@qwen-code/qwen-code 0.22.2-preview.1 → 0.22.3

package/chunks/{chunk-GTUZ3R6I.js → chunk-DJEZ55D4.js}

@@ -1,8 +1,5 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  contextCommand
-} from "./chunk-WZ3QKPMQ.js";
 import {
   ExtensionRefreshState,
   clearSkillArgs,
@@ -11,7 +8,13 @@ import {
   staleArgsWarning,
   validateAuthMethod,
   writeSkillArgs
-} from "./chunk-HPECDZ6X.js";
+} from "./chunk-DJPASAUV.js";
+import {
+  isKittyProtocolEnabled
+} from "./chunk-NYX53SV4.js";
+import {
+  contextCommand
+} from "./chunk-6X7EU5TI.js";
 import {
   calculateCost,
   computeSessionStats,
@@ -20,28 +23,25 @@ import {
   findInlineMathExpressions,
   getSystemInfoFields,
   levelLabel
-} from "./chunk-CDUN63IN.js";
+} from "./chunk-WGY3AVGM.js";
 import {
   VSCODE_SHIFT_ENTER_SEQUENCE,
   isWaylandSession,
   writeOsc52
-} from "./chunk-2FN2HNTI.js";
+} from "./chunk-CFJY4DGX.js";
 import {
   formatDuration,
   formatTokenCount
 } from "./chunk-3SH53ANB.js";
-import {
-  isKittyProtocolEnabled
-} from "./chunk-NYX53SV4.js";
 import {
   rollbackStandaloneUpdate
-} from "./chunk-R3T33BG5.js";
+} from "./chunk-ZYMLPEZQ.js";
 import {
   themeManager
-} from "./chunk-WEGXPP5E.js";
+} from "./chunk-QFCDF5PL.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-TR7G7XFQ.js";
+} from "./chunk-MPNBVAEU.js";
 import {
   GITHUB_WORKFLOW_PATHS,
   INSIGHT_CSS,
@@ -54,7 +54,7 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-J3CBIEDS.js";
+} from "./chunk-ST5MDGH3.js";
 import {
   stripUnsafeCharacters,
   toCodePoints,
@@ -70,16 +70,16 @@ import {
   isVoiceEnabled,
   readVoiceMode,
   readVoiceModel
-} from "./chunk-2MHGD7EE.js";
+} from "./chunk-A3LWD5MK.js";
 import {
   getExtendedSystemInfo,
   getGitVersion,
   getNpmVersion
-} from "./chunk-ATLGYSYH.js";
+} from "./chunk-VGIFXISB.js";
 import {
   isInlineModelOverrideAllowed,
   parseAcpModelOption
-} from "./chunk-HABT2Z7R.js";
+} from "./chunk-OU5APVWO.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
   getAllSettingKeys,
