@qwen-code/qwen-code 0.19.10 → 0.19.11-nightly.20260717.f8e6e8931

package/chunks/{chunk-Q5GLXH5Q.js → chunk-UJG4VV2O.js}

@@ -2,25 +2,25 @@
 "use strict";
 import {
   getExtensionManager
-} from "./chunk-AAR5SGMD.js";
+} from "./chunk-4YR7FSAM.js";
 import {
   getPlugin,
   parseChannelConfig,
   registerPlugin
-} from "./chunk-OATTJGPJ.js";
+} from "./chunk-5CNYZ7TN.js";
 import {
   sanitizeLogText
-} from "./chunk-SXU3KKNI.js";
+} from "./chunk-ZQIYGQCG.js";
 import {
   loadSettings
-} from "./chunk-6GETGQWP.js";
+} from "./chunk-5WWYHNAH.js";
 import {
   writeStderrLine,
   writeStdoutLine
 } from "./chunk-YUZI3WAC.js";
 import {
   hashDaemonWorkspace
-} from "./chunk-P6LART6G.js";
+} from "./chunk-BTSE2DUP.js";
 import {
   Storage
 } from "./chunk-7NFB7LBQ.js";

package/chunks/{chunk-CJFNEBYB.js → chunk-VFEZWI6F.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   t
-} from "./chunk-RDRVMDWV.js";
+} from "./chunk-EMJJBXS7.js";
 import {
   writeStderrLine
 } from "./chunk-YUZI3WAC.js";

package/chunks/{chunk-UFOKA4PR.js → chunk-VHCSIMTF.js}

@@ -1,11 +1,8 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  ndJsonStream
-} from "./chunk-TEGEBB2I.js";
 import {
   MissingCliEntryError
-} from "./chunk-CUUXANEQ.js";
+} from "./chunk-W6J7RSCK.js";
 import {
   redactLogCredentials
 } from "./chunk-M5GB774H.js";
@@ -22,6 +19,113 @@ import { spawn } from "node:child_process";
 import * as os from "node:os";
 import { Readable, Writable } from "node:stream";
 import { getHeapStatistics } from "node:v8";
