@qwen-code/qwen-code 0.18.5 → 0.19.0

package/chunks/{chunk-F5E6IKYN.js → chunk-KFR4QTV3.js}

@@ -7,7 +7,7 @@ import {
   getLanguageSettingsOptions,
   t,
   writeStderrLine
-} from "./chunk-C7JA3XCX.js";
+} from "./chunk-VRIVIYRL.js";
 import {
   DEFAULT_STOP_HOOK_BLOCK_CAP,
   DEFAULT_TOOL_OUTPUT_BATCH_BUDGET,
@@ -17,22 +17,28 @@ import {
   IdeClient,
   SkillError,
   ideContextStore,
-  require_main
-} from "./chunk-VECKCOH6.js";
-import {
-  isWithinRoot,
+  require_main,
+  resolveModelConfig,
   stripRuntimeSnapshotPrefix
-} from "./chunk-2CNO5W47.js";
+} from "./chunk-YF3ORUIU.js";
+import {
+  DEFAULT_QWEN_CUSTOM_IGNORE_FILE_NAMES
+} from "./chunk-EEEZIVFJ.js";
+import {
+  AuthType,
+  MODEL_GENERATION_CONFIG_FIELDS,
+  isWithinRoot
+} from "./chunk-CICUTYTF.js";
 import {
   atomicWriteFileSync
-} from "./chunk-LTN3VYMZ.js";
+} from "./chunk-3UALQ56H.js";
 import {
   FatalConfigError,
   QWEN_DIR,
   Storage,
   createDebugLogger,
   getErrorMessage
-} from "./chunk-WE6TNQJU.js";
+} from "./chunk-C4K3FEQ2.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -13472,7 +13478,7 @@ var BoundedAsyncQueue = class {
   }
 };
 
-// packages/cli/src/serve/eventBus.ts
+// packages/cli/src/serve/event-bus.ts
 init_esbuild_shims();
 
 // packages/acp-bridge/src/bridgeErrors.ts
@@ -13899,6 +13905,7 @@ var SERVE_CONTROL_EXT_METHODS = {
   sessionClose: "qwen/control/session/close",
   sessionApprovalMode: "qwen/control/session/approval_mode",
   sessionBranch: "qwen/control/session/branch",
+  sessionForkAgent: "qwen/control/session/fork_agent",
   sessionRecap: "qwen/control/session/recap",
   sessionBtw: "qwen/control/session/btw",
   sessionShellHistory: "qwen/control/session/shell_history",
@@ -15651,7 +15658,7 @@ var SETTINGS_SCHEMA = {
     category: "Model",
     requiresRestart: false,
     default: {},
-    description: "Model providers configuration grouped by authType. Each authType contains an array of model configurations.",
+    description: "Model providers configuration grouped by authType. Each authType maps to a ProviderConfig object with protocol and models fields.",
     showInDialog: false,
     mergeStrategy: "replace" /* REPLACE */
   },
@@ -15711,6 +15718,48 @@ var SETTINGS_SCHEMA = {
         description: "Enable Vim keybindings",
         showInDialog: true
       },
+      voice: {
+        type: "object",
+        label: "Voice Dictation",
+        category: "General",
+        requiresRestart: false,
+        default: {},
+        description: "Voice dictation settings.",
+        showInDialog: false,
+        properties: {
+          enabled: {
+            type: "boolean",
+            label: "Voice Dictation",
+            category: "General",
+            requiresRestart: false,
+            default: false,
+            description: "Enable voice dictation in the prompt input.",
+            showInDialog: false
+          },
+          mode: {
+            type: "enum",
+            label: "Voice Dictation Mode",
+            category: "General",
+            requiresRestart: false,
+            default: "hold",
+            description: 'How push-to-talk behaves: "hold" to talk while held, or "tap" to start and tap (or pause) to stop and submit.',
+            showInDialog: false,
+            options: [
+              { value: "hold", label: "Hold to talk" },
+              { value: "tap", label: "Tap to toggle" }
+            ]
+          },
+          language: {
+            type: "string",
+            label: "Voice Dictation Language",
+            category: "General",
+            requiresRestart: false,
+            default: "",
+            description: 'Preferred spoken language for voice transcription (e.g. "english", "chinese"). Leave empty to auto-detect.',
+            showInDialog: false
+          }
+        }
+      },
       enableAutoUpdate: {
         type: "boolean",
         label: "Enable Auto Update",
@@ -15751,7 +15800,7 @@ var SETTINGS_SCHEMA = {
         // surprised when a mid-session edit doesn't take effect immediately.
         requiresRestart: true,
         default: 30,
-        description: "Number of days to retain ~/.qwen/file-history/ session backups used by /rewind. Backups older than this are removed by a background housekeeping pass that runs at most once per day. Set to 0 for minimum retention (~1 hour) \u2014 protects sessions touched in the last hour, plus the currently active session. Other persistent caches will honor the same setting in the future.",
+        description: "Number of days to retain ~/.qwen/file-history/ session backups used by /rewind and background subagent transcripts under <projectDir>/subagents/. Data older than this is removed by a background housekeeping pass that runs at most once per day. Set to 0 for minimum retention (~1 hour) \u2014 protects sessions touched in the last hour, plus the currently active session.",
         showInDialog: true
       },
       gitCoAuthor: {
@@ -15897,6 +15946,15 @@ var SETTINGS_SCHEMA = {
           { value: "text", label: "Text" },
           { value: "json", label: "JSON" }
         ]
+      },
+      showTimestamps: {
+        type: "boolean",
+        label: "Show Timestamps",
+        category: "General",
+        requiresRestart: false,
+        default: false,
+        description: "Show [HH:MM:SS] timestamp before each assistant response.",
+        showInDialog: true
       }
     }
   },
