@rdmind/rdmind 0.0.27 → 0.0.28-alpha.0

package/cli.js

@@ -26868,7 +26868,7 @@ var require_backend = __commonJS({
                     return [b, function() {
                     }];
                   }, "useReducer"),
-                  useRef: /* @__PURE__ */ __name(function useRef21(a) {
+                  useRef: /* @__PURE__ */ __name(function useRef22(a) {
                     var b = C();
                     a = null !== b ? b.memoizedState : {
                       current: a
@@ -26880,7 +26880,7 @@ var require_backend = __commonJS({
                     });
                     return a;
                   }, "useRef"),
-                  useState: /* @__PURE__ */ __name(function useState67(a) {
+                  useState: /* @__PURE__ */ __name(function useState66(a) {
                     var b = C();
                     a = null !== b ? b.memoizedState : "function" === typeof a ? a() : a;
                     x.push({
@@ -98064,7 +98064,7 @@ function isDeviceTokenPending(response) {
 function isErrorResponse(response) {
   return "error" in response;
 }
-async function getQwenOAuthClient(config) {
+async function getQwenOAuthClient(config, options2) {
   const client = new QwenOAuth2Client();
   const sharedManager = SharedTokenManager.getInstance();
   try {
@@ -98072,10 +98072,6 @@ async function getQwenOAuthClient(config) {
     client.setCredentials(credentials);
     return client;
   } catch (error) {
-    console.debug(
-      "Shared token manager failed, attempting device flow:",
-      error
-    );
     if (error instanceof TokenManagerError) {
       switch (error.type) {
         case "NO_REFRESH_TOKEN" /* NO_REFRESH_TOKEN */:
@@ -98098,10 +98094,16 @@ async function getQwenOAuthClient(config) {
     if (await loadCachedQwenCredentials(client)) {
       const result2 = await authWithQwenDeviceFlow(client, config);
       if (!result2.success) {
-        throw new Error("Qwen OAuth authentication failed");
+        const errorMessage = result2.message || "Qwen OAuth authentication failed";
+        throw new Error(errorMessage);
       }
       return client;
     }
+    if (options2?.requireCachedCredentials) {
+      throw new Error(
+        "No cached Qwen-OAuth credentials found. Please re-authenticate."
+      );
+    }
     const result = await authWithQwenDeviceFlow(client, config);
     if (!result.success) {
       if (result.reason === "timeout") {
@@ -98111,19 +98113,20 @@ async function getQwenOAuthClient(config) {
           "Authentication timed out. Please try again or select a different authentication method."
         );
       }
-      switch (result.reason) {
-        case "timeout":
-          throw new Error("Qwen OAuth authentication timed out");
-        case "cancelled":
-          throw new Error("Qwen OAuth authentication was cancelled by user");
-        case "rate_limit":
-          throw new Error(
-            "Too many request for Qwen OAuth authentication, please try again later."
-          );
-        case "error":
-        default:
-          throw new Error("Qwen OAuth authentication failed");
-      }
+      const errorMessage = result.message || (() => {
+        switch (result.reason) {
+          case "timeout":
+            return "Qwen OAuth authentication timed out";
+          case "cancelled":
+            return "Qwen OAuth authentication was cancelled by user";
+          case "rate_limit":
+            return "Too many request for Qwen OAuth authentication, please try again later.";
+          case "error":
+          default:
+            return "Qwen OAuth authentication failed";
+        }
+      })();
+      throw new Error(errorMessage);
     }
     return client;
   }
@@ -98187,13 +98190,10 @@ ${deviceAuth.verification_uri_complete}
     );
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       if (isCancelled) {
-        console.debug("\nAuthentication cancelled by user.");
-        qwenOAuth2Events.emit(
-          "auth-progress" /* AuthProgress */,
-          "error",
-          "Authentication cancelled by user."
-        );
-        return { success: false, reason: "cancelled" };
+        const message = "Authentication cancelled by user.";
+        console.debug("\n" + message);
+        qwenOAuth2Events.emit("auth-progress" /* AuthProgress */, "error", message);
+        return { success: false, reason: "cancelled", message };
       }
       try {
         console.debug("polling for token...");
@@ -98255,13 +98255,14 @@ Server requested to slow down, increasing poll interval to ${pollInterval}ms'`
             }, checkInterval);
           });
           if (isCancelled) {
-            console.debug("\nAuthentication cancelled by user.");
+            const message = "Authentication cancelled by user.";
+            console.debug("\n" + message);
             qwenOAuth2Events.emit(
               "auth-progress" /* AuthProgress */,
               "error",
-              "Authentication cancelled by user."
+              message
             );
-            return { success: false, reason: "cancelled" };
+            return { success: false, reason: "cancelled", message };
           }
           continue;
         }
@@ -98274,25 +98275,36 @@ Server requested to slow down, increasing poll interval to ${pollInterval}ms'`
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         const statusCode = error instanceof Error ? error.status : null;
+        const handleError2 = /* @__PURE__ */ __name((reason, message2, eventType = "error") => {
+          qwenOAuth2Events.emit(
+            "auth-progress" /* AuthProgress */,
+            eventType,
+            message2
+          );
+          console.error("\n" + message2);
+          return { success: false, reason, message: message2 };
+        }, "handleError");
+        if (errorMessage.includes("Failed to cache credentials")) {
+          return handleError2("error", errorMessage);
+        }
         if (errorMessage.includes("401") || statusCode === 401) {
-          const message2 = "Device code expired or invalid, please restart the authorization process.";
-          qwenOAuth2Events.emit("auth-progress" /* AuthProgress */, "error", message2);
-          return { success: false, reason: "error" };
+          return handleError2(
+            "error",
+            "Device code expired or invalid, please restart the authorization process."
+          );
         }
         if (errorMessage.includes("429") || statusCode === 429) {
-          const message2 = "Too many requests. The server is rate limiting our requests. Please select a different authentication method or try again later.";
-          qwenOAuth2Events.emit(
-            "auth-progress" /* AuthProgress */,
+          return handleError2(
             "rate_limit",
-            message2
+            "Too many requests. The server is rate limiting our requests. Please select a different authentication method or try again later.",
+            "rate_limit"
           );
-          console.log("\n" + message2);
-          return { success: false, reason: "rate_limit" };
         }
         const message = `Error polling for token: ${errorMessage}`;
         qwenOAuth2Events.emit("auth-progress" /* AuthProgress */, "error", message);
         if (isCancelled) {
-          return { success: false, reason: "cancelled" };
+          const message2 = "Authentication cancelled by user.";
+          return { success: false, reason: "cancelled", message: message2 };
         }
         await new Promise((resolve26) => setTimeout(resolve26, pollInterval));
       }
@@ -98304,11 +98316,12 @@ Server requested to slow down, increasing poll interval to ${pollInterval}ms'`
       timeoutMessage
     );
     console.error("\n" + timeoutMessage);
-    return { success: false, reason: "timeout" };
+    return { success: false, reason: "timeout", message: timeoutMessage };
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    console.error("Device authorization flow failed:", errorMessage);
-    return { success: false, reason: "error" };
+    const message = `Device authorization flow failed: ${errorMessage}`;
+    console.error(message);
+    return { success: false, reason: "error", message };
   } finally {
     qwenOAuth2Events.off("auth-cancel" /* AuthCancel */, cancelHandler);
   }
@@ -98330,9 +98343,22 @@ async function loadCachedQwenCredentials(client) {
 }
 async function cacheQwenCredentials(credentials) {
   const filePath = getQwenCachedCredentialPath();
-  await fs11.mkdir(path7.dirname(filePath), { recursive: true });
-  const credString = JSON.stringify(credentials, null, 2);
-  await fs11.writeFile(filePath, credString);
+  try {
+    await fs11.mkdir(path7.dirname(filePath), { recursive: true });
+    const credString = JSON.stringify(credentials, null, 2);
+    await fs11.writeFile(filePath, credString);
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    const errorCode = error instanceof Error && "code" in error ? error.code : void 0;
+    if (errorCode === "EACCES") {
+      throw new Error(
+        `Failed to cache credentials: Permission denied (EACCES). Current user has no permission to access \`${filePath}\`. Please check permissions.`
+      );
+    }
+    throw new Error(
+      `Failed to cache credentials: error when creating folder \`${path7.dirname(filePath)}\` and writing to \`${filePath}\`. ${errorMessage}. Please check permissions.`
+    );
+  }
 }
 async function clearQwenCredentials() {
   try {
@@ -114160,7 +114186,7 @@ function makeChatCompressionEvent({
     tokens_after
   };
 }
-var StartSessionEvent, EndSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiErrorEvent, ApiCancelEvent, ApiResponseEvent, FlashFallbackEvent, RipgrepFallbackEvent, LoopDetectedEvent, LoopDetectionDisabledEvent, NextSpeakerCheckEvent, IdeConnectionEvent, ConversationFinishedEvent, KittySequenceOverflowEvent, FileOperationEvent, ContentRetryEvent, ContentRetryFailureEvent, ExtensionInstallEvent, ToolOutputTruncatedEvent, ExtensionUninstallEvent, ExtensionEnableEvent, ModelSlashCommandEvent, SubagentExecutionEvent, ExtensionDisableEvent;
+var StartSessionEvent, EndSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiErrorEvent, ApiCancelEvent, ApiResponseEvent, FlashFallbackEvent, RipgrepFallbackEvent, LoopDetectedEvent, LoopDetectionDisabledEvent, NextSpeakerCheckEvent, IdeConnectionEvent, ConversationFinishedEvent, KittySequenceOverflowEvent, FileOperationEvent, ContentRetryEvent, ContentRetryFailureEvent, ExtensionInstallEvent, ToolOutputTruncatedEvent, ExtensionUninstallEvent, ExtensionEnableEvent, ModelSlashCommandEvent, SubagentExecutionEvent, AuthEvent, ExtensionDisableEvent;
 var init_types3 = __esm({
   "packages/core/src/telemetry/types.ts"() {
     "use strict";
@@ -114698,6 +114724,25 @@ var init_types3 = __esm({
         this.execution_summary = options2?.execution_summary;
       }
     };
+    AuthEvent = class {
+      static {
+        __name(this, "AuthEvent");
+      }
+      "event.name";
+      "event.timestamp";
+      auth_type;
+      action_type;
+      status;
+      error_message;
+      constructor(auth_type, action_type, status, error_message) {
+        this["event.name"] = "auth";
+        this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
+        this.auth_type = auth_type;
+        this.action_type = action_type;
+        this.status = status;
+        this.error_message = error_message;
+      }
+    };
     ExtensionDisableEvent = class {
       static {
         __name(this, "ExtensionDisableEvent");
@@ -117112,7 +117157,7 @@ var init_esm = __esm({
 });
 
 // packages/core/src/telemetry/constants.ts
-var SERVICE_NAME, EVENT_USER_PROMPT, EVENT_TOOL_CALL, EVENT_API_REQUEST, EVENT_API_ERROR, EVENT_API_CANCEL, EVENT_API_RESPONSE, EVENT_CLI_CONFIG, EVENT_EXTENSION_DISABLE, EVENT_EXTENSION_ENABLE, EVENT_EXTENSION_INSTALL, EVENT_EXTENSION_UNINSTALL, EVENT_FLASH_FALLBACK, EVENT_RIPGREP_FALLBACK, EVENT_NEXT_SPEAKER_CHECK, EVENT_SLASH_COMMAND, EVENT_IDE_CONNECTION, EVENT_CHAT_COMPRESSION, EVENT_CONTENT_RETRY, EVENT_CONTENT_RETRY_FAILURE, EVENT_CONVERSATION_FINISHED, EVENT_FILE_OPERATION, EVENT_MODEL_SLASH_COMMAND, EVENT_SUBAGENT_EXECUTION;
+var SERVICE_NAME, EVENT_USER_PROMPT, EVENT_TOOL_CALL, EVENT_API_REQUEST, EVENT_API_ERROR, EVENT_API_CANCEL, EVENT_API_RESPONSE, EVENT_CLI_CONFIG, EVENT_EXTENSION_DISABLE, EVENT_EXTENSION_ENABLE, EVENT_EXTENSION_INSTALL, EVENT_EXTENSION_UNINSTALL, EVENT_FLASH_FALLBACK, EVENT_RIPGREP_FALLBACK, EVENT_NEXT_SPEAKER_CHECK, EVENT_SLASH_COMMAND, EVENT_IDE_CONNECTION, EVENT_CHAT_COMPRESSION, EVENT_CONTENT_RETRY, EVENT_CONTENT_RETRY_FAILURE, EVENT_CONVERSATION_FINISHED, EVENT_FILE_OPERATION, EVENT_MODEL_SLASH_COMMAND, EVENT_SUBAGENT_EXECUTION, EVENT_AUTH;
 var init_constants = __esm({
   "packages/core/src/telemetry/constants.ts"() {
     "use strict";
@@ -117141,6 +117186,7 @@ var init_constants = __esm({
     EVENT_FILE_OPERATION = "rdmind.file_operation";
     EVENT_MODEL_SLASH_COMMAND = "rdmind.slash_command.model";
     EVENT_SUBAGENT_EXECUTION = "rdmind.subagent_execution";
+    EVENT_AUTH = "rdmind.auth";
   }
 });
 
@@ -121202,6 +121248,21 @@ var init_qwen_logger = __esm({
         this.enqueueLogEvent(rumEvent);
         this.flushIfNeeded();
       }
+      logAuthEvent(event) {
+        const snapshots = {
+          auth_type: event.auth_type,
+          action_type: event.action_type,
+          status: event.status
+        };
+        if (event.error_message) {
+          snapshots["error_message"] = event.error_message;
+        }
+        const rumEvent = this.createActionEvent("auth", "auth", {
+          snapshots: JSON.stringify(snapshots)
+        });
+        this.enqueueLogEvent(rumEvent);
+        this.flushIfNeeded();
+      }
       // misc events
       logFlashFallbackEvent(event) {
         const rumEvent = this.createActionEvent("misc", "flash_fallback", {
@@ -171730,6 +171791,28 @@ function logExtensionDisable(config, event) {
   };
   logger6.emit(logRecord);
 }
+function logAuth(config, event) {
+  QwenLogger.getInstance(config)?.logAuthEvent(event);
+  if (!isTelemetrySdkInitialized()) return;
+  const attributes = {
+    ...getCommonAttributes(config),
+    ...event,
+    "event.name": EVENT_AUTH,
+    "event.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
+    auth_type: event.auth_type,
+    action_type: event.action_type,
+    status: event.status
+  };
+  if (event.error_message) {
+    attributes["error.message"] = event.error_message;
+  }
+  const logger6 = import_api_logs.logs.getLogger(SERVICE_NAME);
+  const logRecord = {
+    body: `Auth event: ${event.action_type} ${event.status} for ${event.auth_type}`,
+    attributes
+  };
+  logger6.emit(logRecord);
+}
 var import_api_logs, shouldLogUserPrompts;
 var init_loggers = __esm({
   "packages/core/src/telemetry/loggers.ts"() {
@@ -171773,6 +171856,7 @@ var init_loggers = __esm({
     __name(logExtensionUninstall, "logExtensionUninstall");
     __name(logExtensionEnable, "logExtensionEnable");
     __name(logExtensionDisable, "logExtensionDisable");
+    __name(logAuth, "logAuth");
   }
 });
 
@@ -183803,8 +183887,8 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
     model: newContentGeneratorConfig?.model || DEFAULT_QWEN_MODEL
   };
 }
-async function createContentGenerator(config, gcConfig, sessionId2) {
-  const version2 = "0.0.27";
+async function createContentGenerator(config, gcConfig, sessionId2, isInitialAuth) {
+  const version2 = "0.0.28-alpha.0";
   const userAgent2 = `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -183850,11 +183934,14 @@ async function createContentGenerator(config, gcConfig, sessionId2) {
     const { getQwenOAuthClient: getQwenOauthClient } = await Promise.resolve().then(() => (init_qwenOAuth2(), qwenOAuth2_exports));
     const { QwenContentGenerator: QwenContentGenerator2 } = await Promise.resolve().then(() => (init_qwenContentGenerator(), qwenContentGenerator_exports));
     try {
-      const qwenClient = await getQwenOauthClient(gcConfig);
+      const qwenClient = await getQwenOauthClient(
+        gcConfig,
+        isInitialAuth ? { requireCachedCredentials: true } : void 0
+      );
       return new QwenContentGenerator2(qwenClient, config, gcConfig);
     } catch (error) {
       throw new Error(
-        `Failed to initialize Qwen: ${error instanceof Error ? error.message : String(error)}`
+        `${error instanceof Error ? error.message : String(error)}`
       );
     }
   }
@@ -234346,7 +234433,7 @@ function getPlatformString(platform15) {
     case "win32":
       return platform15;
     default:
-      throw new Error(`Unsupported platform: ${platform15}`);
+      return void 0;
   }
 }
 function getArchitectureString(arch3) {
@@ -234355,12 +234442,15 @@ function getArchitectureString(arch3) {
     case "arm64":
       return arch3;
     default:
-      throw new Error(`Unsupported architecture: ${arch3}`);
+      return void 0;
   }
 }
-function getRipgrepPath() {
+function getBuiltinRipgrep() {
   const platform15 = getPlatformString(process.platform);
   const arch3 = getArchitectureString(process.arch);
+  if (!platform15 || !arch3) {
+    return null;
+  }
   const binaryName = platform15 === "win32" ? "rg.exe" : "rg";
   const isBundled = !__filename2.includes(path39.join("src", "utils"));
   const vendorPath = isBundled ? path39.join(
@@ -234381,32 +234471,36 @@ function getRipgrepPath() {
   );
   return vendorPath;
 }
-async function canUseRipgrep(useBuiltin = true) {
+async function getSystemRipgrep() {
   try {
-    if (useBuiltin) {
-      const rgPath = getRipgrepPath();
-      if (await fileExists(rgPath)) {
-        return true;
-      }
-    }
     const { spawn: spawn13 } = await import("node:child_process");
-    return await new Promise((resolve26) => {
-      const proc2 = spawn13("rg", ["--version"]);
+    const rgCommand = process.platform === "win32" ? "rg.exe" : "rg";
+    const isAvailable = await new Promise((resolve26) => {
+      const proc2 = spawn13(rgCommand, ["--version"]);
       proc2.on("error", () => resolve26(false));
       proc2.on("exit", (code2) => resolve26(code2 === 0));
     });
+    return isAvailable ? rgCommand : null;
   } catch (_error) {
-    return false;
+    return null;
   }
 }
-async function ensureRipgrepPath() {
-  const rgPath = getRipgrepPath();
-  if (!await fileExists(rgPath)) {
-    throw new Error(
-      `Ripgrep binary not found at ${rgPath}. Platform: ${process.platform}, Architecture: ${process.arch}`
-    );
+async function getRipgrepCommand(useBuiltin = true) {
+  try {
+    if (useBuiltin) {
+      const rgPath = getBuiltinRipgrep();
+      if (rgPath && await fileExists(rgPath)) {
+        return rgPath;
+      }
+    }
+    return await getSystemRipgrep();
+  } catch (_error) {
+    return null;
   }
-  return rgPath;
+}
+async function canUseRipgrep(useBuiltin = true) {
+  const rgPath = await getRipgrepCommand(useBuiltin);
+  return rgPath !== null;
 }
 var __filename2, __dirname3;
 var init_ripgrepUtils = __esm({
@@ -234418,16 +234512,16 @@ var init_ripgrepUtils = __esm({
     __dirname3 = path39.dirname(__filename2);
     __name(getPlatformString, "getPlatformString");
     __name(getArchitectureString, "getArchitectureString");
-    __name(getRipgrepPath, "getRipgrepPath");
+    __name(getBuiltinRipgrep, "getBuiltinRipgrep");
+    __name(getSystemRipgrep, "getSystemRipgrep");
+    __name(getRipgrepCommand, "getRipgrepCommand");
     __name(canUseRipgrep, "canUseRipgrep");
-    __name(ensureRipgrepPath, "ensureRipgrepPath");
   }
 });
 
 // packages/core/src/tools/ripGrep.ts
 import fs36 from "node:fs";
 import path40 from "node:path";
-import { EOL as EOL3 } from "node:os";
 import { spawn as spawn6 } from "node:child_process";
 var GrepToolInvocation2, RipGrepTool;
 var init_ripGrep = __esm({
@@ -234469,7 +234563,7 @@ var init_ripGrep = __esm({
             const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${filterDescription}.`;
             return { llmContent: noMatchMsg, returnDisplay: `No matches found` };
           }
-          const allLines = rawOutput.split(EOL3).filter((line) => line.trim());
+          const allLines = rawOutput.split("\n").filter((line) => line.trim());
           const totalMatches = allLines.length;
           const matchTerm = totalMatches === 1 ? "match" : "matches";
           const header = `Found ${totalMatches} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${filterDescription}:
@@ -234527,7 +234621,7 @@ var init_ripGrep = __esm({
             returnDisplay: displayMessage
           };
         } catch (error) {
-          console.error(`Error during GrepLogic execution: ${error}`);
+          console.error(`Error during ripgrep search operation: ${error}`);
           const errorMessage = getErrorMessage(error);
           return {
             llmContent: `Error during grep search operation: ${errorMessage}`,
@@ -234564,9 +234658,14 @@ var init_ripGrep = __esm({
         rgArgs.push("--threads", "4");
         rgArgs.push(absolutePath);
         try {
-          const rgPath = this.config.getUseBuiltinRipgrep() ? await ensureRipgrepPath() : "rg";
+          const rgCommand = await getRipgrepCommand(
+            this.config.getUseBuiltinRipgrep()
+          );
+          if (!rgCommand) {
+            throw new Error("ripgrep binary not found.");
+          }
           const output = await new Promise((resolve26, reject) => {
-            const child = spawn6(rgPath, rgArgs, {
+            const child = spawn6(rgCommand, rgArgs, {
               windowsHide: true
             });
             const stdoutChunks = [];
@@ -234581,7 +234680,7 @@ var init_ripGrep = __esm({
             child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
             child.on("error", (err) => {
               options2.signal.removeEventListener("abort", cleanup);
-              reject(new Error(`Failed to start ripgrep: ${err.message}.`));
+              reject(new Error(`failed to start ripgrep: ${err.message}.`));
             });
             child.on("close", (code2) => {
               options2.signal.removeEventListener("abort", cleanup);
@@ -234600,7 +234699,7 @@ var init_ripGrep = __esm({
           });
           return output;
         } catch (error) {
-          console.error(`GrepLogic: ripgrep failed: ${getErrorMessage(error)}`);
+          console.error(`Ripgrep failed: ${getErrorMessage(error)}`);
           throw error;
         }
       }
@@ -248130,7 +248229,7 @@ var init_config3 = __esm({
           this._generationConfig.model = credentials.model;
         }
       }
-      async refreshAuth(authMethod) {
+      async refreshAuth(authMethod, isInitialAuth) {
         if (this.contentGeneratorConfig?.authType === "gemini-api-key" /* USE_GEMINI */ && authMethod === "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
           this.geminiClient.stripThoughtsFromHistory();
         }
@@ -248142,7 +248241,8 @@ var init_config3 = __esm({
         this.contentGenerator = await createContentGenerator(
           newContentGeneratorConfig,
           this,
-          this.getSessionId()
+          this.getSessionId(),
+          isInitialAuth
         );
         this.contentGeneratorConfig = newContentGeneratorConfig;
         this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
@@ -320560,7 +320660,7 @@ function CompressionMessage({
       case 3 /* COMPRESSION_FAILED_TOKEN_COUNT_ERROR */:
         return "Could not compress chat history due to a token counting error.";
       case 5 /* NOOP */:
-        return "Chat history is already compressed.";
+        return "Nothing to compress.";
       default:
         return "";
     }
@@ -330885,6 +330985,7 @@ function saveSettings(settingsFile) {
     );
   } catch (error) {
     console.error("Error saving user settings file:", error);
+    throw error;
   }
 }
 __name(saveSettings, "saveSettings");
@@ -332071,53 +332172,13 @@ function SettingsDialog({
 }
 __name(SettingsDialog, "SettingsDialog");
 
-// packages/cli/src/ui/auth/AuthInProgress.tsx
-init_esbuild_shims();
-var import_react73 = __toESM(require_react(), 1);
-var import_jsx_runtime71 = __toESM(require_jsx_runtime(), 1);
-function AuthInProgress({
-  onTimeout
-}) {
-  const [timedOut, setTimedOut] = (0, import_react73.useState)(false);
-  useKeypress(
-    (key) => {
-      if (key.name === "escape" || key.ctrl && key.name === "c") {
-        onTimeout();
-      }
-    },
-    { isActive: true }
-  );
-  (0, import_react73.useEffect)(() => {
-    const timer = setTimeout(() => {
-      setTimedOut(true);
-      onTimeout();
-    }, 18e4);
-    return () => clearTimeout(timer);
-  }, [onTimeout]);
-  return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
-    Box_default,
-    {
-      borderStyle: "round",
-      borderColor: theme.border.default,
-      flexDirection: "column",
-      padding: 1,
-      width: "100%",
-      children: timedOut ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: theme.status.error, children: "Authentication timed out. Please try again." }) : /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Text, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(build_default, { type: "dots" }),
-        " Waiting for auth... (Press ESC or CTRL+C to cancel)"
-      ] }) })
-    }
-  );
-}
-__name(AuthInProgress, "AuthInProgress");
-
 // packages/cli/src/ui/components/QwenOAuthProgress.tsx
 init_esbuild_shims();
-var import_react75 = __toESM(require_react(), 1);
+var import_react74 = __toESM(require_react(), 1);
 
 // node_modules/ink-link/dist/index.js
 init_esbuild_shims();
-var import_react74 = __toESM(require_react(), 1);
+var import_react73 = __toESM(require_react(), 1);
 var import_prop_types2 = __toESM(require_prop_types(), 1);
 
 // node_modules/terminal-link/index.js
@@ -332265,10 +332326,10 @@ terminalLink.stderr.isSupported = import_supports_hyperlinks.default.stderr;
 // node_modules/ink-link/dist/index.js
 var Link = /* @__PURE__ */ __name(({ children, url: url2, fallback = true }) => (
   // eslint-disable-line react/function-component-definition
-  import_react74.default.createElement(
+  import_react73.default.createElement(
     Transform,
     { transform: /* @__PURE__ */ __name((children2) => terminalLink(children2, url2, { fallback }), "transform") },
-    import_react74.default.createElement(Text, null, children)
+    import_react73.default.createElement(Text, null, children)
   )
 ), "Link");
 Link.propTypes = {
@@ -332284,7 +332345,7 @@ var dist_default5 = Link;
 
 // packages/cli/src/ui/components/QwenOAuthProgress.tsx
 var import_qrcode_terminal = __toESM(require_main2(), 1);
-var import_jsx_runtime72 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime71 = __toESM(require_jsx_runtime(), 1);
 function QrCodeDisplay({
   verificationUrl,
   qrCodeData
@@ -332292,7 +332353,7 @@ function QrCodeDisplay({
   if (!qrCodeData) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
     Box_default,
     {
       borderStyle: "round",
@@ -332301,11 +332362,11 @@ function QrCodeDisplay({
       padding: 1,
       width: "100%",
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { bold: true, color: Colors.AccentBlue, children: "Qwen OAuth Authentication" }),
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { children: "Please visit this URL to authorize:" }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(dist_default5, { url: verificationUrl, fallback: false, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { color: Colors.AccentGreen, bold: true, children: verificationUrl }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { children: "Or scan the QR code below:" }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { children: qrCodeData }) })
+        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { bold: true, color: Colors.AccentBlue, children: "Qwen OAuth Authentication" }),
+        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { children: "Please visit this URL to authorize:" }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(dist_default5, { url: verificationUrl, fallback: false, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: Colors.AccentGreen, bold: true, children: verificationUrl }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { children: "Or scan the QR code below:" }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { children: qrCodeData }) })
       ]
     }
   );
@@ -332320,7 +332381,7 @@ function StatusDisplay({
     const remainingSeconds = seconds % 60;
     return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`;
   }, "formatTime");
-  return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
     Box_default,
     {
       borderStyle: "round",
@@ -332329,17 +332390,17 @@ function StatusDisplay({
       padding: 1,
       width: "100%",
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Text, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(build_default, { type: "dots" }),
+        /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Text, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(build_default, { type: "dots" }),
           " Waiting for authorization",
           dots
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Box_default, { marginTop: 1, justifyContent: "space-between", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Text, { color: Colors.Gray, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Box_default, { marginTop: 1, justifyContent: "space-between", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Text, { color: Colors.Gray, children: [
             "Time remaining: ",
             formatTime(timeRemaining)
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { color: Colors.AccentPurple, children: "(Press ESC or CTRL+C to cancel)" })
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: Colors.AccentPurple, children: "(Press ESC or CTRL+C to cancel)" })
         ] })
       ]
     }
@@ -332354,12 +332415,12 @@ function QwenOAuthProgress({
   authMessage
 }) {
   const defaultTimeout = deviceAuth?.expires_in || 300;
-  const [timeRemaining, setTimeRemaining] = (0, import_react75.useState)(defaultTimeout);
-  const [dots, setDots] = (0, import_react75.useState)("");
-  const [qrCodeData, setQrCodeData] = (0, import_react75.useState)(null);
+  const [timeRemaining, setTimeRemaining] = (0, import_react74.useState)(defaultTimeout);
+  const [dots, setDots] = (0, import_react74.useState)("");
+  const [qrCodeData, setQrCodeData] = (0, import_react74.useState)(null);
   useKeypress(
     (key) => {
-      if (authStatus === "timeout") {
+      if (authStatus === "timeout" || authStatus === "error") {
         onCancel();
       } else if (key.name === "escape" || key.ctrl && key.name === "c") {
         onCancel();
@@ -332367,7 +332428,7 @@ function QwenOAuthProgress({
     },
     { isActive: true }
   );
-  (0, import_react75.useEffect)(() => {
+  (0, import_react74.useEffect)(() => {
     if (!deviceAuth?.verification_uri_complete) {
       return;
     }
@@ -332387,7 +332448,7 @@ function QwenOAuthProgress({
     }, "generateQR");
     generateQR();
   }, [deviceAuth?.verification_uri_complete]);
-  (0, import_react75.useEffect)(() => {
+  (0, import_react74.useEffect)(() => {
     const timer = setInterval(() => {
       setTimeRemaining((prev) => {
         if (prev <= 1) {
@@ -332399,7 +332460,7 @@ function QwenOAuthProgress({
     }, 1e3);
     return () => clearInterval(timer);
   }, [onTimeout]);
-  (0, import_react75.useEffect)(() => {
+  (0, import_react74.useEffect)(() => {
     const dotsTimer = setInterval(() => {
       setDots((prev) => {
         if (prev.length >= 3) return "";
@@ -332408,9 +332469,9 @@ function QwenOAuthProgress({
     }, 500);
     return () => clearInterval(dotsTimer);
   }, []);
-  const qrCodeDisplay = (0, import_react75.useMemo)(() => {
+  const qrCodeDisplay = (0, import_react74.useMemo)(() => {
     if (!deviceAuth?.verification_uri_complete) return null;
-    return /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
       QrCodeDisplay,
       {
         verificationUrl: deviceAuth.verification_uri_complete,
@@ -332419,7 +332480,7 @@ function QwenOAuthProgress({
     );
   }, [deviceAuth?.verification_uri_complete, qrCodeData]);
   if (authStatus === "timeout") {
-    return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(
+    return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
       Box_default,
       {
         borderStyle: "round",
@@ -332428,15 +332489,32 @@ function QwenOAuthProgress({
         padding: 1,
         width: "100%",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { bold: true, color: Colors.AccentRed, children: "Qwen OAuth Authentication Timeout" }),
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { children: authMessage || `OAuth token expired (over ${defaultTimeout} seconds). Please select authentication method again.` }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { color: Colors.Gray, children: "Press any key to return to authentication type selection." }) })
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { bold: true, color: Colors.AccentRed, children: "Qwen OAuth Authentication Timeout" }),
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { children: authMessage || `OAuth token expired (over ${defaultTimeout} seconds). Please select authentication method again.` }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: Colors.Gray, children: "Press any key to return to authentication type selection." }) })
+        ]
+      }
+    );
+  }
+  if (authStatus === "error") {
+    return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
+      Box_default,
+      {
+        borderStyle: "round",
+        borderColor: Colors.AccentRed,
+        flexDirection: "column",
+        padding: 1,
+        width: "100%",
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { bold: true, color: Colors.AccentRed, children: "Qwen OAuth Authentication Error" }),
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { children: authMessage || "An error occurred during authentication. Please try again." }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: Colors.Gray, children: "Press any key to return to authentication type selection." }) })
         ]
       }
     );
   }
   if (!deviceAuth) {
-    return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(
+    return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
       Box_default,
       {
         borderStyle: "round",
@@ -332445,26 +332523,26 @@ function QwenOAuthProgress({
         padding: 1,
         width: "100%",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Text, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(build_default, { type: "dots" }),
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Text, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(build_default, { type: "dots" }),
             " Waiting for Qwen OAuth authentication..."
           ] }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Box_default, { marginTop: 1, justifyContent: "space-between", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Text, { color: Colors.Gray, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Box_default, { marginTop: 1, justifyContent: "space-between", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Text, { color: Colors.Gray, children: [
               "Time remaining: ",
               Math.floor(timeRemaining / 60),
               ":",
               (timeRemaining % 60).toString().padStart(2, "0")
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { color: Colors.AccentPurple, children: "(Press ESC or CTRL+C to cancel)" })
+            /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: Colors.AccentPurple, children: "(Press ESC or CTRL+C to cancel)" })
           ] })
         ]
       }
     );
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(Box_default, { flexDirection: "column", width: "100%", children: [
     qrCodeDisplay,
-    /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(StatusDisplay, { timeRemaining, dots })
+    /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(StatusDisplay, { timeRemaining, dots })
   ] });
 }
 __name(QwenOAuthProgress, "QwenOAuthProgress");
@@ -332474,30 +332552,85 @@ init_esbuild_shims();
 var import_react77 = __toESM(require_react(), 1);
 init_core2();
 
-// packages/cli/src/config/auth.ts
+// packages/cli/src/ui/contexts/UIActionsContext.tsx
 init_esbuild_shims();
+var import_react76 = __toESM(require_react(), 1);
 init_core2();
-function validateAuthMethod(authMethod) {
-  const settings = loadSettings();
-  loadEnvironment(settings.merged);
-  if (authMethod === "openai" /* USE_OPENAI */) {
-    const hasApiKey = process.env["OPENAI_API_KEY"] || settings.merged.security?.auth?.apiKey;
-    if (!hasApiKey) {
-      return "OPENAI_API_KEY environment variable not found. You can enter it interactively or add it to your .env file.";
+
+// packages/cli/src/ui/components/ModelSwitchDialog.tsx
+init_esbuild_shims();
+var import_jsx_runtime72 = __toESM(require_jsx_runtime(), 1);
+var ModelSwitchDialog = /* @__PURE__ */ __name(({
+  onSelect
+}) => {
+  useKeypress(
+    (key) => {
+      if (key.name === "escape") {
+        onSelect("persist" /* ContinueWithCurrentModel */);
+      }
+    },
+    { isActive: true }
+  );
+  const options2 = [
+    {
+      key: "switch-once",
+      label: "Switch for this request only",
+      value: "once" /* SwitchOnce */
+    },
+    {
+      key: "switch-session",
+      label: "Switch session to vision model",
+      value: "session" /* SwitchSessionToVL */
+    },
+    {
+      key: "continue",
+      label: "Continue with current model",
+      value: "persist" /* ContinueWithCurrentModel */
     }
-    return null;
-  }
-  if (authMethod === "qwen-oauth" /* QWEN_OAUTH */) {
-    return null;
-  }
-  return "Invalid auth method selected.";
-}
-__name(validateAuthMethod, "validateAuthMethod");
+  ];
+  const handleSelect = /* @__PURE__ */ __name((outcome) => {
+    onSelect(outcome);
+  }, "handleSelect");
+  return /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(
+    Box_default,
+    {
+      flexDirection: "column",
+      borderStyle: "round",
+      borderColor: Colors.AccentYellow,
+      padding: 1,
+      width: "100%",
+      marginLeft: 1,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime72.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { bold: true, children: "Vision Model Switch Required" }),
+          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { children: "Your message contains an image, but the current model doesn't support vision." }),
+          /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { children: "How would you like to proceed?" })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(
+          RadioButtonSelect,
+          {
+            items: options2,
+            initialIndex: 0,
+            onSelect: handleSelect,
+            isFocused: true
+          }
+        ) }),
+        /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(Text, { color: Colors.Gray, children: "Press Enter to select, Esc to cancel" }) })
+      ]
+    }
+  );
+}, "ModelSwitchDialog");
 
 // packages/cli/src/ui/components/OpenAIKeyPrompt.tsx
 init_esbuild_shims();
-var import_react76 = __toESM(require_react(), 1);
+var import_react75 = __toESM(require_react(), 1);
+init_zod();
 var import_jsx_runtime73 = __toESM(require_jsx_runtime(), 1);
+var credentialSchema = external_exports.object({
+  apiKey: external_exports.string().min(1, "API key is required"),
+  baseUrl: external_exports.union([external_exports.string().url("Base URL must be a valid URL"), external_exports.literal("")]).optional(),
+  model: external_exports.string().min(1, "Model must be a non-empty string").optional()
+});
 function OpenAIKeyPrompt({
   onSubmit,
   onCancel,
@@ -332505,10 +332638,33 @@ function OpenAIKeyPrompt({
   defaultBaseUrl,
   defaultModel
 }) {
-  const [apiKey, setApiKey] = (0, import_react76.useState)(defaultApiKey || "");
-  const [baseUrl, setBaseUrl] = (0, import_react76.useState)(defaultBaseUrl || "");
-  const [model, setModel] = (0, import_react76.useState)(defaultModel || "");
-  const [currentField, setCurrentField] = (0, import_react76.useState)("apiKey");
+  const [apiKey, setApiKey] = (0, import_react75.useState)(defaultApiKey || "");
+  const [baseUrl, setBaseUrl] = (0, import_react75.useState)(defaultBaseUrl || "");
+  const [model, setModel] = (0, import_react75.useState)(defaultModel || "");
+  const [currentField, setCurrentField] = (0, import_react75.useState)("apiKey");
+  const [validationError, setValidationError] = (0, import_react75.useState)(null);
+  const validateAndSubmit = /* @__PURE__ */ __name(() => {
+    setValidationError(null);
+    try {
+      const validated = credentialSchema.parse({
+        apiKey: apiKey.trim(),
+        baseUrl: baseUrl.trim() || void 0,
+        model: model.trim() || void 0
+      });
+      onSubmit(
+        validated.apiKey,
+        validated.baseUrl === "" ? "" : validated.baseUrl || "",
+        validated.model || ""
+      );
+    } catch (error) {
+      if (error instanceof external_exports.ZodError) {
+        const errorMessage = error.errors.map((e2) => `${e2.path.join(".")}: ${e2.message}`).join(", ");
+        setValidationError(`Invalid credentials: ${errorMessage}`);
+      } else {
+        setValidationError("Failed to validate credentials");
+      }
+    }
+  }, "validateAndSubmit");
   useKeypress(
     (key) => {
       if (key.name === "escape") {
@@ -332524,7 +332680,7 @@ function OpenAIKeyPrompt({
           return;
         } else if (currentField === "model") {
           if (apiKey.trim()) {
-            onSubmit(apiKey.trim(), baseUrl.trim(), model.trim());
+            validateAndSubmit();
           } else {
             setCurrentField("apiKey");
           }
@@ -332606,6 +332762,7 @@ function OpenAIKeyPrompt({
       width: "100%",
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Text, { bold: true, color: Colors.AccentBlue, children: "OpenAI Configuration Required" }),
+        validationError && /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Text, { color: Colors.AccentRed, children: validationError }) }),
         /* @__PURE__ */ (0, import_jsx_runtime73.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime73.jsxs)(Text, { children: [
           "Please enter your OpenAI configuration. You can get an API key from",
           " ",
@@ -332657,6 +332814,16 @@ function OpenAIKeyPrompt({
 }
 __name(OpenAIKeyPrompt, "OpenAIKeyPrompt");
 
+// packages/cli/src/ui/contexts/UIActionsContext.tsx
+var UIActionsContext = (0, import_react76.createContext)(null);
+var useUIActions = /* @__PURE__ */ __name(() => {
+  const context2 = (0, import_react76.useContext)(UIActionsContext);
+  if (!context2) {
+    throw new Error("useUIActions must be used within a UIActionsProvider");
+  }
+  return context2;
+}, "useUIActions");
+
 // packages/cli/src/ui/auth/AuthDialog.tsx
 var import_jsx_runtime74 = __toESM(require_jsx_runtime(), 1);
 function parseDefaultAuthType(defaultAuthType) {
@@ -332666,15 +332833,12 @@ function parseDefaultAuthType(defaultAuthType) {
   return null;
 }
 __name(parseDefaultAuthType, "parseDefaultAuthType");
-function AuthDialog({
-  onSelect,
-  settings,
-  initialErrorMessage
-}) {
-  const [errorMessage, setErrorMessage] = (0, import_react77.useState)(
-    initialErrorMessage || null
-  );
-  const [showOpenAIKeyPrompt, setShowOpenAIKeyPrompt] = (0, import_react77.useState)(false);
+function AuthDialog() {
+  const { pendingAuthType, authError } = useUIState();
+  const { handleAuthSelect: onAuthSelect } = useUIActions();
+  const settings = useSettings();
+  const [errorMessage, setErrorMessage] = (0, import_react77.useState)(null);
+  const [selectedIndex, setSelectedIndex] = (0, import_react77.useState)(null);
   const items = [
     {
       key: "qwen-oauth" /* QWEN_OAUTH */,
@@ -332686,6 +332850,9 @@ function AuthDialog({
   const initialAuthIndex = Math.max(
     0,
     items.findIndex((item) => {
+      if (pendingAuthType) {
+        return item.value === pendingAuthType;
+      }
       if (settings.merged.security?.auth?.selectedType) {
         return item.value === settings.merged.security?.auth?.selectedType;
       }
@@ -332698,37 +332865,18 @@ function AuthDialog({
       return item.value === "qwen-oauth" /* QWEN_OAUTH */;
     })
   );
-  const handleAuthSelect = /* @__PURE__ */ __name((authMethod) => {
-    if (authMethod === "openai" /* USE_OPENAI */) {
-      setShowOpenAIKeyPrompt(true);
-      setErrorMessage(null);
-    } else {
-      const error = validateAuthMethod(authMethod);
-      if (error) {
-        setErrorMessage(error);
-      } else {
-        setErrorMessage(null);
-        onSelect(authMethod, "User" /* User */);
-      }
-    }
+  const hasApiKey = Boolean(settings.merged.security?.auth?.apiKey);
+  const currentSelectedAuthType = selectedIndex !== null ? items[selectedIndex]?.value : items[initialAuthIndex]?.value;
+  const handleAuthSelect = /* @__PURE__ */ __name(async (authMethod) => {
+    setErrorMessage(null);
+    await onAuthSelect(authMethod, "User" /* User */);
   }, "handleAuthSelect");
-  const handleOpenAIKeySubmit = /* @__PURE__ */ __name((apiKey, baseUrl, model) => {
-    setShowOpenAIKeyPrompt(false);
-    onSelect("openai" /* USE_OPENAI */, "User" /* User */, {
-      apiKey,
-      baseUrl,
-      model
-    });
-  }, "handleOpenAIKeySubmit");
-  const handleOpenAIKeyCancel = /* @__PURE__ */ __name(() => {
-    setShowOpenAIKeyPrompt(false);
-    setErrorMessage("OpenAI API key is required to use OpenAI authentication.");
-  }, "handleOpenAIKeyCancel");
+  const handleHighlight = /* @__PURE__ */ __name((authMethod) => {
+    const index = items.findIndex((item) => item.value === authMethod);
+    setSelectedIndex(index);
+  }, "handleHighlight");
   useKeypress(
     (key) => {
-      if (showOpenAIKeyPrompt) {
-        return;
-      }
       if (key.name === "escape") {
         if (errorMessage) {
           return;
@@ -332739,33 +332887,11 @@ function AuthDialog({
           );
           return;
         }
-        onSelect(void 0, "User" /* User */);
+        onAuthSelect(void 0, "User" /* User */);
       }
     },
     { isActive: true }
   );
-  const getDefaultOpenAIConfig = /* @__PURE__ */ __name(() => {
-    const fromSettings = settings.merged.security?.auth;
-    const modelSettings = settings.merged.model;
-    return {
-      apiKey: fromSettings?.apiKey || process.env["OPENAI_API_KEY"] || "",
-      baseUrl: fromSettings?.baseUrl || process.env["OPENAI_BASE_URL"] || "",
-      model: modelSettings?.name || process.env["OPENAI_MODEL"] || ""
-    };
-  }, "getDefaultOpenAIConfig");
-  if (showOpenAIKeyPrompt) {
-    const defaults3 = getDefaultOpenAIConfig();
-    return /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(
-      OpenAIKeyPrompt,
-      {
-        defaultApiKey: defaults3.apiKey,
-        defaultBaseUrl: defaults3.baseUrl,
-        defaultModel: defaults3.model,
-        onSubmit: handleOpenAIKeySubmit,
-        onCancel: handleOpenAIKeyCancel
-      }
-    );
-  }
   return /* @__PURE__ */ (0, import_jsx_runtime74.jsxs)(
     Box_default,
     {
@@ -332782,11 +332908,13 @@ function AuthDialog({
           {
             items,
             initialIndex: initialAuthIndex,
-            onSelect: handleAuthSelect
+            onSelect: handleAuthSelect,
+            onHighlight: handleHighlight
           }
         ) }),
-        errorMessage && /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Text, { color: Colors.AccentRed, children: errorMessage }) }),
+        (authError || errorMessage) && /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Text, { color: Colors.AccentRed, children: authError || errorMessage }) }),
         /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Text, { color: Colors.AccentPurple, children: "(Use Enter to Set Auth)" }) }),
+        hasApiKey && currentSelectedAuthType === "qwen-oauth" /* QWEN_OAUTH */ && /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Text, { color: Colors.Gray, children: "Note: Your existing API key in settings.json will not be cleared when using Qwen OAuth. You can switch back to OpenAI authentication later if needed." }) }),
         /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Text, { children: "Terms of Services and Privacy Notice for RDMind" }) }),
         /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime74.jsx)(Text, { color: Colors.AccentBlue, children: "https://docs.xiaohongshu.com/doc/03040f132e7201a6b8e95806118a11f3" }) })
       ]
@@ -333572,91 +333700,13 @@ function ApprovalModeDialog({
 }
 __name(ApprovalModeDialog, "ApprovalModeDialog");
 
-// packages/cli/src/ui/contexts/UIActionsContext.tsx
-init_esbuild_shims();
-var import_react83 = __toESM(require_react(), 1);
-init_core2();
-
-// packages/cli/src/ui/components/ModelSwitchDialog.tsx
-init_esbuild_shims();
-var import_jsx_runtime82 = __toESM(require_jsx_runtime(), 1);
-var ModelSwitchDialog = /* @__PURE__ */ __name(({
-  onSelect
-}) => {
-  useKeypress(
-    (key) => {
-      if (key.name === "escape") {
-        onSelect("persist" /* ContinueWithCurrentModel */);
-      }
-    },
-    { isActive: true }
-  );
-  const options2 = [
-    {
-      key: "switch-once",
-      label: "Switch for this request only",
-      value: "once" /* SwitchOnce */
-    },
-    {
-      key: "switch-session",
-      label: "Switch session to vision model",
-      value: "session" /* SwitchSessionToVL */
-    },
-    {
-      key: "continue",
-      label: "Continue with current model",
-      value: "persist" /* ContinueWithCurrentModel */
-    }
-  ];
-  const handleSelect = /* @__PURE__ */ __name((outcome) => {
-    onSelect(outcome);
-  }, "handleSelect");
-  return /* @__PURE__ */ (0, import_jsx_runtime82.jsxs)(
-    Box_default,
-    {
-      flexDirection: "column",
-      borderStyle: "round",
-      borderColor: Colors.AccentYellow,
-      padding: 1,
-      width: "100%",
-      marginLeft: 1,
-      children: [
-        /* @__PURE__ */ (0, import_jsx_runtime82.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(Text, { bold: true, children: "Vision Model Switch Required" }),
-          /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(Text, { children: "Your message contains an image, but the current model doesn't support vision." }),
-          /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(Text, { children: "How would you like to proceed?" })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(
-          RadioButtonSelect,
-          {
-            items: options2,
-            initialIndex: 0,
-            onSelect: handleSelect,
-            isFocused: true
-          }
-        ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(Text, { color: Colors.Gray, children: "Press Enter to select, Esc to cancel" }) })
-      ]
-    }
-  );
-}, "ModelSwitchDialog");
-
-// packages/cli/src/ui/contexts/UIActionsContext.tsx
-var UIActionsContext = (0, import_react83.createContext)(null);
-var useUIActions = /* @__PURE__ */ __name(() => {
-  const context2 = (0, import_react83.useContext)(UIActionsContext);
-  if (!context2) {
-    throw new Error("useUIActions must be used within a UIActionsProvider");
-  }
-  return context2;
-}, "useUIActions");
-
 // packages/cli/src/ui/components/DialogManager.tsx
+init_core2();
 import process29 from "node:process";
 
 // packages/cli/src/ui/components/IdeTrustChangeDialog.tsx
 init_esbuild_shims();
-var import_jsx_runtime83 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime82 = __toESM(require_jsx_runtime(), 1);
 var IdeTrustChangeDialog = /* @__PURE__ */ __name(({ reason }) => {
   useKeypress(
     (key) => {
@@ -333676,7 +333726,7 @@ var IdeTrustChangeDialog = /* @__PURE__ */ __name(({ reason }) => {
   } else if (reason === "TRUST_CHANGE") {
     message = "Workspace trust has changed due to a change in the IDE trust.";
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Box_default, { borderStyle: "round", borderColor: theme.status.warning, paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(Text, { color: theme.status.warning, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime82.jsx)(Box_default, { borderStyle: "round", borderColor: theme.status.warning, paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime82.jsxs)(Text, { color: theme.status.warning, children: [
     message,
     " Press 'r' to restart Gemini to apply the changes."
   ] }) });
@@ -333685,7 +333735,7 @@ var IdeTrustChangeDialog = /* @__PURE__ */ __name(({ reason }) => {
 // packages/cli/src/ui/components/WelcomeBackDialog.tsx
 init_esbuild_shims();
 init_core2();
-var import_jsx_runtime84 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime83 = __toESM(require_jsx_runtime(), 1);
 function WelcomeBackDialog({
   welcomeBackInfo,
   onSelect,
@@ -333719,7 +333769,7 @@ function WelcomeBackDialog({
     inProgressCount = 0,
     pendingTasks = []
   } = welcomeBackInfo;
-  return /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -333729,18 +333779,18 @@ function WelcomeBackDialog({
       width: "100%",
       marginLeft: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Box_default, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Text, { color: Colors.AccentBlue, bold: true, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Box_default, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(Text, { color: Colors.AccentBlue, bold: true, children: [
           "\u{1F44B} Welcome back! (Last updated: ",
           timeAgo,
           ")"
         ] }) }),
-        goalContent && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Text, { color: Colors.Foreground, bold: true, children: "\u{1F3AF} Overall Goal:" }),
-          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Box_default, { marginTop: 1, paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Text, { color: Colors.Gray, children: goalContent }) })
+        goalContent && /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Text, { color: Colors.Foreground, bold: true, children: "\u{1F3AF} Overall Goal:" }),
+          /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Box_default, { marginTop: 1, paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Text, { color: Colors.Gray, children: goalContent }) })
         ] }),
-        totalTasks > 0 && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Text, { color: Colors.Foreground, bold: true, children: "\u{1F4CB} Current Plan:" }),
-          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Box_default, { marginTop: 1, paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Text, { color: Colors.Gray, children: [
+        totalTasks > 0 && /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Text, { color: Colors.Foreground, bold: true, children: "\u{1F4CB} Current Plan:" }),
+          /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Box_default, { marginTop: 1, paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(Text, { color: Colors.Gray, children: [
             "Progress: ",
             doneCount,
             "/",
@@ -333748,19 +333798,19 @@ function WelcomeBackDialog({
             " tasks completed",
             inProgressCount > 0 && `, ${inProgressCount} in progress`
           ] }) }),
-          pendingTasks.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, paddingLeft: 2, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Text, { color: Colors.Foreground, bold: true, children: "Pending Tasks:" }),
-            pendingTasks.map((task, index) => /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Text, { color: Colors.Gray, children: [
+          pendingTasks.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, paddingLeft: 2, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Text, { color: Colors.Foreground, bold: true, children: "Pending Tasks:" }),
+            pendingTasks.map((task, index) => /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(Text, { color: Colors.Gray, children: [
               "\u2022 ",
               task
             ] }, index))
           ] })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Text, { bold: true, children: "What would you like to do?" }),
-          /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Text, { children: "Choose how to proceed with your session:" })
+        /* @__PURE__ */ (0, import_jsx_runtime83.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Text, { bold: true, children: "What would you like to do?" }),
+          /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Text, { children: "Choose how to proceed with your session:" })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(RadioButtonSelect, { items: options2, onSelect, isFocused: true }) })
+        /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime83.jsx)(RadioButtonSelect, { items: options2, onSelect, isFocused: true }) })
       ]
     }
   );
@@ -333769,7 +333819,7 @@ __name(WelcomeBackDialog, "WelcomeBackDialog");
 
 // packages/cli/src/ui/components/QuitConfirmationDialog.tsx
 init_esbuild_shims();
-var import_jsx_runtime85 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime84 = __toESM(require_jsx_runtime(), 1);
 var QuitConfirmationDialog = /* @__PURE__ */ __name(({
   onSelect
 }) => {
@@ -333803,7 +333853,7 @@ var QuitConfirmationDialog = /* @__PURE__ */ __name(({
       value: "cancel" /* CANCEL */
     }
   ];
-  return /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime84.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -333813,15 +333863,15 @@ var QuitConfirmationDialog = /* @__PURE__ */ __name(({
       width: "100%",
       marginLeft: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Box_default, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Text, { children: "\u9000\u51FA\u524D\u60A8\u5E0C\u671B\u6267\u884C\u4EC0\u4E48\u64CD\u4F5C\uFF1F" }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(RadioButtonSelect, { items: options2, onSelect, isFocused: true })
+        /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Box_default, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(Text, { children: "\u9000\u51FA\u524D\u60A8\u5E0C\u671B\u6267\u884C\u4EC0\u4E48\u64CD\u4F5C\uFF1F" }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime84.jsx)(RadioButtonSelect, { items: options2, onSelect, isFocused: true })
       ]
     }
   );
 }, "QuitConfirmationDialog");
 
 // packages/cli/src/ui/components/DialogManager.tsx
-var import_jsx_runtime86 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime85 = __toESM(require_jsx_runtime(), 1);
 var DialogManager = /* @__PURE__ */ __name(({
   addItem,
   terminalWidth
@@ -333831,8 +333881,17 @@ var DialogManager = /* @__PURE__ */ __name(({
   const uiState = useUIState();
   const uiActions = useUIActions();
   const { constrainHeight, terminalHeight, staticExtraHeight, mainAreaWidth } = uiState;
+  const getDefaultOpenAIConfig = /* @__PURE__ */ __name(() => {
+    const fromSettings = settings.merged.security?.auth;
+    const modelSettings = settings.merged.model;
+    return {
+      apiKey: fromSettings?.apiKey || process29.env["OPENAI_API_KEY"] || "",
+      baseUrl: fromSettings?.baseUrl || process29.env["OPENAI_BASE_URL"] || "",
+      model: modelSettings?.name || process29.env["OPENAI_MODEL"] || ""
+    };
+  }, "getDefaultOpenAIConfig");
   if (uiState.showWelcomeBackDialog && uiState.welcomeBackInfo?.hasHistory) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       WelcomeBackDialog,
       {
         welcomeBackInfo: uiState.welcomeBackInfo,
@@ -333842,10 +333901,10 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.showIdeRestartPrompt) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(IdeTrustChangeDialog, { reason: uiState.ideTrustRestartReason });
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(IdeTrustChangeDialog, { reason: uiState.ideTrustRestartReason });
   }
   if (uiState.showWorkspaceMigrationDialog) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       WorkspaceMigrationDialog,
       {
         workspaceExtensions: uiState.workspaceExtensions,
@@ -333855,7 +333914,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.proQuotaRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       ProQuotaDialog,
       {
         failedModel: uiState.proQuotaRequest.failedModel,
@@ -333865,7 +333924,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.shouldShowIdePrompt) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       IdeIntegrationNudge,
       {
         ide: uiState.currentIDE,
@@ -333874,7 +333933,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.isFolderTrustDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       FolderTrustDialog,
       {
         onSelect: uiActions.handleFolderTrustSelect,
@@ -333883,10 +333942,10 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.shellConfirmationRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(ShellConfirmationDialog, { request: uiState.shellConfirmationRequest });
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(ShellConfirmationDialog, { request: uiState.shellConfirmationRequest });
   }
   if (uiState.loopDetectionConfirmationRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       LoopDetectionConfirmation,
       {
         onComplete: uiState.loopDetectionConfirmationRequest.onComplete
@@ -333894,7 +333953,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.quitConfirmationRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       QuitConfirmationDialog,
       {
         onSelect: (choice2) => {
@@ -333915,7 +333974,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.confirmationRequest) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       ConsentPrompt,
       {
         prompt: uiState.confirmationRequest.prompt,
@@ -333926,7 +333985,7 @@ var DialogManager = /* @__PURE__ */ __name(({
   }
   if (uiState.confirmUpdateExtensionRequests.length > 0) {
     const request4 = uiState.confirmUpdateExtensionRequests[0];
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       ConsentPrompt,
       {
         prompt: request4.prompt,
@@ -333936,9 +333995,9 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.isThemeDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(Box_default, { flexDirection: "column", children: [
-      uiState.themeError && /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Text, { color: theme.status.error, children: uiState.themeError }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Box_default, { flexDirection: "column", children: [
+      uiState.themeError && /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Text, { color: theme.status.error, children: uiState.themeError }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
         ThemeDialog,
         {
           onSelect: uiActions.handleThemeSelect,
@@ -333951,7 +334010,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     ] });
   }
   if (uiState.isSettingsDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       SettingsDialog,
       {
         settings,
@@ -333964,7 +334023,7 @@ var DialogManager = /* @__PURE__ */ __name(({
   }
   if (uiState.isApprovalModeDialogOpen) {
     const currentMode = config.getApprovalMode();
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       ApprovalModeDialog,
       {
         settings,
@@ -333975,47 +334034,61 @@ var DialogManager = /* @__PURE__ */ __name(({
     ) });
   }
   if (uiState.isModelDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(ModelDialog, { onClose: uiActions.closeModelDialog });
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(ModelDialog, { onClose: uiActions.closeModelDialog });
   }
   if (uiState.isVisionSwitchDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(ModelSwitchDialog, { onSelect: uiActions.handleVisionSwitchSelect });
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(ModelSwitchDialog, { onSelect: uiActions.handleVisionSwitchSelect });
+  }
+  if (uiState.isAuthDialogOpen || uiState.authError) {
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(AuthDialog, {}) });
   }
   if (uiState.isAuthenticating) {
-    if (uiState.isQwenAuth && uiState.isQwenAuthenticating) {
-      return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
-        QwenOAuthProgress,
+    if (uiState.pendingAuthType === "openai" /* USE_OPENAI */) {
+      const defaults3 = getDefaultOpenAIConfig();
+      return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+        OpenAIKeyPrompt,
         {
-          deviceAuth: uiState.deviceAuth || void 0,
-          authStatus: uiState.authStatus,
-          authMessage: uiState.authMessage,
-          onTimeout: uiActions.handleQwenAuthTimeout,
-          onCancel: uiActions.handleQwenAuthCancel
+          onSubmit: (apiKey, baseUrl, model) => {
+            uiActions.handleAuthSelect("openai" /* USE_OPENAI */, "User" /* User */, {
+              apiKey,
+              baseUrl,
+              model
+            });
+          },
+          onCancel: () => {
+            uiActions.cancelAuthentication();
+            uiActions.setAuthState("updating" /* Updating */);
+          },
+          defaultApiKey: defaults3.apiKey,
+          defaultBaseUrl: defaults3.baseUrl,
+          defaultModel: defaults3.model
         }
       );
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
-      AuthInProgress,
-      {
-        onTimeout: () => {
-          uiActions.onAuthError("Authentication cancelled.");
+    if (uiState.pendingAuthType === "qwen-oauth" /* QWEN_OAUTH */) {
+      return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
+        QwenOAuthProgress,
+        {
+          deviceAuth: uiState.qwenAuthState.deviceAuth || void 0,
+          authStatus: uiState.qwenAuthState.authStatus,
+          authMessage: uiState.qwenAuthState.authMessage,
+          onTimeout: () => {
+            uiActions.onAuthError("Qwen OAuth authentication timed out.");
+            uiActions.cancelAuthentication();
+            uiActions.setAuthState("updating" /* Updating */);
+          },
+          onCancel: () => {
+            uiActions.cancelAuthentication();
+            uiActions.setAuthState("updating" /* Updating */);
+          }
         }
-      }
-    );
-  }
-  if (uiState.isAuthDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
-      AuthDialog,
-      {
-        onSelect: uiActions.handleAuthSelect,
-        settings,
-        initialErrorMessage: uiState.authError
-      }
-    ) });
+      );
+    }
   }
   if (uiState.isEditorDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(Box_default, { flexDirection: "column", children: [
-      uiState.editorError && /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Text, { color: theme.status.error, children: uiState.editorError }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsxs)(Box_default, { flexDirection: "column", children: [
+      uiState.editorError && /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(Text, { color: theme.status.error, children: uiState.editorError }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
         EditorSettingsDialog,
         {
           onSelect: uiActions.handleEditorSelect,
@@ -334026,7 +334099,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     ] });
   }
   if (uiState.isPermissionsDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       PermissionsModifyTrustDialog,
       {
         onExit: uiActions.closePermissionsDialog,
@@ -334035,7 +334108,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.isSubagentCreateDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       AgentCreationWizard,
       {
         onClose: uiActions.closeSubagentCreateDialog,
@@ -334044,7 +334117,7 @@ var DialogManager = /* @__PURE__ */ __name(({
     );
   }
   if (uiState.isAgentsManagerDialogOpen) {
-    return /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime85.jsx)(
       AgentsManagerDialog,
       {
         onClose: uiActions.closeAgentsManagerDialog,
@@ -334057,7 +334130,7 @@ var DialogManager = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/Composer.tsx
 init_esbuild_shims();
-var import_react98 = __toESM(require_react(), 1);
+var import_react97 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/LoadingIndicator.tsx
 init_esbuild_shims();
@@ -334070,7 +334143,7 @@ function isNarrowWidth(width) {
 __name(isNarrowWidth, "isNarrowWidth");
 
 // packages/cli/src/ui/components/LoadingIndicator.tsx
-var import_jsx_runtime87 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime86 = __toESM(require_jsx_runtime(), 1);
 var LoadingIndicator = /* @__PURE__ */ __name(({
   currentLoadingPhrase,
   elapsedTime,
@@ -334085,41 +334158,41 @@ var LoadingIndicator = /* @__PURE__ */ __name(({
   }
   const primaryText = thought?.subject || currentLoadingPhrase;
   const cancelAndTimerContent = streamingState !== "waiting_for_confirmation" /* WaitingForConfirmation */ ? `(esc to cancel, ${elapsedTime < 60 ? `${elapsedTime}s` : formatDuration(elapsedTime * 1e3)})` : null;
-  return /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Box_default, { paddingLeft: 0, flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(Box_default, { paddingLeft: 0, flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(
       Box_default,
       {
         width: "100%",
         flexDirection: isNarrow ? "column" : "row",
         alignItems: isNarrow ? "flex-start" : "center",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Box_default, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(Box_default, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(
               GeminiRespondingSpinner,
               {
                 nonRespondingDisplay: streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ ? "\u280F" : ""
               }
             ) }),
-            primaryText && /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Text, { color: theme.text.accent, wrap: "truncate-end", children: primaryText }),
-            !isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Text, { color: theme.text.secondary, children: [
+            primaryText && /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Text, { color: theme.text.accent, wrap: "truncate-end", children: primaryText }),
+            !isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime86.jsxs)(Text, { color: theme.text.secondary, children: [
               " ",
               cancelAndTimerContent
             ] })
           ] }),
-          !isNarrow && /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Box_default, { flexGrow: 1 }),
-          !isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Box_default, { children: rightContent })
+          !isNarrow && /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { flexGrow: 1 }),
+          !isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { children: rightContent })
         ]
       }
     ),
-    isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent }) }),
-    isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Box_default, { children: rightContent })
+    isNarrow && cancelAndTimerContent && /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Text, { color: theme.text.secondary, children: cancelAndTimerContent }) }),
+    isNarrow && rightContent && /* @__PURE__ */ (0, import_jsx_runtime86.jsx)(Box_default, { children: rightContent })
   ] });
 }, "LoadingIndicator");
 
 // packages/cli/src/ui/components/ContextSummaryDisplay.tsx
 init_esbuild_shims();
 init_core2();
-var import_jsx_runtime88 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime87 = __toESM(require_jsx_runtime(), 1);
 var ContextSummaryDisplay = /* @__PURE__ */ __name(({
   geminiMdFileCount,
   contextFileNames,
@@ -334134,7 +334207,7 @@ var ContextSummaryDisplay = /* @__PURE__ */ __name(({
   const blockedMcpServerCount = blockedMcpServers?.length || 0;
   const openFileCount = ideContext?.workspaceState?.openFiles?.length ?? 0;
   if (geminiMdFileCount === 0 && mcpServerCount === 0 && blockedMcpServerCount === 0 && openFileCount === 0) {
-    return /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text, { children: " " });
+    return /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Text, { children: " " });
   }
   const openFilesText = (() => {
     if (openFileCount === 0) {
@@ -334179,16 +334252,16 @@ var ContextSummaryDisplay = /* @__PURE__ */ __name(({
   })();
   const summaryParts = [openFilesText, geminiMdText, mcpText].filter(Boolean);
   if (isNarrow) {
-    return /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text, { color: theme.text.secondary, children: "Using:" }),
-      summaryParts.map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text, { color: theme.text.secondary, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Box_default, { flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Text, { color: theme.text.secondary, children: "Using:" }),
+      summaryParts.map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Text, { color: theme.text.secondary, children: [
         "  ",
         "- ",
         part
       ] }, index))
     ] });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text, { color: theme.text.secondary, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(Text, { color: theme.text.secondary, children: [
     "Using: ",
     summaryParts.join(" | ")
   ] }) });
@@ -334197,7 +334270,7 @@ var ContextSummaryDisplay = /* @__PURE__ */ __name(({
 // packages/cli/src/ui/components/AutoAcceptIndicator.tsx
 init_esbuild_shims();
 init_core2();
-var import_jsx_runtime89 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime88 = __toESM(require_jsx_runtime(), 1);
 var AutoAcceptIndicator = /* @__PURE__ */ __name(({
   approvalMode
 }) => {
@@ -334224,29 +334297,29 @@ var AutoAcceptIndicator = /* @__PURE__ */ __name(({
     default:
       break;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(Text, { color: textColor, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime88.jsxs)(Text, { color: textColor, children: [
     textContent2,
-    subText && /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Text, { color: theme.text.secondary, children: subText })
+    subText && /* @__PURE__ */ (0, import_jsx_runtime88.jsx)(Text, { color: theme.text.secondary, children: subText })
   ] }) });
 }, "AutoAcceptIndicator");
 
 // packages/cli/src/ui/components/ShellModeIndicator.tsx
 init_esbuild_shims();
-var import_jsx_runtime90 = __toESM(require_jsx_runtime(), 1);
-var ShellModeIndicator = /* @__PURE__ */ __name(() => /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(Text, { color: theme.ui.symbol, children: [
+var import_jsx_runtime89 = __toESM(require_jsx_runtime(), 1);
+var ShellModeIndicator = /* @__PURE__ */ __name(() => /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime89.jsxs)(Text, { color: theme.ui.symbol, children: [
   "shell mode enabled",
-  /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Text, { color: theme.text.secondary, children: " (esc to disable)" })
+  /* @__PURE__ */ (0, import_jsx_runtime89.jsx)(Text, { color: theme.text.secondary, children: " (esc to disable)" })
 ] }) }), "ShellModeIndicator");
 
 // packages/cli/src/ui/components/DetailedMessagesDisplay.tsx
 init_esbuild_shims();
-var import_jsx_runtime91 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime90 = __toESM(require_jsx_runtime(), 1);
 var DetailedMessagesDisplay = /* @__PURE__ */ __name(({ messages, maxHeight, width }) => {
   if (messages.length === 0) {
     return null;
   }
   const borderAndPadding = 4;
-  return /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -334256,12 +334329,12 @@ var DetailedMessagesDisplay = /* @__PURE__ */ __name(({ messages, maxHeight, wid
       paddingX: 1,
       width,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
           "Debug Console",
           " ",
-          /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text, { color: theme.text.secondary, children: "(ctrl+o to close)" })
+          /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(Text, { color: theme.text.secondary, children: "(ctrl+o to close)" })
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(MaxSizedBox, { maxHeight, maxWidth: width - borderAndPadding, children: messages.map((msg, index) => {
+        /* @__PURE__ */ (0, import_jsx_runtime90.jsx)(MaxSizedBox, { maxHeight, maxWidth: width - borderAndPadding, children: messages.map((msg, index) => {
           let textColor = theme.text.primary;
           let icon = "\u2139";
           switch (msg.type) {
@@ -334281,14 +334354,14 @@ var DetailedMessagesDisplay = /* @__PURE__ */ __name(({ messages, maxHeight, wid
             default:
               break;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Box_default, { flexDirection: "row", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text, { color: textColor, children: [
+          return /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(Box_default, { flexDirection: "row", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(Text, { color: textColor, children: [
               icon,
               " "
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text, { color: textColor, wrap: "wrap", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(Text, { color: textColor, wrap: "wrap", children: [
               msg.content,
-              msg.count && msg.count > 1 && /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text, { color: theme.text.secondary, children: [
+              msg.count && msg.count > 1 && /* @__PURE__ */ (0, import_jsx_runtime90.jsxs)(Text, { color: theme.text.secondary, children: [
                 " (x",
                 msg.count,
                 ")"
@@ -334303,15 +334376,15 @@ var DetailedMessagesDisplay = /* @__PURE__ */ __name(({ messages, maxHeight, wid
 
 // packages/cli/src/ui/components/InputPrompt.tsx
 init_esbuild_shims();
-var import_react94 = __toESM(require_react(), 1);
+var import_react93 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/SuggestionsDisplay.tsx
 init_esbuild_shims();
 
 // packages/cli/src/ui/components/PrepareLabel.tsx
 init_esbuild_shims();
-var import_react84 = __toESM(require_react(), 1);
-var import_jsx_runtime92 = __toESM(require_jsx_runtime(), 1);
+var import_react83 = __toESM(require_react(), 1);
+var import_jsx_runtime91 = __toESM(require_jsx_runtime(), 1);
 var MAX_WIDTH = 150;
 var _PrepareLabel = /* @__PURE__ */ __name(({
   label,
@@ -334323,7 +334396,7 @@ var _PrepareLabel = /* @__PURE__ */ __name(({
   const hasMatch = matchedIndex !== void 0 && matchedIndex >= 0 && matchedIndex < label.length && userInput.length > 0;
   if (!hasMatch) {
     const display = isExpanded ? label : label.length > MAX_WIDTH ? label.slice(0, MAX_WIDTH) + "..." : label;
-    return /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text, { wrap: "wrap", color: textColor, children: display });
+    return /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(Text, { wrap: "wrap", color: textColor, children: display });
   }
   const matchLength = userInput.length;
   let before = "";
@@ -334362,9 +334435,9 @@ var _PrepareLabel = /* @__PURE__ */ __name(({
       after = after.length >= 3 ? after.slice(0, -3) + "..." : "...";
     }
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Text, { color: textColor, wrap: "wrap", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime91.jsxs)(Text, { color: textColor, wrap: "wrap", children: [
     before,
-    match2 ? match2.split(/(\s+)/).map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(
+    match2 ? match2.split(/(\s+)/).map((part, index) => /* @__PURE__ */ (0, import_jsx_runtime91.jsx)(
       Text,
       {
         color: theme.background.primary,
@@ -334376,10 +334449,10 @@ var _PrepareLabel = /* @__PURE__ */ __name(({
     after
   ] });
 }, "_PrepareLabel");
-var PrepareLabel = import_react84.default.memo(_PrepareLabel);
+var PrepareLabel = import_react83.default.memo(_PrepareLabel);
 
 // packages/cli/src/ui/components/SuggestionsDisplay.tsx
-var import_jsx_runtime93 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime92 = __toESM(require_jsx_runtime(), 1);
 var MAX_SUGGESTIONS_TO_SHOW = 8;
 function SuggestionsDisplay({
   suggestions,
@@ -334392,7 +334465,7 @@ function SuggestionsDisplay({
   expandedIndex
 }) {
   if (isLoading) {
-    return /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { paddingX: 1, width, children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: "gray", children: "Loading suggestions..." }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Box_default, { paddingX: 1, width, children: /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text, { color: "gray", children: "Loading suggestions..." }) });
   }
   if (suggestions.length === 0) {
     return null;
@@ -334408,15 +334481,15 @@ function SuggestionsDisplay({
     ...suggestions.map((s2) => getFullLabel(s2).length)
   );
   const commandColumnWidth = mode === "slash" ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
-  return /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, width, children: [
-    scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: theme.text.primary, children: "\u25B2" }),
+  return /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, width, children: [
+    scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text, { color: theme.text.primary, children: "\u25B2" }),
     visibleSuggestions.map((suggestion, index) => {
       const originalIndex = startIndex + index;
       const isActive = originalIndex === activeIndex;
       const isExpanded = originalIndex === expandedIndex;
       const textColor = isActive ? theme.text.accent : theme.text.secondary;
       const isLong = suggestion.value.length >= MAX_WIDTH;
-      const labelElement = /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
+      const labelElement = /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(
         PrepareLabel,
         {
           label: suggestion.value,
@@ -334426,23 +334499,23 @@ function SuggestionsDisplay({
           isExpanded
         }
       );
-      return /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Box_default, { flexDirection: "row", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Box_default, { flexDirection: "row", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(
           Box_default,
           {
             ...mode === "slash" ? { width: commandColumnWidth, flexShrink: 0 } : { flexShrink: 1 },
-            children: /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Box_default, { children: [
+            children: /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Box_default, { children: [
               labelElement,
-              suggestion.commandKind === "mcp-prompt" /* MCP_PROMPT */ && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: textColor, children: " [MCP]" })
+              suggestion.commandKind === "mcp-prompt" /* MCP_PROMPT */ && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text, { color: textColor, children: " [MCP]" })
             ] })
           }
         ),
-        suggestion.description && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { flexGrow: 1, paddingLeft: 3, children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: textColor, wrap: "truncate", children: suggestion.description }) }),
-        isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
+        suggestion.description && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Box_default, { flexGrow: 1, paddingLeft: 3, children: /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text, { color: textColor, wrap: "truncate", children: suggestion.description }) }),
+        isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
       ] }, `${suggestion.value}-${originalIndex}`);
     }),
-    endIndex < suggestions.length && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: "gray", children: "\u25BC" }),
-    suggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Text, { color: "gray", children: [
+    endIndex < suggestions.length && /* @__PURE__ */ (0, import_jsx_runtime92.jsx)(Text, { color: "gray", children: "\u25BC" }),
+    suggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime92.jsxs)(Text, { color: "gray", children: [
       "(",
       activeIndex + 1,
       "/",
@@ -334455,7 +334528,7 @@ __name(SuggestionsDisplay, "SuggestionsDisplay");
 
 // packages/cli/src/ui/hooks/useInputHistory.ts
 init_esbuild_shims();
-var import_react85 = __toESM(require_react(), 1);
+var import_react84 = __toESM(require_react(), 1);
 function useInputHistory({
   userMessages,
   onSubmit,
@@ -334463,13 +334536,13 @@ function useInputHistory({
   currentQuery,
   onChange
 }) {
-  const [historyIndex, setHistoryIndex] = (0, import_react85.useState)(-1);
-  const [originalQueryBeforeNav, setOriginalQueryBeforeNav] = (0, import_react85.useState)("");
-  const resetHistoryNav = (0, import_react85.useCallback)(() => {
+  const [historyIndex, setHistoryIndex] = (0, import_react84.useState)(-1);
+  const [originalQueryBeforeNav, setOriginalQueryBeforeNav] = (0, import_react84.useState)("");
+  const resetHistoryNav = (0, import_react84.useCallback)(() => {
     setHistoryIndex(-1);
     setOriginalQueryBeforeNav("");
   }, []);
-  const handleSubmit = (0, import_react85.useCallback)(
+  const handleSubmit = (0, import_react84.useCallback)(
     (value) => {
       const trimmedValue = value.trim();
       if (trimmedValue) {
@@ -334479,7 +334552,7 @@ function useInputHistory({
     },
     [onSubmit, resetHistoryNav]
   );
-  const navigateUp = (0, import_react85.useCallback)(() => {
+  const navigateUp = (0, import_react84.useCallback)(() => {
     if (!isActive) return false;
     if (userMessages.length === 0) return false;
     let nextIndex = historyIndex;
@@ -334508,7 +334581,7 @@ function useInputHistory({
     // Use currentQuery from props
     setOriginalQueryBeforeNav
   ]);
-  const navigateDown = (0, import_react85.useCallback)(() => {
+  const navigateDown = (0, import_react84.useCallback)(() => {
     if (!isActive) return false;
     if (historyIndex === -1) return false;
     const nextIndex = historyIndex - 1;
@@ -334541,7 +334614,7 @@ var import_chalk7 = __toESM(require_source(), 1);
 
 // packages/cli/src/ui/hooks/useShellHistory.ts
 init_esbuild_shims();
-var import_react86 = __toESM(require_react(), 1);
+var import_react85 = __toESM(require_react(), 1);
 init_core2();
 import * as fs72 from "node:fs/promises";
 import * as path74 from "node:path";
@@ -334586,10 +334659,10 @@ async function writeHistoryFile(filePath, history) {
 }
 __name(writeHistoryFile, "writeHistoryFile");
 function useShellHistory(projectRoot, storage) {
-  const [history, setHistory] = (0, import_react86.useState)([]);
-  const [historyIndex, setHistoryIndex] = (0, import_react86.useState)(-1);
-  const [historyFilePath, setHistoryFilePath] = (0, import_react86.useState)(null);
-  (0, import_react86.useEffect)(() => {
+  const [history, setHistory] = (0, import_react85.useState)([]);
+  const [historyIndex, setHistoryIndex] = (0, import_react85.useState)(-1);
+  const [historyFilePath, setHistoryFilePath] = (0, import_react85.useState)(null);
+  (0, import_react85.useEffect)(() => {
     async function loadHistory() {
       const filePath = await getHistoryFilePath(projectRoot, storage);
       setHistoryFilePath(filePath);
@@ -334599,7 +334672,7 @@ function useShellHistory(projectRoot, storage) {
     __name(loadHistory, "loadHistory");
     loadHistory();
   }, [projectRoot, storage]);
-  const addCommandToHistory = (0, import_react86.useCallback)(
+  const addCommandToHistory = (0, import_react85.useCallback)(
     (command2) => {
       if (!command2.trim() || !historyFilePath) {
         return;
@@ -334611,7 +334684,7 @@ function useShellHistory(projectRoot, storage) {
     },
     [history, historyFilePath]
   );
-  const getPreviousCommand = (0, import_react86.useCallback)(() => {
+  const getPreviousCommand = (0, import_react85.useCallback)(() => {
     if (history.length === 0) {
       return null;
     }
@@ -334619,7 +334692,7 @@ function useShellHistory(projectRoot, storage) {
     setHistoryIndex(newIndex);
     return history[newIndex] ?? null;
   }, [history, historyIndex]);
-  const getNextCommand = (0, import_react86.useCallback)(() => {
+  const getNextCommand = (0, import_react85.useCallback)(() => {
     if (historyIndex < 0) {
       return null;
     }
@@ -334630,7 +334703,7 @@ function useShellHistory(projectRoot, storage) {
     }
     return history[newIndex] ?? null;
   }, [history, historyIndex]);
-  const resetHistoryPosition = (0, import_react86.useCallback)(() => {
+  const resetHistoryPosition = (0, import_react85.useCallback)(() => {
     setHistoryIndex(-1);
   }, []);
   return {
@@ -334645,19 +334718,19 @@ __name(useShellHistory, "useShellHistory");
 
 // packages/cli/src/ui/hooks/useReverseSearchCompletion.tsx
 init_esbuild_shims();
-var import_react88 = __toESM(require_react(), 1);
+var import_react87 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useCompletion.ts
 init_esbuild_shims();
-var import_react87 = __toESM(require_react(), 1);
+var import_react86 = __toESM(require_react(), 1);
 function useCompletion() {
-  const [suggestions, setSuggestions] = (0, import_react87.useState)([]);
-  const [activeSuggestionIndex, setActiveSuggestionIndex] = (0, import_react87.useState)(-1);
-  const [visibleStartIndex, setVisibleStartIndex] = (0, import_react87.useState)(0);
-  const [showSuggestions, setShowSuggestions] = (0, import_react87.useState)(false);
-  const [isLoadingSuggestions, setIsLoadingSuggestions] = (0, import_react87.useState)(false);
-  const [isPerfectMatch, setIsPerfectMatch] = (0, import_react87.useState)(false);
-  const resetCompletionState = (0, import_react87.useCallback)(() => {
+  const [suggestions, setSuggestions] = (0, import_react86.useState)([]);
+  const [activeSuggestionIndex, setActiveSuggestionIndex] = (0, import_react86.useState)(-1);
+  const [visibleStartIndex, setVisibleStartIndex] = (0, import_react86.useState)(0);
+  const [showSuggestions, setShowSuggestions] = (0, import_react86.useState)(false);
+  const [isLoadingSuggestions, setIsLoadingSuggestions] = (0, import_react86.useState)(false);
+  const [isPerfectMatch, setIsPerfectMatch] = (0, import_react86.useState)(false);
+  const resetCompletionState = (0, import_react86.useCallback)(() => {
     setSuggestions([]);
     setActiveSuggestionIndex(-1);
     setVisibleStartIndex(0);
@@ -334665,7 +334738,7 @@ function useCompletion() {
     setIsLoadingSuggestions(false);
     setIsPerfectMatch(false);
   }, []);
-  const navigateUp = (0, import_react87.useCallback)(() => {
+  const navigateUp = (0, import_react86.useCallback)(() => {
     if (suggestions.length === 0) return;
     setActiveSuggestionIndex((prevActiveIndex) => {
       const newActiveIndex = prevActiveIndex <= 0 ? suggestions.length - 1 : prevActiveIndex - 1;
@@ -334681,7 +334754,7 @@ function useCompletion() {
       return newActiveIndex;
     });
   }, [suggestions.length]);
-  const navigateDown = (0, import_react87.useCallback)(() => {
+  const navigateDown = (0, import_react86.useCallback)(() => {
     if (suggestions.length === 0) return;
     setActiveSuggestionIndex((prevActiveIndex) => {
       const newActiveIndex = prevActiveIndex >= suggestions.length - 1 ? 0 : prevActiveIndex + 1;
@@ -334720,8 +334793,8 @@ __name(useCompletion, "useCompletion");
 
 // packages/cli/src/ui/hooks/useReverseSearchCompletion.tsx
 function useDebouncedValue(value, delay4 = 200) {
-  const [debounced, setDebounced] = (0, import_react88.useState)(value);
-  (0, import_react88.useEffect)(() => {
+  const [debounced, setDebounced] = (0, import_react87.useState)(value);
+  (0, import_react87.useEffect)(() => {
     const handle = setTimeout(() => setDebounced(value), delay4);
     return () => clearTimeout(handle);
   }, [value, delay4]);
@@ -334744,19 +334817,19 @@ function useReverseSearchCompletion(buffer, history, reverseSearchActive) {
     setVisibleStartIndex
   } = useCompletion();
   const debouncedQuery = useDebouncedValue(buffer.text, 100);
-  const prevQueryRef = (0, import_react88.useRef)("");
-  const prevMatchesRef = (0, import_react88.useRef)([]);
-  (0, import_react88.useEffect)(() => {
+  const prevQueryRef = (0, import_react87.useRef)("");
+  const prevMatchesRef = (0, import_react87.useRef)([]);
+  (0, import_react87.useEffect)(() => {
     if (reverseSearchActive) {
       prevQueryRef.current = "";
       prevMatchesRef.current = [];
     }
   }, [reverseSearchActive]);
-  (0, import_react88.useEffect)(() => {
+  (0, import_react87.useEffect)(() => {
     prevQueryRef.current = "";
     prevMatchesRef.current = [];
   }, [history]);
-  const searchHistory = (0, import_react88.useCallback)(
+  const searchHistory = (0, import_react87.useCallback)(
     (query, items) => {
       const out = [];
       for (let i = 0; i < items.length; i++) {
@@ -334770,7 +334843,7 @@ function useReverseSearchCompletion(buffer, history, reverseSearchActive) {
     },
     []
   );
-  const matches = (0, import_react88.useMemo)(() => {
+  const matches = (0, import_react87.useMemo)(() => {
     if (!reverseSearchActive) return [];
     if (debouncedQuery.length === 0)
       return history.map((cmd) => ({
@@ -334783,7 +334856,7 @@ function useReverseSearchCompletion(buffer, history, reverseSearchActive) {
     const source2 = canUseCache ? prevMatchesRef.current.map((m) => m.value) : history;
     return searchHistory(query, source2);
   }, [debouncedQuery, history, reverseSearchActive, searchHistory]);
-  (0, import_react88.useEffect)(() => {
+  (0, import_react87.useEffect)(() => {
     if (!reverseSearchActive) {
       resetCompletionState();
       return;
@@ -334805,7 +334878,7 @@ function useReverseSearchCompletion(buffer, history, reverseSearchActive) {
     setVisibleStartIndex,
     resetCompletionState
   ]);
-  const handleAutocomplete = (0, import_react88.useCallback)(
+  const handleAutocomplete = (0, import_react87.useCallback)(
     (i) => {
       if (i < 0 || i >= suggestions.length) return;
       buffer.setText(suggestions[i].value);
@@ -334829,11 +334902,11 @@ __name(useReverseSearchCompletion, "useReverseSearchCompletion");
 
 // packages/cli/src/ui/hooks/useCommandCompletion.tsx
 init_esbuild_shims();
-var import_react92 = __toESM(require_react(), 1);
+var import_react91 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useAtCompletion.ts
 init_esbuild_shims();
-var import_react89 = __toESM(require_react(), 1);
+var import_react88 = __toESM(require_react(), 1);
 init_core2();
 var initialState = {
   status: "idle" /* IDLE */,
@@ -334892,20 +334965,20 @@ function useAtCompletion(props) {
     setSuggestions,
     setIsLoadingSuggestions
   } = props;
-  const [state, dispatch] = (0, import_react89.useReducer)(atCompletionReducer, initialState);
-  const fileSearch = (0, import_react89.useRef)(null);
-  const searchAbortController = (0, import_react89.useRef)(null);
-  const slowSearchTimer = (0, import_react89.useRef)(null);
-  (0, import_react89.useEffect)(() => {
+  const [state, dispatch] = (0, import_react88.useReducer)(atCompletionReducer, initialState);
+  const fileSearch = (0, import_react88.useRef)(null);
+  const searchAbortController = (0, import_react88.useRef)(null);
+  const slowSearchTimer = (0, import_react88.useRef)(null);
+  (0, import_react88.useEffect)(() => {
     setSuggestions(state.suggestions);
   }, [state.suggestions, setSuggestions]);
-  (0, import_react89.useEffect)(() => {
+  (0, import_react88.useEffect)(() => {
     setIsLoadingSuggestions(state.isLoading);
   }, [state.isLoading, setIsLoadingSuggestions]);
-  (0, import_react89.useEffect)(() => {
+  (0, import_react88.useEffect)(() => {
     dispatch({ type: "RESET" });
   }, [cwd7, config]);
-  (0, import_react89.useEffect)(() => {
+  (0, import_react88.useEffect)(() => {
     if (!enabled) {
       if (state.status === "ready" /* READY */ || state.status === "error" /* ERROR */) {
         dispatch({ type: "RESET" });
@@ -334922,7 +334995,7 @@ function useAtCompletion(props) {
       dispatch({ type: "SEARCH", payload: pattern });
     }
   }, [enabled, pattern, state.status, state.pattern]);
-  (0, import_react89.useEffect)(() => {
+  (0, import_react88.useEffect)(() => {
     const initialize = /* @__PURE__ */ __name(async () => {
       try {
         const searcher = FileSearchFactory.create({
@@ -334997,7 +335070,7 @@ __name(useAtCompletion, "useAtCompletion");
 
 // packages/cli/src/ui/hooks/useSlashCompletion.ts
 init_esbuild_shims();
-var import_react90 = __toESM(require_react(), 1);
+var import_react89 = __toESM(require_react(), 1);
 init_fzf_es();
 function logErrorSafely(error, context2) {
   if (error instanceof Error) {
@@ -335012,7 +335085,7 @@ function matchesCommand(cmd, query) {
 }
 __name(matchesCommand, "matchesCommand");
 function useCommandParser(query, slashCommands) {
-  return (0, import_react90.useMemo)(() => {
+  return (0, import_react89.useMemo)(() => {
     if (!query) {
       return {
         hasTrailingSpace: false,
@@ -335082,9 +335155,9 @@ function useCommandParser(query, slashCommands) {
 }
 __name(useCommandParser, "useCommandParser");
 function useCommandSuggestions(parserResult, commandContext, getFzfForCommands, getPrefixSuggestions) {
-  const [suggestions, setSuggestions] = (0, import_react90.useState)([]);
-  const [isLoading, setIsLoading] = (0, import_react90.useState)(false);
-  (0, import_react90.useEffect)(() => {
+  const [suggestions, setSuggestions] = (0, import_react89.useState)([]);
+  const [isLoading, setIsLoading] = (0, import_react89.useState)(false);
+  (0, import_react89.useEffect)(() => {
     const abortController = new AbortController();
     const { signal } = abortController;
     const {
@@ -335204,7 +335277,7 @@ function useCommandSuggestions(parserResult, commandContext, getFzfForCommands,
 }
 __name(useCommandSuggestions, "useCommandSuggestions");
 function useCompletionPositions(query, parserResult) {
-  return (0, import_react90.useMemo)(() => {
+  return (0, import_react89.useMemo)(() => {
     if (!query) {
       return { start: -1, end: -1 };
     }
@@ -335226,7 +335299,7 @@ function useCompletionPositions(query, parserResult) {
 }
 __name(useCompletionPositions, "useCompletionPositions");
 function usePerfectMatch(parserResult) {
-  return (0, import_react90.useMemo)(() => {
+  return (0, import_react89.useMemo)(() => {
     const { hasTrailingSpace, partial, leafCommand, currentLevel } = parserResult;
     if (hasTrailingSpace) {
       return { isPerfectMatch: false };
@@ -335256,13 +335329,13 @@ function useSlashCompletion(props) {
     setIsLoadingSuggestions,
     setIsPerfectMatch
   } = props;
-  const [completionStart, setCompletionStart] = (0, import_react90.useState)(-1);
-  const [completionEnd, setCompletionEnd] = (0, import_react90.useState)(-1);
-  const fzfInstanceCache = (0, import_react90.useMemo)(
+  const [completionStart, setCompletionStart] = (0, import_react89.useState)(-1);
+  const [completionEnd, setCompletionEnd] = (0, import_react89.useState)(-1);
+  const fzfInstanceCache = (0, import_react89.useMemo)(
     () => /* @__PURE__ */ new WeakMap(),
     []
   );
-  const getFzfForCommands = (0, import_react90.useMemo)(
+  const getFzfForCommands = (0, import_react89.useMemo)(
     () => (commands) => {
       if (!commands || commands.length === 0) {
         return null;
@@ -335306,7 +335379,7 @@ function useSlashCompletion(props) {
     },
     [fzfInstanceCache]
   );
-  const getPrefixSuggestions = (0, import_react90.useMemo)(
+  const getPrefixSuggestions = (0, import_react89.useMemo)(
     () => (commands, partial) => commands.filter(
       (cmd) => cmd.description && !cmd.hidden && (cmd.name.toLowerCase().startsWith(partial.toLowerCase()) || cmd.altNames?.some(
         (alt) => alt.toLowerCase().startsWith(partial.toLowerCase())
@@ -335326,7 +335399,7 @@ function useSlashCompletion(props) {
     parserResult
   );
   const { isPerfectMatch } = usePerfectMatch(parserResult);
-  (0, import_react90.useEffect)(() => {
+  (0, import_react89.useEffect)(() => {
     if (!enabled) {
       setSuggestions([]);
       setIsLoadingSuggestions(false);
@@ -335335,7 +335408,7 @@ function useSlashCompletion(props) {
       setCompletionEnd(-1);
     }
   }, [enabled, setSuggestions, setIsLoadingSuggestions, setIsPerfectMatch]);
-  (0, import_react90.useEffect)(() => {
+  (0, import_react89.useEffect)(() => {
     if (!enabled || query === null) {
       return;
     }
@@ -335365,7 +335438,7 @@ __name(useSlashCompletion, "useSlashCompletion");
 
 // packages/cli/src/ui/hooks/usePromptCompletion.ts
 init_esbuild_shims();
-var import_react91 = __toESM(require_react(), 1);
+var import_react90 = __toESM(require_react(), 1);
 init_core2();
 var PROMPT_COMPLETION_MIN_LENGTH = 5;
 var PROMPT_COMPLETION_DEBOUNCE_MS = 250;
@@ -335374,18 +335447,18 @@ function usePromptCompletion({
   config,
   enabled
 }) {
-  const [ghostText, setGhostText] = (0, import_react91.useState)("");
-  const [isLoadingGhostText, setIsLoadingGhostText] = (0, import_react91.useState)(false);
-  const abortControllerRef = (0, import_react91.useRef)(null);
-  const [justSelectedSuggestion, setJustSelectedSuggestion] = (0, import_react91.useState)(false);
-  const lastSelectedTextRef = (0, import_react91.useRef)("");
-  const lastRequestedTextRef = (0, import_react91.useRef)("");
+  const [ghostText, setGhostText] = (0, import_react90.useState)("");
+  const [isLoadingGhostText, setIsLoadingGhostText] = (0, import_react90.useState)(false);
+  const abortControllerRef = (0, import_react90.useRef)(null);
+  const [justSelectedSuggestion, setJustSelectedSuggestion] = (0, import_react90.useState)(false);
+  const lastSelectedTextRef = (0, import_react90.useRef)("");
+  const lastRequestedTextRef = (0, import_react90.useRef)("");
   const isPromptCompletionEnabled = enabled && (config?.getEnablePromptCompletion() ?? false);
-  const clearGhostText = (0, import_react91.useCallback)(() => {
+  const clearGhostText = (0, import_react90.useCallback)(() => {
     setGhostText("");
     setIsLoadingGhostText(false);
   }, []);
-  const acceptGhostText = (0, import_react91.useCallback)(() => {
+  const acceptGhostText = (0, import_react90.useCallback)(() => {
     if (ghostText && ghostText.length > buffer.text.length) {
       buffer.setText(ghostText);
       setGhostText("");
@@ -335393,11 +335466,11 @@ function usePromptCompletion({
       lastSelectedTextRef.current = ghostText;
     }
   }, [ghostText, buffer]);
-  const markSuggestionSelected = (0, import_react91.useCallback)((selectedText) => {
+  const markSuggestionSelected = (0, import_react90.useCallback)((selectedText) => {
     setJustSelectedSuggestion(true);
     lastSelectedTextRef.current = selectedText;
   }, []);
-  const generatePromptSuggestions = (0, import_react91.useCallback)(async () => {
+  const generatePromptSuggestions = (0, import_react90.useCallback)(async () => {
     const trimmedText = buffer.text.trim();
     const geminiClient = config?.getGeminiClient();
     if (trimmedText === lastRequestedTextRef.current) {
@@ -335465,7 +335538,7 @@ function usePromptCompletion({
       }
     }
   }, [buffer.text, config, clearGhostText, isPromptCompletionEnabled]);
-  const isCursorAtEnd = (0, import_react91.useCallback)(() => {
+  const isCursorAtEnd = (0, import_react90.useCallback)(() => {
     const [cursorRow, cursorCol] = buffer.cursor;
     const totalLines = buffer.lines.length;
     if (cursorRow !== totalLines - 1) {
@@ -335474,7 +335547,7 @@ function usePromptCompletion({
     const lastLine = buffer.lines[cursorRow] || "";
     return cursorCol === lastLine.length;
   }, [buffer.cursor, buffer.lines]);
-  const handlePromptCompletion = (0, import_react91.useCallback)(() => {
+  const handlePromptCompletion = (0, import_react90.useCallback)(() => {
     if (!isCursorAtEnd()) {
       clearGhostText();
       return;
@@ -335495,14 +335568,14 @@ function usePromptCompletion({
     isCursorAtEnd,
     clearGhostText
   ]);
-  (0, import_react91.useEffect)(() => {
+  (0, import_react90.useEffect)(() => {
     const timeoutId = setTimeout(
       handlePromptCompletion,
       PROMPT_COMPLETION_DEBOUNCE_MS
     );
     return () => clearTimeout(timeoutId);
   }, [buffer.text, buffer.cursor, handlePromptCompletion]);
-  (0, import_react91.useEffect)(() => {
+  (0, import_react90.useEffect)(() => {
     const currentText = buffer.text.trim();
     if (ghostText && !isCursorAtEnd()) {
       clearGhostText();
@@ -335512,8 +335585,8 @@ function usePromptCompletion({
       clearGhostText();
     }
   }, [buffer.text, buffer.cursor, ghostText, clearGhostText, isCursorAtEnd]);
-  (0, import_react91.useEffect)(() => () => abortControllerRef.current?.abort(), []);
-  const isActive = (0, import_react91.useMemo)(() => {
+  (0, import_react90.useEffect)(() => () => abortControllerRef.current?.abort(), []);
+  const isActive = (0, import_react90.useMemo)(() => {
     if (!isPromptCompletionEnabled) return false;
     if (!isCursorAtEnd()) return false;
     const trimmedText = buffer.text.trim();
@@ -335551,7 +335624,7 @@ function useCommandCompletion(buffer, dirs, cwd7, slashCommands, commandContext,
   } = useCompletion();
   const cursorRow = buffer.cursor[0];
   const cursorCol = buffer.cursor[1];
-  const { completionMode, query, completionStart, completionEnd } = (0, import_react92.useMemo)(() => {
+  const { completionMode, query, completionStart, completionEnd } = (0, import_react91.useMemo)(() => {
     const currentLine = buffer.lines[cursorRow] || "";
     if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
       return {
@@ -335635,11 +335708,11 @@ function useCommandCompletion(buffer, dirs, cwd7, slashCommands, commandContext,
     config,
     enabled: completionMode === "PROMPT" /* PROMPT */
   });
-  (0, import_react92.useEffect)(() => {
+  (0, import_react91.useEffect)(() => {
     setActiveSuggestionIndex(suggestions.length > 0 ? 0 : -1);
     setVisibleStartIndex(0);
   }, [suggestions, setActiveSuggestionIndex, setVisibleStartIndex]);
-  (0, import_react92.useEffect)(() => {
+  (0, import_react91.useEffect)(() => {
     if (completionMode === "IDLE" /* IDLE */ || reverseSearchActive) {
       resetCompletionState();
       return;
@@ -335653,7 +335726,7 @@ function useCommandCompletion(buffer, dirs, cwd7, slashCommands, commandContext,
     resetCompletionState,
     setShowSuggestions
   ]);
-  const handleAutocomplete = (0, import_react92.useCallback)(
+  const handleAutocomplete = (0, import_react91.useCallback)(
     (indexToUse) => {
       if (indexToUse < 0 || indexToUse >= suggestions.length) {
         return;
@@ -335884,12 +335957,12 @@ import * as path76 from "node:path";
 
 // packages/cli/src/ui/contexts/ShellFocusContext.tsx
 init_esbuild_shims();
-var import_react93 = __toESM(require_react(), 1);
-var ShellFocusContext = (0, import_react93.createContext)(true);
-var useShellFocusState = /* @__PURE__ */ __name(() => (0, import_react93.useContext)(ShellFocusContext), "useShellFocusState");
+var import_react92 = __toESM(require_react(), 1);
+var ShellFocusContext = (0, import_react92.createContext)(true);
+var useShellFocusState = /* @__PURE__ */ __name(() => (0, import_react92.useContext)(ShellFocusContext), "useShellFocusState");
 
 // packages/cli/src/ui/components/InputPrompt.tsx
-var import_jsx_runtime94 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime93 = __toESM(require_jsx_runtime(), 1);
 var calculatePromptWidths = /* @__PURE__ */ __name((terminalWidth) => {
   const widthFraction = 0.9;
   const FRAME_PADDING_AND_BORDER = 4;
@@ -335927,29 +336000,29 @@ var InputPrompt = /* @__PURE__ */ __name(({
   isEmbeddedShellFocused
 }) => {
   const isShellFocused = useShellFocusState();
-  const [justNavigatedHistory, setJustNavigatedHistory] = (0, import_react94.useState)(false);
-  const [escPressCount, setEscPressCount] = (0, import_react94.useState)(0);
-  const [showEscapePrompt, setShowEscapePrompt] = (0, import_react94.useState)(false);
-  const escapeTimerRef = (0, import_react94.useRef)(null);
-  const [recentPasteTime, setRecentPasteTime] = (0, import_react94.useState)(null);
-  const pasteTimeoutRef = (0, import_react94.useRef)(null);
-  const [dirs, setDirs] = (0, import_react94.useState)(
+  const [justNavigatedHistory, setJustNavigatedHistory] = (0, import_react93.useState)(false);
+  const [escPressCount, setEscPressCount] = (0, import_react93.useState)(0);
+  const [showEscapePrompt, setShowEscapePrompt] = (0, import_react93.useState)(false);
+  const escapeTimerRef = (0, import_react93.useRef)(null);
+  const [recentPasteTime, setRecentPasteTime] = (0, import_react93.useState)(null);
+  const pasteTimeoutRef = (0, import_react93.useRef)(null);
+  const [dirs, setDirs] = (0, import_react93.useState)(
     config.getWorkspaceContext().getDirectories()
   );
   const dirsChanged = config.getWorkspaceContext().getDirectories();
-  (0, import_react94.useEffect)(() => {
+  (0, import_react93.useEffect)(() => {
     if (dirs.length !== dirsChanged.length) {
       setDirs(dirsChanged);
     }
   }, [dirs.length, dirsChanged]);
-  const [reverseSearchActive, setReverseSearchActive] = (0, import_react94.useState)(false);
-  const [commandSearchActive, setCommandSearchActive] = (0, import_react94.useState)(false);
-  const [textBeforeReverseSearch, setTextBeforeReverseSearch] = (0, import_react94.useState)("");
-  const [cursorPosition, setCursorPosition] = (0, import_react94.useState)([
+  const [reverseSearchActive, setReverseSearchActive] = (0, import_react93.useState)(false);
+  const [commandSearchActive, setCommandSearchActive] = (0, import_react93.useState)(false);
+  const [textBeforeReverseSearch, setTextBeforeReverseSearch] = (0, import_react93.useState)("");
+  const [cursorPosition, setCursorPosition] = (0, import_react93.useState)([
     0,
     0
   ]);
-  const [expandedSuggestionIndex, setExpandedSuggestionIndex] = (0, import_react94.useState)(-1);
+  const [expandedSuggestionIndex, setExpandedSuggestionIndex] = (0, import_react93.useState)(-1);
   const shellHistory = useShellHistory(config.getProjectRoot());
   const shellHistoryData = shellHistory.history;
   const completion3 = useCommandCompletion(
@@ -335975,7 +336048,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
   const resetReverseSearchCompletionState = reverseSearchCompletion.resetCompletionState;
   const resetCommandSearchCompletionState = commandSearchCompletion.resetCompletionState;
   const showCursor = focus && isShellFocused && !isEmbeddedShellFocused;
-  const resetEscapeState = (0, import_react94.useCallback)(() => {
+  const resetEscapeState = (0, import_react93.useCallback)(() => {
     if (escapeTimerRef.current) {
       clearTimeout(escapeTimerRef.current);
       escapeTimerRef.current = null;
@@ -335983,12 +336056,12 @@ var InputPrompt = /* @__PURE__ */ __name(({
     setEscPressCount(0);
     setShowEscapePrompt(false);
   }, []);
-  (0, import_react94.useEffect)(() => {
+  (0, import_react93.useEffect)(() => {
     if (onEscapePromptChange) {
       onEscapePromptChange(showEscapePrompt);
     }
   }, [showEscapePrompt, onEscapePromptChange]);
-  (0, import_react94.useEffect)(
+  (0, import_react93.useEffect)(
     () => () => {
       if (escapeTimerRef.current) {
         clearTimeout(escapeTimerRef.current);
@@ -335999,7 +336072,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
     },
     []
   );
-  const handleSubmitAndClear = (0, import_react94.useCallback)(
+  const handleSubmitAndClear = (0, import_react93.useCallback)(
     (submittedValue) => {
       if (shellModeActive) {
         shellHistory.addCommandToHistory(submittedValue);
@@ -336018,7 +336091,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
       resetReverseSearchCompletionState
     ]
   );
-  const customSetTextAndResetCompletionSignal = (0, import_react94.useCallback)(
+  const customSetTextAndResetCompletionSignal = (0, import_react93.useCallback)(
     (newText) => {
       buffer.setText(newText);
       setJustNavigatedHistory(true);
@@ -336032,7 +336105,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
     currentQuery: buffer.text,
     onChange: customSetTextAndResetCompletionSignal
   });
-  (0, import_react94.useEffect)(() => {
+  (0, import_react93.useEffect)(() => {
     if (justNavigatedHistory) {
       resetCompletionState();
       resetReverseSearchCompletionState();
@@ -336048,7 +336121,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
     resetReverseSearchCompletionState,
     resetCommandSearchCompletionState
   ]);
-  const handleClipboardImage = (0, import_react94.useCallback)(async () => {
+  const handleClipboardImage = (0, import_react93.useCallback)(async () => {
     try {
       if (await clipboardHasImage()) {
         const imagePath = await saveClipboardImage(config.getTargetDir());
@@ -336080,7 +336153,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
       console.error("Error handling clipboard image:", error);
     }
   }, [buffer, config]);
-  const handleInput = (0, import_react94.useCallback)(
+  const handleInput = (0, import_react93.useCallback)(
     (key) => {
       if (!focus && !key.paste) {
         return;
@@ -336386,7 +336459,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
   const linesToRender = buffer.viewportVisualLines;
   const [cursorVisualRowAbsolute, cursorVisualColAbsolute] = buffer.visualCursor;
   const scrollVisualRow = buffer.visualScrollRow;
-  const getGhostTextLines = (0, import_react94.useCallback)(() => {
+  const getGhostTextLines = (0, import_react93.useCallback)(() => {
     if (!completion3.promptCompletion.text || !buffer.text || !completion3.promptCompletion.text.startsWith(buffer.text)) {
       return { inlineGhost: "", additionalLines: [] };
     }
@@ -336502,21 +336575,21 @@ var InputPrompt = /* @__PURE__ */ __name(({
     statusColor = theme.status.warning;
     statusText = "Accepting edits";
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(import_jsx_runtime94.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(import_jsx_runtime93.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(
       Box_default,
       {
         borderStyle: "round",
         borderColor: isShellFocused && !isEmbeddedShellFocused ? statusColor ?? theme.border.focused : theme.border.default,
         paddingX: 1,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
+          /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(
             Text,
             {
               color: statusColor ?? theme.text.accent,
               "aria-label": statusText || void 0,
               children: [
-                shellModeActive ? reverseSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
+                shellModeActive ? reverseSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(
                   Text,
                   {
                     color: theme.text.link,
@@ -336526,15 +336599,15 @@ var InputPrompt = /* @__PURE__ */ __name(({
                       " "
                     ]
                   }
-                ) : "!" : commandSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text, { color: theme.text.accent, children: "(r:) " }) : showYoloStyling ? "*" : ">",
+                ) : "!" : commandSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: theme.text.accent, children: "(r:) " }) : showYoloStyling ? "*" : ">",
                 " "
               ]
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(Text, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { flexGrow: 1, flexDirection: "column", children: buffer.text.length === 0 && placeholder ? showCursor ? /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Text, { children: [
             import_chalk7.default.inverse(placeholder.slice(0, 1)),
-            /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text, { color: theme.text.secondary, children: placeholder.slice(1) })
-          ] }) : /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text, { color: theme.text.secondary, children: placeholder }) : linesToRender.map((lineText, visualIdxInRenderedSet) => {
+            /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: theme.text.secondary, children: placeholder.slice(1) })
+          ] }) : /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: theme.text.secondary, children: placeholder }) : linesToRender.map((lineText, visualIdxInRenderedSet) => {
             const absoluteVisualIdx = scrollVisualRow + visualIdxInRenderedSet;
             const mapEntry = buffer.visualToLogicalMap[absoluteVisualIdx];
             const cursorVisualRow = cursorVisualRowAbsolute - scrollVisualRow;
@@ -336581,22 +336654,22 @@ var InputPrompt = /* @__PURE__ */ __name(({
               }
               const color = seg.type === "command" || seg.type === "file" ? theme.text.accent : theme.text.primary;
               renderedLine.push(
-                /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text, { color, children: display }, `token-${segIdx}`)
+                /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color, children: display }, `token-${segIdx}`)
               );
             });
             const currentLineGhost = isOnCursorLine ? inlineGhost : "";
             if (isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText)) {
               if (!currentLineGhost) {
                 renderedLine.push(
-                  /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text, { children: showCursor ? import_chalk7.default.inverse(" ") : " " }, `cursor-end-${cursorVisualColAbsolute}`)
+                  /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { children: showCursor ? import_chalk7.default.inverse(" ") : " " }, `cursor-end-${cursorVisualColAbsolute}`)
                 );
               }
             }
             const showCursorBeforeGhost = focus && isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText) && currentLineGhost;
-            return /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(Text, { children: [
+            return /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(Text, { children: [
               renderedLine,
               showCursorBeforeGhost && (showCursor ? import_chalk7.default.inverse(" ") : " "),
-              currentLineGhost && /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text, { color: theme.text.secondary, children: currentLineGhost })
+              currentLineGhost && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Text, { color: theme.text.secondary, children: currentLineGhost })
             ] }) }, `line-${visualIdxInRenderedSet}`);
           }).concat(
             additionalLines.map((ghostLine, index) => {
@@ -336604,7 +336677,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
                 0,
                 inputWidth - stringWidth4(ghostLine)
               );
-              return /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
+              return /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)(
                 Text,
                 {
                   color: theme.text.secondary,
@@ -336620,7 +336693,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
         ]
       }
     ),
-    shouldShowSuggestions && /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { paddingRight: 2, children: /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(
+    shouldShowSuggestions && /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Box_default, { paddingRight: 2, children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
       SuggestionsDisplay,
       {
         suggestions: activeCompletion.suggestions,
@@ -336642,7 +336715,7 @@ init_core2();
 
 // packages/cli/src/ui/components/ConsoleSummaryDisplay.tsx
 init_esbuild_shims();
-var import_jsx_runtime95 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime94 = __toESM(require_jsx_runtime(), 1);
 var ConsoleSummaryDisplay = /* @__PURE__ */ __name(({
   errorCount
 }) => {
@@ -336650,14 +336723,14 @@ var ConsoleSummaryDisplay = /* @__PURE__ */ __name(({
     return null;
   }
   const errorIcon = "\u2716";
-  return /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Box_default, { children: errorCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Text, { color: theme.status.error, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { children: errorCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(Text, { color: theme.status.error, children: [
     errorIcon,
     " ",
     errorCount,
     " error",
     errorCount > 1 ? "s" : "",
     " ",
-    /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text, { color: theme.text.secondary, children: "(ctrl+o for details)" })
+    /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text, { color: theme.text.secondary, children: "(ctrl+o for details)" })
   ] }) });
 }, "ConsoleSummaryDisplay");
 
@@ -336666,15 +336739,15 @@ import process31 from "node:process";
 
 // packages/cli/src/ui/components/MemoryUsageDisplay.tsx
 init_esbuild_shims();
-var import_react95 = __toESM(require_react(), 1);
+var import_react94 = __toESM(require_react(), 1);
 import process30 from "node:process";
-var import_jsx_runtime96 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime95 = __toESM(require_jsx_runtime(), 1);
 var MemoryUsageDisplay = /* @__PURE__ */ __name(() => {
-  const [memoryUsage, setMemoryUsage] = (0, import_react95.useState)("");
-  const [memoryUsageColor, setMemoryUsageColor] = (0, import_react95.useState)(
+  const [memoryUsage, setMemoryUsage] = (0, import_react94.useState)("");
+  const [memoryUsageColor, setMemoryUsageColor] = (0, import_react94.useState)(
     theme.text.secondary
   );
-  (0, import_react95.useEffect)(() => {
+  (0, import_react94.useEffect)(() => {
     const updateMemory = /* @__PURE__ */ __name(() => {
       const usage2 = process30.memoryUsage().rss;
       setMemoryUsage(formatMemoryUsage2(usage2));
@@ -336686,16 +336759,16 @@ var MemoryUsageDisplay = /* @__PURE__ */ __name(() => {
     updateMemory();
     return () => clearInterval(intervalId);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(Box_default, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(Text, { color: theme.text.secondary, children: " | " }),
-    /* @__PURE__ */ (0, import_jsx_runtime96.jsx)(Text, { color: memoryUsageColor, children: memoryUsage })
+  return /* @__PURE__ */ (0, import_jsx_runtime95.jsxs)(Box_default, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text, { color: theme.text.secondary, children: " | " }),
+    /* @__PURE__ */ (0, import_jsx_runtime95.jsx)(Text, { color: memoryUsageColor, children: memoryUsage })
   ] });
 }, "MemoryUsageDisplay");
 
 // packages/cli/src/ui/components/ContextUsageDisplay.tsx
 init_esbuild_shims();
 init_core2();
-var import_jsx_runtime97 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime96 = __toESM(require_jsx_runtime(), 1);
 var ContextUsageDisplay = /* @__PURE__ */ __name(({
   promptTokenCount,
   model,
@@ -336704,7 +336777,7 @@ var ContextUsageDisplay = /* @__PURE__ */ __name(({
   const percentage = promptTokenCount / tokenLimit(model);
   const percentageLeft = ((1 - percentage) * 100).toFixed(0);
   const label = terminalWidth < 100 ? "%" : "% context left";
-  return /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text, { color: theme.text.secondary, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime96.jsxs)(Text, { color: theme.text.secondary, children: [
     "(",
     percentageLeft,
     label,
@@ -336714,12 +336787,12 @@ var ContextUsageDisplay = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/DebugProfiler.tsx
 init_esbuild_shims();
-var import_react96 = __toESM(require_react(), 1);
-var import_jsx_runtime98 = __toESM(require_jsx_runtime(), 1);
+var import_react95 = __toESM(require_react(), 1);
+var import_jsx_runtime97 = __toESM(require_jsx_runtime(), 1);
 var DebugProfiler = /* @__PURE__ */ __name(() => {
-  const numRenders = (0, import_react96.useRef)(0);
-  const [showNumRenders, setShowNumRenders] = (0, import_react96.useState)(false);
-  (0, import_react96.useEffect)(() => {
+  const numRenders = (0, import_react95.useRef)(0);
+  const [showNumRenders, setShowNumRenders] = (0, import_react95.useState)(false);
+  (0, import_react95.useEffect)(() => {
     numRenders.current++;
   });
   useKeypress(
@@ -336733,7 +336806,7 @@ var DebugProfiler = /* @__PURE__ */ __name(() => {
   if (!showNumRenders) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { color: theme.status.warning, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime97.jsxs)(Text, { color: theme.status.warning, children: [
     "Renders: ",
     numRenders.current,
     " "
@@ -336741,7 +336814,7 @@ var DebugProfiler = /* @__PURE__ */ __name(() => {
 }, "DebugProfiler");
 
 // packages/cli/src/ui/components/Footer.tsx
-var import_jsx_runtime99 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime98 = __toESM(require_jsx_runtime(), 1);
 var Footer = /* @__PURE__ */ __name(() => {
   const uiState = useUIState();
   const config = useConfig();
@@ -336781,7 +336854,7 @@ var Footer = /* @__PURE__ */ __name(() => {
   const displayPath = shortenPath(tildeifyPath(targetDir), pathLength);
   const justifyContent = hideCWD && hideModelInfo ? "center" : "space-between";
   const displayVimMode = vimEnabled ? vimMode : void 0;
-  return /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(
     Box_default,
     {
       justifyContent,
@@ -336789,57 +336862,57 @@ var Footer = /* @__PURE__ */ __name(() => {
       flexDirection: "row",
       alignItems: "center",
       children: [
-        (debugMode || displayVimMode || !hideCWD) && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { children: [
-          debugMode && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(DebugProfiler, {}),
-          displayVimMode && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { color: theme.text.secondary, children: [
+        (debugMode || displayVimMode || !hideCWD) && /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Box_default, { children: [
+          debugMode && /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(DebugProfiler, {}),
+          displayVimMode && /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { color: theme.text.secondary, children: [
             "[",
             displayVimMode,
             "] "
           ] }),
-          !hideCWD && (nightly ? /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(dist_default4, { colors: theme.ui.gradient, children: /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { children: [
+          !hideCWD && (nightly ? /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(dist_default4, { colors: theme.ui.gradient, children: /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { children: [
             displayPath,
-            branchName && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { children: [
+            branchName && /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { children: [
               " (",
               branchName,
               "*)"
             ] })
-          ] }) }) : /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { color: theme.text.link, children: [
+          ] }) }) : /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { color: theme.text.link, children: [
             displayPath,
-            branchName && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { color: theme.text.secondary, children: [
+            branchName && /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { color: theme.text.secondary, children: [
               " (",
               branchName,
               "*)"
             ] })
           ] })),
-          debugMode && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.status.error, children: " " + (debugMessage || "--debug") })
+          debugMode && /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.status.error, children: " " + (debugMessage || "--debug") })
         ] }),
-        !hideSandboxStatus && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(
+        !hideSandboxStatus && /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(
           Box_default,
           {
             flexGrow: 1,
             alignItems: "center",
             justifyContent: "center",
             display: "flex",
-            children: isTrustedFolder === false ? /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.status.warning, children: "untrusted" }) : process31.env["SANDBOX"] && process31.env["SANDBOX"] !== "sandbox-exec" ? /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: "green", children: process31.env["SANDBOX"].replace(/^gemini-(?:cli-)?/, "") }) : process31.env["SANDBOX"] === "sandbox-exec" ? /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { color: theme.status.warning, children: [
+            children: isTrustedFolder === false ? /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.status.warning, children: "untrusted" }) : process31.env["SANDBOX"] && process31.env["SANDBOX"] !== "sandbox-exec" ? /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: "green", children: process31.env["SANDBOX"].replace(/^gemini-(?:cli-)?/, "") }) : process31.env["SANDBOX"] === "sandbox-exec" ? /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { color: theme.status.warning, children: [
               "macOS Seatbelt",
               " ",
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { color: theme.text.secondary, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { color: theme.text.secondary, children: [
                 "(",
                 process31.env["SEATBELT_PROFILE"],
                 ")"
               ] })
-            ] }) : /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { color: theme.status.error, children: [
+            ] }) : /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { color: theme.status.error, children: [
               "no sandbox",
-              terminalWidth >= 100 && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.text.secondary, children: " (see /docs)" })
+              terminalWidth >= 100 && /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.text.secondary, children: " (see /docs)" })
             ] })
           }
         ),
-        !hideModelInfo && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { alignItems: "center", justifyContent: "flex-end", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { alignItems: "center", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { color: theme.text.accent, children: [
+        !hideModelInfo && /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Box_default, { alignItems: "center", justifyContent: "flex-end", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Box_default, { alignItems: "center", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { color: theme.text.accent, children: [
               model,
               " ",
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(
                 ContextUsageDisplay,
                 {
                   promptTokenCount,
@@ -336848,20 +336921,20 @@ var Footer = /* @__PURE__ */ __name(() => {
                 }
               )
             ] }),
-            showMemoryUsage && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(MemoryUsageDisplay, {})
+            showMemoryUsage && /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(MemoryUsageDisplay, {})
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { alignItems: "center", paddingLeft: 2, children: [
-            corgiMode && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.ui.symbol, children: "| " }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.status.error, children: "\u25BC" }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.text.primary, children: "(\xB4" }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.status.error, children: "\u1D25" }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.text.primary, children: "`)" }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.status.error, children: "\u25BC " })
+          /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Box_default, { alignItems: "center", paddingLeft: 2, children: [
+            corgiMode && /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Text, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.ui.symbol, children: "| " }),
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.status.error, children: "\u25BC" }),
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.text.primary, children: "(\xB4" }),
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.status.error, children: "\u1D25" }),
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.text.primary, children: "`)" }),
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.status.error, children: "\u25BC " })
             ] }),
-            !showErrorDetails && errorCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { color: theme.ui.symbol, children: "| " }),
-              /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(ConsoleSummaryDisplay, { errorCount })
+            !showErrorDetails && errorCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime98.jsxs)(Box_default, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(Text, { color: theme.ui.symbol, children: "| " }),
+              /* @__PURE__ */ (0, import_jsx_runtime98.jsx)(ConsoleSummaryDisplay, { errorCount })
             ] })
           ] })
         ] })
@@ -336872,7 +336945,7 @@ var Footer = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/components/QueuedMessageDisplay.tsx
 init_esbuild_shims();
-var import_jsx_runtime100 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime99 = __toESM(require_jsx_runtime(), 1);
 var MAX_DISPLAYED_QUEUED_MESSAGES = 3;
 var QueuedMessageDisplay = /* @__PURE__ */ __name(({
   messageQueue
@@ -336880,12 +336953,12 @@ var QueuedMessageDisplay = /* @__PURE__ */ __name(({
   if (messageQueue.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
     messageQueue.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES).map((message, index) => {
       const preview = message.replace(/\s+/g, " ");
-      return /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Box_default, { paddingLeft: 2, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text, { dimColor: true, wrap: "truncate", children: preview }) }, index);
+      return /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Box_default, { paddingLeft: 2, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Text, { dimColor: true, wrap: "truncate", children: preview }) }, index);
     }),
-    messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text, { dimColor: true, children: [
+    messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && /* @__PURE__ */ (0, import_jsx_runtime99.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime99.jsxs)(Text, { dimColor: true, children: [
       "... (+",
       messageQueue.length - MAX_DISPLAYED_QUEUED_MESSAGES,
       " more)"
@@ -336898,7 +336971,7 @@ init_core2();
 
 // packages/cli/src/ui/components/ConfigInitDisplay.tsx
 init_esbuild_shims();
-var import_react97 = __toESM(require_react(), 1);
+var import_react96 = __toESM(require_react(), 1);
 
 // packages/cli/src/utils/events.ts
 init_esbuild_shims();
@@ -336907,11 +336980,11 @@ var appEvents = new EventEmitter8();
 
 // packages/cli/src/ui/components/ConfigInitDisplay.tsx
 init_core2();
-var import_jsx_runtime101 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime100 = __toESM(require_jsx_runtime(), 1);
 var ConfigInitDisplay = /* @__PURE__ */ __name(() => {
   const config = useConfig();
-  const [message, setMessage] = (0, import_react97.useState)("Initializing...");
-  (0, import_react97.useEffect)(() => {
+  const [message, setMessage] = (0, import_react96.useState)("Initializing...");
+  (0, import_react96.useEffect)(() => {
     const onChange = /* @__PURE__ */ __name((clients) => {
       if (!clients || clients.size === 0) {
         setMessage(`Initializing...`);
@@ -336930,15 +337003,15 @@ var ConfigInitDisplay = /* @__PURE__ */ __name(() => {
       appEvents.off("mcp-client-update", onChange);
     };
   }, [config]);
-  return /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Text, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(GeminiSpinner, {}),
+  return /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime100.jsxs)(Text, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(GeminiSpinner, {}),
     " ",
-    /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Text, { color: theme.text.primary, children: message })
+    /* @__PURE__ */ (0, import_jsx_runtime100.jsx)(Text, { color: theme.text.primary, children: message })
   ] }) });
 }, "ConfigInitDisplay");
 
 // packages/cli/src/ui/components/Composer.tsx
-var import_jsx_runtime102 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime101 = __toESM(require_jsx_runtime(), 1);
 var Composer = /* @__PURE__ */ __name(() => {
   const config = useConfig();
   const settings = useSettings();
@@ -336950,12 +337023,12 @@ var Composer = /* @__PURE__ */ __name(() => {
   const isNarrow = isNarrowWidth(terminalWidth);
   const debugConsoleMaxHeight = Math.floor(Math.max(terminalWidth * 0.2, 5));
   const { contextFileNames, showAutoAcceptIndicator } = uiState;
-  const { containerWidth } = (0, import_react98.useMemo)(
+  const { containerWidth } = (0, import_react97.useMemo)(
     () => calculatePromptWidths(uiState.terminalWidth),
     [uiState.terminalWidth]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Box_default, { flexDirection: "column", children: [
-    !uiState.embeddedShellFocused && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Box_default, { flexDirection: "column", children: [
+    !uiState.embeddedShellFocused && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(
       LoadingIndicator,
       {
         thought: uiState.streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ || config.getAccessibility()?.disableLoadingPhrases ? void 0 : uiState.thought,
@@ -336963,9 +337036,9 @@ var Composer = /* @__PURE__ */ __name(() => {
         elapsedTime: uiState.elapsedTime
       }
     ),
-    !uiState.isConfigInitialized && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(ConfigInitDisplay, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(QueuedMessageDisplay, { messageQueue: uiState.messageQueue }),
-    /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(
+    !uiState.isConfigInitialized && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(ConfigInitDisplay, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(QueuedMessageDisplay, { messageQueue: uiState.messageQueue }),
+    /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(
       Box_default,
       {
         marginTop: 1,
@@ -336974,9 +337047,9 @@ var Composer = /* @__PURE__ */ __name(() => {
         flexDirection: isNarrow ? "column" : "row",
         alignItems: isNarrow ? "flex-start" : "center",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Box_default, { marginRight: 1, children: [
-            process.env["GEMINI_SYSTEM_MD"] && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text, { color: theme.status.error, children: "|\u2310\u25A0_\u25A0| " }),
-            uiState.ctrlCPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) : uiState.ctrlDPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) : uiState.showEscapePrompt ? /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text, { color: theme.text.secondary, children: "Press Esc again to clear." }) : !settings.merged.ui?.hideContextSummary && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Box_default, { marginRight: 1, children: [
+            process.env["GEMINI_SYSTEM_MD"] && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Text, { color: theme.status.error, children: "|\u2310\u25A0_\u25A0| " }),
+            uiState.ctrlCPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) : uiState.ctrlDPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) : uiState.showEscapePrompt ? /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Text, { color: theme.text.secondary, children: "Press Esc again to clear." }) : !settings.merged.ui?.hideContextSummary && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(
               ContextSummaryDisplay,
               {
                 ideContext: uiState.ideContextState,
@@ -336988,15 +337061,15 @@ var Composer = /* @__PURE__ */ __name(() => {
               }
             )
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Box_default, { paddingTop: isNarrow ? 1 : 0, children: [
-            showAutoAcceptIndicator !== "default" /* DEFAULT */ && !uiState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator }),
-            uiState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(ShellModeIndicator, {})
+          /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Box_default, { paddingTop: isNarrow ? 1 : 0, children: [
+            showAutoAcceptIndicator !== "default" /* DEFAULT */ && !uiState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator }),
+            uiState.shellModeActive && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(ShellModeIndicator, {})
           ] })
         ]
       }
     ),
-    uiState.showErrorDetails && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+    uiState.showErrorDetails && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Box_default, { flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(
         DetailedMessagesDisplay,
         {
           messages: uiState.filteredConsoleMessages,
@@ -337004,9 +337077,9 @@ var Composer = /* @__PURE__ */ __name(() => {
           width: containerWidth
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(ShowMoreLines, { constrainHeight: uiState.constrainHeight })
+      /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(ShowMoreLines, { constrainHeight: uiState.constrainHeight })
     ] }) }),
-    uiState.isInputActive && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(
+    uiState.isInputActive && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(
       InputPrompt,
       {
         buffer: uiState.buffer,
@@ -337028,65 +337101,65 @@ var Composer = /* @__PURE__ */ __name(() => {
         placeholder: vimEnabled ? "  Press 'i' for INSERT mode and 'Esc' for NORMAL mode." : "  Type your message or @path/to/file"
       }
     ),
-    !settings.merged.ui?.hideFooter && !isScreenReaderEnabled && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Footer, {})
+    !settings.merged.ui?.hideFooter && !isScreenReaderEnabled && /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Footer, {})
   ] });
 }, "Composer");
 
 // packages/cli/src/ui/components/ExitWarning.tsx
 init_esbuild_shims();
-var import_jsx_runtime103 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime102 = __toESM(require_jsx_runtime(), 1);
 var ExitWarning = /* @__PURE__ */ __name(() => {
   const uiState = useUIState();
-  return /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(import_jsx_runtime103.Fragment, { children: [
-    uiState.dialogsVisible && uiState.ctrlCPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) }),
-    uiState.dialogsVisible && uiState.ctrlDPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) })
+  return /* @__PURE__ */ (0, import_jsx_runtime102.jsxs)(import_jsx_runtime102.Fragment, { children: [
+    uiState.dialogsVisible && uiState.ctrlCPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) }),
+    uiState.dialogsVisible && uiState.ctrlDPressedOnce && /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime102.jsx)(Text, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) })
   ] });
 }, "ExitWarning");
 
 // packages/cli/src/ui/layouts/ScreenReaderAppLayout.tsx
-var import_jsx_runtime104 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime103 = __toESM(require_jsx_runtime(), 1);
 var ScreenReaderAppLayout = /* @__PURE__ */ __name(() => {
   const uiState = useUIState();
-  return /* @__PURE__ */ (0, import_jsx_runtime104.jsxs)(Box_default, { flexDirection: "column", width: "90%", height: "100%", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Notifications, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Footer, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(MainContent, {}) }),
-    uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Box_default, { flexDirection: "column", width: "90%", height: "100%", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Notifications, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Footer, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(MainContent, {}) }),
+    uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(
       DialogManager,
       {
         terminalWidth: uiState.terminalWidth,
         addItem: uiState.historyManager.addItem
       }
-    ) : /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Composer, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(ExitWarning, {})
+    ) : /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Composer, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(ExitWarning, {})
   ] });
 }, "ScreenReaderAppLayout");
 
 // packages/cli/src/ui/layouts/DefaultAppLayout.tsx
 init_esbuild_shims();
-var import_jsx_runtime105 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime104 = __toESM(require_jsx_runtime(), 1);
 var DefaultAppLayout = /* @__PURE__ */ __name(({
   width = "90%"
 }) => {
   const uiState = useUIState();
-  return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { flexDirection: "column", width, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(MainContent, {}),
-    /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { flexDirection: "column", ref: uiState.mainControlsRef, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Notifications, {}),
-      uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime104.jsxs)(Box_default, { flexDirection: "column", width, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(MainContent, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime104.jsxs)(Box_default, { flexDirection: "column", ref: uiState.mainControlsRef, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Notifications, {}),
+      uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(
         DialogManager,
         {
           terminalWidth: uiState.terminalWidth,
           addItem: uiState.historyManager.addItem
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Composer, {}),
-      /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(ExitWarning, {})
+      ) : /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(Composer, {}),
+      /* @__PURE__ */ (0, import_jsx_runtime104.jsx)(ExitWarning, {})
     ] })
   ] });
 }, "DefaultAppLayout");
 
 // packages/cli/src/ui/App.tsx
-var import_jsx_runtime106 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime105 = __toESM(require_jsx_runtime(), 1);
 var getContainerWidth = /* @__PURE__ */ __name((terminalWidth) => {
   if (terminalWidth <= 80) {
     return "98%";
@@ -337104,14 +337177,34 @@ var App2 = /* @__PURE__ */ __name(() => {
   const { columns } = useTerminalSize();
   const containerWidth = getContainerWidth(columns);
   if (uiState.quittingMessages) {
-    return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(QuittingDisplay, {});
+    return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(QuittingDisplay, {});
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(StreamingContext.Provider, { value: uiState.streamingState, children: isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(ScreenReaderAppLayout, {}) : /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(DefaultAppLayout, { width: containerWidth }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(StreamingContext.Provider, { value: uiState.streamingState, children: isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(ScreenReaderAppLayout, {}) : /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(DefaultAppLayout, { width: containerWidth }) });
 }, "App");
 
 // packages/cli/src/ui/AppContainer.tsx
 init_core2();
 
+// packages/cli/src/config/auth.ts
+init_esbuild_shims();
+init_core2();
+function validateAuthMethod(authMethod) {
+  const settings = loadSettings();
+  loadEnvironment(settings.merged);
+  if (authMethod === "openai" /* USE_OPENAI */) {
+    const hasApiKey = process.env["OPENAI_API_KEY"] || settings.merged.security?.auth?.apiKey;
+    if (!hasApiKey) {
+      return "OPENAI_API_KEY environment variable not found. You can enter it interactively or add it to your .env file.";
+    }
+    return null;
+  }
+  if (authMethod === "qwen-oauth" /* QWEN_OAUTH */) {
+    return null;
+  }
+  return "Invalid auth method selected.";
+}
+__name(validateAuthMethod, "validateAuthMethod");
+
 // packages/cli/src/config/config.ts
 init_esbuild_shims();
 
@@ -343016,7 +343109,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.0.27";
+  return "0.0.28-alpha.0";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -344064,12 +344157,12 @@ import process50 from "node:process";
 
 // packages/cli/src/ui/hooks/useMemoryMonitor.ts
 init_esbuild_shims();
-var import_react99 = __toESM(require_react(), 1);
+var import_react98 = __toESM(require_react(), 1);
 import process33 from "node:process";
 var MEMORY_WARNING_THRESHOLD = 7 * 1024 * 1024 * 1024;
 var MEMORY_CHECK_INTERVAL = 60 * 1e3;
 var useMemoryMonitor = /* @__PURE__ */ __name(({ addItem }) => {
-  (0, import_react99.useEffect)(() => {
+  (0, import_react98.useEffect)(() => {
     const intervalId = setInterval(() => {
       const usage2 = process33.memoryUsage().rss;
       if (usage2 > MEMORY_WARNING_THRESHOLD) {
@@ -344089,11 +344182,11 @@ var useMemoryMonitor = /* @__PURE__ */ __name(({ addItem }) => {
 
 // packages/cli/src/ui/hooks/useThemeCommand.ts
 init_esbuild_shims();
-var import_react100 = __toESM(require_react(), 1);
+var import_react99 = __toESM(require_react(), 1);
 import process34 from "node:process";
 var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, addItem, initialThemeError) => {
-  const [isThemeDialogOpen, setIsThemeDialogOpen] = (0, import_react100.useState)(!!initialThemeError);
-  const openThemeDialog = (0, import_react100.useCallback)(() => {
+  const [isThemeDialogOpen, setIsThemeDialogOpen] = (0, import_react99.useState)(!!initialThemeError);
+  const openThemeDialog = (0, import_react99.useCallback)(() => {
     if (process34.env["NO_COLOR"]) {
       addItem(
         {
@@ -344106,7 +344199,7 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
     }
     setIsThemeDialogOpen(true);
   }, [addItem]);
-  const applyTheme = (0, import_react100.useCallback)(
+  const applyTheme = (0, import_react99.useCallback)(
     (themeName) => {
       if (!themeManager.setActiveTheme(themeName)) {
         setIsThemeDialogOpen(true);
@@ -344117,13 +344210,13 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
     },
     [setThemeError]
   );
-  const handleThemeHighlight = (0, import_react100.useCallback)(
+  const handleThemeHighlight = (0, import_react99.useCallback)(
     (themeName) => {
       applyTheme(themeName);
     },
     [applyTheme]
   );
-  const handleThemeSelect = (0, import_react100.useCallback)(
+  const handleThemeSelect = (0, import_react99.useCallback)(
     (themeName, scope) => {
       try {
         const mergedCustomThemes = {
@@ -344161,17 +344254,73 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
 init_esbuild_shims();
 var import_react101 = __toESM(require_react(), 1);
 init_core2();
-function validateAuthMethodWithSettings(authType, settings) {
-  const enforcedType = settings.merged.security?.auth?.enforcedType;
-  if (enforcedType && enforcedType !== authType) {
-    return `Authentication is enforced to be ${enforcedType}, but you are currently using ${authType}.`;
-  }
-  if (settings.merged.security?.auth?.useExternal) {
-    return null;
-  }
-  return validateAuthMethod(authType);
-}
-__name(validateAuthMethodWithSettings, "validateAuthMethodWithSettings");
+
+// packages/cli/src/ui/hooks/useQwenAuth.ts
+init_esbuild_shims();
+var import_react100 = __toESM(require_react(), 1);
+init_core2();
+var useQwenAuth = /* @__PURE__ */ __name((pendingAuthType, isAuthenticating) => {
+  const [qwenAuthState, setQwenAuthState] = (0, import_react100.useState)({
+    deviceAuth: null,
+    authStatus: "idle",
+    authMessage: null
+  });
+  const isQwenAuth = pendingAuthType === "qwen-oauth" /* QWEN_OAUTH */;
+  (0, import_react100.useEffect)(() => {
+    if (!isQwenAuth || !isAuthenticating) {
+      setQwenAuthState({
+        deviceAuth: null,
+        authStatus: "idle",
+        authMessage: null
+      });
+      return;
+    }
+    setQwenAuthState((prev) => ({
+      ...prev,
+      authStatus: "idle"
+    }));
+    const handleDeviceAuth = /* @__PURE__ */ __name((deviceAuth) => {
+      setQwenAuthState((prev) => ({
+        ...prev,
+        deviceAuth: {
+          verification_uri: deviceAuth.verification_uri,
+          verification_uri_complete: deviceAuth.verification_uri_complete,
+          user_code: deviceAuth.user_code,
+          expires_in: deviceAuth.expires_in,
+          device_code: deviceAuth.device_code
+        },
+        authStatus: "polling"
+      }));
+    }, "handleDeviceAuth");
+    const handleAuthProgress = /* @__PURE__ */ __name((status, message) => {
+      setQwenAuthState((prev) => ({
+        ...prev,
+        authStatus: status,
+        authMessage: message || null
+      }));
+    }, "handleAuthProgress");
+    qwenOAuth2Events.on("auth-uri" /* AuthUri */, handleDeviceAuth);
+    qwenOAuth2Events.on("auth-progress" /* AuthProgress */, handleAuthProgress);
+    return () => {
+      qwenOAuth2Events.off("auth-uri" /* AuthUri */, handleDeviceAuth);
+      qwenOAuth2Events.off("auth-progress" /* AuthProgress */, handleAuthProgress);
+    };
+  }, [isQwenAuth, isAuthenticating]);
+  const cancelQwenAuth = (0, import_react100.useCallback)(() => {
+    qwenOAuth2Events.emit("auth-cancel" /* AuthCancel */);
+    setQwenAuthState({
+      deviceAuth: null,
+      authStatus: "idle",
+      authMessage: null
+    });
+  }, []);
+  return {
+    qwenAuthState,
+    cancelQwenAuth
+  };
+}, "useQwenAuth");
+
+// packages/cli/src/ui/auth/useAuth.ts
 var useAuthCommand = /* @__PURE__ */ __name((settings, config) => {
   const unAuthenticated = settings.merged.security?.auth?.selectedType === void 0;
   const [authState, setAuthState] = (0, import_react101.useState)(
@@ -344180,6 +344329,13 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config) => {
   const [authError, setAuthError] = (0, import_react101.useState)(null);
   const [isAuthenticating, setIsAuthenticating] = (0, import_react101.useState)(false);
   const [isAuthDialogOpen, setIsAuthDialogOpen] = (0, import_react101.useState)(unAuthenticated);
+  const [pendingAuthType, setPendingAuthType] = (0, import_react101.useState)(
+    void 0
+  );
+  const { qwenAuthState, cancelQwenAuth } = useQwenAuth(
+    pendingAuthType,
+    isAuthenticating
+  );
   const onAuthError = (0, import_react101.useCallback)(
     (error) => {
       setAuthError(error);
@@ -344190,75 +344346,123 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config) => {
     },
     [setAuthError, setAuthState]
   );
-  (0, import_react101.useEffect)(() => {
-    const authFlow = /* @__PURE__ */ __name(async () => {
-      const authType = settings.merged.security?.auth?.selectedType;
-      if (isAuthDialogOpen || !authType) {
-        return;
-      }
-      const validationError = validateAuthMethodWithSettings(
-        authType,
-        settings
-      );
-      if (validationError) {
-        onAuthError(validationError);
-        return;
-      }
-      try {
-        setIsAuthenticating(true);
-        await config.refreshAuth(authType);
-        console.log(`Authenticated via "${authType}".`);
-        setAuthError(null);
-        setAuthState("authenticated" /* Authenticated */);
-      } catch (e2) {
-        onAuthError(`Failed to login. Message: ${getErrorMessage(e2)}`);
-      } finally {
-        setIsAuthenticating(false);
+  const handleAuthFailure = (0, import_react101.useCallback)(
+    (error) => {
+      setIsAuthenticating(false);
+      const errorMessage = `Failed to authenticate. Message: ${getErrorMessage(error)}`;
+      onAuthError(errorMessage);
+      if (pendingAuthType) {
+        const authEvent = new AuthEvent(
+          pendingAuthType,
+          "manual",
+          "error",
+          errorMessage
+        );
+        logAuth(config, authEvent);
       }
-    }, "authFlow");
-    void authFlow();
-  }, [isAuthDialogOpen, settings, config, onAuthError]);
-  const handleAuthSelect = (0, import_react101.useCallback)(
+    },
+    [onAuthError, pendingAuthType, config]
+  );
+  const handleAuthSuccess = (0, import_react101.useCallback)(
     async (authType, scope, credentials) => {
-      if (authType) {
-        await clearCachedCredentialFile();
-        if (credentials) {
-          config.updateCredentials({
-            apiKey: credentials.apiKey,
-            baseUrl: credentials.baseUrl,
-            model: credentials.model
-          });
-          if (credentials.apiKey) {
+      try {
+        settings.setValue(scope, "security.auth.selectedType", authType);
+        if (authType !== "qwen-oauth" /* QWEN_OAUTH */ && credentials) {
+          if (credentials?.apiKey != null) {
             settings.setValue(
               scope,
               "security.auth.apiKey",
               credentials.apiKey
             );
           }
-          if (credentials.baseUrl) {
+          if (credentials?.baseUrl != null) {
             settings.setValue(
               scope,
               "security.auth.baseUrl",
               credentials.baseUrl
             );
           }
-          if (credentials.model) {
+          if (credentials?.model != null) {
             settings.setValue(scope, "model.name", credentials.model);
           }
+          await clearCachedCredentialFile();
         }
-        settings.setValue(scope, "security.auth.selectedType", authType);
+      } catch (error) {
+        handleAuthFailure(error);
+        return;
       }
+      setAuthError(null);
+      setAuthState("authenticated" /* Authenticated */);
+      setPendingAuthType(void 0);
       setIsAuthDialogOpen(false);
+      setIsAuthenticating(false);
+      const authEvent = new AuthEvent(authType, "manual", "success");
+      logAuth(config, authEvent);
+    },
+    [settings, handleAuthFailure, config]
+  );
+  const performAuth = (0, import_react101.useCallback)(
+    async (authType, scope, credentials) => {
+      try {
+        await config.refreshAuth(authType);
+        handleAuthSuccess(authType, scope, credentials);
+      } catch (e2) {
+        handleAuthFailure(e2);
+      }
+    },
+    [config, handleAuthSuccess, handleAuthFailure]
+  );
+  const handleAuthSelect = (0, import_react101.useCallback)(
+    async (authType, scope, credentials) => {
+      if (!authType) {
+        setIsAuthDialogOpen(false);
+        setAuthError(null);
+        return;
+      }
+      setPendingAuthType(authType);
       setAuthError(null);
+      setIsAuthDialogOpen(false);
+      setIsAuthenticating(true);
+      if (authType === "openai" /* USE_OPENAI */) {
+        if (credentials) {
+          config.updateCredentials({
+            apiKey: credentials.apiKey,
+            baseUrl: credentials.baseUrl,
+            model: credentials.model
+          });
+          await performAuth(authType, scope, credentials);
+        }
+        return;
+      }
+      await performAuth(authType, scope);
     },
-    [settings, config]
+    [config, performAuth]
   );
   const openAuthDialog = (0, import_react101.useCallback)(() => {
     setIsAuthDialogOpen(true);
   }, []);
   const cancelAuthentication = (0, import_react101.useCallback)(() => {
+    if (isAuthenticating && pendingAuthType === "qwen-oauth" /* QWEN_OAUTH */) {
+      cancelQwenAuth();
+    }
+    if (isAuthenticating && pendingAuthType) {
+      const authEvent = new AuthEvent(pendingAuthType, "manual", "cancelled");
+      logAuth(config, authEvent);
+    }
     setIsAuthenticating(false);
-  }, []);
+    setIsAuthDialogOpen(true);
+    setAuthError(null);
+  }, [isAuthenticating, pendingAuthType, cancelQwenAuth, config]);
+  (0, import_react101.useEffect)(() => {
+    const defaultAuthType = process.env["QWEN_DEFAULT_AUTH_TYPE"];
+    if (defaultAuthType && !["qwen-oauth" /* QWEN_OAUTH */, "openai" /* USE_OPENAI */].includes(
+      defaultAuthType
+    )) {
+      onAuthError(
+        `Invalid QWEN_DEFAULT_AUTH_TYPE value: "${defaultAuthType}". Valid values are: ${["qwen-oauth" /* QWEN_OAUTH */, "openai" /* USE_OPENAI */].join(", ")}`
+      );
+    }
+  }, [onAuthError]);
   return {
     authState,
     setAuthState,
@@ -344266,85 +344470,18 @@ var useAuthCommand = /* @__PURE__ */ __name((settings, config) => {
     onAuthError,
     isAuthDialogOpen,
     isAuthenticating,
+    pendingAuthType,
+    qwenAuthState,
     handleAuthSelect,
     openAuthDialog,
     cancelAuthentication
   };
 }, "useAuthCommand");
 
-// packages/cli/src/ui/hooks/useQwenAuth.ts
-init_esbuild_shims();
-var import_react102 = __toESM(require_react(), 1);
-init_core2();
-var useQwenAuth = /* @__PURE__ */ __name((settings, isAuthenticating) => {
-  const [qwenAuthState, setQwenAuthState] = (0, import_react102.useState)({
-    isQwenAuthenticating: false,
-    deviceAuth: null,
-    authStatus: "idle",
-    authMessage: null
-  });
-  const isQwenAuth = settings.merged.security?.auth?.selectedType === "qwen-oauth" /* QWEN_OAUTH */;
-  (0, import_react102.useEffect)(() => {
-    if (!isQwenAuth || !isAuthenticating) {
-      setQwenAuthState({
-        isQwenAuthenticating: false,
-        deviceAuth: null,
-        authStatus: "idle",
-        authMessage: null
-      });
-      return;
-    }
-    setQwenAuthState((prev) => ({
-      ...prev,
-      isQwenAuthenticating: true,
-      authStatus: "idle"
-    }));
-    const handleDeviceAuth = /* @__PURE__ */ __name((deviceAuth) => {
-      setQwenAuthState((prev) => ({
-        ...prev,
-        deviceAuth: {
-          verification_uri: deviceAuth.verification_uri,
-          verification_uri_complete: deviceAuth.verification_uri_complete,
-          user_code: deviceAuth.user_code,
-          expires_in: deviceAuth.expires_in
-        },
-        authStatus: "polling"
-      }));
-    }, "handleDeviceAuth");
-    const handleAuthProgress = /* @__PURE__ */ __name((status, message) => {
-      setQwenAuthState((prev) => ({
-        ...prev,
-        authStatus: status,
-        authMessage: message || null
-      }));
-    }, "handleAuthProgress");
-    qwenOAuth2Events.on("auth-uri" /* AuthUri */, handleDeviceAuth);
-    qwenOAuth2Events.on("auth-progress" /* AuthProgress */, handleAuthProgress);
-    return () => {
-      qwenOAuth2Events.off("auth-uri" /* AuthUri */, handleDeviceAuth);
-      qwenOAuth2Events.off("auth-progress" /* AuthProgress */, handleAuthProgress);
-    };
-  }, [isQwenAuth, isAuthenticating]);
-  const cancelQwenAuth = (0, import_react102.useCallback)(() => {
-    qwenOAuth2Events.emit("auth-cancel" /* AuthCancel */);
-    setQwenAuthState({
-      isQwenAuthenticating: false,
-      deviceAuth: null,
-      authStatus: "idle",
-      authMessage: null
-    });
-  }, []);
-  return {
-    ...qwenAuthState,
-    isQwenAuth,
-    cancelQwenAuth
-  };
-}, "useQwenAuth");
-
 // packages/cli/src/ui/hooks/useQuotaAndFallback.ts
 init_esbuild_shims();
 init_core2();
-var import_react103 = __toESM(require_react(), 1);
+var import_react102 = __toESM(require_react(), 1);
 function useQuotaAndFallback({
   config,
   historyManager,
@@ -344352,9 +344489,9 @@ function useQuotaAndFallback({
   setAuthState,
   setModelSwitchedFromQuotaError
 }) {
-  const [proQuotaRequest, setProQuotaRequest] = (0, import_react103.useState)(null);
-  const isDialogPending = (0, import_react103.useRef)(false);
-  (0, import_react103.useEffect)(() => {
+  const [proQuotaRequest, setProQuotaRequest] = (0, import_react102.useState)(null);
+  const isDialogPending = (0, import_react102.useRef)(false);
+  (0, import_react102.useEffect)(() => {
     const fallbackHandler = /* @__PURE__ */ __name(async (failedModel, fallbackModel, error) => {
       if (config.isInFallbackMode()) {
         return null;
@@ -344432,7 +344569,7 @@ function useQuotaAndFallback({
     }, "fallbackHandler");
     config.setFallbackModelHandler(fallbackHandler);
   }, [config, historyManager, userTier, setModelSwitchedFromQuotaError]);
-  const handleProQuotaChoice = (0, import_react103.useCallback)(
+  const handleProQuotaChoice = (0, import_react102.useCallback)(
     (choice2) => {
       if (!proQuotaRequest) return;
       const intent = choice2 === "auth" ? "auth" : "retry";
@@ -344462,14 +344599,14 @@ __name(useQuotaAndFallback, "useQuotaAndFallback");
 
 // packages/cli/src/ui/hooks/useEditorSettings.ts
 init_esbuild_shims();
-var import_react104 = __toESM(require_react(), 1);
+var import_react103 = __toESM(require_react(), 1);
 init_core2();
 var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError, addItem) => {
-  const [isEditorDialogOpen, setIsEditorDialogOpen] = (0, import_react104.useState)(false);
-  const openEditorDialog = (0, import_react104.useCallback)(() => {
+  const [isEditorDialogOpen, setIsEditorDialogOpen] = (0, import_react103.useState)(false);
+  const openEditorDialog = (0, import_react103.useCallback)(() => {
     setIsEditorDialogOpen(true);
   }, []);
-  const handleEditorSelect = (0, import_react104.useCallback)(
+  const handleEditorSelect = (0, import_react103.useCallback)(
     (editorType, scope) => {
       if (editorType && (!checkHasEditorType(editorType) || !allowEditorTypeInSandbox(editorType))) {
         return;
@@ -344491,7 +344628,7 @@ var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError,
     },
     [loadedSettings, setEditorError, addItem]
   );
-  const exitEditorDialog = (0, import_react104.useCallback)(() => {
+  const exitEditorDialog = (0, import_react103.useCallback)(() => {
     setIsEditorDialogOpen(false);
   }, []);
   return {
@@ -344504,13 +344641,13 @@ var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError,
 
 // packages/cli/src/ui/hooks/useSettingsCommand.ts
 init_esbuild_shims();
-var import_react105 = __toESM(require_react(), 1);
+var import_react104 = __toESM(require_react(), 1);
 function useSettingsCommand() {
-  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = (0, import_react105.useState)(false);
-  const openSettingsDialog = (0, import_react105.useCallback)(() => {
+  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = (0, import_react104.useState)(false);
+  const openSettingsDialog = (0, import_react104.useCallback)(() => {
     setIsSettingsDialogOpen(true);
   }, []);
-  const closeSettingsDialog = (0, import_react105.useCallback)(() => {
+  const closeSettingsDialog = (0, import_react104.useCallback)(() => {
     setIsSettingsDialogOpen(false);
   }, []);
   return {
@@ -344523,13 +344660,13 @@ __name(useSettingsCommand, "useSettingsCommand");
 
 // packages/cli/src/ui/hooks/useModelCommand.ts
 init_esbuild_shims();
-var import_react106 = __toESM(require_react(), 1);
+var import_react105 = __toESM(require_react(), 1);
 var useModelCommand = /* @__PURE__ */ __name(() => {
-  const [isModelDialogOpen, setIsModelDialogOpen] = (0, import_react106.useState)(false);
-  const openModelDialog = (0, import_react106.useCallback)(() => {
+  const [isModelDialogOpen, setIsModelDialogOpen] = (0, import_react105.useState)(false);
+  const openModelDialog = (0, import_react105.useCallback)(() => {
     setIsModelDialogOpen(true);
   }, []);
-  const closeModelDialog = (0, import_react106.useCallback)(() => {
+  const closeModelDialog = (0, import_react105.useCallback)(() => {
     setIsModelDialogOpen(false);
   }, []);
   return {
@@ -344541,13 +344678,13 @@ var useModelCommand = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useApprovalModeCommand.ts
 init_esbuild_shims();
-var import_react107 = __toESM(require_react(), 1);
+var import_react106 = __toESM(require_react(), 1);
 var useApprovalModeCommand = /* @__PURE__ */ __name((loadedSettings, config) => {
-  const [isApprovalModeDialogOpen, setIsApprovalModeDialogOpen] = (0, import_react107.useState)(false);
-  const openApprovalModeDialog = (0, import_react107.useCallback)(() => {
+  const [isApprovalModeDialogOpen, setIsApprovalModeDialogOpen] = (0, import_react106.useState)(false);
+  const openApprovalModeDialog = (0, import_react106.useCallback)(() => {
     setIsApprovalModeDialogOpen(true);
   }, []);
-  const handleApprovalModeSelect = (0, import_react107.useCallback)(
+  const handleApprovalModeSelect = (0, import_react106.useCallback)(
     (mode, scope) => {
       try {
         if (!mode) {
@@ -344573,7 +344710,7 @@ var useApprovalModeCommand = /* @__PURE__ */ __name((loadedSettings, config) =>
 
 // packages/cli/src/ui/hooks/slashCommandProcessor.ts
 init_esbuild_shims();
-var import_react110 = __toESM(require_react(), 1);
+var import_react109 = __toESM(require_react(), 1);
 
 // packages/cli/node_modules/@google/genai/dist/node/index.mjs
 init_esbuild_shims();
@@ -345049,7 +345186,7 @@ init_core2();
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "7f84e4ce";
+var GIT_COMMIT_INFO2 = "f6aa011d";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -345232,7 +345369,7 @@ ${issueUrl}`
 
 // packages/cli/src/ui/commands/chatCommand.ts
 init_esbuild_shims();
-var import_react108 = __toESM(require_react(), 1);
+var import_react107 = __toESM(require_react(), 1);
 import * as fsPromises5 from "node:fs/promises";
 init_core2();
 import path83 from "node:path";
@@ -345320,11 +345457,11 @@ var saveCommand = {
       if (exists2) {
         return {
           type: "confirm_action",
-          prompt: import_react108.default.createElement(
+          prompt: import_react107.default.createElement(
             Text,
             null,
             "A checkpoint with the tag ",
-            import_react108.default.createElement(Text, { color: theme.text.accent }, tag2),
+            import_react107.default.createElement(Text, { color: theme.text.accent }, tag2),
             " already exists. Do you want to overwrite it?"
           ),
           originalInvocation: {
@@ -347799,7 +347936,7 @@ init_esbuild_shims();
 init_core2();
 import * as fs78 from "node:fs";
 import * as path87 from "node:path";
-var import_react109 = __toESM(require_react(), 1);
+var import_react108 = __toESM(require_react(), 1);
 var initCommand = {
   name: "init",
   description: "\u5206\u6790\u9879\u76EE\u5E76\u521B\u5EFA RDMind.md ",
@@ -347825,7 +347962,7 @@ var initCommand = {
                 type: "confirm_action",
                 // TODO: Move to .tsx file to use JSX syntax instead of React.createElement
                 // For now, using React.createElement to maintain .ts compatibility for PR review
-                prompt: import_react109.default.createElement(
+                prompt: import_react108.default.createElement(
                   Text,
                   null,
                   `A ${contextFileName} file already exists in this directory. Do you want to regenerate it?`
@@ -351263,41 +351400,41 @@ var parseSlashCommand = /* @__PURE__ */ __name((query, commands) => {
 // packages/cli/src/ui/hooks/slashCommandProcessor.ts
 var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, addItem, clearItems, loadHistory, refreshStatic, toggleVimEnabled, setIsProcessing, setGeminiMdFileCount, actions, extensionsUpdateState, isConfigInitialized) => {
   const session = useSessionStats();
-  const [commands, setCommands] = (0, import_react110.useState)([]);
-  const [reloadTrigger, setReloadTrigger] = (0, import_react110.useState)(0);
-  const reloadCommands = (0, import_react110.useCallback)(() => {
+  const [commands, setCommands] = (0, import_react109.useState)([]);
+  const [reloadTrigger, setReloadTrigger] = (0, import_react109.useState)(0);
+  const reloadCommands = (0, import_react109.useCallback)(() => {
     setReloadTrigger((v) => v + 1);
   }, []);
-  const [shellConfirmationRequest, setShellConfirmationRequest] = (0, import_react110.useState)(null);
-  const [confirmationRequest, setConfirmationRequest] = (0, import_react110.useState)(null);
-  const [quitConfirmationRequest, setQuitConfirmationRequest] = (0, import_react110.useState)(null);
-  const [sessionShellAllowlist, setSessionShellAllowlist] = (0, import_react110.useState)(
+  const [shellConfirmationRequest, setShellConfirmationRequest] = (0, import_react109.useState)(null);
+  const [confirmationRequest, setConfirmationRequest] = (0, import_react109.useState)(null);
+  const [quitConfirmationRequest, setQuitConfirmationRequest] = (0, import_react109.useState)(null);
+  const [sessionShellAllowlist, setSessionShellAllowlist] = (0, import_react109.useState)(
     /* @__PURE__ */ new Set()
   );
-  const gitService = (0, import_react110.useMemo)(() => {
+  const gitService = (0, import_react109.useMemo)(() => {
     if (!config?.getProjectRoot()) {
       return;
     }
     return new GitService(config.getProjectRoot(), config.storage);
   }, [config]);
-  const logger6 = (0, import_react110.useMemo)(() => {
+  const logger6 = (0, import_react109.useMemo)(() => {
     const l2 = new Logger(
       config?.getSessionId() || "",
       config?.storage ?? new Storage(process37.cwd())
     );
     return l2;
   }, [config]);
-  const [pendingItem, setPendingItem] = (0, import_react110.useState)(
+  const [pendingItem, setPendingItem] = (0, import_react109.useState)(
     null
   );
-  const pendingHistoryItems = (0, import_react110.useMemo)(() => {
+  const pendingHistoryItems = (0, import_react109.useMemo)(() => {
     const items = [];
     if (pendingItem != null) {
       items.push(pendingItem);
     }
     return items;
   }, [pendingItem]);
-  const addMessage = (0, import_react110.useCallback)(
+  const addMessage = (0, import_react109.useCallback)(
     (message) => {
       let historyItemContent;
       if (message.type === "about" /* ABOUT */) {
@@ -351353,7 +351490,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, addItem
     },
     [addItem]
   );
-  const commandContext = (0, import_react110.useMemo)(
+  const commandContext = (0, import_react109.useMemo)(
     () => ({
       services: {
         config,
@@ -351405,7 +351542,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, addItem
       extensionsUpdateState
     ]
   );
-  (0, import_react110.useEffect)(() => {
+  (0, import_react109.useEffect)(() => {
     if (!config) {
       return;
     }
@@ -351423,7 +351560,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, addItem
       })();
     };
   }, [config, reloadCommands]);
-  (0, import_react110.useEffect)(() => {
+  (0, import_react109.useEffect)(() => {
     const controller = new AbortController();
     const load = /* @__PURE__ */ __name(async () => {
       const loaders = [
@@ -351442,7 +351579,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, addItem
       controller.abort();
     };
   }, [config, reloadTrigger, isConfigInitialized]);
-  const handleSlashCommand2 = (0, import_react110.useCallback)(
+  const handleSlashCommand2 = (0, import_react109.useCallback)(
     async (rawQuery, oneTimeShellAllowlist, overwriteConfirmed) => {
       if (typeof rawQuery !== "string") {
         return false;
@@ -351748,7 +351885,7 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
 
 // packages/cli/src/ui/hooks/useConsoleMessages.ts
 init_esbuild_shims();
-var import_react111 = __toESM(require_react(), 1);
+var import_react110 = __toESM(require_react(), 1);
 function consoleMessagesReducer(state, action) {
   switch (action.type) {
     case "ADD_MESSAGES": {
@@ -351774,11 +351911,11 @@ function consoleMessagesReducer(state, action) {
 }
 __name(consoleMessagesReducer, "consoleMessagesReducer");
 function useConsoleMessages() {
-  const [consoleMessages, dispatch] = (0, import_react111.useReducer)(consoleMessagesReducer, []);
-  const messageQueueRef = (0, import_react111.useRef)([]);
-  const timeoutRef = (0, import_react111.useRef)(null);
-  const [, startTransition] = (0, import_react111.useTransition)();
-  const processQueue = (0, import_react111.useCallback)(() => {
+  const [consoleMessages, dispatch] = (0, import_react110.useReducer)(consoleMessagesReducer, []);
+  const messageQueueRef = (0, import_react110.useRef)([]);
+  const timeoutRef = (0, import_react110.useRef)(null);
+  const [, startTransition] = (0, import_react110.useTransition)();
+  const processQueue = (0, import_react110.useCallback)(() => {
     if (messageQueueRef.current.length > 0) {
       const messagesToProcess = messageQueueRef.current;
       messageQueueRef.current = [];
@@ -351788,7 +351925,7 @@ function useConsoleMessages() {
     }
     timeoutRef.current = null;
   }, []);
-  const handleNewMessage = (0, import_react111.useCallback)(
+  const handleNewMessage = (0, import_react110.useCallback)(
     (message) => {
       messageQueueRef.current.push(message);
       if (!timeoutRef.current) {
@@ -351797,7 +351934,7 @@ function useConsoleMessages() {
     },
     [processQueue]
   );
-  const clearConsoleMessages = (0, import_react111.useCallback)(() => {
+  const clearConsoleMessages = (0, import_react110.useCallback)(() => {
     if (timeoutRef.current) {
       clearTimeout(timeoutRef.current);
       timeoutRef.current = null;
@@ -351807,7 +351944,7 @@ function useConsoleMessages() {
       dispatch({ type: "CLEAR" });
     });
   }, []);
-  (0, import_react111.useEffect)(
+  (0, import_react110.useEffect)(
     () => () => {
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
@@ -351837,11 +351974,11 @@ __name(computeWindowTitle, "computeWindowTitle");
 
 // packages/cli/src/ui/hooks/useLogger.ts
 init_esbuild_shims();
-var import_react112 = __toESM(require_react(), 1);
+var import_react111 = __toESM(require_react(), 1);
 init_core2();
 var useLogger = /* @__PURE__ */ __name((storage) => {
-  const [logger6, setLogger] = (0, import_react112.useState)(null);
-  (0, import_react112.useEffect)(() => {
+  const [logger6, setLogger] = (0, import_react111.useState)(null);
+  (0, import_react111.useEffect)(() => {
     const newLogger = new Logger(sessionId, storage);
     newLogger.initialize().then(() => {
       setLogger(newLogger);
@@ -351853,12 +351990,12 @@ var useLogger = /* @__PURE__ */ __name((storage) => {
 
 // packages/cli/src/ui/hooks/useGeminiStream.ts
 init_esbuild_shims();
-var import_react117 = __toESM(require_react(), 1);
+var import_react116 = __toESM(require_react(), 1);
 init_core2();
 
 // packages/cli/src/ui/hooks/shellCommandProcessor.ts
 init_esbuild_shims();
-var import_react113 = __toESM(require_react(), 1);
+var import_react112 = __toESM(require_react(), 1);
 init_core2();
 import crypto17 from "node:crypto";
 import path94 from "node:path";
@@ -351887,8 +352024,8 @@ ${modelContent}
 }
 __name(addShellCommandToGeminiHistory, "addShellCommandToGeminiHistory");
 var useShellCommandProcessor = /* @__PURE__ */ __name((addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight) => {
-  const [activeShellPtyId, setActiveShellPtyId] = (0, import_react113.useState)(null);
-  const handleShellCommand = (0, import_react113.useCallback)(
+  const [activeShellPtyId, setActiveShellPtyId] = (0, import_react112.useState)(null);
+  const handleShellCommand = (0, import_react112.useCallback)(
     (rawQuery, abortSignal) => {
       if (typeof rawQuery !== "string" || rawQuery.trim() === "") {
         return false;
@@ -352137,7 +352274,7 @@ ${finalOutput}`;
 // packages/cli/src/ui/hooks/useVisionAutoSwitch.ts
 init_esbuild_shims();
 init_core2();
-var import_react114 = __toESM(require_react(), 1);
+var import_react113 = __toESM(require_react(), 1);
 init_core2();
 function hasImageParts(parts) {
   if (typeof parts === "string") {
@@ -352227,8 +352364,8 @@ function processVisionSwitchOutcome(outcome) {
 }
 __name(processVisionSwitchOutcome, "processVisionSwitchOutcome");
 function useVisionAutoSwitch(config, addItem, visionModelPreviewEnabled = true, onVisionSwitchRequired) {
-  const originalModelRef = (0, import_react114.useRef)(null);
-  const handleVisionSwitch = (0, import_react114.useCallback)(
+  const originalModelRef = (0, import_react113.useRef)(null);
+  const handleVisionSwitch = (0, import_react113.useCallback)(
     async (query, userMessageTimestamp, isContinuation) => {
       if (isContinuation || !onVisionSwitchRequired) {
         return { shouldProceed: true };
@@ -352329,7 +352466,7 @@ function useVisionAutoSwitch(config, addItem, visionModelPreviewEnabled = true,
     },
     [config, addItem, visionModelPreviewEnabled, onVisionSwitchRequired]
   );
-  const restoreOriginalModel = (0, import_react114.useCallback)(async () => {
+  const restoreOriginalModel = (0, import_react113.useCallback)(async () => {
     if (originalModelRef.current) {
       await config.setModel(originalModelRef.current, {
         reason: "vision_auto_switch",
@@ -352745,11 +352882,11 @@ var findLastSafeSplitPoint = /* @__PURE__ */ __name((content) => {
 
 // packages/cli/src/ui/hooks/useStateAndRef.ts
 init_esbuild_shims();
-var import_react115 = __toESM(require_react(), 1);
+var import_react114 = __toESM(require_react(), 1);
 var useStateAndRef = /* @__PURE__ */ __name((initialValue) => {
-  const [state, setState] = import_react115.default.useState(initialValue);
-  const ref = import_react115.default.useRef(initialValue);
-  const setStateInternal = import_react115.default.useCallback(
+  const [state, setState] = import_react114.default.useState(initialValue);
+  const ref = import_react114.default.useRef(initialValue);
+  const setStateInternal = import_react114.default.useCallback(
     (newStateOrCallback) => {
       let newValue;
       if (typeof newStateOrCallback === "function") {
@@ -352768,10 +352905,10 @@ var useStateAndRef = /* @__PURE__ */ __name((initialValue) => {
 // packages/cli/src/ui/hooks/useReactToolScheduler.ts
 init_esbuild_shims();
 init_core2();
-var import_react116 = __toESM(require_react(), 1);
+var import_react115 = __toESM(require_react(), 1);
 function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorClose) {
-  const [toolCallsForDisplay, setToolCallsForDisplay] = (0, import_react116.useState)([]);
-  const outputUpdateHandler = (0, import_react116.useCallback)(
+  const [toolCallsForDisplay, setToolCallsForDisplay] = (0, import_react115.useState)([]);
+  const outputUpdateHandler = (0, import_react115.useCallback)(
     (toolCallId, outputChunk) => {
       setToolCallsForDisplay(
         (prevCalls) => prevCalls.map((tc) => {
@@ -352785,13 +352922,13 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     },
     []
   );
-  const allToolCallsCompleteHandler = (0, import_react116.useCallback)(
+  const allToolCallsCompleteHandler = (0, import_react115.useCallback)(
     async (completedToolCalls) => {
       await onComplete(completedToolCalls);
     },
     [onComplete]
   );
-  const toolCallsUpdateHandler = (0, import_react116.useCallback)(
+  const toolCallsUpdateHandler = (0, import_react115.useCallback)(
     (updatedCoreToolCalls) => {
       setToolCallsForDisplay(
         (prevTrackedCalls) => updatedCoreToolCalls.map((coreTc) => {
@@ -352818,7 +352955,7 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     },
     [setToolCallsForDisplay]
   );
-  const scheduler = (0, import_react116.useMemo)(
+  const scheduler = (0, import_react115.useMemo)(
     () => new CoreToolScheduler({
       outputUpdateHandler,
       onAllToolCallsComplete: allToolCallsCompleteHandler,
@@ -352837,13 +352974,13 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
       onEditorClose
     ]
   );
-  const schedule = (0, import_react116.useCallback)(
+  const schedule = (0, import_react115.useCallback)(
     (request4, signal) => {
       void scheduler.schedule(request4, signal);
     },
     [scheduler]
   );
-  const markToolsAsSubmitted = (0, import_react116.useCallback)(
+  const markToolsAsSubmitted = (0, import_react115.useCallback)(
     (callIdsToMark) => {
       setToolCallsForDisplay(
         (prevCalls) => prevCalls.map(
@@ -352992,18 +353129,18 @@ function showCitations(settings) {
 }
 __name(showCitations, "showCitations");
 var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, config, settings, onDebugMessage, handleSlashCommand2, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onEditorClose, onCancelSubmit, visionModelPreviewEnabled, setShellInputFocused, terminalWidth, terminalHeight, onVisionSwitchRequired, isShellFocused) => {
-  const [initError, setInitError] = (0, import_react117.useState)(null);
-  const abortControllerRef = (0, import_react117.useRef)(null);
-  const turnCancelledRef = (0, import_react117.useRef)(false);
-  const isSubmittingQueryRef = (0, import_react117.useRef)(false);
-  const [isResponding, setIsResponding] = (0, import_react117.useState)(false);
-  const [thought, setThought] = (0, import_react117.useState)(null);
+  const [initError, setInitError] = (0, import_react116.useState)(null);
+  const abortControllerRef = (0, import_react116.useRef)(null);
+  const turnCancelledRef = (0, import_react116.useRef)(false);
+  const isSubmittingQueryRef = (0, import_react116.useRef)(false);
+  const [isResponding, setIsResponding] = (0, import_react116.useState)(false);
+  const [thought, setThought] = (0, import_react116.useState)(null);
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
-  const processedMemoryToolsRef = (0, import_react117.useRef)(/* @__PURE__ */ new Set());
+  const processedMemoryToolsRef = (0, import_react116.useRef)(/* @__PURE__ */ new Set());
   const { startNewPrompt, getPromptCount } = useSessionStats();
   const storage = config.storage;
   const logger6 = useLogger(storage);
-  const gitService = (0, import_react117.useMemo)(() => {
+  const gitService = (0, import_react116.useMemo)(() => {
     if (!config.getProjectRoot()) {
       return;
     }
@@ -353027,11 +353164,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     getPreferredEditor,
     onEditorClose
   );
-  const pendingToolCallGroupDisplay = (0, import_react117.useMemo)(
+  const pendingToolCallGroupDisplay = (0, import_react116.useMemo)(
     () => toolCalls.length ? mapToDisplay(toolCalls) : void 0,
     [toolCalls]
   );
-  const activeToolPtyId = (0, import_react117.useMemo)(() => {
+  const activeToolPtyId = (0, import_react116.useMemo)(() => {
     const executingShellTool = toolCalls?.find(
       (tc) => tc.status === "executing" && tc.request.name === "run_shell_command"
     );
@@ -353040,12 +353177,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }
     return void 0;
   }, [toolCalls]);
-  const loopDetectedRef = (0, import_react117.useRef)(false);
+  const loopDetectedRef = (0, import_react116.useRef)(false);
   const [
     loopDetectionConfirmationRequest,
     setLoopDetectionConfirmationRequest
-  ] = (0, import_react117.useState)(null);
-  const onExec = (0, import_react117.useCallback)(async (done) => {
+  ] = (0, import_react116.useState)(null);
+  const onExec = (0, import_react116.useCallback)(async (done) => {
     setIsResponding(true);
     await done;
     setIsResponding(false);
@@ -353068,12 +353205,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     onVisionSwitchRequired
   );
   const activePtyId = activeShellPtyId || activeToolPtyId;
-  (0, import_react117.useEffect)(() => {
+  (0, import_react116.useEffect)(() => {
     if (!activePtyId) {
       setShellInputFocused(false);
     }
   }, [activePtyId, setShellInputFocused]);
-  const streamingState = (0, import_react117.useMemo)(() => {
+  const streamingState = (0, import_react116.useMemo)(() => {
     if (toolCalls.some((tc) => tc.status === "awaiting_approval")) {
       return "waiting_for_confirmation" /* WaitingForConfirmation */;
     }
@@ -353084,7 +353221,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }
     return "idle" /* Idle */;
   }, [isResponding, toolCalls]);
-  (0, import_react117.useEffect)(() => {
+  (0, import_react116.useEffect)(() => {
     if (config.getApprovalMode() === "yolo" /* YOLO */ && streamingState === "idle" /* Idle */) {
       const lastUserMessageIndex = history.findLastIndex(
         (item) => item.type === "user" /* USER */
@@ -353098,7 +353235,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
     }
   }, [streamingState, config, history]);
-  const cancelOngoingRequest = (0, import_react117.useCallback)(() => {
+  const cancelOngoingRequest = (0, import_react116.useCallback)(() => {
     if (streamingState !== "responding" /* Responding */) {
       return;
     }
@@ -353147,7 +353284,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     { isActive: streamingState === "responding" /* Responding */ }
   );
-  const prepareQueryForGemini = (0, import_react117.useCallback)(
+  const prepareQueryForGemini = (0, import_react116.useCallback)(
     async (query, userMessageTimestamp, abortSignal, prompt_id) => {
       if (turnCancelledRef.current) {
         return { queryToSend: null, shouldProceed: false };
@@ -353242,7 +353379,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       scheduleToolCalls
     ]
   );
-  const handleContentEvent = (0, import_react117.useCallback)(
+  const handleContentEvent = (0, import_react116.useCallback)(
     (eventValue, currentGeminiMessageBuffer, userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return "";
@@ -353278,7 +353415,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleUserCancelledEvent = (0, import_react117.useCallback)(
+  const handleUserCancelledEvent = (0, import_react116.useCallback)(
     (userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return;
@@ -353307,7 +353444,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, setThought]
   );
-  const handleErrorEvent = (0, import_react117.useCallback)(
+  const handleErrorEvent = (0, import_react116.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -353330,7 +353467,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, config, setThought]
   );
-  const handleCitationEvent = (0, import_react117.useCallback)(
+  const handleCitationEvent = (0, import_react116.useCallback)(
     (text, userMessageTimestamp) => {
       if (!showCitations(settings)) {
         return;
@@ -353343,7 +353480,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings]
   );
-  const handleFinishedEvent = (0, import_react117.useCallback)(
+  const handleFinishedEvent = (0, import_react116.useCallback)(
     (event, userMessageTimestamp) => {
       const finishReason = event.value.reason;
       if (!finishReason) {
@@ -353377,7 +353514,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem]
   );
-  const handleChatCompressionEvent = (0, import_react117.useCallback)(
+  const handleChatCompressionEvent = (0, import_react116.useCallback)(
     (eventValue, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -353393,7 +353530,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, config, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleMaxSessionTurnsEvent = (0, import_react117.useCallback)(
+  const handleMaxSessionTurnsEvent = (0, import_react116.useCallback)(
     () => addItem(
       {
         type: "info",
@@ -353403,7 +353540,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ),
     [addItem, config]
   );
-  const handleSessionTokenLimitExceededEvent = (0, import_react117.useCallback)(
+  const handleSessionTokenLimitExceededEvent = (0, import_react116.useCallback)(
     (value) => addItem(
       {
         type: "error",
@@ -353418,7 +353555,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ),
     [addItem]
   );
-  const handleLoopDetectionConfirmation = (0, import_react117.useCallback)(
+  const handleLoopDetectionConfirmation = (0, import_react116.useCallback)(
     (result) => {
       setLoopDetectionConfirmationRequest(null);
       if (result.userSelection === "disable") {
@@ -353442,12 +353579,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [config, addItem]
   );
-  const handleLoopDetectedEvent = (0, import_react117.useCallback)(() => {
+  const handleLoopDetectedEvent = (0, import_react116.useCallback)(() => {
     setLoopDetectionConfirmationRequest({
       onComplete: handleLoopDetectionConfirmation
     });
   }, [handleLoopDetectionConfirmation]);
-  const processGeminiStreamEvents = (0, import_react117.useCallback)(
+  const processGeminiStreamEvents = (0, import_react116.useCallback)(
     async (stream2, userMessageTimestamp, signal) => {
       let geminiMessageBuffer = "";
       const toolCallRequests = [];
@@ -353521,7 +353658,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       handleCitationEvent
     ]
   );
-  const submitQuery = (0, import_react117.useCallback)(
+  const submitQuery = (0, import_react116.useCallback)(
     async (query, options2, prompt_id) => {
       if (isSubmittingQueryRef.current && !options2?.isContinuation) {
         return;
@@ -353654,7 +353791,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       restoreOriginalModel
     ]
   );
-  const handleApprovalModeChange = (0, import_react117.useCallback)(
+  const handleApprovalModeChange = (0, import_react116.useCallback)(
     async (newApprovalMode) => {
       if (newApprovalMode === "yolo" /* YOLO */ || newApprovalMode === "auto-edit" /* AUTO_EDIT */) {
         let awaitingApprovalCalls = toolCalls.filter(
@@ -353683,7 +353820,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [toolCalls]
   );
-  const handleCompletedTools = (0, import_react117.useCallback)(
+  const handleCompletedTools = (0, import_react116.useCallback)(
     async (completedToolCallsFromScheduler) => {
       if (isResponding) {
         return;
@@ -353768,13 +353905,13 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       modelSwitchedFromQuotaError
     ]
   );
-  const pendingHistoryItems = (0, import_react117.useMemo)(
+  const pendingHistoryItems = (0, import_react116.useMemo)(
     () => [pendingHistoryItem, pendingToolCallGroupDisplay].filter(
       (i) => i !== void 0 && i !== null
     ),
     [pendingHistoryItem, pendingToolCallGroupDisplay]
   );
-  (0, import_react117.useEffect)(() => {
+  (0, import_react116.useEffect)(() => {
     const saveRestorableToolCalls = /* @__PURE__ */ __name(async () => {
       if (!config.getCheckpointingEnabled()) {
         return;
@@ -353893,7 +354030,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
 
 // packages/cli/src/ui/hooks/vim.ts
 init_esbuild_shims();
-var import_react118 = __toESM(require_react(), 1);
+var import_react117 = __toESM(require_react(), 1);
 var DIGIT_MULTIPLIER = 10;
 var DEFAULT_COUNT = 1;
 var DIGIT_1_TO_9 = /^[1-9]$/;
@@ -353956,22 +354093,22 @@ var vimReducer = /* @__PURE__ */ __name((state, action) => {
 }, "vimReducer");
 function useVim(buffer, onSubmit) {
   const { vimEnabled, vimMode, setVimMode } = useVimMode();
-  const [state, dispatch] = (0, import_react118.useReducer)(vimReducer, initialVimState);
-  (0, import_react118.useEffect)(() => {
+  const [state, dispatch] = (0, import_react117.useReducer)(vimReducer, initialVimState);
+  (0, import_react117.useEffect)(() => {
     dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
-  const updateMode = (0, import_react118.useCallback)(
+  const updateMode = (0, import_react117.useCallback)(
     (mode) => {
       setVimMode(mode);
       dispatch({ type: "SET_MODE", mode });
     },
     [setVimMode]
   );
-  const getCurrentCount = (0, import_react118.useCallback)(
+  const getCurrentCount = (0, import_react117.useCallback)(
     () => state.count || DEFAULT_COUNT,
     [state.count]
   );
-  const executeCommand = (0, import_react118.useCallback)(
+  const executeCommand = (0, import_react117.useCallback)(
     (cmdType, count) => {
       switch (cmdType) {
         case CMD_TYPES.DELETE_WORD_FORWARD: {
@@ -354047,7 +354184,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, updateMode]
   );
-  const handleInsertModeInput = (0, import_react118.useCallback)(
+  const handleInsertModeInput = (0, import_react117.useCallback)(
     (normalizedKey) => {
       if (normalizedKey.name === "escape") {
         buffer.vimEscapeInsertMode();
@@ -354078,7 +354215,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, dispatch, updateMode, onSubmit]
   );
-  const normalizeKey = (0, import_react118.useCallback)(
+  const normalizeKey = (0, import_react117.useCallback)(
     (key) => ({
       name: key.name || "",
       sequence: key.sequence || "",
@@ -354089,7 +354226,7 @@ function useVim(buffer, onSubmit) {
     }),
     []
   );
-  const handleChangeMovement = (0, import_react118.useCallback)(
+  const handleChangeMovement = (0, import_react117.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       dispatch({ type: "CLEAR_COUNT" });
@@ -354110,7 +354247,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer, updateMode]
   );
-  const handleOperatorMotion = (0, import_react118.useCallback)(
+  const handleOperatorMotion = (0, import_react117.useCallback)(
     (operator2, motion) => {
       const count = getCurrentCount();
       const commandMap = {
@@ -354137,7 +354274,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, executeCommand, dispatch]
   );
-  const handleInput = (0, import_react118.useCallback)(
+  const handleInput = (0, import_react117.useCallback)(
     (key) => {
       if (!vimEnabled) {
         return false;
@@ -354447,9 +354584,14 @@ async function performInitialAuth(config, authType) {
     return null;
   }
   try {
-    await config.refreshAuth(authType);
+    await config.refreshAuth(authType, true);
+    const authEvent = new AuthEvent(authType, "auto", "success");
+    logAuth(config, authEvent);
   } catch (e2) {
-    return `Failed to login. Message: ${getErrorMessage(e2)}`;
+    const errorMessage = `Failed to login. Message: ${getErrorMessage(e2)}`;
+    const authEvent = new AuthEvent(authType, "auto", "error", errorMessage);
+    logAuth(config, authEvent);
+    return errorMessage;
   }
   return null;
 }
@@ -354468,10 +354610,15 @@ __name(validateTheme, "validateTheme");
 
 // packages/cli/src/core/initializer.ts
 async function initializeApp(config, settings) {
-  const authError = await performInitialAuth(
-    config,
-    settings.merged.security?.auth?.selectedType
-  );
+  const authType = settings.merged.security?.auth?.selectedType;
+  const authError = await performInitialAuth(config, authType);
+  if (authError) {
+    settings.setValue(
+      "User" /* User */,
+      "security.auth.selectedType",
+      void 0
+    );
+  }
   const themeError = validateTheme(settings);
   const shouldOpenAuthDialog = settings.merged.security?.auth?.selectedType === void 0 || !!authError;
   if (config.getIdeMode()) {
@@ -354490,14 +354637,14 @@ __name(initializeApp, "initializeApp");
 
 // packages/cli/src/ui/hooks/useBracketedPaste.ts
 init_esbuild_shims();
-var import_react119 = __toESM(require_react(), 1);
+var import_react118 = __toESM(require_react(), 1);
 var ENABLE_BRACKETED_PASTE = "\x1B[?2004h";
 var DISABLE_BRACKETED_PASTE = "\x1B[?2004l";
 var useBracketedPaste = /* @__PURE__ */ __name(() => {
   const cleanup = /* @__PURE__ */ __name(() => {
     process.stdout.write(DISABLE_BRACKETED_PASTE);
   }, "cleanup");
-  (0, import_react119.useEffect)(() => {
+  (0, import_react118.useEffect)(() => {
     process.stdout.write(ENABLE_BRACKETED_PASTE);
     process.on("exit", cleanup);
     process.on("SIGINT", cleanup);
@@ -354516,13 +354663,13 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/hooks/useTimer.ts
 init_esbuild_shims();
-var import_react120 = __toESM(require_react(), 1);
+var import_react119 = __toESM(require_react(), 1);
 var useTimer = /* @__PURE__ */ __name((isActive, resetKey) => {
-  const [elapsedTime, setElapsedTime] = (0, import_react120.useState)(0);
-  const timerRef = (0, import_react120.useRef)(null);
-  const prevResetKeyRef = (0, import_react120.useRef)(resetKey);
-  const prevIsActiveRef = (0, import_react120.useRef)(isActive);
-  (0, import_react120.useEffect)(() => {
+  const [elapsedTime, setElapsedTime] = (0, import_react119.useState)(0);
+  const timerRef = (0, import_react119.useRef)(null);
+  const prevResetKeyRef = (0, import_react119.useRef)(resetKey);
+  const prevIsActiveRef = (0, import_react119.useRef)(isActive);
+  (0, import_react119.useEffect)(() => {
     let shouldResetTime = false;
     if (prevResetKeyRef.current !== resetKey) {
       shouldResetTime = true;
@@ -354560,7 +354707,7 @@ var useTimer = /* @__PURE__ */ __name((isActive, resetKey) => {
 
 // packages/cli/src/ui/hooks/usePhraseCycler.ts
 init_esbuild_shims();
-var import_react121 = __toESM(require_react(), 1);
+var import_react120 = __toESM(require_react(), 1);
 var WITTY_LOADING_PHRASES = [
   "\u51AC\u74DC\u3001\u9EC4\u74DC\u3001\u897F\u74DC\u3001\u5357\u74DC\u90FD\u80FD\u5403\uFF0C\u4EC0\u4E48\u74DC\u4E0D\u80FD\u5403\uFF1F",
   "\u76C6\u91CC\u67096\u53EA\u9992\u5934\uFF0C6\u4E2A\u5C0F\u670B\u53CB\u6BCF\u4EBA\u5206\u52301\u53EA\uFF0C\u4F46\u76C6\u91CC\u8FD8\u7559\u77401\u53EA\uFF0C\u4E3A\u4EC0\u4E48\uFF1F",
@@ -354665,11 +354812,11 @@ var WITTY_LOADING_PHRASES = [
 var PHRASE_CHANGE_INTERVAL_MS = 15e3;
 var usePhraseCycler = /* @__PURE__ */ __name((isActive, isWaiting, customPhrases) => {
   const loadingPhrases = customPhrases && customPhrases.length > 0 ? customPhrases : WITTY_LOADING_PHRASES;
-  const [currentLoadingPhrase, setCurrentLoadingPhrase] = (0, import_react121.useState)(
+  const [currentLoadingPhrase, setCurrentLoadingPhrase] = (0, import_react120.useState)(
     loadingPhrases[0]
   );
-  const phraseIntervalRef = (0, import_react121.useRef)(null);
-  (0, import_react121.useEffect)(() => {
+  const phraseIntervalRef = (0, import_react120.useRef)(null);
+  (0, import_react120.useEffect)(() => {
     if (isWaiting) {
       setCurrentLoadingPhrase("Waiting for user confirmation...");
       if (phraseIntervalRef.current) {
@@ -354706,9 +354853,9 @@ var usePhraseCycler = /* @__PURE__ */ __name((isActive, isWaiting, customPhrases
 }, "usePhraseCycler");
 
 // packages/cli/src/ui/hooks/useLoadingIndicator.ts
-var import_react122 = __toESM(require_react(), 1);
+var import_react121 = __toESM(require_react(), 1);
 var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhrases) => {
-  const [timerResetKey, setTimerResetKey] = (0, import_react122.useState)(0);
+  const [timerResetKey, setTimerResetKey] = (0, import_react121.useState)(0);
   const isTimerActive = streamingState === "responding" /* Responding */;
   const elapsedTimeFromTimer = useTimer(isTimerActive, timerResetKey);
   const isPhraseCyclingActive = streamingState === "responding" /* Responding */;
@@ -354718,9 +354865,9 @@ var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhr
     isWaiting,
     customWittyPhrases
   );
-  const [retainedElapsedTime, setRetainedElapsedTime] = (0, import_react122.useState)(0);
-  const prevStreamingStateRef = (0, import_react122.useRef)(null);
-  (0, import_react122.useEffect)(() => {
+  const [retainedElapsedTime, setRetainedElapsedTime] = (0, import_react121.useState)(0);
+  const prevStreamingStateRef = (0, import_react121.useRef)(null);
+  (0, import_react121.useEffect)(() => {
     if (prevStreamingStateRef.current === "waiting_for_confirmation" /* WaitingForConfirmation */ && streamingState === "responding" /* Responding */) {
       setTimerResetKey((prevKey) => prevKey + 1);
       setRetainedElapsedTime(0);
@@ -354740,20 +354887,20 @@ var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhr
 
 // packages/cli/src/ui/hooks/useFolderTrust.ts
 init_esbuild_shims();
-var import_react123 = __toESM(require_react(), 1);
+var import_react122 = __toESM(require_react(), 1);
 import * as process38 from "node:process";
 var useFolderTrust = /* @__PURE__ */ __name((settings, onTrustChange) => {
-  const [isTrusted, setIsTrusted] = (0, import_react123.useState)(void 0);
-  const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = (0, import_react123.useState)(false);
-  const [isRestarting, setIsRestarting] = (0, import_react123.useState)(false);
+  const [isTrusted, setIsTrusted] = (0, import_react122.useState)(void 0);
+  const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = (0, import_react122.useState)(false);
+  const [isRestarting, setIsRestarting] = (0, import_react122.useState)(false);
   const folderTrust = settings.merged.security?.folderTrust?.enabled;
-  (0, import_react123.useEffect)(() => {
+  (0, import_react122.useEffect)(() => {
     const { isTrusted: trusted } = isWorkspaceTrusted(settings.merged);
     setIsTrusted(trusted);
     setIsFolderTrustDialogOpen(trusted === void 0);
     onTrustChange(trusted);
   }, [folderTrust, onTrustChange, settings.merged]);
-  const handleFolderTrustSelect = (0, import_react123.useCallback)(
+  const handleFolderTrustSelect = (0, import_react122.useCallback)(
     (choice2) => {
       const trustedFolders = loadTrustedFolders();
       const cwd7 = process38.cwd();
@@ -357938,27 +358085,27 @@ var ConsolePatcher = class {
 
 // packages/cli/src/ui/hooks/useMessageQueue.ts
 init_esbuild_shims();
-var import_react124 = __toESM(require_react(), 1);
+var import_react123 = __toESM(require_react(), 1);
 function useMessageQueue({
   isConfigInitialized,
   streamingState,
   submitQuery
 }) {
-  const [messageQueue, setMessageQueue] = (0, import_react124.useState)([]);
-  const addMessage = (0, import_react124.useCallback)((message) => {
+  const [messageQueue, setMessageQueue] = (0, import_react123.useState)([]);
+  const addMessage = (0, import_react123.useCallback)((message) => {
     const trimmedMessage = message.trim();
     if (trimmedMessage.length > 0) {
       setMessageQueue((prev) => [...prev, trimmedMessage]);
     }
   }, []);
-  const clearQueue = (0, import_react124.useCallback)(() => {
+  const clearQueue = (0, import_react123.useCallback)(() => {
     setMessageQueue([]);
   }, []);
-  const getQueuedMessagesText = (0, import_react124.useCallback)(() => {
+  const getQueuedMessagesText = (0, import_react123.useCallback)(() => {
     if (messageQueue.length === 0) return "";
     return messageQueue.join("\n\n");
   }, [messageQueue]);
-  (0, import_react124.useEffect)(() => {
+  (0, import_react123.useEffect)(() => {
     if (isConfigInitialized && streamingState === "idle" /* Idle */ && messageQueue.length > 0) {
       const combinedMessage = messageQueue.join("\n\n");
       setMessageQueue([]);
@@ -357977,15 +358124,15 @@ __name(useMessageQueue, "useMessageQueue");
 // packages/cli/src/ui/hooks/useAutoAcceptIndicator.ts
 init_esbuild_shims();
 init_core2();
-var import_react125 = __toESM(require_react(), 1);
+var import_react124 = __toESM(require_react(), 1);
 function useAutoAcceptIndicator({
   config,
   addItem,
   onApprovalModeChange
 }) {
   const currentConfigValue = config.getApprovalMode();
-  const [showAutoAcceptIndicator, setShowAutoAcceptIndicator] = (0, import_react125.useState)(currentConfigValue);
-  (0, import_react125.useEffect)(() => {
+  const [showAutoAcceptIndicator, setShowAutoAcceptIndicator] = (0, import_react124.useState)(currentConfigValue);
+  (0, import_react124.useEffect)(() => {
     setShowAutoAcceptIndicator(currentConfigValue);
   }, [currentConfigValue]);
   useKeypress(
@@ -358018,14 +358165,14 @@ __name(useAutoAcceptIndicator, "useAutoAcceptIndicator");
 
 // packages/cli/src/ui/hooks/useWorkspaceMigration.ts
 init_esbuild_shims();
-var import_react126 = __toESM(require_react(), 1);
+var import_react125 = __toESM(require_react(), 1);
 import process48 from "node:process";
 function useWorkspaceMigration(settings) {
-  const [showWorkspaceMigrationDialog, setShowWorkspaceMigrationDialog] = (0, import_react126.useState)(false);
-  const [workspaceExtensions, setWorkspaceExtensions] = (0, import_react126.useState)(
+  const [showWorkspaceMigrationDialog, setShowWorkspaceMigrationDialog] = (0, import_react125.useState)(false);
+  const [workspaceExtensions, setWorkspaceExtensions] = (0, import_react125.useState)(
     []
   );
-  (0, import_react126.useEffect)(() => {
+  (0, import_react125.useEffect)(() => {
     if (!(settings.merged.experimental?.extensionManagement ?? true)) {
       return;
     }
@@ -358067,14 +358214,14 @@ __name(useWorkspaceMigration, "useWorkspaceMigration");
 
 // packages/cli/src/ui/hooks/useGitBranchName.ts
 init_esbuild_shims();
-var import_react127 = __toESM(require_react(), 1);
+var import_react126 = __toESM(require_react(), 1);
 init_core2();
 import fs92 from "node:fs";
 import fsPromises7 from "node:fs/promises";
 import path106 from "node:path";
 function useGitBranchName(cwd7) {
-  const [branchName, setBranchName] = (0, import_react127.useState)(void 0);
-  const fetchBranchName = (0, import_react127.useCallback)(async () => {
+  const [branchName, setBranchName] = (0, import_react126.useState)(void 0);
+  const fetchBranchName = (0, import_react126.useCallback)(async () => {
     try {
       const { stdout } = await spawnAsync(
         "git",
@@ -358096,7 +358243,7 @@ function useGitBranchName(cwd7) {
       setBranchName(void 0);
     }
   }, [cwd7, setBranchName]);
-  (0, import_react127.useEffect)(() => {
+  (0, import_react126.useEffect)(() => {
     fetchBranchName();
     const gitLogsHeadPath = path106.join(cwd7, ".git", "logs", "HEAD");
     let watcher;
@@ -358122,7 +358269,7 @@ __name(useGitBranchName, "useGitBranchName");
 
 // packages/cli/src/ui/hooks/useExtensionUpdates.ts
 init_esbuild_shims();
-var import_react128 = __toESM(require_react(), 1);
+var import_react127 = __toESM(require_react(), 1);
 function confirmationRequestsReducer(state, action) {
   switch (action.type) {
     case "add":
@@ -358136,15 +358283,15 @@ function confirmationRequestsReducer(state, action) {
 }
 __name(confirmationRequestsReducer, "confirmationRequestsReducer");
 var useExtensionUpdates = /* @__PURE__ */ __name((extensions, addItem, cwd7) => {
-  const [extensionsUpdateState, dispatchExtensionStateUpdate] = (0, import_react128.useReducer)(
+  const [extensionsUpdateState, dispatchExtensionStateUpdate] = (0, import_react127.useReducer)(
     extensionUpdatesReducer,
     initialExtensionUpdatesState
   );
   const [
     confirmUpdateExtensionRequests,
     dispatchConfirmUpdateExtensionRequests
-  ] = (0, import_react128.useReducer)(confirmationRequestsReducer, []);
-  const addConfirmUpdateExtensionRequest = (0, import_react128.useCallback)(
+  ] = (0, import_react127.useReducer)(confirmationRequestsReducer, []);
+  const addConfirmUpdateExtensionRequest = (0, import_react127.useCallback)(
     (original) => {
       const wrappedRequest = {
         prompt: original.prompt,
@@ -358163,7 +358310,7 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensions, addItem, cwd7) =>
     },
     [dispatchConfirmUpdateExtensionRequests]
   );
-  (0, import_react128.useEffect)(() => {
+  (0, import_react127.useEffect)(() => {
     (async () => {
       await checkForAllExtensionUpdates(
         extensions,
@@ -358171,7 +358318,7 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensions, addItem, cwd7) =>
       );
     })();
   }, [extensions, extensions.length, dispatchExtensionStateUpdate]);
-  (0, import_react128.useEffect)(() => {
+  (0, import_react127.useEffect)(() => {
     if (extensionsUpdateState.batchChecksInProgress > 0) {
       return;
     }
@@ -358236,7 +358383,7 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensions, addItem, cwd7) =>
     addItem,
     cwd7
   ]);
-  const extensionsUpdateStateComputed = (0, import_react128.useMemo)(() => {
+  const extensionsUpdateStateComputed = (0, import_react127.useMemo)(() => {
     const result = /* @__PURE__ */ new Map();
     for (const [
       key,
@@ -358257,13 +358404,13 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensions, addItem, cwd7) =>
 
 // packages/cli/src/ui/hooks/useQuitConfirmation.ts
 init_esbuild_shims();
-var import_react129 = __toESM(require_react(), 1);
+var import_react128 = __toESM(require_react(), 1);
 var useQuitConfirmation = /* @__PURE__ */ __name(() => {
-  const [isQuitConfirmationOpen, setIsQuitConfirmationOpen] = (0, import_react129.useState)(false);
-  const showQuitConfirmation = (0, import_react129.useCallback)(() => {
+  const [isQuitConfirmationOpen, setIsQuitConfirmationOpen] = (0, import_react128.useState)(false);
+  const showQuitConfirmation = (0, import_react128.useCallback)(() => {
     setIsQuitConfirmationOpen(true);
   }, []);
-  const handleQuitConfirmationSelect = (0, import_react129.useCallback)((choice2) => {
+  const handleQuitConfirmationSelect = (0, import_react128.useCallback)((choice2) => {
     setIsQuitConfirmationOpen(false);
     if (choice2 === "cancel" /* CANCEL */) {
       return { shouldQuit: false, action: "cancel" };
@@ -358285,15 +358432,15 @@ var useQuitConfirmation = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useWelcomeBack.ts
 init_esbuild_shims();
-var import_react130 = __toESM(require_react(), 1);
+var import_react129 = __toESM(require_react(), 1);
 init_core2();
 function useWelcomeBack(config, submitQuery, buffer, settings) {
-  const [welcomeBackInfo, setWelcomeBackInfo] = (0, import_react130.useState)(null);
-  const [showWelcomeBackDialog, setShowWelcomeBackDialog] = (0, import_react130.useState)(false);
-  const [welcomeBackChoice, setWelcomeBackChoice] = (0, import_react130.useState)(null);
-  const [shouldFillInput, setShouldFillInput] = (0, import_react130.useState)(false);
-  const [inputFillText, setInputFillText] = (0, import_react130.useState)(null);
-  const checkWelcomeBack = (0, import_react130.useCallback)(async () => {
+  const [welcomeBackInfo, setWelcomeBackInfo] = (0, import_react129.useState)(null);
+  const [showWelcomeBackDialog, setShowWelcomeBackDialog] = (0, import_react129.useState)(false);
+  const [welcomeBackChoice, setWelcomeBackChoice] = (0, import_react129.useState)(null);
+  const [shouldFillInput, setShouldFillInput] = (0, import_react129.useState)(false);
+  const [inputFillText, setInputFillText] = (0, import_react129.useState)(null);
+  const checkWelcomeBack = (0, import_react129.useCallback)(async () => {
     if (settings.ui?.enableWelcomeBack === false) {
       return;
     }
@@ -358307,7 +358454,7 @@ function useWelcomeBack(config, submitQuery, buffer, settings) {
       console.debug("Welcome back check failed:", error);
     }
   }, [settings.ui?.enableWelcomeBack]);
-  const handleWelcomeBackSelection = (0, import_react130.useCallback)(
+  const handleWelcomeBackSelection = (0, import_react129.useCallback)(
     (choice2) => {
       setWelcomeBackChoice(choice2);
       setShowWelcomeBackDialog(false);
@@ -358319,21 +358466,21 @@ function useWelcomeBack(config, submitQuery, buffer, settings) {
     },
     [welcomeBackInfo]
   );
-  const handleWelcomeBackClose = (0, import_react130.useCallback)(() => {
+  const handleWelcomeBackClose = (0, import_react129.useCallback)(() => {
     setWelcomeBackChoice("restart");
     setShowWelcomeBackDialog(false);
   }, []);
-  const clearInputFill = (0, import_react130.useCallback)(() => {
+  const clearInputFill = (0, import_react129.useCallback)(() => {
     setShouldFillInput(false);
     setInputFillText(null);
   }, []);
-  (0, import_react130.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     if (shouldFillInput && inputFillText) {
       buffer.setText(inputFillText);
       clearInputFill();
     }
   }, [shouldFillInput, inputFillText, buffer, clearInputFill]);
-  (0, import_react130.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     checkWelcomeBack();
   }, [checkWelcomeBack]);
   return {
@@ -358354,9 +358501,9 @@ __name(useWelcomeBack, "useWelcomeBack");
 
 // packages/cli/src/ui/hooks/useDialogClose.ts
 init_esbuild_shims();
-var import_react131 = __toESM(require_react(), 1);
+var import_react130 = __toESM(require_react(), 1);
 function useDialogClose(options2) {
-  const closeAnyOpenDialog = (0, import_react131.useCallback)(() => {
+  const closeAnyOpenDialog = (0, import_react130.useCallback)(() => {
     if (options2.isThemeDialogOpen) {
       options2.handleThemeSelect(void 0, "User" /* User */);
       return true;
@@ -358386,6 +358533,26 @@ function useDialogClose(options2) {
 }
 __name(useDialogClose, "useDialogClose");
 
+// packages/cli/src/ui/hooks/useInitializationAuthError.ts
+init_esbuild_shims();
+var import_react131 = __toESM(require_react(), 1);
+var useInitializationAuthError = /* @__PURE__ */ __name((authError, onAuthError) => {
+  const hasHandled = (0, import_react131.useRef)(false);
+  const authErrorRef = (0, import_react131.useRef)(authError);
+  const onAuthErrorRef = (0, import_react131.useRef)(onAuthError);
+  authErrorRef.current = authError;
+  onAuthErrorRef.current = onAuthError;
+  (0, import_react131.useEffect)(() => {
+    if (hasHandled.current) {
+      return;
+    }
+    if (authErrorRef.current) {
+      hasHandled.current = true;
+      onAuthErrorRef.current(authErrorRef.current);
+    }
+  }, [authError, onAuthError]);
+}, "useInitializationAuthError");
+
 // packages/cli/src/ui/hooks/useSubagentCreateDialog.ts
 init_esbuild_shims();
 var import_react132 = __toESM(require_react(), 1);
@@ -358481,7 +358648,7 @@ var useAttentionNotifications = /* @__PURE__ */ __name(({
 }, "useAttentionNotifications");
 
 // packages/cli/src/ui/AppContainer.tsx
-var import_jsx_runtime107 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime106 = __toESM(require_jsx_runtime(), 1);
 var CTRL_EXIT_PROMPT_DURATION_MS = 1e3;
 function isToolExecuting(pendingHistoryItems) {
   return pendingHistoryItems.some((item) => {
@@ -358669,17 +358836,12 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     onAuthError,
     isAuthDialogOpen,
     isAuthenticating,
+    pendingAuthType,
+    qwenAuthState,
     handleAuthSelect,
-    openAuthDialog
+    openAuthDialog,
+    cancelAuthentication
   } = useAuthCommand(settings, config);
-  const {
-    isQwenAuth,
-    isQwenAuthenticating,
-    deviceAuth,
-    authStatus,
-    authMessage,
-    cancelQwenAuth
-  } = useQwenAuth(settings, isAuthenticating);
   const { proQuotaRequest, handleProQuotaChoice } = useQuotaAndFallback({
     config,
     historyManager,
@@ -358687,16 +358849,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     setAuthState,
     setModelSwitchedFromQuotaError
   });
-  const handleQwenAuthTimeout = (0, import_react135.useCallback)(() => {
-    onAuthError("Qwen OAuth authentication timed out. Please try again.");
-    cancelQwenAuth();
-    setAuthState("updating" /* Updating */);
-  }, [onAuthError, cancelQwenAuth, setAuthState]);
-  const handleQwenAuthCancel = (0, import_react135.useCallback)(() => {
-    onAuthError("Qwen OAuth authentication cancelled.");
-    cancelQwenAuth();
-    setAuthState("updating" /* Updating */);
-  }, [onAuthError, cancelQwenAuth, setAuthState]);
+  useInitializationAuthError(initializationResult.authError, onAuthError);
   (0, import_react135.useEffect)(() => {
     if (settings.merged.security?.auth?.enforcedType && settings.merged.security?.auth.selectedType && settings.merged.security?.auth.enforcedType !== settings.merged.security?.auth.selectedType) {
       onAuthError(
@@ -359136,7 +359289,7 @@ ${queuedText}` : queuedText;
     handleApprovalModeSelect,
     isAuthDialogOpen,
     handleAuthSelect,
-    selectedAuthType: settings.merged.security?.auth?.selectedType,
+    pendingAuthType,
     isEditorDialogOpen,
     exitEditorDialog,
     isSettingsDialogOpen,
@@ -359295,7 +359448,7 @@ ${queuedText}` : queuedText;
     [filteredConsoleMessages]
   );
   const nightly = props.version.includes("nightly");
-  const dialogsVisible = showWelcomeBackDialog || showWorkspaceMigrationDialog || shouldShowIdePrompt || isFolderTrustDialogOpen || !!shellConfirmationRequest || !!confirmationRequest || confirmUpdateExtensionRequests.length > 0 || !!loopDetectionConfirmationRequest || !!quitConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || isModelDialogOpen || isVisionSwitchDialogOpen || isPermissionsDialogOpen || isAuthDialogOpen || isAuthenticating && isQwenAuthenticating || isEditorDialogOpen || showIdeRestartPrompt || !!proQuotaRequest || isSubagentCreateDialogOpen || isAgentsManagerDialogOpen || isApprovalModeDialogOpen;
+  const dialogsVisible = showWelcomeBackDialog || showWorkspaceMigrationDialog || shouldShowIdePrompt || isFolderTrustDialogOpen || !!shellConfirmationRequest || !!confirmationRequest || confirmUpdateExtensionRequests.length > 0 || !!loopDetectionConfirmationRequest || !!quitConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || isModelDialogOpen || isVisionSwitchDialogOpen || isPermissionsDialogOpen || isAuthDialogOpen || isAuthenticating || isEditorDialogOpen || showIdeRestartPrompt || !!proQuotaRequest || isSubagentCreateDialogOpen || isAgentsManagerDialogOpen || isApprovalModeDialogOpen;
   const pendingHistoryItems = (0, import_react135.useMemo)(
     () => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems],
     [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]
@@ -359310,12 +359463,9 @@ ${queuedText}` : queuedText;
       isConfigInitialized,
       authError,
       isAuthDialogOpen,
+      pendingAuthType,
       // Qwen OAuth state
-      isQwenAuth,
-      isQwenAuthenticating,
-      deviceAuth,
-      authStatus,
-      authMessage,
+      qwenAuthState,
       editorError,
       isEditorDialogOpen,
       corgiMode,
@@ -359405,12 +359555,9 @@ ${queuedText}` : queuedText;
       isConfigInitialized,
       authError,
       isAuthDialogOpen,
+      pendingAuthType,
       // Qwen OAuth state
-      isQwenAuth,
-      isQwenAuthenticating,
-      deviceAuth,
-      authStatus,
-      authMessage,
+      qwenAuthState,
       editorError,
       isEditorDialogOpen,
       corgiMode,
@@ -359503,9 +359650,7 @@ ${queuedText}` : queuedText;
       handleAuthSelect,
       setAuthState,
       onAuthError,
-      // Qwen OAuth handlers
-      handleQwenAuthTimeout,
-      handleQwenAuthCancel,
+      cancelAuthentication,
       handleEditorSelect,
       exitEditorDialog,
       closeSettingsDialog,
@@ -359539,9 +359684,7 @@ ${queuedText}` : queuedText;
       handleAuthSelect,
       setAuthState,
       onAuthError,
-      // Qwen OAuth handlers
-      handleQwenAuthTimeout,
-      handleQwenAuthCancel,
+      cancelAuthentication,
       handleEditorSelect,
       exitEditorDialog,
       closeSettingsDialog,
@@ -359567,14 +359710,14 @@ ${queuedText}` : queuedText;
       closeAgentsManagerDialog
     ]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(
     AppContext2.Provider,
     {
       value: {
         version: props.version,
         startupWarnings: props.startupWarnings || []
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(App2, {}) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(App2, {}) })
     }
   ) }) }) });
 }, "AppContainer");
@@ -362488,7 +362631,7 @@ function toPermissionOptions(confirmation) {
 __name(toPermissionOptions, "toPermissionOptions");
 
 // packages/cli/src/gemini.tsx
-var import_jsx_runtime108 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime107 = __toESM(require_jsx_runtime(), 1);
 function validateDnsResolutionOrder(order) {
   const defaultValue = "ipv4first";
   if (order === void 0) {
@@ -362553,14 +362696,14 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
   const AppWrapper = /* @__PURE__ */ __name(() => {
     const kittyProtocolStatus = useKittyKeyboardProtocol();
     const nodeMajorVersion = parseInt(process.versions.node.split(".")[0], 10);
-    return /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(SettingsContext.Provider, { value: settings, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(SettingsContext.Provider, { value: settings, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(
       KeypressProvider,
       {
         kittyProtocolEnabled: kittyProtocolStatus.enabled,
         config,
         debugKeystrokeLogging: settings.merged.general?.debugKeystrokeLogging,
         pasteWorkaround: process.platform === "win32" || nodeMajorVersion < 20,
-        children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(SessionStatsProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(VimModeProvider, { settings, children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(SessionStatsProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(VimModeProvider, { settings, children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(
           AppContainer,
           {
             config,
@@ -362574,7 +362717,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
     ) });
   }, "AppWrapper");
   const instance = render_default(
-    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(import_react137.default.StrictMode, { children: /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(AppWrapper, {}) }) : /* @__PURE__ */ (0, import_jsx_runtime108.jsx)(AppWrapper, {}),
+    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(import_react137.default.StrictMode, { children: /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(AppWrapper, {}) }) : /* @__PURE__ */ (0, import_jsx_runtime107.jsx)(AppWrapper, {}),
     {
       exitOnCtrlC: false,
       isScreenReaderEnabled: config.getScreenReader()
@@ -362814,6 +362957,11 @@ main().catch((error) => {
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+/**
+ * @license
+ * Copyright 2025 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
 /*! Bundled license information:
 
 react/cjs/react.production.js: