mirror of
https://github.com/agent0ai/agent-zero.git
synced 2026-07-30 11:13:36 +00:00
4ffcdf5246
Detect and treat terminated local/SSH/TTY shells as definitive command completion. Add is_terminated and get_exit_code helpers to LocalInteractiveSession, SSHInteractiveSession, and TTYSession; expand _is_closed_pty_error to recognize exited TTY processes. CodeExecution now reports a shell-exit prompt, recreates terminated sessions lazily before the next command, and returns immediately when a shell has exited. Docs and README updated to describe strict-mode/exit behavior, and tests were added/updated to cover the new termination detection and handling.
86 lines
2.8 KiB
Python
86 lines
2.8 KiB
Python
import os
|
|
import platform
|
|
import select
|
|
import subprocess
|
|
import time
|
|
import sys
|
|
from typing import Optional, Tuple
|
|
from helpers import runtime
|
|
from plugins._code_execution.helpers import tty_session
|
|
from plugins._code_execution.helpers.shell_ssh import clean_string
|
|
|
|
|
|
def disable_pagers_in_env(env: dict | None = None) -> dict:
|
|
"""Return a copy of ``env`` with terminal pagers disabled.
|
|
|
|
Commands such as ``git diff``/``git log`` detect a TTY and pipe their output
|
|
through a pager (``more``/``less``). The non-interactive shells created by
|
|
the code execution tool never receive any user input, so the pager blocks
|
|
forever and spins at 100% CPU per process. Pointing the pager variables at
|
|
``cat`` lets the output stream through instead. See issue #1697.
|
|
"""
|
|
env = dict(env if env is not None else os.environ)
|
|
env["PAGER"] = "cat"
|
|
env["GIT_PAGER"] = "cat"
|
|
return env
|
|
|
|
|
|
class LocalInteractiveSession:
|
|
def __init__(self, cwd: str|None = None):
|
|
self.session: tty_session.TTYSession|None = None
|
|
self.full_output = ''
|
|
self.cwd = cwd
|
|
|
|
async def connect(self):
|
|
self.session = tty_session.TTYSession(
|
|
runtime.get_terminal_executable(),
|
|
cwd=self.cwd,
|
|
env=disable_pagers_in_env(),
|
|
)
|
|
await self.session.start()
|
|
await self.session.read_full_until_idle(idle_timeout=1, total_timeout=1)
|
|
|
|
async def close(self):
|
|
if self.session:
|
|
session = self.session
|
|
self.session = None
|
|
try:
|
|
await session.close()
|
|
except Exception:
|
|
try:
|
|
session.kill()
|
|
except Exception:
|
|
pass
|
|
|
|
async def send_command(self, command: str):
|
|
if not self.session:
|
|
raise Exception("Shell not connected")
|
|
self.full_output = ""
|
|
await self.session.sendline(command)
|
|
|
|
def is_terminated(self) -> bool:
|
|
return self.session is None or self.session.is_terminated()
|
|
|
|
def get_exit_code(self) -> int | None:
|
|
if not self.session:
|
|
return None
|
|
return self.session.get_exit_code()
|
|
|
|
async def read_output(self, timeout: float = 0, reset_full_output: bool = False) -> Tuple[str, Optional[str]]:
|
|
if not self.session:
|
|
raise Exception("Shell not connected")
|
|
|
|
if reset_full_output:
|
|
self.full_output = ""
|
|
|
|
# get output from terminal
|
|
partial_output = await self.session.read_full_until_idle(idle_timeout=0.01, total_timeout=timeout)
|
|
self.full_output += partial_output
|
|
|
|
# clean output
|
|
partial_output = clean_string(partial_output)
|
|
clean_full_output = clean_string(self.full_output)
|
|
|
|
if not partial_output:
|
|
return clean_full_output, None
|
|
return clean_full_output, partial_output
|