@qwen-code/qwen-code 0.19.0 → 0.19.1-nightly.20260624.a234860a4

package/cli.js

@@ -7,7 +7,7 @@ import {
   formatContextUsageText,
   isTerminalGoalStatusKind,
   require_react
-} from "./chunks/chunk-GAAALA2X.js";
+} from "./chunks/chunk-C4JC2FL3.js";
 import {
   noteInteraction
 } from "./chunks/chunk-MRO43B25.js";
@@ -104,12 +104,10 @@ import {
   setPendingSettingValue,
   setPendingSettingValueAny,
   settingExistsInScope,
-  subtleBandColor,
-  supportsTrueColor,
   updateOutputLanguageFile,
   validateCustomTheme,
   writeOutputLanguageAndRegisterPath
-} from "./chunks/chunk-KFR4QTV3.js";
+} from "./chunks/chunk-54J4JDWT.js";
 import {
   SUPPORTED_LANGUAGES,
   clearScreen,
@@ -125,7 +123,7 @@ import {
   ta,
   writeStderrLine,
   writeStdoutLine
-} from "./chunks/chunk-VRIVIYRL.js";
+} from "./chunks/chunk-TKXRLRTF.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -272,6 +270,7 @@ import {
   getTimeRangeBounds,
   getWelcomeBackState,
   glob,
+  hasImageParts,
   hashMcpServerConfig,
   hookEventSupportsMatcher,
   ideContextStore,
@@ -331,6 +330,7 @@ import {
   resolveOwnsModel,
   restoreWorktreeContext,
   runForkedAgent,
+  runVisionBridge,
   saveWelcomeBackRestartChoice,
   saveWorkflowScript,
   sessionIdContext,
@@ -342,7 +342,9 @@ import {
   shouldFirePermissionDeniedForAutoMode,
   shouldForceAutoModeReviewForAllow,
   shouldRunAutoModeForCall,
+  shouldRunVisionBridge,
   shouldShowStep,
+  splitImageParts,
   startSpeculation,
   stripAnsi,
   stripStartupContext,
@@ -358,7 +360,7 @@ import {
   writeRuntimeStatus,
   writeWorktreeSession,
   writeWorktreeSessionMarker
-} from "./chunks/chunk-YF3ORUIU.js";
+} from "./chunks/chunk-7QBKO4A6.js";
 import {
   external_exports
 } from "./chunks/chunk-K5PGHDBN.js";
@@ -369,8 +371,8 @@ import {
 } from "./chunks/chunk-2BIF2NVV.js";
 import {
   runSideQuery
-} from "./chunks/chunk-57XRIZVC.js";
-import "./chunks/chunk-255L5QYW.js";
+} from "./chunks/chunk-NWLUISRA.js";
+import "./chunks/chunk-3BR4OIOE.js";
 import "./chunks/chunk-2MPVVENX.js";
 import "./chunks/chunk-ZTQ26VBE.js";
 import "./chunks/chunk-GZCJS5WH.js";
