@cabane/companion 0.6.225 → 0.6.227

package/dist/cli.js

@@ -2572,7 +2572,7 @@ var init_transcript_sink = __esm({
 });
 
 // packages/agent-runtime/src/turn-control/descriptions.ts
-var MAX_ASK_QUESTION_BYTES, MAX_ASK_HEADLINE_BYTES, MAX_ASK_ITEMS, EXCHANGE_KINDS, APPROVAL_OPTIONS, REQUEST_OPTIONS, EXCHANGE_EXPECTS, MAX_EXCHANGE_FILES, MAX_REQUEST_BODY_BYTES, MAX_ASK_OPTION_BYTES, ASK_OPTION_NOT_A_STRING, MIN_ASK_OPTIONS, MAX_ASK_OPTIONS, ASK_TARGET_PATTERN, ASK_TARGET_INVALID, MAX_WAKE_NOTE_BYTES, MAX_WITHDRAW_REASON_BYTES, MAX_SKIP_REASON_BYTES, TURN_CONTROL_MCP_SERVER, TURN_CONTROL_TOOLS, TURN_CONTROL_TOOL_DESCRIPTIONS, TURN_CONTROL_FIELD_DESCRIPTIONS;
+var MAX_ASK_QUESTION_BYTES, MAX_ASK_HEADLINE_BYTES, MAX_ASK_ITEMS, EXCHANGE_KINDS, APPROVAL_OPTIONS, MAX_EXCHANGE_ACTION_BYTES, REQUEST_OPTIONS, EXCHANGE_EXPECTS, MAX_EXCHANGE_FILES, MAX_REQUEST_BODY_BYTES, MAX_ASK_OPTION_BYTES, ASK_OPTION_NOT_A_STRING, MIN_ASK_OPTIONS, MAX_ASK_OPTIONS, ASK_TARGET_PATTERN, ASK_TARGET_INVALID, MAX_WAKE_NOTE_BYTES, MAX_WITHDRAW_REASON_BYTES, MAX_SKIP_REASON_BYTES, TURN_CONTROL_MCP_SERVER, TURN_CONTROL_TOOLS, TURN_CONTROL_TOOL_DESCRIPTIONS, TURN_CONTROL_FIELD_DESCRIPTIONS;
 var init_descriptions = __esm({
   "packages/agent-runtime/src/turn-control/descriptions.ts"() {
     "use strict";
@@ -2581,6 +2581,7 @@ var init_descriptions = __esm({
     MAX_ASK_ITEMS = 20;
     EXCHANGE_KINDS = ["question", "approval", "request"];
     APPROVAL_OPTIONS = ["Yes", "No"];
+    MAX_EXCHANGE_ACTION_BYTES = 32;
     REQUEST_OPTIONS = ["Done"];
     EXCHANGE_EXPECTS = ["confirmation", "result"];
     MAX_EXCHANGE_FILES = 5;
@@ -2605,8 +2606,8 @@ var init_descriptions = __esm({
     ];
     TURN_CONTROL_TOOL_DESCRIPTIONS = {
       answer: `Call this just before you write your answer: the text you write next is what the conversation keeps as your message. Call it once.`,
-      open_exchange: `Put something in front of one person that comes back with a recorded outcome, then end your turn; don't wait for it. Not for delivering finished work, and never for acknowledgement or feedback on it; the reply delivers. Open one only when the work can't continue without the answer. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name them with \`@handle\` in your reply.
-- A question is one item (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} items; never both. An approval or request is \`headline\` and an optional \`question\` body only. An approval is answered ${APPROVAL_OPTIONS.join(" / ")}; a request ${REQUEST_OPTIONS.join("")}, or the typed result when \`expects\` is \`result\`, or a note saying the person couldn't. A request's body carries the steps and may hold a list and code blocks; every other body is a sentence or two of framing, inline Markdown only.
+      open_exchange: `Put something in front of one person that comes back with a recorded outcome, then end your turn; don't wait for it. Not for delivering finished work, and never for acknowledgement or feedback on it; the reply delivers. Open one only when the work can't continue without the answer. \`targetUserId\` is a person; to bring in an agent, name them with \`@handle\` in your reply.
+- A question is one item (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} items; never both. An approval or request is \`headline\` and an optional \`question\` body only. An approval is answered by its \`go\` or \`hold\` word, ${APPROVAL_OPTIONS.join(" / ")} without them; a request ${REQUEST_OPTIONS.join("")}, or the typed result when \`expects\` is \`result\`, or a note saying the person couldn't. A request's body carries the steps and may hold a list and code blocks; every other body is a sentence or two of framing, inline Markdown only.
 - Decisions that arise together go in ONE call, in the order you want them answered. A second call is a separate exchange, never an edit.
 - Voice, in headline, body and options: "I" for yourself, never your own name; name everyone else who decides or acts, as on your roster. Never "you", "your", "we", "us", "our" or their contractions, nor "he", "she" or "they" for a named actor. A quotation stays accurate: say who said it.
 - It must stand alone, since it can arrive first: the reply carries the findings, the exchange the question; don't repeat the reply in it.
@@ -2622,7 +2623,9 @@ var init_descriptions = __esm({
       answer: {},
       open_exchange: {
         targetUserId: "The person: their `@handle` from your turn context's roster (preferred), or their user id.",
-        kind: `What the exchange is for; default \`question\`. \`question\`: the person picks among courses of action or types an answer. \`approval\`: a yes/no on one proposed action \u2014 the person answers ${APPROVAL_OPTIONS.join(" or ")}. \`request\`: something only the person can do \u2014 they answer ${REQUEST_OPTIONS.join("")}, or type the result when \`expects\` is \`result\`, or send a note saying they couldn't.`,
+        kind: `What the exchange is for; default \`question\`. \`question\`: the person picks among courses of action or types an answer. \`approval\`: a yes/no on one proposed action \u2014 the person answers with its \`go\` or \`hold\` word, ${APPROVAL_OPTIONS.join(" or ")} when none is given. \`request\`: something only the person can do \u2014 they answer ${REQUEST_OPTIONS.join("")}, or type the result when \`expects\` is \`result\`, or send a note saying they couldn't.`,
+        go: `An approval only: the go answer as the action itself, a short verb phrase ("Merge", "Send them", "Archive it"; not "Yes, merge it"), about 24 characters and at most ${MAX_EXCHANGE_ACTION_BYTES}. Given with \`hold\`, or neither: without them the person answers ${APPROVAL_OPTIONS.join(" or ")}.`,
+        hold: `An approval only: the hold answer in the same voice ("Hold off", "Not yet", "Keep it"), at most ${MAX_EXCHANGE_ACTION_BYTES} characters and different from \`go\`. Given with \`go\`.`,
         expects: "A request only: `confirmation` (default) when you only need to hear it's done, `result` when you need something back. Either way the person may send only a note saying they couldn't. Refused on a question or approval.",
         question: `The body beneath the headline \u2014 for a question or approval one or two sentences of framing, NOT a report (up to ${MAX_ASK_QUESTION_BYTES} characters, inline markdown only); for a request the steps, with lists and code blocks allowed (up to ${MAX_REQUEST_BODY_BYTES} characters). With \`questions\`, leave it out.`,
         headline: `ONE clear, capitalized sentence, up to ${MAX_ASK_HEADLINE_BYTES} characters: for a question or approval, the question ending in \`?\` ("Should Ledger deploy once Mia approves?"); for a request, what to do ("Run these and send me the output"). What the person reads first in For you. Required for an approval or request.`,
@@ -6252,6 +6255,8 @@ function createTurnControlMcpServer(acts, skipState) {
               ).min(MIN_ASK_OPTIONS).max(MAX_ASK_OPTIONS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange["questions.options"])
             })
           ).min(1).max(MAX_ASK_ITEMS).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange.questions),
+          go: z15.string().min(1).max(MAX_EXCHANGE_ACTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange.go),
+          hold: z15.string().min(1).max(MAX_EXCHANGE_ACTION_BYTES).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange.hold),
           files: z15.array(z15.string().min(1).max(1024)).optional().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange.files),
           replaces: z15.object({
             askId: z15.string().uuid().describe(TURN_CONTROL_FIELD_DESCRIPTIONS.open_exchange["replaces.askId"]),
@@ -6275,6 +6280,11 @@ function createTurnControlMcpServer(acts, skipState) {
                 ...args.question ? { question: args.question } : {},
                 ...args.options ? { options: args.options } : {},
                 ...args.questions ? { questions: args.questions } : {},
+                // Forwarded whole, so the server's rule (both or neither, an
+                // approval's only) refuses them by name rather than one half
+                // being dropped here unseen.
+                ...args.go !== void 0 ? { go: args.go } : {},
+                ...args.hold !== void 0 ? { hold: args.hold } : {},
                 ...args.files ? { files: args.files } : {}
               }
             });
@@ -10566,14 +10576,15 @@ import { hostname as hostname2 } from "os";
 // src/log-copy.ts
 init_failure();
 init_bundled_binaries();
+var RESTART = "then `cabane stop` and `cabane start` to restart the companion";
 function turnFailureCopy(reason, runtime) {
   const failure = decodeFailureReason(reason);
   if (failure?.kind === "auth_expired") {
     if (runtime === "claude-code")
-      return "Claude Code sign-in has expired on this device. Open Claude Code, run /login, then reply in Cabane to try again.";
+      return `Claude Code is signed out on this device. To sign back in, run \`claude auth login\`, ${RESTART}. Then reply in Cabane to try again.`;
     if (runtime === "codex")
-      return "Codex sign-in has expired on this device. Run codex login, then reply in Cabane to try again.";
-    return "Sign-in has expired on this device. Sign in to the agent, then reply in Cabane to try again.";
+      return `Codex is signed out on this device. To sign back in, run \`codex login\`, ${RESTART}. Then reply in Cabane to try again.`;
+    return `The agent is signed out on this device. Sign in to their harness, ${RESTART}. Then reply in Cabane to try again.`;
   }
   if (failure?.kind === "usage_capped")
     return failure.resetsAt ? `The usage limit is reached; it resets around ${new Date(failure.resetsAt).toLocaleTimeString()}. Reply in Cabane after it resets.` : "The usage limit is reached. Try again later in Cabane.";

package/dist/runtime.js

@@ -1501,14 +1501,15 @@ var RATE_PATTERNS = [/rate[_ ]?limit/, /\b429\b/, /too many requests/];
 var BARE_LIMIT = /\blimit (reached|exceeded)\b/;
 
 // src/log-copy.ts
+var RESTART = "then `cabane stop` and `cabane start` to restart the companion";
 function turnFailureCopy(reason, runtime) {
   const failure = decodeFailureReason(reason);
   if (failure?.kind === "auth_expired") {
     if (runtime === "claude-code")
-      return "Claude Code sign-in has expired on this device. Open Claude Code, run /login, then reply in Cabane to try again.";
+      return `Claude Code is signed out on this device. To sign back in, run \`claude auth login\`, ${RESTART}. Then reply in Cabane to try again.`;
     if (runtime === "codex")
-      return "Codex sign-in has expired on this device. Run codex login, then reply in Cabane to try again.";
-    return "Sign-in has expired on this device. Sign in to the agent, then reply in Cabane to try again.";
+      return `Codex is signed out on this device. To sign back in, run \`codex login\`, ${RESTART}. Then reply in Cabane to try again.`;
+    return `The agent is signed out on this device. Sign in to their harness, ${RESTART}. Then reply in Cabane to try again.`;
   }
   if (failure?.kind === "usage_capped")
     return failure.resetsAt ? `The usage limit is reached; it resets around ${new Date(failure.resetsAt).toLocaleTimeString()}. Reply in Cabane after it resets.` : "The usage limit is reached. Try again later in Cabane.";
@@ -2938,6 +2939,7 @@ var MAX_ASK_QUESTION_BYTES = 400;
 var MAX_ASK_HEADLINE_BYTES = 120;
 var MAX_ASK_ITEMS = 20;
 var APPROVAL_OPTIONS = ["Yes", "No"];
+var MAX_EXCHANGE_ACTION_BYTES = 32;
 var REQUEST_OPTIONS = ["Done"];
 var MAX_EXCHANGE_FILES = 5;
 var MAX_REQUEST_BODY_BYTES = 2e3;
@@ -2958,8 +2960,8 @@ var TURN_CONTROL_TOOLS = [
 ];
 var TURN_CONTROL_TOOL_DESCRIPTIONS = {
   answer: `Call this just before you write your answer: the text you write next is what the conversation keeps as your message. Call it once.`,
-  open_exchange: `Put something in front of one person that comes back with a recorded outcome, then end your turn; don't wait for it. Not for delivering finished work, and never for acknowledgement or feedback on it; the reply delivers. Open one only when the work can't continue without the answer. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name them with \`@handle\` in your reply.
-- A question is one item (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} items; never both. An approval or request is \`headline\` and an optional \`question\` body only. An approval is answered ${APPROVAL_OPTIONS.join(" / ")}; a request ${REQUEST_OPTIONS.join("")}, or the typed result when \`expects\` is \`result\`, or a note saying the person couldn't. A request's body carries the steps and may hold a list and code blocks; every other body is a sentence or two of framing, inline Markdown only.
+  open_exchange: `Put something in front of one person that comes back with a recorded outcome, then end your turn; don't wait for it. Not for delivering finished work, and never for acknowledgement or feedback on it; the reply delivers. Open one only when the work can't continue without the answer. \`targetUserId\` is a person; to bring in an agent, name them with \`@handle\` in your reply.
+- A question is one item (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} items; never both. An approval or request is \`headline\` and an optional \`question\` body only. An approval is answered by its \`go\` or \`hold\` word, ${APPROVAL_OPTIONS.join(" / ")} without them; a request ${REQUEST_OPTIONS.join("")}, or the typed result when \`expects\` is \`result\`, or a note saying the person couldn't. A request's body carries the steps and may hold a list and code blocks; every other body is a sentence or two of framing, inline Markdown only.
 - Decisions that arise together go in ONE call, in the order you want them answered. A second call is a separate exchange, never an edit.
 - Voice, in headline, body and options: "I" for yourself, never your own name; name everyone else who decides or acts, as on your roster. Never "you", "your", "we", "us", "our" or their contractions, nor "he", "she" or "they" for a named actor. A quotation stays accurate: say who said it.
 - It must stand alone, since it can arrive first: the reply carries the findings, the exchange the question; don't repeat the reply in it.
@@ -2975,7 +2977,9 @@ var TURN_CONTROL_FIELD_DESCRIPTIONS = {
   answer: {},
   open_exchange: {
     targetUserId: "The person: their `@handle` from your turn context's roster (preferred), or their user id.",
-    kind: `What the exchange is for; default \`question\`. \`question\`: the person picks among courses of action or types an answer. \`approval\`: a yes/no on one proposed action \u2014 the person answers ${APPROVAL_OPTIONS.join(" or ")}. \`request\`: something only the person can do \u2014 they answer ${REQUEST_OPTIONS.join("")}, or type the result when \`expects\` is \`result\`, or send a note saying they couldn't.`,
+    kind: `What the exchange is for; default \`question\`. \`question\`: the person picks among courses of action or types an answer. \`approval\`: a yes/no on one proposed action \u2014 the person answers with its \`go\` or \`hold\` word, ${APPROVAL_OPTIONS.join(" or ")} when none is given. \`request\`: something only the person can do \u2014 they answer ${REQUEST_OPTIONS.join("")}, or type the result when \`expects\` is \`result\`, or send a note saying they couldn't.`,
+    go: `An approval only: the go answer as the action itself, a short verb phrase ("Merge", "Send them", "Archive it"; not "Yes, merge it"), about 24 characters and at most ${MAX_EXCHANGE_ACTION_BYTES}. Given with \`hold\`, or neither: without them the person answers ${APPROVAL_OPTIONS.join(" or ")}.`,
+    hold: `An approval only: the hold answer in the same voice ("Hold off", "Not yet", "Keep it"), at most ${MAX_EXCHANGE_ACTION_BYTES} characters and different from \`go\`. Given with \`go\`.`,
     expects: "A request only: `confirmation` (default) when you only need to hear it's done, `result` when you need something back. Either way the person may send only a note saying they couldn't. Refused on a question or approval.",
     question: `The body beneath the headline \u2014 for a question or approval one or two sentences of framing, NOT a report (up to ${MAX_ASK_QUESTION_BYTES} characters, inline markdown only); for a request the steps, with lists and code blocks allowed (up to ${MAX_REQUEST_BODY_BYTES} characters). With \`questions\`, leave it out.`,
     headline: `ONE clear, capitalized sentence, up to ${MAX_ASK_HEADLINE_BYTES} characters: for a question or approval, the question ending in \`?\` ("Should Ledger deploy once Mia approves?"); for a request, what to do ("Run these and send me the output"). What the person reads first in For you. Required for an approval or request.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.225",
+  "version": "0.6.227",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an 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",