@cabane/companion 0.6.129 → 0.6.131

package/dist/cli.js

@@ -1383,6 +1383,21 @@ var init_api = __esm({
           (e) => e.turnId === turnId && e.kind === "message" && e.body?.kind !== "runtime_notice"
         );
       }
+      // CT1677: ADOPT the issuance a turn context carried as the execution source of
+      // the work about to run on it. Made once per context, before preparation emits
+      // or queues anything, so every row that work commits can name a source the
+      // server has durably recorded and will never reap. Retried like any write: the
+      // server's adoption is idempotent. A 409 `execution_source_unavailable` is a
+      // refusal — nothing to adopt, the reaper got there first — and the caller
+      // fetches a fresh context rather than working on this one.
+      adoptExecutionSource(issuanceId, body, signal) {
+        return this.request(
+          "POST",
+          `/api/agent/execution-sources/${encodeURIComponent(issuanceId)}/adoption`,
+          body,
+          signal ? { retry: true, signal } : { retry: true }
+        );
+      }
       // CT1680: the launcher mints the runner credential for one dispatch, on its
       // PAT and from its device, and hands it to the runner in place of both. A
       // retry is safe: the server returns the same runner id and retires the
@@ -8535,6 +8550,7 @@ var init_turn_committer = __esm({
     TurnCommitter = class {
       constructor(deps) {
         this.deps = deps;
+        const source = deps.executionSourceId !== void 0 ? { executionSourceId: deps.executionSourceId } : {};
         this.onError = (err, hook) => {
           deps.log.warn(
             { ...apiErrorLogFields(err), hook },
@@ -8552,7 +8568,8 @@ var init_turn_committer = __esm({
                 kind,
                 turnId: deps.turnId,
                 seq,
-                parentMessageId: deps.parentMessageId
+                parentMessageId: deps.parentMessageId,
+                ...source
               },
               deps.signal
             );
@@ -8580,7 +8597,8 @@ var init_turn_committer = __esm({
                 result,
                 mcpServer,
                 phase,
-                seq
+                seq,
+                ...source
               },
               deps.signal
             );
@@ -8590,7 +8608,7 @@ var init_turn_committer = __esm({
               deps.workspaceId,
               deps.conversationId,
               deps.agentId,
-              { turnId: deps.turnId, text, seq },
+              { turnId: deps.turnId, text, seq, ...source },
               deps.signal
             );
           },
@@ -8599,7 +8617,7 @@ var init_turn_committer = __esm({
               deps.workspaceId,
               deps.conversationId,
               deps.agentId,
-              { turnId: deps.turnId, text, seq },
+              { turnId: deps.turnId, text, seq, ...source },
               deps.signal
             );
           }
@@ -8925,6 +8943,14 @@ var init_turn_execution = __esm({
       admitted = false;
       // Rooms: one recompose per turn when the lease refuses a stale context.
       recomposedForLease = false;
+      // CT1677: the execution source the CURRENT context was adopted as. Reassigned
+      // when a `dispatch_context_stale` recompose adopts a replacement, so a piece of
+      // work — preparation, the committer, a notice — captures it when that work
+      // begins and never reads it again: earlier work keeps its source. Undefined
+      // only before the first adoption; no work runs until it is set.
+      executionSourceId;
+      // CT1677: one fresh fetch per turn when adoption is refused.
+      refetchedForAdoption = false;
       concluded(reason, errorReason) {
         return new TurnConcluded(reason, errorReason);
       }
@@ -9075,6 +9101,15 @@ var init_turn_execution = __esm({
           turnLog.warn({ turnId }, "dispatcher: turn context carried no turn token");
           throw this.concluded(NO_TURN_TOKEN_REASON, NO_TURN_TOKEN_REASON);
         }
+        if (await this.adoptSource(turnContext) === "refused") {
+          if (this.refetchedForAdoption) {
+            const reason = "execution_source_unavailable: adoption refused twice";
+            throw this.concluded(reason, reason);
+          }
+          this.refetchedForAdoption = true;
+          turnLog.info({ turnId }, "dispatcher: context could not be adopted; fetching a fresh one");
+          return this.fetchContext();
+        }
         this.turnContext = turnContext;
         if (this.resumed) {
           const sources = { serverFloor: turnContext.turnSeqFloor, outboxFloor };
@@ -9090,6 +9125,34 @@ var init_turn_execution = __esm({
           throw this.concluded(reason, reason);
         }
       }
+      // CT1677: register this context's issuance as the execution source of the
+      // work about to run on it. A context with no issuance has nothing to adopt,
+      // and that ends the turn exactly as a failed adoption does: this companion
+      // never commits a row whose provenance it cannot name. Only a refusal —
+      // nothing to adopt any more — earns a fresh fetch.
+      async adoptSource(context) {
+        const { payload, turnId, turnLog } = this;
+        if (!context.issuanceId) {
+          turnLog.warn({ turnId }, "dispatcher: the turn context carried no issuance to adopt");
+          const reason = "execution_source_unavailable: the context carried no issuance";
+          throw this.concluded(reason, reason);
+        }
+        try {
+          const adopted = await this.opts.api.adoptExecutionSource(
+            context.issuanceId,
+            { conversationId: payload.conversationId, turnId },
+            this.abortController.signal
+          );
+          this.executionSourceId = adopted.executionSourceId;
+          return "adopted";
+        } catch (err) {
+          if (this.abortController.signal.aborted) throw this.concluded("cancelled");
+          if (apiErrorCode(err) === "execution_source_unavailable") return "refused";
+          turnLog.warn(apiErrorLogFields(err), "dispatcher: failed to adopt the turn context");
+          const reason = `execution_source_unavailable: ${describeError(err)}`;
+          throw this.concluded(reason, reason);
+        }
+      }
       gateTrigger() {
         const { payload, turnLog } = this;
         const message = this.turnContext.message;
@@ -9186,6 +9249,7 @@ var init_turn_execution = __esm({
             const delayMs = this.opts.preparingRowDelayMs ?? DEFAULT_PREPARING_ROW_DELAY_MS;
             let preparingStarted = false;
             let preparing = null;
+            const executionSourceId = this.executionSourceId;
             const reportPreparing = (phase) => {
               preparing ??= { id: `prepare:${randomUUID3()}`, seq: this.nextSeq() };
               const { id, seq } = preparing;
@@ -9195,7 +9259,8 @@ var init_turn_execution = __esm({
                 toolName: PREPARING_TOOL_NAME,
                 summary: "",
                 phase,
-                seq
+                seq,
+                ...executionSourceId !== void 0 ? { executionSourceId } : {}
               };
               void this.opts.api.reportActivity(workspaceId, payload.conversationId, payload.agentId, body).catch((err) => {
                 turnLog.debug(
@@ -9363,6 +9428,7 @@ var init_turn_execution = __esm({
         });
       }
       integrityContext() {
+        const source = this.executionSourceId !== void 0 ? { executionSourceId: this.executionSourceId } : {};
         return {
           runtime: this.turnContext.runtime,
           workspaceId: this.workspaceId,
@@ -9370,7 +9436,7 @@ var init_turn_execution = __esm({
           turnId: this.turnId,
           parentMessageId: this.payload.messageId,
           log: this.turnLog,
-          postTurnMessage: (workspaceId, conversationId, body) => this.opts.api.postTurnMessage(workspaceId, conversationId, body),
+          postTurnMessage: (workspaceId, conversationId, body) => this.opts.api.postTurnMessage(workspaceId, conversationId, { ...body, ...source }),
           ...this.opts.resolveBundled ? { resolveBundled: this.opts.resolveBundled } : {}
         };
       }
@@ -9459,7 +9525,9 @@ var init_turn_execution = __esm({
               body: `${RUNTIME_UNAVAILABLE_PREFIX} ${err.message}`,
               kind: "runtime_notice",
               turnId,
-              parentMessageId: payload.messageId
+              parentMessageId: payload.messageId,
+              // CT1677: the notice is written by this attempt's source, like its speech.
+              ...this.executionSourceId !== void 0 ? { executionSourceId: this.executionSourceId } : {}
             });
           } catch (postErr) {
             turnLog.warn(
@@ -9553,6 +9621,8 @@ var init_turn_execution = __esm({
           log: turnLog,
           nextSeq: this.nextSeq,
           spoke: this.resumedSpoke,
+          // CT1677: admitted by now, so this is the source the model's work runs on.
+          ...this.executionSourceId !== void 0 ? { executionSourceId: this.executionSourceId } : {},
           // CT1292: a commit that didn't land may mean this turn's lease is gone.
           // `noteCommitFailed` is a field slot the lease watchdog fills when it
           // arms (it starts as a no-op) — the committer only fires it from inside
@@ -10520,11 +10590,12 @@ function gitCredentialExports(credentials) {
   const git = credentials.filter((c) => c.gitHost);
   if (!git.length) return "";
   const lines2 = ["n=${GIT_CONFIG_COUNT:-0}"];
+  const set = (key, value) => lines2.push(`export "GIT_CONFIG_KEY_$n=${key}" "GIT_CONFIG_VALUE_$n=${value}"`, "n=$((n+1))");
   for (const c of git) {
-    lines2.push(
-      `export "GIT_CONFIG_KEY_$n=http.https://${c.gitHost}/.extraHeader" "GIT_CONFIG_VALUE_$n=Authorization: Basic $${c.name}"`,
-      "n=$((n+1))"
-    );
+    const h = c.gitHost;
+    set(`http.https://${h}/.extraHeader`, `Authorization: Basic $${c.name}`);
+    set(`url.https://${h}/.insteadOf`, `git@${h}:`);
+    set(`url.https://${h}/.insteadOf`, `ssh://git@${h}/`);
   }
   lines2.push("export GIT_CONFIG_COUNT=$n");
   return lines2.join("; ") + "; ";

package/dist/runtime.js

@@ -2566,6 +2566,21 @@ var CabaneApi = class {
       (e) => e.turnId === turnId && e.kind === "message" && e.body?.kind !== "runtime_notice"
     );
   }
+  // CT1677: ADOPT the issuance a turn context carried as the execution source of
+  // the work about to run on it. Made once per context, before preparation emits
+  // or queues anything, so every row that work commits can name a source the
+  // server has durably recorded and will never reap. Retried like any write: the
+  // server's adoption is idempotent. A 409 `execution_source_unavailable` is a
+  // refusal — nothing to adopt, the reaper got there first — and the caller
+  // fetches a fresh context rather than working on this one.
+  adoptExecutionSource(issuanceId, body, signal) {
+    return this.request(
+      "POST",
+      `/api/agent/execution-sources/${encodeURIComponent(issuanceId)}/adoption`,
+      body,
+      signal ? { retry: true, signal } : { retry: true }
+    );
+  }
   // CT1680: the launcher mints the runner credential for one dispatch, on its
   // PAT and from its device, and hands it to the runner in place of both. A
   // retry is safe: the server returns the same runner id and retires the
@@ -9568,6 +9583,7 @@ function pruneOld(dir2, retain) {
 var TurnCommitter = class {
   constructor(deps) {
     this.deps = deps;
+    const source = deps.executionSourceId !== void 0 ? { executionSourceId: deps.executionSourceId } : {};
     this.onError = (err, hook) => {
       deps.log.warn(
         { ...apiErrorLogFields(err), hook },
@@ -9585,7 +9601,8 @@ var TurnCommitter = class {
             kind,
             turnId: deps.turnId,
             seq,
-            parentMessageId: deps.parentMessageId
+            parentMessageId: deps.parentMessageId,
+            ...source
           },
           deps.signal
         );
@@ -9613,7 +9630,8 @@ var TurnCommitter = class {
             result,
             mcpServer,
             phase,
-            seq
+            seq,
+            ...source
           },
           deps.signal
         );
@@ -9623,7 +9641,7 @@ var TurnCommitter = class {
           deps.workspaceId,
           deps.conversationId,
           deps.agentId,
-          { turnId: deps.turnId, text, seq },
+          { turnId: deps.turnId, text, seq, ...source },
           deps.signal
         );
       },
@@ -9632,7 +9650,7 @@ var TurnCommitter = class {
           deps.workspaceId,
           deps.conversationId,
           deps.agentId,
-          { turnId: deps.turnId, text, seq },
+          { turnId: deps.turnId, text, seq, ...source },
           deps.signal
         );
       }
@@ -9911,6 +9929,14 @@ var TurnExecution = class {
   admitted = false;
   // Rooms: one recompose per turn when the lease refuses a stale context.
   recomposedForLease = false;
+  // CT1677: the execution source the CURRENT context was adopted as. Reassigned
+  // when a `dispatch_context_stale` recompose adopts a replacement, so a piece of
+  // work — preparation, the committer, a notice — captures it when that work
+  // begins and never reads it again: earlier work keeps its source. Undefined
+  // only before the first adoption; no work runs until it is set.
+  executionSourceId;
+  // CT1677: one fresh fetch per turn when adoption is refused.
+  refetchedForAdoption = false;
   concluded(reason, errorReason) {
     return new TurnConcluded(reason, errorReason);
   }
@@ -10061,6 +10087,15 @@ var TurnExecution = class {
       turnLog.warn({ turnId }, "dispatcher: turn context carried no turn token");
       throw this.concluded(NO_TURN_TOKEN_REASON, NO_TURN_TOKEN_REASON);
     }
+    if (await this.adoptSource(turnContext) === "refused") {
+      if (this.refetchedForAdoption) {
+        const reason = "execution_source_unavailable: adoption refused twice";
+        throw this.concluded(reason, reason);
+      }
+      this.refetchedForAdoption = true;
+      turnLog.info({ turnId }, "dispatcher: context could not be adopted; fetching a fresh one");
+      return this.fetchContext();
+    }
     this.turnContext = turnContext;
     if (this.resumed) {
       const sources = { serverFloor: turnContext.turnSeqFloor, outboxFloor };
@@ -10076,6 +10111,34 @@ var TurnExecution = class {
       throw this.concluded(reason, reason);
     }
   }
+  // CT1677: register this context's issuance as the execution source of the
+  // work about to run on it. A context with no issuance has nothing to adopt,
+  // and that ends the turn exactly as a failed adoption does: this companion
+  // never commits a row whose provenance it cannot name. Only a refusal —
+  // nothing to adopt any more — earns a fresh fetch.
+  async adoptSource(context) {
+    const { payload, turnId, turnLog } = this;
+    if (!context.issuanceId) {
+      turnLog.warn({ turnId }, "dispatcher: the turn context carried no issuance to adopt");
+      const reason = "execution_source_unavailable: the context carried no issuance";
+      throw this.concluded(reason, reason);
+    }
+    try {
+      const adopted = await this.opts.api.adoptExecutionSource(
+        context.issuanceId,
+        { conversationId: payload.conversationId, turnId },
+        this.abortController.signal
+      );
+      this.executionSourceId = adopted.executionSourceId;
+      return "adopted";
+    } catch (err) {
+      if (this.abortController.signal.aborted) throw this.concluded("cancelled");
+      if (apiErrorCode(err) === "execution_source_unavailable") return "refused";
+      turnLog.warn(apiErrorLogFields(err), "dispatcher: failed to adopt the turn context");
+      const reason = `execution_source_unavailable: ${describeError(err)}`;
+      throw this.concluded(reason, reason);
+    }
+  }
   gateTrigger() {
     const { payload, turnLog } = this;
     const message = this.turnContext.message;
@@ -10172,6 +10235,7 @@ var TurnExecution = class {
         const delayMs = this.opts.preparingRowDelayMs ?? DEFAULT_PREPARING_ROW_DELAY_MS;
         let preparingStarted = false;
         let preparing = null;
+        const executionSourceId = this.executionSourceId;
         const reportPreparing = (phase) => {
           preparing ??= { id: `prepare:${randomUUID3()}`, seq: this.nextSeq() };
           const { id, seq } = preparing;
@@ -10181,7 +10245,8 @@ var TurnExecution = class {
             toolName: PREPARING_TOOL_NAME,
             summary: "",
             phase,
-            seq
+            seq,
+            ...executionSourceId !== void 0 ? { executionSourceId } : {}
           };
           void this.opts.api.reportActivity(workspaceId, payload.conversationId, payload.agentId, body).catch((err) => {
             turnLog.debug(
@@ -10349,6 +10414,7 @@ var TurnExecution = class {
     });
   }
   integrityContext() {
+    const source = this.executionSourceId !== void 0 ? { executionSourceId: this.executionSourceId } : {};
     return {
       runtime: this.turnContext.runtime,
       workspaceId: this.workspaceId,
@@ -10356,7 +10422,7 @@ var TurnExecution = class {
       turnId: this.turnId,
       parentMessageId: this.payload.messageId,
       log: this.turnLog,
-      postTurnMessage: (workspaceId, conversationId, body) => this.opts.api.postTurnMessage(workspaceId, conversationId, body),
+      postTurnMessage: (workspaceId, conversationId, body) => this.opts.api.postTurnMessage(workspaceId, conversationId, { ...body, ...source }),
       ...this.opts.resolveBundled ? { resolveBundled: this.opts.resolveBundled } : {}
     };
   }
@@ -10445,7 +10511,9 @@ var TurnExecution = class {
           body: `${RUNTIME_UNAVAILABLE_PREFIX} ${err.message}`,
           kind: "runtime_notice",
           turnId,
-          parentMessageId: payload.messageId
+          parentMessageId: payload.messageId,
+          // CT1677: the notice is written by this attempt's source, like its speech.
+          ...this.executionSourceId !== void 0 ? { executionSourceId: this.executionSourceId } : {}
         });
       } catch (postErr) {
         turnLog.warn(
@@ -10539,6 +10607,8 @@ var TurnExecution = class {
       log: turnLog,
       nextSeq: this.nextSeq,
       spoke: this.resumedSpoke,
+      // CT1677: admitted by now, so this is the source the model's work runs on.
+      ...this.executionSourceId !== void 0 ? { executionSourceId: this.executionSourceId } : {},
       // CT1292: a commit that didn't land may mean this turn's lease is gone.
       // `noteCommitFailed` is a field slot the lease watchdog fills when it
       // arms (it starts as a no-op) — the committer only fires it from inside

package/package.json

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