@autohq/cli 0.1.293 → 0.1.295

package/dist/agent-bridge.js

@@ -23399,7 +23399,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.293",
+  version: "0.1.295",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -27210,7 +27210,16 @@ var SessionCheckTimeoutPhaseSchema = external_exports.enum(
 );
 var ManualSessionRequestSchema = external_exports.object({
   message: external_exports.string().trim().min(1).max(2e4).optional(),
-  interactive: external_exports.boolean().optional()
+  interactive: external_exports.boolean().optional(),
+  /**
+   * Deliver the agent's configured `initialPrompt` as the session's kickoff
+   * message so the agent opens the conversation. Agents without an
+   * `initialPrompt` fall back to the default manual say-hello message, so a
+   * kickoff always pings the agent. The kickoff is delivered through the
+   * session's one idempotent start command and never renders as a user chat
+   * bubble; the agent's greeting is the first visible content.
+   */
+  kickoff: external_exports.boolean().optional()
 });
 var SessionArchiveRequestSchema = external_exports.object({
   archived: external_exports.boolean()
@@ -28434,6 +28443,9 @@ var UsageEventSchema = external_exports.object({
 });
 var UsageEventRecordSchema = UsageEventSchema.extend({
   id: external_exports.string().trim().min(1),
+  // Set on append-only correction rows: this row replaces the pointed-at row's
+  // amounts, and ledger readers exclude any row another row supersedes.
+  supersedesUsageEventId: external_exports.string().trim().min(1).nullable().default(null),
   createdAt: external_exports.string().datetime()
 });
 var UsageTotalsSchema = external_exports.object({
@@ -57686,6 +57698,7 @@ function withClaudeStderrDiagnosticsPointer(error51, capturedStderr) {
 // src/commands/agent-bridge/harness/claude-code/session.ts
 var CLAUDE_AGENT_STARTUP_TIMEOUT_MS = 3e4;
 var CLAUDE_INTERRUPT_SETTLE_TIMEOUT_MS = 1e4;
+var CLAUDE_INTERRUPT_ACK_TIMEOUT_MS = 1e4;
 var CLAUDE_MCP_REGISTRATION_TIMEOUT_MS = 3e3;
 var CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS = 100;
 var CLAUDE_STARTUP_PROFILE_HOOK_EVENTS = [
@@ -57725,10 +57738,18 @@ var ClaudeAgentBridgeSessionImpl = class {
   // decrements — so interleaved interrupt/result deliveries stay balanced.
   activeTurnCount = 0;
   interruptInFlight = null;
+  // turnResultCount at the moment an interrupt ack timed out, or null when no
+  // timeout is latched. While turnResultCount still equals this value the same
+  // wedged turn is running, so follow-up messages defer immediately instead of
+  // each re-racing a fresh ack timeout against the unresponsive control
+  // channel (and stacking pending control requests). Any terminal result
+  // advances turnResultCount and un-latches.
+  interruptAckTimeoutTurn = null;
   exitReported = false;
-  // Messages delivered in "deferred" mode while a turn is in flight. They are
-  // held here instead of injected mid-turn (which would reject a pending
-  // tool_use) and flushed once the turn ends and the session is idle.
+  // Messages held for the turn's terminal result instead of injected mid-turn
+  // (which would reject a pending tool_use): "deferred"-mode deliveries, plus
+  // interrupt-mode deliveries whose interrupt ack timed out. Flushed once the
+  // turn ends and the session is idle.
   deferredMessages = [];
   // tool_use ids the assistant has emitted whose tool_result has not yet been
   // observed. A non-empty set means a tool call is in flight, so an immediate
@@ -57808,7 +57829,19 @@ var ClaudeAgentBridgeSessionImpl = class {
       });
       return;
     }
-    await this.interruptActiveTurnBeforeMessage();
+    const interruption = await this.interruptActiveTurnBeforeMessage();
+    if (interruption === "defer" && this.hasInterruptibleTurn()) {
+      this.deferredMessages.push(message);
+      this.input.runtimeLogger?.info(
+        "agent_bridge_claude_message_deferred_after_interrupt_timeout",
+        {
+          active_turn_count: this.activeTurnCount,
+          pending_tool_use_count: this.pendingToolUseIds.size,
+          deferred_count: this.deferredMessages.length
+        }
+      );
+      return;
+    }
     await this.awaitMcpRegistration();
     this.enqueueUserMessage(message);
     this.input.runtimeLogger?.info("agent_bridge_claude_send_message_queued", {
@@ -58057,14 +58090,19 @@ var ClaudeAgentBridgeSessionImpl = class {
   }
   async interruptActiveTurnBeforeMessage() {
     if (!this.hasInterruptibleTurn()) {
-      return;
+      return "proceed";
     }
     if (this.interruptInFlight) {
-      await this.interruptInFlight;
-      return;
+      return await this.interruptInFlight;
+    }
+    if (this.interruptAckTimeoutTurn !== null) {
+      if (this.interruptAckTimeoutTurn === this.turnResultCount) {
+        return "defer";
+      }
+      this.interruptAckTimeoutTurn = null;
     }
     if (this.state.kind !== "running") {
-      return;
+      return "proceed";
     }
     const query = this.state.query;
     const hadInFlightToolUse = this.hasInFlightToolUse();
@@ -58074,29 +58112,79 @@ var ClaudeAgentBridgeSessionImpl = class {
       `agent_bridge_claude_mid_turn_interrupt_started at=${new Date(startedAt).toISOString()} in_flight_tool_use=${hadInFlightToolUse}`
     );
     const interruptPromise = (async () => {
-      try {
-        await query.interrupt();
-        this.input.writeOutput?.(
-          `agent_bridge_claude_mid_turn_interrupt_ready duration_ms=${Date.now() - startedAt}`
-        );
-      } catch (error51) {
-        this.input.writeOutput?.(
-          `agent_bridge_claude_mid_turn_interrupt_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
-        );
+      const ack = await this.requestInterruptAck(query, startedAt);
+      if (ack === "timeout") {
+        this.interruptAckTimeoutTurn = settlementBaseline;
+        return "defer";
       }
       if (hadInFlightToolUse) {
         await this.awaitTurnSettlement(settlementBaseline, startedAt);
       }
+      return "proceed";
     })();
     this.interruptInFlight = interruptPromise;
     try {
-      await interruptPromise;
+      return await interruptPromise;
     } finally {
       if (this.interruptInFlight === interruptPromise) {
         this.interruptInFlight = null;
       }
     }
   }
+  // Fire the interrupt control request, bounded by the ack timeout. "ready" =
+  // the SDK acked; "failed" = the SDK rejected it (a steering message is still
+  // useful, so the caller falls back to normal queued delivery); "timeout" =
+  // no answer within CLAUDE_INTERRUPT_ACK_TIMEOUT_MS (FRA-3465). The abandoned
+  // request stays attached to late-outcome logging so it can never surface as
+  // an unhandled rejection after the timeout won.
+  requestInterruptAck(query, startedAt) {
+    return new Promise((resolve2) => {
+      let done = false;
+      const finish = (outcome, line) => {
+        if (done) {
+          return;
+        }
+        done = true;
+        clearTimeout(timer);
+        this.input.writeOutput?.(line);
+        resolve2(outcome);
+      };
+      const timer = setTimeout(() => {
+        finish(
+          "timeout",
+          `agent_bridge_claude_mid_turn_interrupt_ack_timeout duration_ms=${Date.now() - startedAt}`
+        );
+      }, CLAUDE_INTERRUPT_ACK_TIMEOUT_MS);
+      timer.unref?.();
+      query.interrupt().then(
+        () => {
+          if (done) {
+            this.input.writeOutput?.(
+              `agent_bridge_claude_mid_turn_interrupt_late_ready duration_ms=${Date.now() - startedAt}`
+            );
+            return;
+          }
+          finish(
+            "ready",
+            `agent_bridge_claude_mid_turn_interrupt_ready duration_ms=${Date.now() - startedAt}`
+          );
+        },
+        (error51) => {
+          const detail = `duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`;
+          if (done) {
+            this.input.writeOutput?.(
+              `agent_bridge_claude_mid_turn_interrupt_late_failed ${detail}`
+            );
+            return;
+          }
+          finish(
+            "failed",
+            `agent_bridge_claude_mid_turn_interrupt_failed ${detail}`
+          );
+        }
+      );
+    });
+  }
   // Why this gate is correct without a provider-backed test (it relies on real
   // SDK mcpServerStatus() timing that fakes cannot prove):
   // - Safe-degrade on uncertainty: pollMcpRegistration never rejects — on
@@ -60266,15 +60354,19 @@ function replaceErrors(_key, value2) {
 async function runAgentBridgeProcess(input) {
   const runAgentBridge = input.runAgentBridge ?? runAgentBridgeHarness;
   const log = createRuntimeLogger(input.env);
+  const writeOutput = (line) => {
+    input.writeOutput?.(line);
+    log.info(line);
+  };
   log.info("agent bridge process starting", {
     bridge_url_host: bridgeUrlHost(input.env.AUTO_BRIDGE_URL),
     log_level: log.level
   });
   try {
     await runAgentBridge({
-      ...agentBridgeOptionsFromEnv(input),
+      ...agentBridgeOptionsFromEnv({ env: input.env, writeOutput }),
       runtimeLogger: log,
-      onBootstrap: createGitCredentialRelayStarter(input.writeOutput, log)
+      onBootstrap: createGitCredentialRelayStarter(writeOutput, log)
     });
   } catch (error51) {
     log.error("agent bridge process failed", { error: error51 });

package/dist/index.js

@@ -18941,7 +18941,16 @@ var init_sessions = __esm({
     );
     ManualSessionRequestSchema = external_exports.object({
       message: external_exports.string().trim().min(1).max(2e4).optional(),
-      interactive: external_exports.boolean().optional()
+      interactive: external_exports.boolean().optional(),
+      /**
+       * Deliver the agent's configured `initialPrompt` as the session's kickoff
+       * message so the agent opens the conversation. Agents without an
+       * `initialPrompt` fall back to the default manual say-hello message, so a
+       * kickoff always pings the agent. The kickoff is delivered through the
+       * session's one idempotent start command and never renders as a user chat
+       * bubble; the agent's greeting is the first visible content.
+       */
+      kickoff: external_exports.boolean().optional()
     });
     SessionArchiveRequestSchema = external_exports.object({
       archived: external_exports.boolean()
@@ -20336,6 +20345,9 @@ var init_usage = __esm({
     });
     UsageEventRecordSchema = UsageEventSchema.extend({
       id: external_exports.string().trim().min(1),
+      // Set on append-only correction rows: this row replaces the pointed-at row's
+      // amounts, and ledger readers exclude any row another row supersedes.
+      supersedesUsageEventId: external_exports.string().trim().min(1).nullable().default(null),
       createdAt: external_exports.string().datetime()
     });
     UsageTotalsSchema = external_exports.object({
@@ -23182,7 +23194,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.293",
+      version: "0.1.295",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -25118,7 +25130,10 @@ function readApplyAssets(resources, readAsset) {
         `Invalid identity avatar asset for "${target.resourceName}": asset path must be under .auto/assets`
       );
     }
-    const source = readAsset(target);
+    const source = readAsset({
+      asset: target.asset,
+      resourceName: target.resourceName
+    });
     if (!source) {
       throw new Error(
         `Invalid identity avatar asset for "${target.resourceName}": ${target.asset} does not exist`
@@ -25158,12 +25173,20 @@ function projectApplyAssetFromSource(input) {
 }
 function avatarAssetTarget(resource) {
   if (resource.kind === RESOURCE_KIND_IDENTITY) {
-    const asset = resource.spec.avatar?.asset;
-    return asset ? { asset, resourceName: resource.metadata.name } : void 0;
+    const avatar = resource.spec.avatar;
+    return avatar ? {
+      asset: avatar.asset,
+      sha256: avatar.sha256,
+      resourceName: resource.metadata.name
+    } : void 0;
   }
   if (resource.kind === RESOURCE_KIND_AGENT && typeof resource.spec.identity === "object" && resource.spec.identity !== null && !Array.isArray(resource.spec.identity)) {
-    const asset = resource.spec.identity.avatar?.asset;
-    return asset ? { asset, resourceName: resource.metadata.name } : void 0;
+    const avatar = resource.spec.identity.avatar;
+    return avatar ? {
+      asset: avatar.asset,
+      sha256: avatar.sha256,
+      resourceName: resource.metadata.name
+    } : void 0;
   }
   return void 0;
 }
@@ -25429,6 +25452,7 @@ var init_project_apply_files = __esm({
     init_assets();
     init_source();
     init_template_injection();
+    init_assets();
     init_template_injection();
     init_template_bump_diagnostics();
     init_template_staleness();
@@ -35135,6 +35159,7 @@ function withClaudeStderrDiagnosticsPointer(error51, capturedStderr) {
 // src/commands/agent-bridge/harness/claude-code/session.ts
 var CLAUDE_AGENT_STARTUP_TIMEOUT_MS = 3e4;
 var CLAUDE_INTERRUPT_SETTLE_TIMEOUT_MS = 1e4;
+var CLAUDE_INTERRUPT_ACK_TIMEOUT_MS = 1e4;
 var CLAUDE_MCP_REGISTRATION_TIMEOUT_MS = 3e3;
 var CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS = 100;
 var CLAUDE_STARTUP_PROFILE_HOOK_EVENTS = [
@@ -35174,10 +35199,18 @@ var ClaudeAgentBridgeSessionImpl = class {
   // decrements — so interleaved interrupt/result deliveries stay balanced.
   activeTurnCount = 0;
   interruptInFlight = null;
+  // turnResultCount at the moment an interrupt ack timed out, or null when no
+  // timeout is latched. While turnResultCount still equals this value the same
+  // wedged turn is running, so follow-up messages defer immediately instead of
+  // each re-racing a fresh ack timeout against the unresponsive control
+  // channel (and stacking pending control requests). Any terminal result
+  // advances turnResultCount and un-latches.
+  interruptAckTimeoutTurn = null;
   exitReported = false;
-  // Messages delivered in "deferred" mode while a turn is in flight. They are
-  // held here instead of injected mid-turn (which would reject a pending
-  // tool_use) and flushed once the turn ends and the session is idle.
+  // Messages held for the turn's terminal result instead of injected mid-turn
+  // (which would reject a pending tool_use): "deferred"-mode deliveries, plus
+  // interrupt-mode deliveries whose interrupt ack timed out. Flushed once the
+  // turn ends and the session is idle.
   deferredMessages = [];
   // tool_use ids the assistant has emitted whose tool_result has not yet been
   // observed. A non-empty set means a tool call is in flight, so an immediate
@@ -35257,7 +35290,19 @@ var ClaudeAgentBridgeSessionImpl = class {
       });
       return;
     }
-    await this.interruptActiveTurnBeforeMessage();
+    const interruption = await this.interruptActiveTurnBeforeMessage();
+    if (interruption === "defer" && this.hasInterruptibleTurn()) {
+      this.deferredMessages.push(message);
+      this.input.runtimeLogger?.info(
+        "agent_bridge_claude_message_deferred_after_interrupt_timeout",
+        {
+          active_turn_count: this.activeTurnCount,
+          pending_tool_use_count: this.pendingToolUseIds.size,
+          deferred_count: this.deferredMessages.length
+        }
+      );
+      return;
+    }
     await this.awaitMcpRegistration();
     this.enqueueUserMessage(message);
     this.input.runtimeLogger?.info("agent_bridge_claude_send_message_queued", {
@@ -35506,14 +35551,19 @@ var ClaudeAgentBridgeSessionImpl = class {
   }
   async interruptActiveTurnBeforeMessage() {
     if (!this.hasInterruptibleTurn()) {
-      return;
+      return "proceed";
     }
     if (this.interruptInFlight) {
-      await this.interruptInFlight;
-      return;
+      return await this.interruptInFlight;
+    }
+    if (this.interruptAckTimeoutTurn !== null) {
+      if (this.interruptAckTimeoutTurn === this.turnResultCount) {
+        return "defer";
+      }
+      this.interruptAckTimeoutTurn = null;
     }
     if (this.state.kind !== "running") {
-      return;
+      return "proceed";
     }
     const query = this.state.query;
     const hadInFlightToolUse = this.hasInFlightToolUse();
@@ -35523,29 +35573,79 @@ var ClaudeAgentBridgeSessionImpl = class {
       `agent_bridge_claude_mid_turn_interrupt_started at=${new Date(startedAt).toISOString()} in_flight_tool_use=${hadInFlightToolUse}`
     );
     const interruptPromise = (async () => {
-      try {
-        await query.interrupt();
-        this.input.writeOutput?.(
-          `agent_bridge_claude_mid_turn_interrupt_ready duration_ms=${Date.now() - startedAt}`
-        );
-      } catch (error51) {
-        this.input.writeOutput?.(
-          `agent_bridge_claude_mid_turn_interrupt_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
-        );
+      const ack = await this.requestInterruptAck(query, startedAt);
+      if (ack === "timeout") {
+        this.interruptAckTimeoutTurn = settlementBaseline;
+        return "defer";
       }
       if (hadInFlightToolUse) {
         await this.awaitTurnSettlement(settlementBaseline, startedAt);
       }
+      return "proceed";
     })();
     this.interruptInFlight = interruptPromise;
     try {
-      await interruptPromise;
+      return await interruptPromise;
     } finally {
       if (this.interruptInFlight === interruptPromise) {
         this.interruptInFlight = null;
       }
     }
   }
+  // Fire the interrupt control request, bounded by the ack timeout. "ready" =
+  // the SDK acked; "failed" = the SDK rejected it (a steering message is still
+  // useful, so the caller falls back to normal queued delivery); "timeout" =
+  // no answer within CLAUDE_INTERRUPT_ACK_TIMEOUT_MS (FRA-3465). The abandoned
+  // request stays attached to late-outcome logging so it can never surface as
+  // an unhandled rejection after the timeout won.
+  requestInterruptAck(query, startedAt) {
+    return new Promise((resolve4) => {
+      let done = false;
+      const finish = (outcome, line) => {
+        if (done) {
+          return;
+        }
+        done = true;
+        clearTimeout(timer);
+        this.input.writeOutput?.(line);
+        resolve4(outcome);
+      };
+      const timer = setTimeout(() => {
+        finish(
+          "timeout",
+          `agent_bridge_claude_mid_turn_interrupt_ack_timeout duration_ms=${Date.now() - startedAt}`
+        );
+      }, CLAUDE_INTERRUPT_ACK_TIMEOUT_MS);
+      timer.unref?.();
+      query.interrupt().then(
+        () => {
+          if (done) {
+            this.input.writeOutput?.(
+              `agent_bridge_claude_mid_turn_interrupt_late_ready duration_ms=${Date.now() - startedAt}`
+            );
+            return;
+          }
+          finish(
+            "ready",
+            `agent_bridge_claude_mid_turn_interrupt_ready duration_ms=${Date.now() - startedAt}`
+          );
+        },
+        (error51) => {
+          const detail = `duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`;
+          if (done) {
+            this.input.writeOutput?.(
+              `agent_bridge_claude_mid_turn_interrupt_late_failed ${detail}`
+            );
+            return;
+          }
+          finish(
+            "failed",
+            `agent_bridge_claude_mid_turn_interrupt_failed ${detail}`
+          );
+        }
+      );
+    });
+  }
   // Why this gate is correct without a provider-backed test (it relies on real
   // SDK mcpServerStatus() timing that fakes cannot prove):
   // - Safe-degrade on uncertainty: pollMcpRegistration never rejects — on
@@ -37721,15 +37821,19 @@ function replaceErrors(_key, value) {
 async function runAgentBridgeProcess(input) {
   const runAgentBridge = input.runAgentBridge ?? runAgentBridgeHarness;
   const log = createRuntimeLogger(input.env);
+  const writeOutput = (line) => {
+    input.writeOutput?.(line);
+    log.info(line);
+  };
   log.info("agent bridge process starting", {
     bridge_url_host: bridgeUrlHost(input.env.AUTO_BRIDGE_URL),
     log_level: log.level
   });
   try {
     await runAgentBridge({
-      ...agentBridgeOptionsFromEnv(input),
+      ...agentBridgeOptionsFromEnv({ env: input.env, writeOutput }),
       runtimeLogger: log,
-      onBootstrap: createGitCredentialRelayStarter(input.writeOutput, log)
+      onBootstrap: createGitCredentialRelayStarter(writeOutput, log)
     });
   } catch (error51) {
     log.error("agent bridge process failed", { error: error51 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.293",
+  "version": "0.1.295",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"