@qwen-code/qwen-code 0.22.2 → 0.22.3-nightly.20260831.3a0c4c6108

package/chunks/{chunk-F5SZP77N.js → chunk-BBYTY46C.js}

@@ -8,40 +8,42 @@ import {
   staleArgsWarning,
   validateAuthMethod,
   writeSkillArgs
-} from "./chunk-BAJKAAOY.js";
-import {
-  isKittyProtocolEnabled
-} from "./chunk-NYX53SV4.js";
-import {
-  contextCommand
-} from "./chunk-AGR5UROZ.js";
+} from "./chunk-YOMKOM7E.js";
 import {
   calculateCost,
   computeSessionStats,
   diffCommand,
   filterCommandsForMode,
   findInlineMathExpressions,
+  formatCompressionTokenCount,
+  getCompressionFailureStatusText,
   getSystemInfoFields,
   levelLabel
-} from "./chunk-K2NQPH5D.js";
+} from "./chunk-3NQCZMUB.js";
+import {
+  isKittyProtocolEnabled
+} from "./chunk-NYX53SV4.js";
 import {
   VSCODE_SHIFT_ENTER_SEQUENCE,
   isWaylandSession,
   writeOsc52
-} from "./chunk-FDY5RMGH.js";
+} from "./chunk-JLSZT354.js";
+import {
+  contextCommand
+} from "./chunk-KUDI54QQ.js";
 import {
   formatDuration,
   formatTokenCount
 } from "./chunk-3SH53ANB.js";
 import {
   rollbackStandaloneUpdate
-} from "./chunk-QP4C6WCE.js";
+} from "./chunk-NGKLMNWN.js";
 import {
   themeManager
-} from "./chunk-QFCDF5PL.js";
+} from "./chunk-JHN7UIDW.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-L6YT5H34.js";
+} from "./chunk-MJBHSZEJ.js";
 import {
   GITHUB_WORKFLOW_PATHS,
   INSIGHT_CSS,
@@ -54,12 +56,12 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-3SGB2UHX.js";
+} from "./chunk-L2OKAIUK.js";
 import {
   stripUnsafeCharacters,
   toCodePoints,
   truncateToWidth
-} from "./chunk-E7REAOTN.js";
+} from "./chunk-47ECGEJC.js";
 import {
   isValidSessionId
 } from "./chunk-ZEZKIS2K.js";
@@ -70,16 +72,16 @@ import {
   isVoiceEnabled,
   readVoiceMode,
   readVoiceModel
-} from "./chunk-XRSOI3DL.js";
+} from "./chunk-BE5FGT5Z.js";
 import {
   getExtendedSystemInfo,
   getGitVersion,
   getNpmVersion
-} from "./chunk-RJC5EIKY.js";
+} from "./chunk-6YXNJXQW.js";
 import {
   isInlineModelOverrideAllowed,
   parseAcpModelOption
-} from "./chunk-Q26AYA62.js";
+} from "./chunk-W7KWB6AH.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
   getAllSettingKeys,
@@ -91,12 +93,12 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-F7TNAPZ4.js";
+} from "./chunk-AAX236AR.js";
 import {
   getCurrentLanguage,
   setLanguageAsync,
   t
-} from "./chunk-LDP5OD6N.js";
+} from "./chunk-EU2B4P3D.js";
 import {
   SUPPORTED_LANGUAGES,
   getSupportedLanguageIds,
@@ -104,11 +106,11 @@ import {
 } from "./chunk-5EJZE3FP.js";
 import {
   getInstallationInfo
-} from "./chunk-V2NDP3I4.js";
+} from "./chunk-7XL4WRXM.js";
 import {
   isFolderTrustEnabled,
   loadTrustedFolders
-} from "./chunk-V4QXXQJ2.js";
+} from "./chunk-I75VKFCJ.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -122,27 +124,29 @@ import {
   buildLearnSkillPrompt,
   buildLearnVideoSkillRequest,
   buildManagedRememberPrompt,
