@qwen-code/qwen-code 0.22.2 → 0.22.3-nightly.20260829.e5cb60ad48

package/chunks/{startInteractiveUI-WHJPFOGH.js → startInteractiveUI-5ZMSJZ3J.js}

@@ -1,22 +1,25 @@
 // Force strict mode and setup for ESM
 "use strict";
+import {
+  buildPermissionSuggestions
+} from "./chunk-BFSFJR3D.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-2K6ORIHJ.js";
+} from "./chunk-3CAI35FS.js";
+import {
+  stopAndGetCapturedInput
+} from "./chunk-M6FOJXW3.js";
 import {
   useAutoAcceptIndicator
-} from "./chunk-Z7TGYN5F.js";
+} from "./chunk-FROAFEFB.js";
 import {
   classifyApiError,
   fireSessionDeleteHook
 } from "./chunk-P5Y23G2L.js";
-import {
-  buildPermissionSuggestions
-} from "./chunk-BFSFJR3D.js";
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-TRZTNIQ6.js";
+} from "./chunk-I6LYRJPB.js";
 import {
   MAX_SUGGESTIONS_TO_SHOW,
   SESSION_MENTION_PREFIX,
@@ -29,10 +32,10 @@ import {
   normalizePartList,
   resolveAtCommandQuery,
   sanitizeDisplayText
-} from "./chunk-OIP7C4FE.js";
+} from "./chunk-PO6YCWIQ.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-6LFJEACX.js";
+} from "./chunk-JHDPOPQG.js";
 import {
   BuiltinCommandLoader,
   BundledSkillLoader,
@@ -79,21 +82,21 @@ import {
   resetBackgroundStateForSessionSwitch,
   serializeUserPromptExpansionPrompt,
   supportsMatchers
-} from "./chunk-F5SZP77N.js";
+} from "./chunk-BP5PTNCU.js";
 import {
   EXTENSION_RELOAD_FAILED_REASON,
   ExtensionRefreshState,
   appEvents,
   cleanupReviewWorktreeLeases,
-  loadHierarchicalGeminiMemory
-} from "./chunk-BAJKAAOY.js";
+  loadHierarchicalMemory
+} from "./chunk-TGJ2PKCW.js";
 import {
   disableKittyProtocol,
   isKittyProtocolEnabled,
   isKittyProtocolSupported,
   pushKittyProtocolFlags
 } from "./chunk-NYX53SV4.js";
-import "./chunk-AGR5UROZ.js";
+import "./chunk-YN44TEOZ.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -171,21 +174,21 @@ import {
   useUIActions,
   useUIState,
   useVirtualViewport
-} from "./chunk-CCBZDVUA.js";
+} from "./chunk-UI4DXRZW.js";
 import {
   KeypressProvider,
   useFocus,
   useKeypress,
   useKeypressContext
-} from "./chunk-T32W2JHI.js";
+} from "./chunk-SS5SDCD3.js";
 import {
   getCommandDisplayName,
   getCommandSourceBadge
-} from "./chunk-IJKTMLBE.js";
+} from "./chunk-FIKYKQOO.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-K2NQPH5D.js";
+} from "./chunk-OJEMXKA4.js";
 import {
   BEL,
   OSC_PREFIX,
@@ -198,7 +201,7 @@ import {
   oscKittyNotify,
   saveClipboardImage,
   writeOsc52
-} from "./chunk-FDY5RMGH.js";
+} from "./chunk-CFJY4DGX.js";
 import "./chunk-4WGODMVR.js";
 import {
   MaxSizedBox,
@@ -206,11 +209,11 @@ import {
   useOverflowState
 } from "./chunk-NU7RKEZR.js";
 import {
-  GeminiRespondingSpinner,
-  GeminiSpinner,
   ICON,
+  RespondingSpinner,
   SCREEN_READER_USER_PREFIX,
   SHELL_COMMAND_NAME,
+  Spinner,
   StreamingContext,
   applyCollapsePolicyAndSummary,
   buildResumedHistoryItems,
@@ -222,7 +225,7 @@ import {
   useStreamingContext,
   waitForGoalRuntime,
   wrapAnsi
-} from "./chunk-2NYCN6F2.js";
+} from "./chunk-WD3WSEW3.js";
 import {
   formatDuration,
   formatRelativeTime,
@@ -251,9 +254,7 @@ import {
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
-import {
-  stopAndGetCapturedInput
-} from "./chunk-M6FOJXW3.js";
+import "./chunk-IJMEPQ5N.js";
 import "./chunk-BXDAPVQU.js";
 import {
   MAX_INLINE_IMAGES_PER_ITEM,
@@ -262,35 +263,34 @@ import {
 } from "./chunk-TPI7O7HR.js";
 import {
   setUpdateHandler
-} from "./chunk-4JWNNLPT.js";
+} from "./chunk-B42A5ZHA.js";
 import {
   isHistoryItemVisibleAfterRestore
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-QP4C6WCE.js";
+import "./chunk-PI6HYGBE.js";
 import "./chunk-YAF2MQZ6.js";
-import "./chunk-FY76G3G5.js";
+import "./chunk-W3CY4QIO.js";
 import {
   AUTO_THEME_NAME,
   DEFAULT_THEME,
   themeManager
 } from "./chunk-QFCDF5PL.js";
 import "./chunk-KW7NOTN6.js";
-import "./chunk-C6K43ZDE.js";
+import "./chunk-W7HH77GN.js";
 import "./chunk-6H67XLET.js";
-import "./chunk-A7YP63XN.js";
+import "./chunk-J7SS77YW.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-L6YT5H34.js";
+} from "./chunk-CVUBULIX.js";
 import {
   relaunchApp
-} from "./chunk-CSMI4FP5.js";
-import "./chunk-66KDY3LV.js";
+} from "./chunk-UAOTD2BN.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
 } from "./chunk-RU7BK6B3.js";
-import "./chunk-3SGB2UHX.js";
+import "./chunk-NENQE7VH.js";
 import "./chunk-BFPESSTR.js";
 import {
   cpLen,
@@ -305,14 +305,15 @@ import {
   toCodePoints,
   truncateToWidth
 } from "./chunk-E7REAOTN.js";
-import "./chunk-XDLEZ5HX.js";
+import "./chunk-ZZUKP7HV.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-TXASDT2M.js";
-import "./chunk-UXEO7E3V.js";
+import "./chunk-4VQBQLIZ.js";
 import "./chunk-RXFQM6FQ.js";
+import "./chunk-UXEO7E3V.js";
 import {
   isValidSessionId
 } from "./chunk-ZEZKIS2K.js";
@@ -322,58 +323,58 @@ import {
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-JCQD3INC.js";
+} from "./chunk-URE3QBBB.js";
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-XRSOI3DL.js";
+} from "./chunk-A3LWD5MK.js";
 import "./chunk-YTDVNSUQ.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-RJC5EIKY.js";
-import "./chunk-6CGL7E7G.js";
+} from "./chunk-HHQJANFM.js";
+import "./chunk-IZDKYNKN.js";
 import "./chunk-7U5G6JXI.js";
 import "./chunk-WCCLLK7X.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-Q26AYA62.js";
+} from "./chunk-VKCJPNGU.js";
 import {
   computeWorkspaceSkillListUpdates,
   resolveSkillSettings,
   skillSettingStrings
-} from "./chunk-Z4X5MTRT.js";
-import "./chunk-FBSSIAAQ.js";
+} from "./chunk-HCOBAG2L.js";
+import "./chunk-AMLXTTJJ.js";
 import {
   requestConsentInteractive,
   requestConsentOrFail
-} from "./chunk-PFCQ62V4.js";
+} from "./chunk-JWDMKJG5.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-HVQ3B7FF.js";
-import "./chunk-7JPW6IYH.js";
-import "./chunk-5XBFCMWD.js";
+import "./chunk-Y5S7LBOZ.js";
+import "./chunk-3XKLXHGK.js";
+import "./chunk-HVC3PNVC.js";
 import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-CPGJJJLU.js";
-import "./chunk-MZS7GEC7.js";
+} from "./chunk-SEDFP3ZI.js";
+import "./chunk-FTF2YIZ5.js";
 import "./chunk-2AUM35J5.js";
 import "./chunk-OZ6KS6KW.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-STUJ7IMZ.js";
-import "./chunk-JVPFTDBK.js";
-import "./chunk-ALMR3E6Q.js";
 import "./chunk-GYTKQYDB.js";
+import "./chunk-RFIDDFAL.js";
+import "./chunk-ALMR3E6Q.js";
 import "./chunk-RKFGE7JH.js";
 import "./chunk-UDG5EZJI.js";
 import "./chunk-3VUENPWF.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-7EQQR46F.js";
-import "./chunk-E55H6BZ7.js";
+import "./chunk-ICURCKIU.js";
 import "./chunk-IW6RQPQB.js";
 import {
   loadMcpApprovals
-} from "./chunk-5O72BNDD.js";
+} from "./chunk-F5RB4S23.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -395,11 +396,11 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-F7TNAPZ4.js";
+} from "./chunk-5SBVOOA2.js";
 import "./chunk-RKUWKYED.js";
 import {
   TOGGLE_TYPES
-} from "./chunk-JSC3H3TD.js";
+} from "./chunk-RZKOA4JE.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
 import {
@@ -407,19 +408,19 @@ import {
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-LDP5OD6N.js";
+} from "./chunk-CLWO3B77.js";
 import "./chunk-5EJZE3FP.js";
-import "./chunk-IK5BW3CS.js";
-import "./chunk-5PA6UEYA.js";
-import "./chunk-V2NDP3I4.js";
+import "./chunk-5ZJL3AIV.js";
+import "./chunk-MZCJWS5Y.js";
+import "./chunk-2AEHQRY2.js";
 import {
   getCliVersion
-} from "./chunk-7UYV53BC.js";
+} from "./chunk-GIHXH2KO.js";
 import "./chunk-W3N5XAZ6.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-V4QXXQJ2.js";
+} from "./chunk-H4LCV44K.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -470,26 +471,26 @@ import {
   startSpeculation,
   subagentGenerator,
   watchRepoBranch
-} from "./chunk-KUX5D6DK.js";
+} from "./chunk-BFYGL2XL.js";
 import {
   saveWorkflowScript,
   validateWorkflowName
-} from "./chunk-3DXFGHAJ.js";
+} from "./chunk-VNMZLAVG.js";
 import "./chunk-XFSFZCM5.js";
 import "./chunk-2EAZ43JQ.js";
 import "./chunk-NF5J2WFA.js";
 import "./chunk-CQH5KTKC.js";
 import "./chunk-LJZSMWOH.js";
-import "./chunk-6LFTG244.js";
-import "./chunk-PKAYJDB3.js";
-import "./chunk-6IUNAPLR.js";
+import "./chunk-TU6WVK67.js";
+import "./chunk-WNPDGUJO.js";
+import "./chunk-K5KXUXWC.js";
 import {
   clearWorktreeSession,
   isSessionRuntimeActive,
   readWorktreeSession,
   restoreWorktreeContext
-} from "./chunk-OIVXBW3W.js";
-import "./chunk-4CDSK5AZ.js";
+} from "./chunk-62GQFYID.js";
+import "./chunk-AYFA7MZV.js";
 import "./chunk-XQFT3QUF.js";
 import "./chunk-VTHREBQM.js";
 import "./chunk-ZPJWUGCS.js";
@@ -499,8 +500,8 @@ import {
   sanitizeForOsc,
   supportsHyperlinks,
   wrapForMultiplexer
-} from "./chunk-H2WDGQ6D.js";
-import "./chunk-MIIVI25Q.js";
+} from "./chunk-3JXM2CVW.js";
+import "./chunk-ST5V3ZOC.js";
 import {
   ConditionalRulesRegistry,
   CoreToolScheduler,
@@ -539,6 +540,7 @@ import {
   getExtensionDisplayName,
   getTimeRangeBounds,
   getToolResponseDisplayText,
+  goalToolResultProvenance,
   ideContextStore,
   isActiveWorkflowStatus,
   isClearedMediaPlaceholder,
@@ -567,7 +569,7 @@ import {
   refreshMemoryInstruction,
   registerSession,
   stripTerminalControlSequences
-} from "./chunk-TGWAQ5RB.js";
+} from "./chunk-ECE3UYVO.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import {
@@ -575,70 +577,70 @@ import {
 } from "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
 import "./chunk-EKSCLBBF.js";
-import "./chunk-P2SU6ZTI.js";
-import "./chunk-IZIVM7LZ.js";
-import "./chunk-SFPGAQUL.js";
+import "./chunk-LUEHOUHM.js";
+import "./chunk-WXEA74YB.js";
+import "./chunk-42IDLQWS.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
 } from "./chunk-JB4JIVTJ.js";
