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

package/chunks/{server-SUXD2F3C.js → server-AWQHKXLG.js}

@@ -20,14 +20,13 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-KIFRFCCB.js";
+} from "./chunk-CZ4OWGQQ.js";
 import {
   deriveWebSocketBase,
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-3XZYK76R.js";
-import "./chunk-ZBBVBZBR.js";
+} from "./chunk-EJOGLSNJ.js";
 import {
   SetupGithubError,
   collectSessionData,
@@ -39,15 +38,15 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-VWD7SNNN.js";
+} from "./chunk-UI5UGEF4.js";
 import {
   OBSERVED_CONTACT_MAX_FRESH_WITHIN_SECONDS,
   ObservedChannelContactStore
-} from "./chunk-47FQVRCO.js";
+} from "./chunk-TMFWI4RC.js";
 import {
   escapeAnsiCtrlCodes
 } from "./chunk-4NFY2S7N.js";
-import "./chunk-U6PTKAOW.js";
+import "./chunk-V6OBVAST.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-3Z43GZUQ.js";
@@ -107,18 +106,14 @@ import {
   setRateLimiter,
   unsafeRevealSecret,
   validateMcpRuntimeServerName
-} from "./chunk-KNQZXSLW.js";
+} from "./chunk-HG3UBTJ4.js";
 import "./chunk-VGHZT6JR.js";
 import {
   isLoopbackBind,
   normalizeSessionIdForLookup,
   parseCallerSuppliedSessionId
 } from "./chunk-TQOF5KBL.js";
-import "./chunk-HGCQ5SE7.js";
-import {
-  evaluateDaemonWorkspaceTrust,
-  readDaemonTrustPolicySnapshot
-} from "./chunk-6AECVSVX.js";
+import "./chunk-UXEO7E3V.js";
 import {
   EMPTY_WORKSPACE_VOICE_UPDATE_ERROR,
   MAX_WORKSPACE_SKILL_NAME_LENGTH,
@@ -132,14 +127,14 @@ import {
   validateWorkspaceSkillName,
   validateWorkspaceVoiceState,
   voiceSettingsScopeToWire
-} from "./chunk-EXG2R5UR.js";
+} from "./chunk-YCHNAKC5.js";
 import {
   PermissionRulesValidationError,
   buildPermissionSettings,
   isPermissionRuleType,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-SSAOTDK7.js";
+} from "./chunk-YX2RDGAL.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isStreamingVoiceModel,
@@ -147,13 +142,13 @@ import {
   resolveVoiceTranscriptionConfig,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-VQZXRLEX.js";
+} from "./chunk-LCX5B364.js";
 import {
   isVoiceEnabled,
   isVoiceMode,
   readVoiceModel
-} from "./chunk-5UPJ774B.js";
-import "./chunk-IQFYO5BF.js";
+} from "./chunk-VIFA5VJD.js";
+import "./chunk-H7TMVHKE.js";
 import {
   createTotalSessionAdmissionController
 } from "./chunk-X2UOOG5V.js";
@@ -170,39 +165,25 @@ import {
 } from "./chunk-4JRM2BSM.js";
 import {
   assertValidChannelSecretUpdates
-} from "./chunk-P64FPV3G.js";
+} from "./chunk-6JEIRPLN.js";
 import {
   createDaemonStatusProvider
-} from "./chunk-RQVVXDHS.js";
+} from "./chunk-Q4ZPYNIZ.js";
 import "./chunk-NTTBXH7U.js";
