@autohq/cli 0.1.315 → 0.1.317

package/dist/agent-bridge.js

@@ -23431,7 +23431,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.315",
+  version: "0.1.317",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -25285,6 +25285,12 @@ var AgentModelSelectionSchema = external_exports.object({
 var ResolvedAgentModelSelectionSchema = AgentModelSelectionSchema.extend({
   provider: ModelApiTokenProviderSchema
 });
+var InvalidModelSelectionError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "InvalidModelSelectionError";
+  }
+};
 var HARNESS_MODEL_RULES = {
   "claude-code": {
     defaultProvider: "anthropic",
@@ -25335,7 +25341,7 @@ function validateReasoningEffortForHarness(input) {
   }
   const rules = modelRulesForHarness(input.harness);
   if (!rules.reasoningEfforts.includes(input.reasoningEffort)) {
-    throw new Error(
+    throw new InvalidModelSelectionError(
       `${input.harness} does not support reasoning effort "${input.reasoningEffort}"`
     );
   }
@@ -25372,7 +25378,9 @@ function validateAgentModelFieldsForHarness(spec, context) {
 function validateModelProviderForHarness(harness, provider) {
   const rules = modelRulesForHarness(harness);
   if (!rules.providers.includes(provider)) {
-    throw new Error(`${harness} does not support ${provider} models`);
+    throw new InvalidModelSelectionError(
+      `${harness} does not support ${provider} models`
+    );
   }
 }
 function validateModelIdForProvider(input) {
@@ -25386,11 +25394,11 @@ function validateModelIdForProvider(input) {
     return;
   }
   if (curated) {
-    throw new Error(
+    throw new InvalidModelSelectionError(
       `${input.provider} model "${input.id}" is not available for ${input.harness}`
     );
   }
-  throw new Error(
+  throw new InvalidModelSelectionError(
     `${input.provider} model ids are not open for ${input.harness}`
   );
 }
@@ -40833,7 +40841,7 @@ var UiMessagePartTracker = class {
     }
   }
   appendDataChunk(chunk) {
-    if (!chunk.type.startsWith("data-") || chunk.type === "data-auto-question") {
+    if (!chunk.type.startsWith("data-")) {
       return [];
     }
     const dataChunk = chunk;
@@ -40974,22 +40982,6 @@ var AgentBridgeOutputBuffer = class {
     await this.drainPendingOutputs({ force: true });
   }
   async emitUiMessageChunk(context, projection) {
-    if (projection.chunk.type === "data-auto-question") {
-      await this.flushPendingDelta();
-      await this.emitLiveUiMessageChunk(context, projection.chunk);
-      await this.enqueueProjectionAndDrain(context, {
-        type: "entry",
-        entry: {
-          role: "assistant",
-          kind: "question",
-          ...projection.turnStatus ? { turnStatus: projection.turnStatus } : {},
-          content: {
-            parts: [questionPart(projection.chunk.data)]
-          }
-        }
-      });
-      return;
-    }
     await this.flushPendingDelta();
     await this.emitLiveUiMessageChunk(context, projection.chunk);
     await this.emitUiMessagePartSnapshots(context, projection.chunk, {
@@ -41334,14 +41326,6 @@ var UiMessageAssembler = class {
 function isTerminalUiMessageChunk(chunk) {
   return chunk.type === "finish" || chunk.type === "error" || chunk.type === "abort";
 }
-function questionPart(data) {
-  const parsed = data;
-  return {
-    type: "question",
-    toolCallId: parsed.toolCallId ?? null,
-    questions: parsed.questions
-  };
-}
 function legacyToolEntry(chunk) {
   switch (chunk.type) {
     case "tool-input-available":
@@ -41952,15 +41936,21 @@ function conversationProjectionToUiChunks(projection) {
           turnStatus: "waiting_for_input"
         },
         {
-          type: "ui_message_chunk",
-          chunk: {
-            type: "data-auto-question",
-            data: {
-              toolCallId: part.toolCallId,
-              questions: part.questions
+          type: "entry",
+          entry: {
+            role: "assistant",
+            kind: "question",
+            turnStatus: "waiting_for_input",
+            content: {
+              parts: [
+                {
+                  type: "question",
+                  toolCallId: part.toolCallId,
+                  questions: part.questions
+                }
+              ]
             }
-          },
-          turnStatus: "waiting_for_input"
+          }
         }
       ] : []
     );
@@ -61696,7 +61686,8 @@ function claudeAgentOptions(config2, input = {}) {
     includePartialMessages: true,
     thinking: { type: "adaptive", display: "summarized" },
     settings: { showThinkingSummaries: true },
-    model: CLAUDE_CODE_DEFAULT_MODEL,
+    model: config2.model?.id ?? CLAUDE_CODE_DEFAULT_MODEL,
+    ...config2.reasoningEffort ? { effort: config2.reasoningEffort } : {},
     permissionMode: "bypassPermissions",
     allowDangerouslySkipPermissions: true,
     pathToClaudeCodeExecutable: claudeCodeExecutablePath(),
@@ -62438,7 +62429,10 @@ var ClaudeAgentBridgeSessionImpl = class {
         );
         return { outcome: "timeout" };
       }
-      await delay(CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS);
+      await delay(
+        CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS,
+        this.abortController.signal
+      );
     }
   }
   messageProbeContext() {
@@ -62593,10 +62587,19 @@ function mcpStatusDetailList(statuses) {
     (server) => server.error ? `${server.name}:${server.status}(${server.error})` : `${server.name}:${server.status}`
   ).join(",");
 }
-function delay(ms) {
+function delay(ms, signal) {
+  if (signal?.aborted) {
+    return Promise.resolve();
+  }
   return new Promise((resolve2) => {
-    const timer = setTimeout(resolve2, ms);
+    const finish = () => {
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", finish);
+      resolve2();
+    };
+    const timer = setTimeout(finish, ms);
     timer.unref?.();
+    signal?.addEventListener("abort", finish, { once: true });
   });
 }
 function claudeAgentUserMessage(message) {
@@ -62693,11 +62696,13 @@ function createClaudeCodeCommandHandler(input) {
 var ClaudeCodeCommandHandler = class {
   constructor(input) {
     this.input = input;
+    this.claudeConfig = input.claude;
     this.outputBuffer = new AgentBridgeOutputBuffer(input);
   }
   input;
   context = null;
   agentSession = null;
+  claudeConfig;
   persistedAgentId = null;
   injectedCommands = /* @__PURE__ */ new Set();
   // Message commands whose injection has started but not settled. A fresh SDK
@@ -62897,6 +62902,7 @@ var ClaudeCodeCommandHandler = class {
       );
       const sendStartedAt = Date.now();
       const mode = deliveryMode(delivery);
+      this.applySelectionForMessage(delivery);
       this.input.runtimeLogger?.info(
         "agent_bridge_claude_command_send_message_started",
         commandLogContext(delivery, {
@@ -63130,7 +63136,7 @@ var ClaudeCodeCommandHandler = class {
       return this.agentSession;
     }
     const session = claudeAgentBridgeRuntime.start({
-      claude: this.input.claude,
+      claude: this.claudeConfig,
       resumeAgentId: this.storedResumeAgentId(),
       canUseTool: this.canUseTool,
       onMessage: (message, meta3) => this.handleAgentMessage(message, meta3),
@@ -63147,6 +63153,27 @@ var ClaudeCodeCommandHandler = class {
     this.agentSession = session;
     return session;
   }
+  applySelectionForMessage(delivery) {
+    const selection = deliverySelection(delivery);
+    if (!selection.model && selection.reasoningEffort === void 0) {
+      return;
+    }
+    const next = {
+      ...this.claudeConfig,
+      ...selection.model ? { model: selection.model } : {},
+      ...selection.reasoningEffort ? { reasoningEffort: selection.reasoningEffort } : {}
+    };
+    if (sameClaudeConfigSelection(this.claudeConfig, next)) {
+      return;
+    }
+    this.claudeConfig = next;
+    this.agentSession?.close();
+    this.agentSession = null;
+    this.settlePendingQuestions("The runtime restarted to change model");
+    this.input.writeOutput?.(
+      `agent_bridge_claude_model_selection_changed provider=${next.model?.provider ?? ""} model=${next.model?.id ?? ""} reasoning_effort=${next.reasoningEffort ?? ""}`
+    );
+  }
 };
 function withConsumedCommandIds(projection, meta3) {
   const consumedCommandIds = meta3?.consumedCommandIds;
@@ -63171,6 +63198,23 @@ function deliveryMessage(delivery) {
   }
   return null;
 }
+function deliverySelection(delivery) {
+  const payload = delivery.payload;
+  if (!payload || typeof payload !== "object") {
+    return {};
+  }
+  const model = "model" in payload ? AgentBridgeModelSelectionSchema.safeParse(payload.model) : null;
+  const reasoningEffort = "reasoningEffort" in payload ? AgentBridgeClaudeReasoningEffortSchema.safeParse(
+    payload.reasoningEffort
+  ) : null;
+  return {
+    ...model?.success ? { model: model.data } : {},
+    ...reasoningEffort?.success ? { reasoningEffort: reasoningEffort.data } : {}
+  };
+}
+function sameClaudeConfigSelection(current, next) {
+  return current.model?.provider === next.model?.provider && current.model?.id === next.model?.id && current.reasoningEffort === next.reasoningEffort;
+}
 function deliveryMode(delivery) {
   const payload = delivery.payload;
   if (payload && typeof payload === "object" && "deliveryMode" in payload) {
@@ -63223,8 +63267,10 @@ var CodexProjector = class {
         return [];
     }
   }
-  // An approval parks the turn on operator input, so both chunks mark the
-  // delivered turn as waiting for input.
+  // An approval parks the turn on operator input: the native approval chunk
+  // transitions the tool part to `approval-requested` for AI SDK clients, and
+  // the durable question entry keeps owning answer routing for the CLI
+  // transcript. Both mark the delivered turn as waiting for input.
   projectApproval(request) {
     return [
       {
@@ -63237,15 +63283,21 @@ var CodexProjector = class {
         turnStatus: "waiting_for_input"
       },
       {
-        type: "ui_message_chunk",
-        chunk: {
-          type: "data-auto-question",
-          data: {
-            toolCallId: request.itemId,
-            questions: [approvalQuestion(request)]
+        type: "entry",
+        entry: {
+          role: "assistant",
+          kind: "question",
+          turnStatus: "waiting_for_input",
+          content: {
+            parts: [
+              {
+                type: "question",
+                toolCallId: request.itemId,
+                questions: [approvalQuestion(request)]
+              }
+            ]
           }
-        },
-        turnStatus: "waiting_for_input"
+        }
       }
     ];
   }
@@ -63546,9 +63598,12 @@ import { join } from "path";
 var CODEX_EXECUTABLE_PATH = "codex";
 var CODEX_DEFAULT_MODEL = "gpt-5.3-codex";
 var CODEX_HTTP_PROVIDER_ID = "openai-responses-http";
+var CODEX_OPENROUTER_PROVIDER_ID = "openrouter-responses-http";
 var CODEX_OPENAI_BASE_URL = "https://api.openai.com/v1";
+var CODEX_OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1";
 var CODEX_API_KEY_ENV = "OPENAI_API_KEY";
 var MODEL_GATEWAY_OPENAI_BASE_URL_ENV = "AUTO_MODEL_GATEWAY_OPENAI_BASE_URL";
+var MODEL_GATEWAY_OPENROUTER_BASE_URL_ENV = "AUTO_MODEL_GATEWAY_OPENROUTER_BASE_URL";
 var CODEX_RUNTIME_PROCESS_ENV_KEYS = ["PATH", "HOME"];
 function codexLaunchOptions(config2) {
   return {
@@ -63571,8 +63626,14 @@ function codexThreadParams(config2) {
 }
 function renderCodexConfigToml(config2) {
   const lines = [];
-  lines.push(`model = ${tomlString(CODEX_DEFAULT_MODEL)}`);
-  lines.push(`model_provider = ${tomlString(CODEX_HTTP_PROVIDER_ID)}`);
+  const selectedProvider = codexProviderIdForModel(config2);
+  lines.push(`model = ${tomlString(config2.model?.id ?? CODEX_DEFAULT_MODEL)}`);
+  lines.push(`model_provider = ${tomlString(selectedProvider)}`);
+  if (config2.reasoningEffort) {
+    lines.push(
+      `model_reasoning_effort = ${tomlString(config2.reasoningEffort)}`
+    );
+  }
   lines.push("");
   lines.push(`[model_providers.${CODEX_HTTP_PROVIDER_ID}]`);
   lines.push('name = "OpenAI"');
@@ -63582,6 +63643,15 @@ function renderCodexConfigToml(config2) {
   lines.push('wire_api = "responses"');
   lines.push(`env_key = ${tomlString(CODEX_API_KEY_ENV)}`);
   lines.push("supports_websockets = false");
+  lines.push("");
+  lines.push(`[model_providers.${CODEX_OPENROUTER_PROVIDER_ID}]`);
+  lines.push('name = "OpenRouter"');
+  lines.push(
+    `base_url = ${tomlString(openRouterBaseUrlForCodexConfig(config2.env))}`
+  );
+  lines.push('wire_api = "responses"');
+  lines.push(`env_key = ${tomlString(CODEX_API_KEY_ENV)}`);
+  lines.push("supports_websockets = false");
   for (const [name23, server] of Object.entries(config2.mcpServers ?? {})) {
     lines.push("");
     lines.push(`[mcp_servers.${tomlKey(name23)}]`);
@@ -63609,6 +63679,12 @@ function codexProcessEnv(env) {
 function openaiBaseUrlForCodexConfig(env) {
   return env[MODEL_GATEWAY_OPENAI_BASE_URL_ENV] ?? CODEX_OPENAI_BASE_URL;
 }
+function openRouterBaseUrlForCodexConfig(env) {
+  return env[MODEL_GATEWAY_OPENROUTER_BASE_URL_ENV] ?? CODEX_OPENROUTER_BASE_URL;
+}
+function codexProviderIdForModel(config2) {
+  return config2.model?.provider === "openrouter" ? CODEX_OPENROUTER_PROVIDER_ID : CODEX_HTTP_PROVIDER_ID;
+}
 function codexHomeDir() {
   const home = process.env.HOME;
   if (!home) {
@@ -63663,6 +63739,7 @@ var CodexAgentBridgeSessionImpl = class {
   // set means an interrupt/steer would race an unsettled item (FRA-3049 analog).
   pendingToolItemIds = /* @__PURE__ */ new Set();
   settlementWaiters = /* @__PURE__ */ new Set();
+  callbackQueue = Promise.resolve();
   // Messages held in "deferred" mode while a turn is in flight; flushed as a
   // fresh turn once the active turn completes.
   deferredMessages = [];
@@ -63934,10 +64011,12 @@ var CodexAgentBridgeSessionImpl = class {
         return;
       case "notification":
         this.trackNotification(message.notification);
-        void this.input.onNotification(message.notification);
+        this.enqueueCallback(
+          () => this.input.onNotification(message.notification)
+        );
         return;
       case "serverRequest":
-        void this.input.onServerRequest(message.request);
+        this.enqueueCallback(() => this.input.onServerRequest(message.request));
         return;
       case "elicitation":
         this.writeFrame({
@@ -63963,6 +64042,18 @@ var CodexAgentBridgeSessionImpl = class {
         return;
     }
   }
+  enqueueCallback(callback) {
+    this.callbackQueue = this.callbackQueue.then(async () => {
+      try {
+        await callback();
+      } catch (error51) {
+        try {
+          await this.input.onError(error51);
+        } catch {
+        }
+      }
+    });
+  }
   // Track turn/item lifecycle so steer/interrupt target the live turn and gate on
   // tool-item settlement.
   trackNotification(notification) {
@@ -64100,17 +64191,20 @@ function createCodexCommandHandler(input) {
 var CodexCommandHandler = class {
   constructor(input) {
     this.input = input;
+    this.codexConfig = input.codex;
     this.outputBuffer = new AgentBridgeOutputBuffer(input);
   }
   input;
   context = null;
   session = null;
+  codexConfig;
   injectedCommands = /* @__PURE__ */ new Set();
   // itemId -> JSON-RPC request id of the parked approval request, so an `answer`
   // command keyed by toolCallId (= itemId) can resolve the right server request.
   pendingApprovals = /* @__PURE__ */ new Map();
   outputBuffer;
   projector = new CodexProjector();
+  skipResumeForNextSession = false;
   // ---------------------------------------------------------------------------
   // Lifecycle (public API)
   // ---------------------------------------------------------------------------
@@ -64165,6 +64259,7 @@ var CodexCommandHandler = class {
     }
     this.injectedCommands.add(delivery.commandId);
     try {
+      this.applySelectionForMessage(delivery);
       await this.emitUserMessageEntry(
         activeContext,
         delivery.commandId,
@@ -64298,9 +64393,10 @@ var CodexCommandHandler = class {
     if (this.session) {
       return this.session;
     }
-    const resumeThreadId = this.storedResumeThreadId();
+    const resumeThreadId = this.skipResumeForNextSession ? void 0 : this.storedResumeThreadId();
+    this.skipResumeForNextSession = false;
     const session = codexAgentBridgeRuntime.start({
-      codex: this.input.codex,
+      codex: this.codexConfig,
       ...resumeThreadId ? { resumeThreadId } : {},
       onNotification: (notification) => this.handleNotification(notification),
       onServerRequest: (request) => this.handleServerRequest(request),
@@ -64317,6 +64413,28 @@ var CodexCommandHandler = class {
     this.session = session;
     return session;
   }
+  applySelectionForMessage(delivery) {
+    const selection = deliverySelection2(delivery);
+    if (!selection.model && selection.reasoningEffort === void 0) {
+      return;
+    }
+    const next = {
+      ...this.codexConfig,
+      ...selection.model ? { model: selection.model } : {},
+      ...selection.reasoningEffort ? { reasoningEffort: selection.reasoningEffort } : {}
+    };
+    if (sameCodexConfigSelection(this.codexConfig, next)) {
+      return;
+    }
+    this.codexConfig = next;
+    this.skipResumeForNextSession = true;
+    this.session?.close();
+    this.session = null;
+    this.pendingApprovals.clear();
+    this.input.writeOutput?.(
+      `agent_bridge_codex_model_selection_changed provider=${next.model?.provider ?? ""} model=${next.model?.id ?? ""} reasoning_effort=${next.reasoningEffort ?? ""}`
+    );
+  }
   storedResumeThreadId() {
     const store = this.input.sessionResume;
     const activeContext = this.context;
@@ -64363,6 +64481,21 @@ function deliveryMessage2(delivery) {
   }
   return null;
 }
+function deliverySelection2(delivery) {
+  const payload = delivery.payload;
+  if (!payload || typeof payload !== "object") {
+    return {};
+  }
+  const model = "model" in payload ? AgentBridgeModelSelectionSchema.safeParse(payload.model) : null;
+  const reasoningEffort = "reasoningEffort" in payload ? AgentBridgeCodexReasoningEffortSchema.safeParse(payload.reasoningEffort) : null;
+  return {
+    ...model?.success ? { model: model.data } : {},
+    ...reasoningEffort?.success ? { reasoningEffort: reasoningEffort.data } : {}
+  };
+}
+function sameCodexConfigSelection(current, next) {
+  return current.model?.provider === next.model?.provider && current.model?.id === next.model?.id && current.reasoningEffort === next.reasoningEffort;
+}
 function deliveryMode2(delivery) {
   const payload = delivery.payload;
   if (payload && typeof payload === "object" && "deliveryMode" in payload) {

package/dist/index.js

@@ -16694,7 +16694,7 @@ function validateReasoningEffortForHarness(input) {
   }
   const rules = modelRulesForHarness(input.harness);
   if (!rules.reasoningEfforts.includes(input.reasoningEffort)) {
-    throw new Error(
+    throw new InvalidModelSelectionError(
       `${input.harness} does not support reasoning effort "${input.reasoningEffort}"`
     );
   }
@@ -16731,7 +16731,9 @@ function validateAgentModelFieldsForHarness(spec, context) {
 function validateModelProviderForHarness(harness, provider) {
   const rules = modelRulesForHarness(harness);
   if (!rules.providers.includes(provider)) {
-    throw new Error(`${harness} does not support ${provider} models`);
+    throw new InvalidModelSelectionError(
+      `${harness} does not support ${provider} models`
+    );
   }
 }
 function validateModelIdForProvider(input) {
@@ -16745,15 +16747,15 @@ function validateModelIdForProvider(input) {
     return;
   }
   if (curated) {
-    throw new Error(
+    throw new InvalidModelSelectionError(
       `${input.provider} model "${input.id}" is not available for ${input.harness}`
     );
   }
-  throw new Error(
+  throw new InvalidModelSelectionError(
     `${input.provider} model ids are not open for ${input.harness}`
   );
 }
-var MODEL_API_TOKEN_PROVIDERS, ModelApiTokenProviderSchema, CLAUDE_CODE_REASONING_EFFORTS, CODEX_REASONING_EFFORTS, ClaudeCodeReasoningEffortSchema, CodexReasoningEffortSchema, AgentReasoningEffortSchema, OPENROUTER_MODEL_SLUG_PATTERN, AgentModelSelectionSchema, ResolvedAgentModelSelectionSchema, HARNESS_MODEL_RULES;
+var MODEL_API_TOKEN_PROVIDERS, ModelApiTokenProviderSchema, CLAUDE_CODE_REASONING_EFFORTS, CODEX_REASONING_EFFORTS, ClaudeCodeReasoningEffortSchema, CodexReasoningEffortSchema, AgentReasoningEffortSchema, OPENROUTER_MODEL_SLUG_PATTERN, AgentModelSelectionSchema, ResolvedAgentModelSelectionSchema, InvalidModelSelectionError, HARNESS_MODEL_RULES;
 var init_model_selection = __esm({
   "../../packages/schemas/src/model-selection.ts"() {
     "use strict";
@@ -16797,6 +16799,12 @@ var init_model_selection = __esm({
     ResolvedAgentModelSelectionSchema = AgentModelSelectionSchema.extend({
       provider: ModelApiTokenProviderSchema
     });
+    InvalidModelSelectionError = class extends Error {
+      constructor(message) {
+        super(message);
+        this.name = "InvalidModelSelectionError";
+      }
+    };
     HARNESS_MODEL_RULES = {
       "claude-code": {
         defaultProvider: "anthropic",
@@ -27058,7 +27066,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.315",
+      version: "0.1.317",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -37945,7 +37953,7 @@ var UiMessagePartTracker = class {
     }
   }
   appendDataChunk(chunk) {
-    if (!chunk.type.startsWith("data-") || chunk.type === "data-auto-question") {
+    if (!chunk.type.startsWith("data-")) {
       return [];
     }
     const dataChunk = chunk;
@@ -38086,22 +38094,6 @@ var AgentBridgeOutputBuffer = class {
     await this.drainPendingOutputs({ force: true });
   }
   async emitUiMessageChunk(context, projection) {
-    if (projection.chunk.type === "data-auto-question") {
-      await this.flushPendingDelta();
-      await this.emitLiveUiMessageChunk(context, projection.chunk);
-      await this.enqueueProjectionAndDrain(context, {
-        type: "entry",
-        entry: {
-          role: "assistant",
-          kind: "question",
-          ...projection.turnStatus ? { turnStatus: projection.turnStatus } : {},
-          content: {
-            parts: [questionPart(projection.chunk.data)]
-          }
-        }
-      });
-      return;
-    }
     await this.flushPendingDelta();
     await this.emitLiveUiMessageChunk(context, projection.chunk);
     await this.emitUiMessagePartSnapshots(context, projection.chunk, {
@@ -38446,14 +38438,6 @@ var UiMessageAssembler = class {
 function isTerminalUiMessageChunk(chunk) {
   return chunk.type === "finish" || chunk.type === "error" || chunk.type === "abort";
 }
-function questionPart(data) {
-  const parsed = data;
-  return {
-    type: "question",
-    toolCallId: parsed.toolCallId ?? null,
-    questions: parsed.questions
-  };
-}
 function legacyToolEntry(chunk) {
   switch (chunk.type) {
     case "tool-input-available":
@@ -39065,15 +39049,21 @@ function conversationProjectionToUiChunks(projection) {
           turnStatus: "waiting_for_input"
         },
         {
-          type: "ui_message_chunk",
-          chunk: {
-            type: "data-auto-question",
-            data: {
-              toolCallId: part.toolCallId,
-              questions: part.questions
+          type: "entry",
+          entry: {
+            role: "assistant",
+            kind: "question",
+            turnStatus: "waiting_for_input",
+            content: {
+              parts: [
+                {
+                  type: "question",
+                  toolCallId: part.toolCallId,
+                  questions: part.questions
+                }
+              ]
             }
-          },
-          turnStatus: "waiting_for_input"
+          }
         }
       ] : []
     );
@@ -39237,7 +39227,8 @@ function claudeAgentOptions(config2, input = {}) {
     includePartialMessages: true,
     thinking: { type: "adaptive", display: "summarized" },
     settings: { showThinkingSummaries: true },
-    model: CLAUDE_CODE_DEFAULT_MODEL,
+    model: config2.model?.id ?? CLAUDE_CODE_DEFAULT_MODEL,
+    ...config2.reasoningEffort ? { effort: config2.reasoningEffort } : {},
     permissionMode: "bypassPermissions",
     allowDangerouslySkipPermissions: true,
     pathToClaudeCodeExecutable: claudeCodeExecutablePath(),
@@ -39979,7 +39970,10 @@ var ClaudeAgentBridgeSessionImpl = class {
         );
         return { outcome: "timeout" };
       }
-      await delay(CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS);
+      await delay(
+        CLAUDE_MCP_REGISTRATION_POLL_INTERVAL_MS,
+        this.abortController.signal
+      );
     }
   }
   messageProbeContext() {
@@ -40134,10 +40128,19 @@ function mcpStatusDetailList(statuses) {
     (server) => server.error ? `${server.name}:${server.status}(${server.error})` : `${server.name}:${server.status}`
   ).join(",");
 }
-function delay(ms) {
+function delay(ms, signal) {
+  if (signal?.aborted) {
+    return Promise.resolve();
+  }
   return new Promise((resolve4) => {
-    const timer = setTimeout(resolve4, ms);
+    const finish = () => {
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", finish);
+      resolve4();
+    };
+    const timer = setTimeout(finish, ms);
     timer.unref?.();
+    signal?.addEventListener("abort", finish, { once: true });
   });
 }
 function claudeAgentUserMessage(message) {
@@ -40234,11 +40237,13 @@ function createClaudeCodeCommandHandler(input) {
 var ClaudeCodeCommandHandler = class {
   constructor(input) {
     this.input = input;
+    this.claudeConfig = input.claude;
     this.outputBuffer = new AgentBridgeOutputBuffer(input);
   }
   input;
   context = null;
   agentSession = null;
+  claudeConfig;
   persistedAgentId = null;
   injectedCommands = /* @__PURE__ */ new Set();
   // Message commands whose injection has started but not settled. A fresh SDK
@@ -40438,6 +40443,7 @@ var ClaudeCodeCommandHandler = class {
       );
       const sendStartedAt = Date.now();
       const mode = deliveryMode(delivery);
+      this.applySelectionForMessage(delivery);
       this.input.runtimeLogger?.info(
         "agent_bridge_claude_command_send_message_started",
         commandLogContext(delivery, {
@@ -40671,7 +40677,7 @@ var ClaudeCodeCommandHandler = class {
       return this.agentSession;
     }
     const session = claudeAgentBridgeRuntime.start({
-      claude: this.input.claude,
+      claude: this.claudeConfig,
       resumeAgentId: this.storedResumeAgentId(),
       canUseTool: this.canUseTool,
       onMessage: (message, meta3) => this.handleAgentMessage(message, meta3),
@@ -40688,6 +40694,27 @@ var ClaudeCodeCommandHandler = class {
     this.agentSession = session;
     return session;
   }
+  applySelectionForMessage(delivery) {
+    const selection = deliverySelection(delivery);
+    if (!selection.model && selection.reasoningEffort === void 0) {
+      return;
+    }
+    const next = {
+      ...this.claudeConfig,
+      ...selection.model ? { model: selection.model } : {},
+      ...selection.reasoningEffort ? { reasoningEffort: selection.reasoningEffort } : {}
+    };
+    if (sameClaudeConfigSelection(this.claudeConfig, next)) {
+      return;
+    }
+    this.claudeConfig = next;
+    this.agentSession?.close();
+    this.agentSession = null;
+    this.settlePendingQuestions("The runtime restarted to change model");
+    this.input.writeOutput?.(
+      `agent_bridge_claude_model_selection_changed provider=${next.model?.provider ?? ""} model=${next.model?.id ?? ""} reasoning_effort=${next.reasoningEffort ?? ""}`
+    );
+  }
 };
 function withConsumedCommandIds(projection, meta3) {
   const consumedCommandIds = meta3?.consumedCommandIds;
@@ -40712,6 +40739,23 @@ function deliveryMessage(delivery) {
   }
   return null;
 }
+function deliverySelection(delivery) {
+  const payload = delivery.payload;
+  if (!payload || typeof payload !== "object") {
+    return {};
+  }
+  const model = "model" in payload ? AgentBridgeModelSelectionSchema.safeParse(payload.model) : null;
+  const reasoningEffort = "reasoningEffort" in payload ? AgentBridgeClaudeReasoningEffortSchema.safeParse(
+    payload.reasoningEffort
+  ) : null;
+  return {
+    ...model?.success ? { model: model.data } : {},
+    ...reasoningEffort?.success ? { reasoningEffort: reasoningEffort.data } : {}
+  };
+}
+function sameClaudeConfigSelection(current, next) {
+  return current.model?.provider === next.model?.provider && current.model?.id === next.model?.id && current.reasoningEffort === next.reasoningEffort;
+}
 function deliveryMode(delivery) {
   const payload = delivery.payload;
   if (payload && typeof payload === "object" && "deliveryMode" in payload) {
@@ -40768,8 +40812,10 @@ var CodexProjector = class {
         return [];
     }
   }
-  // An approval parks the turn on operator input, so both chunks mark the
-  // delivered turn as waiting for input.
+  // An approval parks the turn on operator input: the native approval chunk
+  // transitions the tool part to `approval-requested` for AI SDK clients, and
+  // the durable question entry keeps owning answer routing for the CLI
+  // transcript. Both mark the delivered turn as waiting for input.
   projectApproval(request) {
     return [
       {
@@ -40782,15 +40828,21 @@ var CodexProjector = class {
         turnStatus: "waiting_for_input"
       },
       {
-        type: "ui_message_chunk",
-        chunk: {
-          type: "data-auto-question",
-          data: {
-            toolCallId: request.itemId,
-            questions: [approvalQuestion(request)]
+        type: "entry",
+        entry: {
+          role: "assistant",
+          kind: "question",
+          turnStatus: "waiting_for_input",
+          content: {
+            parts: [
+              {
+                type: "question",
+                toolCallId: request.itemId,
+                questions: [approvalQuestion(request)]
+              }
+            ]
           }
-        },
-        turnStatus: "waiting_for_input"
+        }
       }
     ];
   }
@@ -41092,9 +41144,12 @@ import { join as join3 } from "path";
 var CODEX_EXECUTABLE_PATH = "codex";
 var CODEX_DEFAULT_MODEL = "gpt-5.3-codex";
 var CODEX_HTTP_PROVIDER_ID = "openai-responses-http";
+var CODEX_OPENROUTER_PROVIDER_ID = "openrouter-responses-http";
 var CODEX_OPENAI_BASE_URL = "https://api.openai.com/v1";
+var CODEX_OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1";
 var CODEX_API_KEY_ENV = "OPENAI_API_KEY";
 var MODEL_GATEWAY_OPENAI_BASE_URL_ENV = "AUTO_MODEL_GATEWAY_OPENAI_BASE_URL";
+var MODEL_GATEWAY_OPENROUTER_BASE_URL_ENV = "AUTO_MODEL_GATEWAY_OPENROUTER_BASE_URL";
 var CODEX_RUNTIME_PROCESS_ENV_KEYS = ["PATH", "HOME"];
 function codexLaunchOptions(config2) {
   return {
@@ -41117,8 +41172,14 @@ function codexThreadParams(config2) {
 }
 function renderCodexConfigToml(config2) {
   const lines = [];
-  lines.push(`model = ${tomlString(CODEX_DEFAULT_MODEL)}`);
-  lines.push(`model_provider = ${tomlString(CODEX_HTTP_PROVIDER_ID)}`);
+  const selectedProvider = codexProviderIdForModel(config2);
+  lines.push(`model = ${tomlString(config2.model?.id ?? CODEX_DEFAULT_MODEL)}`);
+  lines.push(`model_provider = ${tomlString(selectedProvider)}`);
+  if (config2.reasoningEffort) {
+    lines.push(
+      `model_reasoning_effort = ${tomlString(config2.reasoningEffort)}`
+    );
+  }
   lines.push("");
   lines.push(`[model_providers.${CODEX_HTTP_PROVIDER_ID}]`);
   lines.push('name = "OpenAI"');
@@ -41128,6 +41189,15 @@ function renderCodexConfigToml(config2) {
   lines.push('wire_api = "responses"');
   lines.push(`env_key = ${tomlString(CODEX_API_KEY_ENV)}`);
   lines.push("supports_websockets = false");
+  lines.push("");
+  lines.push(`[model_providers.${CODEX_OPENROUTER_PROVIDER_ID}]`);
+  lines.push('name = "OpenRouter"');
+  lines.push(
+    `base_url = ${tomlString(openRouterBaseUrlForCodexConfig(config2.env))}`
+  );
+  lines.push('wire_api = "responses"');
+  lines.push(`env_key = ${tomlString(CODEX_API_KEY_ENV)}`);
+  lines.push("supports_websockets = false");
   for (const [name, server] of Object.entries(config2.mcpServers ?? {})) {
     lines.push("");
     lines.push(`[mcp_servers.${tomlKey(name)}]`);
@@ -41155,6 +41225,12 @@ function codexProcessEnv(env) {
 function openaiBaseUrlForCodexConfig(env) {
   return env[MODEL_GATEWAY_OPENAI_BASE_URL_ENV] ?? CODEX_OPENAI_BASE_URL;
 }
+function openRouterBaseUrlForCodexConfig(env) {
+  return env[MODEL_GATEWAY_OPENROUTER_BASE_URL_ENV] ?? CODEX_OPENROUTER_BASE_URL;
+}
+function codexProviderIdForModel(config2) {
+  return config2.model?.provider === "openrouter" ? CODEX_OPENROUTER_PROVIDER_ID : CODEX_HTTP_PROVIDER_ID;
+}
 function codexHomeDir() {
   const home = process.env.HOME;
   if (!home) {
@@ -41209,6 +41285,7 @@ var CodexAgentBridgeSessionImpl = class {
   // set means an interrupt/steer would race an unsettled item (FRA-3049 analog).
   pendingToolItemIds = /* @__PURE__ */ new Set();
   settlementWaiters = /* @__PURE__ */ new Set();
+  callbackQueue = Promise.resolve();
   // Messages held in "deferred" mode while a turn is in flight; flushed as a
   // fresh turn once the active turn completes.
   deferredMessages = [];
@@ -41480,10 +41557,12 @@ var CodexAgentBridgeSessionImpl = class {
         return;
       case "notification":
         this.trackNotification(message.notification);
-        void this.input.onNotification(message.notification);
+        this.enqueueCallback(
+          () => this.input.onNotification(message.notification)
+        );
         return;
       case "serverRequest":
-        void this.input.onServerRequest(message.request);
+        this.enqueueCallback(() => this.input.onServerRequest(message.request));
         return;
       case "elicitation":
         this.writeFrame({
@@ -41509,6 +41588,18 @@ var CodexAgentBridgeSessionImpl = class {
         return;
     }
   }
+  enqueueCallback(callback) {
+    this.callbackQueue = this.callbackQueue.then(async () => {
+      try {
+        await callback();
+      } catch (error51) {
+        try {
+          await this.input.onError(error51);
+        } catch {
+        }
+      }
+    });
+  }
   // Track turn/item lifecycle so steer/interrupt target the live turn and gate on
   // tool-item settlement.
   trackNotification(notification) {
@@ -41646,17 +41737,20 @@ function createCodexCommandHandler(input) {
 var CodexCommandHandler = class {
   constructor(input) {
     this.input = input;
+    this.codexConfig = input.codex;
     this.outputBuffer = new AgentBridgeOutputBuffer(input);
   }
   input;
   context = null;
   session = null;
+  codexConfig;
   injectedCommands = /* @__PURE__ */ new Set();
   // itemId -> JSON-RPC request id of the parked approval request, so an `answer`
   // command keyed by toolCallId (= itemId) can resolve the right server request.
   pendingApprovals = /* @__PURE__ */ new Map();
   outputBuffer;
   projector = new CodexProjector();
+  skipResumeForNextSession = false;
   // ---------------------------------------------------------------------------
   // Lifecycle (public API)
   // ---------------------------------------------------------------------------
@@ -41711,6 +41805,7 @@ var CodexCommandHandler = class {
     }
     this.injectedCommands.add(delivery.commandId);
     try {
+      this.applySelectionForMessage(delivery);
       await this.emitUserMessageEntry(
         activeContext,
         delivery.commandId,
@@ -41844,9 +41939,10 @@ var CodexCommandHandler = class {
     if (this.session) {
       return this.session;
     }
-    const resumeThreadId = this.storedResumeThreadId();
+    const resumeThreadId = this.skipResumeForNextSession ? void 0 : this.storedResumeThreadId();
+    this.skipResumeForNextSession = false;
     const session = codexAgentBridgeRuntime.start({
-      codex: this.input.codex,
+      codex: this.codexConfig,
       ...resumeThreadId ? { resumeThreadId } : {},
       onNotification: (notification) => this.handleNotification(notification),
       onServerRequest: (request) => this.handleServerRequest(request),
@@ -41863,6 +41959,28 @@ var CodexCommandHandler = class {
     this.session = session;
     return session;
   }
+  applySelectionForMessage(delivery) {
+    const selection = deliverySelection2(delivery);
+    if (!selection.model && selection.reasoningEffort === void 0) {
+      return;
+    }
+    const next = {
+      ...this.codexConfig,
+      ...selection.model ? { model: selection.model } : {},
+      ...selection.reasoningEffort ? { reasoningEffort: selection.reasoningEffort } : {}
+    };
+    if (sameCodexConfigSelection(this.codexConfig, next)) {
+      return;
+    }
+    this.codexConfig = next;
+    this.skipResumeForNextSession = true;
+    this.session?.close();
+    this.session = null;
+    this.pendingApprovals.clear();
+    this.input.writeOutput?.(
+      `agent_bridge_codex_model_selection_changed provider=${next.model?.provider ?? ""} model=${next.model?.id ?? ""} reasoning_effort=${next.reasoningEffort ?? ""}`
+    );
+  }
   storedResumeThreadId() {
     const store = this.input.sessionResume;
     const activeContext = this.context;
@@ -41909,6 +42027,21 @@ function deliveryMessage2(delivery) {
   }
   return null;
 }
+function deliverySelection2(delivery) {
+  const payload = delivery.payload;
+  if (!payload || typeof payload !== "object") {
+    return {};
+  }
+  const model = "model" in payload ? AgentBridgeModelSelectionSchema.safeParse(payload.model) : null;
+  const reasoningEffort = "reasoningEffort" in payload ? AgentBridgeCodexReasoningEffortSchema.safeParse(payload.reasoningEffort) : null;
+  return {
+    ...model?.success ? { model: model.data } : {},
+    ...reasoningEffort?.success ? { reasoningEffort: reasoningEffort.data } : {}
+  };
+}
+function sameCodexConfigSelection(current, next) {
+  return current.model?.provider === next.model?.provider && current.model?.id === next.model?.id && current.reasoningEffort === next.reasoningEffort;
+}
 function deliveryMode2(delivery) {
   const payload = delivery.payload;
   if (payload && typeof payload === "object" && "deliveryMode" in payload) {

package/package.json

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