@cabane/companion 0.6.12 → 0.6.14

package/dist/cli.js

@@ -6278,7 +6278,7 @@ var ConnectorHealthStore = class {
 
 // src/dispatcher.ts
 import { randomUUID } from "crypto";
-import { appendFileSync as appendFileSync2, existsSync as existsSync9, mkdirSync as mkdirSync10 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync9, mkdirSync as mkdirSync10, statSync as statSync2 } from "fs";
 import { join as join13 } from "path";
 
 // src/summon.ts
@@ -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 }
         )
       ] : []
     ]
@@ -6580,7 +6620,7 @@ async function writeCodexInstructionsFile(contents) {
 }
 
 // src/prepared.ts
-import { mkdirSync as mkdirSync8, readFileSync as readFileSync6, writeFileSync as writeFileSync6, existsSync as existsSync7 } from "fs";
+import { mkdirSync as mkdirSync8, readFileSync as readFileSync6, rmSync as rmSync4, writeFileSync as writeFileSync6, existsSync as existsSync7 } from "fs";
 import { join as join10 } from "path";
 function dirFor(workspaceId) {
   return join10(cabaneDir(), "prepared", encodeURIComponent(workspaceId));
@@ -6615,6 +6655,9 @@ function writePrepared(workspaceId, conversationId, agentId, result) {
     "utf8"
   );
 }
+function clearPrepared(workspaceId, conversationId, agentId) {
+  rmSync4(pathFor3(workspaceId, conversationId, agentId), { force: true });
+}
 
 // src/secrets.ts
 import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
@@ -6708,7 +6751,7 @@ function resolveMcpSecrets(mcpServers, store) {
 }
 
 // src/transcript-writer.ts
-import { appendFileSync, chmodSync as chmodSync3, mkdirSync as mkdirSync9, readdirSync, rmSync as rmSync4 } from "fs";
+import { appendFileSync, chmodSync as chmodSync3, mkdirSync as mkdirSync9, readdirSync, rmSync as rmSync5 } from "fs";
 import { join as join12 } from "path";
 function transcriptsDir() {
   return join12(cabaneDir(), "transcripts");
@@ -6779,7 +6822,7 @@ function pruneOld(dir2, retain) {
   const drop = files.sort().slice(0, files.length - retain);
   for (const f of drop) {
     try {
-      rmSync4(join12(dir2, f), { force: true });
+      rmSync5(join12(dir2, f), { force: true });
     } catch {
     }
   }
@@ -6941,16 +6984,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);
   }
 };
 
@@ -7080,6 +7120,21 @@ var SKIPPED_MARKER_BODY = "(skipped)";
 var DEFAULT_PREPARING_ROW_DELAY_MS = 1500;
 var DEFAULT_AGENT_IDLE_TIMEOUT_MS = 10 * 6e4;
 var DEFAULT_AGENT_TOTAL_TIMEOUT_MS = 6 * 60 * 6e4;
+function checkoutState(cwd) {
+  if (!cwd) return { ok: false, reason: "no checkout was resolved for this turn" };
+  if (!existsSync9(cwd)) return { ok: false, reason: `the checkout directory is gone (${cwd})` };
+  const gitPath = join13(cwd, ".git");
+  if (!existsSync9(gitPath)) return { ok: false, reason: `${cwd} holds no git metadata` };
+  let stat;
+  try {
+    stat = statSync2(gitPath);
+  } catch (error) {
+    return { ok: false, reason: `${gitPath} is unreadable (${error.message})` };
+  }
+  if (stat.isDirectory() && !existsSync9(join13(gitPath, "HEAD")))
+    return { ok: false, reason: `${gitPath} has no HEAD \u2014 an empty shell, not a checkout` };
+  return { ok: true, reason: "usable" };
+}
 function runKey(conversationId, agentId) {
   return `${conversationId}|${agentId}`;
 }
@@ -7249,7 +7304,15 @@ var Dispatcher = class {
     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);
