@qwen-code/qwen-code 0.21.12-preview.3 → 0.21.12

package/chunks/{acpAgent-37UDZP64.js → acpAgent-7JOAESF5.js}

@@ -1,14 +1,9 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  recomputeMcpGating
-} from "./chunk-V4MJ56RS.js";
-import {
-  classifyApiError
-} from "./chunk-V7RNNPGC.js";
-import {
+  classifyApiError,
   fireSessionDeleteHook
-} from "./chunk-L34XSHIZ.js";
+} from "./chunk-P5Y23G2L.js";
 import {
   EXTENSION_CONTEXT_BUDGET,
   buildExtensionMentionContext,
@@ -18,17 +13,17 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-HBZUU4AE.js";
-import "./chunk-WLML6VIA.js";
+} from "./chunk-X5SLJOMF.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
+  isSlashCommand,
   normalizePartList
-} from "./chunk-UOMZKPI5.js";
+} from "./chunk-QSD4UH74.js";
 import {
-  isSlashCommand
-} from "./chunk-3TT6MZHJ.js";
+  recomputeMcpGating
+} from "./chunk-CIDQISGM.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -36,46 +31,48 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-UZPWH6SP.js";
+} from "./chunk-IX4PWUDU.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-UNCIELQJ.js";
+} from "./chunk-4XA4QIUA.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-M4OYAR6J.js";
+} from "./chunk-MDNUCDKZ.js";
+import "./chunk-3SH53ANB.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-FRH4SSGX.js";
+import "./chunk-NW2GIPG3.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-32VOOMEF.js";
+} from "./chunk-62X3CM7Q.js";
 import "./chunk-4WGODMVR.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-NELCY6JT.js";
+import "./chunk-OYWVIXHT.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-N3FJOQX7.js";
+} from "./chunk-5AFGJNY6.js";
 import "./chunk-KW7NOTN6.js";
-import "./chunk-575MI5K3.js";
-import "./chunk-TEKFBSMY.js";
-import "./chunk-7D4KEFOT.js";
+import "./chunk-ZQUY3ZJU.js";
+import "./chunk-RDVNSJQU.js";
+import "./chunk-OPVF453Q.js";
 import "./chunk-YAF2MQZ6.js";
 import {
   computeCpuPercent
 } from "./chunk-LBOVL47Y.js";
-import "./chunk-ILVATFYJ.js";
+import "./chunk-TDESMS7M.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-M2NMFAFR.js";
+} from "./chunk-FMIH5KMQ.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
+  HistoryReplayLimitError,
   MAX_REMEMBER_CONTENT_BYTES,
   REDACTED_MCP_SECRET,
   collectHistoryReplayUpdates,
@@ -94,8 +91,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-KIFRFCCB.js";
-import "./chunk-ZBBVBZBR.js";
+} from "./chunk-CZ4OWGQQ.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -104,10 +100,10 @@ import {
   createTranscriptMessageUpdate,
   createTranscriptUsageUpdate,
   hasFullSessionContext
-} from "./chunk-VWD7SNNN.js";
-import "./chunk-47FQVRCO.js";
+} from "./chunk-UI5UGEF4.js";
+import "./chunk-TMFWI4RC.js";
 import "./chunk-4NFY2S7N.js";
-import "./chunk-U6PTKAOW.js";
+import "./chunk-V6OBVAST.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-3Z43GZUQ.js";
@@ -118,33 +114,25 @@ import {
   normalizeSessionIdForLookup,
   parseCallerSuppliedSessionId
 } from "./chunk-TQOF5KBL.js";
-import "./chunk-HGCQ5SE7.js";
+import "./chunk-UXEO7E3V.js";
 import {
   PERMISSION_RULE_TYPES,
   PermissionRulesValidationError,
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-SSAOTDK7.js";
+} from "./chunk-YX2RDGAL.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-VQZXRLEX.js";
+} from "./chunk-LCX5B364.js";
 import {
   readVoiceModel
-} from "./chunk-5UPJ774B.js";
-import "./chunk-IQFYO5BF.js";
+} from "./chunk-VIFA5VJD.js";
+import "./chunk-H7TMVHKE.js";
 import "./chunk-NTTBXH7U.js";
-import "./chunk-JEMR2FTD.js";
-import "./chunk-3SH53ANB.js";
-import {
-  SESSION_SOURCE_META_KEY,
-  parseSessionSource
-} from "./chunk-O5G7IQGM.js";
-import "./chunk-MZSJ43WV.js";
-import "./chunk-XCGIMOLN.js";
-import "./chunk-OCPBI7J5.js";
+import "./chunk-RQJA2YYO.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -153,26 +141,32 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-NPE3STIW.js";
+} from "./chunk-ROIJYS5K.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-BGXZBI5B.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-TRYJ3BVE.js";
-import "./chunk-LHY6HBRA.js";
+import "./chunk-WM3LUQLO.js";
+import "./chunk-IH4Z54RJ.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-YTYPRVIZ.js";
-import "./chunk-ENEEQMGM.js";
-import "./chunk-DEG7R6Z6.js";
-import "./chunk-V6WHFGST.js";
+import "./chunk-BSR5AXZR.js";
+import "./chunk-45NQKMYB.js";
+import "./chunk-OK47XBYH.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-DYVCDQW2.js";
+} from "./chunk-2IVYL3IF.js";
+import {
+  SESSION_SOURCE_META_KEY,
+  parseSessionSource
+} from "./chunk-6P5EXEBL.js";
+import "./chunk-7U5G6JXI.js";
+import "./chunk-WCCLLK7X.js";
+import "./chunk-OCPBI7J5.js";
 import {
   ndJsonStream
-} from "./chunk-TYGKUOEG.js";
+} from "./chunk-DAV4QFD5.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -180,14 +174,15 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-OPBATTFQ.js";
-import "./chunk-3GCU5O2E.js";
-import "./chunk-N5ULBHP3.js";
+} from "./chunk-HTYND72J.js";
+import "./chunk-ZLCT4C5A.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_LEGACY_HOLD_CATEGORIES,
   ACTIVE_WORK_NOTIFICATION_METHOD,
   CHANNEL_STARTUP_PROFILE_META_KEY,
   CHANNEL_STARTUP_PROFILE_VERSION,
@@ -197,6 +192,8 @@ import {
   DAEMON_PROMPT_DISPLAY_TEXT_META_KEY,
   LOAD_REPLAY_BULK_MODE,
   LOAD_REPLAY_HIDE_INHERITED_META_KEY,
+  LOAD_REPLAY_MAX_BYTES,
+  LOAD_REPLAY_MAX_UPDATES,
   LOAD_REPLAY_META_KEY,
   LOAD_REPLAY_MODE_META_KEY,
   LOAD_REPLAY_PAGE_SIZE_META_KEY,
@@ -209,7 +206,7 @@ import {
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-HHGQGTJQ.js";
+} from "./chunk-FQDCO3CJ.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -217,7 +214,7 @@ import {
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-K7JW6V5O.js";
+import "./chunk-A6NRNRKE.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-M5GB774H.js";
@@ -226,22 +223,24 @@ import {
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
   EXTERNAL_TOOL_GUARD_TOKEN_ENV,
   PRIVATE_EXTERNAL_TOOL_GUARD_ENV,
+  PRIVATE_EXTERNAL_TOOL_GUARD_PROVIDER_ENV,
+  SHELL_EXECUTING_TOOL_NAMES,
   isValidExternalToolGuardDenialReason
-} from "./chunk-BKHCW2BI.js";
+} from "./chunk-3VUENPWF.js";
+import "./chunk-3AEKDXKT.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS,
   CHANNEL_PROMPT_META_KEY
-} from "./chunk-LT532KF4.js";
+} from "./chunk-AW27A43Y.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-IW6RQPQB.js";
-import "./chunk-AQHNAA7E.js";
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-4M2F7OG7.js";
+} from "./chunk-3LDGOQXZ.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -250,9 +249,9 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-M6SXIXBV.js";
+} from "./chunk-3GDBZJD6.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-L7T742G2.js";
+import "./chunk-FA5K6YI2.js";
 import "./chunk-GOXKNSDZ.js";
 import {
   getSystemDefaultsPath,
@@ -261,7 +260,7 @@ import {
 import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-GYBDYWMV.js";
+} from "./chunk-IRSLAS4M.js";
 import {
   SUPPORTED_LANGUAGES
 } from "./chunk-5EJZE3FP.js";
@@ -269,17 +268,18 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-RRQJPCRQ.js";
+} from "./chunk-XH3KAV2G.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD
 } from "./chunk-MS7GNABG.js";
-import "./chunk-M2PY7CNK.js";
-import "./chunk-VJNBRRZG.js";
+import "./chunk-7KJPO7YH.js";
+import "./chunk-OWXFBIB6.js";
+import "./chunk-WZMH7II3.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-4ETA3KRC.js";
+} from "./chunk-ZMY2P4L3.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
@@ -332,6 +332,7 @@ import {
   buildPermissionCheckContext,
   buildSessionRecoveryPlanFromApiHistory,
   clampInlineMediaPart,
+  collectSessionTurnState,
   computeUniqueBranchTitle,
   convertToFunctionErrorResponse,
   convertToFunctionResponse,
@@ -348,7 +349,6 @@ import {
   evaluatePlanModeShellPolicy,
   evaluateToolInvocationGuard,
   finalizeToolResponses,
-  findBoundaryAtOrBefore,
   findExistingProviderModels,
   findPlanModeEntryBatchBoundaryIndex,
   findProviderById,
@@ -381,7 +381,6 @@ import {
   isDenialFallbackReason,
   isGatedMcpScope,
   isPlanModeBlocked,
-  isReplayTurnStartType,
   markDuplicateProviderToolCallResponseSent,
   matchesAnyServerPattern,
   mcpServerRequiresOAuth,
@@ -393,7 +392,6 @@ import {
   readManyFiles,
   recordAllow,
   recordFallbackApprove,
-  redactUrlCredentials,
   refreshMemoryAfterManagedWrite,
   refreshMemoryInstruction,
   resolveBaseUrl,
@@ -401,7 +399,6 @@ import {
   runForkedAgent,
   runManagedAutoMemoryDream,
   runManagedRememberByAgent,
-  sessionIdContext,
   shouldClassifyAllShellForAutoMode,
   shouldFallback,
   shouldFirePermissionDeniedForAutoMode,
@@ -413,25 +410,25 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-M6HXP2SG.js";
+} from "./chunk-EBPLKY6U.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
-import "./chunk-QTI7SRXI.js";
-import "./chunk-KT4OWAAZ.js";
-import "./chunk-IX7CFQGA.js";
-import "./chunk-N7NBMAMW.js";
+import "./chunk-QPBFRWCP.js";
+import "./chunk-JRIVMPD2.js";
+import "./chunk-YILJKX2T.js";
+import "./chunk-D2RNVVH6.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-I4XSOFH2.js";
+import "./chunk-I7BT2MME.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-XLQS3VI6.js";
-import "./chunk-NWPO6I7V.js";
+import "./chunk-AKBFSOC5.js";
+import "./chunk-DEDESZDL.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -439,39 +436,73 @@ import {
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
-import {
-  APPROVAL_MODES
-} from "./chunk-6LYDH7VT.js";
-import "./chunk-2AZMF6G5.js";
+import "./chunk-5RUCD4ED.js";
 import "./chunk-KRXPRVGL.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-GZGDJ4E6.js";
-import "./chunk-T6W4KACQ.js";
-import "./chunk-MWZYNOCG.js";
+} from "./chunk-YBVVOSOH.js";
+import "./chunk-CPFFU46D.js";
+import "./chunk-ULNWG62W.js";
 import {
   GoalPersistenceUnavailableError,
   emptyGoalSnapshot,
   goalTurnContext,
+  parseGoalSnapshotV2,
+  parseGoalStateCause,
   wrapUserPromptSubmitContext
-} from "./chunk-SAQHDAUJ.js";
-import "./chunk-6XZERB6P.js";
+} from "./chunk-DPTMKFIH.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-63FNZTWG.js";
+import "./chunk-3GM5DLBI.js";
 import {
+  AgentOutputMessageCapture,
+  addAgentInputMessageAttributes,
+  addDaemonRequestAttribute,
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
   extractDaemonTraceContext,
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor,
   withDaemonSpan
-} from "./chunk-O5AZPHYZ.js";
+} from "./chunk-K34GJQOZ.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-5PWLQ7SK.js";
+import "./chunk-KLOMACIR.js";
 import {
   runWithRuntimeContentGenerator
-} from "./chunk-EYS3GGM3.js";
+} from "./chunk-VPV7WBVT.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-2J3OJGTL.js";
+import {
+  FORK_SUBAGENT_TYPE,
+  getStartupContextLength,
+  isSystemReminderContent
+} from "./chunk-TTRH3RTQ.js";
+import "./chunk-K623ENWT.js";
+import "./chunk-AQ37AY7B.js";
+import "./chunk-FRHQQC2Z.js";
+import {
+  clearCachedCredentialFile,
+  qwenOAuth2Events
+} from "./chunk-DG4IQ6JG.js";
+import "./chunk-NAVJD2PQ.js";
+import "./chunk-KEC5FHLM.js";
+import "./chunk-2ZWH53I4.js";
+import "./chunk-P3QQPMQA.js";
+import "./chunk-TB4YFWXG.js";
+import "./chunk-D7QGE3RT.js";
+import {
+  REASONING_EFFORT_TIERS,
+  applyReasoningEffort
+} from "./chunk-KM73TBQ4.js";
+import "./chunk-MPHPFVKK.js";
+import "./chunk-AXMWHKXA.js";
+import {
+  getToolCallPreparations
+} from "./chunk-GLCZKT5V.js";
+import "./chunk-DJ2GSRLV.js";
+import "./chunk-NLFLYSS4.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -504,26 +535,17 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-HB6QW4LM.js";
+} from "./chunk-4KM2SYK5.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-732MOPEM.js";
+} from "./chunk-G6MUFRNI.js";
 import {
   runSideQuery
-} from "./chunk-CTQE2NB2.js";
-import "./chunk-NC4O6UE6.js";
-import "./chunk-IEP44U2R.js";
-import {
-  FORK_SUBAGENT_TYPE,
-  getStartupContextLength,
-  isSystemReminderContent
-} from "./chunk-ZV4XVYL3.js";
-import "./chunk-K623ENWT.js";
-import "./chunk-AQ37AY7B.js";
-import "./chunk-V3LXMASR.js";
+} from "./chunk-LSRI3ND3.js";
+import "./chunk-PVXEJB66.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -531,63 +553,47 @@ import {
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-XTH2OMDS.js";
-import {
-  clearCachedCredentialFile,
-  qwenOAuth2Events
-} from "./chunk-TBVNYG5B.js";
-import "./chunk-NAVJD2PQ.js";
-import "./chunk-5HBFERG5.js";
-import "./chunk-EYW54TBD.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-O4BBDP2G.js";
-import "./chunk-KPVVWKF3.js";
+} from "./chunk-YIGGWOJE.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-XWUQ4IH5.js";
+} from "./chunk-KWX56CHZ.js";
 import "./chunk-F6WFNA7U.js";
