@cabane/companion 0.6.226 → 0.6.228

package/dist/cli.js

@@ -2572,7 +2572,7 @@ var init_transcript_sink = __esm({
 });
 
 // packages/agent-runtime/src/turn-control/descriptions.ts
-var MAX_ASK_QUESTION_BYTES, MAX_ASK_HEADLINE_BYTES, MAX_ASK_ITEMS, EXCHANGE_KINDS, APPROVAL_OPTIONS, REQUEST_OPTIONS, EXCHANGE_EXPECTS, MAX_EXCHANGE_FILES, MAX_REQUEST_BODY_BYTES, MAX_ASK_OPTION_BYTES, ASK_OPTION_NOT_A_STRING, MIN_ASK_OPTIONS, MAX_ASK_OPTIONS, ASK_TARGET_PATTERN, ASK_TARGET_INVALID, MAX_WAKE_NOTE_BYTES, MAX_WITHDRAW_REASON_BYTES, MAX_SKIP_REASON_BYTES, TURN_CONTROL_MCP_SERVER, TURN_CONTROL_TOOLS, TURN_CONTROL_TOOL_DESCRIPTIONS, TURN_CONTROL_FIELD_DESCRIPTIONS;
+var MAX_ASK_QUESTION_BYTES, MAX_ASK_HEADLINE_BYTES, MAX_ASK_ITEMS, EXCHANGE_KINDS, APPROVAL_OPTIONS, MAX_EXCHANGE_ACTION_BYTES, REQUEST_OPTIONS, EXCHANGE_EXPECTS, MAX_EXCHANGE_FILES, MAX_REQUEST_BODY_BYTES, MAX_ASK_OPTION_BYTES, ASK_OPTION_NOT_A_STRING, MIN_ASK_OPTIONS, MAX_ASK_OPTIONS, ASK_TARGET_PATTERN, ASK_TARGET_INVALID, MAX_WAKE_NOTE_BYTES, MAX_WITHDRAW_REASON_BYTES, MAX_SKIP_REASON_BYTES, TURN_CONTROL_MCP_SERVER, TURN_CONTROL_TOOLS, TURN_CONTROL_TOOL_DESCRIPTIONS, TURN_CONTROL_FIELD_DESCRIPTIONS;
 var init_descriptions = __esm({
   "packages/agent-runtime/src/turn-control/descriptions.ts"() {
     "use strict";
@@ -2581,6 +2581,7 @@ var init_descriptions = __esm({
     MAX_ASK_ITEMS = 20;
     EXCHANGE_KINDS = ["question", "approval", "request"];
     APPROVAL_OPTIONS = ["Yes", "No"];
+    MAX_EXCHANGE_ACTION_BYTES = 32;
     REQUEST_OPTIONS = ["Done"];
     EXCHANGE_EXPECTS = ["confirmation", "result"];
     MAX_EXCHANGE_FILES = 5;
@@ -2605,8 +2606,8 @@ var init_descriptions = __esm({
     ];
     TURN_CONTROL_TOOL_DESCRIPTIONS = {
       answer: `Call this just before you write your answer: the text you write next is what the conversation keeps as your message. Call it once.`,
-      open_exchange: `Put something in front of one person that comes back with a recorded outcome, then end your turn; don't wait for it. Not for delivering finished work, and never for acknowledgement or feedback on it; the reply delivers. Open one only when the work can't continue without the answer. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name them with \`@handle\` in your reply.
-- A question is one item (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} items; never both. An approval or request is \`headline\` and an optional \`question\` body only. An approval is answered ${APPROVAL_OPTIONS.join(" / ")}; a request ${REQUEST_OPTIONS.join("")}, or the typed result when \`expects\` is \`result\`, or a note saying the person couldn't. A request's body carries the steps and may hold a list and code blocks; every other body is a sentence or two of framing, inline Markdown only.
+      open_exchange: `Put something in front of one person that comes back with a recorded outcome, then end your turn; don't wait for it. Not for delivering finished work, and never for acknowledgement or feedback on it; the reply delivers. Open one only when the work can't continue without the answer. \`targetUserId\` is a person; to bring in an agent, name them with \`@handle\` in your reply.
+- A question is one item (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} items; never both. An approval or request is \`headline\` and an optional \`question\` body only. An approval is answered by its \`go\` or \`hold\` word, ${APPROVAL_OPTIONS.join(" / ")} without them; a request ${REQUEST_OPTIONS.join("")}, or the typed result when \`expects\` is \`result\`, or a note saying the person couldn't. A request's body carries the steps and may hold a list and code blocks; every other body is a sentence or two of framing, inline Markdown only.
 - Decisions that arise together go in ONE call, in the order you want them answered. A second call is a separate exchange, never an edit.
 - Voice, in headline, body and options: "I" for yourself, never your own name; name everyone else who decides or acts, as on your roster. Never "you", "your", "we", "us", "our" or their contractions, nor "he", "she" or "they" for a named actor. A quotation stays accurate: say who said it.
 - It must stand alone, since it can arrive first: the reply carries the findings, the exchange the question; don't repeat the reply in it.
@@ -2622,7 +2623,9 @@ var init_descriptions = __esm({
       answer: {},
       open_exchange: {
         targetUserId: "The person: their `@handle` from your turn context's roster (preferred), or their user id.",
-        kind: `What the exchange is for; default \`question\`. \`question\`: the person picks among courses of action or types an answer. \`approval\`: a yes/no on one proposed action \u2014 the person answers ${APPROVAL_OPTIONS.join(" or ")}. \`request\`: something only the person can do \u2014 they answer ${REQUEST_OPTIONS.join("")}, or type the result when \`expects\` is \`result\`, or send a note saying they couldn't.`,
+        kind: `What the exchange is for; default \`question\`. \`question\`: the person picks among courses of action or types an answer. \`approval\`: a yes/no on one proposed action \u2014 the person answers with its \`go\` or \`hold\` word, ${APPROVAL_OPTIONS.join(" or ")} when none is given. \`request\`: something only the person can do \u2014 they answer ${REQUEST_OPTIONS.join("")}, or type the result when \`expects\` is \`result\`, or send a note saying they couldn't.`,
+        go: `An approval only: the go answer as the action itself, a short verb phrase ("Merge", "Send them", "Archive it"; not "Yes, merge it"), about 24 characters and at most ${MAX_EXCHANGE_ACTION_BYTES}. Given with \`hold\`, or neither: without them the person answers ${APPROVAL_OPTIONS.join(" or ")}.`,
+        hold: `An approval only: the hold answer in the same voice ("Hold off", "Not yet", "Keep it"), at most ${MAX_EXCHANGE_ACTION_BYTES} characters and different from \`go\`. Given with \`go\`.`,
         expects: "A request only: `confirmation` (default) when you only need to hear it's done, `result` when you need something back. Either way the person may send only a note saying they couldn't. Refused on a question or approval.",
         question: `The body beneath the headline \u2014 for a question or approval one or two sentences of framing, NOT a report (up to ${MAX_ASK_QUESTION_BYTES} characters, inline markdown only); for a request the steps, with lists and code blocks allowed (up to ${MAX_REQUEST_BODY_BYTES} characters). With \`questions\`, leave it out.`,
         headline: `ONE clear, capitalized sentence, up to ${MAX_ASK_HEADLINE_BYTES} characters: for a question or approval, the question ending in \`?\` ("Should Ledger deploy once Mia approves?"); for a request, what to do ("Run these and send me the output"). What the person reads first in For you. Required for an approval or request.`,
@@ -2819,8 +2822,10 @@ var init_pump = __esm({
 
 // packages/agent-runtime/src/turn-control/prompt-guidance.ts
 function turnControlPromptGuidance(prefix) {
-  const controls = TURN_CONTROL_TOOLS.map((name) => `\`${prefix}${name}\` (${MEANINGS[name]})`);
-  return `The turn tools are: ${controls.join("; ")}. Read a tool's description before calling it. A peer response is ordinary conversation speech; your reply is the answer.`;
+  return [
+    "Turn tools (read each description before calling):",
+    ...TURN_CONTROL_TOOLS.map((name) => `- \`${prefix}${name}\` \u2014 ${MEANINGS[name]}.`)
+  ].join("\n");
 }
 var MEANINGS;
 var init_prompt_guidance = __esm({
@@ -2829,8 +2834,8 @@ var init_prompt_guidance = __esm({
     init_descriptions();
     MEANINGS = {
       answer: "declare the text you write next as your answer",
-      open_exchange: "put a question, go-ahead or request to a person",
-      cancel_wake: "cancel your own armed wake in this conversation",
+      open_exchange: "ask a person for a decision, approval or action",
+      cancel_wake: "cancel your scheduled return to this conversation",
       skip_turn: "end without posting a reply",
       wake_me: "schedule your own return; when it fires, say what you came back to check",
       withdraw_exchange: "withdraw an open exchange in this conversation with a reason"
@@ -2845,15 +2850,14 @@ var init_addendum = __esm({
     "use strict";
     init_prompt_guidance();
     CLAUDE_CODE_ADDENDUM = [
-      "On this harness the Cabane tools register under MCP prefixes. The workspace tools are",
-      "`mcp__cabane__query`, `mcp__cabane__mutate` and `mcp__cabane__describe`; the ancillary",
-      "tools are `mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`,",
-      "`mcp__cabane__finalize_upload`, and `mcp__cabane__mint_render_token`.",
-      turnControlPromptGuidance("mcp__cabane_companion__"),
-      "Where this prompt names a tool by its bare verb, call",
-      "the prefixed form from your tool list. Your harness's own tools (shell, local file",
-      "read/edit) keep their ordinary names and act on the local machine only."
-    ].join(" ");
+      "- Workspace tools: `mcp__cabane__query`, `mcp__cabane__mutate`, `mcp__cabane__describe`.",
+      "- File tools: `mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload`.",
+      "- Page verification: `mcp__cabane__mint_render_token`.",
+      "- Where these instructions use a bare tool name, call its prefixed form from the tool list.",
+      "- Host tools such as the shell and local file editor keep their ordinary names and act on the local device.",
+      "",
+      turnControlPromptGuidance("mcp__cabane_companion__")
+    ].join("\n");
   }
 });
 
@@ -3701,17 +3705,14 @@ var init_addendum2 = __esm({
     "use strict";
     init_prompt_guidance();
     OPENCODE_ADDENDUM = [
-      "Every tool here goes by its plain name: the workspace tools are `query`, `mutate` and",
-      "`describe`.",
-      turnControlPromptGuidance(""),
-      "The ancillary tools are `read_binary`, `upload`, `begin_upload`,",
-      "`finalize_upload`, `mint_render_token`; and the host tools are plain verbs too (`bash`,",
-      "`read`, `edit`). Mind the collision: a bare `read` or `edit` is the HOST tool, acting on the",
-      "local machine \u2014 a workspace read is `query` with the operation name `files.read`. The",
-      "collision runs the other way too: `read` is a host tool here AND `files.read` is an",
-      "operation name, so keep the bare verb and the dotted name apart. If a tool ever appears with",
-      "an `mcp__\u2026__` prefix, that prefix is not part of its name here."
-    ].join(" ");
+      "- Workspace tools: `query`, `mutate`, `describe`.",
+      "- File tools: `read_binary`, `upload`, `begin_upload`, `finalize_upload`.",
+      "- Page verification: `mint_render_token`.",
+      "- Call tools by their plain names here, without an `mcp__\u2026__` prefix.",
+      "- Host tools such as `bash`, `read` and `edit` act on the local device. To read a workspace file, call `query` with the operation `files.read`.",
+      "",
+      turnControlPromptGuidance("")
+    ].join("\n");
   }
 });
 
@@ -4444,23 +4445,14 @@ var init_addendum3 = __esm({
     "use strict";
     init_prompt_guidance();
     CODEX_ADDENDUM = [
-      "Codex surfaces MCP tools under qualified names, and on some versions defers them. The",
-      "workspace tools are `mcp__cabane__query`, `mcp__cabane__mutate` and",
-      "`mcp__cabane__describe` \u2014 if they aren't in your visible tool list, locate them in",
-      "the deferred-tool inventory and invoke those exact qualified names; never conclude the",
-      "workspace is",
-      "absent without attempting discovery and invocation, and if a call fails, report the recorded",
-      "error.",
-      turnControlPromptGuidance("mcp__cabane_companion__"),
-      // Every ancillary tool is written as Codex's own tool list shows it — qualified — so the sentence
-      // instructing exact qualified names doesn't contradict itself. The bare `query` / `mutate` below
-      // stay: that sentence is about operation names, after the qualified forms are given.
-      "The ancillary tools are `mcp__cabane__read_binary`, `mcp__cabane__upload`,",
-      "`mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload` and",
-      "`mcp__cabane__mint_render_token` \u2014 all possibly deferred too.",
-      "There is no Cabane `read`/`write`/`search` tool \u2014 those are",
-      "operation NAMES you pass to `query` / `mutate`."
-    ].join(" ");
+      "- Workspace tools: `mcp__cabane__query`, `mcp__cabane__mutate`, `mcp__cabane__describe`.",
+      "- File tools: `mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload`.",
+      "- Page verification: `mcp__cabane__mint_render_token`.",
+      "- Codex may defer MCP tools. If a listed tool is missing, search the deferred-tool inventory and call the matching tool by its exact name. Report discovery or call failures with the recorded error.",
+      "- Names such as `files.read` are operations passed to `query` or `mutate`, not separate tools.",
+      "",
+      turnControlPromptGuidance("mcp__cabane_companion__")
+    ].join("\n");
   }
 });
 
@@ -6252,6 +6244,8 @@ function createTurnControlMcpServer(acts, skipState) {
               ).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange["questions.options"])
             })
           ).min(1).max(MAX_ASK_ITEMS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange.questions),
+          go: z15.string().min(1).max(MAX_EXCHANGE_ACTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange.go),
+          hold: z15.string().min(1).max(MAX_EXCHANGE_ACTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange.hold),
           files: z15.array(z15.string().min(1).max(1024)).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange.files),
           replaces: z15.object({
             askId: z15.string().uuid().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange["replaces.askId"]),
@@ -6275,6 +6269,11 @@ function createTurnControlMcpServer(acts, skipState) {
                 ...args.question ? { question: args.question } : {},
                 ...args.options ? { options: args.options } : {},
                 ...args.questions ? { questions: args.questions } : {},
+                // Forwarded whole, so the server's rule (both or neither, an
+                // approval's only) refuses them by name rather than one half
+                // being dropped here unseen.
+                ...args.go !== void 0 ? { go: args.go } : {},
+                ...args.hold !== void 0 ? { hold: args.hold } : {},
                 ...args.files ? { files: args.files } : {}
               }
             });

package/dist/runtime.js

@@ -2939,6 +2939,7 @@ var MAX_ASK_QUESTION_BYTES = 400;
 var MAX_ASK_HEADLINE_BYTES = 120;
 var MAX_ASK_ITEMS = 20;
 var APPROVAL_OPTIONS = ["Yes", "No"];
+var MAX_EXCHANGE_ACTION_BYTES = 32;
 var REQUEST_OPTIONS = ["Done"];
 var MAX_EXCHANGE_FILES = 5;
 var MAX_REQUEST_BODY_BYTES = 2e3;
@@ -2959,8 +2960,8 @@ var TURN_CONTROL_TOOLS = [
 ];
 var TURN_CONTROL_TOOL_DESCRIPTIONS = {
   answer: `Call this just before you write your answer: the text you write next is what the conversation keeps as your message. Call it once.`,
-  open_exchange: `Put something in front of one person that comes back with a recorded outcome, then end your turn; don't wait for it. Not for delivering finished work, and never for acknowledgement or feedback on it; the reply delivers. Open one only when the work can't continue without the answer. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name them with \`@handle\` in your reply.
-- A question is one item (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} items; never both. An approval or request is \`headline\` and an optional \`question\` body only. An approval is answered ${APPROVAL_OPTIONS.join(" / ")}; a request ${REQUEST_OPTIONS.join("")}, or the typed result when \`expects\` is \`result\`, or a note saying the person couldn't. A request's body carries the steps and may hold a list and code blocks; every other body is a sentence or two of framing, inline Markdown only.
+  open_exchange: `Put something in front of one person that comes back with a recorded outcome, then end your turn; don't wait for it. Not for delivering finished work, and never for acknowledgement or feedback on it; the reply delivers. Open one only when the work can't continue without the answer. \`targetUserId\` is a person; to bring in an agent, name them with \`@handle\` in your reply.
+- A question is one item (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} items; never both. An approval or request is \`headline\` and an optional \`question\` body only. An approval is answered by its \`go\` or \`hold\` word, ${APPROVAL_OPTIONS.join(" / ")} without them; a request ${REQUEST_OPTIONS.join("")}, or the typed result when \`expects\` is \`result\`, or a note saying the person couldn't. A request's body carries the steps and may hold a list and code blocks; every other body is a sentence or two of framing, inline Markdown only.
 - Decisions that arise together go in ONE call, in the order you want them answered. A second call is a separate exchange, never an edit.
 - Voice, in headline, body and options: "I" for yourself, never your own name; name everyone else who decides or acts, as on your roster. Never "you", "your", "we", "us", "our" or their contractions, nor "he", "she" or "they" for a named actor. A quotation stays accurate: say who said it.
 - It must stand alone, since it can arrive first: the reply carries the findings, the exchange the question; don't repeat the reply in it.
@@ -2976,7 +2977,9 @@ var TURN_CONTROL_FIELD_DESCRIPTIONS = {
   answer: {},
   open_exchange: {
     targetUserId: "The person: their `@handle` from your turn context's roster (preferred), or their user id.",
-    kind: `What the exchange is for; default \`question\`. \`question\`: the person picks among courses of action or types an answer. \`approval\`: a yes/no on one proposed action \u2014 the person answers ${APPROVAL_OPTIONS.join(" or ")}. \`request\`: something only the person can do \u2014 they answer ${REQUEST_OPTIONS.join("")}, or type the result when \`expects\` is \`result\`, or send a note saying they couldn't.`,
+    kind: `What the exchange is for; default \`question\`. \`question\`: the person picks among courses of action or types an answer. \`approval\`: a yes/no on one proposed action \u2014 the person answers with its \`go\` or \`hold\` word, ${APPROVAL_OPTIONS.join(" or ")} when none is given. \`request\`: something only the person can do \u2014 they answer ${REQUEST_OPTIONS.join("")}, or type the result when \`expects\` is \`result\`, or send a note saying they couldn't.`,
+    go: `An approval only: the go answer as the action itself, a short verb phrase ("Merge", "Send them", "Archive it"; not "Yes, merge it"), about 24 characters and at most ${MAX_EXCHANGE_ACTION_BYTES}. Given with \`hold\`, or neither: without them the person answers ${APPROVAL_OPTIONS.join(" or ")}.`,
+    hold: `An approval only: the hold answer in the same voice ("Hold off", "Not yet", "Keep it"), at most ${MAX_EXCHANGE_ACTION_BYTES} characters and different from \`go\`. Given with \`go\`.`,
     expects: "A request only: `confirmation` (default) when you only need to hear it's done, `result` when you need something back. Either way the person may send only a note saying they couldn't. Refused on a question or approval.",
     question: `The body beneath the headline \u2014 for a question or approval one or two sentences of framing, NOT a report (up to ${MAX_ASK_QUESTION_BYTES} characters, inline markdown only); for a request the steps, with lists and code blocks allowed (up to ${MAX_REQUEST_BODY_BYTES} characters). With \`questions\`, leave it out.`,
     headline: `ONE clear, capitalized sentence, up to ${MAX_ASK_HEADLINE_BYTES} characters: for a question or approval, the question ending in \`?\` ("Should Ledger deploy once Mia approves?"); for a request, what to do ("Run these and send me the output"). What the person reads first in For you. Required for an approval or request.`,
@@ -3013,28 +3016,29 @@ import {
 // packages/agent-runtime/src/turn-control/prompt-guidance.ts
 var MEANINGS = {
   answer: "declare the text you write next as your answer",
-  open_exchange: "put a question, go-ahead or request to a person",
-  cancel_wake: "cancel your own armed wake in this conversation",
+  open_exchange: "ask a person for a decision, approval or action",
+  cancel_wake: "cancel your scheduled return to this conversation",
   skip_turn: "end without posting a reply",
   wake_me: "schedule your own return; when it fires, say what you came back to check",
   withdraw_exchange: "withdraw an open exchange in this conversation with a reason"
 };
 function turnControlPromptGuidance(prefix) {
-  const controls = TURN_CONTROL_TOOLS.map((name) => `\`${prefix}${name}\` (${MEANINGS[name]})`);
-  return `The turn tools are: ${controls.join("; ")}. Read a tool's description before calling it. A peer response is ordinary conversation speech; your reply is the answer.`;
+  return [
+    "Turn tools (read each description before calling):",
+    ...TURN_CONTROL_TOOLS.map((name) => `- \`${prefix}${name}\` \u2014 ${MEANINGS[name]}.`)
+  ].join("\n");
 }
 
 // packages/agent-runtime/src/claude-code/addendum.ts
 var CLAUDE_CODE_ADDENDUM = [
-  "On this harness the Cabane tools register under MCP prefixes. The workspace tools are",
-  "`mcp__cabane__query`, `mcp__cabane__mutate` and `mcp__cabane__describe`; the ancillary",
-  "tools are `mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`,",
-  "`mcp__cabane__finalize_upload`, and `mcp__cabane__mint_render_token`.",
-  turnControlPromptGuidance("mcp__cabane_companion__"),
-  "Where this prompt names a tool by its bare verb, call",
-  "the prefixed form from your tool list. Your harness's own tools (shell, local file",
-  "read/edit) keep their ordinary names and act on the local machine only."
-].join(" ");
+  "- Workspace tools: `mcp__cabane__query`, `mcp__cabane__mutate`, `mcp__cabane__describe`.",
+  "- File tools: `mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload`.",
+  "- Page verification: `mcp__cabane__mint_render_token`.",
+  "- Where these instructions use a bare tool name, call its prefixed form from the tool list.",
+  "- Host tools such as the shell and local file editor keep their ordinary names and act on the local device.",
+  "",
+  turnControlPromptGuidance("mcp__cabane_companion__")
+].join("\n");
 
 // packages/agent-runtime/src/mcp-secret-env.ts
 function headersAsEnvReferences(server) {
@@ -3760,17 +3764,14 @@ var claudeCodeAdapter = createClaudeCodeAdapter();
 
 // packages/agent-runtime/src/opencode/addendum.ts
 var OPENCODE_ADDENDUM = [
-  "Every tool here goes by its plain name: the workspace tools are `query`, `mutate` and",
-  "`describe`.",
-  turnControlPromptGuidance(""),
-  "The ancillary tools are `read_binary`, `upload`, `begin_upload`,",
-  "`finalize_upload`, `mint_render_token`; and the host tools are plain verbs too (`bash`,",
-  "`read`, `edit`). Mind the collision: a bare `read` or `edit` is the HOST tool, acting on the",
-  "local machine \u2014 a workspace read is `query` with the operation name `files.read`. The",
-  "collision runs the other way too: `read` is a host tool here AND `files.read` is an",
-  "operation name, so keep the bare verb and the dotted name apart. If a tool ever appears with",
-  "an `mcp__\u2026__` prefix, that prefix is not part of its name here."
-].join(" ");
+  "- Workspace tools: `query`, `mutate`, `describe`.",
+  "- File tools: `read_binary`, `upload`, `begin_upload`, `finalize_upload`.",
+  "- Page verification: `mint_render_token`.",
+  "- Call tools by their plain names here, without an `mcp__\u2026__` prefix.",
+  "- Host tools such as `bash`, `read` and `edit` act on the local device. To read a workspace file, call `query` with the operation `files.read`.",
+  "",
+  turnControlPromptGuidance("")
+].join("\n");
 
 // packages/agent-runtime/src/opencode/events.ts
 function asRecord(v) {
@@ -4430,23 +4431,14 @@ var opencodeAdapter = createOpencodeAdapter();
 
 // packages/agent-runtime/src/codex/addendum.ts
 var CODEX_ADDENDUM = [
-  "Codex surfaces MCP tools under qualified names, and on some versions defers them. The",
-  "workspace tools are `mcp__cabane__query`, `mcp__cabane__mutate` and",
-  "`mcp__cabane__describe` \u2014 if they aren't in your visible tool list, locate them in",
-  "the deferred-tool inventory and invoke those exact qualified names; never conclude the",
-  "workspace is",
-  "absent without attempting discovery and invocation, and if a call fails, report the recorded",
-  "error.",
-  turnControlPromptGuidance("mcp__cabane_companion__"),
-  // Every ancillary tool is written as Codex's own tool list shows it — qualified — so the sentence
-  // instructing exact qualified names doesn't contradict itself. The bare `query` / `mutate` below
-  // stay: that sentence is about operation names, after the qualified forms are given.
-  "The ancillary tools are `mcp__cabane__read_binary`, `mcp__cabane__upload`,",
-  "`mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload` and",
-  "`mcp__cabane__mint_render_token` \u2014 all possibly deferred too.",
-  "There is no Cabane `read`/`write`/`search` tool \u2014 those are",
-  "operation NAMES you pass to `query` / `mutate`."
-].join(" ");
+  "- Workspace tools: `mcp__cabane__query`, `mcp__cabane__mutate`, `mcp__cabane__describe`.",
+  "- File tools: `mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`, `mcp__cabane__finalize_upload`.",
+  "- Page verification: `mcp__cabane__mint_render_token`.",
+  "- Codex may defer MCP tools. If a listed tool is missing, search the deferred-tool inventory and call the matching tool by its exact name. Report discovery or call failures with the recorded error.",
+  "- Names such as `files.read` are operations passed to `query` or `mutate`, not separate tools.",
+  "",
+  turnControlPromptGuidance("mcp__cabane_companion__")
+].join("\n");
 
 // packages/agent-runtime/src/codex/events.ts
 function asRecord3(v) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.226",
+  "version": "0.6.228",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",