-import "./chunk-JEMR2FTD.js";
-import "./chunk-3SH53ANB.js";
-import {
-  SessionArtifactAuthorizationError,
-  SessionArtifactValidationError,
-  createAcpSessionBridge,
-  parseSessionSource
-} from "./chunk-O5G7IQGM.js";
-import {
-  EVENT_SCHEMA_VERSION,
-  EventBus,
-  SubscriberLimitExceededError
-} from "./chunk-MZSJ43WV.js";
-import "./chunk-XCGIMOLN.js";
-import "./chunk-OCPBI7J5.js";
+import "./chunk-RQJA2YYO.js";
 import {
   createWorkspaceProvidersStatusProvider
-} from "./chunk-YZJVVQD3.js";
+} from "./chunk-6ZKSO6K7.js";
 import {
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-NPE3STIW.js";
+} from "./chunk-ROIJYS5K.js";
 import {
   snapshotProcessEnv
-} from "./chunk-5I5NMQCU.js";
+} from "./chunk-36XKGB7E.js";
 import {
   createWorkspaceSkillsStatusProvider
-} from "./chunk-AJX4ITUG.js";
+} from "./chunk-BSSLSQEW.js";
 import "./chunk-BGXZBI5B.js";
 import "./chunk-Z4X5MTRT.js";
 import {
@@ -218,35 +199,52 @@ import {
 import {
   require_express
 } from "./chunk-GDXET5XU.js";
+import {
+  evaluateDaemonWorkspaceTrust,
+  readDaemonTrustPolicySnapshot
+} from "./chunk-MAKIANMX.js";
 import {
   daemonObservedContactsPath,
   loadChannelsConfig
-} from "./chunk-TRYJ3BVE.js";
-import "./chunk-LHY6HBRA.js";
+} from "./chunk-WM3LUQLO.js";
+import "./chunk-IH4Z54RJ.js";
 import "./chunk-57OAHC2Y.js";
 import {
   parseChannelWebhookConfigLenient
-} from "./chunk-YTYPRVIZ.js";
-import "./chunk-ENEEQMGM.js";
+} from "./chunk-BSR5AXZR.js";
+import "./chunk-45NQKMYB.js";
 import {
   supportedChannelCatalog
-} from "./chunk-DEG7R6Z6.js";
-import "./chunk-V6WHFGST.js";
+} from "./chunk-OK47XBYH.js";
 import {
   LIVE_HOST_BUNDLE_ID,
   LIVE_HOST_PROTOCOL_VERSION,
   LIVE_INPUT_AUDIO_EPOCH_BYTES
 } from "./chunk-NKLP3DCK.js";
-import "./chunk-TYGKUOEG.js";
+import {
+  SessionArtifactAuthorizationError,
+  SessionArtifactValidationError,
+  createAcpSessionBridge,
+  parseSessionSource
+} from "./chunk-6P5EXEBL.js";
+import {
+  EVENT_SCHEMA_VERSION,
+  EventBus,
+  SubscriberLimitExceededError
+} from "./chunk-7U5G6JXI.js";
+import "./chunk-WCCLLK7X.js";
+import "./chunk-OCPBI7J5.js";
+import "./chunk-DAV4QFD5.js";
 import {
   STATUS_SCHEMA_VERSION,
   SessionRestoreTimeoutError,
   createIdleWorkspaceMemoryStatus,
   mapDomainErrorToErrorKind
-} from "./chunk-OPBATTFQ.js";
+} from "./chunk-HTYND72J.js";
 import "./chunk-K6KS3LTN.js";
 import "./chunk-FC4KQFCS.js";
 import "./chunk-T3CHYWJZ.js";
+import "./chunk-V6WHFGST.js";
 import {
   MAX_REGISTERED_WORKSPACES,
   WorkspaceDisplayNameValidationError,
@@ -254,12 +252,13 @@ import {
   WorkspaceRegistrationStoreLimitError,
   normalizeWorkspaceDisplayName,
   workspaceRegistrationId
-} from "./chunk-JL3LC3CQ.js";
+} from "./chunk-WCEI6J56.js";
 import {
+  CHANNEL_PROMPT_META_KEY,
   DAEMON_PROMPT_DISPLAY_TEXT_META_KEY,
   REQUESTED_SESSION_ID_META_KEY,
   gradeActiveWorkCoverage
-} from "./chunk-HHGQGTJQ.js";
+} from "./chunk-FQDCO3CJ.js";
 import {
   BranchWhilePromptActiveError,
   BridgeChannelQuarantinedError,
@@ -316,7 +315,7 @@ import {
 } from "./chunk-YP5KH5Y7.js";
 import {
   normalizeWorkerDiagnostic
-} from "./chunk-K7JW6V5O.js";
+} from "./chunk-A6NRNRKE.js";
 import {
   normalizeServeChannelSelection
 } from "./chunk-ALMR3E6Q.js";
@@ -324,12 +323,12 @@ import "./chunk-HIBNSEJE.js";
 import {
   redactLogCredentials
 } from "./chunk-M5GB774H.js";
-import "./chunk-BKHCW2BI.js";
+import "./chunk-3VUENPWF.js";
+import "./chunk-5HBA2Z7V.js";
 import {
   sanitizeLogText
-} from "./chunk-LT532KF4.js";
+} from "./chunk-AW27A43Y.js";
 import "./chunk-IW6RQPQB.js";
