@qwen-code/qwen-code 0.21.11-preview.0 → 0.21.12-preview.1

package/chunks/{chunk-VBU76UYP.js → chunk-QIN5P5BP.js}

@@ -8,16 +8,15 @@ import {
   staleArgsWarning,
   validateAuthMethod,
   writeSkillArgs
-} from "./chunk-ZUIOLZ4V.js";
+} from "./chunk-VUFEW3SF.js";
 import {
   calculateCost,
-  computeSessionStats,
   diffCommand,
   filterCommandsForMode,
   findInlineMathExpressions,
   getSystemInfoFields,
   levelLabel
-} from "./chunk-HDHLWOG5.js";
+} from "./chunk-JRRZFO4A.js";
 import {
   isKittyProtocolEnabled
 } from "./chunk-NYX53SV4.js";
@@ -25,33 +24,32 @@ import {
   VSCODE_SHIFT_ENTER_SEQUENCE,
   isWaylandSession,
   writeOsc52
-} from "./chunk-NV3F44FL.js";
+} from "./chunk-AMXMM7DH.js";
 import {
   contextCommand
-} from "./chunk-A6PSUNCY.js";
+} from "./chunk-DEVFUPC5.js";
 import {
   themeManager
-} from "./chunk-CTJLZLB5.js";
-import {
-  rollbackStandaloneUpdate
-} from "./chunk-SKSOLRPK.js";
+} from "./chunk-EN2J77G7.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-FTO3P6PZ.js";
+} from "./chunk-T2VEHZH3.js";
+import {
+  rollbackStandaloneUpdate
+} from "./chunk-VO52SIZW.js";
 import {
   GITHUB_WORKFLOW_PATHS,
   INSIGHT_CSS,
   INSIGHT_JS,
   collectSessionData,
   generateExportFilename,
-  installGoalTerminalObserver,
   normalizeSessionData,
   setupGithub,
   toHtml,
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-5C7FDVHB.js";
+} from "./chunk-7L64FSYQ.js";
 import {
   stripUnsafeCharacters,
   toCodePoints,
@@ -67,12 +65,12 @@ import {
   isVoiceEnabled,
   readVoiceMode,
   readVoiceModel
-} from "./chunk-UXV3DYVT.js";
+} from "./chunk-SZ36WFVK.js";
 import {
   getExtendedSystemInfo,
   getGitVersion,
   getNpmVersion
-} from "./chunk-B7SQOICP.js";
+} from "./chunk-ZIS5I56G.js";
 import {
   formatDuration,
   formatTokenCount
@@ -80,7 +78,10 @@ import {
 import {
   isInlineModelOverrideAllowed,
   parseAcpModelOption
-} from "./chunk-I7XTOGIS.js";
+} from "./chunk-5DDUYIY6.js";
+import {
+  getInstallationInfo
+} from "./chunk-L2O7DJIE.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
   getAllSettingKeys,
@@ -92,24 +93,21 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-SVY7G3WS.js";
+} from "./chunk-3ZLUA4GV.js";
 import {
   getCurrentLanguage,
   setLanguageAsync,
   t
-} from "./chunk-KHLBIO6M.js";
+} from "./chunk-6LK2QPIA.js";
 import {
   SUPPORTED_LANGUAGES,
   getSupportedLanguageIds,
   resolveSupportedLanguage
 } from "./chunk-5EJZE3FP.js";
-import {
-  getInstallationInfo
-} from "./chunk-X7XXP7CN.js";
 import {
   isFolderTrustEnabled,
   loadTrustedFolders
-} from "./chunk-P6RBCBBE.js";
+} from "./chunk-M2S67TPJ.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -120,11 +118,11 @@ import {
   EXTENSIONS_CONFIG_FILENAME,
   ExtensionManager,
   IdeClient,
-  Logger,
   QWEN_CODE_COMPANION_EXTENSION_NAME,
   SESSION_TITLE_MAX_LENGTH,
   SessionService,
   ShellExecutionService,
+  analyzeToolResultRetention,
   appendToLastTextPart,
   buildBackgroundEntryLabel,
   buildBareRememberPrompt,
@@ -145,15 +143,11 @@ import {
   flatMapTextParts,
   formatMemoryUsage,
   generateSessionRecap,
-  getActiveGoal,
-  getArenaSystemReminder,
   getExtensionDescription,
   getExtensionDisplayName,
   getIdeInstaller,
   getInsightPrompt,
-  getLastGoalTerminal,
   getMCPServerPrompts,
-  getPlanModeSystemReminder,
   getProjectSummaryPrompt,
   getShellConfiguration,
   glob,
@@ -178,18 +172,20 @@ import {
   persistSessionUsage,
   readPathFromWorkspace,
   redactUrlCredentials,
-  registerGoalHook,
   require_toml,
+  resolveSlimmingConfig,
   runForkedAgent,
-  tryGenerateSessionTitle,
-  unregisterGoalHook
-} from "./chunk-O3VWAZLP.js";
+  tryGenerateSessionTitle
+} from "./chunk-INQN4KIA.js";
 import {
   external_exports
-} from "./chunk-H6XPXXMH.js";
+} from "./chunk-CQ35AJ4Z.js";
 import {
   resolveModelId
-} from "./chunk-TCRQD7F6.js";
+} from "./chunk-U6LT3QBF.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-6LYDH7VT.js";
 import {
   getAutoSkillCuratorStatus,
   parse,
@@ -197,37 +193,21 @@ import {
   restoreArchivedAutoSkill,
   runAutoSkillCurator,
   setAutoSkillPinned
-} from "./chunk-J6SZID63.js";
+} from "./chunk-2AZMF6G5.js";
 import {
   HookEventName,
   sanitizeUserPromptExpansionAdditionalContext
-} from "./chunk-GM463R2B.js";
+} from "./chunk-GZGDJ4E6.js";
 import {
+  GoalPersistenceUnavailableError,
+  emptyGoalSnapshot,
   projectUserTranscriptForDisplay
-} from "./chunk-QUI267ZP.js";
-import {
-  APPROVAL_MODES
-} from "./chunk-WAUGQKUU.js";
+} from "./chunk-SAQHDAUJ.js";
 import {
   resolveOpenAILogDir
-} from "./chunk-DZUO626D.js";
-import {
-  FORK_SUBAGENT_TYPE,
-  stripStartupContext
-} from "./chunk-IA7TGCN2.js";
-import {
-  applySkillAllowedTools,
-  buildSkillLlmContent
-} from "./chunk-K623ENWT.js";
-import {
-  openBrowserSecurely
-} from "./chunk-NAVJD2PQ.js";
-import {
-  REASONING_EFFORT_TIERS,
-  applyReasoningEffort,
-  normalizeReasoningEffort
-} from "./chunk-KM73TBQ4.js";
+} from "./chunk-6XZERB6P.js";
 import {
+  COMBINED_PASS_TOLERANCE_FACTOR,
   IdeConnectionEvent,
   formatTokenUsageSummaryAsCsv,
   formatTokenUsageSummaryAsJson,
@@ -237,19 +217,35 @@ import {
   logIdeConnection,
   queryTokenUsage,
   read,
-  recordSkillInvocation,
   uiTelemetryService
-} from "./chunk-YGT2AUJ7.js";
+} from "./chunk-HB6QW4LM.js";
 import {
   getAutoMemoryRoot
-} from "./chunk-FVKHVJZQ.js";
+} from "./chunk-732MOPEM.js";
 import {
   runSideQuery
-} from "./chunk-COBO5EBO.js";
+} from "./chunk-CTQE2NB2.js";
+import {
+  FORK_SUBAGENT_TYPE,
+  stripStartupContext
+} from "./chunk-ZV4XVYL3.js";
 import {
+  applySkillAllowedTools,
+  buildSkillLlmContent
+} from "./chunk-K623ENWT.js";
+import {
+  ToolDisplayNamesMigration,
   ToolNames,
-  isShellProgressData
-} from "./chunk-PYQADEFD.js";
+  canonicalToolName
+} from "./chunk-XTH2OMDS.js";
+import {
+  openBrowserSecurely
+} from "./chunk-NAVJD2PQ.js";
+import {
+  REASONING_EFFORT_TIERS,
+  applyReasoningEffort,
+  normalizeReasoningEffort
+} from "./chunk-KM73TBQ4.js";
 import {
   Storage,
   createDebugLogger,
@@ -258,12 +254,12 @@ import {
   isSubpath,
   resolvePath,
   updateSymlink
-} from "./chunk-OIVKILPI.js";
+} from "./chunk-MPBRV3UU.js";
 import {
   isCpuProfileRecording,
   startCpuProfile,
   stopCpuProfile
-} from "./chunk-AJ6LQ5A6.js";
+} from "./chunk-M3QYOPGN.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -592,9 +588,6 @@ function findSlashCommandTokens(text, commands) {
 }
 __name(findSlashCommandTokens, "findSlashCommandTokens");
 
-// packages/cli/src/nonInteractiveCliCommands.ts
-init_esbuild_shims();
-
 // packages/cli/src/services/CommandService.ts
 init_esbuild_shims();
 var debugLogger2 = createDebugLogger("CLI_COMMANDS");
@@ -2053,7 +2046,7 @@ var approvalModeCommand = {
         };
       }
     }
