@qwen-code/qwen-code 0.22.0 → 0.22.2-nightly.20260828.7357136dd1

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

@@ -8,7 +8,13 @@ import {
   staleArgsWarning,
   validateAuthMethod,
   writeSkillArgs
-} from "./chunk-6QSA4JHL.js";
+} from "./chunk-TQHGJYR3.js";
+import {
+  isKittyProtocolEnabled
+} from "./chunk-NYX53SV4.js";
+import {
+  contextCommand
+} from "./chunk-UY3PBNY3.js";
 import {
   calculateCost,
   computeSessionStats,
@@ -17,31 +23,25 @@ import {
   findInlineMathExpressions,
   getSystemInfoFields,
   levelLabel
-} from "./chunk-J5ZDDUKM.js";
-import {
-  formatDuration,
-  formatTokenCount
-} from "./chunk-3SH53ANB.js";
-import {
-  isKittyProtocolEnabled
-} from "./chunk-NYX53SV4.js";
+} from "./chunk-RVXDXY6I.js";
 import {
   VSCODE_SHIFT_ENTER_SEQUENCE,
   isWaylandSession,
   writeOsc52
-} from "./chunk-DB2OKNTU.js";
+} from "./chunk-CFJY4DGX.js";
 import {
-  contextCommand
-} from "./chunk-7JBHIQS2.js";
+  formatDuration,
+  formatTokenCount
+} from "./chunk-3SH53ANB.js";
 import {
   rollbackStandaloneUpdate
-} from "./chunk-VYC7XFYV.js";
+} from "./chunk-SUX7HDNA.js";
 import {
   themeManager
-} from "./chunk-S3G6YFQC.js";
+} from "./chunk-QFCDF5PL.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-OARZJFZX.js";
+} from "./chunk-JN4IWWMN.js";
 import {
   GITHUB_WORKFLOW_PATHS,
   INSIGHT_CSS,
@@ -54,7 +54,7 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-MQP3MHWN.js";
+} from "./chunk-AU3MMVJF.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-HYDJDQGJ.js";
 import {
   getExtendedSystemInfo,
   getGitVersion,
   getNpmVersion
-} from "./chunk-PHJJ3RVO.js";
+} from "./chunk-7GWQW5ID.js";
 import {
   isInlineModelOverrideAllowed,
   parseAcpModelOption
-} from "./chunk-FVBVJEBG.js";
+} from "./chunk-EKNBU2X7.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
   getAllSettingKeys,
@@ -91,12 +91,12 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-6UQSU7CQ.js";
+} from "./chunk-HPXV655A.js";
 import {
   getCurrentLanguage,
   setLanguageAsync,
   t
-} from "./chunk-OE52YHCZ.js";
+} from "./chunk-RWZB422L.js";
 import {
   SUPPORTED_LANGUAGES,
   getSupportedLanguageIds,
@@ -104,11 +104,11 @@ import {
 } from "./chunk-5EJZE3FP.js";
 import {
   getInstallationInfo
-} from "./chunk-DWCKACFL.js";
+} from "./chunk-V2NDP3I4.js";
 import {
   isFolderTrustEnabled,
   loadTrustedFolders
-} from "./chunk-L4HVF7LM.js";
+} from "./chunk-CYAUBK46.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -122,28 +122,27 @@ import {
   buildLearnSkillPrompt,
   buildLearnVideoSkillRequest,
   buildManagedRememberPrompt,
+  canonicalizeMsgId,
+  describeHoldCause,
   encodeInsightErrorMessage,
   encodeInsightProgressMessage,
   encodeInsightReadyMessage,
   findProviderByCredentials,
+  flattenPeerLabel,
   generateSessionRecap,
   getIdeInstaller,
   getMCPServerPrompts,
+  isWsl,
   parseLearnVideoInput,
   readPathFromWorkspace
-} from "./chunk-62JOGZL5.js";
+} from "./chunk-W6DUQ5GA.js";
 import {
   listSavedWorkflows,
   listWorkflowSnapshots
-} from "./chunk-5HJUPACR.js";
-import {
-  REASONING_EFFORT_TIERS,
-  applyReasoningEffort,
-  normalizeReasoningEffort
-} from "./chunk-KM73TBQ4.js";
+} from "./chunk-CRKKHXTI.js";
 import {
   resolveOpenAILogDir
-} from "./chunk-EFB657PR.js";
+} from "./chunk-TW3E6YNO.js";
 import {
   ArenaManager,
   ConditionalRulesRegistry,
@@ -169,6 +168,7 @@ import {
   ideContextStore,
   isActiveWorkflowStatus,
   isExtensionCommittedWithWarningsError,
+  isImageGenerationCapable,
   isSignalTermination,
   isSuccessStatus,
   isTerminalStatus,
@@ -184,13 +184,15 @@ import {
   resolveSlimmingConfig,
   runForkedAgent,
   tryGenerateSessionTitle
-} from "./chunk-T6XLJRQY.js";
+} from "./chunk-EWIQ3NAE.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
 import {
-  resolveModelId
-} from "./chunk-7DYNJFES.js";
+  buildRuntimeSnapshotId,
+  resolveModelId,
+  stripRuntimeSnapshotPrefix
+} from "./chunk-JB4JIVTJ.js";
 import {
   getAutoSkillCuratorStatus,
   parse,
@@ -198,34 +200,41 @@ import {
   restoreArchivedAutoSkill,
   runAutoSkillCurator,
   setAutoSkillPinned
-} from "./chunk-VUMLT7E5.js";
+} from "./chunk-6W2IK5KC.js";
 import {
   HookEventName,
   sanitizeUserPromptExpansionAdditionalContext
-} from "./chunk-ISJMN3ML.js";
+} from "./chunk-TTX2JUE6.js";
 import {
   canUseRipgrep
-} from "./chunk-XLDFW44M.js";
+} from "./chunk-4K7KNVWH.js";
 import {
   glob
-} from "./chunk-Q54XG7IX.js";
+} from "./chunk-SMPR7SPO.js";
 import {
   checkArgumentSafety,
   checkCommandPermissions,
   escapeShellArg,
   getShellConfiguration
-} from "./chunk-FEMQ6Y7W.js";
+} from "./chunk-JWALNCLT.js";
 import {
   GoalPersistenceUnavailableError,
-  emptyGoalSnapshot,
+  emptyGoalSnapshot
+} from "./chunk-XLLQJRAH.js";
+import {
   projectUserTranscriptForDisplay
-} from "./chunk-LDGWX737.js";
+} from "./chunk-7J6OTNGO.js";
 import {
   APPROVAL_MODES
-} from "./chunk-VLRBJ24J.js";
+} from "./chunk-V5J4J5TP.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 +247,37 @@ import {
   read,
   recordSkillInvocation,
   uiTelemetryService
-} from "./chunk-FDD2IUEL.js";
+} from "./chunk-SZLBBZH4.js";
 import {
-  getCurrentGeminiMdFilename
-} from "./chunk-IWOWEENB.js";
+  getCurrentMemoryFilename
+} from "./chunk-BKWNKLZB.js";
 import {
   getAutoMemoryRoot
-} from "./chunk-HIK2OF33.js";
+} from "./chunk-6PJOTWAN.js";
 import {
   runSideQuery
-} from "./chunk-ZRYQMWEP.js";
+} from "./chunk-BWORX6FA.js";
+import {
+  AuthType
+} from "./chunk-PPKZ7JOE.js";
 import {
   normalizeContent,
   redactUrlCredentials
-} from "./chunk-GAHYKJPV.js";
+} from "./chunk-B5PHIJGI.js";
 import {
   FORK_SUBAGENT_TYPE,
   stripStartupContext
-} from "./chunk-WZDM44SB.js";
+} from "./chunk-CAJTKR6W.js";
 import {
   applySkillAllowedTools,
   buildSkillLlmContent
-} from "./chunk-K623ENWT.js";
+} from "./chunk-ZU4UDIWX.js";
 import {
   ToolDisplayNamesMigration,
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-6NFAEG54.js";
+} from "./chunk-UTLCH2FK.js";
 import {
   Storage,
   createDebugLogger,
@@ -274,12 +286,12 @@ import {
   isSubpath,
   resolvePath,
   updateSymlink
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   isCpuProfileRecording,
   startCpuProfile,
   stopCpuProfile
-} from "./chunk-VEND4KA4.js";
+} from "./chunk-X3ZRTCJD.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -292,7 +304,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 +653,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 +853,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 +940,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 +1012,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 +1031,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 +1846,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 +1923,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 +1933,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 +1963,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 +2080,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 +2440,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-ULBJJWPY.js") : void 0;
     if (config) {
       try {
         config.setApprovalMode(mode);
@@ -2375,6 +2538,175 @@ var branchCommand = {
   }, "action")
 };
 