-import "./chunk-F6AOBFUN.js";
-import {
-  REASONING_EFFORT_TIERS,
-  applyReasoningEffort
-} from "./chunk-KM73TBQ4.js";
-import "./chunk-MPHPFVKK.js";
-import "./chunk-AXMWHKXA.js";
-import {
-  getToolCallPreparations
-} from "./chunk-GLCZKT5V.js";
-import "./chunk-GJJQV4PY.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-FPGTNKCP.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-EFIMD5VA.js";
+import "./chunk-4AOVQPJU.js";
+import "./chunk-PZW46OTB.js";
+import "./chunk-YBHUXEC6.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
+  getActiveInteractionSpan,
   initializeTelemetry,
+  redactUrlCredentials,
   runInToolSpanContext,
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-E5BWLU5J.js";
+} from "./chunk-N4SVADAV.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-L2GTEEEU.js";
+import {
+  sessionIdContext
+} from "./chunk-K5IDV3PC.js";
 import {
   Storage,
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-HOSVOUDK.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-CZXQ4UZA.js";
+import "./chunk-MELQSJOU.js";
 import {
   runExitCleanup
-} from "./chunk-J7DNMZFO.js";
+} from "./chunk-OR64CU46.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -1650,8 +1656,12 @@ var MessageEmitter = class extends BaseEmitter {
       }
     });
   }
