@cabane/companion 0.6.62 → 0.6.63

package/dist/cli.js

@@ -7173,16 +7173,32 @@ var WAKE_ME_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${WAKE_ME_TOOL}`;
 var CANCEL_WAKE_TOOL = "cancel_wake";
 var CANCEL_WAKE_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${CANCEL_WAKE_TOOL}`;
 function createReplyState() {
-  return { answersMessageId: null };
+  return { answersMessageId: null, order: null };
 }
 function createSendState() {
-  return { agentId: null, message: null };
+  return { agentId: null, message: null, order: null };
+}
+function createTurnControlOrder() {
+  let calls = 0;
+  return {
+    next: () => {
+      calls += 1;
+      return calls;
+    }
+  };
 }
 function createSkipState() {
   return { skipped: false, reason: null };
 }
 function createAskState() {
-  return { targetUserId: null, question: null, headline: null, options: null, questions: null };
+  return {
+    targetUserId: null,
+    question: null,
+    headline: null,
+    options: null,
+    questions: null,
+    order: null
+  };
 }
 function createWakeState() {
   return { afterSeconds: null, at: null, note: null, cancelled: false };
@@ -7212,7 +7228,7 @@ function wakeCommitField(state) {
     }
   };
 }
-function createTurnControlMcpServer(sendState, skipState, askState, subAgentCreate, wakeState, replyState) {
+function createTurnControlMcpServer(sendState, skipState, askState, subAgentCreate, wakeState, replyState, controlOrder) {
   return createSdkMcpServer({
     name: COMPANION_LOCAL_MCP_SERVER,
     version: "0.0.0",
@@ -7229,6 +7245,7 @@ function createTurnControlMcpServer(sendState, skipState, askState, subAgentCrea
         async (args) => {
           sendState.agentId = args.agentId;
           sendState.message = args.message;
+          sendState.order = controlOrder?.next() ?? null;
           return {
             content: [{ type: "text", text: JSON.stringify({ sent: args.agentId }) }]
           };
@@ -7244,6 +7261,7 @@ function createTurnControlMcpServer(sendState, skipState, askState, subAgentCrea
           },
           async (args) => {
             replyState.answersMessageId = args.messageId;
+            replyState.order = controlOrder?.next() ?? null;
             return {
               content: [
                 {
@@ -7326,6 +7344,7 @@ function createTurnControlMcpServer(sendState, skipState, askState, subAgentCrea
               };
             }
             askState.targetUserId = args.targetUserId;
+            askState.order = controlOrder?.next() ?? null;
             if (hasArray) {
               askState.questions = args.questions;
               askState.question = null;
@@ -7889,12 +7908,31 @@ var TurnCommitter = class {
   // a wordless turn has no answer to bind, and the server's mute-settle
   // notice speaks for it.
   turnControlFields(kind) {
-    return {
+    const fields = {
       ...this.answersField(kind),
       ...this.sendField(),
       ...this.askField(),
       ...this.wakeField()
     };
+    return { ...fields, ...this.orderField(fields) };
+  }
+  // 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.
+  orderField(fields) {
+    const order = {};
+    const replyOrder = this.deps.replyState.order;
+    if (fields.answersMessageId !== void 0 && replyOrder !== null) order.reply = replyOrder;
+    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
   // declaration for the turn that just answers — see
@@ -8353,6 +8391,7 @@ ${reason}`,
     const askState = createAskState();
     const wakeState = createWakeState();
     const replyState = createReplyState();
+    const controlOrder = createTurnControlOrder();
     let spawnedSubAgent = false;
     const subAgentCreate = async (args) => {
       const dispatchTarget = args.agentId ?? payload.agentId;
@@ -8384,7 +8423,8 @@ ${reason}`,
       askState,
       subAgentCreate,
       wakeState,
-      replyState
+      replyState,
+      controlOrder
     );
     const request = buildCompanionTurnRequest({
       turnContext,
@@ -8503,11 +8543,12 @@ ${reason}`,
       signal: abortController.signal,
       log: turnLog,
       nextSeq,
-      // The committer reads this at commit to attach the addressed send onto the
-      // turn's `final` row.
+      // The committer reads this at commit to carry the addressed send on the
+      // terminal row; the server writes the send itself as a distinct message.
       sendState,
-      // CT326: likewise the ask payload — attached to the `final` row so the
-      // server creates the `asks` row atomically with the message it rides on.
+      // CT326: likewise the ask payload. CT1281: the server writes the ask as its
+      // own addressed message to the human — which ENQUEUES like any other send —
+      // and creates the `asks` row against that carrier, not against turn speech.
       askState,
       // CT442: likewise the wake payload — attached to the `final` row so the
       // server arms the wake schedule atomically with the reply it rode on.
@@ -8532,6 +8573,7 @@ ${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;
@@ -8560,8 +8602,12 @@ ${reason}`,
         if (intent.sendAgentId && intent.sendBody) {
           sendState.agentId = intent.sendAgentId;
           sendState.message = intent.sendBody;
+          sendState.order = intent.sendOrder ?? null;
+        }
+        if (intent.answersMessageId) {
+          replyState.answersMessageId = intent.answersMessageId;
+          replyState.order = intent.replyOrder ?? null;
         }
-        if (intent.answersMessageId) replyState.answersMessageId = intent.answersMessageId;
         if (intent.skipped) {
           skipState.skipped = true;
           skipState.reason = intent.skipReason;

package/dist/runtime.js

@@ -6672,16 +6672,32 @@ var WAKE_ME_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${WAKE_ME_TOOL}`;
 var CANCEL_WAKE_TOOL = "cancel_wake";
 var CANCEL_WAKE_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${CANCEL_WAKE_TOOL}`;
 function createReplyState() {
-  return { answersMessageId: null };
+  return { answersMessageId: null, order: null };
 }
 function createSendState() {
-  return { agentId: null, message: null };
+  return { agentId: null, message: null, order: null };
+}
+function createTurnControlOrder() {
+  let calls = 0;
+  return {
+    next: () => {
+      calls += 1;
+      return calls;
+    }
+  };
 }
 function createSkipState() {
   return { skipped: false, reason: null };
 }
 function createAskState() {
-  return { targetUserId: null, question: null, headline: null, options: null, questions: null };
+  return {
+    targetUserId: null,
+    question: null,
+    headline: null,
+    options: null,
+    questions: null,
+    order: null
+  };
 }
 function createWakeState() {
   return { afterSeconds: null, at: null, note: null, cancelled: false };
@@ -6711,7 +6727,7 @@ function wakeCommitField(state) {
     }
   };
 }
-function createTurnControlMcpServer(sendState, skipState, askState, subAgentCreate, wakeState, replyState) {
+function createTurnControlMcpServer(sendState, skipState, askState, subAgentCreate, wakeState, replyState, controlOrder) {
   return createSdkMcpServer({
     name: COMPANION_LOCAL_MCP_SERVER,
     version: "0.0.0",
@@ -6728,6 +6744,7 @@ function createTurnControlMcpServer(sendState, skipState, askState, subAgentCrea
         async (args) => {
           sendState.agentId = args.agentId;
           sendState.message = args.message;
+          sendState.order = controlOrder?.next() ?? null;
           return {
             content: [{ type: "text", text: JSON.stringify({ sent: args.agentId }) }]
           };
@@ -6743,6 +6760,7 @@ function createTurnControlMcpServer(sendState, skipState, askState, subAgentCrea
           },
           async (args) => {
             replyState.answersMessageId = args.messageId;
+            replyState.order = controlOrder?.next() ?? null;
             return {
               content: [
                 {
@@ -6825,6 +6843,7 @@ function createTurnControlMcpServer(sendState, skipState, askState, subAgentCrea
               };
             }
             askState.targetUserId = args.targetUserId;
+            askState.order = controlOrder?.next() ?? null;
             if (hasArray) {
               askState.questions = args.questions;
               askState.question = null;
@@ -7388,12 +7407,31 @@ var TurnCommitter = class {
   // a wordless turn has no answer to bind, and the server's mute-settle
   // notice speaks for it.
   turnControlFields(kind) {
-    return {
+    const fields = {
       ...this.answersField(kind),
       ...this.sendField(),
       ...this.askField(),
       ...this.wakeField()
     };
+    return { ...fields, ...this.orderField(fields) };
+  }
+  // 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.
+  orderField(fields) {
+    const order = {};
+    const replyOrder = this.deps.replyState.order;
+    if (fields.answersMessageId !== void 0 && replyOrder !== null) order.reply = replyOrder;
+    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
   // declaration for the turn that just answers — see
@@ -7852,6 +7890,7 @@ ${reason}`,
     const askState = createAskState();
     const wakeState = createWakeState();
     const replyState = createReplyState();
+    const controlOrder = createTurnControlOrder();
     let spawnedSubAgent = false;
     const subAgentCreate = async (args) => {
       const dispatchTarget = args.agentId ?? payload.agentId;
@@ -7883,7 +7922,8 @@ ${reason}`,
       askState,
       subAgentCreate,
       wakeState,
-      replyState
+      replyState,
+      controlOrder
     );
     const request = buildCompanionTurnRequest({
       turnContext,
@@ -8002,11 +8042,12 @@ ${reason}`,
       signal: abortController.signal,
       log: turnLog,
       nextSeq,
-      // The committer reads this at commit to attach the addressed send onto the
-      // turn's `final` row.
+      // The committer reads this at commit to carry the addressed send on the
+      // terminal row; the server writes the send itself as a distinct message.
       sendState,
-      // CT326: likewise the ask payload — attached to the `final` row so the
-      // server creates the `asks` row atomically with the message it rides on.
+      // CT326: likewise the ask payload. CT1281: the server writes the ask as its
+      // own addressed message to the human — which ENQUEUES like any other send —
+      // and creates the `asks` row against that carrier, not against turn speech.
       askState,
       // CT442: likewise the wake payload — attached to the `final` row so the
       // server arms the wake schedule atomically with the reply it rode on.
@@ -8031,6 +8072,7 @@ ${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;
@@ -8059,8 +8101,12 @@ ${reason}`,
         if (intent.sendAgentId && intent.sendBody) {
           sendState.agentId = intent.sendAgentId;
           sendState.message = intent.sendBody;
+          sendState.order = intent.sendOrder ?? null;
+        }
+        if (intent.answersMessageId) {
+          replyState.answersMessageId = intent.answersMessageId;
+          replyState.order = intent.replyOrder ?? null;
         }
-        if (intent.answersMessageId) replyState.answersMessageId = intent.answersMessageId;
         if (intent.skipped) {
           skipState.skipped = true;
           skipState.reason = intent.skipReason;

package/package.json

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