mirror of
https://github.com/agent0ai/agent-zero.git
synced 2026-07-09 17:08:29 +00:00
528c33b7ef
The code execution tool runs commands inside TTY-backed shells (local PTY and remote SSH). Commands like `git diff`/`git log` detect the TTY and pipe output through a pager (more/less). These shells never receive interactive input, so the pager blocks forever and spins at 100% CPU per process — on a 16-core host 5 pager processes pegged 5 cores for 8+ hours (#1697). Disable pagers in both session types: - LocalInteractiveSession: inject PAGER=cat / GIT_PAGER=cat into the TTY env - SSHInteractiveSession: export the same in the initial shell command `cat` streams the output through instead of blocking, and also covers other pager-using tools (man, systemctl, journalctl). Adds regression tests. Fixes #1697
78 lines
No EOL
2.6 KiB
Python
78 lines
No EOL
2.6 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)
|
|
|
|
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 |