@@ -15992,6 +16050,15 @@ var SETTINGS_SCHEMA = {
         description: "Hide the window title bar",
         showInDialog: false
       },
+      disableWorkflowKeywordTrigger: {
+        type: "boolean",
+        label: "Disable Workflow Keyword Trigger",
+        category: "UI",
+        requiresRestart: false,
+        default: false,
+        description: "When true, mentioning the word `workflow` in a prompt no longer softly steers the turn toward the Workflow tool (and the Footer `workflow active` indicator is suppressed). Only applies when workflows are enabled.",
+        showInDialog: true
+      },
       showStatusInTitle: {
         type: "boolean",
         label: "Show Status in Title",
@@ -16404,6 +16471,15 @@ var SETTINGS_SCHEMA = {
     description: "Model used for generating prompt suggestions and speculative execution. Leave empty to use the main model. A smaller/faster model (e.g., qwen3-coder-flash) reduces latency and cost.",
     showInDialog: true
   },
+  voiceModel: {
+    type: "string",
+    label: "Voice Model",
+    category: "Model",
+    requiresRestart: false,
+    default: "",
+    description: "Model used for voice transcription. Set with /model --voice. Leave empty to keep voice dictation disabled until a voice model is selected.",
+    showInDialog: false
+  },
   model: {
     type: "object",
     label: "Model",
@@ -16500,7 +16576,7 @@ var SETTINGS_SCHEMA = {
         category: "Model",
         requiresRestart: false,
         default: true,
-        description: "Skip streaming loop detection. Defaults to true to avoid false-positive interruptions; set to false to re-enable as an unattended-run guardrail.",
+        description: "Skip the opt-in streaming loop-detection heuristics (content/thought repetition, read-file and action stagnation, global-duplicate and alternating tool-call patterns). Defaults to true to avoid false-positive interruptions; set to false to re-enable them as an unattended-run guardrail. A minimal always-on guard (consecutive identical tool calls plus a per-turn tool-call cap) still runs regardless of this setting.",
         showInDialog: false
       },
       skipStartupContext: {
@@ -16748,9 +16824,19 @@ var SETTINGS_SCHEMA = {
             category: "Context",
             requiresRestart: true,
             default: true,
-            description: "Respect .qwenignore files when searching",
+            description: "Respect .qwenignore and configured custom ignore files when searching",
             showInDialog: true
           },
+          customIgnoreFiles: {
+            type: "array",
+            label: "Custom Ignore Files",
+            category: "Context",
+            requiresRestart: true,
+            default: [...DEFAULT_QWEN_CUSTOM_IGNORE_FILE_NAMES],
+            description: "Project-root-relative ignore files to use instead of the defaults (`.agentignore`, `.aiignore`) when respectQwenIgnore is enabled. .qwenignore is always included when respectQwenIgnore is enabled.",
+            showInDialog: false,
+            items: { type: "string" }
+          },
           enableRecursiveFileSearch: {
             type: "boolean",
             label: "Enable Recursive File Search",
@@ -17305,7 +17391,7 @@ var SETTINGS_SCHEMA = {
         default: void 0,
         description: "Optional fixed quorum size for consensus policy. Capped at M (count of registered voters at request issue time) to prevent unreachable quorum. Unset = floor(M/2)+1. Requires daemon restart \u2014 read once at boot.",
         showInDialog: false,
-        // runQwenServe.ts validates `Number.isInteger(n) && n >= 1` and
+        // run-qwen-serve.ts validates `Number.isInteger(n) && n >= 1` and
         // refuses to boot otherwise. Override the generated schema so IDE
         // (VSCode, JetBrains via JSON Schema) flags `0`, `-1`, `1.5`
         // BEFORE the user restarts the daemon. The bare `type:'number'`
@@ -17822,6 +17908,15 @@ var SETTINGS_SCHEMA = {
         description: "Enable agent team collaboration tools (experimental). When enabled, the model can create agent teams and coordinate work using team_create, team_delete, send_message, task_create, task_update, and task_list tools. Can also be enabled via QWEN_CODE_ENABLE_AGENT_TEAM=1 environment variable.",
         showInDialog: true
       },
+      artifact: {
+        type: "boolean",
+        label: "Enable Artifacts",
+        category: "Experimental",
+        requiresRestart: true,
+        default: false,
+        description: "Enable the Artifact tool (experimental). When enabled, the model can publish a self-contained HTML page as an interactive Artifact and open it in the browser. Interactive, non-SDK sessions only. Can also be enabled via QWEN_CODE_ENABLE_ARTIFACT=1, or hard-disabled via QWEN_CODE_DISABLE_ARTIFACT=1.",
+        showInDialog: true
+      },
       emitToolUseSummaries: {
         type: "boolean",
         label: "Tool Use Summaries",
@@ -17833,6 +17928,134 @@ var SETTINGS_SCHEMA = {
       }
     }
   },
+  artifact: {
+    type: "object",
+    label: "Artifacts",
+    category: "Experimental",
+    requiresRestart: true,
+    default: {},
+    description: "Configuration for the experimental Artifact tool (enable it via experimental.artifact). Selects the publish backend and, for the host backend, the upload command and shareable URL template.",
+    showInDialog: false,
+    properties: {
+      autoOpen: {
+        type: "boolean",
+        label: "Auto-open Artifacts",
+        category: "Experimental",
+        requiresRestart: true,
+        default: true,
+        description: "Open published artifacts in the browser automatically. Set to false to publish without launching a browser. QWEN_ARTIFACT_NO_AUTO_OPEN=1 overrides this setting.",
+        showInDialog: false
+      },
+      publisher: {
+        type: "enum",
+        label: "Artifact Publisher",
+        category: "Experimental",
+        requiresRestart: true,
+        default: "local",
+        description: "Where artifacts are published: 'local' (a file:// page on disk, the default), 'host' (upload via artifact.host.uploadCommand and return a shareable link), or 'oss' (native Aliyun OSS upload).",
+        showInDialog: false,
+        options: [
+          { value: "local", label: "Local (file://)" },
+          { value: "host", label: "Host (shareable link)" },
+          { value: "oss", label: "Aliyun OSS" }
+        ]
+      },
+      host: {
+        type: "object",
+        label: "Artifact Host",
+        category: "Experimental",
+        requiresRestart: true,
+        default: {},
+        description: 'Host-backend config, used when artifact.publisher is "host".',
+        showInDialog: false,
+        properties: {
+          uploadCommand: {
+            type: "string",
+            label: "Upload Command",
+            category: "Experimental",
+            requiresRestart: true,
+            default: "",
+            description: 'Command that uploads the artifact, run with execFile (no shell). {file} = local HTML path, {key} = remote object key. e.g. "aws s3 cp {file} s3://bucket/{key} --content-type text/html".',
+            showInDialog: false
+          },
+          urlTemplate: {
+            type: "string",
+            label: "URL Template",
+            category: "Experimental",
+            requiresRestart: true,
+            default: "",
+            description: 'Shareable URL template; {key} is substituted. e.g. "https://bucket.example.com/{key}".',
+            showInDialog: false
+          },
+          keyPrefix: {
+            type: "string",
+            label: "Key Prefix",
+            category: "Experimental",
+            requiresRestart: true,
+            default: "artifacts",
+            description: 'Remote key prefix; the object key is "{prefix}/{id}/index.html".',
+            showInDialog: false
+          }
+        }
+      },
+      oss: {
+        type: "object",
+        label: "Artifact OSS",
+        category: "Experimental",
+        requiresRestart: true,
+        default: {},
+        description: 'Native Aliyun OSS backend, used when artifact.publisher is "oss". Credentials are read from OSS_ACCESS_KEY_ID / OSS_ACCESS_KEY_SECRET (or ALIBABA_CLOUD_*), never from settings.',
+        showInDialog: false,
+        properties: {
+          bucket: {
+            type: "string",
+            label: "OSS Bucket",
+            category: "Experimental",
+            requiresRestart: true,
+            default: "",
+            description: "OSS bucket name.",
+            showInDialog: false
+          },
+          endpoint: {
+            type: "string",
+            label: "OSS Endpoint",
+            category: "Experimental",
+            requiresRestart: true,
+            default: "",
+            description: 'OSS endpoint host, e.g. "oss-cn-hangzhou.aliyuncs.com".',
+            showInDialog: false
+          },
+          keyPrefix: {
+            type: "string",
+            label: "Key Prefix",
+            category: "Experimental",
+            requiresRestart: true,
+            default: "artifacts",
+            description: 'Remote key prefix; the object key is "{prefix}/{id}/index.html".',
+            showInDialog: false
+          },
+          acl: {
+            type: "string",
+            label: "Object ACL",
+            category: "Experimental",
+            requiresRestart: true,
+            default: "public-read",
+            description: 'Object ACL applied on upload. "public-read" (default) makes the link shareable.',
+            showInDialog: false
+          },
+          publicBaseUrl: {
+            type: "string",
+            label: "Public Base URL",
+            category: "Experimental",
+            requiresRestart: true,
+            default: "",
+            description: 'Optional CDN / custom-domain base for the returned URL. Upload still goes through endpoint. e.g. "https://cdn.example.com".',
+            showInDialog: false
+          }
+        }
+      }
+    }
+  },
   worktree: {
     type: "object",
     label: "Worktree",
@@ -18876,11 +19099,74 @@ var V3ToV4Migration = class {
 };
 var v3ToV4Migration = new V3ToV4Migration();
 
+// packages/cli/src/config/migration/versions/v4-to-v5.ts
+init_esbuild_shims();
+var PROVIDER_KEY_TO_PROTOCOL = {
+  openai: "openai",
+  "qwen-oauth": "qwen-oauth",
+  gemini: "gemini",
+  "vertex-ai": "gemini",
+  anthropic: "anthropic"
+};
+var V4ToV5Migration = class {
+  static {
+    __name(this, "V4ToV5Migration");
+  }
+  fromVersion = 4;
+  toVersion = 5;
+  shouldMigrate(settings) {
+    if (typeof settings !== "object" || settings === null) {
+      return false;
+    }
+    const s = settings;
+    if (s["$version"] !== 4 && s["$version"] !== void 0) {
+      return false;
+    }
+    if (s["$version"] === 4) {
+      return true;
+    }
+    const modelProviders = s["modelProviders"];
+    if (typeof modelProviders !== "object" || modelProviders === null) {
+      return false;
+    }
+    return Object.values(modelProviders).some((v) => Array.isArray(v));
+  }
+  migrate(settings, _scope) {
+    if (typeof settings !== "object" || settings === null) {
+      throw new Error("Settings must be an object");
+    }
+    const result = structuredClone(settings);
+    const warnings = [];
+    const modelProviders = result["modelProviders"];
+    if (typeof modelProviders === "object" && modelProviders !== null) {
+      const providers = modelProviders;
+      for (const [key, value] of Object.entries(providers)) {
+        if (!Array.isArray(value)) {
+          continue;
+        }
+        if (!Object.hasOwn(PROVIDER_KEY_TO_PROTOCOL, key)) {
+          warnings.push(
+            `Unknown provider key "${key}", defaulting protocol to "openai". If this provider uses a different protocol (anthropic, gemini), edit settings.json to set "protocol" explicitly.`
+          );
+        }
+        providers[key] = {
+          protocol: Object.hasOwn(PROVIDER_KEY_TO_PROTOCOL, key) ? PROVIDER_KEY_TO_PROTOCOL[key] : "openai",
+          models: value
+        };
+      }
+    }
+    result["$version"] = 5;
+    return { settings: result, warnings };
+  }
+};
+var v4ToV5Migration = new V4ToV5Migration();
+
 // packages/cli/src/config/migration/index.ts
 var ALL_MIGRATIONS = [
   v1ToV2Migration,
   v2ToV3Migration,
-  v3ToV4Migration
+  v3ToV4Migration,
+  v4ToV5Migration
 ];
 function runMigrations(settings, scope) {
   const scheduler = new MigrationScheduler([...ALL_MIGRATIONS], scope);
@@ -18964,7 +19250,7 @@ var dotEnvSourcedKeys = /* @__PURE__ */ new Set();
 var settingsEnvSourcedKeys = /* @__PURE__ */ new Set();
 var lastReloadSnapshot = /* @__PURE__ */ new Map();
 var lastReloadSnapshotSeeded = false;
-var SETTINGS_VERSION = 4;
+var SETTINGS_VERSION = 5;
 var SETTINGS_VERSION_KEY = "$version";
 function getSystemSettingsPath() {
   if (process2.env["QWEN_CODE_SYSTEM_SETTINGS_PATH"]) {
@@ -19045,9 +19331,16 @@ function hasAnyProviderEntries(modelProviders) {
   if (!isPlainObject2(modelProviders)) {
     return false;
   }
-  return Object.values(modelProviders).some(
-    (providerModels) => Array.isArray(providerModels) && providerModels.length > 0
-  );
+  return Object.values(modelProviders).some((providerModels) => {
+    if (Array.isArray(providerModels)) {
+      return providerModels.length > 0;
+    }
+    if (isPlainObject2(providerModels)) {
+      const models = providerModels["models"];
+      return Array.isArray(models) && models.length > 0;
+    }
+    return false;
+  });
 }
 __name(hasAnyProviderEntries, "hasAnyProviderEntries");
 function getModelProvidersOverrideWarnings(loadedSettings) {
@@ -20077,7 +20370,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.18.5";
+  return "0.19.0";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -20222,6 +20515,242 @@ function createLoadedSettingsAdapter(settings, scope) {
 }
 __name(createLoadedSettingsAdapter, "createLoadedSettingsAdapter");
 
+// packages/cli/src/utils/acpModelUtils.ts
+init_esbuild_shims();
+function formatAcpModelId(modelId, authType) {
+  return `${modelId}(${authType})`;
+}
+__name(formatAcpModelId, "formatAcpModelId");
+function sanitizeProviderBaseUrl(baseUrl) {
+  const scheme = baseUrl.match(/^[A-Za-z][A-Za-z\d+.-]*:\/\//);
+  if (!scheme) {
+    return baseUrl;
+  }
+  const authorityStart = scheme[0].length;
+  const stripAt = /* @__PURE__ */ __name((at) => `${baseUrl.slice(0, authorityStart)}${baseUrl.slice(at + 1)}`, "stripAt");
+  const authorityEnd = findAuthorityEnd(baseUrl, authorityStart);
+  const authorityAt = baseUrl.slice(authorityStart, authorityEnd).lastIndexOf("@");
+  const authorityAtIndex = authorityAt === -1 ? -1 : authorityStart + authorityAt;
+  try {
+    const parsed = new URL(baseUrl);
+    if (parsed.username || parsed.password) {
+      return authorityAtIndex >= authorityStart ? stripAt(authorityAtIndex) : baseUrl;
+    }
+    return baseUrl;
+  } catch {
+    if (authorityAtIndex >= authorityStart) {
+      return stripAt(authorityAtIndex);
+    }
+    const fallbackAt = findUnescapedUserInfoFallbackAt(
+      baseUrl,
+      authorityStart,
+      authorityEnd
+    );
+    return fallbackAt === -1 ? baseUrl : stripAt(fallbackAt);
+  }
+}
+__name(sanitizeProviderBaseUrl, "sanitizeProviderBaseUrl");
+function findUnescapedUserInfoFallbackAt(baseUrl, authorityStart, authorityEnd) {
+  const at = baseUrl.lastIndexOf("@");
+  if (at < authorityStart || authorityEnd >= at) {
+    return -1;
+  }
+  const colon = baseUrl.indexOf(":", authorityStart);
+  if (colon === -1 || colon > authorityEnd) {
+    return -1;
+  }
+  const portCandidate = baseUrl.slice(colon + 1, authorityEnd);
+  return /^\d+$/.test(portCandidate) ? -1 : at;
+}
+__name(findUnescapedUserInfoFallbackAt, "findUnescapedUserInfoFallbackAt");
+function findAuthorityEnd(baseUrl, authorityStart) {
+  const slash = baseUrl.indexOf("/", authorityStart);
+  const query = baseUrl.indexOf("?", authorityStart);
+  const hash = baseUrl.indexOf("#", authorityStart);
+  let end = baseUrl.length;
+  if (slash !== -1) end = Math.min(end, slash);
+  if (query !== -1) end = Math.min(end, query);
+  if (hash !== -1) end = Math.min(end, hash);
+  return end;
+}
+__name(findAuthorityEnd, "findAuthorityEnd");
+function parseAcpBaseModelId(value) {
+  const trimmed = value.trim();
+  const closeIdx = trimmed.lastIndexOf(")");
+  const openIdx = trimmed.lastIndexOf("(");
+  if (openIdx >= 0 && closeIdx === trimmed.length - 1 && openIdx < closeIdx) {
+    return trimmed.slice(0, openIdx);
+  }
+  return trimmed;
+}
+__name(parseAcpBaseModelId, "parseAcpBaseModelId");
+function parseAcpModelOption(input) {
+  const trimmed = input.trim();
+  const closeIdx = trimmed.lastIndexOf(")");
+  const openIdx = trimmed.lastIndexOf("(");
+  if (openIdx >= 0 && closeIdx === trimmed.length - 1 && openIdx < closeIdx) {
+    const maybeModelId = trimmed.slice(0, openIdx);
+    const maybeAuthType = trimmed.slice(openIdx + 1, closeIdx);
+    if (maybeAuthType) {
+      return { modelId: maybeModelId, authType: maybeAuthType };
+    }
+  }
+  return { modelId: trimmed };
+}
+__name(parseAcpModelOption, "parseAcpModelOption");
+
+// packages/cli/src/utils/modelConfigUtils.ts
+init_esbuild_shims();
+var AUTH_ENV_MODEL_VARS = {
+  [AuthType.USE_OPENAI]: ["OPENAI_MODEL", "QWEN_MODEL"],
+  [AuthType.USE_GEMINI]: ["GEMINI_MODEL"],
+  [AuthType.USE_VERTEX_AI]: ["GOOGLE_MODEL"],
+  [AuthType.USE_ANTHROPIC]: ["ANTHROPIC_MODEL"],
+  [AuthType.QWEN_OAUTH]: []
+};
+function getIgnoredTopLevelGenerationConfigFields(settingsGenerationConfig, modelProvider) {
+  if (!settingsGenerationConfig || !modelProvider) {
+    return [];
+  }
+  const providerGenerationConfig = modelProvider.generationConfig ?? {};
+  return MODEL_GENERATION_CONFIG_FIELDS.filter(
+    (field) => Object.hasOwn(settingsGenerationConfig, field) && !Object.hasOwn(providerGenerationConfig, field)
+  );
+}
+__name(getIgnoredTopLevelGenerationConfigFields, "getIgnoredTopLevelGenerationConfigFields");
+function buildIgnoredTopLevelGenerationConfigWarning(authType, modelProvider, ignoredFields) {
+  if (ignoredFields.length === 0) {
+    return void 0;
+  }
+  const fieldList = ignoredFields.map((field) => `model.generationConfig.${field}`).join(", ");
+  const isSingular = ignoredFields.length === 1;
+  const verb = isSingular ? "is" : "are";
+  const fieldReference = isSingular ? "this field" : "these fields";
+  const pronoun = isSingular ? "it" : "them";
+  return `Warning: ${fieldList} ${verb} ignored for provider model "${modelProvider.id}" from modelProviders.${authType}. Move ${fieldReference} to modelProviders.${authType}[].generationConfig for that model if you want ${pronoun} to apply.`;
+}
+__name(buildIgnoredTopLevelGenerationConfigWarning, "buildIgnoredTopLevelGenerationConfigWarning");
+function getAuthTypeFromEnv() {
+  if (process.env["QWEN_OAUTH"]) {
+    return AuthType.QWEN_OAUTH;
+  }
+  if (process.env["OPENAI_API_KEY"] && (process.env["OPENAI_MODEL"] || process.env["QWEN_MODEL"]) && process.env["OPENAI_BASE_URL"]) {
+    return AuthType.USE_OPENAI;
+  }
+  if (process.env["GEMINI_API_KEY"] && process.env["GEMINI_MODEL"]) {
+    return AuthType.USE_GEMINI;
+  }
+  if (process.env["GOOGLE_API_KEY"] && process.env["GOOGLE_MODEL"]) {
+    return AuthType.USE_VERTEX_AI;
+  }
+  if (process.env["ANTHROPIC_API_KEY"] && process.env["ANTHROPIC_MODEL"] && process.env["ANTHROPIC_BASE_URL"]) {
+    return AuthType.USE_ANTHROPIC;
+  }
+  return void 0;
+}
+__name(getAuthTypeFromEnv, "getAuthTypeFromEnv");
+function resolveCliGenerationConfig(inputs) {
+  const { argv, settings, selectedAuthType } = inputs;
+  const env = inputs.env ?? process.env;
+  const authType = selectedAuthType;
+  let resolvedModel;
+  let sourceEnvVar;
+  let resolvedFromSettings = false;
+  if (argv.model) {
+    resolvedModel = argv.model;
+  } else if (settings.model?.name) {
+    resolvedModel = stripRuntimeSnapshotPrefix(settings.model.name);
+    resolvedFromSettings = true;
+  } else if (authType && AUTH_ENV_MODEL_VARS[authType]) {
+    for (const envVar of AUTH_ENV_MODEL_VARS[authType]) {
+      if (env[envVar]) {
+        resolvedModel = env[envVar];
+        sourceEnvVar = envVar;
+        break;
+      }
+    }
+  }
+  let modelProvider;
+  let disambiguationWarning;
+  if (resolvedModel && authType && settings.modelProviders) {
+    const providerConfig = settings.modelProviders[authType];
+    if (providerConfig && providerConfig.models) {
+      const providers = providerConfig.models;
+      const persistedBaseUrl = settings.model?.baseUrl;
+      if (resolvedFromSettings && persistedBaseUrl) {
+        const exactMatch = providers.find(
+          (p) => p.id === resolvedModel && p.baseUrl === persistedBaseUrl
+        );
+        modelProvider = exactMatch ?? providers.find((p) => p.id === resolvedModel);
+        if (!exactMatch && modelProvider) {
+          const fallbackBaseUrl = modelProvider.baseUrl === void 0 ? "(default baseUrl)" : sanitizeProviderBaseUrl(modelProvider.baseUrl);
+          disambiguationWarning = `Persisted model.baseUrl '${sanitizeProviderBaseUrl(persistedBaseUrl)}' no longer matches any provider for model '${resolvedModel}' (authType '${authType}'); using the first id match ('${fallbackBaseUrl}'). Re-select the model to update it.`;
+        }
+      } else {
+        modelProvider = providers.find((p) => p.id === resolvedModel);
+      }
+    }
+  }
+  const allModelEnvVars = Object.values(AUTH_ENV_MODEL_VARS).flat();
+  const filteredEnv = { ...env };
+  if (sourceEnvVar) {
+    for (const envVar of allModelEnvVars) {
+      if (envVar !== sourceEnvVar) {
+        delete filteredEnv[envVar];
+      }
+    }
+  } else {
+    for (const envVar of allModelEnvVars) {
+      delete filteredEnv[envVar];
+    }
+  }
+  const configSources = {
+    authType,
+    cli: {
+      model: argv.model,
+      apiKey: argv.openaiApiKey,
+      baseUrl: argv.openaiBaseUrl
+    },
+    settings: {
+      model: settings.model?.name ? stripRuntimeSnapshotPrefix(settings.model.name) : void 0,
+      apiKey: settings.security?.auth?.apiKey,
+      baseUrl: settings.security?.auth?.baseUrl,
+      generationConfig: settings.model?.generationConfig
+    },
+    modelProvider,
+    env: filteredEnv
+  };
+  const resolved = resolveModelConfig(configSources);
+  const ignoredGenerationConfigWarning = authType && modelProvider ? buildIgnoredTopLevelGenerationConfigWarning(
+    authType,
+    modelProvider,
+    getIgnoredTopLevelGenerationConfigFields(
+      settings.model?.generationConfig,
+      modelProvider
+    )
+  ) : void 0;
+  const enableOpenAILogging = (typeof argv.openaiLogging === "undefined" ? settings.model?.enableOpenAILogging : argv.openaiLogging) ?? false;
+  const openAILoggingDir = argv.openaiLoggingDir || settings.model?.openAILoggingDir;
+  const generationConfig = {
+    ...resolved.config,
+    enableOpenAILogging,
+    openAILoggingDir
+  };
+  return {
+    model: resolved.config.model || "",
+    apiKey: resolved.config.apiKey || "",
+    baseUrl: resolved.config.baseUrl || "",
+    generationConfig,
+    sources: resolved.sources,
+    warnings: [
+      ...resolved.warnings,
+      ...disambiguationWarning ? [disambiguationWarning] : [],
+      ...ignoredGenerationConfigWarning ? [ignoredGenerationConfigWarning] : []
+    ]
+  };
+}
+__name(resolveCliGenerationConfig, "resolveCliGenerationConfig");
+
 // packages/acp-bridge/src/bridgeTypes.ts
 init_esbuild_shims();
 var MID_TURN_QUEUE_DRAIN_METHOD = "craft/drainMidTurnQueue";
@@ -20234,7 +20763,7 @@ import { execFile } from "node:child_process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "2937b09cf";
+var GIT_COMMIT_INFO = "fc883d958";
 
 // packages/cli/src/utils/systemInfo.ts
 var debugLogger4 = createDebugLogger("STATUS");
@@ -20324,7 +20853,7 @@ async function getExtendedSystemInfo(context) {
   const baseInfo = await getSystemInfo(context);
   const memoryUsage = formatMemoryUsage(process4.memoryUsage().rss);
   const sandboxEnv = getSandboxEnv(true);
-  const contentGeneratorConfig = baseInfo.selectedAuthType === "openai" /* USE_OPENAI */ || baseInfo.selectedAuthType === "anthropic" /* USE_ANTHROPIC */ ? context.services.config?.getContentGeneratorConfig() : void 0;
+  const contentGeneratorConfig = baseInfo.selectedAuthType === AuthType.USE_OPENAI || baseInfo.selectedAuthType === AuthType.USE_ANTHROPIC ? context.services.config?.getContentGeneratorConfig() : void 0;
   const baseUrl = contentGeneratorConfig?.baseUrl;
   const apiKeyEnvKey = contentGeneratorConfig?.apiKeyEnvKey;
   const gitCommit = GIT_COMMIT_INFO && !["N/A"].includes(GIT_COMMIT_INFO) ? GIT_COMMIT_INFO : void 0;
@@ -20438,6 +20967,12 @@ export {
   reloadEnvironment,
   CORRUPTED_SUFFIX,
   loadSettings,
+  formatAcpModelId,
+  sanitizeProviderBaseUrl,
+  parseAcpBaseModelId,
+  parseAcpModelOption,
+  getAuthTypeFromEnv,
+  resolveCliGenerationConfig,
   require_debug,
   require_constants,
   require_re,