@qwen-code/qwen-code 0.21.7 → 0.21.8

package/chunks/{acpAgent-KUAZ3GCZ.js → acpAgent-5UWLFV6V.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   recomputeMcpGating
-} from "./chunk-RZHU3ILK.js";
+} from "./chunk-YEF7XEO2.js";
 import {
   classifyApiError,
   fireSessionDeleteHook
@@ -16,14 +16,14 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-KR4ZSC7K.js";
+} from "./chunk-FWBXMANW.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-RUL4S3K3.js";
+} from "./chunk-YHJFF7KH.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -31,36 +31,36 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-KKJJB5X6.js";
+} from "./chunk-7VUERJHS.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-QETYKPMG.js";
+} from "./chunk-NVRDQFCX.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-RNVQB725.js";
+} from "./chunk-XHD7CRP2.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-YHEEE624.js";
+import "./chunk-EN2TKTFH.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-SCI7K3GM.js";
+} from "./chunk-GOEVOFQI.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-GSS34377.js";
+import "./chunk-ZHA242R4.js";
 import "./chunk-YAF2MQZ6.js";
 import "./chunk-CTJLZLB5.js";
 import {
   computeCpuPercent
 } from "./chunk-LBOVL47Y.js";
-import "./chunk-CB2464BK.js";
+import "./chunk-HWX5HPUG.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-W7U4ESW2.js";
-import "./chunk-FPM27XN4.js";
-import "./chunk-TDXGKHDN.js";
+} from "./chunk-CG3WBKJK.js";
+import "./chunk-EIVICVHM.js";
+import "./chunk-IYES5WOT.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -83,7 +83,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-TRLYP7OF.js";
+} from "./chunk-ZPLALRXZ.js";
 import {
   HistoryReplayer,
   MessageEmitter,
@@ -93,9 +93,9 @@ import {
   goalTerminalEventToHistoryItem,
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-6XJMFJ4D.js";
+} from "./chunk-2M4K4KYS.js";
 import "./chunk-OWMAZHIX.js";
-import "./chunk-KXSDEOFU.js";
+import "./chunk-4ALIARFY.js";
 import "./chunk-4NFY2S7N.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
@@ -113,7 +113,7 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-CSZEXZBE.js";
+} from "./chunk-GBDINRIL.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-BGXZBI5B.js";
@@ -123,38 +123,38 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-6GONZVLS.js";
+} from "./chunk-KKDVZLGL.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-AE77C5ZU.js";
+} from "./chunk-DQSDACD2.js";
 import {
   readVoiceModel
-} from "./chunk-55LYDVPU.js";
+} from "./chunk-C5VWPTGT.js";
 import "./chunk-AOHJKPKL.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-EUQTXRKZ.js";
-import "./chunk-OHJLEW5J.js";
+import "./chunk-E4ZBKMSF.js";
+import "./chunk-QQWD7LZV.js";
 import "./chunk-57OAHC2Y.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-5KH532V7.js";
+} from "./chunk-WV5J6Q6N.js";
 import "./chunk-VXZBKKQR.js";
-import "./chunk-SPMY6CX6.js";
+import "./chunk-3SE7J4DR.js";
 import "./chunk-3SH53ANB.js";
 import {
   SESSION_SOURCE_META_KEY,
   parseSessionSource
-} from "./chunk-LA7YLSR6.js";
+} from "./chunk-FYAXKJK7.js";
 import "./chunk-MZSJ43WV.js";
 import "./chunk-XCGIMOLN.js";
 import "./chunk-OCPBI7J5.js";
 import {
   ndJsonStream
-} from "./chunk-E33LOKRA.js";
+} from "./chunk-RPWVIXDB.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -163,11 +163,16 @@ import {
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
 } from "./chunk-NLREQJFK.js";
-import "./chunk-ZXU5UHMI.js";
-import "./chunk-VWOVHOTT.js";
-import "./chunk-IUFV6FYU.js";
+import "./chunk-QXVSWG66.js";
+import "./chunk-KJZ26VBX.js";
+import "./chunk-NGYI5EF5.js";
 import "./chunk-V6WHFGST.js";
 import {
+  ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
+  ACTIVE_WORK_HEARTBEAT_META_KEY,
+  ACTIVE_WORK_HEARTBEAT_VERSION,
+  ACTIVE_WORK_HOLD_CATEGORIES,
+  ACTIVE_WORK_NOTIFICATION_METHOD,
   CHANNEL_STARTUP_PROFILE_META_KEY,
   CHANNEL_STARTUP_PROFILE_VERSION,
   CLIENT_MCP_OVER_WS_CONFIG_FLAG,
@@ -185,8 +190,9 @@ import {
   TODO_STOP_GUARD_CONTINUATION_CLAIM_METHOD,
   TODO_STOP_GUARD_QUEUE_RELEASE_METHOD,
   WORKTREE_MCP_DEFER_META_KEY,
+  clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-R574ATRM.js";
+} from "./chunk-M2PNLYGY.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -194,7 +200,7 @@ import {
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-24ER7UV4.js";
+import "./chunk-UFALT4LK.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import {
@@ -206,10 +212,10 @@ import {
 } from "./chunk-BKHCW2BI.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-UVX4Y6IN.js";
-import "./chunk-WUC6ZFXO.js";
+import "./chunk-ZWBUH5UP.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS
-} from "./chunk-DIEFUBV6.js";
+} from "./chunk-DIWZNWZT.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -218,7 +224,7 @@ import {
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-6HVUFDS2.js";
+} from "./chunk-Y4TETC74.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -226,7 +232,7 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-PQBHU2IA.js";
+} from "./chunk-OHKJVAKG.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
@@ -234,20 +240,20 @@ import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-DBOFL3LQ.js";
+} from "./chunk-PG62DFWD.js";
 import {
   reloadEnvironment
-} from "./chunk-VOARQPTA.js";
-import "./chunk-6PEXNQTX.js";
-import "./chunk-HYRDKNUY.js";
-import "./chunk-FZBZSYKU.js";
+} from "./chunk-B52AWKBB.js";
+import "./chunk-UA5H3DS2.js";
+import "./chunk-IUQ52YJK.js";
+import "./chunk-FN6YXJOP.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-6XU3PH66.js";
-import "./chunk-ALGGS7UH.js";
+} from "./chunk-HA3SAB64.js";
+import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
 import {
@@ -255,6 +261,7 @@ import {
   APPROVAL_MODE_INFO,
   BTW_MAX_INPUT_LENGTH,
   ExtensionManager,
+  GLOBAL_DUPLICATE_THRESHOLD,
   IMAGE_CAPABILITY,
   InvalidMcpConfigError,
   InvalidSessionTranscriptCursorError,
@@ -308,12 +315,14 @@ import {
   dedupeToolCallsById,
   detectAutonomousSentinel,
   detectLoopSentinel,
+  didWriteProjectContextFile,
   encodeSessionTranscriptCursor,
   evaluateAutoMode,
   evaluatePermissionFlow,
   evaluatePlanModeShellPolicy,
   evaluateToolInvocationGuard,
   finalizeToolResponses,
+  findBoundaryAtOrBefore,
   findExistingProviderModels,
   findPlanModeEntryBatchBoundaryIndex,
   findProviderById,
@@ -339,11 +348,13 @@ import {
   getProviderToolCallId,
   getScopedEnvContents,
   getStopHookContinuationReason,
+  getToolCallRepeatKey,
   injectPermissionRulesIfMissing,
   isApproveOutcome,
   isDenialFallbackReason,
   isGatedMcpScope,
   isPlanModeBlocked,
+  isReplayTurnStartType,
   markDuplicateProviderToolCallResponseSent,
   matchesAnyServerPattern,
   mcpServerRequiresOAuth,
@@ -368,32 +379,32 @@ import {
   shouldFallback,
   shouldFirePermissionDeniedForAutoMode,
   shouldForceAutoModeReviewForAllow,
+  shouldHaltOnTurnToolCallCap,
   shouldRunAutoModeForCall,
   subagentGenerator,
   unregisterGoalHook,
   updateSetting,
   validatePlanModeShellApproval,
-  validatePlanModeShellContext,
-  wrapUserPromptSubmitContext
-} from "./chunk-Y7E5LNLO.js";
+  validatePlanModeShellContext
+} from "./chunk-GXSNGY5M.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-H6XPXXMH.js";
-import "./chunk-CNIID3TV.js";
+import "./chunk-2UUMVNYT.js";
 import "./chunk-MVUQRLOH.js";
 import "./chunk-XCWO3SMQ.js";
 import "./chunk-7MH4J33A.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-RMH5OWLD.js";
+import "./chunk-VXZ5HAOV.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-GNPNYXJB.js";
-import "./chunk-Y4NGLFGJ.js";
+import "./chunk-HUWENAHO.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -408,48 +419,53 @@ import {
   createHookOutput
 } from "./chunk-GM463R2B.js";
 import "./chunk-SEZ556DZ.js";
-import "./chunk-CJXIIILK.js";
-import "./chunk-3K7FH2KQ.js";
+import "./chunk-2FRY5CRX.js";
+import {
+  wrapUserPromptSubmitContext
+} from "./chunk-67N6HB5H.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-WAUGQKUU.js";
+import "./chunk-PLFATELK.js";
+import {
+  addToolArgumentsAttributes,
+  addToolCallResultAttributes,
+  extractDaemonTraceContext,
+  registerAcpEventLoopLagGauge,
+  startEventLoopLagMonitor,
+  withDaemonSpan
+} from "./chunk-L4N6TIP7.js";
+import "./chunk-SAH4BD2J.js";
 import {
-  APPROVAL_MODES,
   runWithRuntimeContentGenerator
-} from "./chunk-BVWVWGLE.js";
+} from "./chunk-CPG6P4GG.js";
 import "./chunk-S6LOFUVP.js";
+import "./chunk-2J3OJGTL.js";
 import {
   FORK_SUBAGENT_TYPE,
   getStartupContextLength,
   isSystemReminderContent
-} from "./chunk-LZC3B5N2.js";
+} from "./chunk-IA7TGCN2.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
 import "./chunk-EQL65XGA.js";
