fix(terminal): cap foreground timeout to prevent session deadlocks

When the model calls terminal() in foreground mode without background=true
(e.g. to start a server), the tool call blocks until the command exits or
the timeout expires. Without an upper bound the model can request arbitrarily
high timeouts (the schema had minimum=1 but no maximum), blocking the entire
agent session for hours until the gateway idle watchdog kills it.

Changes:
- Add FOREGROUND_MAX_TIMEOUT (600s, configurable via
  TERMINAL_MAX_FOREGROUND_TIMEOUT env var) that caps foreground timeout
- Clamp effective_timeout to the cap when background=false and timeout
  exceeds the limit
- Include a timeout_note in the tool result when clamped, nudging the
  model to use background=true for long-running processes
- Update schema description to show the max timeout value
- Remove dead clamping code in the background branch that could never
  fire (max_timeout was set to effective_timeout, so timeout > max_timeout
  was always false)
- Add 7 tests covering clamping, no-clamping, config-default-exceeds-cap
  edge case, background bypass, default timeout, constant value, and
  schema content

Self-review fixes:
- Fixed bug where timeout_note said 'Requested timeout Nones' when
  clamping fired from config default exceeding cap (timeout param is
  None). Now uses unclamped_timeout instead of the raw timeout param.
- Removed unused pytest import from test file
- Extracted test config dict into _make_env_config() helper
- Fixed tautological test_default_value assertion
- Added missing test for config default > cap with no model timeout
This commit is contained in:
kshitijk4poor
2026-04-09 22:36:11 +05:30
committed by Teknium
parent 45034b746f
commit ca2d28d45c
2 changed files with 206 additions and 11 deletions

View File

@@ -75,6 +75,9 @@ from tools.tool_backend_helpers import (
)
# Hard cap on foreground timeout; override via TERMINAL_MAX_FOREGROUND_TIMEOUT env var.
FOREGROUND_MAX_TIMEOUT = int(os.getenv("TERMINAL_MAX_FOREGROUND_TIMEOUT", "600"))
# Disk usage warning threshold (in GB)
DISK_USAGE_WARNING_THRESHOLD_GB = float(os.getenv("TERMINAL_DISK_WARNING_GB", "500"))
@@ -1207,6 +1210,16 @@ def terminal_tool(
cwd = overrides.get("cwd") or config["cwd"]
default_timeout = config["timeout"]
effective_timeout = timeout or default_timeout
unclamped_timeout = effective_timeout
# Clamp foreground commands to FOREGROUND_MAX_TIMEOUT to prevent
# a single tool call from blocking the entire agent session.
if not background and effective_timeout > FOREGROUND_MAX_TIMEOUT:
logger.info(
"Clamping foreground timeout from %ds to %ds (max: TERMINAL_MAX_FOREGROUND_TIMEOUT=%d)",
effective_timeout, FOREGROUND_MAX_TIMEOUT, FOREGROUND_MAX_TIMEOUT,
)
effective_timeout = FOREGROUND_MAX_TIMEOUT
# Start cleanup thread
_start_cleanup_thread()
@@ -1398,14 +1411,6 @@ def terminal_tool(
if pty_disabled_reason:
result_data["pty_note"] = pty_disabled_reason
# Transparent timeout clamping note
max_timeout = effective_timeout
if timeout and timeout > max_timeout:
result_data["timeout_note"] = (
f"Requested timeout {timeout}s was clamped to "
f"configured limit of {max_timeout}s"
)
# Mark for agent notification on completion
if notify_on_complete and background:
proc_session.notify_on_complete = True
@@ -1480,11 +1485,18 @@ def terminal_tool(
except Exception as e:
error_str = str(e).lower()
if "timeout" in error_str:
return json.dumps({
timeout_result = {
"output": "",
"exit_code": 124,
"error": f"Command timed out after {effective_timeout} seconds"
}, ensure_ascii=False)
}
if unclamped_timeout != effective_timeout:
timeout_result["timeout_note"] = (
f"Timeout of {unclamped_timeout}s was clamped to "
f"the foreground maximum of {FOREGROUND_MAX_TIMEOUT}s. "
f"Use background=true for long-running processes."
)
return json.dumps(timeout_result, ensure_ascii=False)
# Retry on transient errors
if retry_count < max_retries:
@@ -1547,6 +1559,12 @@ def terminal_tool(
result_dict["approval"] = approval_note
if exit_note:
result_dict["exit_code_meaning"] = exit_note
if unclamped_timeout != effective_timeout:
result_dict["timeout_note"] = (
f"Timeout of {unclamped_timeout}s was clamped to "
f"the foreground maximum of {FOREGROUND_MAX_TIMEOUT}s. "
f"Use background=true for long-running processes."
)
return json.dumps(result_dict, ensure_ascii=False)
@@ -1733,7 +1751,7 @@ TERMINAL_SCHEMA = {
},
"timeout": {
"type": "integer",
"description": "Max seconds to wait (default: 180). Returns INSTANTLY when command finishes — set high for long tasks, you won't wait unnecessarily.",
"description": f"Max seconds to wait (default: 180, max: {FOREGROUND_MAX_TIMEOUT}). Returns INSTANTLY when command finishes — set high for long tasks, you won't wait unnecessarily.",
"minimum": 1
},
"workdir": {