-  canonicalizeMsgId,
-  describeHoldCause,
   encodeInsightErrorMessage,
   encodeInsightProgressMessage,
   encodeInsightReadyMessage,
   findProviderByCredentials,
-  flattenPeerLabel,
   generateSessionRecap,
   getIdeInstaller,
   getMCPServerPrompts,
   isWsl,
   parseLearnVideoInput,
   readPathFromWorkspace
-} from "./chunk-KUX5D6DK.js";
+} from "./chunk-NT7LXVV5.js";
 import {
   listSavedWorkflows,
   listWorkflowSnapshots
-} from "./chunk-3DXFGHAJ.js";
+} from "./chunk-DBTMP3P4.js";
+import {
+  canonicalizeMsgId,
+  describeHoldCause,
+  flattenPeerLabel
+} from "./chunk-AYYKUUKP.js";
 import {
   resolveOpenAILogDir
-} from "./chunk-MIIVI25Q.js";
+} from "./chunk-JDIO45X7.js";
 import {
   ArenaManager,
   ConditionalRulesRegistry,
@@ -157,16 +161,12 @@ import {
   buildBackgroundEntryLabel,
   collectMemoryDiagnostics,
   flatMapTextParts,
-  formatMemoryUsage,
-  getArenaSystemReminder,
   getExtensionDescription,
   getExtensionDisplayName,
-  getInsightPrompt,
-  getPlanModeSystemReminder,
-  getProjectSummaryPrompt,
   hookEventSupportsMatcher,
   ideContextStore,
   isActiveWorkflowStatus,
+  isCompressionFailureStatus,
   isExtensionCommittedWithWarningsError,
   isImageGenerationCapable,
   isSignalTermination,
@@ -184,7 +184,7 @@ import {
   resolveSlimmingConfig,
   runForkedAgent,
   tryGenerateSessionTitle
-} from "./chunk-TGWAQ5RB.js";
+} from "./chunk-ZBDYI7VM.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
@@ -192,7 +192,13 @@ import {
   buildRuntimeSnapshotId,
   resolveModelId,
   stripRuntimeSnapshotPrefix
-} from "./chunk-JB4JIVTJ.js";
+} from "./chunk-OKTNXDVO.js";
+import {
+  getArenaSystemReminder,
+  getInsightPrompt,
+  getPlanModeSystemReminder,
+  getProjectSummaryPrompt
+} from "./chunk-YDQ4OCDK.js";
 import {
   getAutoSkillCuratorStatus,
   parse,
@@ -200,31 +206,37 @@ import {
   restoreArchivedAutoSkill,
   runAutoSkillCurator,
   setAutoSkillPinned
-} from "./chunk-EFUM7RVY.js";
+} from "./chunk-OSTQZIOY.js";
 import {
   HookEventName,
   sanitizeUserPromptExpansionAdditionalContext
-} from "./chunk-TTX2JUE6.js";
+} from "./chunk-U6D2PPMN.js";
 import {
   canUseRipgrep
-} from "./chunk-43GGFFLY.js";
+} from "./chunk-PDXYZBBQ.js";
 import {
   glob
-} from "./chunk-SMPR7SPO.js";
+} from "./chunk-QJNDUTOL.js";
 import {
   checkArgumentSafety,
   checkCommandPermissions,
   escapeShellArg,
   getShellConfiguration
-} from "./chunk-JWALNCLT.js";
+} from "./chunk-AF3QB6OL.js";
 import {
   GoalPersistenceUnavailableError,
-  emptyGoalSnapshot,
+  emptyGoalSnapshot
+} from "./chunk-4P7PPAHN.js";
+import {
   projectUserTranscriptForDisplay
-} from "./chunk-WKK5BQNP.js";
+} from "./chunk-7J6OTNGO.js";
+import {
+  escapeJsonTagCharacters,
+  formatMemoryUsage
+} from "./chunk-CHEIIBT3.js";
 import {
   APPROVAL_MODES
-} from "./chunk-V5J4J5TP.js";
+} from "./chunk-JX6XHPTX.js";
 import {
   openBrowserSecurely
 } from "./chunk-NAVJD2PQ.js";
