@qwen-code/qwen-code 0.19.6 → 0.19.7-nightly.20260708.394c1a289

package/chunks/{acpAgent-PKCTYWJV.js → acpAgent-4VE3FGJX.js}

@@ -3,71 +3,79 @@
 import {
   classifyApiError,
   prefixMidTurnUserMessageParts
-} from "./chunk-MBWLP5OT.js";
+} from "./chunk-LKXDC3AW.js";
 import {
   EXTENSION_CONTEXT_BUDGET,
   buildExtensionMentionContext,
+  buildMcpServerContextText,
   matchExtensionByRef,
-  parseExtensionRef
-} from "./chunk-UNXGEDX2.js";
+  matchMcpServerByRef,
+  parseExtensionRef,
+  parseMcpServerRef
+} from "./chunk-5OSSOBZC.js";
 import {
-  HistoryReplayer,
-  MessageEmitter,
-  PlanEmitter,
-  ToolCallEmitter,
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-O2RJARYU.js";
+} from "./chunk-KKWO4IX2.js";
 import {
   appEvents,
   buildDisabledSkillNamesProvider,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-DXXNMPJH.js";
-import {
-  collectContextData,
-  formatContextUsageText
-} from "./chunk-UTL7KABL.js";
+} from "./chunk-YMWIKAEE.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-MHQKYQDS.js";
-import "./chunk-FPHA7WIZ.js";
+} from "./chunk-LC4SMGYY.js";
+import "./chunk-MYZWWRVW.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-GQBRGBLS.js";
+} from "./chunk-J43WPR6U.js";
+import "./chunk-IFEWJXFS.js";
+import "./chunk-ELMPRVCB.js";
+import "./chunk-JZSY4WP3.js";
+import {
+  collectContextData,
+  formatContextUsageText
+} from "./chunk-VQJ64BIQ.js";
+import "./chunk-UIDXQNMV.js";
+import "./chunk-332PWN27.js";
+import "./chunk-N74BA4VP.js";
 import {
   isTerminalGoalStatusKind
-} from "./chunk-KSPVDFE4.js";
-import "./chunk-MRO43B25.js";
-import "./chunk-VXGPYF7U.js";
-import "./chunk-YSU33ACT.js";
+} from "./chunk-SAIILPQ3.js";
 import "./chunk-KYMBIKIW.js";
-import "./chunk-HTWHAN44.js";
-import "./chunk-JZSY4WP3.js";
-import "./chunk-3X76L4UF.js";
+import "./chunk-PC4ZXHU2.js";
+import "./chunk-MRO43B25.js";
+import "./chunk-PLGONYEL.js";
 import "./chunk-3GONHQOA.js";
-import "./chunk-OIFSBXSP.js";
-import "./chunk-ZI4MGBB5.js";
+import "./chunk-SJHAUELE.js";
+import "./chunk-TBAZMRW3.js";
 import {
   MAX_REMEMBER_CONTENT_BYTES,
   extractRememberErrorCode,
   formatWorkspaceMemoryForgetSummary,
   isValidServerName
 } from "./chunk-6SHO7WFF.js";
-import "./chunk-L7QPM2YD.js";
+import {
+  HistoryReplayer,
+  MessageEmitter,
+  PlanEmitter,
+  ToolCallEmitter
+} from "./chunk-FK77ILF5.js";
+import "./chunk-ZK5EI6NR.js";
+import "./chunk-LGFAYIKX.js";
 import "./chunk-54YZOP7P.js";
-import "./chunk-XH7H6YG4.js";
-import "./chunk-OAYOHSGP.js";
+import "./chunk-BHRU4SDF.js";
 import "./chunk-KHDZHZMH.js";
 import {
   formatAcpModelId,
   parseAcpBaseModelId,
   parseAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-SOT7OMGL.js";
+} from "./chunk-KT3SI3CQ.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-6IAWPIQ6.js";
@@ -77,48 +85,61 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-YTWX5TT2.js";
-import "./chunk-HCFSKO6K.js";
-import "./chunk-NIOPRZNN.js";
+} from "./chunk-5FL2K3ZB.js";
+import "./chunk-3QDZDAJG.js";
+import "./chunk-E7KNELIZ.js";
+import {
+  computeCpuPercent
+} from "./chunk-II73RK2S.js";
 import "./chunk-AHNXYU4O.js";
 import "./chunk-RNBYOUGV.js";
-import "./chunk-N2IJLN2L.js";
+import "./chunk-2SWMCXVR.js";
 import "./chunk-BJBWRCSK.js";
-import "./chunk-2INJBYLJ.js";
-import "./chunk-6BEOH4KK.js";
+import "./chunk-GIY6JTTC.js";
+import "./chunk-2NPS2UDH.js";
 import "./chunk-S6RLAIUR.js";
 import "./chunk-MX2YXRER.js";
-import "./chunk-YHTNWGRR.js";
+import "./chunk-MZ7BABX3.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-NUK2PFSU.js";
+} from "./chunk-L7IWK7JY.js";
 import {
   OUTPUT_LANGUAGE_AUTO,
+  findEnvFiles,
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
+  getUserSettingsPath,
   isAutoLanguage,
   loadSettings,
+  preResolveHomeEnvOverrides,
   reloadEnvironment,
   resolveOutputLanguage,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-CEYA7K7C.js";
+} from "./chunk-QHT5USLK.js";
 import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-6QVRLKTZ.js";
+} from "./chunk-TBLJNMI7.js";
 import "./chunk-TLRYABYP.js";
-import "./chunk-4RQIB5UZ.js";
+import {
+  getSystemDefaultsPath,
+  getSystemSettingsPath
+} from "./chunk-4RQIB5UZ.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE
-} from "./chunk-T22H4V4R.js";
+} from "./chunk-B34OV7K2.js";
 import {
   CLIENT_MCP_OVER_WS_CONFIG_FLAG,
+  LOAD_REPLAY_BULK_MODE,
+  LOAD_REPLAY_META_KEY,
+  LOAD_REPLAY_MODE_META_KEY,
+  LOAD_REPLAY_VERSION,
   MID_TURN_QUEUE_DRAIN_METHOD
-} from "./chunk-EWALXUAD.js";
-import "./chunk-SEZC2725.js";
-import "./chunk-ALX6BUYW.js";
+} from "./chunk-AGHU5VRK.js";
+import "./chunk-ER3BKOLB.js";
+import "./chunk-G7ZG7CA6.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -126,7 +147,7 @@ import {
 } from "./chunk-VRDMOSQS.js";
 import {
   ndJsonStream
-} from "./chunk-3VJ7MT3N.js";
+} from "./chunk-EXPMGZZV.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -134,14 +155,15 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-7Z6UEJA4.js";
+} from "./chunk-ME344634.js";
 import "./chunk-3RW4AZJV.js";
-import "./chunk-SL2P3JUA.js";
+import "./chunk-XUSONNJ4.js";
+import "./chunk-43W4YSO6.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-V6NH3CUC.js";
+} from "./chunk-MOQOAH7N.js";
 import {
   writeStderrLine
 } from "./chunk-Y6Z2O3WR.js";
@@ -151,6 +173,7 @@ import {
   APPROVAL_MODE_INFO,
   BTW_MAX_INPUT_LENGTH,
   ExtensionManager,
+  IMAGE_CAPABILITY,
   InvalidMcpConfigError,
   LoopTickResolver,
   MAX_TRANSCRIPT_MESSAGES,
@@ -212,6 +235,7 @@ import {
   getScopedEnvContents,
   getStartupContextLength,
   hasImageParts,
+  ideContextStore,
   injectPermissionRulesIfMissing,
   isApproveOutcome,
   isDenialFallbackReason,
@@ -245,37 +269,37 @@ import {
   subagentGenerator,
   unregisterGoalHook,
   updateSetting
-} from "./chunk-AGZF43UV.js";
+} from "./chunk-E7HM76PR.js";
 import "./chunk-5P5XGNYH.js";
 import "./chunk-SKAZWEV5.js";
 import {
   external_exports
 } from "./chunk-K5PGHDBN.js";
-import "./chunk-CLQPBI4H.js";
-import "./chunk-QOMAHFYI.js";
-import "./chunk-G7OQ3RFJ.js";
-import "./chunk-LKWAVAB5.js";
+import "./chunk-3B26UVCX.js";
+import "./chunk-W7EEOR7D.js";
+import "./chunk-42XGFRJS.js";
+import "./chunk-X2XNQQJI.js";
 import {
   runSideQuery
-} from "./chunk-5ES5YPED.js";
+} from "./chunk-VZ7HY3YU.js";
 import "./chunk-2MPVVENX.js";
 import "./chunk-ZTQ26VBE.js";
-import "./chunk-DMSNJDWG.js";
+import "./chunk-FV7425LN.js";
 import "./chunk-MLZQVCF3.js";
 import "./chunk-LQ7TMOCE.js";
 import "./chunk-E5A7LHNN.js";
 import {
   APPROVAL_MODES,
   FORK_SUBAGENT_TYPE
-} from "./chunk-LM3YCCZJ.js";
+} from "./chunk-VEB3NYSO.js";
 import "./chunk-GO6LNQXT.js";
-import "./chunk-B236XPGF.js";
+import "./chunk-NQKLOAVJ.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-NVFJSIAX.js";
-import "./chunk-TOAUDIS7.js";
-import "./chunk-NPQWQYU6.js";
+} from "./chunk-WMPVYQ4P.js";
+import "./chunk-TLWA7TPR.js";
+import "./chunk-QYNNN7BK.js";
 import {
   AuthType,
   ConversationFinishedEvent,
@@ -300,7 +324,7 @@ import {
   startToolSpan,
   uiTelemetryService,
   withInteractionSpan
-} from "./chunk-JN2VJ33O.js";
+} from "./chunk-7I4MGFBN.js";
 import "./chunk-E6US47KI.js";
 import "./chunk-UWCTAVOD.js";
 import "./chunk-OFEVLU4C.js";
@@ -308,44 +332,44 @@ import "./chunk-OMX7CUOE.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-MOUXUCXQ.js";
-import "./chunk-BZHLWC6T.js";
-import "./chunk-RZORUN6X.js";
+} from "./chunk-4KJ2BPIT.js";
+import "./chunk-SUAKHHK7.js";
+import "./chunk-FEJ2FZ3U.js";
 import {
   ToolConfirmationOutcome,
   ToolNames
-} from "./chunk-MJKMIQMK.js";
+} from "./chunk-X3YGAX7V.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-TENOUWY2.js";
-import "./chunk-GLPV75ES.js";
+} from "./chunk-IJRL2S3D.js";
+import "./chunk-AHNJGLFV.js";
 import "./chunk-22IFUCVR.js";
-import "./chunk-T42ACHFI.js";
+import "./chunk-7LTB54MK.js";
 import "./chunk-SIUQ3YYX.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
-} from "./chunk-KYTQOCDE.js";
-import "./chunk-YPCPZSZB.js";
+} from "./chunk-HW4N45EE.js";
+import "./chunk-CCGOFQV3.js";
 import "./chunk-IRJWHZWU.js";
 import "./chunk-SYCJMSIJ.js";
 import "./chunk-55ZMG67I.js";
 import "./chunk-H6BD2ELD.js";
 import "./chunk-5IFG2VC4.js";
 import "./chunk-64WXLC72.js";
-import "./chunk-D5KISTLW.js";
+import "./chunk-H6EMK6QK.js";
 import {
   Storage,
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-AVQDCKNF.js";
-import "./chunk-MJKEQSZI.js";
+} from "./chunk-22MNNNXE.js";
+import "./chunk-BGL43SJ3.js";
 import {
   runExitCleanup
-} from "./chunk-ZO5EA3XJ.js";
+} from "./chunk-QCSLZO6J.js";
 import "./chunk-ZERZSAZL.js";
 import "./chunk-QN5NZ3UQ.js";
 import "./chunk-BR4QREVK.js";
@@ -460,6 +484,23 @@ async function resolveRealPath(value) {
   }
 }
 __name(resolveRealPath, "resolveRealPath");