@@ -445,7 +447,7 @@ import {
   startToolSpan,
   uiTelemetryService,
   withInteractionSpan
-} from "./chunks/chunk-CICUTYTF.js";
+} from "./chunks/chunk-HNYTRFAM.js";
 import "./chunks/chunk-3PJXIDKI.js";
 import "./chunks/chunk-UWCTAVOD.js";
 import {
@@ -460,13 +462,13 @@ import {
   isAnyAutoMemPath
 } from "./chunks/chunk-BNXANYLH.js";
 import "./chunks/chunk-T2VDEFUU.js";
-import "./chunks/chunk-PO5LVPK3.js";
+import "./chunks/chunk-2QDQTWCI.js";
 import {
   SchemaValidator,
   ToolConfirmationOutcome,
   ToolDisplayNames,
   ToolNames
-} from "./chunks/chunk-PLY4F7QW.js";
+} from "./chunks/chunk-L7U2RI5O.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
@@ -489,7 +491,7 @@ import {
   isSupportedImageMimeType,
   redactProxyCredentials,
   tokenLimit
-} from "./chunks/chunk-JDV3VBPY.js";
+} from "./chunks/chunk-F6XNTYNE.js";
 import "./chunks/chunk-CGEGHF2C.js";
 import "./chunks/chunk-EJYJYJZ2.js";
 import {
@@ -11474,14 +11476,14 @@ var require_templates = __commonJS({
       return results;
     }
     __name(parseStyle, "parseStyle");
-    function buildStyle(chalk10, styles10) {
+    function buildStyle(chalk6, styles10) {
       const enabled2 = {};
       for (const layer of styles10) {
         for (const style of layer.styles) {
           enabled2[style[0]] = layer.inverse ? null : style.slice(1);
         }
       }
-      let current = chalk10;
+      let current = chalk6;
       for (const [styleName, styles11] of Object.entries(enabled2)) {
         if (!Array.isArray(styles11)) {
           continue;
@@ -11494,7 +11496,7 @@ var require_templates = __commonJS({
       return current;
     }
     __name(buildStyle, "buildStyle");
-    module.exports = (chalk10, temporary) => {
+    module.exports = (chalk6, temporary) => {
       const styles10 = [];
       const chunks = [];
       let chunk = [];
@@ -11504,13 +11506,13 @@ var require_templates = __commonJS({
         } else if (style) {
           const string = chunk.join("");
           chunk = [];
-          chunks.push(styles10.length === 0 ? string : buildStyle(chalk10, styles10)(string));
+          chunks.push(styles10.length === 0 ? string : buildStyle(chalk6, styles10)(string));
           styles10.push({ inverse, styles: parseStyle(style) });
         } else if (close) {
           if (styles10.length === 0) {
             throw new Error("Found extraneous } in Chalk template literal");
           }
-          chunks.push(buildStyle(chalk10, styles10)(chunk.join("")));
+          chunks.push(buildStyle(chalk6, styles10)(chunk.join("")));
           chunk = [];
           styles10.pop();
         } else {
@@ -11562,16 +11564,16 @@ var require_source = __commonJS({
       }
     };
     var chalkFactory3 = /* @__PURE__ */ __name((options) => {
-      const chalk11 = {};
-      applyOptions3(chalk11, options);
-      chalk11.template = (...arguments_) => chalkTag(chalk11.template, ...arguments_);
-      Object.setPrototypeOf(chalk11, Chalk.prototype);
-      Object.setPrototypeOf(chalk11.template, chalk11);
-      chalk11.template.constructor = () => {
+      const chalk7 = {};
+      applyOptions3(chalk7, options);
+      chalk7.template = (...arguments_) => chalkTag(chalk7.template, ...arguments_);
+      Object.setPrototypeOf(chalk7, Chalk.prototype);
+      Object.setPrototypeOf(chalk7.template, chalk7);
+      chalk7.template.constructor = () => {
         throw new Error("`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.");
       };
-      chalk11.template.Instance = ChalkClass;
-      return chalk11.template;
+      chalk7.template.Instance = ChalkClass;
+      return chalk7.template;
     }, "chalkFactory");
     function Chalk(options) {
       return chalkFactory3(options);
@@ -11683,7 +11685,7 @@ var require_source = __commonJS({
       return openAll + string + closeAll;
     }, "applyStyle");
     var template;
-    var chalkTag = /* @__PURE__ */ __name((chalk11, ...strings) => {
+    var chalkTag = /* @__PURE__ */ __name((chalk7, ...strings) => {
       const [firstString] = strings;
       if (!isArray(firstString) || !isArray(firstString.raw)) {
         return strings.join(" ");
@@ -11699,14 +11701,14 @@ var require_source = __commonJS({
       if (template === void 0) {
         template = require_templates();
       }
-      return template(chalk11, parts.join(""));
+      return template(chalk7, parts.join(""));
     }, "chalkTag");
     Object.defineProperties(Chalk.prototype, styles10);
-    var chalk10 = Chalk();
-    chalk10.supportsColor = stdoutColor3;
-    chalk10.stderr = Chalk({ level: stderrColor3 ? stderrColor3.level : 0 });
-    chalk10.stderr.supportsColor = stderrColor3;
-    module.exports = chalk10;
+    var chalk6 = Chalk();
+    chalk6.supportsColor = stdoutColor3;
+    chalk6.stderr = Chalk({ level: stderrColor3 ? stderrColor3.level : 0 });
+    chalk6.stderr.supportsColor = stderrColor3;
+    module.exports = chalk6;
   }
 });
 
@@ -32908,7 +32910,7 @@ var require_tinycolor = __commonJS({
           var h = Math.round(hsl.h * 360), s = Math.round(hsl.s * 100), l = Math.round(hsl.l * 100);
           return this._a == 1 ? "hsl(" + h + ", " + s + "%, " + l + "%)" : "hsla(" + h + ", " + s + "%, " + l + "%, " + this._roundA + ")";
         }, "toHslString"),
-        toHex: /* @__PURE__ */ __name(function toHex(allow3Char) {
+        toHex: /* @__PURE__ */ __name(function toHex2(allow3Char) {
           return rgbToHex(this._r, this._g, this._b, allow3Char);
         }, "toHex"),
         toHexString: /* @__PURE__ */ __name(function toHexString(allow3Char) {
@@ -34128,7 +34130,7 @@ var require_gradient_string = __commonJS({
   "node_modules/gradient-string/index.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var chalk10 = require_source();
+    var chalk6 = require_source();
     var tinygradient = require_tinygradient();
     var forbiddenChars = /\s/g;
     function InitGradient(...args) {
@@ -34145,7 +34147,7 @@ var require_gradient_string = __commonJS({
       const colors = getColors(gradient, options, colorsCount);
       let result = "";
       for (const s of str) {
-        result += s.match(forbiddenChars) ? s : chalk10.hex(colors.shift().toHex())(s);
+        result += s.match(forbiddenChars) ? s : chalk6.hex(colors.shift().toHex())(s);
       }
       return result;
     }
@@ -34160,7 +34162,7 @@ var require_gradient_string = __commonJS({
         const lineColors = colors.slice(0);
         let lineResult = "";
         for (const l of line) {
-          lineResult += chalk10.hex(lineColors.shift().toHex())(l);
+          lineResult += chalk6.hex(lineColors.shift().toHex())(l);
         }
         results.push(lineResult);
       }
@@ -45297,10 +45299,10 @@ var applyOptions = /* @__PURE__ */ __name((object, options = {}) => {
   object.level = options.level === void 0 ? colorLevel : options.level;
 }, "applyOptions");
 var chalkFactory = /* @__PURE__ */ __name((options) => {
-  const chalk10 = /* @__PURE__ */ __name((...strings) => strings.join(" "), "chalk");
-  applyOptions(chalk10, options);
-  Object.setPrototypeOf(chalk10, createChalk.prototype);
-  return chalk10;
+  const chalk6 = /* @__PURE__ */ __name((...strings) => strings.join(" "), "chalk");
+  applyOptions(chalk6, options);
+  Object.setPrototypeOf(chalk6, createChalk.prototype);
+  return chalk6;
 }, "chalkFactory");
 function createChalk(options) {
   return chalkFactory(options);
@@ -48770,6 +48772,21 @@ var use_is_screen_reader_enabled_default = useIsScreenReaderEnabled;
 // node_modules/ink/build/hooks/use-cursor.js
 init_esbuild_shims();
 var import_react30 = __toESM(require_react(), 1);
+var useCursor = /* @__PURE__ */ __name(() => {
+  const context = (0, import_react30.useContext)(CursorContext_default);
+  const positionRef = (0, import_react30.useRef)(void 0);
+  const setCursorPosition = (0, import_react30.useCallback)((position) => {
+    positionRef.current = position;
+  }, []);
+  (0, import_react30.useInsertionEffect)(() => {
+    context.setCursorPosition(positionRef.current);
+    return () => {
+      context.setCursorPosition(void 0);
+    };
+  });
+  return { setCursorPosition };
+}, "useCursor");
+var use_cursor_default = useCursor;
 
 // node_modules/ink/build/hooks/use-animation.js
 init_esbuild_shims();
@@ -48848,18 +48865,17 @@ import v83 from "node:v8";
 // packages/cli/src/config/auth.ts
 init_esbuild_shims();
 var DEFAULT_ENV_KEYS = {
-  [AuthType.USE_OPENAI]: "OPENAI_API_KEY",
-  [AuthType.USE_ANTHROPIC]: "ANTHROPIC_API_KEY",
-  [AuthType.USE_GEMINI]: "GEMINI_API_KEY",
-  [AuthType.USE_VERTEX_AI]: "GOOGLE_API_KEY"
+  ["openai" /* USE_OPENAI */]: "OPENAI_API_KEY",
+  ["anthropic" /* USE_ANTHROPIC */]: "ANTHROPIC_API_KEY",
+  ["gemini" /* USE_GEMINI */]: "GEMINI_API_KEY",
+  ["vertex-ai" /* USE_VERTEX_AI */]: "GOOGLE_API_KEY"
 };
 function findModelConfig(modelProviders, authType, modelId, baseUrl) {
   if (!modelProviders || !modelId) {
     return void 0;
   }
-  const entry = modelProviders[authType];
-  const models = Array.isArray(entry) ? entry : typeof entry === "object" && entry !== null && Array.isArray(entry.models) ? entry.models : void 0;
-  if (!models) {
+  const models = modelProviders[authType];
+  if (!Array.isArray(models)) {
     return void 0;
   }
   if (baseUrl) {
@@ -48965,7 +48981,7 @@ __name(getApiKeyError, "getApiKeyError");
 function validateAuthMethod(authMethod, config) {
   const settings = loadSettings(process.cwd(), false);
   loadEnvironment(settings.merged);
-  if (authMethod === AuthType.USE_OPENAI) {
+  if (authMethod === "openai" /* USE_OPENAI */) {
     const { hasKey, checkedEnvKey, isExplicitEnvKey } = hasApiKeyForAuth(
       authMethod,
       settings.merged,
@@ -48986,12 +49002,12 @@ function validateAuthMethod(authMethod, config) {
     }
     return null;
   }
-  if (authMethod === AuthType.QWEN_OAUTH) {
+  if (authMethod === "qwen-oauth" /* QWEN_OAUTH */) {
     return t(
       "Qwen OAuth free tier was discontinued on 2026-04-15. Run /auth to switch to Coding Plan, OpenRouter, Fireworks AI, or another provider."
     );
   }
-  if (authMethod === AuthType.USE_ANTHROPIC) {
+  if (authMethod === "anthropic" /* USE_ANTHROPIC */) {
     const apiKeyError = getApiKeyError(authMethod, settings.merged, config);
     if (apiKeyError) {
       return apiKeyError;
@@ -49014,14 +49030,14 @@ function validateAuthMethod(authMethod, config) {
     }
     return null;
   }
-  if (authMethod === AuthType.USE_GEMINI) {
+  if (authMethod === "gemini" /* USE_GEMINI */) {
     const apiKeyError = getApiKeyError(authMethod, settings.merged, config);
     if (apiKeyError) {
       return apiKeyError;
     }
     return null;
   }
-  if (authMethod === AuthType.USE_VERTEX_AI) {
+  if (authMethod === "vertex-ai" /* USE_VERTEX_AI */) {
     const apiKeyError = getApiKeyError(authMethod, settings.merged, config);
     if (apiKeyError) {
       return apiKeyError;
@@ -49277,7 +49293,9 @@ function extensionConsentString(extensionConfig, commands = [], skills = [], sub
   }
   const mcpServerEntries = Object.entries(extensionConfig.mcpServers || {});
   const displayLabel = extensionConfig.displayName ?? extensionConfig.name;
-  output.push(t('Installing extension "{{name}}".', { name: displayLabel }));
+  output.push(
+    t('Installing extension "{{name}}".', { name: displayLabel })
+  );
   if (typeof extensionConfig.description === "string" && extensionConfig.description) {
     output.push(stripAnsi(extensionConfig.description));
   }
@@ -49584,6 +49602,30 @@ async function getExtensionManager() {
   return extensionManager;
 }
 __name(getExtensionManager, "getExtensionManager");
+var EXTENSION_COMMAND_SCOPES = ["User" /* User */, "Workspace" /* Workspace */];
+function extensionCommandScopesList() {
+  return EXTENSION_COMMAND_SCOPES.map((s) => s.toLowerCase()).join(", ");
+}
+__name(extensionCommandScopesList, "extensionCommandScopesList");
+function resolveExtensionCommandScope(scope) {
+  if (!scope) {
+    return "User" /* User */;
+  }
+  const normalized = scope.toLowerCase();
+  const matched = EXTENSION_COMMAND_SCOPES.find(
+    (candidate) => candidate.toLowerCase() === normalized
+  );
+  if (matched) {
+    return matched;
+  }
+  throw new Error(
+    t("Invalid scope: {{scope}}. Please use one of {{scopes}}.", {
+      scope,
+      scopes: extensionCommandScopesList()
+    })
+  );
+}
+__name(resolveExtensionCommandScope, "resolveExtensionCommandScope");
 function extensionToOutputString(extension, extensionManager, workspaceDir, inline = false) {
   const cwd5 = workspaceDir;
   const userEnabled = extensionManager.isEnabled(
@@ -54922,11 +54964,8 @@ var yargs_default = Yargs;
 async function handleDisable(args) {
   const extensionManager = await getExtensionManager();
   try {
-    if (args.scope?.toLowerCase() === "workspace") {
-      extensionManager.disableExtension(args.name, "Workspace" /* Workspace */);
-    } else {
-      extensionManager.disableExtension(args.name, "User" /* User */);
-    }
+    const scope = resolveExtensionCommandScope(args.scope);
+    await extensionManager.disableExtension(args.name, scope);
     writeStdoutLine(
       t('Extension "{{name}}" successfully disabled for scope "{{scope}}".', {
         name: args.name,
@@ -54950,14 +54989,7 @@ var disableCommand = {
     type: "string",
     default: "User" /* User */
   }).check((argv) => {
-    if (argv.scope && !Object.values(SettingScope).map((s) => s.toLowerCase()).includes(argv.scope.toLowerCase())) {
-      throw new Error(
-        t("Invalid scope: {{scope}}. Please use one of {{scopes}}.", {
-          scope: argv.scope,
-          scopes: Object.values(SettingScope).map((s) => s.toLowerCase()).join(", ")
-        })
-      );
-    }
+    resolveExtensionCommandScope(argv.scope);
     return true;
   }), "builder"),
   handler: /* @__PURE__ */ __name(async (argv) => {
@@ -54973,11 +55005,8 @@ init_esbuild_shims();
 async function handleEnable(args) {
   const extensionManager = await getExtensionManager();
   try {
-    if (args.scope?.toLowerCase() === "workspace") {
-      extensionManager.enableExtension(args.name, "Workspace" /* Workspace */);
-    } else {
-      extensionManager.enableExtension(args.name, "User" /* User */);
-    }
+    const scope = resolveExtensionCommandScope(args.scope);
+    await extensionManager.enableExtension(args.name, scope);
     if (args.scope) {
       writeStdoutLine(
         t('Extension "{{name}}" successfully enabled for scope "{{scope}}".', {
@@ -55009,14 +55038,7 @@ var enableCommand = {
     ),
     type: "string"
   }).check((argv) => {
-    if (argv.scope && !Object.values(SettingScope).map((s) => s.toLowerCase()).includes(argv.scope.toLowerCase())) {
-      throw new Error(
-        t("Invalid scope: {{scope}}. Please use one of {{scopes}}.", {
-          scope: argv.scope,
-          scopes: Object.values(SettingScope).map((s) => s.toLowerCase()).join(", ")
-        })
-      );
-    }
+    resolveExtensionCommandScope(argv.scope);
     return true;
   }), "builder"),
   handler: /* @__PURE__ */ __name(async (argv) => {
@@ -56536,6 +56558,19 @@ function findCliEntryPath() {
   throw new Error("Cannot determine CLI entry path");
 }
 __name(findCliEntryPath, "findCliEntryPath");
+function resolveOptionalStringField(channelName, rawConfig, field) {
+  const value = rawConfig[field];
+  if (value === void 0 || value === null || value === "") {
+    return void 0;
+  }
+  if (typeof value !== "string") {
+    throw new Error(
+      `Channel "${channelName}" field "${field}" must be a string.`
+    );
+  }
+  return resolveEnvVars(value);
+}
+__name(resolveOptionalStringField, "resolveOptionalStringField");
 async function parseChannelConfig(name, rawConfig) {
   if (!rawConfig["type"]) {
     throw new Error(`Channel "${name}" is missing required field "type".`);
@@ -56549,15 +56584,20 @@ async function parseChannelConfig(name, rawConfig) {
     );
   }
   for (const field of plugin.requiredConfigFields ?? []) {
-    if (!rawConfig[field]) {
+    const value = rawConfig[field];
+    if (value === void 0 || value === null || value === "") {
       throw new Error(
         `Channel "${name}" (${channelType}) requires "${field}".`
       );
     }
   }
-  const token = rawConfig["token"] ? resolveEnvVars(rawConfig["token"]) : "";
-  const clientId = rawConfig["clientId"] ? resolveEnvVars(rawConfig["clientId"]) : void 0;
-  const clientSecret = rawConfig["clientSecret"] ? resolveEnvVars(rawConfig["clientSecret"]) : void 0;
+  const token = resolveOptionalStringField(name, rawConfig, "token") ?? "";
+  const clientId = resolveOptionalStringField(name, rawConfig, "clientId");
+  const clientSecret = resolveOptionalStringField(
+    name,
+    rawConfig,
+    "clientSecret"
+  );
   return {
     ...rawConfig,
     type: channelType,
@@ -58798,6 +58838,10 @@ var serveCommand = {
     type: "boolean",
     default: false,
     description: "Enable direct POST /session/:id/shell execution. Requires a bearer token and a session-bound client id on each call."
+  }).option("experimental-lsp", {
+    type: "boolean",
+    default: false,
+    description: "Forward the experimental LSP opt-in to spawned agent sessions."
   }).option("web", {
     type: "boolean",
     default: true,
@@ -58951,7 +58995,7 @@ var serveCommand = {
         process.exit(1);
       }
     }
-    const { runQwenServe } = await import("./chunks/serve-ZBRCIIHW.js");
+    const { runQwenServe } = await import("./chunks/serve-P356SCA2.js");
     try {
       const handle = await runQwenServe({
         port: argv.port,
@@ -58982,7 +59026,8 @@ var serveCommand = {
         ...rateLimitPrompt !== void 0 ? { rateLimitPrompt } : {},
         ...rateLimitMutation !== void 0 ? { rateLimitMutation } : {},
         ...rateLimitRead !== void 0 ? { rateLimitRead } : {},
-        ...rateLimitWindowMs !== void 0 ? { rateLimitWindowMs } : {}
+        ...rateLimitWindowMs !== void 0 ? { rateLimitWindowMs } : {},
+        ...argv.experimentalLsp === true ? { experimentalLsp: true } : {}
       });
       await maybeOpenWebShellBrowser(handle, argv.open);
     } catch (err) {
@@ -60057,11 +60102,11 @@ async function parseArguments() {
     }).option("auth-type", {
       type: "string",
       choices: [
-        AuthType.USE_OPENAI,
-        AuthType.USE_ANTHROPIC,
-        AuthType.QWEN_OAUTH,
-        AuthType.USE_GEMINI,
-        AuthType.USE_VERTEX_AI
+        "openai" /* USE_OPENAI */,
+        "anthropic" /* USE_ANTHROPIC */,
+        "qwen-oauth" /* QWEN_OAUTH */,
+        "gemini" /* USE_GEMINI */,
+        "vertex-ai" /* USE_VERTEX_AI */
       ],
       description: "Authentication type"
     }).deprecateOption(
@@ -63570,6 +63615,13 @@ var ThemeManager = class {
    * when the app first rendered.
    */
   cachedAutoDetection;
+  /**
+   * Memoised synchronous detection of the terminal's background brightness,
+   * used when no async OSC 11 result is available (e.g. an explicitly
+   * configured theme, for which the startup probe never runs). Detected at
+   * most once per process.
+   */
+  terminalBackground;
   /**
    * Detects the terminal's dark/light preference (synchronous) and returns
    * the corresponding Qwen theme.
@@ -63593,6 +63645,21 @@ var ThemeManager = class {
     this.activeTheme = detected === "light" ? QwenLight : QwenDark;
     debugLogger6.info(`Auto-detected theme (async): ${this.activeTheme.name}`);
   }
+  /**
+   * Returns the terminal's detected background brightness ('dark' | 'light').
+   *
+   * Prefers the accurate async OSC 11 result captured at startup (for 'auto'
+   * themes); otherwise falls back to a memoised synchronous heuristic
+   * (COLORFGBG → macOS appearance → default dark). Lets UI code decide whether
+   * the active theme's background matches the terminal without re-probing.
+   */
+  getTerminalBackgroundType() {
+    if (this.cachedAutoDetection) {
+      return this.cachedAutoDetection;
+    }
+    this.terminalBackground ??= detectTerminalTheme();
+    return this.terminalBackground;
+  }
   /**
    * Gets the currently active theme.
    * @returns The active theme.
@@ -65515,7 +65582,7 @@ function buildArenaExecutionInput(parsed, config) {
     };
   }
   const contentGeneratorConfig = config.getContentGeneratorConfig();
-  const defaultAuthType = contentGeneratorConfig?.authType ?? AuthType.USE_OPENAI;
+  const defaultAuthType = contentGeneratorConfig?.authType ?? "openai" /* USE_OPENAI */;
   const modelsConfig = config.getModelsConfig();
   const models = parsed.models.map((parsedModel) => {
     const authType = parsedModel.authType ?? defaultAuthType;
@@ -72443,7 +72510,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd5) {
-    const { getGitRepoName } = await import("./chunks/src-PDDLF5BB.js");
+    const { getGitRepoName } = await import("./chunks/src-SPEHQKTK.js");
     gitRepo = getGitRepoName(cwd5);
   }
   let model;
@@ -76513,13 +76580,28 @@ var mcpCommand2 = {
   get description() {
     return t("Open MCP management dialog");
   },
-  argumentHint: "desc|nodesc|schema|auth|noauth",
+  argumentHint: "desc|nodesc|schema",
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive"],
-  action: /* @__PURE__ */ __name(async () => ({
-    type: "dialog",
-    dialog: "mcp"
-  }), "action")
+  action: /* @__PURE__ */ __name(async (_context, args = "") => {
+    const [subcommand, serverName] = args.trim().split(/\s+/);
+    if (subcommand === "auth" || subcommand === "noauth") {
+      return {
+        type: "message",
+        messageType: "warning",
+        content: serverName ? t(
+          "MCP OAuth is now managed in the /mcp dialog. Open /mcp, select '{{serverName}}', then use the Auth actions there.",
+          { serverName }
+        ) : t(
+          "MCP OAuth is now managed in the /mcp dialog. Open /mcp, select a server, then use the Auth actions there."
+        )
+      };
+    }
+    return {
+      type: "dialog",
+      dialog: "mcp"
+    };
+  }, "action")
 };
 
 // packages/cli/src/ui/commands/dreamCommand.ts
@@ -76655,7 +76737,7 @@ function resolveVoiceTransport(model) {
 }
 __name(resolveVoiceTransport, "resolveVoiceTransport");
 function isTranscribableVoiceModel(model) {
-  return model.authType === AuthType.USE_OPENAI && model.isRuntimeModel !== true && typeof model.baseUrl === "string" && model.baseUrl.trim().length > 0;
+  return model.authType === "openai" /* USE_OPENAI */ && model.isRuntimeModel !== true && typeof model.baseUrl === "string" && model.baseUrl.trim().length > 0;
 }
 __name(isTranscribableVoiceModel, "isTranscribableVoiceModel");
 function isSelectableVoiceModel(model) {
@@ -76685,7 +76767,7 @@ async function switchMainModel(config, settings, currentAuthType, modelArg) {
     await config.switchModel(
       parsed.authType,
       parsed.modelId,
-      parsed.authType !== currentAuthType && parsed.authType === AuthType.QWEN_OAUTH ? { requireCachedCredentials: true } : void 0
+      parsed.authType !== currentAuthType && parsed.authType === "qwen-oauth" /* QWEN_OAUTH */ ? { requireCachedCredentials: true } : void 0
     );
     persistSetting(settings, "security.auth.selectedType", parsed.authType);
     persistSetting(settings, "model.name", parsed.modelId);
@@ -81186,7 +81268,7 @@ var lspCommand = {
     return t("Show LSP server status. Usage: /lsp [status]");
   },
   kind: "built-in" /* BUILT_IN */,
-  supportedModes: ["interactive", "non_interactive"],
+  supportedModes: ["interactive", "non_interactive", "acp"],
   action: /* @__PURE__ */ __name(async (context, _args) => {
     const config = context.services.config;
     if (!config) {
@@ -84722,7 +84804,8 @@ ${messages.join("\n")}`;
     try {
       const result = await readManyFiles(config, {
         paths: pathSpecsToRead,
-        signal
+        signal,
+        preserveUnsupportedImageForBridge: shouldRunVisionBridge(config)
       });
       const parts = Array.isArray(result.contentParts) ? result.contentParts : [result.contentParts];
       fileDisplays = result.files.map((file, index) => ({
@@ -86271,7 +86354,7 @@ var SystemController = class extends BaseController {
       throw new Error("Request aborted");
     }
     try {
-      const mod = await import("./chunks/contextCommand-BO45MUAA.js");
+      const mod = await import("./chunks/contextCommand-JSYQAO3O.js");
       if (signal.aborted) {
         throw new Error("Request aborted");
       }
@@ -89460,8 +89543,7 @@ function getInstalledOwnedModelIds(settings, provider) {
   const mergedSettings = settings.merged;
   const modelProviders = mergedSettings["modelProviders"];
   if (!modelProviders) return [];
-  const entry = modelProviders[protocol];
-  const allModels = Array.isArray(entry) ? entry : entry?.models ?? [];
+  const allModels = modelProviders[protocol] ?? [];
   const ownsFn = resolveOwnsModel(provider);
   if (!ownsFn) return allModels.map((m) => m.id);
   return allModels.filter(ownsFn).map((m) => m.id);
@@ -95009,10 +95091,10 @@ var ContinuationMarkdownMessage = /* @__PURE__ */ __name(({
     }
   ) });
 }, "ContinuationMarkdownMessage");
-var UserMessage = /* @__PURE__ */ __name(({ text, width }) => {
-  const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
-  const useBand = width !== void 0 && width > 0 && !isScreenReaderEnabled && !!theme.background.primary && supportsTrueColor();
-  const fallback = /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+var UserMessage = /* @__PURE__ */ __name(({ text }) => (
+  // The TUI paints no background of its own; user messages render directly on
+  // the terminal background so they blend in across terminals and themes.
+  /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
     PrefixedTextMessage,
     {
       text,
@@ -95023,42 +95105,8 @@ var UserMessage = /* @__PURE__ */ __name(({ text, width }) => {
       alignSelf: "flex-start",
       marginTop: 1
     }
-  );
-  if (!useBand) {
-    return fallback;
-  }
-  const bg = resolveColor(theme.background.primary) || theme.background.primary;
-  const bandColor = subtleBandColor(bg);
-  if (!bandColor) {
-    return fallback;
-  }
-  const prefix = "> ";
-  const lines = text.split("\n");
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(Box_default, { flexDirection: "column", width, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Text, { color: bandColor, children: "\u2584".repeat(width) }),
-    lines.map((line, i) => {
-      const linePrefix = i === 0 ? prefix : "  ";
-      const lineWidth2 = stringWidth2(linePrefix + line);
-      const pad2 = Math.max(0, width - lineWidth2);
-      return /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
-        Text,
-        {
-          backgroundColor: bandColor,
-          "aria-label": i === 0 ? SCREEN_READER_USER_PREFIX : void 0,
-          children: [
-            /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(Text, { color: theme.text.accent, children: [
-              linePrefix,
-              line
-            ] }),
-            pad2 > 0 ? " ".repeat(pad2) : ""
-          ]
-        },
-        i
-      );
-    }),
-    /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Text, { color: bandColor, children: "\u2580".repeat(width) })
-  ] });
-}, "UserMessage");
+  )
+), "UserMessage");
 var UserShellMessage = /* @__PURE__ */ __name(({ text }) => {
   const commandToDisplay = text.startsWith("!") ? text.substring(1) : text;
   return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
@@ -95658,7 +95706,6 @@ var import_react61 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/shared/TextInput.tsx
 init_esbuild_shims();
-var import_chalk6 = __toESM(require_source(), 1);
 
 // packages/cli/src/ui/components/shared/text-buffer.ts
 init_esbuild_shims();
@@ -98370,6 +98417,73 @@ __name(usePreferredEditor, "usePreferredEditor");
 
 // packages/cli/src/ui/components/shared/TextInput.tsx
 var import_react60 = __toESM(require_react(), 1);
+
+// packages/cli/src/ui/utils/software-cursor.ts
+init_esbuild_shims();
+var import_chalk6 = __toESM(require_source(), 1);
+
+// packages/cli/src/ui/utils/theme-background.ts
+init_esbuild_shims();
+var DARK_TERMINAL_BACKGROUND = "#000000";
+var LIGHT_TERMINAL_BACKGROUND = "#ffffff";
+function getEffectiveTerminalBackground() {
+  return themeManager.getTerminalBackgroundType() === "light" ? LIGHT_TERMINAL_BACKGROUND : DARK_TERMINAL_BACKGROUND;
+}
+__name(getEffectiveTerminalBackground, "getEffectiveTerminalBackground");
+
+// packages/cli/src/ui/utils/software-cursor.ts
+var LIGHT_CURSOR_BACKGROUND = "#D4D4D4";
+var DARK_CURSOR_BACKGROUND = "#3A3A3A";
+var INK_NAME_TO_HEX = {
+  black: "#000000",
+  red: "#ff0000",
+  green: "#00ff00",
+  yellow: "#ffff00",
+  blue: "#0000ff",
+  cyan: "#00ffff",
+  magenta: "#ff00ff",
+  white: "#ffffff",
+  gray: "#808080",
+  grey: "#808080",
+  blackbright: "#808080",
+  redbright: "#ff8080",
+  greenbright: "#80ff80",
+  yellowbright: "#ffff80",
+  bluebright: "#8080ff",
+  cyanbright: "#80ffff",
+  magentabright: "#ff80ff",
+  whitebright: "#ffffff"
+};
+function toHex(color2) {
+  const resolved = resolveColor(color2) ?? color2;
+  const lower2 = resolved.toLowerCase();
+  if (/^#[0-9a-f]{3}$/.test(lower2)) {
+    return `#${lower2.slice(1).split("").map((c) => c + c).join("")}`;
+  }
+  if (/^#[0-9a-f]{6}$/.test(lower2)) {
+    return lower2;
+  }
+  return INK_NAME_TO_HEX[lower2];
+}
+__name(toHex, "toHex");
+function getSoftwareCursorBackground(backgroundColor = getEffectiveTerminalBackground()) {
+  const hex = backgroundColor ? toHex(backgroundColor) : void 0;
+  if (!hex) {
+    return LIGHT_CURSOR_BACKGROUND;
+  }
+  const r = parseInt(hex.slice(1, 3), 16);
+  const g = parseInt(hex.slice(3, 5), 16);
+  const b = parseInt(hex.slice(5, 7), 16);
+  const luminance = (r * 299 + g * 587 + b * 114) / 1e3;
+  return luminance >= 128 ? DARK_CURSOR_BACKGROUND : LIGHT_CURSOR_BACKGROUND;
+}
+__name(getSoftwareCursorBackground, "getSoftwareCursorBackground");
+function renderSoftwareCursor(text) {
+  return import_chalk6.default.bgHex(getSoftwareCursorBackground())(text || " ");
+}
+__name(renderSoftwareCursor, "renderSoftwareCursor");
+
+// packages/cli/src/ui/components/shared/TextInput.tsx
 var import_jsx_runtime20 = __toESM(require_jsx_runtime(), 1);
 function ellipsizeMiddle(text, width) {
   if (width <= 0) return "";
@@ -98496,7 +98610,7 @@ function TextInput({
     /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.accent, children: "> " }),
       /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? shouldRenderCursor ? /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { children: [
-        import_chalk6.default.inverse(placeholder.slice(0, 1)),
+        renderSoftwareCursor(placeholder.slice(0, 1)),
         /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: Colors.Gray, children: placeholder.slice(1) })
       ] }) : /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: Colors.Gray, children: placeholder }) : ellipsizeOverflow && stringWidth2(buffer.text) > inputWidth ? /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { children: ellipsizeMiddle(buffer.text, inputWidth) }) : linesToRender.map((lineText, visualIdxInRenderedSet) => {
         const cursorVisualRow = cursorVisualRowAbsolute - scrollVisualRow;
@@ -98514,10 +98628,10 @@ function TextInput({
                 relativeVisualColForHighlight,
                 relativeVisualColForHighlight + 1
               ) || " ";
-              const highlighted = import_chalk6.default.inverse(charToHighlight);
+              const highlighted = renderSoftwareCursor(charToHighlight);
               display = cpSlice(display, 0, relativeVisualColForHighlight) + highlighted + cpSlice(display, relativeVisualColForHighlight + 1);
             } else if (relativeVisualColForHighlight === cpLen(display) && cpLen(display) === inputWidth) {
-              display = display + import_chalk6.default.inverse(" ");
+              display = display + renderSoftwareCursor(" ");
             }
           }
         }
@@ -102493,7 +102607,7 @@ var McpStatus = /* @__PURE__ */ __name(({
         "- ",
         t("Use"),
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.accent, children: "/mcp auth <server-name>" }),
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.accent, children: "/mcp" }),
         " ",
         t("to authenticate with OAuth-enabled servers")
       ] }),
@@ -103609,6 +103723,39 @@ var ThinkingViewerProvider = ThinkingViewerContext.Provider;
 // packages/cli/src/ui/hooks/useMouseEvents.ts
 init_esbuild_shims();
 var import_react81 = __toESM(require_react(), 1);
+var mouseModeRefs = /* @__PURE__ */ new Map();
+var disableAllMouseModes = /* @__PURE__ */ __name(() => {
+  for (const stdout of mouseModeRefs.keys()) {
+    disableMouseEvents(stdout);
+  }
+  mouseModeRefs.clear();
+}, "disableAllMouseModes");
+function acquireMouseMode(stdout) {
+  const entry = mouseModeRefs.get(stdout);
+  if (entry) {
+    entry.refs += 1;
+    return;
+  }
+  enableMouseEvents(stdout);
+  if (mouseModeRefs.size === 0) {
+    process.on("exit", disableAllMouseModes);
+  }
+  mouseModeRefs.set(stdout, { refs: 1 });
+}
+__name(acquireMouseMode, "acquireMouseMode");
+function releaseMouseMode(stdout) {
+  const entry = mouseModeRefs.get(stdout);
+  if (!entry) return;
+  entry.refs -= 1;
+  if (entry.refs <= 0) {
+    mouseModeRefs.delete(stdout);
+    disableMouseEvents(stdout);
+    if (mouseModeRefs.size === 0) {
+      process.removeListener("exit", disableAllMouseModes);
+    }
+  }
+}
+__name(releaseMouseMode, "releaseMouseMode");
 function useMouseEvents(handler, { isActive }) {
   const { isRawModeSupported } = use_stdin_default();
   const { stdout } = use_stdout_default();
@@ -103618,14 +103765,9 @@ function useMouseEvents(handler, { isActive }) {
   const enabled2 = isActive && isRawModeSupported;
   (0, import_react81.useEffect)(() => {
     if (!enabled2) return;
-    enableMouseEvents(stdout);
-    const onExit = /* @__PURE__ */ __name(() => {
-      disableMouseEvents(stdout);
-    }, "onExit");
-    process.on("exit", onExit);
+    acquireMouseMode(stdout);
     return () => {
-      process.removeListener("exit", onExit);
-      disableMouseEvents(stdout);
+      releaseMouseMode(stdout);
     };
   }, [enabled2, stdout]);
   const mouseCallback = (0, import_react81.useCallback)((event) => {
@@ -103776,7 +103918,7 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
       marginLeft: 2,
       marginRight: 2,
       children: [
-        itemForDisplay.type === "user" && /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(UserMessage, { text: itemForDisplay.text, width: contentWidth }),
+        itemForDisplay.type === "user" && /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(UserMessage, { text: itemForDisplay.text }),
         itemForDisplay.type === "notification" && /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(InfoMessage, { text: itemForDisplay.text }),
         itemForDisplay.type === "user_shell" && /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(UserShellMessage, { text: itemForDisplay.text }),
         itemForDisplay.type === "gemini" && /* @__PURE__ */ (0, import_jsx_runtime53.jsxs)(import_jsx_runtime53.Fragment, { children: [
@@ -104880,7 +105022,7 @@ function getAuthDisplayType(authType, baseUrl, apiKeyEnvKey) {
     return matched.label;
   }
   switch (authType) {
-    case AuthType.QWEN_OAUTH:
+    case "qwen-oauth" /* QWEN_OAUTH */:
       return "qwen_oauth" /* QWEN_OAUTH */;
     default:
       return "api_key" /* API_KEY */;
@@ -105321,6 +105463,7 @@ function VirtualizedList(props, ref) {
     return scrollToEnd;
   });
   const containerRef = (0, import_react90.useRef)(null);
+  const rootRef = (0, import_react90.useRef)(null);
   const { width: measuredContainerWidth, height: measuredContainerHeight } = use_box_metrics_default(containerRef);
   const containerHeight = props.containerHeight ?? measuredContainerHeight;
   const containerWidth = measuredContainerWidth;
@@ -105587,6 +105730,64 @@ function VirtualizedList(props, ref) {
     Math.max(0, isStickingToBottom ? maxScroll : actualScrollTop),
     maxScroll
   );
+  const getScrollbarGeometry = (0, import_react90.useCallback)(() => {
+    const shouldShowScrollbar = (props.showScrollbar ?? true) && maxScroll > 0;
+    if (!shouldShowScrollbar || !rootRef.current || scrollableContainerHeight <= 0) {
+      return null;
+    }
+    const metrics = measureElementPosition(rootRef.current);
+    if (metrics.width <= 0 || metrics.height <= 0) return null;
+    return {
+      col: metrics.x + metrics.width - 1,
+      top: metrics.y,
+      height: scrollableContainerHeight
+    };
+  }, [props.showScrollbar, maxScroll, scrollableContainerHeight]);
+  const hitTestScrollbar = (0, import_react90.useCallback)(
+    ({ col, row }) => {
+      const geometry = getScrollbarGeometry();
+      if (!geometry) return false;
+      const zeroBasedCol = col - 1;
+      const zeroBasedRow = row - 1;
+      return zeroBasedCol === geometry.col && zeroBasedRow >= geometry.top && zeroBasedRow < geometry.top + geometry.height;
+    },
+    [getScrollbarGeometry]
+  );
+  const scrollToScrollbarRow = (0, import_react90.useCallback)(
+    (row) => {
+      const geometry = getScrollbarGeometry();
+      if (!geometry) return;
+      const zeroBasedRow = row - 1;
+      const rowInTrack = Math.max(
+        0,
+        Math.min(geometry.height - 1, zeroBasedRow - geometry.top)
+      );
+      const scrollRatio = rowInTrack / Math.max(1, geometry.height - 1);
+      const newScrollTop = Math.round(scrollRatio * maxScroll);
+      if (newScrollTop >= maxScroll) {
+        setIsStickingToBottom(true);
+        setPendingScrollTop(Number.MAX_SAFE_INTEGER);
+        if (data.length > 0) {
+          setScrollAnchor({
+            index: data.length - 1,
+            offset: SCROLL_TO_ITEM_END
+          });
+        }
+      } else {
+        setIsStickingToBottom(false);
+        setPendingScrollTop(newScrollTop);
+        setScrollAnchor(getAnchorForScrollTop(newScrollTop, offsets));
+      }
+    },
+    [
+      data.length,
+      getAnchorForScrollTop,
+      getScrollbarGeometry,
+      maxScroll,
+      offsets,
+      setPendingScrollTop
+    ]
+  );
   (0, import_react90.useImperativeHandle)(
     ref,
     () => ({
@@ -105689,6 +105890,8 @@ function VirtualizedList(props, ref) {
           }
         }
       }, "scrollToItem"),
+      hitTestScrollbar,
+      scrollToScrollbarRow,
       getScrollIndex: /* @__PURE__ */ __name(() => scrollAnchor.index, "getScrollIndex"),
       getScrollState: /* @__PURE__ */ __name(() => {
         const maxScroll2 = Math.max(0, totalHeight - scrollableContainerHeight);
@@ -105707,7 +105910,9 @@ function VirtualizedList(props, ref) {
       data,
       scrollableContainerHeight,
       getScrollTop,
-      setPendingScrollTop
+      setPendingScrollTop,
+      hitTestScrollbar,
+      scrollToScrollbarRow
     ]
   );
   const showScrollbar = (props.showScrollbar ?? true) && maxScroll > 0;
@@ -105746,6 +105951,7 @@ function VirtualizedList(props, ref) {
   return /* @__PURE__ */ (0, import_jsx_runtime64.jsxs)(
     Box_default,
     {
+      ref: rootRef,
       width: "100%",
       height: props.containerHeight !== void 0 ? props.containerHeight : "100%",
       flexDirection: "row",
@@ -105788,6 +105994,7 @@ var import_jsx_runtime65 = __toESM(require_jsx_runtime(), 1);
 function ScrollableList(props, ref) {
   const { hasFocus, ...virtualizedListProps } = props;
   const virtualizedListRef = (0, import_react91.useRef)(null);
+  const isDraggingScrollbar = (0, import_react91.useRef)(false);
   (0, import_react91.useImperativeHandle)(
     ref,
     () => ({
@@ -105796,6 +106003,8 @@ function ScrollableList(props, ref) {
       scrollToEnd: /* @__PURE__ */ __name(() => virtualizedListRef.current?.scrollToEnd(), "scrollToEnd"),
       scrollToIndex: /* @__PURE__ */ __name((params) => virtualizedListRef.current?.scrollToIndex(params), "scrollToIndex"),
       scrollToItem: /* @__PURE__ */ __name((params) => virtualizedListRef.current?.scrollToItem(params), "scrollToItem"),
+      hitTestScrollbar: /* @__PURE__ */ __name((location) => virtualizedListRef.current?.hitTestScrollbar(location) ?? false, "hitTestScrollbar"),
+      scrollToScrollbarRow: /* @__PURE__ */ __name((row) => virtualizedListRef.current?.scrollToScrollbarRow(row), "scrollToScrollbarRow"),
       getScrollIndex: /* @__PURE__ */ __name(() => virtualizedListRef.current?.getScrollIndex() ?? 0, "getScrollIndex"),
       getScrollState: /* @__PURE__ */ __name(() => virtualizedListRef.current?.getScrollState() ?? {
         scrollTop: 0,
@@ -105841,6 +106050,21 @@ function ScrollableList(props, ref) {
   const WHEEL_LINES_PER_TICK = 3;
   const handleMouseEvent = (0, import_react91.useCallback)((event) => {
     if (!virtualizedListRef.current) return;
+    if (event.name === "left-release") {
+      isDraggingScrollbar.current = false;
+      return;
+    }
+    if (event.name === "left-press") {
+      isDraggingScrollbar.current = virtualizedListRef.current.hitTestScrollbar(event);
+      if (isDraggingScrollbar.current) {
+        virtualizedListRef.current.scrollToScrollbarRow(event.row);
+      }
+      return;
+    }
+    if (event.name === "move" && isDraggingScrollbar.current) {
+      virtualizedListRef.current.scrollToScrollbarRow(event.row);
+      return;
+    }
     if (event.name === "scroll-up") {
       virtualizedListRef.current.scrollBy(-WHEEL_LINES_PER_TICK);
     } else if (event.name === "scroll-down") {
@@ -106638,7 +106862,6 @@ var ProviderUpdatePrompt = /* @__PURE__ */ __name(({
 // packages/cli/src/ui/components/SettingInputPrompt.tsx
 init_esbuild_shims();
 var import_react95 = __toESM(require_react(), 1);
-var import_chalk7 = __toESM(require_source(), 1);
 var import_jsx_runtime71 = __toESM(require_jsx_runtime(), 1);
 var PasswordInput = /* @__PURE__ */ __name(({
   value,
@@ -106671,7 +106894,7 @@ var PasswordInput = /* @__PURE__ */ __name(({
   );
   const maskedValue = "*".repeat(value.length);
   const displayValue = maskedValue || "";
-  const cursorChar = import_chalk7.default.inverse(" ");
+  const cursorChar = renderSoftwareCursor(" ");
   return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Box_default, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: theme.text.accent, children: "> " }),
     value.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Text, { children: [
@@ -107236,7 +107459,6 @@ var useVimModeActions = /* @__PURE__ */ __name(() => {
 }, "useVimModeActions");
 
 // packages/cli/src/ui/components/SettingsDialog.tsx
-var import_chalk8 = __toESM(require_source(), 1);
 var import_jsx_runtime76 = __toESM(require_jsx_runtime(), 1);
 var debugLogger46 = createDebugLogger("SETTINGS_DIALOG");
 var maxItemsToShow = 8;
@@ -107803,9 +108025,9 @@ function SettingsDialog({
                   editCursorPos + 1
                 );
                 const afterCursor = cpSlice(editBuffer, editCursorPos + 1);
-                displayValue = beforeCursor + import_chalk8.default.inverse(atCursor) + afterCursor;
+                displayValue = beforeCursor + renderSoftwareCursor(atCursor) + afterCursor;
               } else if (cursorVisible && editCursorPos >= cpLen(editBuffer)) {
-                displayValue = editBuffer + import_chalk8.default.inverse(" ");
+                displayValue = editBuffer + renderSoftwareCursor(" ");
               } else {
                 displayValue = editBuffer;
               }
@@ -108813,7 +109035,7 @@ var useQwenAuth = /* @__PURE__ */ __name((pendingAuthType, isAuthenticating) =>
     authStatus: "idle",
     authMessage: null
   });
-  const isQwenAuth = pendingAuthType === AuthType.QWEN_OAUTH;
+  const isQwenAuth = pendingAuthType === "qwen-oauth" /* QWEN_OAUTH */;
   (0, import_react103.useEffect)(() => {
     if (!isQwenAuth || !isAuthenticating) {
       setQwenAuthState({
@@ -108972,7 +109194,7 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config, addItem, onAuthCh
     setAuthError(null);
   }, []);
   const cancelAuthentication = (0, import_react104.useCallback)(() => {
-    if (isAuthenticating && pendingAuthType === AuthType.QWEN_OAUTH) {
+    if (isAuthenticating && pendingAuthType === "qwen-oauth" /* QWEN_OAUTH */) {
       cancelQwenAuth();
     }
     if (isAuthenticating && pendingAuthType) {
@@ -108986,11 +109208,11 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config, addItem, onAuthCh
   (0, import_react104.useEffect)(() => {
     const val = process.env["QWEN_DEFAULT_AUTH_TYPE"];
     const valid = [
-      AuthType.QWEN_OAUTH,
-      AuthType.USE_OPENAI,
-      AuthType.USE_ANTHROPIC,
-      AuthType.USE_GEMINI,
-      AuthType.USE_VERTEX_AI
+      "qwen-oauth" /* QWEN_OAUTH */,
+      "openai" /* USE_OPENAI */,
+      "anthropic" /* USE_ANTHROPIC */,
+      "gemini" /* USE_GEMINI */,
+      "vertex-ai" /* USE_VERTEX_AI */
     ];
     if (val && !valid.includes(val)) {
       onAuthError(
@@ -109076,7 +109298,7 @@ function useProviderSetupFlow(onSubmit) {
   const [provider, setProvider] = (0, import_react105.useState)(null);
   const [visibleSteps, setVisibleSteps] = (0, import_react105.useState)([]);
   const [stepIndex, setStepIndex] = (0, import_react105.useState)(0);
-  const [protocol, setProtocol] = (0, import_react105.useState)("openai" /* OPENAI */);
+  const [protocol, setProtocol] = (0, import_react105.useState)("openai" /* USE_OPENAI */);
   const [baseUrl, setBaseUrl] = (0, import_react105.useState)("");
   const [baseUrlPlaceholder, setBaseUrlPlaceholder] = (0, import_react105.useState)("");
   const [baseUrlOptionIndex, setBaseUrlOptionIndex] = (0, import_react105.useState)(0);
@@ -109147,10 +109369,9 @@ function useProviderSetupFlow(onSubmit) {
   }, [visibleSteps]);
   const selectProtocol = (0, import_react105.useCallback)(
     (selectedProtocol) => {
-      const proto3 = selectedProtocol;
-      setProtocol(proto3);
+      setProtocol(selectedProtocol);
       setBaseUrl("");
-      setBaseUrlPlaceholder(getDefaultBaseUrlForProtocol(proto3));
+      setBaseUrlPlaceholder(getDefaultBaseUrlForProtocol(selectedProtocol));
       setApiKey("");
       setApiKeyError(null);
       goNext();
@@ -109923,25 +110144,25 @@ function ReviewStep({ flow }) {
 __name(ReviewStep, "ReviewStep");
 var PROTOCOL_ITEMS = [
   {
-    key: AuthType.USE_OPENAI,
+    key: "openai" /* USE_OPENAI */,
     title: t("OpenAI-compatible"),
     label: t("OpenAI-compatible"),
     description: t("Standard OpenAI API format (most common)"),
-    value: AuthType.USE_OPENAI
+    value: "openai" /* USE_OPENAI */
   },
   {
-    key: AuthType.USE_ANTHROPIC,
+    key: "anthropic" /* USE_ANTHROPIC */,
     title: t("Anthropic-compatible"),
     label: t("Anthropic-compatible"),
     description: t("Anthropic Messages API format"),
-    value: AuthType.USE_ANTHROPIC
+    value: "anthropic" /* USE_ANTHROPIC */
   },
   {
-    key: AuthType.USE_GEMINI,
+    key: "gemini" /* USE_GEMINI */,
     title: t("Gemini-compatible"),
     label: t("Gemini-compatible"),
     description: t("Google Gemini API format"),
-    value: AuthType.USE_GEMINI
+    value: "gemini" /* USE_GEMINI */
   }
 ];
 function ProviderSetupSteps({
@@ -111491,7 +111712,7 @@ function ModelDialog({
     const allModels = config ? config.getAllConfiguredModels() : [];
     const runtimeModels = allModels.filter((m) => m.isRuntimeModel);
     const registryModels = allModels.filter(
-      (m) => !m.isRuntimeModel && (m.authType !== AuthType.QWEN_OAUTH || authType === AuthType.QWEN_OAUTH) && (isFastModelMode || !m.fastOnly) && (isVoiceModelMode || !m.voiceOnly)
+      (m) => !m.isRuntimeModel && (m.authType !== "qwen-oauth" /* QWEN_OAUTH */ || authType === "qwen-oauth" /* QWEN_OAUTH */) && (isFastModelMode || !m.fastOnly) && (isVoiceModelMode || !m.voiceOnly)
     );
     const modelsByAuthTypeMap = /* @__PURE__ */ new Map();
     for (const model of registryModels) {
@@ -111501,25 +111722,17 @@ function ModelDialog({
       }
       modelsByAuthTypeMap.get(authType2).push(model);
     }
-    const builtinAuthTypeOrder = [
-      AuthType.QWEN_OAUTH,
-      AuthType.USE_OPENAI,
-      AuthType.USE_ANTHROPIC,
-      AuthType.USE_GEMINI,
-      AuthType.USE_VERTEX_AI
+    const authTypeOrder = [
+      "qwen-oauth" /* QWEN_OAUTH */,
+      "openai" /* USE_OPENAI */,
+      "anthropic" /* USE_ANTHROPIC */,
+      "gemini" /* USE_GEMINI */,
+      "vertex-ai" /* USE_VERTEX_AI */
     ];
     const availableAuthTypes = new Set(modelsByAuthTypeMap.keys());
-    const orderedAuthTypes = [];
-    for (const authType2 of builtinAuthTypeOrder) {
-      if (availableAuthTypes.has(authType2)) {
-        orderedAuthTypes.push(authType2);
-      }
-    }
-    for (const authType2 of availableAuthTypes) {
-      if (!builtinAuthTypeOrder.includes(authType2)) {
-        orderedAuthTypes.push(authType2);
-      }
-    }
+    const orderedAuthTypes = authTypeOrder.filter(
+      (t2) => availableAuthTypes.has(t2)
+    );
     const result = [];
     for (const runtimeModel of runtimeModels) {
       result.push({
@@ -111540,7 +111753,7 @@ function ModelDialog({
     () => availableModelEntries.map(
       ({ authType: t2, model, isRuntime, snapshotId }) => {
         const value = isRuntime && snapshotId ? snapshotId : buildModelSelectionKey(t2, model.id, model.baseUrl);
-        const isQwenOAuth = t2 === AuthType.QWEN_OAUTH;
+        const isQwenOAuth = t2 === "qwen-oauth" /* QWEN_OAUTH */;
         const title = /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Text, { children: [
           /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(
             Text,
@@ -111709,9 +111922,9 @@ function ModelDialog({
         onClose();
         return;
       }
-      const isQwenOAuthSelection = selected.startsWith(`${AuthType.QWEN_OAUTH}::`) || selected.startsWith("$runtime|") && selected.split("|")[1] === AuthType.QWEN_OAUTH;
+      const isQwenOAuthSelection = selected.startsWith(`${"qwen-oauth" /* QWEN_OAUTH */}::`) || selected.startsWith("$runtime|") && selected.split("|")[1] === "qwen-oauth" /* QWEN_OAUTH */;
       const isRuntimeOAuthSelection = selected.startsWith(
-        `$runtime|${AuthType.QWEN_OAUTH}|`
+        `$runtime|${"qwen-oauth" /* QWEN_OAUTH */}|`
       );
       if (isQwenOAuthSelection && !isRuntimeOAuthSelection) {
         setErrorMessage(
@@ -111749,7 +111962,7 @@ function ModelDialog({
           selectedBaseUrl = parsed.baseUrl;
         }
         await config.switchModel(selectedAuthType, modelId, {
-          ...selectedAuthType !== authType && selectedAuthType === AuthType.QWEN_OAUTH ? { requireCachedCredentials: true } : {},
+          ...selectedAuthType !== authType && selectedAuthType === "qwen-oauth" /* QWEN_OAUTH */ ? { requireCachedCredentials: true } : {},
           baseUrl: selectedBaseUrl
         });
         if (!isRuntime) {
@@ -111840,7 +112053,7 @@ ${baseErrorMessage}`);
               borderColor: theme.border.default
             }
           ),
-          highlightedEntry.authType === AuthType.QWEN_OAUTH && !highlightedEntry.isRuntime && /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Text, { color: theme.status.warning, children: [
+          highlightedEntry.authType === "qwen-oauth" /* QWEN_OAUTH */ && !highlightedEntry.isRuntime && /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Text, { color: theme.status.warning, children: [
             "\u26A0 ",
             t("Discontinued \u2014 switch to Coding Plan or API Key")
           ] }) }),
@@ -111860,7 +112073,7 @@ ${baseErrorMessage}`);
               )
             }
           ),
-          highlightedEntry.authType !== AuthType.QWEN_OAUTH && /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(import_jsx_runtime87.Fragment, { children: [
+          highlightedEntry.authType !== "qwen-oauth" /* QWEN_OAUTH */ && /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(import_jsx_runtime87.Fragment, { children: [
             /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
               DetailRow2,
               {
@@ -111905,7 +112118,7 @@ function ArenaStartDialog({
     const selectableModels = allModels.filter((model) => !model.isRuntimeModel);
     return selectableModels.map((model) => {
       const token = `${model.authType}:${model.id}`;
-      const isQwenOauth = model.authType === AuthType.QWEN_OAUTH;
+      const isQwenOauth = model.authType === "qwen-oauth" /* QWEN_OAUTH */;
       return {
         key: token,
         value: token,
@@ -117735,10 +117948,7 @@ function UninstallConfirmStep({
   }
   return /* @__PURE__ */ (0, import_jsx_runtime121.jsxs)(Box_default, { flexDirection: "column", gap: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Text, { color: theme.status.error, children: t('Are you sure you want to uninstall extension "{{name}}"?', {
-      name: getExtensionDisplayName(
-        selectedExtension,
-        getCurrentLanguage()
-      )
+      name: getExtensionDisplayName(selectedExtension, getCurrentLanguage())
     }) }),
     /* @__PURE__ */ (0, import_jsx_runtime121.jsx)(Text, { color: theme.status.error, children: t("Note: Uninstall permanently removes this extension.") })
   ] });
@@ -126411,7 +126621,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     return /* @__PURE__ */ (0, import_jsx_runtime153.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime153.jsx)(AuthDialog, {}) });
   }
   if (uiState.auth.isAuthenticating) {
-    if (uiState.auth.pendingAuthType === AuthType.USE_OPENAI && uiState.auth.externalAuthState) {
+    if (uiState.auth.pendingAuthType === "openai" /* USE_OPENAI */ && uiState.auth.externalAuthState) {
       return /* @__PURE__ */ (0, import_jsx_runtime153.jsx)(
         ExternalAuthProgress,
         {
@@ -126425,7 +126635,7 @@ var DialogManager = /* @__PURE__ */ __name(({
         }
       );
     }
-    if (uiState.auth.pendingAuthType === AuthType.QWEN_OAUTH) {
+    if (uiState.auth.pendingAuthType === "qwen-oauth" /* QWEN_OAUTH */) {
       return /* @__PURE__ */ (0, import_jsx_runtime153.jsx)(
         QwenOAuthProgress,
         {
@@ -126792,6 +127002,7 @@ var PrepareLabel = import_react160.default.memo(_PrepareLabel);
 // packages/cli/src/ui/components/SuggestionsDisplay.tsx
 var import_jsx_runtime156 = __toESM(require_jsx_runtime(), 1);
 var MAX_SUGGESTIONS_TO_SHOW = 8;
+var MIN_DESCRIPTION_WIDTH = 12;
 function normalizeDescription(description) {
   return description.replace(/\s+/g, " ").trim();
 }
@@ -126822,7 +127033,11 @@ function SuggestionsDisplay({
   const maxLabelLength = Math.max(
     ...suggestions.map((s) => getFullLabel(s).length)
   );
-  const commandColumnWidth = mode === "slash" ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
+  const describedLabelLengths = suggestions.filter((s) => s.description).map((s) => getFullLabel(s).length);
+  const labelColumnWidth = mode === "slash" ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : describedLabelLengths.length > 0 ? Math.min(
+    Math.max(...describedLabelLengths),
+    Math.max(width - MIN_DESCRIPTION_WIDTH - 2, 1)
+  ) : 0;
   return /* @__PURE__ */ (0, import_jsx_runtime156.jsxs)(Box_default, { flexDirection: "column", width, children: [
     scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime156.jsx)(Text, { color: theme.text.primary, children: "\u25B2" }),
     visibleSuggestions.map((suggestion, index) => {
@@ -126834,7 +127049,7 @@ function SuggestionsDisplay({
       const isLong = displayLabel.length >= MAX_WIDTH;
       const expansionIndicatorWidth = isActive && isLong ? 3 : 0;
       const descriptionColumnWidth = Math.max(
-        width - commandColumnWidth - 2 - expansionIndicatorWidth,
+        width - labelColumnWidth - 2 - expansionIndicatorWidth,
         1
       );
       const labelElement = /* @__PURE__ */ (0, import_jsx_runtime156.jsx)(
@@ -126851,7 +127066,7 @@ function SuggestionsDisplay({
         /* @__PURE__ */ (0, import_jsx_runtime156.jsx)(
           Box_default,
           {
-            ...mode === "slash" ? { width: commandColumnWidth, flexShrink: 0 } : { flexShrink: 1 },
+            ...mode === "slash" || suggestion.description ? { width: labelColumnWidth, flexShrink: 0 } : { flexShrink: 1 },
             children: /* @__PURE__ */ (0, import_jsx_runtime156.jsxs)(Box_default, { children: [
               labelElement,
               suggestion.argumentHint && /* @__PURE__ */ (0, import_jsx_runtime156.jsxs)(Text, { color: theme.text.secondary, children: [
@@ -126974,9 +127189,6 @@ function useInputHistory({
 }
 __name(useInputHistory, "useInputHistory");
 
-// packages/cli/src/ui/components/InputPrompt.tsx
-var import_chalk10 = __toESM(require_source(), 1);
-
 // packages/cli/src/ui/hooks/useShellHistory.ts
 init_esbuild_shims();
 var import_react162 = __toESM(require_react(), 1);
@@ -127317,30 +127529,71 @@ var import_react167 = __toESM(require_react(), 1);
 // packages/cli/src/ui/hooks/useAtCompletion.ts
 init_esbuild_shims();
 var import_react165 = __toESM(require_react(), 1);
+function rankResourceMatch(uri, friendly, query) {
+  if (uri.startsWith(query)) return 0;
+  if (friendly.startsWith(query)) return 1;
+  if (uri.includes(query)) return 2;
+  if (friendly.includes(query)) return 3;
+  return Infinity;
+}
+__name(rankResourceMatch, "rankResourceMatch");
+function rankResourcesToSuggestions(resources, query) {
+  return resources.map((resource) => {
+    const friendly = resource.title || resource.name || "";
+    return {
+      resource,
+      friendly,
+      ref: buildMcpResourceRef(resource.serverName, resource.uri),
+      rank: rankResourceMatch(
+        resource.uri.toLowerCase(),
+        friendly.toLowerCase(),
+        query
+      )
+    };
+  }).filter((m) => m.rank !== Infinity).sort((a, b) => a.rank - b.rank || a.ref.localeCompare(b.ref)).slice(0, MAX_SUGGESTIONS_TO_SHOW * 3).map((m) => ({
+    label: m.ref,
+    value: m.ref,
+    description: m.friendly && m.friendly !== m.resource.uri ? m.friendly : void 0,
+    isDirectory: false
+  }));
+}
+__name(rankResourcesToSuggestions, "rankResourcesToSuggestions");
 function getMcpResourceSuggestions(config, pattern) {
   if (!config) return null;
   if (config.isTrustedFolder?.() === false) return null;
   const mcpServers = config.getMcpServers?.() || {};
   const match = matchMcpServerPrefix(pattern, Object.keys(mcpServers));
   if (!match) return null;
-  const serverName = match.serverName;
-  const partialUri = match.rest;
-  const resources = config.getResourceRegistry?.()?.getResourcesByServer(serverName) ?? [];
-  const matches = resources.filter((r) => r.uri.includes(partialUri)).sort((a, b) => {
-    const aPrefix = a.uri.startsWith(partialUri) ? 0 : 1;
-    const bPrefix = b.uri.startsWith(partialUri) ? 0 : 1;
-    return aPrefix - bPrefix || a.uri.localeCompare(b.uri);
-  });
-  return matches.slice(0, MAX_SUGGESTIONS_TO_SHOW * 3).map((r) => {
-    const ref = buildMcpResourceRef(serverName, r.uri);
-    return {
-      label: ref,
-      value: ref,
-      isDirectory: false
-    };
-  });
+  const resources = config.getResourceRegistry?.()?.getResourcesByServer(match.serverName) ?? [];
+  return rankResourcesToSuggestions(resources, match.rest.toLowerCase());
 }
 __name(getMcpResourceSuggestions, "getMcpResourceSuggestions");
+function getGlobalMcpResourceSuggestions(config, pattern) {
+  if (!config) return [];
+  if (config.isTrustedFolder?.() === false) return [];
+  if (pattern.length === 0) return [];
+  const resources = config.getResourceRegistry?.()?.getAllResources?.() ?? [];
+  return rankResourcesToSuggestions(resources, pattern.toLowerCase());
+}
+__name(getGlobalMcpResourceSuggestions, "getGlobalMcpResourceSuggestions");
+function getMcpServerSuggestions(config, pattern) {
+  if (!config) return [];
+  if (config.isTrustedFolder?.() === false) return [];
+  if (pattern.length === 0) return [];
+  const registry2 = config.getResourceRegistry?.();
+  if (!registry2) return [];
+  const mcpServers = config.getMcpServers?.() || {};
+  const query = pattern.toLowerCase();
+  return Object.keys(mcpServers).filter(
+    (name) => name.toLowerCase().startsWith(query) && (registry2.getResourcesByServer(name)?.length ?? 0) > 0
+  ).sort((a, b) => a.localeCompare(b)).map((name) => ({
+    label: `${name}:`,
+    value: `${name}:`,
+    description: t("MCP resource server"),
+    isDirectory: true
+  }));
+}
+__name(getMcpServerSuggestions, "getMcpServerSuggestions");
 var initialState = {
   status: "idle" /* IDLE */,
   suggestions: [],
@@ -127482,7 +127735,22 @@ function useAtCompletion(props) {
         dispatch({ type: "SEARCH_SUCCESS", payload: resourceSuggestions });
         return;
       }
+      const serverSuggestions = getMcpServerSuggestions(config, state2.pattern);
+      const globalResourceSuggestions = getGlobalMcpResourceSuggestions(
+        config,
+        state2.pattern
+      );
+      const mcpSuggestions = [
+        ...serverSuggestions,
+        ...globalResourceSuggestions
+      ];
       if (!fileSearch.current) {
+        if (mcpSuggestions.length > 0) {
+          if (slowSearchTimer.current) {
+            clearTimeout(slowSearchTimer.current);
+          }
+          dispatch({ type: "SEARCH_SUCCESS", payload: mcpSuggestions });
+        }
         return;
       }
       if (slowSearchTimer.current) {
@@ -127504,15 +127772,22 @@ function useAtCompletion(props) {
         if (controller.signal.aborted) {
           return;
         }
-        const suggestions = results.map((p) => ({
+        const fileSuggestions = results.map((p) => ({
           label: p,
           value: escapePath(p),
           isDirectory: p.endsWith("/")
         }));
-        dispatch({ type: "SEARCH_SUCCESS", payload: suggestions });
+        dispatch({
+          type: "SEARCH_SUCCESS",
+          payload: [...mcpSuggestions, ...fileSuggestions]
+        });
       } catch (error) {
         if (!(error instanceof Error && error.name === "AbortError")) {
-          dispatch({ type: "ERROR" });
+          if (mcpSuggestions.length > 0) {
+            dispatch({ type: "SEARCH_SUCCESS", payload: mcpSuggestions });
+          } else {
+            dispatch({ type: "ERROR" });
+          }
         }
       }
     }, "search");
@@ -129122,7 +129397,6 @@ var FeedbackDialog = /* @__PURE__ */ __name(() => {
 // packages/cli/src/ui/components/BaseTextInput.tsx
 init_esbuild_shims();
 var import_react174 = __toESM(require_react(), 1);
-var import_chalk9 = __toESM(require_source(), 1);
 var import_jsx_runtime159 = __toESM(require_jsx_runtime(), 1);
 function defaultRenderLine({
   lineText,
@@ -129137,7 +129411,7 @@ function defaultRenderLine({
   if (cursorCol >= len) {
     return /* @__PURE__ */ (0, import_jsx_runtime159.jsxs)(Text, { children: [
       lineText,
-      import_chalk9.default.inverse(" ") + "\u200B"
+      renderSoftwareCursor(" ") + "\u200B"
     ] });
   }
   const before = cpSlice(lineText, 0, cursorCol);
@@ -129145,18 +129419,49 @@ function defaultRenderLine({
   const after = cpSlice(lineText, cursorCol + 1);
   return /* @__PURE__ */ (0, import_jsx_runtime159.jsxs)(Text, { children: [
     before,
-    import_chalk9.default.inverse(cursorChar),
+    renderSoftwareCursor(cursorChar),
     after
   ] });
 }
 __name(defaultRenderLine, "defaultRenderLine");
-function findRootNode2(node) {
+function getAbsolutePosition(node) {
   if (!node) return void 0;
-  if (!node.parentNode)
-    return node["nodeName"] === "ink-root" ? node : void 0;
-  return findRootNode2(node.parentNode);
+  let top2 = 0;
+  let left2 = 0;
+  let current = node;
+  while (current) {
+    const layout = current.yogaNode?.getComputedLayout();
+    if (layout) {
+      top2 += layout.top;
+      left2 += layout.left;
+    }
+    current = current.parentNode;
+  }
+  return { top: top2, left: left2 };
+}
+__name(getAbsolutePosition, "getAbsolutePosition");
+function getPhysicalCursorPosition(node, {
+  hasMeasured,
+  showCursor,
+  cursorVisualRow,
+  cursorVisualCol,
+  scrollVisualRow,
+  linesToRender,
+  prefixWidth
+}) {
+  if (!showCursor || !hasMeasured) return void 0;
+  const position = getAbsolutePosition(node);
+  if (!position) return void 0;
+  const relativeRow = cursorVisualRow - scrollVisualRow;
+  const lineText = linesToRender[relativeRow] || "";
+  const textBeforeCursor = cpSlice(lineText, 0, cursorVisualCol);
+  const physicalCol = stringWidth2(textBeforeCursor);
+  return {
+    x: position.left + prefixWidth + physicalCol,
+    y: position.top + relativeRow + 1
+  };
 }
-__name(findRootNode2, "findRootNode");
+__name(getPhysicalCursorPosition, "getPhysicalCursorPosition");
 var BaseTextInput = /* @__PURE__ */ __name(({
   buffer,
   onSubmit,
@@ -129241,9 +129546,11 @@ var BaseTextInput = /* @__PURE__ */ __name(({
   const linesToRender = buffer.viewportVisualLines;
   const [cursorVisualRow, cursorVisualCol] = buffer.visualCursor;
   const scrollVisualRow = buffer.visualScrollRow;
-  const rootRef = (0, import_react174.useRef)(null);
-  const cursorCtx = (0, import_react174.useContext)(CursorContext_default);
-  const stateRef = (0, import_react174.useRef)({
+  const boxRef = (0, import_react174.useRef)(null);
+  const { hasMeasured } = use_box_metrics_default(boxRef);
+  const { setCursorPosition } = use_cursor_default();
+  const cursorPosition = getPhysicalCursorPosition(boxRef.current, {
+    hasMeasured,
     showCursor,
     cursorVisualRow,
     cursorVisualCol,
@@ -129251,65 +129558,17 @@ var BaseTextInput = /* @__PURE__ */ __name(({
     linesToRender,
     prefixWidth
   });
-  stateRef.current = {
-    showCursor,
-    cursorVisualRow,
-    cursorVisualCol,
-    scrollVisualRow,
-    linesToRender,
-    prefixWidth
-  };
-  (0, import_react174.useEffect)(() => {
-    const rootNode = findRootNode2(rootRef.current);
-    if (!rootNode) return;
-    const unsub = addLayoutListener(rootNode, () => {
-      const {
-        showCursor: sc,
-        cursorVisualRow: vr,
-        cursorVisualCol: vc,
-        scrollVisualRow: sr,
-        linesToRender: lt,
-        prefixWidth: pw
-      } = stateRef.current;
-      if (!sc) {
-        cursorCtx.setCursorPosition(void 0);
-        return;
-      }
-      const node = rootRef.current;
-      if (!node) return;
-      let absTop = 0;
-      let absLeft = 0;
-      let n = node;
-      while (n) {
-        const nd = n;
-        const layout = nd.yogaNode?.getComputedLayout();
-        if (layout) {
-          absTop += layout.top;
-          absLeft += layout.left;
-        }
-        n = nd.parentNode;
-      }
-      const relativeRow = vr - sr;
-      const lineText = lt[relativeRow] || "";
-      const textBeforeCursor = cpSlice(lineText, 0, vc);
-      const physicalCol = stringWidth2(textBeforeCursor);
-      cursorCtx.setCursorPosition({
-        x: absLeft + pw + physicalCol,
-        y: absTop + relativeRow + 1
-      });
-    });
-    return () => {
-      unsub();
-      cursorCtx.setCursorPosition(void 0);
-    };
-  }, [cursorCtx]);
+  (0, import_react174.useInsertionEffect)(() => {
+    setCursorPosition(cursorPosition);
+    return () => setCursorPosition(void 0);
+  }, [setCursorPosition, cursorPosition]);
   const resolvedBorderColor = borderColor ?? theme.border.focused;
   const resolvedPrefix = prefix ?? /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Text, { color: theme.text.accent, children: "> " });
   const columns = process.stdout.columns || 80;
   const labelWidth = topRightLabel ? stringWidth2(topRightLabel) + 4 : 0;
   const dashCount = Math.max(1, columns - labelWidth);
   const topBorderLine = topRightLabel ? `${"\u2500".repeat(dashCount)} ${topRightLabel} ${"\u2500".repeat(2)}` : "\u2500".repeat(columns);
-  return /* @__PURE__ */ (0, import_jsx_runtime159.jsxs)(Box_default, { ref: rootRef, flexDirection: "column", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime159.jsxs)(Box_default, { ref: boxRef, flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Text, { color: resolvedBorderColor, wrap: "truncate-end", children: topBorderLine }),
     /* @__PURE__ */ (0, import_jsx_runtime159.jsxs)(
       Box_default,
@@ -129322,31 +129581,23 @@ var BaseTextInput = /* @__PURE__ */ __name(({
         borderColor: resolvedBorderColor,
         children: [
           resolvedPrefix,
-          /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(
-            Box_default,
-            {
-              flexGrow: 1,
-              flexDirection: "column",
-              backgroundColor: theme.background.primary,
-              children: buffer.text.length === 0 && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime159.jsxs)(Text, { children: [
-                import_chalk9.default.inverse(placeholder.slice(0, 1)),
-                /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Text, { color: theme.text.secondary, children: placeholder.slice(1) })
-              ] }) : /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Text, { color: theme.text.secondary, children: placeholder }) : linesToRender.map((lineText, idx) => {
-                const absoluteVisualIndex = scrollVisualRow + idx;
-                const isOnCursorLine = absoluteVisualIndex === cursorVisualRow;
-                return /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Box_default, { height: 1, children: renderLine({
-                  lineText,
-                  isOnCursorLine,
-                  cursorCol: cursorVisualCol,
-                  showCursor,
-                  visualLineIndex: idx,
-                  absoluteVisualIndex,
-                  buffer,
-                  scrollVisualRow
-                }) }, idx);
-              })
-            }
-          )
+          /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime159.jsxs)(Text, { children: [
+            renderSoftwareCursor(placeholder.slice(0, 1)),
+            /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Text, { color: theme.text.secondary, children: placeholder.slice(1) })
+          ] }) : /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Text, { color: theme.text.secondary, children: placeholder }) : linesToRender.map((lineText, idx) => {
+            const absoluteVisualIndex = scrollVisualRow + idx;
+            const isOnCursorLine = absoluteVisualIndex === cursorVisualRow;
+            return /* @__PURE__ */ (0, import_jsx_runtime159.jsx)(Box_default, { height: 1, children: renderLine({
+              lineText,
+              isOnCursorLine,
+              cursorCol: cursorVisualCol,
+              showCursor,
+              visualLineIndex: idx,
+              absoluteVisualIndex,
+              buffer,
+              scrollVisualRow
+            }) }, idx);
+          }) })
         ]
       }
     )
@@ -132385,7 +132636,7 @@ ${currentText}`);
               cursorVisualColAbsolute - segStart,
               cursorVisualColAbsolute - segStart + 1
             );
-            const highlighted = showCursorOpt ? import_chalk10.default.inverse(charToHighlight) : charToHighlight;
+            const highlighted = showCursorOpt ? renderSoftwareCursor(charToHighlight) : charToHighlight;
             display = cpSlice(seg.text, 0, cursorVisualColAbsolute - segStart) + highlighted + cpSlice(seg.text, cursorVisualColAbsolute - segStart + 1);
           }
           charCount = segEnd;
@@ -132400,7 +132651,7 @@ ${currentText}`);
         if (ghostText && showCursorOpt && ghostText.text.length > 0) {
           if (ghostText.showCursorBeforeText) {
             renderedLine.push(
-              /* @__PURE__ */ (0, import_jsx_runtime161.jsx)(Text, { children: import_chalk10.default.inverse(" ") }, "ghost-cursor")
+              /* @__PURE__ */ (0, import_jsx_runtime161.jsx)(Text, { children: renderSoftwareCursor(" ") }, "ghost-cursor")
             );
             renderedLine.push(
               /* @__PURE__ */ (0, import_jsx_runtime161.jsx)(Text, { color: theme.text.secondary, children: ghostText.text }, "ghost-rest")
@@ -132409,7 +132660,7 @@ ${currentText}`);
             const firstChar = ghostText.text[0];
             const rest = ghostText.text.slice(firstChar.length);
             renderedLine.push(
-              /* @__PURE__ */ (0, import_jsx_runtime161.jsx)(Text, { children: import_chalk10.default.inverse(firstChar) }, "ghost-cursor")
+              /* @__PURE__ */ (0, import_jsx_runtime161.jsx)(Text, { children: renderSoftwareCursor(firstChar) }, "ghost-cursor")
             );
             if (rest.length > 0) {
               renderedLine.push(
@@ -132420,7 +132671,7 @@ ${currentText}`);
           renderedLine.push(/* @__PURE__ */ (0, import_jsx_runtime161.jsx)(Text, { children: `\u200B` }, "ghost-zwsp"));
         } else {
           renderedLine.push(
-            /* @__PURE__ */ (0, import_jsx_runtime161.jsx)(Text, { children: showCursorOpt ? import_chalk10.default.inverse(" ") + "\u200B" : " \u200B" }, `cursor-end-${cursorVisualColAbsolute}`)
+            /* @__PURE__ */ (0, import_jsx_runtime161.jsx)(Text, { children: showCursorOpt ? renderSoftwareCursor(" ") + "\u200B" : " \u200B" }, `cursor-end-${cursorVisualColAbsolute}`)
           );
         }
       }
@@ -137530,6 +137781,34 @@ import process36 from "node:process";
 var debugLogger78 = createDebugLogger("GEMINI_STREAM");
 var MID_TURN_AT_COMMAND_RESOLVE_TIMEOUT_MS = 1e4;
 var MID_TURN_AT_COMMAND_RESOLVE_TIMEOUT_MESSAGE = "Mid-turn @ command resolution timed out";
+var VISION_BRIDGE_TRANSCRIPT_NOTICE_LIMIT = 2048;
+var TERMINAL_CONTROL_CHARS = /[\u0000-\u0008\u000B-\u001F\u007F-\u009F]/g;
+function truncateVisionBridgeTranscript(transcript) {
+  const safe = transcript.replace(TERMINAL_CONTROL_CHARS, "");
+  if (safe.length <= VISION_BRIDGE_TRANSCRIPT_NOTICE_LIMIT) {
+    return safe;
+  }
+  return `${safe.slice(0, VISION_BRIDGE_TRANSCRIPT_NOTICE_LIMIT).trimEnd()}
+[Transcript truncated]`;
+}
+__name(truncateVisionBridgeTranscript, "truncateVisionBridgeTranscript");
+function formatVisionBridgeNotice(result) {
+  const modelName = result.modelId ?? "vision model";
+  const target = result.modelEndpoint ? `${modelName} (${result.modelEndpoint})` : modelName;
+  const egressNote = result.egressOccurred ? ` Your image and prompt/context were sent to ${target}.` : "";
+  if (result.status === "failed") {
+    const reason = result.egressOccurred ? "the vision model request failed" : "the vision bridge could not run";
+    return `\u26A0 Vision bridge (${modelName}) failed: ${reason}.${egressNote} The image was not interpreted.`;
+  }
+  if (result.status === "skipped") {
+    return `\u{1F50E} Vision bridge cancelled.${egressNote}`;
+  }
+  const omitted = result.omittedCount > 0 ? ` (${result.omittedCount} image(s) omitted)` : "";
+  const header = `\u{1F50E} Converted ${result.convertedCount} image(s)${omitted} to text via ${target}. Your image and prompt/context were sent to that model.`;
+  return result.transcript ? `${header}
+${truncateVisionBridgeTranscript(result.transcript)}` : header;
+}
+__name(formatVisionBridgeNotice, "formatVisionBridgeNotice");
 function extractLastAssistantText(history) {
   for (let i = history.length - 1; i >= 0; i--) {
     const item = history[i];
@@ -137933,6 +138212,36 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     config,
     getPromptCount
   ]);
+  const applyVisionBridgeIfNeeded = (0, import_react211.useCallback)(
+    async (parts, timestamp, signal) => {
+      if (parts === null || !hasImageParts(parts) || !shouldRunVisionBridge(config)) {
+        return { parts, shouldProceed: true };
+      }
+      debugLogger78.debug("vision bridge: gate matched, running conversion");
+      const bridgeResult = await runVisionBridge({ config, parts, signal });
+      debugLogger78.debug(
+        `vision bridge: status=${bridgeResult.status} applied=${bridgeResult.applied} model=${bridgeResult.modelId ?? "(none)"}`
+      );
+      if (bridgeResult.status !== "skipped" || bridgeResult.egressOccurred) {
+        addItem(
+          {
+            type: bridgeResult.status === "failed" ? "error" /* ERROR */ : "info" /* INFO */,
+            text: formatVisionBridgeNotice(bridgeResult)
+          },
+          timestamp
+        );
+      }
+      if (signal.aborted) {
+        return { parts: null, shouldProceed: false };
+      }
+      if (bridgeResult.applied && bridgeResult.parts != null) {
+        return { parts: bridgeResult.parts, shouldProceed: true };
+      }
+      const textOnly = splitImageParts(parts).nonImageParts;
+      return textOnly.length > 0 ? { parts: textOnly, shouldProceed: true } : { parts: null, shouldProceed: false };
+    },
+    [addItem, config]
+  );
   const prepareQueryForGemini = (0, import_react211.useCallback)(
     async (query, userMessageTimestamp, abortSignal, prompt_id, submitType) => {
       if (turnCancelledRef.current) {
@@ -138025,6 +138334,15 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           }
           localQueryToSendToGemini = atCommandResult.processedQuery;
         }
+        const bridgeResult = await applyVisionBridgeIfNeeded(
+          localQueryToSendToGemini,
+          userMessageTimestamp,
+          abortSignal
+        );
+        if (!bridgeResult.shouldProceed) {
+          return { queryToSend: null, shouldProceed: false };
+        }
+        localQueryToSendToGemini = bridgeResult.parts;
       } else {
         localQueryToSendToGemini = query;
       }
@@ -138044,7 +138362,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       handleSlashCommand2,
       logger3,
       shellModeActive,
-      scheduleToolCalls
+      scheduleToolCalls,
+      applyVisionBridgeIfNeeded
     ]
   );
   const handleContentEvent = (0, import_react211.useCallback)(
@@ -139274,7 +139593,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                   );
                 }
                 if (atCommandResult.recording) {
-                  config.getChatRecordingService()?.recordAtCommand?.({
+                  config.getChatRecordingService?.()?.recordAtCommand?.({
                     filesRead: atCommandResult.recording.filesRead,
                     status: atCommandResult.recording.status,
                     ...atCommandResult.recording.message ? { message: atCommandResult.recording.message } : {},
@@ -139306,6 +139625,18 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 break;
               }
             }
+            const bridgeResult = await applyVisionBridgeIfNeeded(
+              resolvedMidTurnQuery,
+              midTurnTimestamp + index,
+              midTurnAbort.signal
+            );
+            if (!bridgeResult.shouldProceed) {
+              if (midTurnAbort.signal.aborted) {
+                break;
+              }
+              continue;
+            }
+            resolvedMidTurnQuery = bridgeResult.parts ?? resolvedMidTurnQuery;
             const midTurnUserMessageParts = prefixMidTurnUserMessageParts(
               resolvedMidTurnQuery,
               msg
@@ -139323,7 +139654,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               );
             }
             responsesToSend.push(...midTurnUserMessageParts);
-            config.getChatRecordingService()?.recordMidTurnUserMessage(midTurnUserMessageParts, msg);
+            config.getChatRecordingService?.()?.recordMidTurnUserMessage(midTurnUserMessageParts, msg);
             addItem({ type: "notification" /* NOTIFICATION */, text: msg }, Date.now());
           }
         } finally {
@@ -139348,7 +139679,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       midTurnDrainRef,
       addItem,
       dualOutput,
-      onDebugMessage
+      onDebugMessage,
+      applyVisionBridgeIfNeeded
     ]
   );
   const pendingHistoryItems = (0, import_react211.useMemo)(
@@ -143033,10 +143365,10 @@ var applyOptions2 = /* @__PURE__ */ __name((object, options = {}) => {
   object.level = options.level === void 0 ? colorLevel : options.level;
 }, "applyOptions");
 var chalkFactory2 = /* @__PURE__ */ __name((options) => {
-  const chalk10 = /* @__PURE__ */ __name((...strings) => strings.join(" "), "chalk");
-  applyOptions2(chalk10, options);
-  Object.setPrototypeOf(chalk10, createChalk2.prototype);
-  return chalk10;
+  const chalk6 = /* @__PURE__ */ __name((...strings) => strings.join(" "), "chalk");
+  applyOptions2(chalk6, options);
+  Object.setPrototypeOf(chalk6, createChalk2.prototype);
+  return chalk6;
 }, "chalkFactory");
 function createChalk2(options) {
   return chalkFactory2(options);
@@ -143157,9 +143489,9 @@ var applyStyle2 = /* @__PURE__ */ __name((self2, string) => {
   return openAll + string + closeAll;
 }, "applyStyle");
 Object.defineProperties(createChalk2.prototype, styles8);
-var chalk9 = createChalk2();
+var chalk5 = createChalk2();
 var chalkStderr2 = createChalk2({ level: stderrColor2 ? stderrColor2.level : 0 });
-var source_default2 = chalk9;
+var source_default2 = chalk5;
 
 // node_modules/update-notifier/update-notifier.js
 var import_diff3 = __toESM(require_diff(), 1);
@@ -151309,7 +151641,7 @@ init_esbuild_shims();
 function buildAuthMethods() {
   return [
     {
-      id: AuthType.USE_OPENAI,
+      id: "openai" /* USE_OPENAI */,
       name: "Use OpenAI API key",
       description: "Requires setting the `OPENAI_API_KEY` environment variable",
       _meta: {
@@ -151384,7 +151716,7 @@ var AcpFileSystemService = class {
     if (!this.capabilities.writeTextFile) {
       return this.fallback.writeTextFile(params);
     }
-    const finalContent = params._meta?.["bom"] ? "\uFEFF" + params.content : params.content;
+    const finalContent = params._meta?.["bom"] && params.content.charCodeAt(0) !== 65279 ? "\uFEFF" + params.content : params.content;
     await this.connection.writeTextFile({
       ...params,
       content: finalContent,
@@ -152593,7 +152925,7 @@ var Session2 = class {
     );
     await this.historyReplayer.replay(records);
   }
-  rewindToTurn(targetTurnIndex) {
+  rewindToTurn(targetTurnIndex, opts) {
     if (!Number.isInteger(targetTurnIndex) || targetTurnIndex < 0) {
       throw RequestError.invalidParams(
         void 0,
@@ -152620,9 +152952,12 @@ var Session2 = class {
     }
     chat.truncateHistory(apiTruncateIndex);
     chat.stripThoughtsFromHistory();
+    const rewindFiles = opts?.rewindFiles !== false;
     const fileHistoryService = this.config.getFileHistoryService();
-    const survivingSnapshots = fileHistoryService.getSnapshots().slice(0, targetTurnIndex + 1);
-    fileHistoryService.restoreFromSnapshots(survivingSnapshots);
+    const survivingSnapshots = rewindFiles ? fileHistoryService.getSnapshots().slice(0, targetTurnIndex + 1) : void 0;
+    if (survivingSnapshots) {
+      fileHistoryService.restoreFromSnapshots(survivingSnapshots);
+    }
     this.config.getChatRecordingService()?.rewindRecording(
       targetTurnIndex,
       { truncatedCount: Math.max(0, apiHistory.length - apiTruncateIndex) },
@@ -152633,6 +152968,17 @@ var Session2 = class {
   captureHistorySnapshot() {
     return this.config.getGeminiClient().getChat().getHistoryShallow();
   }
+  getRewindableUserTurnCount() {
+    const apiHistory = this.captureHistorySnapshot();
+    const startIndex = getStartupContextLength(apiHistory);
+    let count = 0;
+    for (let i = startIndex; i < apiHistory.length; i++) {
+      if (this.#isUserTextContent(apiHistory[i])) {
+        count += 1;
+      }
+    }
+    return count;
+  }
   restoreHistory(history) {
     if (this.pendingPrompt || this.cronProcessing || this.cronAbortController || this.notificationProcessing || this.notificationAbortController) {
       throw RequestError.invalidParams(
@@ -154184,7 +154530,7 @@ ${this.pendingWorktreeNotice}
     await this.config.switchModel(
       selectedAuthType,
       parsed.modelId,
-      selectedAuthType !== previousAuthType && selectedAuthType === AuthType.QWEN_OAUTH ? { requireCachedCredentials: true } : void 0
+      selectedAuthType !== previousAuthType && selectedAuthType === "qwen-oauth" /* QWEN_OAUTH */ ? { requireCachedCredentials: true } : void 0
     );
     const after = this.config.getContentGeneratorConfig?.();
     const effectiveAuthType = after?.authType ?? selectedAuthType;
@@ -155144,6 +155490,7 @@ ${this.pendingWorktreeNotice}
     if (!("outputHistoryItems" in result)) {
       return;
     }
+    let hasActiveGoalStatus = false;
     for (const item of result.outputHistoryItems ?? []) {
       if (item.type === "goal_status" /* GOAL_STATUS */) {
         this.emitGoalStatus({
@@ -155154,8 +155501,14 @@ ${this.pendingWorktreeNotice}
           ...item.durationMs !== void 0 ? { durationMs: item.durationMs } : {},
           ...item.lastReason !== void 0 ? { lastReason: item.lastReason } : {}
         });
+        if (!isTerminalGoalStatusKind(item.kind)) {
+          hasActiveGoalStatus = true;
+        }
       }
     }
+    if (hasActiveGoalStatus) {
+      this.#installGoalTerminalObserver();
+    }
   }
   /**
    * Processes the result of a slash command execution.
@@ -156274,10 +156627,8 @@ function readProviderModels(settings, protocol) {
   const modelProviders = toRecord(
     settings.merged["modelProviders"]
   );
-  const entry = modelProviders[protocol];
-  const entryRecord = typeof entry === "object" && entry !== null ? entry : void 0;
-  const models = Array.isArray(entry) ? entry : Array.isArray(entryRecord?.["models"]) ? entryRecord["models"] : [];
-  return models.filter(isProviderModelConfig);
+  const models = modelProviders[protocol];
+  return Array.isArray(models) ? models.filter(isProviderModelConfig) : [];
 }
 __name(readProviderModels, "readProviderModels");
 function findExistingProviderModels(config, settings) {
@@ -157063,6 +157414,19 @@ function normalizeAcpSessionListSize(value) {
   return Math.min(Math.max(value, 1), MAX_ACP_SESSION_PAGE_SIZE);
 }
 __name(normalizeAcpSessionListSize, "normalizeAcpSessionListSize");
+function parseAcpSessionListCursor(value) {
+  if (value == null || value === "") return void 0;
+  const trimmed = value.trim();
+  const parsedCursor = Number(trimmed);
+  if (trimmed === "" || !Number.isFinite(parsedCursor) || parsedCursor < 0 || parsedCursor > Number.MAX_SAFE_INTEGER) {
+    throw RequestError.invalidParams(
+      void 0,
+      `Invalid cursor: "${value}" is not a valid numeric cursor`
+    );
+  }
+  return parsedCursor;
+}
+__name(parseAcpSessionListCursor, "parseAcpSessionListCursor");
 var QwenAgent = class {
   constructor(config, settings, argv, connection) {
     this.config = config;
@@ -157196,7 +157560,7 @@ var QwenAgent = class {
   async initialize(args) {
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.19.0";
+    const version = "0.19.1-nightly.20260624.a234860a4";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -157224,7 +157588,7 @@ var QwenAgent = class {
     };
   }
   async authenticate({ methodId }) {
-    const method = methodId;
+    const method = external_exports.nativeEnum(AuthType).parse(methodId);
     let authUri;
     const authUriHandler = /* @__PURE__ */ __name((deviceAuth) => {
       authUri = deviceAuth.verification_uri_complete;
@@ -157232,7 +157596,7 @@ var QwenAgent = class {
         _meta: { authUri }
       });
     }, "authUriHandler");
-    if (method === AuthType.QWEN_OAUTH) {
+    if (method === "qwen-oauth" /* QWEN_OAUTH */) {
       qwenOAuth2Events.once("auth-uri" /* AuthUri */, authUriHandler);
     }
     await clearCachedCredentialFile();
@@ -157244,7 +157608,7 @@ var QwenAgent = class {
         method
       );
     } finally {
-      if (method === AuthType.QWEN_OAUTH) {
+      if (method === "qwen-oauth" /* QWEN_OAUTH */) {
         qwenOAuth2Events.off("auth-uri" /* AuthUri */, authUriHandler);
       }
     }
@@ -157292,10 +157656,7 @@ var QwenAgent = class {
     await this.ensureAuthenticated(config);
     this.setupFileSystem(config);
     const sessionData = config.getResumedSessionData();
-    const session2 = await this.createAndStoreSession(
-      config,
-      sessionData?.conversation
-    );
+    const session2 = await this.createAndStoreSession(config, sessionData);
     await this.#restoreWorktreeOnResume(config, session2);
     const modesData = this.buildModesData(config);
     const availableModels = this.buildAvailableModels(config);
@@ -157326,7 +157687,11 @@ var QwenAgent = class {
     );
     await this.ensureAuthenticated(config);
     this.setupFileSystem(config);
-    const session2 = await this.createAndStoreSession(config);
+    const session2 = await this.createAndStoreSession(
+      config,
+      config.getResumedSessionData(),
+      { replayHistory: false }
+    );
     await this.#restoreWorktreeOnResume(config, session2);
     const modesData = this.buildModesData(config);
     const availableModels = this.buildAvailableModels(config);
@@ -157356,17 +157721,7 @@ var QwenAgent = class {
   }
   async unstable_listSessions(params) {
     const cwd5 = params.cwd || process.cwd();
-    let numericCursor;
-    if (params.cursor != null && params.cursor !== "") {
-      const parsedCursor = Number(params.cursor);
-      if (!Number.isFinite(parsedCursor)) {
-        throw RequestError.invalidParams(
-          void 0,
-          `Invalid cursor: "${params.cursor}" is not a valid numeric cursor`
-        );
-      }
-      numericCursor = parsedCursor;
-    }
+    const numericCursor = parseAcpSessionListCursor(params.cursor);
     const size = normalizeAcpSessionListSize(params._meta?.["size"]);
     const result = await runWithAcpRuntimeOutputDir(this.settings, cwd5, () => {
       const sessionService = new SessionService(cwd5);
@@ -158466,6 +158821,32 @@ var QwenAgent = class {
     const session2 = this.sessionOrThrow(sessionId);
     return buildSessionTasksStatus(sessionId, session2.getConfig());
   }
+  buildSessionLspStatus(sessionId) {
+    const session2 = this.sessionOrThrow(sessionId);
+    const config = session2.getConfig();
+    const snapshot = config.getLspStatusSnapshot();
+    return {
+      v: STATUS_SCHEMA_VERSION,
+      sessionId,
+      workspaceCwd: this.workspaceCwd(config),
+      enabled: snapshot.enabled,
+      configuredServers: snapshot.configuredServers,
+      readyServers: snapshot.readyServers,
+      failedServers: snapshot.failedServers,
+      inProgressServers: snapshot.inProgressServers,
+      notStartedServers: snapshot.notStartedServers,
+      ...snapshot.statusUnavailable ? { statusUnavailable: true } : {},
+      ...snapshot.initializationError ? { initializationError: snapshot.initializationError } : {},
+      servers: snapshot.servers.map((server) => ({
+        name: server.name,
+        status: server.status,
+        languages: server.languages,
+        ...server.transport ? { transport: server.transport } : {},
+        ...server.command ? { command: server.command } : {},
+        ...server.error ? { error: server.error } : {}
+      }))
+    };
+  }
   buildSessionStatsStatus(sessionId) {
     const session2 = this.sessionOrThrow(sessionId);
     const config = session2.getConfig();
@@ -159099,6 +159480,16 @@ var QwenAgent = class {
         }
         return this.buildSessionTasksStatus(sessionId);
       }
+      case SERVE_STATUS_EXT_METHODS.sessionLspStatus: {
+        const sessionId = params["sessionId"];
+        if (typeof sessionId !== "string" || sessionId.length === 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing sessionId"
+          );
+        }
+        return this.buildSessionLspStatus(sessionId);
+      }
       case SERVE_STATUS_EXT_METHODS.sessionStats: {
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || sessionId.length === 0) {
@@ -159126,11 +159517,12 @@ var QwenAgent = class {
         }
         const fhs = session2.getConfig().getFileHistoryService();
         const snapshots = fhs.getSnapshots();
+        const rewindableTurnCount = session2.getRewindableUserTurnCount();
         const prefix = sessionId + "########";
         const results = await Promise.all(
           snapshots.map((s, idx) => ({ s, idx })).filter(
             ({ s }) => s.promptId.startsWith(prefix) && /^\d+$/.test(s.promptId.slice(prefix.length))
-          ).map(async ({ s, idx }) => {
+          ).filter(({ idx }) => idx < rewindableTurnCount).map(async ({ s, idx }) => {
             const stats = await fhs.getDiffStats(s.promptId);
             return {
               promptId: s.promptId,
@@ -160136,10 +160528,13 @@ ${outputText}
             "Invalid or missing targetTurnIndex"
           );
         }
+        const rewindFiles = params["rewindFiles"] !== false;
         const historyBeforeRewind = session2.captureHistorySnapshot();
         let rewindResult;
         try {
-          rewindResult = session2.rewindToTurn(turnIndex);
+          rewindResult = session2.rewindToTurn(turnIndex, {
+            rewindFiles
+          });
         } catch (err) {
           if (err instanceof RequestError) {
             const msg = err.message;
@@ -160158,7 +160553,6 @@ ${outputText}
         }
         let filesChanged = [];
         let filesFailed = [];
-        const rewindFiles = params["rewindFiles"] !== false;
         if (rewindFiles && promptId) {
           const fhs = session2.getConfig().getFileHistoryService();
           try {
@@ -160790,7 +161184,7 @@ ${outputText}
     );
     config.setFileSystemService(acpFileSystemService);
   }
-  async createAndStoreSession(config, conversation) {
+  async createAndStoreSession(config, sessionData, options = {}) {
     const sessionId = config.getSessionId();
     const geminiClient = config.getGeminiClient();
     const needsInitialize = !geminiClient.isInitialized();
@@ -160808,8 +161202,11 @@ ${outputText}
     setTimeout(async () => {
       await session2.sendAvailableCommandsUpdate();
     }, 0);
-    if (conversation && conversation.messages) {
-      await session2.replayHistory(conversation.messages);
+    if (sessionData?.fileHistorySnapshots?.length) {
+      config.getFileHistoryService().restoreFromSnapshots(sessionData.fileHistorySnapshots);
+    }
+    if (options.replayHistory !== false && sessionData?.conversation.messages) {
+      await session2.replayHistory(sessionData.conversation.messages);
     }
     session2.installRewriter();
     session2.startCronScheduler();
@@ -161449,7 +161846,7 @@ ${finalArgs[promptIndex + 1]}`;
       process.exit(0);
     }
     if (config.isInteractive()) {
-      void import("./chunks/scheduler-PNPG5WJ3.js").then((m) => m.startBackgroundHousekeeping(config, settings)).catch((err) => {
+      void import("./chunks/scheduler-XUBHNI2Z.js").then((m) => m.startBackgroundHousekeeping(config, settings)).catch((err) => {
         debugLogger92.warn("failed to start background housekeeping:", err);
       });
     }
@@ -161464,7 +161861,7 @@ ${finalArgs[promptIndex + 1]}`;
         }),
         ...getSettingsWarnings(settings),
         ...config.getWarnings(),
-        ...config.getModelsConfig().getCurrentAuthType() === AuthType.QWEN_OAUTH ? [
+        ...config.getModelsConfig().getCurrentAuthType() === "qwen-oauth" /* QWEN_OAUTH */ ? [
           "Qwen OAuth free tier was discontinued on 2026-04-15. Run /auth to switch to Coding Plan or another provider."
         ] : []
       ])
@@ -161720,10 +162117,9 @@ main().catch((error) => {
  * Copyright 2025 Qwen
  * SPDX-License-Identifier: Apache-2.0
  *
- * Inspired by gemini-cli's MouseContext (Google LLC, Apache-2.0) but
- * collapsed for our single-consumer case: enable SGR mouse mode on
- * mount, parse mouse sequences out of the KeypressContext pipeline,
- * call the handler, restore on unmount.
+ * Inspired by gemini-cli's MouseContext (Google LLC, Apache-2.0): enable SGR
+ * mouse mode while at least one subscriber is active, parse mouse sequences
+ * out of the KeypressContext pipeline, call each handler, restore on cleanup.
  */
 /**
  * @license