-  async emitGoalStatus(status) {
-    await this.sendUpdate(buildGoalStatusUpdate(status));
+  async emitGoalStatus(status, goalState) {
+    const update = buildGoalStatusUpdate(status);
+    if (goalState) {
+      update._meta = { ...update._meta, goalState };
+    }
+    await this.sendUpdate(update);
   }
   async emitGoalState(snapshot, cause, previousGoal = null) {
     await this.sendUpdate(buildGoalStateUpdate(snapshot, cause, previousGoal));
@@ -1786,6 +1796,58 @@ var MessageEmitter = class extends BaseEmitter {
   }
 };
 
+// packages/cli/src/acp-integration/session/recovered-goal-update.ts
+init_esbuild_shims();
+async function renderPreparedGoalUpdate(getRuntime, options = {}) {
+  let runtime;
+  try {
+    runtime = await getRuntime();
+  } catch (error) {
+    if (!(error instanceof GoalPersistenceUnavailableError)) throw error;
+    const status = unrestorableGoalStatus(
+      options.replayedRecords,
+      options.bootstrap
+    );
+    return { updates: status ? [buildGoalStatusUpdate(status)] : [] };
+  }
+  const cause = runtime.getRecoveryCause?.();
+  if (!cause) return { updates: [] };
+  const snapshot = runtime.getSnapshot();
+  const publicationKey = goalPublicationKey(snapshot, cause);
+  if (options.hideRuntimeGoal) {
+    return {
+      publicationKey,
+      ...snapshot.goal ? {
+        suppressedGoalId: snapshot.goal.goalId
+      } : {},
+      updates: []
+    };
+  }
+  const bootstrapGoal = options.bootstrap?.goalState?.goal;
+  const bootstrapMatchesRuntime = bootstrapGoal != null && snapshot.goal?.goalId === bootstrapGoal.goalId && snapshot.goal?.revision === bootstrapGoal.revision;
+  return {
+    publicationKey,
+    updates: options.bootstrap && bootstrapMatchesRuntime ? [] : [buildGoalStateUpdate(snapshot, cause, options.previousGoal ?? null)]
+  };
+}
+__name(renderPreparedGoalUpdate, "renderPreparedGoalUpdate");
+function unrestorableGoalStatus(replayedRecords, bootstrap) {
+  const active = (replayedRecords?.length ? findGoalToRestore(collectGoalStatusItemsFromRecords(replayedRecords)) : void 0) ?? bootstrap?.goalStatus;
+  if (!active) return void 0;
+  return {
+    kind: "cleared",
+    condition: active.condition,
+    iterations: active.iterations,
+    ...active.setAt !== void 0 ? { setAt: active.setAt } : {},
+    lastReason: "Goal not restored: its saved state could not be read, so this session is not driving it."
+  };
+}
+__name(unrestorableGoalStatus, "unrestorableGoalStatus");
+function goalPublicationKey(snapshot, cause) {
+  return cause ? `${cause}:${JSON.stringify(snapshot)}` : void 0;
+}
+__name(goalPublicationKey, "goalPublicationKey");
+
 // packages/cli/src/acp-integration/session/SubAgentTracker.ts
 init_esbuild_shims();
 
@@ -3074,6 +3136,7 @@ var DAEMON_INVALID_TOOL_PARAMS_THRESHOLD = 3;
 var PERMISSION_CANCEL_SKIP_MESSAGE = "Skipped because a permission request was cancelled before the user answered; user input is required before continuing.";
 var LOOP_DETECTED_SKIP_MESSAGE = "Skipped because loop detection stopped the current turn before this tool call could run.";
 var LOOP_DETECTED_CONTEXT_MESSAGE = "System: this turn was terminated because the model exceeded tool-call safety limits. Try a different approach on the next turn.";
+var LOOP_DETECTED_TURN_ERROR_MESSAGE = "Tool-call loop protection stopped this turn. The session is still available; send a more specific instruction to continue.";
 var TOOL_EXECUTION_CANCELLED_MESSAGE = "Tool execution was cancelled.";
 var TOOL_POST_EXECUTION_CANCELLED_MESSAGE = "The tool had already completed; its output was discarded.";
 function createDaemonToolLoopState(repeatedToolFailureMode) {
@@ -3142,6 +3205,7 @@ __name(recordRepeatedToolFailureDecision, "recordRepeatedToolFailureDecision");
 function recordDaemonLoopDetected(config, promptId, loopType, message, loopState, options = {}) {
   if (!loopState.loopDetected) {
     loopState.loopDetected = true;
+    loopState.loopType = loopType;
     debugLogger6.warn(message);
     try {
       logLoopDetected(
@@ -3159,6 +3223,25 @@ function recordDaemonLoopDetected(config, promptId, loopType, message, loopState
   return true;
 }
 __name(recordDaemonLoopDetected, "recordDaemonLoopDetected");
+function createLoopDetectedTurnError(loopState) {
+  return new RequestError(-32603, LOOP_DETECTED_TURN_ERROR_MESSAGE, {
+    code: "LOOP_DETECTED",
+    errorKind: "loop_detected",
+    ...loopState.loopType ? { loopType: loopState.loopType } : {}
+  });
+}
+__name(createLoopDetectedTurnError, "createLoopDetectedTurnError");
+function cancelledOrThrowLoopDetected(signal, loopState) {
+  if (signal.aborted) return "cancelled";
+  throw createLoopDetectedTurnError(loopState);
+}
+__name(cancelledOrThrowLoopDetected, "cancelledOrThrowLoopDetected");
+function isLoopDetectedTurnError(error) {
+  if (!(error instanceof RequestError)) return false;
+  const data = error.data;
+  return typeof data === "object" && data !== null && data.code === "LOOP_DETECTED";
+}
+__name(isLoopDetectedTurnError, "isLoopDetectedTurnError");
 function recordDaemonToolCalls(config, promptId, loopState, calls) {
   if (!loopState || loopState.loopDetected)
     return loopState?.loopDetected ?? false;
@@ -3422,14 +3505,16 @@ var TodoStopGuardClaimTimeoutError = class extends Error {
   }
 };
 function beginChannelDeliveryResponseBlock(capture) {
-  if (!capture) return void 0;
-  capture.finalText = "";
+  capture?.agentOutput.beginResponse();
+  if (!capture?.channelDelivery) return void 0;
+  capture.channelDelivery.finalText = "";
   return [];
 }
 __name(beginChannelDeliveryResponseBlock, "beginChannelDeliveryResponseBlock");
 function commitChannelDeliveryResponseBlock(capture, responseBlock, hasFunctionCalls) {
-  if (capture && responseBlock && !hasFunctionCalls) {
-    capture.finalText = responseBlock.join("");
+  capture?.agentOutput.commitResponse(hasFunctionCalls);
+  if (capture?.channelDelivery && responseBlock && !hasFunctionCalls) {
+    capture.channelDelivery.finalText = responseBlock.join("");
   }
 }
 __name(commitChannelDeliveryResponseBlock, "commitChannelDeliveryResponseBlock");
@@ -3481,28 +3566,6 @@ function resolveHomeLoopResolverRoots({
   };
 }
 __name(resolveHomeLoopResolverRoots, "resolveHomeLoopResolverRoots");
-function computeInitialTurnFromHistory(records, sessionId) {
-  let maxPromptTurn = 0;
-  let userMessageCount = 0;
-  const promptIdPrefix = `${sessionId}########`;
-  for (const record of records) {
-    if (record.sessionId === sessionId && isUserPromptRecord(record)) {
-      userMessageCount += 1;
-    }
-    for (const promptId of getRecordPromptIds(record)) {
-      if (!promptId.startsWith(promptIdPrefix)) {
-        continue;
-      }
-      const suffix = promptId.slice(promptIdPrefix.length);
-      if (!/^\d+$/.test(suffix)) {
-        continue;
-      }
-      maxPromptTurn = Math.max(maxPromptTurn, Number(suffix));
-    }
-  }
-  return maxPromptTurn > 0 ? maxPromptTurn : userMessageCount;
-}
-__name(computeInitialTurnFromHistory, "computeInitialTurnFromHistory");
 async function fireSessionPermissionDeniedForAutoMode(config, decision, outcome, toolName, toolParams, callId, signal) {
   if (!config.getDisableAllHooks?.() && shouldFirePermissionDeniedForAutoMode(decision, outcome)) {
     try {
@@ -3522,40 +3585,6 @@ async function fireSessionPermissionDeniedForAutoMode(config, decision, outcome,
   }
 }
 __name(fireSessionPermissionDeniedForAutoMode, "fireSessionPermissionDeniedForAutoMode");
-function getRecordPromptIds(record) {
-  const promptIds = [];
-  const recordPromptId = record.promptId;
-  if (typeof recordPromptId === "string") {
-    promptIds.push(recordPromptId);
-  }
-  const telemetryPromptId = readTelemetryPromptId(record.systemPayload);
-  if (telemetryPromptId) {
-    promptIds.push(telemetryPromptId);
-  }
-  return promptIds;
-}
-__name(getRecordPromptIds, "getRecordPromptIds");
-function readTelemetryPromptId(payload) {
-  if (!payload || typeof payload !== "object" || !("uiEvent" in payload)) {
-    return void 0;
-  }
-  const uiEvent = payload.uiEvent;
-  if (!uiEvent || typeof uiEvent !== "object" || !("prompt_id" in uiEvent)) {
-    return void 0;
-  }
-  const promptId = uiEvent.prompt_id;
-  return typeof promptId === "string" ? promptId : void 0;
-}
-__name(readTelemetryPromptId, "readTelemetryPromptId");
-function isUserPromptRecord(record) {
-  if (record.type !== "user" || record.subtype === "realtime_message") {
-    return false;
-  }
-  return record.message?.parts?.some(
-    (part) => typeof part.text === "string" && part.text.trim().length > 0
-  ) ?? false;
-}
-__name(isUserPromptRecord, "isUserPromptRecord");
 var AT_TOKEN_RE = /@([^\s,;!?()[\]{}]+)/g;
 function collectExtensionMentionRefs(text, mentions) {
   for (const match of text.matchAll(AT_TOKEN_RE)) {
@@ -3778,6 +3807,7 @@ var Session = class {
   notificationAbortController = null;
   notificationCompletion = null;
   currentAgentNotificationTaskId = null;
+  currentShellNotificationActive = false;
   persistedBackgroundNotificationTaskIds = /* @__PURE__ */ new Set();
   backgroundNotificationAcceptances = /* @__PURE__ */ new Map();
   activeAgentNotificationAcceptances = /* @__PURE__ */ new Set();
@@ -3788,6 +3818,9 @@ var Session = class {
   goalRuntimeUnsubscribe;
   lastGoalSnapshot;
   lastGoalPublicationKey;
+  // Set only when runtime recovery selected a Goal that initial replay hid.
+  // Keep that Goal private through activation and later progress updates.
+  suppressedRecoveredGoalId;
   goalPublicationTail = Promise.resolve();
   // Set true in dispose(). Guards #drainCronQueue and #drainNotificationQueue
   // against the race where #drainNotificationQueue's finally block kicks off
@@ -3802,6 +3835,7 @@ var Session = class {
   /** The exact status-change callback this Session installed, so dispose can
    *  retract its own and nobody else's. */
   #statusChangeCallback;
+  #shellStatusChangeCallback;
   workflowApprovalAbortController = new AbortController();
   activeTodoPlanRevision;
   // Modular components
@@ -3899,6 +3933,7 @@ var Session = class {
     this.goalHostUnbind = void 0;
     this.lastGoalSnapshot = void 0;
     this.lastGoalPublicationKey = void 0;
+    this.suppressedRecoveredGoalId = void 0;
     this.#bindGoalRuntime();
   }
   /**
@@ -3936,50 +3971,36 @@ var Session = class {
     if (!cause) return;
     await this.#queueGoalState(runtime.getSnapshot(), cause);
   }
-  /**
-   * Render the recovered-Goal cards instead of streaming them.
-   *
-   * The bulk load-replay path (`historyReplay: 'response'`) does not stream
-   * its replay: `loadSession` collects the page into the `LOAD_REPLAY`
-   * envelope and the bridge seeds those updates onto the session's event bus
-   * *after* the ACP `session/load` call returns. A card streamed from inside
-   * that call therefore lands on the bus **before** the replayed
-   * pre-migration `set` card — the reverse of the ordering
-   * {@link publishRecoveredGoalState} exists to produce, leaving the phantom
-   * running goal exactly as it was. Returning the cards lets the caller
-   * append them to the envelope, after the replay page.
-   *
-   * Appending after a truncated page (`hasMore`) is still correct: paging
-   * drops the oldest records, so the authoritative state belongs last either
-   * way.
-   *
-   * Marks the publication as delivered, so the runtime subscription cannot
-   * emit a duplicate card for the same `(cause, snapshot)` once the session
-   * goes live.
-   */
   async renderRecoveredGoalUpdates(replayedRecords) {
     if (this.disposed || this.closing) return [];
-    let runtime;
-    try {
-      runtime = await this.config.getGoalRuntimeReady();
-    } catch (error) {
-      if (!(error instanceof GoalPersistenceUnavailableError)) throw error;
-      const status = this.#unrestorableGoalStatus(replayedRecords);
-      return status ? [buildGoalStatusUpdate(status)] : [];
+    const rendered = await renderPreparedGoalUpdate(
+      () => this.config.getGoalRuntimeReady(),
+      {
+        ...replayedRecords ? { replayedRecords } : {},
+        previousGoal: this.lastGoalSnapshot?.goal ?? null
+      }
+    );
+    if (rendered.publicationKey && rendered.publicationKey === this.lastGoalPublicationKey) {
+      return [];
     }
-    const cause = runtime.getRecoveryCause?.();
-    if (!cause) return [];
-    const snapshot = runtime.getSnapshot();
-    const publicationKey = this.#goalPublicationKey(snapshot, cause);
-    if (publicationKey === this.lastGoalPublicationKey) return [];
-    this.lastGoalPublicationKey = publicationKey;
-    return [
-      buildGoalStateUpdate(
-        snapshot,
-        cause,
-        this.lastGoalSnapshot?.goal ?? null
-      )
-    ];
+    this.primeRecoveredGoalPublication(rendered.publicationKey);
+    return rendered.updates;
+  }
+  primeRecoveredGoalPublication(publicationKey, suppressedGoalId) {
+    if (publicationKey) this.lastGoalPublicationKey = publicationKey;
+    this.suppressedRecoveredGoalId = suppressedGoalId;
+  }
+  #suppressRecoveredGoalUpdate(snapshot) {
+    const suppressedGoalId = this.suppressedRecoveredGoalId;
+    if (!suppressedGoalId) return false;
+    const goal = snapshot.goal;
+    if (goal?.goalId === suppressedGoalId) return true;
+    if (goal === null) {
+      this.suppressedRecoveredGoalId = void 0;
+      return true;
+    }
+    this.suppressedRecoveredGoalId = void 0;
+    return false;
   }
   /**
    * Emit a trailing `cleared` card for an active legacy goal the runtime
@@ -4012,11 +4033,9 @@ var Session = class {
       lastReason: "Goal not restored: its saved state could not be read, so this session is not driving it."
     };
   }
-  #goalPublicationKey(snapshot, cause) {
-    return cause ? `${cause}:${JSON.stringify(snapshot)}` : void 0;
-  }
   async #publishGoalState(snapshot, cause, previousGoal = this.lastGoalSnapshot?.goal ?? null) {
-    const publicationKey = this.#goalPublicationKey(snapshot, cause);
+    if (this.#suppressRecoveredGoalUpdate(snapshot)) return;
+    const publicationKey = goalPublicationKey(snapshot, cause);
     if (publicationKey && publicationKey === this.lastGoalPublicationKey) {
       return;
     }
@@ -4785,6 +4804,10 @@ var Session = class {
     for (const taskId of notificationIds) {
       holds.push({ category: "notification", id: taskId });
     }
+    const shellActive = this.config.getBackgroundShellRegistry().hasRunningEntries() || this.notificationQueue.some((item) => item.kind === "shell") || this.currentShellNotificationActive;
+    if (shellActive) {
+      holds.push({ category: "shell", id: "background-shells" });
+    }
     return holds;
   }
   #activeWorkChanged() {
@@ -4912,7 +4935,12 @@ var Session = class {
       this.#statusChangeCallback = void 0;
     }
     this.config.getMonitorRegistry().setNotificationCallback(void 0);
-    this.config.getBackgroundShellRegistry().setNotificationCallback(void 0);
+    const shellRegistry = this.config.getBackgroundShellRegistry();
+    shellRegistry.setNotificationCallback(void 0);
+    if (this.#shellStatusChangeCallback) {
+      shellRegistry.clearStatusChangeCallback(this.#shellStatusChangeCallback);
+      this.#shellStatusChangeCallback = void 0;
+    }
     this.config.getChatRecordingService()?.setTitleRecordedCallback(void 0);
     this.unsubscribeChatRecordingFailure?.();
     this.unsubscribeChatRecordingFailure = void 0;
@@ -4940,22 +4968,25 @@ var Session = class {
    * Delegates to HistoryReplayer for consistent event emission.
    */
   primeTurnFromHistory(records) {
-    for (const record of records) {
-      if (record.subtype !== "notification") continue;
-      const backgroundTask = record.systemPayload?.backgroundTask;
-      if (typeof backgroundTask?.taskId === "string") {
-        this.persistedBackgroundNotificationTaskIds.add(backgroundTask.taskId);
-      }
-    }
-    this.turn = Math.max(
-      this.turn,
-      computeInitialTurnFromHistory(records, this.config.getSessionId())
+    const turnState = collectSessionTurnState(
+      records,
+      this.config.getSessionId()
     );
+    this.primeTurnState(
+      turnState.initialTurn,
+      turnState.backgroundNotificationTaskIds
+    );
+  }
+  primeTurnState(initialTurn, backgroundNotificationTaskIds) {
+    for (const taskId of backgroundNotificationTaskIds) {
+      this.persistedBackgroundNotificationTaskIds.add(taskId);
+    }
+    this.turn = Math.max(this.turn, initialTurn);
   }
-  async replayHistory(records, gaps) {
+  async replayHistory(records, gaps, options) {
     this.primeTurnFromHistory(records);
     try {
-      await this.historyReplayer.replay(records, gaps);
+      await this.historyReplayer.replay(records, gaps, options);
     } finally {
       this.activeTodoPlanRevision = void 0;
     }
@@ -5280,21 +5311,37 @@ var Session = class {
     }
     this.duplicateProviderToolCallResponseIds.clear();
     const channelDelivery = parsePromptChannelDelivery(params);
-    const channelDeliveryCapture = channelDelivery ? { finalText: "" } : void 0;
+    const responseCapture = {
+      ...channelDelivery ? { channelDelivery: { finalText: "" } } : {},
+      agentOutput: new AgentOutputMessageCapture(this.config)
+    };
+    const channelPromptTurn = params._meta?.[CHANNEL_PROMPT_META_KEY] === true;
     let resolveCompletion;
     this.pendingPromptCompletion = new Promise((resolve6) => {
       resolveCompletion = resolve6;
     });
+    let rejectedByLoopProtection = false;
     let promptResult;
     let promptFailed = false;
     try {
       const result = await this.#executePrompt(
         params,
         pendingSend,
-        channelDeliveryCapture,
+        responseCapture,
         invocationContext,
         modelPrompt,
-        goalTurn
+        // Channel turns are non-interactive deliveries: like cron,
+        // background-notification, and goal turns they keep the graceful
+        // end-turn handling so the collected response text is still
+        // delivered. Only the authenticated CHANNEL_PROMPT_META_KEY turns
+        // sent by the channel bridges qualify; the delivery meta alone
+        // schedules the delivery but keeps the foreground rejection. Goal
+        // turns bypass the bridge entirely, so a rejection there would
+        // settle the turn as failed and pause the goal without any
+        // turn_error ever being published.
+        !channelPromptTurn && goalTurn === void 0,
+        goalTurn,
+        channelPromptTurn
       );
       promptResult = result;
       releasePendingSend();
@@ -5308,7 +5355,7 @@ var Session = class {
           source: "prompt",
           target: channelDelivery.target,
           text: normalizeChannelDeliveryText(
-            channelDeliveryCapture?.finalText ?? ""
+            responseCapture.channelDelivery?.finalText ?? ""
           ),
           promptId: channelDelivery.deliveryId
         });
@@ -5321,11 +5368,17 @@ var Session = class {
           errorKind: error.errorKind
         });
       }
+      rejectedByLoopProtection = isLoopDetectedTurnError(error);
       throw error;
     } finally {
       const stillOwnsPendingPrompt = this.pendingPrompt === pendingSend;
       releasePendingSend();
-      const shouldDrainAutomaticQueues = todoStopGuardPreparation.drainSupersededAutomaticQueues || this.todoStopGuardDrainAutomaticQueuesWhenIdle || this.todoStopGuard.blocksUnrelatedAutomaticTurns || this.todoStopGuard.hasCommittedContinuation || this.todoStopGuardQueuedPromptPriority;
+      const shouldDrainAutomaticQueues = (
+        // Loop-detected turns resolved end_turn (and drained) before loop
+        // stops became rejections; keep that invariant on the new path so
+        // queued cron/notification work is not stranded.
+        rejectedByLoopProtection || todoStopGuardPreparation.drainSupersededAutomaticQueues || this.todoStopGuardDrainAutomaticQueuesWhenIdle || this.todoStopGuard.blocksUnrelatedAutomaticTurns || this.todoStopGuard.hasCommittedContinuation || this.todoStopGuardQueuedPromptPriority
+      );
       if (stillOwnsPendingPrompt) {
         this.todoStopGuardDrainAutomaticQueuesWhenIdle = false;
       }
@@ -5463,7 +5516,7 @@ var Session = class {
       }
     })();
   }
-  async #executePrompt(params, pendingSend, channelDeliveryCapture, invocationContext, modelPrompt, goalTurn) {
+  async #executePrompt(params, pendingSend, responseCapture, invocationContext, modelPrompt, rejectOnLoopDetected = false, goalTurn, channelTurn = false) {
     const sessionId = this.config.getSessionId();
     if (invocationContext !== void 0 && invocationContext.sessionId !== sessionId) {
       throw RequestError.invalidParams(
@@ -5478,15 +5531,17 @@ var Session = class {
         () => this.#executePromptInner(
           params,
           pendingSend,
-          channelDeliveryCapture,
+          responseCapture,
           modelPrompt,
-          goalTurn
+          rejectOnLoopDetected,
+          goalTurn,
+          channelTurn
         )
       )
     ), "execute");
     return goalTurn ? goalTurnContext.run(goalTurn.permit, execute) : goalTurnContext.exit(execute);
   }
-  async #executePromptInner(params, pendingSend, channelDeliveryCapture, modelPrompt, goalTurn) {
+  async #executePromptInner(params, pendingSend, responseCapture, modelPrompt, rejectOnLoopDetected = false, goalTurn, channelTurn = false) {
     return Storage.runWithRuntimeBaseDir(
       this.runtimeBaseDir,
       this.config.getWorkingDir(),
@@ -5524,6 +5579,16 @@ var Session = class {
             );
             const isRetry = params.retry === true || params._meta?.[DAEMON_RETRY_META_KEY] === true;
             const isContinue = params._meta?.[DAEMON_CONTINUE_META_KEY] === true;
+            if (!isRetry && !isContinue && goalTurn?.origin !== "runtime") {
+              const interactionSpan = getActiveInteractionSpan();
+              if (interactionSpan) {
+                addAgentInputMessageAttributes(
+                  this.config,
+                  interactionSpan,
+                  promptDisplayText ?? promptText
+                );
+              }
+            }
             let continuationParts = null;
             let strippedOrphanEntries = null;
             let orphanPushCountSnapshot = 0;
@@ -5722,7 +5787,7 @@ ${this.pendingRecoveredAgentsNotice}
             let nextMessage = { role: "user", parts };
             let turnCount = 0;
             const toolLoopState = createDaemonToolLoopState(
-              promptMetadata?.[CHANNEL_PROMPT_META_KEY] === true ? "off" : this.repeatedToolFailureGuardMode
+              channelTurn ? "off" : this.repeatedToolFailureGuardMode
             );
             try {
               while (nextMessage !== null) {
@@ -5742,6 +5807,7 @@ ${this.pendingRecoveredAgentsNotice}
                   pendingSend.signal
                 );
                 let channelDeliveryResponseBlock;
+                let channelDeliveryCheckpoint = 0;
                 try {
                   if (goalTurn) goalTurn.modelStarted = true;
                   const sendResult = await this.#sendMessageStreamWithAutoCompression(
@@ -5760,8 +5826,8 @@ ${this.pendingRecoveredAgentsNotice}
                   }
                   const responseStream = sendResult.responseStream;
                   nextMessage = null;
-                  channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(channelDeliveryCapture);
-                  const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
+                  channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(responseCapture);
+                  channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
                   let streamFailed = false;
                   try {
                     for await (const resp of responseStream) {
@@ -5781,10 +5847,14 @@ ${this.pendingRecoveredAgentsNotice}
                             part.thought
                           );
                           if (!part.thought) {
+                            responseCapture.agentOutput.appendText(part.text);
                             channelDeliveryResponseBlock?.push(part.text);
                             messageDisplay?.addChunk(part.text);
                           }
                         }
+                        responseCapture.agentOutput.observeFinishReason(
+                          candidate.finishReason
+                        );
                       }
                       if (resp.type === "chunk" /* CHUNK */ && resp.value.usageMetadata) {
                         usageMetadata = resp.value.usageMetadata;
@@ -5797,6 +5867,9 @@ ${this.pendingRecoveredAgentsNotice}
                         }
                       }
                       if (resp.type === "retry" /* RETRY */ || resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                        responseCapture.agentOutput.restartAttempt(
+                          resp.type === "retry" /* RETRY */ && resp.isContinuation === true
+                        );
                         if (resp.type === "model_fallback" /* MODEL_FALLBACK */ || !resp.isContinuation) {
                           if (channelDeliveryResponseBlock) {
                             channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
@@ -5857,7 +5930,7 @@ ${this.pendingRecoveredAgentsNotice}
                   await messageDisplay?.finish();
                 }
                 commitChannelDeliveryResponseBlock(
-                  channelDeliveryCapture,
+                  responseCapture,
                   channelDeliveryResponseBlock,
                   functionCalls.length > 0
                 );
@@ -5901,14 +5974,16 @@ ${this.pendingRecoveredAgentsNotice}
                     pendingSend.signal,
                     promptId,
                     toolLoopState,
-                    onFullTurnModel
+                    onFullTurnModel,
+                    rejectOnLoopDetected
                   );
                   nextMessage = nextAfterTools.message;
                   if (nextAfterTools.stoppedByRepeatedToolFailure) {
                     return {
-                      stopReason: getAbortAwareEndTurnStopReason(
-                        pendingSend.signal
-                      )
+                      stopReason: rejectOnLoopDetected ? cancelledOrThrowLoopDetected(
+                        pendingSend.signal,
+                        toolLoopState
+                      ) : getAbortAwareEndTurnStopReason(pendingSend.signal)
                     };
                   }
                   if (toolRun.loopDetected) {
@@ -5918,9 +5993,10 @@ ${this.pendingRecoveredAgentsNotice}
                       pendingSend.signal
                     );
                     return {
-                      stopReason: getAbortAwareEndTurnStopReason(
-                        pendingSend.signal
-                      )
+                      stopReason: rejectOnLoopDetected ? cancelledOrThrowLoopDetected(
+                        pendingSend.signal,
+                        toolLoopState
+                      ) : getAbortAwareEndTurnStopReason(pendingSend.signal)
                     };
                   }
                 }
@@ -5928,15 +6004,22 @@ ${this.pendingRecoveredAgentsNotice}
               if (this.messageRewriter) {
                 await this.messageRewriter.waitForPendingRewrites();
               }
-              return await this.#handleStopHookLoop(
+              const result = await this.#handleStopHookLoop(
                 pendingSend,
                 promptId,
                 hooksEnabled,
                 messageBus,
                 true,
                 fullTurnModelOverride,
-                channelDeliveryCapture
+                responseCapture,
+                rejectOnLoopDetected
               );
+              if (result.stopReason !== "cancelled") {
+                responseCapture.agentOutput.writeToSpan(
+                  getActiveInteractionSpan()
+                );
+              }
+              return result;
             } finally {
               logConversationFinishedEvent(
                 this.config,
@@ -5957,7 +6040,7 @@ ${this.pendingRecoveredAgentsNotice}
       }
     );
   }
-  async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride, channelDeliveryCapture) {
+  async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride, responseCapture, rejectOnLoopDetected = false) {
     const stopHookBlockingCap = this.config.getStopHookBlockingCap();
     let stopHookIterationCount = 0;
     let stopHookReasons = [];
@@ -6017,7 +6100,8 @@ ${this.pendingRecoveredAgentsNotice}
             {
               onFullTurnModel,
               getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
-              channelDeliveryCapture
+              responseCapture,
+              rejectOnLoopDetected
             }
           );
           if (continuation2.kind === "terminal") {
@@ -6101,7 +6185,8 @@ ${this.pendingRecoveredAgentsNotice}
               {
                 onFullTurnModel,
                 getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
-                channelDeliveryCapture
+                responseCapture,
+                rejectOnLoopDetected
               }
             );
             if (continuation2.kind === "terminal") {
@@ -6200,7 +6285,8 @@ ${this.pendingRecoveredAgentsNotice}
           } : {},
           onFullTurnModel,
           getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
-          channelDeliveryCapture
+          responseCapture,
+          rejectOnLoopDetected
         }
       );
       if (continuation.supersededAutomaticContinuation && externalReason) {
@@ -6267,6 +6353,7 @@ ${this.pendingRecoveredAgentsNotice}
         pendingSend.signal
       );
       let channelDeliveryResponseBlock;
+      let channelDeliveryCheckpoint = 0;
       let providerSendChat;
       let userContentPushCountBeforeSend = 0;
       try {
@@ -6497,9 +6584,9 @@ ${this.pendingRecoveredAgentsNotice}
         const responseStream = sendResult.responseStream;
         nextMessage = null;
         channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(
-          options.channelDeliveryCapture
+          options.responseCapture
         );
-        const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
+        channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
         initialSend = false;
         if (guardForThisSend) {
           const guardCommitted = this.todoStopGuard.commitContinuation(
@@ -6531,10 +6618,14 @@ ${this.pendingRecoveredAgentsNotice}
                 part.thought
               );
               if (!part.thought) {
+                options.responseCapture?.agentOutput.appendText(part.text);
                 channelDeliveryResponseBlock?.push(part.text);
                 messageDisplay?.addChunk(part.text);
               }
             }
+            options.responseCapture?.agentOutput.observeFinishReason(
+              candidate.finishReason
+            );
           }
           if (response.type === "chunk" /* CHUNK */ && response.value.usageMetadata) {
             usageMetadata = response.value.usageMetadata;
@@ -6547,6 +6638,9 @@ ${this.pendingRecoveredAgentsNotice}
             }
           }
           if (response.type === "retry" /* RETRY */ || response.type === "model_fallback" /* MODEL_FALLBACK */) {
+            options.responseCapture?.agentOutput.restartAttempt(
+              response.type === "retry" /* RETRY */ && response.isContinuation === true
+            );
             if (response.type === "model_fallback" /* MODEL_FALLBACK */ || !response.isContinuation) {
               if (channelDeliveryResponseBlock) {
                 channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
@@ -6609,7 +6703,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
       }
       commitChannelDeliveryResponseBlock(
-        options.channelDeliveryCapture,
+        options.responseCapture,
         channelDeliveryResponseBlock,
         functionCalls.length > 0
       );
@@ -6633,7 +6727,7 @@ ${this.pendingRecoveredAgentsNotice}
             options.onFullTurnModel
           )
         );
-        if (toolRun.stopAfterPermissionCancel || toolRun.loopDetected || pendingSend.signal.aborted) {
+        if (toolRun.stopAfterPermissionCancel || pendingSend.signal.aborted) {
           this.todoStopGuard.suspend();
           await this.#preserveStoppedToolRun(toolRun, pendingSend.signal);
           return {
@@ -6642,12 +6736,25 @@ ${this.pendingRecoveredAgentsNotice}
             ...supersededAutomaticContinuation ? { supersededAutomaticContinuation: true } : {}
           };
         }
+        if (toolRun.loopDetected) {
+          this.todoStopGuard.suspend();
+          await this.#preserveStoppedToolRun(toolRun, pendingSend.signal);
+          return {
+            kind: "terminal",
+            // Only the foreground chain rejects a loop-detected stop; cron
+            // and background-notification turns keep the graceful end-turn
+            // handling they had before loop stops became rejections.
+            stopReason: options.rejectOnLoopDetected ? cancelledOrThrowLoopDetected(pendingSend.signal, toolLoopState) : getAbortAwareEndTurnStopReason(pendingSend.signal),
+            ...supersededAutomaticContinuation ? { supersededAutomaticContinuation: true } : {}
+          };
+        }
         const nextAfterTools = await this.#buildNextMessageAfterToolRun(
           toolRun,
           pendingSend.signal,
           toolPromptId,
           toolLoopState,
-          options.onFullTurnModel
+          options.onFullTurnModel,
+          options.rejectOnLoopDetected ?? false
         );
         nextMessage = nextAfterTools.message;
         if (nextAfterTools.hadMidTurnUserInput) {
@@ -6952,7 +7059,7 @@ ${this.pendingRecoveredAgentsNotice}
     );
     await this.messageRewriter?.waitForPendingRewrites();
   }
