@cabane/companion 0.6.11 → 0.6.13

package/dist/cli.js

@@ -6295,6 +6295,8 @@ var SUB_AGENT_TOOL = "sub_agent";
 var SUB_AGENT_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${SUB_AGENT_TOOL}`;
 var WAKE_ME_TOOL = "wake_me";
 var WAKE_ME_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${WAKE_ME_TOOL}`;
+var CANCEL_WAKE_TOOL = "cancel_wake";
+var CANCEL_WAKE_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${CANCEL_WAKE_TOOL}`;
 function createSummonState() {
   return { agentId: null };
 }
@@ -6305,7 +6307,19 @@ function createAskState() {
   return { targetUserId: null, question: null, headline: null, options: null, questions: null };
 }
 function createWakeState() {
-  return { afterSeconds: null, at: null, note: null };
+  return { afterSeconds: null, at: null, note: null, cancelled: false };
+}
+function wakeCommitField(state) {
+  if (state.cancelled) return { wake: { cancel: true } };
+  const { afterSeconds, at, note } = state;
+  if (!note || afterSeconds === null && at === null) return {};
+  return {
+    wake: {
+      ...afterSeconds !== null ? { afterSeconds } : {},
+      ...at !== null ? { at } : {},
+      note
+    }
+  };
 }
 function createSummonMcpServer(summonState, skipState, askState, subAgentCreate, wakeState) {
   return createSdkMcpServer({
@@ -6492,6 +6506,7 @@ function createSummonMcpServer(summonState, skipState, askState, subAgentCreate,
             wakeState.afterSeconds = args.afterSeconds ?? null;
             wakeState.at = args.at ?? null;
             wakeState.note = args.note;
+            wakeState.cancelled = false;
             return {
               content: [
                 {
@@ -6505,6 +6520,31 @@ function createSummonMcpServer(summonState, skipState, askState, subAgentCreate,
             };
           },
           { annotations: { readOnlyHint: true, openWorldHint: false }, alwaysLoad: true }
+        ),
+        // CT990: the inverse. No arguments — it can only ever stand down the
+        // caller's own wake in the conversation it's holding a turn in.
+        tool(
+          CANCEL_WAKE_TOOL,
+          'Stand down your own wake \u2014 the inverse of `wake_me`. No arguments: it means "when this turn settles, leave no wake armed for me in this conversation." Reach for it when the thing you armed a wake to check has already happened, or the work it was watching is over \u2014 an armed wake you no longer need fires into a turn with nothing to do, and a supervision loop with no off switch is one you can only end by leaving it running. Whether you have one armed is printed in your turn context ("Wake armed: \u2026"); calling this with nothing armed is a clean no-op, no error. It writes the same per-turn slot as `wake_me`, so the two are last-call-wins against each other: `cancel_wake` then `wake_me` leaves the NEW wake armed, `wake_me` then `cancel_wake` leaves nothing armed. Like `wake_me` it takes effect when the turn SETTLES, not now. It reaches only your own wake in this conversation \u2014 never a peer\'s, and never a recurring schedule (those are `cabane.schedules.*`).',
+          {},
+          async () => {
+            wakeState.cancelled = true;
+            wakeState.afterSeconds = null;
+            wakeState.at = null;
+            wakeState.note = null;
+            return {
+              content: [
+                {
+                  type: "text",
+                  text: JSON.stringify({
+                    cancelled: true,
+                    note: "Recorded. Any wake you have armed in this conversation is stood down when this turn ends. If you had none, nothing happens."
+                  })
+                }
+              ]
+            };
+          },
+          { annotations: { readOnlyHint: true, openWorldHint: false }, alwaysLoad: true }
         )
       ] : []
     ]
@@ -6941,16 +6981,13 @@ var TurnCommitter = class {
   // null = no wake this turn → attach nothing). The server computes `fire_at` and
   // arms the CT441 schedule. Kept independent of summon/ask — a turn could
   // conceivably ask AND arm a wake.
+  //
+  // CT990: the field now carries three states, and the third can't be spelled by
+  // absence — attaching NOTHING means "leave the standing wake alone", which is
+  // exactly what a stand-down must not do. So a `cancel_wake` turn attaches the
+  // discriminated `{ cancel: true }` payload instead.
   wakeField() {
-    const { afterSeconds, at, note } = this.deps.wakeState;
-    if (!note || afterSeconds === null && at === null) return {};
-    return {
-      wake: {
-        ...afterSeconds !== null ? { afterSeconds } : {},
-        ...at !== null ? { at } : {},
-        note
-      }
-    };
+    return wakeCommitField(this.deps.wakeState);
   }
 };
 
@@ -7246,6 +7283,8 @@ var Dispatcher = class {
       effectiveCwd = void 0;
     }
     let hookEnv;
+    const triggerIsPrepareFailure = message.body.startsWith(PREPARE_FAILED_PREFIX);
+    const prepareFailureDispatch = turnContext.dispatchedByAgentId && !triggerIsPrepareFailure ? { dispatch: turnContext.dispatchedByAgentId } : {};
     if (prepareHook) {
       const cached2 = readPrepared(workspaceId, payload.conversationId, payload.agentId);
       if (cached2) {
@@ -7275,7 +7314,8 @@ var Dispatcher = class {
 ${reason}`,
                 kind: "final",
                 turnId,
-                parentMessageId: payload.messageId
+                parentMessageId: payload.messageId,
+                ...prepareFailureDispatch
               });
             } catch (postErr) {
               turnLog.warn(
@@ -7349,7 +7389,8 @@ ${reason}`,
               kind: "final",
               turnId,
               // CT113: stamp the parent even on the prepare-failed close.
-              parentMessageId: payload.messageId
+              parentMessageId: payload.messageId,
+              ...prepareFailureDispatch
             });
           } catch (postErr) {
             turnLog.warn(
@@ -7623,9 +7664,17 @@ ${reason}`,
           }
         }
         if (intent.wake) {
-          wakeState.afterSeconds = intent.wake.afterSeconds ?? null;
-          wakeState.at = intent.wake.at ?? null;
-          wakeState.note = intent.wake.note;
+          if ("cancel" in intent.wake) {
+            wakeState.cancelled = true;
+            wakeState.afterSeconds = null;
+            wakeState.at = null;
+            wakeState.note = null;
+          } else {
+            wakeState.cancelled = false;
+            wakeState.afterSeconds = intent.wake.afterSeconds ?? null;
+            wakeState.at = intent.wake.at ?? null;
+            wakeState.note = intent.wake.note;
+          }
         }
         if (intent.summonAgentId) summonState.agentId = intent.summonAgentId;
         if (intent.skipped) {
@@ -7716,12 +7765,7 @@ ${reason}`,
           { reason: skipState.reason, turnId, ok: okResult },
           "agent skipped turn (skip_turn)"
         );
-        const { afterSeconds: wakeAfter, at: wakeAt, note: wakeNote } = wakeState;
-        const skipWake = wakeNote && (wakeAfter !== null || wakeAt !== null) ? {
-          ...wakeAfter !== null ? { afterSeconds: wakeAfter } : {},
-          ...wakeAt !== null ? { at: wakeAt } : {},
-          note: wakeNote
-        } : void 0;
+        const { wake: skipWake } = wakeCommitField(wakeState);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
             body: SKIPPED_MARKER_BODY,

package/dist/runtime.js

@@ -5948,6 +5948,8 @@ var SUB_AGENT_TOOL = "sub_agent";
 var SUB_AGENT_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${SUB_AGENT_TOOL}`;
 var WAKE_ME_TOOL = "wake_me";
 var WAKE_ME_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${WAKE_ME_TOOL}`;
+var CANCEL_WAKE_TOOL = "cancel_wake";
+var CANCEL_WAKE_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${CANCEL_WAKE_TOOL}`;
 function createSummonState() {
   return { agentId: null };
 }
@@ -5958,7 +5960,19 @@ function createAskState() {
   return { targetUserId: null, question: null, headline: null, options: null, questions: null };
 }
 function createWakeState() {
-  return { afterSeconds: null, at: null, note: null };
+  return { afterSeconds: null, at: null, note: null, cancelled: false };
+}
+function wakeCommitField(state) {
+  if (state.cancelled) return { wake: { cancel: true } };
+  const { afterSeconds, at, note } = state;
+  if (!note || afterSeconds === null && at === null) return {};
+  return {
+    wake: {
+      ...afterSeconds !== null ? { afterSeconds } : {},
+      ...at !== null ? { at } : {},
+      note
+    }
+  };
 }
 function createSummonMcpServer(summonState, skipState, askState, subAgentCreate, wakeState) {
   return createSdkMcpServer({
@@ -6145,6 +6159,7 @@ function createSummonMcpServer(summonState, skipState, askState, subAgentCreate,
             wakeState.afterSeconds = args.afterSeconds ?? null;
             wakeState.at = args.at ?? null;
             wakeState.note = args.note;
+            wakeState.cancelled = false;
             return {
               content: [
                 {
@@ -6158,6 +6173,31 @@ function createSummonMcpServer(summonState, skipState, askState, subAgentCreate,
             };
           },
           { annotations: { readOnlyHint: true, openWorldHint: false }, alwaysLoad: true }
+        ),
+        // CT990: the inverse. No arguments — it can only ever stand down the
+        // caller's own wake in the conversation it's holding a turn in.
+        tool(
+          CANCEL_WAKE_TOOL,
+          'Stand down your own wake \u2014 the inverse of `wake_me`. No arguments: it means "when this turn settles, leave no wake armed for me in this conversation." Reach for it when the thing you armed a wake to check has already happened, or the work it was watching is over \u2014 an armed wake you no longer need fires into a turn with nothing to do, and a supervision loop with no off switch is one you can only end by leaving it running. Whether you have one armed is printed in your turn context ("Wake armed: \u2026"); calling this with nothing armed is a clean no-op, no error. It writes the same per-turn slot as `wake_me`, so the two are last-call-wins against each other: `cancel_wake` then `wake_me` leaves the NEW wake armed, `wake_me` then `cancel_wake` leaves nothing armed. Like `wake_me` it takes effect when the turn SETTLES, not now. It reaches only your own wake in this conversation \u2014 never a peer\'s, and never a recurring schedule (those are `cabane.schedules.*`).',
+          {},
+          async () => {
+            wakeState.cancelled = true;
+            wakeState.afterSeconds = null;
+            wakeState.at = null;
+            wakeState.note = null;
+            return {
+              content: [
+                {
+                  type: "text",
+                  text: JSON.stringify({
+                    cancelled: true,
+                    note: "Recorded. Any wake you have armed in this conversation is stood down when this turn ends. If you had none, nothing happens."
+                  })
+                }
+              ]
+            };
+          },
+          { annotations: { readOnlyHint: true, openWorldHint: false }, alwaysLoad: true }
         )
       ] : []
     ]
@@ -6594,16 +6634,13 @@ var TurnCommitter = class {
   // null = no wake this turn → attach nothing). The server computes `fire_at` and
   // arms the CT441 schedule. Kept independent of summon/ask — a turn could
   // conceivably ask AND arm a wake.
+  //
+  // CT990: the field now carries three states, and the third can't be spelled by
+  // absence — attaching NOTHING means "leave the standing wake alone", which is
+  // exactly what a stand-down must not do. So a `cancel_wake` turn attaches the
+  // discriminated `{ cancel: true }` payload instead.
   wakeField() {
-    const { afterSeconds, at, note } = this.deps.wakeState;
-    if (!note || afterSeconds === null && at === null) return {};
-    return {
-      wake: {
-        ...afterSeconds !== null ? { afterSeconds } : {},
-        ...at !== null ? { at } : {},
-        note
-      }
-    };
+    return wakeCommitField(this.deps.wakeState);
   }
 };
 
@@ -6899,6 +6936,8 @@ var Dispatcher = class {
       effectiveCwd = void 0;
     }
     let hookEnv;
+    const triggerIsPrepareFailure = message.body.startsWith(PREPARE_FAILED_PREFIX);
+    const prepareFailureDispatch = turnContext.dispatchedByAgentId && !triggerIsPrepareFailure ? { dispatch: turnContext.dispatchedByAgentId } : {};
     if (prepareHook) {
       const cached2 = readPrepared(workspaceId, payload.conversationId, payload.agentId);
       if (cached2) {
@@ -6928,7 +6967,8 @@ var Dispatcher = class {
 ${reason}`,
                 kind: "final",
                 turnId,
-                parentMessageId: payload.messageId
+                parentMessageId: payload.messageId,
+                ...prepareFailureDispatch
               });
             } catch (postErr) {
               turnLog.warn(
@@ -7002,7 +7042,8 @@ ${reason}`,
               kind: "final",
               turnId,
               // CT113: stamp the parent even on the prepare-failed close.
-              parentMessageId: payload.messageId
+              parentMessageId: payload.messageId,
+              ...prepareFailureDispatch
             });
           } catch (postErr) {
             turnLog.warn(
@@ -7276,9 +7317,17 @@ ${reason}`,
           }
         }
         if (intent.wake) {
-          wakeState.afterSeconds = intent.wake.afterSeconds ?? null;
-          wakeState.at = intent.wake.at ?? null;
-          wakeState.note = intent.wake.note;
+          if ("cancel" in intent.wake) {
+            wakeState.cancelled = true;
+            wakeState.afterSeconds = null;
+            wakeState.at = null;
+            wakeState.note = null;
+          } else {
+            wakeState.cancelled = false;
+            wakeState.afterSeconds = intent.wake.afterSeconds ?? null;
+            wakeState.at = intent.wake.at ?? null;
+            wakeState.note = intent.wake.note;
+          }
         }
         if (intent.summonAgentId) summonState.agentId = intent.summonAgentId;
         if (intent.skipped) {
@@ -7369,12 +7418,7 @@ ${reason}`,
           { reason: skipState.reason, turnId, ok: okResult },
           "agent skipped turn (skip_turn)"
         );
-        const { afterSeconds: wakeAfter, at: wakeAt, note: wakeNote } = wakeState;
-        const skipWake = wakeNote && (wakeAfter !== null || wakeAt !== null) ? {
-          ...wakeAfter !== null ? { afterSeconds: wakeAfter } : {},
-          ...wakeAt !== null ? { at: wakeAt } : {},
-          note: wakeNote
-        } : void 0;
+        const { wake: skipWake } = wakeCommitField(wakeState);
         try {
           await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
             body: SKIPPED_MARKER_BODY,

package/package.json

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