+// packages/cli/src/ui/commands/peers-command.ts
+init_esbuild_shims();
+function shortId(msgId) {
+  return msgId.replace(/-/g, "").slice(0, 6);
+}
+__name(shortId, "shortId");
+function displayHandle(entry, held) {
+  const own = canonicalizeMsgId(entry.frame.msgId);
+  let length = Math.min(shortId(entry.frame.msgId).length, own.length);
+  const collides = /* @__PURE__ */ __name((len) => held.some(
+    (other) => other !== entry && canonicalizeMsgId(other.frame.msgId).startsWith(own.slice(0, len))
+  ), "collides");
+  while (length < own.length && collides(length)) {
+    length += 1;
+  }
+  return own.slice(0, length);
+}
+__name(displayHandle, "displayHandle");
+function preview(text, max = 100) {
+  const oneLine = flattenPeerLabel(text).replace(/\s+/g, " ").trim();
+  return oneLine.length > max ? `${oneLine.slice(0, max - 1)}\u2026` : oneLine;
+}
+__name(preview, "preview");
+function formatHeldList(held) {
+  if (held.length === 0) return "No messages from other sessions are waiting.";
+  const lines = held.map((entry) => {
+    const who = flattenPeerLabel(
+      entry.frame.fromName ?? entry.frame.from ?? "unknown session"
+    );
+    const handle = flattenPeerLabel(displayHandle(entry, held));
+    return `  ${handle}  ${who}
+      ${preview(entry.frame.message.content)}
+      held because ${describeHoldCause(entry.cause)}`;
+  });
+  return [
+    `${held.length} message${held.length === 1 ? "" : "s"} waiting for your review:`,
+    ...lines,
+    "",
+    "Release with /peers accept <id|all>, or drop with /peers deny <id|all>."
+  ].join("\n");
+}
+__name(formatHeldList, "formatHeldList");
+function resolveHeld(held, token) {
+  const needle = token.toLowerCase();
+  const exact = held.filter(
+    (entry) => canonicalizeMsgId(entry.frame.msgId) === needle
+  );
+  if (exact.length === 1) return { kind: "one", msgId: exact[0].frame.msgId };
+  const matches = held.filter(
+    (entry) => canonicalizeMsgId(entry.frame.msgId).startsWith(needle) || entry.frame.msgId.toLowerCase().startsWith(needle)
+  );
+  if (matches.length === 0) return { kind: "none" };
+  if (matches.length > 1) return { kind: "ambiguous" };
+  return { kind: "one", msgId: matches[0].frame.msgId };
+}
+__name(resolveHeld, "resolveHeld");
+var peersCommand = {
+  name: "peers",
+  kind: "built-in" /* BUILT_IN */,
+  get description() {
+    return t(
+      "Review messages held from other Qwen Code sessions (accept | deny)"
+    );
+  },
+  action: /* @__PURE__ */ __name(async (context, args) => {
+    const peerMessaging = context.services.peerMessaging;
+    if (!peerMessaging) {
+      const enabled = context.services.settings?.merged?.agents?.crossSessionMessaging === true;
+      return {
+        type: "message",
+        messageType: enabled ? "error" : "info",
+        content: enabled ? "Cross-session messaging is on, but this session has no inbox: it either failed to register in the session registry or failed to bind its socket. Re-run with DEBUG=1 to see the bind error." : 'Cross-session messaging is off. Enable it with "agents.crossSessionMessaging": true in settings.json, then restart.'
+      };
+    }
+    const held = peerMessaging.getHeld();
+    const [verb, ...rest] = args.trim().split(/\s+/).filter(Boolean);
+    if (verb === void 0 || verb === "list") {
+      peerMessaging.recordHeldListing(held);
+      return {
+        type: "message",
+        messageType: "info",
+        content: formatHeldList(held)
+      };
+    }
+    if (verb !== "accept" && verb !== "deny") {
+      return {
+        type: "message",
+        messageType: "error",
+        content: `Unknown subcommand "${verb}". Use /peers, /peers accept <id|all>, or /peers deny <id|all>.`
+      };
+    }
+    const decision = verb === "accept" ? "approve" : "deny";
+    const target = rest[0];
+    if (target === void 0) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: `Which message? Use /peers ${verb} <id|all> \u2014 /peers lists the ids.`
+      };
+    }
+    if (peerMessaging.heldSetChangedSinceListing()) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "The waiting list changed since you listed it \u2014 run /peers again to review what is waiting now."
+      };
+    }
+    if (held.length === 0) {
+      return {
+        type: "message",
+        messageType: "info",
+        content: "No messages from other sessions are waiting."
+      };
+    }
+    if (target.toLowerCase() === "all") {
+      const ids = held.map((entry) => entry.frame.msgId);
+      let count = 0;
+      let failed = 0;
+      for (const msgId of ids) {
+        const outcome2 = peerMessaging.decide(msgId, decision);
+        if (outcome2 === "done") count += 1;
+        else if (outcome2 === "failed") failed += 1;
+      }
+      peerMessaging.recordHeldListing(peerMessaging.getHeld());
+      return {
+        type: "message",
+        messageType: "info",
+        content: `${verb === "accept" ? "Released" : "Dropped"} ${count} message${count === 1 ? "" : "s"}.` + (failed > 0 ? ` ${failed} could not be delivered and ${failed === 1 ? "is" : "are"} still waiting \u2014 try again once the session catches up.` : "")
+      };
+    }
+    const resolved = resolveHeld(held, target);
+    if (resolved.kind === "none") {
+      return {
+        type: "message",
+        messageType: "error",
+        content: `No held message matches "${target}". Run /peers to see what is waiting.`
+      };
+    }
+    if (resolved.kind === "ambiguous") {
+      return {
+        type: "message",
+        messageType: "error",
+        content: `"${target}" matches more than one held message. Use more characters of the id.`
+      };
+    }
+    const outcome = peerMessaging.decide(resolved.msgId, decision);
+    peerMessaging.recordHeldListing(peerMessaging.getHeld());
+    if (outcome === "gone") {
+      return {
+        type: "message",
+        messageType: "info",
+        content: "That message is no longer waiting \u2014 it may have expired or already been decided."
+      };
+    }
+    if (outcome === "failed") {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "The session could not take the message just now \u2014 its input queue is full. It is still waiting; try again in a moment."
+      };
+    }
+    return {
+      type: "message",
+      messageType: "info",
+      content: verb === "accept" ? "Released to this session. It will be picked up on the next turn." : "Dropped. The sending session has been told."
+    };
+  }, "action")
+};
+
 // packages/cli/src/ui/commands/btwCommand.ts
 init_esbuild_shims();
 function formatBtwError(error) {
@@ -2746,12 +3078,12 @@ var directoryCommand = {
                   config.getContextRuleExcludes()
                 );
                 config.setUserMemory(memoryContent);
-                config.setGeminiMdFileCount(fileCount);
+                config.setMemoryFileCount(fileCount);
                 config.setContextFilePaths(contextFilePaths);
                 config.setConditionalRulesRegistry(
                   new ConditionalRulesRegistry(conditionalRules, projectRoot)
                 );
-                context.ui.setGeminiMdFileCount(fileCount);
+                context.ui.setMemoryFileCount(fileCount);
                 messages.push(
                   t(
                     "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}",
@@ -3132,7 +3464,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 +3476,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 +3538,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 +3902,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 +3981,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 +4035,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 +4053,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 +4089,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 +4155,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 +4199,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 +4211,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 +4910,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 +5658,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";
@@ -5644,8 +5982,8 @@ function formatSmapsRollup(smapsRollup) {
   if (rssLine) {
     return rssLine;
   }
-  const preview = smapsRollup.slice(0, 80).trim().replace(/\s+/g, " ");
-  return `${t("parse error")}: ${preview}`;
+  const preview2 = smapsRollup.slice(0, 80).trim().replace(/\s+/g, " ");
+  return `${t("parse error")}: ${preview2}`;
 }
 __name(formatSmapsRollup, "formatSmapsRollup");
 function formatCoreDiagnostics(diagnostics) {
@@ -5734,7 +6072,7 @@ function collectToolResultRetention(context) {
       presentInCompressionInput: stats.oversizedResultCount > 0
     };
   } catch (error) {
-    debugLogger6.warn(
+    debugLogger7.warn(
       `Tool result retention diagnostics unavailable: ${formatErrorMessage2(error)}`
     );
     return null;
@@ -6065,11 +6403,13 @@ var effortCommand = {
       };
     }
     applyReasoningEffort(config, tier);
-    settings.setValue(
-      getPersistScopeForModelSelection(settings),
-      "model.reasoningEffort",
-      tier
-    );
+    if (context.executionPolicy?.persistModelSelection !== false) {
+      settings.setValue(
+        getPersistScopeForModelSelection(settings),
+        "model.reasoningEffort",
+        tier
+      );
+    }
     return {
       type: "message",
       messageType: "info",
@@ -6083,7 +6423,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 +6452,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 +6465,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 +6480,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 +6498,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 +6526,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 +6544,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 +6580,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 +6589,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 +6606,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 +6636,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 +6655,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 +6663,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 +6672,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 +6692,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 +6788,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 +6844,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 +6904,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 +6918,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 +7081,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 +7415,7 @@ var expandNowCommand = {
         content: t("History is already expanded in this session.")
       };
     }
-    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-DDSBAQJS.js");
+    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-44IETXDY.js");
     const updated = expandCollapsedHistory(history);
     loadHistory(updated);
     refreshStatic();
@@ -8458,6 +8798,15 @@ var importConfigCommand = {
 ${usage()}`
       };
     }
+    if (parsed.scope === "project" && context.executionPolicy?.allowWorkspaceSettingsWrite === false) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: t(
+          "Project configuration imports are not available in this session."
+        )
+      };
+    }
     try {
       const importSource = resolveImportSourceForScope(
         parsed.source,
@@ -8514,7 +8863,7 @@ var initCommand = {
       };
     }
     const targetDir = context.services.config.getTargetDir();
-    const contextFileName = getCurrentGeminiMdFilename();
+    const contextFileName = getCurrentMemoryFilename();
     const contextFilePath = path8.join(targetDir, contextFileName);
     try {
       if (fs7.existsSync(contextFilePath)) {
@@ -8609,7 +8958,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);
@@ -8652,6 +9001,15 @@ function validateUiScopeFlags(context, parsed) {
       )
     };
   }
+  if (parsed.scope === "Workspace" /* Workspace */ && context.executionPolicy?.allowWorkspaceSettingsWrite === false) {
+    return {
+      type: "message",
+      messageType: "error",
+      content: t(
+        "Project language settings are not available in this session."
+      )
+    };
+  }
   if (parsed.scope === "Workspace" /* Workspace */ && context.services.settings && !context.services.settings.isTrusted) {
     return {
       type: "message",
@@ -8677,7 +9035,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 +9071,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 +9080,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 +9435,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",
@@ -9132,7 +9490,7 @@ function persistSetting(settings, path18, value, scopeOverride) {
   settings.setValue(resolveScope(settings, scopeOverride), path18, value);
 }
 __name(persistSetting, "persistSetting");
-async function switchMainModel(config, settings, currentAuthType, modelArg, scopeOverride) {
+async function switchMainModel(config, settings, currentAuthType, modelArg, scopeOverride, persistSelection = true) {
   const parsed = parseAcpModelOption(modelArg);
   if (parsed.authType) {
     await config.switchModel(
@@ -9140,19 +9498,23 @@ async function switchMainModel(config, settings, currentAuthType, modelArg, scop
       parsed.modelId,
       parsed.authType !== currentAuthType && parsed.authType === "qwen-oauth" /* QWEN_OAUTH */ ? { requireCachedCredentials: true } : void 0
     );
-    persistSetting(
-      settings,
-      "security.auth.selectedType",
-      parsed.authType,
-      scopeOverride
-    );
-    persistSetting(settings, "model.name", parsed.modelId, scopeOverride);
-    persistSetting(settings, "model.baseUrl", "", scopeOverride);
+    if (persistSelection) {
+      persistSetting(
+        settings,
+        "security.auth.selectedType",
+        parsed.authType,
+        scopeOverride
+      );
+      persistSetting(settings, "model.name", parsed.modelId, scopeOverride);
+      persistSetting(settings, "model.baseUrl", "", scopeOverride);
+    }
     return parsed.modelId;
   }
   await config.switchModel(currentAuthType, modelArg, void 0);
-  persistSetting(settings, "model.name", modelArg, scopeOverride);
-  persistSetting(settings, "model.baseUrl", "", scopeOverride);
+  if (persistSelection) {
+    persistSetting(settings, "model.name", modelArg, scopeOverride);
+    persistSetting(settings, "model.baseUrl", "", scopeOverride);
+  }
   return modelArg;
 }
 __name(switchMainModel, "switchMainModel");
@@ -9266,7 +9628,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;
@@ -9376,6 +9738,14 @@ var modelCommand = {
         )
       };
     }
+    const auxiliarySelection = /(?:^|\s)--(?:fast|voice|vision|compaction|image)(?:\s|$)/.test(rawArgs);
+    if (hasProject && context.executionPolicy?.allowWorkspaceSettingsWrite === false || context.executionPolicy?.persistModelSelection === false && (hasProject || hasGlobal || auxiliarySelection)) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: t("This model selection is not available in this session.")
+      };
+    }
     if (scopeOverride === "Workspace" /* Workspace */ && settings && !settings.isTrusted) {
       return {
         type: "message",
@@ -9737,7 +10107,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
@@ -9872,8 +10242,12 @@ ${formatNonVisionModelWarning(modelName2)}`;
         settings,
         authType,
         modelName,
-        scopeOverride
+        scopeOverride,
+        context.executionPolicy?.persistModelSelection !== false
       );
+      if (context.executionMode === "acp") {
+        await recordDaemonSessionModelFromConfig(config);
+      }
       return {
         type: "message",
         messageType: "info",
@@ -10141,7 +10515,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 +10535,7 @@ async function refreshExtensionContentRuntime(options) {
     await manager.refreshCache();
   } catch (error) {
     errors.push(error);
-    debugLogger11.warn(
+    debugLogger12.warn(
       "refreshExtensionContentRuntime: refreshCache failed:",
       error
     );
@@ -10174,7 +10548,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 +12357,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 +12390,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 +12402,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 +12734,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 +14725,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-T5O2WGIB.js"),
+      import("./processUtils-PVDKBL35.js"),
+      import("./standalone-update-QN5HFRIC.js"),
+      import("./installationInfo-WM2GXQZ6.js")
     ]);
     const { formatUpdateInstructions, getInstallationInfo: getInstallationInfo2 } = installationInfo;
     const settings = context.services.settings;
@@ -14510,15 +14880,16 @@ 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,
       authCommand,
       branchCommand,
+      peersCommand,
       btwCommand,
       forkCommand,
       bugCommand,
@@ -14591,7 +14962,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 +14972,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 +14985,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 +14996,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 +15058,7 @@ ${body}`;
         }, "action")
       }));
     } catch (error) {
-      debugLogger13.error("Failed to load bundled skills:", error);
+      debugLogger14.error("Failed to load bundled skills:", error);
       return [];
     }
   }
@@ -14967,7 +15338,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 +15384,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 +15409,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 +15453,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 +15491,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 +15525,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 +15569,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 +15628,7 @@ var FileCommandLoader = class {
         }
       }
     } catch (error) {
-      debugLogger16.warn(
+      debugLogger17.warn(
         `Failed to read extension config for ${ext.name}:`,
         error
       );
@@ -15283,7 +15654,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 +15664,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 +15672,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 +15699,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 +15709,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 +15717,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 +15743,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 +15762,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 +16078,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 +16091,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 +16106,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,13 +16128,13 @@ 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) => {
         const isExtension = skill.level === "extension";
         const modelInvocable = skill.disableModelInvocation ? false : isExtension ? !!(skill.description || skill.whenToUse) : true;
-        const sourceLabel = isExtension ? `${t("Extension:")} ${skill.extensionName ?? "unknown"}` : skill.level === "project" ? t("Project") : t("User");
+        const sourceLabel = isExtension ? `${t("Extension:")} ${skill.extensionDisplayName ?? skill.extensionName ?? "unknown"}` : skill.level === "project" ? t("Project") : t("User");
         return {
           name: skill.name,
           description: skill.description,
@@ -15814,7 +16185,7 @@ var SkillCommandLoader = class {
         };
       });
     } catch (error) {
-      debugLogger18.error("Failed to load skill commands:", error);
+      debugLogger19.error("Failed to load skill commands:", error);
       return [];
     }
   }
@@ -15845,8 +16216,8 @@ function createNonInteractiveUI() {
     btwAbortControllerRef: { current: null },
     isIdleRef: { current: true },
     toggleVimEnabled: /* @__PURE__ */ __name(async () => false, "toggleVimEnabled"),
-    setGeminiMdFileCount: /* @__PURE__ */ __name((_count) => {
-    }, "setGeminiMdFileCount"),
+    setMemoryFileCount: /* @__PURE__ */ __name((_count) => {
+    }, "setMemoryFileCount"),
     reloadCommands: /* @__PURE__ */ __name(() => {
     }, "reloadCommands"),
     setSessionName: /* @__PURE__ */ __name(() => {
@@ -15889,11 +16260,17 @@ 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;
 }
 __name(getSkillCommandName, "getSkillCommandName");
+function isCommandAllowedByPolicy(command, policy) {
+  if (!policy || command.kind !== "built-in" /* BUILT_IN */) return true;
+  if (command.name === "clear" && !policy.allowSessionReset) return false;
+  return !policy.blockedBuiltinCommandNames.includes(command.name);
+}
+__name(isCommandAllowedByPolicy, "isCommandAllowedByPolicy");
 function handleCommandResult(result, outputHistoryItems) {
   switch (result.type) {
     case "submit_prompt":
@@ -16013,12 +16390,12 @@ async function fireUserPromptExpansionHook(config, commandName, commandArgs, con
   };
 }
 __name(fireUserPromptExpansionHook, "fireUserPromptExpansionHook");
-async function registerModelInvocableCommands(commandService, config, executionMode, settings) {
+async function registerModelInvocableCommands(commandService, config, executionMode, settings, executionPolicy) {
   if (!settings) {
     return;
   }
   config.setModelInvocableCommandsProvider(
-    () => commandService.getModelInvocableCommands().map((cmd) => ({
+    () => commandService.getModelInvocableCommands().filter((cmd) => isCommandAllowedByPolicy(cmd, executionPolicy)).map((cmd) => ({
       name: cmd.name,
       description: cmd.modelDescription ?? cmd.description
     }))
@@ -16026,7 +16403,9 @@ async function registerModelInvocableCommands(commandService, config, executionM
   config.setModelInvocableCommandsExecutor(
     async (name, args = "") => {
       const commands = commandService.getModelInvocableCommands();
-      const cmd = commands.find((c) => c.name === name);
+      const cmd = commands.find(
+        (candidate) => candidate.name === name && isCommandAllowedByPolicy(candidate, executionPolicy)
+      );
       if (!cmd?.action) return null;
       const minimalContext = {
         executionMode,
@@ -16035,7 +16414,8 @@ async function registerModelInvocableCommands(commandService, config, executionM
           name,
           args
         },
-        services: { config, settings, logger: null }
+        services: { config, settings, logger: null },
+        ...executionPolicy ? { executionPolicy } : {}
       };
       const result = await cmd.action(minimalContext, args);
       if (!result || result.type !== "submit_prompt") return null;
@@ -16064,7 +16444,7 @@ async function registerModelInvocableCommands(commandService, config, executionM
   await skillManager?.notifyConfigChanged();
 }
 __name(registerModelInvocableCommands, "registerModelInvocableCommands");
-var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController, config, settings, sessionHooks) => {
+var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController, config, settings, sessionHooks, executionPolicy) => {
   const trimmed = rawQuery.trim();
   if (!trimmed.startsWith("/")) {
     return { type: "no_command" };
@@ -16100,10 +16480,13 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
     commandService,
     config,
     executionMode,
-    settings
+    settings,
+    executionPolicy
   );
   const allCommands = allCommandService.getCommands();
-  const filteredCommands = commandService.getCommandsForMode(executionMode).filter((cmd) => !isDisabled(cmd));
+  const filteredCommands = commandService.getCommandsForMode(executionMode).filter(
+    (cmd) => !isDisabled(cmd) && isCommandAllowedByPolicy(cmd, executionPolicy)
+  );
   const { commandToExecute, args } = parseSlashCommand(
     rawQuery,
     filteredCommands
@@ -16119,6 +16502,7 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
       if (!skill.action) continue;
       const skillContext = {
         executionMode,
+        ...executionPolicy ? { executionPolicy } : {},
         invocation: {
           raw: `/${skill.name}`,
           name: skill.name,
@@ -16192,6 +16576,15 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
           originalType: "filtered_command"
         };
       }
+      if (!isCommandAllowedByPolicy(knownCommand, executionPolicy)) {
+        return {
+          type: "unsupported",
+          reason: t('The command "/{{command}}" is not available here.', {
+            command: typedToken
+          }),
+          originalType: "unsupported_action"
+        };
+      }
       return {
         type: "unsupported",
         reason: t('The command "/{{command}}" is not supported in this mode.', {
@@ -16225,6 +16618,7 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
   };
   const context = {
     executionMode,
+    ...executionPolicy ? { executionPolicy } : {},
     abortSignal: commandToExecute.name === "advisor" ? abortController.signal : void 0,
     services: {
       config,
@@ -16303,7 +16697,7 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
     resolvedCommand
   };
 }, "handleSlashCommand");
-var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mode = "acp", settings) => {
+var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mode = "acp", settings, executionPolicy) => {
   try {
     const loaders = [
       new McpPromptLoader(config),
@@ -16323,33 +16717,21 @@ var getAvailableCommands = /* @__PURE__ */ __name(async (config, abortSignal, mo
       commandService,
       config,
       mode,
-      settings
+      settings,
+      executionPolicy
+    );
+    return commandService.getCommandsForMode(mode).filter(
+      (command) => isCommandAllowedByPolicy(command, executionPolicy)
     );
-    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 +16814,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 +16839,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 +17034,8 @@ export {
   createEmptyHookEventInfo,
   addConfigToMatcherGroup,
   getAllConfigs,
+  recordDaemonSessionModel,
+  restoreSessionModelThenAuthenticate,
   isPickerOnlyModelInvocation,
   refreshExtensionContentRuntime,
   dayKey,
@@ -16668,7 +17052,6 @@ export {
   formatUserPromptExpansionBlockedMessage,
   handleSlashCommand,
   getAvailableCommands,
-  normalizePartList,
   extractPartsFromUserMessage,
   computeUsageFromMetrics,
   buildInitialSystemReminders,
@@ -16685,22 +17068,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
  */
 /**