@cabane/companion 0.6.211 → 0.6.213

package/dist/cli.js

@@ -9292,6 +9292,7 @@ var init_turn_execution = __esm({
         this.supervisor = supervisor;
         this.payload = payload;
         this.resumed = handleOpts.resumed === true;
+        this.dispatchTiming = handleOpts.dispatchTiming ?? (() => void 0);
         this.dispatchId = payload.messageId;
         this.workspaceId = opts.workspaceId;
         this.turnLog = opts.log.child({
@@ -9323,6 +9324,8 @@ var init_turn_execution = __esm({
       // is set on every dispatch. `resumedFromSeq` is what it seeded from.
       resumed;
       resumedFromSeq;
+      // The dispatch's time on the device before this process started, as the launcher said it.
+      dispatchTiming;
       // Whether the span this resumed run continues already has first words —
       // from the server (`turnSpoke`) or from speech still queued in the outbox.
       resumedSpoke = false;
@@ -9774,6 +9777,16 @@ var init_turn_execution = __esm({
         this.hookEnv = hookEnv;
         this.turnEnv = turnEnv;
       }
+      leaseTiming() {
+        const timing = this.dispatchTiming();
+        if (this.turnContext.dispatchTimingVersion !== 1 || !timing) return void 0;
+        return {
+          dispatchTiming: {
+            queueMs: Math.round(timing.queueMs),
+            setupMs: Math.round(timing.beforeRunnerMs + performance.now())
+          }
+        };
+      }
       async acquireLease() {
         const { payload, workspaceId, turnId, turnLog } = this;
         const abortController = this.abortController;
@@ -9785,6 +9798,11 @@ var init_turn_execution = __esm({
               responsivenessVersion: 1,
               responsivenessSessionMode: this.request.session ? "resumed" : "fresh"
             } : {},
+            // The dispatch's time on this device before this request: its queue, and its setup,
+            // which is what passed before this process started plus this process's uptime
+            // (`performance.now()` counts from the process's start). Only to an API that takes the
+            // field, and only once the launcher has said; never a guess in its place.
+            ...this.leaseTiming() ?? {},
             // A runner leases under its launcher's boot id, the one the device
             // heartbeats, or the lost-run sweep reads it as a restart.
             bootId: this.opts.inRunner?.bootId ?? bootId,
@@ -10299,7 +10317,7 @@ var init_turn_execution = __esm({
           if (!o.okResult && o.resultReason && o.resultReason !== "cancelled" && !userCancelled && !o.leaseLost && !o.runtimeIncomplete && !this.skipState.skipped) {
             body.errorReason = o.resultReason.slice(0, ERROR_REASON_MAX);
           }
-          body.outcome = o.okResult ? committer.spoke ? "settled" : "passed" : body.errorReason || o.runtimeIncomplete ? "failed" : "interrupted";
+          body.outcome = o.okResult ? committer.spoke && !this.skipState.skipped ? "settled" : "passed" : body.errorReason || o.runtimeIncomplete ? "failed" : "interrupted";
           if (body.outcome === "settled") body.lastMessageSeq = committer.lastMessageSeq;
           if (o.sessionDegraded) {
             body.degraded = true;
@@ -10631,6 +10649,7 @@ function openLauncherChannel(stdin, emit, onLauncherGone) {
   let gotFirst = false;
   let stopRequested = false;
   let gzipBodies;
+  let dispatchTiming;
   let gone = false;
   const causeWaiters = /* @__PURE__ */ new Set();
   const first = new Promise((resolve2) => resolveFirst = resolve2);
@@ -10645,6 +10664,9 @@ function openLauncherChannel(stdin, emit, onLauncherGone) {
     if (message2?.cabaneLauncher === "granted") waiting.get(message2.id)?.();
     if (message2?.cabaneLauncher === "stop") stopRequested = true;
     if (message2?.cabaneLauncher === "gzip_bodies") gzipBodies = message2.on;
+    if (message2?.cabaneLauncher === "dispatch_timing") {
+      dispatchTiming = { queueMs: message2.queueMs, beforeRunnerMs: message2.beforeRunnerMs };
+    }
     if (message2?.cabaneLauncher === "cause") {
       for (const resolve2 of causeWaiters) resolve2(message2.cause);
     }
@@ -10663,6 +10685,9 @@ function openLauncherChannel(stdin, emit, onLauncherGone) {
     get gzipBodies() {
       return gzipBodies;
     },
+    get dispatchTiming() {
+      return dispatchTiming;
+    },
     terminationCause(timeoutMs = CAUSE_TIMEOUT_MS) {
       if (gone) return Promise.resolve(null);
       return new Promise((resolve2) => {
@@ -10874,7 +10899,7 @@ async function runTurn(env, deps) {
     for (const controller of controllers) controller.abort(RUNNER_SIGTERM);
   };
   deps.signals.on("SIGTERM", onTerm);
-  emit({ cabaneRunner: "ready" });
+  emit({ cabaneRunner: "ready", uptimeMs: performance.now() });
   try {
     const input = parseRunnerInput(env, await channel.first);
     for (const name of Object.values(RUNNER_ENV)) delete env[name];
@@ -10913,7 +10938,8 @@ async function runTurn(env, deps) {
     });
     const result = await new TurnExecution(opts, supervisor, input.dispatch, {
       turnId: input.turnId,
-      resumed: input.resumed
+      resumed: input.resumed,
+      dispatchTiming: () => channel.dispatchTiming
     }).run().finally(() => shims.dispose());
     if (outbox) await drainBeforeExit(outbox.outbox, outbox.api, deps.outboxGraceMs, log2);
     emit({ cabaneRunner: "result", result });
@@ -13244,6 +13270,16 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
         case "ready":
           ready = true;
           if (controller.signal.aborted) stopRunner.abort();
+          if (handleOpts.clock && event.uptimeMs !== void 0 && running.stdin.writable) {
+            const elapsed = performance.now() - handleOpts.clock.begunAt;
+            running.stdin.write(
+              encodeLauncherMessage({
+                cabaneLauncher: "dispatch_timing",
+                queueMs: handleOpts.clock.queueMs,
+                beforeRunnerMs: Math.max(0, elapsed - event.uptimeMs)
+              })
+            );
+          }
           return;
         case "start":
           duties.notifyStart({
@@ -13424,7 +13460,11 @@ var Dispatcher = class {
         notifyEnd: (info) => this.notifyEnd(info)
       },
       payload,
-      { turnId: opts.turnId ?? randomUUID5(), resumed: opts.resumed === true }
+      {
+        turnId: opts.turnId ?? randomUUID5(),
+        resumed: opts.resumed === true,
+        ...opts.clock ? { clock: opts.clock } : {}
+      }
     );
   }
   // Cancel the named turn. An older server omits turnId and cancels the pair.
@@ -14642,7 +14682,9 @@ var CompanionSupervisor = class {
     this.detectTimer = setInterval(() => void this.detect(), DETECT_INTERVAL_MS);
     this.detectTimer.unref?.();
     if (!this.deviceApi || !this.config.deviceToken) {
-      this.log.warn("This device isn't paired. Get a setup line from a workspace's Settings \u2192 Devices.");
+      this.log.warn(
+        "This device isn't paired. Get a setup line from a workspace's Settings \u2192 Devices."
+      );
       return;
     }
     this.deviceSub = new SseSubscriber({
@@ -15236,6 +15278,7 @@ var CompanionSupervisor = class {
   // it replays what is still offered on every connect instead of resuming from
   // a `Last-Event-ID`.
   async handleDeviceMessage(ev) {
+    const receivedAt = performance.now();
     const wire = this.parseFrame(ev);
     if (!wire) return;
     let wr = this.workspaces.get(wire.workspaceId);
@@ -15257,7 +15300,7 @@ var CompanionSupervisor = class {
       }
     }
     this.hub.recordEvent(wr.workspaceId);
-    await this.deliverFrame(wr, wire);
+    await this.deliverFrame(wr, wire, receivedAt);
   }
   parseFrame(ev) {
     try {
@@ -15276,19 +15319,19 @@ var CompanionSupervisor = class {
   //
   // A cancel needs no gate: `dispatcher.cancel` on an already-aborted run is a
   // no-op that reports `false`, so a second copy is inert.
-  async deliverFrame(wr, wire) {
+  async deliverFrame(wr, wire, receivedAt) {
     const claim = wire.type === "device:dispatch_requested" && wire.id ? this.claims.claim(wire.id) : null;
     if (claim && !claim.first) {
       await claim.done;
       return;
     }
     try {
-      await this.routeFrame(wr, wire);
+      await this.routeFrame(wr, wire, receivedAt);
     } finally {
       if (claim) this.claims.release(wire.id);
     }
   }
-  async routeFrame(wr, wire) {
+  async routeFrame(wr, wire, receivedAt) {
     if (wire.type === "device:cancel_requested") {
       const payload2 = {
         type: "device:cancel_requested",
@@ -15342,7 +15385,7 @@ var CompanionSupervisor = class {
     }
     const chainKey = `${payload.conversationId}|${payload.agentId}`;
     const prev = wr.chains.get(chainKey) ?? Promise.resolve();
-    const tail = prev.then(() => this.runDispatch(wr, wire.id, payload, agent)).catch((err) => {
+    const tail = prev.then(() => this.runDispatch(wr, wire.id, payload, agent, void 0, receivedAt)).catch((err) => {
       this.log.warn(
         {
           workspaceId: wr.workspaceId,
@@ -15539,7 +15582,7 @@ var CompanionSupervisor = class {
     }
   }
   // One turn: the skip-vs-resume dedupe, the dispatch, then the console summary.
-  async runDispatch(wr, dispatchId, payload, agent, recoveredTurnId) {
+  async runDispatch(wr, dispatchId, payload, agent, recoveredTurnId, receivedAt) {
     await this.initialHarnessReady;
     if (this.stopped) return;
     const workspaceId = wr.workspaceId;
@@ -15602,9 +15645,11 @@ var CompanionSupervisor = class {
       workspaceId
     };
     this.log.info(turnBindings, "Turn started");
+    const begunAt = performance.now();
     const result = await agent.dispatcher.handle(payload, {
       turnId,
-      resumed: resumedTurnId !== null
+      resumed: resumedTurnId !== null,
+      ...receivedAt !== void 0 ? { clock: { queueMs: begunAt - receivedAt, begunAt } } : {}
     });
     if (dispatchId) markCompleted(workspaceId, dispatchId);
     const durationS = (result.durationMs / 1e3).toFixed(1);

package/dist/runtime.js

@@ -8101,6 +8101,16 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
         case "ready":
           ready = true;
           if (controller.signal.aborted) stopRunner.abort();
+          if (handleOpts.clock && event.uptimeMs !== void 0 && running.stdin.writable) {
+            const elapsed = performance.now() - handleOpts.clock.begunAt;
+            running.stdin.write(
+              encodeLauncherMessage({
+                cabaneLauncher: "dispatch_timing",
+                queueMs: handleOpts.clock.queueMs,
+                beforeRunnerMs: Math.max(0, elapsed - event.uptimeMs)
+              })
+            );
+          }
           return;
         case "start":
           duties.notifyStart({
@@ -8591,7 +8601,11 @@ var Dispatcher = class {
         notifyEnd: (info) => this.notifyEnd(info)
       },
       payload,
-      { turnId: opts.turnId ?? randomUUID5(), resumed: opts.resumed === true }
+      {
+        turnId: opts.turnId ?? randomUUID5(),
+        resumed: opts.resumed === true,
+        ...opts.clock ? { clock: opts.clock } : {}
+      }
     );
   }
   // Cancel the named turn. An older server omits turnId and cancels the pair.
@@ -10187,7 +10201,9 @@ var CompanionSupervisor = class {
     this.detectTimer = setInterval(() => void this.detect(), DETECT_INTERVAL_MS);
     this.detectTimer.unref?.();
     if (!this.deviceApi || !this.config.deviceToken) {
-      this.log.warn("This device isn't paired. Get a setup line from a workspace's Settings \u2192 Devices.");
+      this.log.warn(
+        "This device isn't paired. Get a setup line from a workspace's Settings \u2192 Devices."
+      );
       return;
     }
     this.deviceSub = new SseSubscriber({
@@ -10781,6 +10797,7 @@ var CompanionSupervisor = class {
   // it replays what is still offered on every connect instead of resuming from
   // a `Last-Event-ID`.
   async handleDeviceMessage(ev) {
+    const receivedAt = performance.now();
     const wire = this.parseFrame(ev);
     if (!wire) return;
     let wr = this.workspaces.get(wire.workspaceId);
@@ -10802,7 +10819,7 @@ var CompanionSupervisor = class {
       }
     }
     this.hub.recordEvent(wr.workspaceId);
-    await this.deliverFrame(wr, wire);
+    await this.deliverFrame(wr, wire, receivedAt);
   }
   parseFrame(ev) {
     try {
@@ -10821,19 +10838,19 @@ var CompanionSupervisor = class {
   //
   // A cancel needs no gate: `dispatcher.cancel` on an already-aborted run is a
   // no-op that reports `false`, so a second copy is inert.
-  async deliverFrame(wr, wire) {
+  async deliverFrame(wr, wire, receivedAt) {
     const claim = wire.type === "device:dispatch_requested" && wire.id ? this.claims.claim(wire.id) : null;
     if (claim && !claim.first) {
       await claim.done;
       return;
     }
     try {
-      await this.routeFrame(wr, wire);
+      await this.routeFrame(wr, wire, receivedAt);
     } finally {
       if (claim) this.claims.release(wire.id);
     }
   }
-  async routeFrame(wr, wire) {
+  async routeFrame(wr, wire, receivedAt) {
     if (wire.type === "device:cancel_requested") {
       const payload2 = {
         type: "device:cancel_requested",
@@ -10887,7 +10904,7 @@ var CompanionSupervisor = class {
     }
     const chainKey = `${payload.conversationId}|${payload.agentId}`;
     const prev = wr.chains.get(chainKey) ?? Promise.resolve();
-    const tail = prev.then(() => this.runDispatch(wr, wire.id, payload, agent)).catch((err) => {
+    const tail = prev.then(() => this.runDispatch(wr, wire.id, payload, agent, void 0, receivedAt)).catch((err) => {
       this.log.warn(
         {
           workspaceId: wr.workspaceId,
@@ -11084,7 +11101,7 @@ var CompanionSupervisor = class {
     }
   }
   // One turn: the skip-vs-resume dedupe, the dispatch, then the console summary.
-  async runDispatch(wr, dispatchId, payload, agent, recoveredTurnId) {
+  async runDispatch(wr, dispatchId, payload, agent, recoveredTurnId, receivedAt) {
     await this.initialHarnessReady;
     if (this.stopped) return;
     const workspaceId = wr.workspaceId;
@@ -11147,9 +11164,11 @@ var CompanionSupervisor = class {
       workspaceId
     };
     this.log.info(turnBindings, "Turn started");
+    const begunAt = performance.now();
     const result = await agent.dispatcher.handle(payload, {
       turnId,
-      resumed: resumedTurnId !== null
+      resumed: resumedTurnId !== null,
+      ...receivedAt !== void 0 ? { clock: { queueMs: begunAt - receivedAt, begunAt } } : {}
     });
     if (dispatchId) markCompleted(workspaceId, dispatchId);
     const durationS = (result.durationMs / 1e3).toFixed(1);

package/package.json

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