-  async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, toolLoopState, onFullTurnModel) {
+  async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, toolLoopState, onFullTurnModel, rejectOnLoopDetected = false) {
     if (toolRun.loopDetected) {
       debugLogger6.debug("Stopping ACP turn after daemon loop detection.");
       return { message: null, hadMidTurnUserInput: false };
@@ -7042,14 +7149,16 @@ ${this.pendingRecoveredAgentsNotice}
         toolLoopState,
         { recordToQwenLogger: false }
       );
-      try {
-        await this.messageEmitter.emitAgentMessage(
-          REPEATED_TOOL_FAILURE_STOP_MESSAGE
-        );
-      } catch (error) {
-        debugLogger6.warn(
-          `Failed to emit repeated tool failure stop message: ${this.#formatError(error)}`
-        );
+      if (!rejectOnLoopDetected) {
+        try {
+          await this.messageEmitter.emitAgentMessage(
+            REPEATED_TOOL_FAILURE_STOP_MESSAGE
+          );
+        } catch (error) {
+          debugLogger6.warn(
+            `Failed to emit repeated tool failure stop message: ${this.#formatError(error)}`
+          );
+        }
       }
       return {
         message: null,
@@ -7486,7 +7595,10 @@ ${this.pendingRecoveredAgentsNotice}
         const promptId = this.config.getSessionId() + "########cron" + Date.now();
         let cronHadError = false;
         let cronCompleted = false;
-        const channelDeliveryCapture = item.delivery ? { finalText: "" } : void 0;
+        const responseCapture = {
+          ...item.delivery ? { channelDelivery: { finalText: "" } } : {},
+          agentOutput: new AgentOutputMessageCapture(this.config)
+        };
         await withInteractionSpan(
           this.config,
           {
@@ -7599,7 +7711,7 @@ ${this.pendingRecoveredAgentsNotice}
                   return;
                 }
                 const responseStream = sendResult.responseStream;
-                const channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(channelDeliveryCapture);
+                const channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(responseCapture);
                 const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
                 if (loopTick && turnCount === 1) {
                   this.loopTickResolver?.markDelivered();
@@ -7625,10 +7737,14 @@ ${this.pendingRecoveredAgentsNotice}
                           part.thought
                         );
                         if (!part.thought) {
+                          responseCapture.agentOutput.appendText(part.text);
                           channelDeliveryResponseBlock?.push(part.text);
                           messageDisplay?.addChunk(part.text);
                         }
                       }
+                      responseCapture.agentOutput.observeFinishReason(
+                        candidate.finishReason
+                      );
                     }
                     if (resp.type === "chunk" /* CHUNK */ && resp.value.usageMetadata) {
                       usageMetadata = resp.value.usageMetadata;
@@ -7641,6 +7757,9 @@ ${this.pendingRecoveredAgentsNotice}
                       }
                     }
                     if (resp.type === "retry" /* RETRY */ || resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                      responseCapture.agentOutput.restartAttempt(
+                        resp.type === "retry" /* RETRY */ && resp.isContinuation === true
+                      );
                       if (resp.type === "model_fallback" /* MODEL_FALLBACK */ || !resp.isContinuation) {
                         if (channelDeliveryResponseBlock) {
                           channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
@@ -7669,7 +7788,7 @@ ${this.pendingRecoveredAgentsNotice}
                   }
                 }
                 commitChannelDeliveryResponseBlock(
-                  channelDeliveryCapture,
+                  responseCapture,
                   channelDeliveryResponseBlock,
                   functionCalls.length > 0
                 );
@@ -7720,7 +7839,7 @@ ${this.pendingRecoveredAgentsNotice}
                   void 0,
                   false,
                   void 0,
-                  channelDeliveryCapture
+                  responseCapture
                 );
                 stopReason = guardStop.stopReason;
                 if (guardStop.stopReason === "max_tokens") {
@@ -7753,6 +7872,11 @@ ${this.pendingRecoveredAgentsNotice}
                 )
               );
             }
