@cabane/companion 0.6.82 → 0.6.84

package/dist/cli.js

@@ -7576,6 +7576,9 @@ var COMPANION_LOCAL_TOOL_GLOB = `mcp__${COMPANION_LOCAL_MCP_SERVER}__*`;
 var SKIP_TURN_TOOL = "skip_turn";
 var ASK_TOOL = "ask";
 var ASK_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${ASK_TOOL}`;
+var WITHDRAW_ASK_TOOL = "withdraw_ask";
+var WITHDRAW_ASK_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${WITHDRAW_ASK_TOOL}`;
+var MAX_WITHDRAW_REASON = 400;
 var REPLY_TO_TOOL = "reply_to";
 var REPLY_TO_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${REPLY_TO_TOOL}`;
 var MAX_ASK_ITEMS = 20;
@@ -7691,7 +7694,7 @@ function createTurnControlMcpServer(acts, skipState, replyState) {
       ] : [],
       tool(
         ASK_TOOL,
-        `Ask a HUMAN a structured question (or a short LIST of them) you need answered to continue, then END your turn \u2014 don't wait for the reply. Use it when you genuinely can't proceed without a person's input (a decision only they can make, a missing fact). Pass \`targetUserId\` (a workspace member's user id \u2014 every person's id is on the roster in your turn context). Two forms: a SINGLE question \u2014 a \`headline\` (the actual question as one clear, capitalized sentence ending in \`?\`, "Do we go to prod?") plus a short \`question\` body for the framing the headline can't hold \u2014 OR, when a plan ends with SEVERAL bounded decisions at once, a \`questions\` array of 1\u2013${MAX_ASK_ITEMS} items, each \`{ headline, body?, options? }\`. **Prefer the list over cramming the extra decisions into prose or dropping them** \u2014 one ask carrying every question, never pick one and bury the rest. Each question keeps the same form rules: a one-sentence \`headline\`, a short \`body\` frame (NOT a report \u2014 your status, links, and detail go in your REPLY; inline markdown only, no lists or headings), and 2\u20134 \`options\` when the answer is a bounded choice \u2014 for a yes/no go-ahead always pass them, so it's one click, not a typed reply. Provide EITHER \`question\` (single) or \`questions\` (array), never both. The ask is a first-class attention item aimed at that person; your final reply carries the CONTEXT, the ask carries the QUESTION(S). It is written and delivered THE MOMENT you call this \u2014 the person sees it in their inbox while your turn is still running \u2014 so call it once you know the question; a second call is a second question, not an edit. The human sends ONE response: supplied answers are recorded, omissions become terminally Unanswered. Ask only when blocked \u2014 never ceremonially. After asking, finish your reply and stop; when the person replies addressed to you, the ask resolves and you resume. Targets a human only; to hand work to another AGENT use send/dispatch instead.`,
+        `Ask a HUMAN a structured question (or a short LIST of them) you need answered to continue, then END your turn \u2014 don't wait for the reply. Use it when you genuinely can't proceed without a person's input (a decision only they can make, a missing fact). Pass \`targetUserId\` (a workspace member's user id \u2014 every person's id is on the roster in your turn context). Two forms: a SINGLE question \u2014 a \`headline\` (the actual question as one clear, capitalized sentence ending in \`?\`, "Do we go to prod?") plus a short \`question\` body for the framing the headline can't hold \u2014 OR, when a plan ends with SEVERAL bounded decisions at once, a \`questions\` array of 1\u2013${MAX_ASK_ITEMS} items, each \`{ headline, body?, options? }\`. **Prefer the list over cramming the extra decisions into prose or dropping them** \u2014 one ask carrying every question, never pick one and bury the rest. Each question keeps the same form rules: a one-sentence \`headline\`, a short \`body\` frame (NOT a report \u2014 your status, links, and detail go in your REPLY; inline markdown only, no lists or headings), and 2\u20134 \`options\` when the answer is a bounded choice \u2014 for a yes/no go-ahead always pass them, so it's one click, not a typed reply. Provide EITHER \`question\` (single) or \`questions\` (array), never both. The ask is a first-class attention item aimed at that person; your final reply carries the CONTEXT, the ask carries the QUESTION(S). It is written and delivered THE MOMENT you call this \u2014 the person sees it in their inbox while your turn is still running \u2014 so call it once you know the question; a second call is a second question, not an edit. The human sends ONE response: supplied answers are recorded, omissions become terminally Unanswered. Ask only when blocked \u2014 never ceremonially. \`replaces\` withdraws a stale ask of yours (or anyone's) in this conversation in the same write, with the reason shown to the person. Targets a human only; to hand work to another AGENT use send/dispatch instead.`,
         {
           targetUserId: z13.string().uuid().describe(
             "The workspace member (human) to ask \u2014 a user id, from your turn context's roster."
@@ -7713,6 +7716,14 @@ function createTurnControlMcpServer(acts, skipState, replyState) {
             })
           ).min(1).max(MAX_ASK_ITEMS).optional().describe(
             `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.`
+          ),
+          replaces: z13.object({
+            askId: z13.string().uuid().describe("The id of the open ask to withdraw."),
+            reason: z13.string().min(1).max(MAX_WITHDRAW_REASON).describe(
+              "Why the old question is no longer the question \u2014 shown to the person on their Done row."
+            )
+          }).optional().describe(
+            "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."
           )
         },
         async (args) => {
@@ -7729,6 +7740,9 @@ function createTurnControlMcpServer(acts, skipState, replyState) {
           return performAct(acts, {
             kind: "ask",
             callId: randomUUID(),
+            // CT1350: the swap rides the ask, so the server commits both halves
+            // in one transaction — the person never sees neither or both.
+            ...args.replaces ? { replaces: args.replaces } : {},
             ask: hasArray ? {
               targetUserId: args.targetUserId,
               questions: args.questions.map((q) => ({
@@ -7783,6 +7797,29 @@ function createTurnControlMcpServer(acts, skipState, replyState) {
         },
         { annotations: ACT_TOOL, alwaysLoad: true }
       ),
+      // CT1350: the standalone withdrawal. Not annotated destructive — an ask
+      // is a question, not data, and a harness that gated this on a live
+      // operator would hang a turn nobody is watching (the `cancel_wake`
+      // reasoning). Not idempotent either: a second call with the same id is
+      // refused with `ask_not_open`, which is information, not a no-op.
+      tool(
+        WITHDRAW_ASK_TOOL,
+        "Withdraw an open ask \u2014 yours or anyone's in this conversation \u2014 because the question is moot, was wrong, or has been overtaken. `reason` is required and is shown to the person and, if it wasn't your ask, to the agent who asked it. If there is a current question to put in its place, don't call this \u2014 call `ask` with `replaces` so the two land as one and the person never sees neither or both. Never withdraw to hurry an answer; to act on a deadline, arm a `wake_me` and decide then.",
+        {
+          askId: z13.string().uuid().describe(
+            "The open ask to withdraw. Ask ids ride the conversation's message rows (`ask: { id, status, items }`), and your turn context lists the ones you have open."
+          ),
+          reason: z13.string().min(1).max(MAX_WITHDRAW_REASON).describe(
+            'Why this question is no longer the question ("merged via GitHub #1551"). Required, and shown to the person on their Done row \u2014 a bare "withdrawn" tells them nothing.'
+          )
+        },
+        async (args) => performAct(acts, {
+          kind: "withdraw_ask",
+          callId: randomUUID(),
+          withdraw: { askId: args.askId, reason: args.reason }
+        }),
+        { annotations: ACT_TOOL, 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(

package/dist/runtime.js

@@ -7075,6 +7075,9 @@ var COMPANION_LOCAL_TOOL_GLOB = `mcp__${COMPANION_LOCAL_MCP_SERVER}__*`;
 var SKIP_TURN_TOOL = "skip_turn";
 var ASK_TOOL = "ask";
 var ASK_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${ASK_TOOL}`;
+var WITHDRAW_ASK_TOOL = "withdraw_ask";
+var WITHDRAW_ASK_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${WITHDRAW_ASK_TOOL}`;
+var MAX_WITHDRAW_REASON = 400;
 var REPLY_TO_TOOL = "reply_to";
 var REPLY_TO_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${REPLY_TO_TOOL}`;
 var MAX_ASK_ITEMS = 20;
@@ -7190,7 +7193,7 @@ function createTurnControlMcpServer(acts, skipState, replyState) {
       ] : [],
       tool(
         ASK_TOOL,
-        `Ask a HUMAN a structured question (or a short LIST of them) you need answered to continue, then END your turn \u2014 don't wait for the reply. Use it when you genuinely can't proceed without a person's input (a decision only they can make, a missing fact). Pass \`targetUserId\` (a workspace member's user id \u2014 every person's id is on the roster in your turn context). Two forms: a SINGLE question \u2014 a \`headline\` (the actual question as one clear, capitalized sentence ending in \`?\`, "Do we go to prod?") plus a short \`question\` body for the framing the headline can't hold \u2014 OR, when a plan ends with SEVERAL bounded decisions at once, a \`questions\` array of 1\u2013${MAX_ASK_ITEMS} items, each \`{ headline, body?, options? }\`. **Prefer the list over cramming the extra decisions into prose or dropping them** \u2014 one ask carrying every question, never pick one and bury the rest. Each question keeps the same form rules: a one-sentence \`headline\`, a short \`body\` frame (NOT a report \u2014 your status, links, and detail go in your REPLY; inline markdown only, no lists or headings), and 2\u20134 \`options\` when the answer is a bounded choice \u2014 for a yes/no go-ahead always pass them, so it's one click, not a typed reply. Provide EITHER \`question\` (single) or \`questions\` (array), never both. The ask is a first-class attention item aimed at that person; your final reply carries the CONTEXT, the ask carries the QUESTION(S). It is written and delivered THE MOMENT you call this \u2014 the person sees it in their inbox while your turn is still running \u2014 so call it once you know the question; a second call is a second question, not an edit. The human sends ONE response: supplied answers are recorded, omissions become terminally Unanswered. Ask only when blocked \u2014 never ceremonially. After asking, finish your reply and stop; when the person replies addressed to you, the ask resolves and you resume. Targets a human only; to hand work to another AGENT use send/dispatch instead.`,
+        `Ask a HUMAN a structured question (or a short LIST of them) you need answered to continue, then END your turn \u2014 don't wait for the reply. Use it when you genuinely can't proceed without a person's input (a decision only they can make, a missing fact). Pass \`targetUserId\` (a workspace member's user id \u2014 every person's id is on the roster in your turn context). Two forms: a SINGLE question \u2014 a \`headline\` (the actual question as one clear, capitalized sentence ending in \`?\`, "Do we go to prod?") plus a short \`question\` body for the framing the headline can't hold \u2014 OR, when a plan ends with SEVERAL bounded decisions at once, a \`questions\` array of 1\u2013${MAX_ASK_ITEMS} items, each \`{ headline, body?, options? }\`. **Prefer the list over cramming the extra decisions into prose or dropping them** \u2014 one ask carrying every question, never pick one and bury the rest. Each question keeps the same form rules: a one-sentence \`headline\`, a short \`body\` frame (NOT a report \u2014 your status, links, and detail go in your REPLY; inline markdown only, no lists or headings), and 2\u20134 \`options\` when the answer is a bounded choice \u2014 for a yes/no go-ahead always pass them, so it's one click, not a typed reply. Provide EITHER \`question\` (single) or \`questions\` (array), never both. The ask is a first-class attention item aimed at that person; your final reply carries the CONTEXT, the ask carries the QUESTION(S). It is written and delivered THE MOMENT you call this \u2014 the person sees it in their inbox while your turn is still running \u2014 so call it once you know the question; a second call is a second question, not an edit. The human sends ONE response: supplied answers are recorded, omissions become terminally Unanswered. Ask only when blocked \u2014 never ceremonially. \`replaces\` withdraws a stale ask of yours (or anyone's) in this conversation in the same write, with the reason shown to the person. Targets a human only; to hand work to another AGENT use send/dispatch instead.`,
         {
           targetUserId: z13.string().uuid().describe(
             "The workspace member (human) to ask \u2014 a user id, from your turn context's roster."
@@ -7212,6 +7215,14 @@ function createTurnControlMcpServer(acts, skipState, replyState) {
             })
           ).min(1).max(MAX_ASK_ITEMS).optional().describe(
             `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.`
+          ),
+          replaces: z13.object({
+            askId: z13.string().uuid().describe("The id of the open ask to withdraw."),
+            reason: z13.string().min(1).max(MAX_WITHDRAW_REASON).describe(
+              "Why the old question is no longer the question \u2014 shown to the person on their Done row."
+            )
+          }).optional().describe(
+            "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."
           )
         },
         async (args) => {
@@ -7228,6 +7239,9 @@ function createTurnControlMcpServer(acts, skipState, replyState) {
           return performAct(acts, {
             kind: "ask",
             callId: randomUUID(),
+            // CT1350: the swap rides the ask, so the server commits both halves
+            // in one transaction — the person never sees neither or both.
+            ...args.replaces ? { replaces: args.replaces } : {},
             ask: hasArray ? {
               targetUserId: args.targetUserId,
               questions: args.questions.map((q) => ({
@@ -7282,6 +7296,29 @@ function createTurnControlMcpServer(acts, skipState, replyState) {
         },
         { annotations: ACT_TOOL, alwaysLoad: true }
       ),
+      // CT1350: the standalone withdrawal. Not annotated destructive — an ask
+      // is a question, not data, and a harness that gated this on a live
+      // operator would hang a turn nobody is watching (the `cancel_wake`
+      // reasoning). Not idempotent either: a second call with the same id is
+      // refused with `ask_not_open`, which is information, not a no-op.
+      tool(
+        WITHDRAW_ASK_TOOL,
+        "Withdraw an open ask \u2014 yours or anyone's in this conversation \u2014 because the question is moot, was wrong, or has been overtaken. `reason` is required and is shown to the person and, if it wasn't your ask, to the agent who asked it. If there is a current question to put in its place, don't call this \u2014 call `ask` with `replaces` so the two land as one and the person never sees neither or both. Never withdraw to hurry an answer; to act on a deadline, arm a `wake_me` and decide then.",
+        {
+          askId: z13.string().uuid().describe(
+            "The open ask to withdraw. Ask ids ride the conversation's message rows (`ask: { id, status, items }`), and your turn context lists the ones you have open."
+          ),
+          reason: z13.string().min(1).max(MAX_WITHDRAW_REASON).describe(
+            'Why this question is no longer the question ("merged via GitHub #1551"). Required, and shown to the person on their Done row \u2014 a bare "withdrawn" tells them nothing.'
+          )
+        },
+        async (args) => performAct(acts, {
+          kind: "withdraw_ask",
+          callId: randomUUID(),
+          withdraw: { askId: args.askId, reason: args.reason }
+        }),
+        { annotations: ACT_TOOL, 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(

package/package.json

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