@@ -91,12 +91,12 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-TDQBVEPK.js";
+} from "./chunk-AIAOIFY4.js";
 import {
   getCurrentLanguage,
   setLanguageAsync,
   t
-} from "./chunk-W2WRNJKX.js";
+} from "./chunk-CLWO3B77.js";
 import {
   SUPPORTED_LANGUAGES,
   getSupportedLanguageIds,
@@ -104,11 +104,11 @@ import {
 } from "./chunk-5EJZE3FP.js";
 import {
   getInstallationInfo
-} from "./chunk-7DPKPBOQ.js";
+} from "./chunk-V2NDP3I4.js";
 import {
   isFolderTrustEnabled,
   loadTrustedFolders
-} from "./chunk-ZGWDHSUM.js";
+} from "./chunk-MF7HCQWZ.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
@@ -122,24 +122,27 @@ import {
   buildLearnSkillPrompt,
   buildLearnVideoSkillRequest,
   buildManagedRememberPrompt,
+  canonicalizeMsgId,
+  describeHoldCause,
   encodeInsightErrorMessage,
   encodeInsightProgressMessage,
   encodeInsightReadyMessage,
   findProviderByCredentials,
+  flattenPeerLabel,
   generateSessionRecap,
   getIdeInstaller,
   getMCPServerPrompts,
   isWsl,
   parseLearnVideoInput,
   readPathFromWorkspace
-} from "./chunk-5URK47RN.js";
+} from "./chunk-NV55WWD6.js";
 import {
   listSavedWorkflows,
   listWorkflowSnapshots
-} from "./chunk-JSY43GMI.js";
+} from "./chunk-2OUD5T67.js";
 import {
   resolveOpenAILogDir
-} from "./chunk-J5352S3S.js";
+} from "./chunk-ST5V3ZOC.js";
 import {
   ArenaManager,
   ConditionalRulesRegistry,
@@ -181,7 +184,7 @@ import {
   resolveSlimmingConfig,
   runForkedAgent,
   tryGenerateSessionTitle
-} from "./chunk-XIRDDFRS.js";
+} from "./chunk-PZ66FRIC.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
@@ -189,7 +192,7 @@ import {
   buildRuntimeSnapshotId,
   resolveModelId,
   stripRuntimeSnapshotPrefix
-} from "./chunk-AYVIGUUK.js";
+} from "./chunk-JB4JIVTJ.js";
 import {
   getAutoSkillCuratorStatus,
   parse,
@@ -197,31 +200,33 @@ import {
   restoreArchivedAutoSkill,
   runAutoSkillCurator,
   setAutoSkillPinned
-} from "./chunk-I6DY753S.js";
+} from "./chunk-KJO2LBUK.js";
 import {
   HookEventName,
   sanitizeUserPromptExpansionAdditionalContext
-} from "./chunk-T2CRBIDJ.js";
+} from "./chunk-TTX2JUE6.js";
 import {
   canUseRipgrep
-} from "./chunk-77TOMRBG.js";
+} from "./chunk-4K7KNVWH.js";
 import {
   glob
-} from "./chunk-DEYPMJPD.js";
+} from "./chunk-SMPR7SPO.js";
 import {
   checkArgumentSafety,
   checkCommandPermissions,
   escapeShellArg,
   getShellConfiguration
-} from "./chunk-T6OODF2U.js";
+} from "./chunk-JWALNCLT.js";
 import {
   GoalPersistenceUnavailableError,
-  emptyGoalSnapshot,
+  emptyGoalSnapshot
+} from "./chunk-JHYH6PYQ.js";
+import {
   projectUserTranscriptForDisplay
-} from "./chunk-FN5C6C7G.js";
+} from "./chunk-7J6OTNGO.js";
 import {
   APPROVAL_MODES
-} from "./chunk-XR7OIAQF.js";
+} from "./chunk-V5J4J5TP.js";
 import {
   openBrowserSecurely
 } from "./chunk-NAVJD2PQ.js";
@@ -242,37 +247,37 @@ import {
   read,
   recordSkillInvocation,
   uiTelemetryService
-} from "./chunk-OF2DPXUS.js";
+} from "./chunk-QYMAKPY5.js";
 import {
-  getCurrentGeminiMdFilename
-} from "./chunk-WBT3STGU.js";
+  getCurrentMemoryFilename
+} from "./chunk-BKWNKLZB.js";
 import {
   getAutoMemoryRoot
-} from "./chunk-PVBT5QPD.js";
+} from "./chunk-6PJOTWAN.js";
 import {
   runSideQuery
-} from "./chunk-IPQA4SR5.js";
+} from "./chunk-BWORX6FA.js";
 import {
   AuthType
-} from "./chunk-GTUKW3I6.js";
+} from "./chunk-PPKZ7JOE.js";
 import {
   normalizeContent,
   redactUrlCredentials
-} from "./chunk-6US7BF3G.js";
+} from "./chunk-B5PHIJGI.js";
 import {
   FORK_SUBAGENT_TYPE,
   stripStartupContext
-} from "./chunk-7OBH4AM2.js";
+} from "./chunk-CAJTKR6W.js";
 import {
   applySkillAllowedTools,
   buildSkillLlmContent
-} from "./chunk-OT4YKUUV.js";
+} from "./chunk-ZU4UDIWX.js";
 import {
   ToolDisplayNamesMigration,
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-KOJ6MHD5.js";
+} from "./chunk-UTLCH2FK.js";
 import {
   Storage,
   createDebugLogger,
@@ -281,12 +286,12 @@ import {
   isSubpath,
   resolvePath,
   updateSymlink
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   isCpuProfileRecording,
   startCpuProfile,
   stopCpuProfile
-} from "./chunk-66GIFJ63.js";
+} from "./chunk-MK2GIB46.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -1194,7 +1199,7 @@ async function askAdvisor(context, focus, abortSignal) {
   const { config } = context.services;
   if (!config) throw new Error(t("Config not loaded."));
   const cacheSafeParams = buildBtwCacheSafeParams(config);