-import "./chunk-5HBA2Z7V.js";
 import {
   getDialogSettingKeys,
   getModelProvidersOwnerScope,
@@ -339,26 +338,26 @@ import {
   getWritableScopes,
   loadSettings,
   validateSettingValue
-} 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 "./chunk-IDS7MSUP.js";
 import {
   detectSystemLanguage,
   resolveLanguageSetting
-} from "./chunk-GYBDYWMV.js";
+} from "./chunk-IRSLAS4M.js";
 import {
   SUPPORTED_LANGUAGES,
   resolveSupportedLanguage
 } from "./chunk-5EJZE3FP.js";
-import "./chunk-RRQJPCRQ.js";
+import "./chunk-XH3KAV2G.js";
 import "./chunk-MS7GNABG.js";
-import "./chunk-M2PY7CNK.js";
-import "./chunk-VJNBRRZG.js";
+import "./chunk-OWXFBIB6.js";
+import "./chunk-WZMH7II3.js";
 import {
   getWorkspaceTrustStatus
-} from "./chunk-4ETA3KRC.js";
+} from "./chunk-ZMY2P4L3.js";
 import "./chunk-NPQ5ZKRP.js";
 import {
   isWithinRoot as isWithinRoot2
@@ -428,17 +427,15 @@ import {
   partToString,
   readAgentMeta,
   readWorktreeSession,
-  redactUrlCredentials,
   resolveBranchName,
   resolveProviderProtocol,
   shouldShowStep,
-  stripAnsiAndControl,
   stripTerminalControlSequences,
   watchRepoBranch,
   writeWorkspaceContextFile,
   writeWorktreeSession,
   writeWorktreeSessionMarker
-} from "./chunk-M6HXP2SG.js";
+} from "./chunk-EBPLKY6U.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
@@ -446,12 +443,12 @@ import "./chunk-CQ35AJ4Z.js";
 import {
   MAX_JOBS,
   nextDurableFireMs
-} from "./chunk-QTI7SRXI.js";
-import "./chunk-KT4OWAAZ.js";
-import "./chunk-IX7CFQGA.js";
-import "./chunk-N7NBMAMW.js";
+} from "./chunk-QPBFRWCP.js";
+import "./chunk-JRIVMPD2.js";
+import "./chunk-YILJKX2T.js";
+import "./chunk-D2RNVVH6.js";
 import "./chunk-6PVPNMXU.js";
-import "./chunk-I4XSOFH2.js";
+import "./chunk-I7BT2MME.js";
 import {
   nextFireTime,
   parseCron
@@ -464,22 +461,22 @@ import {
   readCronTasks,
   taskHasLegacyCondition,
   updateCronTasks
-} from "./chunk-XLQS3VI6.js";
-import "./chunk-NWPO6I7V.js";
+} from "./chunk-AKBFSOC5.js";
+import "./chunk-DEDESZDL.js";
 import "./chunk-O6GEWCJA.js";
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
+import "./chunk-5RUCD4ED.js";
+import "./chunk-KRXPRVGL.js";
+import "./chunk-YBVVOSOH.js";
+import "./chunk-CPFFU46D.js";
+import "./chunk-ULNWG62W.js";
+import "./chunk-DPTMKFIH.js";
 import {
   APPROVAL_MODES
-} from "./chunk-6LYDH7VT.js";
-import "./chunk-2AZMF6G5.js";
-import "./chunk-KRXPRVGL.js";
-import "./chunk-GZGDJ4E6.js";
-import "./chunk-T6W4KACQ.js";
-import "./chunk-MWZYNOCG.js";
-import "./chunk-SAQHDAUJ.js";
-import "./chunk-6XZERB6P.js";
+} from "./chunk-63FNZTWG.js";
+import "./chunk-3GM5DLBI.js";
 import {
   addDaemonRequestAttribute,
   captureDaemonTelemetryContext,
@@ -491,39 +488,21 @@ import {
   recordDaemonHttpResponse,
   runWithDaemonTelemetryContext,
   withDaemonRequestSpan
-} from "./chunk-O5AZPHYZ.js";
+} from "./chunk-K34GJQOZ.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-5PWLQ7SK.js";
-import "./chunk-EYS3GGM3.js";
+import "./chunk-KLOMACIR.js";
+import "./chunk-VPV7WBVT.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-2J3OJGTL.js";
-import {
-  CursorNotAtLineBoundaryError,
-  LargeNonUtf8TextError,
-  TextScanBudgetExceededError,
-  decodeBufferWithEncodingInfoAsync,
-  getAllGeminiMdFilenames,
-  isUtf8CompatibleEncoding,
-  isWithinRoot,
-  parseLineTolerant,
-  read
-} from "./chunk-HB6QW4LM.js";
-import "./chunk-YRLW2MSX.js";
-import "./chunk-VGC4I5JJ.js";
-import "./chunk-732MOPEM.js";
-import "./chunk-CTQE2NB2.js";
-import "./chunk-NC4O6UE6.js";
-import "./chunk-IEP44U2R.js";
 import {
   SubagentError,
   SubagentErrorCode
-} from "./chunk-ZV4XVYL3.js";
+} from "./chunk-TTRH3RTQ.js";
 import "./chunk-K623ENWT.js";
 import {
   escapeXml
 } from "./chunk-AQ37AY7B.js";
