@cabane/companion 0.6.4 → 0.6.6

package/dist/cli.js

@@ -2827,7 +2827,17 @@ import {
 } from "@anthropic-ai/claude-agent-sdk";
 
 // packages/agent-runtime/src/claude-code/addendum.ts
-var CLAUDE_CODE_ADDENDUM = "";
+var CLAUDE_CODE_ADDENDUM = [
+  "On this harness the Cabane tools register under MCP prefixes. The workspace tool is",
+  "`mcp__cabane__sdk`; the ancillary tools are `mcp__cabane__list_workspaces`,",
+  "`mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`,",
+  "`mcp__cabane__finalize_upload`, and `mcp__cabane__mint_render_token`; the turn tools are",
+  "`mcp__cabane_companion__ask`, `mcp__cabane_companion__wake_me`,",
+  "`mcp__cabane_companion__summon_agent`, `mcp__cabane_companion__sub_agent`, and",
+  "`mcp__cabane_companion__skip_turn`. 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(" ");
 
 // packages/agent-runtime/src/claude-code/policy.ts
 import { z as z9 } from "zod";
@@ -3612,19 +3622,15 @@ function selectAdapter(registry, runtime) {
 
 // packages/agent-runtime/src/opencode/addendum.ts
 var OPENCODE_ADDENDUM = [
-  "Your one Cabane workspace tool has a plain name \u2014 `sdk` (you act on the",
-  "workspace by writing a TypeScript program and calling `sdk` with it); the",
-  "turn-control verbs (`ask`, `wake_me`, `summon_agent`, `skip_turn`) are",
-  "plain-named too, as are the few ancillary cabane tools (`list_workspaces`,",
-  "`read_binary`, `upload`, `begin_upload`, `finalize_upload`,",
-  "`mint_render_token`), and the host tools are plain verbs (`bash`, `read`,",
-  "`edit`). There is no `write`/`search`/`edit` CABANE tool here \u2014 those are",
-  "`cabane` SDK calls inside your program, not tools (a bare `read`/`edit` is the",
-  "HOST tool). If a tool appears in this prompt with an `mcp__\u2026__` prefix, that",
-  "prefix is not part of its name \u2014 call the tool by its plain verb. Write your",
-  "closing reply as the last thing you say in the turn: you can interleave",
-  "narration with tool calls, but only your final message is recorded as the",
-  "turn\u2019s reply."
+  "Every tool here goes by its plain name: the workspace tool is `sdk`; the turn tools are",
+  "`ask`, `wake_me`, `summon_agent`, `sub_agent`, `skip_turn`; the ancillary tools are",
+  "`list_workspaces`, `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 `cabane.files.read` inside an `sdk` program. If a tool ever appears with",
+  "an `mcp__\u2026__` prefix, that prefix is not part of its name here. One more harness fact: you",
+  "can interleave narration with tool calls, but only your final message is recorded as the",
+  "turn's reply \u2014 write your closing answer last."
 ].join(" ");
 
 // packages/agent-runtime/src/opencode/events.ts
@@ -4577,22 +4583,17 @@ var OPENCODE_CONFORMANCE_FIXTURES = [
 
 // packages/agent-runtime/src/codex/addendum.ts
 var CODEX_ADDENDUM = [
-  "Your Cabane workspace tool is exposed to Codex as the qualified MCP tool",
-  "`mcp__cabane__sdk`. On Codex versions that defer MCP tools, locate it in the",
-  "`functions.exec` deferred-tool inventory and invoke that exact qualified tool",
-  "from the exec program; do not look for or call a bare top-level `sdk` tool.",
-  "If discovery or an invocation fails, report the recorded tool error; never",
-  "declare the SDK absent without attempting discovery and invocation. The SDK",
-  "call runs a TypeScript program against the ambient `cabane` object. The",
-  "turn-control verbs (`ask`, `wake_me`, `summon_agent`, `skip_turn`) are",
-  "qualified `mcp__cabane_companion__\u2026` tools (and may be deferred too), as are",
-  "the few ancillary cabane tools (`mcp__cabane__list_workspaces`,",
-  "`mcp__cabane__read_binary`, the upload tools, `mcp__cabane__mint_render_token`).",
-  "There is no Cabane `read`/`write`/`search`/`edit` tool here \u2014 those are `cabane`",
-  "SDK calls inside your program, not tools. If a tool appears in this prompt with",
-  "an `mcp__\u2026__` prefix, preserve that qualified name. Write your closing reply as",
-  "the last thing you say in the turn: you can interleave narration with tool",
-  "calls, but only your final message is recorded as the turn\u2019s reply."
+  "Codex surfaces MCP tools under qualified names, and on some versions defers them. The",
+  "workspace tool is `mcp__cabane__sdk` \u2014 if it isn't in your visible tool list, locate it in",
+  "the deferred-tool inventory and invoke that exact qualified name; never conclude the SDK is",
+  "absent without attempting discovery and invocation, and if a call fails, report the recorded",
+  "error. The turn tools are `mcp__cabane_companion__ask` / `wake_me` / `summon_agent` /",
+  "`sub_agent` / `skip_turn`, and the ancillary tools `mcp__cabane__list_workspaces` /",
+  "`read_binary` / `upload` / `begin_upload` / `finalize_upload` / `mint_render_token` \u2014 all",
+  "possibly deferred too. There is no Cabane `read`/`write`/`search` tool \u2014 those are",
+  "`cabane.*` calls inside your program. One more harness fact: you can interleave narration",
+  "with tool calls, but only your final message is recorded as the turn's reply \u2014 write your",
+  "closing answer last."
 ].join(" ");
 
 // packages/agent-runtime/src/codex/events.ts
@@ -4980,6 +4981,7 @@ function buildConfig(req) {
   }
   const policy = codexToolPolicy(req.policy);
   const tmpDir = req.local.env?.TMPDIR;
+  const gateLockDir = req.local.env?.CABANE_GATE_LOCK_DIR;
   return {
     mcp_servers,
     experimental_use_rmcp_client: true,
@@ -4997,7 +4999,9 @@ function buildConfig(req) {
         [policy.permissionProfile]: {
           filesystem: {
             ":root": "read",
-            ":workspace_roots": { ".": "write", ".git": "write" }
+            ":workspace_roots": { ".": "write", ".git": "write" },
+            // The one absolute-path grant — see the CT612-fallout note above.
+            ...gateLockDir ? { [gateLockDir]: "write" } : {}
           },
           network: { enabled: policy.networkAccessEnabled, mode: "full" }
         }
@@ -7254,6 +7258,9 @@ ${reason}`,
         );
       }
     }
+    if (turnContext.runtime === "codex" && process.env.CABANE_GATE_LOCK_DIR) {
+      turnEnv = { ...turnEnv, CABANE_GATE_LOCK_DIR: process.env.CABANE_GATE_LOCK_DIR };
+    }
     const key = runKey(payload.conversationId, payload.agentId);
     const abortController = new AbortController();
     this.aborts.set(key, abortController);
@@ -7280,13 +7287,13 @@ ${reason}`,
     const wakeState = createWakeState();
     const subAgentCreate = async (args) => {
       const dispatchTarget = args.agentId ?? payload.agentId;
-      const channelId = turnContext.conversation.channelId;
+      const projectId = turnContext.conversation.projectId;
       const { status: status2, body } = await this.opts.api.createSubAgentConversation(
         workspaceId,
         payload.conversationId,
         turnContext.turnToken ?? this.opts.credential,
         {
-          ...channelId ? { channelId } : {},
+          ...projectId ? { projectId } : {},
           ...args.title ? { title: args.title } : {},
           body: args.prompt,
           dispatch: dispatchTarget,

package/dist/runtime.js

@@ -2480,7 +2480,17 @@ import {
 } from "@anthropic-ai/claude-agent-sdk";
 
 // packages/agent-runtime/src/claude-code/addendum.ts
-var CLAUDE_CODE_ADDENDUM = "";
+var CLAUDE_CODE_ADDENDUM = [
+  "On this harness the Cabane tools register under MCP prefixes. The workspace tool is",
+  "`mcp__cabane__sdk`; the ancillary tools are `mcp__cabane__list_workspaces`,",
+  "`mcp__cabane__read_binary`, `mcp__cabane__upload`, `mcp__cabane__begin_upload`,",
+  "`mcp__cabane__finalize_upload`, and `mcp__cabane__mint_render_token`; the turn tools are",
+  "`mcp__cabane_companion__ask`, `mcp__cabane_companion__wake_me`,",
+  "`mcp__cabane_companion__summon_agent`, `mcp__cabane_companion__sub_agent`, and",
+  "`mcp__cabane_companion__skip_turn`. 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(" ");
 
 // packages/agent-runtime/src/claude-code/policy.ts
 import { z as z9 } from "zod";
@@ -3265,19 +3275,15 @@ function selectAdapter(registry, runtime) {
 
 // packages/agent-runtime/src/opencode/addendum.ts
 var OPENCODE_ADDENDUM = [
-  "Your one Cabane workspace tool has a plain name \u2014 `sdk` (you act on the",
-  "workspace by writing a TypeScript program and calling `sdk` with it); the",
-  "turn-control verbs (`ask`, `wake_me`, `summon_agent`, `skip_turn`) are",
-  "plain-named too, as are the few ancillary cabane tools (`list_workspaces`,",
-  "`read_binary`, `upload`, `begin_upload`, `finalize_upload`,",
-  "`mint_render_token`), and the host tools are plain verbs (`bash`, `read`,",
-  "`edit`). There is no `write`/`search`/`edit` CABANE tool here \u2014 those are",
-  "`cabane` SDK calls inside your program, not tools (a bare `read`/`edit` is the",
-  "HOST tool). If a tool appears in this prompt with an `mcp__\u2026__` prefix, that",
-  "prefix is not part of its name \u2014 call the tool by its plain verb. Write your",
-  "closing reply as the last thing you say in the turn: you can interleave",
-  "narration with tool calls, but only your final message is recorded as the",
-  "turn\u2019s reply."
+  "Every tool here goes by its plain name: the workspace tool is `sdk`; the turn tools are",
+  "`ask`, `wake_me`, `summon_agent`, `sub_agent`, `skip_turn`; the ancillary tools are",
+  "`list_workspaces`, `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 `cabane.files.read` inside an `sdk` program. If a tool ever appears with",
+  "an `mcp__\u2026__` prefix, that prefix is not part of its name here. One more harness fact: you",
+  "can interleave narration with tool calls, but only your final message is recorded as the",
+  "turn's reply \u2014 write your closing answer last."
 ].join(" ");
 
 // packages/agent-runtime/src/opencode/events.ts
@@ -4230,22 +4236,17 @@ var OPENCODE_CONFORMANCE_FIXTURES = [
 
 // packages/agent-runtime/src/codex/addendum.ts
 var CODEX_ADDENDUM = [
-  "Your Cabane workspace tool is exposed to Codex as the qualified MCP tool",
-  "`mcp__cabane__sdk`. On Codex versions that defer MCP tools, locate it in the",
-  "`functions.exec` deferred-tool inventory and invoke that exact qualified tool",
-  "from the exec program; do not look for or call a bare top-level `sdk` tool.",
-  "If discovery or an invocation fails, report the recorded tool error; never",
-  "declare the SDK absent without attempting discovery and invocation. The SDK",
-  "call runs a TypeScript program against the ambient `cabane` object. The",
-  "turn-control verbs (`ask`, `wake_me`, `summon_agent`, `skip_turn`) are",
-  "qualified `mcp__cabane_companion__\u2026` tools (and may be deferred too), as are",
-  "the few ancillary cabane tools (`mcp__cabane__list_workspaces`,",
-  "`mcp__cabane__read_binary`, the upload tools, `mcp__cabane__mint_render_token`).",
-  "There is no Cabane `read`/`write`/`search`/`edit` tool here \u2014 those are `cabane`",
-  "SDK calls inside your program, not tools. If a tool appears in this prompt with",
-  "an `mcp__\u2026__` prefix, preserve that qualified name. Write your closing reply as",
-  "the last thing you say in the turn: you can interleave narration with tool",
-  "calls, but only your final message is recorded as the turn\u2019s reply."
+  "Codex surfaces MCP tools under qualified names, and on some versions defers them. The",
+  "workspace tool is `mcp__cabane__sdk` \u2014 if it isn't in your visible tool list, locate it in",
+  "the deferred-tool inventory and invoke that exact qualified name; never conclude the SDK is",
+  "absent without attempting discovery and invocation, and if a call fails, report the recorded",
+  "error. The turn tools are `mcp__cabane_companion__ask` / `wake_me` / `summon_agent` /",
+  "`sub_agent` / `skip_turn`, and the ancillary tools `mcp__cabane__list_workspaces` /",
+  "`read_binary` / `upload` / `begin_upload` / `finalize_upload` / `mint_render_token` \u2014 all",
+  "possibly deferred too. There is no Cabane `read`/`write`/`search` tool \u2014 those are",
+  "`cabane.*` calls inside your program. One more harness fact: you can interleave narration",
+  "with tool calls, but only your final message is recorded as the turn's reply \u2014 write your",
+  "closing answer last."
 ].join(" ");
 
 // packages/agent-runtime/src/codex/events.ts
@@ -4633,6 +4634,7 @@ function buildConfig(req) {
   }
   const policy = codexToolPolicy(req.policy);
   const tmpDir = req.local.env?.TMPDIR;
+  const gateLockDir = req.local.env?.CABANE_GATE_LOCK_DIR;
   return {
     mcp_servers,
     experimental_use_rmcp_client: true,
@@ -4650,7 +4652,9 @@ function buildConfig(req) {
         [policy.permissionProfile]: {
           filesystem: {
             ":root": "read",
-            ":workspace_roots": { ".": "write", ".git": "write" }
+            ":workspace_roots": { ".": "write", ".git": "write" },
+            // The one absolute-path grant — see the CT612-fallout note above.
+            ...gateLockDir ? { [gateLockDir]: "write" } : {}
           },
           network: { enabled: policy.networkAccessEnabled, mode: "full" }
         }
@@ -6907,6 +6911,9 @@ ${reason}`,
         );
       }
     }
+    if (turnContext.runtime === "codex" && process.env.CABANE_GATE_LOCK_DIR) {
+      turnEnv = { ...turnEnv, CABANE_GATE_LOCK_DIR: process.env.CABANE_GATE_LOCK_DIR };
+    }
     const key = runKey(payload.conversationId, payload.agentId);
     const abortController = new AbortController();
     this.aborts.set(key, abortController);
@@ -6933,13 +6940,13 @@ ${reason}`,
     const wakeState = createWakeState();
     const subAgentCreate = async (args) => {
       const dispatchTarget = args.agentId ?? payload.agentId;
-      const channelId = turnContext.conversation.channelId;
+      const projectId = turnContext.conversation.projectId;
       const { status, body } = await this.opts.api.createSubAgentConversation(
         workspaceId,
         payload.conversationId,
         turnContext.turnToken ?? this.opts.credential,
         {
-          ...channelId ? { channelId } : {},
+          ...projectId ? { projectId } : {},
           ...args.title ? { title: args.title } : {},
           body: args.prompt,
           dispatch: dispatchTarget,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding 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",