+function toAcpReadTextFileRequest(params, sessionId) {
+  const request = {
+    path: params.path,
+    sessionId
+  };
+  if (params._meta !== void 0) {
+    request._meta = params._meta;
+  }
+  if (params.limit !== void 0) {
+    request.limit = params.limit;
+  }
+  if (params.line != null) {
+    request.line = params.line + 1;
+  }
+  return request;
+}
+__name(toAcpReadTextFileRequest, "toAcpReadTextFileRequest");
 var AcpFileSystemService = class {
   constructor(connection, sessionId, capabilities, fallback, options = {}) {
     this.connection = connection;
@@ -477,10 +518,9 @@ var AcpFileSystemService = class {
     }
     let response;
     try {
-      response = await this.connection.readTextFile({
-        ...params,
-        sessionId: this.sessionId
-      });
+      response = await this.connection.readTextFile(
+        toAcpReadTextFileRequest(params, this.sessionId)
+      );
     } catch (error) {
       const errorCode = getErrorCode(error);
       if (errorCode === RESOURCE_NOT_FOUND_CODE) {
@@ -572,14 +612,130 @@ var AcpFileSystemService = class {
 // packages/cli/src/acp-integration/acpAgent.ts
 import { Readable, Writable } from "node:stream";
 import { pipeline } from "node:stream/promises";
-import * as fs from "node:fs/promises";
-import * as path3 from "node:path";
+import * as fs2 from "node:fs/promises";
+import * as os3 from "node:os";
+import * as path4 from "node:path";
 import { createGunzip } from "node:zlib";
 
-// packages/cli/src/acp-integration/session/Session.ts
+// packages/cli/src/config/settings-cache.ts
 init_esbuild_shims();
+import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path2 from "node:path";
+var MAX_CACHE_ENTRIES = 64;
+var debugLogger2 = createDebugLogger("SETTINGS_CACHE");
+var cache = /* @__PURE__ */ new Map();
+function statSig(filePath) {
+  const st = fs.statSync(filePath, { throwIfNoEntry: false });
+  return st ? `${st.mtimeMs}:${st.size}:${st.ino}` : "missing";
+}
+__name(statSig, "statSig");
+function realpathOr(p) {
+  try {
+    return fs.realpathSync(p);
+  } catch {
+    return path2.resolve(p);
+  }
+}
+__name(realpathOr, "realpathOr");
+function settingsFileSigs(workspaceDir) {
+  const filePaths = [
+    getSystemSettingsPath(),
+    getSystemDefaultsPath(),
+    getUserSettingsPath(),
+    new Storage(workspaceDir).getWorkspaceSettingsPath()
+  ];
+  return filePaths.map((filePath) => ({ filePath, sig: statSig(filePath) }));
+}
+__name(settingsFileSigs, "settingsFileSigs");
+function envFileSigs(settings, workspaceDir) {
+  return findEnvFiles(settings.merged, workspaceDir).map((filePath) => ({
+    filePath,
+    sig: statSig(filePath)
+  }));
+}
+__name(envFileSigs, "envFileSigs");
+function sameFileSigs(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  return a.every(
+    (sig, i) => sig.filePath === b[i].filePath && sig.sig === b[i].sig
+  );
+}
+__name(sameFileSigs, "sameFileSigs");
+function isEntryFresh(key, entry) {
+  const fp = entry.fingerprint;
+  return ideContextStore.get()?.workspaceState?.isTrusted === fp.ideTrust && realpathOr(key) === fp.realCwd && // homeDir guards the corner where nothing else moves: QWEN_HOME set (so
+  // settings paths don't follow HOME), no .env files anywhere, and the new
+  // home equals the workspace dir — which flips workspaceSettingsActive.
+  realpathOr(os.homedir()) === fp.homeDir && sameFileSigs(settingsFileSigs(key), fp.settingsFiles) && sameFileSigs(envFileSigs(entry.settings, key), fp.envFiles);
+}
+__name(isEntryFresh, "isEntryFresh");
+function loadSettingsCached(workspaceDir) {
+  preResolveHomeEnvOverrides();
+  const key = path2.resolve(workspaceDir);
+  const entry = cache.get(key);
+  if (entry) {
+    let isFresh = false;
+    try {
+      isFresh = isEntryFresh(key, entry);
+    } catch (error) {
+      debugLogger2.warn(
+        `fingerprint check failed for ${key}; reloading:`,
+        error
+      );
+    }
+    if (isFresh) {
+      cache.delete(key);
+      cache.set(key, entry);
+      debugLogger2.debug(`hit ${key}`);
+      return entry.settings;
+    }
+    cache.delete(key);
+  }
+  debugLogger2.debug(`miss ${key}`);
+  let preLoadSigs;
+  try {
+    preLoadSigs = settingsFileSigs(key);
+  } catch (error) {
+    debugLogger2.warn(`pre-load signing failed for ${key}; not caching:`, error);
+  }
+  const settings = loadSettings(key);
+  if (preLoadSigs) {
+    try {
+      cache.set(key, {
+        settings,
+        fingerprint: {
+          settingsFiles: preLoadSigs,
+          // .env discovery needs the merged settings (trust), so it can only
+          // be signed after the load — see difference (2) in the module doc.
+          envFiles: envFileSigs(settings, key),
+          ideTrust: ideContextStore.get()?.workspaceState?.isTrusted,
+          realCwd: realpathOr(key),
+          homeDir: realpathOr(os.homedir())
+        }
+      });
+      if (cache.size > MAX_CACHE_ENTRIES) {
+        const oldest = cache.keys().next().value;
+        if (oldest !== void 0) {
+          cache.delete(oldest);
+          debugLogger2.debug(`evicted LRU entry ${oldest}`);
+        }
+      }
+    } catch (error) {
+      cache.delete(key);
+      debugLogger2.warn(`caching failed for ${key}; serving uncached:`, error);
+    }
+  }
+  return settings;
+}
+__name(loadSettingsCached, "loadSettingsCached");
+
+// packages/cli/src/acp-integration/session/Session.ts
+init_esbuild_shims();
+import * as os2 from "node:os";
+import * as path3 from "node:path";
 
 // packages/cli/src/acp-integration/session/SubAgentTracker.ts
 init_esbuild_shims();
@@ -761,7 +917,7 @@ function toPermissionOptions(confirmation, forceHideAlwaysAllow = false) {
 __name(toPermissionOptions, "toPermissionOptions");
 
 // packages/cli/src/acp-integration/session/SubAgentTracker.ts
-var debugLogger2 = createDebugLogger("ACP_SUBAGENT_TRACKER");
+var debugLogger3 = createDebugLogger("ACP_SUBAGENT_TRACKER");
 var SubAgentTracker = class {
   constructor(ctx, client, parentToolCallId, subagentType, onPermissionCancel) {
     this.ctx = ctx;
@@ -821,7 +977,7 @@ var SubAgentTracker = class {
         try {
           invocation = tool.build(event.args);
         } catch (e) {
-          debugLogger2.warn(`Failed to build subagent tool ${event.name}:`, e);
+          debugLogger3.warn(`Failed to build subagent tool ${event.name}:`, e);
         }
       }
       this.toolStates.set(event.callId, {
@@ -900,7 +1056,7 @@ var SubAgentTracker = class {
           this.onPermissionCancel?.();
         }
       } catch (error) {
-        debugLogger2.error(
+        debugLogger3.error(
           `Permission request failed for subagent tool ${event.name}:`,
           error
         );
@@ -908,7 +1064,7 @@ var SubAgentTracker = class {
         try {
           await event.respond("cancel" /* Cancel */);
         } catch (respondError) {
-          debugLogger2.error(
+          debugLogger3.error(
             `Failed to cancel subagent tool ${event.name} after permission request failure:`,
             respondError
           );
@@ -1006,8 +1162,8 @@ var TurnBuffer = class {
 // packages/cli/src/acp-integration/session/rewrite/LlmRewriter.ts
 init_esbuild_shims();
 import { readFileSync, existsSync } from "node:fs";
-import { resolve } from "node:path";
-var debugLogger3 = createDebugLogger("MESSAGE_REWRITER");
+import { resolve as resolve2 } from "node:path";
+var debugLogger4 = createDebugLogger("MESSAGE_REWRITER");
 var DEFAULT_REWRITE_PROMPT = `You are an assistant that rewrites raw coding-agent output into concise, user-friendly progress updates.
 
 The agent is a software engineering assistant that reads files, writes code, runs commands, and uses tools. Its raw output mixes internal reasoning with user-facing information. Your job: extract what the user cares about, drop what they don't.
@@ -1033,14 +1189,14 @@ var LlmRewriter = class {
     this.rewriteModel = rewriteConfig.model || void 0;
     this.contextTurns = rewriteConfig.contextTurns === "all" ? Infinity : rewriteConfig.contextTurns ?? 1;
     if (rewriteConfig.promptFile) {
-      const filePath = resolve(rewriteConfig.promptFile);
+      const filePath = resolve2(rewriteConfig.promptFile);
       if (existsSync(filePath)) {
         this.prompt = readFileSync(filePath, "utf-8").trim();
-        debugLogger3.info(
+        debugLogger4.info(
           `Loaded rewrite prompt from file: ${filePath} (${this.prompt.length} chars)`
         );
       } else {
-        debugLogger3.warn(
+        debugLogger4.warn(
           `Rewrite prompt file not found: ${filePath}, using default`
         );
         this.prompt = DEFAULT_REWRITE_PROMPT;
@@ -1077,7 +1233,7 @@ var LlmRewriter = class {
     const inputText = inputParts.join("\n\n");
     if (!inputText.trim()) return null;
     if (inputText.length < 10) return null;
-    debugLogger3.info(
+    debugLogger4.info(
       `[REWRITE INPUT] system_prompt_len=${this.prompt.length} input_len=${inputText.length} context_turns=${this.outputHistory.length}
 --- INPUT TEXT ---
 ${inputText}
@@ -1106,10 +1262,10 @@ ${inputText}
       });
       const rewritten = result.text;
       if (!rewritten || rewritten.length < 5) {
-        debugLogger3.info(`[REWRITE OUTPUT] empty or too short, skipping`);
+        debugLogger4.info(`[REWRITE OUTPUT] empty or too short, skipping`);
         return null;
       }
-      debugLogger3.info(
+      debugLogger4.info(
         `[REWRITE OUTPUT] len=${rewritten.length}
 --- OUTPUT ---
 ${rewritten}
@@ -1118,7 +1274,7 @@ ${rewritten}
       this.outputHistory.push(rewritten);
       return rewritten;
     } catch (error) {
-      debugLogger3.warn(
+      debugLogger4.warn(
         `LLM rewrite failed, skipping: ${error instanceof Error ? error.message : String(error)}`
       );
       return null;
@@ -1127,7 +1283,7 @@ ${rewritten}
 };
 
 // packages/cli/src/acp-integration/session/rewrite/MessageRewriteMiddleware.ts
-var debugLogger4 = createDebugLogger("MESSAGE_REWRITE");
+var debugLogger5 = createDebugLogger("MESSAGE_REWRITE");
 var DEFAULT_REWRITE_TIMEOUT_MS = 3e4;
 var REWRITE_META_EXCLUDED_KEYS = /* @__PURE__ */ new Set([]);
 var MessageRewriteMiddleware = class {
@@ -1207,10 +1363,10 @@ var MessageRewriteMiddleware = class {
         try {
           const rewritten = await this.rewriter.rewrite(content, rewriteSignal);
           if (!rewritten) {
-            debugLogger4.info(`Turn ${turnIdx}: no rewrite output`);
+            debugLogger5.info(`Turn ${turnIdx}: no rewrite output`);
             return;
           }
-          debugLogger4.info(
+          debugLogger5.info(
             `Turn ${turnIdx}: rewritten ${rewritten.length} chars`
           );
           await this.sendUpdate({
@@ -1223,7 +1379,7 @@ var MessageRewriteMiddleware = class {
             }
           });
         } catch (error) {
-          debugLogger4.warn(
+          debugLogger5.warn(
             `Turn ${turnIdx}: rewrite failed: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -1268,7 +1424,7 @@ function loadRewriteConfig(settings) {
 __name(loadRewriteConfig, "loadRewriteConfig");
 
 // packages/cli/src/acp-integration/session/Session.ts
-var debugLogger5 = createDebugLogger("SESSION");
+var debugLogger6 = createDebugLogger("SESSION");
 var USER_CANCEL_ABORT_REASON = "qwen:user-cancel";
 var DAEMON_RETRY_META_KEY = "qwen.daemon.retry";
 var DAEMON_CONTINUE_META_KEY = "qwen.daemon.continueLastTurn";
@@ -1279,7 +1435,6 @@ function maskApiKeyForDisplay(apiKey) {
   return `${trimmed.slice(0, 3)}...${trimmed.slice(-4)}`;
 }
 __name(maskApiKeyForDisplay, "maskApiKeyForDisplay");
-var DAEMON_TURN_TOOL_CALL_CAP = 100;
 var DAEMON_INVALID_TOOL_PARAMS_THRESHOLD = 3;
 var PERMISSION_CANCEL_SKIP_MESSAGE = "Skipped because a permission request was cancelled before the user answered; user input is required before continuing.";
 var LOOP_DETECTED_SKIP_MESSAGE = "Skipped because loop detection stopped the current turn before this tool call could run.";
@@ -1295,7 +1450,7 @@ __name(createDaemonToolLoopState, "createDaemonToolLoopState");
 function recordDaemonLoopDetected(config, promptId, loopType, message, loopState) {
   if (!loopState.loopDetected) {
     loopState.loopDetected = true;
-    debugLogger5.warn(message);
+    debugLogger6.warn(message);
     logLoopDetected(config, new LoopDetectedEvent(loopType, promptId));
   }
   return true;
@@ -1305,7 +1460,7 @@ function recordDaemonToolCalls(config, promptId, loopState, count) {
   if (!loopState || loopState.loopDetected)
     return loopState?.loopDetected ?? false;
   loopState.totalToolCalls += count;
-  if (loopState.totalToolCalls <= DAEMON_TURN_TOOL_CALL_CAP) return false;
+  if (loopState.totalToolCalls <= config.getMaxToolCallsPerTurn()) return false;
   return recordDaemonLoopDetected(
     config,
     promptId,
@@ -1364,7 +1519,7 @@ function isContentBlock(value) {
     case "resource":
       return isEmbeddedResourceResource(value["resource"]);
     default:
-      debugLogger5.warn(`Unknown ContentBlock type: ${value["type"]}`);
+      debugLogger6.warn(`Unknown ContentBlock type: ${value["type"]}`);
       return false;
   }
 }
@@ -1403,7 +1558,7 @@ function hasInlineMediaContentBlock(content) {
 __name(hasInlineMediaContentBlock, "hasInlineMediaContentBlock");
 function capMidTurnDrainItems(items, fieldName) {
   if (items.length <= MAX_MID_TURN_DRAIN_ITEMS) return items;
-  debugLogger5.warn(
+  debugLogger6.warn(
     `Mid-turn drain response had ${items.length} ${fieldName}; processing first ${MAX_MID_TURN_DRAIN_ITEMS}`
   );
   return items.slice(0, MAX_MID_TURN_DRAIN_ITEMS);
@@ -1418,7 +1573,7 @@ function getMidTurnItemDisplayTextForLog(displayText) {
 __name(getMidTurnItemDisplayTextForLog, "getMidTurnItemDisplayTextForLog");
 function getValidMidTurnContentBlocks(content, displayText) {
   if (!Array.isArray(content)) {
-    debugLogger5.warn(
+    debugLogger6.warn(
       `Dropped invalid mid-turn item: ${getMidTurnItemDisplayTextForLog(
         displayText
       )}`
@@ -1428,7 +1583,7 @@ function getValidMidTurnContentBlocks(content, displayText) {
   const validBlocks = content.filter(isContentBlock);
   const invalidBlockCount = content.length - validBlocks.length;
   if (invalidBlockCount > 0) {
-    debugLogger5.warn(
+    debugLogger6.warn(
       `Dropped ${invalidBlockCount} invalid mid-turn content block(s): ${getMidTurnItemDisplayTextForLog(
         displayText
       )}`
@@ -1474,7 +1629,7 @@ function parseMidTurnDrainResponse(response) {
     );
   }
   if (!Array.isArray(response["messages"])) {
-    debugLogger5.warn(
+    debugLogger6.warn(
       `Mid-turn drain response had no recognized 'items' or 'messages' field; keys: ${Object.keys(
         response
       ).join(", ")}`
@@ -1499,11 +1654,11 @@ var MidTurnDrainTimeoutError = class extends Error {
 var MAX_NOTIFICATION_QUEUE = 20;
 function resolveHomeLoopResolverRoots({
   homeQwenDir = Storage.getGlobalQwenDir(),
-  homeDir = os.homedir(),
+  homeDir = os2.homedir(),
   qwenHome = process.env["QWEN_HOME"]
 } = {}) {
   return {
-    homeConfineRoot: (qwenHome ? homeQwenDir : homeDir) || path2.dirname(homeQwenDir),
+    homeConfineRoot: (qwenHome ? homeQwenDir : homeDir) || path3.dirname(homeQwenDir),
     homeQwenDir
   };
 }
@@ -1542,7 +1697,7 @@ async function fireSessionPermissionDeniedForAutoMode(config, decision, outcome,
         callId
       );
     } catch (hookError) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `PermissionDenied hook failed for tool ${callId}: ${hookError instanceof Error ? hookError.message : String(hookError)}`
       );
     }
@@ -1595,6 +1750,17 @@ function collectExtensionMentionRefs(text, mentions) {
   }
 }
 __name(collectExtensionMentionRefs, "collectExtensionMentionRefs");
+function collectMcpServerMentionRefs(text, mentions) {
+  for (const match of text.matchAll(AT_TOKEN_RE)) {
+    const pathName = match[1];
+    if (!pathName) continue;
+    const ref = parseMcpServerRef(pathName);
+    if (ref) {
+      mentions.set(ref.name.toLowerCase(), ref.name);
+    }
+  }
+}
+__name(collectMcpServerMentionRefs, "collectMcpServerMentionRefs");
 async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.timeout(1e4), settings) {
   const slashCommands = await getAvailableCommands(
     config,
@@ -1651,7 +1817,7 @@ async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.
       }
     }
   } catch (error) {
-    debugLogger5.error("Error loading available skills:", error);
+    debugLogger6.error("Error loading available skills:", error);
   }
   for (const command of visibleSlashCommands) {
     if (command.kind !== "skill" /* SKILL */ || !command.skillDetail) {
@@ -1793,7 +1959,7 @@ var Session = class {
    */
   startCronScheduler() {
     this.#startCronSchedulerIfNeeded().catch((error) => {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Cron scheduler startup failed [session ${this.sessionId}]: ${error}`
       );
     });
@@ -1840,7 +2006,7 @@ var Session = class {
   installRewriter() {
     const rewriteConfig = loadRewriteConfig(this.settings);
     if (rewriteConfig?.enabled) {
-      debugLogger5.info("Message rewrite middleware enabled");
+      debugLogger6.info("Message rewrite middleware enabled");
       this.messageRewriter = new MessageRewriteMiddleware(
         this.config,
         rewriteConfig,
@@ -1851,7 +2017,7 @@ var Session = class {
   #installGoalTerminalObserver() {
     setGoalTerminalObserver(this.sessionId, (event) => {
       void this.messageEmitter.emitGoalTerminal(event).catch((error) => {
-        debugLogger5.warn(
+        debugLogger6.warn(
           `Failed to emit goal terminal update: ${this.#formatError(error)}`
         );
       });
@@ -1859,7 +2025,7 @@ var Session = class {
   }
   emitGoalStatus(status) {
     void this.messageEmitter.emitGoalStatus(status).catch((error) => {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Failed to emit goal status update: ${this.#formatError(error)}`
       );
     });
@@ -1868,11 +2034,14 @@ var Session = class {
    * Replays conversation history to the client using modular components.
    * Delegates to HistoryReplayer for consistent event emission.
    */
-  async replayHistory(records) {
+  primeTurnFromHistory(records) {
     this.turn = Math.max(
       this.turn,
       computeInitialTurnFromHistory(records, this.config.getSessionId())
     );
+  }
+  async replayHistory(records) {
+    this.primeTurnFromHistory(records);
     await this.historyReplayer.replay(records);
   }
   rewindToTurn(targetTurnIndex, opts) {
@@ -1920,7 +2089,9 @@ var Session = class {
   }
   getRewindableUserTurnCount() {
     const apiHistory = this.captureHistorySnapshot();
-    const startIndex = getStartupContextLength(apiHistory);
+    const startIndex = getStartupContextLength(apiHistory, {
+      includeCompressed: true
+    });
     let count = 0;
     for (let i = startIndex; i < apiHistory.length; i++) {
       if (this.#isUserTextContent(apiHistory[i])) {
@@ -1939,7 +2110,9 @@ var Session = class {
     this.config.getGeminiClient().getChat().setHistory(structuredClone(history));
   }
   #computeApiTruncationIndexForUserTurn(apiHistory, targetTurnIndex) {
-    const startIndex = getStartupContextLength(apiHistory);
+    const startIndex = getStartupContextLength(apiHistory, {
+      includeCompressed: true
+    });
     if (targetTurnIndex === 0) {
       return startIndex;
     }
@@ -2045,8 +2218,8 @@ var Session = class {
     }
     this.duplicateProviderToolCallResponseIds.clear();
     let resolveCompletion;
-    this.pendingPromptCompletion = new Promise((resolve3) => {
-      resolveCompletion = resolve3;
+    this.pendingPromptCompletion = new Promise((resolve4) => {
+      resolveCompletion = resolve4;
     });
     try {
       const result = await this.#executePrompt(params, pendingSend);
@@ -2128,7 +2301,7 @@ var Session = class {
         const fullHistory = chat.getHistory(true);
         const lastEntry = fullHistory[fullHistory.length - 1];
         if (!lastEntry || lastEntry.role !== "model") {
-          debugLogger5.debug(
+          debugLogger6.debug(
             "Skipping followup suggestion: last history entry is not model"
           );
           return;
@@ -2164,9 +2337,9 @@ var Session = class {
         }
       } catch (error) {
         if (ac.signal.aborted) {
-          debugLogger5.debug("Follow-up suggestion generation aborted");
+          debugLogger6.debug("Follow-up suggestion generation aborted");
         } else {
-          debugLogger5.warn("Follow-up suggestion generation failed", error);
+          debugLogger6.warn("Follow-up suggestion generation failed", error);
         }
       } finally {
         if (this.followupAbort === ac) {
@@ -2218,7 +2391,7 @@ var Session = class {
                 this.#getCurrentChat().getHistory()
               );
               if (detection.kind === "none") {
-                debugLogger5.warn(
+                debugLogger6.warn(
                   `[Session] continue ${promptId}: no interrupted turn on re-detection, nothing to continue`
                 );
                 logConversationFinishedEvent(
@@ -2310,10 +2483,10 @@ var Session = class {
                   this.config.getChatRecordingService()?.recordFileHistorySnapshot(latestSnapshot);
                 }
               } catch (e) {
-                debugLogger5.error(`FileHistory: recordSnapshot failed: ${e}`);
+                debugLogger6.error(`FileHistory: recordSnapshot failed: ${e}`);
               }
             } catch (e) {
-              debugLogger5.error(`FileHistory: makeSnapshot failed: ${e}`);
+              debugLogger6.error(`FileHistory: makeSnapshot failed: ${e}`);
             }
             const systemReminders = await this.#buildInitialSystemReminders();
             if (systemReminders.length > 0) {
@@ -2386,6 +2559,9 @@ ${this.pendingWorktreeNotice}
                     if (resp.type === "chunk" /* CHUNK */ && resp.value.functionCalls) {
                       functionCalls.push(...resp.value.functionCalls);
                     }
+                    if (resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                      functionCalls.length = 0;
+                    }
                   }
                 } catch (error) {
                   if (strippedOrphanEntries && (this.#getCurrentChat().getUserContentPushCount?.() ?? 0) <= orphanPushCountSnapshot) {
@@ -2407,7 +2583,7 @@ ${this.pendingWorktreeNotice}
                   const hooksEnabledForStopFailure = !this.config.getDisableAllHooks?.();
                   if (hooksEnabledForStopFailure && hookSystem && this.config.hasHooksForEvent?.("StopFailure")) {
                     hookSystem.fireStopFailureEvent(errorType, errorMessage).catch((err) => {
-                      debugLogger5.warn(`StopFailure hook failed: ${err}`);
+                      debugLogger6.warn(`StopFailure hook failed: ${err}`);
                     });
                   }
                   if (errorStatus === 429) {
@@ -2542,7 +2718,7 @@ ${this.pendingWorktreeNotice}
             warning
           );
           await this.messageEmitter.emitAgentMessage(warning);
-          debugLogger5.warn(warning);
+          debugLogger6.warn(warning);
           return { stopReason: "end_turn" };
         }
         if (stopHookIterationCount > 1) {
@@ -2602,6 +2778,9 @@ ${this.pendingWorktreeNotice}
               if (resp.type === "chunk" /* CHUNK */ && resp.value.functionCalls) {
                 functionCalls.push(...resp.value.functionCalls);
               }
+              if (resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                functionCalls.length = 0;
+              }
             }
           } catch (error) {
             const errorStatus = getErrorStatus(error);
@@ -2614,7 +2793,7 @@ ${this.pendingWorktreeNotice}
             const hooksEnabledForStopFailure = !this.config.getDisableAllHooks?.();
             if (hooksEnabledForStopFailure && hookSystem && this.config.hasHooksForEvent?.("StopFailure")) {
               hookSystem.fireStopFailureEvent(errorType, errorMessage).catch((err) => {
-                debugLogger5.warn(`StopFailure hook failed: ${err}`);
+                debugLogger6.warn(`StopFailure hook failed: ${err}`);
               });
             }
             if (errorStatus === 429) {
@@ -2699,16 +2878,16 @@ ${this.pendingWorktreeNotice}
         }
       } catch (compressionError) {
         if (abortSignal.aborted || this.#isAbortError(compressionError)) {
-          debugLogger5.debug(`Auto-compression aborted for prompt ${promptId}`);
+          debugLogger6.debug(`Auto-compression aborted for prompt ${promptId}`);
           return { responseStream: null, stopReason: "cancelled" };
         }
-        debugLogger5.warn(
+        debugLogger6.warn(
           `Auto-compression failed for prompt ${promptId}; proceeding without compression: ` + this.#formatError(compressionError)
         );
       }
     }
     if (abortSignal.aborted) {
-      debugLogger5.debug(`Auto-compression aborted for prompt ${promptId}`);
+      debugLogger6.debug(`Auto-compression aborted for prompt ${promptId}`);
       return { responseStream: null, stopReason: "cancelled" };
     }
     if (!compressionInfo) {
@@ -2718,7 +2897,7 @@ ${this.pendingWorktreeNotice}
     if (sessionTokenLimit > 0) {
       const lastPromptTokenCount = this.#getPostCompressionTokenCount(compressionInfo);
       if (lastPromptTokenCount > sessionTokenLimit) {
-        debugLogger5.warn(
+        debugLogger6.warn(
           `Session token limit exceeded for prompt ${promptId}: ${lastPromptTokenCount} > ${sessionTokenLimit}. Send dropped.`
         );
         await this.#emitAgentDiagnosticMessageSafely(
@@ -2735,7 +2914,7 @@ ${this.pendingWorktreeNotice}
       );
     }
     if (abortSignal.aborted) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `Send aborted after compression diagnostic for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -2763,7 +2942,7 @@ ${this.pendingWorktreeNotice}
     ) ?? [];
     const droppedParts = (message.parts?.length ?? 0) - functionResponseParts.length;
     if (droppedParts > 0) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `Dropping ${droppedParts} non-functionResponse part(s) from unsent ACP message after send was skipped.`
       );
     }
@@ -2790,11 +2969,11 @@ ${this.pendingWorktreeNotice}
   }
   async #buildNextMessageAfterToolRun(toolRun, abortSignal) {
     if (toolRun.loopDetected) {
-      debugLogger5.debug("Stopping ACP turn after daemon loop detection.");
+      debugLogger6.debug("Stopping ACP turn after daemon loop detection.");
       return null;
     }
     if (toolRun.repeatedDuplicateProviderToolCall) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         "Stopping ACP turn after dropping repeated duplicate provider tool-call response."
       );
       return null;
@@ -2872,7 +3051,7 @@ ${this.pendingWorktreeNotice}
     try {
       await this.#emitAgentDiagnosticMessage(text);
     } catch (notifyError) {
-      debugLogger5.warn(`${failureContext}: ${this.#formatError(notifyError)}`);
+      debugLogger6.warn(`${failureContext}: ${this.#formatError(notifyError)}`);
     }
   }
   async #emitAgentDiagnosticMessage(text) {
@@ -2921,7 +3100,7 @@ ${this.pendingWorktreeNotice}
       if (isPermanentError) {
         this.midTurnDrainUnavailable = true;
       }
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Mid-turn queue drain ${isPermanentError ? "permanently " : ""}unavailable [session ${this.sessionId}]: ${errorMessage}`
       );
       return this.#buildMidTurnParts(recovered, abortSignal);
@@ -2947,9 +3126,9 @@ ${this.pendingWorktreeNotice}
     });
     const expired = Symbol("mid-turn-recovery-expired");
     let timer;
-    const deadline = new Promise((resolve3) => {
+    const deadline = new Promise((resolve4) => {
       timer = setTimeout(
-        () => resolve3(expired),
+        () => resolve4(expired),
         MID_TURN_QUEUE_RECOVERY_TIMEOUT_MS
       );
       timer.unref?.();
@@ -2963,14 +3142,14 @@ ${this.pendingWorktreeNotice}
       clearTimeout(timer);
     }
     if (late === expired) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `[mid-turn] dropped a drain response that arrived after the ${MID_TURN_QUEUE_RECOVERY_TIMEOUT_MS}ms recovery deadline [session ${this.sessionId}]`
       );
       return;
     }
     const lateMessages = parseMidTurnDrainResponse(late);
     if (lateMessages.length > 0) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `[mid-turn] recovered ${lateMessages.length} message(s) from a timed-out drain [session ${this.sessionId}]`
       );
       this.midTurnRecoveredMessages.push(...lateMessages);
@@ -2996,7 +3175,7 @@ ${this.pendingWorktreeNotice}
       } catch (messageError) {
         if (abortSignal.aborted) return parts;
         const errorMessage = this.#formatError(messageError);
-        debugLogger5.warn(`Failed to resolve mid-turn message: ${errorMessage}`);
+        debugLogger6.warn(`Failed to resolve mid-turn message: ${errorMessage}`);
         rawParts = [{ text: displayText }];
         if (message.kind === "structured" && hasInlineMediaContentBlock(message.content)) {
           rawParts.push({ text: MID_TURN_ATTACHMENT_PROCESSING_FAILURE_TEXT });
@@ -3021,7 +3200,7 @@ ${this.pendingWorktreeNotice}
     try {
       await scheduler.enableDurable(this.sessionId);
     } catch (err) {
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Durable cron init failed \u2014 persistent tasks will not fire in this session: ${err}`
       );
     }
@@ -3050,8 +3229,8 @@ ${this.pendingWorktreeNotice}
     if (this.notificationProcessing) return;
     this.cronProcessing = true;
     let resolveCompletion;
-    this.cronCompletion = new Promise((resolve3) => {
-      resolveCompletion = resolve3;
+    this.cronCompletion = new Promise((resolve4) => {
+      resolveCompletion = resolve4;
     });
     try {
       while (this.cronQueue.length > 0) {
@@ -3132,7 +3311,7 @@ ${this.pendingWorktreeNotice}
                   loopTick = await resolver.resolve(loopMode, trustedAtResolve);
                 } catch (resolveErr) {
                   const code = resolveErr.code ?? "unknown";
-                  debugLogger5.warn(
+                  debugLogger6.warn(
                     `loop.md sentinel resolution failed (mode=${loopMode}, code=${code}) \u2014 check .qwen/loop.md permissions/IO`,
                     resolveErr
                   );
@@ -3155,7 +3334,7 @@ ${this.pendingWorktreeNotice}
               }
               const modelText = loopTick ? loopTick.modelText : prompt;
               if (loopTick) {
-                debugLogger5.debug(
+                debugLogger6.debug(
                   `loop tick: mode=${loopMode ?? autonomousMode} delivery=${loopTick.full ? "full" : loopTick.transientError ? "transient-error" : loopTick.autonomous ? "autonomous-tick" : loopTick.sourceLabel ? "reminder" : "absent"} source=${loopTick.sourceLabel ?? "none"} autonomous=${loopTick.autonomous ?? false} transient=${loopTick.transientError ?? false}`
                 );
               }
@@ -3226,6 +3405,9 @@ ${this.pendingWorktreeNotice}
                   if (resp.type === "chunk" /* CHUNK */ && resp.value.functionCalls) {
                     functionCalls.push(...resp.value.functionCalls);
                   }
+                  if (resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                    functionCalls.length = 0;
+                  }
                 }
                 if (usageMetadata) {
                   this.#recordPromptTokenCount(usageMetadata);
@@ -3263,7 +3445,7 @@ ${this.pendingWorktreeNotice}
             } catch (error) {
               if (ac.signal.aborted) return;
               cronHadError = true;
-              debugLogger5.error("Error processing cron prompt:", error);
+              debugLogger6.error("Error processing cron prompt:", error);
               const msg = error instanceof Error ? error.message : String(error);
               await this.messageEmitter.emitAgentMessage(
                 `[${item.source} error] ${msg}`
@@ -3347,7 +3529,7 @@ ${this.pendingWorktreeNotice}
   #enqueueBackgroundNotification(item) {
     while (this.notificationQueue.length >= MAX_NOTIFICATION_QUEUE) {
       const evicted = this.notificationQueue.shift();
-      debugLogger5.warn(
+      debugLogger6.warn(
         `Notification queue overflow: evicting task=${evicted.taskId} kind=${evicted.kind}`
       );
     }
@@ -3363,8 +3545,8 @@ ${this.pendingWorktreeNotice}
     if (this.notificationQueue.length === 0) return;
     this.notificationProcessing = true;
     let resolveCompletion;
-    this.notificationCompletion = new Promise((resolve3) => {
-      resolveCompletion = resolve3;
+    this.notificationCompletion = new Promise((resolve4) => {
+      resolveCompletion = resolve4;
     });
     try {
       while (this.notificationQueue.length > 0) {
@@ -3457,6 +3639,9 @@ ${this.pendingWorktreeNotice}
               if (resp.type === "chunk" /* CHUNK */ && resp.value.functionCalls) {
                 functionCalls.push(...resp.value.functionCalls);
               }
+              if (resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                functionCalls.length = 0;
+              }
             }
             if (responseText.length > 0) {
               await this.#emitBackgroundNotificationResponse(
@@ -3509,14 +3694,14 @@ ${this.pendingWorktreeNotice}
             await this.#emitBackgroundNotificationEndTurn("cancelled");
             return;
           }
-          debugLogger5.error("Error processing background notification:", error);
+          debugLogger6.error("Error processing background notification:", error);
           const msg = error instanceof Error ? error.message : String(error);
           try {
             await this.messageEmitter.emitAgentMessage(
               `[notification error] ${msg}`
             );
           } catch (emitError) {
-            debugLogger5.error(
+            debugLogger6.error(
               "Failed to emit background notification error:",
               emitError
             );
@@ -3576,7 +3761,7 @@ ${this.pendingWorktreeNotice}
         source: "background_notification"
       });
     } catch (error) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `Background notification end-turn extNotification dropped: ${this.#formatError(error)}`
       );
     }
@@ -3600,7 +3785,7 @@ ${this.pendingWorktreeNotice}
       };
       await this.sendUpdate(update);
     } catch (error) {
-      debugLogger5.error("Error sending available commands update:", error);
+      debugLogger6.error("Error sending available commands update:", error);
     }
   }
   /**
@@ -3635,7 +3820,7 @@ ${this.pendingWorktreeNotice}
       sessionId: this.sessionId,
       currentModeId: params.modeId
     }).catch((error) => {
-      debugLogger5.debug("mode-update extNotification failed", error);
+      debugLogger6.debug("mode-update extNotification failed", error);
     });
   }
   /**
@@ -3669,7 +3854,7 @@ ${this.pendingWorktreeNotice}
       sessionId: this.sessionId,
       currentModelId: effectiveModelId
     }).catch((error) => {
-      debugLogger5.debug("model-update extNotification failed", error);
+      debugLogger6.debug("model-update extNotification failed", error);
     });
     if (options.persistDefault ?? true) {
       const persistScope = getPersistScopeForModelSelection(this.settings);
@@ -3722,7 +3907,7 @@ ${this.pendingWorktreeNotice}
       currentModeId: newModeId,
       legacyFrameSent: true
     }).catch((error) => {
-      debugLogger5.debug("mode-update extNotification failed", error);
+      debugLogger6.debug("mode-update extNotification failed", error);
     });
   }
   /**
@@ -3767,7 +3952,7 @@ ${this.pendingWorktreeNotice}
         }
         await this.toolCallEmitter.emitError(callId, toolName, error);
       } catch (recordError) {
-        debugLogger5.error("Failed to record skipped tool call:", recordError);
+        debugLogger6.error("Failed to record skipped tool call:", recordError);
       }
       return part;
     }, "recordSkippedToolCall");
@@ -3799,7 +3984,7 @@ ${this.pendingWorktreeNotice}
     );
     if (repeatedDuplicateCall) {
       const providerCallId = getProviderToolCallId(repeatedDuplicateCall) ?? repeatedDuplicateCall.id;
-      debugLogger5.debug(
+      debugLogger6.debug(
         `[Session.runToolCalls] Dropping batch after repeated duplicate provider tool-call id: ${providerCallId} (tool: ${repeatedDuplicateCall.name ?? "unknown_tool"})`
       );
       return {
@@ -3815,7 +4000,7 @@ ${this.pendingWorktreeNotice}
         this.duplicateProviderToolCallResponseIds
       );
       const response = createDuplicateProviderToolCallResponse(request);
-      debugLogger5.debug(
+      debugLogger6.debug(
         `[Session.runToolCalls] Suppressing duplicate provider tool-call id: ${providerCallId} (tool: ${request.name})`
       );
       batches.push({ kind: "duplicate", request, response });
@@ -4320,7 +4505,7 @@ ${this.pendingWorktreeNotice}
             forceAutoReviewForAllow
           );
           if (finalPermission === "allow" && forceAutoReviewForAllow) {
-            debugLogger5.info(
+            debugLogger6.info(
               `Auto mode: L4 allow overridden by protected-write guard for ${toolName}`
             );
           }
@@ -4363,7 +4548,7 @@ ${this.pendingWorktreeNotice}
                 autoModeAllowed = true;
                 break;
               case "blocked":
-                debugLogger5.warn(
+                debugLogger6.warn(
                   `Auto mode blocked (${outcome.reason}): tool=${toolName}, ` + formatDenialStateLog(denialState)
                 );
                 return earlyErrorResponse(
@@ -4375,7 +4560,7 @@ ${this.pendingWorktreeNotice}
                   outcome.reason
                 );
                 if (wasAutoModeDenialFallback) {
-                  debugLogger5.warn(
+                  debugLogger6.warn(
                     `Auto mode fallback to manual approval (${outcome.reason}): ` + formatDenialStateLog(denialState)
                   );
                 }
@@ -4393,12 +4578,12 @@ ${this.pendingWorktreeNotice}
               const before = this.config.getAutoModeDenialState();
               const after = recordFallbackApprove(before);
               if (after === before) {
-                debugLogger5.warn(
+                debugLogger6.warn(
                   `Auto mode denial counters already clear after fallback approval: ` + formatDenialStateLog(before)
                 );
                 return;
               }
-              debugLogger5.warn(
+              debugLogger6.warn(
                 `Auto mode denial counters reset after fallback approval: ${formatDenialStateLog(before)} -> ${formatDenialStateLog(after)}`
               );
               this.config.setAutoModeDenialState(after);
@@ -4504,7 +4689,7 @@ ${this.pendingWorktreeNotice}
                 );
                 outcome = output.outcome.outcome === "cancelled" ? "cancel" /* Cancel */ : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
               } catch (error) {
-                debugLogger5.error(
+                debugLogger6.error(
                   `Permission request failed for tool ${toolName}:`,
                   error
                 );
@@ -4513,7 +4698,7 @@ ${this.pendingWorktreeNotice}
                     "cancel" /* Cancel */
                   );
                 } catch (confirmError) {
-                  debugLogger5.error(
+                  debugLogger6.error(
                     `Failed to cancel tool ${toolName} after permission request failure:`,
                     confirmError
                   );
@@ -4538,7 +4723,7 @@ ${this.pendingWorktreeNotice}
                 if (outcome !== "cancel" /* Cancel */) {
                   throw error;
                 }
-                debugLogger5.error(
+                debugLogger6.error(
                   `Failed to confirm cancellation for tool ${toolName}:`,
                   error
                 );
@@ -4608,7 +4793,7 @@ ${this.pendingWorktreeNotice}
               return earlyErrorResponse(new Error(blockReason), toolName);
             }
             if (preHookResult.additionalContext) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 `PreToolUse hook additional context for ${toolName}: ${preHookResult.additionalContext}`
               );
             }
@@ -4672,7 +4857,7 @@ ${this.pendingWorktreeNotice}
             );
             if (postHookResult.shouldStop) {
               const stopMessage = postHookResult.stopReason || "Execution stopped by PostToolUse hook";
-              debugLogger5.info(
+              debugLogger6.info(
                 `PostToolUse hook requested stop for ${toolName}: ${stopMessage}`
               );
               return earlyErrorResponse(new Error(stopMessage), toolName);
@@ -4701,7 +4886,7 @@ ${this.pendingWorktreeNotice}
               callId
             );
             if (failureHookResult.additionalContext) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 `PostToolUseFailure hook additional context for ${toolName}: ${failureHookResult.additionalContext}`
               );
             }
@@ -4783,7 +4968,7 @@ ${this.pendingWorktreeNotice}
               callId
             );
             if (failureHookResult.additionalContext) {
-              debugLogger5.debug(
+              debugLogger6.debug(
                 `PostToolUseFailure hook additional context for ${toolName}: ${failureHookResult.additionalContext}`
               );
             }
@@ -4934,6 +5119,7 @@ ${this.pendingWorktreeNotice}
     const FILE_URI_SCHEME = "file://";
     const embeddedContext = [];
     const extensionMentions = /* @__PURE__ */ new Map();
+    const mcpServerMentions = /* @__PURE__ */ new Map();
     const preserveUnsupportedImageForBridge = shouldRunVisionBridge(
       this.config
     );
@@ -4941,6 +5127,7 @@ ${this.pendingWorktreeNotice}
       switch (part.type) {
         case "text":
           collectExtensionMentionRefs(part.text, extensionMentions);
+          collectMcpServerMentionRefs(part.text, mcpServerMentions);
           return { text: part.text };
         case "image":
           if (preserveUnsupportedImageForBridge) {
@@ -4992,12 +5179,13 @@ ${this.pendingWorktreeNotice}
       extensionMentions,
       abortSignal
     );
-    if (atPathCommandParts.length === 0 && embeddedContext.length === 0 && extensionParts.length === 0) {
+    const mcpServerParts = this.#resolveMcpServerMentionParts(mcpServerMentions);
+    if (atPathCommandParts.length === 0 && embeddedContext.length === 0 && extensionParts.length === 0 && mcpServerParts.length === 0) {
       return this.#applyVisionBridgeIfNeeded(parts, abortSignal);
     }
     if (atPathCommandParts.length === 0 && embeddedContext.length === 0) {
       return this.#applyVisionBridgeIfNeeded(
-        [...parts, ...extensionParts],
+        [...parts, ...extensionParts, ...mcpServerParts],
         abortSignal
       );
     }
@@ -5027,6 +5215,7 @@ ${this.pendingWorktreeNotice}
       const contentParts = Array.isArray(readResult.contentParts) ? readResult.contentParts : [readResult.contentParts];
       processedQueryParts.push({ text: initialQueryText });
       processedQueryParts.push(...extensionParts);
+      processedQueryParts.push(...mcpServerParts);
       for (const part of contentParts) {
         if (typeof part === "string") {
           processedQueryParts.push({ text: part });
@@ -5039,6 +5228,7 @@ ${this.pendingWorktreeNotice}
     } else {
       processedQueryParts.push({ text: initialQueryText.trim() });
       processedQueryParts.push(...extensionParts);
+      processedQueryParts.push(...mcpServerParts);
     }
     for (const contextPart of embeddedContext) {
       if ("text" in contextPart && contextPart.text) {
@@ -5067,19 +5257,19 @@ ${contextPart.text}`
     }
     let bridgeResult;
     try {
-      debugLogger5.debug("vision bridge: gate matched, running conversion");
+      debugLogger6.debug("vision bridge: gate matched, running conversion");
       bridgeResult = await runVisionBridge({
         config: this.config,
         parts,
         signal: abortSignal
       });
     } catch (error) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `vision bridge: failed before replacement; falling back to text-only parts error=${String(error instanceof Error ? error.message : error)}`
       );
       return splitImageParts(parts).nonImageParts;
     }
-    debugLogger5.debug(
+    debugLogger6.debug(
       `vision bridge: status=${bridgeResult.status} applied=${bridgeResult.applied} model=${bridgeResult.modelId ?? "(none)"}${bridgeResult.error ? ` error=${bridgeResult.error}` : ""}`
     );
     if (bridgeResult.status !== "skipped" || bridgeResult.egressOccurred) {
@@ -5088,13 +5278,13 @@ ${contextPart.text}`
           this.#formatVisionBridgeNotice(bridgeResult)
         );
       } catch (error) {
-        debugLogger5.debug(
+        debugLogger6.debug(
           `vision bridge: failed to emit notice; continuing with bridge result error=${String(error instanceof Error ? error.message : error)}`
         );
       }
     }
     if (abortSignal.aborted) {
-      debugLogger5.debug("vision bridge: turn aborted after bridge returned");
+      debugLogger6.debug("vision bridge: turn aborted after bridge returned");
       return splitImageParts(parts).nonImageParts;
     }
     if (bridgeResult.applied && bridgeResult.parts != null) {
@@ -5143,9 +5333,28 @@ ${contextPart.text}`
     }
     return extensionParts;
   }
+  #resolveMcpServerMentionParts(mcpServerMentions) {
+    if (mcpServerMentions.size === 0) return [];
+    const servers = this.config.getMcpServers?.() ?? {};
+    if (Object.keys(servers).length === 0) return [];
+    const parts = [];
+    for (const name of mcpServerMentions.values()) {
+      const matched = matchMcpServerByRef(name, servers);
+      if (!matched) {
+        this.debug(
+          `MCP server "${name}" not found among configured MCP servers. Available: ${Object.keys(servers).join(", ") || "(none)"}`
+        );
+        continue;
+      }
+      parts.push({
+        text: buildMcpServerContextText(this.config, matched.serverName)
+      });
+    }
+    return parts;
+  }
   debug(msg) {
     if (this.config.getDebugMode()) {
-      debugLogger5.warn(msg);
+      debugLogger6.warn(msg);
     }
   }
   async emitHookArtifactsNotification(args) {
@@ -5185,7 +5394,7 @@ ${contextPart.text}`
         }
       );
     }).catch((err) => {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `ACP terminalSequence notification dropped (session=${this.sessionId}): ${err instanceof Error ? err.message : String(err)}`
       );
     });
@@ -5301,9 +5510,101 @@ function runWithAcpRuntimeOutputDir(settings, cwd, fn) {
 __name(runWithAcpRuntimeOutputDir, "runWithAcpRuntimeOutputDir");
 
 // packages/cli/src/acp-integration/acpAgent.ts
-var debugLogger6 = createDebugLogger("ACP_AGENT");
+var debugLogger7 = createDebugLogger("ACP_AGENT");
+var QWEN_ACP_LOCAL_READ_ROOTS_ENV = "QWEN_ACP_LOCAL_READ_ROOTS";
+var POSIX_TMP_LOCAL_READ_ROOT = "/tmp";
 var BTW_CHILD_TIMEOUT_MS = 55e3;
 var WORKSPACE_MEMORY_REMEMBER_CHILD_TIMEOUT_MS = 295e3;
+function parseAcpLocalReadRootsEnv(raw = process.env[QWEN_ACP_LOCAL_READ_ROOTS_ENV]) {
+  if (!raw) return [];
+  return raw.split(path4.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0 && path4.isAbsolute(entry));
+}
+__name(parseAcpLocalReadRootsEnv, "parseAcpLocalReadRootsEnv");
+function defaultAcpOnlyLocalReadRoots() {
+  return process.platform === "win32" ? [] : [POSIX_TMP_LOCAL_READ_ROOT];
+}
+__name(defaultAcpOnlyLocalReadRoots, "defaultAcpOnlyLocalReadRoots");
+function buildAcpLocalReadRoots(config) {
+  return [
+    // SYNC: The first group mirrors ReadFileTool's default allowed local roots,
+    // including auto-memory roots. The ACP-only additions below expand only
+    // local read fallback, not read_file's default permission.
+    config.storage.getProjectTempDir(),
+    path4.join(config.storage.getProjectDir(), "subagents"),
+    Storage.getGlobalTempDir(),
+    getAutoMemoryRoot(config.getTargetDir()),
+    getUserAutoMemoryRoot(),
+    ...config.storage.getUserSkillsDirs(),
+    Storage.getUserExtensionsDir(),
+    ...defaultAcpOnlyLocalReadRoots(),
+    ...parseAcpLocalReadRootsEnv()
+  ];
+}
+__name(buildAcpLocalReadRoots, "buildAcpLocalReadRoots");
+function isObjectRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+__name(isObjectRecord, "isObjectRecord");
+function isBulkLoadReplayRequest(params) {
+  const meta = isObjectRecord(params._meta) ? params._meta : void 0;
+  return meta?.[LOAD_REPLAY_MODE_META_KEY] === LOAD_REPLAY_BULK_MODE;
+}
+__name(isBulkLoadReplayRequest, "isBulkLoadReplayRequest");
+function createReplayCumulativeUsage() {
+  return {
+    promptTokens: 0,
+    cachedTokens: 0,
+    candidateTokens: 0,
+    apiTimeMs: 0
+  };
+}
+__name(createReplayCumulativeUsage, "createReplayCumulativeUsage");
+function copyCumulativeUsage(target, source) {
+  target.promptTokens = source.promptTokens;
+  target.cachedTokens = source.cachedTokens;
+  target.candidateTokens = source.candidateTokens;
+  target.apiTimeMs = source.apiTimeMs;
+}
+__name(copyCumulativeUsage, "copyCumulativeUsage");
+async function collectHistoryReplayUpdates({
+  sessionId,
+  config,
+  records,
+  cumulativeUsage
+}) {
+  const updates = [];
+  const replayContext = {
+    sessionId,
+    config,
+    sendUpdate: /* @__PURE__ */ __name(async (update) => {
+      updates.push(update);
+    }, "sendUpdate"),
+    cumulativeUsage
+  };
+  try {
+    await new HistoryReplayer(replayContext).replay(records);
+  } catch (error) {
+    const replayError = error instanceof Error ? error.message : String(error);
+    debugLogger7.warn(
+      "[historyReplay] History replay failed for session %s (partial updates: %d):",
+      sessionId,
+      updates.length,
+      error
+    );
+    return { updates, replayError };
+  }
+  return { updates };
+}
+__name(collectHistoryReplayUpdates, "collectHistoryReplayUpdates");
+function liftSessionUpdateTimestamps(updates) {
+  return updates.map((update) => {
+    const record = update;
+    const meta = record["_meta"];
+    const timestamp = isObjectRecord(meta) ? meta["timestamp"] : void 0;
+    return typeof timestamp === "number" || typeof timestamp === "string" ? { ...record, timestamp } : update;
+  });
+}
+__name(liftSessionUpdateTimestamps, "liftSessionUpdateTimestamps");
 function createHiddenWorkspaceMemoryConfig(config) {
   return new Proxy(config, {
     get(target, prop) {
@@ -5441,7 +5742,7 @@ function readRequiredString(value, fieldName) {
 }
 __name(readRequiredString, "readRequiredString");
 function validateSkillSlug(slug) {
-  if (!slug || slug === "." || slug === ".." || slug.includes("/") || slug.includes(path3.sep) || !/^[a-zA-Z0-9._-]+$/.test(slug)) {
+  if (!slug || slug === "." || slug === ".." || slug.includes("/") || slug.includes(path4.sep) || !/^[a-zA-Z0-9._-]+$/.test(slug)) {
     throw RequestError.invalidParams(void 0, "Invalid skill.slug");
   }
 }
@@ -5910,7 +6211,7 @@ async function downloadGitHubSkillDirectoryFromApi(githubUrl, directoryPath, rel
     const name = readRequiredString(record["name"], "github.name");
     const itemPath = readRequiredString(record["path"], "github.path");
     const type = readRequiredString(record["type"], "github.type");
-    const relativePath = relativeRoot ? path3.posix.join(relativeRoot, name) : name;
+    const relativePath = relativeRoot ? path4.posix.join(relativeRoot, name) : name;
     if (type === "dir") {
       files.push(
         ...await downloadGitHubSkillDirectoryFromApi(
@@ -5957,7 +6258,7 @@ async function downloadGitHubSkillDirectory(githubUrl, directoryPath) {
     githubUrl,
     directoryPath
   ).catch((error) => {
-    debugLogger6.warn(
+    debugLogger7.warn(
       "GitHub API directory listing failed, falling back to archive download:",
       error
     );
@@ -5970,10 +6271,10 @@ __name(downloadGitHubSkillDirectory, "downloadGitHubSkillDirectory");
 async function downloadSkill(sourceUrl) {
   assertAllowedSkillSourceUrl(sourceUrl);
   const githubUrl = parseGitHubBlobSkillUrl(sourceUrl);
-  if (!githubUrl || path3.posix.basename(githubUrl.filePath) !== "SKILL.md") {
+  if (!githubUrl || path4.posix.basename(githubUrl.filePath) !== "SKILL.md") {
     return downloadSingleSkillFile(sourceUrl);
   }
-  const skillDirectory = path3.posix.dirname(githubUrl.filePath);
+  const skillDirectory = path4.posix.dirname(githubUrl.filePath);
   const files = await downloadGitHubSkillDirectory(githubUrl, skillDirectory);
   const skillFile = files.find((file) => file.relativePath === "SKILL.md");
   if (!skillFile) {
@@ -5989,9 +6290,9 @@ async function downloadSkill(sourceUrl) {
 }
 __name(downloadSkill, "downloadSkill");
 function resolveSkillInstallPath(skillDir, relativePath) {
-  const root = path3.resolve(skillDir);
-  const target = path3.resolve(skillDir, relativePath);
-  if (target !== root && !target.startsWith(root + path3.sep)) {
+  const root = path4.resolve(skillDir);
+  const target = path4.resolve(skillDir, relativePath);
+  if (target !== root && !target.startsWith(root + path4.sep)) {
     throw RequestError.invalidParams(
       void 0,
       `Invalid skill file path: ${relativePath}`
@@ -6001,9 +6302,9 @@ function resolveSkillInstallPath(skillDir, relativePath) {
 }
 __name(resolveSkillInstallPath, "resolveSkillInstallPath");
 function resolveManagedSkillDir(skillsBaseDir, slug) {
-  const root = path3.resolve(skillsBaseDir);
-  const skillDir = path3.resolve(skillsBaseDir, slug);
-  if (!skillDir.startsWith(root + path3.sep)) {
+  const root = path4.resolve(skillsBaseDir);
+  const skillDir = path4.resolve(skillsBaseDir, slug);
+  if (!skillDir.startsWith(root + path4.sep)) {
     throw RequestError.invalidParams(void 0, "Invalid skill.slug");
   }
   return skillDir;
@@ -6559,7 +6860,7 @@ function readMcpServers(source, scope) {
       const server = toMcpServerConfig(value);
       return server ? { name, scope, server: redactMcpServerSecrets(server) } : void 0;
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Skipping malformed MCP server config [${scope}:${name}]:`,
         error
       );
@@ -6655,7 +6956,7 @@ function readHooks(source, scope, extensionName) {
           extensionName
         });
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Skipping malformed hook entry [${scope}:${event}:${index}]:`,
           error
         );
@@ -6680,14 +6981,14 @@ function readScopeSettings(settings, scope) {
 __name(readScopeSettings, "readScopeSettings");
 async function resolvePreferredMemoryFile(dir, fallbackFilename) {
   for (const filename of getAllGeminiMdFilenames()) {
-    const filePath = path3.join(dir, filename);
+    const filePath = path4.join(dir, filename);
     try {
-      await fs.access(filePath);
+      await fs2.access(filePath);
       return filePath;
     } catch {
     }
   }
-  return path3.join(dir, fallbackFilename);
+  return path4.join(dir, fallbackFilename);
 }
 __name(resolvePreferredMemoryFile, "resolvePreferredMemoryFile");
 async function resolveQwenMemoryPaths(params) {
@@ -6708,7 +7009,7 @@ async function resolveQwenMemoryPaths(params) {
   };
 }
 __name(resolveQwenMemoryPaths, "resolveQwenMemoryPaths");
-async function deliverClientMcpMessage(connection, serverName, message) {
+async function deliverClientMcpMessage(connection, serverName, message, sessionId) {
   if (!connection) {
     throw new Error(
       `client MCP server '${serverName}' has no ACP connection yet`
@@ -6716,7 +7017,11 @@ async function deliverClientMcpMessage(connection, serverName, message) {
   }
   const response = await connection.extMethod(
     SERVE_CONTROL_EXT_METHODS.clientMcpMessage,
-    { server: serverName, payload: message }
+    {
+      server: serverName,
+      payload: message,
+      ...sessionId ? { sessionId } : {}
+    }
   );
   const payload = response["payload"];
   if (payload === void 0 || payload === null) {
@@ -6769,7 +7074,7 @@ async function runAcpAgent(config, settings, argv) {
     try {
       await agentInstance.shutdownMcpPool(8e3);
     } catch (err) {
-      debugLogger6.error(`[ACP] MCP pool drain (${label}) error:`, err);
+      debugLogger7.error(`[ACP] MCP pool drain (${label}) error:`, err);
     }
   }, "drainPoolBeforeExit");
   let shuttingDown = false;
@@ -6796,7 +7101,7 @@ async function runAcpAgent(config, settings, argv) {
       try {
         await hookSystem.fireSessionEndEvent(reason);
       } catch (err) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `SessionEnd hook failed: ${err instanceof Error ? err.message : String(err)}`
         );
       }
@@ -6805,7 +7110,7 @@ async function runAcpAgent(config, settings, argv) {
   const shutdownHandler = /* @__PURE__ */ __name(async () => {
     if (shuttingDown) return;
     shuttingDown = true;
-    debugLogger6.debug("[ACP] Shutdown signal received, closing streams");
+    debugLogger7.debug("[ACP] Shutdown signal received, closing streams");
     try {
       await fireSessionEndOnce("other" /* Other */);
       agentInstance?.disposeSessions();
@@ -6819,12 +7124,12 @@ async function runAcpAgent(config, settings, argv) {
       }
       await drainPoolBeforeExit("signal");
     } catch (err) {
-      debugLogger6.error("[ACP] Shutdown error:", err);
+      debugLogger7.error("[ACP] Shutdown error:", err);
     } finally {
       eventLoopMonitor.dispose();
     }
     runExitCleanup().catch((err) => {
-      debugLogger6.error("[ACP] Cleanup error:", err);
+      debugLogger7.error("[ACP] Cleanup error:", err);
     }).finally(() => {
       process.exit(0);
     });
@@ -6988,6 +7293,20 @@ var QwenAgent = class {
   }
   sessions = /* @__PURE__ */ new Map();
   clientCapabilities;
+  // CPU-usage delta baseline for the daemon's `workspaceResource` extMethod
+  // (Daemon Status child-resource chart). The daemon polls this at a fixed
+  // cadence, so successive calls form a clean delta window independent of tool
+  // activity. Init is guarded — `process.cpuUsage()` can throw in restricted
+  // containers.
+  childCpuCoreCount = os3.availableParallelism?.() ?? os3.cpus().length ?? 1;
+  prevChildCpu = (() => {
+    try {
+      return process.cpuUsage();
+    } catch {
+      return null;
+    }
+  })();
+  prevChildCpuAt = Date.now();
   /**
    * Workspace-shared MCP transport pool. Eagerly constructed; lazy
    * w.r.t. actual MCP work — spawns nothing until `pool.acquire`.
@@ -7015,12 +7334,12 @@ var QwenAgent = class {
     try {
       const result = await this.mcpPool.drainAll({ force: true, timeoutMs });
       if (result.forced > 0 || result.errors.length > 0) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `MCP pool drain: ${result.drained} clean, ${result.forced} timed out, ${result.errors.length} errors`
         );
       }
     } catch (err) {
-      debugLogger6.error(
+      debugLogger7.error(
         `MCP pool drainAll failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -7037,7 +7356,7 @@ var QwenAgent = class {
         await session.getConfig().getChatRecordingService()?.flush();
         return void 0;
       } catch (err) {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `Session ${sessionId} chat recording flush during close failed: ${err instanceof Error ? err.message : String(err)}`
         );
         return err;
@@ -7052,7 +7371,7 @@ var QwenAgent = class {
     try {
       await session.cancelPendingPrompt();
     } catch (err) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Session ${sessionId} cancel during close failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -7063,7 +7382,7 @@ var QwenAgent = class {
     try {
       await session.getConfig().getToolRegistry()?.stop();
     } catch (err) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Session ${sessionId} tool registry stop during close failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -7072,6 +7391,37 @@ var QwenAgent = class {
     uiTelemetryService.removeSession(sessionId);
     this.sessions.delete(sessionId);
   }
+  discardStoredSessionIfCurrent(sessionId, session) {
+    if (this.sessions.get(sessionId) !== session) {
+      return;
+    }
+    const logCleanupFailure = /* @__PURE__ */ __name((action, err) => {
+      debugLogger7.debug(
+        `Session ${sessionId} ${action} during failed restore cleanup failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }, "logCleanupFailure");
+    try {
+      session.dispose();
+    } catch (err) {
+      logCleanupFailure("dispose", err);
+    }
+    try {
+      unregisterGoalHook(session.getConfig(), sessionId);
+    } catch (err) {
+      logCleanupFailure("goal hook unregister", err);
+    }
+    try {
+      this.mcpPool?.releaseSession(sessionId);
+    } catch (err) {
+      logCleanupFailure("MCP pool release", err);
+    }
+    try {
+      uiTelemetryService.removeSession(sessionId);
+    } catch (err) {
+      logCleanupFailure("telemetry removal", err);
+    }
+    this.sessions.delete(sessionId);
+  }
   disposeSessions() {
     for (const session of this.sessions.values()) {
       session.dispose();
@@ -7097,7 +7447,7 @@ var QwenAgent = class {
         scope: "workspace",
         ...event
       }).catch((err) => {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `MCP workspace budget event delivery to session ${sid} failed (kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
         );
       });
@@ -7106,7 +7456,7 @@ var QwenAgent = class {
   async initialize(args) {
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.19.6";
+    const version = "0.19.7-nightly.20260708.394c1a289";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -7129,6 +7479,9 @@ var QwenAgent = class {
         mcpCapabilities: {
           sse: true,
           http: true
+        },
+        _meta: {
+          imageCapability: IMAGE_CAPABILITY
         }
       }
     };
@@ -7163,10 +7516,12 @@ var QwenAgent = class {
     cwd,
     mcpServers
   }) {
-    const config = await this.newSessionConfig(cwd, mcpServers);
+    const settings = loadSettingsCached(cwd);
+    this.settings = settings;
+    const config = await this.newSessionConfig(cwd, mcpServers, settings);
     await this.ensureAuthenticated(config);
     this.setupFileSystem(config);
-    const session = await this.createAndStoreSession(config);
+    const session = await this.createAndStoreSession(config, settings);
     const availableModels = this.buildAvailableModels(config);
     const modesData = this.buildModesData(config);
     const configOptions = this.buildConfigOptions(config);
@@ -7178,8 +7533,9 @@ var QwenAgent = class {
     };
   }
   async loadSession(params) {
+    const settings = loadSettingsCached(params.cwd);
     const exists = await runWithAcpRuntimeOutputDir(
-      this.settings,
+      settings,
       params.cwd,
       async () => {
         const sessionService = new SessionService(params.cwd);
@@ -7189,6 +7545,7 @@ var QwenAgent = class {
     if (!exists) {
       throw RequestError.resourceNotFound(`session:${params.sessionId}`);
     }
+    this.settings = settings;
     const config = await this.newSessionConfig(
       params.cwd,
       // `LoadSessionRequest.mcpServers` is required in today's ACP
@@ -7196,26 +7553,79 @@ var QwenAgent = class {
       // future loosening — `newSessionConfig` iterates the list, so
       // a `null`/`undefined` would otherwise throw `TypeError`.
       params.mcpServers ?? [],
+      settings,
       params.sessionId,
       true
     );
     await this.ensureAuthenticated(config);
     this.setupFileSystem(config);
     const sessionData = config.getResumedSessionData();
-    const session = await this.createAndStoreSession(config, sessionData);
+    const bulkReplay = isBulkLoadReplayRequest(params);
+    const session = await this.createAndStoreSession(
+      config,
+      settings,
+      sessionData,
+      bulkReplay ? { replayHistory: false, startPostReplayServices: false } : {}
+    );
+    let replayEnvelope;
+    if (bulkReplay) {
+      try {
+        const records = sessionData?.conversation.messages;
+        let replayUpdates = [];
+        if (records) {
+          session.primeTurnFromHistory(records);
+          const replayUsage = createReplayCumulativeUsage();
+          const replay = await collectHistoryReplayUpdates({
+            sessionId: params.sessionId,
+            config,
+            records,
+            cumulativeUsage: replayUsage
+          });
+          replayUpdates = liftSessionUpdateTimestamps(replay.updates);
+          copyCumulativeUsage(session.cumulativeUsage, replayUsage);
+          if (replay.replayError !== void 0) {
+            replayEnvelope = {
+              v: LOAD_REPLAY_VERSION,
+              updates: replayUpdates,
+              partial: true,
+              replayError: replay.replayError
+            };
+          }
+        }
+        replayEnvelope ??= {
+          v: LOAD_REPLAY_VERSION,
+          updates: replayUpdates
+        };
+        session.installRewriter();
+        session.startCronScheduler();
+      } catch (err) {
+        this.discardStoredSessionIfCurrent(params.sessionId, session);
+        throw err;
+      }
+    }
     await this.#restoreWorktreeOnResume(config, session);
     const modesData = this.buildModesData(config);
     const availableModels = this.buildAvailableModels(config);
     const configOptions = this.buildConfigOptions(config);
-    return {
+    const response = {
       modes: modesData,
       models: availableModels,
       configOptions
     };
+    if (!replayEnvelope) {
+      return response;
+    }
+    return {
+      ...response,
+      _meta: {
+        [LOAD_REPLAY_META_KEY]: replayEnvelope
+      }
+    };
   }
   async unstable_resumeSession(params) {
+    const settings = loadSettingsCached(params.cwd);
     const exists = await runWithAcpRuntimeOutputDir(
-      this.settings,
+      settings,
       params.cwd,
       async () => {
         const sessionService = new SessionService(params.cwd);
@@ -7225,9 +7635,11 @@ var QwenAgent = class {
     if (!exists) {
       throw RequestError.resourceNotFound(`session:${params.sessionId}`);
     }
+    this.settings = settings;
     const config = await this.newSessionConfig(
       params.cwd,
       params.mcpServers ?? [],
+      settings,
       params.sessionId,
       true
     );
@@ -7235,6 +7647,7 @@ var QwenAgent = class {
     this.setupFileSystem(config);
     const session = await this.createAndStoreSession(
       config,
+      settings,
       config.getResumedSessionData(),
       { replayHistory: false }
     );
@@ -7262,7 +7675,7 @@ var QwenAgent = class {
         session.pendingWorktreeNotice = restored.contextMessage;
       }
     } catch (error) {
-      debugLogger6.warn(`ACP worktree restore failed: ${error}`);
+      debugLogger7.warn(`ACP worktree restore failed: ${error}`);
     }
   }
   async unstable_listSessions(params) {
@@ -7383,7 +7796,7 @@ var QwenAgent = class {
       await extensionManager.refreshCache();
       extensions = extensionManager.getLoadedExtensions();
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         "Extension loading failed, continuing without extensions:",
         error
       );
@@ -7509,7 +7922,7 @@ var QwenAgent = class {
             pm.addPersistentRule(rule, ruleType);
           }
         } catch (error) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             `Failed to sync permission rules to a live session: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -8089,9 +8502,10 @@ var QwenAgent = class {
     return { kind, locality: "acp", ...spec };
   }
   /**
-   * Pure auth preflight check. Looks up the well-known env var keys for the
-   * configured auth method (via `AUTH_ENV_MAPPINGS`) and reports whether at
-   * least one is present.
+   * Pure auth preflight check. First looks up the well-known env var keys
+   * for the configured auth method, then falls back to the API key already
+   * resolved into the generation config (which folds settings.security.auth.apiKey,
+   * provider envKey from settings.env, and CLI flags into a single value).
    *
    * Deliberately does NOT call `validateAuthMethod` from `cli/config/auth.ts`:
    * that helper has side effects (reloads `.env` from disk via
@@ -8116,14 +8530,22 @@ var QwenAgent = class {
       const presentVar = apiKeyVars.find(
         (name) => Boolean(process.env[name])
       );
-      const hasToken = Boolean(presentVar);
+      let hasToken = Boolean(presentVar);
+      if (!hasToken && !AUTH_PREFLIGHT_WAIVED_AUTH_TYPES.has(String(authType))) {
+        const resolvedApiKey = config.getModelsConfig().getGenerationConfig()?.apiKey;
+        if (resolvedApiKey) {
+          hasToken = true;
+        }
+      }
       if (apiKeyVars.length === 0) {
         return this.acpCell("auth", {
-          status: "unknown",
-          hint: "Auth credentials for this provider are not env-keyed; full validation runs at session start.",
+          status: hasToken ? "ok" : "unknown",
+          ...hasToken ? {} : {
+            hint: "Auth credentials for this provider are not env-keyed; full validation runs at session start."
+          },
           detail: {
             source: String(authType),
-            hasToken: "unknown",
+            hasToken: hasToken || "unknown",
             envVarCandidates: []
           }
         });
@@ -8774,9 +9196,9 @@ var QwenAgent = class {
       );
     }
     const download = await downloadSkill(request.sourceUrl);
-    const skillsBaseDir = path3.join(Storage.getGlobalQwenDir(), "skills");
+    const skillsBaseDir = path4.join(Storage.getGlobalQwenDir(), "skills");
     const skillDir = resolveManagedSkillDir(skillsBaseDir, request.slug);
-    const skillFile = path3.join(skillDir, "SKILL.md");
+    const skillFile = path4.join(skillDir, "SKILL.md");
     const parsed = skillManager.parseSkillContent(
       download.skillContent,
       skillFile,
@@ -8790,19 +9212,19 @@ var QwenAgent = class {
     }
     const stagingDir = `${skillDir}.installing-${process.pid}-${Date.now()}`;
     try {
-      await fs.rm(stagingDir, { recursive: true, force: true });
+      await fs2.rm(stagingDir, { recursive: true, force: true });
       for (const file of download.files) {
         const targetPath = resolveSkillInstallPath(
           stagingDir,
           file.relativePath
         );
-        await fs.mkdir(path3.dirname(targetPath), { recursive: true });
-        await fs.writeFile(targetPath, file.content);
+        await fs2.mkdir(path4.dirname(targetPath), { recursive: true });
+        await fs2.writeFile(targetPath, file.content);
       }
-      await fs.rm(skillDir, { recursive: true, force: true });
-      await fs.rename(stagingDir, skillDir);
+      await fs2.rm(skillDir, { recursive: true, force: true });
+      await fs2.rename(stagingDir, skillDir);
     } catch (error) {
-      await fs.rm(stagingDir, { recursive: true, force: true }).catch(() => {
+      await fs2.rm(stagingDir, { recursive: true, force: true }).catch(() => {
       });
       throw error;
     }
@@ -8835,17 +9257,17 @@ var QwenAgent = class {
         `Skill name "${parsed.name}" does not match requested slug "${request.slug}"`
       );
     }
-    const resolvedSkillDir = path3.resolve(skillDir);
-    const resolvedSkillFile = path3.resolve(skillFile);
-    const globalDir = path3.resolve(Storage.getGlobalQwenDir());
-    const isDedicatedSkillDir = resolvedSkillFile === path3.join(resolvedSkillDir, "SKILL.md");
-    if (!isDedicatedSkillDir || resolvedSkillDir === path3.parse(resolvedSkillDir).root || resolvedSkillDir === globalDir) {
+    const resolvedSkillDir = path4.resolve(skillDir);
+    const resolvedSkillFile = path4.resolve(skillFile);
+    const globalDir = path4.resolve(Storage.getGlobalQwenDir());
+    const isDedicatedSkillDir = resolvedSkillFile === path4.join(resolvedSkillDir, "SKILL.md");
+    if (!isDedicatedSkillDir || resolvedSkillDir === path4.parse(resolvedSkillDir).root || resolvedSkillDir === globalDir) {
       throw RequestError.invalidParams(
         void 0,
         `Refusing to delete unexpected skill directory: ${skillDir}`
       );
     }
-    await fs.rm(skillDir, { recursive: true, force: true });
+    await fs2.rm(skillDir, { recursive: true, force: true });
     await skillManager.refreshCache();
     return {
       slug: request.slug,
@@ -8855,11 +9277,11 @@ var QwenAgent = class {
   async readManagedSkillFile(slug, scope, skillManager, cwd) {
     if (scope === "global") {
       const qwenSkillDir = resolveManagedSkillDir(
-        path3.join(Storage.getGlobalQwenDir(), "skills"),
+        path4.join(Storage.getGlobalQwenDir(), "skills"),
         slug
       );
-      const qwenSkillFile = path3.join(qwenSkillDir, "SKILL.md");
-      const qwenContent = await fs.readFile(qwenSkillFile, "utf8").catch(() => void 0);
+      const qwenSkillFile = path4.join(qwenSkillDir, "SKILL.md");
+      const qwenContent = await fs2.readFile(qwenSkillFile, "utf8").catch(() => void 0);
       if (qwenContent !== void 0) {
         return {
           skillDir: qwenSkillDir,
@@ -8887,34 +9309,34 @@ var QwenAgent = class {
         `${scope === "project" ? "Project" : "Global"} skill not found: ${slug}`
       );
     }
-    const content = await fs.readFile(skillFile, "utf8").catch(() => {
+    const content = await fs2.readFile(skillFile, "utf8").catch(() => {
       throw RequestError.invalidParams(
         void 0,
         `${scope === "project" ? "Project" : "Global"} skill not found: ${slug}`
       );
     });
     return {
-      skillDir: path3.dirname(skillFile),
+      skillDir: path4.dirname(skillFile),
       skillFile,
       content
     };
   }
   async findProjectSkillFileFromCwd(slug, cwd, skillManager) {
-    const projectRoot = path3.resolve(cwd);
+    const projectRoot = path4.resolve(cwd);
     for (const configDir of PROJECT_SKILL_DIRS) {
-      const baseDir = path3.join(projectRoot, configDir, SKILLS_DIR);
+      const baseDir = path4.join(projectRoot, configDir, SKILLS_DIR);
       const skills = await skillManager.loadSkillsFromDir(baseDir, "project");
       const skill = skills.find((candidate) => candidate.name === slug);
       const skillFile = skill?.filePath;
       if (!skillFile) continue;
-      const content = await fs.readFile(skillFile, "utf8").catch(() => {
+      const content = await fs2.readFile(skillFile, "utf8").catch(() => {
         throw RequestError.invalidParams(
           void 0,
           `Project skill not found: ${slug}`
         );
       });
       return {
-        skillDir: path3.dirname(skillFile),
+        skillDir: path4.dirname(skillFile),
         skillFile,
         content
       };
@@ -8945,13 +9367,13 @@ var QwenAgent = class {
     }
     const nextContent = setSkillFrontmatterEnabled(content, request.enabled);
     skillManager.parseSkillContent(nextContent, skillFile, level);
-    if (path3.basename(skillFile) !== "SKILL.md") {
+    if (path4.basename(skillFile) !== "SKILL.md") {
       throw RequestError.invalidParams(
         void 0,
         `Refusing to write to unexpected skill file: ${skillFile}`
       );
     }
-    await fs.writeFile(skillFile, nextContent, "utf8");
+    await fs2.writeFile(skillFile, nextContent, "utf8");
     await skillManager.refreshCache();
     return {
       slug: request.slug,
@@ -9106,6 +9528,33 @@ var QwenAgent = class {
         return await this.buildAcpPreflightCells(
           this.config
         );
+      case SERVE_STATUS_EXT_METHODS.workspaceResource: {
+        const now = Date.now();
+        let cpu = null;
+        try {
+          cpu = process.cpuUsage();
+        } catch {
+        }
+        const cpuPercent = computeCpuPercent(
+          this.prevChildCpu,
+          cpu,
+          now - this.prevChildCpuAt,
+          this.childCpuCoreCount
+        );
+        if (cpu) {
+          this.prevChildCpu = cpu;
+          this.prevChildCpuAt = now;
+        }
+        let rssBytes = 0;
+        try {
+          rssBytes = process.memoryUsage().rss;
+        } catch {
+        }
+        return {
+          rssBytes,
+          cpuPercent
+        };
+      }
       case SERVE_STATUS_EXT_METHODS.sessionContext: {
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || sessionId.length === 0) {
@@ -9761,7 +10210,7 @@ var QwenAgent = class {
             "Invalid or missing sessionId"
           );
         }
-        if (typeof targetPath !== "string" || targetPath.length === 0 || !path3.isAbsolute(targetPath) || targetPath.includes("\0")) {
+        if (typeof targetPath !== "string" || targetPath.length === 0 || !path4.isAbsolute(targetPath) || targetPath.includes("\0")) {
           throw RequestError.invalidParams(
             void 0,
             "Invalid or missing path (must be an absolute path)"
@@ -9776,7 +10225,7 @@ var QwenAgent = class {
         }
         let stats;
         try {
-          stats = await fs.stat(targetPath);
+          stats = await fs2.stat(targetPath);
         } catch {
           throw new RequestError(-32002, `Directory not found: ${targetPath}`, {
             errorKind: "directory_not_found",
@@ -9789,7 +10238,7 @@ var QwenAgent = class {
             path: targetPath
           });
         }
-        const canonicalPath = await fs.realpath(targetPath);
+        const canonicalPath = await fs2.realpath(targetPath);
         const previousCwd = config.getTargetDir();
         if (canonicalPath === previousCwd) {
           return { previousCwd, newCwd: canonicalPath, warnings: [] };
@@ -9879,7 +10328,7 @@ var QwenAgent = class {
         try {
           await setLanguageAsync(language);
         } catch (err) {
-          debugLogger6.warn("setLanguageAsync failed:", err);
+          debugLogger7.warn("setLanguageAsync failed:", err);
           throw new RequestError(
             -32603,
             `Failed to switch UI language: ${err instanceof Error ? err.message : String(err)}`
@@ -9893,7 +10342,7 @@ var QwenAgent = class {
             language
           );
         } catch (err) {
-          debugLogger6.warn("Failed to persist UI language setting:", err);
+          debugLogger7.warn("Failed to persist UI language setting:", err);
         }
         let outputLanguage = null;
         let refreshed = false;
@@ -9908,7 +10357,7 @@ var QwenAgent = class {
             );
             fileWriteOk = true;
           } catch (err) {
-            debugLogger6.warn("Failed to write output-language.md:", err);
+            debugLogger7.warn("Failed to write output-language.md:", err);
           }
           if (fileWriteOk) {
             try {
@@ -9918,7 +10367,7 @@ var QwenAgent = class {
                 settingValue
               );
             } catch (err) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 "Failed to persist output language setting:",
                 err
               );
@@ -9938,7 +10387,7 @@ var QwenAgent = class {
                     writeOutputLanguageAndRegisterPath(settingValue, cfg);
                   }
                 } catch (err) {
-                  debugLogger6.warn(
+                  debugLogger7.warn(
                     `Failed to write output-language.md for session ${s.getId()} (path=${sessionPath ?? "global-default"}):`,
                     err
                   );
@@ -9951,7 +10400,7 @@ var QwenAgent = class {
               (r) => r.status === "rejected"
             ).length;
             if (failedCount > 0) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `Language refresh failed for ${failedCount}/${results.length} session(s)`
               );
             }
@@ -9969,14 +10418,14 @@ var QwenAgent = class {
             "Invalid or missing sessionId"
           );
         }
-        debugLogger6.debug(`recap ext-method received for session=${sessionId}`);
+        debugLogger7.debug(`recap ext-method received for session=${sessionId}`);
         const session = this.sessionOrThrow(sessionId);
         const config = session.getConfig();
         const recap = await generateSessionRecap(
           config,
           new AbortController().signal
         );
-        debugLogger6.debug(
+        debugLogger7.debug(
           `recap ext-method completed for session=${sessionId} result=${recap ? `len=${recap.length}` : "null"}`
         );
         return { sessionId, recap };
@@ -10000,7 +10449,7 @@ var QwenAgent = class {
         const config = session.getConfig();
         const cacheSafeParams = buildBtwCacheSafeParams(config);
         if (!cacheSafeParams) {
-          debugLogger6.debug(`btw: no cacheSafeParams for session=${sessionId}`);
+          debugLogger7.debug(`btw: no cacheSafeParams for session=${sessionId}`);
           return { sessionId, answer: null };
         }
         const childSignal = AbortSignal.timeout(BTW_CHILD_TIMEOUT_MS);
@@ -10048,7 +10497,7 @@ var QwenAgent = class {
         try {
           hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
         } catch (error) {
-          debugLogger6.debug("Failed to read history before /fork:", error);
+          debugLogger7.debug("Failed to read history before /fork:", error);
         }
         if (!hasHistory) {
           throw RequestError.invalidParams(
@@ -10090,7 +10539,7 @@ var QwenAgent = class {
             ]
           });
         } catch (error) {
-          debugLogger6.debug("Failed to record fork event in history:", error);
+          debugLogger7.debug("Failed to record fork event in history:", error);
         }
         return { sessionId, description, launched: true };
       }
@@ -10153,7 +10602,7 @@ ${outputText}
             'taskKind must be "agent", "shell", or "monitor"'
           );
         }
-        debugLogger6.info(
+        debugLogger7.info(
           `sessionTaskCancel requested sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind}`
         );
         const session = this.sessionOrThrow(sessionId);
@@ -10163,7 +10612,7 @@ ${outputText}
             const task = config.getBackgroundTaskRegistry().get(taskId);
             if (!task || task.status !== "running" && task.status !== "paused") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger6.info(
+              debugLogger7.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
@@ -10173,7 +10622,7 @@ ${outputText}
             } else {
               config.getBackgroundTaskRegistry().cancel(taskId);
             }
-            debugLogger6.info(
+            debugLogger7.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -10182,13 +10631,13 @@ ${outputText}
             const task = config.getBackgroundShellRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger6.info(
+              debugLogger7.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
             }
             config.getBackgroundShellRegistry().requestCancel(taskId);
-            debugLogger6.info(
+            debugLogger7.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -10197,13 +10646,13 @@ ${outputText}
             const task = config.getMonitorRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger6.info(
+              debugLogger7.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
             }
             config.getMonitorRegistry().cancel(taskId);
-            debugLogger6.info(
+            debugLogger7.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -10233,7 +10682,7 @@ ${outputText}
             durationMs: Date.now() - cleared.setAt
           });
         }
-        debugLogger6.info(
+        debugLogger7.info(
           `sessionGoalClear sessionId=${sessionId} cleared=${!!cleared} condition=${cleared?.condition ?? "(none)"}`
         );
         return {
@@ -10251,7 +10700,7 @@ ${outputText}
         }
         const session = this.sessionOrThrow(sessionId);
         const result = await session.continueLastTurn();
-        debugLogger6.info(
+        debugLogger7.info(
           `sessionContinue sessionId=${sessionId} accepted=${result.accepted} interruption=${result.interruption}`
         );
         return result;
@@ -10327,7 +10776,7 @@ ${outputText}
                   originatorClientId
                 );
               } catch (sessionErr) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `workspaceMcpRuntimeAdd: failed to add runtime MCP server '${name}' to active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
                 );
               }
@@ -10400,7 +10849,7 @@ ${outputText}
                 originatorClientId
               );
             } catch (sessionErr) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `workspaceMcpRuntimeRemove: failed to remove runtime MCP server '${name}' from active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -10416,7 +10865,7 @@ ${outputText}
         try {
           await extensionManager.refreshTools();
         } catch (err) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             `Extension tool refresh failed for session ${sessionId}: ${err instanceof Error ? err.message : String(err)}`
           );
         }
@@ -10564,7 +11013,7 @@ ${outputText}
             filesFailed = fileResult.filesFailed;
           } catch (err) {
             const reason = err instanceof Error ? err.message : String(err);
-            debugLogger6.error(
+            debugLogger7.error(
               `[ACP] File-history rewind failed for session=${sessionId} promptId=${promptId}: ${reason}`
             );
             filesFailed = [`file-history-rewind: ${reason}`];
@@ -10597,51 +11046,19 @@ ${outputText}
         if (!sessionData?.conversation) {
           return { updates: [] };
         }
-        const updates = [];
-        const replayContext = {
+        const replay = await collectHistoryReplayUpdates({
           sessionId,
           config: this.config,
-          sendUpdate: /* @__PURE__ */ __name(async (update) => {
-            updates.push(update);
-          }, "sendUpdate"),
-          // Fresh accumulator for this replay: MessageEmitter advances it from
-          // replayed usage metadata (tokens only — no per-turn durations) and
-          // PlanEmitter snapshots it onto each todo update, so resumed sessions
-          // recover per-task token spend (API time stays live-only).
-          cumulativeUsage: {
-            promptTokens: 0,
-            cachedTokens: 0,
-            candidateTokens: 0,
-            apiTimeMs: 0
-          }
-        };
-        let replayError;
-        try {
-          await new HistoryReplayer(replayContext).replay(
-            sessionData.conversation.messages
-          );
-        } catch (error) {
-          replayError = error instanceof Error ? error.message : String(error);
-          debugLogger6.warn(
-            "[loadUpdates] History replay failed for session %s (partial updates: %d):",
-            sessionId,
-            updates.length,
-            error
-          );
-        }
-        const updatesWithTopLevelTimestamps = updates.map((update) => {
-          const record = update;
-          const meta = record["_meta"];
-          const timestamp = meta && typeof meta === "object" && !Array.isArray(meta) ? meta["timestamp"] : void 0;
-          return typeof timestamp === "number" || typeof timestamp === "string" ? { ...record, timestamp } : record;
+          records: sessionData.conversation.messages,
+          cumulativeUsage: createReplayCumulativeUsage()
         });
         return {
-          updates: updatesWithTopLevelTimestamps,
+          updates: liftSessionUpdateTimestamps(replay.updates),
           startTime: sessionData.conversation.startTime,
           lastUpdated: sessionData.conversation.lastUpdated,
           // Signal to the client that replay aborted partway so it doesn't
           // render a truncated replay as the full conversation.
-          ...replayError !== void 0 ? { partial: true, replayError } : {}
+          ...replay.replayError !== void 0 ? { partial: true, replayError: replay.replayError } : {}
         };
       }
       case "restoreSessionHistory": {
@@ -10982,7 +11399,7 @@ ${outputText}
                   newMerged.providerProtocol ?? {}
                 );
               } catch (err) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `reload: reloadModelProvidersConfig failed for session ${id}: ${err}`
                 );
               }
@@ -10992,7 +11409,7 @@ ${outputText}
               try {
                 await config.switchModel(authType, newModelName);
               } catch (err) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `reload: switchModel failed for session ${id}: ${err}`
                 );
               }
@@ -11000,7 +11417,7 @@ ${outputText}
               try {
                 await config.refreshAuth(authType);
               } catch (err) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `reload: refreshAuth failed for session ${id}: ${err}`
                 );
               }
@@ -11015,7 +11432,7 @@ ${outputText}
                 try {
                   config.setApprovalMode(newMode);
                 } catch (err) {
-                  debugLogger6.warn(
+                  debugLogger7.warn(
                     `reload: setApprovalMode failed for session ${id}: ${err}`
                   );
                 }
@@ -11024,14 +11441,14 @@ ${outputText}
             try {
               await config.refreshHierarchicalMemory();
             } catch (err) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `reload: refreshHierarchicalMemory failed for session ${id}: ${err}`
               );
             }
             try {
               await config.getGeminiClient()?.refreshSystemInstruction();
             } catch (err) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `reload: refreshSystemInstruction failed for session ${id}: ${err}`
               );
             }
@@ -11041,7 +11458,7 @@ ${outputText}
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
             const reason = results[i].reason;
-            debugLogger6.warn(
+            debugLogger7.warn(
               `Session ${sessions[i][0]} reload failed: ${reason}`
             );
             skipped.push(sessions[i][0]);
@@ -11071,11 +11488,10 @@ ${outputText}
    * servers in this session share one callback — the `serverName` argument
    * routes to the right client-hosted server in the parent.
    */
-  buildClientMcpSender() {
-    return (serverName, message) => deliverClientMcpMessage(this.connection, serverName, message);
+  buildClientMcpSender(sessionId) {
+    return (serverName, message) => deliverClientMcpMessage(this.connection, serverName, message, sessionId);
   }
-  async newSessionConfig(cwd, mcpServers, sessionId, resume) {
-    this.settings = loadSettings(cwd);
+  async newSessionConfig(cwd, mcpServers, settings, sessionId, resume) {
     const sessionMcpServers = {};
     for (const server of mcpServers) {
       const stdioServer = toStdioServer(server);
@@ -11127,14 +11543,14 @@ ${outputText}
         continue;
       }
     }
-    const settings = this.settings.merged;
+    const mergedSettings = settings.merged;
     const argvForSession = {
       ...this.argv,
       ...resume ? { resume: sessionId } : { sessionId },
       continue: false
     };
     const config = await loadCliConfig(
-      settings,
+      mergedSettings,
       argvForSession,
       cwd,
       // ACP sessions do not provide an extension override. Passing [] is a
@@ -11143,16 +11559,16 @@ ${outputText}
       void 0,
       // Pass separated hooks for proper source attribution
       {
-        userHooks: this.settings.getUserHooks(),
-        projectHooks: this.settings.getProjectHooks()
+        userHooks: settings.getUserHooks(),
+        projectHooks: settings.getProjectHooks()
       },
-      // CRITICAL: close over `this.settings` (LoadedSettings instance), NOT
-      // over the local `settings` snapshot built above. `LoadedSettings.
-      // setValue` replaces `_merged`, so a closure over the snapshot would
-      // never see workspace toggles applied during the session. ACP/Zed
-      // sessions otherwise leak persisted disabled skills into the first
-      // <available_skills> at cold start.
-      buildDisabledSkillNamesProvider(this.settings),
+      // CRITICAL: close over the per-request `settings` (LoadedSettings
+      // instance), NOT over the `mergedSettings` snapshot built above.
+      // `LoadedSettings.setValue` replaces `_merged`, so a closure over the
+      // snapshot would never see workspace toggles applied during the
+      // session. ACP/Zed sessions otherwise leak persisted disabled skills
+      // into the first <available_skills> at cold start.
+      buildDisabledSkillNamesProvider(settings),
       sessionMcpServers
     );
     if (typeof config.enableFileCheckpointing === "function") {
@@ -11179,7 +11595,7 @@ ${outputText}
           sessionId: sid,
           ...event
         }).catch((err) => {
-          debugLogger6.debug(
+          debugLogger7.debug(
             `MCP budget extNotification dropped (session=${sid}, kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
           );
         });
@@ -11191,7 +11607,7 @@ ${outputText}
       // client-hosted (extension) MCP server added at runtime reaches the
       // daemon WS. Servers that aren't client-hosted never use this callback
       // (the daemon only adds SDK-type runtime servers for client MCP).
-      sendSdkMcpMessage: this.buildClientMcpSender()
+      sendSdkMcpMessage: this.buildClientMcpSender(wiredSessionId)
     });
     void this.surfaceMcpFailuresWhenReady(config);
     return config;
@@ -11200,7 +11616,7 @@ ${outputText}
     try {
       await config.waitForMcpReady();
     } catch (err) {
-      debugLogger6.error(
+      debugLogger7.error(
         `MCP discovery readiness failed: ${err instanceof Error ? err.message : String(err)}`
       );
       return;
@@ -11224,7 +11640,7 @@ ${outputText}
     try {
       await config.refreshAuth(selectedType, true);
     } catch (e) {
-      debugLogger6.error(`Authentication failed: ${e}`);
+      debugLogger7.error(`Authentication failed: ${e}`);
       throw RequestError.authRequired(
         {
           authMethods: pickAuthMethodsForAuthRequired(selectedType)
@@ -11241,22 +11657,12 @@ ${outputText}
       this.clientCapabilities.fs,
       config.getFileSystemService(),
       {
-        // SYNC: Mirrors ReadFileTool's default allowed local roots, including
-        // auto-memory roots, so ACP-local read fallback follows the same policy.
-        localReadRoots: [
-          config.storage.getProjectTempDir(),
-          path3.join(config.storage.getProjectDir(), "subagents"),
-          Storage.getGlobalTempDir(),
-          getAutoMemoryRoot(config.getTargetDir()),
-          getUserAutoMemoryRoot(),
-          ...config.storage.getUserSkillsDirs(),
-          Storage.getUserExtensionsDir()
-        ]
+        localReadRoots: buildAcpLocalReadRoots(config)
       }
     );
     config.setFileSystemService(acpFileSystemService);
   }
-  async createAndStoreSession(config, sessionData, options = {}) {
+  async createAndStoreSession(config, settings, sessionData, options = {}) {
     const sessionId = config.getSessionId();
     const geminiClient = config.getGeminiClient();
     const needsInitialize = !geminiClient.isInitialized();
@@ -11264,12 +11670,7 @@ ${outputText}
       await geminiClient.initialize();
     }
     this.sessions.get(sessionId)?.dispose();
-    const session = new Session(
-      sessionId,
-      config,
-      this.connection,
-      this.settings
-    );
+    const session = new Session(sessionId, config, this.connection, settings);
     this.sessions.set(sessionId, session);
     setTimeout(async () => {
       await session.sendAvailableCommandsUpdate();
@@ -11283,8 +11684,10 @@ ${outputText}
     if (options.replayHistory !== false && sessionData?.conversation.messages) {
       await session.replayHistory(sessionData.conversation.messages);
     }
-    session.installRewriter();
-    session.startCronScheduler();
+    if (options.startPostReplayServices !== false) {
+      session.installRewriter();
+      session.startCronScheduler();
+    }
     return session;
   }
   buildAvailableModels(config) {