Official Codebase of 3DCodeVerse
Python
cleanup: B4 — cli_common.invoke for the four CLI agent backends
gaoypeng60d1b5ea89f5
diff --git a/harness/codeverse/agents/antigravity.py b/harness/codeverse/agents/antigravity.pyindex e240fe9e..67ad6829 100644--- a/harness/codeverse/agents/antigravity.py+++ b/harness/codeverse/agents/antigravity.py@@ -32,9 +32,10 @@ from codeverse.agents.cli_common import (failed,finish_session,hardened_env,+ invoke,tail,+ watchdog_error,)-from codeverse.agents.watchdog import run_with_watchdogfrom codeverse.config import get_settingsfrom codeverse.contracts.agent import AgentJob, AgentResultfrom codeverse.contracts.common import Usage@@ -42,8 +43,6 @@ from codeverse.proc import run_subprocesslog = logging.getLogger(__name__)-IDLE_GRACE_S = 300.0-#: reasoning efforts agy exposes for the models that have themEFFORTS = ("low", "medium", "high")#: what a bare id is resolved to when agy offers only effort-suffixed spellings@@ -161,15 +160,7 @@ class AntigravityAgent:if not ok:return failed(s, "error", why)prompt = deliver_prompt(s, _compose_prompt(s))- argv = self.build_argv(s, prompt)- s.traj.append("invoke", argv=[a if a != prompt else f"<prompt {len(prompt)} chars>" for a in argv])- proc = run_with_watchdog(- argv, cwd=s.ws.root, env=self.build_env(s), soft_timeout_s=job.timeout_s, idle_grace_s=IDLE_GRACE_S,- on_line=lambda stream, line: s.traj.append("line", stream=stream, text=line[:4000]),- activity_dirs=[s.ws.src, s.ws.public],- )- s.traj.write_text("stdout.json", proc.stdout)- s.traj.write_text("stderr.log", proc.stderr)+ proc = invoke(s, self.build_argv(s, prompt), self.build_env(s), prompt=prompt)env = parse_agy_json(proc.stdout)served = self.served_model()usage = usage_from_agy(env, served) if env else Usage(backend=self.kind, model=served)@@ -181,7 +172,7 @@ class AntigravityAgent:s.notes.append("agy is subscription-billed: cost_usd=0")if proc.timed_out:ok, reason = False, "timeout"- errors.append(f"killed by watchdog ({proc.killed_reason}) after {proc.duration_s:.0f}s")+ errors.append(watchdog_error(proc))elif proc.rc != 0 or (env is not None and str(env.get("status", "SUCCESS")).upper() not in ("SUCCESS", "OK")):ok, reason = False, "error"errors.append(f"rc={proc.rc}; status={(env or {}).get('status')}; error={(env or {}).get('error', '')}; "diff --git a/harness/codeverse/agents/claude_code.py b/harness/codeverse/agents/claude_code.pyindex c9a71088..0b3e011f 100644--- a/harness/codeverse/agents/claude_code.py+++ b/harness/codeverse/agents/claude_code.py@@ -26,10 +26,11 @@ from codeverse.agents.cli_common import (failed,finish_session,hardened_env,+ invoke,is_transient_failure,tail,+ watchdog_error,)-from codeverse.agents.watchdog import run_with_watchdogfrom codeverse.config import get_settingsfrom codeverse.contracts.agent import AgentJob, AgentResultfrom codeverse.contracts.common import Usage@@ -40,7 +41,6 @@ from codeverse.contracts.common import Usage#: ignoring them. It only ever opens files already inside the workspace.ALLOWED_TOOLS = ("Read", "Edit", "Write", "MultiEdit", "Glob", "Grep", "Skill","Bash(node:*)", "Bash(python:*)", "Bash(python3:*)", "Bash(ls:*)", "mcp__c3v__*")-IDLE_GRACE_S = 300.0def parse_claude_json(stdout: str) -> dict[str, Any] | None:@@ -153,15 +153,7 @@ class ClaudeCodeAgent:if not ok:return failed(s, "error", why)prompt = deliver_prompt(s, job.prompt)- argv = self.build_argv(s, prompt)- s.traj.append("invoke", argv=[a if a != prompt else f"<prompt {len(prompt)} chars>" for a in argv])- proc = run_with_watchdog(- argv, cwd=s.ws.root, env=self.build_env(s), soft_timeout_s=job.timeout_s, idle_grace_s=IDLE_GRACE_S,- on_line=lambda stream, line: s.traj.append("line", stream=stream, text=line[:4000]),- activity_dirs=[s.ws.src, s.ws.public],- )- s.traj.write_text("stdout.json", proc.stdout)- s.traj.write_text("stderr.log", proc.stderr)+ proc = invoke(s, self.build_argv(s, prompt), self.build_env(s), prompt=prompt)env = parse_claude_json(proc.stdout)usage = usage_from_envelope(env, self.model) if env else Usage(backend=self.kind, model=self.model)usage.latency_ms = usage.latency_ms or int(proc.duration_s * 1000)@@ -170,7 +162,7 @@ class ClaudeCodeAgent:errors: list[str] = []if proc.timed_out:reason, ok = "timeout", False- errors.append(f"killed by watchdog ({proc.killed_reason}) after {proc.duration_s:.0f}s")+ errors.append(watchdog_error(proc))elif env is None or proc.rc != 0:reason, ok = "error", Falseerrors.append(f"rc={proc.rc}; no result envelope; stderr tail: {tail(proc.stderr, 1500)}")diff --git a/harness/codeverse/agents/cli_common.py b/harness/codeverse/agents/cli_common.pyindex e16f5264..53e70698 100644--- a/harness/codeverse/agents/cli_common.py+++ b/harness/codeverse/agents/cli_common.py@@ -6,6 +6,9 @@git snapshot before/after, ``files_changed`` from git *attributed to thissession* (see :func:`attribute_changes`), ``result.json``.* :func:`deliver_prompt` — argv prompt or "read the prompt file" stub.+* :func:`invoke` / :func:`watchdog_error` — one CLI process under the watchdog,+ recorded in the trajectory (``invoke`` line, every output line, stdout/stderr+ captures); ``IDLE_GRACE_S`` is the shared idle kill threshold.* :func:`estimate_cost_safe` — lazy bridge to ``codeverse.models.pricing``.* :func:`is_transient_failure` — 429 / 503 / empty-response detection."""@@ -19,11 +22,13 @@ import reimport sysimport threadingimport time+from collections.abc import Callable, Mappingfrom dataclasses import dataclass, fieldfrom pathlib import Pathfrom typing import Anyfrom codeverse.agents.transcript import Trajectory+from codeverse.agents.watchdog import CompletedProc, run_with_watchdogfrom codeverse.contracts.agent import AgentJob, AgentResult, FileChangefrom codeverse.contracts.common import Usagefrom codeverse.workspace import Workspace@@ -254,6 +259,66 @@ def deliver_prompt(s: Session, prompt: str, *, max_bytes: int = MAX_ARGV_PROMPT_)+# --------------------------------------------------------------------------- invoke+#: seconds without output or workspace activity before the watchdog kills a CLI agent;+#: read at call time by :func:`invoke` so a test can monkeypatch it here.+IDLE_GRACE_S = 300.0+++def invoke(+ s: Session,+ argv: list[str],+ env: Mapping[str, str],+ *,+ prompt: str,+ stdout_name: str = "stdout.json",+ on_stdout: Callable[[str], None] | None = None,+ stdin: str | None = None,+ attempt: int = 1,+ idle_grace_s: float | None = None,+ **invoke_extra: Any,+) -> CompletedProc:+ """Run one CLI agent process under the watchdog and record it in the trajectory.++ Replaces the block ``claude_code.ClaudeCodeAgent.run``, ``codex.CodexAgent.run``,+ ``antigravity.AntigravityAgent.run`` and ``gemini_cli.GeminiCliAgent._invoke`` each+ carried verbatim: the ``invoke`` transcript line with the prompt masked out of argv,+ ``run_with_watchdog`` with identical kwargs (workspace cwd, the job's soft timeout,+ ``IDLE_GRACE_S``, every output line into the transcript, ``src/`` + ``public/`` as+ activity dirs) and the stdout/stderr captures next to the transcript.++ ``stdout_name`` sets the capture's name (codex streams JSONL → ``stdout.jsonl``);+ ``on_stdout`` also receives each stdout line (codex folds events live); ``stdin``+ feeds the prompt through stdin instead of argv; ``attempt`` > 1 writes+ ``stdout.<n>.json`` / ``stderr.<n>.log`` so a retry keeps attempt 1's captures.+ The ``invoke`` line records ``attempt`` and whether stdin was used, plus+ ``invoke_extra`` (gemini-cli adds ``model`` and ``key_tail``).+ """+ masked = [a if a != prompt else f"<prompt {len(prompt)} chars>" for a in argv]+ s.traj.append("invoke", argv=masked, attempt=attempt, stdin=stdin is not None, **invoke_extra)++ def on_line(stream: str, line: str) -> None:+ s.traj.append("line", stream=stream, text=line[:4000])+ if on_stdout is not None and stream == "stdout":+ on_stdout(line)++ proc = run_with_watchdog(+ argv, cwd=s.ws.root, env=env, soft_timeout_s=s.job.timeout_s,+ idle_grace_s=IDLE_GRACE_S if idle_grace_s is None else idle_grace_s,+ on_line=on_line, stdin=stdin, activity_dirs=[s.ws.src, s.ws.public],+ )+ suffix = "" if attempt == 1 else f".{attempt}"+ out = Path(stdout_name)+ s.traj.write_text(f"{out.stem}{suffix}{out.suffix}", proc.stdout)+ s.traj.write_text(f"stderr{suffix}.log", proc.stderr)+ return proc+++def watchdog_error(proc: CompletedProc) -> str:+ """The error line every CLI backend records when the watchdog killed its process."""+ return f"killed by watchdog ({proc.killed_reason}) after {proc.duration_s:.0f}s"++# --------------------------------------------------------------------------- failures_TRANSIENT_RE = re.compile(r"(\b429\b|RESOURCE_EXHAUSTED|rate.?limit|quota|\b503\b|UNAVAILABLE|overloaded|"diff --git a/harness/codeverse/agents/codex.py b/harness/codeverse/agents/codex.pyindex 39e6a3b1..0a8db957 100644--- a/harness/codeverse/agents/codex.py+++ b/harness/codeverse/agents/codex.py@@ -25,16 +25,16 @@ from codeverse.agents.cli_common import (failed,finish_session,hardened_env,+ invoke,mcp_command_for,tail,+ watchdog_error,)from codeverse.agents.materialize import codex_mcp_overrides-from codeverse.agents.watchdog import run_with_watchdogfrom codeverse.config import get_settingsfrom codeverse.contracts.agent import AgentJob, AgentResultfrom codeverse.contracts.common import Usage-IDLE_GRACE_S = 300.0STDIN_PROMPT_BYTES = 100_000_TOOL_ITEMS = ("command_execution", "file_change", "mcp_tool_call", "web_search", "tool_call")@@ -170,26 +170,15 @@ class CodexAgent:via_stdin = len(prompt.encode("utf-8")) > STDIN_PROMPT_BYTESargv = self.build_argv(s, None if via_stdin else prompt)events = CodexEvents()- s.traj.append("invoke", argv=[a if a != prompt else f"<prompt {len(prompt)} chars>" for a in argv], stdin=via_stdin)-- def on_line(stream: str, line: str) -> None:- s.traj.append("line", stream=stream, text=line[:4000])- if stream == "stdout":- events.feed(line)-- proc = run_with_watchdog(- argv, cwd=s.ws.root, env=self.build_env(s), soft_timeout_s=job.timeout_s, idle_grace_s=IDLE_GRACE_S,- on_line=on_line, stdin=prompt if via_stdin else None, activity_dirs=[s.ws.src, s.ws.public],- )- s.traj.write_text("stdout.jsonl", proc.stdout)- s.traj.write_text("stderr.log", proc.stderr)+ proc = invoke(s, argv, self.build_env(s), prompt=prompt, stdout_name="stdout.jsonl",+ on_stdout=events.feed, stdin=prompt if via_stdin else None)usage = events.usage(self.model)usage.latency_ms = int(proc.duration_s * 1000)text = "\n\n".join(m for m in events.messages if m.strip())errors = list(events.errors)if proc.timed_out:ok, reason = False, "timeout"- errors.append(f"killed by watchdog ({proc.killed_reason}) after {proc.duration_s:.0f}s")+ errors.append(watchdog_error(proc))elif proc.rc != 0 or events.n_events == 0:ok, reason = False, "error"errors.append(f"rc={proc.rc}; events={events.n_events}; stderr tail: {tail(proc.stderr, 1500)}")diff --git a/harness/codeverse/agents/gemini_cli.py b/harness/codeverse/agents/gemini_cli.pyindex d4c77c6e..1879e1c9 100644--- a/harness/codeverse/agents/gemini_cli.py+++ b/harness/codeverse/agents/gemini_cli.py@@ -33,11 +33,13 @@ from codeverse.agents.cli_common import (failed,finish_session,hardened_env,+ invoke,is_quota_failure,is_transient_failure,tail,+ watchdog_error,)-from codeverse.agents.watchdog import CompletedProc, run_with_watchdog+from codeverse.agents.watchdog import CompletedProcfrom codeverse.config import get_settingsfrom codeverse.contracts.agent import AgentJob, AgentResultfrom codeverse.contracts.common import Usage@@ -52,7 +54,6 @@ SYSTEM_SETTINGS = {"experimental": {"dynamicModelConfiguration": True},"general": {"topicUpdateNarration": False},}-IDLE_GRACE_S = 300.0#: how long a retry waits for a *different* healthy key before reusing the same oneRETRY_KEY_WAIT_S = 10.0@@ -214,19 +215,8 @@ class GeminiCliAgent:)def _invoke(self, s: Session, prompt: str, key: str, *, attempt: int) -> CompletedProc:- argv = self.build_argv(prompt)- env = self.build_env(s, key)- s.traj.append("invoke", attempt=attempt, argv=[a if a != prompt else f"<prompt {len(prompt)} chars>" for a in argv],+ return invoke(s, self.build_argv(prompt), self.build_env(s, key), prompt=prompt, attempt=attempt,model=self.model, key_tail=key[-4:])- proc = run_with_watchdog(- argv, cwd=s.ws.root, env=env, soft_timeout_s=s.job.timeout_s, idle_grace_s=IDLE_GRACE_S,- on_line=lambda stream, line: s.traj.append("line", stream=stream, text=line[:4000]),- activity_dirs=[s.ws.src, s.ws.public],- )- suffix = "" if attempt == 1 else f".{attempt}"- s.traj.write_text(f"stdout{suffix}.json", proc.stdout)- s.traj.write_text(f"stderr{suffix}.log", proc.stderr)- return procdef _interpret(self, s: Session, proc: CompletedProc) -> dict[str, Any]:parsed = parse_gemini_json(proc.stdout)@@ -241,7 +231,7 @@ class GeminiCliAgent:"session_id": (parsed or {}).get("session_id", "")}if proc.timed_out:out["exit_reason"] = "timeout"- errors.append(f"killed by watchdog ({proc.killed_reason}) after {proc.duration_s:.0f}s")+ errors.append(watchdog_error(proc))return outif served and self.model not in served:out["exit_reason"] = "model_substituted"diff --git a/harness/tests/agents/test_gemini_cli.py b/harness/tests/agents/test_gemini_cli.pyindex c029a3df..56d8529d 100644--- a/harness/tests/agents/test_gemini_cli.py+++ b/harness/tests/agents/test_gemini_cli.py@@ -140,7 +140,7 @@ def test_pool_exhausted_before_first_attempt_is_a_budget_result(tmp_ws: Workspacdef test_timeout_is_reported(tmp_ws: Workspace, agent: GeminiCliAgent, monkeypatch):monkeypatch.setenv("FAKE_MODE", "hang")- monkeypatch.setattr("codeverse.agents.gemini_cli.IDLE_GRACE_S", 1.0)+ monkeypatch.setattr("codeverse.agents.cli_common.IDLE_GRACE_S", 1.0)res = agent.run(_job(tmp_ws, timeout_s=1))assert not res.ok and res.exit_reason == "timeout" and res.duration_s < 30