+      let cached2 = readPrepared(workspaceId, payload.conversationId, payload.agentId);
+      if (cached2 && !checkoutState(cached2.cwd).ok) {
+        turnLog.warn(
+          { cwd: cached2.cwd, reason: checkoutState(cached2.cwd).reason },
+          "dispatcher: the prepared checkout is no longer usable \u2014 re-running the prepare hook to restore it"
+        );
+        clearPrepared(workspaceId, payload.conversationId, payload.agentId);
+        cached2 = null;
+      }
       if (cached2) {
         effectiveCwd = cached2.cwd;
         hookEnv = cached2.env;
@@ -7510,11 +7573,12 @@ ${reason}`,
         ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
         harnessFingerprint: turnContext.runtime
       });
-      turnLog[proof.ok ? "info" : "error"](
-        { workspaceProof: proof, checkout: effectiveCwd ?? null },
-        `dispatcher: workspace tool proof ${proof.ok ? "passed" : "failed"}`
+      const checkout = checkoutState(effectiveCwd);
+      turnLog[proof.ok && checkout.ok ? "info" : "error"](
+        { workspaceProof: proof, checkout: effectiveCwd ?? null, checkoutState: checkout },
+        `dispatcher: workspace tool proof ${proof.ok ? "passed" : "failed"}, checkout ${checkout.ok ? "usable" : checkout.reason}`
       );
-      if (effectiveCwd) {
+      if (effectiveCwd && checkout.ok) {
         try {
           const diagnosticDir = join13(effectiveCwd, ".git", "cabane");
           mkdirSync10(diagnosticDir, { recursive: true });
@@ -7539,6 +7603,23 @@ ${reason}`,
           );
         }
       }
