@qwen-code/qwen-code 0.21.1 → 0.21.2-nightly.20260801.bc382c3ff

package/chunks/{acpAgent-WN5SRDQO.js → acpAgent-6WVVT2P3.js}

@@ -1,8 +1,9 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  classifyApiError
-} from "./chunk-V7RNNPGC.js";
+  classifyApiError,
+  fireSessionDeleteHook
+} from "./chunk-P5Y23G2L.js";
 import {
   EXTENSION_CONTEXT_BUDGET,
   buildExtensionMentionContext,
@@ -12,53 +13,49 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-TV64SXKD.js";
+} from "./chunk-RGJ4JWSU.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-J7OACQDE.js";
+} from "./chunk-TNVKFQXQ.js";
+import {
+  collectContextData,
+  formatContextUsageText
+} from "./chunk-7K2WTPQO.js";
 import {
   recomputeMcpGating
-} from "./chunk-A4COXFB3.js";
+} from "./chunk-PGP7Y3RQ.js";
 import {
+  SessionIdConflictError,
   appEvents,
   buildDisabledSkillNamesProvider,
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-7BAU433D.js";
+} from "./chunk-VS3GXRNZ.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-JX27F6QS.js";
+} from "./chunk-OBAIHYFT.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-7AEJDLRA.js";
-import "./chunk-PQNHRFJC.js";
-import "./chunk-M7OONWYU.js";
-import {
-  collectContextData,
-  formatContextUsageText
-} from "./chunk-65PQENQP.js";
+} from "./chunk-7IYLHTTM.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-GATT5TKW.js";
-import "./chunk-EVKE2FZL.js";
-import "./chunk-T3O2B4XO.js";
-import "./chunk-7DXQIJID.js";
-import "./chunk-YAF2MQZ6.js";
-import {
-  computeCpuPercent
-} from "./chunk-HGT6JR3U.js";
-import "./chunk-S4WJVPZW.js";
-import "./chunk-6H67XLET.js";
+import "./chunk-NYX53SV4.js";
+import "./chunk-3LGZEYOF.js";
+import "./chunk-KKN2IE7Q.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-3L2SPEBH.js";
+} from "./chunk-M744OFVE.js";
+import "./chunk-433VD3HX.js";
+import "./chunk-PHODQP2V.js";
+import "./chunk-ZRFJ75D7.js";
+import "./chunk-YAF2MQZ6.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -71,6 +68,7 @@ import {
   executeGeneration,
   formatWorkspaceMemoryForgetSummary,
   isValidServerName,
+  loadSettingsCached,
   normalizeChannelDeliveryText,
   redactMcpServerSecrets,
   replayTranscriptRecordPage,
@@ -78,7 +76,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-6PE7N3A4.js";
+} from "./chunk-5UJ6A3CH.js";
 import {
   HistoryReplayer,
   MessageEmitter,
@@ -88,48 +86,57 @@ import {
   goalTerminalEventToHistoryItem,
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-LO4ROVP4.js";
-import "./chunk-LGAOC3ZS.js";
-import "./chunk-XFZYFU3I.js";
-import "./chunk-YDLJGZHL.js";
+} from "./chunk-UOFFZNXV.js";
+import "./chunk-DYA25Y7U.js";
+import "./chunk-4NFY2S7N.js";
+import "./chunk-UHQ3L6GC.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import {
   isTerminalGoalStatusKind
 } from "./chunk-QTERJVPZ.js";
 import "./chunk-3Z43GZUQ.js";
+import {
+  computeCpuPercent
+} from "./chunk-LBOVL47Y.js";
 import "./chunk-RXFQM6FQ.js";
+import "./chunk-LL4U3BSH.js";
+import "./chunk-6H67XLET.js";
+import {
+  mapSkillConfigToStatus
+} from "./chunk-BGXZBI5B.js";
 import {
   PERMISSION_RULE_TYPES,
   PermissionRulesValidationError,
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-MR5EAQ5M.js";
+} from "./chunk-GALUTA2C.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-CAPPWD3X.js";
+} from "./chunk-2A6MHYIA.js";
 import {
   readVoiceModel
-} from "./chunk-JTV5K7NH.js";
-import "./chunk-ZHBO7WVX.js";
+} from "./chunk-XSA5EKTJ.js";
+import "./chunk-JELIWHXD.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-WUZ7H6DP.js";
+} from "./chunk-K5Q62CGR.js";
 import "./chunk-VXZBKKQR.js";
-import "./chunk-QIZKCVM3.js";
-import "./chunk-E5Z2AVNV.js";
+import "./chunk-GHJM2C2T.js";
+import "./chunk-3SH53ANB.js";
 import {
+  SESSION_SOURCE_META_KEY,
   parseSessionSource
-} from "./chunk-ZURDMIDR.js";
+} from "./chunk-3MHPWQ2M.js";
 import "./chunk-GLWP3FDB.js";
 import "./chunk-XCGIMOLN.js";
 import "./chunk-OCPBI7J5.js";
 import {
   ndJsonStream
-} from "./chunk-KAMYKP7E.js";
+} from "./chunk-UWSXFI6E.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -138,10 +145,7 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-KCO4FLFJ.js";
-import {
-  mapSkillConfigToStatus
-} from "./chunk-L55JWS76.js";
+} from "./chunk-AYB4HSBI.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -149,16 +153,16 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-FTD6DP4T.js";
+} from "./chunk-PDDYAXL2.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-BNWB5CYE.js";
-import "./chunk-5MKRTI4T.js";
+import "./chunk-3WXMXT7C.js";
+import "./chunk-BKUN5QHP.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-2XSLTRFZ.js";
-import "./chunk-TFRMVU6R.js";
-import "./chunk-XBYYDKAZ.js";
+import "./chunk-2CTKGIFR.js";
+import "./chunk-K4CGQN4Q.js";
+import "./chunk-ZTN6OA5J.js";
 import "./chunk-V6WHFGST.js";
 import {
   CHANNEL_STARTUP_PROFILE_META_KEY,
@@ -166,29 +170,34 @@ import {
   CLIENT_MCP_OVER_WS_CONFIG_FLAG,
   DAEMON_CHANNEL_DELIVERY_META_KEY,
   LOAD_REPLAY_BULK_MODE,
+  LOAD_REPLAY_HIDE_INHERITED_META_KEY,
   LOAD_REPLAY_META_KEY,
   LOAD_REPLAY_MODE_META_KEY,
   LOAD_REPLAY_PAGE_SIZE_META_KEY,
   LOAD_REPLAY_VERSION,
   MID_TURN_QUEUE_DRAIN_METHOD,
   PROMPT_CANCEL_METHOD,
+  REQUESTED_SESSION_ID_META_KEY,
   TODO_STOP_GUARD_CONTINUATION_CLAIM_METHOD,
-  TODO_STOP_GUARD_QUEUE_RELEASE_METHOD
-} from "./chunk-XZC5VLBZ.js";
+  TODO_STOP_GUARD_QUEUE_RELEASE_METHOD,
+  WORKTREE_MCP_DEFER_META_KEY
+} from "./chunk-UKZEXS6K.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
-} from "./chunk-B4AJNNOL.js";
-import "./chunk-2RFKHEXL.js";
+} from "./chunk-J26HHFI5.js";
+import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
-import "./chunk-U4VTUMMK.js";
-import "./chunk-GZ3RCT54.js";
+import "./chunk-QONSRAEV.js";
+import "./chunk-UHTJC7O3.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-BK2UNYWD.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-4G2BISNC.js";
-import "./chunk-GEBV2JGB.js";
-import "./chunk-7I5GTCT4.js";
+import "./chunk-XC2VAFVZ.js";
+import "./chunk-I6FAHB4N.js";
+import {
+  ACP_EVENT_LOOP_STALL_RESTART_MS
+} from "./chunk-GB3AB7TR.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -197,48 +206,38 @@ import {
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-6RPMI2AB.js";
+} from "./chunk-NZB4NDJL.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
-  getUserSettingsPath,
   loadSettings,
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-EIF3FXTB.js";
+} from "./chunk-LAPK3GLC.js";
 import "./chunk-RKUWKYED.js";
+import "./chunk-GOXKNSDZ.js";
+import "./chunk-IDS7MSUP.js";
 import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-TCIFAA7K.js";
+} from "./chunk-CHCLO3M7.js";
 import {
-  findEnvFiles,
-  preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-2N7CODY5.js";
-import "./chunk-VWOOBLTY.js";
-import "./chunk-GOXKNSDZ.js";
-import {
-  getSystemDefaultsPath,
-  getSystemSettingsPath
-} from "./chunk-IDS7MSUP.js";
+} from "./chunk-AQEWCKX4.js";
 import "./chunk-6PEXNQTX.js";
-import "./chunk-XFSFZCM5.js";
-import "./chunk-VYOXCEPJ.js";
-import "./chunk-VJNBRRZG.js";
+import "./chunk-25QQVOCG.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-Q43KPN7X.js";
+} from "./chunk-434YCHSV.js";
 import "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
-import {
-  writeStderrLine,
-  writeStderrLineSafe
-} from "./chunk-OWAK7LMW.js";
+import "./chunk-XFSFZCM5.js";
+import "./chunk-MBKPUM5Y.js";
+import "./chunk-VJNBRRZG.js";
 import {
   ALL_PROVIDERS,
   APPROVAL_MODE_INFO,
@@ -300,6 +299,7 @@ import {
   evaluateAutoMode,
   evaluatePermissionFlow,
   evaluatePlanModeShellPolicy,
+  evaluateToolInvocationGuard,
   finalizeToolResponses,
   findExistingProviderModels,
   findPlanModeEntryBatchBoundaryIndex,
@@ -326,7 +326,6 @@ import {
   getProviderToolCallId,
   getScopedEnvContents,
   getStopHookContinuationReason,
-  ideContextStore,
   injectPermissionRulesIfMissing,
   isApproveOutcome,
   isDenialFallbackReason,
@@ -339,7 +338,6 @@ import {
   normalizeEventPayload,
   normalizeSnapshotPayload,
   persistPermissionOutcome,
-  promptIdContext,
   readManyFiles,
   recordAllow,
   recordFallbackApprove,
@@ -362,57 +360,66 @@ import {
   unregisterGoalHook,
   updateSetting,
   validatePlanModeShellApproval,
-  validatePlanModeShellContext
-} from "./chunk-X5WNMMIA.js";
+  validatePlanModeShellContext,
+  wrapUserPromptSubmitContext
+} from "./chunk-NGWYUZZO.js";
+import "./chunk-GOFAQQZA.js";
+import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-H6XPXXMH.js";
-import "./chunk-5M6IDOMF.js";
-import "./chunk-UPUG4GXM.js";
-import "./chunk-64LQLPL7.js";
-import "./chunk-2LQTH543.js";
-import "./chunk-KRXPRVGL.js";
-import "./chunk-BMFALVGQ.js";
-import "./chunk-CVHIL5IG.js";
-import "./chunk-IRH27ZC2.js";
-import "./chunk-QHWCP53L.js";
-import "./chunk-PONHVBRT.js";
-import "./chunk-T26EAKDL.js";
+import "./chunk-CWEIMFFW.js";
+import "./chunk-I7JDGNG6.js";
+import "./chunk-A6SX5TAH.js";
+import "./chunk-33FNCQSY.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
+import "./chunk-PXA5AWHY.js";
+import "./chunk-IRH27ZC2.js";
+import "./chunk-QHWCP53L.js";
+import "./chunk-MOHAWIAW.js";
+import "./chunk-MYT7N6QH.js";
+import {
+  promptIdContext,
+  todoWorkChainContext
+} from "./chunk-O6GEWCJA.js";
+import "./chunk-T26EAKDL.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-6QIGFD5W.js";
+import "./chunk-MISUEWB4.js";
+import "./chunk-KRXPRVGL.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-XWWKIXVD.js";
-import "./chunk-75GFAX4R.js";
-import "./chunk-OKF7JF3R.js";
+} from "./chunk-A5YZ3FA2.js";
+import "./chunk-YAVY33G4.js";
+import "./chunk-2UISUFHQ.js";
+import "./chunk-6FMJLI5M.js";
 import {
   APPROVAL_MODES,
   FORK_SUBAGENT_TYPE,
   getStartupContextLength,
   isSystemReminderContent,
   runWithRuntimeContentGenerator
-} from "./chunk-JSD33JG6.js";
+} from "./chunk-PGEGUNH5.js";
 import "./chunk-S6LOFUVP.js";
-import "./chunk-JCW2R7WC.js";
-import "./chunk-2DN4J57Y.js";
+import "./chunk-K623ENWT.js";
+import "./chunk-AQ37AY7B.js";
+import "./chunk-432XCUHF.js";
 import "./chunk-ZPJWUGCS.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-2LKVPASC.js";
+} from "./chunk-XC656O42.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-LW3RFMG7.js";
-import "./chunk-W4MIWP6M.js";
+import "./chunk-QYPT3QUD.js";
+import "./chunk-QMBEW7EW.js";
 import "./chunk-DGEIYUC3.js";
 import "./chunk-MPHPFVKK.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-5KTQXHPY.js";
+import "./chunk-XCLLRKY5.js";
 import {
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
@@ -420,14 +427,14 @@ import {
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor,
   withDaemonSpan
-} from "./chunk-75MIQ3LV.js";
+} from "./chunk-RPYYTL7E.js";
 import "./chunk-2J3OJGTL.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-RPLGZJV2.js";
+import "./chunk-6O5DVH27.js";
 import {
   getToolCallPreparations
 } from "./chunk-GLCZKT5V.js";
-import "./chunk-DZLYR4U3.js";
+import "./chunk-2DNKEBXY.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -458,30 +465,30 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-PT722TDT.js";
+} from "./chunk-M2F5PLOW.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-SGFT55XI.js";
-import "./chunk-Y4IHBGBP.js";
+} from "./chunk-E4WHKETF.js";
+import "./chunk-BV4QX43X.js";
 import {
   ToolConfirmationOutcome,
   ToolNames,
   isShellProgressData
-} from "./chunk-Y6AXW2OG.js";
+} from "./chunk-I5GNT6ZS.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-VCPIZRYH.js";
+} from "./chunk-TFFMATHX.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-ZBVS26BY.js";
-import "./chunk-WZRWHXFE.js";
-import "./chunk-A3NDJ5SB.js";
-import "./chunk-7XATOOE7.js";
+import "./chunk-BFHXDAR7.js";
+import "./chunk-TYERNYH4.js";
+import "./chunk-UH7Z7Y45.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
@@ -490,21 +497,25 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-BGTQCTQW.js";
+} from "./chunk-O2ZYHG33.js";
 import "./chunk-W4RQUHY3.js";
