@cabane/companion 0.6.8 → 0.6.9

package/dist/cli.js

@@ -79,7 +79,20 @@ var prepareHookSchema = z.object({
   // Wall-clock cap for the hook. Provisioning is slow (minutes), so the
   // default is generous; a hook that hangs past this is killed and the turn
   // fails with a clear timeout message rather than pinning the companion.
-  timeoutMs: z.number().int().positive().optional()
+  timeoutMs: z.number().int().positive().optional(),
+  // CT943: re-invoke the hook on turns where a prepared result already exists,
+  // in VALIDATE mode — the cached result is handed back as `prepared` and the
+  // hook's stdout is ignored, so the cwd provably cannot move. Its only power
+  // is to exit non-zero and fail the turn.
+  //
+  // Why it exists: the hook runs exactly once per (conversation, agent), so a
+  // later message asking for a different environment can't be honoured. Without
+  // this, it is silently ignored — the host knows and says nothing, which is
+  // the worst available outcome. An opt-in hook can now refuse it out loud.
+  //
+  // Default OFF, and deliberately: an operator hook that provisions
+  // unconditionally must not start running on every turn because it upgraded.
+  validateCached: z.boolean().optional()
 }).strict();
 var DEFAULT_TIMEOUT_MS = 10 * 6e4;
 var prepareResultSchema = z.object({
@@ -143,7 +156,12 @@ var runPrepareHook = (hook, input) => {
           // CT317: newline-joined — workspace paths never contain a newline, so a
           // hook splits on `\n` unambiguously. Empty string when none.
           CABANE_TRIGGER_ENTRY_PATHS: input.triggerEntryPaths.join("\n"),
-          CABANE_CONVERSATION_TITLE: input.title ?? ""
+          CABANE_CONVERSATION_TITLE: input.title ?? "",
+          // CT943: the dispatching message's text, and — in validate mode only —
+          // the prepared result the hook is being asked to check this dispatch
+          // against. Both empty/absent on an ordinary first run.
+          CABANE_TRIGGER_MESSAGE: input.messageBody ?? "",
+          ...input.prepared ? { CABANE_PREPARED: JSON.stringify(input.prepared) } : {}
         }
       });
     } catch (err) {
@@ -181,6 +199,10 @@ var runPrepareHook = (hook, input) => {
           );
           return;
         }