@@ -245,37 +257,37 @@ import {
   read,
   recordSkillInvocation,
   uiTelemetryService
-} from "./chunk-L2M46FP5.js";
+} from "./chunk-FXUSWLBF.js";
 import {
-  getCurrentGeminiMdFilename
-} from "./chunk-3I6UTTDX.js";
+  getCurrentMemoryFilename
+} from "./chunk-67AY5D3M.js";
 import {
   getAutoMemoryRoot
-} from "./chunk-6PJOTWAN.js";
+} from "./chunk-HT5S5TRQ.js";
 import {
   runSideQuery
-} from "./chunk-BWORX6FA.js";
+} from "./chunk-LMMHS3RS.js";
 import {
   AuthType
-} from "./chunk-PPKZ7JOE.js";
+} from "./chunk-22UH7VTP.js";
 import {
   normalizeContent,
   redactUrlCredentials
-} from "./chunk-L6BZRIUL.js";
+} from "./chunk-TBJ3SNS3.js";
 import {
   FORK_SUBAGENT_TYPE,
   stripStartupContext
-} from "./chunk-CAJTKR6W.js";
+} from "./chunk-D7D3HSYQ.js";
 import {
   applySkillAllowedTools,
   buildSkillLlmContent
-} from "./chunk-ZU4UDIWX.js";
+} from "./chunk-YKADANK6.js";
 import {
   ToolDisplayNamesMigration,
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-UTLCH2FK.js";
+} from "./chunk-LYSZVCCD.js";
 import {
   Storage,
   createDebugLogger,
@@ -284,12 +296,12 @@ import {
   isSubpath,
   resolvePath,
   updateSymlink
-} from "./chunk-UHQFIS7N.js";
+} from "./chunk-EAHOJF6V.js";
 import {
   isCpuProfileRecording,
   startCpuProfile,
   stopCpuProfile
-} from "./chunk-W5MJJ2V7.js";
+} from "./chunk-FHPYRXRH.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -1197,7 +1209,7 @@ async function askAdvisor(context, focus, abortSignal) {
   const { config } = context.services;
   if (!config) throw new Error(t("Config not loaded."));
   const cacheSafeParams = buildBtwCacheSafeParams(config);