+            if (!ac.signal.aborted && !cronHadError) {
+              responseCapture.agentOutput.writeToSpan(
+                getActiveInteractionSpan()
+              );
+            }
           },
           () => ac.signal.aborted ? "cancelled" : cronHadError ? "error" : "ok"
         );
@@ -7763,7 +7887,7 @@ ${this.pendingRecoveredAgentsNotice}
             source: "scheduled",
             target: item.delivery.target,
             text: normalizeChannelDeliveryText(
-              channelDeliveryCapture?.finalText ?? ""
+              responseCapture.channelDelivery?.finalText ?? ""
             ),
             taskId: item.taskId,
             firedAt: item.firedAt
@@ -7835,6 +7959,10 @@ ${this.pendingRecoveredAgentsNotice}
       });
     });
     const shellRegistry = this.config.getBackgroundShellRegistry();
+    this.#shellStatusChangeCallback = () => {
+      this.#activeWorkChanged();
+    };
+    shellRegistry.setStatusChangeCallback(this.#shellStatusChangeCallback);
     shellRegistry.setNotificationCallback((displayText, modelText, meta) => {
       const entry = shellRegistry.get(meta.shellId);
       this.#enqueueBackgroundNotification({
@@ -7993,6 +8121,7 @@ ${this.pendingRecoveredAgentsNotice}
         const [item] = this.notificationQueue.splice(nextIndex, 1);
         if (!item) break;
         this.currentAgentNotificationTaskId = item.kind === "agent" ? item.taskId : null;
+        this.currentShellNotificationActive = item.kind === "shell";
         this.#activeWorkChanged();
         try {
           await runWithInvocationContext(
@@ -8004,6 +8133,7 @@ ${this.pendingRecoveredAgentsNotice}
           );
         } finally {
           this.currentAgentNotificationTaskId = null;
+          this.currentShellNotificationActive = false;
           this.#activeWorkChanged();
         }
       }
@@ -10019,6 +10149,13 @@ ${this.pendingRecoveredAgentsNotice}
                 toolName: policyToolName,
                 args: invocation.params,
                 signal: activeToolAbortSignal,
+                // Same identity and execution scope `CoreToolScheduler`
+                // supplies. This is the path daemon ACP sessions actually
+                // take, so without them a host policy that falls back to the
+                // session — or reasons about where the tool runs — sees
+                // neither on every call made here.
+                sessionId: this.config.getSessionId(),
+                cwd: this.config.getTargetDir(),
                 ...invocationContext ? { invocationContext } : {}
               }
             );