-  if (!cacheSafeParams || config.getGeminiClient().getHistoryForForkWindow().length === 0) {
+  if (!cacheSafeParams || config.getLlmClient().getHistoryForForkWindow().length === 0) {
     throw new Error(t("No conversation context available for /advisor"));
   }
   const advisorModel = context.services.settings.merged.advisorModel?.trim() || void 0;
@@ -1925,7 +1930,7 @@ __name(recordArenaItem, "recordArenaItem");
 function executeArenaCommand(config, ui, input) {
   let chatHistory;
   try {
-    const fullHistory = config.getGeminiClient().getChat().getHistoryShallow();
+    const fullHistory = config.getLlmClient().getChat().getHistoryShallow();
     chatHistory = stripStartupContext(fullHistory);
   } catch {
     debugLogger5.debug("Could not retrieve chat history for arena agents");
@@ -2435,7 +2440,7 @@ var approvalModeCommand = {
         };
       }
     }
-    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-O2N2Q6KG.js") : void 0;
+    const autoModeNotices = mode === "auto" /* AUTO */ && priorMode !== "auto" /* AUTO */ && config ? await import("./useAutoAcceptIndicator-ILINOSAS.js") : void 0;
     if (config) {
       try {
         config.setApprovalMode(mode);
@@ -2533,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) {
@@ -2904,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}}",
@@ -2926,7 +3100,7 @@ var directoryCommand = {
             }
           }
           if (added.length > 0) {
-            const gemini = config.getGeminiClient();
+            const gemini = config.getLlmClient();
             if (gemini) {
               try {
                 await gemini.addDirectoryContext();
@@ -3162,7 +3336,7 @@ var cdCommand = {
       }
     }
     try {
-      await config.getGeminiClient()?.addWorkingDirectoryChangedContext(realOldDir, realTargetPath);
+      await config.getLlmClient()?.addWorkingDirectoryChangedContext(realOldDir, realTargetPath);
     } catch (error) {
       warnings.push(
         `Model context refresh failed: ${error instanceof Error ? error.message : String(error)}`
@@ -3350,12 +3524,12 @@ var clearCommand = {
         context.session.startNewSession(newSessionId);
       }
       context.ui.clear();
-      const geminiClient = config.getGeminiClient();
-      if (geminiClient) {
+      const llmClient = config.getLlmClient();
+      if (llmClient) {
         context.ui.setDebugMessage(
           t("Starting a new session, resetting chat, and clearing terminal.")
         );
-        await geminiClient.resetChat();
+        await llmClient.resetChat();
       } else {
         context.ui.setDebugMessage(t("Starting a new session and clearing."));
       }
@@ -3761,8 +3935,8 @@ var compressCommand = {
       }
     };
     const config = context.services.config;
-    const geminiClient = config?.getGeminiClient();
-    if (!config || !geminiClient) {
+    const llmClient = config?.getLlmClient();
+    if (!config || !llmClient) {
       return {
         type: "message",
         messageType: "error",
@@ -3777,7 +3951,7 @@ var compressCommand = {
     }) : void 0;
     const doCompress = /* @__PURE__ */ __name(async () => {
       const promptId = `compress-${Date.now()}`;
-      return await geminiClient.tryCompressChat(
+      return await llmClient.tryCompressChat(
         promptId,
         true,
         abortSignal,
@@ -3955,15 +4129,15 @@ var compressFastCommand = {
       }
     };
     const config = context.services.config;
-    const geminiClient = config?.getGeminiClient();
-    if (!config || !geminiClient) {
+    const llmClient = config?.getLlmClient();
+    if (!config || !llmClient) {
       return {
         type: "message",
         messageType: "error",
         content: t("Config not loaded.")
       };
     }
-    const doCompress = /* @__PURE__ */ __name(async () => await geminiClient.tryCompressChatFast(), "doCompress");
+    const doCompress = /* @__PURE__ */ __name(async () => await llmClient.tryCompressChatFast(), "doCompress");
     if (executionMode === "acp") {
       const messages = /* @__PURE__ */ __name(async function* () {
         try {
@@ -4582,7 +4756,7 @@ var copyCommand = {
   kind: "built-in" /* BUILT_IN */,
   supportedModes: ["interactive"],
   action: /* @__PURE__ */ __name(async (context, args) => {
-    const chat = await context.services.config?.getGeminiClient()?.getChat();
+    const chat = await context.services.config?.getLlmClient()?.getChat();
     const history = chat?.getHistoryShallow();
     const aiMessages = history?.filter((item) => item.role === "model") ?? [];
     if (aiMessages.length === 0) {
@@ -4857,7 +5031,7 @@ async function checkApiClient(context) {
     };
   }
   try {
-    const client = config.getGeminiClient();
+    const client = config.getLlmClient();
     if (client.isInitialized()) {
       return {
         category: t("Authentication"),
@@ -5808,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) {
@@ -5851,7 +6025,7 @@ __name(formatCoreDiagnostics, "formatCoreDiagnostics");
 function collectToolResultRetention(context) {
   try {
     const config = context.services.config;
-    const history = config?.getGeminiClient()?.getHistoryShallow();
+    const history = config?.getLlmClient()?.getHistoryShallow();
     if (!history) {
       return null;
     }
@@ -6229,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",
@@ -6666,7 +6842,7 @@ var forkCommand = {
     }
     let hasHistory = false;
     try {
-      hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
+      hasHistory = (config.getLlmClient().getHistoryShallow() ?? []).length > 0;
     } catch (error) {
       debugLogger9.debug("Failed to read history before /fork:", error);
       hasHistory = false;
@@ -6714,7 +6890,7 @@ var forkCommand = {
       };
     }
     try {
-      config.getGeminiClient().addHistory({
+      config.getLlmClient().addHistory({
         role: "user",
         parts: [
           {
@@ -7239,7 +7415,7 @@ var expandNowCommand = {
         content: t("History is already expanded in this session.")
       };
     }
-    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-35D4KAVT.js");
+    const { expandCollapsedHistory } = await import("./resumeHistoryUtils-NSGF3UCB.js");
     const updated = expandCollapsedHistory(history);
     loadHistory(updated);
     refreshStatic();
@@ -8622,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,
@@ -8678,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)) {
@@ -8816,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",
@@ -8884,7 +9078,7 @@ async function setOutputLanguage(context, language) {
     if (config) {
       try {
         await config.refreshHierarchicalMemory();
-        await config.getGeminiClient().refreshSystemInstruction();
+        await config.getLlmClient().refreshSystemInstruction();
       } catch (error) {
         debugLogger11.warn(
           "Failed to apply output language to running session:",
@@ -9296,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(
@@ -9304,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");
@@ -9540,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",
@@ -10036,7 +10242,8 @@ ${formatNonVisionModelWarning(modelName2)}`;
         settings,
         authType,
         modelName,
-        scopeOverride
+        scopeOverride,
+        context.executionPolicy?.persistModelSelection !== false
       );
       if (context.executionMode === "acp") {
         await recordDaemonSessionModelFromConfig(config);
@@ -10790,7 +10997,7 @@ ${fileList}`
       loadHistory(toolCallData.history);
     }
     if (toolCallData.clientHistory) {
-      await config?.getGeminiClient()?.setHistory(toolCallData.clientHistory);
+      await config?.getLlmClient()?.setHistory(toolCallData.clientHistory);
     }
     return {
       type: "tool",
@@ -11823,8 +12030,8 @@ var summaryCommand = {
         content: t("Config not loaded.")
       };
     }
-    const geminiClient = config.getGeminiClient();
-    if (!geminiClient) {
+    const llmClient = config.getLlmClient();
+    if (!llmClient) {
       return {
         type: "message",
         messageType: "error",
@@ -11850,7 +12057,7 @@ var summaryCommand = {
       };
     }
     const getChatHistory = /* @__PURE__ */ __name(() => {
-      const chat = geminiClient.getChat();
+      const chat = llmClient.getChat();
       return chat.getHistoryShallow();
     }, "getChatHistory");
     const validateChatHistory = /* @__PURE__ */ __name((history2) => {
@@ -11863,7 +12070,7 @@ var summaryCommand = {
         role: message2.role,
         parts: message2.parts
       }));
-      const rawSystemInstruction = geminiClient.getChat().getGenerationConfig().systemInstruction;
+      const rawSystemInstruction = llmClient.getChat().getGenerationConfig().systemInstruction;
       const chatSystemInstruction = typeof rawSystemInstruction === "string" ? rawSystemInstruction : void 0;
       const result = await runSideQuery(config, {
         purpose: "project-summary",
@@ -12480,13 +12687,17 @@ var toolsCommand = {
       return;
     }
     const tools = toolRegistry.getAllTools();
-    const geminiTools = tools.filter((tool) => !("serverName" in tool));
+    const llmTools = tools.filter((tool) => !("serverName" in tool));
     const toolsListItem = {
       type: "tools_list" /* TOOLS_LIST */,
-      tools: geminiTools.map((tool) => ({
+      tools: llmTools.map((tool) => ({
         name: tool.name,
         displayName: tool.displayName,
-        description: tool.description
+        description: tool.description,
+        // Surface the deferred/eager split so a `tools.eager` allowlist is
+        // visible rather than silently reshaping the model's toolset — the
+        // user-facing half of #10075.
+        deferred: toolRegistry.isDeferredAndHidden(tool.name)
       })),
       showDescriptions: useShowDescriptions
     };
@@ -14518,10 +14729,10 @@ var updateCommand = {
       { performStandaloneUpdate },
       installationInfo
     ] = await Promise.all([
-      import("./updateCheck-AK4COHNK.js"),
-      import("./processUtils-ZHFC7CSL.js"),
-      import("./standalone-update-XOCWGXAH.js"),
-      import("./installationInfo-D4XGQNHJ.js")
+      import("./updateCheck-D3YG2WCD.js"),
+      import("./processUtils-GPHNANKZ.js"),
+      import("./standalone-update-THVU3OKY.js"),
+      import("./installationInfo-AAPKYDSZ.js")
     ]);
     const { formatUpdateInstructions, getInstallationInfo: getInstallationInfo2 } = installationInfo;
     const settings = context.services.settings;
@@ -14682,6 +14893,7 @@ var BuiltinCommandLoader = class {
       approvalModeCommand,
       authCommand,
       branchCommand,
+      peersCommand,
       btwCommand,
       forkCommand,
       bugCommand,
@@ -15926,7 +16138,7 @@ var SkillCommandLoader = class {
       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,
@@ -16008,8 +16220,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(() => {
@@ -16057,6 +16269,12 @@ 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":
@@ -16176,12 +16394,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
     }))
@@ -16189,7 +16407,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,
@@ -16198,7 +16418,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;
@@ -16227,7 +16448,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" };
@@ -16263,10 +16484,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
@@ -16282,6 +16506,7 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
       if (!skill.action) continue;
       const skillContext = {
         executionMode,
+        ...executionPolicy ? { executionPolicy } : {},
         invocation: {
           raw: `/${skill.name}`,
           name: skill.name,
@@ -16355,6 +16580,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.', {
@@ -16388,6 +16622,7 @@ var handleSlashCommand = /* @__PURE__ */ __name(async (rawQuery, abortController
   };
   const context = {
     executionMode,
+    ...executionPolicy ? { executionPolicy } : {},
     abortSignal: commandToExecute.name === "advisor" ? abortController.signal : void 0,
     services: {
       config,
@@ -16466,7 +16701,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),
@@ -16486,9 +16721,12 @@ 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) {
     debugLogger20.error("Error loading available commands:", error);
     return [];