Skip to content

graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs

Python

Claude Agent provider: drive the user's own claude (ADR 0309)

justrachd1ad993d9aa6
diff --git a/build.zig b/build.zig
index 63c86187..b4625e82 100644
--- a/build.zig
+++ b/build.zig
@@ -183,6 +183,9 @@ pub fn build(b: *std.Build) void {
const usage_trace_test = b.addSystemCommand(&.{ "python3", "scripts/test-usage-trace.py" });
usage_trace_test.addArtifactArg(exe);
test_step.dependOn(&usage_trace_test.step);
+ const claude_agent_test = b.addSystemCommand(&.{ "python3", "scripts/test-claude-agent.py" });
+ claude_agent_test.addArtifactArg(exe);
+ test_step.dependOn(&claude_agent_test.step);
const acp_view_meta_test = b.addSystemCommand(&.{ "python3", "scripts/test-acp-view-meta.py" });
acp_view_meta_test.addArtifactArg(exe);
test_step.dependOn(&acp_view_meta_test.step);
diff --git a/docs/adr/0309-claude-agent-runs-the-users-claude.md b/docs/adr/0309-claude-agent-runs-the-users-claude.md
new file mode 100644
index 00000000..ea9d4fbc
--- /dev/null
+++ b/docs/adr/0309-claude-agent-runs-the-users-claude.md
@@ -0,0 +1,103 @@
+# 0309. Claude Agent runs the user's own `claude`
+
+Status: accepted 2026-10-31
+
+## Context
+
+ADR 0281 signs in to an Anthropic Console account (API credits) and ADR 0288
+added a native subscription PKCE login; ADR 0288 left room for "a separate
+Claude CLI transport" that a user selects explicitly. The Agent SDK route is
+that transport: a host application runs the user's installed `claude`
+program through the SDK's control protocol, the user signs in with
+`claude auth login`, and the host never reads Claude Code's credentials or
+sits between Claude Code and Anthropic. The SDK's branding rules allow
+"Claude Agent" as the product name and do not allow "Claude Code".
+
+The SDK itself is a TypeScript/Python library; graff is Zig. Its protocol is
+plain newline-delimited JSON over the child's stdio, verified against
+`claude` 2.1.304:
+
+- `--input-format stream-json --output-format stream-json
+ --include-partial-messages` streams the raw Anthropic Messages events
+ (`stream_event.event`), the same events graff's HTTP transport parses.
+- One `initialize` control request carries the host's in-process MCP servers
+ (`sdkMcpServers`) and a system prompt (`systemPrompt` replaces Claude
+ Code's, `appendSystemPrompt` extends it). A replaced prompt works on a
+ subscription login.
+- MCP JSON-RPC is tunnelled through `mcp_message` control requests. Every
+ `tools/call` carries the model's tool_use id in
+ `_meta["claudecode/toolUseId"]`.
+- `mcp_set_servers` removes and re-adds an SDK server, after which Claude
+ Code initializes it again and re-reads `tools/list`; `mcp_reconnect`
+ refuses SDK servers.
+- `client_composed: true` on a user message stops Claude Code from reading
+ the text as its own commands or adding its per-turn context (2.1.248+).
+
+## Decision
+
+`claude-agent` is a provider (`.kind = .anthropic`, login `claude_cli`). It
+is seated only after `graff login claude-agent` (which runs
+`claude auth status`, then `claude auth login` if needed, and writes a
+marker naming the binary) or `GRAFF_CLAUDE_AGENT=1`. The catalog lists Claude Code's aliases as
+`claude-agent-sonnet`, `-opus`, `-haiku` and `-fable` (prefixed so bare
+`opus` keeps its Anthropic route); `claude-agent/<id>` passes any id Claude
+Code accepts.
+
+`Agent.postLive` routes the provider to `claude_agent.zig`, which returns an
+Anthropic SSE body, so `assembleAnthropic`, `stepAnthropic`, `runTools`,
+approvals, sinks, ACP, usage and compaction run unchanged:
+
+- One long-running child per graff agent, started with Claude Code's
+ built-in tools, settings files, hooks, CLAUDE.md, memory, auto-compaction,
+ tool search and advisor off, `dontAsk` permissions, `mcp__graff__*` as the
+ only allowed tools, and no saved session. The inherited identity of an
+ enclosing Claude Code session (CLAUDECODE, the entrypoint, its messaging
+ socket) is removed from the child's environment; the user's own settings
+ (CLAUDE_CONFIG_DIR, CLAUDE_CODE_OAUTH_TOKEN, cloud switches) pass through.
+- graff's tools are served as the `graff` SDK server. A `tools/call` is
+ held: the step ends at the response's `tool_use` stop, graff runs the
+ calls (in parallel where its own batching allows), and the next step
+ answers each held call by its tool_use id. Results for calls Claude Code
+ has not asked for yet are kept until it does.
+- graff's history is the source of truth. Each request sends only messages
+ the child has not seen; a fresh child (first use, a changed model, effort,
+ prompt or folder, a compaction or edit, five idle minutes) gets everything
+ it missed as one `<conversation-checkpoint>` user message, without
+ thinking text. A changed tool list refreshes the server in place.
+- Titles, recaps, judges and compaction summaries run on a throwaway child.
+- graff's system prompt replaces Claude Code's by default;
+ `GRAFF_CLAUDE_AGENT_PROMPT=claude` keeps Claude Code's and appends graff's.
+- Usage is Claude Code's per-response counts; billing is the flat-rate plan.
+- `rlm`'s nested `llm_query` reports that it is unavailable (no endpoint).
+
+## Measurements
+
+graff-evals core + rlm + swe (22 tasks; `bind-reuse` left out because it asks
+for graff's own `rlm` tool), Sonnet on one subscription login, two
+interleaved reps, global MCP off on both sides, `claude -p` with no user
+settings, hooks, plugins or CLAUDE.md (`claude-code-clean`):
+
+| arm | pass | wall | median/task | prompt tokens | output tokens |
+|---|---|---|---|---|---|
+| `claude -p` | 44/44 | 428 s | 8.2 s | 2.19M | 29.0k |
+| claude-agent, Claude Code prompt + graff's | 44/44 | 362 s | 6.3 s | 1.06M | 26.2k |
+| claude-agent, graff's prompt | 44/44 | 360 s | 6.3 s | 0.85M | 26.5k |
+
+Paired by task and rep, graff's prompt was faster in 33 of 44 runs (median
+1.3 s). Calls per task were the same; the difference is request size:
+Claude Code's own prompt and tool definitions are about twice graff's, which
+is why graff's prompt is the default. A plan's limits count these tokens.
+
+## Consequences
+
+- Claude Code makes the API calls, so graff's Claude request shaping (cache
+ breakpoints, effort routing beyond `--effort`, retries and the stall
+ ladder, request headers) does not apply; Claude Code retries by itself and
+ a failure it reports ends the turn as a readable reply.
+- It works only where `claude` is installed and signed in on the same
+ machine. Hosted or remote sessions cannot use it.
+- An imported conversation still continues on graff's configured provider;
+ this provider is never chosen implicitly for one.
+- Revisit if the protocol drops `_meta["claudecode/toolUseId"]` (calls would
+ then need a PreToolUse hook to learn their id and run one at a time) or
+ `client_composed`.
diff --git a/docs/adr/README.md b/docs/adr/README.md
index 79e1e387..04737f5d 100644
--- a/docs/adr/README.md
+++ b/docs/adr/README.md
@@ -332,6 +332,7 @@ record only when you need the evidence or the edge cases.
| [0305](0305-cancelled-checklist-items-carry-a-reason.md) | A `cancelled` todo needs a short reason or the write is rejected whole; it stays listed with that reason, stops blocking completion and never counts as verified. A verification item can be cancelled after a newer user message or an answered `ask_user`. |
| [0306](0306-model-catalogs-never-hold-startup.md) | Boot and `graff/models` never wait on a catalog GET past a budget: cached catalogs activate now and refresh behind on detached workers whose only output is the disk cache; only uncached ones wait, together, up to 800ms. |
| [0307](0307-resumed-sessions-keep-their-compaction-state-count.md) | A session saves the provider's count of its compaction state, scoped to provider, model, size and digest; loading reapplies it before rebasing the meter, so a restart neither inflates the meter nor forces a compaction. |
+| [0309](0309-claude-agent-runs-the-users-claude.md) | Claude Agent runs the user's own `claude` over the SDK control protocol: graff's tools as an in-process MCP server with held calls, graff's history as the source of truth, never reading Claude Code's login. |
| [0302](0302-sse-idle-watchdogs-follow-body-byte-progress.md) | SSE idle watchdogs observe partial body-byte progress, while separate unfinished-event time and size bounds preserve recovery. |
diff --git a/examples/edge-worker/src/remote.ts b/examples/edge-worker/src/remote.ts
index 8d8df43a..a6826834 100644
--- a/examples/edge-worker/src/remote.ts
+++ b/examples/edge-worker/src/remote.ts
@@ -9,9 +9,9 @@
export const HARNESS_VERSION = "0.13";
-export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-fable-5" | "claude-fable-5-1" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {});
+export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-agent-fable" | "claude-agent-haiku" | "claude-agent-opus" | "claude-agent-sonnet" | "claude-fable-5" | "claude-fable-5-1" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {});
export type ToolName = "shell" | "read_file" | "edit_file" | "write_file" | "webfetch" | "skill" | "codedb" | "read_tool_result" | "render_html" | "todo_write" | "todo_read" | "eval" | "note_constraint" | "ask_user" | "attempt_completion" | "load_tool_schemas" | "mcp_search_tools" | "mcp_select_tool" | "clock_sleep" | "subagent" | "workflow" | "agent_output" | "agent_message" | "subagent_resume" | "learn_candidate" | "peer_message" | "workspace" | "yield_turn" | "imagegen" | "rlm";
-export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex";
+export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent";
/** Events streamed by the bridge (same `--json` contract as the stdio SDK).
* `seq` is a monotonic, gap-free, 1-based per-session id the bridge forwards
@@ -528,5 +528,5 @@ export async function* runAgentRemote(opts: RunAgentRemoteOptions): AsyncGenerat
}
}
-export const MODELS: ModelName[] = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-fable-5", "claude-fable-5-1", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"];
+export const MODELS: ModelName[] = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-agent-fable", "claude-agent-haiku", "claude-agent-opus", "claude-agent-sonnet", "claude-fable-5", "claude-fable-5-1", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"];
export const TOOLS: ToolName[] = ["shell", "read_file", "edit_file", "write_file", "webfetch", "skill", "codedb", "read_tool_result", "render_html", "todo_write", "todo_read", "eval", "note_constraint", "ask_user", "attempt_completion", "load_tool_schemas", "mcp_search_tools", "mcp_select_tool", "clock_sleep", "subagent", "workflow", "agent_output", "agent_message", "subagent_resume", "learn_candidate", "peer_message", "workspace", "yield_turn", "imagegen", "rlm"];
diff --git a/graff-evals/claude_code_run.py b/graff-evals/claude_code_run.py
index eef9b14c..a226fd61 100644
--- a/graff-evals/claude_code_run.py
+++ b/graff-evals/claude_code_run.py
@@ -20,6 +20,11 @@ cmd = [CLAUDE, "-p", prompt, "--model", model, "--dangerously-skip-permissions",
"--output-format", "stream-json", "--verbose"]
if os.path.exists(".mcp.json"):
cmd += ["--mcp-config", ".mcp.json", "--strict-mcp-config"]
+elif os.environ.get("CLAUDE_CODE_RUN_ISOLATED"):
+ cmd += ["--strict-mcp-config"]
+if os.environ.get("CLAUDE_CODE_RUN_ISOLATED"):
+ # No user/project settings: hooks, plugins and permissions stay out.
+ cmd += ["--setting-sources", ""]
r = subprocess.run(cmd, stdin=subprocess.DEVNULL, capture_output=True, text=True)
per_message, answer, result = {}, "", None
diff --git a/graff-evals/empty-mcp.json b/graff-evals/empty-mcp.json
new file mode 100644
index 00000000..1cb85dce
--- /dev/null
+++ b/graff-evals/empty-mcp.json
@@ -0,0 +1 @@
+{"mcpServers": {}}
diff --git a/graff-evals/harnesses.json b/graff-evals/harnesses.json
index b1ffc7c5..fdffa27f 100644
--- a/graff-evals/harnesses.json
+++ b/graff-evals/harnesses.json
@@ -434,5 +434,31 @@
"model_prefix": "codegraff",
"default_model": "gemini-4-argon",
"note": "graff --json on the Codegraff gateway, set_effort default before the prompt (-p has no effort flag)"
+ },
+ "graff-dev-claude-agent": {
+ "cmd": ["{repo}/zig-out/bin/graff", "-p", "{prompt}", "--model", "claude-agent/{model}", "--yolo"],
+ "answer": "stdout",
+ "usage": "graff-stderr",
+ "capabilities": [],
+ "env": {"GRAFF_CLAUDE_AGENT": "1", "GRAFF_MCP_CONFIG": "{repo}/graff-evals/empty-mcp.json", "GRAFF_POST_DEADLINE_SECS": "90"},
+ "default_model": "sonnet",
+ "note": "graff on the Claude Agent provider (ADR 0309): the user's own `claude` login runs the model; graff's prompt, tools and loop. Global MCP off; a task's .mcp.json still loads. Pass a Claude Code model alias (sonnet, opus, haiku)."
+ },
+ "graff-dev-claude-agent-ccprompt": {
+ "cmd": ["{repo}/zig-out/bin/graff", "-p", "{prompt}", "--model", "claude-agent/{model}", "--yolo"],
+ "answer": "stdout",
+ "usage": "graff-stderr",
+ "capabilities": [],
+ "env": {"GRAFF_CLAUDE_AGENT": "1", "GRAFF_CLAUDE_AGENT_PROMPT": "claude", "GRAFF_MCP_CONFIG": "{repo}/graff-evals/empty-mcp.json", "GRAFF_POST_DEADLINE_SECS": "90"},
+ "default_model": "sonnet",
+ "note": "graff-dev-claude-agent keeping Claude Code's system prompt with graff's appended."
+ },
+ "claude-code-clean": {
+ "cmd": ["python3", "{repo}/graff-evals/claude_code_run.py", "{model}", "{prompt}"],
+ "answer": "stdout",
+ "usage": "graff-stderr",
+ "env": {"CLAUDE_CODE_RUN_ISOLATED": "1", "CLAUDE_CODE_DISABLE_CLAUDE_MDS": "1", "DISABLE_TELEMETRY": "1", "DISABLE_AUTOUPDATER": "1", "DISABLE_ERROR_REPORTING": "1"},
+ "default_model": "sonnet",
+ "note": "`claude -p` on its own login with no user settings, hooks, plugins, CLAUDE.md or global MCP: the isolation graff-dev-claude-agent runs with. Launch the runner without an enclosing Claude Code session's CLAUDE* variables."
}
}
diff --git a/lean-proofs/Graff/Provider.lean b/lean-proofs/Graff/Provider.lean
index 0bb93be9..4f7c4cec 100644
--- a/lean-proofs/Graff/Provider.lean
+++ b/lean-proofs/Graff/Provider.lean
@@ -1,7 +1,7 @@
/-
Provider table kernel.
- Twenty-five baked rows. Each row is data: an id plus the axes `Kind`,
+ Twenty-six baked rows. Each row is data: an id plus the axes `Kind`,
`Auth`, login, catalog, and two bools. The program does not branch per
brand. Adding a vendor is one constructor here and one line in
`provider.zig`; the Zig fixture test is the ratchet.
@@ -26,6 +26,7 @@ inductive Login where
| zaiCli
| chatgptBrowser
| anthropicBrowser
+ | claudeCli
deriving DecidableEq, Repr, BEq
inductive Catalog where
@@ -72,6 +73,7 @@ def specs : List Row :=
, { id := "omlx", kind := .openai, auth := .bearer, catalog := .openai, takesEffort := true }
, { id := "chatgpt-new", kind := .responses, auth := .bearer, login := .chatgptBrowser, catalog := .openai, subLogin := true }
, { id := "codex", kind := .responses, auth := .bearer, login := .codexDevice, catalog := .codex, subLogin := true }
+ , { id := "claude-agent", kind := .anthropic, auth := .bearer, login := .claudeCli, subLogin := true, takesEffort := true }
]
def ids : List String := specs.map (·.id)
@@ -90,7 +92,7 @@ def xApiKeyCount : Nat := countWhere (fun r => r.auth == .xApiKey) specs
def providerRows : Nat := specs.length
-theorem provider_cube : providerRows = 25 := by native_decide
+theorem provider_cube : providerRows = 26 := by native_decide
theorem responses_vendors : responsesCount = 3 := by native_decide
theorem one_x_api_key : xApiKeyCount = 1 := by native_decide
diff --git a/scripts/test-claude-agent.py b/scripts/test-claude-agent.py
new file mode 100755
index 00000000..2cd3ba5d
--- /dev/null
+++ b/scripts/test-claude-agent.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python3
+"""Claude Agent (ADR 0309) end to end against a fake `claude`, offline.
+
+The fake speaks the Agent SDK control protocol the way `claude` 2.1.x does:
+it answers `initialize`, lists graff's tools over the tunnelled MCP server,
+streams a response that calls `write_file`, holds the call until graff's own
+loop has run it, then answers. Asserts:
+
+- graff's tools reach the model as the `graff` SDK server; the user line is
+ client-composed and graff's system prompt replaces Claude Code's
+- the held `tools/call` is answered with graff's real result, matched by
+ `_meta["claudecode/toolUseId"]`, and the file graff wrote exists
+- the second step reuses the same `claude` process (one spawn per run)
+- Claude Code's own login is never read: the fake sees no graff credential
+"""
+import json, os, shutil, subprocess, sys, tempfile
+from pathlib import Path
+
+FAKE = r'''#!/usr/bin/env python3
+import json, os, sys
+log = open(os.environ["FAKE_CLAUDE_LOG"], "a")
+def note(kind, obj): log.write(json.dumps({"kind": kind, "obj": obj}) + "\n"); log.flush()
+note("argv", sys.argv[1:])
+note("env", {k: v for k, v in os.environ.items() if k.startswith("CLAUDE") or k in ("MCP_TOOL_TIMEOUT", "DISABLE_AUTO_COMPACT")})
+def out(obj): sys.stdout.write(json.dumps(obj) + "\n"); sys.stdout.flush()
+def read():
+ line = sys.stdin.readline()
+ if not line: sys.exit(0)
+ obj = json.loads(line); note("in", obj); return obj
+def ev(e): out({"type": "stream_event", "parent_tool_use_id": None, "event": e})
+def mcp(rid, msg):
+ out({"type": "control_request", "request_id": rid, "request": {"subtype": "mcp_message", "server_name": "graff", "message": msg}})
+ return read()
+init = read()
+# As claude does: connect the SDK server before answering initialize.
+mcp("m1", {"method": "initialize", "params": {"protocolVersion": "2025-11-25"}, "jsonrpc": "2.0", "id": 0})
+mcp("m2", {"method": "tools/list", "jsonrpc": "2.0", "id": 1})
+out({"type": "control_response", "response": {"subtype": "success", "request_id": init["request_id"], "response": {"claude_code_version": "2.1.304", "models": []}}})
+user = read()
+usage = {"input_tokens": 10, "cache_read_input_tokens": 0, "cache_creation_input_tokens": 0, "output_tokens": 1}
+ev({"type": "message_start", "message": {"id": "msg_1", "type": "message", "role": "assistant", "model": "claude-test", "content": [], "usage": usage}})
+ev({"type": "content_block_start", "index": 0, "content_block": {"type": "tool_use", "id": "toolu_1", "name": "mcp__graff__write_file", "input": {}}})
+ev({"type": "content_block_delta", "index": 0, "delta": {"type": "input_json_delta", "partial_json": json.dumps({"path": "out.txt", "content": "from claude agent\n"})}})
+ev({"type": "content_block_stop", "index": 0})
+ev({"type": "message_delta", "delta": {"stop_reason": "tool_use", "stop_sequence": None}, "usage": {"output_tokens": 20}})
+ev({"type": "message_stop"})
+reply = mcp("m3", {"method": "tools/call", "params": {"name": "write_file", "arguments": {"path": "out.txt", "content": "from claude agent\n"}, "_meta": {"claudecode/toolUseId": "toolu_1"}}, "jsonrpc": "2.0", "id": 2})
+ev({"type": "message_start", "message": {"id": "msg_2", "type": "message", "role": "assistant", "model": "claude-test", "content": [], "usage": usage}})
+ev({"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}})
+ev({"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "FAKE-DONE"}})
+ev({"type": "content_block_stop", "index": 0})
+ev({"type": "message_delta", "delta": {"stop_reason": "end_turn", "stop_sequence": None}, "usage": {"output_tokens": 3}})
+ev({"type": "message_stop"})
+out({"type": "result", "subtype": "success", "is_error": False, "result": "FAKE-DONE"})
+while True: read()
+'''
+
+
+def main():
+ binary = str(Path(sys.argv[1] if len(sys.argv) > 1 else 'zig-out/bin/graff').resolve())
+ if os.name == 'nt':
+ print('SKIP claude-agent fake child needs a POSIX shebang', flush=True)
+ return
+ temp = Path(tempfile.mkdtemp(prefix='graff-claude-agent-'))
+ try:
+ fake = temp / 'bin' / 'claude'
+ fake.parent.mkdir()
+ fake.write_text(FAKE)
+ fake.chmod(0o755)
+ log = temp / 'fake.log'
+ work = temp / 'proj'
+ work.mkdir()
+ mcp_off = temp / 'mcp.json'
+ mcp_off.write_text('{"mcpServers": {}}')
+ env = {k: v for k, v in os.environ.items() if not k.endswith('_API_KEY') and not k.startswith('CLAUDE')}
+ env.update(HOME=str(temp), USERPROFILE=str(temp), GRAFF_NO_TELEMETRY='1', GRAFF_FLEET='off', GRAFF_NO_SMOLIFY='1',
+ GRAFF_NO_CODEDB_GUARD='1', GRAFF_MCP_CONFIG=str(mcp_off), GRAFF_CLAUDE_AGENT='1',
+ GRAFF_CLAUDE_PATH=str(fake), FAKE_CLAUDE_LOG=str(log),
+ # An enclosing Claude Code session's identity must not reach the child.
+ CLAUDECODE='1', CLAUDE_CODE_ENTRYPOINT='cli', CLAUDE_CONFIG_DIR=str(temp / 'cc'))
+ run = subprocess.run([binary, '--model', 'claude-agent/sonnet', '--yolo', '-p', 'write the file'], cwd=work, env=env,
+ capture_output=True, text=True, encoding='utf-8', errors='replace', timeout=120)
+ assert run.returncode == 0, run.stderr[-2000:]
+ assert 'FAKE-DONE' in run.stdout, (run.stdout[-500:], run.stderr[-1500:])
+ assert (work / 'out.txt').read_text() == 'from claude agent\n'
+ rows = [json.loads(l) for l in log.read_text().splitlines() if l.strip()]
+ spawns = [r['obj'] for r in rows if r['kind'] == 'argv']
+ assert len(spawns) == 1, f'expected one claude process, got {len(spawns)}'
+ argv = spawns[0]
+ assert argv[argv.index('--tools') + 1] == '' and argv[argv.index('--allowedTools') + 1] == 'mcp__graff__*', argv
+ assert argv[argv.index('--model') + 1] == 'sonnet' and '--no-session-persistence' in argv, argv
+ child_env = [r['obj'] for r in rows if r['kind'] == 'env'][0]
+ assert 'CLAUDECODE' not in child_env and 'CLAUDE_CODE_ENTRYPOINT' not in child_env, child_env
+ assert child_env.get('CLAUDE_CONFIG_DIR') == str(temp / 'cc'), child_env
+ assert child_env.get('DISABLE_AUTO_COMPACT') == '1', child_env
+ inputs = [r['obj'] for r in rows if r['kind'] == 'in']
+ init = inputs[0]['request']
+ assert init['subtype'] == 'initialize' and init['sdkMcpServers'] == ['graff'], init
+ assert init['systemPrompt'] and 'appendSystemPrompt' not in init, init
+ replies = {i['response']['request_id']: i['response'] for i in inputs if i.get('type') == 'control_response'}
+ listed = replies['m2']['response']['mcp_response']['result']['tools']
+ assert any(t['name'] == 'write_file' and 'inputSchema' in t for t in listed), [t['name'] for t in listed]
+ user = [i for i in inputs if i.get('type') == 'user'][0]
+ assert user['client_composed'] is True and user['message']['content'][0]['text'] == 'write the file', user
+ call = replies['m3']['response']['mcp_response']
+ assert call['id'] == 2 and not call['result'].get('isError'), call
+ assert 'out.txt' in call['result']['content'][0]['text'], call
+ print('PASS claude-agent: graff tools as the SDK server, a held call answered with graff\'s result, one process', flush=True)
+ finally:
+ shutil.rmtree(temp, ignore_errors=True)
+
+
+if __name__ == '__main__':
+ main()
diff --git a/sdk/py/harness_sdk.py b/sdk/py/harness_sdk.py
index 571cf349..1e4f45bd 100644
--- a/sdk/py/harness_sdk.py
+++ b/sdk/py/harness_sdk.py
@@ -13,9 +13,9 @@ import urllib.error
import urllib.request
from typing import Iterator, List, Literal, Optional, TypedDict, Union
-MODELS = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-fable-5", "claude-fable-5-1", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"]
+MODELS = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-agent-fable", "claude-agent-haiku", "claude-agent-opus", "claude-agent-sonnet", "claude-fable-5", "claude-fable-5-1", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"]
TOOLS = ["shell", "read_file", "edit_file", "write_file", "webfetch", "skill", "codedb", "read_tool_result", "render_html", "todo_write", "todo_read", "eval", "note_constraint", "ask_user", "attempt_completion", "load_tool_schemas", "mcp_search_tools", "mcp_select_tool", "clock_sleep", "subagent", "workflow", "agent_output", "agent_message", "subagent_resume", "learn_candidate", "peer_message", "workspace", "yield_turn", "imagegen", "rlm"]
-PROVIDERS = ["anthropic", "codegraff", "deepseek", "openai", "google", "minimax", "xiaomi", "kilo", "groq", "cerebras", "mistral", "kimi", "moonshot", "xai", "zai", "meta", "vercel", "openrouter", "fugu", "fireworks", "mlx", "lmstudio", "omlx", "chatgpt-new", "codex"]
+PROVIDERS = ["anthropic", "codegraff", "deepseek", "openai", "google", "minimax", "xiaomi", "kilo", "groq", "cerebras", "mistral", "kimi", "moonshot", "xai", "zai", "meta", "vercel", "openrouter", "fugu", "fireworks", "mlx", "lmstudio", "omlx", "chatgpt-new", "codex", "claude-agent"]
class ImageUrlInput(TypedDict):
diff --git a/sdk/ts/harness.ts b/sdk/ts/harness.ts
index 8dcf6ae1..b032ab6a 100644
--- a/sdk/ts/harness.ts
+++ b/sdk/ts/harness.ts
@@ -11,9 +11,9 @@ import type { Readable, Writable } from "node:stream";
export const HARNESS_VERSION = "0.13";
-export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-fable-5" | "claude-fable-5-1" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {});
+export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-agent-fable" | "claude-agent-haiku" | "claude-agent-opus" | "claude-agent-sonnet" | "claude-fable-5" | "claude-fable-5-1" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {});
export type ToolName = "shell" | "read_file" | "edit_file" | "write_file" | "webfetch" | "skill" | "codedb" | "read_tool_result" | "render_html" | "todo_write" | "todo_read" | "eval" | "note_constraint" | "ask_user" | "attempt_completion" | "load_tool_schemas" | "mcp_search_tools" | "mcp_select_tool" | "clock_sleep" | "subagent" | "workflow" | "agent_output" | "agent_message" | "subagent_resume" | "learn_candidate" | "peer_message" | "workspace" | "yield_turn" | "imagegen" | "rlm";
-export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex";
+export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent";
/** Events streamed by `harness --json` (one JSON object per stdout line), each
* discriminated by `type` — the analogue of codegraff's AgentEvent stream.
@@ -684,5 +684,5 @@ export async function* runAgent(opts: RunAgentOptions): AsyncGenerator<Event> {
}
}
-export const MODELS: ModelName[] = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-fable-5", "claude-fable-5-1", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"];
+export const MODELS: ModelName[] = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-agent-fable", "claude-agent-haiku", "claude-agent-opus", "claude-agent-sonnet", "claude-fable-5", "claude-fable-5-1", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"];
export const TOOLS: ToolName[] = ["shell", "read_file", "edit_file", "write_file", "webfetch", "skill", "codedb", "read_tool_result", "render_html", "todo_write", "todo_read", "eval", "note_constraint", "ask_user", "attempt_completion", "load_tool_schemas", "mcp_search_tools", "mcp_select_tool", "clock_sleep", "subagent", "workflow", "agent_output", "agent_message", "subagent_resume", "learn_candidate", "peer_message", "workspace", "yield_turn", "imagegen", "rlm"];
diff --git a/sdk/ts/remote.ts b/sdk/ts/remote.ts
index 8d8df43a..a6826834 100644
--- a/sdk/ts/remote.ts
+++ b/sdk/ts/remote.ts
@@ -9,9 +9,9 @@
export const HARNESS_VERSION = "0.13";
-export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-fable-5" | "claude-fable-5-1" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {});
+export type ModelName = "MiniMax-M2.5" | "MiniMax-M2.7" | "MiniMax-M3" | "accounts/fireworks/models/deepseek-v4-flash" | "accounts/fireworks/models/deepseek-v4-pro" | "accounts/fireworks/models/glm-5p2" | "accounts/fireworks/models/gpt-oss-120b" | "accounts/fireworks/models/kimi-k2p6" | "accounts/fireworks/models/kimi-k2p7-code" | "accounts/fireworks/models/minimax-m3" | "accounts/fireworks/models/qwen3p7-plus" | "alibaba/qwen3.8-27b" | "anthropic/claude-sonnet-4.6" | "claude-agent-fable" | "claude-agent-haiku" | "claude-agent-opus" | "claude-agent-sonnet" | "claude-fable-5" | "claude-fable-5-1" | "claude-haiku-5-5" | "claude-opus-4-5" | "claude-opus-4-6" | "claude-opus-4-7" | "claude-opus-4-8" | "claude-opus-4.8" | "claude-opus-5" | "claude-opus-5-5" | "claude-sonnet-4-5" | "claude-sonnet-4-6" | "claude-sonnet-4.6" | "claude-sonnet-5" | "claude-sonnet-5-5" | "deepseek-chat" | "deepseek-reasoner" | "deepseek-v4-flash" | "deepseek-v4-pro" | "flint" | "fugu" | "fugu-ultra" | "fugu-ultra-20260615" | "gemini-3-flash-preview" | "gemini-3.1-flash-lite" | "gemini-3.1-pro-preview" | "gemini-3.5-flash" | "gemini-3.5-flash-lite" | "gemini-3.6-flash" | "gemini-3.7-flash" | "gemini-3.8-flash" | "gemini-4-argon" | "gemma-4-26b-a4b-it" | "gemma-4-31b" | "gemma-4-31b-it" | "glm-4.5" | "glm-4.7" | "glm-5" | "glm-5-turbo" | "glm-5.2" | "glm-5.3" | "glm-5.3-flash" | "glm-5v-turbo" | "gpt-5-codex" | "gpt-5.2" | "gpt-5.3-codex-spark" | "gpt-5.4" | "gpt-5.4-mini" | "gpt-5.4-pro" | "gpt-5.5" | "gpt-5.6" | "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra" | "gpt-6-luna" | "gpt-6-sol" | "gpt-6.1-sol" | "gpt-oss-120b" | "grok-4.3" | "grok-4.6" | "grok-4.7" | "grok-build" | "k3" | "kilo-auto/small" | "kimi-for-coding" | "kimi-for-coding-highspeed" | "kimi-k2.6" | "kimi-k2.7-code" | "kimi-k3" | "kimi-latest" | "lmstudio" | "mimo-v2-flash" | "mimo-v2.5" | "mimo-v2.5-pro" | "mimo-v2.5-pro-ultraspeed" | "mimo-v2.6-flash" | "mimo-v2.6-pro" | "mimo-v2.6-pro-ultraspeed" | "minimax-m3" | "mistral-medium-latest" | "mlx-community/Qwen3.6-27B-OptiQ-4bit" | "muse-spark-1.2" | "muse-spark-1.2-contributor" | "omlx" | "openai/gpt-oss-120b" | (string & {});
export type ToolName = "shell" | "read_file" | "edit_file" | "write_file" | "webfetch" | "skill" | "codedb" | "read_tool_result" | "render_html" | "todo_write" | "todo_read" | "eval" | "note_constraint" | "ask_user" | "attempt_completion" | "load_tool_schemas" | "mcp_search_tools" | "mcp_select_tool" | "clock_sleep" | "subagent" | "workflow" | "agent_output" | "agent_message" | "subagent_resume" | "learn_candidate" | "peer_message" | "workspace" | "yield_turn" | "imagegen" | "rlm";
-export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex";
+export type ProviderId = "anthropic" | "codegraff" | "deepseek" | "openai" | "google" | "minimax" | "xiaomi" | "kilo" | "groq" | "cerebras" | "mistral" | "kimi" | "moonshot" | "xai" | "zai" | "meta" | "vercel" | "openrouter" | "fugu" | "fireworks" | "mlx" | "lmstudio" | "omlx" | "chatgpt-new" | "codex" | "claude-agent";
/** Events streamed by the bridge (same `--json` contract as the stdio SDK).
* `seq` is a monotonic, gap-free, 1-based per-session id the bridge forwards
@@ -528,5 +528,5 @@ export async function* runAgentRemote(opts: RunAgentRemoteOptions): AsyncGenerat
}
}
-export const MODELS: ModelName[] = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-fable-5", "claude-fable-5-1", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"];
+export const MODELS: ModelName[] = ["MiniMax-M2.5", "MiniMax-M2.7", "MiniMax-M3", "accounts/fireworks/models/deepseek-v4-flash", "accounts/fireworks/models/deepseek-v4-pro", "accounts/fireworks/models/glm-5p2", "accounts/fireworks/models/gpt-oss-120b", "accounts/fireworks/models/kimi-k2p6", "accounts/fireworks/models/kimi-k2p7-code", "accounts/fireworks/models/minimax-m3", "accounts/fireworks/models/qwen3p7-plus", "alibaba/qwen3.8-27b", "anthropic/claude-sonnet-4.6", "claude-agent-fable", "claude-agent-haiku", "claude-agent-opus", "claude-agent-sonnet", "claude-fable-5", "claude-fable-5-1", "claude-haiku-5-5", "claude-opus-4-5", "claude-opus-4-6", "claude-opus-4-7", "claude-opus-4-8", "claude-opus-4.8", "claude-opus-5", "claude-opus-5-5", "claude-sonnet-4-5", "claude-sonnet-4-6", "claude-sonnet-4.6", "claude-sonnet-5", "claude-sonnet-5-5", "deepseek-chat", "deepseek-reasoner", "deepseek-v4-flash", "deepseek-v4-pro", "flint", "fugu", "fugu-ultra", "fugu-ultra-20260615", "gemini-3-flash-preview", "gemini-3.1-flash-lite", "gemini-3.1-pro-preview", "gemini-3.5-flash", "gemini-3.5-flash-lite", "gemini-3.6-flash", "gemini-3.7-flash", "gemini-3.8-flash", "gemini-4-argon", "gemma-4-26b-a4b-it", "gemma-4-31b", "gemma-4-31b-it", "glm-4.5", "glm-4.7", "glm-5", "glm-5-turbo", "glm-5.2", "glm-5.3", "glm-5.3-flash", "glm-5v-turbo", "gpt-5-codex", "gpt-5.2", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini", "gpt-5.4-pro", "gpt-5.5", "gpt-5.6", "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra", "gpt-6-luna", "gpt-6-sol", "gpt-6.1-sol", "gpt-oss-120b", "grok-4.3", "grok-4.6", "grok-4.7", "grok-build", "k3", "kilo-auto/small", "kimi-for-coding", "kimi-for-coding-highspeed", "kimi-k2.6", "kimi-k2.7-code", "kimi-k3", "kimi-latest", "lmstudio", "mimo-v2-flash", "mimo-v2.5", "mimo-v2.5-pro", "mimo-v2.5-pro-ultraspeed", "mimo-v2.6-flash", "mimo-v2.6-pro", "mimo-v2.6-pro-ultraspeed", "minimax-m3", "mistral-medium-latest", "mlx-community/Qwen3.6-27B-OptiQ-4bit", "muse-spark-1.2", "muse-spark-1.2-contributor", "omlx", "openai/gpt-oss-120b"];
export const TOOLS: ToolName[] = ["shell", "read_file", "edit_file", "write_file", "webfetch", "skill", "codedb", "read_tool_result", "render_html", "todo_write", "todo_read", "eval", "note_constraint", "ask_user", "attempt_completion", "load_tool_schemas", "mcp_search_tools", "mcp_select_tool", "clock_sleep", "subagent", "workflow", "agent_output", "agent_message", "subagent_resume", "learn_candidate", "peer_message", "workspace", "yield_turn", "imagegen", "rlm"];
diff --git a/spec/conformance.py b/spec/conformance.py
index 09e831c7..539d8eab 100644
--- a/spec/conformance.py
+++ b/spec/conformance.py
@@ -312,8 +312,8 @@ def check_provider() -> int:
ids = [r["id"] for r in PROVIDER_SPECS]
if len(ids) != len(set(ids)):
raise Counterexample("provider-unique", None, f"ids={ids}")
- if len(PROVIDER_SPECS) != 25:
- raise Counterexample("provider-count", None, f"n={len(PROVIDER_SPECS)} want=25")
+ if len(PROVIDER_SPECS) != 26:
+ raise Counterexample("provider-count", None, f"n={len(PROVIDER_SPECS)} want=26")
responses = [r for r in PROVIDER_SPECS if r["kind"] == "responses"]
if [r["id"] for r in responses] != ["openai", "chatgpt-new", "codex"]:
raise Counterexample("responses-vendors", None, f"{responses}")
diff --git a/spec/kernels/providers.json b/spec/kernels/providers.json
index 931fc05a..50972f0f 100644
--- a/spec/kernels/providers.json
+++ b/spec/kernels/providers.json
@@ -226,6 +226,15 @@
"catalog": "codex",
"sub_login": true,
"takes_effort": false
+ },
+ {
+ "id": "claude-agent",
+ "kind": "anthropic",
+ "auth": "bearer",
+ "login": "claude_cli",
+ "catalog": "baked",
+ "sub_login": true,
+ "takes_effort": true
}
]
}
diff --git a/spec/ref/provider.py b/spec/ref/provider.py
index 30c1f106..2a589615 100644
--- a/spec/ref/provider.py
+++ b/spec/ref/provider.py
@@ -6,7 +6,7 @@ from typing import Literal
Kind = Literal["anthropic", "openai", "responses", "interactions"]
Auth = Literal["x_api_key", "bearer", "goog_api_key"]
-Login = Literal["api_key", "codegraff_device", "codex_device", "kimi_device", "xai_device", "zai_cli", "chatgpt_browser", "anthropic_browser"]
+Login = Literal["api_key", "codegraff_device", "codex_device", "kimi_device", "xai_device", "zai_cli", "chatgpt_browser", "anthropic_browser", "claude_cli"]
Catalog = Literal["baked", "codex", "kimi", "openai", "anthropic"]
@@ -56,6 +56,7 @@ SPECS: list[dict] = [
row("omlx", "openai", "bearer", catalog="openai", takes_effort=True),
row("chatgpt-new", "responses", "bearer", login="chatgpt_browser", catalog="openai", sub_login=True),
row("codex", "responses", "bearer", login="codex_device", catalog="codex", sub_login=True),
+ row("claude-agent", "anthropic", "bearer", login="claude_cli", sub_login=True, takes_effort=True),
]
diff --git a/src/additional_tests.zig b/src/additional_tests.zig
index 43ccccd8..d2332709 100644
--- a/src/additional_tests.zig
+++ b/src/additional_tests.zig
@@ -28,6 +28,10 @@ test {
_ = @import("engine_events_tests.zig");
_ = @import("run_task_meta.zig");
_ = @import("acp_run_task_tests.zig");
+ // Claude Agent provider (ADR 0309).
+ _ = @import("claude_agent_tests.zig");
+ _ = @import("claude_agent_login.zig");
+ _ = @import("claude_agent.zig");
}
test "oneshot -p still uses the live stall-watched transport" {
diff --git a/src/agent_ws.zig b/src/agent_ws.zig
index b5db7c5a..7956ca41 100644
--- a/src/agent_ws.zig
+++ b/src/agent_ws.zig
@@ -116,6 +116,7 @@ pub fn postLive(self: *Agent, body: []const u8) ![]u8 {
emitAbort(self, .dropped, true);
return error.StreamDropped;
}
+ if (@import("claude_agent.zig").owns(self)) return @import("claude_agent.zig").post(self, body); // ADR 0309
if (!wsEligible(self)) return self.postStream(body);
const response = postResponsesWs(self, body) catch |e| {
if (@import("agent_async_tools.zig").started(self)) return e;
diff --git a/src/args.zig b/src/args.zig
index 38e64891..dfe06bf1 100644
--- a/src/args.zig
+++ b/src/args.zig
@@ -47,6 +47,7 @@ pub const Flags = struct {
chatgpt_login: bool = false,
anthropic_login: bool = false,
anthropic_console_login: bool = false,
+ claude_agent_login: bool = false,
help_flag: bool = false,
version_flag: bool = false,
print_flag: bool = false,
@@ -270,7 +271,7 @@ pub fn parse(init: std.process.Init) !Flags {
if (flags.login_flag and flags.positionals.items.len > 1) {
const name = flags.positionals.items[1];
const target = loginTarget(name) orelse
- std.process.fatal("unknown login '{s}' — graff login [codegraff|chatgpt|anthropic|kimi|xai|zai]", .{name});
+ std.process.fatal("unknown login '{s}' — graff login [codegraff|chatgpt|anthropic|claude-agent|kimi|xai|zai]", .{name});
flags.codex_login = std.mem.eql(u8, target, "codex");
flags.kimi_login = std.mem.eql(u8, target, "kimi");
flags.xai_login = std.mem.eql(u8, target, "xai");
@@ -278,6 +279,7 @@ pub fn parse(init: std.process.Init) !Flags {
flags.chatgpt_login = std.mem.eql(u8, target, "chatgpt-new");
flags.anthropic_console_login = std.ascii.eqlIgnoreCase(name, "console");
flags.anthropic_login = std.mem.eql(u8, target, "anthropic") and !flags.anthropic_console_login;
+ flags.claude_agent_login = std.mem.eql(u8, target, "claude-agent");
}
}
@@ -344,10 +346,10 @@ pub fn acpLoginIsLogin(positionals: *std.ArrayList([]const u8)) void {
pub fn loginTarget(name: []const u8) ?[]const u8 {
const aliases = [_][2][]const u8{
- .{ "codex", "chatgpt-new" }, .{ "chatgpt", "chatgpt-new" }, .{ "openai", "chatgpt-new" }, .{ "gpt", "chatgpt-new" },
- .{ "oai", "chatgpt-new" }, .{ "codegraff", "codegraff" }, .{ "graff", "codegraff" }, .{ "kimi", "kimi" },
- .{ "xai", "xai" }, .{ "grok", "xai" }, .{ "ant", "anthropic" }, .{ "anthropic", "anthropic" },
- .{ "console", "anthropic" },
+ .{ "codex", "chatgpt-new" }, .{ "chatgpt", "chatgpt-new" }, .{ "openai", "chatgpt-new" }, .{ "gpt", "chatgpt-new" },
+ .{ "oai", "chatgpt-new" }, .{ "codegraff", "codegraff" }, .{ "graff", "codegraff" }, .{ "kimi", "kimi" },
+ .{ "xai", "xai" }, .{ "grok", "xai" }, .{ "ant", "anthropic" }, .{ "anthropic", "anthropic" },
+ .{ "console", "anthropic" }, .{ "claude-agent", "claude-agent" }, .{ "claude", "claude-agent" },
};
for (aliases) |pair| if (std.ascii.eqlIgnoreCase(name, pair[0])) return pair[1];
if (@import("oauth_zai.zig").isLoginName(name)) return "zai";
@@ -364,6 +366,8 @@ test "loginTarget: every ChatGPT name, codex included, is the plan's sign-in; un
for ([_][]const u8{ "ant", "anthropic", "ANT", "Anthropic", "console", "Console" }) |name|
try std.testing.expectEqualStrings("anthropic", loginTarget(name).?);
try std.testing.expectEqualStrings("zai", loginTarget("zai").?);
+ try std.testing.expectEqualStrings("claude-agent", loginTarget("claude-agent").?);
+ try std.testing.expectEqualStrings("claude-agent", loginTarget("Claude").?);
try std.testing.expect(loginTarget("chatgptt") == null);
try std.testing.expect(loginTarget("") == null);
}
diff --git a/src/claude_agent.zig b/src/claude_agent.zig
new file mode 100644
index 00000000..dbb41ded
--- /dev/null
+++ b/src/claude_agent.zig
@@ -0,0 +1,393 @@
+//! Claude Agent provider (ADR 0309): Claude models through the user's own
+//! `claude` program and its login, with graff's harness around it.
+//!
+//! graff never reads Claude Code's saved login and never sits between Claude
+//! Code and Anthropic. It starts `claude` with its built-in tools, settings
+//! files, hooks, memory and compaction switched off, and offers graff's
+//! tools as an in-process MCP server. When the model calls one, the call is
+//! held: this step ends with a `tool_use` response, graff's loop runs the
+//! tool (approvals, sinks, ACP, all unchanged), and the next step answers
+//! the held call with graff's result. graff's history stays the source of
+//! truth, so switching between Claude Agent and any other model works.
+//!
+//! The wire is Anthropic's: `claude --include-partial-messages` streams the
+//! raw Messages events, which go to the same printDelta/assembleAnthropic
+//! path the HTTP transport uses. Agent.postLive routes here first.
+
+const std = @import("std");
+const Io = std.Io;
+const Value = std.json.Value;
+const main_mod = @import("main.zig");
+const Agent = @import("agent.zig").Agent;
+const engine_sink = @import("engine_sink.zig");
+const tty = @import("term.zig").tty;
+const wire = @import("claude_agent_wire.zig");
+const history = @import("claude_agent_history.zig");
+const session = @import("claude_agent_session.zig");
+const Session = session.Session;
+
+pub const provider_id = "claude-agent";
+/// Claude Code retries and backs off on its own; silence this long means the
+/// child is stuck, not thinking (thinking summaries stream as deltas).
+const turn_budget_ms: u64 = 300_000;
+const init_budget_ms: u64 = 60_000;
+const init_id = "graff_init";
+
+pub fn owns(self: *const Agent) bool {
+ return std.mem.eql(u8, self.provider.id, provider_id);
+}
+
+/// Titles, recaps, judges and compaction summaries run on a throwaway
+/// process, so they never disturb the chat's session or its prompt cache.
+fn sideCall(self: *const Agent) bool {
+ if (self.compaction_request) return true;
+ return switch (self.call_kind) {
+ .title, .recap, .compaction, .judge => true,
+ else => false,
+ };
+}
+
+fn nowMs(io: Io) i64 {
+ return @intCast(@divTrunc(Io.Timestamp.now(io, .awake).nanoseconds, std.time.ns_per_ms));
+}
+
+fn envGet(name: [:0]const u8) ?[]const u8 {
+ if (@import("mcp_lazy.zig").parent_env) |m| return m.get(name);
+ return if (std.c.getenv(name.ptr)) |v| std.mem.span(v) else null;
+}
+
+pub fn post(self: *Agent, body: []const u8) ![]u8 {
+ const a = self.scratchAlloc();
+ const req = try std.json.parseFromSliceLeaky(Value, a, body, .{ .allocate = .alloc_always });
+ if (req != .object) return error.ClaudeAgentBadRequest;
+ const side = sideCall(self);
+ const tools: ?Value = if (side) null else if (req.object.get("tools")) |t| (if (t == .array and t.array.items.len > 0) t else null) else null;
+ const system = try history.textOf(a, req.object.get("system"));
+ const mode = wire.promptMode(envGet("GRAFF_CLAUDE_AGENT_PROMPT"));
+ const effort = wire.effortFlag(@tagName(self.reasoning));
+ const exe = if (self.provider.api_key.len > 0) self.provider.api_key else "claude";
+ const tools_json = if (tools) |t| try std.json.Stringify.valueAlloc(a, t, .{}) else "";
+ const spawn: wire.Spawn = .{ .exe = exe, .model = wire.modelArg(self.provider.model), .effort = effort, .has_tools = tools != null };
+
+ // The CLI takes these at start; the tool list can change live (MCP
+ // servers connect and go dormant), so it is kept apart.
+ var fp = std.hash.Wyhash.init(0);
+ for ([_][]const u8{ exe, self.provider.model, effort orelse "", @tagName(mode), system, if (tools != null) "tools" else "", self.agent_cwd orelse "" }) |part| {
+ fp.update(part);
+ fp.update("\x00");
+ }
+ const props_fp = fp.final();
+ const tools_fp = std.hash.Wyhash.hash(0, tools_json);
+
+ const sink = engine_sink.forAgent(self);
+ sink.emit(self.io, .stream_begin);
+ defer sink.emit(self.io, .stream_finished);
+ resetStreamState(self);
+ const watch_esc = !self.sub and self.in != null and main_mod.use_color and !main_mod.json_mode;
+ const orig_tio: ?tty.RawState = if (watch_esc) Agent.rawNonblockStdin() else null;
+ defer if (orig_tio) |o| {
+ _ = Agent.drainSteerStdin(true);
+ tty.restore(o);
+ };
+ const poll = orig_tio != null;
+
+ const items = self.messages.items;
+ const owner = @intFromPtr(self);
+ const now = nowMs(self.io);
+ var held: ?*Session = if (side) null else session.take(self.io, owner);
+ if (held) |s| if (staleBecause(a, s, props_fp, self.history_rewrites, items, now)) |why| {
+ if (self.tracer) |tr| tr.note("claude-agent", why);
+ s.stop();
+ held = null;
+ } else if (self.tracer) |tr| tr.note("claude-agent", "reused");
+ if (held) |s| if (s.tools_fp != tools_fp) {
+ refreshTools(s, a, tools, poll) catch |e| {
+ s.stop();
+ return e;
+ };
+ if (self.tracer) |tr| tr.note("claude-agent", "tool list refreshed");
+ };
+
+ var restarts: u8 = 0;
+ const s: *Session = while (true) {
+ const s = held orelse start(self, a, spawn, mode, system, tools, props_fp, poll) catch |e| switch (e) {
+ error.Interrupted => return e,
+ else => return failSse(self, a, startProblem(e)),
+ };
+ held = s;
+ s.tools_fp = tools_fp;
+ if (try sendDelta(self, a, s, items)) break s;
+ // The new messages are not something this session can take: replay
+ // everything into a fresh one, once.
+ s.stop();
+ held = null;
+ if (self.tracer) |tr| tr.note("claude-agent", "restart: new messages need a checkpoint");
+ restarts += 1;
+ if (restarts > 1) return error.ClaudeAgentBadHistory;
+ };
+ s.seen = items.len;
+ s.seen_fp = history.hashMessages(a, items);
+ s.rewrites = self.history_rewrites;
+
+ const out = turn(self, a, s, tools, poll) catch |e| {
+ s.stop();
+ return e;
+ };
+ s.used_ms = nowMs(self.io);
+ if (side or out.failed) s.stop() else session.put(self.io, owner, s, s.used_ms);
+ return out.sse;
+}
+
+/// Why a held session cannot serve this request, or null if it can.
+fn staleBecause(a: std.mem.Allocator, s: *const Session, props_fp: u64, rewrites: u32, items: []const Value, now: i64) ?[]const u8 {
+ if (s.props_fp != props_fp) return "restart: model, effort, prompt or tools changed";
+ if (s.rewrites != rewrites or s.seen > items.len) return "restart: history was compacted or trimmed";
+ if (session.expired(s, now)) return "restart: idle past 5 minutes";
+ if (history.hashMessages(a, items[0..s.seen]) != s.seen_fp) return "restart: earlier history changed";
+ return null;
+}
+
+fn start(self: *Agent, a: std.mem.Allocator, spawn: wire.Spawn, mode: wire.PromptMode, system: []const u8, tools: ?Value, props_fp: u64, poll: bool) !*Session {
+ const argv = try wire.argv(a, spawn);
+ const s = try Session.start(self.gpa, self.io, argv, @import("mcp_lazy.zig").parent_env, self.agent_cwd, props_fp);
+ errdefer s.stop();
+ if (self.tracer) |tr| tr.note("claude-agent", if (sideCall(self)) "started (side call)" else "started");
+ try s.send(try wire.initRequest(a, init_id, mode, system, spawn.has_tools));
+ while (true) {
+ const line = try s.readLine(poll, init_budget_ms);
+ switch (try wire.classify(a, line)) {
+ .response => |r| if (std.mem.eql(u8, r.request_id, init_id)) {
+ if (!r.ok) return error.ClaudeAgentInitFailed;
+ const body = r.body orelse return s;
+ if (body == .object) if (wire.strField(body.object, "claude_code_version")) |v| {
+ if (!wire.atLeast(v, wire.min_version)) return error.ClaudeAgentTooOld;
+ };
+ return s;
+ },
+ .control => |c| try service(s, a, c, tools),
+ else => {},
+ }
+ }
+}
+
+/// Send a control request and wait for its answer, serving whatever Claude
+/// Code asks graff in between.
+fn control(s: *Session, a: std.mem.Allocator, id: []const u8, request_json: []const u8, tools: ?Value, poll: bool) !void {
+ try s.send(try std.fmt.allocPrint(a, "{{\"type\":\"control_request\",\"request_id\":\"{s}\",\"request\":{s}}}", .{ id, request_json }));
+ while (true) {
+ switch (try wire.classify(a, try s.readLine(poll, init_budget_ms))) {
+ .response => |r| if (std.mem.eql(u8, r.request_id, id)) return if (r.ok) {} else error.ClaudeAgentControlFailed,
+ .control => |c| try service(s, a, c, tools),
+ else => {},
+ }
+ }
+}
+
+/// graff's tool list changed: remove and re-add its server, which makes
+/// Claude Code initialize it again and re-read tools/list. The session and
+/// its history stay; only the prompt cache past the tools is rewritten.
+fn refreshTools(s: *Session, a: std.mem.Allocator, tools: ?Value, poll: bool) !void {
+ try control(s, a, "graff_tools_off", "{\"subtype\":\"mcp_set_servers\",\"servers\":{}}", tools, poll);
+ try control(s, a, "graff_tools_on", "{\"subtype\":\"mcp_set_servers\",\"servers\":{\"" ++ wire.server_name ++ "\":{\"type\":\"sdk\",\"name\":\"" ++ wire.server_name ++ "\"}}}", tools, poll);
+}
+
+fn startProblem(e: anyerror) []const u8 {
+ return switch (e) {
+ error.FileNotFound => "Claude Code isn't installed. Install it (https://code.claude.com/docs/en/setup), sign in with `claude auth login`, then try again.",
+ error.ClaudeAgentTooOld => "Claude Code is too old for Claude Agent; version " ++ wire.min_version ++ " or later is required. Run `claude update`.",
+ error.StreamStalled => "Claude Code did not start within 60 seconds.",
+ else => "Claude Code exited while starting. Run `claude auth status` in a terminal to check its login.",
+ };
+}
+
+/// Send what Claude Code has not seen. False when the session cannot take
+/// it and a fresh one must start from a checkpoint.
+fn sendDelta(self: *Agent, a: std.mem.Allocator, s: *Session, items: []const Value) !bool {
+ _ = self;
+ if (s.seen == 0) {
+ try s.send(try wire.userLine(a, try history.freshContent(a, items)));
+ return true;
+ }
+ const d = (try history.delta(a, items[s.seen..])) orelse return false;
+ if (d.results.len == 0) {
+ // Claude Code is still waiting on a call graff never answered.
+ if (s.pending.items.len > 0) return false;
+ try s.send(try wire.userLine(a, d.user.?));
+ return true;
+ }
+ for (d.results, 0..) |r, i| {
+ const result = try wire.toolResult(a, r.block, if (i + 1 == d.results.len) d.extra_text else "");
+ if (pendingIndex(s, r.id)) |pi| {
+ const p = s.pending.items[pi];
+ try s.send(try wire.mcpReply(a, p.request_id, p.rpc_id, result));
+ s.dropPending(pi);
+ } else try s.putResult(r.id, result);
+ }
+ return s.pending.items.len == 0;
+}
+
+fn pendingIndex(s: *Session, tool_use_id: []const u8) ?usize {
+ for (s.pending.items, 0..) |p, i| if (std.mem.eql(u8, p.tool_use_id, tool_use_id)) return i;
+ return null;
+}
+
+/// Answer a control request from Claude Code. A `tools/call` graff already
+/// has a result for is answered at once; any other is held for graff's loop.
+fn service(s: *Session, a: std.mem.Allocator, c: wire.Control, tools: ?Value) !void {
+ if (std.mem.eql(u8, c.subtype, "mcp_message")) {
+ const msg = c.request.get("message") orelse return s.send(try wire.controlErr(a, c.request_id, "missing message"));
+ if (msg != .object) return s.send(try wire.controlErr(a, c.request_id, "bad message"));
+ const method = wire.strField(msg.object, "method") orelse "";
+ const rpc_id: ?[]const u8 = if (msg.object.get("id")) |id| try std.json.Stringify.valueAlloc(a, id, .{}) else null;
+ const params: ?std.json.ObjectMap = if (msg.object.get("params")) |p| (if (p == .object) p.object else null) else null;
+ if (std.mem.eql(u8, method, "tools/call")) {
+ const id = rpc_id orelse return s.send(try wire.controlErr(a, c.request_id, "tools/call without id"));
+ const tool_use_id = toolUseId(params) orelse "";
+ if (s.takeResult(tool_use_id)) |result| {
+ defer s.gpa.free(result);
+ return s.send(try wire.mcpReply(a, c.request_id, id, result));
+ }
+ return s.addPending(c.request_id, id, tool_use_id);
+ }
+ const result: []const u8 = if (std.mem.eql(u8, method, "initialize"))
+ try wire.initializeResult(a, if (params) |p| wire.strField(p, "protocolVersion") orelse "2025-06-18" else "2025-06-18")
+ else if (std.mem.eql(u8, method, "tools/list"))
+ try wire.toolsList(a, tools)
+ else
+ "{}";
+ return s.send(try wire.mcpReply(a, c.request_id, rpc_id, result));
+ }
+ if (std.mem.eql(u8, c.subtype, "can_use_tool")) {
+ const input = std.json.Stringify.valueAlloc(a, c.request.get("input") orelse Value{ .object = .empty }, .{}) catch "{}";
+ return s.send(try wire.controlOk(a, c.request_id, try std.fmt.allocPrint(a, "{{\"behavior\":\"allow\",\"updatedInput\":{s}}}", .{input})));
+ }
+ if (std.mem.eql(u8, c.subtype, "hook_callback")) return s.send(try wire.controlOk(a, c.request_id, "{}"));
+ return s.send(try wire.controlErr(a, c.request_id, "graff does not handle this request"));
+}
+
+fn toolUseId(params: ?std.json.ObjectMap) ?[]const u8 {
+ const p = params orelse return null;
+ const meta = p.get("_meta") orelse return null;
+ if (meta != .object) return null;
+ return wire.strField(meta.object, "claudecode/toolUseId");
+}
+
+const TurnOut = struct { sse: []u8, failed: bool = false };
+
+/// Read one model step: until a response stops for tool use (the held call
+/// is graff's to run) or Claude Code reports the turn's result.
+fn turn(self: *Agent, a: std.mem.Allocator, s: *Session, tools: ?Value, poll: bool) !TurnOut {
+ var full: Io.Writer.Allocating = .init(self.gpa);
+ errdefer full.deinit();
+ var loop_guard: @import("agent_model_loop.zig").Stream = .{};
+ var stop_reason: []const u8 = "";
+ var responses: usize = 0;
+ var first_token = false;
+ while (true) {
+ const line = try s.readLine(poll, turn_budget_ms);
+ switch (try wire.classify(a, line)) {
+ .event => |event| {
+ var ev = event;
+ const kind = wire.strField(ev.object, "type") orelse "";
+ if (std.mem.eql(u8, kind, "message_start")) {
+ // A second response in one step means Claude Code answered
+ // a call graff did not offer by itself; keep the last one.
+ responses += 1;
+ if (responses > 1) full.clearRetainingCapacity();
+ stop_reason = "";
+ }
+ _ = wire.unprefixToolUse(&ev);
+ if (std.mem.eql(u8, kind, "message_delta")) if (ev.object.get("delta")) |d| {
+ if (d == .object) if (wire.strField(d.object, "stop_reason")) |r| {
+ stop_reason = r;
+ };
+ };
+ const json = try std.json.Stringify.valueAlloc(a, ev, .{});
+ try loop_guard.event(self, json, false);
+ const sse_line = try std.mem.concat(a, u8, &.{ "data: ", json });
+ self.printDelta(sse_line);
+ if (!first_token and std.mem.eql(u8, kind, "content_block_delta")) {
+ first_token = true;
+ self.traceFirstToken();
+ }
+ try full.writer.writeAll(sse_line);
+ try full.writer.writeByte('\n');
+ if (std.mem.eql(u8, kind, "message_stop") and std.mem.eql(u8, stop_reason, "tool_use")) break;
+ },
+ .control => |c| try service(s, a, c, tools),
+ .cancel => |id| {
+ for (s.pending.items, 0..) |p, i| if (std.mem.eql(u8, p.request_id, id)) {
+ s.dropPending(i);
+ break;
+ };
+ },
+ .result => |r| {
+ if (r.is_error) {
+ const sse = try failSse(self, a, try problem(a, r.text));
+ full.deinit();
+ return .{ .sse = sse, .failed = true };
+ }
+ break;
+ },
+ .response, .ignore => {},
+ }
+ }
+ self.traceFirstToken();
+ engine_sink.forAgent(self).emit(self.io, .{ .stream_complete = .{ .streamed_text = self.streamed_text } });
+ return .{ .sse = try full.toOwnedSlice() };
+}
+
+fn problem(a: std.mem.Allocator, text: []const u8) ![]const u8 {
+ if (std.mem.indexOf(u8, text, "Not logged in") != null or std.mem.indexOf(u8, text, "/login") != null)
+ return "Claude Code is not logged in. Run `claude auth login` in a terminal, then try again.";
+ return std.fmt.allocPrint(a, "Claude Code stopped: {s}", .{text});
+}
+
+/// A failure the user should read, as an assistant reply on the Messages
+/// wire: it ends the turn without the transport retry ladder resending a
+/// request that would fail the same way.
+fn failSse(self: *Agent, a: std.mem.Allocator, text: []const u8) ![]u8 {
+ var full: Io.Writer.Allocating = .init(self.gpa);
+ errdefer full.deinit();
+ const quoted = try std.json.Stringify.valueAlloc(a, text, .{});
+ const events = [_][]const u8{
+ "{\"type\":\"message_start\",\"message\":{\"id\":\"msg_claude_agent\",\"type\":\"message\",\"role\":\"assistant\",\"model\":\"claude-agent\",\"content\":[],\"stop_reason\":null,\"usage\":{\"input_tokens\":0,\"output_tokens\":0}}}",
+ "{\"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"text\",\"text\":\"\"}}",
+ try std.fmt.allocPrint(a, "{{\"type\":\"content_block_delta\",\"index\":0,\"delta\":{{\"type\":\"text_delta\",\"text\":{s}}}}}", .{quoted}),
+ "{\"type\":\"content_block_stop\",\"index\":0}",
+ "{\"type\":\"message_delta\",\"delta\":{\"stop_reason\":\"end_turn\",\"stop_sequence\":null},\"usage\":{\"output_tokens\":0}}",
+ "{\"type\":\"message_stop\"}",
+ };
+ for (events) |ev| {
+ const sse_line = try std.mem.concat(a, u8, &.{ "data: ", ev });
+ self.printDelta(sse_line);
+ try full.writer.writeAll(sse_line);
+ try full.writer.writeByte('\n');
+ }
+ engine_sink.forAgent(self).emit(self.io, .{ .stream_complete = .{ .streamed_text = self.streamed_text } });
+ return full.toOwnedSlice();
+}
+
+/// The same per-stream presentation resets postStream makes.
+fn resetStreamState(self: *Agent) void {
+ self.thinking_open = false;
+ main_mod.g_thinking_open = false;
+ self.thinking_rows = 0;
+ self.thinking_col = 0;
+ self.thinking_folded = false;
+ self.thinking_text.clearRetainingCapacity();
+ self.thinking_overflow = false;
+ self.md_buf.clearRetainingCapacity();
+ self.arg_live = .{};
+ self.md_fence = false;
+ self.md_kind = .classify;
+ self.md_span = .normal;
+ self.md_word.clearRetainingCapacity();
+ self.md_word_vis = 0;
+ self.md_col = 0;
+ self.md_indent = 0;
+ self.md_width = 0;
+ for (self.md_table.items) |r| self.gpa.free(r);
+ self.md_table.clearRetainingCapacity();
+ self.partial_text.clearRetainingCapacity();
+}
diff --git a/src/claude_agent_history.zig b/src/claude_agent_history.zig
new file mode 100644
index 00000000..71a76123
--- /dev/null
+++ b/src/claude_agent_history.zig
@@ -0,0 +1,208 @@
+//! Claude Agent history (ADR 0309): graff's transcript stays the source of
+//! truth. A running `claude` holds the part it has seen; each request sends
+//! only what is new. A fresh process (first use, a changed prompt or tool
+//! list, a compaction, an edit) gets everything it missed as one user
+//! message wrapped in `<conversation-checkpoint>`, without thinking text.
+
+const std = @import("std");
+const Allocator = std.mem.Allocator;
+const Value = std.json.Value;
+const wire = @import("claude_agent_wire.zig");
+
+/// Identity of a history prefix, to tell "only grew" from "rewritten".
+pub fn hashMessages(a: Allocator, items: []const Value) u64 {
+ var h = std.hash.Wyhash.init(0x6772_6166_665f_6361);
+ for (items) |m| {
+ const bytes = std.json.Stringify.valueAlloc(a, m, .{}) catch return 0;
+ h.update(bytes);
+ h.update("\x00");
+ }
+ return h.final();
+}
+
+/// Text of a `system` field (a string or an array of text blocks).
+pub fn textOf(a: Allocator, v: ?Value) ![]const u8 {
+ const value = v orelse return "";
+ switch (value) {
+ .string => |s| return s,
+ .array => |items| {
+ var out: std.ArrayList(u8) = .empty;
+ for (items.items) |b| {
+ if (b != .object) continue;
+ const t = wire.strField(b.object, "text") orelse continue;
+ if (out.items.len > 0) try out.append(a, '\n');
+ try out.appendSlice(a, t);
+ }
+ return out.items;
+ },
+ else => return "",
+ }
+}
+
+fn role(m: Value) []const u8 {
+ if (m != .object) return "";
+ return wire.strField(m.object, "role") orelse "";
+}
+
+fn hasToolResult(m: Value) bool {
+ if (m != .object) return false;
+ const c = m.object.get("content") orelse return false;
+ if (c != .array) return false;
+ for (c.array.items) |b| if (b == .object and std.mem.eql(u8, wire.strField(b.object, "type") orelse "", "tool_result")) return true;
+ return false;
+}
+
+/// Content for the first message of a fresh session: the checkpoint of
+/// everything before the latest user prompt, then that prompt's own blocks.
+pub fn freshContent(a: Allocator, items: []const Value) !Value {
+ var blocks: std.json.Array = .init(a);
+ const last_is_prompt = items.len > 0 and std.mem.eql(u8, role(items[items.len - 1]), "user") and !hasToolResult(items[items.len - 1]);
+ const head = if (last_is_prompt) items[0 .. items.len - 1] else items;
+ if (head.len > 0) try blocks.append(try textBlock(a, try checkpoint(a, head)));
+ if (last_is_prompt) {
+ const c = items[items.len - 1].object.get("content") orelse Value{ .string = "" };
+ try appendPromptBlocks(a, &blocks, c);
+ } else if (head.len > 0) {
+ try blocks.append(try textBlock(a, "Continue from where the checkpoint ends."));
+ }
+ if (blocks.items.len == 0) try blocks.append(try textBlock(a, ""));
+ return .{ .array = blocks };
+}
+
+/// User blocks Claude Code takes as-is (text, image, document); anything
+/// else is rendered as text.
+fn appendPromptBlocks(a: Allocator, blocks: *std.json.Array, c: Value) !void {
+ switch (c) {
+ .string => |s| try blocks.append(try textBlock(a, s)),
+ .array => |items| for (items.items) |b| try appendBlock(a, blocks, b),
+ else => {},
+ }
+}
+
+fn appendBlock(a: Allocator, blocks: *std.json.Array, b: Value) !void {
+ if (b != .object) return;
+ const kind = wire.strField(b.object, "type") orelse "";
+ if (std.mem.eql(u8, kind, "text") or std.mem.eql(u8, kind, "image") or std.mem.eql(u8, kind, "document")) {
+ try blocks.append(try stripCacheControl(a, b));
+ } else {
+ var out: std.ArrayList(u8) = .empty;
+ try renderBlock(a, &out, b);
+ if (out.items.len > 0) try blocks.append(try textBlock(a, out.items));
+ }
+}
+
+/// A block without graff's `cache_control` marker (Claude Code places its own).
+fn stripCacheControl(a: Allocator, b: Value) !Value {
+ if (b.object.get("cache_control") == null) return b;
+ var copy: std.json.ObjectMap = .empty;
+ var it = b.object.iterator();
+ while (it.next()) |kv| if (!std.mem.eql(u8, kv.key_ptr.*, "cache_control")) try copy.put(a, kv.key_ptr.*, kv.value_ptr.*);
+ return .{ .object = copy };
+}
+
+fn textBlock(a: Allocator, text: []const u8) !Value {
+ var o: std.json.ObjectMap = .empty;
+ try o.put(a, "type", .{ .string = "text" });
+ try o.put(a, "text", .{ .string = text });
+ return .{ .object = o };
+}
+
+pub fn checkpoint(a: Allocator, items: []const Value) ![]const u8 {
+ var out: std.ArrayList(u8) = .empty;
+ try out.appendSlice(a, "<conversation-checkpoint>\nThe conversation so far, from before this session started. Tool calls and results are shown as text; continue from where it ends.\n");
+ for (items) |m| {
+ if (m != .object) continue;
+ try out.print(a, "\n[{s}]\n", .{role(m)});
+ const c = m.object.get("content") orelse continue;
+ switch (c) {
+ .string => |s| try out.appendSlice(a, s),
+ .array => |blocks| for (blocks.items) |b| try renderBlock(a, &out, b),
+ else => {},
+ }
+ try out.append(a, '\n');
+ }
+ try out.appendSlice(a, "</conversation-checkpoint>");
+ return out.items;
+}
+
+fn renderBlock(a: Allocator, out: *std.ArrayList(u8), b: Value) !void {
+ if (b != .object) return;
+ const kind = wire.strField(b.object, "type") orelse "";
+ if (std.mem.eql(u8, kind, "text")) {
+ try out.appendSlice(a, wire.strField(b.object, "text") orelse "");
+ try out.append(a, '\n');
+ } else if (std.mem.eql(u8, kind, "tool_use")) {
+ const input = std.json.Stringify.valueAlloc(a, b.object.get("input") orelse Value{ .object = .empty }, .{}) catch "{}";
+ try out.print(a, "<tool_call name=\"{s}\" id=\"{s}\">{s}</tool_call>\n", .{ wire.strField(b.object, "name") orelse "", wire.strField(b.object, "id") orelse "", input });
+ } else if (std.mem.eql(u8, kind, "tool_result")) {
+ try out.print(a, "<tool_result id=\"{s}\"{s}>", .{ wire.strField(b.object, "tool_use_id") orelse "", if (isError(b)) " error=\"true\"" else "" });
+ if (b.object.get("content")) |c| switch (c) {
+ .string => |s| try out.appendSlice(a, s),
+ .array => |parts| for (parts.items) |p| {
+ if (p == .object and std.mem.eql(u8, wire.strField(p.object, "type") orelse "", "text"))
+ try out.appendSlice(a, wire.strField(p.object, "text") orelse "")
+ else
+ try out.appendSlice(a, "[image]");
+ },
+ else => {},
+ };
+ try out.appendSlice(a, "</tool_result>\n");
+ } else if (std.mem.eql(u8, kind, "image") or std.mem.eql(u8, kind, "document")) {
+ try out.print(a, "[{s}]\n", .{kind});
+ }
+ // thinking / redacted_thinking: left out of the checkpoint.
+}
+
+fn isError(b: Value) bool {
+ const e = b.object.get("is_error") orelse return false;
+ return e == .bool and e.bool;
+}
+
+pub const ToolRes = struct { id: []const u8, block: std.json.ObjectMap };
+
+/// What changed since Claude Code's last step, from `items = messages[seen..]`.
+pub const Delta = struct {
+ results: []const ToolRes,
+ /// Non-result text that arrived with results (reminders, a steer).
+ extra_text: []const u8,
+ /// A new prompt when there are no results.
+ user: ?Value,
+};
+
+/// Null when the new messages are not a shape a live session can take
+/// (graff injected an assistant message, or nothing new at all): the caller
+/// then starts a fresh session from a checkpoint.
+pub fn delta(a: Allocator, items: []const Value) !?Delta {
+ var i: usize = 0;
+ // Claude Code's own reply, which graff appended after the last step.
+ if (items.len > 0 and std.mem.eql(u8, role(items[0]), "assistant")) i = 1;
+ if (i == items.len) return null;
+ var results: std.ArrayList(ToolRes) = .empty;
+ var extra: std.ArrayList(u8) = .empty;
+ var prompt: std.json.Array = .init(a);
+ for (items[i..]) |m| {
+ if (!std.mem.eql(u8, role(m), "user")) return null;
+ const c = m.object.get("content") orelse continue;
+ switch (c) {
+ .string => |s| try prompt.append(try textBlock(a, s)),
+ .array => |blocks| for (blocks.items) |b| {
+ if (b != .object) continue;
+ if (std.mem.eql(u8, wire.strField(b.object, "type") orelse "", "tool_result")) {
+ try results.append(a, .{ .id = wire.strField(b.object, "tool_use_id") orelse "", .block = b.object });
+ } else try appendBlock(a, &prompt, b);
+ },
+ else => {},
+ }
+ }
+ if (results.items.len > 0) {
+ for (prompt.items) |b| {
+ const t = wire.strField(b.object, "text") orelse "[image]";
+ if (t.len == 0) continue;
+ if (extra.items.len > 0) try extra.append(a, '\n');
+ try extra.appendSlice(a, t);
+ }
+ return .{ .results = results.items, .extra_text = extra.items, .user = null };
+ }
+ if (prompt.items.len == 0) return null;
+ return .{ .results = &.{}, .extra_text = "", .user = .{ .array = prompt } };
+}
diff --git a/src/claude_agent_login.zig b/src/claude_agent_login.zig
new file mode 100644
index 00000000..abd0c460
--- /dev/null
+++ b/src/claude_agent_login.zig
@@ -0,0 +1,123 @@
+//! `graff login claude-agent` (ADR 0309): records that the user chose Claude
+//! Agent. The login itself belongs to `claude` (`claude auth login`); graff
+//! never reads Claude Code's saved credentials, it only asks `claude auth
+//! status` whether a login exists. The marker holds which `claude` to run.
+
+const std = @import("std");
+const Io = std.Io;
+const Allocator = std.mem.Allocator;
+const credential_store = @import("credential_store.zig");
+
+pub const marker_name = "claude-agent.json";
+
+pub fn markerPath(arena: Allocator, home: []const u8) []const u8 {
+ return credential_store.graffCredentialPath(arena, home, marker_name);
+}
+
+fn off(v: []const u8) bool {
+ for ([_][]const u8{ "", "0", "off", "false", "no" }) |o| if (std.ascii.eqlIgnoreCase(v, o)) return true;
+ return false;
+}
+
+/// The `claude` to run when the user opted in (the marker, or
+/// GRAFF_CLAUDE_AGENT=1), else null. GRAFF_CLAUDE_PATH picks the binary.
+pub fn enabled(io: Io, arena: Allocator, environ_map: anytype, home: []const u8) ?[]const u8 {
+ const exe_env = environ_map.get("GRAFF_CLAUDE_PATH");
+ if (environ_map.get("GRAFF_CLAUDE_AGENT")) |v| return if (off(v)) null else exe_env orelse "claude";
+ if (home.len == 0) return null;
+ const data = Io.Dir.cwd().readFileAlloc(io, markerPath(arena, home), arena, .limited(4096)) catch return null;
+ if (exe_env) |e| return e;
+ const v = std.json.parseFromSliceLeaky(std.json.Value, arena, data, .{ .allocate = .alloc_always }) catch return "claude";
+ if (v == .object) if (v.object.get("claude")) |c| if (c == .string and c.string.len > 0) return c.string;
+ return "claude";
+}
+
+pub const Status = struct { logged_in: bool, method: []const u8 = "", plan: []const u8 = "" };
+
+/// `claude auth status` reads Claude Code's own login and prints JSON.
+pub fn status(io: Io, arena: Allocator, exe: []const u8) !Status {
+ const pr = @import("process_runner.zig");
+ const run = try pr.runCappedWithOptions(arena, io, &.{ exe, "auth", "status" }, 64 * 1024, 8192, 20_000, .{});
+ const v = std.json.parseFromSliceLeaky(std.json.Value, arena, run.stdout, .{ .allocate = .alloc_always }) catch return .{ .logged_in = false };
+ if (v != .object) return .{ .logged_in = false };
+ const logged = if (v.object.get("loggedIn")) |l| l == .bool and l.bool else false;
+ const str = struct {
+ fn get(o: std.json.ObjectMap, k: []const u8) []const u8 {
+ const x = o.get(k) orelse return "";
+ return if (x == .string) x.string else "";
+ }
+ }.get;
+ return .{ .logged_in = logged, .method = str(v.object, "authMethod"), .plan = str(v.object, "subscriptionType") };
+}
+
+pub fn login(io: Io, arena: Allocator, environ_map: anytype, home: []const u8) !void {
+ const style = &@import("ansi.zig").style;
+ var buf: [1024]u8 = undefined;
+ var w = Io.File.stdout().writerStreaming(io, &buf);
+ const out = &w.interface;
+ const exe = environ_map.get("GRAFF_CLAUDE_PATH") orelse "claude";
+ var st = status(io, arena, exe) catch |err| switch (err) {
+ error.FileNotFound => {
+ try out.writeAll(
+ \\Claude Agent runs your own Claude Code (`claude`), which isn't installed.
+ \\Install it (https://code.claude.com/docs/en/setup), then run `graff login claude-agent` again.
+ \\
+ );
+ try out.flush();
+ return error.ClaudeNotInstalled;
+ },
+ else => return err,
+ };
+ if (!st.logged_in) {
+ try out.writeAll("Claude Code is not signed in; starting `claude auth login`.\n");
+ try out.flush();
+ var child = try std.process.spawn(io, .{ .argv = &.{ exe, "auth", "login" }, .stdin = .inherit, .stdout = .inherit, .stderr = .inherit });
+ const term = try child.wait(io);
+ if (term != .exited or term.exited != 0) {
+ try out.writeAll("claude auth login did not finish; nothing changed.\n");
+ try out.flush();
+ return error.ClaudeLoginIncomplete;
+ }
+ st = try status(io, arena, exe);
+ if (!st.logged_in) {
+ try out.writeAll("Claude Code still reports no login; nothing changed.\n");
+ try out.flush();
+ return error.ClaudeLoginIncomplete;
+ }
+ }
+ const path = markerPath(arena, home);
+ if (std.fs.path.dirname(path)) |dir| try Io.Dir.cwd().createDirPath(io, dir);
+ const data = try std.fmt.allocPrint(arena, "{{\"claude\":{f}}}\n", .{std.json.fmt(exe, .{})});
+ try Io.Dir.cwd().writeFile(io, .{ .sub_path = path, .data = data });
+ try out.print("{s}✓{s} Claude Agent is ready: graff runs your Claude Code login", .{ style.green, style.reset });
+ if (st.method.len > 0) try out.print(" ({s}{s}{s})", .{ st.method, if (st.plan.len > 0) ", " else "", st.plan });
+ try out.writeAll(".\n Pick it with `graff --model claude-agent-sonnet` (or -opus, -haiku, -fable), or /model.\n");
+ try out.flush();
+}
+
+/// `graff logout claude-agent`: forget the choice. Claude Code's own login stays.
+pub fn logout(io: Io, arena: Allocator, home: []const u8) !void {
+ Io.Dir.cwd().deleteFile(io, markerPath(arena, home)) catch |err| switch (err) {
+ error.FileNotFound => {},
+ else => return err,
+ };
+}
+
+const Env = struct {
+ map: []const [2][]const u8,
+ pub fn get(self: Env, key: []const u8) ?[]const u8 {
+ for (self.map) |kv| if (std.mem.eql(u8, kv[0], key)) return kv[1];
+ return null;
+ }
+};
+
+test "claude-agent opt-in: env wins, 0 turns it off, no marker and no env is off" {
+ var arena_state = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena_state.deinit();
+ const arena = arena_state.allocator();
+ const io = std.testing.io;
+ try std.testing.expectEqualStrings("claude", enabled(io, arena, Env{ .map = &.{.{ "GRAFF_CLAUDE_AGENT", "1" }} }, "").?);
+ try std.testing.expectEqualStrings("/opt/claude", enabled(io, arena, Env{ .map = &.{ .{ "GRAFF_CLAUDE_AGENT", "1" }, .{ "GRAFF_CLAUDE_PATH", "/opt/claude" } } }, "").?);
+ try std.testing.expect(enabled(io, arena, Env{ .map = &.{.{ "GRAFF_CLAUDE_AGENT", "0" }} }, "/nonexistent-home") == null);
+ try std.testing.expect(enabled(io, arena, Env{ .map = &.{} }, "/nonexistent-home") == null);
+}
diff --git a/src/claude_agent_session.zig b/src/claude_agent_session.zig
new file mode 100644
index 00000000..825a78a2
--- /dev/null
+++ b/src/claude_agent_session.zig
@@ -0,0 +1,254 @@
+//! Claude Agent sessions (ADR 0309): one long-running `claude` child per
+//! graff agent, held between model steps so a tool call can stay open while
+//! graff's own loop runs it, and between user turns so Claude Code keeps its
+//! prompt cache. A session idle past `idle_ms` is stopped; the next request
+//! starts a fresh one and replays graff's history as a checkpoint.
+
+const std = @import("std");
+const Io = std.Io;
+const Allocator = std.mem.Allocator;
+const wire = @import("claude_agent_wire.zig");
+const http = @import("http.zig");
+
+pub const idle_ms: i64 = 5 * std.time.ms_per_min;
+/// Lines carry whole assistant messages and echoed tool results; a line past
+/// this is skipped (it is always an echo graff does not read).
+const out_buf_len = 8 << 20;
+const in_buf_len = 256 << 10;
+
+/// A `tools/call` Claude Code is waiting on.
+pub const Pending = struct {
+ request_id: []u8,
+ /// The JSON-RPC id, raw JSON.
+ rpc_id: []u8,
+ tool_use_id: []u8,
+};
+
+pub const Session = struct {
+ gpa: Allocator,
+ io: Io,
+ child: std.process.Child,
+ env: ?std.process.Environ.Map,
+ in_buf: []u8,
+ out_buf: []u8,
+ writer: Io.File.Writer,
+ reader: Io.File.Reader,
+ /// Model, effort, prompt mode, system prompt, tools and folder: a change
+ /// to any of them needs a new process (the CLI takes them at start).
+ props_fp: u64,
+ /// The tool list Claude Code last read from graff's server.
+ tools_fp: u64 = 0,
+ /// graff messages Claude Code already holds, and a hash of them.
+ seen: usize = 0,
+ seen_fp: u64 = 0,
+ rewrites: u32 = 0,
+ pending: std.ArrayList(Pending) = .empty,
+ /// Results graff produced for calls Claude Code has not asked for yet
+ /// (it runs a response's calls one after another): tool_use id → MCP
+ /// result JSON. gpa-owned keys and values.
+ results: std.StringHashMapUnmanaged([]u8) = .empty,
+ used_ms: i64 = 0,
+
+ pub fn start(gpa: Allocator, io: Io, argv: []const []const u8, parent_env: ?*const std.process.Environ.Map, cwd: ?[]const u8, props_fp: u64) !*Session {
+ const self = try gpa.create(Session);
+ errdefer gpa.destroy(self);
+ var env: ?std.process.Environ.Map = null;
+ if (parent_env) |p| {
+ var m = try p.clone(gpa);
+ errdefer m.deinit();
+ var drop: std.ArrayList([]const u8) = .empty;
+ defer drop.deinit(gpa);
+ for (m.keys()) |k| if (wire.dropsEnv(k)) try drop.append(gpa, k);
+ for (drop.items) |k| _ = m.swapRemove(k);
+ for (wire.isolation_env) |kv| try m.put(kv[0], kv[1]);
+ env = m;
+ }
+ errdefer if (env) |*m| m.deinit();
+ var child = try std.process.spawn(io, .{
+ .argv = argv,
+ .stdin = .pipe,
+ .stdout = .pipe,
+ .stderr = .ignore,
+ .environ_map = if (env) |*m| m else null,
+ .cwd = if (cwd) |path| .{ .path = path } else .inherit,
+ });
+ errdefer @import("mcp_stdio.zig").stopChild(io, &child);
+ const in_buf = try gpa.alloc(u8, in_buf_len);
+ errdefer gpa.free(in_buf);
+ const out_buf = try gpa.alloc(u8, out_buf_len);
+ self.* = .{
+ .gpa = gpa,
+ .io = io,
+ .child = child,
+ .env = env,
+ .in_buf = in_buf,
+ .out_buf = out_buf,
+ .writer = undefined,
+ .reader = undefined,
+ .props_fp = props_fp,
+ };
+ self.writer = self.child.stdin.?.writerStreaming(io, self.in_buf);
+ self.reader = self.child.stdout.?.readerStreaming(io, self.out_buf);
+ return self;
+ }
+
+ pub fn send(self: *Session, line: []const u8) !void {
+ const w = &self.writer.interface;
+ w.writeAll(line) catch return error.ClaudeAgentExited;
+ w.writeByte('\n') catch return error.ClaudeAgentExited;
+ w.flush() catch return error.ClaudeAgentExited;
+ }
+
+ /// The next line, or a stall/Esc error once `budget_ms` passes silent.
+ pub fn readLine(self: *Session, poll_stdin: bool, budget_ms: u64) ![]u8 {
+ const Done = union(enum) { line: anyerror![]u8, stall: http.WatchdogFired };
+ var buf: [2]Done = undefined;
+ var sel: Io.Select(Done) = .init(self.io, &buf);
+ sel.concurrent(.line, readLineTask, .{&self.reader.interface}) catch return error.StreamStalled;
+ sel.concurrent(.stall, http.deadlineStallTask, .{ self.io, poll_stdin, budget_ms }) catch {
+ const only = sel.await() catch |e| {
+ sel.cancelDiscard();
+ return e;
+ };
+ sel.cancelDiscard();
+ return only.line;
+ };
+ const first = sel.await() catch |e| {
+ sel.cancelDiscard();
+ return e;
+ };
+ sel.cancelDiscard();
+ return switch (first) {
+ .line => |l| l,
+ .stall => |w| http.watchdogError(w, error.StreamStalled),
+ };
+ }
+
+ pub fn addPending(self: *Session, request_id: []const u8, rpc_id: []const u8, tool_use_id: []const u8) !void {
+ try self.pending.append(self.gpa, .{
+ .request_id = try self.gpa.dupe(u8, request_id),
+ .rpc_id = try self.gpa.dupe(u8, rpc_id),
+ .tool_use_id = try self.gpa.dupe(u8, tool_use_id),
+ });
+ }
+
+ pub fn dropPending(self: *Session, index: usize) void {
+ const p = self.pending.orderedRemove(index);
+ self.gpa.free(p.request_id);
+ self.gpa.free(p.rpc_id);
+ self.gpa.free(p.tool_use_id);
+ }
+
+ pub fn putResult(self: *Session, tool_use_id: []const u8, result: []const u8) !void {
+ const gop = try self.results.getOrPut(self.gpa, tool_use_id);
+ if (gop.found_existing) {
+ self.gpa.free(gop.value_ptr.*);
+ } else {
+ gop.key_ptr.* = self.gpa.dupe(u8, tool_use_id) catch |e| {
+ self.results.removeByPtr(gop.key_ptr);
+ return e;
+ };
+ }
+ gop.value_ptr.* = try self.gpa.dupe(u8, result);
+ }
+
+ /// Remove and return a stored result (caller frees with gpa).
+ pub fn takeResult(self: *Session, tool_use_id: []const u8) ?[]u8 {
+ const kv = self.results.fetchRemove(tool_use_id) orelse return null;
+ self.gpa.free(kv.key);
+ return kv.value;
+ }
+
+ pub fn stop(self: *Session) void {
+ @import("mcp_stdio.zig").stopChild(self.io, &self.child);
+ while (self.pending.items.len > 0) self.dropPending(self.pending.items.len - 1);
+ self.pending.deinit(self.gpa);
+ var it = self.results.iterator();
+ while (it.next()) |kv| {
+ self.gpa.free(kv.key_ptr.*);
+ self.gpa.free(kv.value_ptr.*);
+ }
+ self.results.deinit(self.gpa);
+ if (self.env) |*m| m.deinit();
+ self.gpa.free(self.in_buf);
+ self.gpa.free(self.out_buf);
+ self.gpa.destroy(self);
+ }
+};
+
+fn readLineTask(r: *Io.Reader) anyerror![]u8 {
+ while (true) {
+ const line = r.takeDelimiter('\n') catch |err| switch (err) {
+ error.StreamTooLong => {
+ _ = r.discardDelimiterInclusive('\n') catch return error.ClaudeAgentExited;
+ continue;
+ },
+ error.ReadFailed => return error.ClaudeAgentExited,
+ };
+ return line orelse error.ClaudeAgentExited;
+ }
+}
+
+// Sessions are keyed by the owning Agent's address. A session is taken out
+// while a request uses it, so parallel subagents never share one. A reused
+// address is harmless: the history hash no longer matches, and the stale
+// session is replaced.
+var mutex: Io.Mutex = .init;
+var sessions: std.AutoHashMapUnmanaged(usize, *Session) = .empty;
+var map_gpa: ?Allocator = null;
+
+pub fn take(io: Io, owner: usize) ?*Session {
+ mutex.lockUncancelable(io);
+ defer mutex.unlock(io);
+ const kv = sessions.fetchRemove(owner) orelse return null;
+ return kv.value;
+}
+
+/// Return a session after a request, stopping any other session left idle
+/// past `idle_ms` (a finished subagent's, or the user walked away).
+pub fn put(io: Io, owner: usize, s: *Session, now_ms: i64) void {
+ var idle: std.ArrayList(*Session) = .empty;
+ defer idle.deinit(s.gpa);
+ {
+ mutex.lockUncancelable(io);
+ defer mutex.unlock(io);
+ const gpa = map_gpa orelse blk: {
+ map_gpa = s.gpa;
+ break :blk s.gpa;
+ };
+ var it = sessions.iterator();
+ while (it.next()) |kv| if (now_ms - kv.value_ptr.*.used_ms > idle_ms) idle.append(s.gpa, kv.value_ptr.*) catch {};
+ for (idle.items) |old| {
+ var it2 = sessions.iterator();
+ while (it2.next()) |kv| if (kv.value_ptr.* == old) {
+ _ = sessions.remove(kv.key_ptr.*);
+ break;
+ };
+ }
+ sessions.put(gpa, owner, s) catch {
+ idle.append(s.gpa, s) catch {};
+ };
+ }
+ for (idle.items) |old| old.stop();
+}
+
+/// Stop every held session (graff is exiting).
+pub fn stopAll(io: Io) void {
+ var all: std.ArrayList(*Session) = .empty;
+ mutex.lockUncancelable(io);
+ const gpa = map_gpa;
+ if (gpa) |g| {
+ var it = sessions.valueIterator();
+ while (it.next()) |s| all.append(g, s.*) catch {};
+ sessions.deinit(g);
+ sessions = .empty;
+ }
+ mutex.unlock(io);
+ for (all.items) |s| s.stop();
+ if (gpa) |g| all.deinit(g);
+}
+
+/// The session held for `owner` is past its idle window.
+pub fn expired(s: *const Session, now_ms: i64) bool {
+ return s.used_ms != 0 and now_ms - s.used_ms > idle_ms;
+}
diff --git a/src/claude_agent_tests.zig b/src/claude_agent_tests.zig
new file mode 100644
index 00000000..dbed7566
--- /dev/null
+++ b/src/claude_agent_tests.zig
@@ -0,0 +1,196 @@
+//! Claude Agent (ADR 0309): wire and history facts, no child process.
+
+const std = @import("std");
+const Value = std.json.Value;
+const wire = @import("claude_agent_wire.zig");
+const history = @import("claude_agent_history.zig");
+
+fn parse(a: std.mem.Allocator, json: []const u8) !Value {
+ return std.json.parseFromSliceLeaky(Value, a, json, .{ .allocate = .alloc_always });
+}
+
+fn has(argv: []const []const u8, flag: []const u8) ?usize {
+ for (argv, 0..) |arg, i| if (std.mem.eql(u8, arg, flag)) return i;
+ return null;
+}
+
+test "claude-agent argv: built-ins off, graff's tools the only allowed ones, no saved session" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+ const a = arena.allocator();
+ const argv = try wire.argv(a, .{ .exe = "claude", .model = "sonnet", .effort = "high", .has_tools = true });
+ try std.testing.expectEqualStrings("", argv[has(argv, "--tools").? + 1]);
+ try std.testing.expectEqualStrings("mcp__graff__*", argv[has(argv, "--allowedTools").? + 1]);
+ try std.testing.expectEqualStrings("dontAsk", argv[has(argv, "--permission-mode").? + 1]);
+ try std.testing.expectEqualStrings("", argv[has(argv, "--setting-sources").? + 1]);
+ try std.testing.expectEqualStrings("high", argv[has(argv, "--effort").? + 1]);
+ try std.testing.expectEqualStrings("sonnet", argv[has(argv, "--model").? + 1]);
+ try std.testing.expect(has(argv, "--no-session-persistence") != null);
+ try std.testing.expect(has(argv, "--strict-mcp-config") != null);
+ const cfg = try parse(a, argv[has(argv, "--mcp-config").? + 1]);
+ try std.testing.expectEqualStrings("sdk", cfg.object.get("mcpServers").?.object.get("graff").?.object.get("type").?.string);
+ // A tool-less side call offers no server at all.
+ const bare = try wire.argv(a, .{ .exe = "claude", .model = "haiku", .effort = null, .has_tools = false });
+ try std.testing.expect(has(bare, "--mcp-config") == null and has(bare, "--allowedTools") == null and has(bare, "--effort") == null);
+}
+
+test "claude-agent initialize: graff's prompt replaces Claude Code's, or is appended to it" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+ const a = arena.allocator();
+ const own = try parse(a, try wire.initRequest(a, "i1", .graff, "You are graff.", true));
+ const r = own.object.get("request").?.object;
+ try std.testing.expectEqualStrings("initialize", r.get("subtype").?.string);
+ try std.testing.expectEqualStrings("You are graff.", r.get("systemPrompt").?.array.items[0].string);
+ try std.testing.expectEqualStrings("graff", r.get("sdkMcpServers").?.array.items[0].string);
+ try std.testing.expect(r.get("appendSystemPrompt") == null);
+ const appended = try parse(a, try wire.initRequest(a, "i2", .claude, "You are graff.", false));
+ const r2 = appended.object.get("request").?.object;
+ try std.testing.expectEqualStrings("You are graff.", r2.get("appendSystemPrompt").?.string);
+ try std.testing.expect(r2.get("systemPrompt") == null and r2.get("sdkMcpServers") == null);
+ try std.testing.expectEqual(wire.PromptMode.claude, wire.promptMode("append"));
+ try std.testing.expectEqual(wire.PromptMode.graff, wire.promptMode(null));
+}
+
+test "claude-agent user line: client-composed, so Claude Code adds no command parsing" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+ const a = arena.allocator();
+ const line = try parse(a, try wire.userLine(a, .{ .string = "/compact hi" }));
+ try std.testing.expectEqualStrings("user", line.object.get("type").?.string);
+ try std.testing.expect(line.object.get("client_composed").?.bool);
+ try std.testing.expectEqualStrings("/compact hi", line.object.get("message").?.object.get("content").?.string);
+}
+
+test "claude-agent classify: stream events, held tool calls, results; subagent events skipped" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+ const a = arena.allocator();
+ const ev = try wire.classify(a, "{\"type\":\"stream_event\",\"parent_tool_use_id\":null,\"event\":{\"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"tool_use\",\"id\":\"toolu_1\",\"name\":\"mcp__graff__read_file\",\"input\":{}}}}");
+ var event = ev.event;
+ try std.testing.expect(wire.unprefixToolUse(&event));
+ try std.testing.expectEqualStrings("read_file", event.object.get("content_block").?.object.get("name").?.string);
+ const nested = try wire.classify(a, "{\"type\":\"stream_event\",\"parent_tool_use_id\":\"toolu_0\",\"event\":{\"type\":\"message_start\"}}");
+ try std.testing.expect(nested == .ignore);
+ const call = try wire.classify(a, "{\"type\":\"control_request\",\"request_id\":\"r9\",\"request\":{\"subtype\":\"mcp_message\",\"server_name\":\"graff\",\"message\":{\"method\":\"tools/call\",\"params\":{\"name\":\"read_file\",\"arguments\":{},\"_meta\":{\"claudecode/toolUseId\":\"toolu_1\"}},\"jsonrpc\":\"2.0\",\"id\":2}}}");
+ try std.testing.expectEqualStrings("r9", call.control.request_id);
+ try std.testing.expectEqualStrings("mcp_message", call.control.subtype);
+ const failed = try wire.classify(a, "{\"type\":\"result\",\"subtype\":\"success\",\"is_error\":true,\"result\":\"Not logged in · Please run /login\"}");
+ try std.testing.expect(failed.result.is_error);
+ const ok = try wire.classify(a, "{\"type\":\"result\",\"subtype\":\"success\",\"is_error\":false,\"result\":\"done\"}");
+ try std.testing.expect(!ok.result.is_error);
+ try std.testing.expect(try wire.classify(a, "not json") == .ignore);
+ const resp = try wire.classify(a, "{\"type\":\"control_response\",\"response\":{\"subtype\":\"success\",\"request_id\":\"graff_init\",\"response\":{\"claude_code_version\":\"2.1.304\"}}}");
+ try std.testing.expect(resp.response.ok);
+}
+
+test "claude-agent MCP: tools/list renames input_schema; a tool_result becomes MCP content" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+ const a = arena.allocator();
+ const tools = try parse(a, "[{\"name\":\"shell\",\"description\":\"run\",\"input_schema\":{\"type\":\"object\"}}]");
+ const listed = try parse(a, try wire.toolsList(a, tools));
+ const t0 = listed.object.get("tools").?.array.items[0].object;
+ try std.testing.expectEqualStrings("shell", t0.get("name").?.string);
+ try std.testing.expectEqualStrings("object", t0.get("inputSchema").?.object.get("type").?.string);
+ const block = try parse(a, "{\"type\":\"tool_result\",\"tool_use_id\":\"toolu_1\",\"is_error\":true,\"content\":[{\"type\":\"text\",\"text\":\"boom\"},{\"type\":\"image\",\"source\":{\"type\":\"base64\",\"media_type\":\"image/jpeg\",\"data\":\"AAAA\"}}]}");
+ const result = try parse(a, try wire.toolResult(a, block.object, "steer: also check tests"));
+ const content = result.object.get("content").?.array.items;
+ try std.testing.expectEqual(@as(usize, 3), content.len);
+ try std.testing.expectEqualStrings("boom", content[0].object.get("text").?.string);
+ try std.testing.expectEqualStrings("image/jpeg", content[1].object.get("mimeType").?.string);
+ try std.testing.expectEqualStrings("steer: also check tests", content[2].object.get("text").?.string);
+ try std.testing.expect(result.object.get("isError").?.bool);
+ const reply = try parse(a, try wire.mcpReply(a, "r9", "2", "{\"content\":[]}"));
+ const mcp = reply.object.get("response").?.object.get("response").?.object.get("mcp_response").?.object;
+ try std.testing.expectEqual(@as(i64, 2), mcp.get("id").?.integer);
+}
+
+test "claude-agent env: Claude Code's session identity never reaches the child" {
+ try std.testing.expect(wire.dropsEnv("CLAUDECODE"));
+ try std.testing.expect(wire.dropsEnv("CLAUDE_CODE_ENTRYPOINT"));
+ try std.testing.expect(wire.dropsEnv("CLAUDE_CODE_SIMPLE"));
+ try std.testing.expect(wire.dropsEnv("MCP_TOOL_TIMEOUT"));
+ try std.testing.expect(wire.dropsEnv("CLAUDE_CODE_MESSAGING_SOCKET"));
+ try std.testing.expect(!wire.dropsEnv("CLAUDE_CONFIG_DIR"));
+ try std.testing.expect(!wire.dropsEnv("CLAUDE_CODE_OAUTH_TOKEN"));
+ try std.testing.expect(!wire.dropsEnv("CLAUDE_CODE_USE_BEDROCK"));
+ try std.testing.expect(!wire.dropsEnv("PATH"));
+}
+
+test "claude-agent version floor" {
+ try std.testing.expect(wire.atLeast("2.1.304", wire.min_version));
+ try std.testing.expect(wire.atLeast("2.1.248", wire.min_version));
+ try std.testing.expect(!wire.atLeast("2.1.247", wire.min_version));
+ try std.testing.expect(wire.atLeast("3.0.0-beta", wire.min_version));
+ try std.testing.expect(!wire.atLeast("2.0.999", wire.min_version));
+ try std.testing.expectEqualStrings("max", wire.effortFlag("ultra").?);
+ try std.testing.expectEqualStrings("sonnet", wire.modelArg("claude-agent-sonnet"));
+ try std.testing.expectEqualStrings("claude-opus-5-5[1m]", wire.modelArg("claude-opus-5-5[1m]"));
+ try std.testing.expect(wire.effortFlag("none") == null);
+}
+
+test "claude-agent fresh session: earlier history is a checkpoint, the prompt keeps its blocks" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+ const a = arena.allocator();
+ const msgs = try parse(a,
+ \\[{"role":"user","content":"fix the bug"},
+ \\ {"role":"assistant","content":[{"type":"thinking","thinking":"secret","signature":"s"},{"type":"tool_use","id":"t1","name":"read_file","input":{"path":"a.zig"}}]},
+ \\ {"role":"user","content":[{"type":"tool_result","tool_use_id":"t1","content":"fn main() {}"}]},
+ \\ {"role":"assistant","content":[{"type":"text","text":"done"}]},
+ \\ {"role":"user","content":[{"type":"text","text":"now add a test","cache_control":{"type":"ephemeral"}}]}]
+ );
+ const content = try history.freshContent(a, msgs.array.items);
+ const blocks = content.array.items;
+ try std.testing.expectEqual(@as(usize, 2), blocks.len);
+ const cp = blocks[0].object.get("text").?.string;
+ try std.testing.expect(std.mem.startsWith(u8, cp, "<conversation-checkpoint>"));
+ try std.testing.expect(std.mem.indexOf(u8, cp, "<tool_call name=\"read_file\" id=\"t1\">") != null);
+ try std.testing.expect(std.mem.indexOf(u8, cp, "fn main() {}") != null);
+ try std.testing.expect(std.mem.indexOf(u8, cp, "secret") == null); // no thinking text
+ try std.testing.expectEqualStrings("now add a test", blocks[1].object.get("text").?.string);
+ try std.testing.expect(blocks[1].object.get("cache_control") == null);
+ // Ending on tool results (a restart mid-loop): everything is checkpoint.
+ const mid = try history.freshContent(a, msgs.array.items[0..3]);
+ try std.testing.expectEqual(@as(usize, 2), mid.array.items.len);
+ try std.testing.expect(std.mem.startsWith(u8, mid.array.items[1].object.get("text").?.string, "Continue"));
+}
+
+test "claude-agent delta: Claude's own reply is skipped; results and a new prompt are told apart" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+ const a = arena.allocator();
+ const tool_step = try parse(a,
+ \\[{"role":"assistant","content":[{"type":"tool_use","id":"t1","name":"shell","input":{}},{"type":"tool_use","id":"t2","name":"shell","input":{}}]},
+ \\ {"role":"user","content":[{"type":"tool_result","tool_use_id":"t1","content":"a"},{"type":"tool_result","tool_use_id":"t2","content":"b"},{"type":"text","text":"<reminder>"}]}]
+ );
+ const d = (try history.delta(a, tool_step.array.items)).?;
+ try std.testing.expectEqual(@as(usize, 2), d.results.len);
+ try std.testing.expectEqualStrings("t2", d.results[1].id);
+ try std.testing.expectEqualStrings("<reminder>", d.extra_text);
+ try std.testing.expect(d.user == null);
+ const next = try parse(a,
+ \\[{"role":"assistant","content":[{"type":"text","text":"done"}]},{"role":"user","content":"thanks, now B"}]
+ );
+ const d2 = (try history.delta(a, next.array.items)).?;
+ try std.testing.expectEqual(@as(usize, 0), d2.results.len);
+ try std.testing.expectEqualStrings("thanks, now B", d2.user.?.array.items[0].object.get("text").?.string);
+ // An assistant message graff injected after the reply: not a live shape.
+ const odd = try parse(a,
+ \\[{"role":"assistant","content":"x"},{"role":"assistant","content":"y"},{"role":"user","content":"z"}]
+ );
+ try std.testing.expect(try history.delta(a, odd.array.items) == null);
+ try std.testing.expect(try history.delta(a, next.array.items[0..1]) == null);
+}
+
+test "claude-agent history hash: a grown history keeps its prefix identity, a rewrite does not" {
+ var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena.deinit();
+ const a = arena.allocator();
+ const one = try parse(a, "[{\"role\":\"user\",\"content\":\"a\"},{\"role\":\"assistant\",\"content\":\"b\"}]");
+ const two = try parse(a, "[{\"role\":\"user\",\"content\":\"a\"},{\"role\":\"assistant\",\"content\":\"b\"},{\"role\":\"user\",\"content\":\"c\"}]");
+ const edited = try parse(a, "[{\"role\":\"user\",\"content\":\"A\"},{\"role\":\"assistant\",\"content\":\"b\"}]");
+ try std.testing.expectEqual(history.hashMessages(a, one.array.items), history.hashMessages(a, two.array.items[0..2]));
+ try std.testing.expect(history.hashMessages(a, one.array.items) != history.hashMessages(a, edited.array.items));
+}
diff --git a/src/claude_agent_wire.zig b/src/claude_agent_wire.zig
new file mode 100644
index 00000000..aa0d171f
--- /dev/null
+++ b/src/claude_agent_wire.zig
@@ -0,0 +1,387 @@
+//! Claude Agent wire (ADR 0309): the stream-json lines graff writes to, and
+//! reads from, the user's own `claude` program. Pure functions over strings
+//! and parsed JSON, so the protocol is testable without a child process.
+//!
+//! graff speaks the control protocol the Agent SDK uses: one `initialize`
+//! control request carrying graff's tool server (`sdkMcpServers`) and system
+//! prompt, user messages as `{"type":"user",...}` lines, and MCP JSON-RPC
+//! tunnelled through `mcp_message` control requests. Each `tools/call`
+//! carries the model's tool_use id in `_meta["claudecode/toolUseId"]`, which
+//! is how a held call is matched to the result graff's own loop produces.
+
+const std = @import("std");
+const Allocator = std.mem.Allocator;
+const Value = std.json.Value;
+const ObjectMap = std.json.ObjectMap;
+
+pub const server_name = "graff";
+pub const tool_prefix = "mcp__graff__";
+/// Older binaries ignore `client_composed` and can read user text as Claude
+/// Code commands.
+pub const min_version = "2.1.248";
+
+/// Whose system prompt the session runs on. `graff` replaces Claude Code's
+/// prompt with graff's own; `claude` keeps Claude Code's and appends graff's.
+pub const PromptMode = enum { graff, claude };
+
+pub fn promptMode(value: ?[]const u8) PromptMode {
+ const v = value orelse return .graff;
+ if (std.ascii.eqlIgnoreCase(v, "claude") or std.ascii.eqlIgnoreCase(v, "append")) return .claude;
+ return .graff;
+}
+
+/// graff's effort ladder onto `claude --effort` (low|medium|high|xhigh|max).
+pub fn effortFlag(tag: []const u8) ?[]const u8 {
+ const pairs = [_][2][]const u8{ .{ "low", "low" }, .{ "medium", "medium" }, .{ "high", "high" }, .{ "xhigh", "xhigh" }, .{ "max", "max" }, .{ "ultra", "max" } };
+ for (pairs) |p| if (std.mem.eql(u8, tag, p[0])) return p[1];
+ return null;
+}
+
+/// Claude Code features that duplicate graff's are switched off; graff's own
+/// versions win. The three cleared names would skip the subscription login,
+/// override graff's effort, or cap every graff tool call.
+pub const isolation_env = [_][2][]const u8{
+ .{ "CLAUDE_CODE_DISABLE_CLAUDE_MDS", "1" },
+ .{ "CLAUDE_CODE_DISABLE_AUTO_MEMORY", "1" },
+ .{ "DISABLE_AUTO_COMPACT", "1" },
+ .{ "CLAUDE_CODE_ENABLE_AWAY_SUMMARY", "0" },
+ .{ "ENABLE_TOOL_SEARCH", "false" },
+ .{ "CLAUDE_CODE_DISABLE_ADVISOR_TOOL", "1" },
+ .{ "MAX_MCP_OUTPUT_TOKENS", "200000" },
+};
+
+/// Inherited variables that must not reach `claude`. A graff started from
+/// inside Claude Code inherits that session's identity (CLAUDECODE, the
+/// entrypoint, its messaging socket), which the child would otherwise adopt.
+/// CLAUDE_CODE_SIMPLE would skip the subscription login, the effort names
+/// would override graff's effort, and MCP_TOOL_TIMEOUT would cap every graff
+/// tool call. The user's own settings (CLAUDE_CONFIG_DIR,
+/// CLAUDE_CODE_OAUTH_TOKEN, the Bedrock/Vertex switches) pass through.
+const dropped_env = [_][]const u8{
+ "CLAUDECODE", "CLAUDE_CODE_ENTRYPOINT", "CLAUDE_CODE_CHILD_SESSION",
+ "CLAUDE_CODE_SESSION_ID", "CLAUDE_CODE_SESSION_ATTENDED", "CLAUDE_CODE_EXECPATH",
+ "CLAUDE_CODE_SSE_PORT", "CLAUDE_PID", "CLAUDE_EFFORT",
+ "CLAUDE_CODE_EFFORT_LEVEL", "CLAUDE_CODE_SIMPLE", "CLAUDE_AGENT_SDK_VERSION",
+ "MCP_TOOL_TIMEOUT",
+};
+const dropped_prefixes = [_][]const u8{"CLAUDE_CODE_MESSAGING_"};
+
+pub fn dropsEnv(name: []const u8) bool {
+ for (dropped_env) |d| if (std.mem.eql(u8, name, d)) return true;
+ for (dropped_prefixes) |p| if (std.mem.startsWith(u8, name, p)) return true;
+ return false;
+}
+
+/// The catalog's `claude-agent-sonnet` is Claude Code's `sonnet`; any other id
+/// (`claude-agent/claude-opus-5-5[1m]`) goes through as given.
+pub fn modelArg(model: []const u8) []const u8 {
+ const prefix = "claude-agent-";
+ return if (std.mem.startsWith(u8, model, prefix)) model[prefix.len..] else model;
+}
+
+pub const Spawn = struct {
+ exe: []const u8,
+ model: []const u8,
+ effort: ?[]const u8,
+ has_tools: bool,
+};
+
+pub fn argv(a: Allocator, s: Spawn) ![]const []const u8 {
+ var out: std.ArrayList([]const u8) = .empty;
+ try out.appendSlice(a, &.{
+ s.exe, "--output-format", "stream-json", "--verbose",
+ "--input-format", "stream-json", "--tools", "",
+ "--permission-mode", "dontAsk", "--setting-sources", "",
+ "--settings", "{\"disableAllHooks\":true}", "--strict-mcp-config", "--include-partial-messages",
+ "--thinking=adaptive", "--thinking-display", "summarized", "--no-session-persistence",
+ "--model", s.model,
+ });
+ if (s.has_tools) try out.appendSlice(a, &.{
+ "--allowedTools", tool_prefix ++ "*",
+ "--mcp-config", "{\"mcpServers\":{\"" ++ server_name ++ "\":{\"type\":\"sdk\",\"name\":\"" ++ server_name ++ "\"}}}",
+ });
+ if (s.effort) |e| try out.appendSlice(a, &.{ "--effort", e });
+ return out.items;
+}
+
+pub fn initRequest(a: Allocator, request_id: []const u8, mode: PromptMode, system: []const u8, has_tools: bool) ![]u8 {
+ var aw: std.Io.Writer.Allocating = .init(a);
+ var s: std.json.Stringify = .{ .writer = &aw.writer };
+ try s.beginObject();
+ try s.objectField("type");
+ try s.write("control_request");
+ try s.objectField("request_id");
+ try s.write(request_id);
+ try s.objectField("request");
+ try s.beginObject();
+ try s.objectField("subtype");
+ try s.write("initialize");
+ if (has_tools) {
+ try s.objectField("sdkMcpServers");
+ try s.write(&[_][]const u8{server_name});
+ }
+ if (system.len > 0) switch (mode) {
+ .graff => {
+ try s.objectField("systemPrompt");
+ try s.write(&[_][]const u8{system});
+ },
+ .claude => {
+ try s.objectField("appendSystemPrompt");
+ try s.write(system);
+ },
+ };
+ try s.endObject();
+ try s.endObject();
+ return aw.toOwnedSlice();
+}
+
+/// One user turn. `content` is Anthropic message content (string or blocks).
+pub fn userLine(a: Allocator, content: Value) ![]u8 {
+ var aw: std.Io.Writer.Allocating = .init(a);
+ var s: std.json.Stringify = .{ .writer = &aw.writer };
+ try s.beginObject();
+ try s.objectField("type");
+ try s.write("user");
+ try s.objectField("message");
+ try s.beginObject();
+ try s.objectField("role");
+ try s.write("user");
+ try s.objectField("content");
+ try s.write(content);
+ try s.endObject();
+ try s.objectField("parent_tool_use_id");
+ try s.write(null);
+ try s.objectField("session_id");
+ try s.write("");
+ // graff already expanded its own commands; Claude Code must not read the
+ // text as slash commands or add its per-turn context again.
+ try s.objectField("client_composed");
+ try s.write(true);
+ try s.endObject();
+ return aw.toOwnedSlice();
+}
+
+/// A success control_response; `response_json` is the raw `response` object.
+pub fn controlOk(a: Allocator, request_id: []const u8, response_json: []const u8) ![]u8 {
+ var aw: std.Io.Writer.Allocating = .init(a);
+ var s: std.json.Stringify = .{ .writer = &aw.writer };
+ try s.beginObject();
+ try s.objectField("type");
+ try s.write("control_response");
+ try s.objectField("response");
+ try s.beginObject();
+ try s.objectField("subtype");
+ try s.write("success");
+ try s.objectField("request_id");
+ try s.write(request_id);
+ try s.objectField("response");
+ try s.beginWriteRaw();
+ try aw.writer.writeAll(response_json);
+ s.endWriteRaw();
+ try s.endObject();
+ try s.endObject();
+ return aw.toOwnedSlice();
+}
+
+pub fn controlErr(a: Allocator, request_id: []const u8, message: []const u8) ![]u8 {
+ var aw: std.Io.Writer.Allocating = .init(a);
+ var s: std.json.Stringify = .{ .writer = &aw.writer };
+ try s.beginObject();
+ try s.objectField("type");
+ try s.write("control_response");
+ try s.objectField("response");
+ try s.beginObject();
+ try s.objectField("subtype");
+ try s.write("error");
+ try s.objectField("request_id");
+ try s.write(request_id);
+ try s.objectField("error");
+ try s.write(message);
+ try s.endObject();
+ try s.endObject();
+ return aw.toOwnedSlice();
+}
+
+/// The control_response carrying a JSON-RPC reply. `rpc_id` is the request's
+/// raw id JSON, or null for a notification's ack.
+pub fn mcpReply(a: Allocator, request_id: []const u8, rpc_id: ?[]const u8, result_json: []const u8) ![]u8 {
+ const inner = if (rpc_id) |id|
+ try std.fmt.allocPrint(a, "{{\"mcp_response\":{{\"jsonrpc\":\"2.0\",\"id\":{s},\"result\":{s}}}}}", .{ id, result_json })
+ else
+ try std.fmt.allocPrint(a, "{{\"mcp_response\":{{\"jsonrpc\":\"2.0\",\"result\":{s}}}}}", .{result_json});
+ return controlOk(a, request_id, inner);
+}
+
+pub fn initializeResult(a: Allocator, protocol_version: []const u8) ![]u8 {
+ return std.fmt.allocPrint(a, "{{\"protocolVersion\":{f},\"capabilities\":{{\"tools\":{{}}}},\"serverInfo\":{{\"name\":\"" ++ server_name ++ "\",\"version\":\"1\"}}}}", .{std.json.fmt(protocol_version, .{})});
+}
+
+/// graff's Anthropic tool list (`[{name, description, input_schema}]`) as an
+/// MCP `tools/list` result.
+pub fn toolsList(a: Allocator, tools: ?Value) ![]u8 {
+ var aw: std.Io.Writer.Allocating = .init(a);
+ var s: std.json.Stringify = .{ .writer = &aw.writer };
+ try s.beginObject();
+ try s.objectField("tools");
+ try s.beginArray();
+ if (tools) |t| if (t == .array) for (t.array.items) |tool| {
+ if (tool != .object) continue;
+ const name = tool.object.get("name") orelse continue;
+ if (name != .string) continue;
+ try s.beginObject();
+ try s.objectField("name");
+ try s.write(name.string);
+ if (tool.object.get("description")) |d| {
+ try s.objectField("description");
+ try s.write(d);
+ }
+ try s.objectField("inputSchema");
+ try s.write(tool.object.get("input_schema") orelse Value{ .object = .empty });
+ try s.endObject();
+ };
+ try s.endArray();
+ try s.endObject();
+ return aw.toOwnedSlice();
+}
+
+/// An Anthropic `tool_result` block as an MCP `tools/call` result. Text that
+/// graff appended to the same user message (reminders, a steer) rides along
+/// as one more text item: the model reads it with the result, as it would
+/// on the Messages wire.
+pub fn toolResult(a: Allocator, block: ObjectMap, extra_text: []const u8) ![]u8 {
+ var aw: std.Io.Writer.Allocating = .init(a);
+ var s: std.json.Stringify = .{ .writer = &aw.writer };
+ try s.beginObject();
+ try s.objectField("content");
+ try s.beginArray();
+ if (block.get("content")) |c| switch (c) {
+ .string => |text| try textItem(&s, text),
+ .array => |items| for (items.items) |item| {
+ if (item != .object) continue;
+ const kind = strField(item.object, "type") orelse continue;
+ if (std.mem.eql(u8, kind, "text")) {
+ try textItem(&s, strField(item.object, "text") orelse "");
+ } else if (std.mem.eql(u8, kind, "image")) {
+ const src = item.object.get("source") orelse continue;
+ if (src != .object) continue;
+ const data = strField(src.object, "data") orelse continue;
+ try s.beginObject();
+ try s.objectField("type");
+ try s.write("image");
+ try s.objectField("data");
+ try s.write(data);
+ try s.objectField("mimeType");
+ try s.write(strField(src.object, "media_type") orelse "image/png");
+ try s.endObject();
+ }
+ },
+ else => {},
+ };
+ if (extra_text.len > 0) try textItem(&s, extra_text);
+ try s.endArray();
+ if (block.get("is_error")) |e| if (e == .bool and e.bool) {
+ try s.objectField("isError");
+ try s.write(true);
+ };
+ try s.endObject();
+ return aw.toOwnedSlice();
+}
+
+fn textItem(s: *std.json.Stringify, text: []const u8) !void {
+ try s.beginObject();
+ try s.objectField("type");
+ try s.write("text");
+ try s.objectField("text");
+ try s.write(text);
+ try s.endObject();
+}
+
+pub fn strField(o: ObjectMap, key: []const u8) ?[]const u8 {
+ const v = o.get(key) orelse return null;
+ return if (v == .string) v.string else null;
+}
+
+/// One line from `claude`, classified. Slices point into the parse arena.
+pub const Line = union(enum) {
+ /// A raw Anthropic stream event (`stream_event.event`).
+ event: Value,
+ control: Control,
+ /// `control_cancel_request`: Claude Code abandoned a request it sent.
+ cancel: []const u8,
+ /// The answer to a control request graff sent.
+ response: Response,
+ result: Result,
+ ignore,
+};
+
+pub const Control = struct { request_id: []const u8, subtype: []const u8, request: ObjectMap };
+pub const Response = struct { request_id: []const u8, ok: bool, body: ?Value, err: []const u8 };
+pub const Result = struct { is_error: bool, text: []const u8 };
+
+pub fn classify(a: Allocator, line: []const u8) !Line {
+ const trimmed = std.mem.trim(u8, line, " \t\r");
+ if (trimmed.len == 0 or trimmed[0] != '{') return .ignore;
+ const v = std.json.parseFromSliceLeaky(Value, a, trimmed, .{ .allocate = .alloc_always }) catch return .ignore;
+ if (v != .object) return .ignore;
+ const kind = strField(v.object, "type") orelse return .ignore;
+ if (std.mem.eql(u8, kind, "stream_event")) {
+ const ev = v.object.get("event") orelse return .ignore;
+ // A subagent's events carry its parent's tool_use id; graff has no
+ // Claude Code subagents (its tools are the only tools), so skip them.
+ if (v.object.get("parent_tool_use_id")) |p| if (p != .null) return .ignore;
+ return if (ev == .object) .{ .event = ev } else .ignore;
+ }
+ if (std.mem.eql(u8, kind, "control_request")) {
+ const req = v.object.get("request") orelse return .ignore;
+ if (req != .object) return .ignore;
+ return .{ .control = .{
+ .request_id = strField(v.object, "request_id") orelse return .ignore,
+ .subtype = strField(req.object, "subtype") orelse "",
+ .request = req.object,
+ } };
+ }
+ if (std.mem.eql(u8, kind, "control_cancel_request")) return .{ .cancel = strField(v.object, "request_id") orelse return .ignore };
+ if (std.mem.eql(u8, kind, "control_response")) {
+ const r = v.object.get("response") orelse return .ignore;
+ if (r != .object) return .ignore;
+ return .{ .response = .{
+ .request_id = strField(r.object, "request_id") orelse return .ignore,
+ .ok = std.mem.eql(u8, strField(r.object, "subtype") orelse "", "success"),
+ .body = r.object.get("response"),
+ .err = strField(r.object, "error") orelse "",
+ } };
+ }
+ if (std.mem.eql(u8, kind, "result")) {
+ const is_error = if (v.object.get("is_error")) |e| e == .bool and e.bool else false;
+ const subtype = strField(v.object, "subtype") orelse "success";
+ return .{ .result = .{
+ .is_error = is_error or !std.mem.eql(u8, subtype, "success"),
+ .text = strField(v.object, "result") orelse subtype,
+ } };
+ }
+ return .ignore;
+}
+
+/// Strip graff's MCP server prefix from a streamed tool_use block, in place,
+/// so graff's loop sees its own tool names. True if the event is a tool_use start.
+pub fn unprefixToolUse(ev: *Value) bool {
+ if (ev.* != .object) return false;
+ if (!std.mem.eql(u8, strField(ev.object, "type") orelse "", "content_block_start")) return false;
+ const block = ev.object.getPtr("content_block") orelse return false;
+ if (block.* != .object or !std.mem.eql(u8, strField(block.object, "type") orelse "", "tool_use")) return false;
+ const name = block.object.getPtr("name") orelse return true;
+ if (name.* == .string and std.mem.startsWith(u8, name.string, tool_prefix)) name.* = .{ .string = name.string[tool_prefix.len..] };
+ return true;
+}
+
+/// Whether `version` (e.g. "2.1.304", suffixes ignored) is at least `floor`.
+pub fn atLeast(version: []const u8, floor: []const u8) bool {
+ var vi = std.mem.splitScalar(u8, std.mem.sliceTo(version, '-'), '.');
+ var fi = std.mem.splitScalar(u8, floor, '.');
+ while (fi.next()) |fpart| {
+ const want = std.fmt.parseUnsigned(u32, fpart, 10) catch 0;
+ const have = std.fmt.parseUnsigned(u32, vi.next() orelse "0", 10) catch 0;
+ if (have != want) return have > want;
+ }
+ return true;
+}
diff --git a/src/cli_text_source.zig b/src/cli_text_source.zig
index 173fb816..4ed36caa 100644
--- a/src/cli_text_source.zig
+++ b/src/cli_text_source.zig
@@ -281,6 +281,7 @@ pub const usage_text =
\\ graff login chatgpt ChatGPT sign-in (also: codex, openai)
\\ graff login anthropic Claude subscription browser sign-in (also: ant)
\\ graff login console metered Console sign-in through the `ant` CLI
+ \\ graff login claude-agent Claude through your own Claude Code login (`claude`)
\\ graff login kimi Kimi Code OAuth login (device-code)
\\ graff login xai Grok/SuperGrok OAuth login (device-code)
\\ graff login zai Z.AI Coding Plan OAuth login
diff --git a/src/commands_model.zig b/src/commands_model.zig
index 322d04f4..81d37862 100644
--- a/src/commands_model.zig
+++ b/src/commands_model.zig
@@ -360,6 +360,7 @@ pub fn tryHandle(root: *Agent, keys: *Keys, arena: Allocator, line: []const u8,
.{ .name = "chatgpt", .desc = "ChatGPT sign-in (also: codex, openai)" },
.{ .name = "anthropic", .desc = "Claude subscription sign-in (also: ant)" },
.{ .name = "console", .desc = "metered Console sign-in through the ant CLI" },
+ .{ .name = "claude-agent", .desc = "your own Claude Code login, through `claude`" },
.{ .name = "kimi", .desc = "Kimi Code sign-in (device-code OAuth)" },
.{ .name = "xai", .desc = "Grok / SuperGrok sign-in (device-code OAuth)" },
.{ .name = "zai", .desc = "Z.AI Coding Plan sign-in (CLI OAuth)" },
@@ -421,6 +422,13 @@ pub fn tryHandle(root: *Agent, keys: *Keys, arena: Allocator, line: []const u8,
try out.flush();
return true;
};
+ } else if (std.mem.eql(u8, target, "claude-agent")) {
+ const ca = @import("claude_agent_login.zig");
+ ca.login(root.io, arena, @import("anthropic_profile.zig").ProcessEnv{}, home) catch |err| {
+ try out.print("\xe2\x9c\x97 claude-agent login failed: {t}\n", .{err});
+ try out.flush();
+ return true;
+ };
} else if (std.mem.eql(u8, target, "chatgpt-new")) {
@import("oauth_chatgpt.zig").login(root.io, root.gpa, arena, home) catch |err| {
try out.print("\xe2\x9c\x97 chatgpt-new login failed: {t}\n", .{err});
@@ -434,7 +442,7 @@ pub fn tryHandle(root: *Agent, keys: *Keys, arena: Allocator, line: []const u8,
try out.flush();
return true;
}
- try out.print("can't log into '{s}' \xe2\x80\x94 try /login codegraff | chatgpt | anthropic | console | kimi | xai | zai (others: /key <provider> <key>)\n", .{target});
+ try out.print("can't log into '{s}' \xe2\x80\x94 try /login codegraff | chatgpt | anthropic | console | claude-agent | kimi | xai | zai (others: /key <provider> <key>)\n", .{target});
try out.flush();
return true;
}
diff --git a/src/picker_auth.zig b/src/picker_auth.zig
index 3e8d0e88..003c8fdd 100644
--- a/src/picker_auth.zig
+++ b/src/picker_auth.zig
@@ -98,6 +98,12 @@ pub fn reloadLoginKey(root: *Agent, keys: *Keys, arena: Allocator, login_id: []c
source.* = .login;
reloaded = true;
}
+ } else if (std.mem.eql(u8, provider_id, "claude-agent")) {
+ if (@import("claude_agent_login.zig").enabled(root.io, arena, @import("anthropic_profile.zig").ProcessEnv{}, home)) |exe| {
+ value.* = root.arena.dupe(u8, exe) catch exe;
+ source.* = .login;
+ reloaded = true;
+ }
} else if (std.mem.eql(u8, provider_id, "chatgpt-new")) {
if (@import("oauth_chatgpt.zig").loadChatgptOAuth(root.io, root.gpa, arena, home, false, null)) |k| {
value.* = k;
diff --git a/src/pricing_models.zig b/src/pricing_models.zig
index 1dd4cffa..9ef6650a 100644
--- a/src/pricing_models.zig
+++ b/src/pricing_models.zig
@@ -32,6 +32,14 @@ pub const rows = [_]ModelInfo{
.{ .provider = "anthropic", .name = "claude-haiku-5-5", .context = 1_000_000 },
.{ .provider = "anthropic", .name = "claude-opus-4-5", .context = 200_000 },
.{ .provider = "anthropic", .name = "claude-sonnet-4-5", .context = 200_000 },
+ // Claude Agent (ADR 0309): Claude Code's own aliases (the prefix keeps
+ // bare `opus`/`sonnet` on their existing routes), which follow its current
+ // models. `claude-agent/<id>` passes any id Claude Code accepts. 200k is
+ // the window Claude Code reports without a `[1m]` suffix.
+ .{ .provider = "claude-agent", .name = "claude-agent-sonnet", .context = 200_000 },
+ .{ .provider = "claude-agent", .name = "claude-agent-opus", .context = 200_000 },
+ .{ .provider = "claude-agent", .name = "claude-agent-haiku", .context = 200_000 },
+ .{ .provider = "claude-agent", .name = "claude-agent-fable", .context = 200_000 },
.{ .provider = "deepseek", .name = "deepseek-v4-pro", .context = 1_000_000 },
.{ .provider = "deepseek", .name = "deepseek-v4-flash", .context = 1_000_000 },
.{ .provider = "deepseek", .name = "deepseek-chat", .context = 1_000_000 },
diff --git a/src/provider.zig b/src/provider.zig
index cdf954c5..6158b069 100644
--- a/src/provider.zig
+++ b/src/provider.zig
@@ -37,7 +37,7 @@ fn contextWindowFor(provider_id: []const u8, model: []const u8) u64 {
/// provider_specs; one additional OpenAI-compatible router may be loaded from
/// `.graff/.config.router` at startup.
pub const ProviderSpec = struct {
- pub const LoginKind = enum { api_key, codegraff_device, codex_device, kimi_device, xai_device, zai_cli, chatgpt_browser, anthropic_browser };
+ pub const LoginKind = enum { api_key, codegraff_device, codex_device, kimi_device, xai_device, zai_cli, chatgpt_browser, anthropic_browser, claude_cli };
pub const CatalogKind = enum { baked, codex, kimi, openai, anthropic };
id: []const u8,
@@ -131,6 +131,9 @@ pub const provider_specs = [_]ProviderSpec{
// (see loadCodexAuth), the same on-disk-credential trick used for the
// codegraff gateway key in ~/forge/.credentials.json.
.{ .id = "codex", .display_name = "Codex (ChatGPT)", .kind = .responses, .auth = .bearer, .url = "https://chatgpt.com/backend-api/codex/responses", .env_key = "CODEX_DISABLED", .default_model = "gpt-6-sol", .login = .codex_device, .sub_login = true, .catalog = .codex },
+ // claude-agent (ADR 0309): Claude through the user's own `claude` and its login, opted into with
+ // `graff login claude-agent`. No URL: claude_agent.zig drives the child. The "key" is its path.
+ .{ .id = "claude-agent", .display_name = "Claude Agent", .kind = .anthropic, .auth = .bearer, .url = "stdio:claude", .env_key = "GRAFF_CLAUDE_AGENT", .default_model = "claude-agent-sonnet", .login = .claude_cli, .sub_login = true, .takes_effort = true },
};
/// Optional workspace-local router loaded from `.graff/.config.router`.
diff --git a/src/rlm_query.zig b/src/rlm_query.zig
index 8ccd1da2..623d9387 100644
--- a/src/rlm_query.zig
+++ b/src/rlm_query.zig
@@ -40,6 +40,10 @@ pub fn run(ctx: ToolCtx, args_json: []const u8) ToolOutput {
};
}
defer if (permit) |*p| p.release();
+ // Claude Agent has no HTTP endpoint: every model call goes through the
+ // session's `claude` child (ADR 0309), which a nested query cannot share.
+ if (std.mem.eql(u8, ctx.provider.id, "claude-agent"))
+ return .{ .text = ctx.gpa.dupe(u8, "rlm: llm_query is not available on Claude Agent; work with the data directly") catch &.{}, .is_error = true };
const body = buildBody(ctx.gpa, ctx.provider, prompt) catch {
return .{ .text = ctx.gpa.dupe(u8, "rlm: llm_query could not build request") catch &.{}, .is_error = true };
};
diff --git a/src/route_report.zig b/src/route_report.zig
index b85b3ad6..cfc0507e 100644
--- a/src/route_report.zig
+++ b/src/route_report.zig
@@ -52,6 +52,7 @@ pub fn loginOnDisk(io: Io, arena: Allocator, home: []const u8, spec: provider_mo
.kimi_device => credential_store.oauthPath(arena, home, ".kimi"),
.xai_device => credential_store.oauthPath(arena, home, ".xai"),
.anthropic_browser => credential_store.oauthPath(arena, home, ".anthropic"),
+ .claude_cli => @import("claude_agent_login.zig").markerPath(arena, home),
.zai_cli => credential_store.oauthPath(arena, home, ".zai"),
.chatgpt_browser => return @import("oauth_chatgpt.zig").onDisk(io, arena, home),
.codex_device => blk: {
diff --git a/src/session_globals.zig b/src/session_globals.zig
index be8b9ff9..48f82fa9 100644
--- a/src/session_globals.zig
+++ b/src/session_globals.zig
@@ -15,4 +15,6 @@ pub fn release(gpa: Allocator, io: Io) void {
presence.deinit(gpa);
// #1196: filled by the first successful MCP tool result.
@import("mcp_shapes.zig").shutdown(io);
+ // ADR 0309: held `claude` children end with the run.
+ @import("claude_agent_session.zig").stopAll(io);
}
diff --git a/src/spec_provider_conformance.zig b/src/spec_provider_conformance.zig
index 07f0ea37..767b4ac0 100644
--- a/src/spec_provider_conformance.zig
+++ b/src/spec_provider_conformance.zig
@@ -35,6 +35,7 @@ fn loginName(l: ProviderSpec.LoginKind) []const u8 {
.zai_cli => "zai_cli",
.chatgpt_browser => "chatgpt_browser",
.anthropic_browser => "anthropic_browser",
+ .claude_cli => "claude_cli",
};
}
diff --git a/src/startup.zig b/src/startup.zig
index a6a61168..df6f551b 100644
--- a/src/startup.zig
+++ b/src/startup.zig
@@ -340,7 +340,7 @@ pub fn runSubcommand(io: Io, gpa: Allocator, arena: Allocator, init: std.process
// args.loginTarget owns the names.
if (flags.login_flag) {
const home = keys_cli.homeEnv(init.environ_map) orelse std.process.fatal("no HOME/USERPROFILE", .{});
- if (flags.anthropic_console_login) try @import("anthropic_profile.zig").login(io, arena, init.environ_map, home) else if (flags.anthropic_login) try @import("oauth_anthropic.zig").login(io, gpa, arena, home, flags.refresh_flag) else if (flags.chatgpt_login) try @import("oauth_chatgpt.zig").login(io, gpa, arena, home) else if (flags.xai_login) try oauth.xaiLogin(io, gpa, arena, home) else if (flags.kimi_login) try oauth.kimiLogin(io, gpa, arena, home) else if (flags.zai_login) try oauth.zaiLogin(io, gpa, arena, home) else if (flags.codex_login or flags.refresh_flag) try oauth.codexLogin(io, gpa, arena, home, flags.refresh_flag) else try oauth.codegraffLogin(io, gpa, arena, home);
+ if (flags.claude_agent_login) try @import("claude_agent_login.zig").login(io, arena, init.environ_map, home) else if (flags.anthropic_console_login) try @import("anthropic_profile.zig").login(io, arena, init.environ_map, home) else if (flags.anthropic_login) try @import("oauth_anthropic.zig").login(io, gpa, arena, home, flags.refresh_flag) else if (flags.chatgpt_login) try @import("oauth_chatgpt.zig").login(io, gpa, arena, home) else if (flags.xai_login) try oauth.xaiLogin(io, gpa, arena, home) else if (flags.kimi_login) try oauth.kimiLogin(io, gpa, arena, home) else if (flags.zai_login) try oauth.zaiLogin(io, gpa, arena, home) else if (flags.codex_login or flags.refresh_flag) try oauth.codexLogin(io, gpa, arena, home, flags.refresh_flag) else try oauth.codegraffLogin(io, gpa, arena, home);
return true;
}
@@ -348,8 +348,12 @@ pub fn runSubcommand(io: Io, gpa: Allocator, arena: Allocator, init: std.process
if (flags.positionals.items.len > 0 and std.mem.eql(u8, flags.positionals.items[0], "logout")) {
const home = keys_cli.homeEnv(init.environ_map) orelse std.process.fatal("no HOME/USERPROFILE", .{});
const target = if (flags.positionals.items.len > 1) flags.positionals.items[1] else "";
+ if (std.mem.eql(u8, @import("args.zig").loginTarget(target) orelse "", "claude-agent")) {
+ try @import("claude_agent_login.zig").logout(io, arena, home);
+ return true;
+ }
const plan = std.mem.eql(u8, @import("args.zig").loginTarget(target) orelse "", "chatgpt-new");
- if (!plan) std.process.fatal("graff logout supports: chatgpt", .{});
+ if (!plan) std.process.fatal("graff logout supports: chatgpt, claude-agent", .{});
try @import("oauth_chatgpt.zig").logout(io, gpa, arena, home);
return true;
}
diff --git a/src/startup_keys.zig b/src/startup_keys.zig
index 90115bbd..b84056ff 100644
--- a/src/startup_keys.zig
+++ b/src/startup_keys.zig
@@ -256,6 +256,7 @@ fn missingCredentials() noreturn {
\\ graff login anthropic Claude subscription browser sign-in (also: ant)
\\ graff key set <provider> <key> store a key (macOS Keychain, else 0600 file)
\\ graff login console Anthropic Console account (its workspace's API credits)
+ \\ graff login claude-agent your own Claude Code login, through `claude` (Claude Agent)
\\ export ANTHROPIC_API_KEY=sk-ant-… or CODEGRAFF/DEEPSEEK/OPENAI/MINIMAX/XIAOMI/KIMI/MOONSHOT/XAI/ZAI _API_KEY
\\a Codex CLI login (~/.codex/auth.json) is also picked up automatically.
, .{});
@@ -308,6 +309,16 @@ pub fn resolveKeysOptional(io: Io, gpa: Allocator, arena: Allocator, environ_map
codex_account = auth.account;
}
}
+ // Claude Agent (ADR 0309) is seated only once chosen: `graff login
+ // claude-agent` or GRAFF_CLAUDE_AGENT=1. Its "key" is the `claude` to run.
+ {
+ const exe = @import("claude_agent_login.zig").enabled(io, arena, environ_map, keys_cli.homeEnv(environ_map) orelse "");
+ for (provider_mod.provider_specs, &keys.values, &keys.sources) |spec, *value, *source| {
+ if (!std.mem.eql(u8, spec.id, "claude-agent")) continue;
+ value.* = exe;
+ source.* = if (exe != null) .login else .none;
+ }
+ }
// #471: the kimi/xAI device logins outrank their env keys, and the metered
// key is parked rather than dropped — credential_failover.preferPlan owns
// that policy. #274: the gate stays here because only startup knows what