@qwen-code/qwen-code 0.21.12-preview.1 → 0.21.12-preview.4

package/chunks/{acpAgent-GUV7LTDH.js → acpAgent-7YC6SNIS.js}

@@ -2,11 +2,13 @@
 "use strict";
 import {
   recomputeMcpGating
-} from "./chunk-ZXUMPZRT.js";
+} from "./chunk-OIZWCOYC.js";
+import {
+  classifyApiError
+} from "./chunk-V7RNNPGC.js";
 import {
-  classifyApiError,
   fireSessionDeleteHook
-} from "./chunk-P5Y23G2L.js";
+} from "./chunk-L34XSHIZ.js";
 import {
   EXTENSION_CONTEXT_BUDGET,
   buildExtensionMentionContext,
@@ -16,17 +18,17 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-EAJESCBT.js";
+} from "./chunk-JGD35ZSJ.js";
 import "./chunk-WLML6VIA.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   normalizePartList
-} from "./chunk-T5ZFG4CI.js";
+} from "./chunk-MUN34TTF.js";
 import {
   isSlashCommand
-} from "./chunk-QIN5P5BP.js";
+} from "./chunk-DUFZ3OW6.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -34,46 +36,47 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-VUFEW3SF.js";
+} from "./chunk-CTEGMF77.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-MM4XBXF7.js";
+} from "./chunk-VRQD5D7R.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-JRRZFO4A.js";
+} from "./chunk-QXFAQDBV.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-AMXMM7DH.js";
+import "./chunk-UPUAGRKY.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-DEVFUPC5.js";
+} from "./chunk-TB6DPBE4.js";
 import "./chunk-4WGODMVR.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-EN2J77G7.js";
+import "./chunk-6LDLDK6E.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-OH5UKBLL.js";
+} from "./chunk-KB4ISUT3.js";
 import "./chunk-KW7NOTN6.js";
-import "./chunk-JWXBLIQL.js";
-import "./chunk-T2VEHZH3.js";
-import "./chunk-VO52SIZW.js";
+import "./chunk-LIBTBTHP.js";
+import "./chunk-6T5HCY34.js";
+import "./chunk-L3YACXS2.js";
 import "./chunk-YAF2MQZ6.js";
 import {
   computeCpuPercent
 } from "./chunk-LBOVL47Y.js";
-import "./chunk-67LXZ6LV.js";
+import "./chunk-SFBRH5RY.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-M2NMFAFR.js";
+} from "./chunk-ZZ7RUTJ4.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
+  HistoryReplayLimitError,
   MAX_REMEMBER_CONTENT_BYTES,
   REDACTED_MCP_SECRET,
   collectHistoryReplayUpdates,
@@ -92,7 +95,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-5AWARYOK.js";
+} from "./chunk-UWIJU22K.js";
 import "./chunk-ZBBVBZBR.js";
 import {
   BaseEmitter,
@@ -102,10 +105,10 @@ import {
   createTranscriptMessageUpdate,
   createTranscriptUsageUpdate,
   hasFullSessionContext
-} from "./chunk-7L64FSYQ.js";
-import "./chunk-47FQVRCO.js";
+} from "./chunk-APQTLUZ3.js";
+import "./chunk-EGB2PIYM.js";
 import "./chunk-4NFY2S7N.js";
-import "./chunk-GQW6P73F.js";
+import "./chunk-FNVF5RR4.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-3Z43GZUQ.js";
@@ -116,32 +119,32 @@ 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-LCWRQA5U.js";
+} from "./chunk-Y2EOB7WZ.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-FLUYVAQZ.js";
+} from "./chunk-Y2HK3ELT.js";
 import {
   readVoiceModel
-} from "./chunk-SZ36WFVK.js";
-import "./chunk-IQFYO5BF.js";
+} from "./chunk-BGIKUE5J.js";
+import "./chunk-5KZNWF2M.js";
 import "./chunk-NTTBXH7U.js";