+
+// packages/acp-bridge/src/ndJsonStream.ts
+init_esbuild_shims();
+function ndJsonStream(output, input, hooks) {
+  const textEncoder = new TextEncoder();
+  const textDecoder = new TextDecoder();
+  const readable = new ReadableStream({
+    async start(controller) {
+      const pending = [];
+      const reader = input.getReader();
+      try {
+        while (true) {
+          const { value, done } = await reader.read();
+          if (done) break;
+          if (!value) continue;
+          readChunk(value, pending, controller, textDecoder, hooks);
+        }
+      } finally {
+        reader.releaseLock();
+        controller.close();
+      }
+    }
+  });
+  const writable = new WritableStream({
+    async write(message) {
+      const content = JSON.stringify(message);
+      const payload = textEncoder.encode(content);
+      const frame = new Uint8Array(payload.byteLength + 1);
+      frame.set(payload);
+      frame[payload.byteLength] = 10;
+      const writer = output.getWriter();
+      try {
+        await writer.write(frame);
+        callHook(hooks?.onMessageSent, payload.byteLength);
+        callHook(hooks?.onMessageObserved, {
+          direction: "sent",
+          bytes: payload.byteLength,
+          message
+        });
+      } finally {
+        writer.releaseLock();
+      }
+    }
+  });
+  return { readable, writable };
+}
+__name(ndJsonStream, "ndJsonStream");
+function readChunk(chunk, pending, controller, textDecoder, hooks) {
+  let start = 0;
+  let newline = chunk.indexOf(10, start);
+  while (newline !== -1) {
+    const lineBytes = takeLineBytes(pending, chunk.subarray(start, newline));
+    handleLine(lineBytes, controller, textDecoder, hooks);
+    start = newline + 1;
+    newline = chunk.indexOf(10, start);
+  }
+  if (start < chunk.length) {
+    pending.push(chunk.subarray(start));
+  }
+}
+__name(readChunk, "readChunk");
+function takeLineBytes(pending, current) {
+  if (pending.length === 0) return current;
+  const totalLength = pending.reduce((sum, part) => sum + part.byteLength, 0) + current.byteLength;
+  const line = new Uint8Array(totalLength);
+  let offset = 0;
+  for (const part of pending) {
+    line.set(part, offset);
+    offset += part.byteLength;
+  }
+  line.set(current, offset);
+  pending.length = 0;
+  return line;
+}
+__name(takeLineBytes, "takeLineBytes");
+function handleLine(lineBytes, controller, textDecoder, hooks) {
+  const line = textDecoder.decode(lineBytes);
+  const trimmedLine = line.trim();
+  if (!trimmedLine) return;
+  try {
+    const message = JSON.parse(trimmedLine);
+    controller.enqueue(message);
+    const bytes = jsonPayloadByteLength(lineBytes);
+    callHook(hooks?.onMessageReceived, bytes);
+    callHook(hooks?.onMessageObserved, {
+      direction: "received",
+      bytes,
+      message
+    });
+  } catch (err) {
+    console.error("Failed to parse JSON message:", trimmedLine, err);
+  }
+}
+__name(handleLine, "handleLine");
+function jsonPayloadByteLength(lineBytes) {
+  return lineBytes[lineBytes.byteLength - 1] === 13 ? lineBytes.byteLength - 1 : lineBytes.byteLength;
+}
+__name(jsonPayloadByteLength, "jsonPayloadByteLength");
+function callHook(hook, value) {
+  try {
+    hook?.(value);
+  } catch {
+  }
+}
+__name(callHook, "callHook");
+
+// packages/acp-bridge/src/spawnChannel.ts
 var cachedMemoryArgs;
 function getAcpMemoryArgs() {
   if (cachedMemoryArgs) return cachedMemoryArgs;
@@ -221,12 +325,18 @@ function killChild(child) {
 __name(killChild, "killChild");
 
 export {
+  ndJsonStream,
   getAcpMemoryArgs,
   createStderrForwarder,
   createSpawnChannelFactory,
   defaultSpawnChannelFactory,
   scrubChildEnv
 };
+/**
+ * @license
+ * Copyright 2026 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
 /**
  * @license
  * Copyright 2025 Qwen Team

package/chunks/{chunk-TQBODCFD.js → chunk-VRR65QYW.js}

@@ -10,6 +10,226 @@ import {
   __name
 } from "./chunk-J2S4EL5Y.js";
 
+// packages/core/src/core/tokenLimits.ts
+init_esbuild_shims();
+var DEFAULT_TOKEN_LIMIT = 2e5;
+var DEFAULT_OUTPUT_TOKEN_LIMIT = 32e3;
+var ESCALATED_MAX_TOKENS = 64e3;
+var OUTPUT_TOKEN_CEILING = ESCALATED_MAX_TOKENS;
+var MIN_CLAMPED_OUTPUT_TOKENS = 4e3;
+function outputClampMargin(contextWindowSize) {
+  return Math.max(1e4, Math.round(0.05 * contextWindowSize));
+}
+__name(outputClampMargin, "outputClampMargin");
+function clampOutputTokensToWindow(outputCeiling, contextWindowSize, promptTokens) {
+  const room = contextWindowSize - promptTokens - outputClampMargin(contextWindowSize);
+  return Math.min(outputCeiling, Math.max(MIN_CLAMPED_OUTPUT_TOKENS, room));
+}
+__name(clampOutputTokensToWindow, "clampOutputTokensToWindow");
+function parsePositiveIntegerEnvValue(raw) {
+  if (raw === void 0) return void 0;
+  const trimmed = raw.trim();
+  if (!/^\d+$/.test(trimmed)) return void 0;
+  const parsed = Number(trimmed);
+  if (!Number.isSafeInteger(parsed) || parsed <= 0) return void 0;
+  return parsed;
+}
+__name(parsePositiveIntegerEnvValue, "parsePositiveIntegerEnvValue");
+var LIMITS = {
+  "32k": 32768,
+  "64k": 65536,
+  "128k": 131072,
+  "192k": 196608,
+  // MiniMax-M2.5 context window
+  "200k": 2e5,
+  // vendor-declared decimal, used by OpenAI, Anthropic, etc.
+  "256k": 262144,
+  "272k": 272e3,
+  // vendor-declared decimal, GPT-5.x input (400K total - 128K output)
+  "384k": 384e3,
+  // vendor-declared decimal, DeepSeek V4 max output
+  "400k": 4e5,
+  // vendor-declared decimal, used by OpenAI GPT-5.x
+  "512k": 524288,
+  "1m": 1e6,
+  // Output token limits (typically much smaller than input limits)
+  "4k": 4096,
+  "8k": 8192,
+  "16k": 16384
+};
+function normalize(model) {
+  let s = (model ?? "").toLowerCase().trim();
+  s = s.replace(/^.*\//, "");
+  s = s.split("|").pop() ?? s;
+  s = s.split(":").pop() ?? s;
+  s = s.replace(/\s+/g, "-");
+  s = s.replace(/-preview/g, "");
+  if (!s.match(/^qwen-(?:plus|flash|vl-max)-latest$/) && !s.match(/^kimi-k2-\d{4}$/)) {
+    s = s.replace(
+      /-(?:\d{4,}|\d+x\d+b|v\d+(?:\.\d+)*|(?<=-[^-]+-)\d+(?:\.\d+)+|latest|exp)$/g,
+      ""
+    );
+  }
+  s = s.replace(/-(?:\d?bit|int[48]|bf16|fp16|q[45]|quantized)$/g, "");
+  return s;
+}
+__name(normalize, "normalize");
+var PATTERNS = [
+  // -------------------
+  // Google Gemini
+  // -------------------
+  [/^gemini-3/, LIMITS["1m"]],
+  // Gemini 3.x (Pro, Flash, 3.1, etc.): 1M
+  [/^gemini-/, LIMITS["1m"]],
+  // Gemini fallback (1.5, 2.x): 1M
+  // -------------------
+  // OpenAI
+  // -------------------
+  [/^gpt-5/, LIMITS["272k"]],
+  // GPT-5.x: 272K input (400K total - 128K output)
+  [/^gpt-/, LIMITS["128k"]],
+  // GPT fallback (4o, 4.1, etc.): 128K
+  [/^o\d/, LIMITS["200k"]],
+  // o-series (o3, o4-mini, etc.): 200K
+  // -------------------
+  // Anthropic Claude
+  // -------------------
+  [/^claude-opus-4-(?:6|7|8)/, LIMITS["1m"]],
+  // Opus 4.6-4.8: 1M
+  [/^claude-/, LIMITS["200k"]],
+  // All Claude models: 200K
+  // -------------------
+  // Alibaba / Qwen
+  // -------------------
+  // Commercial API models (1,000,000 context)
+  [/^qwen3-coder-plus/, LIMITS["1m"]],
+  [/^qwen3-coder-flash/, LIMITS["1m"]],
+  [/^qwen3\.\d/, LIMITS["1m"]],
+  [/^qwen-plus-latest$/, LIMITS["1m"]],
+  [/^qwen-flash-latest$/, LIMITS["1m"]],
+  [/^coder-model$/, LIMITS["1m"]],
+  // Commercial API models (256K context)
+  [/^qwen3-max/, LIMITS["256k"]],
+  // Open-source Qwen3 variants: 256K native
+  [/^qwen3-coder-/, LIMITS["256k"]],
+  // Qwen fallback (VL, turbo, plus, 2.5, etc.): 256K
+  [/^qwen/, LIMITS["256k"]],
+  // -------------------
+  // DeepSeek
+  // -------------------
+  [/^deepseek-v4/, LIMITS["1m"]],
+  // DeepSeek V4 (flash, pro): 1M
+  [/^deepseek/, LIMITS["128k"]],
+  // -------------------
+  // Zhipu GLM
+  // -------------------
+  // 1M context is the forward default for new GLM releases (GLM-5.2+, GLM-6.x,
+  // and beyond) so they need no future code change. Confirmed 200K families
+  // (GLM-5 / 5.0 / 5.1, GLM-4.x and older) are pinned explicitly first.
+  [/^glm-5(\.[01])?(-|$)/, 202752],
+  // GLM-5 / 5.0 / 5.1: 200K
+  [/^glm-(?:[5-9]|\d{2,})/, LIMITS["1m"]],
+  // GLM-5.2+, 6.x..9.x, 10.x+: 1M
+  [/^glm-/, 202752],
+  // GLM <=4.x / non-numeric fallback: 200K
+  // -------------------
+  // MiniMax
+  // -------------------
+  [/^minimax-m3/i, LIMITS["1m"]],
+  // MiniMax-M3: 1,000,000
+  [/^minimax-m2\.5/i, LIMITS["192k"]],
+  // MiniMax-M2.5: 196,608
+  [/^minimax-/i, LIMITS["200k"]],
+  // MiniMax fallback: 200K
+  // -------------------
+  // Moonshot / Kimi
+  // -------------------
+  [/^kimi-/, LIMITS["256k"]],
+  // Kimi fallback: 256K
+  // -------------------
+  // ByteDance Seed-OSS (512K)
+  // -------------------
+  [/^seed-oss/, LIMITS["512k"]]
+];
+var OUTPUT_PATTERNS = [
+  // Google Gemini
+  [/^gemini-3/, LIMITS["64k"]],
+  // Gemini 3.x: 64K
+  [/^gemini-/, LIMITS["8k"]],
+  // Gemini fallback: 8K
+  // OpenAI
+  [/^gpt-5/, LIMITS["128k"]],
+  // GPT-5.x: 128K
+  [/^gpt-/, LIMITS["16k"]],
+  // GPT fallback: 16K
+  [/^o\d/, LIMITS["128k"]],
+  // o-series: 128K
+  // Anthropic Claude
+  [/^claude-opus-4-(?:6|7|8)/, 128e3],
+  // Opus 4.6-4.8: 128K
+  [/^claude-sonnet-4-6/, LIMITS["64k"]],
+  // Sonnet 4.6: 64K
+  [/^claude-/, LIMITS["64k"]],
+  // Claude fallback: 64K
+  // Alibaba / Qwen
+  [/^qwen3\.\d/, LIMITS["64k"]],
+  [/^coder-model$/, LIMITS["64k"]],
+  [/^qwen/, LIMITS["32k"]],
+  // Qwen fallback (VL, turbo, plus, etc.): 32K
+  // DeepSeek
+  [/^deepseek-v4/, LIMITS["384k"]],
+  // DeepSeek V4 (flash, pro): 384K
+  [/^deepseek-reasoner/, LIMITS["64k"]],
+  [/^deepseek-r1/, LIMITS["64k"]],
+  [/^deepseek-chat/, LIMITS["8k"]],
+  // Zhipu GLM
+  [/^glm-5(?:\.\d+)?(?:-|$)/, LIMITS["128k"]],
+  [/^glm-4\.7/, LIMITS["16k"]],
+  // MiniMax
+  [/^minimax-m2\.5/i, LIMITS["64k"]],
+  // Kimi
+  [/^kimi-k2\.5/, LIMITS["32k"]]
+];
+function findTokenLimit(model, type = "input") {
+  const norm = normalize(model);
+  const patterns = type === "output" ? OUTPUT_PATTERNS : PATTERNS;
+  for (const [regex, limit] of patterns) {
+    if (regex.test(norm)) {
+      return limit;
+    }
+  }
+  return void 0;
+}
+__name(findTokenLimit, "findTokenLimit");
+function hasExplicitOutputLimit(model) {
+  const norm = normalize(model);
+  return OUTPUT_PATTERNS.some(([regex]) => regex.test(norm));
+}
+__name(hasExplicitOutputLimit, "hasExplicitOutputLimit");
+function knownTokenLimit(model, type = "input") {
+  return findTokenLimit(model, type);
+}
+__name(knownTokenLimit, "knownTokenLimit");
+function tokenLimit(model, type = "input") {
+  return knownTokenLimit(model, type) ?? (type === "output" ? DEFAULT_OUTPUT_TOKEN_LIMIT : DEFAULT_TOKEN_LIMIT);
+}
+__name(tokenLimit, "tokenLimit");
+function defaultOutputCeiling(model) {
+  const outputLimit = tokenLimit(model, "output");
+  if (/^claude-opus-4-(?:6|7|8)/.test(normalize(model))) {
+    return outputLimit;
+  }
+  return Math.min(outputLimit, OUTPUT_TOKEN_CEILING);
+}
+__name(defaultOutputCeiling, "defaultOutputCeiling");
+function reconcileMaxTokens(configMaxTokens, requestMaxTokens) {
+  if (typeof configMaxTokens === "number" && typeof requestMaxTokens === "number") {
+    return Math.min(configMaxTokens, requestMaxTokens);
+  }
+  return void 0;
+}
+__name(reconcileMaxTokens, "reconcileMaxTokens");
+
 // packages/core/src/utils/request-tokenizer/textTokenizer.ts
 init_esbuild_shims();
 var NON_ASCII_RE = /[\u0080-\uffff]/;
@@ -58,6 +278,18 @@ var TextTokenizer = class {
   }
 };
 
+// packages/core/src/core/tool-call-preparation.ts
+init_esbuild_shims();
+var preparationsByResponse = /* @__PURE__ */ new WeakMap();
+function setToolCallPreparations(response, preparations) {
+  preparationsByResponse.set(response, preparations);
+}
+__name(setToolCallPreparations, "setToolCallPreparations");
+function getToolCallPreparations(response) {
+  return preparationsByResponse.get(response) ?? [];
+}
+__name(getToolCallPreparations, "getToolCallPreparations");
+
 // packages/core/src/utils/runtimeDiagnostics.ts
 init_esbuild_shims();
 var RUNTIME_PROFILE_ENV = "QWEN_CODE_PROFILE_RUNTIME";
@@ -1241,10 +1473,26 @@ function toOpenAPI30(schema) {
 __name(toOpenAPI30, "toOpenAPI30");
 
 export {
+  DEFAULT_TOKEN_LIMIT,
+  DEFAULT_OUTPUT_TOKEN_LIMIT,
+  ESCALATED_MAX_TOKENS,
+  OUTPUT_TOKEN_CEILING,
+  MIN_CLAMPED_OUTPUT_TOKENS,
+  outputClampMargin,
+  clampOutputTokensToWindow,
+  parsePositiveIntegerEnvValue,
+  normalize,
+  hasExplicitOutputLimit,
+  knownTokenLimit,
+  tokenLimit,
+  defaultOutputCeiling,
+  reconcileMaxTokens,
   estimateTextTokens,
   TextTokenizer,
   safeJsonParse,
   convertSchema,
+  setToolCallPreparations,
+  getToolCallPreparations,
   isRuntimeDiagnosticsEnabled,
   RuntimeDiagnosticsCollector,
   runtimeDiagnostics,
@@ -1258,11 +1506,11 @@ export {
  */
 /**
  * @license
- * Copyright 2026 Qwen
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Qwen
  * SPDX-License-Identifier: Apache-2.0
  */

package/chunks/{chunk-CUUXANEQ.js → chunk-W6J7RSCK.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   SkillError
-} from "./chunk-K7CRWKOE.js";
+} from "./chunk-R6AO7HBQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -79,6 +79,8 @@ var SERVE_CONTROL_EXT_METHODS = {
   sessionBranch: "qwen/control/session/branch",
   sessionForkAgent: "qwen/control/session/fork_agent",
   sessionRecap: "qwen/control/session/recap",
+  sessionGenerationStart: "qwen/control/session/generation/start",
+  sessionGenerationCancel: "qwen/control/session/generation/cancel",
   sessionBtw: "qwen/control/session/btw",
   sessionShellHistory: "qwen/control/session/shell_history",
   sessionLanguage: "qwen/control/session/language",
@@ -86,9 +88,12 @@ var SERVE_CONTROL_EXT_METHODS = {
   sessionContinue: "qwen/control/session/continue",
   sessionTitle: "qwen/control/session/title",
   sessionParent: "qwen/control/session/parent",
+  sessionSource: "qwen/control/session/source",
   sessionArtifactsPersist: "qwen/control/session/artifacts/persist",
   workspaceMcpRestart: "qwen/control/workspace/mcp/restart",
   workspaceMcpManage: "qwen/control/workspace/mcp/manage",
+  workspaceMcpInitialize: "qwen/control/workspace/mcp/initialize",
+  workspaceMcpReload: "qwen/control/workspace/mcp/reload",
   workspaceAgentGenerate: "qwen/control/workspace/agents/generate",
   workspaceMemoryRememberAvailability: "qwen/control/workspace/memory/remember/availability",
   workspaceMemoryRemember: "qwen/control/workspace/memory/remember",

package/chunks/{chunk-YHN5SUIJ.js → chunk-W7H223ZZ.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   SessionNotFoundError
-} from "./chunk-KSO42X3Z.js";
+} from "./chunk-X6YQWCIJ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-WX6SD4IQ.js → chunk-WTNZ6DXB.js}

@@ -5,7 +5,7 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-2UUAIFQO.js";
+} from "./chunk-JGUT3LWZ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-GGJII3FM.js → chunk-WZJELXEU.js}

@@ -4,14 +4,14 @@ import {
   resolveModelConfig,
   resolveProviderProtocol,
   stripRuntimeSnapshotPrefix
-} from "./chunk-K7CRWKOE.js";
+} from "./chunk-R6AO7HBQ.js";
 import {
   external_exports
 } from "./chunk-H6XPXXMH.js";
 import {
   AuthType,
   MODEL_GENERATION_CONFIG_FIELDS
-} from "./chunk-P6LART6G.js";
+} from "./chunk-BTSE2DUP.js";
 import {
   REASONING_EFFORT_TIERS,
   normalizeReasoningEffort
@@ -25,10 +25,95 @@ import {
 
 // packages/cli/src/utils/acpModelUtils.ts
 init_esbuild_shims();
+import { createHash } from "node:crypto";
+var ACP_ROUTE_ID_PREFIX = "qwen-route:v1:";
+function getRouteEndpointIdentity(baseUrl) {
+  if (!baseUrl) return null;
+  try {
+    const url = new URL(baseUrl);
+    url.username = "";
+    url.password = "";
+    url.search = "";
+    url.hash = "";
+    return url.href;
+  } catch {
+    return sanitizeProviderBaseUrl(baseUrl).split(/[?#]/, 1)[0] ?? null;
+  }
+}
+__name(getRouteEndpointIdentity, "getRouteEndpointIdentity");
 function formatAcpModelId(modelId, authType) {
   return `${modelId}(${authType})`;
 }
 __name(formatAcpModelId, "formatAcpModelId");
+function buildAcpModelOptions(models) {
+  const candidates = models.filter((model) => model.fastOnly !== true && model.voiceOnly !== true).map((model) => {
+    const effectiveModelId = model.isRuntimeModel && model.runtimeSnapshotId ? model.runtimeSnapshotId : model.id;
+    return {
+      model,
+      effectiveModelId,
+      legacyModelId: formatAcpModelId(effectiveModelId, model.authType)
+    };
+  });
+  const counts = /* @__PURE__ */ new Map();
+  for (const candidate of candidates) {
+    counts.set(
+      candidate.legacyModelId,
+      (counts.get(candidate.legacyModelId) ?? 0) + 1
+    );
+  }
+  const discriminators = /* @__PURE__ */ new Set();
+  return candidates.map(({ model, effectiveModelId, legacyModelId }) => {
+    const discriminator = [
+      legacyModelId,
+      model.label,
+      model.envKey ?? null,
+      model.registryBaseUrl === void 0,
+      getRouteEndpointIdentity(model.registryBaseUrl ?? model.baseUrl)
+    ];
+    const discriminatorKey = JSON.stringify(discriminator);
+    if (counts.get(legacyModelId) !== 1 && discriminators.has(discriminatorKey)) {
+      throw new Error(
+        `ACP model routes for "${legacyModelId}" need distinct names, envKey values, or public endpoints.`
+      );
+    }
+    discriminators.add(discriminatorKey);
+    return {
+      model,
+      effectiveModelId,
+      modelId: counts.get(legacyModelId) === 1 ? legacyModelId : `${ACP_ROUTE_ID_PREFIX}${createHash("sha256").update(discriminatorKey).digest("base64url").slice(0, 16)}`
+    };
+  });
+}
+__name(buildAcpModelOptions, "buildAcpModelOptions");
+function resolveAcpModelOption(input, models) {
+  const matched = buildAcpModelOptions(models).find(
+    (option) => option.modelId === input.trim()
+  );
+  if (!matched) return null;
+  return {
+    modelId: matched.effectiveModelId,
+    authType: matched.model.authType,
+    ...matched.model.registryBaseUrl !== void 0 ? { baseUrl: matched.model.registryBaseUrl } : {},
+    ...!matched.model.isRuntimeModel ? { registryBaseUrl: matched.model.registryBaseUrl ?? null } : {},
+    isRuntime: matched.model.isRuntimeModel === true
+  };
+}
+__name(resolveAcpModelOption, "resolveAcpModelOption");
+function getCurrentAcpModelId(options, modelId, authType, registryBaseUrl) {
+  if (!modelId || !authType) return modelId;
+  const matching = options.filter(
+    (option) => option.effectiveModelId === modelId && option.model.authType === authType
+  );
+  if (matching[0]?.model.isRuntimeModel) return matching[0].modelId;
+  if (registryBaseUrl !== void 0) {
+    const exact = matching.find(
+      (option) => (option.model.registryBaseUrl ?? null) === registryBaseUrl
+    );
+    return exact?.modelId ?? modelId;
+  }
+  return matching.length === 1 ? matching[0].modelId : formatAcpModelId(modelId, authType);
+}
+__name(getCurrentAcpModelId, "getCurrentAcpModelId");
 function sanitizeProviderBaseUrl(baseUrl) {
   const scheme = baseUrl.match(/^[A-Za-z][A-Za-z\d+.-]*:\/\//);
   if (!scheme) {
@@ -342,6 +427,7 @@ function resolveCliGenerationConfig(inputs) {
     apiKey: resolved.config.apiKey || "",
     baseUrl: resolved.config.baseUrl || "",
     generationConfig,
+    ...modelProvider ? { registryBaseUrl: modelProvider.baseUrl ?? null } : {},
     sources: resolved.sources,
     warnings: [
       ...resolved.warnings,
@@ -358,7 +444,10 @@ function resolveCliGenerationConfig(inputs) {
 __name(resolveCliGenerationConfig, "resolveCliGenerationConfig");
 
 export {
-  formatAcpModelId,
+  ACP_ROUTE_ID_PREFIX,
+  buildAcpModelOptions,
+  resolveAcpModelOption,
+  getCurrentAcpModelId,
   sanitizeProviderBaseUrl,
   parseAcpBaseModelId,
   parseAcpModelOption,