@cabane/companion 0.6.106 → 0.6.108

package/dist/cli.js

@@ -93,7 +93,15 @@ var prepareHookSchema = z.object({
   //
   // Default OFF, and deliberately: an operator hook that provisions
   // unconditionally must not start running on every turn because it upgraded.
-  validateCached: z.boolean().optional()
+  validateCached: z.boolean().optional(),
+  // Independent operator-owned reporter. Receives sanitized failure metadata
+  // on stdin; never re-enters this hook and cannot change the turn outcome.
+  failureReporter: z.object({
+    command: z.string().min(1),
+    args: z.array(z.string()).optional(),
+    env: z.record(z.string(), z.string()).optional(),
+    timeoutMs: z.number().int().positive().max(3e4).optional()
+  }).strict().optional()
 }).strict();
 var DEFAULT_TIMEOUT_MS = 10 * 6e4;
 var prepareResultSchema = z.object({
@@ -1769,8 +1777,8 @@ function requestEnrollmentCode(baseUrl, opts = {}) {
     ...opts.label ? { label: opts.label } : {}
   });
 }
-function deviceLabelFromHostname(hostname4) {
-  const trimmed = hostname4.trim().replace(/\.local$/i, "");
+function deviceLabelFromHostname(hostname5) {
+  const trimmed = hostname5.trim().replace(/\.local$/i, "");
   if (trimmed.length === 0) return void 0;
   return trimmed.slice(0, 120);
 }
@@ -2097,7 +2105,7 @@ async function logs(opts = {}) {
 }
 
 // src/commands/start.ts
-import { hostname as hostname3 } from "os";
+import { hostname as hostname4 } from "os";
 
 // src/runtime.ts
 import { randomUUID as randomUUID5 } from "crypto";
@@ -2662,7 +2670,7 @@ async function warnAboutHarnessReadiness(cfg, deps = {}) {
 }
 
 // src/supervisor.ts
-import { hostname as hostname2 } from "os";
+import { hostname as hostname3 } from "os";
 
 // packages/agent-runtime/src/failure.ts
 import { z as z4 } from "zod";
@@ -4383,6 +4391,15 @@ var MAX_ASK_QUESTION_BYTES = 400;
 var MAX_ASK_HEADLINE_BYTES = 120;
 var MAX_ASK_ITEMS = 20;
 var MAX_ASK_OPTION_BYTES = 200;
+var TASK_STAGES = [
+  "proposed",
+  "todo",
+  "in_progress",
+  "in_review",
+  "done",
+  "dropped",
+  "deferred"
+];
 var MIN_ASK_OPTIONS = 2;
 var MAX_ASK_OPTIONS = 4;
 var MAX_WAKE_NOTE_BYTES = 2e3;
@@ -4407,11 +4424,19 @@ var TURN_CONTROL_FIELD_DESCRIPTIONS = {
     targetUserId: "The workspace member (human) to ask \u2014 a user id, from your turn context's roster.",
     question: `SINGLE-question form: a short body \u2014 one or two sentences of framing the headline can't hold. NOT a report (up to ${MAX_ASK_QUESTION_BYTES} characters, inline markdown only). Provide EITHER this or \`questions\`, not both. Put the crisp one-sentence question in \`headline\`. Say "I" for yourself; name anyone else described, never "you", "we" or "they".`,
     headline: `SINGLE-question form: the question itself as ONE clear, capitalized sentence ending in \`?\` ("Should Ledger deploy once Mia approves?"), up to ${MAX_ASK_HEADLINE_BYTES} characters. What the human reads first in the inbox and the chip \u2014 one scannable question, no elaboration (that goes in \`question\`). Strongly encouraged. Say "I" for yourself; name anyone else described, never "you", "we" or "they".`,
-    options: `SINGLE-question form: optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} suggested one-click answers, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must stand alone: "I" for yourself, anyone else responsible for its action by name \u2014 never "you", "we" or "they".`,
+    options: `SINGLE-question form: optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} suggested one-click answers, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must stand alone: "I" for yourself, anyone else responsible for its action by name \u2014 never "you", "we" or "they". An option may instead be \`{ label, move: { task, status } }\` \u2014 a MOVE of a task: clicking it is the person making that move, and the task's next stage owner is told for you. A wrapper carrying a move is ONE question about ONE task, and you are NOT woken when the move applies.`,
     questions: `MULTI-question form: 1\u2013${MAX_ASK_ITEMS} questions to ask at once, when a plan ends with several bounded decisions. Provide EITHER this or \`question\`/\`headline\`/\`options\`, not both.`,
     "questions.headline": `The one-sentence question ("Should Ledger deploy once Mia approves?") \u2014 required for each item, up to ${MAX_ASK_HEADLINE_BYTES} characters. Say "I" for yourself; name anyone else described, never "you", "we" or "they".`,
     "questions.body": `Optional short framing beneath the headline, up to ${MAX_ASK_QUESTION_BYTES} characters. NOT a report. Say "I" for yourself; name anyone else described, never "you", "we" or "they".`,
-    "questions.options": `Optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} one-click answers for this question, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must stand alone: "I" for yourself, anyone else responsible for its action by name \u2014 never "you", "we" or "they".`,
+    "options.label": `What the option SAYS. The destination stage is drawn beside it as a pill, so the label is the decision (\`Accept\`), not a restatement of the move.`,
+    "options.move": `Makes this option a MOVE of a task: clicking it is the person making that move, recorded as theirs. The next stage's owner is told for you, and you are not woken.`,
+    "options.move.task": `The task the move applies to \u2014 its reference (\`CT12\`) or its uuid. Every move in one ask names the SAME task.`,
+    "options.move.status": `The stage the task goes to when the person clicks this option. A move the task cannot make from where it is now is refused when you raise the ask, by name.`,
+    "questions.options.label": `What the option SAYS. The destination stage is drawn beside it as a pill, so the label is the decision (\`Accept\`), not a restatement of the move.`,
+    "questions.options.move": `See \`options.move\`. An ask carrying a move has exactly one question.`,
+    "questions.options.move.task": `The task the move applies to \u2014 its reference (\`CT12\`) or its uuid. Every move in one ask names the SAME task.`,
+    "questions.options.move.status": `The stage the task goes to when the person clicks this option. A move the task cannot make from where it is now is refused when you raise the ask, by name.`,
+    "questions.options": `Optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} one-click answers for this question, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must stand alone: "I" for yourself, anyone else responsible for its action by name \u2014 never "you", "we" or "they". An option may instead be \`{ label, move: { task, status } }\` \u2014 see the single-question form; an ask carrying a move has exactly one question.`,
     replaces: "Withdraw a stale ask in this conversation as part of raising this one. Both land in a single write, so the person goes from the old question to the new one and never sees neither or both.",
     "replaces.askId": "The id of the open ask to withdraw.",
     "replaces.reason": `Why the old question is no longer the question \u2014 shown to the person on their Done row. Up to ${MAX_WITHDRAW_REASON_BYTES} characters.`
@@ -6649,10 +6674,15 @@ var CODEX_ADDENDUM = [
   "absent without attempting discovery and invocation, and if a call fails, report the recorded",
   "error.",
   turnControlPromptGuidance("mcp__cabane_companion__"),
-  "The ancillary tools are",
-  "`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",
+  // CT1552: every ancillary tool is written the way Codex's own tool list shows
+  // it — qualified. The bare `read_binary` / `upload` / … this list used to mix
+  // in sat two lines under the instruction to invoke the exact qualified names,
+  // so the sentence contradicted 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__list_workspaces`, `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`. One more harness fact: you can interleave",
   "narration",
   "with tool calls, but your final message is the turn's answer \u2014 write your",
@@ -8388,12 +8418,34 @@ function createTurnControlMcpServer(acts, skipState) {
           targetUserId: z13.string().uuid().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.targetUserId),
           question: z13.string().min(1).max(MAX_ASK_QUESTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.question),
           headline: z13.string().min(1).max(MAX_ASK_HEADLINE_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.headline),
-          options: z13.array(z13.string().min(1).max(MAX_ASK_OPTION_BYTES)).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.options),
+          options: z13.array(
+            z13.union([
+              z13.string().min(1).max(MAX_ASK_OPTION_BYTES),
+              z13.object({
+                label: z13.string().min(1).max(MAX_ASK_OPTION_BYTES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["options.label"]),
+                move: z13.object({
+                  task: z13.string().min(1).max(200).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["options.move.task"]),
+                  status: z13.enum(TASK_STAGES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["options.move.status"])
+                }).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["options.move"])
+              })
+            ])
+          ).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.options),
           questions: z13.array(
             z13.object({
               headline: z13.string().min(1).max(MAX_ASK_HEADLINE_BYTES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.headline"]),
               body: z13.string().min(1).max(MAX_ASK_QUESTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.body"]),
-              options: z13.array(z13.string().min(1).max(MAX_ASK_OPTION_BYTES)).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options"])
+              options: z13.array(
+                z13.union([
+                  z13.string().min(1).max(MAX_ASK_OPTION_BYTES),
+                  z13.object({
+                    label: z13.string().min(1).max(MAX_ASK_OPTION_BYTES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options.label"]),
+                    move: z13.object({
+                      task: z13.string().min(1).max(200).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options.move.task"]),
+                      status: z13.enum(TASK_STAGES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options.move.status"])
+                    }).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options.move"])
+                  })
+                ])
+              ).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options"])
             })
           ).min(1).max(MAX_ASK_ITEMS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.questions),
           replaces: z13.object({
@@ -8604,6 +8656,68 @@ function readOutboxFloor(read, turnId, log) {
   }
 }
 
+// src/prepare-failure.ts
+import { spawn as spawn4 } from "child_process";
+import { hostname as hostname2 } from "os";
+function prepareFailureCause(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  if (/timed out/i.test(message)) return "prepare hook timed out";
+  if (/MODULE_NOT_FOUND|Cannot find (?:module|package)/.test(message))
+    return "prepare hook module missing; check the configured command and its installation for this device";
+  if (/not valid JSON|JSON must carry|produced no output/.test(message))
+    return "prepare hook returned malformed output; expected a cwd path or JSON with a non-empty cwd";
+  if (/ENOENT/.test(message)) return "prepare hook executable missing (ENOENT)";
+  if (/EACCES/.test(message)) return "prepare hook executable is not accessible (EACCES)";
+  const exit = message.match(/exited with code (\d+)/)?.[1];
+  return exit ? `prepare hook exited with code ${exit}` : "prepare hook failed; inspect the device-local hook log";
+}
+async function runPrepareWithReporting(runner, hook, input, context, reportError) {
+  try {
+    return await runner(hook, input);
+  } catch (error) {
+    if (hook.failureReporter) {
+      try {
+        await reportFailure(hook.failureReporter, {
+          workspaceId: input.workspaceId,
+          conversationId: input.conversationId,
+          agentId: input.agentId,
+          agentUsername: input.agentUsername,
+          turnId: context.turnId,
+          deviceId: context.deviceId ?? hostname2(),
+          cause: prepareFailureCause(error)
+        });
+      } catch {
+        reportError();
+      }
+    }
+    throw error;
+  }
+}
+function reportFailure(config, body) {
+  return new Promise((resolve2, reject) => {
+    const child = spawn4(config.command, config.args ?? [], {
+      stdio: ["pipe", "ignore", "ignore"],
+      env: { ...process.env, ...config.env }
+    });
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      reject(new Error("reporter timeout"));
+    }, config.timeoutMs ?? 15e3);
+    child.stdin.on("error", () => {
+    });
+    child.once("error", () => {
+      clearTimeout(timer);
+      reject(new Error("reporter failed to start"));
+    });
+    child.once("close", (code) => {
+      clearTimeout(timer);
+      if (code === 0) resolve2();
+      else reject(new Error("reporter failed"));
+    });
+    child.stdin.end(JSON.stringify(body));
+  });
+}
+
 // src/prepared.ts
 import { mkdirSync as mkdirSync8, readFileSync as readFileSync6, rmSync as rmSync5, writeFileSync as writeFileSync6, existsSync as existsSync8 } from "fs";
 import { join as join12 } from "path";
@@ -8834,7 +8948,7 @@ function pruneOld(dir2, retain) {
 }
 
 // src/turn-containment.ts
-import { execFile, execFileSync, spawn as spawn4 } from "child_process";
+import { execFile, execFileSync, spawn as spawn5 } from "child_process";
 import { readFileSync as readFileSync8 } from "fs";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
@@ -8916,7 +9030,7 @@ function createTurnContainment(turnId, deps = {}) {
       command: options.command
     });
     return asContained(
-      spawn4(
+      spawn5(
         "systemd-run",
         [
           "--user",
@@ -8943,7 +9057,7 @@ function createTurnContainment(turnId, deps = {}) {
     );
   }
   function spawnInGroup(options) {
-    const child = spawn4(options.command, options.args, {
+    const child = spawn5(options.command, options.args, {
       ...options.cwd ? { cwd: options.cwd } : {},
       env: options.env,
       stdio: ["pipe", "pipe", "pipe"],
@@ -9645,18 +9759,28 @@ var TurnExecution = class {
         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: this.turnContext.runtime,
-              hostAccess: this.turnContext.policy.hostFs,
-              triggerEntryPaths: this.turnContext.conversation.triggerEntryPaths ?? [],
-              title: this.turnContext.conversation.title,
-              messageBody: this.turnContext.message.body,
-              prepared: cached2
-            });
+            await runPrepareWithReporting(
+              runHook,
+              prepareHook,
+              {
+                workspaceId,
+                conversationId: payload.conversationId,
+                agentId: payload.agentId,
+                agentUsername: this.opts.agentUsername,
+                runtime: this.turnContext.runtime,
+                hostAccess: this.turnContext.policy.hostFs,
+                triggerEntryPaths: this.turnContext.conversation.triggerEntryPaths ?? [],
+                title: this.turnContext.conversation.title,
+                messageBody: this.turnContext.message.body,
+                prepared: cached2
+              },
+              { turnId, deviceId: this.opts.deviceId },
+              () => {
+                turnLog.error(
+                  "dispatcher: prepare failure reporter failed; original failure preserved"
+                );
+              }
+            );
           } catch (err) {
             const reason = err instanceof Error ? err.message : String(err);
             turnLog.debug({ err: reason }, "dispatcher: prepare hook rejected a prepared turn");
@@ -9692,24 +9816,34 @@ var TurnExecution = class {
         preparingTimer.unref?.();
         const runHook = this.opts.prepareHookRunner ?? runPrepareHook;
         try {
-          const result = await runHook(prepareHook, {
-            workspaceId,
-            conversationId: payload.conversationId,
-            agentId: payload.agentId,
-            agentUsername: this.opts.agentUsername,
-            runtime: this.turnContext.runtime,
-            hostAccess: this.turnContext.policy.hostFs,
-            // CT317/CT319: the trigger message's referenced-entry paths — what the
-            // tasker prepare hook keys its per-task env off. Defaults to `[]` for
-            // an older API. The conversation anchor is gone (CT319).
-            triggerEntryPaths: this.turnContext.conversation.triggerEntryPaths ?? [],
-            title: this.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: this.turnContext.message.body
-          });
+          const result = await runPrepareWithReporting(
+            runHook,
+            prepareHook,
+            {
+              workspaceId,
+              conversationId: payload.conversationId,
+              agentId: payload.agentId,
+              agentUsername: this.opts.agentUsername,
+              runtime: this.turnContext.runtime,
+              hostAccess: this.turnContext.policy.hostFs,
+              // CT317/CT319: the trigger message's referenced-entry paths — what the
+              // tasker prepare hook keys its per-task env off. Defaults to `[]` for
+              // an older API. The conversation anchor is gone (CT319).
+              triggerEntryPaths: this.turnContext.conversation.triggerEntryPaths ?? [],
+              title: this.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: this.turnContext.message.body
+            },
+            { turnId, deviceId: this.opts.deviceId },
+            () => {
+              turnLog.error(
+                "dispatcher: prepare failure reporter failed; original failure preserved"
+              );
+            }
+          );
           clearTimeout(preparingTimer);
           if (preparingStarted) reportPreparing("done");
           writePrepared(workspaceId, payload.conversationId, payload.agentId, result);
@@ -10870,7 +11004,7 @@ var CompanionSupervisor = class {
   async start() {
     this.log.info(
       { protocolVersion: TURN_PROTOCOL_VERSION, version: COMPANION_VERSION },
-      `Companion ${COMPANION_VERSION} starting on ${this.config.deviceLabel ?? hostname2()}`
+      `Companion ${COMPANION_VERSION} starting on ${this.config.deviceLabel ?? hostname3()}`
     );
     const startupHarnessRefresh = this.refreshHarnessStatuses();
     this.trackHeartbeat(startupHarnessRefresh);
@@ -10889,7 +11023,7 @@ var CompanionSupervisor = class {
       token: this.config.deviceToken,
       log: this.log,
       lastEventId: null,
-      onOpen: () => this.log.info(`Connected to Cabane as ${this.hub.statusJson().device_label ?? hostname2()}`),
+      onOpen: () => this.log.info(`Connected to Cabane as ${this.hub.statusJson().device_label ?? hostname3()}`),
       onMessage: async (ev) => {
         if (ev.event === "assignments_changed") {
           if (this.refreshing && this.inFlightRefresh) await this.inFlightRefresh;
@@ -11305,6 +11439,7 @@ var CompanionSupervisor = class {
     });
     if (this.dispatcherFactory) return this.dispatcherFactory({ ...ctx, local });
     return new Dispatcher({
+      deviceId: this.deviceId ?? void 0,
       api: ctx.api,
       baseUrl: ctx.baseUrl,
       workspaceId: ctx.workspaceId,
@@ -11952,9 +12087,9 @@ async function waitForBoundedHeartbeat(heartbeat) {
 }
 function defaultReexec() {
   clearRuntimeState();
-  void import("child_process").then(({ spawn: spawn6 }) => {
+  void import("child_process").then(({ spawn: spawn7 }) => {
     try {
-      const child = spawn6(process.execPath, process.argv.slice(1), {
+      const child = spawn7(process.execPath, process.argv.slice(1), {
         stdio: "inherit",
         detached: false
       });
@@ -12209,7 +12344,7 @@ async function closeSurfaces(control, dashboard) {
 }
 
 // src/commands/daemon.ts
-import { spawn as spawn5 } from "child_process";
+import { spawn as spawn6 } from "child_process";
 import { closeSync as closeSync3, mkdirSync as mkdirSync12, openSync as openSync3 } from "fs";
 
 // src/cli-entry.ts
@@ -12321,7 +12456,7 @@ function defaultSpawnDetached(args) {
   mkdirSync12(cabaneDir(), { recursive: true });
   const logFd = openSync3(companionLogPath(), "a");
   try {
-    return spawn5(process.execPath, [cliPath, ...args], {
+    return spawn6(process.execPath, [cliPath, ...args], {
       detached: true,
       stdio: ["ignore", logFd, logFd],
       env: { ...process.env, CABANE_COMPANION_DAEMON: "1" }
@@ -12489,7 +12624,7 @@ function prePairFoundPhrase(harness) {
 }
 async function pairHere(opts, interactive) {
   const baseUrl = resolvePairBaseUrl(opts.server);
-  const label = deviceLabelFromHostname(hostname3());
+  const label = deviceLabelFromHostname(hostname4());
   const aborter = new AbortController();
   const onSigint = () => aborter.abort();
   process.on("SIGINT", onSigint);

package/dist/pairing-config.js

@@ -76,7 +76,15 @@ var prepareHookSchema = z.object({
   //
   // Default OFF, and deliberately: an operator hook that provisions
   // unconditionally must not start running on every turn because it upgraded.
-  validateCached: z.boolean().optional()
+  validateCached: z.boolean().optional(),
+  // Independent operator-owned reporter. Receives sanitized failure metadata
+  // on stdin; never re-enters this hook and cannot change the turn outcome.
+  failureReporter: z.object({
+    command: z.string().min(1),
+    args: z.array(z.string()).optional(),
+    env: z.record(z.string(), z.string()).optional(),
+    timeoutMs: z.number().int().positive().max(3e4).optional()
+  }).strict().optional()
 }).strict();
 var DEFAULT_TIMEOUT_MS = 10 * 6e4;
 var prepareResultSchema = z.object({

package/dist/runtime.js

@@ -85,7 +85,15 @@ var prepareHookSchema = z.object({
   //
   // Default OFF, and deliberately: an operator hook that provisions
   // unconditionally must not start running on every turn because it upgraded.
-  validateCached: z.boolean().optional()
+  validateCached: z.boolean().optional(),
+  // Independent operator-owned reporter. Receives sanitized failure metadata
+  // on stdin; never re-enters this hook and cannot change the turn outcome.
+  failureReporter: z.object({
+    command: z.string().min(1),
+    args: z.array(z.string()).optional(),
+    env: z.record(z.string(), z.string()).optional(),
+    timeoutMs: z.number().int().positive().max(3e4).optional()
+  }).strict().optional()
 }).strict();
 var DEFAULT_TIMEOUT_MS = 10 * 6e4;
 var prepareResultSchema = z.object({
@@ -1996,7 +2004,7 @@ async function verifyRuntime(state, requestImpl = controlRequest) {
 }
 
 // src/supervisor.ts
-import { hostname } from "os";
+import { hostname as hostname2 } from "os";
 
 // packages/agent-runtime/src/failure.ts
 import { z as z3 } from "zod";
@@ -3796,6 +3804,15 @@ var MAX_ASK_QUESTION_BYTES = 400;
 var MAX_ASK_HEADLINE_BYTES = 120;
 var MAX_ASK_ITEMS = 20;
 var MAX_ASK_OPTION_BYTES = 200;
+var TASK_STAGES = [
+  "proposed",
+  "todo",
+  "in_progress",
+  "in_review",
+  "done",
+  "dropped",
+  "deferred"
+];
 var MIN_ASK_OPTIONS = 2;
 var MAX_ASK_OPTIONS = 4;
 var MAX_WAKE_NOTE_BYTES = 2e3;
@@ -3820,11 +3837,19 @@ var TURN_CONTROL_FIELD_DESCRIPTIONS = {
     targetUserId: "The workspace member (human) to ask \u2014 a user id, from your turn context's roster.",
     question: `SINGLE-question form: a short body \u2014 one or two sentences of framing the headline can't hold. NOT a report (up to ${MAX_ASK_QUESTION_BYTES} characters, inline markdown only). Provide EITHER this or \`questions\`, not both. Put the crisp one-sentence question in \`headline\`. Say "I" for yourself; name anyone else described, never "you", "we" or "they".`,
     headline: `SINGLE-question form: the question itself as ONE clear, capitalized sentence ending in \`?\` ("Should Ledger deploy once Mia approves?"), up to ${MAX_ASK_HEADLINE_BYTES} characters. What the human reads first in the inbox and the chip \u2014 one scannable question, no elaboration (that goes in \`question\`). Strongly encouraged. Say "I" for yourself; name anyone else described, never "you", "we" or "they".`,
-    options: `SINGLE-question form: optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} suggested one-click answers, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must stand alone: "I" for yourself, anyone else responsible for its action by name \u2014 never "you", "we" or "they".`,
+    options: `SINGLE-question form: optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} suggested one-click answers, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must stand alone: "I" for yourself, anyone else responsible for its action by name \u2014 never "you", "we" or "they". An option may instead be \`{ label, move: { task, status } }\` \u2014 a MOVE of a task: clicking it is the person making that move, and the task's next stage owner is told for you. A wrapper carrying a move is ONE question about ONE task, and you are NOT woken when the move applies.`,
     questions: `MULTI-question form: 1\u2013${MAX_ASK_ITEMS} questions to ask at once, when a plan ends with several bounded decisions. Provide EITHER this or \`question\`/\`headline\`/\`options\`, not both.`,
     "questions.headline": `The one-sentence question ("Should Ledger deploy once Mia approves?") \u2014 required for each item, up to ${MAX_ASK_HEADLINE_BYTES} characters. Say "I" for yourself; name anyone else described, never "you", "we" or "they".`,
     "questions.body": `Optional short framing beneath the headline, up to ${MAX_ASK_QUESTION_BYTES} characters. NOT a report. Say "I" for yourself; name anyone else described, never "you", "we" or "they".`,
-    "questions.options": `Optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} one-click answers for this question, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must stand alone: "I" for yourself, anyone else responsible for its action by name \u2014 never "you", "we" or "they".`,
+    "options.label": `What the option SAYS. The destination stage is drawn beside it as a pill, so the label is the decision (\`Accept\`), not a restatement of the move.`,
+    "options.move": `Makes this option a MOVE of a task: clicking it is the person making that move, recorded as theirs. The next stage's owner is told for you, and you are not woken.`,
+    "options.move.task": `The task the move applies to \u2014 its reference (\`CT12\`) or its uuid. Every move in one ask names the SAME task.`,
+    "options.move.status": `The stage the task goes to when the person clicks this option. A move the task cannot make from where it is now is refused when you raise the ask, by name.`,
+    "questions.options.label": `What the option SAYS. The destination stage is drawn beside it as a pill, so the label is the decision (\`Accept\`), not a restatement of the move.`,
+    "questions.options.move": `See \`options.move\`. An ask carrying a move has exactly one question.`,
+    "questions.options.move.task": `The task the move applies to \u2014 its reference (\`CT12\`) or its uuid. Every move in one ask names the SAME task.`,
+    "questions.options.move.status": `The stage the task goes to when the person clicks this option. A move the task cannot make from where it is now is refused when you raise the ask, by name.`,
+    "questions.options": `Optional ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} one-click answers for this question, up to ${MAX_ASK_OPTION_BYTES} characters each. Each option must stand alone: "I" for yourself, anyone else responsible for its action by name \u2014 never "you", "we" or "they". An option may instead be \`{ label, move: { task, status } }\` \u2014 see the single-question form; an ask carrying a move has exactly one question.`,
     replaces: "Withdraw a stale ask in this conversation as part of raising this one. Both land in a single write, so the person goes from the old question to the new one and never sees neither or both.",
     "replaces.askId": "The id of the open ask to withdraw.",
     "replaces.reason": `Why the old question is no longer the question \u2014 shown to the person on their Done row. Up to ${MAX_WITHDRAW_REASON_BYTES} characters.`
@@ -6062,10 +6087,15 @@ var CODEX_ADDENDUM = [
   "absent without attempting discovery and invocation, and if a call fails, report the recorded",
   "error.",
   turnControlPromptGuidance("mcp__cabane_companion__"),
-  "The ancillary tools are",
-  "`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",
+  // CT1552: every ancillary tool is written the way Codex's own tool list shows
+  // it — qualified. The bare `read_binary` / `upload` / … this list used to mix
+  // in sat two lines under the instruction to invoke the exact qualified names,
+  // so the sentence contradicted 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__list_workspaces`, `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`. One more harness fact: you can interleave",
   "narration",
   "with tool calls, but your final message is the turn's answer \u2014 write your",
@@ -7811,12 +7841,34 @@ function createTurnControlMcpServer(acts, skipState) {
           targetUserId: z13.string().uuid().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.targetUserId),
           question: z13.string().min(1).max(MAX_ASK_QUESTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.question),
           headline: z13.string().min(1).max(MAX_ASK_HEADLINE_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.headline),
-          options: z13.array(z13.string().min(1).max(MAX_ASK_OPTION_BYTES)).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.options),
+          options: z13.array(
+            z13.union([
+              z13.string().min(1).max(MAX_ASK_OPTION_BYTES),
+              z13.object({
+                label: z13.string().min(1).max(MAX_ASK_OPTION_BYTES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["options.label"]),
+                move: z13.object({
+                  task: z13.string().min(1).max(200).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["options.move.task"]),
+                  status: z13.enum(TASK_STAGES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["options.move.status"])
+                }).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["options.move"])
+              })
+            ])
+          ).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.options),
           questions: z13.array(
             z13.object({
               headline: z13.string().min(1).max(MAX_ASK_HEADLINE_BYTES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.headline"]),
               body: z13.string().min(1).max(MAX_ASK_QUESTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.body"]),
-              options: z13.array(z13.string().min(1).max(MAX_ASK_OPTION_BYTES)).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options"])
+              options: z13.array(
+                z13.union([
+                  z13.string().min(1).max(MAX_ASK_OPTION_BYTES),
+                  z13.object({
+                    label: z13.string().min(1).max(MAX_ASK_OPTION_BYTES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options.label"]),
+                    move: z13.object({
+                      task: z13.string().min(1).max(200).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options.move.task"]),
+                      status: z13.enum(TASK_STAGES).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options.move.status"])
+                    }).describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options.move"])
+                  })
+                ])
+              ).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask["questions.options"])
             })
           ).min(1).max(MAX_ASK_ITEMS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.ask.questions),
           replaces: z13.object({
@@ -8027,6 +8079,68 @@ function readOutboxFloor(read, turnId, log) {
   }
 }
 
+// src/prepare-failure.ts
+import { spawn as spawn4 } from "child_process";
+import { hostname } from "os";
+function prepareFailureCause(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  if (/timed out/i.test(message)) return "prepare hook timed out";
+  if (/MODULE_NOT_FOUND|Cannot find (?:module|package)/.test(message))
+    return "prepare hook module missing; check the configured command and its installation for this device";
+  if (/not valid JSON|JSON must carry|produced no output/.test(message))
+    return "prepare hook returned malformed output; expected a cwd path or JSON with a non-empty cwd";
+  if (/ENOENT/.test(message)) return "prepare hook executable missing (ENOENT)";
+  if (/EACCES/.test(message)) return "prepare hook executable is not accessible (EACCES)";
+  const exit = message.match(/exited with code (\d+)/)?.[1];
+  return exit ? `prepare hook exited with code ${exit}` : "prepare hook failed; inspect the device-local hook log";
+}
+async function runPrepareWithReporting(runner, hook, input, context, reportError) {
+  try {
+    return await runner(hook, input);
+  } catch (error) {
+    if (hook.failureReporter) {
+      try {
+        await reportFailure(hook.failureReporter, {
+          workspaceId: input.workspaceId,
+          conversationId: input.conversationId,
+          agentId: input.agentId,
+          agentUsername: input.agentUsername,
+          turnId: context.turnId,
+          deviceId: context.deviceId ?? hostname(),
+          cause: prepareFailureCause(error)
+        });
+      } catch {
+        reportError();
+      }
+    }
+    throw error;
+  }
+}
+function reportFailure(config, body) {
+  return new Promise((resolve2, reject) => {
+    const child = spawn4(config.command, config.args ?? [], {
+      stdio: ["pipe", "ignore", "ignore"],
+      env: { ...process.env, ...config.env }
+    });
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      reject(new Error("reporter timeout"));
+    }, config.timeoutMs ?? 15e3);
+    child.stdin.on("error", () => {
+    });
+    child.once("error", () => {
+      clearTimeout(timer);
+      reject(new Error("reporter failed to start"));
+    });
+    child.once("close", (code) => {
+      clearTimeout(timer);
+      if (code === 0) resolve2();
+      else reject(new Error("reporter failed"));
+    });
+    child.stdin.end(JSON.stringify(body));
+  });
+}
+
 // src/prepared.ts
 import { mkdirSync as mkdirSync8, readFileSync as readFileSync6, rmSync as rmSync5, writeFileSync as writeFileSync6, existsSync as existsSync8 } from "fs";
 import { join as join12 } from "path";
@@ -8257,7 +8371,7 @@ function pruneOld(dir2, retain) {
 }
 
 // src/turn-containment.ts
-import { execFile, execFileSync, spawn as spawn4 } from "child_process";
+import { execFile, execFileSync, spawn as spawn5 } from "child_process";
 import { readFileSync as readFileSync8 } from "fs";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
@@ -8339,7 +8453,7 @@ function createTurnContainment(turnId, deps = {}) {
       command: options.command
     });
     return asContained(
-      spawn4(
+      spawn5(
         "systemd-run",
         [
           "--user",
@@ -8366,7 +8480,7 @@ function createTurnContainment(turnId, deps = {}) {
     );
   }
   function spawnInGroup(options) {
-    const child = spawn4(options.command, options.args, {
+    const child = spawn5(options.command, options.args, {
       ...options.cwd ? { cwd: options.cwd } : {},
       env: options.env,
       stdio: ["pipe", "pipe", "pipe"],
@@ -9068,18 +9182,28 @@ var TurnExecution = class {
         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: this.turnContext.runtime,
-              hostAccess: this.turnContext.policy.hostFs,
-              triggerEntryPaths: this.turnContext.conversation.triggerEntryPaths ?? [],
-              title: this.turnContext.conversation.title,
-              messageBody: this.turnContext.message.body,
-              prepared: cached2
-            });
+            await runPrepareWithReporting(
+              runHook,
+              prepareHook,
+              {
+                workspaceId,
+                conversationId: payload.conversationId,
+                agentId: payload.agentId,
+                agentUsername: this.opts.agentUsername,
+                runtime: this.turnContext.runtime,
+                hostAccess: this.turnContext.policy.hostFs,
+                triggerEntryPaths: this.turnContext.conversation.triggerEntryPaths ?? [],
+                title: this.turnContext.conversation.title,
+                messageBody: this.turnContext.message.body,
+                prepared: cached2
+              },
+              { turnId, deviceId: this.opts.deviceId },
+              () => {
+                turnLog.error(
+                  "dispatcher: prepare failure reporter failed; original failure preserved"
+                );
+              }
+            );
           } catch (err) {
             const reason = err instanceof Error ? err.message : String(err);
             turnLog.debug({ err: reason }, "dispatcher: prepare hook rejected a prepared turn");
@@ -9115,24 +9239,34 @@ var TurnExecution = class {
         preparingTimer.unref?.();
         const runHook = this.opts.prepareHookRunner ?? runPrepareHook;
         try {
-          const result = await runHook(prepareHook, {
-            workspaceId,
-            conversationId: payload.conversationId,
-            agentId: payload.agentId,
-            agentUsername: this.opts.agentUsername,
-            runtime: this.turnContext.runtime,
-            hostAccess: this.turnContext.policy.hostFs,
-            // CT317/CT319: the trigger message's referenced-entry paths — what the
-            // tasker prepare hook keys its per-task env off. Defaults to `[]` for
-            // an older API. The conversation anchor is gone (CT319).
-            triggerEntryPaths: this.turnContext.conversation.triggerEntryPaths ?? [],
-            title: this.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: this.turnContext.message.body
-          });
+          const result = await runPrepareWithReporting(
+            runHook,
+            prepareHook,
+            {
+              workspaceId,
+              conversationId: payload.conversationId,
+              agentId: payload.agentId,
+              agentUsername: this.opts.agentUsername,
+              runtime: this.turnContext.runtime,
+              hostAccess: this.turnContext.policy.hostFs,
+              // CT317/CT319: the trigger message's referenced-entry paths — what the
+              // tasker prepare hook keys its per-task env off. Defaults to `[]` for
+              // an older API. The conversation anchor is gone (CT319).
+              triggerEntryPaths: this.turnContext.conversation.triggerEntryPaths ?? [],
+              title: this.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: this.turnContext.message.body
+            },
+            { turnId, deviceId: this.opts.deviceId },
+            () => {
+              turnLog.error(
+                "dispatcher: prepare failure reporter failed; original failure preserved"
+              );
+            }
+          );
           clearTimeout(preparingTimer);
           if (preparingStarted) reportPreparing("done");
           writePrepared(workspaceId, payload.conversationId, payload.agentId, result);
@@ -10293,7 +10427,7 @@ var CompanionSupervisor = class {
   async start() {
     this.log.info(
       { protocolVersion: TURN_PROTOCOL_VERSION, version: COMPANION_VERSION },
-      `Companion ${COMPANION_VERSION} starting on ${this.config.deviceLabel ?? hostname()}`
+      `Companion ${COMPANION_VERSION} starting on ${this.config.deviceLabel ?? hostname2()}`
     );
     const startupHarnessRefresh = this.refreshHarnessStatuses();
     this.trackHeartbeat(startupHarnessRefresh);
@@ -10312,7 +10446,7 @@ var CompanionSupervisor = class {
       token: this.config.deviceToken,
       log: this.log,
       lastEventId: null,
-      onOpen: () => this.log.info(`Connected to Cabane as ${this.hub.statusJson().device_label ?? hostname()}`),
+      onOpen: () => this.log.info(`Connected to Cabane as ${this.hub.statusJson().device_label ?? hostname2()}`),
       onMessage: async (ev) => {
         if (ev.event === "assignments_changed") {
           if (this.refreshing && this.inFlightRefresh) await this.inFlightRefresh;
@@ -10728,6 +10862,7 @@ var CompanionSupervisor = class {
     });
     if (this.dispatcherFactory) return this.dispatcherFactory({ ...ctx, local });
     return new Dispatcher({
+      deviceId: this.deviceId ?? void 0,
       api: ctx.api,
       baseUrl: ctx.baseUrl,
       workspaceId: ctx.workspaceId,
@@ -11375,9 +11510,9 @@ async function waitForBoundedHeartbeat(heartbeat) {
 }
 function defaultReexec() {
   clearRuntimeState();
-  void import("child_process").then(({ spawn: spawn5 }) => {
+  void import("child_process").then(({ spawn: spawn6 }) => {
     try {
-      const child = spawn5(process.execPath, process.argv.slice(1), {
+      const child = spawn6(process.execPath, process.argv.slice(1), {
         stdio: "inherit",
         detached: false
       });

package/package.json

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