@qwen-code/qwen-code 0.22.0 → 0.22.2-preview.0

package/chunks/{chunk-PXOJLJ5W.js → chunk-RQAMNZ4Y.js}

@@ -1,5 +1,8 @@
 // Force strict mode and setup for ESM
 "use strict";
+import {
+  contextCommand
+} from "./chunk-XO4NGYRP.js";
 import {
   ExtensionRefreshState,
   clearSkillArgs,
@@ -8,7 +11,7 @@ import {
   staleArgsWarning,
   validateAuthMethod,
   writeSkillArgs
-} from "./chunk-6QSA4JHL.js";
+} from "./chunk-GQAIZL3H.js";
 import {
   calculateCost,
   computeSessionStats,
@@ -17,7 +20,12 @@ import {
   findInlineMathExpressions,
   getSystemInfoFields,
   levelLabel
-} from "./chunk-J5ZDDUKM.js";
+} from "./chunk-DX5FZGHZ.js";
+import {
+  VSCODE_SHIFT_ENTER_SEQUENCE,
+  isWaylandSession,
+  writeOsc52
+} from "./chunk-2FN2HNTI.js";
 import {
   formatDuration,
   formatTokenCount
@@ -25,23 +33,15 @@ import {
 import {
   isKittyProtocolEnabled
 } from "./chunk-NYX53SV4.js";
-import {
-  VSCODE_SHIFT_ENTER_SEQUENCE,
-  isWaylandSession,
-  writeOsc52
-} from "./chunk-DB2OKNTU.js";
-import {
-  contextCommand
-} from "./chunk-7JBHIQS2.js";
 import {
   rollbackStandaloneUpdate
-} from "./chunk-VYC7XFYV.js";
+} from "./chunk-4PLAO7FS.js";
 import {
   themeManager
-} from "./chunk-S3G6YFQC.js";
+} from "./chunk-WEGXPP5E.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-OARZJFZX.js";
+} from "./chunk-BGWT7VBV.js";
 import {
   GITHUB_WORKFLOW_PATHS,
   INSIGHT_CSS,
@@ -54,7 +54,7 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-MQP3MHWN.js";
+} from "./chunk-JJJD6QCC.js";
 import {
   stripUnsafeCharacters,
   toCodePoints,
@@ -62,7 +62,7 @@ import {
 } from "./chunk-E7REAOTN.js";
 import {
   isValidSessionId
-} from "./chunk-TQOF5KBL.js";
+} from "./chunk-ZEZKIS2K.js";
 import {
   formatUnsupportedVoiceModelMessage,
   getVoiceSettingsScope,
@@ -70,16 +70,16 @@ import {
   isVoiceEnabled,
   readVoiceMode,
   readVoiceModel
-} from "./chunk-QJHPWLZC.js";
+} from "./chunk-2MHGD7EE.js";
 import {
   getExtendedSystemInfo,
   getGitVersion,
   getNpmVersion
-} from "./chunk-PHJJ3RVO.js";
+} from "./chunk-7XKW4CVK.js";
 import {
   isInlineModelOverrideAllowed,
   parseAcpModelOption
-} from "./chunk-FVBVJEBG.js";
+} from "./chunk-HOANA6GC.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
   getAllSettingKeys,
@@ -91,12 +91,12 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-6UQSU7CQ.js";
+} from "./chunk-C2BAEV64.js";
 import {
   getCurrentLanguage,
   setLanguageAsync,
   t
-} from "./chunk-OE52YHCZ.js";
+} from "./chunk-W2WRNJKX.js";
 import {
   SUPPORTED_LANGUAGES,
   getSupportedLanguageIds,
@@ -104,11 +104,11 @@ import {
 } from "./chunk-5EJZE3FP.js";
 import {
   getInstallationInfo
-} from "./chunk-DWCKACFL.js";
+} from "./chunk-7DPKPBOQ.js";
 import {
   isFolderTrustEnabled,
   loadTrustedFolders
-} from "./chunk-L4HVF7LM.js";
+} from "./chunk-RQ5ASDFQ.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -129,21 +129,17 @@ import {
   generateSessionRecap,
   getIdeInstaller,
   getMCPServerPrompts,
+  isWsl,
   parseLearnVideoInput,
   readPathFromWorkspace
-} from "./chunk-62JOGZL5.js";
+} from "./chunk-RUQBJS34.js";
 import {
   listSavedWorkflows,
   listWorkflowSnapshots
-} from "./chunk-5HJUPACR.js";
-import {
-  REASONING_EFFORT_TIERS,
-  applyReasoningEffort,
-  normalizeReasoningEffort
-} from "./chunk-KM73TBQ4.js";
+} from "./chunk-LRLMDV5X.js";
 import {
   resolveOpenAILogDir
-} from "./chunk-EFB657PR.js";
+} from "./chunk-OX44MOAN.js";
 import {
   ArenaManager,
   ConditionalRulesRegistry,
@@ -169,6 +165,7 @@ import {
   ideContextStore,
   isActiveWorkflowStatus,
   isExtensionCommittedWithWarningsError,
+  isImageGenerationCapable,
   isSignalTermination,
   isSuccessStatus,
   isTerminalStatus,
@@ -184,13 +181,15 @@ import {
   resolveSlimmingConfig,
   runForkedAgent,
   tryGenerateSessionTitle
-} from "./chunk-T6XLJRQY.js";
+} from "./chunk-D6XO27Z5.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
 import {
-  resolveModelId
-} from "./chunk-7DYNJFES.js";
+  buildRuntimeSnapshotId,
+  resolveModelId,
+  stripRuntimeSnapshotPrefix
+} from "./chunk-AYVIGUUK.js";
 import {
   getAutoSkillCuratorStatus,
   parse,
@@ -198,34 +197,39 @@ import {
   restoreArchivedAutoSkill,
   runAutoSkillCurator,
   setAutoSkillPinned
-} from "./chunk-VUMLT7E5.js";
+} from "./chunk-5Y2JCJAH.js";
 import {
   HookEventName,
   sanitizeUserPromptExpansionAdditionalContext
-} from "./chunk-ISJMN3ML.js";
+} from "./chunk-T2CRBIDJ.js";
 import {
   canUseRipgrep
-} from "./chunk-XLDFW44M.js";
+} from "./chunk-77TOMRBG.js";
 import {
   glob
-} from "./chunk-Q54XG7IX.js";
+} from "./chunk-DEYPMJPD.js";
 import {
   checkArgumentSafety,
   checkCommandPermissions,
   escapeShellArg,
   getShellConfiguration
-} from "./chunk-FEMQ6Y7W.js";
+} from "./chunk-T6OODF2U.js";
 import {
   GoalPersistenceUnavailableError,
   emptyGoalSnapshot,
   projectUserTranscriptForDisplay
-} from "./chunk-LDGWX737.js";
+} from "./chunk-FN5C6C7G.js";
 import {
   APPROVAL_MODES
-} from "./chunk-VLRBJ24J.js";
+} from "./chunk-BVE5EMIG.js";
 import {
   openBrowserSecurely
 } from "./chunk-NAVJD2PQ.js";