-import "./chunk-ZIS5I56G.js";
+import "./chunk-WIHSDI6U.js";
 import "./chunk-3SH53ANB.js";
 import {
   SESSION_SOURCE_META_KEY,
   parseSessionSource
-} from "./chunk-VUTOKX6F.js";
-import "./chunk-MZSJ43WV.js";
-import "./chunk-XCGIMOLN.js";
+} from "./chunk-A2QIWDFO.js";
+import "./chunk-JVY7FHUZ.js";
+import "./chunk-WCCLLK7X.js";
 import "./chunk-OCPBI7J5.js";
 import {
   ACP_ROUTE_ID_PREFIX,
@@ -151,26 +154,26 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-5DDUYIY6.js";
+} from "./chunk-3JI5D6RU.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-BGXZBI5B.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-3SIXC6QC.js";
-import "./chunk-C2VGLLNA.js";
+import "./chunk-N56NYJWY.js";
+import "./chunk-N3J3CO35.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-YTYPRVIZ.js";
-import "./chunk-ENEEQMGM.js";
-import "./chunk-DEG7R6Z6.js";
+import "./chunk-VUTOV2HG.js";
+import "./chunk-XY7DGTIC.js";
+import "./chunk-TN3REXN4.js";
 import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-7PBUQKMT.js";
+} from "./chunk-QSMZHJ62.js";
 import {
   ndJsonStream
-} from "./chunk-TKAEODJR.js";
+} from "./chunk-2U3UCXZ3.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -178,9 +181,9 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-OPBATTFQ.js";
-import "./chunk-3GCU5O2E.js";
-import "./chunk-L2O7DJIE.js";
+} from "./chunk-NHZF4VCD.js";
+import "./chunk-U7ROFHSH.js";
+import "./chunk-QSDPJROT.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_HEARTBEAT_META_KEY,
@@ -195,6 +198,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,
@@ -207,7 +212,7 @@ import {
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-HHGQGTJQ.js";
+} from "./chunk-UFHPAMAV.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -215,7 +220,7 @@ import {
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-K7JW6V5O.js";
+import "./chunk-JW5UEE3V.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-M5GB774H.js";
@@ -229,17 +234,17 @@ import {
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS,
   CHANNEL_PROMPT_META_KEY
-} from "./chunk-LT532KF4.js";
+} from "./chunk-ADJDLEVO.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-IW6RQPQB.js";
-import "./chunk-AQHNAA7E.js";
+import "./chunk-7JL5YBSA.js";
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-FWJRWCKU.js";
+} from "./chunk-PYLVQ6RT.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -248,9 +253,9 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-3ZLUA4GV.js";
+} from "./chunk-H2U4FK62.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-G4C5RLX6.js";
+import "./chunk-4X5J3V2I.js";
 import "./chunk-GOXKNSDZ.js";
 import {
   getSystemDefaultsPath,
@@ -259,7 +264,7 @@ import {
 import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-6LK2QPIA.js";
+} from "./chunk-JXS2JNMZ.js";
 import {
   SUPPORTED_LANGUAGES
 } from "./chunk-5EJZE3FP.js";
@@ -267,17 +272,17 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-7N6WK2W6.js";
+} from "./chunk-FXWGMPAP.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD
 } from "./chunk-MS7GNABG.js";
