@cabane/companion 0.6.107 → 0.6.109

package/dist/cli.js

@@ -3083,7 +3083,7 @@ var CabaneApi = class {
   // see whether a prior run is still flagged in-flight.
   // SJ383: recovery-path read for a participant row — the `agentSessionId` a
   // freshly-reconnected companion resumes on. CT262: the per-turn piggybacks this
-  // fetch grew (agentRules / visionBlocks / channel / members / conversationContext)
+  // fetch grew (the ABOUT charters / visionBlocks / channel / members / conversationContext)
   // are gone — `getTurnContext` composes the whole turn now — so this is back to
   // the plain recovery read, with no `messageId` param.
   getParticipantAgent(workspaceId, conversationId, agentId) {
@@ -4391,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;
@@ -4415,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.`
@@ -6657,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",
@@ -8396,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({

package/dist/runtime.js

@@ -2417,7 +2417,7 @@ var CabaneApi = class {
   // see whether a prior run is still flagged in-flight.
   // SJ383: recovery-path read for a participant row — the `agentSessionId` a
   // freshly-reconnected companion resumes on. CT262: the per-turn piggybacks this
-  // fetch grew (agentRules / visionBlocks / channel / members / conversationContext)
+  // fetch grew (the ABOUT charters / visionBlocks / channel / members / conversationContext)
   // are gone — `getTurnContext` composes the whole turn now — so this is back to
   // the plain recovery read, with no `messageId` param.
   getParticipantAgent(workspaceId, conversationId, agentId) {
@@ -3804,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;
@@ -3828,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.`
@@ -6070,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",
@@ -7819,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({

package/package.json

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