-import "./chunk-IIJEYBNH.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-22NBYCPD.js";
+} from "./chunk-3P2LV43B.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-3ULCB3NE.js";
-import "./chunk-BGG4MBYD.js";
+import "./chunk-HV76SFIA.js";
+import "./chunk-4PYCZH2V.js";
+import "./chunk-P3QQPMQA.js";
+import "./chunk-SR7RZ4MS.js";
+import "./chunk-M6HMMKVG.js";
 import "./chunk-DGEIYUC3.js";
 import "./chunk-MPHPFVKK.js";
 import "./chunk-AXMWHKXA.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-33ACCIIY.js";
-import {
-  addToolArgumentsAttributes,
-  addToolCallResultAttributes,
-  extractDaemonTraceContext,
-  registerAcpEventLoopLagGauge,
-  startEventLoopLagMonitor,
-  withDaemonSpan
-} from "./chunk-L4N6TIP7.js";
-import "./chunk-2J3OJGTL.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-M6HMMKVG.js";
 import {
   getToolCallPreparations
 } from "./chunk-GLCZKT5V.js";
+import "./chunk-DJ2GSRLV.js";
 import "./chunk-EI3HZX6C.js";
 import {
   ConversationFinishedEvent,
@@ -475,31 +491,35 @@ import {
   logUserPrompt,
   normalizeParts,
   parseInvocationContext,
-  runSideQuery,
   runVisionBridge,
   runWithInvocationContext,
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-2U3WZGZG.js";
+} from "./chunk-3PY4LPJF.js";
 import "./chunk-WOJZWRAZ.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
 } from "./chunk-FVKHVJZQ.js";
-import "./chunk-NG2R4N5O.js";
+import {
+  runSideQuery
+} from "./chunk-COBO5EBO.js";
+import "./chunk-6ZRFAKXK.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolConfirmationOutcome,
   ToolNames,
+  canonicalToolName,
   isShellProgressData
-} from "./chunk-IC4Z6LX6.js";
+} from "./chunk-PYQADEFD.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-6EOI4HOK.js";
+} from "./chunk-M3STHEMM.js";
+import "./chunk-F6WFNA7U.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT,
@@ -527,10 +547,10 @@ import {
   isSubpath
 } from "./chunk-OIVKILPI.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-PJOBIWUG.js";
+import "./chunk-BF52U4XJ.js";
 import {
   runExitCleanup
-} from "./chunk-EORNAQDT.js";
+} from "./chunk-6TR7CFXH.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -2361,6 +2381,8 @@ function createDaemonToolLoopState() {
   return {
     totalToolCalls: 0,
     invalidToolParamErrors: /* @__PURE__ */ new Map(),
+    toolCallKeyCounts: /* @__PURE__ */ new Map(),
+    maxToolCallKeyRepeat: 0,
     loopDetected: false
   };
 }
@@ -2381,18 +2403,42 @@ function recordDaemonLoopDetected(config, promptId, loopType, message, loopState
   return true;
 }
 __name(recordDaemonLoopDetected, "recordDaemonLoopDetected");