-  if (!cacheSafeParams || config.getGeminiClient().getHistoryForForkWindow().length === 0) {
+  if (!cacheSafeParams || config.getLlmClient().getHistoryForForkWindow().length === 0) {
     throw new Error(t("No conversation context available for /advisor"));
   }
   const advisorModel = context.services.settings.merged.advisorModel?.trim() || void 0;
@@ -1928,7 +1940,7 @@ __name(recordArenaItem, "recordArenaItem");
 function executeArenaCommand(config, ui, input) {
   let chatHistory;
   try {
-    const fullHistory = config.getGeminiClient().getChat().getHistoryShallow();
+    const fullHistory = config.getLlmClient().getChat().getHistoryShallow();
     chatHistory = stripStartupContext(fullHistory);
   } catch {
     debugLogger5.debug("Could not retrieve chat history for arena agents");
@@ -2438,7 +2450,7 @@ var approvalModeCommand = {
         };
       }
     }
-    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-UI4SNL2O.js") : void 0;
+    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-DLIQN256.js") : void 0;
     if (config) {
       try {
         config.setApprovalMode(mode);
@@ -3076,12 +3088,12 @@ var directoryCommand = {
                   config.getContextRuleExcludes()
                 );
                 config.setUserMemory(memoryContent);
-                config.setGeminiMdFileCount(fileCount);
+                config.setMemoryFileCount(fileCount);
                 config.setContextFilePaths(contextFilePaths);
                 config.setConditionalRulesRegistry(
                   new ConditionalRulesRegistry(conditionalRules, projectRoot)
                 );
-                context.ui.setGeminiMdFileCount(fileCount);
+                context.ui.setMemoryFileCount(fileCount);
                 messages.push(
                   t(
                     "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}",
@@ -3098,7 +3110,7 @@ var directoryCommand = {
             }
           }
           if (added.length > 0) {
-            const gemini = config.getGeminiClient();
+            const gemini = config.getLlmClient();
             if (gemini) {
               try {
                 await gemini.addDirectoryContext();
@@ -3334,7 +3346,7 @@ var cdCommand = {
       }
     }
     try {
-      await config.getGeminiClient()?.addWorkingDirectoryChangedContext(realOldDir, realTargetPath);
+      await config.getLlmClient()?.addWorkingDirectoryChangedContext(realOldDir, realTargetPath);
     } catch (error) {
       warnings.push(
         `Model context refresh failed: ${error instanceof Error ? error.message : String(error)}`
@@ -3421,6 +3433,16 @@ function describeBlockingBackgroundWork(config) {
       isWorkflowRun: true
     });
   }
+  for (const runId of config.getWorkflowRunRegistry().listStartingRunIds()) {
+    entries.push({
+      startTime: now,
+      id: runId,
+      label: runId,
+      status: "starting",
+      isWorkflowRun: true,
+      isStarting: true
+    });
+  }
   if (entries.length === 0) return void 0;
   entries.sort((a, b) => a.startTime - b.startTime);
   const listed = entries.slice(0, MAX_LISTED_BLOCKING_ENTRIES);
@@ -3429,6 +3451,7 @@ function describeBlockingBackgroundWork(config) {
       stripUnsafeCharacters(entry.label).replace(/[\r\n]+/g, " "),
       MAX_BLOCKING_LABEL_WIDTH
     );
+    if (entry.isStarting) return `  [${entry.id}] (starting)`;
     return `  [${entry.id}] ${label} (${entry.status} ${formatDuration(
       now - entry.startTime,
       { hideTrailingZeros: true }
@@ -3441,7 +3464,10 @@ function describeBlockingBackgroundWork(config) {
   return {
     lines,
     hasTaskEntries: entries.some((entry) => !entry.isWorkflowRun),
-    hasWorkflowRuns: entries.some((entry) => entry.isWorkflowRun)
+    hasInspectableWorkflowRuns: entries.some(
+      (entry) => entry.isWorkflowRun && !entry.isStarting
+    ),
+    hasStartingWorkflowRuns: entries.some((entry) => entry.isStarting)
   };
 }
 __name(describeBlockingBackgroundWork, "describeBlockingBackgroundWork");
@@ -3450,12 +3476,13 @@ function buildBackgroundWorkBlockedMessage(config, baseMessage) {
   if (!blocking) return baseMessage;
   const surfaces = [
     ...blocking.hasTaskEntries ? ["/tasks"] : [],
-    ...blocking.hasWorkflowRuns ? ["/workflows"] : []
+    ...blocking.hasInspectableWorkflowRuns ? ["/workflows"] : []
   ].join(" and ");
   return [
     baseMessage,
     ...blocking.lines,
-    `Use ${surfaces} to inspect them, then retry.`
+    ...surfaces ? [`Use ${surfaces} to inspect them, then retry.`] : [],
+    ...blocking.hasStartingWorkflowRuns ? ["Retry once the run has finished starting."] : []
   ].join("\n");
 }
 __name(buildBackgroundWorkBlockedMessage, "buildBackgroundWorkBlockedMessage");
@@ -3522,12 +3549,12 @@ var clearCommand = {
         context.session.startNewSession(newSessionId);
       }
       context.ui.clear();
-      const geminiClient = config.getGeminiClient();
-      if (geminiClient) {
+      const llmClient = config.getLlmClient();
+      if (llmClient) {
         context.ui.setDebugMessage(
           t("Starting a new session, resetting chat, and clearing terminal.")
         );
-        await geminiClient.resetChat();
+        await llmClient.resetChat();
       } else {
         context.ui.setDebugMessage(t("Starting a new session and clearing."));
       }
@@ -3900,7 +3927,6 @@ var deleteCommand = {
 // packages/cli/src/ui/commands/compressCommand.ts
 init_esbuild_shims();
 var MAX_COMPRESS_INSTRUCTIONS_CHARS = 2e3;
-var formatTokenCount2 = /* @__PURE__ */ __name((count, isEstimated) => isEstimated ? `~${count}` : String(count), "formatTokenCount");
 var compressCommand = {
   name: "compress",
   altNames: ["summarize"],
@@ -3933,8 +3959,8 @@ var compressCommand = {
       }
     };
     const config = context.services.config;
-    const geminiClient = config?.getGeminiClient();
-    if (!config || !geminiClient) {
+    const llmClient = config?.getLlmClient();
+    if (!config || !llmClient) {
       return {
         type: "message",
         messageType: "error",
@@ -3949,7 +3975,7 @@ var compressCommand = {
     }) : void 0;
     const doCompress = /* @__PURE__ */ __name(async () => {
       const promptId = `compress-${Date.now()}`;
-      return await geminiClient.tryCompressChat(
+      return await llmClient.tryCompressChat(
         promptId,
         true,
         abortSignal,
@@ -3970,16 +3996,19 @@ var compressCommand = {
             content: "Compressing context..."
           };
           const compressed = await doCompress();
-          if (!compressed) {
+          if (!compressed || isCompressionFailureStatus(compressed.compressionStatus)) {
             yield {
               messageType: "error",
-              content: t("Failed to compress chat history.")
+              content: compressed ? getCompressionFailureStatusText({
+                compressionStatus: compressed.compressionStatus,
+                originalTokenCount: compressed.originalTokenCount
+              }) : t("Failed to compress chat history.")
             };
             return;
           }
           yield {
             messageType: "info",
-            content: `Context compressed (${formatTokenCount2(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount2(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).` + (compressed.warning ? `
+            content: `Context compressed (${formatCompressionTokenCount(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatCompressionTokenCount(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).` + (compressed.warning ? `
 \u26A0\uFE0F ${compressed.warning}` : "")
           };
         } catch (e) {
@@ -4007,7 +4036,7 @@ var compressCommand = {
       if (abortSignal?.aborted) {
         return;
       }
-      if (!compressed) {
+      if (!compressed || executionMode !== "interactive" && isCompressionFailureStatus(compressed.compressionStatus)) {
         if (executionMode === "interactive") {
           ui.addItem(
             {
@@ -4021,7 +4050,10 @@ var compressCommand = {
         return {
           type: "message",
           messageType: "error",
-          content: t("Failed to compress chat history.")
+          content: compressed ? getCompressionFailureStatusText({
+            compressionStatus: compressed.compressionStatus,
+            originalTokenCount: compressed.originalTokenCount
+          }) : t("Failed to compress chat history.")
         };
       }
       if (executionMode === "interactive") {
@@ -4051,7 +4083,7 @@ var compressCommand = {
       return {
         type: "message",
         messageType: "info",
-        content: `${truncationNotice ? `${truncationNotice} ` : ""}Context compressed (${formatTokenCount2(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount2(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).` + (compressed.warning ? `
+        content: `${truncationNotice ? `${truncationNotice} ` : ""}Context compressed (${formatCompressionTokenCount(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatCompressionTokenCount(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).` + (compressed.warning ? `
 \u26A0\uFE0F ${compressed.warning}` : "")
       };
     } catch (e) {
@@ -4087,7 +4119,7 @@ var compressCommand = {
 
 // packages/cli/src/ui/commands/compressFastCommand.ts
 init_esbuild_shims();
-var formatTokenCount3 = /* @__PURE__ */ __name((count, isEstimated) => isEstimated ? `~${count}` : String(count), "formatTokenCount");
+var formatTokenCount2 = /* @__PURE__ */ __name((count, isEstimated) => isEstimated ? `~${count}` : String(count), "formatTokenCount");
 var compressFastCommand = {
   name: "compress-fast",
   get description() {
@@ -4127,15 +4159,15 @@ var compressFastCommand = {
       }
     };
     const config = context.services.config;
-    const geminiClient = config?.getGeminiClient();
-    if (!config || !geminiClient) {
+    const llmClient = config?.getLlmClient();
+    if (!config || !llmClient) {
       return {
         type: "message",
         messageType: "error",
         content: t("Config not loaded.")
       };
     }
-    const doCompress = /* @__PURE__ */ __name(async () => await geminiClient.tryCompressChatFast(), "doCompress");
+    const doCompress = /* @__PURE__ */ __name(async () => await llmClient.tryCompressChatFast(), "doCompress");
     if (executionMode === "acp") {
       const messages = /* @__PURE__ */ __name(async function* () {
         try {
@@ -4153,7 +4185,7 @@ var compressFastCommand = {
           }
           yield {
             messageType: "info",
-            content: `Context compressed (${formatTokenCount3(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount3(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).`
+            content: `Context compressed (${formatTokenCount2(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount2(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).`
           };
         } catch (e) {
           yield {
@@ -4209,7 +4241,7 @@ var compressFastCommand = {
       return {
         type: "message",
         messageType: "info",
-        content: `Context compressed (${formatTokenCount3(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount3(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).`
+        content: `Context compressed (${formatTokenCount2(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount2(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).`
       };
     } catch (e) {
       if (executionMode === "interactive") {
@@ -4754,7 +4786,7 @@ var copyCommand = {
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive"],
   action: /* @__PURE__ */ __name(async (context, args) => {
-    const chat = await context.services.config?.getGeminiClient()?.getChat();
+    const chat = await context.services.config?.getLlmClient()?.getChat();
     const history = chat?.getHistoryShallow();
     const aiMessages = history?.filter((item) => item.role === "model") ?? [];
     if (aiMessages.length === 0) {
@@ -5029,7 +5061,7 @@ async function checkApiClient(context) {
     };
   }
   try {
-    const client = config.getGeminiClient();
+    const client = config.getLlmClient();
     if (client.isInitialized()) {
       return {
         category: t("Authentication"),
@@ -6023,7 +6055,7 @@ __name(formatCoreDiagnostics, "formatCoreDiagnostics");
 function collectToolResultRetention(context) {
   try {
     const config = context.services.config;
-    const history = config?.getGeminiClient()?.getHistoryShallow();
+    const history = config?.getLlmClient()?.getHistoryShallow();
     if (!history) {
       return null;
     }
@@ -6840,7 +6872,7 @@ var forkCommand = {
     }
     let hasHistory = false;
     try {
-      hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
+      hasHistory = (config.getLlmClient().getHistoryShallow() ?? []).length > 0;
     } catch (error) {
       debugLogger9.debug("Failed to read history before /fork:", error);
       hasHistory = false;
@@ -6888,7 +6920,7 @@ var forkCommand = {
       };
     }
     try {
-      config.getGeminiClient().addHistory({
+      config.getLlmClient().addHistory({
         role: "user",
         parts: [
           {
@@ -7413,7 +7445,7 @@ var expandNowCommand = {
         content: t("History is already expanded in this session.")
       };
     }
-    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-CZ4JRDVW.js");
+    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-3JQORXAK.js");
     const updated = expandCollapsedHistory(history);
     loadHistory(updated);
     refreshStatic();
@@ -8861,7 +8893,7 @@ var initCommand = {
       };
     }
     const targetDir = context.services.config.getTargetDir();
-    const contextFileName = getCurrentGeminiMdFilename();
+    const contextFileName = getCurrentMemoryFilename();
     const contextFilePath = path8.join(targetDir, contextFileName);
     try {
       if (fs7.existsSync(contextFilePath)) {
@@ -9076,7 +9108,7 @@ async function setOutputLanguage(context, language) {
     if (config) {
       try {
         await config.refreshHierarchicalMemory();
-        await config.getGeminiClient().refreshSystemInstruction();
+        await config.getLlmClient().refreshSystemInstruction();
       } catch (error) {
         debugLogger11.warn(
           "Failed to apply output language to running session:",
@@ -10995,7 +11027,7 @@ ${fileList}`
       loadHistory(toolCallData.history);
     }
     if (toolCallData.clientHistory) {
-      await config?.getGeminiClient()?.setHistory(toolCallData.clientHistory);
+      await config?.getLlmClient()?.setHistory(toolCallData.clientHistory);
     }
     return {
       type: "tool",
@@ -11168,12 +11200,11 @@ var skillsCommand = {
       return { type: "dialog", dialog: "skills_manage" };
     }
     const skills = await skillManager.listSkills();
-    const disabled = context.services.config?.getDisabledSkillNames() ?? /* @__PURE__ */ new Set();
     const userInvocableSkills = skills.filter(
       (skill) => skill.userInvocable !== false
     );
     const visibleSkills = userInvocableSkills.filter(
-      (s) => !disabled.has(s.name.toLowerCase())
+      (skill) => context.services.config?.isSkillEnabled(skill) ?? true
     );
     if (visibleSkills.length === 0) {
       const content = skills.length > 0 && userInvocableSkills.length === 0 ? t("All skills are marked as non-user-invocable.") : userInvocableSkills.length === 0 ? t("No skills are currently available.") : t(
@@ -12028,8 +12059,8 @@ var summaryCommand = {
         content: t("Config not loaded.")
       };
     }
-    const geminiClient = config.getGeminiClient();
-    if (!geminiClient) {
+    const llmClient = config.getLlmClient();
+    if (!llmClient) {
       return {
         type: "message",
         messageType: "error",
@@ -12055,7 +12086,7 @@ var summaryCommand = {
       };
     }
     const getChatHistory = /* @__PURE__ */ __name(() => {
-      const chat = geminiClient.getChat();
+      const chat = llmClient.getChat();
       return chat.getHistoryShallow();
     }, "getChatHistory");
     const validateChatHistory = /* @__PURE__ */ __name((history2) => {
@@ -12068,7 +12099,7 @@ var summaryCommand = {
         role: message2.role,
         parts: message2.parts
       }));
-      const rawSystemInstruction = geminiClient.getChat().getGenerationConfig().systemInstruction;
+      const rawSystemInstruction = llmClient.getChat().getGenerationConfig().systemInstruction;
       const chatSystemInstruction = typeof rawSystemInstruction === "string" ? rawSystemInstruction : void 0;
       const result = await runSideQuery(config, {
         purpose: "project-summary",
@@ -12685,13 +12716,17 @@ var toolsCommand = {
       return;
     }
     const tools = toolRegistry.getAllTools();
-    const geminiTools = tools.filter((tool) => !("serverName" in tool));
+    const llmTools = tools.filter((tool) => !("serverName" in tool));
     const toolsListItem = {
       type: "tools_list" /* TOOLS_LIST */,
-      tools: geminiTools.map((tool) => ({
+      tools: llmTools.map((tool) => ({
         name: tool.name,
         displayName: tool.displayName,
-        description: tool.description
+        description: tool.description,
+        // Surface the deferred/eager split so a `tools.eager` allowlist is
+        // visible rather than silently reshaping the model's toolset — the
+        // user-facing half of #10075.
+        deferred: toolRegistry.isDeferredAndHidden(tool.name)
       })),
       showDescriptions: useShowDescriptions
     };
@@ -14181,7 +14216,7 @@ var TemplateRenderer = class {
   }
   // Render the complete HTML file
   async renderInsightHTML(insights) {
-    const insightJson = JSON.stringify(insights).replace(/</g, "\\u003c").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
+    const insightJson = escapeJsonTagCharacters(JSON.stringify(insights)).replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
     const html = `<!doctype html>
 <html lang="en">
   <head>
@@ -14723,10 +14758,10 @@ var updateCommand = {
       { performStandaloneUpdate },
       installationInfo
     ] = await Promise.all([
-      import("./updateCheck-7QBDXZRT.js"),
-      import("./processUtils-IQZBYWSB.js"),
-      import("./standalone-update-RGILUQVK.js"),
-      import("./installationInfo-Y7AULNMX.js")
+      import("./updateCheck-4QZWCGP6.js"),
+      import("./processUtils-2BCDO3DZ.js"),
+      import("./standalone-update-P2Q5H4ZU.js"),
+      import("./installationInfo-YKUSY3ZB.js")
     ]);
     const { formatUpdateInstructions, getInstallationInfo: getInstallationInfo2 } = installationInfo;
     const settings = context.services.settings;
@@ -16119,20 +16154,19 @@ var SkillCommandLoader = class {
         skillManager.listSkills({ level: "extension" })
       ]);
       const allSkills = [...userSkills, ...projectSkills, ...extensionSkills];
-      const disabled = this.config?.getDisabledSkillNames() ?? /* @__PURE__ */ new Set();
       const visibleSkills = allSkills.filter(
-        (skill) => !disabled.has(skill.name.toLowerCase())
+        (skill) => this.config?.isSkillEnabled(skill) ?? true
       );
       const nonUserInvocableCount = visibleSkills.filter(
         (skill) => skill.userInvocable === false
       ).length;
       debugLogger19.debug(
-        `Loaded ${userSkills.length} user + ${projectSkills.length} project + ${extensionSkills.length} extension skill(s) as slash commands; ${allSkills.length - visibleSkills.length} hidden by skills.disabled; ${nonUserInvocableCount} marked non-user-invocable`
+        `Loaded ${userSkills.length} user + ${projectSkills.length} project + ${extensionSkills.length} extension skill(s) as slash commands; ${allSkills.length - visibleSkills.length} disabled; ${nonUserInvocableCount} marked non-user-invocable`
       );
       return visibleSkills.map((skill) => {
         const isExtension = skill.level === "extension";
         const modelInvocable = skill.disableModelInvocation ? false : isExtension ? !!(skill.description || skill.whenToUse) : true;
-        const sourceLabel = isExtension ? `${t("Extension:")} ${skill.extensionName ?? "unknown"}` : skill.level === "project" ? t("Project") : t("User");
+        const sourceLabel = isExtension ? `${t("Extension:")} ${skill.extensionDisplayName ?? skill.extensionName ?? "unknown"}` : skill.level === "project" ? t("Project") : t("User");
         return {
           name: skill.name,
           description: skill.description,
@@ -16154,6 +16188,13 @@ var SkillCommandLoader = class {
             ...isExtension && skill.extensionName ? { extensionName: skill.extensionName } : {}
           },
           action: /* @__PURE__ */ __name(async (context, _args) => {
+            if (this.config && !this.config.isSkillEnabled(skill)) {
+              return {
+                type: "message",
+                messageType: "error",
+                content: `Skill "${skill.name}" is disabled.`
+              };
+            }
             applySkillAllowedTools(
               this.config?.getPermissionManager(),
               skill.allowedTools
@@ -16214,8 +16255,8 @@ function createNonInteractiveUI() {
     btwAbortControllerRef: { current: null },
     isIdleRef: { current: true },
     toggleVimEnabled: /* @__PURE__ */ __name(async () => false, "toggleVimEnabled"),
-    setGeminiMdFileCount: /* @__PURE__ */ __name((_count) => {
-    }, "setGeminiMdFileCount"),
+    setMemoryFileCount: /* @__PURE__ */ __name((_count) => {
+    }, "setMemoryFileCount"),
     reloadCommands: /* @__PURE__ */ __name(() => {
     }, "reloadCommands"),
     setSessionName: /* @__PURE__ */ __name(() => {