-import "./chunk-DGM2XA3R.js";
-import "./chunk-VJNBRRZG.js";
+import "./chunk-V2U6FOJB.js";
+import "./chunk-WZMH7II3.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-M2S67TPJ.js";
+} from "./chunk-ZA2JN5IZ.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
@@ -330,6 +335,7 @@ import {
   buildPermissionCheckContext,
   buildSessionRecoveryPlanFromApiHistory,
   clampInlineMediaPart,
+  collectSessionTurnState,
   computeUniqueBranchTitle,
   convertToFunctionErrorResponse,
   convertToFunctionResponse,
@@ -346,7 +352,6 @@ import {
   evaluatePlanModeShellPolicy,
   evaluateToolInvocationGuard,
   finalizeToolResponses,
-  findBoundaryAtOrBefore,
   findExistingProviderModels,
   findPlanModeEntryBatchBoundaryIndex,
   findProviderById,
@@ -379,7 +384,6 @@ import {
   isDenialFallbackReason,
   isGatedMcpScope,
   isPlanModeBlocked,
-  isReplayTurnStartType,
   markDuplicateProviderToolCallResponseSent,
   matchesAnyServerPattern,
   mcpServerRequiresOAuth,
@@ -399,7 +403,6 @@ import {
   runForkedAgent,
   runManagedAutoMemoryDream,
   runManagedRememberByAgent,
-  sessionIdContext,
   shouldClassifyAllShellForAutoMode,
   shouldFallback,
   shouldFirePermissionDeniedForAutoMode,
@@ -411,25 +414,25 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-INQN4KIA.js";
+} from "./chunk-GHOUZ5X4.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-NM33GGOM.js";
+import "./chunk-A4BAHMJF.js";
+import "./chunk-ZPZANKVP.js";
+import "./chunk-A6GQUQ7I.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-U6LT3QBF.js";
+import "./chunk-JBZYGFIB.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-XLQS3VI6.js";
-import "./chunk-NWPO6I7V.js";
+import "./chunk-AAZWJAPQ.js";
+import "./chunk-7WUMS2UA.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -439,35 +442,38 @@ import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
 import {
   APPROVAL_MODES
-} from "./chunk-6LYDH7VT.js";
-import "./chunk-2AZMF6G5.js";
+} from "./chunk-SNHBRO4C.js";
+import "./chunk-KTWUFHS4.js";
 import "./chunk-KRXPRVGL.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-GZGDJ4E6.js";
-import "./chunk-T6W4KACQ.js";
-import "./chunk-MWZYNOCG.js";
+} from "./chunk-2ASWIM4A.js";
+import "./chunk-67F2BEYW.js";
+import "./chunk-TNETSI2A.js";
 import {
   GoalPersistenceUnavailableError,
   emptyGoalSnapshot,
   goalTurnContext,
+  parseGoalSnapshotV2,
+  parseGoalStateCause,
   wrapUserPromptSubmitContext
-} from "./chunk-SAQHDAUJ.js";
-import "./chunk-6XZERB6P.js";
+} from "./chunk-B66LYK4B.js";
+import "./chunk-VPZMLGD3.js";
 import {
+  addDaemonRequestAttribute,
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
   extractDaemonTraceContext,
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor,
   withDaemonSpan
-} from "./chunk-O5AZPHYZ.js";
+} from "./chunk-U5C2GIN2.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-5PWLQ7SK.js";
+import "./chunk-2RTRFLWH.js";
 import {
   runWithRuntimeContentGenerator
-} from "./chunk-EYS3GGM3.js";
+} from "./chunk-SKRHR6N2.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-2J3OJGTL.js";
 import {
@@ -502,26 +508,26 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-HB6QW4LM.js";
+} from "./chunk-UAAWNTOC.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-732MOPEM.js";
+} from "./chunk-6OJDN5ZT.js";
 import {
   runSideQuery
-} from "./chunk-CTQE2NB2.js";
-import "./chunk-NC4O6UE6.js";
-import "./chunk-IEP44U2R.js";
+} from "./chunk-JRTJEGSP.js";
+import "./chunk-O6SLWH4X.js";
+import "./chunk-C2DR57L6.js";
 import {
   FORK_SUBAGENT_TYPE,
   getStartupContextLength,
   isSystemReminderContent
-} from "./chunk-ZV4XVYL3.js";
+} from "./chunk-TROB4PZY.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
-import "./chunk-V3LXMASR.js";
+import "./chunk-UHF5VBKO.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -529,23 +535,23 @@ import {
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-XTH2OMDS.js";
+} from "./chunk-ZRT36RSF.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-TBVNYG5B.js";
+} from "./chunk-CDDLHCC2.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-5HBFERG5.js";
-import "./chunk-EYW54TBD.js";
+import "./chunk-YI5G32RU.js";
+import "./chunk-QEWAHAW2.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-O4BBDP2G.js";
-import "./chunk-KPVVWKF3.js";
+import "./chunk-FTGU6G45.js";
+import "./chunk-PSTHNTHF.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-LOJO2RPW.js";
+} from "./chunk-XJ6IMYUS.js";
 import "./chunk-F6WFNA7U.js";