+        if (input.prepared) {
+          resolve(input.prepared);
+          return;
+        }
         try {
           resolve(parsePrepareOutput(stdout));
         } catch (err) {
@@ -3857,7 +3879,7 @@ var OPENCODE_HOST_TOOLS = [
 var OPENCODE_WEB_TOOLS = ["webfetch"];
 var OPENCODE_SUBAGENT_TOOLS = ["task"];
 var OPENCODE_SCHEDULING_TOOLS = [];
-var OPENCODE_UI_PROMPT_TOOLS = [];
+var OPENCODE_UI_PROMPT_TOOLS = ["question"];
 function opencodeToolPolicy(policy) {
   const tools = {};
   const deny = (names) => {
@@ -7225,6 +7247,41 @@ var Dispatcher = class {
       if (cached2) {
         effectiveCwd = cached2.cwd;
         hookEnv = cached2.env;
+        if (prepareHook.validateCached) {
+          const runHook = this.opts.prepareHookRunner ?? runPrepareHook;
+          try {
+            await runHook(prepareHook, {
+              workspaceId,
+              conversationId: payload.conversationId,
+              agentId: payload.agentId,
+              agentUsername: this.opts.agentUsername,
+              runtime: turnContext.runtime,
+              triggerEntryPaths: turnContext.conversation.triggerEntryPaths ?? [],
+              title: turnContext.conversation.title,
+              messageBody: message.body,
+              prepared: cached2
+            });
+          } catch (err) {
+            const reason = err instanceof Error ? err.message : String(err);
+            turnLog.error({ err: reason }, "dispatcher: prepare hook rejected a prepared turn");
+            try {
+              await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
+                body: `${PREPARE_FAILED_PREFIX}
+
+${reason}`,
+                kind: "final",
+                turnId,
+                parentMessageId: payload.messageId
+              });
+            } catch (postErr) {
+              turnLog.warn(
+                { err: postErr instanceof Error ? postErr.message : String(postErr) },
+                "dispatcher: prepare-rejection post failed"
+              );
+            }
+            return this.concludeBeforeRun(payload, turnLog, startedAt, `prepare_failed: ${reason}`);
+          }
+        }
       } else {
         const delayMs = this.opts.preparingRowDelayMs ?? DEFAULT_PREPARING_ROW_DELAY_MS;
         let preparingStarted = false;
@@ -7263,7 +7320,12 @@ var Dispatcher = class {
             // tasker prepare hook keys its per-task env off. Defaults to `[]` for
             // an older API. The conversation anchor is gone (CT319).
             triggerEntryPaths: turnContext.conversation.triggerEntryPaths ?? [],
-            title: turnContext.conversation.title
+            title: turnContext.conversation.title,
+            // CT943: the dispatching message's text — where an `env:` directive
+            // rides. The server has always sent the trigger body on the turn
+            // context (for the live feed); this is the first thing to read it as
+            // an INPUT, so a dispatch can ask for its environment in words.
+            messageBody: message.body
           });
           clearTimeout(preparingTimer);
           if (preparingStarted) reportPreparing("done");

package/dist/pairing-config.js

@@ -63,7 +63,20 @@ var prepareHookSchema = z.object({
   // Wall-clock cap for the hook. Provisioning is slow (minutes), so the
   // default is generous; a hook that hangs past this is killed and the turn
   // fails with a clear timeout message rather than pinning the companion.
-  timeoutMs: z.number().int().positive().optional()
+  timeoutMs: z.number().int().positive().optional(),
+  // CT943: re-invoke the hook on turns where a prepared result already exists,
+  // in VALIDATE mode — the cached result is handed back as `prepared` and the
+  // hook's stdout is ignored, so the cwd provably cannot move. Its only power
+  // is to exit non-zero and fail the turn.
+  //
+  // Why it exists: the hook runs exactly once per (conversation, agent), so a
+  // later message asking for a different environment can't be honoured. Without
+  // this, it is silently ignored — the host knows and says nothing, which is
+  // the worst available outcome. An opt-in hook can now refuse it out loud.
+  //
+  // Default OFF, and deliberately: an operator hook that provisions
+  // unconditionally must not start running on every turn because it upgraded.
+  validateCached: z.boolean().optional()
 }).strict();
 var DEFAULT_TIMEOUT_MS = 10 * 6e4;
 var prepareResultSchema = z.object({

package/dist/runtime.js

@@ -72,7 +72,20 @@ var prepareHookSchema = z.object({
   // Wall-clock cap for the hook. Provisioning is slow (minutes), so the
   // default is generous; a hook that hangs past this is killed and the turn
   // fails with a clear timeout message rather than pinning the companion.
-  timeoutMs: z.number().int().positive().optional()
+  timeoutMs: z.number().int().positive().optional(),
+  // CT943: re-invoke the hook on turns where a prepared result already exists,
+  // in VALIDATE mode — the cached result is handed back as `prepared` and the
+  // hook's stdout is ignored, so the cwd provably cannot move. Its only power
+  // is to exit non-zero and fail the turn.
+  //
+  // Why it exists: the hook runs exactly once per (conversation, agent), so a
+  // later message asking for a different environment can't be honoured. Without
+  // this, it is silently ignored — the host knows and says nothing, which is
+  // the worst available outcome. An opt-in hook can now refuse it out loud.
+  //
+  // Default OFF, and deliberately: an operator hook that provisions
+  // unconditionally must not start running on every turn because it upgraded.
+  validateCached: z.boolean().optional()
 }).strict();
 var DEFAULT_TIMEOUT_MS = 10 * 6e4;
 var prepareResultSchema = z.object({
@@ -136,7 +149,12 @@ var runPrepareHook = (hook, input) => {
           // CT317: newline-joined — workspace paths never contain a newline, so a
           // hook splits on `\n` unambiguously. Empty string when none.
           CABANE_TRIGGER_ENTRY_PATHS: input.triggerEntryPaths.join("\n"),
-          CABANE_CONVERSATION_TITLE: input.title ?? ""
+          CABANE_CONVERSATION_TITLE: input.title ?? "",
+          // CT943: the dispatching message's text, and — in validate mode only —
+          // the prepared result the hook is being asked to check this dispatch
+          // against. Both empty/absent on an ordinary first run.
+          CABANE_TRIGGER_MESSAGE: input.messageBody ?? "",
+          ...input.prepared ? { CABANE_PREPARED: JSON.stringify(input.prepared) } : {}
         }
       });
     } catch (err) {
@@ -174,6 +192,10 @@ var runPrepareHook = (hook, input) => {
           );
           return;
         }
+        if (input.prepared) {
+          resolve(input.prepared);
+          return;
+        }
         try {
           resolve(parsePrepareOutput(stdout));
         } catch (err) {
@@ -3510,7 +3532,7 @@ var OPENCODE_HOST_TOOLS = [
 var OPENCODE_WEB_TOOLS = ["webfetch"];
 var OPENCODE_SUBAGENT_TOOLS = ["task"];
 var OPENCODE_SCHEDULING_TOOLS = [];
-var OPENCODE_UI_PROMPT_TOOLS = [];
+var OPENCODE_UI_PROMPT_TOOLS = ["question"];
 function opencodeToolPolicy(policy) {
   const tools = {};
   const deny = (names) => {
@@ -6878,6 +6900,41 @@ var Dispatcher = class {
       if (cached2) {
         effectiveCwd = cached2.cwd;
         hookEnv = cached2.env;
+        if (prepareHook.validateCached) {
+          const runHook = this.opts.prepareHookRunner ?? runPrepareHook;
+          try {
+            await runHook(prepareHook, {
+              workspaceId,
+              conversationId: payload.conversationId,
+              agentId: payload.agentId,
+              agentUsername: this.opts.agentUsername,
+              runtime: turnContext.runtime,
+              triggerEntryPaths: turnContext.conversation.triggerEntryPaths ?? [],
+              title: turnContext.conversation.title,
+              messageBody: message.body,
+              prepared: cached2
+            });
+          } catch (err) {
+            const reason = err instanceof Error ? err.message : String(err);
+            turnLog.error({ err: reason }, "dispatcher: prepare hook rejected a prepared turn");
+            try {
+              await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
+                body: `${PREPARE_FAILED_PREFIX}
+
+${reason}`,
+                kind: "final",
+                turnId,
+                parentMessageId: payload.messageId
+              });
+            } catch (postErr) {
+              turnLog.warn(
+                { err: postErr instanceof Error ? postErr.message : String(postErr) },
+                "dispatcher: prepare-rejection post failed"
+              );
+            }
+            return this.concludeBeforeRun(payload, turnLog, startedAt, `prepare_failed: ${reason}`);
+          }
+        }
       } else {
         const delayMs = this.opts.preparingRowDelayMs ?? DEFAULT_PREPARING_ROW_DELAY_MS;
         let preparingStarted = false;
@@ -6916,7 +6973,12 @@ var Dispatcher = class {
             // tasker prepare hook keys its per-task env off. Defaults to `[]` for
             // an older API. The conversation anchor is gone (CT319).
             triggerEntryPaths: turnContext.conversation.triggerEntryPaths ?? [],
-            title: turnContext.conversation.title
+            title: turnContext.conversation.title,
+            // CT943: the dispatching message's text — where an `env:` directive
+            // rides. The server has always sent the trigger body on the turn
+            // context (for the live feed); this is the first thing to read it as
+            // an INPUT, so a dispatch can ask for its environment in words.
+            messageBody: message.body
           });
           clearTimeout(preparingTimer);
           if (preparingStarted) reportPreparing("done");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "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",