-import "./chunk-V3LXMASR.js";
-import "./chunk-XTH2OMDS.js";
+import "./chunk-FRHQQC2Z.js";
 import {
   QwenOAuth2Client,
   QwenOAuthPollError,
@@ -532,38 +511,59 @@ import {
   isDeviceAuthorizationSuccess,
   isDeviceTokenPending,
   isDeviceTokenSuccess
-} from "./chunk-TBVNYG5B.js";
+} from "./chunk-DG4IQ6JG.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-5HBFERG5.js";
-import "./chunk-EYW54TBD.js";
+import "./chunk-KEC5FHLM.js";
+import "./chunk-2ZWH53I4.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-O4BBDP2G.js";
-import "./chunk-KPVVWKF3.js";
-import "./chunk-XWUQ4IH5.js";
-import "./chunk-F6WFNA7U.js";
-import "./chunk-F6AOBFUN.js";
+import "./chunk-TB4YFWXG.js";
+import "./chunk-D7QGE3RT.js";
 import "./chunk-KM73TBQ4.js";
 import "./chunk-MPHPFVKK.js";
 import "./chunk-AXMWHKXA.js";
 import "./chunk-GLCZKT5V.js";
-import "./chunk-GJJQV4PY.js";
-import "./chunk-46UV252V.js";
-import "./chunk-FPGTNKCP.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-EFIMD5VA.js";
-import "./chunk-E5BWLU5J.js";
+import "./chunk-NLFLYSS4.js";
 import "./chunk-CR3C7WXL.js";
+import "./chunk-XWRJCPHC.js";
+import {
+  CursorNotAtLineBoundaryError,
+  LargeNonUtf8TextError,
+  TextScanBudgetExceededError,
+  decodeBufferWithEncodingInfoAsync,
+  getAllGeminiMdFilenames,
+  isUtf8CompatibleEncoding,
+  isWithinRoot,
+  parseLineTolerant,
+  read
+} from "./chunk-4KM2SYK5.js";
+import "./chunk-YRLW2MSX.js";
+import "./chunk-VGC4I5JJ.js";
+import "./chunk-G6MUFRNI.js";
+import "./chunk-LSRI3ND3.js";
+import "./chunk-PVXEJB66.js";
+import "./chunk-YIGGWOJE.js";
+import "./chunk-KWX56CHZ.js";
+import "./chunk-F6WFNA7U.js";
+import "./chunk-46UV252V.js";
+import "./chunk-FPGTNKCP.js";
+import "./chunk-4AOVQPJU.js";
+import "./chunk-PZW46OTB.js";
+import "./chunk-YBHUXEC6.js";
+import {
+  redactUrlCredentials,
+  stripAnsiAndControl
+} from "./chunk-N4SVADAV.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-L2GTEEEU.js";
+import "./chunk-K5IDV3PC.js";
 import {
   FatalConfigError,
   Storage,
   createDebugLogger,
   getErrorMessage,
   runWithoutDebugLogSession
-} from "./chunk-MPBRV3UU.js";
+} from "./chunk-HOSVOUDK.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-XWRJCPHC.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -571,13 +571,13 @@ import {
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
-import "./chunk-AMDSOFFV.js";
 import {
   import_websocket,
   import_websocket_server,
   wrapper_default
-} from "./chunk-E3GLDLYB.js";
+} from "./chunk-TYAMGABM.js";
 import "./chunk-FCMNKVXT.js";
+import "./chunk-AMDSOFFV.js";
 import "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims
@@ -23328,6 +23328,19 @@ function parseHistoryPageSize(body, res) {
   return value;
 }
 __name(parseHistoryPageSize, "parseHistoryPageSize");
+function parseLiveReplayMode(body, res) {
+  const value = body["liveReplayMode"];
+  if (value === void 0) return void 0;
+  if (value !== "full" && value !== "summary") {
+    res.status(400).json({
+      error: "`liveReplayMode` must be `full` or `summary`",
+      code: "invalid_live_replay_mode"
+    });
+    return null;
+  }
+  return value;
+}
+__name(parseLiveReplayMode, "parseLiveReplayMode");
 function workspaceTranscriptCursorExceedsLimit(cursor, maxBytes = WORKSPACE_TRANSCRIPT_CURSOR_MAX_BYTES) {
   return Buffer.byteLength(cursor) > maxBytes;
 }