-import "./chunk-F6AOBFUN.js";
+import "./chunk-NW7SPXVG.js";
 import {
   REASONING_EFFORT_TIERS,
   applyReasoningEffort
@@ -555,14 +561,14 @@ import "./chunk-AXMWHKXA.js";
 import {
   getToolCallPreparations
 } from "./chunk-GLCZKT5V.js";
-import "./chunk-GJJQV4PY.js";
+import "./chunk-KK3FEHPJ.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-FPGTNKCP.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-EFIMD5VA.js";
+import "./chunk-H6BFLALJ.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
@@ -571,21 +577,23 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-E5BWLU5J.js";
+} from "./chunk-3MJ44LNC.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-YMB77M76.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-M3QYOPGN.js";
+import "./chunk-BXAGPCYH.js";
 import {
   runExitCleanup
-} from "./chunk-ABGS4FDQ.js";
+} from "./chunk-NX5QZVRS.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -1648,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));
@@ -1784,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();
 
@@ -3479,28 +3543,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 {
@@ -3520,40 +3562,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)) {
@@ -3786,6 +3794,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
@@ -3897,6 +3908,7 @@ var Session = class {
     this.goalHostUnbind = void 0;
     this.lastGoalSnapshot = void 0;
     this.lastGoalPublicationKey = void 0;
+    this.suppressedRecoveredGoalId = void 0;
     this.#bindGoalRuntime();
   }
   /**
@@ -3934,50 +3946,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
@@ -4010,11 +4008,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;
     }
@@ -4938,22 +4934,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
     );
   }
-  async replayHistory(records, gaps) {
+  primeTurnState(initialTurn, backgroundNotificationTaskIds) {
+    for (const taskId of backgroundNotificationTaskIds) {
+      this.persistedBackgroundNotificationTaskIds.add(taskId);
+    }
+    this.turn = Math.max(this.turn, initialTurn);
+  }
+  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;
     }
@@ -11496,6 +11495,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"
@@ -11536,61 +11691,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) {
@@ -14060,7 +14160,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();
@@ -14071,12 +14171,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();
     }
@@ -14103,7 +14203,7 @@ var QwenAgent = class {
       this.pendingConfigCleanup.delete(cleanupKey);
     }
   }
-  async cleanupAfterRequestFailure(error, cleanup) {
+  async cleanupAfterRequestFailure(error, cleanup, sessionId) {
     try {
       await cleanup();
     } catch (cleanupError) {
@@ -14111,7 +14211,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}`;
@@ -14311,7 +14411,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.12-preview.1";
+    const version = "0.21.12-preview.4";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -14512,6 +14612,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(
@@ -14524,35 +14625,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) {
@@ -14566,18 +14675,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
               }
             };
           }
@@ -14619,13 +14735,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(
@@ -14634,98 +14769,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();
     }
@@ -14763,13 +14965,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 } : {}
             })
           )
         );
@@ -14806,9 +15009,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(
@@ -14817,51 +15025,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();
     }
@@ -20193,7 +20401,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 () => {
@@ -20209,7 +20417,8 @@ ${outputText}
           sessionId,
           resume,
           initializeOptions,
-          chatRecording
+          chatRecording,
+          restoreOptions
         );
       });
     } catch (error) {
@@ -20225,10 +20434,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);
@@ -20326,7 +20535,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);
@@ -20463,6 +20684,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,
@@ -20470,10 +20701,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();
       }
@@ -20500,12 +20735,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