-function recordDaemonToolCalls(config, promptId, loopState, count) {
+function recordDaemonToolCalls(config, promptId, loopState, calls) {
   if (!loopState || loopState.loopDetected)
     return loopState?.loopDetected ?? false;
-  loopState.totalToolCalls += count;
-  if (loopState.totalToolCalls <= config.getMaxToolCallsPerTurn()) return false;
-  return recordDaemonLoopDetected(
-    config,
-    promptId,
-    "turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */,
-    `Stopping ACP turn after ${loopState.totalToolCalls} tool calls in one turn.`,
-    loopState
-  );
+  loopState.totalToolCalls += calls.length;
+  for (const call of calls) {
+    const key = getToolCallRepeatKey(call.name ?? "", call.args ?? {});
+    const count = (loopState.toolCallKeyCounts.get(key) ?? 0) + 1;
+    loopState.toolCallKeyCounts.set(key, count);
+    if (count > loopState.maxToolCallKeyRepeat) {
+      loopState.maxToolCallKeyRepeat = count;
+    }
+  }
+  if (shouldHaltOnTurnToolCallCap(
+    loopState.totalToolCalls,
+    loopState.maxToolCallKeyRepeat,
+    config.getMaxToolCallsPerTurn(),
+    config.isMaxToolCallsPerTurnExplicit()
+  )) {
+    return recordDaemonLoopDetected(
+      config,
+      promptId,
+      "turn_tool_call_cap" /* TURN_TOOL_CALL_CAP */,
+      `Stopping ACP turn after ${loopState.totalToolCalls} tool calls in one turn.`,
+      loopState
+    );
+  }
+  if (!config.getSkipLoopDetection() && loopState.maxToolCallKeyRepeat >= GLOBAL_DUPLICATE_THRESHOLD) {
+    return recordDaemonLoopDetected(
+      config,
+      promptId,
+      "global_tool_call_duplicate" /* GLOBAL_TOOL_CALL_DUPLICATE */,
+      `Stopping ACP turn after the same tool call repeated ${loopState.maxToolCallKeyRepeat} times.`,
+      loopState
+    );
+  }
+  return false;
 }
 __name(recordDaemonToolCalls, "recordDaemonToolCalls");
 function recordDaemonInvalidToolParams(config, promptId, loopState, toolName, error) {
@@ -2869,10 +2915,11 @@ async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.
 }
 __name(buildAvailableCommandsSnapshot, "buildAvailableCommandsSnapshot");
 var Session = class {
-  constructor(id, config, client, settings) {
+  constructor(id, config, client, settings, onActiveWorkChanged) {
     this.config = config;
     this.client = client;
     this.settings = settings;
+    this.onActiveWorkChanged = onActiveWorkChanged;
     this.sessionId = id;
     this.runtimeBaseDir = config.storage.getRuntimeBaseDir();
     const todoStopGuardEnabled = this.settings.merged.experimental?.todoStopGuard === true && !this.config.getBareMode() && !this.config.isSafeMode();
@@ -2912,6 +2959,7 @@ var Session = class {
    */
   followupAbort = null;
   turn = 0;
+  refreshContextFilesOnWrite = false;
   activeTodoWorkChainPromptId;
   createdAt = Date.now();
   /**
@@ -2966,8 +3014,10 @@ var Session = class {
   notificationProcessing = false;
   notificationAbortController = null;
   notificationCompletion = null;
+  currentAgentNotificationTaskId = null;
   persistedBackgroundNotificationTaskIds = /* @__PURE__ */ new Set();
   backgroundNotificationAcceptances = /* @__PURE__ */ new Map();
+  activeAgentNotificationAcceptances = /* @__PURE__ */ new Set();
   // Set true in dispose(). Guards #drainCronQueue and #drainNotificationQueue
   // against the race where #drainNotificationQueue's finally block kicks off
   // #drainCronQueue after the session has already been disposed (e.g. /clear
@@ -2978,6 +3028,9 @@ var Session = class {
   closeGateCompletion = null;
   resolveCloseGate = null;
   unsubscribeChatRecordingFailure;
+  /** The exact status-change callback this Session installed, so dispose can
+   *  retract its own and nobody else's. */
+  #statusChangeCallback;
   workflowApprovalAbortController = new AbortController();
   activeTodoPlanRevision;
   // Modular components
@@ -3615,7 +3668,51 @@ var Session = class {
     }
   }
   isIdle() {
-    return !this.closing && !this.#hasActiveTurn();
+    return !this.closing && !this.#hasActiveTurn() && this.collectActiveWorkHolds().length === 0;
+  }
+  /**
+   * The Session's current active-work holds, derived on every call.
+   *
+   * Nothing here is bookkeeping kept in parallel with the real work: agent
+   * holds come straight out of the registry's unfinalized set, notification
+   * holds out of the queue and the in-flight acceptance/continuation state.
+   * A hold therefore cannot leak past the work it names, and the daemon's
+   * cached copy converges on whatever these owners actually say.
+   *
+   * `hasUnfinalizedTasks()`'s predicate — not `hasRunningTasks()`' — backs the
+   * agent category on purpose: an agent that has been cancelled still owes its
+   * terminal task-notification, and treating it as finished would let the
+   * daemon reap the Session inside the cancel → finalizeCancelled() window and
+   * strand that notification.
+   *
+   * Prompts are absent by design. The daemon accepts, queues, dispatches, and
+   * settles them itself, so its own count is both authoritative and strictly
+   * wider than anything reported from here (it covers prompts still waiting in
+   * the FIFO, which the child cannot see).
+   */
+  collectActiveWorkHolds() {
+    if (this.disposed) return [];
+    const holds = [];
+    for (const agentId of this.config.getBackgroundTaskRegistry().listUnfinalizedBackgroundAgentIds()) {
+      holds.push({ category: "agent", id: agentId });
+    }
+    const notificationIds = /* @__PURE__ */ new Set();
+    for (const item of this.notificationQueue) {
+      if (item.kind === "agent") notificationIds.add(item.taskId);
+    }
+    for (const taskId of this.activeAgentNotificationAcceptances) {
+      notificationIds.add(taskId);
+    }
+    if (this.currentAgentNotificationTaskId !== null) {
+      notificationIds.add(this.currentAgentNotificationTaskId);
+    }
+    for (const taskId of notificationIds) {
+      holds.push({ category: "notification", id: taskId });
+    }
+    return holds;
+  }
+  #activeWorkChanged() {
+    this.onActiveWorkChanged?.();
   }
   #hasActiveTurn() {
     return Boolean(
@@ -3725,6 +3822,10 @@ var Session = class {
     }
     this.config.getBackgroundTaskRegistry().abortAll({ notify: false });
     this.config.getBackgroundTaskRegistry().setNotificationCallback(void 0);
+    if (this.#statusChangeCallback) {
+      this.config.getBackgroundTaskRegistry().clearStatusChangeCallback(this.#statusChangeCallback);
+      this.#statusChangeCallback = void 0;
+    }
     this.config.getMonitorRegistry().setNotificationCallback(void 0);
     this.config.getBackgroundShellRegistry().setNotificationCallback(void 0);
     this.config.getChatRecordingService()?.setTitleRecordedCallback(void 0);
@@ -3949,6 +4050,7 @@ var Session = class {
     }
     this.notificationQueue = [];
     this.notificationProcessing = false;
+    this.#activeWorkChanged();
     const scheduler = this.config.isCronEnabled() ? this.config.getCronScheduler() : null;
     if (scheduler) {
       const summary = scheduler.getExitSummary();
@@ -4318,6 +4420,9 @@ var Session = class {
             );
             const inputText = firstTextBlock?.text || "";
             const isSlashInput = !isContinue && isSlashCommand(inputText);
+            if (!isSlashInput && !isContinue && !isRetry) {
+              this.refreshContextFilesOnWrite = false;
+            }
             let parts;
             let fullTurnModelOverride;
             const onFullTurnModel = /* @__PURE__ */ __name((model) => {
@@ -6415,6 +6520,10 @@ ${this.pendingRecoveredAgentsNotice}
   }
   #registerBackgroundNotificationCallbacks() {
     const backgroundRegistry = this.config.getBackgroundTaskRegistry();
+    this.#statusChangeCallback = () => {
+      this.#activeWorkChanged();
+    };
+    backgroundRegistry.setStatusChangeCallback(this.#statusChangeCallback);
     backgroundRegistry.setNotificationCallback(
       (displayText, modelText, meta) => {
         this.#enqueueBackgroundNotification({
@@ -6509,6 +6618,7 @@ ${this.pendingRecoveredAgentsNotice}
       );
     }
     this.notificationQueue.push(item);
+    this.#activeWorkChanged();
     void this.#drainNotificationQueue();
   }
   async enqueueBackgroundNotification(item) {
@@ -6519,11 +6629,19 @@ ${this.pendingRecoveredAgentsNotice}
     if (existing) return { accepted: await existing };
     const acceptance = this.#persistDaemonBackgroundNotification(item);
     this.backgroundNotificationAcceptances.set(item.taskId, acceptance);
+    if (item.kind === "agent") {
+      this.activeAgentNotificationAcceptances.add(item.taskId);
+      this.#activeWorkChanged();
+    }
     try {
       return { accepted: await acceptance };
     } finally {
       if (this.backgroundNotificationAcceptances.get(item.taskId) === acceptance) {
         this.backgroundNotificationAcceptances.delete(item.taskId);
+        if (item.kind === "agent") {
+          this.activeAgentNotificationAcceptances.delete(item.taskId);
+          this.#activeWorkChanged();
+        }
       }
     }
   }
@@ -6594,18 +6712,26 @@ ${this.pendingRecoveredAgentsNotice}
         if (nextIndex < 0) break;
         const [item] = this.notificationQueue.splice(nextIndex, 1);
         if (!item) break;
-        await runWithInvocationContext(
-          void 0,
-          () => sessionIdContext.run(
-            this.config.getSessionId(),
-            () => this.#executeBackgroundNotificationPromptInner(item)
-          )
-        );
+        this.currentAgentNotificationTaskId = item.kind === "agent" ? item.taskId : null;
+        this.#activeWorkChanged();
+        try {
+          await runWithInvocationContext(
+            void 0,
+            () => sessionIdContext.run(
+              this.config.getSessionId(),
+              () => this.#executeBackgroundNotificationPromptInner(item)
+            )
+          );
+        } finally {
+          this.currentAgentNotificationTaskId = null;
+          this.#activeWorkChanged();
+        }
       }
     } finally {
       this.notificationProcessing = false;
       resolveCompletion();
       this.notificationCompletion = null;
+      this.#activeWorkChanged();
       void this.#drainCronQueue();
       if (this.notificationQueue.length > 0 && !this.pendingPrompt && !this.cronProcessing && !this.cronAbortController) {
         void this.#drainNotificationQueue();
@@ -7228,27 +7354,6 @@ ${this.pendingRecoveredAgentsNotice}
       }
       return part;
     }, "recordSkippedToolCall");
-    if (recordDaemonToolCalls(
-      this.config,
-      promptId,
-      toolLoopState,
-      dedupedFunctionCalls.length
-    )) {
-      return await finalizeRunToolResult({
-        parts: await Promise.all(
-          dedupedFunctionCalls.map(
-            (fc) => recordSkippedToolCall(
-              fc,
-              LOOP_DETECTED_SKIP_MESSAGE,
-              false,
-              "unknown" /* UNKNOWN */
-            )
-          )
-        ),
-        stopAfterPermissionCancel: false,
-        loopDetected: true
-      });
-    }
     const batches = [];
     const handledProviderToolCallIds = new Set(
       this.#getCurrentChat().getHistoryFunctionResponseIds()
@@ -7358,7 +7463,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         handledProviderToolCallIds.add(providerCallId);
       }
-      const isAgent = fc.name === ToolNames.AGENT;
+      const isAgent = canonicalToolName(fc.name ?? "") === ToolNames.AGENT;
       const last = batches[batches.length - 1];
       if (isAgent && last?.kind === "execute" && last.concurrent) {
         last.calls.push(fc);
@@ -7369,6 +7474,27 @@ ${this.pendingRecoveredAgentsNotice}
     const executableCalls = batches.flatMap(
       (batch) => batch.kind === "execute" ? batch.calls : []
     );
+    if (recordDaemonToolCalls(
+      this.config,
+      promptId,
+      toolLoopState,
+      executableCalls
+    )) {
+      return await finalizeRunToolResult({
+        parts: await Promise.all(
+          dedupedFunctionCalls.map(
+            (fc) => recordSkippedToolCall(
+              fc,
+              LOOP_DETECTED_SKIP_MESSAGE,
+              false,
+              "unknown" /* UNKNOWN */
+            )
+          )
+        ),
+        stopAfterPermissionCancel: false,
+        loopDetected: true
+      });
+    }
     const planModeEntryBoundaryIndex = findPlanModeEntryBatchBoundaryIndex(
       executableCalls.map((call) => call.name)
     );
@@ -7391,20 +7517,35 @@ ${this.pendingRecoveredAgentsNotice}
       await refreshMemoryAfterManagedWrite(this.config, memoryWriteCandidates, {
         logContext: `ACP session ${this.sessionId} memory tool batch`
       });
+      if (!this.refreshContextFilesOnWrite) {
+        return;
+      }
+      const matchedContextFileWrite = didWriteProjectContextFile(
+        memoryWriteCandidates,
+        this.config.getProjectRoot()
+      );
+      debugLogger5.debug(
+        `ACP session ${this.sessionId} checked marked context-file memory tool batch; matched=${matchedContextFileWrite}`
+      );
+      if (!matchedContextFileWrite) {
+        return;
+      }
+      debugLogger5.debug(
+        `ACP session ${this.sessionId} refreshing memory after context-file memory write`
+      );
+      await refreshMemoryInstruction(this.config, {
+        logContext: `ACP session ${this.sessionId} context-file memory tool batch`
+      });
     }, "refreshMemoryIfNeeded");
-    const runBounded = /* @__PURE__ */ __name(async (calls, runAbortSignal, onStopAfterPermissionCancel, onStopAfterLoopDetected, shouldSkipUnstarted) => {
-      const configuredMaxConcurrency = parsePositiveIntegerEnv(
+    const runBounded = /* @__PURE__ */ __name(async (calls, runAbortSignal, onStopAfterPermissionCancel, shouldSkipUnstarted) => {
+      const maxConcurrency = parsePositiveIntegerEnv(
         process.env["QWEN_CODE_MAX_TOOL_CONCURRENCY"],
         10
       );
-      const maxConcurrency = toolLoopState ? Math.min(
-        configuredMaxConcurrency,
-        DAEMON_INVALID_TOOL_PARAMS_THRESHOLD
-      ) : configuredMaxConcurrency;
       const results = new Array(calls.length);
       const executing = /* @__PURE__ */ new Set();
-      const fillLoopSkippedFrom = /* @__PURE__ */ __name(async (startIndex2) => {
-        for (let i = startIndex2; i < calls.length; i++) {
+      const fillLoopSkippedFrom = /* @__PURE__ */ __name(async (startIndex) => {
+        for (let i = startIndex; i < calls.length; i++) {
           if (results[i]) continue;
           results[i] = {
             parts: [
@@ -7420,49 +7561,8 @@ ${this.pendingRecoveredAgentsNotice}
           };
         }
       }, "fillLoopSkippedFrom");
-      const fillPermissionSkippedFrom = /* @__PURE__ */ __name(async (startIndex2) => {
-        for (let i = startIndex2; i < calls.length; i++) {
-          if (results[i]) continue;
-          results[i] = {
-            parts: [await recordSkippedToolCall(calls[i])],
-            stopAfterPermissionCancel: false
-          };
-        }
-      }, "fillPermissionSkippedFrom");
-      let startIndex = 0;
-      if (toolLoopState && calls.length > DAEMON_INVALID_TOOL_PARAMS_THRESHOLD) {
-        startIndex = DAEMON_INVALID_TOOL_PARAMS_THRESHOLD;
-        for (let i = 0; i < startIndex; i++) {
-          if (runAbortSignal.aborted && shouldSkipUnstarted?.()) {
-            results[i] = {
-              parts: [await recordSkippedToolCall(calls[i])],
-              stopAfterPermissionCancel: false
-            };
-            continue;
-          }
-          const r = await this.runTool(
-            runAbortSignal,
-            promptId,
-            calls[i],
-            onStopAfterPermissionCancel,
-            toolLoopState,
-            recordSkippedToolCall,
-            queueToolResultRecord,
-            executionCallIds.get(calls[i]),
-            onFullTurnModel
-          );
-          results[i] = r;
-          if (r.loopDetected) {
-            await fillLoopSkippedFrom(i + 1);
-            return results;
-          }
-          if (r.stopAfterPermissionCancel) {
-            await fillPermissionSkippedFrom(i + 1);
-            return results;
-          }
-        }
-      }
-      for (let i = startIndex; i < calls.length; i++) {
+      let warnedWaitingForInFlight = false;
+      for (let i = 0; i < calls.length; i++) {
         const idx = i;
         if (toolLoopState?.loopDetected) {
           await fillLoopSkippedFrom(idx);
@@ -7487,6 +7587,12 @@ ${this.pendingRecoveredAgentsNotice}
           onFullTurnModel
         ).then((r) => {
           results[idx] = r;
+          if (r.loopDetected && executing.size > 1 && !warnedWaitingForInFlight) {
+            warnedWaitingForInFlight = true;
+            debugLogger5.warn(
+              `Loop detection stopped this ACP turn; waiting for ${executing.size - 1} in-flight tool call(s) to settle before returning.`
+            );
+          }
         }).finally(() => {
           executing.delete(p);
         });
@@ -7494,7 +7600,6 @@ ${this.pendingRecoveredAgentsNotice}
         if (executing.size >= maxConcurrency) {
           await Promise.race(executing);
           if (results.some((result) => result?.loopDetected)) {
-            onStopAfterLoopDetected?.();
             await Promise.all(executing);
             await fillLoopSkippedFrom(idx + 1);
             return results;
@@ -7505,7 +7610,6 @@ ${this.pendingRecoveredAgentsNotice}
           if (invalidToolErrorNearThreshold && executing.size > 0) {
             await Promise.all(executing);
             if (results.some((result) => result?.loopDetected)) {
-              onStopAfterLoopDetected?.();
               await fillLoopSkippedFrom(idx + 1);
               return results;
             }
@@ -7559,7 +7663,6 @@ ${this.pendingRecoveredAgentsNotice}
               batch.calls,
               batchAbortController.signal,
               stopBatchAfterPermissionCancel,
-              () => batchAbortController.abort("loop_detected"),
               () => batchStopAfterPermissionCancel
             );
           } finally {
@@ -9122,6 +9225,7 @@ ${this.pendingRecoveredAgentsNotice}
    */
   async #processSlashCommandResult(result, originalPrompt, abortSignal, onFullTurnModel) {
     this.#emitGoalStatusItems(result);
+    this.refreshContextFilesOnWrite = result.type === "submit_prompt" && Boolean(result.refreshContextFilesOnWrite);
     switch (result.type) {
       case "submit_prompt":
         return this.#applyBridgeConversionsIfNeeded(
@@ -9628,6 +9732,98 @@ ${contextPart.text}`
   }
 };
 
+// packages/cli/src/acp-integration/active-work-reporter.ts
+init_esbuild_shims();
+var debugLogger6 = createDebugLogger("ACTIVE_WORK");
+var ActiveWorkReporter = class {
+  constructor(send, listSources, intervalMs) {
+    this.send = send;
+    this.listSources = listSources;
+    this.intervalMs = intervalMs;
+    this.#timer = setInterval(() => {
+      this.#publish();
+    }, intervalMs);
+    this.#timer.unref?.();
+    this.#publish();
+  }
+  static {
+    __name(this, "ActiveWorkReporter");
+  }
+  #seq = 0;
+  #tail = Promise.resolve();
+  #coalescing = false;
+  #timer;
+  #disposed = false;
+  /**
+   * Note that some Session's derived state may have changed. Coalesced to
+   * one snapshot per microtask so a burst of transitions (an agent finishing
+   * and its terminal notification enqueuing in the same tick) produces a
+   * single message that already reflects the settled state.
+   */
+  notifyChanged() {
+    if (this.#disposed || this.#coalescing) return;
+    this.#coalescing = true;
+    queueMicrotask(() => {
+      if (!this.#coalescing) return;
+      this.#coalescing = false;
+      this.#publish();
+    });
+  }
+  /**
+   * Publish now and resolve once the snapshot has been handed to the
+   * transport.
+   *
+   * Callers use this to order a snapshot ahead of an RPC response on the same
+   * stream. The prompt path needs it: the daemon drops its own
+   * `pendingPromptCount` the moment the prompt response lands, so a hold
+   * taken during that prompt (a background agent it started) has to be on the
+   * wire *first* or the daemon briefly sees neither fact and may reap the
+   * Session.
+   */
+  async flush() {
+    this.#coalescing = false;
+    this.#publish();
+    await this.#tail.catch(() => void 0);
+  }
+  dispose() {
+    this.#disposed = true;
+    this.#coalescing = false;
+    if (this.#timer) {
+      clearInterval(this.#timer);
+      this.#timer = void 0;
+    }
+  }
+  #publish() {
+    if (this.#disposed) return;
+    let sessions;
+    try {
+      sessions = [];
+      for (const source of this.listSources()) {
+        sessions.push({
+          sessionId: source.sessionId,
+          holds: source.collectActiveWorkHolds()
+        });
+      }
+    } catch (error) {
+      debugLogger6.warn(
+        `active-work snapshot collection failed; skipping this report: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return;
+    }
+    const snapshot = {
+      v: ACTIVE_WORK_HEARTBEAT_VERSION,
+      seq: ++this.#seq,
+      sessions
+    };
+    this.#tail = this.#tail.then(
+      () => this.#disposed ? void 0 : this.send(
+        ACTIVE_WORK_NOTIFICATION_METHOD,
+        snapshot
+      )
+    ).catch(() => void 0);
+  }
+};
+
 // packages/cli/src/acp-integration/session/tasksSnapshot.ts
 init_esbuild_shims();
 function runtimeMs(entry, now) {
@@ -9739,7 +9935,7 @@ function runWithAcpRuntimeOutputDir(settings, cwd, fn) {
 __name(runWithAcpRuntimeOutputDir, "runWithAcpRuntimeOutputDir");
 
 // packages/cli/src/acp-integration/acpAgent.ts
-var debugLogger6 = createDebugLogger("ACP_AGENT");
+var debugLogger7 = createDebugLogger("ACP_AGENT");
 var QWEN_ACP_LOCAL_READ_ROOTS_ENV = "QWEN_ACP_LOCAL_READ_ROOTS";
 var POSIX_TMP_LOCAL_READ_ROOT = "/tmp";
 var BTW_CHILD_TIMEOUT_MS = 55e3;
@@ -9874,7 +10070,7 @@ async function beginSessionCloseAfterCurrentGate(session, timeoutMs) {
   }
 }
 __name(beginSessionCloseAfterCurrentGate, "beginSessionCloseAfterCurrentGate");
-var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger6);
+var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger7);
 function parseAcpLocalReadRootsEnv(raw = process.env[QWEN_ACP_LOCAL_READ_ROOTS_ENV]) {
   if (!raw) return [];
   return raw.split(path3.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0 && path3.isAbsolute(entry));
@@ -9996,9 +10192,24 @@ function getLoadReplayPageSize(params) {
 }
 __name(getLoadReplayPageSize, "getLoadReplayPageSize");
 function isHistoryTurnStart(record) {
-  return record.type === "user" && record.subtype !== "mid_turn_user_message";
+  return isReplayTurnStartType(record.type, record.subtype);
 }
 __name(isHistoryTurnStart, "isHistoryTurnStart");
+function isHistoryPageStart(record) {
+  return record.subtype !== "realtime_message" && (record.type === "assistant" || isHistoryTurnStart(record));
+}
+__name(isHistoryPageStart, "isHistoryPageStart");
+function historyOrphansToolResult(records, start, end) {
+  for (let i = start; i < end; i++) {
+    if (records[i].type !== "tool_result") continue;
+    for (let owner = i - 1; owner >= start; owner--) {
+      if (isHistoryPageStart(records[owner])) return false;
+    }
+    return true;
+  }
+  return false;
+}
+__name(historyOrphansToolResult, "historyOrphansToolResult");
 function selectRecentHistoryRecords(records, pageSize) {
   if (pageSize === void 0 || records.length <= pageSize) {
     return { records, hasMore: false };
@@ -10010,8 +10221,27 @@ function selectRecentHistoryRecords(records, pageSize) {
       break;
     }
   }
-  while (start > 0 && !isHistoryTurnStart(records[start])) {
-    start--;
+  const expansionFloor = Math.max(0, records.length - 2 * pageSize);
+  const aligned = findBoundaryAtOrBefore(
+    records,
+    start,
+    expansionFloor,
+    isHistoryTurnStart
+  );
+  if (isHistoryTurnStart(records[aligned])) {
+    start = aligned;
+  }
+  if (start > 0 && historyOrphansToolResult(records, start, records.length)) {
+    const pairFloor = Math.max(0, start - pageSize);
+    const owner = findBoundaryAtOrBefore(
+      records,
+      start,
+      pairFloor,
+      isHistoryPageStart
+    );
+    if (isHistoryPageStart(records[owner])) {
+      start = owner;
+    }
   }
   return { records: records.slice(start), hasMore: start > 0 };
 }
@@ -10673,7 +10903,7 @@ async function downloadGitHubSkillDirectory(githubUrl, directoryPath) {
     githubUrl,
     directoryPath
   ).catch((error) => {
-    debugLogger6.warn(
+    debugLogger7.warn(
       "GitHub API directory listing failed, falling back to archive download:",
       error
     );
@@ -11239,7 +11469,7 @@ function readMcpServers(source, scope) {
       const server = toMcpServerConfig(value);
       return server ? { name, scope, server: redactMcpServerSecrets(server) } : void 0;
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Skipping malformed MCP server config [${scope}:${name}]:`,
         error
       );
@@ -11335,7 +11565,7 @@ function readHooks(source, scope, extensionName) {
           extensionName
         });
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Skipping malformed hook entry [${scope}:${event}:${index}]:`,
           error
         );
@@ -11637,7 +11867,7 @@ async function runAcpAgent(config, settings, argv, options) {
             void preloadContentGenerator(
               session.getConfig().getContentGenerator()
             ).catch((error) => {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 `[ACP] Session provider preload failed for ${sessionId}: ${error instanceof Error ? error.message : String(error)}`
               );
             });
@@ -11678,7 +11908,7 @@ async function runAcpAgent(config, settings, argv, options) {
     try {
       await agentInstance.shutdownMcpPool(8e3);
     } catch (err) {
-      debugLogger6.error(`[ACP] MCP pool drain (${label}) error:`, err);
+      debugLogger7.error(`[ACP] MCP pool drain (${label}) error:`, err);
       if (strict) throw err;
     }
   }, "drainPoolBeforeExit");
@@ -11711,7 +11941,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await hookSystem.fireSessionEndEvent(reason);
       } catch (err) {
         if (managedConfigs) failures.push(err);
-        debugLogger6.warn(
+        debugLogger7.warn(
           `SessionEnd hook failed: ${err instanceof Error ? err.message : String(err)}`
         );
       }
@@ -11735,7 +11965,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await terminal.writerShutdown;
       } catch (error) {
         failures.push(error);
-        debugLogger6.error("[ACP] Managed writer shutdown error:", error);
+        debugLogger7.error("[ACP] Managed writer shutdown error:", error);
         const retainedLockPaths = terminal.configs.flatMap((config2) => {
           if (typeof config2.getSessionRuntimeBaseDir !== "function" || typeof config2.getSessionId !== "function") {
             return [];
@@ -11762,7 +11992,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await agent.finishManagedShutdown(terminal.configs);
       } catch (error) {
         failures.push(error);
-        debugLogger6.error("[ACP] Managed resource shutdown error:", error);
+        debugLogger7.error("[ACP] Managed resource shutdown error:", error);
       }
       try {
         await drainPoolBeforeExit(label, true);
@@ -11773,7 +12003,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await runExitCleanup();
       } catch (error) {
         failures.push(error);
-        debugLogger6.error("[ACP] Cleanup error:", error);
+        debugLogger7.error("[ACP] Cleanup error:", error);
       }
       if (failures.length > 0) {
         throw new AggregateError(failures, "Managed ACP shutdown failed");
@@ -11784,14 +12014,14 @@ async function runAcpAgent(config, settings, argv, options) {
   const shutdownHandler = /* @__PURE__ */ __name(async () => {
     if (shuttingDown) return;
     shuttingDown = true;
-    debugLogger6.debug("[ACP] Shutdown signal received, closing streams");
+    debugLogger7.debug("[ACP] Shutdown signal received, closing streams");
     if (agentInstance?.isTrustedManagedParent()) {
       let exitCode = 0;
       try {
         await shutdownManagedAgent("other" /* Other */, "signal");
       } catch (err) {
         exitCode = 1;
-        debugLogger6.error("[ACP] Managed shutdown error:", err);
+        debugLogger7.error("[ACP] Managed shutdown error:", err);
       } finally {
         eventLoopMonitor.dispose();
       }
@@ -11816,12 +12046,12 @@ async function runAcpAgent(config, settings, argv, options) {
       }
       await drainPoolBeforeExit("signal");
     } catch (err) {
-      debugLogger6.error("[ACP] Shutdown error:", err);
+      debugLogger7.error("[ACP] Shutdown error:", err);
     } finally {
       eventLoopMonitor.dispose();
     }
     runExitCleanup().catch((err) => {
-      debugLogger6.error("[ACP] Cleanup error:", err);
+      debugLogger7.error("[ACP] Cleanup error:", err);
     }).finally(() => {
       process.exit(0);
     });
@@ -12022,6 +12252,8 @@ var QwenAgent = class {
   initializingConfigs = /* @__PURE__ */ new Set();
   managedShuttingDown = false;
   clientCapabilities;
+  /** Set once the daemon negotiates active-work reporting; one per channel. */
+  activeWorkReporter;
   privateParentState = "uninitialized";
   // CPU-usage delta baseline for the daemon's `workspaceResource` extMethod
   // (Daemon Status child-resource chart). The daemon polls this at a fixed
@@ -12094,12 +12326,12 @@ var QwenAgent = class {
       try {
         session.beginCloseIfAvailable();
       } catch (error) {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `Session ${session.getId()} admission close during managed shutdown failed: ${error instanceof Error ? error.message : String(error)}`
         );
       }
       void session.cancelPendingPrompt().catch((error) => {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `Session ${session.getId()} cancel during managed shutdown failed: ${error instanceof Error ? error.message : String(error)}`
         );
       });
@@ -12247,7 +12479,7 @@ var QwenAgent = class {
       await run();
     }).catch((err) => {
       this.workspaceMcpDiscoveryError = err instanceof Error ? err.message : String(err);
-      debugLogger6.error(
+      debugLogger7.error(
         `Workspace MCP ${label} failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }).finally(() => {
@@ -12434,7 +12666,7 @@ var QwenAgent = class {
     try {
       const result = await this.mcpPool.drainAll({ force: true, timeoutMs });
       if (result.forced > 0 || result.errors.length > 0) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `MCP pool drain: ${result.drained} clean, ${result.forced} timed out, ${result.errors.length} errors`
         );
         throw new Error(
@@ -12442,7 +12674,7 @@ var QwenAgent = class {
         );
       }
     } catch (err) {
-      debugLogger6.error(
+      debugLogger7.error(
         `MCP pool drainAll failed: ${err instanceof Error ? err.message : String(err)}`
       );
       throw err;
@@ -12478,8 +12710,9 @@ var QwenAgent = class {
       cleanupErrors.push(error);
     }
     this.sessions.delete(sessionId);
+    this.activeWorkReporter?.notifyChanged();
     if (cleanupErrors.length > 0) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Session ${sessionId} closed after ${cleanupErrors.length} cleanup failure(s): ${cleanupErrors.map(
           (error) => error instanceof Error ? error.message : String(error)
         ).join("; ")}`
@@ -12533,7 +12766,7 @@ var QwenAgent = class {
     try {
       await cleanup();
     } catch (cleanupError) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Session cleanup failed while preserving the original request error: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`
       );
     }
@@ -12557,7 +12790,7 @@ var QwenAgent = class {
         await this.cleanupUnstoredConfig(config);
       } catch (error) {
         if (config.getSessionId() === requiredSessionId) throw error;
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Deferred Config cleanup retry failed for session ${config.getSessionId()}: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -12567,7 +12800,7 @@ var QwenAgent = class {
     const session = this.sessions.get(sessionId);
     if (!session) {
       this.mcpPool?.releaseSession(sessionId);
-      return;
+      return { closed: true, holds: [] };
     }
     const recorder = session.getConfig().getChatRecordingService();
     const requireFlush = opts?.requireFlush === true;
@@ -12576,6 +12809,13 @@ var QwenAgent = class {
     }
     const drainTimeoutMs = opts?.drainTimeoutMs ?? SESSION_DRAIN_TIMEOUT_MS;
     const cancelClose = opts?.waitForCloseGate ? await beginSessionCloseAfterCurrentGate(session, drainTimeoutMs) : session.beginClose();
+    if (opts?.onlyIfUnheld) {
+      const holds = session.collectActiveWorkHolds();
+      if (holds.length > 0) {
+        cancelClose();
+        return { closed: false, holds };
+      }
+    }
     for (const [requestId, generation] of this.generationControllers) {
       if (generation.sessionId !== sessionId) continue;
       generation.controller.abort();
@@ -12588,7 +12828,7 @@ var QwenAgent = class {
           try {
             await session.cancelPendingPrompt();
           } catch (err) {
-            debugLogger6.debug(
+            debugLogger7.debug(
               `Session ${sessionId} cancel during close failed: ${err instanceof Error ? err.message : String(err)}`
             );
           }
@@ -12626,6 +12866,7 @@ var QwenAgent = class {
     } finally {
       if (!removedFromStore) cancelClose();
     }
+    return { closed: true, holds: [] };
   }
   async discardStoredSessionIfCurrent(sessionId, session, opts) {
     if (this.sessions.get(sessionId) !== session) {
@@ -12634,6 +12875,8 @@ var QwenAgent = class {
     await this.closeStoredSession(sessionId, opts);
   }
   async disposeSessions() {
+    this.activeWorkReporter?.dispose();
+    this.activeWorkReporter = void 0;
     for (const generation of this.generationControllers.values()) {
       generation.controller.abort();
     }
@@ -12692,7 +12935,7 @@ var QwenAgent = class {
         scope: "workspace",
         ...event
       }).catch((err) => {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `MCP workspace budget event delivery to session ${sid} failed (kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
         );
       });
@@ -12727,7 +12970,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.7";
+    const version = "0.21.8";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -12766,11 +13009,31 @@ var QwenAgent = class {
     }
     const requestedProfile = args._meta?.[CHANNEL_STARTUP_PROFILE_META_KEY];
     const profileRequested = requestedProfile !== null && typeof requestedProfile === "object" && !Array.isArray(requestedProfile) && requestedProfile["v"] === CHANNEL_STARTUP_PROFILE_VERSION;
+    const requestedActiveWork = args._meta?.[ACTIVE_WORK_HEARTBEAT_META_KEY];
+    const activeWorkRequested = requestedActiveWork !== null && typeof requestedActiveWork === "object" && !Array.isArray(requestedActiveWork) && requestedActiveWork["v"] === ACTIVE_WORK_HEARTBEAT_VERSION;
+    const activeWorkIntervalMs = activeWorkRequested ? clampActiveWorkIntervalMs(
+      requestedActiveWork["intervalMs"]
+    ) : void 0;
+    if (activeWorkIntervalMs !== void 0) {
+      this.activeWorkReporter?.dispose();
+      this.activeWorkReporter = new ActiveWorkReporter(
+        (method, params) => this.connection.extNotification(method, params),
+        () => this.sessions.values(),
+        activeWorkIntervalMs
+      );
+    }
     const responseMeta = {
       ...this.managedToolInvocationGuard ? {
         [EXTERNAL_TOOL_GUARD_READY_META_KEY]: EXTERNAL_TOOL_GUARD_REQUIRED_VALUE
       } : {},
-      ...profileRequested && startupProfile ? { [CHANNEL_STARTUP_PROFILE_META_KEY]: startupProfile } : {}
+      ...profileRequested && startupProfile ? { [CHANNEL_STARTUP_PROFILE_META_KEY]: startupProfile } : {},
+      ...activeWorkIntervalMs !== void 0 ? {
+        [ACTIVE_WORK_HEARTBEAT_META_KEY]: {
+          v: ACTIVE_WORK_HEARTBEAT_VERSION,
+          intervalMs: activeWorkIntervalMs,
+          categories: [...ACTIVE_WORK_HOLD_CATEGORIES]
+        }
+      } : {}
     };
     return Object.keys(responseMeta).length > 0 ? { ...response, _meta: responseMeta } : response;
   }
@@ -12890,7 +13153,7 @@ var QwenAgent = class {
             records: replayPage.records,
             gaps: sessionData2.historyGaps,
             cumulativeUsage: createReplayCumulativeUsage(),
-            logger: debugLogger6
+            logger: debugLogger7
           });
           if (!bulkReplay2) {
             try {
@@ -12977,7 +13240,7 @@ var QwenAgent = class {
                 gaps: sessionData?.historyGaps,
                 cumulativeUsage: replayUsage,
                 supersedeUnrestorableGoal: true,
-                logger: debugLogger6
+                logger: debugLogger7
               });
               replayUpdates = replay.updates;
               copyCumulativeUsage(createdSession.cumulativeUsage, replayUsage);
@@ -13121,7 +13384,7 @@ var QwenAgent = class {
         session.pendingWorktreeNotice = restored.contextMessage;
       }
     } catch (error) {
-      debugLogger6.warn(`ACP worktree restore failed: ${error}`);
+      debugLogger7.warn(`ACP worktree restore failed: ${error}`);
     }
   }
   async #restoreBackgroundAgentsOnResume(config, session) {
@@ -13154,7 +13417,7 @@ var QwenAgent = class {
         config
       );
       if (restored.restored) {
-        debugLogger6.info(
+        debugLogger7.info(
           `ACP goal restored sessionId=${config.getSessionId()} condition=${restored.condition}`
         );
       } else if (restored.blockedBy && restored.blockedBy !== "condition-invalid") {
@@ -13314,6 +13577,7 @@ var QwenAgent = class {
         this.activePromptCalls.delete(params.sessionId);
       }
       settleCall();
+      await this.activeWorkReporter?.flush();
     }
   }
   async cancel(params) {
@@ -13347,7 +13611,7 @@ var QwenAgent = class {
       await extensionManager.refreshCache();
       extensions = extensionManager.getLoadedExtensions();
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         "Extension loading failed, continuing without extensions:",
         error
       );
@@ -13473,7 +13737,7 @@ var QwenAgent = class {
             pm.addPersistentRule(rule, ruleType);
           }
         } catch (error) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             `Failed to sync permission rules to a live session: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -14031,7 +14295,7 @@ var QwenAgent = class {
       if (!changed) return;
       await config.getSkillManager()?.refreshCache();
     } catch (error) {
-      debugLogger6.warn("Extension source revalidation failed:", error);
+      debugLogger7.warn("Extension source revalidation failed:", error);
     }
   }
   async buildWorkspaceSkillsStatus(config) {
@@ -15486,7 +15750,7 @@ var QwenAgent = class {
               config,
               finalizeDangling: !activePromptBeforeRead && !this.activePromptCalls.has(sessionId),
               encodeCursor: /* @__PURE__ */ __name((state) => encodeSessionTranscriptCursor(state, cwd), "encodeCursor"),
-              logger: debugLogger6
+              logger: debugLogger7
             });
             return {
               v: 1,
@@ -15682,7 +15946,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "remember_timeout";
-            debugLogger6.error("Workspace memory remember timed out:", {
+            debugLogger7.error("Workspace memory remember timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -15694,7 +15958,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger6.error("Workspace memory remember failed:", {
+          debugLogger7.error("Workspace memory remember failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -15768,7 +16032,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "forget_timeout";
-            debugLogger6.error("Workspace memory forget timed out:", {
+            debugLogger7.error("Workspace memory forget timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -15780,7 +16044,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger6.error("Workspace memory forget failed:", {
+          debugLogger7.error("Workspace memory forget failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -15848,7 +16112,7 @@ var QwenAgent = class {
           );
           if (childSignal.aborted) {
             const timeoutCode = "dream_timeout";
-            debugLogger6.error("Workspace memory dream timed out:", {
+            debugLogger7.error("Workspace memory dream timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -15860,7 +16124,7 @@ var QwenAgent = class {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger6.error("Workspace memory dream failed:", {
+          debugLogger7.error("Workspace memory dream failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -16270,7 +16534,7 @@ var QwenAgent = class {
                   error: error instanceof Error ? error.message : String(error)
                 });
                 rejectStarted(error);
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `MCP OAuth authentication failed for ${serverName}:`,
                   error
                 );
@@ -16282,7 +16546,7 @@ var QwenAgent = class {
                   "discover"
                 );
               } catch (error) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `MCP OAuth authenticated for ${serverName}, but tool synchronization failed:`,
                   error
                 );
@@ -16690,11 +16954,12 @@ var QwenAgent = class {
             "Invalid session close drain timeout"
           );
         }
-        await this.closeStoredSession(sessionId, {
+        const outcome = await this.closeStoredSession(sessionId, {
           requireFlush: params["requireFlush"] === true,
+          onlyIfUnheld: params[ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM] === true,
           ...typeof rawDrainTimeoutMs === "number" ? { drainTimeoutMs: rawDrainTimeoutMs } : {}
         });
-        return { sessionId, closed: true };
+        return outcome.closed ? { sessionId, closed: true } : { sessionId, closed: false, holds: outcome.holds };
       }
       case SERVE_CONTROL_EXT_METHODS.sessionCd: {
         const sessionId = params["sessionId"];
@@ -16971,7 +17236,7 @@ var QwenAgent = class {
         try {
           await setLanguageAsync(language);
         } catch (err) {
-          debugLogger6.warn("setLanguageAsync failed:", err);
+          debugLogger7.warn("setLanguageAsync failed:", err);
           throw new RequestError(
             -32603,
             `Failed to switch UI language: ${err instanceof Error ? err.message : String(err)}`
@@ -16985,7 +17250,7 @@ var QwenAgent = class {
             language
           );
         } catch (err) {
-          debugLogger6.warn("Failed to persist UI language setting:", err);
+          debugLogger7.warn("Failed to persist UI language setting:", err);
         }
         let outputLanguage = null;
         let refreshed = false;
@@ -16999,7 +17264,7 @@ var QwenAgent = class {
             );
             fileWriteOk = true;
           } catch (err) {
-            debugLogger6.warn("Failed to write output-language.md:", err);
+            debugLogger7.warn("Failed to write output-language.md:", err);
           }
           if (fileWriteOk) {
             try {
@@ -17009,7 +17274,7 @@ var QwenAgent = class {
                 settingValue
               );
             } catch (err) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 "Failed to persist output language setting:",
                 err
               );
@@ -17029,7 +17294,7 @@ var QwenAgent = class {
                     writeOutputLanguageAndRegisterPath(settingValue, cfg);
                   }
                 } catch (err) {
-                  debugLogger6.warn(
+                  debugLogger7.warn(
                     `Failed to write output-language.md for session ${s.getId()} (path=${sessionPath ?? "global-default"}):`,
                     err
                   );
@@ -17042,7 +17307,7 @@ var QwenAgent = class {
               (r) => r.status === "rejected"
             ).length;
             if (failedCount > 0) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `Language refresh failed for ${failedCount}/${results.length} session(s)`
               );
             }
@@ -17060,14 +17325,14 @@ var QwenAgent = class {
             "Invalid or missing sessionId"
           );
         }
-        debugLogger6.debug(`recap ext-method received for session=${sessionId}`);
+        debugLogger7.debug(`recap ext-method received for session=${sessionId}`);
         const session = this.sessionOrThrow(sessionId);
         const config = session.getConfig();
         const recap = await generateSessionRecap(
           config,
           new AbortController().signal
         );
-        debugLogger6.debug(
+        debugLogger7.debug(
           `recap ext-method completed for session=${sessionId} result=${recap ? `len=${recap.length}` : "null"}`
         );
         return { sessionId, recap };
@@ -17149,7 +17414,7 @@ var QwenAgent = class {
         const config = session.getConfig();
         const cacheSafeParams = buildBtwCacheSafeParams(config);
         if (!cacheSafeParams) {
-          debugLogger6.debug(`btw: no cacheSafeParams for session=${sessionId}`);
+          debugLogger7.debug(`btw: no cacheSafeParams for session=${sessionId}`);
           return { sessionId, answer: null };
         }
         const childSignal = AbortSignal.timeout(BTW_CHILD_TIMEOUT_MS);
@@ -17203,7 +17468,7 @@ var QwenAgent = class {
         try {
           hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
         } catch (error) {
-          debugLogger6.debug("Failed to read history before /fork:", error);
+          debugLogger7.debug("Failed to read history before /fork:", error);
         }
         if (!hasHistory) {
           throw RequestError.invalidParams(
@@ -17245,7 +17510,7 @@ var QwenAgent = class {
             ]
           });
         } catch (error) {
-          debugLogger6.debug("Failed to record fork event in history:", error);
+          debugLogger7.debug("Failed to record fork event in history:", error);
         }
         return { sessionId, description, launched: true };
       }
@@ -17308,7 +17573,7 @@ ${outputText}
             'taskKind must be "agent", "shell", or "monitor"'
           );
         }
-        debugLogger6.info(
+        debugLogger7.info(
           `sessionTaskCancel requested sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind}`
         );
         const session = this.sessionOrThrow(sessionId);
@@ -17318,7 +17583,7 @@ ${outputText}
             const task = config.getBackgroundTaskRegistry().get(taskId);
             if (!task || task.status !== "running" && task.status !== "paused") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger6.info(
+              debugLogger7.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
@@ -17328,7 +17593,7 @@ ${outputText}
             } else {
               config.getBackgroundTaskRegistry().cancel(taskId);
             }
-            debugLogger6.info(
+            debugLogger7.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -17337,13 +17602,13 @@ ${outputText}
             const task = config.getBackgroundShellRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger6.info(
+              debugLogger7.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
             }
             config.getBackgroundShellRegistry().requestCancel(taskId);
-            debugLogger6.info(
+            debugLogger7.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -17352,13 +17617,13 @@ ${outputText}
             const task = config.getMonitorRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger6.info(
+              debugLogger7.info(
                 `sessionTaskCancel skipped sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
             }
             config.getMonitorRegistry().cancel(taskId);
-            debugLogger6.info(
+            debugLogger7.info(
               `sessionTaskCancel completed sessionId=${sessionId} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -17388,7 +17653,7 @@ ${outputText}
             durationMs: Date.now() - cleared.setAt
           });
         }
-        debugLogger6.info(
+        debugLogger7.info(
           `sessionGoalClear sessionId=${sessionId} cleared=${!!cleared} condition=${cleared?.condition ?? "(none)"}`
         );
         return {
@@ -17427,7 +17692,7 @@ ${outputText}
         }
         const session = this.sessionOrThrow(sessionId);
         const result = await session.continueLastTurn();
-        debugLogger6.info(
+        debugLogger7.info(
           `sessionContinue sessionId=${sessionId} accepted=${result.accepted} interruption=${result.interruption}`
         );
         return result;
@@ -17449,7 +17714,7 @@ ${outputText}
                 request.runtimeClientId
               );
             } catch (sessionErr) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `workspaceMcpRuntimeAdd: failed to add runtime MCP server '${request.name}' to active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -17472,7 +17737,7 @@ ${outputText}
                 request.runtimeClientId
               );
             } catch (sessionErr) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `workspaceMcpRuntimeRemove: failed to remove runtime MCP server '${request.name}' from active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -17581,7 +17846,7 @@ ${outputText}
           }
         );
         if (success) {
-          fireSessionDeleteHook(this.config, sessionId, debugLogger6);
+          fireSessionDeleteHook(this.config, sessionId, debugLogger7);
         }
         return { success };
       }
@@ -17707,7 +17972,7 @@ ${outputText}
             filesFailed = fileResult.filesFailed;
           } catch (err) {
             const reason = err instanceof Error ? err.message : String(err);
-            debugLogger6.error(
+            debugLogger7.error(
               `[ACP] File-history rewind failed for session=${sessionId} promptId=${promptId}: ${reason}`
             );
             filesFailed = [`file-history-rewind: ${reason}`];
@@ -17739,7 +18004,7 @@ ${outputText}
         } catch (err) {
           const reason = err instanceof Error ? err.message : String(err);
           artifactSnapshotUnavailable = "artifact snapshot unavailable after rewind";
-          debugLogger6.warn(
+          debugLogger7.warn(
             `[ACP] Failed to rebuild artifact snapshot after rewind for session=${sessionId}: ${reason}`
           );
         }
@@ -17795,7 +18060,7 @@ ${outputText}
           records: sessionData.conversation.messages,
           gaps: sessionData.historyGaps,
           cumulativeUsage: createReplayCumulativeUsage(),
-          logger: debugLogger6
+          logger: debugLogger7
         });
         return {
           updates: replay.updates,
@@ -18151,7 +18416,7 @@ ${outputText}
                   newMerged.providerProtocol ?? {}
                 );
               } catch (err) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `reload: reloadModelProvidersConfig failed for session ${id}: ${err}`
                 );
               }
@@ -18161,7 +18426,7 @@ ${outputText}
               try {
                 await config.switchModel(authType, newModelName);
               } catch (err) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `reload: switchModel failed for session ${id}: ${err}`
                 );
               }
@@ -18169,7 +18434,7 @@ ${outputText}
               try {
                 await config.refreshAuth(authType);
               } catch (err) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `reload: refreshAuth failed for session ${id}: ${err}`
                 );
               }
@@ -18188,7 +18453,7 @@ ${outputText}
                     session.clearTodoStopGuardTrust();
                   }
                 } catch (err) {
-                  debugLogger6.warn(
+                  debugLogger7.warn(
                     `reload: setApprovalMode failed for session ${id}: ${err}`
                   );
                 }
@@ -18197,14 +18462,14 @@ ${outputText}
             try {
               await config.refreshHierarchicalMemory();
             } catch (err) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `reload: refreshHierarchicalMemory failed for session ${id}: ${err}`
               );
             }
             try {
               await config.getGeminiClient()?.refreshSystemInstruction();
             } catch (err) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `reload: refreshSystemInstruction failed for session ${id}: ${err}`
               );
             }
@@ -18214,7 +18479,7 @@ ${outputText}
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
             const reason = results[i].reason;
-            debugLogger6.warn(
+            debugLogger7.warn(
               `Session ${sessions[i][0]} reload failed: ${reason}`
             );
             skipped.push(sessions[i][0]);
@@ -18259,7 +18524,7 @@ ${outputText}
           );
           for (const result of configResults) {
             if (result.status === "rejected") {
-              debugLogger6.warn(`Skill config refresh failed: ${result.reason}`);
+              debugLogger7.warn(`Skill config refresh failed: ${result.reason}`);
             }
           }
         }
@@ -18278,7 +18543,7 @@ ${outputText}
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
             const reason2 = results[i].reason;
-            debugLogger6.warn(
+            debugLogger7.warn(
               `Session ${sessions[i].getId()} skill refresh failed: ${reason2}`
             );
           }
@@ -18322,12 +18587,12 @@ ${outputText}
   disposeTranscriptReplayConfig(config) {
     try {
       void Promise.resolve(config.getToolRegistry()?.stop()).catch((err) => {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `Transcript replay config tool registry stop failed: ${err instanceof Error ? err.message : String(err)}`
         );
       });
     } catch (err) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Transcript replay config tool registry stop failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -18575,7 +18840,7 @@ ${outputText}
           sessionId: sid,
           ...event
         }).catch((err) => {
-          debugLogger6.debug(
+          debugLogger7.debug(
             `MCP budget extNotification dropped (session=${sid}, kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
           );
         });
@@ -18605,7 +18870,7 @@ ${outputText}
     try {
       await config.waitForMcpReady();
     } catch (err) {
-      debugLogger6.error(
+      debugLogger7.error(
         `MCP discovery readiness failed: ${err instanceof Error ? err.message : String(err)}`
       );
       return;
@@ -18629,7 +18894,7 @@ ${outputText}
     try {
       await config.refreshAuth(selectedType, true);
     } catch (e) {
-      debugLogger6.error(`Authentication failed: ${e}`);
+      debugLogger7.error(`Authentication failed: ${e}`);
       throw RequestError.authRequired(
         {
           authMethods: pickAuthMethodsForAuthRequired(selectedType)
@@ -18663,8 +18928,15 @@ ${outputText}
     if (this.sessions.has(sessionId)) {
       throw new Error(`Session ${sessionId} is already active.`);
     }
-    const session = new Session(sessionId, config, this.connection, settings);
+    const session = new Session(
+      sessionId,
+      config,
+      this.connection,
+      settings,
+      () => this.activeWorkReporter?.notifyChanged()
+    );
     this.sessions.set(sessionId, session);
+    this.activeWorkReporter?.notifyChanged();
     this.initializingConfigs.delete(config);
     try {
       if (options.enableLiveScreenContext) {