+      if (!checkout.ok) {
+        const reason = `checkout_missing: ${checkout.reason}; task=${hookEnv.CABANE_TASK_ID}; recovery=re-dispatch this conversation (the prepare hook re-provisions the environment)`;
+        try {
+          await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
+            body: `**Couldn't prepare your environment.** ${reason}`,
+            kind: "final",
+            turnId,
+            parentMessageId: payload.messageId
+          });
+        } catch (postErr) {
+          turnLog.warn(
+            { err: postErr instanceof Error ? postErr.message : String(postErr) },
+            "dispatcher: checkout-missing notice post failed"
+          );
+        }
+        return this.concludeBeforeRun(payload, turnLog, startedAt, reason);
+      }
       if (!proof.ok) {
         const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd ?? "unknown"}; runtime=${adapter.name}; recovery=restart the connector after restoring the Cabane workspace tool mount`;
         try {
@@ -7627,9 +7708,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) {
@@ -7720,12 +7809,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,
@@ -8100,7 +8184,7 @@ import {
   readdirSync as readdirSync2,
   readFileSync as readFileSync8,
   renameSync as renameSync3,
-  rmSync as rmSync5,
+  rmSync as rmSync6,
   writeFileSync as writeFileSync7
 } from "fs";
 import { join as join14 } from "path";
@@ -8134,7 +8218,7 @@ var Outbox = class {
       renameSync3(tmp, target);
     } catch (err) {
       try {
-        rmSync5(tmp, { force: true });
+        rmSync6(tmp, { force: true });
       } catch {
       }
       this.log?.warn(
@@ -8181,7 +8265,7 @@ var Outbox = class {
   // Remove a delivered (or terminally-discarded) entry. No-op if already gone.
   remove(turnId, seq) {
     try {
-      rmSync5(this.fileFor(turnId, seq), { force: true });
+      rmSync6(this.fileFor(turnId, seq), { force: true });
     } catch {
     }
   }
@@ -8200,7 +8284,7 @@ var Outbox = class {
       "companion outbox: dropping unreadable entry"
     );
     try {
-      rmSync5(full, { force: true });
+      rmSync6(full, { force: true });
     } catch {
     }
   }
@@ -9267,7 +9351,7 @@ function handleUncaught(log, err, origin) {
 }
 
 // src/crash-marker.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync12, readFileSync as readFileSync9, rmSync as rmSync6, writeFileSync as writeFileSync8 } from "fs";
+import { existsSync as existsSync11, mkdirSync as mkdirSync12, readFileSync as readFileSync9, rmSync as rmSync7, writeFileSync as writeFileSync8 } from "fs";
 import { join as join15 } from "path";
 function crashMarkerPath() {
   return join15(cabaneDir(), "last-error.json");
@@ -9282,7 +9366,7 @@ function recordCrash(rec2) {
 function clearCrash() {
   try {
     const path3 = crashMarkerPath();
-    if (existsSync11(path3)) rmSync6(path3, { force: true });
+    if (existsSync11(path3)) rmSync7(path3, { force: true });
   } catch {
   }
 }

package/dist/runtime.js

@@ -5931,7 +5931,7 @@ var ConnectorHealthStore = class {
 
 // src/dispatcher.ts
 import { randomUUID } from "crypto";
-import { appendFileSync as appendFileSync2, existsSync as existsSync9, mkdirSync as mkdirSync9 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync9, mkdirSync as mkdirSync9, statSync as statSync2 } from "fs";
 import { join as join13 } from "path";
 
 // src/summon.ts
@@ -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 }
         )
       ] : []
     ]
@@ -6233,7 +6273,7 @@ async function writeCodexInstructionsFile(contents) {
 }
 
 // src/prepared.ts
-import { mkdirSync as mkdirSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync6, existsSync as existsSync7 } from "fs";
+import { mkdirSync as mkdirSync7, readFileSync as readFileSync6, rmSync as rmSync4, writeFileSync as writeFileSync6, existsSync as existsSync7 } from "fs";
 import { join as join10 } from "path";
 function dirFor(workspaceId) {
   return join10(cabaneDir(), "prepared", encodeURIComponent(workspaceId));
@@ -6268,6 +6308,9 @@ function writePrepared(workspaceId, conversationId, agentId, result) {
     "utf8"
   );
 }
+function clearPrepared(workspaceId, conversationId, agentId) {
+  rmSync4(pathFor3(workspaceId, conversationId, agentId), { force: true });
+}
 
 // src/secrets.ts
 import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
@@ -6361,7 +6404,7 @@ function resolveMcpSecrets(mcpServers, store) {
 }
 
 // src/transcript-writer.ts
-import { appendFileSync, chmodSync as chmodSync3, mkdirSync as mkdirSync8, readdirSync, rmSync as rmSync4 } from "fs";
+import { appendFileSync, chmodSync as chmodSync3, mkdirSync as mkdirSync8, readdirSync, rmSync as rmSync5 } from "fs";
 import { join as join12 } from "path";
 function transcriptsDir() {
   return join12(cabaneDir(), "transcripts");
@@ -6432,7 +6475,7 @@ function pruneOld(dir2, retain) {
   const drop = files.sort().slice(0, files.length - retain);
   for (const f of drop) {
     try {
-      rmSync4(join12(dir2, f), { force: true });
+      rmSync5(join12(dir2, f), { force: true });
     } catch {
     }
   }
@@ -6594,16 +6637,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);
   }
 };
 
@@ -6733,6 +6773,21 @@ var SKIPPED_MARKER_BODY = "(skipped)";
 var DEFAULT_PREPARING_ROW_DELAY_MS = 1500;
 var DEFAULT_AGENT_IDLE_TIMEOUT_MS = 10 * 6e4;
 var DEFAULT_AGENT_TOTAL_TIMEOUT_MS = 6 * 60 * 6e4;
+function checkoutState(cwd) {
+  if (!cwd) return { ok: false, reason: "no checkout was resolved for this turn" };
+  if (!existsSync9(cwd)) return { ok: false, reason: `the checkout directory is gone (${cwd})` };
+  const gitPath = join13(cwd, ".git");
+  if (!existsSync9(gitPath)) return { ok: false, reason: `${cwd} holds no git metadata` };
+  let stat;
+  try {
+    stat = statSync2(gitPath);
+  } catch (error) {
+    return { ok: false, reason: `${gitPath} is unreadable (${error.message})` };
+  }
+  if (stat.isDirectory() && !existsSync9(join13(gitPath, "HEAD")))
+    return { ok: false, reason: `${gitPath} has no HEAD \u2014 an empty shell, not a checkout` };
+  return { ok: true, reason: "usable" };
+}
 function runKey(conversationId, agentId) {
   return `${conversationId}|${agentId}`;
 }
@@ -6902,7 +6957,15 @@ var Dispatcher = class {
     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);
+      let cached2 = readPrepared(workspaceId, payload.conversationId, payload.agentId);
+      if (cached2 && !checkoutState(cached2.cwd).ok) {
+        turnLog.warn(
+          { cwd: cached2.cwd, reason: checkoutState(cached2.cwd).reason },
+          "dispatcher: the prepared checkout is no longer usable \u2014 re-running the prepare hook to restore it"
+        );
+        clearPrepared(workspaceId, payload.conversationId, payload.agentId);
+        cached2 = null;
+      }
       if (cached2) {
         effectiveCwd = cached2.cwd;
         hookEnv = cached2.env;
@@ -7163,11 +7226,12 @@ ${reason}`,
         ...this.opts.workspaceProofFetch ? { fetchImpl: this.opts.workspaceProofFetch } : {},
         harnessFingerprint: turnContext.runtime
       });