@@ -11025,10 +11162,11 @@ ${contextPart.text}`
 init_esbuild_shims();
 var debugLogger7 = createDebugLogger("ACTIVE_WORK");
 var ActiveWorkReporter = class {
-  constructor(send, listSources, intervalMs) {
+  constructor(send, listSources, intervalMs, enabledCategories) {
     this.send = send;
     this.listSources = listSources;
     this.intervalMs = intervalMs;
+    this.#enabledCategories = new Set(enabledCategories);
     this.#timer = setInterval(() => {
       this.#publish();
     }, intervalMs);
@@ -11043,6 +11181,7 @@ var ActiveWorkReporter = class {
   #coalescing = false;
   #timer;
   #disposed = false;
+  #enabledCategories;
   /**
    * Note that some Session's derived state may have changed. Coalesced to
    * one snapshot per microtask so a burst of transitions (an agent finishing
@@ -11090,7 +11229,7 @@ var ActiveWorkReporter = class {
       for (const source of this.listSources()) {
         sessions.push({
           sessionId: source.sessionId,
-          holds: source.collectActiveWorkHolds()
+          holds: source.collectActiveWorkHolds().filter((hold) => this.#enabledCategories.has(hold.category))
         });
       }
     } catch (error) {
@@ -11498,6 +11637,162 @@ function shouldHideInheritedHistory(params) {
   return meta?.[LOAD_REPLAY_HIDE_INHERITED_META_KEY] === true;
 }
 __name(shouldHideInheritedHistory, "shouldHideInheritedHistory");
+function loadRestoreOptions(params) {
+  const hideInheritedHistory = shouldHideInheritedHistory(params);
+  if (!isBulkLoadReplayRequest(params)) {
+    return { replay: { kind: "all", hideInheritedHistory } };
+  }
+  const limit = getLoadReplayPageSize(params);
+  return limit === void 0 ? { replay: { kind: "all", hideInheritedHistory } } : { replay: { kind: "recent", limit, hideInheritedHistory } };
+}
+__name(loadRestoreOptions, "loadRestoreOptions");
+var RESUME_RESTORE_OPTIONS = {
+  replay: { kind: "none" }
+};
+function mapSessionRestoreRequestError(error, sessionId) {
+  const mappedWriterError = mapSessionWriterRequestError(error);
+  if (mappedWriterError !== error) return mappedWriterError;
+  if (error instanceof SessionTranscriptSnapshotUnavailableError) {
+    return new RequestError(-32010, error.message, {
+      errorKind: "transcript_snapshot_unavailable",
+      sessionId
+    });
+  }
+  if (error instanceof SessionTranscriptTooLargeError) {
+    return new RequestError(-32011, error.message, {
+      errorKind: "transcript_too_large",
+      sessionId,
+      snapshotSize: error.snapshotSize,
+      maxBytes: error.maxBytes
+    });
+  }
+  if (error instanceof SessionTranscriptPageTooLargeError) {
+    addDaemonRequestAttribute(
+      "qwen-code.daemon.session_restore.envelope_limit_reason",
+      "bytes"
+    );
+    return new RequestError(-32012, error.message, {
+      errorKind: "transcript_page_too_large",
+      sessionId,
+      pageBytes: error.pageBytes,
+      maxBytes: error.maxBytes
+    });
+  }
+  if (error instanceof HistoryReplayLimitError) {
+    addDaemonRequestAttribute(
+      "qwen-code.daemon.session_restore.envelope_limit_reason",
+      error.reason
+    );
+    return new RequestError(-32012, error.message, {
+      errorKind: "transcript_page_too_large",
+      sessionId,
+      reason: error.reason,
+      observed: error.observed,
+      limit: error.limit
+    });
+  }
+  return error;
+}
+__name(mapSessionRestoreRequestError, "mapSessionRestoreRequestError");
+function validateLoadReplayEnvelope(sessionId, envelope, enforceLimits) {
+  if (!enforceLimits) return;
+  if (envelope.updates.length > LOAD_REPLAY_MAX_UPDATES) {
+    throw new HistoryReplayLimitError(
+      sessionId,
+      "updates",
+      envelope.updates.length,
+      LOAD_REPLAY_MAX_UPDATES
+    );
+  }
+  const pageBytes = Buffer.byteLength(JSON.stringify(envelope), "utf8");
+  if (pageBytes > LOAD_REPLAY_MAX_BYTES) {
+    throw new HistoryReplayLimitError(
+      sessionId,
+      "bytes",
+      pageBytes,
+      LOAD_REPLAY_MAX_BYTES
+    );
+  }
+}
+__name(validateLoadReplayEnvelope, "validateLoadReplayEnvelope");
+function replayGoalBootstrap(projection) {
+  if (projection && !("runtime" in projection)) {
+    const sourceUuid2 = projection.goalRecoverySourceUuid;
+    if (!sourceUuid2) return void 0;
+    if (projection.replay?.records.some((record) => record.uuid === sourceUuid2)) {
+      return void 0;
+    }
+    const replay = projection.replay?.replay;
+    if (isObjectRecord(replay)) {
+      const bootstrap = HistoryReplayer.v2GoalBootstrap(
+        replay["goalState"],
+        replay["goalCause"]
+      );
+      if (bootstrap) return bootstrap;
+    }
+    const sourceRecord2 = projection.goalRecords?.find(
+      (record) => record.uuid === sourceUuid2
+    );
+    if (sourceRecord2?.subtype === "goal_state") {
+      const payload = isObjectRecord(sourceRecord2.systemPayload) ? sourceRecord2.systemPayload : void 0;
+      return HistoryReplayer.v2GoalBootstrap(
+        payload?.["snapshot"],
+        payload?.["cause"]
+      );
+    }
+    const active2 = findGoalToRestore(
+      collectGoalStatusItemsFromRecords(projection.goalRecords ?? [])
+    );
+    return active2 ? {
+      goalStatus: {
+        kind: active2.iterations > 0 ? "checking" : "set",
+        condition: active2.condition,
+        iterations: active2.iterations,
+        ...active2.setAt !== void 0 ? { setAt: active2.setAt } : {}
+      }
+    } : void 0;
+  }
+  const sourceUuid = projection?.replay?.goalRecoverySourceUuid;
+  if (!projection?.replay || !sourceUuid) return void 0;
+  if (projection.replay.records.some((record) => record.uuid === sourceUuid)) {
+    return void 0;
+  }
+  const goalBootstrapRecords = projection.replay.goalBootstrapRecords ?? [];
+  const sourceRecord = goalBootstrapRecords.find(
+    (record) => record.uuid === sourceUuid
+  );
+  if (sourceRecord?.subtype === "goal_state") {
+    const payload = isObjectRecord(sourceRecord.systemPayload) ? sourceRecord.systemPayload : void 0;
+    return HistoryReplayer.v2GoalBootstrap(
+      payload?.["snapshot"],
+      payload?.["cause"]
+    );
+  }
+  const active = findGoalToRestore(
+    collectGoalStatusItemsFromRecords(goalBootstrapRecords)
+  );
+  if (!active) return void 0;
+  return {
+    goalStatus: {
+      kind: active.iterations > 0 ? "checking" : "set",
+      condition: active.condition,
+      iterations: active.iterations,
+      ...active.setAt !== void 0 ? { setAt: active.setAt } : {}
+    }
+  };
+}
+__name(replayGoalBootstrap, "replayGoalBootstrap");
+function replayInitialGoalState(projection) {
+  const replay = projection?.replay?.replay;
+  if (!isObjectRecord(replay)) return {};
+  const initialGoalState = parseGoalSnapshotV2(replay["goalState"]);
+  const initialGoalCause = parseGoalStateCause(replay["goalCause"]);
+  return {
+    ...initialGoalState ? { initialGoalState } : {},
+    ...initialGoalCause ? { initialGoalCause } : {}
+  };
+}
+__name(replayInitialGoalState, "replayInitialGoalState");
 function selectVisibleHistoryRecords(records, hideInheritedHistory) {
   const sourceBoundary = records.findIndex(
     (record) => record.type === "system" && record.subtype === "session_source" && isObjectRecord(record.systemPayload) && record.systemPayload["sourceType"] === "side_task"
@@ -11538,61 +11833,6 @@ function getLoadReplayPageSize(params) {
   return value;
 }
 __name(getLoadReplayPageSize, "getLoadReplayPageSize");
-function isHistoryTurnStart(record) {
-  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 };
-  }
-  let start = records.length - pageSize;
-  for (let i = start; i < records.length; i++) {
-    if (isHistoryTurnStart(records[i])) {
-      start = i;
-      break;
-    }
-  }
-  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 };
-}
-__name(selectRecentHistoryRecords, "selectRecentHistoryRecords");
 function createHiddenWorkspaceMemoryConfig(config) {
   return new Proxy(config, {
     get(target, prop) {
@@ -12988,23 +13228,28 @@ async function deliverClientMcpMessage(connection, serverName, message, sessionI
   return payload;
 }
 __name(deliverClientMcpMessage, "deliverClientMcpMessage");
-function createManagedExternalToolGuard(connection) {
+function createManagedExternalToolGuard(connection, options = {
+  externalProviderAttached: false
+}) {
   return async (context) => {
+    if (!options.externalProviderAttached && !SHELL_EXECUTING_TOOL_NAMES.has(context.toolName)) {
+      return { allowed: true };
+    }
     const invocation = context.invocationContext;
-    if (!invocation) {
+    if (!invocation && options.externalProviderAttached) {
       throw new Error(
         "Managed external tool guard requires a runtime invocation context."
       );
     }
+    const sessionId = invocation?.sessionId ?? context.sessionId;
+    if (typeof sessionId !== "string" || sessionId.length === 0) {
+      throw new Error(
+        "Managed external tool guard requires a session identity."
+      );
+    }
     if (context.signal.aborted) {
       throw new DOMException("Tool invocation aborted", "AbortError");
     }
-    if (context.toolName === ToolNames.AGENT || context.toolName === ToolNames.WORKFLOW || context.toolName === ToolNames.CREATE_SUB_SESSION || context.toolName === ToolNames.SEND_MESSAGE) {
-      return {
-        allowed: false,
-        reason: "Managed external tool guard v1 does not support nested or delegated agent execution."
-      };
-    }
     let rejectOnAbort;
     const aborted = new Promise((_resolve, reject) => {
       rejectOnAbort = reject;
@@ -13019,11 +13264,14 @@ function createManagedExternalToolGuard(connection) {
         connection.extMethod(
           SERVE_CONTROL_EXT_METHODS.externalToolGuardPrepare,
           {
-            sessionId: invocation.sessionId,
-            promptId: invocation.promptId,
+            sessionId,
+            ...invocation ? { promptId: invocation.promptId } : {},
             toolCallId: context.callId,
             toolName: context.toolName,
-            arguments: context.args
+            arguments: context.args,
+            // A sub-agent pinned to a worktree executes here, not in the
+            // session's own directory; the host validates this before use.
+            ...typeof context.cwd === "string" && context.cwd.length > 0 ? { invocationCwd: context.cwd } : {}
           }
         ),
         aborted
@@ -13150,8 +13398,10 @@ async function runAcpAgent(config, settings, argv, options) {
   const privateParentCapability = options === void 0 ? process.env[PRIVATE_ACP_CAPABILITY_ENV] : options.privateParentCapability;
   delete process.env[PRIVATE_ACP_CAPABILITY_ENV];
   delete process.env[PRIVATE_EXTERNAL_TOOL_GUARD_ENV];
+  delete process.env[PRIVATE_EXTERNAL_TOOL_GUARD_PROVIDER_ENV];
   delete process.env[EXTERNAL_TOOL_GUARD_TOKEN_ENV];
   const externalToolGuardRequired = options?.externalToolGuardRequired === true;
+  const externalToolGuardProviderAttached = options?.externalToolGuardProviderAttached === true;
   if (externalToolGuardRequired && privateParentCapability === void 0) {
     throw new Error(
       "Required external tool guard is available only to a private managed ACP parent."
@@ -13233,7 +13483,9 @@ async function runAcpAgent(config, settings, argv, options) {
     });
     connection = new AgentSideConnection((conn) => {
       acpConnection = conn;
-      const managedToolInvocationGuard = externalToolGuardRequired ? createManagedExternalToolGuard(conn) : void 0;
+      const managedToolInvocationGuard = externalToolGuardRequired ? createManagedExternalToolGuard(conn, {
+        externalProviderAttached: externalToolGuardProviderAttached
+      }) : void 0;
       agentInstance = new QwenAgent(
         config,
         settings,
@@ -13241,7 +13493,8 @@ async function runAcpAgent(config, settings, argv, options) {
         conn,
         privateParentCapability,
         sessionWriterLeaseEnabledAtStartup,
-        managedToolInvocationGuard
+        managedToolInvocationGuard,
+        externalToolGuardProviderAttached
       );
       return agentInstance;
     }, stream);
@@ -13547,7 +13800,7 @@ function isOwnerOnlyDirectory(stats) {
 }
 __name(isOwnerOnlyDirectory, "isOwnerOnlyDirectory");
 var QwenAgent = class {
-  constructor(config, settings, argv, connection, expectedPrivateParentCapability, sessionWriterLeaseEnabledAtStartup = false, managedToolInvocationGuard) {
+  constructor(config, settings, argv, connection, expectedPrivateParentCapability, sessionWriterLeaseEnabledAtStartup = false, managedToolInvocationGuard, externalToolGuardProviderAttached = false) {
     this.config = config;
     this.settings = settings;
     this.argv = argv;
@@ -13555,6 +13808,7 @@ var QwenAgent = class {
     this.expectedPrivateParentCapability = expectedPrivateParentCapability;
     this.sessionWriterLeaseEnabledAtStartup = sessionWriterLeaseEnabledAtStartup;
     this.managedToolInvocationGuard = managedToolInvocationGuard;
+    this.externalToolGuardProviderAttached = externalToolGuardProviderAttached;
     if (process.env["QWEN_SERVE_NO_MCP_POOL"] === "1") {
       this.mcpPool = void 0;
       this.workspaceMcpBudget = void 0;
@@ -13649,7 +13903,7 @@ var QwenAgent = class {
     }
   }
   rejectUnsupportedGuardedHiddenAgent(operation) {
-    if (this.managedToolInvocationGuard) {
+    if (this.managedToolInvocationGuard && this.externalToolGuardProviderAttached) {
       throw RequestError.invalidParams(
         void 0,
         `Managed external tool guard v1 does not support ${operation}.`
@@ -14062,7 +14316,7 @@ var QwenAgent = class {
       );
     }
   }
-  async withLiveSessionRestore(sessionId, session, operation) {
+  async withLiveSessionRestore(sessionId, session, options, operation) {
     await session.assertCanStartTurn();
     const config = session.getConfig();
     const releaseGate = session.beginClose();
@@ -14073,12 +14327,12 @@ var QwenAgent = class {
         "restore"
       );
       const recorder = config.getChatRecordingService();
-      const loadAuthoritative = /* @__PURE__ */ __name(() => config.getSessionService().loadSession(sessionId), "loadAuthoritative");
-      const data = recorder ? await recorder.runWithWriteBarrier(loadAuthoritative) : await loadAuthoritative();
-      if (!data) throw new SessionWriterUnavailableError();
-      return await operation(config, data);
+      const readProjection = /* @__PURE__ */ __name(() => config.getSessionService().readLiveRestoreProjection(sessionId, options), "readProjection");
+      const projection = recorder ? await recorder.runWithWriteBarrier(readProjection) : await readProjection();
+      if (!projection) throw new SessionWriterUnavailableError();
+      return await operation(config, projection);
     } catch (error) {
-      throw mapSessionWriterRequestError(error);
+      throw mapSessionRestoreRequestError(error, sessionId);
     } finally {
       releaseGate();
     }
@@ -14105,7 +14359,7 @@ var QwenAgent = class {
       this.pendingConfigCleanup.delete(cleanupKey);
     }
   }
-  async cleanupAfterRequestFailure(error, cleanup) {
+  async cleanupAfterRequestFailure(error, cleanup, sessionId) {
     try {
       await cleanup();
     } catch (cleanupError) {
@@ -14113,7 +14367,7 @@ var QwenAgent = class {
         `Session cleanup failed while preserving the original request error: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`
       );
     }
-    throw mapSessionWriterRequestError(error);
+    throw sessionId ? mapSessionRestoreRequestError(error, sessionId) : mapSessionWriterRequestError(error);
   }
   pendingConfigCleanupKey(runtimeBaseDir, sessionId) {
     return `${path4.resolve(runtimeBaseDir)}\0${sessionId}`;
@@ -14180,6 +14434,12 @@ var QwenAgent = class {
         drainTimeoutMs,
         "close"
       );
+      if (opts?.onlyIfUnheld) {
+        const holds = session.collectActiveWorkHolds();
+        if (holds.length > 0) {
+          return { closed: false, holds };
+        }
+      }
       recorder?.finalize();
       let flushError;
       try {
@@ -14313,7 +14573,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.12-preview.3";
+    const version = "0.21.12";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -14357,12 +14617,17 @@ var QwenAgent = class {
     const activeWorkIntervalMs = activeWorkRequested ? clampActiveWorkIntervalMs(
       requestedActiveWork["intervalMs"]
     ) : void 0;
+    const requestedActiveWorkCategories = activeWorkRequested ? requestedActiveWork["categories"] : void 0;
+    const activeWorkCategories = activeWorkRequested ? Array.isArray(requestedActiveWorkCategories) ? ACTIVE_WORK_HOLD_CATEGORIES.filter(
+      (category) => requestedActiveWorkCategories.includes(category)
+    ) : ACTIVE_WORK_LEGACY_HOLD_CATEGORIES : void 0;
     if (activeWorkIntervalMs !== void 0) {
       this.activeWorkReporter?.dispose();
       this.activeWorkReporter = new ActiveWorkReporter(
         (method, params) => this.connection.extNotification(method, params),
         () => this.sessions.values(),
-        activeWorkIntervalMs
+        activeWorkIntervalMs,
+        activeWorkCategories ?? []
       );
     }
     const responseMeta = {
@@ -14374,7 +14639,7 @@ var QwenAgent = class {
         [ACTIVE_WORK_HEARTBEAT_META_KEY]: {
           v: ACTIVE_WORK_HEARTBEAT_VERSION,
           intervalMs: activeWorkIntervalMs,
-          categories: [...ACTIVE_WORK_HOLD_CATEGORIES]
+          categories: [...activeWorkCategories ?? []]
         }
       } : {}
     };
@@ -14514,6 +14779,7 @@ var QwenAgent = class {
   async loadSessionWithProfiler(params, initialSessionId, profiler) {
     let sessionId = initialSessionId;
     const sessionSource = getSessionSource(params);
+    const restoreOptions = loadRestoreOptions(params);
     const liveSession = this.sessions.get(sessionId);
     if (liveSession) {
       const settings = profiler.timeSync(
@@ -14526,35 +14792,43 @@ var QwenAgent = class {
         return this.withLiveSessionRestore(
           sessionId,
           liveSession,
-          async (config, sessionData) => {
+          restoreOptions,
+          async (config, projection) => {
             const response = profiler.timeSync(
               "response_build",
               () => ({
                 modes: this.buildModesData(config),
                 models: this.buildAvailableModels(config),
                 configOptions: this.buildConfigOptions(config),
-                ...sessionData.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
+                ...projection?.artifactSnapshot ? { artifactSnapshot: projection.artifactSnapshot } : {}
               })
             );
-            const records = sessionData.conversation.messages;
-            const visibleRecords = selectVisibleHistoryRecords(
-              records,
-              shouldHideInheritedHistory(params)
-            );
-            if (visibleRecords.length === 0) return response;
+            const replayPage = projection?.replay;
+            if (!replayPage || replayPage.records.length === 0) return response;
             const bulkReplay = isBulkLoadReplayRequest(params);
-            const replayPage = bulkReplay ? selectRecentHistoryRecords(
-              visibleRecords,
-              getLoadReplayPageSize(params)
-            ) : { records: visibleRecords, hasMore: false };
-            const replay = await collectHistoryReplayUpdates({
-              sessionId,
-              config,
-              records: replayPage.records,
-              gaps: sessionData.historyGaps,
-              cumulativeUsage: createReplayCumulativeUsage(),
-              logger: debugLogger8
-            });
+            const replay = await profiler.time(
+              "history_replay",
+              () => collectHistoryReplayUpdates({
+                sessionId,
+                config,
+                records: replayPage.records,
+                gaps: replayPage.gaps,
+                cumulativeUsage: createReplayCumulativeUsage(),
+                replayState: replayPage.replay,
+                goalBootstrap: replayGoalBootstrap(projection),
+                ...restoreOptions.replay.kind === "recent" ? {
+                  limits: {
+                    maxBytes: LOAD_REPLAY_MAX_BYTES,
+                    maxUpdates: LOAD_REPLAY_MAX_UPDATES
+                  }
+                } : {},
+                logger: debugLogger8
+              })
+            );
+            addDaemonRequestAttribute(
+              "qwen-code.daemon.session_restore.partial_replay",
+              replay.replayError !== void 0
+            );
             if (!bulkReplay) {
               try {
                 for (const update of replay.updates) {
@@ -14568,18 +14842,25 @@ var QwenAgent = class {
               }
               return response;
             }
+            const envelope = {
+              v: LOAD_REPLAY_VERSION,
+              updates: replay.updates,
+              ...replayPage.anchorRecordId ? { anchorRecordId: replayPage.anchorRecordId } : {},
+              ...replay.replayError !== void 0 ? {
+                partial: true,
+                replayError: replay.replayError
+              } : {},
+              ...replayPage.hasMore ? { hasMore: true } : {}
+            };
+            validateLoadReplayEnvelope(
+              sessionId,
+              envelope,
+              restoreOptions.replay.kind === "recent"
+            );
             return {
               ...response,
               _meta: {
-                [LOAD_REPLAY_META_KEY]: {
-                  v: LOAD_REPLAY_VERSION,
-                  updates: replay.updates,
-                  ...replay.replayError !== void 0 ? {
-                    partial: true,
-                    replayError: replay.replayError
-                  } : {},
-                  ...replayPage.hasMore ? { hasMore: true } : {}
-                }
+                [LOAD_REPLAY_META_KEY]: envelope
               }
             };
           }
@@ -14621,13 +14902,32 @@ var QwenAgent = class {
           settings,
           sessionSource,
           sessionId,
-          true
+          true,
+          {},
+          void 0,
+          restoreOptions
         )
       );
-      const sessionData = config.getResumedSessionData();
+      const projection = config.consumeSessionRestoreProjection?.();
+      const suppressRecoveredGoalPresentation = projection?.runtime.goalRecoverySourceUuid !== void 0 && projection.runtime.goalRecoverySourceUuid !== projection.replay?.goalRecoverySourceUuid;
       const bulkReplay = isBulkLoadReplayRequest(params);
-      const replayPageSize = bulkReplay ? getLoadReplayPageSize(params) : void 0;
       let replayEnvelope;
+      const replayUsage = createReplayCumulativeUsage();
+      let recoveredGoalPublicationKey;
+      let suppressedRecoveredGoalId;
+      let streamGoalUpdates = [];
+      let response;
+      const buildResponse = /* @__PURE__ */ __name(() => profiler.timeSync("response_build", () => ({
+        modes: this.buildModesData(config),
+        models: this.buildAvailableModels(config),
+        configOptions: this.buildConfigOptions(config),
+        ...projection?.runtime.artifactSnapshot ? { artifactSnapshot: projection.runtime.artifactSnapshot } : {},
+        ...replayEnvelope ? {
+          _meta: {
+            [LOAD_REPLAY_META_KEY]: replayEnvelope
+          }
+        } : {}
+      })), "buildResponse");
       try {
         await profiler.time("auth", () => this.ensureAuthenticated(config));
         profiler.timeSync(
@@ -14636,98 +14936,165 @@ var QwenAgent = class {
         );
         await profiler.time(
           "session_register",
-          () => this.createAndStoreSession(config, settings, sessionData, {
+          () => this.createAndStoreSession(config, settings, void 0, {
             enableLiveScreenContext: isCompatibleLiveSessionSource(
               sessionSource ?? {}
             ),
-            ...bulkReplay ? { replayHistory: false } : {},
-            beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
-              if (bulkReplay) {
-                const records = sessionData?.conversation.messages;
-                let replayUpdates = [];
-                if (records) {
-                  createdSession.primeTurnFromHistory(records);
-                  const visibleRecords = selectVisibleHistoryRecords(
-                    records,
-                    shouldHideInheritedHistory(params)
-                  );
-                  const replayPage = selectRecentHistoryRecords(
-                    visibleRecords,
-                    replayPageSize
-                  );
-                  const replayUsage = createReplayCumulativeUsage();
-                  const replay = await collectHistoryReplayUpdates({
+            replayHistory: false,
+            prepareBeforeSessionCreate: /* @__PURE__ */ __name(async () => {
+              if (bulkReplay && projection?.replay) {
+                const replay = await profiler.time(
+                  "history_replay",
+                  () => collectHistoryReplayUpdates({
                     sessionId,
                     config,
-                    records: replayPage.records,
-                    gaps: sessionData?.historyGaps,
+                    records: projection.replay.records,
+                    gaps: projection.replay.gaps,
                     cumulativeUsage: replayUsage,
+                    replayState: projection.replay.replay,
+                    goalBootstrap: replayGoalBootstrap(projection),
+                    ...restoreOptions.replay.kind === "recent" ? {
+                      limits: {
+                        maxBytes: LOAD_REPLAY_MAX_BYTES,
+                        maxUpdates: LOAD_REPLAY_MAX_UPDATES
+                      }
+                    } : {},
                     logger: debugLogger8
-                  });
-                  replayUpdates = replay.updates;
-                  copyCumulativeUsage(
-                    createdSession.cumulativeUsage,
-                    replayUsage
-                  );
-                  try {
-                    replayUpdates = replayUpdates.concat(
-                      await createdSession.renderRecoveredGoalUpdates(records)
+                  })
+                );
+                addDaemonRequestAttribute(
+                  "qwen-code.daemon.session_restore.partial_replay",
+                  replay.replayError !== void 0
+                );
+                replayEnvelope = {
+                  v: LOAD_REPLAY_VERSION,
+                  updates: replay.updates,
+                  ...projection.replay.anchorRecordId ? { anchorRecordId: projection.replay.anchorRecordId } : {},
+                  ...replay.replayError !== void 0 ? {
+                    partial: true,
+                    replayError: replay.replayError
+                  } : {},
+                  ...projection.replay.hasMore ? { hasMore: true } : {}
+                };
+                validateLoadReplayEnvelope(
+                  sessionId,
+                  replayEnvelope,
+                  restoreOptions.replay.kind === "recent"
+                );
+              }
+              const goalBootstrap = replayGoalBootstrap(projection);
+              const rendered = await renderPreparedGoalUpdate(
+                () => config.getGoalRuntimePrepared(),
+                {
+                  ...projection?.replay?.records ? { replayedRecords: projection.replay.records } : {},
+                  ...suppressRecoveredGoalPresentation ? { hideRuntimeGoal: true } : {},
+                  ...goalBootstrap ? { bootstrap: goalBootstrap } : {}
+                }
+              ).catch((error) => {
+                if (suppressRecoveredGoalPresentation) throw error;
+                debugLogger8.debug(
+                  `Failed to render recovered Goal state: ${error instanceof Error ? error.message : String(error)}`
+                );
+                return {
+                  publicationKey: void 0,
+                  suppressedGoalId: void 0,
+                  updates: []
+                };
+              });
+              recoveredGoalPublicationKey = rendered.publicationKey;
+              suppressedRecoveredGoalId = rendered.suppressedGoalId;
+              if (!bulkReplay) {
+                streamGoalUpdates = rendered.updates;
+                return;
+              }
+              const goalUpdates = rendered.updates;
+              if (goalUpdates.length > 0) {
+                replayEnvelope ??= {
+                  v: LOAD_REPLAY_VERSION,
+                  updates: []
+                };
+                replayEnvelope.updates.push(...goalUpdates);
+                validateLoadReplayEnvelope(
+                  sessionId,
+                  replayEnvelope,
+                  restoreOptions.replay.kind === "recent"
+                );
+              }
+            }, "prepareBeforeSessionCreate"),
+            beforeSessionCreate: /* @__PURE__ */ __name(() => {
+              response = buildResponse();
+            }, "beforeSessionCreate"),
+            primeSession: /* @__PURE__ */ __name((createdSession) => {
+              profiler.timeSync("runtime_initialize", () => {
+                if (!projection) return;
+                createdSession.primeTurnState(
+                  projection.runtime.initialTurn,
+                  projection.runtime.backgroundNotificationTaskIds
+                );
+                copyCumulativeUsage(
+                  createdSession.cumulativeUsage,
+                  replayUsage
+                );
+                createdSession.primeRecoveredGoalPublication(
+                  recoveredGoalPublicationKey,
+                  suppressedRecoveredGoalId
+                );
+              });
+            }, "primeSession"),
+            beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
+              if (!bulkReplay && projection?.replay) {
+                await profiler.time("history_replay", async () => {
+                  const goalBootstrap = replayGoalBootstrap(projection);
+                  const initialGoalState = replayInitialGoalState(projection);
+                  const hasGoalReplayState = goalBootstrap !== void 0 || initialGoalState.initialGoalState !== void 0 || initialGoalState.initialGoalCause !== void 0;
+                  if (hasGoalReplayState) {
+                    await createdSession.replayHistory(
+                      projection.replay.records,
+                      projection.replay.gaps,
+                      {
+                        ...goalBootstrap ? { goalBootstrap } : {},
+                        ...initialGoalState
+                      }
                     );
-                  } catch (error) {
-                    debugLogger8.debug(
-                      `Failed to render recovered Goal state: ${error instanceof Error ? error.message : String(error)}`
+                  } else {
+                    await createdSession.replayHistory(
+                      projection.replay.records,
+                      projection.replay.gaps
                     );
                   }
-                  if (replay.replayError !== void 0) {
-                    replayEnvelope = {
-                      v: LOAD_REPLAY_VERSION,
-                      updates: replayUpdates,
-                      partial: true,
-                      replayError: replay.replayError,
-                      ...replayPage.hasMore ? { hasMore: true } : {}
-                    };
+                });
+                try {
+                  for (const update of streamGoalUpdates) {
+                    await createdSession.sendUpdate(update);
                   }
-                  replayEnvelope ??= {
-                    v: LOAD_REPLAY_VERSION,
-                    updates: replayUpdates,
-                    ...replayPage.hasMore ? { hasMore: true } : {}
-                  };
+                } catch (error) {
+                  debugLogger8.debug(
+                    `Failed to publish recovered Goal state: ${error instanceof Error ? error.message : String(error)}`
+                  );
                 }
-                replayEnvelope ??= {
-                  v: LOAD_REPLAY_VERSION,
-                  updates: replayUpdates
-                };
               }
-              await this.#restoreWorktreeOnResume(config, createdSession);
-              await this.#restoreBackgroundAgentsOnResume(
-                config,
-                createdSession
-              );
+              await profiler.time("post_replay_services", async () => {
+                await this.#restoreWorktreeOnResume(config, createdSession);
+                await this.#restoreBackgroundAgentsOnResume(
+                  config,
+                  createdSession
+                );
+              });
             }, "beforeStartPostReplayServices")
           })
         );
       } catch (error) {
-        return this.cleanupAfterRequestFailure(error, async () => {
-          if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
-            await this.cleanupUnstoredConfig(config);
-          }
-        });
+        return this.cleanupAfterRequestFailure(
+          error,
+          async () => {
+            if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
+              await this.cleanupUnstoredConfig(config);
+            }
+          },
+          sessionId
+        );
       }
-      return profiler.timeSync("response_build", () => {
-        const response = {
-          modes: this.buildModesData(config),
-          models: this.buildAvailableModels(config),
-          configOptions: this.buildConfigOptions(config),
-          ...sessionData?.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
-        };
-        if (!replayEnvelope) return response;
-        return {
-          ...response,
-          _meta: {
-            [LOAD_REPLAY_META_KEY]: replayEnvelope
-          }
-        };
-      });
+      return response;
     } finally {
       releaseStartingSessionId();
     }
@@ -14765,13 +15132,14 @@ var QwenAgent = class {
         return this.withLiveSessionRestore(
           sessionId,
           liveSession,
-          async (config, sessionData) => profiler.timeSync(
+          RESUME_RESTORE_OPTIONS,
+          async (config, projection) => profiler.timeSync(
             "response_build",
             () => ({
               modes: this.buildModesData(config),
               models: this.buildAvailableModels(config),
               configOptions: this.buildConfigOptions(config),
-              ...sessionData.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
+              ...projection?.artifactSnapshot ? { artifactSnapshot: projection.artifactSnapshot } : {}
             })
           )
         );
@@ -14808,9 +15176,14 @@ var QwenAgent = class {
           settings,
           sessionSource,
           sessionId,
-          true
+          true,
+          {},
+          void 0,
+          RESUME_RESTORE_OPTIONS
         )
       );
+      const projection = config.consumeSessionRestoreProjection?.();
+      let response;
       try {
         await profiler.time("auth", () => this.ensureAuthenticated(config));
         profiler.timeSync(
@@ -14819,51 +15192,51 @@ var QwenAgent = class {
         );
         await profiler.time(
           "session_register",
-          () => this.createAndStoreSession(
-            config,
-            settings,
-            config.getResumedSessionData(),
-            {
-              enableLiveScreenContext: isCompatibleLiveSessionSource(
-                sessionSource ?? {}
-              ),
-              replayHistory: false,
-              beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
-                try {
-                  await createdSession.publishRecoveredGoalState(
-                    config.getResumedSessionData()?.conversation.messages
-                  );
-                } catch (error) {
-                  debugLogger8.debug(
-                    `Failed to publish recovered Goal state: ${error instanceof Error ? error.message : String(error)}`
-                  );
-                }
+          () => this.createAndStoreSession(config, settings, void 0, {
+            enableLiveScreenContext: isCompatibleLiveSessionSource(
+              sessionSource ?? {}
+            ),
+            replayHistory: false,
+            beforeSessionCreate: /* @__PURE__ */ __name(() => {
+              response = profiler.timeSync("response_build", () => ({
+                modes: this.buildModesData(config),
+                models: this.buildAvailableModels(config),
+                configOptions: this.buildConfigOptions(config),
+                ...projection?.runtime.artifactSnapshot ? { artifactSnapshot: projection.runtime.artifactSnapshot } : {}
+              }));
+            }, "beforeSessionCreate"),
+            primeSession: /* @__PURE__ */ __name((createdSession) => {
+              profiler.timeSync("runtime_initialize", () => {
+                if (!projection) return;
+                createdSession.primeTurnState(
+                  projection.runtime.initialTurn,
+                  projection.runtime.backgroundNotificationTaskIds
+                );
+              });
+            }, "primeSession"),
+            beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
+              await profiler.time("post_replay_services", async () => {
                 await this.#restoreWorktreeOnResume(config, createdSession);
                 await this.#restoreBackgroundAgentsOnResume(
                   config,
                   createdSession
                 );
-              }, "beforeStartPostReplayServices")
-            }
-          )
+              });
+            }, "beforeStartPostReplayServices")
+          })
         );
       } catch (error) {
-        return this.cleanupAfterRequestFailure(error, async () => {
-          if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
-            await this.cleanupUnstoredConfig(config);
-          }
-        });
+        return this.cleanupAfterRequestFailure(
+          error,
+          async () => {
+            if (this.sessions.get(config.getSessionId())?.getConfig() !== config) {
+              await this.cleanupUnstoredConfig(config);
+            }
+          },
+          sessionId
+        );
       }
-      const sessionData = config.getResumedSessionData();
-      return profiler.timeSync(
-        "response_build",
-        () => ({
-          modes: this.buildModesData(config),
-          models: this.buildAvailableModels(config),
-          configOptions: this.buildConfigOptions(config),
-          ...sessionData?.artifactSnapshot ? { artifactSnapshot: sessionData.artifactSnapshot } : {}
-        })
-      );
+      return response;
     } finally {
       releaseStartingSessionId();
     }
@@ -15028,13 +15401,23 @@ var QwenAgent = class {
     const suppliedContext = meta[INVOCATION_CONTEXT_META_KEY];
     const suppliedModelPrompt = meta[DAEMON_MODEL_PROMPT_META_KEY];
     const suppliedPromptDisplayText = meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+    const suppliedChannelPrompt = meta[CHANNEL_PROMPT_META_KEY];
+    const suppliedChannelDelivery = meta[DAEMON_CHANNEL_DELIVERY_META_KEY];
     delete meta[INVOCATION_CONTEXT_META_KEY];
     delete meta[DAEMON_MODEL_PROMPT_META_KEY];
     delete meta[PRIVATE_PARENT_CAPABILITY_META_KEY];
     delete meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+    delete meta[CHANNEL_PROMPT_META_KEY];
+    delete meta[DAEMON_CHANNEL_DELIVERY_META_KEY];
     if (this.privateParentState === "trusted" && typeof suppliedPromptDisplayText === "string") {
       meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY] = suppliedPromptDisplayText;
     }
+    if (this.privateParentState === "trusted" && suppliedChannelPrompt === true) {
+      meta[CHANNEL_PROMPT_META_KEY] = true;
+    }
+    if (this.privateParentState === "trusted" && suppliedChannelDelivery !== void 0) {
+      meta[DAEMON_CHANNEL_DELIVERY_META_KEY] = suppliedChannelDelivery;
+    }
     if (Object.keys(meta).length > 0) {
       sanitizedParams._meta = meta;
     } else {
@@ -17391,7 +17774,7 @@ var QwenAgent = class {
         );
       case SERVE_CONTROL_EXT_METHODS.workspaceMemoryRememberAvailability:
         return {
-          available: !this.managedToolInvocationGuard && this.config.isManagedMemoryAvailable()
+          available: !(this.managedToolInvocationGuard && this.externalToolGuardProviderAttached) && this.config.isManagedMemoryAvailable()
         };
       case SERVE_CONTROL_EXT_METHODS.workspaceMemoryRemember: {
         this.rejectUnsupportedGuardedHiddenAgent(
@@ -18948,7 +19331,7 @@ var QwenAgent = class {
         return { sessionId, answer: result.text || null };
       }
       case SERVE_CONTROL_EXT_METHODS.sessionForkAgent: {
-        if (this.managedToolInvocationGuard) {
+        if (this.managedToolInvocationGuard && this.externalToolGuardProviderAttached) {
           throw RequestError.invalidParams(
             void 0,
             "Managed external tool guard v1 does not support /fork."
@@ -20195,7 +20578,7 @@ ${outputText}
       throw error;
     }
   }
-  async newSessionConfig(cwd, mcpServers, settings, sessionSource, sessionId, resume, initializeOptions = {}, chatRecording) {
+  async newSessionConfig(cwd, mcpServers, settings, sessionSource, sessionId, resume, initializeOptions = {}, chatRecording, restoreOptions) {
     try {
       this.assertManagedSessionAdmission();
       return await this.runWithPinnedRuntimeBaseDir(settings, cwd, async () => {
@@ -20211,7 +20594,8 @@ ${outputText}
           sessionId,
           resume,
           initializeOptions,
-          chatRecording
+          chatRecording,
+          restoreOptions
         );
       });
     } catch (error) {
@@ -20227,10 +20611,10 @@ ${outputText}
           errorKind: writerError.errorKind
         });
       }
-      throw error;
+      throw sessionId && restoreOptions ? mapSessionRestoreRequestError(error, sessionId) : error;
     }
   }
-  async newSessionConfigInRuntimeContext(cwd, mcpServers, settings, sessionSource, sessionId, resume, initializeOptions = {}, chatRecording) {
+  async newSessionConfigInRuntimeContext(cwd, mcpServers, settings, sessionSource, sessionId, resume, initializeOptions = {}, chatRecording, restoreOptions) {
     const sessionMcpServers = {};
     for (const server of mcpServers) {
       const stdioServer = toStdioServer(server);
@@ -20328,7 +20712,19 @@ ${outputText}
       // not process.exit(1) the shared ACP child and every session on its
       // channel. newSessionConfig maps the throw to a RequestError.
       true,
-      this.managedToolInvocationGuard ? { toolInvocationGuard: this.managedToolInvocationGuard } : void 0
+      this.managedToolInvocationGuard || restoreOptions ? {
+        ...this.managedToolInvocationGuard ? { toolInvocationGuard: this.managedToolInvocationGuard } : {},
+        ...restoreOptions && sessionId ? {
+          sessionRestore: {
+            projectionSource: /* @__PURE__ */ __name((restoreSessionId) => new SessionService(cwd, {
+              runtimeBaseDir: Storage.getRuntimeBaseDir()
+            }).readRestoreProjection(
+              restoreSessionId,
+              restoreOptions
+            ), "projectionSource")
+          }
+        } : {}
+      } : void 0
     );
     if (sessionSource) {
       config.setSessionSource(sessionSource.sourceType, sessionSource.sourceId);
@@ -20465,6 +20861,16 @@ ${outputText}
         { errorKind: "session_id_conflict", sessionId }
       );
     }
+    await options.prepareBeforeSessionCreate?.();
+    this.assertManagedSessionAdmission();
+    if (this.sessions.has(sessionId)) {
+      throw new RequestError(
+        ACP_ERROR_CODES.INVALID_PARAMS,
+        `Session ${sessionId} is already active.`,
+        { errorKind: "session_id_conflict", sessionId }
+      );
+    }
+    options.beforeSessionCreate?.();
     const session = new Session(
       sessionId,
       config,
@@ -20472,10 +20878,14 @@ ${outputText}
       settings,
       () => this.activeWorkReporter?.notifyChanged()
     );
-    this.sessions.set(sessionId, session);
-    this.activeWorkReporter?.notifyChanged();
-    this.initializingConfigs.delete(config);
+    let published = false;
     try {
+      options.primeSession?.(session);
+      config.hydrateSessionRestoreFileHistory?.();
+      this.sessions.set(sessionId, session);
+      published = true;
+      this.activeWorkReporter?.notifyChanged();
+      this.initializingConfigs.delete(config);
       if (options.enableLiveScreenContext) {
         await session.enableLiveScreenContext();
       }
@@ -20502,12 +20912,23 @@ ${outputText}
       }
       await options.beforeStartPostReplayServices?.(session);
       session.installRewriter();
+      config.finalizeSessionRestore?.();
       session.startCronScheduler();
       setTimeout(() => {
         void session.sendAvailableCommandsUpdate();
       }, 0);
       return session;
     } catch (error) {
+      if (!published) {
+        try {
+          session.dispose();
+        } catch (disposeError) {
+          debugLogger8.warn(
+            `Failed to dispose unpublished session ${sessionId}: ${disposeError instanceof Error ? disposeError.message : String(disposeError)}`
+          );
+        }
+        throw error;
+      }
       try {
         await this.discardStoredSessionIfCurrent(sessionId, session, {
           shutdownConfig: false