-    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-VVQUPTM5.js") : void 0;
+    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-3QJ7QV5R.js") : void 0;
     if (config) {
       try {
         config.setApprovalMode(mode);
@@ -5090,6 +5083,7 @@ function formatMemoryDiagnostics(diagnostics) {
 __name(formatMemoryDiagnostics, "formatMemoryDiagnostics");
 
 // packages/cli/src/ui/commands/doctorCommand.ts
+var debugLogger6 = createDebugLogger("DOCTOR_MEMORY");
 var MEMORY_SUBCOMMAND = "memory";
 var CPU_PROFILE_SUBCOMMAND = "cpu-profile";
 var ROLLBACK_SUBCOMMAND = "rollback";
@@ -5162,6 +5156,12 @@ var doctorCommand = {
         return;
       }
       let report = formatMemoryDiagnostics(diagnostics);
+      const toolResultRetention = collectToolResultRetention(context);
+      if (toolResultRetention) {
+        report = `${report}
+
+${formatToolResultRetention(toolResultRetention)}`;
+      }
       let messageType = "info";
       let heapSnapshotWritten = false;
       if (abortSignal?.aborted) {
@@ -5354,10 +5354,20 @@ async function memoryDoctorAction(context, args = "") {
     if (context.abortSignal?.aborted) {
       return;
     }
+    const toolResultRetention = collectToolResultRetention(context);
     return {
       type: "message",
       messageType: diagnostics.analysis.risks.length > 0 ? "warning" : "info",
-      content: tokens.includes("--json") ? JSON.stringify(diagnostics, null, 2) : formatCoreDiagnostics(diagnostics)
+      content: tokens.includes("--json") ? JSON.stringify(
+        {
+          ...diagnostics,
+          ...toolResultRetention ? { toolResultRetention } : {}
+        },
+        null,
+        2
+      ) : formatCoreDiagnostics(diagnostics) + (toolResultRetention ? `
+
+${formatToolResultRetention(toolResultRetention)}` : "")
     };
   } catch (error) {
     if (context.abortSignal?.aborted) {
@@ -5437,6 +5447,81 @@ function formatCoreDiagnostics(diagnostics) {
   return lines.join("\n");
 }
 __name(formatCoreDiagnostics, "formatCoreDiagnostics");
+function collectToolResultRetention(context) {
+  try {
+    const config = context.services.config;
+    const history = config?.getGeminiClient()?.getHistoryShallow();
+    if (!history) {
+      return null;
+    }
+    const resolveToolBudgetChars = /* @__PURE__ */ __name((name) => config?.getToolRegistry?.()?.getTool(canonicalToolName(name))?.maxOutputChars, "resolveToolBudgetChars");
+    const displayNameBudgets = /* @__PURE__ */ new Map();
+    for (const tool of config?.getToolRegistry?.()?.getAllTools() ?? []) {
+      if (tool.displayName) {
+        displayNameBudgets.set(tool.displayName, tool.maxOutputChars);
+      }
+    }
+    const stats = analyzeToolResultRetention(history, {
+      // Compare each result against its own tool's declared budget (mirroring
+      // the scheduler), so compliant high-budget results (e.g. MCP) are not
+      // flagged; tools declaring none fall back to the configured global
+      // threshold — the bound the scheduler applies to them.
+      resolveToolBudgetChars,
+      thresholdChars: config?.getTruncateToolOutputThreshold?.(),
+      imageTokenEstimate: resolveSlimmingConfig(config?.getChatCompression?.()).imageTokenEstimate
+    });
+    const threshold = config?.getTruncateToolOutputThreshold?.() ?? stats.oversizedThresholdChars;
+    let largeOutputsInUIHistory = 0;
+    for (const item of context.ui.history ?? []) {
+      if (item.type !== "tool_group") {
+        continue;
+      }
+      for (const tool of item.tools) {
+        if (typeof tool.resultDisplay !== "string") {
+          continue;
+        }
+        const migratedName = ToolDisplayNamesMigration[tool.name] ?? tool.name;
+        const budget = displayNameBudgets.get(tool.name) ?? displayNameBudgets.get(migratedName) ?? resolveToolBudgetChars(tool.name) ?? threshold;
+        if (Number.isFinite(budget) && tool.resultDisplay.length > budget * COMBINED_PASS_TOLERANCE_FACTOR) {
+          largeOutputsInUIHistory += 1;
+        }
+      }
+    }
+    return {
+      ...stats,
+      largeOutputsInUIHistory,
+      // Derived assumption: compression reads the live history by reference
+      // (getHistoryShallow; see chatCompressionService). If compression input
+      // assembly ever changes to copy or filter history, this derivation must
+      // be revisited.
+      presentInCompressionInput: stats.oversizedResultCount > 0
+    };
+  } catch (error) {
+    debugLogger6.warn(
+      `Tool result retention diagnostics unavailable: ${formatErrorMessage2(error)}`
+    );
+    return null;
+  }
+}
+__name(collectToolResultRetention, "collectToolResultRetention");
+function formatToolResultRetention(stats) {
+  const lines = [
+    "Tool result retention",
+    `  Tool results in history: ${stats.toolResultCount}`,
+    `  Total retained: ${stats.totalChars} chars`,
+    `  Largest result: ${stats.largestResultChars} chars`,
+    `  Oversized results (above tool budget): ${stats.oversizedResultCount}`,
+    `  Oversized also rendered in UI history: ${stats.largeOutputsInUIHistory} item(s)`,
+    `  Oversized also in compression input: ${stats.presentInCompressionInput ? "yes (shared by reference, no extra copy)" : "no"}`
+  ];
+  if (stats.oversizedResultCount > 0) {
+    lines.push(
+      "  Hint: oversized tool results stay in context and tax every later turn; /compress can reclaim space."
+    );
+  }
+  return lines.join("\n");
+}
+__name(formatToolResultRetention, "formatToolResultRetention");
 var CPU_PROFILE_USAGE_HINT = "/doctor cpu-profile [--duration <seconds>]";
 var DEFAULT_CPU_PROFILE_DURATION_SEC = 30;
 var MAX_CPU_PROFILE_DURATION_SEC = 300;
@@ -5646,6 +5731,38 @@ var editorCommand = {
 
 // packages/cli/src/ui/commands/effort-command.ts
 init_esbuild_shims();
+
+// packages/cli/src/ui/commands/effort-utils.ts
+init_esbuild_shims();
+function formatEffortChangeMessage(config, tier) {
+  if (config.getReasoningEffort() !== tier) {
+    const override2 = config.getReasoningEffortOverride?.();
+    if (override2) {
+      return t(
+        "Reasoning effort set to {{tier}}, but thinking is currently disabled; after thinking is re-enabled, {{source}}.{{field}} will still have higher priority.",
+        { tier, source: override2.source, field: override2.field }
+      );
+    }
+    return t(
+      "Reasoning effort set to {{tier}}, but thinking is currently disabled \u2014 it will take effect when thinking is re-enabled.",
+      { tier }
+    );
+  }
+  const override = config.getReasoningEffortOverride?.();
+  if (override) {
+    return t(
+      "Reasoning effort: {{tier}} requested, but {{source}}.{{field}} has higher priority for the active DashScope Qwen model; that configured value will remain effective.",
+      { tier, source: override.source, field: override.field }
+    );
+  }
+  return t(
+    "Reasoning effort: {{tier}} (requested; the effective tier depends on the active provider/model).",
+    { tier }
+  );
+}
+__name(formatEffortChangeMessage, "formatEffortChangeMessage");
+
+// packages/cli/src/ui/commands/effort-command.ts
 var TIER_LIST = REASONING_EFFORT_TIERS.join(", ");
 var effortCommand = {
   name: "effort",
@@ -5709,29 +5826,16 @@ var effortCommand = {
         content: t("Settings service not available.")
       };
     }
-    const applied = applyReasoningEffort(config, tier);
+    applyReasoningEffort(config, tier);
     settings.setValue(
       getPersistScopeForModelSelection(settings),
       "model.reasoningEffort",
       tier
     );
-    if (!applied) {
-      return {
-        type: "message",
-        messageType: "info",
-        content: t(
-          "Reasoning effort set to {{tier}}, but thinking is currently disabled \u2014 it will take effect when thinking is re-enabled.",
-          { tier }
-        )
-      };
-    }
     return {
       type: "message",
       messageType: "info",
-      content: t(
-        "Reasoning effort: {{tier}} (requested; the effective tier depends on the active provider/model).",
-        { tier }
-      )
+      content: formatEffortChangeMessage(config, tier)
     };
   }, "action")
 };
@@ -5741,7 +5845,7 @@ init_esbuild_shims();
 import * as fs5 from "node:fs/promises";
 import path5 from "node:path";
 var EXPORT_DIR_OUT_OF_CWD = "Export directory must be within the project working directory.";
-var debugLogger6 = createDebugLogger("EXPORT_COMMAND");
+var debugLogger7 = createDebugLogger("EXPORT_COMMAND");
 function formatExportTargetContext(target) {
   return `target: "${target.outputDir}", cwd: "${target.resolvedCwd}"`;
 }
@@ -5770,7 +5874,7 @@ function resolveExportTarget(cwd, args, extension) {
 }
 __name(resolveExportTarget, "resolveExportTarget");
 async function validateExportTargetWithinCwd(target) {
-  debugLogger6.debug(
+  debugLogger7.debug(
     "Validating export target realpath:",
     formatExportTargetContext(target)
   );
@@ -5783,7 +5887,7 @@ async function validateExportTargetWithinCwd(target) {
     ]);
   } catch (error) {
     if (error.code === "ENOENT") {
-      debugLogger6.debug(
+      debugLogger7.debug(
         "Export target realpath validation failed: missing path",
         formatExportTargetContext(target)
       );
@@ -5798,7 +5902,7 @@ async function validateExportTargetWithinCwd(target) {
     throw error;
   }
   if (!isSubpath(realCwd, realOutputDir)) {
-    debugLogger6.debug("Export target realpath escaped cwd:", {
+    debugLogger7.debug("Export target realpath escaped cwd:", {
       realCwd,
       realOutputDir,
       target
@@ -5816,21 +5920,21 @@ async function validateExportTargetWithinCwd(target) {
 __name(validateExportTargetWithinCwd, "validateExportTargetWithinCwd");
 async function realpathNearestExisting(outputDir, resolvedCwd) {
   let currentPath = outputDir;
-  debugLogger6.debug("Resolving nearest existing export parent:", {
+  debugLogger7.debug("Resolving nearest existing export parent:", {
     outputDir,
     resolvedCwd
   });
   while (isSubpath(resolvedCwd, currentPath)) {
     try {
       const realCurrentPath = await fs5.realpath(currentPath);
-      debugLogger6.debug("Resolved nearest existing export parent:", {
+      debugLogger7.debug("Resolved nearest existing export parent:", {
         currentPath,
         realCurrentPath
       });
       return realCurrentPath;
     } catch (error) {
       if (error.code !== "ENOENT") {
-        debugLogger6.debug("Failed to resolve existing export parent:", error);
+        debugLogger7.debug("Failed to resolve existing export parent:", error);
         throw error;
       }
       const parentPath = path5.dirname(currentPath);
@@ -5844,7 +5948,7 @@ async function realpathNearestExisting(outputDir, resolvedCwd) {
 }
 __name(realpathNearestExisting, "realpathNearestExisting");
 async function validateExistingExportParentWithinCwd(target) {
-  debugLogger6.debug(
+  debugLogger7.debug(
     "Validating existing export parent realpath:",
     formatExportTargetContext(target)
   );
@@ -5862,7 +5966,7 @@ async function validateExistingExportParentWithinCwd(target) {
     target.resolvedCwd
   );
   if (!isSubpath(realCwd, realExistingParent)) {
-    debugLogger6.debug("Existing export parent escaped cwd:", {
+    debugLogger7.debug("Existing export parent escaped cwd:", {
       realCwd,
       realExistingParent,
       target
@@ -5898,7 +6002,7 @@ async function exportSessionAction(context, args, exportFormat) {
   }
   const target = resolveExportTarget(cwd, args, exportFormat.extension);
   const targetFilepath = target.filepath;
-  debugLogger6.debug("Resolved export target:", {
+  debugLogger7.debug("Resolved export target:", {
     format: exportFormat.displayName,
     cwd,
     outputDirArg: args.trim(),
@@ -5907,7 +6011,7 @@ async function exportSessionAction(context, args, exportFormat) {
     filepath: target.filepath
   });
   if (!target.isInsideCwd) {
-    debugLogger6.debug(
+    debugLogger7.debug(
       "Export target rejected before realpath validation:",
       formatExportTargetContext(target)
     );
@@ -5924,17 +6028,17 @@ async function exportSessionAction(context, args, exportFormat) {
     if (initialValidationError) {
       return initialValidationError;
     }
-    debugLogger6.debug("Export target validation passed:", {
+    debugLogger7.debug("Export target validation passed:", {
       format: exportFormat.displayName,
       outputDir: target.outputDir,
       outputDirKind: target.outputDirKind
     });
     const sessionService = new SessionService(cwd);
     const sessionId = config.getSessionId();
-    debugLogger6.debug("Loading session for export:", { sessionId, cwd });
+    debugLogger7.debug("Loading session for export:", { sessionId, cwd });
     const sessionData = await sessionService.loadSession(sessionId);
     if (!sessionData) {
-      debugLogger6.debug("No active session found for export:", {
+      debugLogger7.debug("No active session found for export:", {
         sessionId,
         cwd
       });
@@ -5954,12 +6058,12 @@ async function exportSessionAction(context, args, exportFormat) {
     const content = exportFormat.format(normalizedData);
     if (target.outputDirKind === "custom") {
       try {
-        debugLogger6.debug("Creating export directory:", {
+        debugLogger7.debug("Creating export directory:", {
           outputDir: target.outputDir
         });
         await fs5.mkdir(target.outputDir, { recursive: true, mode: 448 });
       } catch (error) {
-        debugLogger6.debug("Failed to create export directory:", error);
+        debugLogger7.debug("Failed to create export directory:", error);
         return {
           type: "message",
           messageType: "error",
@@ -5973,7 +6077,7 @@ async function exportSessionAction(context, args, exportFormat) {
         return writeValidationError;
       }
     } catch (error) {
-      debugLogger6.debug("Export path validation failed before write:", error);
+      debugLogger7.debug("Export path validation failed before write:", error);
       return {
         type: "message",
         messageType: "error",
@@ -5981,7 +6085,7 @@ async function exportSessionAction(context, args, exportFormat) {
       };
     }
     try {
-      debugLogger6.debug("Writing export file:", {
+      debugLogger7.debug("Writing export file:", {
         format: exportFormat.displayName,
         filepath: target.filepath
       });
@@ -5990,17 +6094,17 @@ async function exportSessionAction(context, args, exportFormat) {
         mode: 384
       });
       await fs5.chmod(target.filepath, 384).catch((error) => {
-        debugLogger6.debug("Failed to tighten export file permissions:", error);
+        debugLogger7.debug("Failed to tighten export file permissions:", error);
       });
     } catch (error) {
-      debugLogger6.debug("Failed to write export file:", error);
+      debugLogger7.debug("Failed to write export file:", error);
       return {
         type: "message",
         messageType: "error",
         content: `Failed to export session: ${error instanceof Error ? error.message : String(error)} (${exportFormat.displayName} target: "${targetFilepath}")`
       };
     }
-    debugLogger6.debug("Session export completed:", {
+    debugLogger7.debug("Session export completed:", {
       format: exportFormat.displayName,
       filepath: target.filepath
     });
@@ -6010,7 +6114,7 @@ async function exportSessionAction(context, args, exportFormat) {
       content: `Session exported to ${exportFormat.displayName}: ${target.displayPath}`
     };
   } catch (error) {
-    debugLogger6.debug("Session export failed:", {
+    debugLogger7.debug("Session export failed:", {
       format: exportFormat.displayName,
       target,
       error
@@ -6106,7 +6210,7 @@ var exportCommand = {
 
 // packages/cli/src/ui/commands/forkCommand.ts
 init_esbuild_shims();
-var debugLogger7 = createDebugLogger("FORK_COMMAND");
+var debugLogger8 = createDebugLogger("FORK_COMMAND");
 function deriveForkDescription(directive) {
   const oneLine = directive.replace(/\s+/g, " ").trim();
   return oneLine.length > 60 ? `${oneLine.slice(0, 57)}\u2026` : oneLine;
@@ -6162,7 +6266,7 @@ var forkCommand = {
     try {
       hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
     } catch (error) {
-      debugLogger7.debug("Failed to read history before /fork:", error);
+      debugLogger8.debug("Failed to read history before /fork:", error);
       hasHistory = false;
     }
     if (!hasHistory) {
@@ -6222,7 +6326,7 @@ var forkCommand = {
         ]
       });
     } catch (error) {
-      debugLogger7.debug("Failed to record fork event in history:", error);
+      debugLogger8.debug("Failed to record fork event in history:", error);
     }
     return {
       type: "message",
@@ -6236,7 +6340,7 @@ var forkCommand = {
 
 // packages/cli/src/ui/commands/extensionsCommand.ts
 init_esbuild_shims();
-var debugLogger8 = createDebugLogger("EXTENSIONS_COMMAND");
+var debugLogger9 = createDebugLogger("EXTENSIONS_COMMAND");
 var EXTENSION_EXPLORE_URL = {
   Gemini: "https://geminicli.com/extensions/",
   ClaudeCode: "https://claudemarketplaces.com/"
@@ -6399,7 +6503,7 @@ async function installAction(context, args) {
   }
   const extensionManager = context.services.config?.getExtensionManager();
   if (!(extensionManager instanceof ExtensionManager)) {
-    debugLogger8.error(
+    debugLogger9.error(
       `Cannot ${context.invocation?.name} extensions in this environment`
     );
     return;
@@ -6544,140 +6648,6 @@ var CLEAR_KEYWORDS = /* @__PURE__ */ new Set([
   "none",
   "cancel"
 ]);
-function formatLegacyTurns(count) {
-  return `${count} ${count === 1 ? "turn" : "turns"}`;
-}
-__name(formatLegacyTurns, "formatLegacyTurns");
-function assertNeverTerminalKind(kind) {
-  throw new Error(`Unexpected GoalTerminalKind: ${kind}`);
-}
-__name(assertNeverTerminalKind, "assertNeverTerminalKind");
-function formatLegacyTerminalSummary(event) {
-  let title;
-  switch (event.kind) {
-    case "achieved":
-      title = "Goal achieved";
-      break;
-    case "failed":
-      title = "Goal could not be achieved";
-      break;
-    case "aborted":
-      title = "Goal aborted";
-      break;
-    default:
-      title = assertNeverTerminalKind(event.kind);
-  }
-  const stats = [];
-  if (event.iterations > 0) stats.push(formatLegacyTurns(event.iterations));
-  if (typeof event.durationMs === "number") {
-    stats.push(formatDuration(event.durationMs, { hideTrailingZeros: true }));
-  }
-  const subtitle = stats.length > 0 ? ` \xB7 ${stats.join(" \xB7 ")}` : "";
-  const reason = event.lastReason?.trim();
-  return `${title}${subtitle}
-Goal: ${event.condition}${reason ? `
-Last check: ${reason}` : ""}`;
-}
-__name(formatLegacyTerminalSummary, "formatLegacyTerminalSummary");
-async function runLegacyGoalCommand(context, args, explicitSet = false) {
-  const { config } = context.services;
-  if (!config) return errorMessage("Configuration is not available.");
-  const sessionId = config.getSessionId();
-  const objective = args.trim();
-  if (!objective) {
-    const active = getActiveGoal(sessionId);
-    if (active) {
-      const turns = active.iterations === 0 ? "not yet evaluated" : formatLegacyTurns(active.iterations);
-      return {
-        type: "message",
-        messageType: "info",
-        content: `Goal active: ${active.condition} (${turns})${active.lastReason ? `
-Last check: ${active.lastReason}` : ""}`
-      };
-    }
-    const terminal = getLastGoalTerminal(sessionId);
-    return {
-      type: "message",
-      messageType: "info",
-      content: terminal ? formatLegacyTerminalSummary(terminal) : "No goal set. Usage: `/goal <condition>` (or `/goal clear`)."
-    };
-  }
-  if (!explicitSet && CLEAR_KEYWORDS.has(objective.toLowerCase())) {
-    const cleared = unregisterGoalHook(config, sessionId);
-    if (!cleared) {
-      return {
-        type: "message",
-        messageType: "info",
-        content: "No goal set."
-      };
-    }
-    const item = {
-      type: "goal_status" /* GOAL_STATUS */,
-      kind: "cleared",
-      condition: cleared.condition,
-      iterations: cleared.iterations,
-      durationMs: Date.now() - cleared.setAt
-    };
-    context.ui.addItem(item, Date.now());
-    return {
-      type: "message",
-      messageType: "info",
-      content: `Goal cleared: ${cleared.condition}`
-    };
-  }
-  if (!config.isTrustedFolder()) {
-    return errorMessage(
-      "/goal is only available in trusted workspaces. Trust this folder via `/trust` and try again."
-    );
-  }
-  if (config.getDisableAllHooks()) {
-    return errorMessage(
-      "/goal is disabled because hooks are turned off in this session (`disableAllHooks` or bare mode)."
-    );
-  }
-  if (!config.getHookSystem()) {
-    return errorMessage(
-      "Hook system is not initialized; cannot set a /goal in this session."
-    );
-  }
-  let registered;
-  try {
-    registered = registerGoalHook({
-      config,
-      sessionId,
-      condition: objective,
-      tokensAtStart: 0
-    });
-  } catch (error) {
-    return errorMessage(
-      `Failed to set goal: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-  context.ui.addItem(
-    {
-      type: "goal_status" /* GOAL_STATUS */,
-      kind: "set",
-      condition: registered.condition,
-      setAt: registered.setAt
-    },
-    Date.now()
-  );
-  installGoalTerminalObserver({
-    sessionId,
-    config,
-    addItem: context.ui.addItem
-  });
-  const result = {
-    type: "submit_prompt",
-    content: [
-      {
-        text: `A session-scoped Stop hook is now active with condition: "${objective.replace(/[\r\n]+/g, " ").replace(/"/g, "'")}". Briefly acknowledge the goal, then immediately start (or continue) working toward it \u2014 treat the condition itself as your directive and do not pause to ask the user what to do. The hook will block stopping until the condition holds. It auto-clears once the condition is met \u2014 do not tell the user to run \`/goal clear\` after success; that is only for clearing a goal early.`
-      }
-    ]
-  };
-  return result;
-}
-__name(runLegacyGoalCommand, "runLegacyGoalCommand");
 function parseGoalCommand(args) {
   let input = args.trim();
   if (/^\/goal(?:\s|$)/i.test(input)) {
@@ -6723,22 +6693,6 @@ var goalCommand = {
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive", "non_interactive", "acp"],
   action: /* @__PURE__ */ __name(async (context, args) => {
-    if (context.executionMode === "acp") {
-      const operation2 = parseGoalCommand(args);
-      if (operation2.kind === "error") return errorMessage(operation2.message);
-      if (operation2.kind !== "status" && operation2.kind !== "clear" && operation2.kind !== "set") {
-        return errorMessage(
-          `'/goal ${operation2.kind}' is not available in ACP mode.`
-        );
-      }
-      const explicitSet = operation2.kind === "set";
-      const legacyArgs = explicitSet ? operation2.objective : args;
-      return await runLegacyGoalCommand(context, legacyArgs, explicitSet) ?? {
-        type: "message",
-        messageType: "info",
-        content: "Command executed successfully."
-      };
-    }
     const { config } = context.services;
     if (!config) return errorMessage("Configuration is not available.");
     const operation = parseGoalCommand(args);
@@ -6749,8 +6703,18 @@ var goalCommand = {
         "/goal is only available in trusted workspaces. Trust this folder via `/trust` and try again."
       );
     }
+    let runtime;
+    try {
+      runtime = await config.getGoalRuntimeReady();
+    } catch (error) {
+      if (error instanceof GoalPersistenceUnavailableError && (operation.kind === "status" || operation.kind === "clear") && config.getChatRecordingService() === void 0) {
+        return goalControl(operation, { snapshot: emptyGoalSnapshot() });
+      }
+      return errorMessage(
+        error instanceof Error ? error.message : String(error)
+      );
+    }
     try {
-      const runtime = await config.getGoalRuntimeReady();
       const snapshot = runtime.getSnapshot();
       if (operation.kind === "status") {
         return goalControl(operation, { snapshot });
@@ -6873,7 +6837,7 @@ var expandNowCommand = {
         content: t("History is already expanded in this session.")
       };
     }
-    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-VUY4B6BO.js");
+    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-UMC4Y3E2.js");
     const updated = expandCollapsedHistory(history);
     loadHistory(updated);
     refreshStatic();
@@ -8323,7 +8287,7 @@ var initCommand = {
         if (existing && existing.trim().length > 0) {
           if (!context.overwriteConfirmed) {
             const [{ Text }, { default: React }] = await Promise.all([
-              import("./build-GDBLPA24.js"),
+              import("./build-RZS65IIX.js"),
               import("./react-SG7JAQSZ.js")
             ]);
             return {
@@ -8406,7 +8370,7 @@ Write the complete content to the \`${contextFileName}\` file. The output must b
 
 // packages/cli/src/ui/commands/languageCommand.ts
 init_esbuild_shims();
-var debugLogger9 = createDebugLogger("LANGUAGE_COMMAND");
+var debugLogger10 = createDebugLogger("LANGUAGE_COMMAND");
 function getCurrentOutputLanguage(context) {
   const settingValue = context?.services?.settings?.merged?.general?.outputLanguage || OUTPUT_LANGUAGE_AUTO;
   const resolved = resolveOutputLanguageOrPreserveAuto(settingValue);
@@ -8474,7 +8438,7 @@ async function setUiLanguage(context, lang, scope = "User" /* User */) {
         throwOnWriteFailure: true
       });
     } catch (error) {
-      debugLogger9.warn("Failed to save language setting:", error);
+      debugLogger10.warn("Failed to save language setting:", error);
       return {
         type: "message",
         messageType: "error",
@@ -8510,7 +8474,7 @@ async function setOutputLanguage(context, language) {
           settingValue
         );
       } catch (error) {
-        debugLogger9.warn("Failed to save output language setting:", error);
+        debugLogger10.warn("Failed to save output language setting:", error);
       }
     }
     const config = context.services.config;
@@ -8519,7 +8483,7 @@ async function setOutputLanguage(context, language) {
         await config.refreshHierarchicalMemory();
         await config.getGeminiClient().refreshSystemInstruction();
       } catch (error) {
-        debugLogger9.warn(
+        debugLogger10.warn(
           "Failed to apply output language to running session:",
           error
         );
@@ -8875,6 +8839,23 @@ var FAST_MODEL_CONFIGURATION_HINT = "Configure models in settings.modelProviders
 var VISION_MODEL_CONFIGURATION_HINT = "Configure an image-capable model in settings.modelProviders and ensure the required environment variables are set. Run /model --vision <model-id> to set it, or leave it unset to auto-pick a same-provider vision model.";
 var COMPACTION_MODEL_CONFIGURATION_HINT = "Configure models in settings.modelProviders and ensure the required environment variables are set. In interactive mode, run /auth to configure or switch providers, or run /model --compaction without a model to choose from configured models.";
 var IMAGE_MODEL_CONFIGURATION_HINT = "Configure a model with imageOnly: true, baseUrl, and envKey in settings.modelProviders. Run /model --image <model-id> to select it.";
+var MODEL_PICKER_FLAGS = [
+  "fast",
+  "voice",
+  "vision",
+  "compaction",
+  "image",
+  "project",
+  "global"
+];
+var MODEL_PICKER_FLAG_PATTERN = `(?:${MODEL_PICKER_FLAGS.join("|")})`;
+var MODEL_PICKER_ONLY_PATTERN = new RegExp(
+  `^(?:\\s*--${MODEL_PICKER_FLAG_PATTERN})*\\s*$`
+);
+function isPickerOnlyModelInvocation(args) {
+  return MODEL_PICKER_ONLY_PATTERN.test(args);
+}
+__name(isPickerOnlyModelInvocation, "isPickerOnlyModelInvocation");
 function parseScopeFlags(args) {
   let scopeOverride;
   let remaining = args;
@@ -9921,7 +9902,7 @@ init_esbuild_shims();
 
 // packages/cli/src/config/extension-runtime-reload.ts
 init_esbuild_shims();
-var debugLogger10 = createDebugLogger("EXTENSION_RUNTIME_RELOAD");
+var debugLogger11 = createDebugLogger("EXTENSION_RUNTIME_RELOAD");
 async function reloadPluginsRuntime(options) {
   if (options.config.isSafeMode()) {
     throw new Error("Extension reload is disabled in safe mode.");
@@ -9941,7 +9922,7 @@ async function refreshExtensionContentRuntime(options) {
     await manager.refreshCache();
   } catch (error) {
     errors.push(error);
-    debugLogger10.warn(
+    debugLogger11.warn(
       "refreshExtensionContentRuntime: refreshCache failed:",
       error
     );
@@ -9954,7 +9935,7 @@ async function refreshExtensionContentRuntime(options) {
   for (const result of settled) {
     if (result.status === "rejected") {
       errors.push(result.reason);
-      debugLogger10.warn(
+      debugLogger11.warn(
         "refreshExtensionContentRuntime: a refresh leg failed:",
         result.reason
       );
@@ -10216,9 +10197,15 @@ var renameCommand = {
       }, 500);
       let outcome;
       try {
+        const userDisplayTexts = config.getChatRecordingService()?.getUserDisplayTextsForTitle?.() ?? [];
+        const lastDisplayText = userDisplayTexts.at(-1)?.trim();
+        const titleDisplayTexts = lastDisplayText?.match(
+          /^\/(?:rename|tag)(?:\s+--auto)?$/i
+        ) ? userDisplayTexts.slice(0, -1) : userDisplayTexts;
         outcome = await tryGenerateSessionTitle(
           config,
-          context.abortSignal ?? new AbortController().signal
+          context.abortSignal ?? new AbortController().signal,
+          titleDisplayTexts
         );
       } finally {
         clearInterval(timer);
@@ -11757,7 +11744,7 @@ import * as os4 from "node:os";
 import * as path13 from "node:path";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
-var debugLogger11 = createDebugLogger("TERMINAL_SETUP");
+var debugLogger12 = createDebugLogger("TERMINAL_SETUP");
 var execAsync = promisify(exec);
 function stripJsonComments2(content) {
   return content.replace(/^\s*\/\/.*$/gm, "");
@@ -11790,7 +11777,7 @@ async function detectTerminal() {
       if (parentName.includes("trae") || parentName.includes("Trae"))
         return "trae";
     } catch (error) {
-      debugLogger11.debug("Parent process detection failed:", error);
+      debugLogger12.debug("Parent process detection failed:", error);
     }
   }
   return null;
@@ -11802,7 +11789,7 @@ async function backupFile(filePath) {
     const backupPath = `${filePath}.backup.${timestamp}`;
     await fs10.copyFile(filePath, backupPath);
   } catch (error) {
-    debugLogger11.warn(`Failed to create backup of ${filePath}:`, error);
+    debugLogger12.warn(`Failed to create backup of ${filePath}:`, error);
   }
 }
 __name(backupFile, "backupFile");
@@ -12033,6 +12020,7 @@ var terminalSetupCommand = {
 
 // packages/cli/src/ui/commands/themeCommand.ts
 init_esbuild_shims();
+import process5 from "node:process";
 var themeCommand = {
   name: "theme",
   get description() {
@@ -12040,10 +12028,21 @@ var themeCommand = {
   },
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive"],
-  action: /* @__PURE__ */ __name((_context, _args) => ({
-    type: "dialog",
-    dialog: "theme"
-  }), "action")
+  action: /* @__PURE__ */ __name((_context, _args) => {
+    if (process5.env["NO_COLOR"]) {
+      return {
+        type: "message",
+        messageType: "info",
+        content: t(
+          "Theme configuration unavailable due to NO_COLOR env variable."
+        )
+      };
+    }
+    return {
+      type: "dialog",
+      dialog: "theme"
+    };
+  }, "action")
 };
 
 // packages/cli/src/ui/commands/toolsCommand.ts
@@ -12112,7 +12111,7 @@ init_esbuild_shims();
 // packages/cli/src/ui/voice/voice-availability.ts
 init_esbuild_shims();
 import { existsSync as existsSync2 } from "node:fs";
-import process5 from "node:process";
+import process6 from "node:process";
 var SUPPORTED_PLATFORMS = [
   "darwin",
   "linux",
@@ -12123,8 +12122,8 @@ function isWsl(env) {
 }
 __name(isWsl, "isWsl");
 function getVoiceUnavailableReason(environment = {
-  platform: process5.platform,
-  env: process5.env
+  platform: process6.platform,
+  env: process6.env
 }) {
   const { platform: platform2, env } = environment;
   const fileExists = environment.fileExists ?? existsSync2;
@@ -14109,10 +14108,10 @@ var updateCommand = {
       { performStandaloneUpdate },
       installationInfo
     ] = await Promise.all([
-      import("./updateCheck-4QDI7CUZ.js"),
-      import("./processUtils-GZOVMFK4.js"),
-      import("./standalone-update-OC5IKJGY.js"),
-      import("./installationInfo-JCUKPGDB.js")
+      import("./updateCheck-3BQA7KNI.js"),
+      import("./processUtils-ILOXESNR.js"),
+      import("./standalone-update-G4BETY4B.js"),
+      import("./installationInfo-GY2OCLIS.js")
     ]);
     const { formatUpdateInstructions, getInstallationInfo: getInstallationInfo2 } = installationInfo;
     const settings = context.services.settings;
@@ -14344,7 +14343,7 @@ var BuiltinCommandLoader = class {
 // packages/cli/src/services/BundledSkillLoader.ts
 init_esbuild_shims();
 import { dirname as dirname2 } from "node:path";
-var debugLogger12 = createDebugLogger("BUNDLED_SKILL_LOADER");
+var debugLogger13 = createDebugLogger("BUNDLED_SKILL_LOADER");
 var BundledSkillLoader = class {
   constructor(config) {
     this.config = config;
@@ -14354,12 +14353,12 @@ var BundledSkillLoader = class {
   }
   async loadCommands(_signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger12.debug("Bare mode enabled, skipping bundled skills");
+      debugLogger13.debug("Bare mode enabled, skipping bundled skills");
       return [];
     }
     const skillManager = this.config?.getSkillManager();
     if (!skillManager) {
-      debugLogger12.debug("SkillManager not available, skipping bundled skills");
+      debugLogger13.debug("SkillManager not available, skipping bundled skills");
       return [];
     }
     try {
@@ -14367,7 +14366,7 @@ var BundledSkillLoader = class {
       const cronEnabled = this.config?.isCronEnabled() ?? false;
       const cronVisible = allSkills.filter((skill) => {
         if (!cronEnabled && skill.allowedTools?.some((t2) => t2.startsWith("cron_"))) {
-          debugLogger12.debug(
+          debugLogger13.debug(
             `Hiding skill "${skill.name}" because cron is not enabled`
           );
           return false;
@@ -14378,7 +14377,7 @@ var BundledSkillLoader = class {
       const skills = cronVisible.filter(
         (skill) => !disabled.has(skill.name.toLowerCase())
       );
-      debugLogger12.debug(
+      debugLogger13.debug(
         `Loaded ${skills.length} bundled skill(s) as slash commands; ${cronVisible.length - skills.length} hidden by skills.disabled`
       );
       return skills.map((skill) => ({
@@ -14440,7 +14439,7 @@ ${body}`;
         }, "action")
       }));
     } catch (error) {
-      debugLogger12.error("Failed to load bundled skills:", error);
+      debugLogger13.error("Failed to load bundled skills:", error);
       return [];
     }
   }
@@ -14720,7 +14719,7 @@ var ShellProcessor = class {
 
 // packages/cli/src/services/prompt-processors/atFileProcessor.ts
 init_esbuild_shims();
-var debugLogger13 = createDebugLogger("AT_FILE_PROCESSOR");
+var debugLogger14 = createDebugLogger("AT_FILE_PROCESSOR");
 var AtFileProcessor = class {
   constructor(commandName) {
     this.commandName = commandName;
@@ -14766,7 +14765,7 @@ var AtFileProcessor = class {
         } catch (error) {
           const message2 = error instanceof Error ? error.message : String(error);
           const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message2}`;
-          debugLogger13.error(
+          debugLogger14.error(
             `[AtFileProcessor] ${uiMessage}. Leaving placeholder in prompt.`
           );
           context.ui.addItem(
@@ -14791,7 +14790,7 @@ var AtFileProcessor = class {
 };
 
 // packages/cli/src/services/command-factory.ts
-var debugLogger14 = createDebugLogger("COMMAND_FACTORY");
+var debugLogger15 = createDebugLogger("COMMAND_FACTORY");
 function createSlashCommandFromDefinition(filePath, baseDir, definition, extensionName, fileExtension) {
   const relativePathWithExt = path16.relative(baseDir, filePath);
   const relativePath = relativePathWithExt.substring(
@@ -14835,7 +14834,7 @@ function createSlashCommandFromDefinition(filePath, baseDir, definition, extensi
     whenToUse: definition.whenToUse,
     action: /* @__PURE__ */ __name(async (context, _args) => {
       if (!context.invocation) {
-        debugLogger14.error(
+        debugLogger15.error(
           `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`
         );
         return {
@@ -14873,7 +14872,7 @@ function createSlashCommandFromDefinition(filePath, baseDir, definition, extensi
 __name(createSlashCommandFromDefinition, "createSlashCommandFromDefinition");
 
 // packages/cli/src/services/FileCommandLoader.ts
-var debugLogger15 = createDebugLogger("FILE_COMMAND_LOADER");
+var debugLogger16 = createDebugLogger("FILE_COMMAND_LOADER");
 var TomlCommandDefSchema = external_exports.object({
   prompt: external_exports.string({
     required_error: "The 'prompt' field is required.",
@@ -14907,7 +14906,7 @@ var FileCommandLoader = class {
    */
   async loadCommands(signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger15.debug("Bare mode enabled, skipping auto-discovered commands");
+      debugLogger16.debug("Bare mode enabled, skipping auto-discovered commands");
       return [];
     }
     const allCommands = [];
@@ -14951,7 +14950,7 @@ var FileCommandLoader = class {
         const isEnoent = error.code === "ENOENT";
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (!isEnoent && !isAbortError) {
-          debugLogger15.error(
+          debugLogger16.error(
             `[FileCommandLoader] Error loading commands from ${dirInfo.path}:`,
             error
           );
@@ -15010,7 +15009,7 @@ var FileCommandLoader = class {
         }
       }
     } catch (error) {
-      debugLogger15.warn(
+      debugLogger16.warn(
         `Failed to read extension config for ${ext.name}:`,
         error
       );
@@ -15036,7 +15035,7 @@ var FileCommandLoader = class {
     try {
       fileContent = await fs13.readFile(filePath, "utf-8");
     } catch (error) {
-      debugLogger15.error(
+      debugLogger16.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15046,7 +15045,7 @@ var FileCommandLoader = class {
     try {
       parsed = import_toml.default.parse(fileContent);
     } catch (error) {
-      debugLogger15.error(
+      debugLogger16.error(
         `[FileCommandLoader] Failed to parse TOML file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15054,7 +15053,7 @@ var FileCommandLoader = class {
     }
     const validationResult = TomlCommandDefSchema.safeParse(parsed);
     if (!validationResult.success) {
-      debugLogger15.error(
+      debugLogger16.error(
         `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
         validationResult.error.flatten()
       );
@@ -15081,7 +15080,7 @@ var FileCommandLoader = class {
     try {
       fileContent = await fs13.readFile(filePath, "utf-8");
     } catch (error) {
-      debugLogger15.error(
+      debugLogger16.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15091,7 +15090,7 @@ var FileCommandLoader = class {
     try {
       parsed = parseMarkdownCommand(fileContent);
     } catch (error) {
-      debugLogger15.error(
+      debugLogger16.error(
         `[FileCommandLoader] Failed to parse Markdown file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15099,7 +15098,7 @@ var FileCommandLoader = class {
     }
     const validationResult = MarkdownCommandDefSchema.safeParse(parsed);
     if (!validationResult.success) {
-      debugLogger15.error(
+      debugLogger16.error(
         `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
         validationResult.error.flatten()
       );
@@ -15125,7 +15124,7 @@ var FileCommandLoader = class {
 
 // packages/cli/src/services/saved-workflow-loader.ts
 init_esbuild_shims();
-var debugLogger16 = createDebugLogger("SavedWorkflowLoader");
+var debugLogger17 = createDebugLogger("SavedWorkflowLoader");
 var SavedWorkflowLoader = class {
   constructor(config) {
     this.config = config;
@@ -15144,7 +15143,7 @@ var SavedWorkflowLoader = class {
     try {
       entries = await listSavedWorkflows(this.config);
     } catch (e) {
-      debugLogger16.debug(`listSavedWorkflows failed: ${e}`);
+      debugLogger17.debug(`listSavedWorkflows failed: ${e}`);
       return [];
     }
     if (signal.aborted) return [];
@@ -15460,7 +15459,7 @@ var McpPromptLoader = class {
 // packages/cli/src/services/SkillCommandLoader.ts
 init_esbuild_shims();
 import { dirname as dirname3 } from "node:path";
-var debugLogger17 = createDebugLogger("SKILL_COMMAND_LOADER");
+var debugLogger18 = createDebugLogger("SKILL_COMMAND_LOADER");
 async function recordAutoSkillCommandUsage(config, command) {
   const detail = command.skillDetail;
   if (!config || detail?.level !== "project" || !detail.filePath) {
@@ -15473,7 +15472,7 @@ async function recordAutoSkillCommandUsage(config, command) {
       filePath: detail.filePath
     });
   } catch (error) {
-    debugLogger17.warn(
+    debugLogger18.warn(
       `Failed to record auto-skill command usage: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -15488,12 +15487,12 @@ var SkillCommandLoader = class {
   }
   async loadCommands(_signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger17.debug("Bare mode enabled, skipping skill commands");
+      debugLogger18.debug("Bare mode enabled, skipping skill commands");
       return [];
     }
     const skillManager = this.config?.getSkillManager();
     if (!skillManager) {
-      debugLogger17.debug("SkillManager not available, skipping skill commands");
+      debugLogger18.debug("SkillManager not available, skipping skill commands");
       return [];
     }
     try {
@@ -15510,7 +15509,7 @@ var SkillCommandLoader = class {
       const nonUserInvocableCount = visibleSkills.filter(
         (skill) => skill.userInvocable === false
       ).length;
-      debugLogger17.debug(
+      debugLogger18.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`
       );
       return visibleSkills.map((skill) => {
@@ -15567,52 +15566,12 @@ var SkillCommandLoader = class {
         };
       });
     } catch (error) {
-      debugLogger17.error("Failed to load skill commands:", error);
+      debugLogger18.error("Failed to load skill commands:", error);
       return [];
     }
   }
 };
 
-// packages/cli/src/ui/noninteractive/nonInteractiveUi.ts
-init_esbuild_shims();
-function createNonInteractiveUI() {
-  return {
-    history: [],
-    addItem: /* @__PURE__ */ __name((_item, _timestamp) => 0, "addItem"),
-    clear: /* @__PURE__ */ __name(() => {
-    }, "clear"),
-    setDebugMessage: /* @__PURE__ */ __name((_message) => {
-    }, "setDebugMessage"),
-    loadHistory: /* @__PURE__ */ __name((_newHistory) => {
-    }, "loadHistory"),
-    refreshStatic: /* @__PURE__ */ __name(() => {
-    }, "refreshStatic"),
-    pendingItem: null,
-    setPendingItem: /* @__PURE__ */ __name((_item) => {
-    }, "setPendingItem"),
-    btwItem: null,
-    setBtwItem: /* @__PURE__ */ __name((_item) => {
-    }, "setBtwItem"),
-    cancelBtw: /* @__PURE__ */ __name(() => {
-    }, "cancelBtw"),
-    btwAbortControllerRef: { current: null },
-    isIdleRef: { current: true },
-    toggleVimEnabled: /* @__PURE__ */ __name(async () => false, "toggleVimEnabled"),
-    setGeminiMdFileCount: /* @__PURE__ */ __name((_count) => {
-    }, "setGeminiMdFileCount"),
-    reloadCommands: /* @__PURE__ */ __name(() => {
-    }, "reloadCommands"),
-    setSessionName: /* @__PURE__ */ __name(() => {
-    }, "setSessionName"),
-    extensionsUpdateState: /* @__PURE__ */ new Map(),
-    dispatchExtensionStateUpdate: /* @__PURE__ */ __name((_action) => {
-    }, "dispatchExtensionStateUpdate"),
-    addConfirmUpdateExtensionRequest: /* @__PURE__ */ __name((_request) => {
-    }, "addConfirmUpdateExtensionRequest")
-  };
-}
-__name(createNonInteractiveUI, "createNonInteractiveUI");
-
 // packages/cli/src/utils/userPromptExpansionHook.ts
 init_esbuild_shims();
 function appendUserPromptExpansionAdditionalContext(content, additionalContext) {
@@ -15641,722 +15600,6 @@ function formatUserPromptExpansionBlockedMessage(reason) {
 }
 __name(formatUserPromptExpansionBlockedMessage, "formatUserPromptExpansionBlockedMessage");
 
-// packages/cli/src/nonInteractiveCliCommands.ts
-var debugLogger18 = createDebugLogger("NON_INTERACTIVE_COMMANDS");
-function getSkillCommandName(command) {
-  return command.skillDetail?.name ?? command.name;
-}
-__name(getSkillCommandName, "getSkillCommandName");
-function handleCommandResult(result, outputHistoryItems) {
-  switch (result.type) {
-    case "submit_prompt":
-      return {
-        type: "submit_prompt",
-        content: result.content,
-        ...result.modelOverride ? { modelOverride: result.modelOverride } : {},
-        ...result.refreshContextFilesOnWrite ? { refreshContextFilesOnWrite: true } : {},
-        ...outputHistoryItems?.length ? { outputHistoryItems } : {}
-      };
-    case "message":
-      return {
-        type: "message",
-        messageType: result.messageType,
-        content: result.content,
-        ...outputHistoryItems?.length ? { outputHistoryItems } : {}
-      };
-    case "stream_messages":
-      return {
-        type: "stream_messages",
-        messages: result.messages
-      };
-    case "goal_control":
-      return {
-        type: "goal_control",
-        operation: result.operation,
-        response: result.response
-      };
-    /**
-     * Currently return types below are never generated due to the
-     * whitelist of allowed slash commands in ACP and non-interactive mode.
-     * We'll try to add more supported return types in the future.
-     */
-    case "tool":
-      return {
-        type: "unsupported",
-        reason: "Tool execution from slash commands is not supported in non-interactive mode.",
-        originalType: "tool"
-      };
-    case "quit":
-      return {
-        type: "unsupported",
-        reason: "Quit command is not supported in non-interactive mode. The process will exit naturally after completion.",
-        originalType: "quit"
-      };
-    case "dialog":
-      return {
-        type: "unsupported",
-        reason: `Dialog '${result.dialog}' cannot be opened in non-interactive mode.`,
-        originalType: "dialog"
-      };
-    case "load_history":
-      return {
-        type: "unsupported",
-        reason: "Loading history is not supported in non-interactive mode. Each invocation starts with a fresh context.",
-        originalType: "load_history"
-      };
-    case "confirm_shell_commands":
-      return {
-        type: "unsupported",
-        reason: "Shell command confirmation is not supported in non-interactive mode. Use YOLO mode or pre-approve commands.",
-        originalType: "confirm_shell_commands"
-      };
-    case "confirm_action":
-      return {
-        type: "unsupported",
-        reason: "Action confirmation is not supported in non-interactive mode. Commands requiring confirmation cannot be executed.",
-        originalType: "confirm_action"
-      };
-    default: {
-      const _exhaustive = result;
-      return {
-        type: "unsupported",
-        reason: `Unknown command result type: ${_exhaustive.type}`,
-        originalType: "unknown"
-      };
-    }
-  }
-}
-__name(handleCommandResult, "handleCommandResult");
-async function fireUserPromptExpansionHook(config, commandName, commandArgs, content, signal) {
-  if (config.getDisableAllHooks?.() || !(config.hasHooksForEvent?.("UserPromptExpansion") ?? false)) {
-    return { content };
-  }
-  const hookSystem = config.getHookSystem();
-  if (!hookSystem) {
-    return { content };
-  }
-  const output = await hookSystem.fireUserPromptExpansionEvent(
-    commandName,
-    commandArgs,
-    serializeUserPromptExpansionPrompt(content),
-    signal
-  );
-  if (!output) {
-    return { content };
-  }
-  const blockingError = output.getBlockingError();
-  if (blockingError.blocked || output.shouldStopExecution()) {
-    return {
-      blockedResult: {
-        type: "message",
-        messageType: "error",
-        content: formatUserPromptExpansionBlockedMessage(
-          blockingError.reason || output.getEffectiveReason()
-        )
-      },
-      content
-    };
-  }
-  return {
-    content: appendUserPromptExpansionAdditionalContext(
-      content,
-      output.getAdditionalContext()
-    )
-  };
-}
-__name(fireUserPromptExpansionHook, "fireUserPromptExpansionHook");
-async function registerModelInvocableCommands(commandService, config, executionMode, settings) {
-  if (!settings) {
-    return;
-  }
-  config.setModelInvocableCommandsProvider(
-    () => commandService.getModelInvocableCommands().map((cmd) => ({
-      name: cmd.name,
-      description: cmd.modelDescription ?? cmd.description
-    }))
-  );
-  config.setModelInvocableCommandsExecutor(
-    async (name, args = "") => {
-      const commands = commandService.getModelInvocableCommands();
-      const cmd = commands.find((c) => c.name === name);
-      if (!cmd?.action) return null;
-      const minimalContext = {
-        executionMode,
-        invocation: {
-          raw: args ? `/${name} ${args}` : `/${name}`,
-          name,
-          args
-        },
-        services: { config, settings, logger: null }
-      };
-      const result = await cmd.action(minimalContext, args);
-      if (!result || result.type !== "submit_prompt") return null;
-      const hookSignal = new AbortController().signal;
-      const hookResult = await fireUserPromptExpansionHook(
-        config,
-        name,
-        args,
-        result.content,
-        hookSignal
-      );
-      if (hookResult.blockedResult) {
-        return hookResult.blockedResult.type === "message" ? { error: hookResult.blockedResult.content } : null;
-      }
-      const content = hookResult.content;
-      if (typeof content === "string") return content;
-      if (Array.isArray(content)) {
-        return content.map(
-          (p) => typeof p === "string" ? p : p.text ?? ""
-        ).join("");
-      }
-      return null;
-    }
-  );
-  const skillManager = typeof config.getSkillManager === "function" ? config.getSkillManager() : null;
-  await skillManager?.notifyConfigChanged();
-}
-__name(registerModelInvocableCommands, "registerModelInvocableCommands");
-var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController, config, settings) => {
-  const trimmed = rawQuery.trim();
-  if (!trimmed.startsWith("/")) {
-    return { type: "no_command" };
-  }
-  const isAcpMode = config.getExperimentalZedIntegration();
-  const isInteractive = config.isInteractive();
-  const executionMode = isAcpMode ? "acp" : isInteractive ? "interactive" : "non_interactive";
-  const allLoaders = [
-    new McpPromptLoader(config),
-    new BuiltinCommandLoader(config),
-    new BundledSkillLoader(config),
-    new SkillCommandLoader(config),
-    new SavedWorkflowLoader(config),
-    new FileCommandLoader(config)
-  ];
-  const disabledSlashCommandsRaw = config.getDisabledSlashCommands();
-  const disabledNameSet = /* @__PURE__ */ new Set();
-  for (const name of disabledSlashCommandsRaw) {
-    const trimmed2 = name.trim();
-    if (trimmed2) disabledNameSet.add(trimmed2.toLowerCase());
-  }
-  const isDisabled = /* @__PURE__ */ __name((cmd) => disabledNameSet.has(cmd.name.toLowerCase()) || (cmd.altNames ?? []).some((a) => disabledNameSet.has(a.toLowerCase())), "isDisabled");
-  const allCommandService = await CommandService.create(
-    allLoaders,
-    abortController.signal
-  );
-  const commandService = disabledNameSet.size > 0 ? await CommandService.create(
-    allLoaders,
-    abortController.signal,
-    disabledNameSet
-  ) : allCommandService;
-  await registerModelInvocableCommands(
-    commandService,
-    config,
-    executionMode,
-    settings
-  );
-  const allCommands = allCommandService.getCommands();
-  const filteredCommands = commandService.getCommandsForMode(executionMode).filter((cmd) => !isDisabled(cmd));
-  const { commandToExecute, args } = parseSlashCommand(
-    rawQuery,
-    filteredCommands
-  );
-  const stackedResult = parseStackedSlashCommands(rawQuery, filteredCommands);
-  if (stackedResult.skills.length >= 2) {
-    const combinedContent = [];
-    let firstModelOverride;
-    let refreshContextFilesOnWrite = false;
-    const onCompleteCallbacks = [];
-    const successfulSkillCommands = [];
-    for (const skill of stackedResult.skills) {
-      if (!skill.action) continue;
-      const skillContext = {
-        executionMode,
-        invocation: {
-          raw: `/${skill.name}`,
-          name: skill.name,
-          args: ""
-        },
-        services: { config, settings, logger: null }
-      };
-      const skillResult = await skill.action(skillContext, "");
-      if (skillResult?.type === "submit_prompt") {
-        combinedContent.push(skillResult.content);
-        firstModelOverride ??= skillResult.modelOverride;
-        refreshContextFilesOnWrite ||= Boolean(
-          skillResult.refreshContextFilesOnWrite
-        );
-        if (skillResult.onComplete) {
-          onCompleteCallbacks.push(skillResult.onComplete);
-        }
-      }
-      const succeeded = skillResult?.type === "submit_prompt";
-      recordSkillInvocation(config, {
-        skillName: getSkillCommandName(skill),
-        success: succeeded
-      });
-      if (succeeded) {
-        successfulSkillCommands.push(skill);
-      }
-    }
-    if (stackedResult.remainingText) {
-      combinedContent.push([{ text: stackedResult.remainingText }]);
-    }
-    const mergedContent = combinedContent.flat();
-    const hookResult = await fireUserPromptExpansionHook(
-      config,
-      stackedResult.skills.map((s) => s.name).join(" "),
-      stackedResult.remainingText,
-      mergedContent,
-      abortController.signal
-    );
-    if (hookResult.blockedResult) {
-      return hookResult.blockedResult;
-    }
-    for (const skill of successfulSkillCommands) {
-      void recordAutoSkillCommandUsage(config, skill);
-    }
-    return {
-      type: "submit_prompt",
-      content: hookResult.content,
-      ...firstModelOverride ? { modelOverride: firstModelOverride } : {},
-      ...refreshContextFilesOnWrite ? { refreshContextFilesOnWrite: true } : {},
-      ...onCompleteCallbacks.length ? {
-        onComplete: /* @__PURE__ */ __name(async () => {
-          for (const cb of onCompleteCallbacks) await cb();
-        }, "onComplete")
-      } : {}
-    };
-  }
-  if (!commandToExecute) {
-    const { commandToExecute: knownCommand } = parseSlashCommand(
-      rawQuery,
-      allCommands
-    );
-    if (knownCommand) {
-      const typedToken = rawQuery.trim().substring(1).trim().split(/\s+/)[0] ?? knownCommand.name;
-      if (isDisabled(knownCommand)) {
-        return {
-          type: "unsupported",
-          reason: t(
-            'The command "/{{command}}" is disabled by the current configuration.',
-            { command: typedToken }
-          ),
-          originalType: "filtered_command"
-        };
-      }
-      return {
-        type: "unsupported",
-        reason: t('The command "/{{command}}" is not supported in this mode.', {
-          command: typedToken
-        }),
-        originalType: "filtered_command"
-      };
-    }
-    return { type: "no_command" };
-  }
-  if (!commandToExecute.action) {
-    return { type: "no_command" };
-  }
-  const sessionStats = {
-    sessionId: config?.getSessionId(),
-    sessionStartTime: /* @__PURE__ */ new Date(),
-    metrics: config ? uiTelemetryService.getMetricsForSession(config.getSessionId()) : uiTelemetryService.getMetrics(),
-    lastPromptTokenCount: 0,
-    promptCount: 1
-  };
-  const logger3 = new Logger(config?.getSessionId() || "", config?.storage);
-  const outputHistoryItems = [];
-  const ui = createNonInteractiveUI();
-  ui.addItem = (item) => {
-    outputHistoryItems.push(item);
-    return 0;
-  };
-  const context = {
-    executionMode,
-    services: {
-      config,
-      settings,
-      logger: logger3
-    },
-    ui,
-    session: {
-      stats: sessionStats,
-      sessionShellAllowlist: /* @__PURE__ */ new Set()
-    },
-    invocation: {
-      raw: trimmed,
-      name: commandToExecute.name,
-      args
-    }
-  };
-  const isSkillCommand = commandToExecute.kind === "skill" /* SKILL */;
-  let skillInvocationRecorded = false;
-  const recordSkillCommandInvocation = /* @__PURE__ */ __name((success) => {
-    if (!isSkillCommand || skillInvocationRecorded) {
-      return;
-    }
-    recordSkillInvocation(config, {
-      skillName: getSkillCommandName(commandToExecute),
-      success
-    });
-    skillInvocationRecorded = true;
-  }, "recordSkillCommandInvocation");
-  let result;
-  try {
-    result = await commandToExecute.action(context, args);
-  } catch (error) {
-    recordSkillCommandInvocation(false);
-    throw error;
-  }
-  if (!result) {
-    return {
-      type: "message",
-      messageType: "info",
-      content: "Command executed successfully."
-    };
-  }
-  if (result.type === "submit_prompt") {
-    let hookResult;
-    try {
-      hookResult = await fireUserPromptExpansionHook(
-        config,
-        commandToExecute.name,
-        args,
-        result.content,
-        abortController.signal
-      );
-    } catch (error) {
-      recordSkillCommandInvocation(false);
-      throw error;
-    }
-    if (hookResult.blockedResult) {
-      recordSkillCommandInvocation(false);
-      return hookResult.blockedResult;
-    }
-    recordSkillCommandInvocation(true);
-    void recordAutoSkillCommandUsage(config, commandToExecute);
-    return handleCommandResult(
-      { ...result, content: hookResult.content },
-      outputHistoryItems
-    );
-  }
-  return handleCommandResult(result, outputHistoryItems);
-}, "handleSlashCommand");
-var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mode = "acp", settings) => {
-  try {
-    const loaders = [
-      new McpPromptLoader(config),
-      new BuiltinCommandLoader(config),
-      new BundledSkillLoader(config),
-      new SkillCommandLoader(config),
-      new SavedWorkflowLoader(config),
-      new FileCommandLoader(config)
-    ];
-    const disabledSlashCommands = config.getDisabledSlashCommands();
-    const commandService = await CommandService.create(
-      loaders,
-      abortSignal,
-      disabledSlashCommands.length > 0 ? new Set(disabledSlashCommands) : void 0
-    );
-    await registerModelInvocableCommands(
-      commandService,
-      config,
-      mode,
-      settings
-    );
-    return commandService.getCommandsForMode(mode);
-  } catch (error) {
-    debugLogger18.error("Error loading available commands:", error);
-    return [];
-  }
-}, "getAvailableCommands");
-
-// packages/cli/src/utils/nonInteractiveHelpers.ts
-init_esbuild_shims();
-var debugLogger19 = createDebugLogger("NON_INTERACTIVE");
-function normalizePartList(parts) {
-  if (!parts) {
-    return [];
-  }
-  if (typeof parts === "string") {
-    return [{ text: parts }];
-  }
-  if (Array.isArray(parts)) {
-    return parts.map(
-      (part) => typeof part === "string" ? { text: part } : part
-    );
-  }
-  return [parts];
-}
-__name(normalizePartList, "normalizePartList");
-function extractPartsFromUserMessage(message2) {
-  if (!message2) {
-    return null;
-  }
-  const content = message2.message?.content;
-  if (typeof content === "string") {
-    return content;
-  }
-  if (Array.isArray(content)) {
-    const parts = [];
-    for (const block of content) {
-      if (!block || typeof block !== "object" || !("type" in block)) {
-        continue;
-      }
-      if (block.type === "text" && "text" in block && block.text) {
-        parts.push({ text: block.text });
-      } else {
-        parts.push({ text: JSON.stringify(block) });
-      }
-    }
-    return parts.length > 0 ? parts : null;
-  }
-  return null;
-}
-__name(extractPartsFromUserMessage, "extractPartsFromUserMessage");
-function computeUsageFromMetrics(metrics) {
-  const stats = computeSessionStats(metrics);
-  const { models } = metrics;
-  const totalOutputTokens = Object.values(models).reduce(
-    (acc, model) => acc + model.tokens.candidates,
-    0
-  );
-  const totalTokens = Object.values(models).reduce(
-    (acc, model) => acc + model.tokens.total,
-    0
-  );
-  const usage2 = {
-    input_tokens: stats.totalPromptTokens,
-    output_tokens: totalOutputTokens,
-    cache_read_input_tokens: stats.totalCachedTokens
-  };
-  if (totalTokens > 0) {
-    usage2.total_tokens = totalTokens;
-  }
-  return usage2;
-}
-__name(computeUsageFromMetrics, "computeUsageFromMetrics");
-function buildInitialSystemReminders(config) {
-  const reminders = [];
-  if (config.getApprovalMode() === "plan" /* PLAN */) {
-    reminders.push({ text: getPlanModeSystemReminder(config.getSdkMode?.()) });
-  }
-  const arenaManager = config.getArenaManager?.();
-  if (arenaManager) {
-    try {
-      const sessionDir = arenaManager.getArenaSessionDir();
-      const configPath = `${sessionDir}/config.json`;
-      reminders.push({ text: getArenaSystemReminder(configPath) });
-    } catch {
-    }
-  }
-  return reminders;
-}
-__name(buildInitialSystemReminders, "buildInitialSystemReminders");
-function insertAfterFunctionResponses(parts, additions) {
-  const firstNonFunctionResponse = parts.findIndex(
-    (part) => !part.functionResponse
-  );
-  const insertAt = firstNonFunctionResponse === -1 ? parts.length : firstNonFunctionResponse;
-  return [...parts.slice(0, insertAt), ...additions, ...parts.slice(insertAt)];
-}
-__name(insertAfterFunctionResponses, "insertAfterFunctionResponses");
-async function loadSlashCommandNames(config) {
-  const controller = new AbortController();
-  try {
-    const commands = await getAvailableCommands(
-      config,
-      controller.signal,
-      "non_interactive"
-    );
-    return commands.map((cmd) => cmd.name).sort();
-  } catch (error) {
-    debugLogger19.error(
-      "[buildSystemMessage] Failed to load slash commands:",
-      error
-    );
-    return [];
-  } finally {
-    controller.abort();
-  }
-}
-__name(loadSlashCommandNames, "loadSlashCommandNames");
-async function buildSystemMessage(config, sessionId, permissionMode) {
-  const toolRegistry = config.getToolRegistry();
-  const tools = toolRegistry ? toolRegistry.getAllToolNames() : [];
-  const mcpServers = config.getMcpServers();
-  const mcpServerList = mcpServers ? Object.keys(mcpServers).map((name) => ({
-    name,
-    status: getMCPServerStatus(name)
-  })) : [];
-  const slashCommands = await loadSlashCommandNames(config);
-  let agentNames = [];
-  try {
-    const subagentManager = config.getSubagentManager();
-    const subagents = await subagentManager.listSubagents();
-    agentNames = subagents.map((subagent) => subagent.name);
-  } catch (error) {
-    debugLogger19.error("[buildSystemMessage] Failed to load subagents:", error);
-  }
-  const systemMessage = {
-    type: "system",
-    subtype: "init",
-    uuid: sessionId,
-    session_id: sessionId,
-    cwd: config.getTargetDir(),
-    tools,
-    mcp_servers: mcpServerList,
-    model: config.getModel(),
-    permission_mode: permissionMode,
-    slash_commands: slashCommands,
-    qwen_code_version: config.getCliVersion() || "unknown",
-    agents: agentNames
-  };
-  return systemMessage;
-}
-__name(buildSystemMessage, "buildSystemMessage");
-function isMcpToolProgressData(output) {
-  return typeof output === "object" && output !== null && "type" in output && output.type === "mcp_tool_progress";
-}
-__name(isMcpToolProgressData, "isMcpToolProgressData");
-function createToolProgressHandler(request, adapter) {
-  const handler = /* @__PURE__ */ __name((_callId, output) => {
-    if (isMcpToolProgressData(output) || isShellProgressData(output)) {
-      adapter.emitToolProgress(request, output);
-    }
-  }, "handler");
-  return { handler };
-}
-__name(createToolProgressHandler, "createToolProgressHandler");
-function createAgentToolProgressHandler(config, agentToolCallId, adapter) {
-  const previousTaskStates = /* @__PURE__ */ new Map();
-  const emittedToolUseIds = /* @__PURE__ */ new Set();
-  const emittedToolResultIds = /* @__PURE__ */ new Set();
-  const buildRequest = /* @__PURE__ */ __name((toolCall) => ({
-    callId: toolCall.callId,
-    name: toolCall.name,
-    args: toolCall.args || {},
-    isClientInitiated: true,
-    prompt_id: "",
-    response_id: void 0
-  }), "buildRequest");
-  const buildResponse = /* @__PURE__ */ __name((toolCall) => ({
-    callId: toolCall.callId,
-    error: toolCall.status === "failed" ? new Error(toolCall.error || "Tool execution failed") : void 0,
-    errorType: toolCall.status === "failed" ? "execution_failed" /* EXECUTION_FAILED */ : void 0,
-    resultDisplay: toolCall.resultDisplay,
-    responseParts: toolCall.responseParts || []
-  }), "buildResponse");
-  const hasResultContent = /* @__PURE__ */ __name((toolCall) => {
-    if (typeof toolCall.resultDisplay === "string" && toolCall.resultDisplay.trim().length > 0) {
-      return true;
-    }
-    if (toolCall.responseParts && toolCall.responseParts.length > 0) {
-      return true;
-    }
-    return toolCall.status === "failed";
-  }, "hasResultContent");
-  const emitToolUseIfNeeded = /* @__PURE__ */ __name((toolCall, fallbackStatus) => {
-    if (emittedToolUseIds.has(toolCall.callId)) {
-      return;
-    }
-    const toolCallToEmit = fallbackStatus ? {
-      ...toolCall,
-      status: fallbackStatus
-    } : toolCall;
-    if (toolCallToEmit.status === "executing" || toolCallToEmit.status === "awaiting_approval") {
-      if (adapter.processSubagentToolCall) {
-        adapter.processSubagentToolCall(toolCallToEmit, agentToolCallId);
-        emittedToolUseIds.add(toolCall.callId);
-      }
-    }
-  }, "emitToolUseIfNeeded");
-  const emitToolResultIfNeeded = /* @__PURE__ */ __name((toolCall) => {
-    if (emittedToolResultIds.has(toolCall.callId)) {
-      return;
-    }
-    if (!hasResultContent(toolCall)) {
-      return;
-    }
-    emittedToolResultIds.add(toolCall.callId);
-    const request = buildRequest(toolCall);
-    const response = buildResponse(toolCall);
-    if ("emitToolResult" in adapter && typeof adapter.emitToolResult === "function") {
-      adapter.emitToolResult(request, response, agentToolCallId);
-    } else {
-      adapter.emitToolResult(request, response);
-    }
-  }, "emitToolResultIfNeeded");
-  const processToolCall = /* @__PURE__ */ __name((toolCall, previousCall) => {
-    const isCompleted = toolCall.status === "success" || toolCall.status === "failed";
-    const isExecuting = toolCall.status === "executing" || toolCall.status === "awaiting_approval";
-    const wasExecuting = previousCall && (previousCall.status === "executing" || previousCall.status === "awaiting_approval");
-    if (isExecuting) {
-      emitToolUseIfNeeded(toolCall);
-    } else if (isCompleted && !emittedToolUseIds.has(toolCall.callId)) {
-      emitToolUseIfNeeded(toolCall, "executing");
-    } else if (wasExecuting && isCompleted) {
-      emitToolUseIfNeeded(toolCall, "executing");
-    }
-    if (isCompleted) {
-      emitToolResultIfNeeded(toolCall);
-    }
-  }, "processToolCall");
-  const outputUpdateHandler = /* @__PURE__ */ __name((callId, outputChunk) => {
-    if (typeof outputChunk === "object" && outputChunk !== null && "type" in outputChunk && outputChunk.type === "task_execution") {
-      const taskDisplay = outputChunk;
-      const previous = previousTaskStates.get(callId);
-      if (!adapter.processSubagentToolCall || !adapter.emitSubagentErrorResult) {
-        previousTaskStates.set(callId, taskDisplay);
-        return;
-      }
-      if (taskDisplay.toolCalls) {
-        if (!previous || !previous.toolCalls) {
-          for (const toolCall of taskDisplay.toolCalls) {
-            processToolCall(toolCall);
-          }
-        } else {
-          for (const toolCall of taskDisplay.toolCalls) {
-            const previousCall = previous.toolCalls.find(
-              (tc) => tc.callId === toolCall.callId
-            );
-            processToolCall(toolCall, previousCall);
-          }
-        }
-      }
-      if (taskDisplay.status === "failed" || taskDisplay.status === "cancelled") {
-        const previousStatus = previous?.status;
-        if (previousStatus !== "failed" && previousStatus !== "cancelled" && previousStatus !== void 0) {
-          const errorMessage2 = taskDisplay.terminateReason || (taskDisplay.status === "cancelled" ? "Task was cancelled" : "Task execution failed");
-          adapter.emitSubagentErrorResult(errorMessage2, 0, agentToolCallId);
-        }
-      }
-      if (!previous && taskDisplay.taskPrompt && !config.isInteractive() && (config.getOutputFormat() === "json" /* JSON */ || config.getOutputFormat() === "stream-json" /* STREAM_JSON */)) {
-        adapter.emitUserMessage(
-          [{ text: taskDisplay.taskPrompt }],
-          agentToolCallId
-        );
-      }
-      previousTaskStates.set(callId, taskDisplay);
-    }
-  }, "outputUpdateHandler");
-  return {
-    handler: outputUpdateHandler
-  };
-}
-__name(createAgentToolProgressHandler, "createAgentToolProgressHandler");
-function functionResponsePartsToString(parts) {
-  return parts.map((part) => {
-    if ("functionResponse" in part) {
-      const response = part.functionResponse?.response;
-      const content = response?.["output"] ?? response?.["error"] ?? "";
-      return content;
-    }
-    return JSON.stringify(part);
-  }).join("");
-}
-__name(functionResponsePartsToString, "functionResponsePartsToString");
-
 export {
   MAX_STACKED_SKILLS,
   isStackedSkillCompletableCommand,
@@ -16378,12 +15621,14 @@ export {
   findMidInputSlashCommand,
   getBestSlashCommandMatch,
   findSlashCommandTokens,
+  formatEffortChangeMessage,
   getTranslatedSourceDisplayMap,
   DISPLAY_HOOK_EVENTS,
   supportsMatchers,
   createEmptyHookEventInfo,
   addConfigToMatcherGroup,
   getAllConfigs,
+  isPickerOnlyModelInvocation,
   refreshExtensionContentRuntime,
   dayKey,
   parseDayKey,
@@ -16396,18 +15641,7 @@ export {
   SkillCommandLoader,
   appendUserPromptExpansionAdditionalContext,
   serializeUserPromptExpansionPrompt,
-  formatUserPromptExpansionBlockedMessage,
-  handleSlashCommand,
-  getAvailableCommands,
-  normalizePartList,
-  extractPartsFromUserMessage,
-  computeUsageFromMetrics,
-  buildInitialSystemReminders,
-  insertAfterFunctionResponses,
-  buildSystemMessage,
-  createToolProgressHandler,
-  createAgentToolProgressHandler,
-  functionResponsePartsToString
+  formatUserPromptExpansionBlockedMessage
 };
 /**
  * @license