@@ -24594,6 +24607,8 @@ function registerSessionRoutes(app, deps) {
     if (approvalMode === null) return;
     const historyPageSize = action === "load" ? parseHistoryPageSize(body ?? {}, res) : void 0;
     if (historyPageSize === null) return;
+    const liveReplayMode = parseLiveReplayMode(body ?? {}, res);
+    if (liveReplayMode === null) return;
     const clientId = parseClientIdHeader(req, res);
     if (clientId === null) return;
     let sessionIdReservation;
@@ -24644,6 +24659,7 @@ function registerSessionRoutes(app, deps) {
             workspaceCwd,
             historyReplay: "response",
             ...historyPageSize !== void 0 ? { historyPageSize } : {},
+            ...liveReplayMode !== void 0 ? { liveReplayMode } : {},
             ...clientId !== void 0 ? { clientId } : {},
             ...approvalMode !== void 0 ? { approvalMode } : {},
             ...metadata
@@ -25659,19 +25675,23 @@ function registerSessionRoutes(app, deps) {
         const forwardedMeta = typeof forwardedBody["_meta"] === "object" && forwardedBody["_meta"] !== null && !Array.isArray(forwardedBody["_meta"]) ? { ...forwardedBody["_meta"] } : void 0;
         const promptAuthorization = forwardedMeta?.[CHANNEL_WORKER_PROMPT_AUTHORIZATION_META_KEY];
         const promptDisplayText = forwardedMeta?.[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+        const channelPrompt = forwardedMeta?.[CHANNEL_PROMPT_META_KEY];
         if (forwardedMeta) {
           delete forwardedMeta[CHANNEL_WORKER_PROMPT_AUTHORIZATION_META_KEY];
           delete forwardedMeta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+          delete forwardedMeta[CHANNEL_PROMPT_META_KEY];
           if (Object.keys(forwardedMeta).length > 0) {
             forwardedBody["_meta"] = forwardedMeta;
           } else {
             delete forwardedBody["_meta"];
           }
         }
-        const trustedPromptDisplayText = typeof promptDisplayText === "string" && isChannelWorkerPromptAuthorized(
+        const channelWorkerAuthorized = isChannelWorkerPromptAuthorized(
           promptAuthorization,
           runtime.workspaceCwd
-        ) ? promptDisplayText : void 0;
+        );
+        const trustedPromptDisplayText = typeof promptDisplayText === "string" && channelWorkerAuthorized ? promptDisplayText : void 0;
+        const trustedChannelPrompt = channelWorkerAuthorized && channelPrompt === true;
         const lastEventId = ownerBridge.getSessionLastEventId(sessionId);
         const eventEpoch = ownerBridge.getSessionEventEpoch(sessionId);
         addDaemonRequestAttribute("qwen-code.prompt_id", promptId);
@@ -25705,6 +25725,7 @@ function registerSessionRoutes(app, deps) {
               promptId,
               ...effectiveDeadlineMs !== void 0 ? { deadlineMs: effectiveDeadlineMs } : {},
               ...trustedPromptDisplayText !== void 0 ? { promptDisplayText: trustedPromptDisplayText } : {},
+              ...trustedChannelPrompt ? { channelPrompt: true } : {},
               ...delivery !== void 0 ? {
                 channelDelivery: {
                   deliveryId: promptId,
@@ -28411,18 +28432,21 @@ function startScheduledTaskKeepalive(opts) {
         const metadata = await new SessionService(
           boundWorkspace
         ).readCreationMetadata(sessionId);
-        const load = bridge.loadSession({
+        const resume = bridge.resumeSession({
           sessionId,
           workspaceCwd: boundWorkspace,
-          historyReplay: "response",
           ...metadata
         });
-        void load.catch(() => {
+        void resume.catch(() => {
         }).finally(() => {
           reviving.delete(sessionId);
         });
         try {
-          await withTimeout(load, reviveTimeoutMs, `loadSession(${sessionId})`);
+          await withTimeout(
+            resume,
+            reviveTimeoutMs,
+            `resumeSession(${sessionId})`
+          );
           log.debug("keepalive: revived non-resident session", sessionId);
           reviveState.delete(sessionId);
         } catch (loadErr) {
@@ -28519,11 +28543,11 @@ function startScheduledTaskKeepalive(opts) {
   };
 }
 __name(startScheduledTaskKeepalive, "startScheduledTaskKeepalive");
-var REHYDRATE_LOAD_TIMEOUT_MS = 7e4;
+var REHYDRATE_RESUME_TIMEOUT_MS = 7e4;
 var REHYDRATE_MAX_CONCURRENCY = 4;
 async function rehydrateScheduledTaskSessions(deps) {
   const { bridge, boundWorkspace } = deps;
-  const timeoutMs = deps.loadTimeoutMs ?? REHYDRATE_LOAD_TIMEOUT_MS;
+  const timeoutMs = deps.loadTimeoutMs ?? REHYDRATE_RESUME_TIMEOUT_MS;
   let tasks;
   try {
     tasks = await readCronTasks(boundWorkspace);
@@ -28543,16 +28567,15 @@ async function rehydrateScheduledTaskSessions(deps) {
     const metadata = await new SessionService(
       boundWorkspace
     ).readCreationMetadata(sessionId);
-    const load = bridge.loadSession({
+    const resume = bridge.resumeSession({
       sessionId,
       workspaceCwd: boundWorkspace,
-      historyReplay: "response",
       ...metadata
     });
-    void load.catch(() => {
+    void resume.catch(() => {
     });
     try {
-      await withTimeout(load, timeoutMs, `loadSession(${sessionId})`);
+      await withTimeout(resume, timeoutMs, `resumeSession(${sessionId})`);
       loaded.push(sessionId);
     } catch (err) {
       failed.push(sessionId);
@@ -32434,7 +32457,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
       throw new Error("Workspace registration limit reached");
     }
   }, "assertOwnedRuntimeAdmission");
-  const publishOwnedRuntime = /* @__PURE__ */ __name(async (canonicalCwd, provenance, validate) => {
+  const publishOwnedRuntime = /* @__PURE__ */ __name(async (canonicalCwd, provenance, validateBeforePublication) => {
     if (!createWorkspaceRuntime || !runtimeRemoval) {
       throw new Error("Managed workspace runtime publication is unavailable");
     }
@@ -32445,7 +32468,10 @@ function registerWorkspaceManagementRoutes(app, deps) {
     let registered = false;
     try {
       runtime = await createWorkspaceRuntime(canonicalCwd, { provenance });
-      await validate(runtime);
+      if (runtime.primary) {
+        throw new Error("Daemon-owned workspace runtime must not be primary");
+      }
+      await validateBeforePublication(runtime);
       const publish = /* @__PURE__ */ __name(async () => {
         if (sealed) throw new Error("Daemon is shutting down");
         if (workspaceRegistry.getManagedByWorkspaceCwd(canonicalCwd)) {
@@ -43326,6 +43352,91 @@ var LiveTaskService = class {
   }
 };
 
+// packages/cli/src/serve/conversations/conversation-runtime-manager.ts
+init_esbuild_shims();
+var ConversationRuntimeManager = class {
+  constructor(options) {
+    this.options = options;
+  }
+  static {
+    __name(this, "ConversationRuntimeManager");
+  }
+  runtime;
+  pending;
+  ensure() {
+    if (this.pending) return this.pending;
+    const pending = this.ensureOnce().finally(() => {
+      if (this.pending === pending) this.pending = void 0;
+    });
+    this.pending = pending;
+    return pending;
+  }
+  async ensureOnce() {
+    const root = await this.options.workspace.revalidate();
+    if (this.runtime) {
+      await this.options.workspace.assertExactRoot(this.runtime.workspaceCwd);
+      this.assertActiveRuntime(
+        root.canonicalRoot,
+        this.runtime,
+        "Live conversation runtime is no longer an active owned runtime."
+      );
+      return this.runtime;
+    }
+    const entry = this.options.registry.getEntryByWorkspaceCwd(
+      root.canonicalRoot
+    );
+    if (entry) {
+      const existing = entry.current?.runtime;
+      if (entry.state !== "active" || !existing) {
+        throw new Error(
+          "Live conversation runtime is no longer an active owned runtime."
+        );
+      }
+      this.assertOwnedRuntime(
+        existing,
+        "Live conversation root is already registered without Live provenance."
+      );
+      await this.options.workspace.assertExactRoot(existing.workspaceCwd);
+      this.assertActiveRuntime(
+        root.canonicalRoot,
+        existing,
+        "Live conversation runtime is no longer an active owned runtime."
+      );
+      this.runtime = existing;
+      return existing;
+    }
+    const created = await this.options.publishRuntime(
+      root.canonicalRoot,
+      async (candidate) => {
+        await this.options.workspace.assertExactRoot(candidate.workspaceCwd);
+        this.assertOwnedRuntime(
+          candidate,
+          "Live conversation runtime failed its ownership gate."
+        );
+      }
+    );
+    this.assertActiveRuntime(
+      root.canonicalRoot,
+      created,
+      "Live conversation runtime is no longer an active owned runtime."
+    );
+    this.runtime = created;
+    return created;
+  }
+  assertActiveRuntime(canonicalRoot, runtime, message) {
+    this.assertOwnedRuntime(runtime, message);
+    const entry = this.options.registry.getEntryByWorkspaceCwd(canonicalRoot);
+    if (entry?.state !== "active" || entry.current?.runtime !== runtime) {
+      throw new Error(message);
+    }
+  }
+  assertOwnedRuntime(runtime, message) {
+    if (runtime.primary || runtime.provenance !== "live-conversation" || !runtime.trusted || runtime.removable !== false) {
+      throw new Error(message);
+    }
+  }
+};
+
 // packages/cli/src/serve/server.ts
 var warnedDefaultTrust = false;
 function loadServeChannelWebhookConfigs(sources) {
@@ -43812,94 +43923,95 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
       message: "The Live Appshot channel is unavailable."
     }
   );
-  let liveRuntime;
-  let liveRuntimePromise;
+  const conversationRuntimeManager = deps.liveConversationWorkspace ? new ConversationRuntimeManager({
+    workspace: deps.liveConversationWorkspace,
+    registry: workspaceRegistry,
+    publishRuntime: /* @__PURE__ */ __name(async (canonicalRoot, validate) => {
+      const runtime = await workspaceManagementHandle.publishOwnedRuntime(
+        canonicalRoot,
+        "live-conversation",
+        async (candidate) => {
+          await validate(candidate);
+          await deps.liveConversationWorkspace.revalidate();
+        }
+      );
+      invalidateServeFeaturesCache();
+      return runtime;
+    }, "publishRuntime")
+  }) : void 0;
+  let liveBoundRuntime;
+  let liveBindingPromise;
   let liveRuntimeBootPromise;
   let liveAppshotChannelPromise;
   let liveCoordinatorSealed = false;
-  const bindLiveAppshotHandler = /* @__PURE__ */ __name((runtime) => {
+  const clearLiveRuntimeHandlers = /* @__PURE__ */ __name((runtime) => {
+    const handlers = [
+      runtime.bridge.setLiveScreenContextCaptureHandler,
+      runtime.bridge.setLiveTaskToolRequestHandler,
+      runtime.bridge.setLiveSpeakToUserHandler
+    ];
+    for (const clear of handlers) {
+      try {
+        clear?.call(runtime.bridge, void 0);
+      } catch {
+        continue;
+      }
+    }
+  }, "clearLiveRuntimeHandlers");
+  const bindLiveRuntimeHandlers = /* @__PURE__ */ __name((runtime) => {
     if (liveCoordinatorSealed) {
       throw new Error("Live Voice is shutting down.");
     }
-    const setHandler = runtime.bridge.setLiveScreenContextCaptureHandler;
-    if (!setHandler) {
+    const setScreenHandler = runtime.bridge.setLiveScreenContextCaptureHandler;
+    const setTaskHandler = runtime.bridge.setLiveTaskToolRequestHandler;
+    const setSpeakHandler = runtime.bridge.setLiveSpeakToUserHandler;
+    if (!setScreenHandler) {
       throw new Error("Live conversation runtime has no Appshot channel.");
     }
-    setHandler.call(
-      runtime.bridge,
-      ({ callerSessionId }) => liveCoordinator.captureScreenContext(callerSessionId)
-    );
-    const setTaskHandler = runtime.bridge.setLiveTaskToolRequestHandler;
     if (!setTaskHandler) {
       throw new Error("Live conversation runtime has no task-tool channel.");
     }
-    setTaskHandler.call(runtime.bridge, (info) => liveTaskService.handle(info));
-    const setSpeakHandler = runtime.bridge.setLiveSpeakToUserHandler;
     if (!setSpeakHandler) {
       throw new Error("Live conversation runtime has no speech channel.");
     }
-    setSpeakHandler.call(
-      runtime.bridge,
-      ({ callerSessionId, message }) => liveSessionCoordinator.speakToUser(callerSessionId, message)
-    );
-  }, "bindLiveAppshotHandler");
+    liveBoundRuntime = runtime;
+    try {
+      setScreenHandler.call(
+        runtime.bridge,
+        ({ callerSessionId }) => liveCoordinator.captureScreenContext(callerSessionId)
+      );
+      setTaskHandler.call(
+        runtime.bridge,
+        (info) => liveTaskService.handle(info)
+      );
+      setSpeakHandler.call(
+        runtime.bridge,
+        ({ callerSessionId, message }) => liveSessionCoordinator.speakToUser(callerSessionId, message)
+      );
+    } catch (error2) {
+      clearLiveRuntimeHandlers(runtime);
+      throw error2;
+    }
+  }, "bindLiveRuntimeHandlers");
   const ensureLiveConversationRuntime = /* @__PURE__ */ __name(() => {
     if (liveCoordinatorSealed) {
       return Promise.reject(new Error("Live Voice is shutting down."));
     }
-    if (liveRuntimePromise) return liveRuntimePromise;
+    if (liveBindingPromise) return liveBindingPromise;
     const pending = (async () => {
-      const conversationWorkspace = deps.liveConversationWorkspace;
-      const runtimePublisher = workspaceManagementHandle;
-      if (!conversationWorkspace || !runtimePublisher) {
+      if (!conversationRuntimeManager) {
         throw new Error("Live conversation runtime is unavailable.");
       }
-      const root = await conversationWorkspace.revalidate();
-      if (liveRuntime) {
-        await conversationWorkspace.assertExactRoot(liveRuntime.workspaceCwd);
-        const entry = workspaceRegistry.getEntryByWorkspaceCwd(
-          root.canonicalRoot
-        );
-        if (entry?.state !== "active" || entry.current?.runtime !== liveRuntime || liveRuntime.provenance !== "live-conversation" || !liveRuntime.trusted || liveRuntime.removable !== false) {
-          throw new Error(
-            "Live conversation runtime is no longer an active owned runtime."
-          );
-        }
-        bindLiveAppshotHandler(liveRuntime);
-        return liveRuntime;
-      }
-      const existing = workspaceRegistry.getByWorkspaceCwd(root.canonicalRoot);
-      if (existing) {
-        if (existing.provenance !== "live-conversation" || !existing.trusted || existing.removable !== false) {
-          throw new Error(
-            "Live conversation root is already registered without Live provenance."
-          );
-        }
-        await conversationWorkspace.assertExactRoot(existing.workspaceCwd);
-        liveRuntime = existing;
-        bindLiveAppshotHandler(existing);
-        return existing;
+      const runtime = await conversationRuntimeManager.ensure();
+      if (liveCoordinatorSealed) {
+        throw new Error("Live Voice is shutting down.");
       }
-      const created = await runtimePublisher.publishOwnedRuntime(
-        root.canonicalRoot,
-        "live-conversation",
-        async (candidate) => {
-          await conversationWorkspace.assertExactRoot(candidate.workspaceCwd);
-          if (candidate.provenance !== "live-conversation" || !candidate.trusted || candidate.removable !== false) {
-            throw new Error(
-              "Live conversation runtime failed its ownership gate."
-            );
-          }
-        }
-      );
-      liveRuntime = created;
-      bindLiveAppshotHandler(created);
-      invalidateServeFeaturesCache();
-      return created;
+      bindLiveRuntimeHandlers(runtime);
+      return runtime;
     })().finally(() => {
-      if (liveRuntimePromise === pending) liveRuntimePromise = void 0;
+      if (liveBindingPromise === pending) liveBindingPromise = void 0;
     });
-    liveRuntimePromise = pending;
+    liveBindingPromise = pending;
     return pending;
   }, "ensureLiveConversationRuntime");
   const verifyLiveAppshotChannel = /* @__PURE__ */ __name(() => {
@@ -44023,9 +44135,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     liveCoordinatorSealed = true;
     if (liveCoordinatorStopped) return;
     liveCoordinatorStopped = true;
-    liveRuntime?.bridge.setLiveScreenContextCaptureHandler?.(void 0);
-    liveRuntime?.bridge.setLiveTaskToolRequestHandler?.(void 0);
-    liveRuntime?.bridge.setLiveSpeakToUserHandler?.(void 0);
+    if (liveBoundRuntime) clearLiveRuntimeHandlers(liveBoundRuntime);
     liveSessionCoordinator.dispose();
     liveCoordinator.dispose();
   }, "stopLiveCoordinator");
@@ -44033,7 +44143,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
   app.locals.sealAndWaitLiveCoordinator = async () => {
     stopLiveCoordinator();
     await Promise.all([
-      liveRuntimePromise?.catch(() => void 0),
+      liveBindingPromise?.catch(() => void 0),
       liveAppshotChannelPromise?.catch(() => void 0)
     ]);
   };