+import "./chunk-DJBQCO2E.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-D5LUXLUH.js";
 import {
   promptIdContext
 } from "./chunk-O6GEWCJA.js";
-import "./chunk-T26EAKDL.js";
+import "./chunk-LGO7DEXL.js";
 import {
   GitWorktreeService,
   readWorktreeSessionMarker,
   writeRuntimeStatus
-} from "./chunk-EOGELB3H.js";
+} from "./chunk-2SXSLSQE.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-EFUM7RVY.js";
+import "./chunk-KJO2LBUK.js";
 import {
   HOOKS_CONFIG_FIELDS
 } from "./chunk-TTX2JUE6.js";
-import "./chunk-43GGFFLY.js";
+import "./chunk-4K7KNVWH.js";
 import {
-  getGitBranch,
   glob
-} from "./chunk-SMPR7SPO.js";
+} from "./chunk-QJNDUTOL.js";
+import {
+  getGitBranch
+} from "./chunk-UVY67MSH.js";
 import "./chunk-JWALNCLT.js";
 import "./chunk-NIFYWDYN.js";
-import "./chunk-3AFMQUTI.js";
+import "./chunk-C2X7KY45.js";
 import {
   elapsedActiveTime,
   goalRequiresExactPermit
-} from "./chunk-WKK5BQNP.js";
+} from "./chunk-JHYH6PYQ.js";
+import "./chunk-7J6OTNGO.js";
 import {
   APPROVAL_MODES
 } from "./chunk-V5J4J5TP.js";
 import "./chunk-MLXTMF7H.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-3JGZSIDA.js";
-import "./chunk-VVW4ZNFY.js";
+import "./chunk-B466ZSHZ.js";
+import "./chunk-4QHPPXK2.js";
 import "./chunk-QHMLYMMS.js";
-import "./chunk-7DJCPZE3.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-HVEYF6VT.js";
+import "./chunk-3WK3QDNV.js";
 import "./chunk-VNOVK4I7.js";
-import "./chunk-SAH4BD2J.js";
-import "./chunk-PDMJ3KGS.js";
+import "./chunk-PQEISIKS.js";
+import "./chunk-EB6QRGHM.js";
 import {
   runOutsideAgentContext
 } from "./chunk-CMHFCLBU.js";
 import "./chunk-S6LOFUVP.js";
+import "./chunk-CFKIH3D3.js";
 import {
   REASONING_EFFORT_TIERS,
   applyReasoningEffort
 } from "./chunk-2LD5U7Q3.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-J2OSJFP3.js";
