@cabane/companion 0.6.227 → 0.6.228

package/dist/cli.js

@@ -2822,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({
@@ -2832,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"
@@ -2848,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");
   }
 });
 
@@ -3704,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");
   }
 });
 
@@ -4447,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");
   }
 });
 

package/dist/runtime.js

@@ -3016,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) {
@@ -3763,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) {
@@ -4433,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.227",
+  "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",