-      turnLog[proof.ok ? "info" : "error"](
-        { workspaceProof: proof, checkout: effectiveCwd ?? null },
-        `dispatcher: workspace tool proof ${proof.ok ? "passed" : "failed"}`
+      const checkout = checkoutState(effectiveCwd);
+      turnLog[proof.ok && checkout.ok ? "info" : "error"](
+        { workspaceProof: proof, checkout: effectiveCwd ?? null, checkoutState: checkout },
+        `dispatcher: workspace tool proof ${proof.ok ? "passed" : "failed"}, checkout ${checkout.ok ? "usable" : checkout.reason}`
       );
-      if (effectiveCwd) {
+      if (effectiveCwd && checkout.ok) {
         try {
           const diagnosticDir = join13(effectiveCwd, ".git", "cabane");
           mkdirSync9(diagnosticDir, { recursive: true });
@@ -7192,6 +7256,23 @@ ${reason}`,
           );
         }
       }
+      if (!checkout.ok) {
+        const reason = `checkout_missing: ${checkout.reason}; task=${hookEnv.CABANE_TASK_ID}; recovery=re-dispatch this conversation (the prepare hook re-provisions the environment)`;
+        try {
+          await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
+            body: `**Couldn't prepare your environment.** ${reason}`,
+            kind: "final",
+            turnId,
+            parentMessageId: payload.messageId
+          });
+        } catch (postErr) {
+          turnLog.warn(
+            { err: postErr instanceof Error ? postErr.message : String(postErr) },
+            "dispatcher: checkout-missing notice post failed"
+          );
+        }
+        return this.concludeBeforeRun(payload, turnLog, startedAt, reason);
+      }
       if (!proof.ok) {
         const reason = `workspace_tools_missing: ${proof.failedCapability}; checkout=${effectiveCwd ?? "unknown"}; runtime=${adapter.name}; recovery=restart the connector after restoring the Cabane workspace tool mount`;
         try {
@@ -7280,9 +7361,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) {
@@ -7373,12 +7462,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,
@@ -7753,7 +7837,7 @@ import {
   readdirSync as readdirSync2,
   readFileSync as readFileSync8,
   renameSync as renameSync3,
-  rmSync as rmSync5,
+  rmSync as rmSync6,
   writeFileSync as writeFileSync7
 } from "fs";
 import { join as join14 } from "path";
@@ -7787,7 +7871,7 @@ var Outbox = class {
       renameSync3(tmp, target);
     } catch (err) {
       try {
-        rmSync5(tmp, { force: true });
+        rmSync6(tmp, { force: true });
       } catch {
       }
       this.log?.warn(
@@ -7834,7 +7918,7 @@ var Outbox = class {
   // Remove a delivered (or terminally-discarded) entry. No-op if already gone.
   remove(turnId, seq) {
     try {
-      rmSync5(this.fileFor(turnId, seq), { force: true });
+      rmSync6(this.fileFor(turnId, seq), { force: true });
     } catch {
     }
   }
@@ -7853,7 +7937,7 @@ var Outbox = class {
       "companion outbox: dropping unreadable entry"
     );
     try {
-      rmSync5(full, { force: true });
+      rmSync6(full, { force: true });
     } catch {
     }
   }
@@ -8920,7 +9004,7 @@ function handleUncaught(log, err, origin) {
 }
 
 // src/crash-marker.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync11, readFileSync as readFileSync9, rmSync as rmSync6, writeFileSync as writeFileSync8 } from "fs";
+import { existsSync as existsSync11, mkdirSync as mkdirSync11, readFileSync as readFileSync9, rmSync as rmSync7, writeFileSync as writeFileSync8 } from "fs";
 import { join as join15 } from "path";
 function crashMarkerPath() {
   return join15(cabaneDir(), "last-error.json");
@@ -8935,7 +9019,7 @@ function recordCrash(rec) {
 function clearCrash() {
   try {
     const path3 = crashMarkerPath();
-    if (existsSync11(path3)) rmSync6(path3, { force: true });
+    if (existsSync11(path3)) rmSync7(path3, { force: true });
   } catch {
   }
 }

package/package.json

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