-import "./chunk-K2OJUPOE.js";
-import "./chunk-CFKIH3D3.js";
-import "./chunk-4FTKQNWJ.js";
-import "./chunk-Y3QL45LS.js";
+import "./chunk-DYXFD5RO.js";
+import "./chunk-V4264FEG.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -677,14 +679,14 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-L2M46FP5.js";
-import "./chunk-YRLW2MSX.js";
+} from "./chunk-QYMAKPY5.js";
+import "./chunk-XBVNNDPK.js";
 import "./chunk-VGC4I5JJ.js";
 import {
-  getAllGeminiMdFilenames,
+  getAllMemoryFilenames,
   getUnsupportedImageFormatWarning,
   isSupportedImageMimeType
-} from "./chunk-3I6UTTDX.js";
+} from "./chunk-BKWNKLZB.js";
 import {
   AUTO_MEMORY_INDEX_FILENAME,
   getAutoMemoryProjectStateDir,
@@ -702,7 +704,7 @@ import {
 import "./chunk-6DIGWMGT.js";
 import {
   MAINLINE_CODER_MODEL
-} from "./chunk-Z7FLBQPR.js";
+} from "./chunk-ARF6IJHM.js";
 import "./chunk-XZA32HII.js";
 import {
   atomicWriteFileSync
@@ -714,7 +716,7 @@ import {
   getActiveInteractionSpan,
   isBinary,
   redactUrlCredentials
-} from "./chunk-L6BZRIUL.js";
+} from "./chunk-B5PHIJGI.js";
 import "./chunk-74TONY4F.js";
 import "./chunk-XF63PKEN.js";
 import {
@@ -742,11 +744,12 @@ import {
   shortenPath,
   tildeifyPath
 } from "./chunk-UHQFIS7N.js";
-import "./chunk-W5MJJ2V7.js";
+import "./chunk-BIJEBAAQ.js";
+import "./chunk-WLEYH7CD.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-Y6LSMB6J.js";
+} from "./chunk-K6CTN5TU.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -757,7 +760,7 @@ import {
   writeStderrLine,
   writeStderrLineSafe,
   writeStdoutLine
-} from "./chunk-KGJGEEVR.js";
+} from "./chunk-7FA2II6K.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
@@ -1368,7 +1371,7 @@ var RemoteInputWatcher = class {
   }
   /**
    * Register the TUI's submit function. Called from AppContainer
-   * once useGeminiStream's submitQuery is available.
+   * once useLlmStream's submitQuery is available.
    */
   setSubmitFn(fn) {
     this.submitFn = fn;
@@ -4406,7 +4409,7 @@ var MainContent = /* @__PURE__ */ __name(({ footerRef }) => {
           terminalWidth,
           mainAreaWidth,
           availableTerminalHeight: uiState.constrainHeight ? staticAreaMaxItemHeight : void 0,
-          availableTerminalHeightGemini: uiState.constrainHeight ? MAX_GEMINI_MESSAGE_LINES : void 0,
+          availableTerminalHeightLlm: uiState.constrainHeight ? MAX_GEMINI_MESSAGE_LINES : void 0,
           item,
           isPending: false,
           commands: uiState.slashCommands,
@@ -4482,7 +4485,7 @@ var MainContent = /* @__PURE__ */ __name(({ footerRef }) => {
                 terminalWidth,
                 mainAreaWidth,
                 availableTerminalHeight: staticAreaMaxItemHeight,
-                availableTerminalHeightGemini: MAX_GEMINI_MESSAGE_LINES,
+                availableTerminalHeightLlm: MAX_GEMINI_MESSAGE_LINES,
                 item: h,
                 isPending: false,
                 commands: uiState.slashCommands,
@@ -13263,7 +13266,7 @@ var IdeTrustChangeDialog = /* @__PURE__ */ __name(({ reason }) => {
   }
   return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Box_default, { borderStyle: "round", borderColor: theme.status.warning, paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { color: theme.status.warning, children: [
     message,
-    " Press 'r' to restart Gemini to apply the changes."
+    " Press 'r' to restart Qwen Code and apply the changes."
   ] }) });
 }, "IdeTrustChangeDialog");
 
@@ -15607,10 +15610,8 @@ function SkillsManagerDialog({
       settings,
       "Workspace" /* Workspace */
     ).filter((name) => typeof name === "string");
-    const lockedNames = new Set(lockedSkills.map((skill) => lower(skill.name)));
     const { disabled, enabled, disabledChanged, enabledChanged } = computeWorkspaceSkillListUpdates(
       workspaceDisabled,
-      lockedNames,
       skillSettingStrings(settings, "Workspace" /* Workspace */, "enabled"),
       unlockedSkills.map((skill) => ({
         name: skill.name,
@@ -15673,7 +15674,6 @@ function SkillsManagerDialog({
     addItem,
     initialResolved,
     initialSelectedKeys,
-    lockedSkills,
     reloadCommands,
     selectedKeys,
     settings,
@@ -17632,9 +17632,9 @@ var AuthenticateStep = /* @__PURE__ */ __name(({
           })
         ]);
       }
-      const geminiClient = config.getGeminiClient();
-      if (geminiClient) {
-        await geminiClient.setTools();
+      const llmClient = config.getLlmClient();
+      if (llmClient) {
+        await llmClient.setTools();
       }
       setMessages((prev) => [
         ...prev,
@@ -22701,7 +22701,7 @@ import { spawn } from "node:child_process";
 var import_jsx_runtime95 = __toESM(require_jsx_runtime(), 1);
 var DISPLAY_ENV_VARS = ["DISPLAY", "WAYLAND_DISPLAY", "MIR_SOCKET"];
 async function resolvePreferredMemoryFile(dir, fallbackFilename) {
-  for (const filename of getAllGeminiMdFilenames()) {
+  for (const filename of getAllMemoryFilenames()) {
     const filePath = path4.join(dir, filename);
     try {
       await fs9.access(filePath);
@@ -22786,14 +22786,14 @@ function MemoryDialog({ onClose }) {
   const globalMemoryPath = (0, import_react73.useMemo)(
     () => path4.join(
       Storage.getGlobalQwenDir(),
-      getAllGeminiMdFilenames()[0] ?? "QWEN.md"
+      getAllMemoryFilenames()[0] ?? "QWEN.md"
     ),
     []
   );
   const projectMemoryPath = (0, import_react73.useMemo)(
     () => path4.join(
       config.getWorkingDir(),
-      getAllGeminiMdFilenames()[0] ?? "QWEN.md"
+      getAllMemoryFilenames()[0] ?? "QWEN.md"
     ),
     [config]
   );
@@ -22896,12 +22896,12 @@ function MemoryDialog({ onClose }) {
         case "project":
           return resolvePreferredMemoryFile(
             config.getWorkingDir(),
-            getAllGeminiMdFilenames()[0] ?? "QWEN.md"
+            getAllMemoryFilenames()[0] ?? "QWEN.md"
           );
         case "global":
           return resolvePreferredMemoryFile(
             Storage.getGlobalQwenDir(),
-            getAllGeminiMdFilenames()[0] ?? "QWEN.md"
+            getAllMemoryFilenames()[0] ?? "QWEN.md"
           );
         default: {
           const _exhaustive = item.value;
@@ -25694,7 +25694,7 @@ var LoadingIndicator = /* @__PURE__ */ __name(({
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime101.jsxs)(Box_default, { children: [
             /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(Box_default, { marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime101.jsx)(
-              GeminiRespondingSpinner,
+              RespondingSpinner,
               {
                 nonRespondingDisplay: streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ ? "\u280F" : ""
               }
@@ -28225,7 +28225,8 @@ var DEFAULT_STATE2 = {
   agentShellFocused: false,
   agentInputBufferText: "",
   agentTabBarFocused: false,
-  agentApprovalModes: /* @__PURE__ */ new Map()
+  agentApprovalModes: /* @__PURE__ */ new Map(),
+  agentMessageQueues: /* @__PURE__ */ new Map()
 };
 var noop2 = /* @__PURE__ */ __name(() => {
 }, "noop");
@@ -28239,7 +28240,9 @@ var DEFAULT_ACTIONS2 = {
   setAgentShellFocused: noop2,
   setAgentInputBufferText: noop2,
   setAgentTabBarFocused: noop2,
-  setAgentApprovalMode: noop2
+  setAgentApprovalMode: noop2,
+  setAgentMessageQueue: noop2,
+  appendToAgentMessageQueue: noop2
 };
 function useAgentViewState() {
   return (0, import_react95.useContext)(AgentViewStateContext) ?? DEFAULT_STATE2;
@@ -28261,6 +28264,8 @@ function AgentViewProvider({
   const [agentInputBufferText, setAgentInputBufferText] = (0, import_react95.useState)("");
   const [agentTabBarFocused, setAgentTabBarFocused] = (0, import_react95.useState)(false);
   const [agentApprovalModes, setAgentApprovalModes] = (0, import_react95.useState)(() => /* @__PURE__ */ new Map());
+  const [agentMessageQueues, setAgentMessageQueues] = (0, import_react95.useState)(() => /* @__PURE__ */ new Map());
+  const registeredIdsRef = (0, import_react95.useRef)(/* @__PURE__ */ new Set());
   const switchToAgent = (0, import_react95.useCallback)(
     (agentId) => {
       if (agents.has(agentId)) {
@@ -28294,6 +28299,7 @@ function AgentViewProvider({
   }, [activeView]);
   const registerAgent = (0, import_react95.useCallback)(
     (agentId, interactiveAgent, modelId, color, modelName) => {
+      registeredIdsRef.current.add(agentId);
       setAgents((prev) => {
         const next = new Map(prev);
         next.set(agentId, {
@@ -28314,6 +28320,7 @@ function AgentViewProvider({
     []
   );
   const unregisterAgent = (0, import_react95.useCallback)((agentId) => {
+    registeredIdsRef.current.delete(agentId);
     setAgents((prev) => {
       if (!prev.has(agentId)) return prev;
       const next = new Map(prev);
@@ -28326,11 +28333,19 @@ function AgentViewProvider({
       next.delete(agentId);
       return next;
     });
+    setAgentMessageQueues((prev) => {
+      if (!prev.has(agentId)) return prev;
+      const next = new Map(prev);
+      next.delete(agentId);
+      return next;
+    });
     setActiveView((current) => current === agentId ? "main" : current);
   }, []);
   const unregisterAll = (0, import_react95.useCallback)(() => {
+    registeredIdsRef.current.clear();
     setAgents(/* @__PURE__ */ new Map());
     setAgentApprovalModes(/* @__PURE__ */ new Map());
+    setAgentMessageQueues(/* @__PURE__ */ new Map());
     setActiveView("main");
     setAgentTabBarFocused(false);
   }, []);
@@ -28348,6 +28363,31 @@ function AgentViewProvider({
     },
     [agents]
   );
+  const setAgentMessageQueue = (0, import_react95.useCallback)(
+    (agentId, queue) => {
+      setAgentMessageQueues((prev) => {
+        const next = new Map(prev);
+        if (queue.length === 0) {
+          next.delete(agentId);
+        } else {
+          next.set(agentId, queue);
+        }
+        return next;
+      });
+    },
+    []
+  );
+  const appendToAgentMessageQueue = (0, import_react95.useCallback)(
+    (agentId, message) => {
+      if (!registeredIdsRef.current.has(agentId)) return;
+      setAgentMessageQueues((prev) => {
+        const next = new Map(prev);
+        next.set(agentId, [...next.get(agentId) ?? [], message]);
+        return next;
+      });
+    },
+    []
+  );
   const state = (0, import_react95.useMemo)(
     () => ({
       activeView,
@@ -28355,7 +28395,8 @@ function AgentViewProvider({
       agentShellFocused,
       agentInputBufferText,
       agentTabBarFocused,
-      agentApprovalModes
+      agentApprovalModes,
+      agentMessageQueues
     }),
     [
       activeView,
@@ -28363,7 +28404,8 @@ function AgentViewProvider({
       agentShellFocused,
       agentInputBufferText,
       agentTabBarFocused,
-      agentApprovalModes
+      agentApprovalModes,
+      agentMessageQueues
     ]
   );
   const actions = (0, import_react95.useMemo)(
@@ -28377,7 +28419,9 @@ function AgentViewProvider({
       setAgentShellFocused,
       setAgentInputBufferText,
       setAgentTabBarFocused,
-      setAgentApprovalMode
+      setAgentApprovalMode,
+      setAgentMessageQueue,
+      appendToAgentMessageQueue
     }),
     [
       switchToAgent,
@@ -28389,7 +28433,9 @@ function AgentViewProvider({
       setAgentShellFocused,
       setAgentInputBufferText,
       setAgentTabBarFocused,
-      setAgentApprovalMode
+      setAgentApprovalMode,
+      setAgentMessageQueue,
+      appendToAgentMessageQueue
     ]
   );
   useArenaInProcess(config ?? null, actions);
@@ -30074,10 +30120,10 @@ var InputPrompt = /* @__PURE__ */ __name(({
     [bgEntries, liveAgentPanelMaxRows]
   );
   const hasActiveToolConfirmation = (0, import_react99.useMemo)(
-    () => Boolean(uiState.confirmationRequest) || (uiState.pendingGeminiHistoryItems ?? []).some(
+    () => Boolean(uiState.confirmationRequest) || (uiState.pendingLlmHistoryItems ?? []).some(
       (item) => item.type === "tool_group" && item.tools.some((tool) => tool.confirmationDetails)
     ),
-    [uiState.confirmationRequest, uiState.pendingGeminiHistoryItems]
+    [uiState.confirmationRequest, uiState.pendingLlmHistoryItems]
   );
   const [historyRestoredText, setHistoryRestoredText] = (0, import_react99.useState)(
     null
@@ -32350,11 +32396,11 @@ var Footer = /* @__PURE__ */ __name(({ containerRef }) => {
   const contextWindowSize = config.getContentGeneratorConfig()?.contextWindowSize;
   const suppressHint = statusLineLines.length > 0;
   const leftBottomContent = uiState.ctrlCPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.warning, children: t("Press Ctrl+C again to exit.") }) : uiState.ctrlDPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.warning, children: t("Press Ctrl+D again to exit.") }) : uiState.showEscapePrompt ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("Press Esc again to clear.") }) : pasteProgress.active ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(PasteProgressBar, { progress: pasteProgress }) : uiState.rewindEscPending ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("Press Esc again to rewind conversation.") }) : vimEnabled && vimMode === "INSERT" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: "-- INSERT --" }) : vimEnabled && vimMode === "NORMAL" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: "-- NORMAL --" }) : uiState.shellModeActive ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(ShellModeIndicator, {}) : configInitMessage ? /* @__PURE__ */ (0, import_jsx_runtime116.jsxs)(Text, { color: theme.text.secondary, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(GeminiSpinner, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Spinner, {}),
     " ",
     configInitMessage
   ] }) : uiState.startupIdeConnectionStatus.state === "connecting" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsxs)(Text, { color: theme.text.secondary, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(GeminiSpinner, {}),
+    /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Spinner, {}),
     " ",
     t("IDE connecting... context may be unavailable")
   ] }) : uiState.startupIdeConnectionStatus.state === "failed" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.warning, children: t("IDE connection unavailable: {{message}}", {
@@ -32478,7 +32524,8 @@ var import_jsx_runtime117 = __toESM(require_jsx_runtime(), 1);
 var MAX_DISPLAYED_QUEUED_MESSAGES = 3;
 var NUM_TIMES_QUEUE_HINT_SHOWN = 3;
 var QueuedMessageDisplay = /* @__PURE__ */ __name(({
-  messageQueue
+  messageQueue,
+  showHint: hintEnabled = true
 }) => {
   const hintSeenCountRef = (0, import_react107.useRef)(0);
   const wasEmptyRef = (0, import_react107.useRef)(true);
@@ -32490,7 +32537,7 @@ var QueuedMessageDisplay = /* @__PURE__ */ __name(({
     hintSeenCountRef.current++;
     wasEmptyRef.current = false;
   }
-  const showHint = hintSeenCountRef.current <= NUM_TIMES_QUEUE_HINT_SHOWN;
+  const shouldShowHint = hintSeenCountRef.current <= NUM_TIMES_QUEUE_HINT_SHOWN;
   return /* @__PURE__ */ (0, import_jsx_runtime117.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
     messageQueue.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES).map((message, index) => {
       const preview = message.replace(/\s+/g, " ");
@@ -32501,7 +32548,7 @@ var QueuedMessageDisplay = /* @__PURE__ */ __name(({
       messageQueue.length - MAX_DISPLAYED_QUEUED_MESSAGES,
       " more)"
     ] }) }),
-    showHint && /* @__PURE__ */ (0, import_jsx_runtime117.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime117.jsx)(Text, { dimColor: true, italic: true, children: t("Ctrl+Q to queue \xB7 \u2191 to edit queued messages") }) })
+    hintEnabled && shouldShowHint && /* @__PURE__ */ (0, import_jsx_runtime117.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime117.jsx)(Text, { dimColor: true, italic: true, children: t("Ctrl+Q to queue \xB7 \u2191 to edit queued messages") }) })
   ] });
 }, "QueuedMessageDisplay");
 
@@ -33435,7 +33482,7 @@ var AgentChatContent = /* @__PURE__ */ __name(({
       },
       item.id
     )),
-    isRunning && /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Box_default, { marginX: 2, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(GeminiRespondingSpinner, {}) })
+    isRunning && /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Box_default, { marginX: 2, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(RespondingSpinner, {}) })
   ] });
 }, "AgentChatContent");
 var AgentChatMissing = /* @__PURE__ */ __name(({ label }) => /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Box_default, { marginX: 2, children: /* @__PURE__ */ (0, import_jsx_runtime125.jsx)(Text, { color: theme.status.error, children: label }) }), "AgentChatMissing");
@@ -33693,12 +33740,21 @@ var AgentFooter = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/agent-view/AgentComposer.tsx
 var import_jsx_runtime128 = __toESM(require_jsx_runtime(), 1);
+var EMPTY_MESSAGE_QUEUE = [];
 var AgentComposer = /* @__PURE__ */ __name(({ agentId }) => {
-  const { agents, agentTabBarFocused, agentShellFocused, agentApprovalModes } = useAgentViewState();
+  const {
+    agents,
+    agentTabBarFocused,
+    agentShellFocused,
+    agentApprovalModes,
+    agentMessageQueues
+  } = useAgentViewState();
   const {
     setAgentInputBufferText,
     setAgentTabBarFocused,
-    setAgentApprovalMode
+    setAgentApprovalMode,
+    setAgentMessageQueue,
+    appendToAgentMessageQueue
   } = useAgentViewActions();
   const agent = agents.get(agentId);
   const interactiveAgent = agent?.interactiveAgent;
@@ -33772,14 +33828,24 @@ var AgentComposer = /* @__PURE__ */ __name(({ agentId }) => {
     },
     [buffer, agentTabBarFocused, setAgentTabBarFocused]
   );
-  const [messageQueue, setMessageQueue] = (0, import_react114.useState)([]);
+  const messageQueue = agentMessageQueues.get(agentId) ?? EMPTY_MESSAGE_QUEUE;
+  const flushedQueueRef = (0, import_react114.useRef)(null);
   (0, import_react114.useEffect)(() => {
     if (streamingState === "idle" /* Idle */ && messageQueue.length > 0 && status !== void 0 && !isTerminalStatus(status)) {
+      if (flushedQueueRef.current === messageQueue) return;
+      flushedQueueRef.current = messageQueue;
       const combined = messageQueue.join("\n");
-      setMessageQueue([]);
+      setAgentMessageQueue(agentId, []);
       interactiveAgent?.enqueueMessage(combined);
     }
-  }, [streamingState, messageQueue, interactiveAgent, status]);
+  }, [
+    streamingState,
+    messageQueue,
+    interactiveAgent,
+    status,
+    agentId,
+    setAgentMessageQueue
+  ]);
   const handleSubmit = (0, import_react114.useCallback)(
     (text) => {
       const trimmed = text.trim();
@@ -33787,10 +33853,10 @@ var AgentComposer = /* @__PURE__ */ __name(({ agentId }) => {
       if (streamingState === "idle" /* Idle */) {
         interactiveAgent.enqueueMessage(trimmed);
       } else {
-        setMessageQueue((prev) => [...prev, trimmed]);
+        appendToAgentMessageQueue(agentId, trimmed);
       }
     },
-    [interactiveAgent, streamingState]
+    [interactiveAgent, streamingState, agentId, appendToAgentMessageQueue]
   );
   const statusLabel = (0, import_react114.useMemo)(() => {
     switch (status) {
@@ -33826,7 +33892,7 @@ var AgentComposer = /* @__PURE__ */ __name(({ agentId }) => {
       }
     ),
     statusLabel && /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(Text, { color: statusLabel.color, children: statusLabel.text }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(QueuedMessageDisplay, { messageQueue }),
+    /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(QueuedMessageDisplay, { messageQueue, showHint: false }),
     /* @__PURE__ */ (0, import_jsx_runtime128.jsx)(
       BaseTextInput,
       {
@@ -35098,7 +35164,7 @@ function useBranchCommand(options) {
       let swapOpened = false;
       let prevSessionData;
       try {
-        const telemetrySwapOpened = config.getGeminiClient()?.beginTelemetrySwap?.() ?? true;
+        const telemetrySwapOpened = config.getLlmClient()?.beginTelemetrySwap?.() ?? true;
         if (!telemetrySwapOpened) {
           throw new Error(
             "A session switch is already in progress. Try again in a moment."
@@ -35141,7 +35207,7 @@ function useBranchCommand(options) {
         config.startNewSession(newSessionId, resumed);
         coreSwapped = true;
         await waitForGoalRuntime(config);
-        await config.getGeminiClient()?.initialize?.("branch" /* Branch */);
+        await config.getLlmClient()?.initialize?.("branch" /* Branch */);
         const rawItems = buildResumedHistoryItems(resumed, config);
         const collapseOnResume = options.settings.merged.ui?.history?.collapseOnResume ?? false;
         const collapsePreviewCount = options.settings.merged.ui?.history?.collapsePreviewCount ?? 0;
@@ -35152,7 +35218,7 @@ function useBranchCommand(options) {
         );
         startNewSession(newSessionId);
         uiSwapped = true;
-        config.getGeminiClient()?.commitTelemetrySwap?.();
+        config.getLlmClient()?.commitTelemetrySwap?.();
         clearPendingState?.();
         historyManager.clearItems();
         historyManager.loadHistory(uiHistoryItems);
@@ -35183,15 +35249,15 @@ function useBranchCommand(options) {
         if (coreSwapped && !uiSwapped) {
           try {
             config.startNewSession(oldSessionId, prevSessionData);
-            await config.getGeminiClient()?.initialize?.();
+            await config.getLlmClient()?.initialize?.();
           } catch (rollbackErr) {
             config.getDebugLogger().warn(
               `Rollback after failed /branch init failed: ${rollbackErr}`
             );
           }
-          config.getGeminiClient()?.abortTelemetrySwap?.();
+          config.getLlmClient()?.abortTelemetrySwap?.();
         } else if (swapOpened) {
-          config.getGeminiClient()?.commitTelemetrySwap?.();
+          config.getLlmClient()?.commitTelemetrySwap?.();
         }
         if (forkCreated && !uiSwapped) {
           try {
@@ -35275,7 +35341,7 @@ function useResumeCommand(options) {
       }
       closeResumeDialog();
       let swapOpened = false;
-      const telemetrySwapOpened = config.getGeminiClient()?.beginTelemetrySwap?.() ?? true;
+      const telemetrySwapOpened = config.getLlmClient()?.beginTelemetrySwap?.() ?? true;
       if (!telemetrySwapOpened) {
         addItem(
           {
@@ -35296,7 +35362,7 @@ function useResumeCommand(options) {
         const sessionService = new SessionService(cwd3);
         const sessionData = await sessionService.loadSession(sessionId);
         if (!sessionData) {
-          config.getGeminiClient()?.commitTelemetrySwap?.();
+          config.getLlmClient()?.commitTelemetrySwap?.();
           return;
         }
         const customTitle = sessionService.getSessionTitle(sessionId);
@@ -35326,14 +35392,14 @@ function useResumeCommand(options) {
         coreSwapped = true;
         await waitForGoalRuntime(config);
         config.getChatRecordingService()?.rebuildTurnBoundaries(sessionData.conversation.messages);
-        await config.getGeminiClient()?.initialize?.();
+        await config.getLlmClient()?.initialize?.();
         const recovered = await config.loadPausedBackgroundAgents(sessionId);
         if (recovered.length > 0) {
           recoveredBackgroundAgentsNotice = config.getBackgroundAgentResumeService().buildRecoveredBackgroundAgentsNotice(recovered.length);
         }
         startNewSession(sessionId);
         uiSwapped = true;
-        config.getGeminiClient()?.commitTelemetrySwap?.();
+        config.getLlmClient()?.commitTelemetrySwap?.();
         setSessionName?.(customTitle ?? null);
         clearPendingState?.();
         clearItems();
@@ -35360,7 +35426,7 @@ function useResumeCommand(options) {
             } catch {
             }
             config.startNewSession(oldSessionId, prevSessionData);
-            await config.getGeminiClient()?.initialize?.();
+            await config.getLlmClient()?.initialize?.();
             await config.loadPausedBackgroundAgents(oldSessionId).catch(() => {
             });
           } catch (rollbackErr) {
@@ -35368,9 +35434,9 @@ function useResumeCommand(options) {
               `Rollback after failed /resume init failed: ${rollbackErr}`
             );
           }
-          config.getGeminiClient()?.abortTelemetrySwap?.();
+          config.getLlmClient()?.abortTelemetrySwap?.();
         } else if (swapOpened) {
-          config.getGeminiClient()?.commitTelemetrySwap?.();
+          config.getLlmClient()?.commitTelemetrySwap?.();
         }
         addItem(
           {
@@ -35670,7 +35736,7 @@ function getSkillCommandName(command) {
   return command.skillDetail?.name ?? command.name;
 }
 __name(getSkillCommandName, "getSkillCommandName");
-var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history, addItem, clearItems, loadHistory, refreshStatic, toggleVimEnabled, isProcessing, setIsProcessing, isIdleRef, setGeminiMdFileCount, actions, extensionsUpdateState, isConfigInitialized, logger, updateItem, setSessionName, extensionRefreshState) => {
+var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history, addItem, clearItems, loadHistory, refreshStatic, toggleVimEnabled, isProcessing, setIsProcessing, isIdleRef, setMemoryFileCount, actions, extensionsUpdateState, isConfigInitialized, logger, updateItem, setSessionName, extensionRefreshState) => {
   const fallbackExtensionRefreshStateRef = (0, import_react130.useRef)(
     null
   );
@@ -35939,7 +36005,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
         btwAbortControllerRef,
         isIdleRef,
         toggleVimEnabled,
-        setGeminiMdFileCount,
+        setMemoryFileCount,
         reloadCommands,
         setSessionName: setSessionName ?? (() => {
         }),
@@ -35972,7 +36038,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       cancelBtw,
       toggleVimEnabled,
       sessionShellAllowlist,
-      setGeminiMdFileCount,
+      setMemoryFileCount,
       reloadCommands,
       setSessionName,
       extensionsUpdateState,
@@ -36579,7 +36645,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
                     }
                   }
                 case "load_history": {
-                  config?.getGeminiClient()?.setHistory(result.clientHistory);
+                  config?.getLlmClient()?.setHistory(result.clientHistory);
                   fullCommandContext.ui.clear();
                   result.history.forEach((item, index) => {
                     fullCommandContext.ui.addItem(item, index);
@@ -36937,7 +37003,7 @@ var useLogger = /* @__PURE__ */ __name((storage, sessionId) => {
   return logger;
 }, "useLogger");
 
-// packages/cli/src/ui/hooks/useGeminiStream.ts
+// packages/cli/src/ui/hooks/use-llm-stream.ts
 init_esbuild_shims();
 var import_react137 = __toESM(require_react(), 1);
 
@@ -36955,9 +37021,9 @@ function copyString(value) {
   return value.split("").join("");
 }
 __name(copyString, "copyString");
-function addShellCommandToGeminiHistory(geminiClient, rawQuery, resultText) {
+function addShellCommandToLlmHistory(llmClient, rawQuery, resultText) {
   const modelContent = resultText.length > MAX_OUTPUT_LENGTH ? copyString(resultText.substring(0, MAX_OUTPUT_LENGTH)) + "\n... (truncated)" : resultText;
-  geminiClient.addHistory({
+  llmClient.addHistory({
     role: "user",
     parts: [
       {
@@ -36974,8 +37040,8 @@ ${modelContent}
     ]
   });
 }
-__name(addShellCommandToGeminiHistory, "addShellCommandToGeminiHistory");
-var useShellCommandProcessor = /* @__PURE__ */ __name((addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight) => {
+__name(addShellCommandToLlmHistory, "addShellCommandToLlmHistory");
+var useShellCommandProcessor = /* @__PURE__ */ __name((addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, llmClient, setShellInputFocused, terminalWidth, terminalHeight) => {
   const [activeShellPtyId, setActiveShellPtyId] = (0, import_react133.useState)(null);
   const handleShellCommand = (0, import_react133.useCallback)(
     (rawQuery, abortSignal) => {
@@ -37166,11 +37232,7 @@ ${finalOutput}`;
               },
               userMessageTimestamp
             );
-            addShellCommandToGeminiHistory(
-              geminiClient,
-              rawQuery,
-              finalOutput
-            );
+            addShellCommandToLlmHistory(llmClient, rawQuery, finalOutput);
           }).catch((err) => {
             setPendingHistoryItem(null);
             const errorMessage = err instanceof Error ? err.message : String(err);
@@ -37220,7 +37282,7 @@ ${finalOutput}`;
       addItemToHistory,
       setPendingHistoryItem,
       onExec,
-      geminiClient,
+      llmClient,
       setShellInputFocused,
       terminalHeight,
       terminalWidth
@@ -37289,17 +37351,17 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
           const existingTrackedCall = prevTrackedCalls.find(
             (ptc) => ptc.request.callId === coreTc.request.callId
           );
-          const responseSubmittedToGemini = existingTrackedCall?.responseSubmittedToGemini ?? false;
+          const responseSubmittedToLlm = existingTrackedCall?.responseSubmittedToLlm ?? false;
           if (coreTc.status === "executing") {
             return {
               ...coreTc,
-              responseSubmittedToGemini,
+              responseSubmittedToLlm,
               liveOutput: existingTrackedCall?.liveOutput
             };
           }
           return {
             ...coreTc,
-            responseSubmittedToGemini,
+            responseSubmittedToLlm,
             liveOutput: void 0,
             pid: void 0,
             promoteAbortController: void 0
@@ -37388,7 +37450,7 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     (callIdsToMark) => {
       setToolCallsForDisplay(
         (prevCalls) => prevCalls.map(
-          (tc) => callIdsToMark.includes(tc.request.callId) ? { ...tc, responseSubmittedToGemini: true } : tc
+          (tc) => callIdsToMark.includes(tc.request.callId) ? { ...tc, responseSubmittedToLlm: true } : tc
         )
       );
     },
@@ -37555,7 +37617,7 @@ function mapToDisplay(toolOrTools, projectRoot) {
 }
 __name(mapToDisplay, "mapToDisplay");
 
-// packages/cli/src/ui/hooks/useGeminiStream.ts
+// packages/cli/src/ui/hooks/use-llm-stream.ts
 import { promises as fs17 } from "node:fs";
 import path12 from "node:path";
 import process16 from "node:process";
@@ -37633,6 +37695,7 @@ function useMessageQueue() {
         permit: { ...input.permit },
         turnKey: `goal-runtime:${input.permit.turnId}`,
         continuationContext: input.continuationContext,
+        ...input.objectiveUpdated ? { objectiveUpdated: input.objectiveUpdated } : {},
         ...input.windDown ? { windDown: true } : {},
         ...input.verifierFeedback ? { verifierFeedback: input.verifierFeedback } : {}
       };
@@ -37822,7 +37885,7 @@ function useMessageQueue() {
 }
 __name(useMessageQueue, "useMessageQueue");
 
-// packages/cli/src/ui/hooks/useGeminiStream.ts
+// packages/cli/src/ui/hooks/use-llm-stream.ts
 var debugLogger39 = createDebugLogger("GEMINI_STREAM");
 function applyModelOverride(modelOverrideRef, inlineActiveRef, value, isInline) {
   modelOverrideRef.current = value;
@@ -37977,7 +38040,7 @@ function charIndexAfterLine(text, keptLines) {
   return -1;
 }
 __name(charIndexAfterLine, "charIndexAfterLine");
-var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, config, isConfigInitialized, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onEditorClose, onCancelSubmit, setShellInputFocused, terminalWidth, terminalHeight, midTurnDrainRef, logger, availableTerminalHeightRef, terminalWidthRef, midTurnRestoreRef, goalQueueRef) => {
+var useLlmStream = /* @__PURE__ */ __name((llmClient, history, addItem, config, isConfigInitialized, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onEditorClose, onCancelSubmit, setShellInputFocused, terminalWidth, terminalHeight, midTurnDrainRef, logger, availableTerminalHeightRef, terminalWidthRef, midTurnRestoreRef, goalQueueRef) => {
   const [initError, setInitError] = (0, import_react137.useState)(null);
   const abortControllerRef = (0, import_react137.useRef)(null);
   const activeInteractionPromptIdRef = (0, import_react137.useRef)(void 0);
@@ -38384,7 +38447,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     onExec,
     onDebugMessage,
     config,
-    geminiClient,
+    llmClient,
     setShellInputFocused,
     terminalWidth,
     terminalHeight
@@ -38407,7 +38470,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       return "waiting_for_confirmation" /* WaitingForConfirmation */;
     }
     if (isResponding || toolCalls.some(
-      (tc) => tc.status === "executing" || tc.status === "scheduled" || tc.status === "validating" || (tc.status === "success" || tc.status === "error" || tc.status === "cancelled") && !tc.responseSubmittedToGemini
+      (tc) => tc.status === "executing" || tc.status === "scheduled" || tc.status === "validating" || (tc.status === "success" || tc.status === "error" || tc.status === "cancelled") && !tc.responseSubmittedToLlm
     )) {
       return "responding" /* Responding */;
     }
@@ -38585,7 +38648,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, config]
   );
-  const prepareQueryForGemini = (0, import_react137.useCallback)(
+  const prepareQueryForLlm = (0, import_react137.useCallback)(
     async (query, userMessageTimestamp, abortSignal, prompt_id, submitType, submittedPrompt, preserveTurnOwnership) => {
       if (turnCancelledRef.current && !preserveTurnOwnership) {
         return { queryToSend: null, shouldProceed: false };
@@ -38596,7 +38659,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       if (!preserveTurnOwnership) {
         lastTurnUserItemRef.current = null;
       }
-      let localQueryToSendToGemini = null;
+      let localQueryToSendToLlm = null;
       if (typeof query === "string") {
         const trimmedQuery = query.trim();
         if (submitType === "notification" /* Notification */) {
@@ -38635,7 +38698,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               };
             }
             case "submit_prompt": {
-              localQueryToSendToGemini = slashCommandResult.content;
+              localQueryToSendToLlm = slashCommandResult.content;
               submitPromptOnCompleteRef.current = slashCommandResult.onComplete ?? null;
               refreshContextFilesOnWriteRef.current = Boolean(
                 slashCommandResult.refreshContextFilesOnWrite
@@ -38658,16 +38721,16 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 }
               }
               const bridgeResult2 = await applyVisionBridgeIfNeeded(
-                localQueryToSendToGemini,
+                localQueryToSendToLlm,
                 userMessageTimestamp,
                 abortSignal
               );
               if (!bridgeResult2.shouldProceed) {
                 return { queryToSend: null, shouldProceed: false };
               }
-              localQueryToSendToGemini = bridgeResult2.parts;
+              localQueryToSendToLlm = bridgeResult2.parts;
               return {
-                queryToSend: localQueryToSendToGemini,
+                queryToSend: localQueryToSendToLlm,
                 shouldProceed: true
               };
             }
@@ -38685,7 +38748,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         if (shellModeActive && handleShellCommand(trimmedQuery, abortSignal)) {
           return { queryToSend: null, shouldProceed: false };
         }
-        localQueryToSendToGemini = trimmedQuery;
+        localQueryToSendToLlm = trimmedQuery;
         if (submitType !== "cron" /* Cron */) {
           const insertedId = addItem(
             {
@@ -38716,27 +38779,27 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           if (!atCommandResult.shouldProceed) {
             return { queryToSend: null, shouldProceed: false };
           }
-          localQueryToSendToGemini = atCommandResult.processedQuery;
+          localQueryToSendToLlm = atCommandResult.processedQuery;
         }
         const bridgeResult = await applyVisionBridgeIfNeeded(
-          localQueryToSendToGemini,
+          localQueryToSendToLlm,
           userMessageTimestamp,
           abortSignal
         );
         if (!bridgeResult.shouldProceed) {
           return { queryToSend: null, shouldProceed: false };
         }
-        localQueryToSendToGemini = bridgeResult.parts;
+        localQueryToSendToLlm = bridgeResult.parts;
       } else {
-        localQueryToSendToGemini = query;
+        localQueryToSendToLlm = query;
       }
-      if (localQueryToSendToGemini === null) {
+      if (localQueryToSendToLlm === null) {
         onDebugMessage(
-          "Query processing resulted in null, not sending to Gemini."
+          "Query processing resulted in null, not sending to the model."
         );
         return { queryToSend: null, shouldProceed: false };
       }
-      return { queryToSend: localQueryToSendToGemini, shouldProceed: true };
+      return { queryToSend: localQueryToSendToLlm, shouldProceed: true };
     },
     [
       config,
@@ -38752,24 +38815,24 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ]
   );
   const handleContentEvent = (0, import_react137.useCallback)(
-    (eventValue, currentGeminiMessageBuffer, userMessageTimestamp, startAsContinuation = false) => {
+    (eventValue, currentLlmMessageBuffer, userMessageTimestamp, startAsContinuation = false) => {
       if (turnCancelledRef.current) {
         return "";
       }
       streamingResponseLengthRef.current += eventValue.length;
       setIsReceivingContent(true);
       turnSawContentEventRef.current = true;
-      let newGeminiMessageBuffer = currentGeminiMessageBuffer + eventValue;
+      let newLlmMessageBuffer = currentLlmMessageBuffer + eventValue;
       const pendingItem = pendingHistoryItemRef.current;
       if ((pendingItem?.type === "gemini" || pendingItem?.type === "gemini_content") && (pendingItem.images?.length || pendingItem.omittedImageCount)) {
-        if (newGeminiMessageBuffer.trim().length === 0) {
-          return newGeminiMessageBuffer;
+        if (newLlmMessageBuffer.trim().length === 0) {
+          return newLlmMessageBuffer;
         }
         stagePendingAssistantItem();
       }
       if (pendingHistoryItemRef.current?.type !== "gemini" && pendingHistoryItemRef.current?.type !== "gemini_content") {
-        if (newGeminiMessageBuffer.trim().length === 0) {
-          return newGeminiMessageBuffer;
+        if (newLlmMessageBuffer.trim().length === 0) {
+          return newLlmMessageBuffer;
         }
         if (pendingHistoryItemRef.current) {
           commitItemInOrder(
@@ -38780,17 +38843,17 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         setPendingHistoryItem(
           startAsContinuation ? { type: "gemini_content", text: "" } : { type: "gemini", text: "", timestamp: Date.now() }
         );
-        newGeminiMessageBuffer = stripLeadingBlankLines(newGeminiMessageBuffer);
+        newLlmMessageBuffer = stripLeadingBlankLines(newLlmMessageBuffer);
       }
       let nextPendingType = pendingHistoryItemRef.current?.type === "gemini_content" ? "gemini_content" : pendingHistoryItemRef.current?.type === "gemini" ? "gemini" : startAsContinuation ? "gemini_content" : "gemini";
-      while (newGeminiMessageBuffer.length > STREAM_PENDING_ITEM_MAX_CHARS) {
+      while (newLlmMessageBuffer.length > STREAM_PENDING_ITEM_MAX_CHARS) {
         const splitPoint = findLastSafeSplitPoint(
-          newGeminiMessageBuffer,
+          newLlmMessageBuffer,
           STREAM_PENDING_ITEM_MAX_CHARS
         );
-        const safeSplitPoint = splitPoint > 0 && splitPoint < newGeminiMessageBuffer.length ? splitPoint : STREAM_PENDING_ITEM_MAX_CHARS;
+        const safeSplitPoint = splitPoint > 0 && splitPoint < newLlmMessageBuffer.length ? splitPoint : STREAM_PENDING_ITEM_MAX_CHARS;
         const { before: beforeText, after: afterText } = splitFencedMarkdown(
-          newGeminiMessageBuffer,
+          newLlmMessageBuffer,
           safeSplitPoint
         );
         commitItemInOrder(
@@ -38801,7 +38864,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           userMessageTimestamp
         );
         nextPendingType = "gemini_content";
-        newGeminiMessageBuffer = afterText;
+        newLlmMessageBuffer = afterText;
       }
       const viewportRows = (availableTerminalHeightRef?.current ?? 0) > 0 ? availableTerminalHeightRef.current : Math.max(4, terminalHeight - STREAM_PENDING_COMPOSER_RESERVE_ROWS);
       const commitWidth = (terminalWidthRef?.current ?? 0) > 0 ? terminalWidthRef.current : terminalWidth;
@@ -38811,7 +38874,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       );
       const tableClampRows = Math.max(2, viewportRows - 3);
       while (true) {
-        const bufferLines = newGeminiMessageBuffer.split("\n");
+        const bufferLines = newLlmMessageBuffer.split("\n");
         const { keptLines, clipped } = fitPendingSlice(
           bufferLines,
           commitWidth,
@@ -38828,28 +38891,22 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         }
         let target;
         if (boundaryLine < 0) {
-          const capIndex = charIndexAfterLine(
-            newGeminiMessageBuffer,
-            keptLines
-          );
-          const fenceInfo = capIndex > 0 ? getEnclosingFenceInfo(newGeminiMessageBuffer, capIndex) : null;
+          const capIndex = charIndexAfterLine(newLlmMessageBuffer, keptLines);
+          const fenceInfo = capIndex > 0 ? getEnclosingFenceInfo(newLlmMessageBuffer, capIndex) : null;
           if (!fenceInfo || fenceInfo.lang?.toLowerCase() === "mermaid") {
             break;
           }
           target = capIndex;
         } else {
-          target = charIndexAfterLine(newGeminiMessageBuffer, boundaryLine + 1);
+          target = charIndexAfterLine(newLlmMessageBuffer, boundaryLine + 1);
           if (target <= 0) break;
         }
-        const splitPoint = findLastSafeSplitPoint(
-          newGeminiMessageBuffer,
-          target
-        );
-        if (splitPoint <= 0 || splitPoint >= newGeminiMessageBuffer.length) {
+        const splitPoint = findLastSafeSplitPoint(newLlmMessageBuffer, target);
+        if (splitPoint <= 0 || splitPoint >= newLlmMessageBuffer.length) {
           break;
         }
         const { before: beforeText, after: afterText } = splitFencedMarkdown(
-          newGeminiMessageBuffer,
+          newLlmMessageBuffer,
           splitPoint
         );
         commitItemInOrder(
@@ -38860,19 +38917,19 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           userMessageTimestamp
         );
         nextPendingType = "gemini_content";
-        newGeminiMessageBuffer = afterText;
+        newLlmMessageBuffer = afterText;
       }
       setPendingHistoryItem((item) => {
         const base = {
           type: nextPendingType,
-          text: newGeminiMessageBuffer
+          text: newLlmMessageBuffer
         };
         if (item && "timestamp" in item) {
           base.timestamp = item.timestamp;
         }
         return base;
       });
-      return newGeminiMessageBuffer;
+      return newLlmMessageBuffer;
     },
     [
       commitItemInOrder,
@@ -39198,7 +39255,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     (result) => {
       setLoopDetectionConfirmationRequest(null);
       if (result.userSelection === "disable") {
-        config.getGeminiClient().getLoopDetectionService().disableForSession();
+        config.getLlmClient().getLoopDetectionService().disableForSession();
         addItem(
           {
             type: "info",
@@ -39258,9 +39315,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, commitItemInOrder, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const processGeminiStreamEvents = (0, import_react137.useCallback)(
+  const processLlmStreamEvents = (0, import_react137.useCallback)(
     async (stream, userMessageTimestamp, signal, submitType, turnAdmission, promptId, trackInteractionOwner = true, toolContinuationOwner) => {
-      let geminiMessageBuffer = "";
+      let llmMessageBuffer = "";
       let thoughtBuffer = "";
       let scheduledToolContinuation = false;
       let assistantOutputStarted = pendingHistoryItemRef.current?.type === "gemini" || pendingHistoryItemRef.current?.type === "gemini_content";
@@ -39301,9 +39358,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               }
               contentParts.push(queuedContent.value);
             }
-            geminiMessageBuffer = handleContentEvent(
+            llmMessageBuffer = handleContentEvent(
               contentParts.join(""),
-              geminiMessageBuffer,
+              llmMessageBuffer,
               userMessageTimestamp,
               assistantOutputStarted
             );
@@ -39326,7 +39383,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 ...pendingItem,
                 omittedImageCount: (pendingItem.omittedImageCount ?? 0) + 1
               });
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               assistantOutputStarted = true;
               continue;
             }
@@ -39339,7 +39396,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 setPendingHistoryItem(null);
               }
             }
-            geminiMessageBuffer = "";
+            llmMessageBuffer = "";
             if (shouldDisplayImage) {
               setPendingHistoryItem({
                 type: assistantOutputStarted ? "gemini_content" : "gemini",
@@ -39473,7 +39530,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             case "chat_compressed" /* ChatCompressed */:
               flushBufferedStreamEvents();
               handleChatCompressionEvent(event.value, userMessageTimestamp);
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               assistantOutputStarted = false;
               break;
             case "tool_call_confirmation" /* ToolCallConfirmation */:
@@ -39490,7 +39547,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 setPendingHistoryItem(null);
               }
               handleMaxSessionTurnsEvent();
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               assistantOutputStarted = false;
               break;
             case "session_token_limit_exceeded" /* SessionTokenLimitExceeded */:
@@ -39503,7 +39560,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 setPendingHistoryItem(null);
               }
               handleSessionTokenLimitExceededEvent(event.value);
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               assistantOutputStarted = false;
               break;
             case "finished" /* Finished */:
@@ -39516,7 +39573,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 );
                 setPendingHistoryItem(null);
               }
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               thoughtBuffer = "";
               assistantOutputStarted = false;
               assistantInlineImageCount = 0;
@@ -39530,7 +39587,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               flushBufferedStreamEvents();
               handleCitationEvent(event.value, userMessageTimestamp);
               if (showCitations(settings)) {
-                geminiMessageBuffer = "";
+                llmMessageBuffer = "";
                 assistantOutputStarted = false;
               }
               break;
@@ -39548,7 +39605,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 commitPendingThought(userMessageTimestamp);
                 thoughtBuffer = "";
                 setThought(null);
-                geminiMessageBuffer = "";
+                llmMessageBuffer = "";
                 assistantOutputStarted = false;
                 assistantInlineImageCount = 0;
               } else {
@@ -39570,7 +39627,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               commitPendingThought(userMessageTimestamp);
               thoughtBuffer = "";
               setThought(null);
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               assistantOutputStarted = false;
               assistantInlineImageCount = 0;
               toolCallRequests.length = 0;
@@ -39602,7 +39659,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 },
                 userMessageTimestamp
               );
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               assistantOutputStarted = false;
               break;
             case "user_prompt_submit_blocked" /* UserPromptSubmitBlocked */:
@@ -39611,13 +39668,13 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 event.value,
                 userMessageTimestamp
               );
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               assistantOutputStarted = false;
               break;
             case "stop_hook_loop" /* StopHookLoop */:
               flushBufferedStreamEvents();
               handleStopHookLoopEvent(event.value, userMessageTimestamp);
-              geminiMessageBuffer = "";
+              llmMessageBuffer = "";
               assistantOutputStarted = false;
               break;
             case "active_goal" /* ActiveGoal */:
@@ -39640,7 +39697,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                   },
                   userMessageTimestamp
                 );
-                geminiMessageBuffer = "";
+                llmMessageBuffer = "";
                 assistantOutputStarted = false;
               }
               break;
@@ -39662,7 +39719,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         const duplicateResponses = [];
         let duplicatePromptId;
         const handledToolCallFingerprints = new Map(
-          geminiClient ? geminiClient.getHistoryToolCallFingerprints() : []
+          llmClient ? llmClient.getHistoryToolCallFingerprints() : []
         );
         for (const [
           providerCallId,
@@ -39689,7 +39746,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         );
         if (repeatedDuplicateRequest?.providerCallId) {
           debugLogger39.debug(
-            `[processGeminiStreamEvents] Dropping batch after repeated duplicate provider tool-call id: ${repeatedDuplicateRequest.providerCallId} (tool: ${repeatedDuplicateRequest.name})`
+            `[processLlmStreamEvents] Dropping batch after repeated duplicate provider tool-call id: ${repeatedDuplicateRequest.providerCallId} (tool: ${repeatedDuplicateRequest.name})`
           );
           loopDetectedRef.current = true;
           return {
@@ -39710,7 +39767,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             );
             const response = createDuplicateProviderToolCallResponse(request);
             debugLogger39.debug(
-              `[processGeminiStreamEvents] Suppressing duplicate provider tool-call id: ${providerCallId} (tool: ${request.name})`
+              `[processLlmStreamEvents] Suppressing duplicate provider tool-call id: ${providerCallId} (tool: ${request.name})`
             );
             dualOutput?.emitToolResult(request, response);
             duplicateResponses.push({ request, response });
@@ -39789,7 +39846,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       handleErrorEvent,
       registerToolBatch,
       scheduleToolCalls,
-      geminiClient,
+      llmClient,
       handleChatCompressionEvent,
       handleFinishedEvent,
       handleMaxSessionTurnsEvent,
@@ -40146,11 +40203,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               goalId: queuedGoal.permit.goalId,
               revision: queuedGoal.permit.revision,
               objective: queuedGoal.continuationContext,
+              objectiveUpdated: queuedGoal.objectiveUpdated,
               windDown: queuedGoal.windDown,
               verifierFeedback: queuedGoal.verifierFeedback
             }),
             shouldProceed: true
-          } : { queryToSend: null, shouldProceed: false } : submitType === "retry" /* Retry */ ? { queryToSend: query, shouldProceed: true } : await prepareQueryForGemini(
+          } : { queryToSend: null, shouldProceed: false } : submitType === "retry" /* Retry */ ? { queryToSend: query, shouldProceed: true } : await prepareQueryForLlm(
             query,
             userMessageTimestamp,
             abortSignal,
@@ -40304,8 +40362,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             ...submittedPrompt !== void 0 ? { submittedPrompt } : {},
             ...!allowConcurrentBtwDuringResponse && !isDetachedToolContinuation && midTurnDrainRef ? { getSteerInput: drainSteerAtBoundary } : {}
           };
+          if (submitType === "goal" /* Goal */ && goalBinding) {
+            try {
+              config.getGoalRuntime().markTurnDelivered(goalBinding.turnKey);
+            } catch {
+            }
+          }
           const providerSignal = inheritedToolContinuationOwner ? processingSignal : abortSignal;
-          const stream = geminiClient.sendMessageStream(
+          const stream = llmClient.sendMessageStream(
             finalQueryToSend,
             providerSignal,
             prompt_id,
@@ -40325,7 +40389,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               } : {}
             }
           );
-          const processingResult = await processGeminiStreamEvents(
+          const processingResult = await processLlmStreamEvents(
             stream,
             userMessageTimestamp,
             processingSignal,
@@ -40381,7 +40445,6 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             );
             immediateDuplicateToolResponses.responses.forEach(
               ({ request, response }, index) => {
-                const goalContext = request.goalContext;
                 config.getChatRecordingService?.()?.recordToolResult?.(
                   finalized[index].responseParts,
                   {
@@ -40394,10 +40457,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                     errorType: response.errorType,
                     executionStatus: response.executionStatus
                   },
-                  goalContext ? request.name === ToolNames.GET_GOAL || request.name === ToolNames.UPDATE_GOAL ? {
-                    goalContext: { ...goalContext },
-                    provenance: "goal_runtime"
-                  } : { goalContext: { ...goalContext } } : void 0
+                  goalToolResultProvenance(request)
                 );
               }
             );
@@ -40434,8 +40494,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               debugLogger39.error("onComplete callback failed:", err);
             });
           }
-          if (geminiClient) {
-            const memoryTaskPromises = geminiClient.consumePendingMemoryTaskPromises();
+          if (llmClient) {
+            const memoryTaskPromises = llmClient.consumePendingMemoryTaskPromises();
             for (const p of memoryTaskPromises) {
               void p.then((count) => {
                 if (count > 0) {
@@ -40534,8 +40594,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [
       streamingState,
       setModelSwitchedFromQuotaError,
-      prepareQueryForGemini,
-      processGeminiStreamEvents,
+      prepareQueryForLlm,
+      processLlmStreamEvents,
       pendingHistoryItemRef,
       addItem,
       commitPendingAssistantItems,
@@ -40543,7 +40603,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       setPendingAssistantItems,
       setPendingHistoryItem,
       setInitError,
-      geminiClient,
+      llmClient,
       onAuthError,
       config,
       startNewPrompt,
@@ -40641,7 +40701,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           return false;
         }
       );
-      const historyCallIdsWithResponse = geminiClient ? geminiClient.getHistoryFunctionResponseIds() : /* @__PURE__ */ new Set();
+      const historyCallIdsWithResponse = llmClient ? llmClient.getHistoryFunctionResponseIds() : /* @__PURE__ */ new Set();
       const dedupedTools = completedAndReadyToSubmitTools.filter(
         (tc) => historyCallIdsWithResponse.has(tc.request.callId)
       );
@@ -40653,7 +40713,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         for (const tc of dedupedTools) {
           if (tc.request.isClientInitiated) continue;
           if (tc.status === "cancelled") continue;
-          geminiClient?.recordCompletedToolCall(
+          llmClient?.recordCompletedToolCall(
             tc.request.name,
             tc.request.args
           );
@@ -40721,7 +40781,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       const newSuccessfulMemorySaves = completedAndReadyToSubmitTools.filter(
         (t2) => t2.request.name === "save_memory" && t2.status === "success" && !processedMemoryToolsRef.current.has(t2.request.callId)
       );
-      let geminiTools = completedAndReadyToSubmitTools.filter(
+      let llmTools = completedAndReadyToSubmitTools.filter(
         (t2) => !t2.request.isClientInitiated && !historyCallIdsWithResponse.has(t2.request.callId)
       );
       const terminalPromptId = completedAndReadyToSubmitTools.find(
@@ -40734,14 +40794,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         return owner && ownerPromptId && getActiveInteractionSpan(ownerPromptId) === owner ? owner : void 0;
       }, "liveOwnerForToolCall");
       const liveActiveInteractionOwner = activeInteractionPromptIdRef.current && activeInteractionOwnerRef.current && getActiveInteractionSpan(activeInteractionPromptIdRef.current) === activeInteractionOwnerRef.current ? activeInteractionOwnerRef.current : void 0;
-      const ownerToolCall = (liveActiveInteractionOwner ? geminiTools.find(
+      const ownerToolCall = (liveActiveInteractionOwner ? llmTools.find(
         (toolCall) => liveOwnerForToolCall(toolCall) === liveActiveInteractionOwner
-      ) : void 0) ?? geminiTools.find((toolCall) => liveOwnerForToolCall(toolCall)) ?? geminiTools[0] ?? completedAndReadyToSubmitTools.find(
+      ) : void 0) ?? llmTools.find((toolCall) => liveOwnerForToolCall(toolCall)) ?? llmTools[0] ?? completedAndReadyToSubmitTools.find(
         (toolCall) => !toolCall.request.isClientInitiated
       );
       const interactionOwner = ownerToolCall ? liveOwnerForToolCall(ownerToolCall) : void 0;
       const secondaryInteractionOwners = /* @__PURE__ */ new Map();
-      const secondaryTools = interactionOwner ? geminiTools.filter(
+      const secondaryTools = interactionOwner ? llmTools.filter(
         (toolCall) => ownerForToolCall(toolCall) !== interactionOwner
       ) : [];
       for (const toolCall of secondaryTools) {
@@ -40753,7 +40813,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           );
         }
         if (toolCall.status !== "cancelled") {
-          geminiClient?.recordCompletedToolCall(
+          llmClient?.recordCompletedToolCall(
             toolCall.request.name,
             toolCall.request.args
           );
@@ -40765,7 +40825,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           secondaryTools.map((toolCall) => toolCall.request.callId)
         );
         markToolsAsSubmitted([...secondaryCallIds2]);
-        geminiTools = geminiTools.filter(
+        llmTools = llmTools.filter(
           (toolCall) => !secondaryCallIds2.has(toolCall.request.callId)
         );
       }
@@ -40805,13 +40865,13 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         }
       }, "endToolInteraction");
       let toolGoalPermit;
-      const toolGoalContexts = geminiTools.map(
+      const toolGoalContexts = llmTools.map(
         (toolCall) => toolCall.request.goalContext
       );
       try {
         toolGoalPermit = sharedGoalPermit(toolGoalContexts);
       } catch (error) {
-        const callIds = geminiTools.map((toolCall) => toolCall.request.callId);
+        const callIds = llmTools.map((toolCall) => toolCall.request.callId);
         markToolsAsSubmitted(callIds);
         const reason = getErrorMessage(error);
         const bindings = /* @__PURE__ */ new Map();
@@ -40860,7 +40920,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         }
         if (active && activeGoalPermitValid) {
           markToolsAsSubmitted(
-            geminiTools.map((toolCall) => toolCall.request.callId)
+            llmTools.map((toolCall) => toolCall.request.callId)
           );
           const reason = "ToolResult batch is missing the active Goal context";
           await failClosedGoalTurn(active, reason);
@@ -40884,7 +40944,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         const existing = goalTurnBindingsRef.current.get(toolGoalPermit.turnId);
         if (existing && !sameGoalPermit(existing.permit, toolGoalPermit)) {
           markToolsAsSubmitted(
-            geminiTools.map((toolCall) => toolCall.request.callId)
+            llmTools.map((toolCall) => toolCall.request.callId)
           );
           const reason = "ToolResult batch has a stale Goal context";
           await failClosedGoalTurn(existing, reason);
@@ -40948,7 +41008,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         );
       }
       const completedCallIds = new Set(
-        geminiTools.map((toolCall) => toolCall.request.callId)
+        llmTools.map((toolCall) => toolCall.request.callId)
       );
       const secondaryCallIds = new Set(
         secondaryTools.map((toolCall) => toolCall.request.callId)
@@ -40973,13 +41033,13 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       if (!promptId && pendingDuplicatePromptId) {
         promptId = pendingDuplicatePromptId;
       }
-      for (const toolCall of geminiTools) {
-        geminiClient?.recordCompletedToolCall(
+      for (const toolCall of llmTools) {
+        llmClient?.recordCompletedToolCall(
           toolCall.request.name,
           toolCall.request.args
         );
       }
-      if (geminiTools.length === 0 && pendingDuplicateResponses.length === 0) {
+      if (llmTools.length === 0 && pendingDuplicateResponses.length === 0) {
         if (!promptId && terminalPromptId) {
           promptId = terminalPromptId;
         }
@@ -41007,7 +41067,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         return;
       }
       const executableQueues = /* @__PURE__ */ new Map();
-      for (const toolCall of geminiTools) {
+      for (const toolCall of llmTools) {
         const queue = executableQueues.get(toolCall.request.callId) ?? [];
         queue.push({
           request: toolCall.request,
@@ -41062,7 +41122,6 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         (entry) => entry.responseParts
       );
       orderedResponses.forEach(({ request, response, status }, index) => {
-        const goalContext = request.goalContext;
         config.getChatRecordingService?.()?.recordToolResult?.(
           finalizedResponses[index].responseParts,
           {
@@ -41075,15 +41134,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             errorType: response.errorType,
             executionStatus: response.executionStatus
           },
-          goalContext ? request.name === ToolNames.GET_GOAL || request.name === ToolNames.UPDATE_GOAL ? {
-            goalContext: { ...goalContext },
-            provenance: "goal_runtime"
-          } : { goalContext: { ...goalContext } } : void 0
+          goalToolResultProvenance(request)
         );
       });
       if (continuationWasCancelled()) {
         markToolsAsSubmitted(
-          geminiTools.map((toolCall) => toolCall.request.callId)
+          llmTools.map((toolCall) => toolCall.request.callId)
         );
         if (toolGoalBinding) {
           await failClosedGoalTurn(
@@ -41094,18 +41150,18 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         endToolInteraction("cancelled");
         return;
       }
-      const allToolsCancelled = geminiTools.every(
+      const allToolsCancelled = llmTools.every(
         (tc) => tc.status === "cancelled"
       );
       if (allToolsCancelled && pendingDuplicateResponses.length === 0) {
-        if (geminiClient) {
-          geminiClient.addHistory({
+        if (llmClient) {
+          llmClient.addHistory({
             role: "user",
             parts: responsesToSend
           });
           config.getArenaAgentClient()?.reportCancelled();
         }
-        const callIdsToMarkAsSubmitted2 = geminiTools.map(
+        const callIdsToMarkAsSubmitted2 = llmTools.map(
           (toolCall) => toolCall.request.callId
         );
         markToolsAsSubmitted(callIdsToMarkAsSubmitted2);
@@ -41118,10 +41174,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         endToolInteraction("cancelled");
         return;
       }
-      const callIdsToMarkAsSubmitted = geminiTools.map(
+      const callIdsToMarkAsSubmitted = llmTools.map(
         (toolCall) => toolCall.request.callId
       );
-      for (const toolCall of geminiTools) {
+      for (const toolCall of llmTools) {
         if ("modelOverride" in toolCall.response) {
           if (inlineModelOverrideActiveRef.current || modelOverrideRef.current?.endsWith("\0")) {
             debugLogger39.debug(
@@ -41140,16 +41196,16 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         }
       }
       if (dualOutput) {
-        for (const toolCall of geminiTools) {
+        for (const toolCall of llmTools) {
           dualOutput.emitToolResult(toolCall.request, toolCall.response);
         }
       }
       markToolsAsSubmitted(callIdsToMarkAsSubmitted);
-      const terminatesGoalTurn = geminiTools.some(
+      const terminatesGoalTurn = llmTools.some(
         (toolCall) => toolCall.response.terminateTurn === true
       );
       if (terminatesGoalTurn && toolGoalBinding) {
-        geminiClient.addHistory({ role: "user", parts: responsesToSend });
+        llmClient.addHistory({ role: "user", parts: responsesToSend });
         let goalFinishFailed = false;
         try {
           await config.getChatRecordingService()?.flush();
@@ -41192,7 +41248,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         return;
       }
       if (config.getEmitToolUseSummaries()) {
-        const successfulTools = geminiTools.filter(
+        const successfulTools = llmTools.filter(
           (tc) => tc.status === "success" && tc.request.name !== ToolNames.GET_GOAL && tc.request.name !== ToolNames.UPDATE_GOAL
         );
         if (successfulTools.length > 0) {
@@ -41250,12 +41306,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         return;
       }
       const backgroundTaskRegistry = config.getBackgroundTaskRegistry();
-      const backgroundLaunchExhaustedCapacity = backgroundTaskRegistry.getMaxConcurrentBackgroundAgents() === 1 && !backgroundTaskRegistry.canStartBackgroundAgent() && geminiTools.some((toolCall) => {
+      const backgroundLaunchExhaustedCapacity = backgroundTaskRegistry.getMaxConcurrentBackgroundAgents() === 1 && !backgroundTaskRegistry.canStartBackgroundAgent() && llmTools.some((toolCall) => {
         const display = toolCall.response.resultDisplay;
         return toolCall.request.name === ToolNames.AGENT && typeof display === "object" && display !== null && "type" in display && "status" in display && display.type === "task_execution" && display.status === "background";
       });
       if (backgroundLaunchExhaustedCapacity) {
-        geminiClient?.addHistory({ role: "user", parts: responsesToSend });
+        llmClient?.addHistory({ role: "user", parts: responsesToSend });
         if (toolGoalBinding) {
           await failClosedGoalTurn(
             toolGoalBinding,
@@ -41340,7 +41396,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [
       submitQuery,
       markToolsAsSubmitted,
-      geminiClient,
+      llmClient,
       performMemoryRefresh,
       modelSwitchedFromQuotaError,
       config,
@@ -41412,7 +41468,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             const toolName = toolCall.request.name;
             const fileName = path12.basename(filePath);
             const toolCallWithSnapshotFileName = `${timestamp}-${fileName}-${toolName}.json`;
-            const clientHistory = geminiClient?.getHistoryShallow();
+            const clientHistory = llmClient?.getHistoryShallow();
             const toolCallWithSnapshotFilePath = path12.join(
               checkpointDir,
               toolCallWithSnapshotFileName
@@ -41445,7 +41501,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
     }, "saveRestorableToolCalls");
     saveRestorableToolCalls();
-  }, [toolCalls, config, onDebugMessage, history, geminiClient, storage]);
+  }, [toolCalls, config, onDebugMessage, history, llmClient, storage]);
   const notificationQueueRef = (0, import_react137.useRef)([]);
   const [notificationTrigger, setNotificationTrigger] = (0, import_react137.useState)(0);
   const goalQueuePendingCount = goalQueueRef?.current?.getPendingSubmissionCount?.() ?? 0;
@@ -41783,7 +41839,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     streamingResponseLengthRef,
     isReceivingContent
   };
-}, "useGeminiStream");
+}, "useLlmStream");
 
 // packages/cli/src/ui/hooks/vim.ts
 init_esbuild_shims();
@@ -45023,6 +45079,7 @@ var import_jsx_runtime132 = __toESM(require_jsx_runtime(), 1);
 var MCP_BATCH_FLUSH_MS = 16;
 var STARTUP_PROFILE_FINALIZE_CAP_MS = 35e3;
 var CTRL_EXIT_PROMPT_DURATION_MS = 1e3;
+var GOAL_RUNTIME_STARTUP_TIMEOUT_MS = 5e3;
 var debugLogger42 = createDebugLogger("APP_CONTAINER");
 function isRenderModeToggleKey(key) {
   return keyMatchers["toggleRenderMode" /* TOGGLE_RENDER_MODE */](key) || key.name === "m" && key.meta && !key.ctrl && !key.paste;
@@ -45259,9 +45316,9 @@ function getSpeculativeToolResult(response) {
   };
 }
 __name(getSpeculativeToolResult, "getSpeculativeToolResult");
-function getResponseCandidateTokens(pendingGeminiHistoryItems) {
+function getResponseCandidateTokens(pendingLlmHistoryItems) {
   let tokens = 0;
-  for (const item of pendingGeminiHistoryItems) {
+  for (const item of pendingLlmHistoryItems) {
     if (item.type !== "tool_group") {
       continue;
     }
@@ -45329,8 +45386,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   );
   const [isProcessing, setIsProcessing] = (0, import_react163.useState)(false);
   const [embeddedShellFocused, setEmbeddedShellFocused] = (0, import_react163.useState)(false);
-  const [geminiMdFileCount, setGeminiMdFileCount] = (0, import_react163.useState)(
-    initializationResult.geminiMdFileCount
+  const [memoryFileCount, setMemoryFileCount] = (0, import_react163.useState)(
+    initializationResult.memoryFileCount
   );
   const [shellModeActive, setShellModeActive] = (0, import_react163.useState)(false);
   const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = (0, import_react163.useState)(false);
@@ -45489,9 +45546,22 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     (async () => {
       profileCheckpoint("config_initialize_start");
       await config.initialize();
-      await waitForGoalRuntime(config);
+      const goalRuntimeReady = await waitForGoalRuntime(config, {
+        timeoutMs: GOAL_RUNTIME_STARTUP_TIMEOUT_MS
+      });
+      if (!goalRuntimeReady) {
+        debugLogger42.warn(
+          `Goal runtime did not settle within ${GOAL_RUNTIME_STARTUP_TIMEOUT_MS}ms (session writer lease contention?); continuing with goal features degraded.`
+        );
+      }
       setStartupWarnings(
-        (currentWarnings) => mergeStartupWarnings(currentWarnings, config.getWarnings())
+        (currentWarnings) => mergeStartupWarnings(
+          currentWarnings,
+          goalRuntimeReady ? config.getWarnings() : [
+            ...config.getWarnings(),
+            `Goal features are degraded: the goal runtime did not settle within ${GOAL_RUNTIME_STARTUP_TIMEOUT_MS}ms at startup.`
+          ]
+        )
       );
       profileCheckpoint("config_initialize_end");
       setConfigInitialized(true);
@@ -45574,8 +45644,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   }, [config]);
   (0, import_react163.useEffect)(() => {
     if (!isConfigInitialized) return void 0;
-    const geminiClient2 = config.getGeminiClient();
-    if (!geminiClient2) return void 0;
+    const llmClient2 = config.getLlmClient();
+    if (!llmClient2) return void 0;
     const manager = config.getToolRegistry().getMcpClientManager();
     let flushTimer = null;
     let finalized = false;
@@ -45589,7 +45659,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         clearTimeout(flushTimer);
         flushTimer = null;
       }
-      return geminiClient2.setTools().catch((err) => {
+      return llmClient2.setTools().catch((err) => {
         debugLogger42.error(
           `setTools() batch-flush failed: ${err instanceof Error ? err.message : String(err)}`
         );
@@ -46073,7 +46143,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
           debugLogger42.debug("Failed to cancel request while quitting:", error);
         }
         setQuittingMessages(messages);
-        config.getGeminiClient()?.requestShutdown();
+        config.getLlmClient()?.requestShutdown();
         setTimeout(async () => {
           await runExitCleanup();
           process18.exit(0);
@@ -46154,7 +46224,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     isProcessing,
     setIsProcessing,
     isIdleRef,
-    setGeminiMdFileCount,
+    setMemoryFileCount,
     slashCommandActions,
     extensionsUpdateStateInternal,
     isConfigInitialized,
@@ -46237,12 +46307,12 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const performMemoryRefresh = (0, import_react163.useCallback)(async () => {
     if (config.isSafeMode()) {
       config.setUserMemory("");
-      config.setGeminiMdFileCount(0);
+      config.setMemoryFileCount(0);
       config.setContextFilePaths([]);
       config.setConditionalRulesRegistry(
         new ConditionalRulesRegistry([], config.getWorkingDir())
       );
-      setGeminiMdFileCount(0);
+      setMemoryFileCount(0);
       historyManager.addItem(
         {
           type: "info" /* INFO */,
@@ -46266,7 +46336,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         contextFilePaths,
         conditionalRules,
         projectRoot
-      } = await loadHierarchicalGeminiMemory(
+      } = await loadHierarchicalMemory(
         config.getWorkingDir(),
         settings.merged.context?.loadFromIncludeDirectories ? config.getWorkspaceContext().getDirectories() : [],
         config.getFileService(),
@@ -46283,12 +46353,12 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         }
       );
       config.setUserMemory(memoryContent);
-      config.setGeminiMdFileCount(fileCount);
+      config.setMemoryFileCount(fileCount);
       config.setContextFilePaths(contextFilePaths);
       config.setConditionalRulesRegistry(
         new ConditionalRulesRegistry(conditionalRules, projectRoot)
       );
-      setGeminiMdFileCount(fileCount);
+      setMemoryFileCount(fileCount);
       historyManager.addItem(
         {
           type: "info" /* INFO */,
@@ -46335,7 +46405,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     streamingState,
     submitQuery,
     initError,
-    pendingHistoryItems: pendingGeminiHistoryItems,
+    pendingHistoryItems: pendingLlmHistoryItems,
     clearPendingState,
     thought,
     cancelOngoingRequest,
@@ -46347,8 +46417,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     pendingToolCalls,
     streamingResponseLengthRef,
     isReceivingContent
-  } = useGeminiStream(
-    config.getGeminiClient(),
+  } = useLlmStream(
+    config.getLlmClient(),
     historyManager.history,
     historyManager.addItem,
     config,
@@ -46429,7 +46499,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       speculationRef.current = IDLE_SPECULATION;
     }
   }, []);
-  const geminiClient = config.getGeminiClient();
+  const llmClient = config.getLlmClient();
   const showAutoAcceptIndicator = useAutoAcceptIndicator({
     config,
     settings,
@@ -46747,7 +46817,7 @@ ${buildWorkflowSteeringNotice()}
       }
       const spec = speculationRef.current;
       if (spec.status !== "idle" && spec.suggestion === submittedValue && spec.status === "completed") {
-        acceptSpeculation(spec, geminiClient).then((result) => {
+        acceptSpeculation(spec, llmClient).then((result) => {
           logSpeculation(
             config,
             new SpeculationEvent({
@@ -46850,7 +46920,7 @@ ${buildWorkflowSteeringNotice()}
       handleSlashCommand,
       slashCommands,
       config,
-      geminiClient,
+      llmClient,
       historyManager,
       settings.merged.ui?.disableWorkflowKeywordTrigger,
       setBufferText,
@@ -46874,8 +46944,8 @@ ${buildWorkflowSteeringNotice()}
     handleWelcomeBackClose
   } = useWelcomeBack(config, handleFinalSubmit, buffer, settings.merged);
   const pendingHistoryItems = (0, import_react163.useMemo)(
-    () => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems],
-    [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]
+    () => [...pendingSlashCommandHistoryItems, ...pendingLlmHistoryItems],
+    [pendingSlashCommandHistoryItems, pendingLlmHistoryItems]
   );
   const rawStickyTodos = (0, import_react163.useMemo)(
     () => getStickyTodos(historyManager.history, pendingHistoryItems),
@@ -46889,7 +46959,7 @@ ${buildWorkflowSteeringNotice()}
     (info) => {
       const pendingHistoryItems2 = [
         ...pendingSlashCommandHistoryItems,
-        ...pendingGeminiHistoryItems
+        ...pendingLlmHistoryItems
       ];
       if (info?.pendingItem) {
         pendingHistoryItems2.push(info.pendingItem);
@@ -46910,7 +46980,7 @@ ${currentText}` : popped.modelText
         );
       }
       if (info?.wasGoalTurn) {
-        geminiClient?.stripOrphanedUserEntriesFromHistory?.();
+        llmClient?.stripOrphanedUserEntriesFromHistory?.();
       }
       if (!draftWasEmpty) {
         debugLogger42.debug("auto-restore bail: buffer was non-empty");
@@ -46988,7 +47058,7 @@ ${currentText}` : popped.modelText
       historyManager.truncateToItem(lastUserItem.id);
       refreshStatic();
       restoreCancelledPrompt();
-      geminiClient?.stripOrphanedUserEntriesFromHistory?.();
+      llmClient?.stripOrphanedUserEntriesFromHistory?.();
       if (info?.canUndoLastLoggedUserMessage) {
         void logger?.removeLastUserMessage().catch((err) => {
           debugLogger42.debug("Failed to undo cancelled prompt from log:", err);
@@ -47002,10 +47072,10 @@ ${currentText}` : popped.modelText
       removeGoalTurns,
       historyManager,
       logger,
-      geminiClient,
+      llmClient,
       refreshStatic,
       pendingSlashCommandHistoryItems,
-      pendingGeminiHistoryItems
+      pendingLlmHistoryItems
     ]
   );
   const handleClearScreen = (0, import_react163.useCallback)(() => {
@@ -47035,12 +47105,12 @@ ${currentText}` : popped.modelText
   });
   const contextFileNames = (0, import_react163.useMemo)(() => {
     const fromSettings = settings.merged.context?.fileName;
-    return fromSettings ? Array.isArray(fromSettings) ? fromSettings : [fromSettings] : getAllGeminiMdFilenames();
+    return fromSettings ? Array.isArray(fromSettings) ? fromSettings : [fromSettings] : getAllMemoryFilenames();
   }, [settings.merged.context?.fileName]);
   const initialPrompt = (0, import_react163.useMemo)(() => config.getQuestion(), [config]);
   const initialPromptSubmitted = (0, import_react163.useRef)(false);
   (0, import_react163.useEffect)(() => {
-    if (initialPrompt && isConfigInitialized && !initialPromptSubmitted.current && !isAuthenticating && !isAuthDialogOpen && !isThemeDialogOpen && !isEditorDialogOpen && !showWelcomeBackDialog && welcomeBackChoice !== "restart" && geminiClient?.isInitialized?.()) {
+    if (initialPrompt && isConfigInitialized && !initialPromptSubmitted.current && !isAuthenticating && !isAuthDialogOpen && !isThemeDialogOpen && !isEditorDialogOpen && !showWelcomeBackDialog && welcomeBackChoice !== "restart" && llmClient?.isInitialized?.()) {
       handleFinalSubmit(initialPrompt);
       initialPromptSubmitted.current = true;
     }
@@ -47054,7 +47124,7 @@ ${currentText}` : popped.modelText
     isEditorDialogOpen,
     showWelcomeBackDialog,
     welcomeBackChoice,
-    geminiClient
+    llmClient
   ]);
   const followupSuggestionsEnabled = settings.merged.ui?.enableFollowupSuggestions !== false;
   (0, import_react163.useEffect)(() => {
@@ -47077,11 +47147,11 @@ ${currentText}` : popped.modelText
       }
     }
     if (followupSuggestionsEnabled && config.isInteractive() && !config.getSdkMode() && prevStreamingStateRef.current === "responding" /* Responding */ && streamingState === "idle" /* Idle */ && // Check both committed history and pending items for errors
-    // (API errors go to pendingGeminiHistoryItems, not historyManager.history)
-    historyManager.history[historyManager.history.length - 1]?.type !== "error" && !pendingGeminiHistoryItems.some((item) => item.type === "error") && !shellConfirmationRequest && !confirmationRequest && !loopDetectionConfirmationRequest && !isPermissionsDialogOpen && settingInputRequests.length === 0 && config.getApprovalMode() !== "plan" /* PLAN */) {
+    // (API errors go to pendingLlmHistoryItems, not historyManager.history)
+    historyManager.history[historyManager.history.length - 1]?.type !== "error" && !pendingLlmHistoryItems.some((item) => item.type === "error") && !shellConfirmationRequest && !confirmationRequest && !loopDetectionConfirmationRequest && !isPermissionsDialogOpen && settingInputRequests.length === 0 && config.getApprovalMode() !== "plan" /* PLAN */) {
       const ac = new AbortController();
       suggestionAbortRef.current = ac;
-      const conversationHistory = geminiClient.getHistoryTail(40, true);
+      const conversationHistory = llmClient.getHistoryTail(40, true);
       generatePromptSuggestion(config, conversationHistory, ac.signal, {
         // On by default: the schema declares `default: true`, but
         // `mergeSettings` doesn't apply schema defaults, so an unset value is
@@ -47339,11 +47409,11 @@ ${currentText}` : popped.modelText
     async (userItem, option) => {
       try {
         const needsConversation = option === "conversation" || option === "both";
-        const geminiClient2 = needsConversation ? config.getGeminiClient() : null;
+        const llmClient2 = needsConversation ? config.getLlmClient() : null;
         let apiTruncateIndex = -1;
         let conversationSkippedNoClient = false;
         if (needsConversation) {
-          if (!geminiClient2) {
+          if (!llmClient2) {
             if (option === "conversation") {
               historyManager.addItem(
                 {
@@ -47361,7 +47431,7 @@ ${currentText}` : popped.modelText
             apiTruncateIndex = computeApiTruncationIndex(
               historyManager.history,
               userItem.id,
-              geminiClient2.getHistoryShallow()
+              llmClient2.getHistoryShallow()
             );
             if (apiTruncateIndex < 0) {
               historyManager.addItem(
@@ -47387,7 +47457,7 @@ ${currentText}` : popped.modelText
           const promptId = userItem.promptId;
           if (promptId) {
             try {
-              const truncateHistory = option === "both" && !!geminiClient2 && apiTruncateIndex >= 0;
+              const truncateHistory = option === "both" && !!llmClient2 && apiTruncateIndex >= 0;
               const result = await config.getFileHistoryService().rewind(promptId, truncateHistory);
               if (result.filesChanged.length > 0) {
                 fileRestoreMessage = t("Restored {{count}} file(s).", {
@@ -47419,7 +47489,7 @@ ${currentText}` : popped.modelText
             );
           }
         }
-        if (needsConversation && geminiClient2 && apiTruncateIndex >= 0 && !(option === "both" && hasRestoreFailure)) {
+        if (needsConversation && llmClient2 && apiTruncateIndex >= 0 && !(option === "both" && hasRestoreFailure)) {
           const originalHistory = historyManager.history;
           const hasSummary = originalHistory.some(
             (h) => h.display?.kind === "collapse-summary"
@@ -47430,7 +47500,7 @@ ${currentText}` : popped.modelText
             if (h.id === userItem.id) break;
             if (isRealUserTurn(h)) targetTurnIndex++;
           }
-          geminiClient2.truncateHistory(apiTruncateIndex);
+          llmClient2.truncateHistory(apiTruncateIndex);
           const truncatedUi = recoalesceFindingsHistoryItems(
             expandCollapsedHistory(
               originalHistory.filter((h) => h.id < userItem.id)
@@ -47592,7 +47662,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     [historyManager, setShowCommandMigrationNudge, config.storage]
   );
   const responseCandidateTokens = getResponseCandidateTokens(
-    pendingGeminiHistoryItems
+    pendingLlmHistoryItems
   );
   const {
     elapsedTime,
@@ -47990,10 +48060,10 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       settingInputRequests,
       pluginChoiceRequests,
       loopDetectionConfirmationRequest,
-      geminiMdFileCount,
+      memoryFileCount,
       streamingState,
       initError,
-      pendingGeminiHistoryItems,
+      pendingLlmHistoryItems,
       thought,
       shellModeActive,
       userMessages,
@@ -48136,10 +48206,10 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       settingInputRequests,
       pluginChoiceRequests,
       loopDetectionConfirmationRequest,
-      geminiMdFileCount,
+      memoryFileCount,
       streamingState,
       initError,
-      pendingGeminiHistoryItems,
+      pendingLlmHistoryItems,
       thought,
       shellModeActive,
       userMessages,