@cabane/companion 0.6.64 → 0.6.66

package/dist/cli.js

@@ -2597,15 +2597,16 @@ var CabaneApi = class {
   // (transport errors + 5xx), never a 4xx, so no `(turnId, kind)` row is
   // double-posted. The caller threads its turn abort signal so a cancel
   // mid-commit aborts the in-flight POST rather than letting it land.
-  // CT11: `kind` now includes `'stopped'` for the terminal marker the
-  // dispatcher writes when a turn is cancelled — same wire shape as
-  // `progress`/`final`, distinguished only by `kind` so the chat drawer's
-  // turn-group renderer treats it as a closing row. `seq` is the companion's
-  // per-turn monotonic counter, stamped on the row so the merged timeline
-  // orders the commit deterministically against the persisted tool/thinking
-  // rows. Both fields are optional on the wire — an older companion that didn't
-  // mint seq still validates (the server defaults to 0); `stopped` is only
-  // emitted by post-CT11 companions.
+  // CT11: `kind` includes `'stopped'` for the terminal cancel marker — same
+  // wire shape as `progress`/`final`, distinguished only by `kind` so the chat
+  // drawer's turn-group renderer treats it as a closing row. CT1295: this
+  // companion no longer WRITES that kind — the server does, in the transaction
+  // that terminalizes the stopped turn — so the value survives here only as
+  // wire vocabulary the server also speaks. `seq` is the companion's per-turn
+  // monotonic counter, stamped on the row so the merged timeline orders the
+  // commit deterministically against the persisted tool/thinking rows. Both
+  // fields are optional on the wire — an older companion that didn't mint seq
+  // still validates (the server defaults to 0).
   postTurnMessage(workspaceId, conversationId, body, signal) {
     return this.durableCommit(
       "message",
@@ -4379,7 +4380,7 @@ var BASE_CLAUDE_CODE_CONFORMANCE_FIXTURES = [
   {
     // HIGHEST-RISK: cancel mid-stream. The abort lands after the tool result;
     // the adapter stops before the closing reply — no final text, no `result`
-    // event. The host writes the `kind:'stopped'` marker off the signal.
+    // event. CT1295: the server writes the `kind:'stopped'` marker.
     name: "cancel mid-stream",
     request: makeRequest(),
     nativeStream: [
@@ -5500,7 +5501,7 @@ var OPENCODE_CONFORMANCE_FIXTURES = [
   {
     // HIGHEST-RISK: cancel mid-stream. The abort lands after the tool result; the
     // adapter stops before the closing reply — no final text, no `result` event.
-    // The host writes the `kind:'stopped'` marker off the signal.
+    // CT1295: the server writes the `kind:'stopped'` marker.
     name: "cancel mid-stream",
     request: makeRequest2(),
     nativeStream: [
@@ -6792,7 +6793,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
   {
     // HIGHEST-RISK: cancel mid-stream. The abort lands after the tool result; the
     // adapter stops before the closing reply — no final text, no `result` event.
-    // The host writes the `kind:'stopped'` marker off the signal.
+    // CT1295: the server writes the `kind:'stopped'` marker.
     name: "cancel mid-stream",
     request: makeRequest3(),
     nativeStream: [
@@ -7253,14 +7254,7 @@ function createSkipState() {
   return { skipped: false, reason: null };
 }
 function createAskState() {
-  return {
-    targetUserId: null,
-    question: null,
-    headline: null,
-    options: null,
-    questions: null,
-    order: null
-  };
+  return { targetUserId: null, question: null, headline: null, options: null, questions: null };
 }
 function createWakeState() {
   return { afterSeconds: null, at: null, note: null, cancelled: false };
@@ -7406,7 +7400,6 @@ function createTurnControlMcpServer(sendState, skipState, askState, subAgentCrea
               };
             }
             askState.targetUserId = args.targetUserId;
-            askState.order = controlOrder?.next() ?? null;
             if (hasArray) {
               askState.questions = args.questions;
               askState.question = null;
@@ -7948,8 +7941,10 @@ var TurnCommitter = class {
   // End-of-turn progress promotion. The held-text flush is now the adapter's
   // job (it emits the closing reply as a `text` event before `result`), so this
   // only asks the pump to promote agent-authored interim text. A wordless turn
-  // stays wordless and the dispatcher closes it with a marker. Guards on the
-  // abort signal, so on cancel no `final` is forced.
+  // stays wordless and the dispatcher closes it with a `silent`/`skipped`
+  // marker (CT1295: a CANCELLED turn is closed by the SERVER's `stopped`
+  // marker, not from this side). Guards on the abort signal, so on cancel no
+  // `final` is forced.
   async finalize(okResult) {
     await this.pump.finalize(okResult);
   }
@@ -7980,10 +7975,15 @@ var TurnCommitter = class {
   }
   // CT1281: the order the control tools were CALLED, for the addressed rows the
   // server writes from this one commit. It reports a position only for an intent
-  // that actually made it into the commit — an ask whose payload was incomplete,
-  // or a self-send the committer stripped, contributes no row and so has no place
-  // in the line. An intent with no recorded call (the runtime's auto-declared
-  // reply) is deliberately absent: the server sorts it last, which is what it is.
+  // that actually made it into the commit — a self-send the committer stripped
+  // contributes no row and so has no place in the line. An intent with no
+  // recorded call (the runtime's auto-declared reply) is deliberately absent, and
+  // the server sorts it after every recorded one — it binds the turn's closing
+  // words.
+  //
+  // The ask is absent by design, not by omission: its carrier queues last among
+  // the turn's rows however early the tool fired, so there is no position to
+  // report.
   orderField(fields) {
     const order = {};
     const replyOrder = this.deps.replyState.order;
@@ -7991,9 +7991,6 @@ var TurnCommitter = class {
     if (fields.dispatch !== void 0 && this.deps.sendState.order !== null) {
       order.send = this.deps.sendState.order;
     }
-    if (fields.ask !== void 0 && this.deps.askState.order !== null) {
-      order.ask = this.deps.askState.order;
-    }
     return Object.keys(order).length > 0 ? { turnControlOrder: order } : {};
   }
   // The declared reply: explicit `reply_to` first, else the runtime's own
@@ -8067,7 +8064,6 @@ var TurnCommitter = class {
 var PREPARING_TOOL_NAME = "preparing";
 var PREPARE_FAILED_PREFIX = "**Couldn't prepare your environment.** I wasn't able to provision a working directory for this conversation, so I can't run this turn. The provisioning command reported:";
 var MISSING_SECRET_PREFIX = "**Missing secret on this companion.** This agent's tools need a credential this device hasn't been given, so I can't run this turn safely. Declare it in this companion\u2019s secret store (`~/.cabane/secrets.json`) and try again. Missing:";
-var STOPPED_MARKER_BODY = "(stopped)";
 var RUNTIME_UNAVAILABLE_PREFIX = "**This agent's runtime isn't available on this companion.** The model this agent uses needs a runtime this device isn't running, so I can't run this turn here. Details:";
 var UNEXPECTED_ROLE_REASON = `refused the wake trigger (role "system" isn't dispatchable on this companion) \u2014 the companion is likely running outdated code; refresh it, then re-address the agent`;
 var SKIPPED_MARKER_BODY = "(skipped)";
@@ -8685,7 +8681,6 @@ ${reason}`,
         );
         if (intent.ask) {
           askState.targetUserId = intent.ask.targetUserId;
-          askState.order = intent.askOrder ?? null;
           if (intent.ask.questions && intent.ask.questions.length > 0) {
             askState.questions = intent.ask.questions;
             askState.question = null;
@@ -8900,23 +8895,6 @@ ${reason}`,
           }
         }
       }
-      if (userCancelled) {
-        try {
-          await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
-            body: STOPPED_MARKER_BODY,
-            kind: "stopped",
-            turnId,
-            seq: nextSeq(),
-            // CT113: the stopped marker is still "about" the triggering message.
-            parentMessageId: payload.messageId
-          });
-        } catch (err) {
-          turnLog.warn(
-            { err: err instanceof Error ? err.message : String(err) },
-            "dispatcher: stopped-marker commit failed"
-          );
-        }
-      }
       const body = {
         activeRunStartedAt: null,
         // CT277: the server keys the turn-end metadata UPDATE (ended_at + tokens)

package/dist/runtime.js

@@ -2017,15 +2017,16 @@ var CabaneApi = class {
   // (transport errors + 5xx), never a 4xx, so no `(turnId, kind)` row is
   // double-posted. The caller threads its turn abort signal so a cancel
   // mid-commit aborts the in-flight POST rather than letting it land.
-  // CT11: `kind` now includes `'stopped'` for the terminal marker the
-  // dispatcher writes when a turn is cancelled — same wire shape as
-  // `progress`/`final`, distinguished only by `kind` so the chat drawer's
-  // turn-group renderer treats it as a closing row. `seq` is the companion's
-  // per-turn monotonic counter, stamped on the row so the merged timeline
-  // orders the commit deterministically against the persisted tool/thinking
-  // rows. Both fields are optional on the wire — an older companion that didn't
-  // mint seq still validates (the server defaults to 0); `stopped` is only
-  // emitted by post-CT11 companions.
+  // CT11: `kind` includes `'stopped'` for the terminal cancel marker — same
+  // wire shape as `progress`/`final`, distinguished only by `kind` so the chat
+  // drawer's turn-group renderer treats it as a closing row. CT1295: this
+  // companion no longer WRITES that kind — the server does, in the transaction
+  // that terminalizes the stopped turn — so the value survives here only as
+  // wire vocabulary the server also speaks. `seq` is the companion's per-turn
+  // monotonic counter, stamped on the row so the merged timeline orders the
+  // commit deterministically against the persisted tool/thinking rows. Both
+  // fields are optional on the wire — an older companion that didn't mint seq
+  // still validates (the server defaults to 0).
   postTurnMessage(workspaceId, conversationId, body, signal) {
     return this.durableCommit(
       "message",
@@ -3878,7 +3879,7 @@ var BASE_CLAUDE_CODE_CONFORMANCE_FIXTURES = [
   {
     // HIGHEST-RISK: cancel mid-stream. The abort lands after the tool result;
     // the adapter stops before the closing reply — no final text, no `result`
-    // event. The host writes the `kind:'stopped'` marker off the signal.
+    // event. CT1295: the server writes the `kind:'stopped'` marker.
     name: "cancel mid-stream",
     request: makeRequest(),
     nativeStream: [
@@ -4999,7 +5000,7 @@ var OPENCODE_CONFORMANCE_FIXTURES = [
   {
     // HIGHEST-RISK: cancel mid-stream. The abort lands after the tool result; the
     // adapter stops before the closing reply — no final text, no `result` event.
-    // The host writes the `kind:'stopped'` marker off the signal.
+    // CT1295: the server writes the `kind:'stopped'` marker.
     name: "cancel mid-stream",
     request: makeRequest2(),
     nativeStream: [
@@ -6291,7 +6292,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
   {
     // HIGHEST-RISK: cancel mid-stream. The abort lands after the tool result; the
     // adapter stops before the closing reply — no final text, no `result` event.
-    // The host writes the `kind:'stopped'` marker off the signal.
+    // CT1295: the server writes the `kind:'stopped'` marker.
     name: "cancel mid-stream",
     request: makeRequest3(),
     nativeStream: [
@@ -6752,14 +6753,7 @@ function createSkipState() {
   return { skipped: false, reason: null };
 }
 function createAskState() {
-  return {
-    targetUserId: null,
-    question: null,
-    headline: null,
-    options: null,
-    questions: null,
-    order: null
-  };
+  return { targetUserId: null, question: null, headline: null, options: null, questions: null };
 }
 function createWakeState() {
   return { afterSeconds: null, at: null, note: null, cancelled: false };
@@ -6905,7 +6899,6 @@ function createTurnControlMcpServer(sendState, skipState, askState, subAgentCrea
               };
             }
             askState.targetUserId = args.targetUserId;
-            askState.order = controlOrder?.next() ?? null;
             if (hasArray) {
               askState.questions = args.questions;
               askState.question = null;
@@ -7447,8 +7440,10 @@ var TurnCommitter = class {
   // End-of-turn progress promotion. The held-text flush is now the adapter's
   // job (it emits the closing reply as a `text` event before `result`), so this
   // only asks the pump to promote agent-authored interim text. A wordless turn
-  // stays wordless and the dispatcher closes it with a marker. Guards on the
-  // abort signal, so on cancel no `final` is forced.
+  // stays wordless and the dispatcher closes it with a `silent`/`skipped`
+  // marker (CT1295: a CANCELLED turn is closed by the SERVER's `stopped`
+  // marker, not from this side). Guards on the abort signal, so on cancel no
+  // `final` is forced.
   async finalize(okResult) {
     await this.pump.finalize(okResult);
   }
@@ -7479,10 +7474,15 @@ var TurnCommitter = class {
   }
   // CT1281: the order the control tools were CALLED, for the addressed rows the
   // server writes from this one commit. It reports a position only for an intent
-  // that actually made it into the commit — an ask whose payload was incomplete,
-  // or a self-send the committer stripped, contributes no row and so has no place
-  // in the line. An intent with no recorded call (the runtime's auto-declared
-  // reply) is deliberately absent: the server sorts it last, which is what it is.
+  // that actually made it into the commit — a self-send the committer stripped
+  // contributes no row and so has no place in the line. An intent with no
+  // recorded call (the runtime's auto-declared reply) is deliberately absent, and
+  // the server sorts it after every recorded one — it binds the turn's closing
+  // words.
+  //
+  // The ask is absent by design, not by omission: its carrier queues last among
+  // the turn's rows however early the tool fired, so there is no position to
+  // report.
   orderField(fields) {
     const order = {};
     const replyOrder = this.deps.replyState.order;
@@ -7490,9 +7490,6 @@ var TurnCommitter = class {
     if (fields.dispatch !== void 0 && this.deps.sendState.order !== null) {
       order.send = this.deps.sendState.order;
     }
-    if (fields.ask !== void 0 && this.deps.askState.order !== null) {
-      order.ask = this.deps.askState.order;
-    }
     return Object.keys(order).length > 0 ? { turnControlOrder: order } : {};
   }
   // The declared reply: explicit `reply_to` first, else the runtime's own
@@ -7566,7 +7563,6 @@ var TurnCommitter = class {
 var PREPARING_TOOL_NAME = "preparing";
 var PREPARE_FAILED_PREFIX = "**Couldn't prepare your environment.** I wasn't able to provision a working directory for this conversation, so I can't run this turn. The provisioning command reported:";
 var MISSING_SECRET_PREFIX = "**Missing secret on this companion.** This agent's tools need a credential this device hasn't been given, so I can't run this turn safely. Declare it in this companion\u2019s secret store (`~/.cabane/secrets.json`) and try again. Missing:";
-var STOPPED_MARKER_BODY = "(stopped)";
 var RUNTIME_UNAVAILABLE_PREFIX = "**This agent's runtime isn't available on this companion.** The model this agent uses needs a runtime this device isn't running, so I can't run this turn here. Details:";
 var UNEXPECTED_ROLE_REASON = `refused the wake trigger (role "system" isn't dispatchable on this companion) \u2014 the companion is likely running outdated code; refresh it, then re-address the agent`;
 var SKIPPED_MARKER_BODY = "(skipped)";
@@ -8184,7 +8180,6 @@ ${reason}`,
         );
         if (intent.ask) {
           askState.targetUserId = intent.ask.targetUserId;
-          askState.order = intent.askOrder ?? null;
           if (intent.ask.questions && intent.ask.questions.length > 0) {
             askState.questions = intent.ask.questions;
             askState.question = null;
@@ -8399,23 +8394,6 @@ ${reason}`,
           }
         }
       }
-      if (userCancelled) {
-        try {
-          await this.opts.api.postTurnMessage(workspaceId, payload.conversationId, {
-            body: STOPPED_MARKER_BODY,
-            kind: "stopped",
-            turnId,
-            seq: nextSeq(),
-            // CT113: the stopped marker is still "about" the triggering message.
-            parentMessageId: payload.messageId
-          });
-        } catch (err) {
-          turnLog.warn(
-            { err: err instanceof Error ? err.message : String(err) },
-            "dispatcher: stopped-marker commit failed"
-          );
-        }
-      }
       const body = {
         activeRunStartedAt: null,
         // CT277: the server keys the turn-end metadata UPDATE (ended_at + tokens)

package/package.json

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