@autohq/cli 0.1.360 → 0.1.362

package/dist/agent-bridge.js

@@ -23492,7 +23492,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.360",
+  version: "0.1.362",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -24190,6 +24190,8 @@ var AuthScopeSchema = external_exports.enum([
   "provider_grants:write",
   "provider_grants:use",
   "members:read",
+  "billing:read",
+  "billing:write",
   "secrets:read",
   "secrets:write",
   "secrets:use",
@@ -27877,6 +27879,12 @@ var SessionListItemSchema = external_exports.object({
   // Additive and optional so older live frames/list payloads that predate the
   // projection keep parsing; new projections include null when no reason exists.
   failureReason: external_exports.string().nullable().optional(),
+  // Additive and optional so older live frames/list payloads that predate the
+  // projection keep parsing; new projections include null when no selection
+  // exists. Carried so a session-upsert after a selection change keeps the
+  // open-session React Query record in sync without a full refetch.
+  model: ResolvedAgentModelSelectionSchema.nullable().optional(),
+  reasoningEffort: external_exports.string().trim().min(1).nullable().optional(),
   agent: SessionListItemAgentSchema,
   createdAt: external_exports.string().datetime(),
   updatedAt: external_exports.string().datetime(),
@@ -27929,6 +27937,89 @@ var OrganizationIdentityPolicySchema = external_exports.object({
 });
 var UpdateOrganizationIdentityPolicyRequestSchema = OrganizationIdentityPolicySchema.strict();
 
+// ../../packages/schemas/src/billing.ts
+var FEE_CARD_2026_07_06 = {
+  version: "2026-07-06",
+  effectiveAt: "2026-07-06T00:00:00.000Z",
+  feeRate: 0.05
+};
+var BILLING_FEE_CARDS = {
+  [FEE_CARD_2026_07_06.version]: FEE_CARD_2026_07_06
+};
+var CURRENT_BILLING_FEE_VERSION = FEE_CARD_2026_07_06.version;
+var CREDIT_EVENT_TYPES = [
+  "signup_grant",
+  "purchase",
+  "auto_topup",
+  "adjustment"
+];
+var CreditEventTypeSchema = external_exports.enum(CREDIT_EVENT_TYPES);
+var UsdAmountSchema = external_exports.number().finite();
+var NonNegativeUsdSchema = external_exports.number().finite().nonnegative();
+var PositiveUsdSchema = external_exports.number().finite().positive();
+var CreditEventSchema = external_exports.object({
+  organizationId: OrganizationIdSchema,
+  type: CreditEventTypeSchema,
+  amountUsd: UsdAmountSchema,
+  description: external_exports.string().trim().min(1).nullable().default(null),
+  // The acting user for manual purchases/adjustments; null for system-issued
+  // rows (signup grants, auto-top-ups).
+  createdByUserId: external_exports.string().trim().min(1).nullable().default(null)
+}).refine(
+  (event) => event.type === "adjustment" || event.amountUsd > 0,
+  "Only adjustment credit events may carry a non-positive amount"
+);
+var CreditEventRecordSchema = external_exports.object({
+  id: external_exports.string().trim().min(1),
+  organizationId: OrganizationIdSchema,
+  type: CreditEventTypeSchema,
+  amountUsd: UsdAmountSchema,
+  description: external_exports.string().trim().min(1).nullable(),
+  createdByUserId: external_exports.string().trim().min(1).nullable(),
+  createdAt: external_exports.string().datetime()
+});
+var SPENDING_LIMIT_WINDOWS = ["hour", "day", "week", "month"];
+var SpendingLimitWindowSchema = external_exports.enum(SPENDING_LIMIT_WINDOWS);
+var BilledSpendWindowsSchema = external_exports.object({
+  hourUsd: NonNegativeUsdSchema,
+  dayUsd: NonNegativeUsdSchema,
+  weekUsd: NonNegativeUsdSchema,
+  monthUsd: NonNegativeUsdSchema
+});
+var OrganizationBillingSettingsSchema = external_exports.object({
+  organizationId: OrganizationIdSchema,
+  // Null means no limit for that window.
+  spendLimitHourUsd: PositiveUsdSchema.nullable(),
+  spendLimitDayUsd: PositiveUsdSchema.nullable(),
+  spendLimitWeekUsd: PositiveUsdSchema.nullable(),
+  spendLimitMonthUsd: PositiveUsdSchema.nullable(),
+  autoTopUpEnabled: external_exports.boolean(),
+  // Balance at or below the threshold triggers a top-up of the configured
+  // amount. Both must be set for auto-top-up to arm.
+  autoTopUpThresholdUsd: NonNegativeUsdSchema.nullable(),
+  autoTopUpAmountUsd: PositiveUsdSchema.nullable()
+});
+var UpdateOrganizationBillingSettingsRequestSchema = external_exports.object({
+  spendLimitHourUsd: PositiveUsdSchema.nullable().optional(),
+  spendLimitDayUsd: PositiveUsdSchema.nullable().optional(),
+  spendLimitWeekUsd: PositiveUsdSchema.nullable().optional(),
+  spendLimitMonthUsd: PositiveUsdSchema.nullable().optional(),
+  autoTopUpEnabled: external_exports.boolean().optional(),
+  autoTopUpThresholdUsd: NonNegativeUsdSchema.nullable().optional(),
+  autoTopUpAmountUsd: PositiveUsdSchema.nullable().optional()
+}).strict();
+var OrganizationCreditsResponseSchema = external_exports.object({
+  organizationId: OrganizationIdSchema,
+  balanceUsd: UsdAmountSchema,
+  totalCreditsUsd: UsdAmountSchema,
+  totalBilledUsageUsd: NonNegativeUsdSchema,
+  events: external_exports.array(CreditEventRecordSchema)
+});
+var AddOrganizationCreditsRequestSchema = external_exports.object({
+  amountUsd: PositiveUsdSchema.max(1e4),
+  description: external_exports.string().trim().min(1).max(500).optional()
+}).strict();
+
 // ../../packages/schemas/src/pricing.ts
 var RATE_CARD_2026_06_23 = {
   version: "2026-06-23",
@@ -36705,7 +36796,7 @@ var ModelCredentialFundingSourceSchema = external_exports.enum([
   "tenant_provider_grant"
 ]);
 var NonNegativeTokenCountSchema = external_exports.number().int().nonnegative();
-var NonNegativeUsdSchema = external_exports.number().nonnegative();
+var NonNegativeUsdSchema2 = external_exports.number().nonnegative();
 var UsageEventSchema = external_exports.object({
   // Tenant + lineage attribution. projectId is nullable because a resource can
   // belong directly to an organization with no project.
@@ -36724,11 +36815,16 @@ var UsageEventSchema = external_exports.object({
   cacheReadTokens: NonNegativeTokenCountSchema,
   // The provider's own cost when it reports one, kept only for reconciliation.
   // Nullable/absent because it can be 0 or missing — never the billing source.
-  providerCostUsd: NonNegativeUsdSchema.nullable(),
+  providerCostUsd: NonNegativeUsdSchema2.nullable(),
   // Platform-derived cost and the rate-card version it was derived under, so a
   // later rate-card change never silently rewrites historical cost.
-  derivedCostUsd: NonNegativeUsdSchema,
+  derivedCostUsd: NonNegativeUsdSchema2,
   pricingVersion: external_exports.string().trim().min(1),
+  // What this call debits from the organization's credit balance, and the fee
+  // card it was derived under (see `./billing`). Required — a writer that
+  // forgets it would silently record unbilled usage, so there is no default.
+  billedCostUsd: NonNegativeUsdSchema2,
+  billingFeeVersion: external_exports.string().trim().min(1),
   // Historical funding attribution for the model call. The provider grant id is
   // denormalized and nullable for platform-funded usage, matching the ledger's
   // no-FK audit-trail contract.
@@ -36750,7 +36846,7 @@ var UsageTotalsSchema = external_exports.object({
   cacheCreationTokens: NonNegativeTokenCountSchema,
   cacheReadTokens: NonNegativeTokenCountSchema,
   totalTokens: NonNegativeTokenCountSchema,
-  derivedCostUsd: NonNegativeUsdSchema
+  billedCostUsd: NonNegativeUsdSchema2
 });
 var SessionUsageModelSummarySchema = UsageTotalsSchema.extend({
   model: external_exports.string().trim().min(1)
@@ -36784,11 +36880,11 @@ var ProjectUsageModelSummarySchema = UsageTotalsSchema.extend({
 });
 var ProjectUsageDayAgentSliceSchema = external_exports.object({
   agentResourceId: external_exports.string().trim().min(1),
-  derivedCostUsd: NonNegativeUsdSchema
+  billedCostUsd: NonNegativeUsdSchema2
 });
 var ProjectUsageDayModelSliceSchema = external_exports.object({
   model: external_exports.string().trim().min(1),
-  derivedCostUsd: NonNegativeUsdSchema
+  billedCostUsd: NonNegativeUsdSchema2
 });
 var ProjectUsageDayPointSchema = UsageTotalsSchema.extend({
   date: UtcDateSchema,
@@ -66836,7 +66932,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       this.input.writeOutput?.(
         `agent_bridge_claude_startup_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
       );
-      if (this.options.resume !== void 0 && this.state.kind !== "closed") {
+      if (this.options.resume !== void 0 && this.input.allowResumeFallback !== false && this.state.kind !== "closed") {
         const { resume, ...optionsWithoutResume } = this.options;
         this.options = optionsWithoutResume;
         this.input.writeOutput?.(
@@ -67498,7 +67594,11 @@ var ClaudeCodeCommandHandler = class {
   context = null;
   agentSession = null;
   claudeConfig;
+  // Selection-change restarts happen in-process, so prefer the live SDK id even
+  // when the file resume store is stale or temporarily unreadable.
+  lastObservedAgentId = null;
   persistedAgentId = null;
+  requireResumeForNextAgentSession = false;
   injectedCommands = /* @__PURE__ */ new Set();
   // Message commands whose injection has started but not settled. A fresh SDK
   // warm inside sendMessage can outlast the bridge's command-ack window, so a
@@ -67922,14 +68022,19 @@ var ClaudeCodeCommandHandler = class {
     );
   }
   persistAgentId(activeContext, message) {
-    const store = this.input.sessionResume;
-    if (!store) {
+    if (!("session_id" in message) || typeof message.session_id !== "string") {
       return;
     }
-    if (!("session_id" in message) || typeof message.session_id !== "string") {
+    if (!message.session_id) {
       return;
     }
-    if (!message.session_id || message.session_id === this.persistedAgentId) {
+    this.lastObservedAgentId = message.session_id;
+    this.requireResumeForNextAgentSession = false;
+    const store = this.input.sessionResume;
+    if (!store) {
+      return;
+    }
+    if (message.session_id === this.persistedAgentId) {
       return;
     }
     try {
@@ -67959,13 +68064,24 @@ var ClaudeCodeCommandHandler = class {
       return void 0;
     }
   }
+  resumeAgentIdForNextSession() {
+    return this.lastObservedAgentId ?? this.storedResumeAgentId();
+  }
   ensureAgentSession() {
     if (this.agentSession) {
       return this.agentSession;
     }
+    const resumeRequired = this.requireResumeForNextAgentSession;
+    const resumeAgentId = this.resumeAgentIdForNextSession();
+    if (resumeRequired && !resumeAgentId) {
+      throw new Error(
+        "Cannot restart Claude Code for a model/effort selection change without a session id to resume"
+      );
+    }
     const session = claudeAgentBridgeRuntime.start({
       claude: this.claudeConfig,
-      resumeAgentId: this.storedResumeAgentId(),
+      resumeAgentId,
+      ...resumeRequired ? { allowResumeFallback: false } : {},
       canUseTool: this.canUseTool,
       onMessage: (message, meta3) => this.handleAgentMessage(message, meta3),
       onError: (error51) => this.handleAgentError(error51),
@@ -67995,6 +68111,7 @@ var ClaudeCodeCommandHandler = class {
       return;
     }
     this.claudeConfig = next;
+    this.requireResumeForNextAgentSession = this.lastObservedAgentId !== null;
     this.agentSession?.close();
     this.agentSession = null;
     this.settlePendingQuestions("The runtime restarted to change model");

package/dist/index.js

@@ -15424,6 +15424,8 @@ var init_auth = __esm({
       "provider_grants:write",
       "provider_grants:use",
       "members:read",
+      "billing:read",
+      "billing:write",
       "secrets:read",
       "secrets:write",
       "secrets:use",
@@ -19477,6 +19479,12 @@ var init_sessions = __esm({
       // Additive and optional so older live frames/list payloads that predate the
       // projection keep parsing; new projections include null when no reason exists.
       failureReason: external_exports.string().nullable().optional(),
+      // Additive and optional so older live frames/list payloads that predate the
+      // projection keep parsing; new projections include null when no selection
+      // exists. Carried so a session-upsert after a selection change keeps the
+      // open-session React Query record in sync without a full refetch.
+      model: ResolvedAgentModelSelectionSchema.nullable().optional(),
+      reasoningEffort: external_exports.string().trim().min(1).nullable().optional(),
       agent: SessionListItemAgentSchema,
       createdAt: external_exports.string().datetime(),
       updatedAt: external_exports.string().datetime(),
@@ -19554,6 +19562,97 @@ var init_organization_settings = __esm({
   }
 });
 
+// ../../packages/schemas/src/billing.ts
+var FEE_CARD_2026_07_06, BILLING_FEE_CARDS, CURRENT_BILLING_FEE_VERSION, CREDIT_EVENT_TYPES, CreditEventTypeSchema, UsdAmountSchema, NonNegativeUsdSchema, PositiveUsdSchema, CreditEventSchema, CreditEventRecordSchema, SPENDING_LIMIT_WINDOWS, SpendingLimitWindowSchema, BilledSpendWindowsSchema, OrganizationBillingSettingsSchema, UpdateOrganizationBillingSettingsRequestSchema, OrganizationCreditsResponseSchema, AddOrganizationCreditsRequestSchema;
+var init_billing = __esm({
+  "../../packages/schemas/src/billing.ts"() {
+    "use strict";
+    init_zod();
+    init_ids();
+    FEE_CARD_2026_07_06 = {
+      version: "2026-07-06",
+      effectiveAt: "2026-07-06T00:00:00.000Z",
+      feeRate: 0.05
+    };
+    BILLING_FEE_CARDS = {
+      [FEE_CARD_2026_07_06.version]: FEE_CARD_2026_07_06
+    };
+    CURRENT_BILLING_FEE_VERSION = FEE_CARD_2026_07_06.version;
+    CREDIT_EVENT_TYPES = [
+      "signup_grant",
+      "purchase",
+      "auto_topup",
+      "adjustment"
+    ];
+    CreditEventTypeSchema = external_exports.enum(CREDIT_EVENT_TYPES);
+    UsdAmountSchema = external_exports.number().finite();
+    NonNegativeUsdSchema = external_exports.number().finite().nonnegative();
+    PositiveUsdSchema = external_exports.number().finite().positive();
+    CreditEventSchema = external_exports.object({
+      organizationId: OrganizationIdSchema,
+      type: CreditEventTypeSchema,
+      amountUsd: UsdAmountSchema,
+      description: external_exports.string().trim().min(1).nullable().default(null),
+      // The acting user for manual purchases/adjustments; null for system-issued
+      // rows (signup grants, auto-top-ups).
+      createdByUserId: external_exports.string().trim().min(1).nullable().default(null)
+    }).refine(
+      (event) => event.type === "adjustment" || event.amountUsd > 0,
+      "Only adjustment credit events may carry a non-positive amount"
+    );
+    CreditEventRecordSchema = external_exports.object({
+      id: external_exports.string().trim().min(1),
+      organizationId: OrganizationIdSchema,
+      type: CreditEventTypeSchema,
+      amountUsd: UsdAmountSchema,
+      description: external_exports.string().trim().min(1).nullable(),
+      createdByUserId: external_exports.string().trim().min(1).nullable(),
+      createdAt: external_exports.string().datetime()
+    });
+    SPENDING_LIMIT_WINDOWS = ["hour", "day", "week", "month"];
+    SpendingLimitWindowSchema = external_exports.enum(SPENDING_LIMIT_WINDOWS);
+    BilledSpendWindowsSchema = external_exports.object({
+      hourUsd: NonNegativeUsdSchema,
+      dayUsd: NonNegativeUsdSchema,
+      weekUsd: NonNegativeUsdSchema,
+      monthUsd: NonNegativeUsdSchema
+    });
+    OrganizationBillingSettingsSchema = external_exports.object({
+      organizationId: OrganizationIdSchema,
+      // Null means no limit for that window.
+      spendLimitHourUsd: PositiveUsdSchema.nullable(),
+      spendLimitDayUsd: PositiveUsdSchema.nullable(),
+      spendLimitWeekUsd: PositiveUsdSchema.nullable(),
+      spendLimitMonthUsd: PositiveUsdSchema.nullable(),
+      autoTopUpEnabled: external_exports.boolean(),
+      // Balance at or below the threshold triggers a top-up of the configured
+      // amount. Both must be set for auto-top-up to arm.
+      autoTopUpThresholdUsd: NonNegativeUsdSchema.nullable(),
+      autoTopUpAmountUsd: PositiveUsdSchema.nullable()
+    });
+    UpdateOrganizationBillingSettingsRequestSchema = external_exports.object({
+      spendLimitHourUsd: PositiveUsdSchema.nullable().optional(),
+      spendLimitDayUsd: PositiveUsdSchema.nullable().optional(),
+      spendLimitWeekUsd: PositiveUsdSchema.nullable().optional(),
+      spendLimitMonthUsd: PositiveUsdSchema.nullable().optional(),
+      autoTopUpEnabled: external_exports.boolean().optional(),
+      autoTopUpThresholdUsd: NonNegativeUsdSchema.nullable().optional(),
+      autoTopUpAmountUsd: PositiveUsdSchema.nullable().optional()
+    }).strict();
+    OrganizationCreditsResponseSchema = external_exports.object({
+      organizationId: OrganizationIdSchema,
+      balanceUsd: UsdAmountSchema,
+      totalCreditsUsd: UsdAmountSchema,
+      totalBilledUsageUsd: NonNegativeUsdSchema,
+      events: external_exports.array(CreditEventRecordSchema)
+    });
+    AddOrganizationCreditsRequestSchema = external_exports.object({
+      amountUsd: PositiveUsdSchema.max(1e4),
+      description: external_exports.string().trim().min(1).max(500).optional()
+    }).strict();
+  }
+});
+
 // ../../packages/schemas/src/pricing.ts
 function tier(inputUsdPerMtok, outputUsdPerMtok) {
   return {
@@ -28547,7 +28646,7 @@ var init_url_slugs = __esm({
 });
 
 // ../../packages/schemas/src/usage.ts
-var UsageHarnessSchema, ModelCredentialFundingSourceSchema, NonNegativeTokenCountSchema, NonNegativeUsdSchema, UsageEventSchema, UsageEventRecordSchema, UsageTotalsSchema, SessionUsageModelSummarySchema, SessionUsageResponseSchema, PROJECT_USAGE_RANGE_KEYS, ProjectUsageRangeKeySchema, UtcDateSchema, ProjectUsageTotalsSchema, ProjectUsageAgentSummarySchema, ProjectUsageModelSummarySchema, ProjectUsageDayAgentSliceSchema, ProjectUsageDayModelSliceSchema, ProjectUsageDayPointSchema, ProjectUsageResponseSchema;
+var UsageHarnessSchema, ModelCredentialFundingSourceSchema, NonNegativeTokenCountSchema, NonNegativeUsdSchema2, UsageEventSchema, UsageEventRecordSchema, UsageTotalsSchema, SessionUsageModelSummarySchema, SessionUsageResponseSchema, PROJECT_USAGE_RANGE_KEYS, ProjectUsageRangeKeySchema, UtcDateSchema, ProjectUsageTotalsSchema, ProjectUsageAgentSummarySchema, ProjectUsageModelSummarySchema, ProjectUsageDayAgentSliceSchema, ProjectUsageDayModelSliceSchema, ProjectUsageDayPointSchema, ProjectUsageResponseSchema;
 var init_usage = __esm({
   "../../packages/schemas/src/usage.ts"() {
     "use strict";
@@ -28560,7 +28659,7 @@ var init_usage = __esm({
       "tenant_provider_grant"
     ]);
     NonNegativeTokenCountSchema = external_exports.number().int().nonnegative();
-    NonNegativeUsdSchema = external_exports.number().nonnegative();
+    NonNegativeUsdSchema2 = external_exports.number().nonnegative();
     UsageEventSchema = external_exports.object({
       // Tenant + lineage attribution. projectId is nullable because a resource can
       // belong directly to an organization with no project.
@@ -28579,11 +28678,16 @@ var init_usage = __esm({
       cacheReadTokens: NonNegativeTokenCountSchema,
       // The provider's own cost when it reports one, kept only for reconciliation.
       // Nullable/absent because it can be 0 or missing — never the billing source.
-      providerCostUsd: NonNegativeUsdSchema.nullable(),
+      providerCostUsd: NonNegativeUsdSchema2.nullable(),
       // Platform-derived cost and the rate-card version it was derived under, so a
       // later rate-card change never silently rewrites historical cost.
-      derivedCostUsd: NonNegativeUsdSchema,
+      derivedCostUsd: NonNegativeUsdSchema2,
       pricingVersion: external_exports.string().trim().min(1),
+      // What this call debits from the organization's credit balance, and the fee
+      // card it was derived under (see `./billing`). Required — a writer that
+      // forgets it would silently record unbilled usage, so there is no default.
+      billedCostUsd: NonNegativeUsdSchema2,
+      billingFeeVersion: external_exports.string().trim().min(1),
       // Historical funding attribution for the model call. The provider grant id is
       // denormalized and nullable for platform-funded usage, matching the ledger's
       // no-FK audit-trail contract.
@@ -28605,7 +28709,7 @@ var init_usage = __esm({
       cacheCreationTokens: NonNegativeTokenCountSchema,
       cacheReadTokens: NonNegativeTokenCountSchema,
       totalTokens: NonNegativeTokenCountSchema,
-      derivedCostUsd: NonNegativeUsdSchema
+      billedCostUsd: NonNegativeUsdSchema2
     });
     SessionUsageModelSummarySchema = UsageTotalsSchema.extend({
       model: external_exports.string().trim().min(1)
@@ -28639,11 +28743,11 @@ var init_usage = __esm({
     });
     ProjectUsageDayAgentSliceSchema = external_exports.object({
       agentResourceId: external_exports.string().trim().min(1),
-      derivedCostUsd: NonNegativeUsdSchema
+      billedCostUsd: NonNegativeUsdSchema2
     });
     ProjectUsageDayModelSliceSchema = external_exports.object({
       model: external_exports.string().trim().min(1),
-      derivedCostUsd: NonNegativeUsdSchema
+      billedCostUsd: NonNegativeUsdSchema2
     });
     ProjectUsageDayPointSchema = UsageTotalsSchema.extend({
       date: UtcDateSchema,
@@ -28689,6 +28793,7 @@ var init_src = __esm({
     init_model_selection();
     init_mounts();
     init_organization_settings();
+    init_billing();
     init_pricing();
     init_provider_grants();
     init_project_config();
@@ -31450,7 +31555,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.360",
+      version: "0.1.362",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -44498,7 +44603,7 @@ var ClaudeAgentBridgeSessionImpl = class {
       this.input.writeOutput?.(
         `agent_bridge_claude_startup_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
       );
-      if (this.options.resume !== void 0 && this.state.kind !== "closed") {
+      if (this.options.resume !== void 0 && this.input.allowResumeFallback !== false && this.state.kind !== "closed") {
         const { resume, ...optionsWithoutResume } = this.options;
         this.options = optionsWithoutResume;
         this.input.writeOutput?.(
@@ -45160,7 +45265,11 @@ var ClaudeCodeCommandHandler = class {
   context = null;
   agentSession = null;
   claudeConfig;
+  // Selection-change restarts happen in-process, so prefer the live SDK id even
+  // when the file resume store is stale or temporarily unreadable.
+  lastObservedAgentId = null;
   persistedAgentId = null;
+  requireResumeForNextAgentSession = false;
   injectedCommands = /* @__PURE__ */ new Set();
   // Message commands whose injection has started but not settled. A fresh SDK
   // warm inside sendMessage can outlast the bridge's command-ack window, so a
@@ -45584,14 +45693,19 @@ var ClaudeCodeCommandHandler = class {
     );
   }
   persistAgentId(activeContext, message) {
-    const store = this.input.sessionResume;
-    if (!store) {
+    if (!("session_id" in message) || typeof message.session_id !== "string") {
       return;
     }
-    if (!("session_id" in message) || typeof message.session_id !== "string") {
+    if (!message.session_id) {
       return;
     }
-    if (!message.session_id || message.session_id === this.persistedAgentId) {
+    this.lastObservedAgentId = message.session_id;
+    this.requireResumeForNextAgentSession = false;
+    const store = this.input.sessionResume;
+    if (!store) {
+      return;
+    }
+    if (message.session_id === this.persistedAgentId) {
       return;
     }
     try {
@@ -45621,13 +45735,24 @@ var ClaudeCodeCommandHandler = class {
       return void 0;
     }
   }
+  resumeAgentIdForNextSession() {
+    return this.lastObservedAgentId ?? this.storedResumeAgentId();
+  }
   ensureAgentSession() {
     if (this.agentSession) {
       return this.agentSession;
     }
+    const resumeRequired = this.requireResumeForNextAgentSession;
+    const resumeAgentId = this.resumeAgentIdForNextSession();
+    if (resumeRequired && !resumeAgentId) {
+      throw new Error(
+        "Cannot restart Claude Code for a model/effort selection change without a session id to resume"
+      );
+    }
     const session = claudeAgentBridgeRuntime.start({
       claude: this.claudeConfig,
-      resumeAgentId: this.storedResumeAgentId(),
+      resumeAgentId,
+      ...resumeRequired ? { allowResumeFallback: false } : {},
       canUseTool: this.canUseTool,
       onMessage: (message, meta3) => this.handleAgentMessage(message, meta3),
       onError: (error51) => this.handleAgentError(error51),
@@ -45657,6 +45782,7 @@ var ClaudeCodeCommandHandler = class {
       return;
     }
     this.claudeConfig = next;
+    this.requireResumeForNextAgentSession = this.lastObservedAgentId !== null;
     this.agentSession?.close();
     this.agentSession = null;
     this.settlePendingQuestions("The runtime restarted to change model");

package/package.json

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