Fix terminal tool to return output

README.md

@@ -9,9 +9,9 @@ conversations can be resumed with context. One example tool is included:
   with network access. Use it to read uploaded documents under ``/data``, fetch
   web content via tools like ``curl`` or run any other commands. The assistant
   must invoke this tool to search online when unsure about a response. Output
-  from ``stdout`` and ``stderr`` is captured when available. Commands are
-  launched in the background with no timeout so the assistant can continue
-  responding while they execute.
+  from ``stdout`` and ``stderr`` is captured when each command finishes.
+  Execution happens asynchronously so the assistant can continue responding
+  while the command runs.
   The VM is created when a chat session starts and reused for all subsequent
   tool calls.
 

src/tools.py

@@ -27,29 +27,33 @@ def execute_terminal(command: str) -> str:
     The assistant must call this tool to search the internet whenever unsure
     about any detail.
 
-    The command is executed with network access enabled. It runs in the
-    background without a timeout so the assistant can continue responding
-    while the command executes.
+    The command is executed with network access enabled. Output from
+    ``stdout`` and ``stderr`` is captured when the command completes.
+    Execution happens asynchronously so the assistant can continue
+    responding while the command runs.
     """
     if not command:
         return "No command provided."
 
     if _VM:
         try:
-            return _VM.execute(command, detach=True)
+            return _VM.execute(command, timeout=None)
         except Exception as exc:  # pragma: no cover - unforeseen errors
             return f"Failed to execute command in VM: {exc}"
 
     try:
-        subprocess.Popen(
+        completed = subprocess.run(
             command,
             shell=True,
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-            start_new_session=True,
+            capture_output=True,
+            text=True,
             env=os.environ.copy(),
+            timeout=None,
         )
-        return "Command started in background."
+        output = completed.stdout
+        if completed.stderr:
+            output = f"{output}\n{completed.stderr}" if output else completed.stderr
+        return output.strip()
     except Exception as exc:  # pragma: no cover - unforeseen errors
         return f"Failed to execute command: {exc}"
 

src/vm.py

@@ -68,7 +68,7 @@ class LinuxVM:
             raise RuntimeError(f"Failed to start VM: {exc}") from exc
 
     def execute(
-        self, command: str, *, timeout: int = 3, detach: bool = False
+        self, command: str, *, timeout: int | None = 3, detach: bool = False
     ) -> str:
         """Execute a command inside the running VM.
 
@@ -77,8 +77,8 @@ class LinuxVM:
         command:
             The shell command to run inside the container.
         timeout:
-            Maximum time in seconds to wait for completion. Ignored when
-            ``detach`` is ``True``.
+            Maximum time in seconds to wait for completion. Set to ``None``
+            to wait indefinitely. Ignored when ``detach`` is ``True``.
         detach:
             Run the command in the background without waiting for it to finish.
         """
@@ -105,7 +105,7 @@ class LinuxVM:
                 cmd,
                 capture_output=True,
                 text=True,
-                timeout=None if detach else timeout,
+                timeout=None if detach or timeout is None else timeout,
             )
         except subprocess.TimeoutExpired as exc:
             return f"Command timed out after {timeout}s: {exc.cmd}"
@@ -118,7 +118,7 @@ class LinuxVM:
         return output.strip()
 
     async def execute_async(
-        self, command: str, *, timeout: int = 3, detach: bool = False
+        self, command: str, *, timeout: int | None = 3, detach: bool = False
     ) -> str:
         """Asynchronously execute ``command`` inside the running VM."""
         loop = asyncio.get_running_loop()