-import "./chunk-S7W2GKIO.js";
+import "./chunk-G7XXKQYS.js";
 import {
   Storage,
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-UHUSJ6X7.js";
+} from "./chunk-3RXUYQJI.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-RCUQIPTN.js";
+import "./chunk-W7XZ3KP5.js";
 import {
   runExitCleanup
-} from "./chunk-52ZSWYEG.js";
+} from "./chunk-SK2UKB45.js";
+import {
+  writeStderrLine,
+  writeStderrLineSafe
+} from "./chunk-OWAK7LMW.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
@@ -749,126 +760,11 @@ var AcpFileSystemService = class {
 // packages/cli/src/acp-integration/acpAgent.ts
 import { Readable, Writable } from "node:stream";
 import { pipeline } from "node:stream/promises";
-import * as fs2 from "node:fs/promises";
-import * as os3 from "node:os";
-import * as path4 from "node:path";
+import * as fs from "node:fs/promises";
+import * as os2 from "node:os";
+import * as path3 from "node:path";
 import { createGunzip } from "node:zlib";
 
-// 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/extension-skills.ts
 init_esbuild_shims();
 function extensionSkillRef(extensionName, skillName) {
@@ -898,9 +794,9 @@ __name(isInactiveExtensionSkill, "isInactiveExtensionSkill");
 init_esbuild_shims();
 import { Buffer as Buffer2 } from "node:buffer";
 import { randomUUID } from "node:crypto";
-import { existsSync as existsSync2, statSync as statSync2 } from "node:fs";
-import * as os2 from "node:os";
-import * as path3 from "node:path";
+import { realpathSync, statSync } from "node:fs";
+import * as os from "node:os";
+import * as path2 from "node:path";
 
 // packages/cli/src/utils/midTurnUserMessage.ts
 init_esbuild_shims();
@@ -1110,7 +1006,7 @@ function requestPermissionWithAbort(client, params, signal) {
   if (signal.aborted) {
     return Promise.reject(permissionAbortError(signal));
   }
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve4, reject) => {
     let settled = false;
     const finish = /* @__PURE__ */ __name((callback) => {
       if (settled) return;
@@ -1128,7 +1024,7 @@ function requestPermissionWithAbort(client, params, signal) {
       return;
     }
     request.then(
-      (response) => finish(() => resolve5(response)),
+      (response) => finish(() => resolve4(response)),
       (error) => finish(() => reject(error))
     );
   });
@@ -1268,12 +1164,13 @@ function toPermissionOptions(confirmation, forceHideAlwaysAllow = false) {
 __name(toPermissionOptions, "toPermissionOptions");
 
 // packages/cli/src/acp-integration/session/SubAgentTracker.ts
-var debugLogger3 = createDebugLogger("ACP_SUBAGENT_TRACKER");
+var debugLogger2 = createDebugLogger("ACP_SUBAGENT_TRACKER");
 var SubAgentTracker = class {
-  constructor(ctx, client, parentToolCallId, subagentType, onPermissionCancel) {
+  constructor(ctx, client, parentToolCallId, subagentType, onPermissionCancel, permissionRequester = (params, signal) => requestPermissionWithAbort(this.client, params, signal)) {
     this.ctx = ctx;
     this.client = client;
     this.onPermissionCancel = onPermissionCancel;
+    this.permissionRequester = permissionRequester;
     this.toolCallEmitter = new ToolCallEmitter(ctx);
     this.messageEmitter = new MessageEmitter(ctx);
     this.subagentMeta = { parentToolCallId, subagentType };
@@ -1328,7 +1225,7 @@ var SubAgentTracker = class {
         try {
           invocation = tool.build(event.args);
         } catch (e) {
-          debugLogger3.warn(`Failed to build subagent tool ${event.name}:`, e);
+          debugLogger2.warn(`Failed to build subagent tool ${event.name}:`, e);
         }
       }
       this.toolStates.set(event.callId, {
@@ -1405,11 +1302,7 @@ var SubAgentTracker = class {
         }
       };
       try {
-        const output = await requestPermissionWithAbort(
-          this.client,
-          params,
-          abortSignal
-        );
+        const output = await this.permissionRequester(params, abortSignal);
         const outcome = resolvePermissionOutcome(
           output,
           offeredPermissionOptions
@@ -1421,7 +1314,7 @@ var SubAgentTracker = class {
           this.onPermissionCancel?.();
         }
       } catch (error) {
-        debugLogger3.error(
+        debugLogger2.error(
           `Permission request failed for subagent tool ${event.name}:`,
           error
         );
@@ -1429,7 +1322,7 @@ var SubAgentTracker = class {
         try {
           await event.respond("cancel" /* Cancel */);
         } catch (respondError) {
-          debugLogger3.error(
+          debugLogger2.error(
             `Failed to cancel subagent tool ${event.name} after permission request failure:`,
             respondError
           );
@@ -1527,8 +1420,8 @@ var TurnBuffer = class {
 // packages/cli/src/acp-integration/session/rewrite/LlmRewriter.ts
 init_esbuild_shims();
 import { readFileSync, existsSync } from "node:fs";
-import { resolve as resolve2 } from "node:path";
-var debugLogger4 = createDebugLogger("MESSAGE_REWRITER");
+import { resolve } from "node:path";
+var debugLogger3 = 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.
@@ -1554,14 +1447,14 @@ var LlmRewriter = class {
     this.rewriteModel = rewriteConfig.model || void 0;
     this.contextTurns = rewriteConfig.contextTurns === "all" ? Infinity : rewriteConfig.contextTurns ?? 1;
     if (rewriteConfig.promptFile) {
-      const filePath = resolve2(rewriteConfig.promptFile);
+      const filePath = resolve(rewriteConfig.promptFile);
       if (existsSync(filePath)) {
         this.prompt = readFileSync(filePath, "utf-8").trim();
-        debugLogger4.info(
+        debugLogger3.info(
           `Loaded rewrite prompt from file: ${filePath} (${this.prompt.length} chars)`
         );
       } else {
-        debugLogger4.warn(
+        debugLogger3.warn(
           `Rewrite prompt file not found: ${filePath}, using default`
         );
         this.prompt = DEFAULT_REWRITE_PROMPT;
@@ -1598,7 +1491,7 @@ var LlmRewriter = class {
     const inputText = inputParts.join("\n\n");
     if (!inputText.trim()) return null;
     if (inputText.length < 10) return null;
-    debugLogger4.info(
+    debugLogger3.info(
       `[REWRITE INPUT] system_prompt_len=${this.prompt.length} input_len=${inputText.length} context_turns=${this.outputHistory.length}
 --- INPUT TEXT ---
 ${inputText}
@@ -1627,10 +1520,10 @@ ${inputText}
       });
       const rewritten = result.text;
       if (!rewritten || rewritten.length < 5) {
-        debugLogger4.info(`[REWRITE OUTPUT] empty or too short, skipping`);
+        debugLogger3.info(`[REWRITE OUTPUT] empty or too short, skipping`);
         return null;
       }
-      debugLogger4.info(
+      debugLogger3.info(
         `[REWRITE OUTPUT] len=${rewritten.length}
 --- OUTPUT ---
 ${rewritten}
@@ -1644,7 +1537,7 @@ ${rewritten}
       }
       return rewritten;
     } catch (error) {
-      debugLogger4.warn(
+      debugLogger3.warn(
         `LLM rewrite failed, skipping: ${error instanceof Error ? error.message : String(error)}`
       );
       return null;
@@ -1653,7 +1546,7 @@ ${rewritten}
 };
 
 // packages/cli/src/acp-integration/session/rewrite/MessageRewriteMiddleware.ts
-var debugLogger5 = createDebugLogger("MESSAGE_REWRITE");
+var debugLogger4 = createDebugLogger("MESSAGE_REWRITE");
 var DEFAULT_REWRITE_TIMEOUT_MS = 3e4;
 var REWRITE_META_EXCLUDED_KEYS = /* @__PURE__ */ new Set([]);
 var MessageRewriteMiddleware = class {
@@ -1736,10 +1629,10 @@ var MessageRewriteMiddleware = class {
         try {
           const rewritten = await this.rewriter.rewrite(content, rewriteSignal);
           if (!rewritten) {
-            debugLogger5.info(`Turn ${turnIdx}: no rewrite output`);
+            debugLogger4.info(`Turn ${turnIdx}: no rewrite output`);
             return;
           }
-          debugLogger5.info(
+          debugLogger4.info(
             `Turn ${turnIdx}: rewritten ${rewritten.length} chars`
           );
           await this.sendUpdate({
@@ -1752,7 +1645,7 @@ var MessageRewriteMiddleware = class {
             }
           });
         } catch (error) {
-          debugLogger5.warn(
+          debugLogger4.warn(
             `Turn ${turnIdx}: rewrite failed: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -1961,7 +1854,8 @@ var DaemonTodoStopGuard = class {
 };
 
 // packages/cli/src/acp-integration/session/Session.ts
-var debugLogger6 = createDebugLogger("SESSION");
+var debugLogger5 = createDebugLogger("SESSION");
+var permissionRequestTails = /* @__PURE__ */ new WeakMap();
 var USER_CANCEL_ABORT_REASON = "qwen:user-cancel";
 var SESSION_DISPOSE_ABORT_REASON = "qwen:session-dispose";
 var DAEMON_RETRY_META_KEY = "qwen.daemon.retry";
@@ -1993,7 +1887,7 @@ async function finalizeToolCallPreparations(tracker, includeResolved, streamName
     await tracker.discard(includeResolved);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    debugLogger6.warn(
+    debugLogger5.warn(
       `Failed to discard tool preparations for ${streamName}; continuing stream: ${message}`
     );
   }
@@ -2025,7 +1919,7 @@ __name(createDaemonToolLoopState, "createDaemonToolLoopState");
 function recordDaemonLoopDetected(config, promptId, loopType, message, loopState) {
   if (!loopState.loopDetected) {
     loopState.loopDetected = true;
-    debugLogger6.warn(message);
+    debugLogger5.warn(message);
     logLoopDetected(config, new LoopDetectedEvent(loopType, promptId));
   }
   return true;
@@ -2094,7 +1988,7 @@ function isContentBlock(value) {
     case "resource":
       return isEmbeddedResourceResource(value["resource"]);
     default:
-      debugLogger6.warn(`Unknown ContentBlock type: ${value["type"]}`);
+      debugLogger5.warn(`Unknown ContentBlock type: ${value["type"]}`);
       return false;
   }
 }
@@ -2152,7 +2046,7 @@ function hasInlineMediaContentBlock(content) {
 __name(hasInlineMediaContentBlock, "hasInlineMediaContentBlock");
 function capMidTurnDrainItems(items, fieldName) {
   if (items.length <= MAX_MID_TURN_DRAIN_ITEMS) return items;
-  debugLogger6.warn(
+  debugLogger5.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);
@@ -2167,7 +2061,7 @@ function getMidTurnItemDisplayTextForLog(displayText) {
 __name(getMidTurnItemDisplayTextForLog, "getMidTurnItemDisplayTextForLog");
 function getValidMidTurnContentBlocks(content, displayText) {
   if (!Array.isArray(content)) {
-    debugLogger6.warn(
+    debugLogger5.warn(
       `Dropped invalid mid-turn item: ${getMidTurnItemDisplayTextForLog(
         displayText
       )}`
@@ -2177,7 +2071,7 @@ function getValidMidTurnContentBlocks(content, displayText) {
   const validBlocks = content.filter(isContentBlock);
   const invalidBlockCount = content.length - validBlocks.length;
   if (invalidBlockCount > 0) {
-    debugLogger6.warn(
+    debugLogger5.warn(
       `Dropped ${invalidBlockCount} invalid mid-turn content block(s): ${getMidTurnItemDisplayTextForLog(
         displayText
       )}`
@@ -2223,7 +2117,7 @@ function parseMidTurnDrainResponse(response) {
     );
   }
   if (!Array.isArray(response["messages"])) {
-    debugLogger6.warn(
+    debugLogger5.warn(
       `Mid-turn drain response had no recognized 'items' or 'messages' field; keys: ${Object.keys(
         response
       ).join(", ")}`
@@ -2308,21 +2202,23 @@ function parsePromptChannelDelivery(params) {
 __name(parsePromptChannelDelivery, "parsePromptChannelDelivery");
 var MAX_NOTIFICATION_QUEUE = 20;
 var MAX_DEFERRED_UNRELATED_CRON_QUEUE = 20;
-function isExistingFile(resolved, fileExists = existsSync2, statFile = statSync2) {
+function resolveExistingFile(resolved, resolveRealPath2 = realpathSync, statFile = statSync) {
   try {
-    return fileExists(resolved) && statFile(resolved).isFile();
+    const canonicalPath = resolveRealPath2(resolved);
+    const stats = statFile(canonicalPath);
+    return stats.isFile() || stats.isDirectory?.() ? canonicalPath : void 0;
   } catch {
-    return false;
+    return void 0;
   }
 }
-__name(isExistingFile, "isExistingFile");
+__name(resolveExistingFile, "resolveExistingFile");
 function resolveHomeLoopResolverRoots({
   homeQwenDir = Storage.getGlobalQwenDir(),
-  homeDir = os2.homedir(),
+  homeDir = os.homedir(),
   qwenHome = process.env["QWEN_HOME"]
 } = {}) {
   return {
-    homeConfineRoot: (qwenHome ? homeQwenDir : homeDir) || path3.dirname(homeQwenDir),
+    homeConfineRoot: (qwenHome ? homeQwenDir : homeDir) || path2.dirname(homeQwenDir),
     homeQwenDir
   };
 }
@@ -2361,7 +2257,7 @@ async function fireSessionPermissionDeniedForAutoMode(config, decision, outcome,
         callId
       );
     } catch (hookError) {
-      debugLogger6.warn(
+      debugLogger5.warn(
         `PermissionDenied hook failed for tool ${callId}: ${hookError instanceof Error ? hookError.message : String(hookError)}`
       );
     }
@@ -2491,7 +2387,7 @@ async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.
       }
     }
   } catch (error) {
-    debugLogger6.error("Error loading available skills:", error);
+    debugLogger5.error("Error loading available skills:", error);
   }
   for (const command of visibleSlashCommands) {
     if (command.kind !== "skill" /* SKILL */ || !command.skillDetail) {
@@ -2525,12 +2421,7 @@ var Session = class {
     this.runtimeBaseDir = config.storage.getRuntimeBaseDir();
     const todoStopGuardEnabled = this.settings.merged.experimental?.todoStopGuard === true && !this.config.getBareMode() && !this.config.isSafeMode();
     this.todoStopGuard = new DaemonTodoStopGuard(todoStopGuardEnabled);
-    this.todoStopGuardBackgroundBaseline = todoStopGuardEnabled ? this.#captureTodoStopGuardBackgroundBaseline() : {
-      agents: /* @__PURE__ */ new Set(),
-      shells: /* @__PURE__ */ new Set(),
-      monitors: /* @__PURE__ */ new Set(),
-      wakeups: /* @__PURE__ */ new Set()
-    };
+    this.todoStopGuardBackgroundBaseline = this.#captureTodoStopGuardBackgroundBaseline();
     this.toolCallEmitter = new ToolCallEmitter(this);
     this.planEmitter = new PlanEmitter(this);
     this.historyReplayer = new HistoryReplayer(this, {
@@ -2540,6 +2431,9 @@ var Session = class {
     this.installGoalTerminalObserver();
     this.#registerBackgroundNotificationCallbacks();
     this.#registerSubSessionSpawner();
+    this.config.getWorkflowRunRegistry?.().setApprovalRequestCallback(
+      (entry, approval, rawArgs, signal) => this.#requestWorkflowApproval(entry.runId, approval, rawArgs, signal)
+    );
   }
   static {
     __name(this, "Session");
@@ -2562,6 +2456,7 @@ var Session = class {
    */
   followupAbort = null;
   turn = 0;
+  activeTodoWorkChainPromptId;
   createdAt = Date.now();
   /**
    * Running cumulative usage for this session, snapshotted onto each todo/plan
@@ -2625,6 +2520,7 @@ var Session = class {
   closeGateCompletion = null;
   resolveCloseGate = null;
   unsubscribeChatRecordingFailure;
+  workflowApprovalAbortController = new AbortController();
   // Modular components
   historyReplayer;
   toolCallEmitter;
@@ -2650,6 +2546,106 @@ var Session = class {
   pendingRecoveredAgentsNotice = null;
   // Implement SessionContext interface
   sessionId;
+  async #requestWorkflowApproval(runId, approval, rawArgs, approvalSignal) {
+    const registry = this.config.getWorkflowRunRegistry();
+    const externalToolCallId = `workflow:${this.sessionId}:${runId}:${approval.approvalId}`;
+    const confirmationDetails = {
+      ...approval.confirmationDetails,
+      onConfirm: /* @__PURE__ */ __name(async () => {
+      }, "onConfirm")
+    };
+    const permissionOptions = toPermissionOptions(confirmationDetails, true);
+    const offeredPermissionOptions = permissionOptions.map((option) => ({
+      ...option
+    }));
+    const content = confirmationDetails.type === "edit" ? [
+      ...(confirmationDetails.warnings ?? []).map((warning) => ({
+        type: "content",
+        content: { type: "text", text: warning }
+      })),
+      ...confirmationDetails.fileDiff ? [
+        {
+          type: "content",
+          content: {
+            type: "text",
+            text: confirmationDetails.fileDiff
+          }
+        }
+      ] : []
+    ] : buildPermissionRequestContent(confirmationDetails);
+    const { title, locations, kind } = this.toolCallEmitter.resolveToolMetadata(
+      approval.name,
+      rawArgs
+    );
+    const params = {
+      sessionId: this.sessionId,
+      options: permissionOptions,
+      toolCall: {
+        toolCallId: externalToolCallId,
+        status: "pending",
+        title,
+        content,
+        locations,
+        kind,
+        rawInput: rawArgs,
+        _meta: { toolName: approval.name, workflowApproval: true }
+      }
+    };
+    const signal = AbortSignal.any([
+      this.workflowApprovalAbortController.signal,
+      approvalSignal
+    ]);
+    try {
+      const response = await this.#requestPermissionQueued(params, signal);
+      const outcome = resolvePermissionOutcome(
+        response,
+        offeredPermissionOptions
+      );
+      const resolved = await registry.resolvePendingApproval(
+        runId,
+        approval.approvalId,
+        outcome === "proceed_once" /* ProceedOnce */ ? outcome : "cancel" /* Cancel */,
+        void 0
+      );
+      await this.#finishWorkflowApprovalToolCall(
+        approval,
+        externalToolCallId,
+        resolved && outcome === "proceed_once" /* ProceedOnce */
+      );
+    } catch (error) {
+      debugLogger5.error("Workflow permission request failed:", error);
+      await registry.resolvePendingApproval(
+        runId,
+        approval.approvalId,
+        "cancel" /* Cancel */
+      );
+      await this.#finishWorkflowApprovalToolCall(
+        approval,
+        externalToolCallId,
+        false
+      );
+    }
+  }
+  async #finishWorkflowApprovalToolCall(approval, externalToolCallId, success) {
+    try {
+      await this.sendUpdate({
+        sessionUpdate: "tool_call_update",
+        toolCallId: externalToolCallId,
+        status: success ? "completed" : "failed",
+        content: [],
+        _meta: {
+          toolName: approval.name,
+          workflowApproval: true,
+          approvalOutcome: success ? "approved" : "denied"
+        }
+      });
+    } catch (error) {
+      debugLogger5.warn(
+        "Failed to finalize workflow approval tool call:",
+        error
+      );
+    }
+  }
   #prepareTodoStopGuardForPrompt(params) {
     if (!this.todoStopGuard.enabled) {
       return {
@@ -2810,7 +2806,7 @@ var Session = class {
       }
       return "unavailable";
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Todo Stop Guard continuation claim unavailable [session ${this.sessionId}]: ${this.#formatError(error)}`
       );
       return "unavailable";
@@ -2976,7 +2972,7 @@ var Session = class {
    */
   startCronScheduler() {
     this.#startCronSchedulerInRuntime().catch((error) => {
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Cron scheduler startup failed [session ${this.sessionId}]: ${error}`
       );
     });
@@ -3019,8 +3015,8 @@ var Session = class {
     }
     this.closing = true;
     let resolveGate;
-    const completion = new Promise((resolve5) => {
-      resolveGate = resolve5;
+    const completion = new Promise((resolve4) => {
+      resolveGate = resolve4;
     });
     this.closeGateCompletion = completion;
     this.resolveCloseGate = resolveGate;
@@ -3060,7 +3056,7 @@ var Session = class {
       if (pending.length > 0) {
         await Promise.allSettled(pending);
       }
-      await new Promise((resolve5) => setImmediate(resolve5));
+      await new Promise((resolve4) => setImmediate(resolve4));
     }
   }
   #deferAutomaticQueueDrainUntilTurnsSettle() {
@@ -3119,6 +3115,8 @@ var Session = class {
     this.unsubscribeChatRecordingFailure?.();
     this.unsubscribeChatRecordingFailure = void 0;
     this.config.setSubSessionSpawner(void 0);
+    this.config.getWorkflowRunRegistry?.().setApprovalRequestCallback(void 0);
+    this.workflowApprovalAbortController.abort(SESSION_DISPOSE_ABORT_REASON);
     clearGoalTerminalObserver(this.sessionId);
   }
   /**
@@ -3128,7 +3126,7 @@ var Session = class {
   installRewriter() {
     const rewriteConfig = loadRewriteConfig(this.settings);
     if (rewriteConfig?.enabled) {
-      debugLogger6.info("Message rewrite middleware enabled");
+      debugLogger5.info("Message rewrite middleware enabled");
       this.messageRewriter = new MessageRewriteMiddleware(
         this.config,
         rewriteConfig,
@@ -3147,7 +3145,7 @@ var Session = class {
   installGoalTerminalObserver() {
     setGoalTerminalObserver(this.sessionId, (event) => {
       void this.messageEmitter.emitGoalTerminal(event).catch((error) => {
-        debugLogger6.warn(
+        debugLogger5.warn(
           `Failed to emit goal terminal update: ${this.#formatError(error)}`
         );
       });
@@ -3164,7 +3162,7 @@ var Session = class {
    */
   emitGoalStatus(status) {
     void this.messageEmitter.emitGoalStatus(status).catch((error) => {
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Failed to emit goal status update: ${this.#formatError(error)}`
       );
     });
@@ -3408,8 +3406,8 @@ var Session = class {
     const channelDelivery = parsePromptChannelDelivery(params);
     const channelDeliveryCapture = channelDelivery ? { finalText: "" } : void 0;
     let resolveCompletion;
-    this.pendingPromptCompletion = new Promise((resolve5) => {
-      resolveCompletion = resolve5;
+    this.pendingPromptCompletion = new Promise((resolve4) => {
+      resolveCompletion = resolve4;
     });
     try {
       const result = await this.#executePrompt(
@@ -3529,7 +3527,7 @@ var Session = class {
         const fullHistory = chat.getHistory(true);
         const lastEntry = fullHistory[fullHistory.length - 1];
         if (!lastEntry || lastEntry.role !== "model") {
-          debugLogger6.debug(
+          debugLogger5.debug(
             "Skipping followup suggestion: last history entry is not model"
           );
           return;
@@ -3565,9 +3563,9 @@ var Session = class {
         }
       } catch (error) {
         if (ac.signal.aborted) {
-          debugLogger6.debug("Follow-up suggestion generation aborted");
+          debugLogger5.debug("Follow-up suggestion generation aborted");
         } else {
-          debugLogger6.warn("Follow-up suggestion generation failed", error);
+          debugLogger5.warn("Follow-up suggestion generation failed", error);
         }
       } finally {
         if (this.followupAbort === ac) {
@@ -3603,6 +3601,8 @@ var Session = class {
         }
         this.turn += 1;
         const promptId = this.config.getSessionId() + "########" + this.turn;
+        const promptMetadata = params._meta;
+        const continuesCurrentWorkChain = params.retry === true || promptMetadata?.[DAEMON_RETRY_META_KEY] === true || promptMetadata?.[DAEMON_CONTINUE_META_KEY] === true;
         promptIdContext.enterWith(promptId);
         const parentContext = extractDaemonTraceContext(params);
         return await withInteractionSpan(
@@ -3635,7 +3635,7 @@ var Session = class {
                 apiHistory: this.#getCurrentChat().getHistory()
               });
               if (!recoveryPlan.continuation) {
-                debugLogger6.warn(
+                debugLogger5.warn(
                   `[Session] continue ${promptId}: no interrupted turn on re-detection, nothing to continue`
                 );
                 logConversationFinishedEvent(
@@ -3727,9 +3727,20 @@ var Session = class {
               }
               const additionalContext = hookOutput?.getAdditionalContext();
               if (additionalContext) {
-                parts = [...parts, { text: additionalContext }];
+                parts = [
+                  ...parts,
+                  { text: wrapUserPromptSubmitContext(additionalContext) }
+                ];
               }
             }
+            if (!continuesCurrentWorkChain && !this.todoStopGuard.enabled) {
+              this.#resetTodoStopGuardBackgroundLineage();
+            }
+            this.config.startActiveTodoWorkChain(
+              promptId,
+              continuesCurrentWorkChain ? this.activeTodoWorkChainPromptId : void 0
+            );
+            this.activeTodoWorkChainPromptId = promptId;
             try {
               const fileHistoryService = this.config.getFileHistoryService();
               await fileHistoryService.makeSnapshot(promptId);
@@ -3739,10 +3750,10 @@ var Session = class {
                   this.config.getChatRecordingService()?.recordFileHistorySnapshot(latestSnapshot);
                 }
               } catch (e) {
-                debugLogger6.error(`FileHistory: recordSnapshot failed: ${e}`);
+                debugLogger5.error(`FileHistory: recordSnapshot failed: ${e}`);
               }
             } catch (e) {
-              debugLogger6.error(`FileHistory: makeSnapshot failed: ${e}`);
+              debugLogger5.error(`FileHistory: makeSnapshot failed: ${e}`);
             }
             const systemReminders = await this.#buildInitialSystemReminders();
             if (systemReminders.length > 0) {
@@ -3775,6 +3786,15 @@ ${this.pendingRecoveredAgentsNotice}
               parts = insertAfterFunctionResponses(parts, [noticePart]);
               this.pendingRecoveredAgentsNotice = null;
             }
+            const activeTodoReminder = this.config.takeActiveTodoReminder(
+              promptId,
+              true
+            );
+            if (activeTodoReminder && !parts.some((part) => part.text === activeTodoReminder)) {
+              parts = insertAfterFunctionResponses(parts, [
+                { text: activeTodoReminder }
+              ]);
+            }
             let nextMessage = { role: "user", parts };
             let turnCount = 0;
             const toolLoopState = createDaemonToolLoopState();
@@ -3896,7 +3916,7 @@ ${this.pendingRecoveredAgentsNotice}
                   const hooksEnabledForStopFailure = !this.config.getDisableAllHooks?.();
                   if (hooksEnabledForStopFailure && hookSystem && this.config.hasHooksForEvent?.("StopFailure")) {
                     hookSystem.fireStopFailureEvent(errorType, errorMessage).catch((err) => {
-                      debugLogger6.warn(`StopFailure hook failed: ${err}`);
+                      debugLogger5.warn(`StopFailure hook failed: ${err}`);
                     });
                   }
                   if (errorStatus === 429) {
@@ -3952,6 +3972,7 @@ ${this.pendingRecoveredAgentsNotice}
                   const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                     toolRun,
                     pendingSend.signal,
+                    promptId,
                     onFullTurnModel
                   );
                   nextMessage = nextAfterTools.message;
@@ -4203,7 +4224,7 @@ ${this.pendingRecoveredAgentsNotice}
         );
         this.todoStopGuard.suspend();
         await this.messageEmitter.emitAgentMessage(warning);
-        debugLogger6.warn(warning);
+        debugLogger5.warn(warning);
         return { stopReason: "end_turn" };
       }
       if (!externalReason && !guardContinuation) {
@@ -4632,7 +4653,7 @@ ${this.pendingRecoveredAgentsNotice}
         const hookSystem = this.config.getHookSystem?.();
         if (!this.config.getDisableAllHooks?.() && hookSystem && this.config.hasHooksForEvent?.("StopFailure")) {
           hookSystem.fireStopFailureEvent(errorType, errorMessage).catch((err) => {
-            debugLogger6.warn(`StopFailure hook failed: ${err}`);
+            debugLogger5.warn(`StopFailure hook failed: ${err}`);
           });
         }
         if (errorStatus === 429) {
@@ -4687,6 +4708,7 @@ ${this.pendingRecoveredAgentsNotice}
         const nextAfterTools = await this.#buildNextMessageAfterToolRun(
           toolRun,
           pendingSend.signal,
+          toolPromptId,
           options.onFullTurnModel
         );
         nextMessage = nextAfterTools.message;
@@ -4763,7 +4785,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
       });
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Failed to emit Todo Stop Guard status: ${this.#formatError(error)}`
       );
     }
@@ -4779,7 +4801,7 @@ ${this.pendingRecoveredAgentsNotice}
     const timer = setTimeout(() => {
       void this.client.extMethod(SERVE_CONTROL_EXT_METHODS.channelDelivery, params).catch((error) => {
         try {
-          debugLogger6.warn(
+          debugLogger5.warn(
             `Channel delivery submission failed: ${error instanceof Error ? error.message : String(error)}`
           );
         } catch {
@@ -4817,7 +4839,7 @@ ${this.pendingRecoveredAgentsNotice}
     return new MessageDisplayDispatcher(
       messageBus,
       signal,
-      (message) => debugLogger6.warn(message)
+      (message) => debugLogger5.warn(message)
     );
   }
   /**
@@ -4838,7 +4860,7 @@ ${this.pendingRecoveredAgentsNotice}
       message = decision.message;
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug(
+      debugLogger5.debug(
         `Send aborted after pre-compression preparation for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -4865,20 +4887,20 @@ ${this.pendingRecoveredAgentsNotice}
         }
       } catch (compressionError) {
         if (abortSignal.aborted) {
-          debugLogger6.debug(`Auto-compression aborted for prompt ${promptId}`);
+          debugLogger5.debug(`Auto-compression aborted for prompt ${promptId}`);
           return { responseStream: null, stopReason: "cancelled" };
         }
         if (this.#isAbortError(compressionError)) {
           throw compressionError;
         }
-        debugLogger6.warn(
+        debugLogger5.warn(
           `Auto-compression failed for prompt ${promptId}; proceeding without compression: ` + this.#formatError(compressionError)
         );
         compressionFailed = true;
       }
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug(`Auto-compression aborted for prompt ${promptId}`);
+      debugLogger5.debug(`Auto-compression aborted for prompt ${promptId}`);
       return { responseStream: null, stopReason: "cancelled" };
     }
     if (!compressionInfo) {
@@ -4888,7 +4910,7 @@ ${this.pendingRecoveredAgentsNotice}
     if (sessionTokenLimit > 0) {
       const lastPromptTokenCount = this.#getPostCompressionTokenCount(compressionInfo);
       if (lastPromptTokenCount > sessionTokenLimit) {
-        debugLogger6.warn(
+        debugLogger5.warn(
           `Session token limit exceeded for prompt ${promptId}: ${lastPromptTokenCount} > ${sessionTokenLimit}. Send dropped.`
         );
         await this.#emitAgentDiagnosticMessageSafely(
@@ -4905,7 +4927,7 @@ ${this.pendingRecoveredAgentsNotice}
       );
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug(
+      debugLogger5.debug(
         `Send aborted after compression diagnostic for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -4918,7 +4940,7 @@ ${this.pendingRecoveredAgentsNotice}
       message = decision.message;
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug(
+      debugLogger5.debug(
         `Send aborted after pre-send validation for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -4946,7 +4968,7 @@ ${this.pendingRecoveredAgentsNotice}
     ) ?? [];
     const droppedParts = (message.parts?.length ?? 0) - functionResponseParts.length;
     if (droppedParts > 0) {
-      debugLogger6.debug(
+      debugLogger5.debug(
         `Dropping ${droppedParts} non-functionResponse part(s) from unsent ACP message after send was skipped.`
       );
     }
@@ -4976,14 +4998,14 @@ ${this.pendingRecoveredAgentsNotice}
     );
     await this.messageRewriter?.waitForPendingRewrites();
   }
-  async #buildNextMessageAfterToolRun(toolRun, abortSignal, onFullTurnModel) {
+  async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, onFullTurnModel) {
     if (toolRun.loopDetected) {
-      debugLogger6.debug("Stopping ACP turn after daemon loop detection.");
+      debugLogger5.debug("Stopping ACP turn after daemon loop detection.");
       return { message: null, hadMidTurnUserInput: false };
     }
     if (toolRun.repeatedDuplicateProviderToolCall) {
       this.todoStopGuard.suspend();
-      debugLogger6.debug(
+      debugLogger5.debug(
         "Stopping ACP turn after dropping repeated duplicate provider tool-call response."
       );
       return { message: null, hadMidTurnUserInput: false };
@@ -4995,7 +5017,12 @@ ${this.pendingRecoveredAgentsNotice}
     if (hadMidTurnUserInput) {
       this.todoStopGuard.acceptMidTurnUserInput();
     }
-    const parts = [...toolRun.parts, ...drained.parts];
+    const activeTodoReminder = this.config.takeActiveTodoReminder(promptId);
+    const parts = [
+      ...toolRun.parts,
+      ...activeTodoReminder ? [{ text: activeTodoReminder }] : [],
+      ...drained.parts
+    ];
     return {
       message: { role: "user", parts },
       hadMidTurnUserInput
@@ -5068,7 +5095,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.#emitAgentDiagnosticMessage(text);
     } catch (notifyError) {
-      debugLogger6.warn(`${failureContext}: ${this.#formatError(notifyError)}`);
+      debugLogger5.warn(`${failureContext}: ${this.#formatError(notifyError)}`);
     }
   }
   async #emitAgentDiagnosticMessage(text) {
@@ -5134,7 +5161,7 @@ ${this.pendingRecoveredAgentsNotice}
       if (isPermanentError) {
         this.midTurnDrainUnavailable = true;
       }
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Mid-turn queue drain ${isPermanentError ? "permanently " : ""}unavailable [session ${this.sessionId}]: ${errorMessage}`
       );
       return {
@@ -5164,9 +5191,9 @@ ${this.pendingRecoveredAgentsNotice}
     });
     const expired = Symbol("mid-turn-recovery-expired");
     let timer;
-    const deadline = new Promise((resolve5) => {
+    const deadline = new Promise((resolve4) => {
       timer = setTimeout(
-        () => resolve5(expired),
+        () => resolve4(expired),
         MID_TURN_QUEUE_RECOVERY_TIMEOUT_MS
       );
       timer.unref?.();
@@ -5180,14 +5207,14 @@ ${this.pendingRecoveredAgentsNotice}
       clearTimeout(timer);
     }
     if (late === expired) {
-      debugLogger6.warn(
+      debugLogger5.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) {
-      debugLogger6.debug(
+      debugLogger5.debug(
         `[mid-turn] recovered ${lateMessages.length} message(s) from a timed-out drain [session ${this.sessionId}]`
       );
       this.midTurnRecoveredMessages.push(...lateMessages);
@@ -5218,7 +5245,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         if (!abortSignal.aborted) {
           const errorMessage = this.#formatError(messageError);
-          debugLogger6.warn(
+          debugLogger5.warn(
             `Failed to resolve mid-turn message: ${errorMessage}`
           );
         }
@@ -5246,7 +5273,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await scheduler.enableDurable(this.sessionId);
     } catch (err) {
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Durable cron init failed \u2014 persistent tasks will not fire in this session: ${err}`
       );
     }
@@ -5260,7 +5287,8 @@ ${this.pendingRecoveredAgentsNotice}
         source: job.cronExpr === "@wakeup" ? "loop" : "cron",
         ...job.id ? { taskId: job.id } : {},
         ...job.lastFiredAt !== void 0 ? { firedAt: job.lastFiredAt } : {},
-        ...job.delivery ? { delivery: job.delivery } : {}
+        ...job.delivery ? { delivery: job.delivery } : {},
+        ...job.todoWorkChainId ? { todoWorkChainId: job.todoWorkChainId } : {}
       });
       void this.#drainCronQueue();
     });
@@ -5308,7 +5336,7 @@ ${this.pendingRecoveredAgentsNotice}
         unrelatedCount--;
       }
       if (evictedTaskIds.length > 0) {
-        debugLogger6.warn(
+        debugLogger5.warn(
           `Cron queue overflow while automatic work is deferred: evicted ${evictedTaskIds.length} unrelated task(s): ${evictedTaskIds.join(", ")}`
         );
       }
@@ -5331,7 +5359,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.assertCanStartTurn();
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Cron turn rejected [session ${this.sessionId}]: ${error instanceof Error ? error.message : String(error)}`
       );
       return;
@@ -5342,8 +5370,8 @@ ${this.pendingRecoveredAgentsNotice}
     if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
     this.cronProcessing = true;
     let resolveCompletion;
-    this.cronCompletion = new Promise((resolve5) => {
-      resolveCompletion = resolve5;
+    this.cronCompletion = new Promise((resolve4) => {
+      resolveCompletion = resolve4;
     });
     try {
       while (this.cronQueue.length > 0) {
@@ -5416,9 +5444,8 @@ ${this.pendingRecoveredAgentsNotice}
       async () => {
         const ac = new AbortController();
         this.cronAbortController = ac;
-        this.#prepareTodoStopGuardForAutomaticTurn(
-          this.#cronContinuesTodoStopGuardWorkChain(item)
-        );
+        const continuesCurrentWorkChain = this.#cronContinuesTodoStopGuardWorkChain(item);
+        this.#prepareTodoStopGuardForAutomaticTurn(continuesCurrentWorkChain);
         const promptId = this.config.getSessionId() + "########cron" + Date.now();
         let cronHadError = false;
         let cronCompleted = false;
@@ -5435,6 +5462,10 @@ ${this.pendingRecoveredAgentsNotice}
             try {
               await this.assertCanStartTurn();
               if (ac.signal.aborted) return;
+              this.config.startAutomaticActiveTodoWorkChain(
+                promptId,
+                item.todoWorkChainId
+              );
               const loopMode = detectLoopSentinel(prompt);
               const autonomousMode = loopMode ? null : detectAutonomousSentinel(prompt);
               let loopTick = null;
@@ -5445,7 +5476,7 @@ ${this.pendingRecoveredAgentsNotice}
                   loopTick = await resolver.resolve(loopMode, trustedAtResolve);
                 } catch (resolveErr) {
                   const code = resolveErr.code ?? "unknown";
-                  debugLogger6.warn(
+                  debugLogger5.warn(
                     `loop.md sentinel resolution failed (mode=${loopMode}, code=${code}) \u2014 check .qwen/loop.md permissions/IO`,
                     resolveErr
                   );
@@ -5468,7 +5499,7 @@ ${this.pendingRecoveredAgentsNotice}
               }
               const modelText = loopTick ? loopTick.modelText : prompt;
               if (loopTick) {
-                debugLogger6.debug(
+                debugLogger5.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}`
                 );
               }
@@ -5489,9 +5520,17 @@ ${this.pendingRecoveredAgentsNotice}
                 _meta: { source: item.source }
               });
               const cronReminders = await this.#buildInitialSystemReminders();
+              const activeTodoReminder = this.config.takeActiveTodoReminder(
+                promptId,
+                true
+              );
               let nextMessage = {
                 role: "user",
-                parts: [...cronReminders, { text: modelText }]
+                parts: [
+                  ...cronReminders,
+                  ...activeTodoReminder ? [{ text: activeTodoReminder }] : [],
+                  { text: modelText }
+                ]
               };
               const toolLoopState = createDaemonToolLoopState();
               while (nextMessage !== null) {
@@ -5623,7 +5662,8 @@ ${this.pendingRecoveredAgentsNotice}
                   }
                   const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                     toolRun,
-                    ac.signal
+                    ac.signal,
+                    promptId
                   );
                   nextMessage = nextAfterTools.message;
                   if (toolRun.loopDetected) {
@@ -5657,12 +5697,13 @@ ${this.pendingRecoveredAgentsNotice}
               }
               this.todoStopGuard.pauseForTrustedRetry();
               cronHadError = true;
-              debugLogger6.error("Error processing cron prompt:", error);
+              debugLogger5.error("Error processing cron prompt:", error);
               const msg = error instanceof Error ? error.message : String(error);
               await this.messageEmitter.emitAgentMessage(
                 `[${item.source} error] ${msg}`
               );
             } finally {
+              this.config.endAutomaticActiveTodoWorkChain(promptId);
               if (this.cronAbortController === ac) {
                 this.cronAbortController = null;
               }
@@ -5715,7 +5756,8 @@ ${this.pendingRecoveredAgentsNotice}
           status: meta.status,
           kind: "agent",
           continuesTodoStopGuardWorkChain: this.#agentContinuesTodoStopGuardWorkChain(meta.agentId),
-          toolUseId: meta.toolUseId
+          toolUseId: meta.toolUseId,
+          todoWorkChainId: meta.todoWorkChainId
         });
       }
     );
@@ -5734,7 +5776,8 @@ ${this.pendingRecoveredAgentsNotice}
           meta.monitorId,
           meta.ownerAgentId
         ),
-        toolUseId: meta.toolUseId
+        toolUseId: meta.toolUseId,
+        todoWorkChainId: meta.todoWorkChainId
       });
     });
     const shellRegistry = this.config.getBackgroundShellRegistry();
@@ -5745,7 +5788,8 @@ ${this.pendingRecoveredAgentsNotice}
         taskId: meta.shellId,
         status: meta.status,
         kind: "shell",
-        continuesTodoStopGuardWorkChain: !this.todoStopGuardBackgroundBaseline.shells.has(meta.shellId)
+        continuesTodoStopGuardWorkChain: !this.todoStopGuardBackgroundBaseline.shells.has(meta.shellId),
+        todoWorkChainId: meta.todoWorkChainId
       });
     });
     this.config.getChatRecordingService()?.setTitleRecordedCallback((customTitle, titleSource, sessionId) => {
@@ -5779,20 +5823,20 @@ ${this.pendingRecoveredAgentsNotice}
           (queued) => !this.#notificationContinuesTodoStopGuardWorkChain(queued)
         );
         if (evictedIndex < 0 && !incomingIsRelated) {
-          debugLogger6.warn(
+          debugLogger5.warn(
             `Notification queue overflow: dropping unrelated task=${item.taskId} kind=${item.kind} while automatic work is deferred`
           );
           return;
         }
         if (evictedIndex < 0) {
-          debugLogger6.warn(
+          debugLogger5.warn(
             `Notification queue overflow: dropping related task=${item.taskId} kind=${item.kind} because all queued items are related`
           );
           return;
         }
       }
       const [evicted] = this.notificationQueue.splice(evictedIndex, 1);
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Notification queue overflow: evicting task=${evicted?.taskId ?? "unknown"} kind=${evicted?.kind ?? "unknown"}`
       );
     }
@@ -5812,7 +5856,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.assertCanStartTurn();
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger5.warn(
         `Notification turn rejected [session ${this.sessionId}]: ${error instanceof Error ? error.message : String(error)}`
       );
       return;
@@ -5823,8 +5867,8 @@ ${this.pendingRecoveredAgentsNotice}
     if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
     this.notificationProcessing = true;
     let resolveCompletion;
-    this.notificationCompletion = new Promise((resolve5) => {
-      resolveCompletion = resolve5;
+    this.notificationCompletion = new Promise((resolve4) => {
+      resolveCompletion = resolve4;
     });
     try {
       while (this.notificationQueue.length > 0) {
@@ -5868,13 +5912,16 @@ ${this.pendingRecoveredAgentsNotice}
       async () => {
         const ac = new AbortController();
         this.notificationAbortController = ac;
-        this.#prepareTodoStopGuardForAutomaticTurn(
-          this.#notificationContinuesTodoStopGuardWorkChain(item)
-        );
+        const continuesCurrentWorkChain = this.#notificationContinuesTodoStopGuardWorkChain(item);
+        this.#prepareTodoStopGuardForAutomaticTurn(continuesCurrentWorkChain);
         const promptId = this.config.getSessionId() + "########notification" + Date.now();
         try {
           await this.assertCanStartTurn();
           if (ac.signal.aborted) return;
+          this.config.startAutomaticActiveTodoWorkChain(
+            promptId,
+            item.todoWorkChainId
+          );
           await this.#emitBackgroundNotificationDisplay(item);
           const notificationParts = [{ text: item.modelText }];
           this.config.getChatRecordingService()?.recordNotification(notificationParts, item.displayText, {
@@ -5884,9 +5931,17 @@ ${this.pendingRecoveredAgentsNotice}
             toolUseId: item.toolUseId
           });
           const notificationReminders = await this.#buildInitialSystemReminders();
+          const activeTodoReminder = this.config.takeActiveTodoReminder(
+            promptId,
+            true
+          );
           let nextMessage = {
             role: "user",
-            parts: [...notificationReminders, ...notificationParts]
+            parts: [
+              ...notificationReminders,
+              ...activeTodoReminder ? [{ text: activeTodoReminder }] : [],
+              ...notificationParts
+            ]
           };
           const toolLoopState = createDaemonToolLoopState();
           while (nextMessage !== null) {
@@ -6016,7 +6071,8 @@ ${this.pendingRecoveredAgentsNotice}
               }
               const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                 toolRun,
-                ac.signal
+                ac.signal,
+                promptId
               );
               nextMessage = nextAfterTools.message;
               if (toolRun.loopDetected) {
@@ -6052,14 +6108,14 @@ ${this.pendingRecoveredAgentsNotice}
             return;
           }
           this.todoStopGuard.pauseForTrustedRetry();
-          debugLogger6.error("Error processing background notification:", error);
+          debugLogger5.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) {
-            debugLogger6.error(
+            debugLogger5.error(
               "Failed to emit background notification error:",
               emitError
             );
@@ -6067,6 +6123,7 @@ ${this.pendingRecoveredAgentsNotice}
             await this.#emitBackgroundNotificationEndTurn("end_turn");
           }
         } finally {
+          this.config.endAutomaticActiveTodoWorkChain(promptId);
           if (this.notificationAbortController === ac) {
             this.notificationAbortController = null;
           }
@@ -6119,7 +6176,7 @@ ${this.pendingRecoveredAgentsNotice}
         source: "background_notification"
       });
     } catch (error) {
-      debugLogger6.debug(
+      debugLogger5.debug(
         `Background notification end-turn extNotification dropped: ${this.#formatError(error)}`
       );
     }
@@ -6128,11 +6185,13 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.sendAvailableCommandsUpdateOrThrow();
     } catch (error) {
-      debugLogger6.error("Error sending available commands update:", error);
+      debugLogger5.error("Error sending available commands update:", error);
     }
   }
-  async refreshSkillsFromSettings() {
-    this.settings.reloadScopeFromDisk("Workspace" /* Workspace */);
+  async refreshSkillsFromSettings(options = {}) {
+    if (options.reloadSettings ?? true) {
+      this.reloadSkillSettings();
+    }
     const skillManager = this.config.getSkillManager();
     let updateFailed = false;
     let updateError;
@@ -6142,13 +6201,13 @@ ${this.pendingRecoveredAgentsNotice}
       updateFailed = true;
       updateError = error;
     }
-    if (skillManager) {
+    if (skillManager && (options.notifyConfigChanged ?? true)) {
       try {
         skillManager.suppressNextSlashReload();
         await skillManager.notifyConfigChanged();
       } catch (error) {
         if (!updateFailed) throw error;
-        debugLogger6.error(
+        debugLogger5.error(
           "SkillManager refresh failed after command update failure:",
           error
         );
@@ -6156,6 +6215,9 @@ ${this.pendingRecoveredAgentsNotice}
     }
     if (updateFailed) throw updateError;
   }
+  reloadSkillSettings() {
+    this.settings.reloadScopeFromDisk("Workspace" /* Workspace */);
+  }
   async sendAvailableCommandsUpdateOrThrow() {
     const { availableCommands, availableSkills, availableSkillDetails } = await buildAvailableCommandsSnapshot(
       this.config,
@@ -6181,6 +6243,32 @@ ${this.pendingRecoveredAgentsNotice}
   async requestPermission(params) {
     return this.client.requestPermission(params);
   }
+  #requestPermissionQueued(params, signal) {
+    const prior = permissionRequestTails.get(this.client) ?? Promise.resolve();
+    const transportRequest = prior.then(
+      () => signal.aborted ? requestPermissionWithAbort(this.client, params, signal) : this.client.requestPermission(params)
+    );
+    let abortListener;
+    const tail = Promise.race([
+      transportRequest.then(
+        () => void 0,
+        () => void 0
+      ),
+      new Promise((resolve4) => {
+        if (signal.aborted) return resolve4();
+        abortListener = /* @__PURE__ */ __name(() => resolve4(), "abortListener");
+        signal.addEventListener("abort", abortListener, { once: true });
+      })
+    ]).finally(() => {
+      if (abortListener) signal.removeEventListener("abort", abortListener);
+    });
+    permissionRequestTails.set(this.client, tail);
+    return requestPermissionWithAbort(
+      { requestPermission: /* @__PURE__ */ __name(() => transportRequest, "requestPermission") },
+      params,
+      signal
+    );
+  }
   /**
    * Sets the approval mode for the current session.
    * Maps ACP approval mode values to core ApprovalMode enum.
@@ -6209,7 +6297,7 @@ ${this.pendingRecoveredAgentsNotice}
       sessionId: this.sessionId,
       currentModeId: params.modeId
     }).catch((error) => {
-      debugLogger6.debug("mode-update extNotification failed", error);
+      debugLogger5.debug("mode-update extNotification failed", error);
     });
   }
   /**
@@ -6265,7 +6353,7 @@ ${this.pendingRecoveredAgentsNotice}
       sessionId: this.sessionId,
       currentModelId: currentAcpModelId
     }).catch((error) => {
-      debugLogger6.debug("model-update extNotification failed", error);
+      debugLogger5.debug("model-update extNotification failed", error);
     });
     if (options.persistDefault ?? true) {
       const persistScope = getPersistScopeForModelSelection(this.settings);
@@ -6312,7 +6400,7 @@ ${this.pendingRecoveredAgentsNotice}
       await this.sendUpdate(update);
       legacyFrameSent = true;
     } catch (error) {
-      debugLogger6.debug("current_mode_update notification failed", error);
+      debugLogger5.debug("current_mode_update notification failed", error);
     }
     try {
       await this.client.extNotification("qwen/notify/session/mode-update", {
@@ -6322,7 +6410,7 @@ ${this.pendingRecoveredAgentsNotice}
         legacyFrameSent
       });
     } catch (error) {
-      debugLogger6.debug("mode-update extNotification failed", error);
+      debugLogger5.debug("mode-update extNotification failed", error);
     }
   }
   /**
@@ -6336,6 +6424,10 @@ ${this.pendingRecoveredAgentsNotice}
    * on. Response-part ordering matches the original `functionCalls` order.
    */
   async runToolCalls(abortSignal, promptId, functionCalls, toolLoopState, onFullTurnModel) {
+    promptIdContext.enterWith(promptId);
+    todoWorkChainContext.enterWith(
+      this.config.getActiveTodoWorkChainOwner(promptId)
+    );
     const dedupedFunctionCalls = dedupeToolCallsById(functionCalls);
     const generatedCallIdBase = randomUUID();
     const executionCallIds = new Map(
@@ -6410,7 +6502,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         await this.toolCallEmitter.emitError(callId, toolName, error);
       } catch (recordError) {
-        debugLogger6.error("Failed to record skipped tool call:", recordError);
+        debugLogger5.error("Failed to record skipped tool call:", recordError);
       }
       return part;
     }, "recordSkippedToolCall");
@@ -6442,7 +6534,7 @@ ${this.pendingRecoveredAgentsNotice}
     );
     if (repeatedDuplicateCall) {
       const providerCallId = getProviderToolCallId(repeatedDuplicateCall) ?? repeatedDuplicateCall.id;
-      debugLogger6.debug(
+      debugLogger5.debug(
         `[Session.runToolCalls] Dropping batch after repeated duplicate provider tool-call id: ${providerCallId} (tool: ${repeatedDuplicateCall.name ?? "unknown_tool"})`
       );
       return await finalizeRunToolResult({
@@ -6458,7 +6550,7 @@ ${this.pendingRecoveredAgentsNotice}
         this.duplicateProviderToolCallResponseIds
       );
       const response = createDuplicateProviderToolCallResponse(request);
-      debugLogger6.debug(
+      debugLogger5.debug(
         `[Session.runToolCalls] Suppressing duplicate provider tool-call id: ${providerCallId} (tool: ${request.name})`
       );
       batches.push({ kind: "duplicate", fc, request, response });
@@ -6907,10 +6999,10 @@ ${this.pendingRecoveredAgentsNotice}
         responseParts: errorParts,
         metadata: {
           callId,
-          status: "error",
+          status: opts?.status ?? "error",
           resultDisplay: void 0,
           error,
-          errorType: void 0
+          errorType: opts?.errorType
         }
       });
       const loopDetected = opts?.recordInvalidToolParams === true && !activeToolAbortSignal.aborted && !opts?.stopAfterPermissionCancel && recordDaemonInvalidToolParams(
@@ -7012,7 +7104,8 @@ ${this.pendingRecoveredAgentsNotice}
                 nestedPermissionCancelled = true;
                 agentToolAbortController?.abort(USER_CANCEL_ABORT_REASON);
                 onStopAfterPermissionCancel?.();
-              }
+              },
+              (params, signal) => this.#requestPermissionQueued(params, signal)
             );
             subAgentCleanupFunctions = subSubAgentTracker.setup(
               taskEventEmitter,
@@ -7090,7 +7183,7 @@ ${this.pendingRecoveredAgentsNotice}
             forceAutoReviewForAllow
           );
           if (finalPermission === "allow" && forceAutoReviewForAllow) {
-            debugLogger6.info(
+            debugLogger5.info(
               `Auto mode: L4 allow overridden by protected-write guard for ${policyToolName}`
             );
           }
@@ -7134,7 +7227,7 @@ ${this.pendingRecoveredAgentsNotice}
                 autoModeAllowed = true;
                 break;
               case "blocked":
-                debugLogger6.warn(
+                debugLogger5.warn(
                   `Auto mode blocked (${outcome.reason}): tool=${policyToolName}, ` + formatDenialStateLog(denialState)
                 );
                 return earlyErrorResponse(
@@ -7145,7 +7238,7 @@ ${this.pendingRecoveredAgentsNotice}
                 wasAutoModeManualFallback = isDenialFallbackReason(outcome.reason) || outcome.reason === "classifier_unavailable";
                 autoModeFallbackMessage = outcome.message;
                 if (wasAutoModeManualFallback) {
-                  debugLogger6.warn(
+                  debugLogger5.warn(
                     `Auto mode fallback to manual approval (${outcome.reason}): ` + formatDenialStateLog(denialState)
                   );
                 }
@@ -7163,12 +7256,12 @@ ${this.pendingRecoveredAgentsNotice}
               const before = this.config.getAutoModeDenialState();
               const after = recordFallbackApprove(before);
               if (after === before) {
-                debugLogger6.warn(
+                debugLogger5.warn(
                   `Auto mode denial counters already clear after fallback approval: ` + formatDenialStateLog(before)
                 );
                 return;
               }
-              debugLogger6.warn(
+              debugLogger5.warn(
                 `Auto mode denial counters reset after fallback approval: ${formatDenialStateLog(before)} -> ${formatDenialStateLog(after)}`
               );
               this.config.setAutoModeDenialState(after);
@@ -7365,8 +7458,7 @@ ${this.pendingRecoveredAgentsNotice}
               let output;
               let outcome;
               try {
-                output = await requestPermissionWithAbort(
-                  this.client,
+                output = await this.#requestPermissionQueued(
                   params,
                   activeToolAbortSignal
                 );
@@ -7375,7 +7467,7 @@ ${this.pendingRecoveredAgentsNotice}
                   offeredPermissionOptions
                 );
               } catch (error) {
-                debugLogger6.error(
+                debugLogger5.error(
                   `Permission request failed for tool ${toolName}:`,
                   error
                 );
@@ -7384,7 +7476,7 @@ ${this.pendingRecoveredAgentsNotice}
                     "cancel" /* Cancel */
                   );
                 } catch (confirmError) {
-                  debugLogger6.error(
+                  debugLogger5.error(
                     `Failed to cancel tool ${toolName} after permission request failure:`,
                     confirmError
                   );
@@ -7431,7 +7523,7 @@ ${this.pendingRecoveredAgentsNotice}
                 if (outcome !== "cancel" /* Cancel */) {
                   throw error;
                 }
-                debugLogger6.error(
+                debugLogger5.error(
                   `Failed to confirm cancellation for tool ${toolName}:`,
                   error
                 );
@@ -7508,11 +7600,37 @@ ${this.pendingRecoveredAgentsNotice}
               return earlyErrorResponse(new Error(blockReason), toolName);
             }
             if (preHookResult.additionalContext) {
-              debugLogger6.debug(
+              debugLogger5.debug(
                 `PreToolUse hook additional context for ${toolName}: ${preHookResult.additionalContext}`
               );
             }
           }
+          const toolInvocationGuard = this.config.getToolInvocationGuard?.();
+          if (toolInvocationGuard) {
+            const guardDecision = await evaluateToolInvocationGuard(
+              toolInvocationGuard,
+              {
+                callId,
+                toolName: policyToolName,
+                args: invocation.params,
+                signal: activeToolAbortSignal
+              }
+            );
+            if (activeToolAbortSignal.aborted) {
+              return earlyErrorResponse(
+                new Error("Tool invocation was cancelled"),
+                toolName,
+                { status: "cancelled" }
+              );
+            }
+            if (!guardDecision.allowed) {
+              return earlyErrorResponse(
+                new Error(guardDecision.reason),
+                toolName,
+                { errorType: "execution_denied" /* EXECUTION_DENIED */ }
+              );
+            }
+          }
           const continuedAgentId = toolName === ToolNames.SEND_MESSAGE && typeof args["task_id"] === "string" && args["task_id"].length > 0 ? args["task_id"] : void 0;
           const provisionalRelatedAgent = continuedAgentId !== void 0 && !this.relatedAgentIds.has(continuedAgentId);
           if (provisionalRelatedAgent) {
@@ -7559,7 +7677,7 @@ ${this.pendingRecoveredAgentsNotice}
               status: "in_progress",
               _meta: { toolName, shellProgress: chunk }
             }).catch((err) => {
-              debugLogger6.debug(
+              debugLogger5.debug(
                 `[Session.runTool] heartbeat update failed for ${callId}: ${err}`
               );
             });
@@ -7585,7 +7703,7 @@ ${this.pendingRecoveredAgentsNotice}
                   invocation.params
                 );
               } catch {
-                debugLogger6.debug(
+                debugLogger5.debug(
                   "[Session.runTool] Failed to record tool arguments telemetry"
                 );
               }
@@ -7660,7 +7778,7 @@ ${this.pendingRecoveredAgentsNotice}
             );
             if (postHookResult.shouldStop) {
               const stopMessage = postHookResult.stopReason || "Execution stopped by PostToolUse hook";
-              debugLogger6.info(
+              debugLogger5.info(
                 `PostToolUse hook requested stop for ${toolName}: ${stopMessage}`
               );
               this.todoStopGuard.suspend();
@@ -7690,7 +7808,7 @@ ${this.pendingRecoveredAgentsNotice}
               callId
             );
             if (failureHookResult.additionalContext) {
-              debugLogger6.debug(
+              debugLogger5.debug(
                 `PostToolUseFailure hook additional context for ${toolName}: ${failureHookResult.additionalContext}`
               );
             }
@@ -7770,7 +7888,7 @@ ${this.pendingRecoveredAgentsNotice}
               try {
                 addToolCallResultAttributes(this.config, toolSpan, result);
               } catch {
-                debugLogger6.debug(
+                debugLogger5.debug(
                   "[Session.runTool] Failed to record tool result telemetry"
                 );
               }
@@ -7812,7 +7930,7 @@ ${this.pendingRecoveredAgentsNotice}
               callId
             );
             if (failureHookResult.additionalContext) {
-              debugLogger6.debug(
+              debugLogger5.debug(
                 `PostToolUseFailure hook additional context for ${toolName}: ${failureHookResult.additionalContext}`
               );
             }
@@ -7962,7 +8080,7 @@ ${this.pendingRecoveredAgentsNotice}
     const embeddedContext = [];
     const extensionMentions = /* @__PURE__ */ new Map();
     const mcpServerMentions = /* @__PURE__ */ new Map();
-    const textPathSpecsToRead = /* @__PURE__ */ new Set();
+    const textPathSpecsToRead = /* @__PURE__ */ new Map();
     const preserveUnsupportedImageForBridge = shouldRunVisionBridge(
       this.config
     );
@@ -7972,13 +8090,16 @@ ${this.pendingRecoveredAgentsNotice}
           collectExtensionMentionRefs(part.text, extensionMentions);
           collectMcpServerMentionRefs(part.text, mcpServerMentions);
           for (const pathSpec of extractAtPathCommands(part.text)) {
-            const resolved = path3.resolve(
+            if (!path2.isAbsolute(pathSpec)) continue;
+            const resolved = path2.resolve(
               this.config.getProjectRoot(),
               pathSpec
             );
-            const filteringOptions = this.config.getFileFilteringOptions();
-            if (path3.isAbsolute(pathSpec) && getSpecificMimeType(resolved)?.startsWith("image/") && isExistingFile(resolved) && this.config.getWorkspaceContext().isPathWithinWorkspace(pathSpec) && !this.config.getFileService().shouldIgnoreFile(pathSpec, filteringOptions)) {
-              textPathSpecsToRead.add(pathSpec);
+            const canonicalPath = resolveExistingFile(resolved);
+            if (!canonicalPath) continue;
+            const filteringOptions2 = this.config.getFileFilteringOptions();
+            if (getSpecificMimeType(canonicalPath)?.startsWith("image/") && this.config.getWorkspaceContext().isPathWithinWorkspace(canonicalPath) && !this.config.getFileService().shouldIgnoreFile(pathSpec, filteringOptions2) && !this.config.getFileService().shouldIgnoreFile(canonicalPath, filteringOptions2)) {
+              textPathSpecsToRead.set(canonicalPath, pathSpec);
             }
           }
           return { text: part.text };
@@ -8028,34 +8149,62 @@ ${this.pendingRecoveredAgentsNotice}
       }
     });
     const atPathCommandParts = parts.filter((part) => "fileData" in part);
-    const pathSpecsToRead = [
-      .../* @__PURE__ */ new Set([
-        ...textPathSpecsToRead,
-        ...atPathCommandParts.map((part) => part.fileData.fileUri)
-      ])
-    ];
     const extensionParts = await this.#resolveExtensionMentionParts(
       extensionMentions,
       abortSignal
     );
     const mcpServerParts = this.#resolveMcpServerMentionParts(mcpServerMentions);
+    const revalidatedTextPaths = [];
+    const validatedPathIdentities = /* @__PURE__ */ new Map();
+    const candidatePathsToRead = [
+      ...textPathSpecsToRead.entries(),
+      ...atPathCommandParts.flatMap((part) => {
+        const fileUri = part.fileData.fileUri;
+        const resolved = path2.resolve(this.config.getTargetDir(), fileUri);
+        const canonicalPath = resolveExistingFile(resolved);
+        return canonicalPath ? [[canonicalPath, fileUri]] : [];
+      })
+    ];
+    const filteringOptions = candidatePathsToRead.length > 0 ? this.config.getFileFilteringOptions() : void 0;
+    const displayPaths = /* @__PURE__ */ new Map();
+    const acceptedFileUris = /* @__PURE__ */ new Set();
+    for (const [textPath, displayPath] of candidatePathsToRead) {
+      try {
+        if (resolveExistingFile(textPath) !== textPath || !this.config.getWorkspaceContext().isPathWithinWorkspace(textPath) || textPathSpecsToRead.has(textPath) && !getSpecificMimeType(textPath)?.startsWith("image/") || this.config.getFileService().shouldIgnoreFile(displayPath, filteringOptions) || this.config.getFileService().shouldIgnoreFile(textPath, filteringOptions)) {
+          continue;
+        }
+        const stats = statSync(textPath);
+        revalidatedTextPaths.push(textPath);
+        displayPaths.set(textPath, displayPath);
+        acceptedFileUris.add(displayPath);
+        validatedPathIdentities.set(textPath, {
+          dev: stats.dev,
+          ino: stats.ino
+        });
+      } catch {
+      }
+    }
+    const pathSpecsToRead = [...new Set(revalidatedTextPaths)];
+    const partsToSend = parts.filter(
+      (part) => !("fileData" in part) || acceptedFileUris.has(part.fileData.fileUri)
+    );
     if (pathSpecsToRead.length === 0 && embeddedContext.length === 0 && extensionParts.length === 0 && mcpServerParts.length === 0) {
       return this.#applyBridgeConversionsIfNeeded(
-        parts,
+        partsToSend,
         abortSignal,
         options.onFullTurnModel
       );
     }
     if (pathSpecsToRead.length === 0 && embeddedContext.length === 0) {
       return this.#applyBridgeConversionsIfNeeded(
-        [...parts, ...extensionParts, ...mcpServerParts],
+        [...partsToSend, ...extensionParts, ...mcpServerParts],
         abortSignal,
         options.onFullTurnModel
       );
     }
     let initialQueryText = "";
-    for (let i = 0; i < parts.length; i++) {
-      const chunk = parts[i];
+    for (let i = 0; i < partsToSend.length; i++) {
+      const chunk = partsToSend[i];
       if ("text" in chunk) {
         initialQueryText += chunk.text;
       } else if ("fileData" in chunk) {
@@ -8071,7 +8220,9 @@ ${this.pendingRecoveredAgentsNotice}
       const readResult = await readManyFiles(this.config, {
         paths: pathSpecsToRead,
         signal: abortSignal,
-        ...preserveUnsupportedImageForBridge ? { preserveUnsupportedImageForBridge } : {}
+        ...preserveUnsupportedImageForBridge ? { preserveUnsupportedImageForBridge } : {},
+        ...validatedPathIdentities.size > 0 ? { validatedPathIdentities } : {},
+        ...displayPaths.size > 0 ? { displayPaths } : {}
       });
       const contentParts = Array.isArray(readResult.contentParts) ? readResult.contentParts : [readResult.contentParts];
       for (const part of contentParts) {
@@ -8135,7 +8286,7 @@ ${contextPart.text}`
             formatFullTurnVisionNotice(fullTurnModel)
           );
         } catch (error) {
-          debugLogger6.debug(
+          debugLogger5.debug(
             `full-turn vision: failed to emit notice; continuing error=${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -8144,19 +8295,19 @@ ${contextPart.text}`
     }
     let bridgeResult;
     try {
-      debugLogger6.debug("vision bridge: gate matched, running conversion");
+      debugLogger5.debug("vision bridge: gate matched, running conversion");
       bridgeResult = await runVisionBridge({
         config: this.config,
         parts,
         signal: abortSignal
       });
     } catch (error) {
-      debugLogger6.debug(
+      debugLogger5.debug(
         `vision bridge: failed before replacement; falling back to text-only parts error=${String(error instanceof Error ? error.message : error)}`
       );
       return splitImageParts(parts).nonImageParts;
     }
-    debugLogger6.debug(
+    debugLogger5.debug(
       `vision bridge: status=${bridgeResult.status} applied=${bridgeResult.applied} model=${bridgeResult.modelId ?? "(none)"}${bridgeResult.error ? ` error=${bridgeResult.error}` : ""}`
     );
     if (bridgeResult.status !== "skipped" || bridgeResult.egressOccurred) {
@@ -8165,13 +8316,13 @@ ${contextPart.text}`
           formatVisionBridgeNotice(bridgeResult)
         );
       } catch (error) {
-        debugLogger6.debug(
+        debugLogger5.debug(
           `vision bridge: failed to emit notice; continuing with bridge result error=${String(error instanceof Error ? error.message : error)}`
         );
       }
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug("vision bridge: turn aborted after bridge returned");
+      debugLogger5.debug("vision bridge: turn aborted after bridge returned");
       return splitImageParts(parts).nonImageParts;
     }
     if (bridgeResult.applied && bridgeResult.parts != null) {
@@ -8185,7 +8336,7 @@ ${contextPart.text}`
     }
     const voiceModel = readVoiceModel(this.settings);
     if (!voiceModel) {
-      debugLogger6.debug(
+      debugLogger5.debug(
         "voice bridge: no voice model configured; replacing audio with note"
       );
       return parts.map(
@@ -8204,14 +8355,14 @@ ${contextPart.text}`
       }
       const inlineData = part.inlineData;
       if (approxBase64Bytes(inlineData.data) > MAX_AUDIO_BYTES) {
-        debugLogger6.debug(
+        debugLogger5.debug(
           "voice bridge: audio too large; replacing audio with note"
         );
         converted.push({ text: buildVoiceUnavailableBlock("audio too large") });
         continue;
       }
       try {
-        debugLogger6.debug(`voice bridge: transcribing audio via ${voiceModel}`);
+        debugLogger5.debug(`voice bridge: transcribing audio via ${voiceModel}`);
         const transcript = (await transcribeVoiceAudio(
           {
             data: new Uint8Array(Buffer2.from(inlineData.data, "base64")),
@@ -8228,7 +8379,7 @@ ${contextPart.text}`
           }
         )).trim();
         if (abortSignal.aborted) {
-          debugLogger6.debug("voice bridge: turn aborted after transcription");
+          debugLogger5.debug("voice bridge: turn aborted after transcription");
           return converted;
         }
         if (transcript.length > 0) {
@@ -8241,10 +8392,10 @@ ${contextPart.text}`
         });
       } catch (error) {
         if (abortSignal.aborted) {
-          debugLogger6.debug("voice bridge: transcription cancelled");
+          debugLogger5.debug("voice bridge: transcription cancelled");
           return converted;
         }
-        debugLogger6.debug(
+        debugLogger5.debug(
           `voice bridge: transcription failed; replacing audio with note error=${sanitizeVoiceErrorMessage(String(error instanceof Error ? error.message : error))}`
         );
         converted.push({
@@ -8258,7 +8409,7 @@ ${contextPart.text}`
           transcribedCount > 0 ? this.#formatVoiceBridgeNotice(voiceModel, transcribedCount) : this.#formatVoiceBridgeEgressNotice(voiceModel, egressCount)
         );
       } catch (error) {
-        debugLogger6.debug(
+        debugLogger5.debug(
           `voice bridge: failed to emit notice; continuing with bridge result error=${String(error instanceof Error ? error.message : error)}`
         );
       }
@@ -8319,7 +8470,7 @@ ${contextPart.text}`
   }
   debug(msg) {
     if (this.config.getDebugMode()) {
-      debugLogger6.warn(msg);
+      debugLogger5.warn(msg);
     }
   }
   async emitHookArtifactsNotification(args) {
@@ -8359,7 +8510,7 @@ ${contextPart.text}`
         }
       );
     }).catch((err) => {
-      debugLogger6.debug(
+      debugLogger5.debug(
         `ACP terminalSequence notification dropped (session=${this.sessionId}): ${err instanceof Error ? err.message : String(err)}`
       );
     });
@@ -8477,7 +8628,7 @@ function runWithAcpRuntimeOutputDir(settings, cwd, fn) {
 __name(runWithAcpRuntimeOutputDir, "runWithAcpRuntimeOutputDir");
 
 // packages/cli/src/acp-integration/acpAgent.ts
-var debugLogger7 = createDebugLogger("ACP_AGENT");
+var debugLogger6 = 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;
@@ -8612,10 +8763,10 @@ async function beginSessionCloseAfterCurrentGate(session, timeoutMs) {
   }
 }
 __name(beginSessionCloseAfterCurrentGate, "beginSessionCloseAfterCurrentGate");
-var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger7);
+var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger6);
 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));
+  return raw.split(path3.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0 && path3.isAbsolute(entry));
 }
 __name(parseAcpLocalReadRootsEnv, "parseAcpLocalReadRootsEnv");
 function defaultAcpOnlyLocalReadRoots() {
@@ -8628,8 +8779,8 @@ function buildAcpLocalReadRoots(config) {
     // 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"),
-    path4.join(config.getSessionRuntimeBaseDir(), "tmp"),
+    path3.join(config.storage.getProjectDir(), "subagents"),
+    path3.join(config.getSessionRuntimeBaseDir(), "tmp"),
     getAutoMemoryRoot(config.getTargetDir()),
     getUserAutoMemoryRoot(),
     ...config.storage.getUserSkillsDirs(),
@@ -8688,6 +8839,38 @@ function isBulkLoadReplayRequest(params) {
   return meta?.[LOAD_REPLAY_MODE_META_KEY] === LOAD_REPLAY_BULK_MODE;
 }
 __name(isBulkLoadReplayRequest, "isBulkLoadReplayRequest");
+function shouldHideInheritedHistory(params) {
+  const meta = isObjectRecord(params._meta) ? params._meta : void 0;
+  return meta?.[LOAD_REPLAY_HIDE_INHERITED_META_KEY] === true;
+}
+__name(shouldHideInheritedHistory, "shouldHideInheritedHistory");
+function selectVisibleHistoryRecords(records, hideInheritedHistory) {
+  const sourceBoundary = records.findIndex(
+    (record) => record.type === "system" && record.subtype === "session_source" && isObjectRecord(record.systemPayload) && record.systemPayload["sourceType"] === "side_task"
+  );
+  if (sourceBoundary >= 0) {
+    return records.slice(sourceBoundary).filter((record) => record.forkedFrom === void 0);
+  }
+  return hideInheritedHistory ? records.filter((record) => record.forkedFrom === void 0) : records;
+}
+__name(selectVisibleHistoryRecords, "selectVisibleHistoryRecords");
+function getSessionSource(params) {
+  const meta = isObjectRecord(params._meta) ? params._meta : void 0;
+  const value = meta?.[SESSION_SOURCE_META_KEY];
+  if (!isObjectRecord(value) || typeof value["sourceType"] !== "string") {
+    return void 0;
+  }
+  return {
+    sourceType: value["sourceType"],
+    ...typeof value["sourceId"] === "string" ? { sourceId: value["sourceId"] } : {}
+  };
+}
+__name(getSessionSource, "getSessionSource");
+function shouldDeferMcpDiscovery(params) {
+  const meta = isObjectRecord(params._meta) ? params._meta : void 0;
+  return meta?.[WORKTREE_MCP_DEFER_META_KEY] === true;
+}
+__name(shouldDeferMcpDiscovery, "shouldDeferMcpDiscovery");
 function getLoadReplayPageSize(params) {
   const meta = isObjectRecord(params._meta) ? params._meta : void 0;
   const value = meta?.[LOAD_REPLAY_PAGE_SIZE_META_KEY];
@@ -8863,7 +9046,7 @@ function readRequiredString(value, fieldName) {
 }
 __name(readRequiredString, "readRequiredString");
 function validateSkillSlug(slug) {
-  if (!slug || slug === "." || slug === ".." || slug.includes("/") || slug.includes(path4.sep) || !/^[a-zA-Z0-9._-]+$/.test(slug)) {
+  if (!slug || slug === "." || slug === ".." || slug.includes("/") || slug.includes(path3.sep) || !/^[a-zA-Z0-9._-]+$/.test(slug)) {
     throw RequestError.invalidParams(void 0, "Invalid skill.slug");
   }
 }
@@ -9332,7 +9515,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 ? path4.posix.join(relativeRoot, name) : name;
+    const relativePath = relativeRoot ? path3.posix.join(relativeRoot, name) : name;
     if (type === "dir") {
       files.push(
         ...await downloadGitHubSkillDirectoryFromApi(
@@ -9379,7 +9562,7 @@ async function downloadGitHubSkillDirectory(githubUrl, directoryPath) {
     githubUrl,
     directoryPath
   ).catch((error) => {
-    debugLogger7.warn(
+    debugLogger6.warn(
       "GitHub API directory listing failed, falling back to archive download:",
       error
     );
@@ -9392,10 +9575,10 @@ __name(downloadGitHubSkillDirectory, "downloadGitHubSkillDirectory");
 async function downloadSkill(sourceUrl) {
   assertAllowedSkillSourceUrl(sourceUrl);
   const githubUrl = parseGitHubBlobSkillUrl(sourceUrl);
-  if (!githubUrl || path4.posix.basename(githubUrl.filePath) !== "SKILL.md") {
+  if (!githubUrl || path3.posix.basename(githubUrl.filePath) !== "SKILL.md") {
     return downloadSingleSkillFile(sourceUrl);
   }
-  const skillDirectory = path4.posix.dirname(githubUrl.filePath);
+  const skillDirectory = path3.posix.dirname(githubUrl.filePath);
   const files = await downloadGitHubSkillDirectory(githubUrl, skillDirectory);
   const skillFile = files.find((file) => file.relativePath === "SKILL.md");
   if (!skillFile) {
@@ -9411,9 +9594,9 @@ async function downloadSkill(sourceUrl) {
 }
 __name(downloadSkill, "downloadSkill");
 function resolveSkillInstallPath(skillDir, relativePath) {
-  const root = path4.resolve(skillDir);
-  const target = path4.resolve(skillDir, relativePath);
-  if (target !== root && !target.startsWith(root + path4.sep)) {
+  const root = path3.resolve(skillDir);
+  const target = path3.resolve(skillDir, relativePath);
+  if (target !== root && !target.startsWith(root + path3.sep)) {
     throw RequestError.invalidParams(
       void 0,
       `Invalid skill file path: ${relativePath}`
@@ -9423,9 +9606,9 @@ function resolveSkillInstallPath(skillDir, relativePath) {
 }
 __name(resolveSkillInstallPath, "resolveSkillInstallPath");
 function resolveManagedSkillDir(skillsBaseDir, slug) {
-  const root = path4.resolve(skillsBaseDir);
-  const skillDir = path4.resolve(skillsBaseDir, slug);
-  if (!skillDir.startsWith(root + path4.sep)) {
+  const root = path3.resolve(skillsBaseDir);
+  const skillDir = path3.resolve(skillsBaseDir, slug);
+  if (!skillDir.startsWith(root + path3.sep)) {
     throw RequestError.invalidParams(void 0, "Invalid skill.slug");
   }
   return skillDir;
@@ -9945,7 +10128,7 @@ function readMcpServers(source, scope) {
       const server = toMcpServerConfig(value);
       return server ? { name, scope, server: redactMcpServerSecrets(server) } : void 0;
     } catch (error) {
-      debugLogger7.warn(
+      debugLogger6.warn(
         `Skipping malformed MCP server config [${scope}:${name}]:`,
         error
       );
@@ -10041,7 +10224,7 @@ function readHooks(source, scope, extensionName) {
           extensionName
         });
       } catch (error) {
-        debugLogger7.warn(
+        debugLogger6.warn(
           `Skipping malformed hook entry [${scope}:${event}:${index}]:`,
           error
         );
@@ -10066,14 +10249,14 @@ function readScopeSettings(settings, scope) {
 __name(readScopeSettings, "readScopeSettings");
 async function resolvePreferredMemoryFile(dir, fallbackFilename) {
   for (const filename of getAllGeminiMdFilenames()) {
-    const filePath = path4.join(dir, filename);
+    const filePath = path3.join(dir, filename);
     try {
-      await fs2.access(filePath);
+      await fs.access(filePath);
       return filePath;
     } catch {
     }
   }
-  return path4.join(dir, fallbackFilename);
+  return path3.join(dir, fallbackFilename);
 }
 __name(resolvePreferredMemoryFile, "resolvePreferredMemoryFile");
 async function resolveQwenMemoryPaths(params) {
@@ -10233,6 +10416,7 @@ async function runAcpAgent(config, settings, argv, options) {
 `);
   }
   const eventLoopMonitor = startEventLoopLagMonitor({
+    suspendThresholdMs: ACP_EVENT_LOOP_STALL_RESTART_MS,
     onNewMaxStall: /* @__PURE__ */ __name((maxMs) => {
       console.error(`[perf] acp agent event loop stall: max=${maxMs}ms`);
     }, "onNewMaxStall")
@@ -10266,7 +10450,7 @@ async function runAcpAgent(config, settings, argv, options) {
             void preloadContentGenerator(
               session.getConfig().getContentGenerator()
             ).catch((error) => {
-              debugLogger7.debug(
+              debugLogger6.debug(
                 `[ACP] Session provider preload failed for ${sessionId}: ${error instanceof Error ? error.message : String(error)}`
               );
             });
@@ -10305,7 +10489,7 @@ async function runAcpAgent(config, settings, argv, options) {
     try {
       await agentInstance.shutdownMcpPool(8e3);
     } catch (err) {
-      debugLogger7.error(`[ACP] MCP pool drain (${label}) error:`, err);
+      debugLogger6.error(`[ACP] MCP pool drain (${label}) error:`, err);
       if (strict) throw err;
     }
   }, "drainPoolBeforeExit");
@@ -10338,7 +10522,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await hookSystem.fireSessionEndEvent(reason);
       } catch (err) {
         if (managedConfigs) failures.push(err);
-        debugLogger7.warn(
+        debugLogger6.warn(
           `SessionEnd hook failed: ${err instanceof Error ? err.message : String(err)}`
         );
       }
@@ -10362,13 +10546,13 @@ async function runAcpAgent(config, settings, argv, options) {
         await terminal.writerShutdown;
       } catch (error) {
         failures.push(error);
-        debugLogger7.error("[ACP] Managed writer shutdown error:", error);
+        debugLogger6.error("[ACP] Managed writer shutdown error:", error);
         const retainedLockPaths = terminal.configs.flatMap((config2) => {
           if (typeof config2.getSessionRuntimeBaseDir !== "function" || typeof config2.getSessionId !== "function") {
             return [];
           }
           return [
-            path4.join(
+            path3.join(
               config2.getSessionRuntimeBaseDir(),
               "tmp",
               "session-writer-locks",
@@ -10389,7 +10573,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await agent.finishManagedShutdown(terminal.configs);
       } catch (error) {
         failures.push(error);
-        debugLogger7.error("[ACP] Managed resource shutdown error:", error);
+        debugLogger6.error("[ACP] Managed resource shutdown error:", error);
       }
       try {
         await drainPoolBeforeExit(label, true);
@@ -10400,7 +10584,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await runExitCleanup();
       } catch (error) {
         failures.push(error);
-        debugLogger7.error("[ACP] Cleanup error:", error);
+        debugLogger6.error("[ACP] Cleanup error:", error);
       }
       if (failures.length > 0) {
         throw new AggregateError(failures, "Managed ACP shutdown failed");
@@ -10411,14 +10595,14 @@ async function runAcpAgent(config, settings, argv, options) {
   const shutdownHandler = /* @__PURE__ */ __name(async () => {
     if (shuttingDown) return;
     shuttingDown = true;
-    debugLogger7.debug("[ACP] Shutdown signal received, closing streams");
+    debugLogger6.debug("[ACP] Shutdown signal received, closing streams");
     if (agentInstance?.isTrustedManagedParent()) {
       let exitCode = 0;
       try {
         await shutdownManagedAgent("other" /* Other */, "signal");
       } catch (err) {
         exitCode = 1;
-        debugLogger7.error("[ACP] Managed shutdown error:", err);
+        debugLogger6.error("[ACP] Managed shutdown error:", err);
       } finally {
         eventLoopMonitor.dispose();
       }
@@ -10443,12 +10627,12 @@ async function runAcpAgent(config, settings, argv, options) {
       }
       await drainPoolBeforeExit("signal");
     } catch (err) {
-      debugLogger7.error("[ACP] Shutdown error:", err);
+      debugLogger6.error("[ACP] Shutdown error:", err);
     } finally {
       eventLoopMonitor.dispose();
     }
     runExitCleanup().catch((err) => {
-      debugLogger7.error("[ACP] Cleanup error:", err);
+      debugLogger6.error("[ACP] Cleanup error:", err);
     }).finally(() => {
       process.exit(0);
     });
@@ -10629,6 +10813,7 @@ var QwenAgent = class {
   workspaceMcpDiscoveryConfig;
   workspaceMcpDiscoveryPromise;
   workspaceMcpDiscoveryError;
+  workspaceExtensionStatusRefreshPromise;
   pendingMcpAuthentications = /* @__PURE__ */ new Map();
   mcpAuthenticationResults = /* @__PURE__ */ new Map();
   generationControllers = /* @__PURE__ */ new Map();
@@ -10644,7 +10829,7 @@ var QwenAgent = class {
   // 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;
+  childCpuCoreCount = os2.availableParallelism?.() ?? os2.cpus().length ?? 1;
   prevChildCpu = (() => {
     try {
       return process.cpuUsage();
@@ -10702,12 +10887,12 @@ var QwenAgent = class {
       try {
         session.beginCloseIfAvailable();
       } catch (error) {
-        debugLogger7.debug(
+        debugLogger6.debug(
           `Session ${session.getId()} admission close during managed shutdown failed: ${error instanceof Error ? error.message : String(error)}`
         );
       }
       void session.cancelPendingPrompt().catch((error) => {
-        debugLogger7.debug(
+        debugLogger6.debug(
           `Session ${session.getId()} cancel during managed shutdown failed: ${error instanceof Error ? error.message : String(error)}`
         );
       });
@@ -10720,7 +10905,7 @@ var QwenAgent = class {
     const writerTerminals = [];
     for (const config of configList) {
       try {
-        writerTerminals.push(config.closeSessionWriter());
+        writerTerminals.push(config.closeSessionWriter({ handoff: true }));
       } catch (error) {
         writerTerminals.push(Promise.reject(error));
       }
@@ -10772,6 +10957,39 @@ var QwenAgent = class {
     }
     return this.workspaceMcpDiscoveryConfig ?? this.config;
   }
+  refreshBootstrapExtensionStatus() {
+    if (this.workspaceExtensionStatusRefreshPromise) {
+      return this.workspaceExtensionStatusRefreshPromise;
+    }
+    const promise = (async () => {
+      const errors = [];
+      try {
+        await this.config.getExtensionManager().refreshCache();
+      } catch (error) {
+        errors.push(error);
+      }
+      try {
+        await this.config.getSkillManager()?.refreshCache();
+      } catch (error) {
+        errors.push(error);
+      }
+      if (errors.length === 1) throw errors[0];
+      if (errors.length > 1) {
+        throw new AggregateError(
+          errors,
+          "Bootstrap extension status refresh failed"
+        );
+      }
+    })();
+    this.workspaceExtensionStatusRefreshPromise = promise;
+    const clear = /* @__PURE__ */ __name(() => {
+      if (this.workspaceExtensionStatusRefreshPromise === promise) {
+        this.workspaceExtensionStatusRefreshPromise = void 0;
+      }
+    }, "clear");
+    void promise.then(clear, clear);
+    return promise;
+  }
   getLiveMcpConfigs(serverName) {
     return [
       .../* @__PURE__ */ new Set([
@@ -10822,7 +11040,7 @@ var QwenAgent = class {
       await run();
     }).catch((err) => {
       this.workspaceMcpDiscoveryError = err instanceof Error ? err.message : String(err);
-      debugLogger7.error(
+      debugLogger6.error(
         `Workspace MCP ${label} failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }).finally(() => {
@@ -11009,7 +11227,7 @@ var QwenAgent = class {
     try {
       const result = await this.mcpPool.drainAll({ force: true, timeoutMs });
       if (result.forced > 0 || result.errors.length > 0) {
-        debugLogger7.warn(
+        debugLogger6.warn(
           `MCP pool drain: ${result.drained} clean, ${result.forced} timed out, ${result.errors.length} errors`
         );
         throw new Error(
@@ -11017,7 +11235,7 @@ var QwenAgent = class {
         );
       }
     } catch (err) {
-      debugLogger7.error(
+      debugLogger6.error(
         `MCP pool drainAll failed: ${err instanceof Error ? err.message : String(err)}`
       );
       throw err;
@@ -11054,7 +11272,7 @@ var QwenAgent = class {
     }
     this.sessions.delete(sessionId);
     if (cleanupErrors.length > 0) {
-      debugLogger7.warn(
+      debugLogger6.warn(
         `Session ${sessionId} closed after ${cleanupErrors.length} cleanup failure(s): ${cleanupErrors.map(
           (error) => error instanceof Error ? error.message : String(error)
         ).join("; ")}`
@@ -11108,21 +11326,21 @@ var QwenAgent = class {
     try {
       await cleanup();
     } catch (cleanupError) {
-      debugLogger7.warn(
+      debugLogger6.warn(
         `Session cleanup failed while preserving the original request error: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`
       );
     }
     throw mapSessionWriterRequestError(error);
   }
   pendingConfigCleanupKey(runtimeBaseDir, sessionId) {
-    return `${path4.resolve(runtimeBaseDir)}\0${sessionId}`;
+    return `${path3.resolve(runtimeBaseDir)}\0${sessionId}`;
   }
   async retryPendingConfigCleanup(runtimeBaseDir, requiredSessionId) {
-    const resolvedRuntimeBaseDir = path4.resolve(runtimeBaseDir);
+    const resolvedRuntimeBaseDir = path3.resolve(runtimeBaseDir);
     const configs = /* @__PURE__ */ new Set();
     for (const pending of this.pendingConfigCleanup.values()) {
       for (const config of pending) {
-        if (path4.resolve(config.getSessionRuntimeBaseDir()) === resolvedRuntimeBaseDir) {
+        if (path3.resolve(config.getSessionRuntimeBaseDir()) === resolvedRuntimeBaseDir) {
           configs.add(config);
         }
       }
@@ -11132,7 +11350,7 @@ var QwenAgent = class {
         await this.cleanupUnstoredConfig(config);
       } catch (error) {
         if (config.getSessionId() === requiredSessionId) throw error;
-        debugLogger7.warn(
+        debugLogger6.warn(
           `Deferred Config cleanup retry failed for session ${config.getSessionId()}: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -11163,7 +11381,7 @@ var QwenAgent = class {
           try {
             await session.cancelPendingPrompt();
           } catch (err) {
-            debugLogger7.debug(
+            debugLogger6.debug(
               `Session ${sessionId} cancel during close failed: ${err instanceof Error ? err.message : String(err)}`
             );
           }
@@ -11233,7 +11451,7 @@ var QwenAgent = class {
     return runWithAcpRuntimeOutputDir(settings, cwd, operation);
   }
   async assertLiveSessionScope(config, settings, cwd) {
-    if (path4.resolve(config.storage.getProjectRoot()) !== path4.resolve(cwd)) {
+    if (path3.resolve(config.storage.getProjectRoot()) !== path3.resolve(cwd)) {
       throw RequestError.invalidParams(
         void 0,
         "The live session belongs to another workspace."
@@ -11244,7 +11462,7 @@ var QwenAgent = class {
       cwd,
       () => Storage.getRuntimeBaseDir()
     );
-    if (path4.resolve(config.getSessionRuntimeBaseDir()) !== path4.resolve(requestedRuntimeBaseDir)) {
+    if (path3.resolve(config.getSessionRuntimeBaseDir()) !== path3.resolve(requestedRuntimeBaseDir)) {
       throw mapSessionWriterRequestError(new SessionWriterUnavailableError());
     }
   }
@@ -11267,7 +11485,7 @@ var QwenAgent = class {
         scope: "workspace",
         ...event
       }).catch((err) => {
-        debugLogger7.debug(
+        debugLogger6.debug(
           `MCP workspace budget event delivery to session ${sid} failed (kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
         );
       });
@@ -11302,7 +11520,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.1";
+    const version = "0.21.2-nightly.20260801.bc382c3ff";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -11376,6 +11594,8 @@ var QwenAgent = class {
   }
   async newSession(params) {
     const { cwd, mcpServers } = params;
+    const requestedSessionId = typeof params._meta?.[REQUESTED_SESSION_ID_META_KEY] === "string" ? params._meta[REQUESTED_SESSION_ID_META_KEY] : void 0;
+    const sessionSource = getSessionSource(params);
     const parentContext = extractDaemonTraceContext(params);
     return await withDaemonSpan(
       "qwen-code.daemon.session_start",
@@ -11389,7 +11609,15 @@ var QwenAgent = class {
         this.settings = settings;
         const config = await profiler.time(
           "config_setup",
-          () => this.newSessionConfig(cwd, mcpServers, settings)
+          () => this.newSessionConfig(
+            cwd,
+            mcpServers,
+            settings,
+            sessionSource,
+            requestedSessionId,
+            void 0,
+            shouldDeferMcpDiscovery(params) ? { skipMcpDiscovery: true } : void 0
+          )
         );
         let session;
         try {
@@ -11421,6 +11649,7 @@ var QwenAgent = class {
     );
   }
   async loadSession(params) {
+    const sessionSource = getSessionSource(params);
     const settings = loadSettingsCached(params.cwd);
     const liveSession = this.sessions.get(params.sessionId);
     if (liveSession) {
@@ -11437,16 +11666,23 @@ var QwenAgent = class {
             ...sessionData2.artifactSnapshot ? { artifactSnapshot: sessionData2.artifactSnapshot } : {}
           };
           const records = sessionData2.conversation.messages;
-          if (records.length === 0) return response2;
+          const visibleRecords = selectVisibleHistoryRecords(
+            records,
+            shouldHideInheritedHistory(params)
+          );
+          if (visibleRecords.length === 0) return response2;
           const bulkReplay2 = isBulkLoadReplayRequest(params);
-          const replayPage = bulkReplay2 ? selectRecentHistoryRecords(records, getLoadReplayPageSize(params)) : { records, hasMore: false };
+          const replayPage = bulkReplay2 ? selectRecentHistoryRecords(
+            visibleRecords,
+            getLoadReplayPageSize(params)
+          ) : { records: visibleRecords, hasMore: false };
           const replay = await collectHistoryReplayUpdates({
             sessionId: params.sessionId,
             config: config2,
             records: replayPage.records,
             gaps: sessionData2.historyGaps,
             cumulativeUsage: createReplayCumulativeUsage(),
-            logger: debugLogger7
+            logger: debugLogger6
           });
           if (!bulkReplay2) {
             for (const update of replay.updates) {
@@ -11491,6 +11727,7 @@ var QwenAgent = class {
       // a `null`/`undefined` would otherwise throw `TypeError`.
       params.mcpServers ?? [],
       settings,
+      sessionSource,
       params.sessionId,
       true
     );
@@ -11509,8 +11746,12 @@ var QwenAgent = class {
             let replayUpdates = [];
             if (records) {
               createdSession.primeTurnFromHistory(records);
-              const replayPage = selectRecentHistoryRecords(
+              const visibleRecords = selectVisibleHistoryRecords(
                 records,
+                shouldHideInheritedHistory(params)
+              );
+              const replayPage = selectRecentHistoryRecords(
+                visibleRecords,
                 replayPageSize
               );
               const replayUsage = createReplayCumulativeUsage();
@@ -11521,7 +11762,7 @@ var QwenAgent = class {
                 gaps: sessionData?.historyGaps,
                 cumulativeUsage: replayUsage,
                 supersedeUnrestorableGoal: true,
-                logger: debugLogger7
+                logger: debugLogger6
               });
               replayUpdates = replay.updates;
               copyCumulativeUsage(createdSession.cumulativeUsage, replayUsage);
@@ -11577,6 +11818,7 @@ var QwenAgent = class {
     };
   }
   async unstable_resumeSession(params) {
+    const sessionSource = getSessionSource(params);
     const settings = loadSettingsCached(params.cwd);
     const liveSession = this.sessions.get(params.sessionId);
     if (liveSession) {
@@ -11609,6 +11851,7 @@ var QwenAgent = class {
       params.cwd,
       params.mcpServers ?? [],
       settings,
+      sessionSource,
       params.sessionId,
       true
     );
@@ -11660,7 +11903,7 @@ var QwenAgent = class {
         session.pendingWorktreeNotice = restored.contextMessage;
       }
     } catch (error) {
-      debugLogger7.warn(`ACP worktree restore failed: ${error}`);
+      debugLogger6.warn(`ACP worktree restore failed: ${error}`);
     }
   }
   async #restoreBackgroundAgentsOnResume(config, session) {
@@ -11693,7 +11936,7 @@ var QwenAgent = class {
         config
       );
       if (restored.restored) {
-        debugLogger7.info(
+        debugLogger6.info(
           `ACP goal restored sessionId=${config.getSessionId()} condition=${restored.condition}`
         );
       } else if (restored.blockedBy && restored.blockedBy !== "condition-invalid") {
@@ -11821,8 +12064,8 @@ var QwenAgent = class {
     }, "settleCall");
     const call = {
       controller: new AbortController(),
-      settled: new Promise((resolve5) => {
-        settleCall = resolve5;
+      settled: new Promise((resolve4) => {
+        settleCall = resolve4;
       })
     };
     let calls = this.activePromptCalls.get(params.sessionId);
@@ -11876,7 +12119,7 @@ var QwenAgent = class {
       await extensionManager.refreshCache();
       extensions = extensionManager.getLoadedExtensions();
     } catch (error) {
-      debugLogger7.warn(
+      debugLogger6.warn(
         "Extension loading failed, continuing without extensions:",
         error
       );
@@ -12002,7 +12245,7 @@ var QwenAgent = class {
             pm.addPersistentRule(rule, ruleType);
           }
         } catch (error) {
-          debugLogger7.warn(
+          debugLogger6.warn(
             `Failed to sync permission rules to a live session: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -12535,23 +12778,56 @@ var QwenAgent = class {
       ...inferred ? { errorKind: inferred } : {}
     };
   }
+  /**
+   * Keeps the extension-derived half of the skill snapshot self-healing.
+   *
+   * Skills have a watcher (`SkillManager.startWatching`); extensions do not, so
+   * without this the child would never notice an extension installed, removed,
+   * enabled, or disabled outside the daemon — and extension-level skills are
+   * derived from that set, so a skill-watcher tick alone cannot recover it.
+   *
+   * The check is one `readdir` plus a bounded number of `stat`s, and refreshes
+   * only when the sources actually moved, so a steady-state read still parses
+   * no manifest and no `SKILL.md`. Failures are logged and swallowed: a status
+   * read must not fail because revalidation could not run.
+   *
+   * Skipped in safe and bare mode. Those modes deliberately never populate the
+   * extension cache (`Config.initialize` omits the refresh), and the snapshot
+   * derives extension skills from `getExtensions()` — so revalidating here
+   * would load the extensions those modes exist to exclude.
+   */
+  async revalidateExtensionSources(config) {
+    try {
+      if (config.isSafeMode() || config.getBareMode()) return;
+      const changed = await config.getExtensionManager().refreshCacheIfSourcesChanged();
+      if (!changed) return;
+      await config.getSkillManager()?.refreshCache();
+    } catch (error) {
+      debugLogger6.warn("Extension source revalidation failed:", error);
+    }
+  }
   async buildWorkspaceSkillsStatus(config) {
     const skillManager = config.getSkillManager();
     if (!skillManager) {
       return {
         v: STATUS_SCHEMA_VERSION,
         workspaceCwd: this.workspaceCwd(config),
-        initialized: true,
+        initialized: false,
         skills: []
       };
     }
+    await this.revalidateExtensionSources(config);
     try {
-      const resolved = resolveSkillSettings(
-        loadSettings(this.workspaceCwd(config), {
-          consumeCorruptionEnvVars: false,
-          skipLoadEnvironment: true
-        })
-      );
+      const skills = skillManager.getCachedSkills();
+      if (skills === null) {
+        return {
+          v: STATUS_SCHEMA_VERSION,
+          workspaceCwd: this.workspaceCwd(config),
+          initialized: false,
+          skills: []
+        };
+      }
+      const resolved = resolveSkillSettings(this.settings);
       const disablements = new Map(
         Array.from(config.getDisabledSkillNames(), (name) => {
           const normalizedName = name.trim().toLowerCase();
@@ -12561,17 +12837,6 @@ var QwenAgent = class {
           ];
         })
       );
-      try {
-        await config.getExtensionManager().refreshCache();
-      } catch (error) {
-        debugLogger7.warn("Extension cache refresh failed:", error);
-      }
-      try {
-        await skillManager.refreshCache();
-      } catch (error) {
-        debugLogger7.warn("Skill cache refresh failed:", error);
-      }
-      const skills = await skillManager.listSkills();
       const inactiveSkillRefs = inactiveExtensionSkillRefs(config);
       const skillsByKey = new Map(
         skills.map((skill) => [
@@ -13427,9 +13692,9 @@ var QwenAgent = class {
       );
     }
     const download = await downloadSkill(request.sourceUrl);
-    const skillsBaseDir = path4.join(Storage.getGlobalQwenDir(), "skills");
+    const skillsBaseDir = path3.join(Storage.getGlobalQwenDir(), "skills");
     const skillDir = resolveManagedSkillDir(skillsBaseDir, request.slug);
-    const skillFile = path4.join(skillDir, "SKILL.md");
+    const skillFile = path3.join(skillDir, "SKILL.md");
     const parsed = skillManager.parseSkillContent(
       download.skillContent,
       skillFile,
@@ -13443,19 +13708,19 @@ var QwenAgent = class {
     }
     const stagingDir = `${skillDir}.installing-${process.pid}-${Date.now()}`;
     try {
-      await fs2.rm(stagingDir, { recursive: true, force: true });
+      await fs.rm(stagingDir, { recursive: true, force: true });
       for (const file of download.files) {
         const targetPath = resolveSkillInstallPath(
           stagingDir,
           file.relativePath
         );
-        await fs2.mkdir(path4.dirname(targetPath), { recursive: true });
-        await fs2.writeFile(targetPath, file.content);
+        await fs.mkdir(path3.dirname(targetPath), { recursive: true });
+        await fs.writeFile(targetPath, file.content);
       }
-      await fs2.rm(skillDir, { recursive: true, force: true });
-      await fs2.rename(stagingDir, skillDir);
+      await fs.rm(skillDir, { recursive: true, force: true });
+      await fs.rename(stagingDir, skillDir);
     } catch (error) {
-      await fs2.rm(stagingDir, { recursive: true, force: true }).catch(() => {
+      await fs.rm(stagingDir, { recursive: true, force: true }).catch(() => {
       });
       throw error;
     }
@@ -13488,17 +13753,17 @@ var QwenAgent = class {
         `Skill name "${parsed.name}" does not match requested slug "${request.slug}"`
       );
     }
-    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) {
+    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) {
       throw RequestError.invalidParams(
         void 0,
         `Refusing to delete unexpected skill directory: ${skillDir}`
       );
     }
-    await fs2.rm(skillDir, { recursive: true, force: true });
+    await fs.rm(skillDir, { recursive: true, force: true });
     await skillManager.refreshCache();
     return {
       slug: request.slug,
@@ -13508,11 +13773,11 @@ var QwenAgent = class {
   async readManagedSkillFile(slug, scope, skillManager, cwd) {
     if (scope === "global") {
       const qwenSkillDir = resolveManagedSkillDir(
-        path4.join(Storage.getGlobalQwenDir(), "skills"),
+        path3.join(Storage.getGlobalQwenDir(), "skills"),
         slug
       );
-      const qwenSkillFile = path4.join(qwenSkillDir, "SKILL.md");
-      const qwenContent = await fs2.readFile(qwenSkillFile, "utf8").catch(() => void 0);
+      const qwenSkillFile = path3.join(qwenSkillDir, "SKILL.md");
+      const qwenContent = await fs.readFile(qwenSkillFile, "utf8").catch(() => void 0);
       if (qwenContent !== void 0) {
         return {
           skillDir: qwenSkillDir,
@@ -13540,34 +13805,34 @@ var QwenAgent = class {
         `${scope === "project" ? "Project" : "Global"} skill not found: ${slug}`
       );
     }
-    const content = await fs2.readFile(skillFile, "utf8").catch(() => {
+    const content = await fs.readFile(skillFile, "utf8").catch(() => {
       throw RequestError.invalidParams(
         void 0,
         `${scope === "project" ? "Project" : "Global"} skill not found: ${slug}`
       );
     });
     return {
-      skillDir: path4.dirname(skillFile),
+      skillDir: path3.dirname(skillFile),
       skillFile,
       content
     };
   }
   async findProjectSkillFileFromCwd(slug, cwd, skillManager) {
-    const projectRoot = path4.resolve(cwd);
+    const projectRoot = path3.resolve(cwd);
     for (const configDir of PROJECT_SKILL_DIRS) {
-      const baseDir = path4.join(projectRoot, configDir, SKILLS_DIR);
+      const baseDir = path3.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 fs2.readFile(skillFile, "utf8").catch(() => {
+      const content = await fs.readFile(skillFile, "utf8").catch(() => {
         throw RequestError.invalidParams(
           void 0,
           `Project skill not found: ${slug}`
         );
       });
       return {
-        skillDir: path4.dirname(skillFile),
+        skillDir: path3.dirname(skillFile),
         skillFile,
         content
       };
@@ -13598,13 +13863,13 @@ var QwenAgent = class {
     }
     const nextContent = setSkillFrontmatterEnabled(content, request.enabled);
     skillManager.parseSkillContent(nextContent, skillFile, level);
-    if (path4.basename(skillFile) !== "SKILL.md") {
+    if (path3.basename(skillFile) !== "SKILL.md") {
       throw RequestError.invalidParams(
         void 0,
         `Refusing to write to unexpected skill file: ${skillFile}`
       );
     }
-    await fs2.writeFile(skillFile, nextContent, "utf8");
+    await fs.writeFile(skillFile, nextContent, "utf8");
     await skillManager.refreshCache();
     return {
       slug: request.slug,
@@ -13977,7 +14242,7 @@ var QwenAgent = class {
               page,
               config,
               encodeCursor: /* @__PURE__ */ __name((state) => encodeSessionTranscriptCursor(state, cwd), "encodeCursor"),
-              logger: debugLogger7
+              logger: debugLogger6
             });
             return {
               v: 1,
@@ -14170,7 +14435,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "remember_timeout";
-            debugLogger7.error("Workspace memory remember timed out:", {
+            debugLogger6.error("Workspace memory remember timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -14182,7 +14447,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger7.error("Workspace memory remember failed:", {
+          debugLogger6.error("Workspace memory remember failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -14256,7 +14521,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "forget_timeout";
-            debugLogger7.error("Workspace memory forget timed out:", {
+            debugLogger6.error("Workspace memory forget timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -14268,7 +14533,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger7.error("Workspace memory forget failed:", {
+          debugLogger6.error("Workspace memory forget failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -14333,7 +14598,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "dream_timeout";
-            debugLogger7.error("Workspace memory dream timed out:", {
+            debugLogger6.error("Workspace memory dream timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -14345,7 +14610,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger7.error("Workspace memory dream failed:", {
+          debugLogger6.error("Workspace memory dream failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -14696,10 +14961,10 @@ var QwenAgent = class {
           let resolveStarted;
           let rejectStarted;
           let startedTimer;
-          const started = new Promise((resolve5, reject) => {
+          const started = new Promise((resolve4, reject) => {
             resolveStarted = /* @__PURE__ */ __name((value) => {
               clearTimeout(startedTimer);
-              resolve5(value);
+              resolve4(value);
             }, "resolveStarted");
             rejectStarted = /* @__PURE__ */ __name((reason) => {
               clearTimeout(startedTimer);
@@ -14755,7 +15020,7 @@ var QwenAgent = class {
                   error: error instanceof Error ? error.message : String(error)
                 });
                 rejectStarted(error);
-                debugLogger7.warn(
+                debugLogger6.warn(
                   `MCP OAuth authentication failed for ${serverName}:`,
                   error
                 );
@@ -14767,7 +15032,7 @@ var QwenAgent = class {
                   "discover"
                 );
               } catch (error) {
-                debugLogger7.warn(
+                debugLogger6.warn(
                   `MCP OAuth authenticated for ${serverName}, but tool synchronization failed:`,
                   error
                 );
@@ -15054,7 +15319,7 @@ var QwenAgent = class {
             "Invalid or missing sessionId"
           );
         }
-        if (typeof targetPath !== "string" || targetPath.length === 0 || !path4.isAbsolute(targetPath) || targetPath.includes("\0")) {
+        if (typeof targetPath !== "string" || targetPath.length === 0 || !path3.isAbsolute(targetPath) || targetPath.includes("\0")) {
           throw RequestError.invalidParams(
             void 0,
             "Invalid or missing path (must be an absolute path)"
@@ -15069,7 +15334,7 @@ var QwenAgent = class {
         }
         let stats;
         try {
-          stats = await fs2.stat(targetPath);
+          stats = await fs.stat(targetPath);
         } catch {
           throw new RequestError(-32002, `Directory not found: ${targetPath}`, {
             errorKind: "directory_not_found",
@@ -15082,13 +15347,13 @@ var QwenAgent = class {
             path: targetPath
           });
         }
-        const canonicalPath = await fs2.realpath(targetPath);
+        const canonicalPath = await fs.realpath(targetPath);
         const allowedRoots = params["allowedRoots"];
         if (Array.isArray(allowedRoots) && allowedRoots.length > 0) {
           const contained = allowedRoots.some((root) => {
             if (typeof root !== "string") return false;
-            const rel = path4.relative(root, canonicalPath);
-            return !rel.startsWith("..") && !path4.isAbsolute(rel);
+            const rel = path3.relative(root, canonicalPath);
+            return !rel.startsWith("..") && !path3.isAbsolute(rel);
           });
           if (!contained) {
             throw new RequestError(
@@ -15151,6 +15416,11 @@ var QwenAgent = class {
               `Memory refresh failed: ${relocation.memoryRefreshError instanceof Error ? relocation.memoryRefreshError.message : String(relocation.memoryRefreshError)}`
             );
           }
+          if (relocation.mcpRefreshError) {
+            warnings.push(
+              `MCP refresh failed: ${relocation.mcpRefreshError instanceof Error ? relocation.mcpRefreshError.message : String(relocation.mcpRefreshError)}`
+            );
+          }
           try {
             await config.getGeminiClient()?.addWorkingDirectoryChangedContext(
               settledPreviousCwd,
@@ -15228,7 +15498,7 @@ var QwenAgent = class {
         try {
           await setLanguageAsync(language);
         } catch (err) {
-          debugLogger7.warn("setLanguageAsync failed:", err);
+          debugLogger6.warn("setLanguageAsync failed:", err);
           throw new RequestError(
             -32603,
             `Failed to switch UI language: ${err instanceof Error ? err.message : String(err)}`
@@ -15242,7 +15512,7 @@ var QwenAgent = class {
             language
           );
         } catch (err) {
-          debugLogger7.warn("Failed to persist UI language setting:", err);
+          debugLogger6.warn("Failed to persist UI language setting:", err);
         }
         let outputLanguage = null;
         let refreshed = false;
@@ -15256,7 +15526,7 @@ var QwenAgent = class {
             );
             fileWriteOk = true;
           } catch (err) {
-            debugLogger7.warn("Failed to write output-language.md:", err);
+            debugLogger6.warn("Failed to write output-language.md:", err);
           }
           if (fileWriteOk) {
             try {
@@ -15266,7 +15536,7 @@ var QwenAgent = class {
                 settingValue
               );
             } catch (err) {
-              debugLogger7.warn(
+              debugLogger6.warn(
                 "Failed to persist output language setting:",
                 err
               );
@@ -15286,7 +15556,7 @@ var QwenAgent = class {
                     writeOutputLanguageAndRegisterPath(settingValue, cfg);
                   }
                 } catch (err) {
-                  debugLogger7.warn(
+                  debugLogger6.warn(
                     `Failed to write output-language.md for session ${s.getId()} (path=${sessionPath ?? "global-default"}):`,
                     err
                   );
@@ -15299,7 +15569,7 @@ var QwenAgent = class {
               (r) => r.status === "rejected"
             ).length;
             if (failedCount > 0) {
-              debugLogger7.warn(
+              debugLogger6.warn(
                 `Language refresh failed for ${failedCount}/${results.length} session(s)`
               );
             }
@@ -15317,14 +15587,14 @@ var QwenAgent = class {
             "Invalid or missing sessionId"
           );
         }
-        debugLogger7.debug(`recap ext-method received for session=${sessionId}`);
+        debugLogger6.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
         );
-        debugLogger7.debug(
+        debugLogger6.debug(
           `recap ext-method completed for session=${sessionId} result=${recap ? `len=${recap.length}` : "null"}`
         );
         return { sessionId, recap };
@@ -15406,7 +15676,7 @@ var QwenAgent = class {
         const config = session.getConfig();
         const cacheSafeParams = buildBtwCacheSafeParams(config);
         if (!cacheSafeParams) {
-          debugLogger7.debug(`btw: no cacheSafeParams for session=${sessionId}`);
+          debugLogger6.debug(`btw: no cacheSafeParams for session=${sessionId}`);
           return { sessionId, answer: null };
         }
         const childSignal = AbortSignal.timeout(BTW_CHILD_TIMEOUT_MS);
@@ -15454,7 +15724,7 @@ var QwenAgent = class {
         try {
           hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
         } catch (error) {
-          debugLogger7.debug("Failed to read history before /fork:", error);
+          debugLogger6.debug("Failed to read history before /fork:", error);
         }
         if (!hasHistory) {
           throw RequestError.invalidParams(
@@ -15496,7 +15766,7 @@ var QwenAgent = class {
             ]
           });
         } catch (error) {
-          debugLogger7.debug("Failed to record fork event in history:", error);
+          debugLogger6.debug("Failed to record fork event in history:", error);
         }
         return { sessionId, description, launched: true };
       }
@@ -15559,7 +15829,7 @@ ${outputText}
             'taskKind must be "agent", "shell", or "monitor"'
           );
         }
-        debugLogger7.info(
+        debugLogger6.info(
           `sessionTaskCancel requested sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind}`
         );
         const session = this.sessionOrThrow(sessionId);
@@ -15569,7 +15839,7 @@ ${outputText}
             const task = config.getBackgroundTaskRegistry().get(taskId);
             if (!task || task.status !== "running" && task.status !== "paused") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger7.info(
+              debugLogger6.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
@@ -15579,7 +15849,7 @@ ${outputText}
             } else {
               config.getBackgroundTaskRegistry().cancel(taskId);
             }
-            debugLogger7.info(
+            debugLogger6.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -15588,13 +15858,13 @@ ${outputText}
             const task = config.getBackgroundShellRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger7.info(
+              debugLogger6.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);
-            debugLogger7.info(
+            debugLogger6.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -15603,13 +15873,13 @@ ${outputText}
             const task = config.getMonitorRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger7.info(
+              debugLogger6.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);
-            debugLogger7.info(
+            debugLogger6.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -15639,7 +15909,7 @@ ${outputText}
             durationMs: Date.now() - cleared.setAt
           });
         }
-        debugLogger7.info(
+        debugLogger6.info(
           `sessionGoalClear sessionId=${sessionId} cleared=${!!cleared} condition=${cleared?.condition ?? "(none)"}`
         );
         return {
@@ -15678,7 +15948,7 @@ ${outputText}
         }
         const session = this.sessionOrThrow(sessionId);
         const result = await session.continueLastTurn();
-        debugLogger7.info(
+        debugLogger6.info(
           `sessionContinue sessionId=${sessionId} accepted=${result.accepted} interruption=${result.interruption}`
         );
         return result;
@@ -15700,7 +15970,7 @@ ${outputText}
                 request.runtimeClientId
               );
             } catch (sessionErr) {
-              debugLogger7.warn(
+              debugLogger6.warn(
                 `workspaceMcpRuntimeAdd: failed to add runtime MCP server '${request.name}' to active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -15723,7 +15993,7 @@ ${outputText}
                 request.runtimeClientId
               );
             } catch (sessionErr) {
-              debugLogger7.warn(
+              debugLogger6.warn(
                 `workspaceMcpRuntimeRemove: failed to remove runtime MCP server '${request.name}' from active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -15762,6 +16032,13 @@ ${outputText}
       }
       case SERVE_CONTROL_EXT_METHODS.workspaceExtensionsRefresh: {
         const sessionId = params["sessionId"];
+        const rawRefreshBootstrap = params["refreshBootstrap"];
+        if (rawRefreshBootstrap !== void 0 && typeof rawRefreshBootstrap !== "boolean") {
+          throw RequestError.invalidParams(
+            void 0,
+            "refreshBootstrap must be a boolean"
+          );
+        }
         const session = this.sessionOrThrow(sessionId);
         const config = session.getConfig();
         const extensionManager = config.getExtensionManager();
@@ -15775,6 +16052,12 @@ ${outputText}
         }, "runRefresh");
         await runRefresh(async () => await extensionManager.refreshCache());
         await runRefresh(async () => await extensionManager.refreshTools());
+        const bootstrapConfig = this.config;
+        if (rawRefreshBootstrap !== false && bootstrapConfig !== config) {
+          await runRefresh(
+            async () => await this.refreshBootstrapExtensionStatus()
+          );
+        }
         const discoveryConfig = this.workspaceMcpDiscoveryConfig;
         if (discoveryConfig && discoveryConfig !== config) {
           const discoveryExtensionManager = discoveryConfig.getExtensionManager();
@@ -15818,6 +16101,9 @@ ${outputText}
             return sessionService.removeSession(sessionId);
           }
         );
+        if (success) {
+          fireSessionDeleteHook(this.config, sessionId, debugLogger6);
+        }
         return { success };
       }
       case "renameSession": {
@@ -15942,7 +16228,7 @@ ${outputText}
             filesFailed = fileResult.filesFailed;
           } catch (err) {
             const reason = err instanceof Error ? err.message : String(err);
-            debugLogger7.error(
+            debugLogger6.error(
               `[ACP] File-history rewind failed for session=${sessionId} promptId=${promptId}: ${reason}`
             );
             filesFailed = [`file-history-rewind: ${reason}`];
@@ -15974,7 +16260,7 @@ ${outputText}
         } catch (err) {
           const reason = err instanceof Error ? err.message : String(err);
           artifactSnapshotUnavailable = "artifact snapshot unavailable after rewind";
-          debugLogger7.warn(
+          debugLogger6.warn(
             `[ACP] Failed to rebuild artifact snapshot after rewind for session=${sessionId}: ${reason}`
           );
         }
@@ -16030,7 +16316,7 @@ ${outputText}
           records: sessionData.conversation.messages,
           gaps: sessionData.historyGaps,
           cumulativeUsage: createReplayCumulativeUsage(),
-          logger: debugLogger7
+          logger: debugLogger6
         });
         return {
           updates: replay.updates,
@@ -16078,7 +16364,9 @@ ${outputText}
           apiKeyEnvKey: cfg?.apiKeyEnvKey ?? null
         };
       }
-      case SERVE_CONTROL_EXT_METHODS.sessionBranch: {
+      case SERVE_CONTROL_EXT_METHODS.sessionBranch:
+      case SERVE_CONTROL_EXT_METHODS.sessionSideTask: {
+        const isSideTask = method === SERVE_CONTROL_EXT_METHODS.sessionSideTask;
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || !SESSION_ID_RE.test(sessionId)) {
           throw RequestError.invalidParams(
@@ -16101,7 +16389,17 @@ ${outputText}
         }
         const newSessionId = randomUUID2();
         const sessionService = sourceConfig.getSessionService();
-        await sessionService.forkSession(sessionId, newSessionId);
+        const fork = /* @__PURE__ */ __name(() => isSideTask ? sessionService.forkSession(sessionId, newSessionId, {
+          source: {
+            sourceType: "side_task",
+            sourceId: sessionId
+          }
+        }) : sessionService.forkSession(sessionId, newSessionId), "fork");
+        if (isSideTask && recording) {
+          await recording.runWithWriteBarrier(fork);
+        } else {
+          await fork();
+        }
         let title;
         try {
           let baseName;
@@ -16116,7 +16414,7 @@ ${outputText}
               baseName = sessionId.slice(0, 8);
             }
           }
-          title = await computeUniqueBranchTitle(baseName, sessionService);
+          title = isSideTask ? baseName : await computeUniqueBranchTitle(baseName, sessionService);
           const renamed = await sessionService.renameSession(
             newSessionId,
             title,
@@ -16374,7 +16672,7 @@ ${outputText}
                   newMerged.providerProtocol ?? {}
                 );
               } catch (err) {
-                debugLogger7.warn(
+                debugLogger6.warn(
                   `reload: reloadModelProvidersConfig failed for session ${id}: ${err}`
                 );
               }
@@ -16384,7 +16682,7 @@ ${outputText}
               try {
                 await config.switchModel(authType, newModelName);
               } catch (err) {
-                debugLogger7.warn(
+                debugLogger6.warn(
                   `reload: switchModel failed for session ${id}: ${err}`
                 );
               }
@@ -16392,7 +16690,7 @@ ${outputText}
               try {
                 await config.refreshAuth(authType);
               } catch (err) {
-                debugLogger7.warn(
+                debugLogger6.warn(
                   `reload: refreshAuth failed for session ${id}: ${err}`
                 );
               }
@@ -16410,7 +16708,7 @@ ${outputText}
                     session.clearTodoStopGuardTrust();
                   }
                 } catch (err) {
-                  debugLogger7.warn(
+                  debugLogger6.warn(
                     `reload: setApprovalMode failed for session ${id}: ${err}`
                   );
                 }
@@ -16419,14 +16717,14 @@ ${outputText}
             try {
               await config.refreshHierarchicalMemory();
             } catch (err) {
-              debugLogger7.warn(
+              debugLogger6.warn(
                 `reload: refreshHierarchicalMemory failed for session ${id}: ${err}`
               );
             }
             try {
               await config.getGeminiClient()?.refreshSystemInstruction();
             } catch (err) {
-              debugLogger7.warn(
+              debugLogger6.warn(
                 `reload: refreshSystemInstruction failed for session ${id}: ${err}`
               );
             }
@@ -16436,7 +16734,7 @@ ${outputText}
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
             const reason = results[i].reason;
-            debugLogger7.warn(
+            debugLogger6.warn(
               `Session ${sessions[i][0]} reload failed: ${reason}`
             );
             skipped.push(sessions[i][0]);
@@ -16450,16 +16748,58 @@ ${outputText}
         };
       }
       case SERVE_CONTROL_EXT_METHODS.workspaceSkillsRefresh: {
-        this.settings.reloadScopeFromDisk("Workspace" /* Workspace */);
+        const rawReason = params["reason"];
+        if (rawReason !== void 0 && rawReason !== "settings" && rawReason !== "content" && rawReason !== "all") {
+          throw RequestError.invalidParams(
+            void 0,
+            "reason must be settings, content, or all"
+          );
+        }
+        const reason = rawReason ?? "all";
+        const refreshSettings = reason !== "content";
+        const refreshContent = reason !== "settings";
+        if (refreshSettings) {
+          this.settings.reloadScopeFromDisk("Workspace" /* Workspace */);
+        }
         const sessions = this.getActiveSessions();
+        const settingsReloadResults = refreshSettings ? await Promise.allSettled(
+          sessions.map(
+            (session) => Promise.resolve().then(() => session.reloadSkillSettings())
+          )
+        ) : void 0;
+        let configResults = [];
+        if (refreshContent) {
+          const skillManagers = new Set(
+            [this.config, ...sessions.map((session) => session.getConfig())].map((config) => config.getSkillManager()).filter(
+              (manager) => manager !== void 0
+            )
+          );
+          configResults = await Promise.allSettled(
+            [...skillManagers].map((manager) => manager.refreshCache())
+          );
+          for (const result of configResults) {
+            if (result.status === "rejected") {
+              debugLogger6.warn(`Skill config refresh failed: ${result.reason}`);
+            }
+          }
+        }
         const results = await Promise.allSettled(
-          sessions.map((session) => session.refreshSkillsFromSettings())
+          sessions.map((session, index) => {
+            const settingsReload = settingsReloadResults?.[index];
+            if (settingsReload?.status === "rejected") {
+              return Promise.reject(settingsReload.reason);
+            }
+            return session.refreshSkillsFromSettings({
+              reloadSettings: false,
+              notifyConfigChanged: !refreshContent
+            });
+          })
         );
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
-            const reason = results[i].reason;
-            debugLogger7.warn(
-              `Session ${sessions[i].getId()} skill refresh failed: ${reason}`
+            const reason2 = results[i].reason;
+            debugLogger6.warn(
+              `Session ${sessions[i].getId()} skill refresh failed: ${reason2}`
             );
           }
         }
@@ -16469,7 +16809,14 @@ ${outputText}
           ).length,
           sessionsFailed: results.filter(
             (result) => result.status === "rejected"
-          ).length
+          ).length,
+          configsRefreshed: configResults.filter(
+            (result) => result.status === "fulfilled"
+          ).length,
+          configsFailed: configResults.filter(
+            (result) => result.status === "rejected"
+          ).length,
+          reason
         };
       }
       default:
@@ -16495,12 +16842,12 @@ ${outputText}
   disposeTranscriptReplayConfig(config) {
     try {
       void Promise.resolve(config.getToolRegistry()?.stop()).catch((err) => {
-        debugLogger7.debug(
+        debugLogger6.debug(
           `Transcript replay config tool registry stop failed: ${err instanceof Error ? err.message : String(err)}`
         );
       });
     } catch (err) {
-      debugLogger7.debug(
+      debugLogger6.debug(
         `Transcript replay config tool registry stop failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -16514,7 +16861,7 @@ ${outputText}
     this.transcriptReplayConfigCache.clear();
   }
   async getTranscriptReplayConfig(cwd, settings) {
-    const key = path4.resolve(cwd);
+    const key = path3.resolve(cwd);
     const cached = this.transcriptReplayConfigCache.get(key);
     if (cached?.settings === settings) {
       if (cached.config) {
@@ -16532,6 +16879,7 @@ ${outputText}
       [],
       settings,
       void 0,
+      void 0,
       false,
       {
         skipMcpDiscovery: true,
@@ -16573,7 +16921,7 @@ ${outputText}
       throw error;
     }
   }
-  async newSessionConfig(cwd, mcpServers, settings, sessionId, resume, initializeOptions = {}, chatRecording) {
+  async newSessionConfig(cwd, mcpServers, settings, sessionSource, sessionId, resume, initializeOptions = {}, chatRecording) {
     try {
       this.assertManagedSessionAdmission();
       return await this.runWithPinnedRuntimeBaseDir(settings, cwd, async () => {
@@ -16585,6 +16933,7 @@ ${outputText}
           cwd,
           mcpServers,
           settings,
+          sessionSource,
           sessionId,
           resume,
           initializeOptions,
@@ -16592,6 +16941,9 @@ ${outputText}
         );
       });
     } catch (error) {
+      if (error instanceof SessionIdConflictError) {
+        throw RequestError.invalidParams(void 0, error.message);
+      }
       const writerError = getSessionWriterError(error);
       if (writerError) {
         throw new RequestError(writerError.rpcCode, writerError.message, {
@@ -16601,7 +16953,7 @@ ${outputText}
       throw error;
     }
   }
-  async newSessionConfigInRuntimeContext(cwd, mcpServers, settings, sessionId, resume, initializeOptions = {}, chatRecording) {
+  async newSessionConfigInRuntimeContext(cwd, mcpServers, settings, sessionSource, sessionId, resume, initializeOptions = {}, chatRecording) {
     const sessionMcpServers = {};
     for (const server of mcpServers) {
       const stdioServer = toStdioServer(server);
@@ -16613,8 +16965,7 @@ ${outputText}
         sessionMcpServers[stdioServer.name] = new MCPServerConfig(
           stdioServer.command,
           stdioServer.args,
-          env,
-          cwd
+          env
         );
         continue;
       }
@@ -16657,7 +17008,8 @@ ${outputText}
       ...settings.merged,
       experimental: {
         ...settings.merged.experimental,
-        sessionWriterLease: this.sessionWriterLeaseEnabledAtStartup
+        sessionWriterLease: this.sessionWriterLeaseEnabledAtStartup,
+        ...sessionSource?.sourceType === "channel" ? { cron: false } : {}
       }
     };
     const sessionArg = resume === true ? { resume: sessionId, sessionId: void 0 } : { sessionId, resume: void 0 };
@@ -16692,8 +17044,17 @@ ${outputText}
       // session. ACP/Zed sessions otherwise leak persisted disabled skills
       // into the first <available_skills> at cold start.
       buildDisabledSkillNamesProvider(settings),
-      sessionMcpServers
+      sessionMcpServers,
+      // The daemon owns the settings watcher lifecycle.
+      void 0,
+      // A duplicate caller-supplied session id must fail this one request,
+      // not process.exit(1) the shared ACP child and every session on its
+      // channel. newSessionConfig maps the throw to a RequestError.
+      true
     );
+    if (sessionSource) {
+      config.setSessionSource(sessionSource.sourceType, sessionSource.sourceId);
+    }
     if (chatRecording !== false) {
       this.initializingConfigs.add(config);
     }
@@ -16701,6 +17062,7 @@ ${outputText}
       this.assertManagedSessionAdmission();
       if (this.isTrustedManagedParent()) {
         config.setSessionWriterReclaimPolicy("never");
+        config.setSessionWriterTakeoverPolicy("certified");
       }
     } catch (error) {
       return this.cleanupAfterRequestFailure(
@@ -16732,7 +17094,7 @@ ${outputText}
           sessionId: sid,
           ...event
         }).catch((err) => {
-          debugLogger7.debug(
+          debugLogger6.debug(
             `MCP budget extNotification dropped (session=${sid}, kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
           );
         });
@@ -16762,7 +17124,7 @@ ${outputText}
     try {
       await config.waitForMcpReady();
     } catch (err) {
-      debugLogger7.error(
+      debugLogger6.error(
         `MCP discovery readiness failed: ${err instanceof Error ? err.message : String(err)}`
       );
       return;
@@ -16786,7 +17148,7 @@ ${outputText}
     try {
       await config.refreshAuth(selectedType, true);
     } catch (e) {
-      debugLogger7.error(`Authentication failed: ${e}`);
+      debugLogger6.error(`Authentication failed: ${e}`);
       throw RequestError.authRequired(
         {
           authMethods: pickAuthMethodsForAuthRequired(selectedType)
@@ -16969,6 +17331,7 @@ export {
   fetchAllowedGitHub,
   normalizeCoreSettingValue,
   runAcpAgent,
+  selectVisibleHistoryRecords,
   toHttpServer,
   toSseServer,
   toStdioServer