Skip to content

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

Python

Merge branch 'main' into fix/acp-command-intent-1814

justrachaedee447e5f8
diff --cc docs/adr/0315-acp-explicit-command-intent.md
index a21e08c6,00000000..30e46fe9
mode 100644,000000..100644
--- a/docs/adr/0315-acp-explicit-command-intent.md
+++ b/docs/adr/0315-acp-explicit-command-intent.md
@@@ -1,19 -1,0 +1,19 @@@
- # 0313 — ACP command selection is separate from prompt text
++# 0315 — ACP command selection is separate from prompt text
+
+## Context
+
+A Harness prompt beginning with ordinary slash prose was rejected as an unknown command before the agent saw it (#1814). A subsequent retry could refer to a session with no saved model history. Known slash names used as prose can also accidentally change goal, review or issue state.
+
+## Decision
+
+Harness preserves canonical completion selections until the ACP adapter builds `session/prompt`. It sends readable prompt content and a boolean `_meta["harness/command"]`: true only for a leading, explicitly accepted native command or native skill command; false for ordinary text, including known slash names. This marker gates both local slash dispatch and live-turn command expansion (goal/loop, review, issue, side requests and playbook overrides), in ACP v1 and v2.
+
+Clients that omit the marker retain existing ACP command syntax. The terminal REPL is unchanged. Literal text is not escaped, prefixed with invisible characters, or rewritten to evade parsing.
+
+## Consequences
+
+Both Harness and graff must carry this intent end to end. User-visible command labels alone cannot recover completion acceptance after it has been discarded. A missing native save must not be treated as a successfully restored conversation; Harness stops failed Graff restores instead of silently sending the retry into an empty session.
+
+## Evidence
+
+`acp_engine_test` covers explicit selection and legacy behavior in both protocol versions. `scripts/test-acp-slash-typo.py` checks literal prompt delivery, command expansion, selected commands, and a worker restart followed by a retry retaining the original synthetic task.
diff --cc docs/adr/README.md
index ea5818ed,aacd821a..740a6112
--- a/docs/adr/README.md
+++ b/docs/adr/README.md
@@@ -337,7 -337,8 +337,9 @@@ record only when you need the evidence
| [0310](0310-auth-failures-name-the-rejected-credential.md) | A terminal auth rejection names the seat that failed: sign-in text keeps "sign in again"; key and promoted-key texts say "API key was rejected" and never the signed-out phrases. Key seats carry `{"kind":"api_key_rejected","provider":…}` (v1 `-32603` data, v2 `_meta["graff/recovery"]`); `reauth_required` is unchanged. |
| [0311](0311-tool-refresh-and-addressed-wakes.md) | Claude Agent refreshes a changed tool list with MCP `tools/list_changed` (served before anything else; fresh session if not re-read in 15 s) instead of removing and re-adding its server, which failed held calls. `attempt_completion` settles a task like a final answer: room mail waits for the next human prompt, addressed mail can still start a turn; `yield_turn` stays strict. A peer wake preloads `peer_message`. |
| [0312](0312-openai-12h-prompt-cache-is-opt-in.md) | OpenAI Responses GPT-5.6+ can put a 12h explicit breakpoint on the stable prefix (`GRAFF_OPENAI_CACHE_TTL=12h` or `openai_cache_ttl`); the default stays 30m (ADR 0009 bytes) until a live probe confirms OpenAI accepts the field and keeps the entry. Usage parses cache writes by TTL. |
- | [0313](0313-acp-explicit-command-intent.md) | Harness carries explicit command completion intent in ACP `_meta["harness/command"]`; literal slash prose bypasses dispatch and expansion, while legacy clients retain their syntax. |
+ | [0313](0313-graff-does-not-load-codex-computer-use.md) | Graff does not load Codex's `computer-use` or `unified-computer-use` plugins; every MCP elicitation is declined. Supersedes 0036 and 0119. |
+ | [0314](0314-nanocua-is-grafts-computer-use.md) | Computer use on macOS is nanocua, a signed app shipped beside graff and offered as one MCP server; it works inside one app in the background, and the app's panel, not graff, says what it may do: graff and Harness can read its state and turn things off, but turning anything on takes a person's click in its window. nanoui's copy is generated from codegraff's and keeps codegraff's license. |
++| [0315](0315-acp-explicit-command-intent.md) | Harness carries explicit command completion intent in ACP `_meta["harness/command"]`; literal slash prose bypasses dispatch and expansion, while legacy clients retain their syntax. |
| [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. |