+import {
+  REASONING_EFFORT_TIERS,
+  applyReasoningEffort,
+  normalizeReasoningEffort
+} from "./chunk-2LD5U7Q3.js";
 import {
   COMBINED_PASS_TOLERANCE_FACTOR,
   IdeConnectionEvent,
@@ -238,34 +242,37 @@ import {
   read,
   recordSkillInvocation,
   uiTelemetryService
-} from "./chunk-FDD2IUEL.js";
+} from "./chunk-UX3IFLJM.js";
 import {
   getCurrentGeminiMdFilename
-} from "./chunk-IWOWEENB.js";
+} from "./chunk-WBT3STGU.js";
 import {
   getAutoMemoryRoot
-} from "./chunk-HIK2OF33.js";
+} from "./chunk-PVBT5QPD.js";
 import {
   runSideQuery
-} from "./chunk-ZRYQMWEP.js";
+} from "./chunk-IPQA4SR5.js";
+import {
+  AuthType
+} from "./chunk-GTUKW3I6.js";
 import {
   normalizeContent,
   redactUrlCredentials
-} from "./chunk-GAHYKJPV.js";
+} from "./chunk-6US7BF3G.js";
 import {
   FORK_SUBAGENT_TYPE,
   stripStartupContext
-} from "./chunk-WZDM44SB.js";
+} from "./chunk-JUIJ3FXC.js";
 import {
   applySkillAllowedTools,
   buildSkillLlmContent
-} from "./chunk-K623ENWT.js";
+} from "./chunk-E6FGMDFQ.js";
 import {
   ToolDisplayNamesMigration,
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-6NFAEG54.js";
+} from "./chunk-KOJ6MHD5.js";
 import {
   Storage,
   createDebugLogger,
@@ -274,12 +281,12 @@ import {
   isSubpath,
   resolvePath,
   updateSymlink
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-2NNTE2ED.js";
 import {
   isCpuProfileRecording,
   startCpuProfile,
   stopCpuProfile
-} from "./chunk-VEND4KA4.js";
+} from "./chunk-YT5XN3HV.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -292,7 +299,7 @@ import {
 init_esbuild_shims();
 import { spawn } from "node:child_process";
 
-// packages/cli/src/utils/commands.ts
+// packages/cli/src/ui/commands/commands.ts
 init_esbuild_shims();
 var MAX_STACKED_SKILLS = 5;
 var isStackedSkillCompletableCommand = /* @__PURE__ */ __name((command) => command.kind === "skill" /* SKILL */ && command.userInvocable !== false && !command.hidden, "isStackedSkillCompletableCommand");
@@ -641,12 +648,163 @@ function findSlashCommandTokens(text, commands) {
 }
 __name(findSlashCommandTokens, "findSlashCommandTokens");
 
+// packages/cli/src/acp-integration/session-model-persistence.ts
+init_esbuild_shims();
+var debugLogger2 = createDebugLogger("SESSION_MODEL");
+var AUTH_TYPES = new Set(Object.values(AuthType));
+function isAuthType(value) {
+  return AUTH_TYPES.has(value);
+}
+__name(isAuthType, "isAuthType");
+function registryHonoredBaseUrl(config, authType, modelId, baseUrl) {
+  if (typeof baseUrl !== "string" || !baseUrl) {
+    return void 0;
+  }
+  return config.getResolvedModelConfig?.(authType, modelId, baseUrl) ? baseUrl : void 0;
+}
+__name(registryHonoredBaseUrl, "registryHonoredBaseUrl");
+async function recordDaemonSessionModel(config, payload) {
+  const recording = config.getChatRecordingService?.();
+  if (!recording?.recordSessionModel) return;
+  try {
+    await recording.recordSessionModel(payload);
+  } catch (error) {
+    debugLogger2.debug("recordSessionModel failed", error);
+  }
+}
+__name(recordDaemonSessionModel, "recordDaemonSessionModel");
+async function recordDaemonSessionModelFromConfig(config) {
+  const modelId = config.getModel()?.trim();
+  const authType = config.getAuthType();
+  if (!modelId || !authType) return;
+  const snapshot = config.getActiveRuntimeModelSnapshot?.();
+  const registryBaseUrl = snapshot ? void 0 : config.getCurrentModelRegistryBaseUrl?.();
+  await recordDaemonSessionModel(config, {
+    modelId,
+    authType,
+    ...typeof registryBaseUrl === "string" ? { baseUrl: registryBaseUrl } : {},
+    ...snapshot ? { isRuntime: true } : {}
+  });
+}
+__name(recordDaemonSessionModelFromConfig, "recordDaemonSessionModelFromConfig");
+function hasMatchingRuntimeSnapshot(config, authType, modelId) {
+  const snapshot = config.getActiveRuntimeModelSnapshot?.();
+  return snapshot?.authType === authType && snapshot.modelId === modelId;
+}
+__name(hasMatchingRuntimeSnapshot, "hasMatchingRuntimeSnapshot");
+function liveAuthType(config) {
+  return config.getAuthType() ?? config.getModelsConfig?.()?.getCurrentAuthType?.();
+}
+__name(liveAuthType, "liveAuthType");
+function runtimeSnapshotIdentity(snapshot) {
+  if (!snapshot) return void 0;
+  if (typeof snapshot.id === "string" && snapshot.id) {
+    return snapshot.id;
+  }
+  if (snapshot.authType && snapshot.modelId) {
+    return buildRuntimeSnapshotId(snapshot.authType, snapshot.modelId);
+  }
+  return void 0;
+}
+__name(runtimeSnapshotIdentity, "runtimeSnapshotIdentity");
+function recordedRouteMatches(recorded, currentRegistryBaseUrl) {
+  if (!recorded || recorded.isRuntime) return true;
+  const targetBaseUrl = recorded.baseUrl;
+  if (targetBaseUrl === void 0) {
+    return currentRegistryBaseUrl === null || currentRegistryBaseUrl === void 0;
+  }
+  if (targetBaseUrl === "") {
+    return currentRegistryBaseUrl === null || currentRegistryBaseUrl === void 0 || currentRegistryBaseUrl === "";
+  }
+  return currentRegistryBaseUrl === targetBaseUrl;
+}
+__name(recordedRouteMatches, "recordedRouteMatches");
+async function applyRestoredSessionModel(config, projection) {
+  const recorded = projection?.runtime.recording.sessionModel;
+  const fallbackModel = projection?.runtime.recording.lastAssistantModel;
+  const recordedAuth = recorded?.authType?.trim();
+  const authType = (recordedAuth && isAuthType(recordedAuth) ? recordedAuth : liveAuthType(config))?.trim();
+  const modelId = recorded?.modelId || fallbackModel;
+  if (!modelId?.trim() || !authType || !isAuthType(authType)) return;
+  const currentModel = stripRuntimeSnapshotPrefix(config.getModel() ?? "");
+  const currentAuth = liveAuthType(config);
+  const targetModel = stripRuntimeSnapshotPrefix(modelId.trim());
+  const targetBaseUrl = recorded?.isRuntime ? void 0 : registryHonoredBaseUrl(config, authType, targetModel, recorded?.baseUrl);
+  const recordedRoute = recorded ? {
+    ...recorded,
+    ...targetBaseUrl ? { baseUrl: targetBaseUrl } : { baseUrl: void 0 }
+  } : void 0;
+  const currentRegistryBaseUrl = config.getCurrentModelRegistryBaseUrl?.();
+  const baseUrlMatches = recordedRouteMatches(
+    recordedRoute,
+    currentRegistryBaseUrl
+  );
+  const currentRuntimeMatches = hasMatchingRuntimeSnapshot(
+    config,
+    authType,
+    targetModel
+  );
+  if (currentModel === targetModel && currentAuth === authType && baseUrlMatches && !(recorded && !recorded.isRuntime && currentRuntimeMatches)) {
+    return;
+  }
+  const useRuntimeSnapshot = Boolean(recorded?.isRuntime) && hasMatchingRuntimeSnapshot(config, authType, targetModel);
+  const switchModelId = useRuntimeSnapshot ? buildRuntimeSnapshotId(authType, targetModel) : targetModel;
+  const requireCachedCredentials = authType === "qwen-oauth" /* QWEN_OAUTH */ && currentAuth !== authType;
+  const switchOptions = targetBaseUrl || requireCachedCredentials ? {
+    ...targetBaseUrl ? { baseUrl: targetBaseUrl } : {},
+    ...requireCachedCredentials ? { requireCachedCredentials: true } : {}
+  } : void 0;
+  try {
+    await config.switchModel(authType, switchModelId, switchOptions);
+  } catch (error) {
+    debugLogger2.warn(
+      `restore session model failed (${targetModel}/${authType}): ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+__name(applyRestoredSessionModel, "applyRestoredSessionModel");
+async function restoreSessionModelThenAuthenticate(config, projection, authenticate) {
+  const originalAuth = liveAuthType(config);
+  const originalModel = config.getModel();
+  const originalBaseUrl = config.getCurrentModelRegistryBaseUrl?.();
+  const originalRuntimeSnapshot = config.getActiveRuntimeModelSnapshot?.();
+  await applyRestoredSessionModel(config, projection);
+  try {
+    await authenticate();
+  } catch (error) {
+    if (liveAuthType(config) === originalAuth && config.getModel() === originalModel && (config.getCurrentModelRegistryBaseUrl?.() ?? void 0) === (originalBaseUrl ?? void 0) && runtimeSnapshotIdentity(config.getActiveRuntimeModelSnapshot?.()) === runtimeSnapshotIdentity(originalRuntimeSnapshot)) {
+      throw error;
+    }
+    debugLogger2.warn(
+      "restored session model made authentication fail; retrying with settings model"
+    );
+    if (!originalAuth || !originalModel) {
+      throw error;
+    }
+    const rollbackModelId = originalRuntimeSnapshot?.authType === originalAuth && originalRuntimeSnapshot.modelId === stripRuntimeSnapshotPrefix(originalModel) ? buildRuntimeSnapshotId(
+      originalAuth,
+      stripRuntimeSnapshotPrefix(originalModel)
+    ) : originalModel;
+    try {
+      await config.switchModel(
+        originalAuth,
+        rollbackModelId,
+        typeof originalBaseUrl === "string" ? { baseUrl: originalBaseUrl } : void 0
+      );
+    } catch {
+      throw error;
+    }
+    await authenticate();
+  }
+}
+__name(restoreSessionModelThenAuthenticate, "restoreSessionModelThenAuthenticate");
+
 // packages/cli/src/nonInteractiveCliCommands.ts
 init_esbuild_shims();
 
 // packages/cli/src/services/CommandService.ts
 init_esbuild_shims();
-var debugLogger2 = createDebugLogger("CLI_COMMANDS");
+var debugLogger3 = createDebugLogger("CLI_COMMANDS");
 var CommandService = class _CommandService {
   /**
    * Private constructor to enforce the use of the async factory.
@@ -690,7 +848,7 @@ var CommandService = class _CommandService {
       if (result.status === "fulfilled") {
         allCommands.push(...result.value);
       } else {
-        debugLogger2.debug("A command loader failed:", result.reason);
+        debugLogger3.debug("A command loader failed:", result.reason);
       }
     }
     const commandMap = /* @__PURE__ */ new Map();
@@ -777,7 +935,7 @@ init_esbuild_shims();
 init_esbuild_shims();
 import fs from "node:fs/promises";
 import path from "node:path";
-var debugLogger3 = createDebugLogger("SESSION_PATHS");
+var debugLogger4 = createDebugLogger("SESSION_PATHS");
 var OPENAI_LOG_SCAN_LIMIT = 100;
 async function collectSessionPathInfo(context) {
   const config = context.services.config;
@@ -849,7 +1007,7 @@ async function findLatestOpenAILogForSession(logDir, sessionId) {
       if (error instanceof SyntaxError || error.code === "ENOENT") {
         continue;
       }
-      debugLogger3.warn("Error reading OpenAI log file", file, error);
+      debugLogger4.warn("Error reading OpenAI log file", file, error);
     }
   }
   return void 0;
@@ -868,7 +1026,7 @@ async function listLogFiles(dir, predicate) {
     return files;
   } catch (error) {
     if (error.code !== "ENOENT") {
-      debugLogger3.warn("Unable to list OpenAI log directory", dir, error);
+      debugLogger4.warn("Unable to list OpenAI log directory", dir, error);
     }
     return [];
   }
@@ -1683,7 +1841,7 @@ function parseArenaArgs(args) {
   return { models, task };
 }
 __name(parseArenaArgs, "parseArenaArgs");
-var debugLogger4 = createDebugLogger("ARENA_COMMAND");
+var debugLogger5 = createDebugLogger("ARENA_COMMAND");
 function buildArenaExecutionInput(parsed, config) {
   if (!parsed.task) {
     return {
@@ -1760,7 +1918,7 @@ function recordArenaItem(config, item) {
       outputHistoryItems: [{ ...item }]
     });
   } catch {
-    debugLogger4.error("Failed to record arena history item");
+    debugLogger5.error("Failed to record arena history item");
   }
 }
 __name(recordArenaItem, "recordArenaItem");
@@ -1770,7 +1928,7 @@ function executeArenaCommand(config, ui, input) {
     const fullHistory = config.getGeminiClient().getChat().getHistoryShallow();
     chatHistory = stripStartupContext(fullHistory);
   } catch {
-    debugLogger4.debug("Could not retrieve chat history for arena agents");
+    debugLogger5.debug("Could not retrieve chat history for arena agents");
   }
   const manager = new ArenaManager(config);
   const emitter = manager.getEventEmitter();
@@ -1800,7 +1958,7 @@ function executeArenaCommand(config, ui, input) {
   }, "handleSessionStart");
   const handleAgentStart = /* @__PURE__ */ __name((event) => {
     agentLabels.set(event.agentId, event.model.modelId);
-    debugLogger4.debug(
+    debugLogger5.debug(
       `Arena agent started: ${event.model.modelId} (${event.agentId})`
     );
   }, "handleAgentStart");
@@ -1917,12 +2075,12 @@ function executeArenaCommand(config, ui, input) {
     chatHistory
   }).then(
     () => {
-      debugLogger4.debug("Arena agents settled");
+      debugLogger5.debug("Arena agents settled");
     },
     (error) => {
       const message2 = error instanceof Error ? error.message : String(error);
       addAndRecordArenaMessage("error" /* ERROR */, `${message2}`);
-      debugLogger4.error("Arena session failed:", error);
+      debugLogger5.error("Arena session failed:", error);
       config.setArenaManager(null);
       for (const detach of detachListeners) {
         detach();
@@ -2277,7 +2435,7 @@ var approvalModeCommand = {
         };
       }
     }
-    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-ZNMIGBTN.js") : void 0;
+    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-VBT3NKDM.js") : void 0;
     if (config) {
       try {
         config.setApprovalMode(mode);
@@ -3132,7 +3290,7 @@ __name(buildBackgroundWorkBlockedMessage, "buildBackgroundWorkBlockedMessage");
 
 // packages/cli/src/ui/commands/clearCommand.ts
 import process2 from "node:process";
-var debugLogger5 = createDebugLogger("CLEAR_COMMAND");
+var debugLogger6 = createDebugLogger("CLEAR_COMMAND");
 var clearCommand = {
   name: "clear",
   altNames: ["reset", "new"],
@@ -3144,8 +3302,8 @@ var clearCommand = {
   action: /* @__PURE__ */ __name(async (context, _args) => {
     const { config } = context.services;
     const memBefore = process2.memoryUsage();
-    if (debugLogger5.isEnabled()) {
-      debugLogger5.debug(
+    if (debugLogger6.isEnabled()) {
+      debugLogger6.debug(
         `[CLEAR_START] Starting clear command, heapUsed=${(memBefore.heapUsed / 1024 / 1024).toFixed(1)}MB, rss=${(memBefore.rss / 1024 / 1024).toFixed(1)}MB`
       );
     }
@@ -3206,10 +3364,10 @@ var clearCommand = {
       context.ui.clear();
     }
     const memAfter = process2.memoryUsage();
-    if (debugLogger5.isEnabled()) {
+    if (debugLogger6.isEnabled()) {
       const heapDiff = (memAfter.heapUsed - memBefore.heapUsed) / 1024 / 1024;
       const rssDiff = (memAfter.rss - memBefore.rss) / 1024 / 1024;
-      debugLogger5.debug(
+      debugLogger6.debug(
         `[CLEAR_END] Clear command completed, heapUsed=${(memAfter.heapUsed / 1024 / 1024).toFixed(1)}MB, rss=${(memAfter.rss / 1024 / 1024).toFixed(1)}MB, heapDiff=${heapDiff.toFixed(1)}MB, rssDiff=${rssDiff.toFixed(1)}MB`
       );
     }
@@ -3570,6 +3728,7 @@ 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"],
@@ -3648,7 +3807,7 @@ var compressCommand = {
           }
           yield {
             messageType: "info",
-            content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).` + (compressed.warning ? `
+            content: `Context compressed (${formatTokenCount2(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount2(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).` + (compressed.warning ? `
 \u26A0\uFE0F ${compressed.warning}` : "")
           };
         } catch (e) {
@@ -3702,7 +3861,9 @@ var compressCommand = {
               originalTokenCount: compressed.originalTokenCount,
               newTokenCount: compressed.newTokenCount,
               compressionStatus: compressed.compressionStatus,
-              compressionKind: "summarize"
+              compressionKind: "summarize",
+              originalTokenCountIsEstimated: compressed.originalTokenCountIsEstimated,
+              newTokenCountIsEstimated: compressed.newTokenCountIsEstimated
             }
           },
           Date.now()
@@ -3718,7 +3879,7 @@ var compressCommand = {
       return {
         type: "message",
         messageType: "info",
-        content: `${truncationNotice ? `${truncationNotice} ` : ""}Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).` + (compressed.warning ? `
+        content: `${truncationNotice ? `${truncationNotice} ` : ""}Context compressed (${formatTokenCount2(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount2(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).` + (compressed.warning ? `
 \u26A0\uFE0F ${compressed.warning}` : "")
       };
     } catch (e) {
@@ -3754,6 +3915,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 compressFastCommand = {
   name: "compress-fast",
   get description() {
@@ -3819,7 +3981,7 @@ var compressFastCommand = {
           }
           yield {
             messageType: "info",
-            content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).`
+            content: `Context compressed (${formatTokenCount3(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount3(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).`
           };
         } catch (e) {
           yield {
@@ -3863,7 +4025,9 @@ var compressFastCommand = {
               originalTokenCount: compressed.originalTokenCount,
               newTokenCount: compressed.newTokenCount,
               compressionStatus: compressed.compressionStatus,
-              compressionKind: "fast"
+              compressionKind: "fast",
+              originalTokenCountIsEstimated: compressed.originalTokenCountIsEstimated,
+              newTokenCountIsEstimated: compressed.newTokenCountIsEstimated
             }
           },
           Date.now()
@@ -3873,7 +4037,7 @@ var compressFastCommand = {
       return {
         type: "message",
         messageType: "info",
-        content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).`
+        content: `Context compressed (${formatTokenCount3(compressed.originalTokenCount, compressed.originalTokenCountIsEstimated)} -> ${formatTokenCount3(compressed.newTokenCount, compressed.newTokenCountIsEstimated)}).`
       };
     } catch (e) {
       if (executionMode === "interactive") {
@@ -4572,7 +4736,7 @@ var docsCommand = {
 // packages/cli/src/ui/commands/doctorCommand.ts
 init_esbuild_shims();
 
-// packages/cli/src/utils/doctorChecks.ts
+// packages/cli/src/ui/commands/doctorChecks.ts
 init_esbuild_shims();
 import process4 from "node:process";
 import os from "node:os";
@@ -5320,7 +5484,7 @@ function formatMemoryDiagnostics(diagnostics) {
 __name(formatMemoryDiagnostics, "formatMemoryDiagnostics");
 
 // packages/cli/src/ui/commands/doctorCommand.ts
-var debugLogger6 = createDebugLogger("DOCTOR_MEMORY");
+var debugLogger7 = createDebugLogger("DOCTOR_MEMORY");
 var MEMORY_SUBCOMMAND = "memory";
 var CPU_PROFILE_SUBCOMMAND = "cpu-profile";
 var ROLLBACK_SUBCOMMAND = "rollback";
@@ -5734,7 +5898,7 @@ function collectToolResultRetention(context) {
       presentInCompressionInput: stats.oversizedResultCount > 0
     };
   } catch (error) {
-    debugLogger6.warn(
+    debugLogger7.warn(
       `Tool result retention diagnostics unavailable: ${formatErrorMessage2(error)}`
     );
     return null;
@@ -6083,7 +6247,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 debugLogger7 = createDebugLogger("EXPORT_COMMAND");
+var debugLogger8 = createDebugLogger("EXPORT_COMMAND");
 function formatExportTargetContext(target) {
   return `target: "${target.outputDir}", cwd: "${target.resolvedCwd}"`;
 }
@@ -6112,7 +6276,7 @@ function resolveExportTarget(cwd, args, extension) {
 }
 __name(resolveExportTarget, "resolveExportTarget");
 async function validateExportTargetWithinCwd(target) {
-  debugLogger7.debug(
+  debugLogger8.debug(
     "Validating export target realpath:",
     formatExportTargetContext(target)
   );
@@ -6125,7 +6289,7 @@ async function validateExportTargetWithinCwd(target) {
     ]);
   } catch (error) {
     if (error.code === "ENOENT") {
-      debugLogger7.debug(
+      debugLogger8.debug(
         "Export target realpath validation failed: missing path",
         formatExportTargetContext(target)
       );
@@ -6140,7 +6304,7 @@ async function validateExportTargetWithinCwd(target) {
     throw error;
   }
   if (!isSubpath(realCwd, realOutputDir)) {
-    debugLogger7.debug("Export target realpath escaped cwd:", {
+    debugLogger8.debug("Export target realpath escaped cwd:", {
       realCwd,
       realOutputDir,
       target
@@ -6158,21 +6322,21 @@ async function validateExportTargetWithinCwd(target) {
 __name(validateExportTargetWithinCwd, "validateExportTargetWithinCwd");
 async function realpathNearestExisting(outputDir, resolvedCwd) {
   let currentPath = outputDir;
-  debugLogger7.debug("Resolving nearest existing export parent:", {
+  debugLogger8.debug("Resolving nearest existing export parent:", {
     outputDir,
     resolvedCwd
   });
   while (isSubpath(resolvedCwd, currentPath)) {
     try {
       const realCurrentPath = await fs5.realpath(currentPath);
-      debugLogger7.debug("Resolved nearest existing export parent:", {
+      debugLogger8.debug("Resolved nearest existing export parent:", {
         currentPath,
         realCurrentPath
       });
       return realCurrentPath;
     } catch (error) {
       if (error.code !== "ENOENT") {
-        debugLogger7.debug("Failed to resolve existing export parent:", error);
+        debugLogger8.debug("Failed to resolve existing export parent:", error);
         throw error;
       }
       const parentPath = path5.dirname(currentPath);
@@ -6186,7 +6350,7 @@ async function realpathNearestExisting(outputDir, resolvedCwd) {
 }
 __name(realpathNearestExisting, "realpathNearestExisting");
 async function validateExistingExportParentWithinCwd(target) {
-  debugLogger7.debug(
+  debugLogger8.debug(
     "Validating existing export parent realpath:",
     formatExportTargetContext(target)
   );
@@ -6204,7 +6368,7 @@ async function validateExistingExportParentWithinCwd(target) {
     target.resolvedCwd
   );
   if (!isSubpath(realCwd, realExistingParent)) {
-    debugLogger7.debug("Existing export parent escaped cwd:", {
+    debugLogger8.debug("Existing export parent escaped cwd:", {
       realCwd,
       realExistingParent,
       target
@@ -6240,7 +6404,7 @@ async function exportSessionAction(context, args, exportFormat) {
   }
   const target = resolveExportTarget(cwd, args, exportFormat.extension);
   const targetFilepath = target.filepath;
-  debugLogger7.debug("Resolved export target:", {
+  debugLogger8.debug("Resolved export target:", {
     format: exportFormat.displayName,
     cwd,
     outputDirArg: args.trim(),
@@ -6249,7 +6413,7 @@ async function exportSessionAction(context, args, exportFormat) {
     filepath: target.filepath
   });
   if (!target.isInsideCwd) {
-    debugLogger7.debug(
+    debugLogger8.debug(
       "Export target rejected before realpath validation:",
       formatExportTargetContext(target)
     );
@@ -6266,17 +6430,17 @@ async function exportSessionAction(context, args, exportFormat) {
     if (initialValidationError) {
       return initialValidationError;
     }
-    debugLogger7.debug("Export target validation passed:", {
+    debugLogger8.debug("Export target validation passed:", {
       format: exportFormat.displayName,
       outputDir: target.outputDir,
       outputDirKind: target.outputDirKind
     });
     const sessionService = new SessionService(cwd);
     const sessionId = config.getSessionId();
-    debugLogger7.debug("Loading session for export:", { sessionId, cwd });
+    debugLogger8.debug("Loading session for export:", { sessionId, cwd });
     const sessionData = await sessionService.loadSession(sessionId);
     if (!sessionData) {
-      debugLogger7.debug("No active session found for export:", {
+      debugLogger8.debug("No active session found for export:", {
         sessionId,
         cwd
       });
@@ -6296,12 +6460,12 @@ async function exportSessionAction(context, args, exportFormat) {
     const content = exportFormat.format(normalizedData);
     if (target.outputDirKind === "custom") {
       try {
-        debugLogger7.debug("Creating export directory:", {
+        debugLogger8.debug("Creating export directory:", {
           outputDir: target.outputDir
         });
         await fs5.mkdir(target.outputDir, { recursive: true, mode: 448 });
       } catch (error) {
-        debugLogger7.debug("Failed to create export directory:", error);
+        debugLogger8.debug("Failed to create export directory:", error);
         return {
           type: "message",
           messageType: "error",
@@ -6315,7 +6479,7 @@ async function exportSessionAction(context, args, exportFormat) {
         return writeValidationError;
       }
     } catch (error) {
-      debugLogger7.debug("Export path validation failed before write:", error);
+      debugLogger8.debug("Export path validation failed before write:", error);
       return {
         type: "message",
         messageType: "error",
@@ -6323,7 +6487,7 @@ async function exportSessionAction(context, args, exportFormat) {
       };
     }
     try {
-      debugLogger7.debug("Writing export file:", {
+      debugLogger8.debug("Writing export file:", {
         format: exportFormat.displayName,
         filepath: target.filepath
       });
@@ -6332,17 +6496,17 @@ async function exportSessionAction(context, args, exportFormat) {
         mode: 384
       });
       await fs5.chmod(target.filepath, 384).catch((error) => {
-        debugLogger7.debug("Failed to tighten export file permissions:", error);
+        debugLogger8.debug("Failed to tighten export file permissions:", error);
       });
     } catch (error) {
-      debugLogger7.debug("Failed to write export file:", error);
+      debugLogger8.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}")`
       };
     }
-    debugLogger7.debug("Session export completed:", {
+    debugLogger8.debug("Session export completed:", {
       format: exportFormat.displayName,
       filepath: target.filepath
     });
@@ -6352,7 +6516,7 @@ async function exportSessionAction(context, args, exportFormat) {
       content: `Session exported to ${exportFormat.displayName}: ${target.displayPath}`
     };
   } catch (error) {
-    debugLogger7.debug("Session export failed:", {
+    debugLogger8.debug("Session export failed:", {
       format: exportFormat.displayName,
       target,
       error
@@ -6448,7 +6612,7 @@ var exportCommand = {
 
 // packages/cli/src/ui/commands/forkCommand.ts
 init_esbuild_shims();
-var debugLogger8 = createDebugLogger("FORK_COMMAND");
+var debugLogger9 = createDebugLogger("FORK_COMMAND");
 function deriveForkDescription(directive) {
   const oneLine = directive.replace(/\s+/g, " ").trim();
   return oneLine.length > 60 ? `${oneLine.slice(0, 57)}\u2026` : oneLine;
@@ -6504,7 +6668,7 @@ var forkCommand = {
     try {
       hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
     } catch (error) {
-      debugLogger8.debug("Failed to read history before /fork:", error);
+      debugLogger9.debug("Failed to read history before /fork:", error);
       hasHistory = false;
     }
     if (!hasHistory) {
@@ -6564,7 +6728,7 @@ var forkCommand = {
         ]
       });
     } catch (error) {
-      debugLogger8.debug("Failed to record fork event in history:", error);
+      debugLogger9.debug("Failed to record fork event in history:", error);
     }
     return {
       type: "message",
@@ -6578,7 +6742,7 @@ var forkCommand = {
 
 // packages/cli/src/ui/commands/extensionsCommand.ts
 init_esbuild_shims();
-var debugLogger9 = createDebugLogger("EXTENSIONS_COMMAND");
+var debugLogger10 = createDebugLogger("EXTENSIONS_COMMAND");
 var EXTENSION_EXPLORE_URL = {
   Gemini: "https://geminicli.com/extensions/",
   ClaudeCode: "https://claudemarketplaces.com/"
@@ -6741,7 +6905,7 @@ async function installAction(context, args) {
   }
   const extensionManager = context.services.config?.getExtensionManager();
   if (!(extensionManager instanceof ExtensionManager)) {
-    debugLogger9.error(
+    debugLogger10.error(
       `Cannot ${context.invocation?.name} extensions in this environment`
     );
     return;
@@ -7075,7 +7239,7 @@ var expandNowCommand = {
         content: t("History is already expanded in this session.")
       };
     }
-    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-DDSBAQJS.js");
+    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-GFPJD2XB.js");
     const updated = expandCollapsedHistory(history);
     loadHistory(updated);
     refreshStatic();
@@ -8609,7 +8773,7 @@ Write the complete content to the \`${contextFileName}\` file. The output must b
 
 // packages/cli/src/ui/commands/languageCommand.ts
 init_esbuild_shims();
-var debugLogger10 = createDebugLogger("LANGUAGE_COMMAND");
+var debugLogger11 = createDebugLogger("LANGUAGE_COMMAND");
 function getCurrentOutputLanguage(context) {
   const settingValue = context?.services?.settings?.merged?.general?.outputLanguage || OUTPUT_LANGUAGE_AUTO;
   const resolved = resolveOutputLanguageOrPreserveAuto(settingValue);
@@ -8677,7 +8841,7 @@ async function setUiLanguage(context, lang, scope = "User" /* User */) {
         throwOnWriteFailure: true
       });
     } catch (error) {
-      debugLogger10.warn("Failed to save language setting:", error);
+      debugLogger11.warn("Failed to save language setting:", error);
       return {
         type: "message",
         messageType: "error",
@@ -8713,7 +8877,7 @@ async function setOutputLanguage(context, language) {
           settingValue
         );
       } catch (error) {
-        debugLogger10.warn("Failed to save output language setting:", error);
+        debugLogger11.warn("Failed to save output language setting:", error);
       }
     }
     const config = context.services.config;
@@ -8722,7 +8886,7 @@ async function setOutputLanguage(context, language) {
         await config.refreshHierarchicalMemory();
         await config.getGeminiClient().refreshSystemInstruction();
       } catch (error) {
-        debugLogger10.warn(
+        debugLogger11.warn(
           "Failed to apply output language to running session:",
           error
         );
@@ -9077,7 +9241,7 @@ var MAIN_MODEL_CONFIGURATION_HINT = "Configure models in settings.modelProviders
 var FAST_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 --fast without a model to choose from configured models.";
 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 IMAGE_MODEL_CONFIGURATION_HINT = "Configure a model with supportsImageGeneration: true (or legacy imageOnly: true), baseUrl, and envKey in settings.modelProviders. Run /model --image <model-id> to select it.";
 var MODEL_PICKER_FLAGS = [
   "fast",
   "voice",
@@ -9266,7 +9430,7 @@ function getAvailableModelIds(context, mode = "main") {
   const models = mode === "image" ? config.getAllConfiguredModels() : config.getAvailableModels();
   const availableModels = models.filter((m) => {
     if (mode === "image")
-      return m.imageOnly === true && !m.fastOnly && !m.voiceOnly;
+      return isImageGenerationCapable(m) && !m.fastOnly && !m.voiceOnly;
     if (mode === "vision") return !m.fastOnly && !m.voiceOnly && !m.imageOnly;
     if (mode === "fast") return !m.voiceOnly && !m.imageOnly && !m.visionOnly;
     if (mode === "voice") return !m.fastOnly && !m.imageOnly && !m.visionOnly;
@@ -9737,7 +9901,7 @@ ${formatNonVisionModelWarning(modelName2)}`;
         };
       }
       const availableModels = (selector.authType ? config.getAvailableModelsForAuthType(selector.authType) : config.getAllConfiguredModels()).filter(
-        (model) => model.imageOnly === true && !model.fastOnly && !model.voiceOnly
+        (model) => isImageGenerationCapable(model) && !model.fastOnly && !model.voiceOnly
       );
       const matchingModels = availableModels.filter(
         (model) => model.id === selector.modelId
@@ -9874,6 +10038,9 @@ ${formatNonVisionModelWarning(modelName2)}`;
         modelName,
         scopeOverride
       );
+      if (context.executionMode === "acp") {
+        await recordDaemonSessionModelFromConfig(config);
+      }
       return {
         type: "message",
         messageType: "info",
@@ -10141,7 +10308,7 @@ init_esbuild_shims();
 
 // packages/cli/src/config/extension-runtime-reload.ts
 init_esbuild_shims();
-var debugLogger11 = createDebugLogger("EXTENSION_RUNTIME_RELOAD");
+var debugLogger12 = createDebugLogger("EXTENSION_RUNTIME_RELOAD");
 async function reloadPluginsRuntime(options) {
   if (options.config.isSafeMode()) {
     throw new Error("Extension reload is disabled in safe mode.");
@@ -10161,7 +10328,7 @@ async function refreshExtensionContentRuntime(options) {
     await manager.refreshCache();
   } catch (error) {
     errors.push(error);
-    debugLogger11.warn(
+    debugLogger12.warn(
       "refreshExtensionContentRuntime: refreshCache failed:",
       error
     );
@@ -10174,7 +10341,7 @@ async function refreshExtensionContentRuntime(options) {
   for (const result of settled) {
     if (result.status === "rejected") {
       errors.push(result.reason);
-      debugLogger11.warn(
+      debugLogger12.warn(
         "refreshExtensionContentRuntime: a refresh leg failed:",
         result.reason
       );
@@ -11983,7 +12150,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 debugLogger12 = createDebugLogger("TERMINAL_SETUP");
+var debugLogger13 = createDebugLogger("TERMINAL_SETUP");
 var execAsync = promisify(exec);
 function stripJsonComments2(content) {
   return content.replace(/^\s*\/\/.*$/gm, "");
@@ -12016,7 +12183,7 @@ async function detectTerminal() {
       if (parentName.includes("trae") || parentName.includes("Trae"))
         return "trae";
     } catch (error) {
-      debugLogger12.debug("Parent process detection failed:", error);
+      debugLogger13.debug("Parent process detection failed:", error);
     }
   }
   return null;
@@ -12028,7 +12195,7 @@ async function backupFile(filePath) {
     const backupPath = `${filePath}.backup.${timestamp}`;
     await fs10.copyFile(filePath, backupPath);
   } catch (error) {
-    debugLogger12.warn(`Failed to create backup of ${filePath}:`, error);
+    debugLogger13.warn(`Failed to create backup of ${filePath}:`, error);
   }
 }
 __name(backupFile, "backupFile");
@@ -12360,10 +12527,6 @@ var SUPPORTED_PLATFORMS = [
   "linux",
   "win32"
 ];
-function isWsl(env) {
-  return Boolean(env["WSL_DISTRO_NAME"] || env["WSL_INTEROP"]);
-}
-__name(isWsl, "isWsl");
 function getVoiceUnavailableReason(environment = {
   platform: process6.platform,
   env: process6.env
@@ -14355,10 +14518,10 @@ var updateCommand = {
       { performStandaloneUpdate },
       installationInfo
     ] = await Promise.all([
-      import("./updateCheck-EOVLHD4T.js"),
-      import("./processUtils-YK2TDTTU.js"),
-      import("./standalone-update-LSCGOEFP.js"),
-      import("./installationInfo-ARU5Q2H7.js")
+      import("./updateCheck-JCLP5JFT.js"),
+      import("./processUtils-ENAY2GSA.js"),
+      import("./standalone-update-IRFRNGAA.js"),
+      import("./installationInfo-HVDQOSIE.js")
     ]);
     const { formatUpdateInstructions, getInstallationInfo: getInstallationInfo2 } = installationInfo;
     const settings = context.services.settings;
@@ -14510,10 +14673,10 @@ var BuiltinCommandLoader = class {
       agentsCommand,
       tasksCommand,
       // Gated behind isWorkflowsEnabled — feature flag honors
-      // QWEN_CODE_ENABLE_WORKFLOWS (opt-in) and QWEN_CODE_DISABLE_WORKFLOWS
-      // (kill switch). When the flag is off the command vanishes entirely
-      // from typeahead and help, matching the established convention for
-      // experimental builtins.
+      // tools.workflowsEnabled, QWEN_CODE_ENABLE_WORKFLOWS (opt-in), and
+      // QWEN_CODE_DISABLE_WORKFLOWS (kill switch). When the flag is off the
+      // command vanishes entirely from typeahead and help, matching the
+      // established convention for experimental builtins.
       this.config?.isWorkflowsEnabled() ? workflowsCommand : null,
       arenaCommand,
       approvalModeCommand,
@@ -14591,7 +14754,7 @@ var BuiltinCommandLoader = class {
 // packages/cli/src/services/BundledSkillLoader.ts
 init_esbuild_shims();
 import { dirname as dirname2 } from "node:path";
-var debugLogger13 = createDebugLogger("BUNDLED_SKILL_LOADER");
+var debugLogger14 = createDebugLogger("BUNDLED_SKILL_LOADER");
 var BundledSkillLoader = class {
   constructor(config) {
     this.config = config;
@@ -14601,12 +14764,12 @@ var BundledSkillLoader = class {
   }
   async loadCommands(_signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger13.debug("Bare mode enabled, skipping bundled skills");
+      debugLogger14.debug("Bare mode enabled, skipping bundled skills");
       return [];
     }
     const skillManager = this.config?.getSkillManager();
     if (!skillManager) {
-      debugLogger13.debug("SkillManager not available, skipping bundled skills");
+      debugLogger14.debug("SkillManager not available, skipping bundled skills");
       return [];
     }
     try {
@@ -14614,7 +14777,7 @@ var BundledSkillLoader = class {
       const cronEnabled = this.config?.isCronEnabled() ?? false;
       const cronVisible = allSkills.filter((skill) => {
         if (!cronEnabled && skill.allowedTools?.some((t2) => t2.startsWith("cron_"))) {
-          debugLogger13.debug(
+          debugLogger14.debug(
             `Hiding skill "${skill.name}" because cron is not enabled`
           );
           return false;
@@ -14625,7 +14788,7 @@ var BundledSkillLoader = class {
       const skills = cronVisible.filter(
         (skill) => !disabled.has(skill.name.toLowerCase())
       );
-      debugLogger13.debug(
+      debugLogger14.debug(
         `Loaded ${skills.length} bundled skill(s) as slash commands; ${cronVisible.length - skills.length} hidden by skills.disabled`
       );
       return skills.map((skill) => ({
@@ -14687,7 +14850,7 @@ ${body}`;
         }, "action")
       }));
     } catch (error) {
-      debugLogger13.error("Failed to load bundled skills:", error);
+      debugLogger14.error("Failed to load bundled skills:", error);
       return [];
     }
   }
@@ -14967,7 +15130,7 @@ var ShellProcessor = class {
 
 // packages/cli/src/services/prompt-processors/atFileProcessor.ts
 init_esbuild_shims();
-var debugLogger14 = createDebugLogger("AT_FILE_PROCESSOR");
+var debugLogger15 = createDebugLogger("AT_FILE_PROCESSOR");
 var AtFileProcessor = class {
   constructor(commandName) {
     this.commandName = commandName;
@@ -15013,7 +15176,7 @@ var AtFileProcessor = class {
         } catch (error) {
           const message2 = error instanceof Error ? error.message : String(error);
           const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message2}`;
-          debugLogger14.error(
+          debugLogger15.error(
             `[AtFileProcessor] ${uiMessage}. Leaving placeholder in prompt.`
           );
           context.ui.addItem(
@@ -15038,7 +15201,7 @@ var AtFileProcessor = class {
 };
 
 // packages/cli/src/services/command-factory.ts
-var debugLogger15 = createDebugLogger("COMMAND_FACTORY");
+var debugLogger16 = createDebugLogger("COMMAND_FACTORY");
 function createSlashCommandFromDefinition(filePath, baseDir, definition, extensionName, fileExtension) {
   const relativePathWithExt = path16.relative(baseDir, filePath);
   const relativePath = relativePathWithExt.substring(
@@ -15082,7 +15245,7 @@ function createSlashCommandFromDefinition(filePath, baseDir, definition, extensi
     whenToUse: definition.whenToUse,
     action: /* @__PURE__ */ __name(async (context, _args) => {
       if (!context.invocation) {
-        debugLogger15.error(
+        debugLogger16.error(
           `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`
         );
         return {
@@ -15120,7 +15283,7 @@ function createSlashCommandFromDefinition(filePath, baseDir, definition, extensi
 __name(createSlashCommandFromDefinition, "createSlashCommandFromDefinition");
 
 // packages/cli/src/services/FileCommandLoader.ts
-var debugLogger16 = createDebugLogger("FILE_COMMAND_LOADER");
+var debugLogger17 = createDebugLogger("FILE_COMMAND_LOADER");
 var TomlCommandDefSchema = external_exports.object({
   prompt: external_exports.string({
     required_error: "The 'prompt' field is required.",
@@ -15154,7 +15317,7 @@ var FileCommandLoader = class {
    */
   async loadCommands(signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger16.debug("Bare mode enabled, skipping auto-discovered commands");
+      debugLogger17.debug("Bare mode enabled, skipping auto-discovered commands");
       return [];
     }
     const allCommands = [];
@@ -15198,7 +15361,7 @@ var FileCommandLoader = class {
         const isEnoent = error.code === "ENOENT";
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (!isEnoent && !isAbortError) {
-          debugLogger16.error(
+          debugLogger17.error(
             `[FileCommandLoader] Error loading commands from ${dirInfo.path}:`,
             error
           );
@@ -15257,7 +15420,7 @@ var FileCommandLoader = class {
         }
       }
     } catch (error) {
-      debugLogger16.warn(
+      debugLogger17.warn(
         `Failed to read extension config for ${ext.name}:`,
         error
       );
@@ -15283,7 +15446,7 @@ var FileCommandLoader = class {
     try {
       fileContent = await fs13.readFile(filePath, "utf-8");
     } catch (error) {
-      debugLogger16.error(
+      debugLogger17.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15293,7 +15456,7 @@ var FileCommandLoader = class {
     try {
       parsed = import_toml.default.parse(fileContent);
     } catch (error) {
-      debugLogger16.error(
+      debugLogger17.error(
         `[FileCommandLoader] Failed to parse TOML file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15301,7 +15464,7 @@ var FileCommandLoader = class {
     }
     const validationResult = TomlCommandDefSchema.safeParse(parsed);
     if (!validationResult.success) {
-      debugLogger16.error(
+      debugLogger17.error(
         `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
         validationResult.error.flatten()
       );
@@ -15328,7 +15491,7 @@ var FileCommandLoader = class {
     try {
       fileContent = await fs13.readFile(filePath, "utf-8");
     } catch (error) {
-      debugLogger16.error(
+      debugLogger17.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15338,7 +15501,7 @@ var FileCommandLoader = class {
     try {
       parsed = parseMarkdownCommand(fileContent);
     } catch (error) {
-      debugLogger16.error(
+      debugLogger17.error(
         `[FileCommandLoader] Failed to parse Markdown file ${filePath}:`,
         error instanceof Error ? error.message : String(error)
       );
@@ -15346,7 +15509,7 @@ var FileCommandLoader = class {
     }
     const validationResult = MarkdownCommandDefSchema.safeParse(parsed);
     if (!validationResult.success) {
-      debugLogger16.error(
+      debugLogger17.error(
         `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
         validationResult.error.flatten()
       );
@@ -15372,7 +15535,7 @@ var FileCommandLoader = class {
 
 // packages/cli/src/services/saved-workflow-loader.ts
 init_esbuild_shims();
-var debugLogger17 = createDebugLogger("SavedWorkflowLoader");
+var debugLogger18 = createDebugLogger("SavedWorkflowLoader");
 var SavedWorkflowLoader = class {
   constructor(config) {
     this.config = config;
@@ -15391,7 +15554,7 @@ var SavedWorkflowLoader = class {
     try {
       entries = await listSavedWorkflows(this.config);
     } catch (e) {
-      debugLogger17.debug(`listSavedWorkflows failed: ${e}`);
+      debugLogger18.debug(`listSavedWorkflows failed: ${e}`);
       return [];
     }
     if (signal.aborted) return [];
@@ -15707,7 +15870,7 @@ var McpPromptLoader = class {
 // packages/cli/src/services/SkillCommandLoader.ts
 init_esbuild_shims();
 import { dirname as dirname3 } from "node:path";
-var debugLogger18 = createDebugLogger("SKILL_COMMAND_LOADER");
+var debugLogger19 = createDebugLogger("SKILL_COMMAND_LOADER");
 async function recordAutoSkillCommandUsage(config, command) {
   const detail = command.skillDetail;
   if (!config || detail?.level !== "project" || !detail.filePath) {
@@ -15720,7 +15883,7 @@ async function recordAutoSkillCommandUsage(config, command) {
       filePath: detail.filePath
     });
   } catch (error) {
-    debugLogger18.warn(
+    debugLogger19.warn(
       `Failed to record auto-skill command usage: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -15735,12 +15898,12 @@ var SkillCommandLoader = class {
   }
   async loadCommands(_signal) {
     if (this.config?.getBareMode?.()) {
-      debugLogger18.debug("Bare mode enabled, skipping skill commands");
+      debugLogger19.debug("Bare mode enabled, skipping skill commands");
       return [];
     }
     const skillManager = this.config?.getSkillManager();
     if (!skillManager) {
-      debugLogger18.debug("SkillManager not available, skipping skill commands");
+      debugLogger19.debug("SkillManager not available, skipping skill commands");
       return [];
     }
     try {
@@ -15757,7 +15920,7 @@ var SkillCommandLoader = class {
       const nonUserInvocableCount = visibleSkills.filter(
         (skill) => skill.userInvocable === false
       ).length;
-      debugLogger18.debug(
+      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`
       );
       return visibleSkills.map((skill) => {
@@ -15814,7 +15977,7 @@ var SkillCommandLoader = class {
         };
       });
     } catch (error) {
-      debugLogger18.error("Failed to load skill commands:", error);
+      debugLogger19.error("Failed to load skill commands:", error);
       return [];
     }
   }
@@ -15889,7 +16052,7 @@ function formatUserPromptExpansionBlockedMessage(reason) {
 __name(formatUserPromptExpansionBlockedMessage, "formatUserPromptExpansionBlockedMessage");
 
 // packages/cli/src/nonInteractiveCliCommands.ts
-var debugLogger19 = createDebugLogger("NON_INTERACTIVE_COMMANDS");
+var debugLogger20 = createDebugLogger("NON_INTERACTIVE_COMMANDS");
 function getSkillCommandName(command) {
   return command.skillDetail?.name ?? command.name;
 }
@@ -16327,29 +16490,14 @@ var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mo
     );
     return commandService.getCommandsForMode(mode);
   } catch (error) {
-    debugLogger19.error("Error loading available commands:", error);
+    debugLogger20.error("Error loading available commands:", error);
     return [];
   }
 }, "getAvailableCommands");
 
-// packages/cli/src/utils/nonInteractiveHelpers.ts
+// packages/cli/src/nonInteractive/nonInteractiveHelpers.ts
 init_esbuild_shims();
-var debugLogger20 = 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");
+var debugLogger21 = createDebugLogger("NON_INTERACTIVE");
 function extractPartsFromUserMessage(message2) {
   if (!message2) {
     return null;
@@ -16432,7 +16580,7 @@ async function loadSlashCommandNames(config) {
     );
     return commands.map((cmd) => cmd.name).sort();
   } catch (error) {
-    debugLogger20.error(
+    debugLogger21.error(
       "[buildSystemMessage] Failed to load slash commands:",
       error
     );
@@ -16457,7 +16605,7 @@ async function buildSystemMessage(config, sessionId, permissionMode) {
     const subagents = await subagentManager.listSubagents();
     agentNames = subagents.map((subagent) => subagent.name);
   } catch (error) {
-    debugLogger20.error("[buildSystemMessage] Failed to load subagents:", error);
+    debugLogger21.error("[buildSystemMessage] Failed to load subagents:", error);
   }
   const systemMessage = {
     type: "system",
@@ -16652,6 +16800,8 @@ export {
   createEmptyHookEventInfo,
   addConfigToMatcherGroup,
   getAllConfigs,
+  recordDaemonSessionModel,
+  restoreSessionModelThenAuthenticate,
   isPickerOnlyModelInvocation,
   refreshExtensionContentRuntime,
   dayKey,
@@ -16668,7 +16818,6 @@ export {
   formatUserPromptExpansionBlockedMessage,
   handleSlashCommand,
   getAvailableCommands,
-  normalizePartList,
   extractPartsFromUserMessage,
   computeUsageFromMetrics,
   buildInitialSystemReminders,
@@ -16685,22 +16834,22 @@ export {
  */
 /**
  * @license
- * Copyright 2025 Qwen Code
+ * Copyright 2025 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
  * @license
- * Copyright 2026 Qwen Team
+ * Copyright 2025 Qwen Code
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
  * @license
- * Copyright 2025 Qwen
+ * Copyright 2026 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
  * @license
- * Copyright 2025 Qwen Team
+ * Copyright 2025 Qwen
  * SPDX-License-Identifier: Apache-2.0
  */
 /**