@qwen-code/qwen-code 0.23.1-preview.1 → 0.23.1

package/chunks/{server-KNDY6K5F.js → server-YPNTJLX2.js}

@@ -20,7 +20,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-PTFFWTTO.js";
+} from "./chunk-XZ3Z43XL.js";
 import {
   SetupGithubError,
   collectSessionData,
@@ -32,13 +32,13 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-KK2GZGBK.js";
+} from "./chunk-TWWS7XUW.js";
 import {
   OBSERVED_CONTACT_MAX_FRESH_WITHIN_SECONDS,
   ObservedChannelContactStore
 } from "./chunk-M3JGHRMQ.js";
 import "./chunk-VFFQAOPR.js";
-import "./chunk-ZTAVGFKA.js";
+import "./chunk-ERXNTINK.js";
 import {
   escapeAnsiCtrlCodes
 } from "./chunk-47ECGEJC.js";
@@ -54,7 +54,6 @@ import {
   AcpPreAttachBudget,
   CAPABILITIES_SCHEMA_VERSION,
   ClientMcpSenderRegistry,
-  ConversationRuntimeOwnershipError,
   CredentialStore,
   DeviceFlowRegistry,
   LocalPathOpenUnavailableError,
@@ -73,10 +72,6 @@ import {
   bearerAuth,
   brandSecret,
   buildDaemonStatusResponse,
-  conversationRootCompromisedError,
-  conversationRuntimeInUseError,
-  conversationRuntimeOwnershipCompromisedError,
-  conversationRuntimeUnavailableError,
   createBridgeFileSystemAdapter,
   createClientMcpServerProvider,
   createManagedScratchDirectory,
@@ -114,7 +109,7 @@ import {
   singleTokenCredentials,
   tagListener,
   unsafeRevealSecret
-} from "./chunk-32YDNYXP.js";
+} from "./chunk-M73KHGNR.js";
 import {
   ConversationDirectoryIdentityError,
   getConversationDirectoryName,
@@ -125,15 +120,16 @@ import {
 import "./chunk-UXEO7E3V.js";
 import {
   createTotalSessionAdmissionController
-} from "./chunk-7IKXTGZT.js";
+} from "./chunk-YI2YCNSP.js";
 import {
   assertValidChannelSecretUpdates
-} from "./chunk-SAZS4IWW.js";
+} from "./chunk-LZGFVUWZ.js";
 import {
   AONE_MAX_MR_VIEW_CALLS_PER_RUN,
   DaemonDrainingError,
   InvalidCursorError,
   SessionArchiveCoordinator,
+  acquireWorktreeOwnershipOp,
   archiveDaemonSessions,
   assertSessionArchived,
   assertSessionLoadable,
@@ -156,7 +152,7 @@ import {
   runWithWorkspaceRuntimeStorage,
   searchWorkspaceSessionsForResponse,
   unarchiveDaemonSessions
-} from "./chunk-URSCX7S7.js";
+} from "./chunk-ZPL2TZNA.js";
 import {
   LIVE_SESSION_SOURCE_PREFIX,
   isCompatibleLiveSessionSource,
@@ -208,17 +204,17 @@ import {
 import {
   evaluateDaemonWorkspaceTrust,
   readDaemonTrustPolicySnapshot
-} from "./chunk-IFD3BTEA.js";
+} from "./chunk-EOET4H7C.js";
 import {
   readRecentPromptTerminals,
   reconcileDanglingPromptTerminals,
   withPromptTerminals
-} from "./chunk-CWNC7M73.js";
+} from "./chunk-IKG2YVRZ.js";
 import {
   WorkspaceGenerationClosedError,
   createSingleWorkspaceRegistry,
   createWorkspaceSessionOwnerIndex
-} from "./chunk-QJVZLILI.js";
+} from "./chunk-R7OO56VZ.js";
 import {
   sessionAttachmentsRoots
 } from "./chunk-XWJFDJZK.js";
@@ -244,11 +240,11 @@ import {
   sendUntrustedWorkspaceResponse,
   sendWorkspaceRuntimeUnavailable,
   setWorkspaceRouteContext
-} from "./chunk-CZACBHAW.js";
+} from "./chunk-B3EL44K3.js";
 import {
   normalizeChannelDelivery,
   parseChannelDelivery
-} from "./chunk-PZUOHCWI.js";
+} from "./chunk-WAASYFPK.js";
 import {
   isValidSessionId,
   normalizeSessionIdForLookup,
@@ -263,7 +259,7 @@ import {
   getWorkspaceRuntimeCoordinator,
   getWorkspaceRuntimeCoordinatorIfSupported,
   supportsWorkspaceRuntimeLifecycle
-} from "./chunk-GCFZ2LAX.js";
+} from "./chunk-HZ2HUXX7.js";
 import "./chunk-OIBUG24X.js";
 import {
   MAX_SESSION_RESTORE_TIMEOUT_MS,
@@ -285,14 +281,14 @@ import {
   validateWorkspaceSkillName,
   validateWorkspaceVoiceState,
   voiceSettingsScopeToWire
-} from "./chunk-KJJPJYHI.js";
+} from "./chunk-FWRRUITH.js";
 import {
   PermissionRulesValidationError,
   buildPermissionSettings,
   isPermissionRuleType,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-MWHY26G3.js";
+} from "./chunk-CHVU543W.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isStreamingVoiceModel,
@@ -300,18 +296,18 @@ import {
   resolveVoiceTranscriptionConfig,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-4MCY33Y2.js";
+} from "./chunk-GNY7B3CA.js";
 import {
   isVoiceEnabled,
   isVoiceMode,
   readVoiceModel
-} from "./chunk-XOVVCGZX.js";
+} from "./chunk-NB3NDQQK.js";
 import "./chunk-Y53DG2HA.js";
 import {
   createDaemonStatusProvider
-} from "./chunk-LPBQODMR.js";
-import "./chunk-P6LATTDG.js";
-import "./chunk-YCDL2SAS.js";
+} from "./chunk-OESZTXTG.js";
+import "./chunk-5IL2BZHW.js";
+import "./chunk-6QILGINT.js";
 import "./chunk-JS73NNWF.js";
 import {
   SessionArtifactAuthorizationError,
@@ -320,7 +316,7 @@ import {
   extractErrorCode,
   extractErrorMessage,
   parseSessionSource
-} from "./chunk-NAKALAL4.js";
+} from "./chunk-2TMJRF46.js";
 import {
   EVENT_SCHEMA_VERSION,
   EventBus,
@@ -330,24 +326,24 @@ import "./chunk-WCCLLK7X.js";
 import "./chunk-OCPBI7J5.js";
 import {
   createSpawnChannelFactory
-} from "./chunk-LMJQSPWB.js";
+} from "./chunk-KA5HR3G2.js";
 import {
   createWorkspaceProvidersStatusProvider
-} from "./chunk-D4CU6DKR.js";
+} from "./chunk-DO5SMV52.js";
 import {
   PERSIST_REASONING_SELECTION_META_KEY,
   REASONING_SELECTION_PERSISTED_META_KEY
-} from "./chunk-ZJ2LM2SI.js";
+} from "./chunk-JGDRB4FP.js";
 import {
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-O2GG7H4C.js";
+} from "./chunk-ARYNBBBM.js";
 import {
   snapshotProcessEnv
-} from "./chunk-4HC4DYKN.js";
+} from "./chunk-6RZX2HIH.js";
 import {
   createWorkspaceSkillsStatusProvider
-} from "./chunk-J3O5I5ZD.js";
+} from "./chunk-QK4K76T6.js";
 import "./chunk-BHTYRHJF.js";
 import {
   BridgeTimeoutError,
@@ -356,7 +352,7 @@ import {
   SessionRestoreTimeoutError,
   createIdleWorkspaceMemoryStatus,
   mapDomainErrorToErrorKind
-} from "./chunk-KPXRFTT7.js";
+} from "./chunk-FETY36NQ.js";
 import {
   resolveSkillSettings
 } from "./chunk-HWVUSYSN.js";
@@ -366,29 +362,35 @@ import {
   WorkspaceSkillNotFoundError,
   mapWorkspaceSkillToggleError
 } from "./chunk-FTJMWDND.js";
-import "./chunk-537SQ2AI.js";
+import "./chunk-5WC2ECUK.js";
 import {
   daemonObservedContactsPath,
   loadChannelsConfig
-} from "./chunk-IXSGOSEG.js";
-import "./chunk-AHBLRVD5.js";
+} from "./chunk-DZ6D4B3K.js";
+import "./chunk-EEKU6COG.js";
 import "./chunk-57OAHC2Y.js";
 import {
   parseChannelWebhookConfigLenient
-} from "./chunk-TMWB67LS.js";
+} from "./chunk-UXDVUFKU.js";
 import {
   supportedChannelCatalog
-} from "./chunk-4IQKBLTQ.js";
-import "./chunk-WXC6OAWD.js";
+} from "./chunk-UHUT4IDM.js";
+import "./chunk-3BTHHXXE.js";
 import "./chunk-V6WHFGST.js";
 import {
+  assertLiveDiscoveryPublisher,
   getStableLiveDiscoveryBaseDir
-} from "./chunk-OHOO527W.js";
+} from "./chunk-WG7BL3FY.js";
 import {
+  ConversationRuntimeOwnershipError,
   LIVE_HOST_BUNDLE_ID,
   LIVE_HOST_PROTOCOL_VERSION,
-  LIVE_INPUT_AUDIO_EPOCH_BYTES
-} from "./chunk-IQAFKVXS.js";
+  LIVE_INPUT_AUDIO_EPOCH_BYTES,
+  conversationRootCompromisedError,
+  conversationRuntimeInUseError,
+  conversationRuntimeOwnershipCompromisedError,
+  conversationRuntimeUnavailableError
+} from "./chunk-2Z3T52OC.js";
 import "./chunk-ZL4HFSL6.js";
 import "./chunk-K6KS3LTN.js";
 import "./chunk-OSHQMOBS.js";
@@ -399,13 +401,13 @@ import {
   WorkspaceRegistrationStoreLimitError,
   normalizeWorkspaceDisplayName,
   workspaceRegistrationId
-} from "./chunk-5YY5MZT6.js";
+} from "./chunk-QZOXVQPK.js";
 import {
   CHANNEL_PROMPT_META_KEY,
   DAEMON_PROMPT_DISPLAY_TEXT_META_KEY,
   REQUESTED_SESSION_ID_META_KEY,
   gradeActiveWorkCoverage
-} from "./chunk-WEXA2DNG.js";
+} from "./chunk-PSPAM24S.js";
 import {
   BranchWhilePromptActiveError,
   BridgeChannelQuarantinedError,
@@ -431,6 +433,7 @@ import {
   SessionLimitExceededError,
   SessionNotArchivedError,
   SessionNotFoundError,
+  SessionResetPendingError,
   SessionShellClientRequiredError,
   SessionShellDisabledError,
   StandaloneSessionSpawnError,
@@ -441,7 +444,7 @@ import {
   WorkspaceInitRaceError,
   WorkspaceInitSymlinkError,
   WorkspaceMismatchError
-} from "./chunk-F47DITLZ.js";
+} from "./chunk-FAWTMDX7.js";
 import {
   MAX_WORKSPACE_PATH_LENGTH,
   canonicalizeWorkspace,
@@ -461,7 +464,7 @@ import {
 } from "./chunk-STUJ7IMZ.js";
 import {
   normalizeWorkerDiagnostic
-} from "./chunk-4JAGXZR3.js";
+} from "./chunk-GM44O6F7.js";
 import {
   QWEN_SERVER_TOKEN_ENV
 } from "./chunk-GYTKQYDB.js";
@@ -479,7 +482,7 @@ import {
 import "./chunk-3VUENPWF.js";
 import {
   sanitizeLogText
-} from "./chunk-VDXYYVCD.js";
+} from "./chunk-XVTCSVBK.js";
 import "./chunk-IW6RQPQB.js";
 import "./chunk-5HBA2Z7V.js";
 import {
@@ -494,8 +497,8 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   validateSettingValue
-} from "./chunk-AQ5NAGWI.js";
-import "./chunk-ER273QE6.js";
+} from "./chunk-66JBCTJF.js";
+import "./chunk-2ZFO5JD7.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-BW4333PP.js";
 import "./chunk-IDS7MSUP.js";
@@ -504,18 +507,18 @@ import {
   getCurrentLanguage,
   resolveLanguageSetting,
   setLanguageAsync
-} from "./chunk-MUZCSTOO.js";
+} from "./chunk-CRZBDVP2.js";
 import {
   SUPPORTED_LANGUAGES,
   resolveSupportedLanguage
 } from "./chunk-5EJZE3FP.js";
-import "./chunk-H3UDNQLO.js";
-import "./chunk-NUQFUXOG.js";
-import "./chunk-XUSOYE2I.js";
+import "./chunk-5CVY5Q2P.js";
+import "./chunk-QTNCGZHQ.js";
+import "./chunk-27LTEY6D.js";
 import "./chunk-W3N5XAZ6.js";
 import {
   getWorkspaceTrustStatus
-} from "./chunk-XY3USGFE.js";
+} from "./chunk-3VDLQUR2.js";
 import "./chunk-NPQ5ZKRP.js";
 import {
   isWithinRoot as isWithinRoot2
@@ -532,24 +535,25 @@ import {
   loadIgnoreRules,
   shouldShowStep,
   writeWorkspaceContextFile
-} from "./chunk-UEZOXZNI.js";
+} from "./chunk-ZU2T5JIS.js";
 import "./chunk-GELRJXE2.js";
 import "./chunk-32CM56LO.js";
-import "./chunk-JPEAQJNS.js";
-import "./chunk-WTW36TJ3.js";
+import "./chunk-WJDXKQIO.js";
+import "./chunk-2EKVPSIJ.js";
 import "./chunk-LJZSMWOH.js";
 import {
+  clearWorktreeSession,
   readWorktreeSession,
   readWorktreeSessionStrict,
   writeWorktreeSession
-} from "./chunk-VUSSAGKI.js";
-import "./chunk-O45WBTNS.js";
+} from "./chunk-YZTGGCEE.js";
+import "./chunk-6SADVYQQ.js";
 import "./chunk-DJXSOEFB.js";
-import "./chunk-2WGJG2KW.js";
-import "./chunk-QMFOYPGV.js";
-import "./chunk-LDS57224.js";
+import "./chunk-25CBAK3H.js";
+import "./chunk-J3VZF2AL.js";
+import "./chunk-OWCFKIFQ.js";
 import "./chunk-ZPJWUGCS.js";
-import "./chunk-HFTB354P.js";
+import "./chunk-5Z4FCEPY.js";
 import "./chunk-BUQN5LTI.js";
 import {
   QwenOAuth2Client,
@@ -559,8 +563,8 @@ import {
   isDeviceAuthorizationSuccess,
   isDeviceTokenPending,
   isDeviceTokenSuccess
-} from "./chunk-VU7O7CGQ.js";
-import "./chunk-QSC5YOEC.js";
+} from "./chunk-XDNFODER.js";
+import "./chunk-YAC7H4K3.js";
 import "./chunk-VNOVK4I7.js";
 import {
   BuiltinAgentRegistry,
@@ -644,20 +648,22 @@ import {
   toSessionPrInfo,
   upsertSessionPr,
   watchRepoBranch
-} from "./chunk-I72PHOKL.js";
+} from "./chunk-PDUMGZ2P.js";
 import "./chunk-GOFAQQZA.js";
-import "./chunk-3K65MUKD.js";
+import "./chunk-65I7S4Z3.js";
 import "./chunk-6HUXPLB5.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
 import "./chunk-YHDGABDC.js";
-import "./chunk-RDKXZ2LS.js";
+import "./chunk-LYT2OU7D.js";
 import "./chunk-B54PFQS5.js";
 import {
   GitWorktreeService,
+  WorktreeMarkerCommittedError,
   createWorktreeSessionMarkerExclusive,
-  readWorktreeSessionMarkerStrict
-} from "./chunk-43NOB5NM.js";
+  readWorktreeSessionMarkerStrict,
+  transferWorktreeSessionMarkerOwner
+} from "./chunk-HIXUUCGY.js";
 import "./chunk-6PVPNMXU.js";
 import "./chunk-565U2ANU.js";
 import "./chunk-FDOGGKAA.js";
@@ -669,14 +675,14 @@ import {
   taskHasLegacyCondition,
   updateCronTasks
 } from "./chunk-F53KKZUD.js";
-import "./chunk-PZV2FASB.js";
+import "./chunk-TRWQQBVH.js";
 import {
   glob
 } from "./chunk-QJNDUTOL.js";
-import "./chunk-OECNP26L.js";
+import "./chunk-N6S3NUYJ.js";
 import "./chunk-O6GEWCJA.js";
 import "./chunk-CHEIIBT3.js";
-import "./chunk-UKKYOIVT.js";
+import "./chunk-QAZ2MGYT.js";
 import "./chunk-B44JBZBB.js";
 import "./chunk-BF3RUIVP.js";
 import {
@@ -686,28 +692,27 @@ import {
   recordDaemonBridgeError,
   recordDaemonHttpRequest,
   validateSkillName
-} from "./chunk-R355CUNQ.js";
-import "./chunk-4VUVBN3Y.js";
+} from "./chunk-CLKE4IY3.js";
 import "./chunk-ZSTCM3MX.js";
-import "./chunk-NXWYCSPL.js";
+import "./chunk-SOA4HKRJ.js";
 import "./chunk-MLXTMF7H.js";
-import "./chunk-GXZHYPHZ.js";
+import "./chunk-3LPJ776W.js";
 import {
   findGitRoot
 } from "./chunk-3CZ2BQV6.js";
 import "./chunk-PQEISIKS.js";
-import "./chunk-3K456UJF.js";
-import "./chunk-VEFRT7NX.js";
+import "./chunk-VF6D6EGV.js";
+import "./chunk-H3Q3RSKZ.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-UKADFFL2.js";
-import "./chunk-EJNYBDYC.js";
+import "./chunk-OFVAS4AR.js";
+import "./chunk-HNLMYDQE.js";
 import "./chunk-QHMLYMMS.js";
 import "./chunk-CFKIH3D3.js";
-import "./chunk-2LD5U7Q3.js";
+import "./chunk-6YEOCHSE.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-W4LL5RZO.js";
-import "./chunk-3UMWOKJC.js";
+import "./chunk-4ALNJDHL.js";
+import "./chunk-NOO4QFXM.js";
 import "./chunk-KFFCDLKV.js";
 import {
   addDaemonRequestAttribute,
@@ -725,7 +730,7 @@ import "./chunk-XWRJCPHC.js";
 import {
   parseLineTolerant,
   read
-} from "./chunk-P5LDR7FI.js";
+} from "./chunk-6QV7Z74P.js";
 import "./chunk-5ETULJLP.js";
 import "./chunk-XBVNNDPK.js";
 import "./chunk-VGC4I5JJ.js";
@@ -743,7 +748,7 @@ import "./chunk-HD7O6WLV.js";
 import "./chunk-WZAD4ZNJ.js";
 import "./chunk-FPGTNKCP.js";
 import "./chunk-TIGXX4PA.js";
-import "./chunk-5MTARK4Y.js";
+import "./chunk-N7YQEKGX.js";
 import "./chunk-XFFRI3WM.js";
 import "./chunk-4HOEU2OR.js";
 import "./chunk-HHJLM3WQ.js";
@@ -753,17 +758,17 @@ import {
   stripAnsiAndControl
 } from "./chunk-7VEYUF3N.js";
 import "./chunk-74TONY4F.js";
-import "./chunk-GMNLYQOS.js";
+import "./chunk-E6TI726I.js";
 import {
   SubagentError,
   SubagentErrorCode
-} from "./chunk-D6PIMKY3.js";
-import "./chunk-NGX4NUNP.js";
+} from "./chunk-4VY3ITHR.js";
+import "./chunk-O2FEO2CB.js";
 import {
   escapeXml
-} from "./chunk-FKJM6JKY.js";
+} from "./chunk-G6UUOCUT.js";
 import "./chunk-IZ2U57NY.js";
-import "./chunk-RPBMP6BN.js";
+import "./chunk-MWIO7MF6.js";
 import {
   FatalConfigError,
   Storage,
@@ -6221,7 +6226,7 @@ __name(createRequestedSessionIdAdmission, "createRequestedSessionIdAdmission");
 
 // packages/cli/src/serve/conversations/standalone-session-service.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 
 // packages/cli/src/serve/server/session-export.ts
 init_esbuild_shims();
@@ -6290,473 +6295,10 @@ __name(exportSessionTranscript, "exportSessionTranscript");
 
 // packages/cli/src/serve/conversations/standalone-deletion-journal.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID4 } from "node:crypto";
-import { constants as fsConstants3 } from "node:fs";
-import * as fs2 from "node:fs/promises";
-import * as path8 from "node:path";
-
-// packages/cli/src/serve/conversations/conversation-runtime-ownership.ts
-init_esbuild_shims();
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { constants as fsConstants2 } from "node:fs";
 import * as fs from "node:fs/promises";
 import * as path7 from "node:path";
-var OWNER_DIRECTORY = "conversations";
-var OWNER_FILE = "runtime-owner.json";
-var OWNER_LOCK = ".runtime-owner.lock";
-var MAX_OWNER_BYTES = 4 * 1024;
-var NONCE_PATTERN = /^[A-Za-z0-9_-]{16,256}$/;
-var DEFAULT_HANDOFF_GRACE_MS = 1e3;
-var UnsafeOwnershipStateError = class extends Error {
-  static {
-    __name(this, "UnsafeOwnershipStateError");
-  }
-};
-function getConversationRuntimeOwnerPath(stableBaseDir) {
-  return path7.join(stableBaseDir, OWNER_DIRECTORY, OWNER_FILE);
-}
-__name(getConversationRuntimeOwnerPath, "getConversationRuntimeOwnerPath");
-function processIsAlive(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (error2) {
-    return error2.code !== "ESRCH";
-  }
-}
-__name(processIsAlive, "processIsAlive");
-function delay(milliseconds) {
-  return new Promise((resolve7) => {
-    setTimeout(resolve7, milliseconds);
-  });
-}
-__name(delay, "delay");
-function isMissing(error2) {
-  return error2.code === "ENOENT";
-}
-__name(isMissing, "isMissing");
-function assertOwnerRecord(value) {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) {
-    throw new UnsafeOwnershipStateError();
-  }
-  const keys = Object.keys(value).sort();
-  if (keys.length !== 3 || keys[0] !== "instanceNonce" || keys[1] !== "pid" || keys[2] !== "version") {
-    throw new UnsafeOwnershipStateError();
-  }
-  const record = value;
-  if (record["version"] !== 1 || !Number.isSafeInteger(record["pid"]) || record["pid"] <= 0 || typeof record["instanceNonce"] !== "string" || !NONCE_PATTERN.test(record["instanceNonce"])) {
-    throw new UnsafeOwnershipStateError();
-  }
-  return {
-    version: 1,
-    pid: record["pid"],
-    instanceNonce: record["instanceNonce"]
-  };
-}
-__name(assertOwnerRecord, "assertOwnerRecord");
-function sameRecord(left, right) {
-  return left.version === right.version && left.pid === right.pid && left.instanceNonce === right.instanceNonce;
-}
-__name(sameRecord, "sameRecord");
-async function inspectDirectory(directory, requirePrivateMode) {
-  const stat3 = await fs.lstat(directory);
-  if (!stat3.isDirectory() || stat3.isSymbolicLink()) {
-    throw new UnsafeOwnershipStateError();
-  }
-  if (process.platform !== "win32" && (typeof process.getuid === "function" && stat3.uid !== process.getuid() || requirePrivateMode && (stat3.mode & 511) !== 448)) {
-    throw new UnsafeOwnershipStateError();
-  }
-  return { dev: stat3.dev, ino: stat3.ino };
-}
-__name(inspectDirectory, "inspectDirectory");
-async function ensureDirectory(directory, requirePrivateMode) {
-  try {
-    return await inspectDirectory(directory, requirePrivateMode);
-  } catch (error2) {
-    if (error2 instanceof UnsafeOwnershipStateError || !isMissing(error2)) {
-      throw error2;
-    }
-  }
-  const parent = path7.dirname(directory);
-  if (parent === directory) throw new UnsafeOwnershipStateError();
-  const parentIdentity = await ensureDirectory(parent, false);
-  await assertDirectoryIdentity(parent, parentIdentity, false);
-  let created = false;
-  try {
-    await fs.mkdir(directory, { mode: 448 });
-    created = true;
-  } catch (error2) {
-    if (error2.code !== "EEXIST") throw error2;
-  }
-  if (created && process.platform !== "win32") {
-    await fs.chmod(directory, 448);
-  }
-  await assertDirectoryIdentity(parent, parentIdentity, false);
-  return inspectDirectory(directory, requirePrivateMode);
-}
-__name(ensureDirectory, "ensureDirectory");
-async function assertDirectoryIdentity(directory, expected, requirePrivateMode = true) {
-  const current = await inspectDirectory(directory, requirePrivateMode);
-  if (current.dev !== expected.dev || current.ino !== expected.ino) {
-    throw new UnsafeOwnershipStateError();
-  }
-}
-__name(assertDirectoryIdentity, "assertDirectoryIdentity");
-async function assertLockShapeIfPresent(lockPath) {
-  let stat3;
-  try {
-    stat3 = await fs.lstat(lockPath);
-  } catch (error2) {
-    if (isMissing(error2)) return;
-    throw error2;
-  }
-  if (!stat3.isDirectory() || stat3.isSymbolicLink() || process.platform !== "win32" && typeof process.getuid === "function" && stat3.uid !== process.getuid()) {
-    throw new UnsafeOwnershipStateError();
-  }
-}
-__name(assertLockShapeIfPresent, "assertLockShapeIfPresent");
-async function readOwnerRecord(ownerPath) {
-  let pathStat;
-  try {
-    pathStat = await fs.lstat(ownerPath);
-  } catch (error2) {
-    if (isMissing(error2)) return void 0;
-    throw error2;
-  }
-  if (!pathStat.isFile() || pathStat.isSymbolicLink() || pathStat.nlink !== 1 || pathStat.size <= 0 || pathStat.size > MAX_OWNER_BYTES || process.platform !== "win32" && ((pathStat.mode & 511) !== 384 || typeof process.getuid === "function" && pathStat.uid !== process.getuid())) {
-    throw new UnsafeOwnershipStateError();
-  }
-  let handle;
-  try {
-    handle = await fs.open(
-      ownerPath,
-      process.platform === "win32" ? fsConstants2.O_RDONLY : fsConstants2.O_RDONLY | fsConstants2.O_NOFOLLOW
-    );
-  } catch (error2) {
-    if (error2.code === "ELOOP") {
-      throw new UnsafeOwnershipStateError(void 0, { cause: error2 });
-    }
-    throw error2;
-  }
-  try {
-    const handleStat = await handle.stat();
-    if (!handleStat.isFile() || handleStat.nlink !== 1 || handleStat.dev !== pathStat.dev || handleStat.ino !== pathStat.ino || handleStat.size !== pathStat.size || process.platform !== "win32" && ((handleStat.mode & 511) !== 384 || typeof process.getuid === "function" && handleStat.uid !== process.getuid())) {
-      throw new UnsafeOwnershipStateError();
-    }
-    const serialized = await handle.readFile("utf8");
-    let parsed;
-    try {
-      parsed = JSON.parse(serialized);
-    } catch (error2) {
-      throw new UnsafeOwnershipStateError(void 0, { cause: error2 });
-    }
-    return assertOwnerRecord(parsed);
-  } finally {
-    await handle.close();
-  }
-}
-__name(readOwnerRecord, "readOwnerRecord");
-async function syncDirectory(directory) {
-  if (process.platform === "win32") return;
-  const handle = await fs.open(directory, fsConstants2.O_RDONLY);
-  try {
-    await handle.sync();
-  } finally {
-    await handle.close();
-  }
-}
-__name(syncDirectory, "syncDirectory");
-var FileConversationRuntimeOwnership = class {
-  static {
-    __name(this, "FileConversationRuntimeOwnership");
-  }
-  stableBaseDir;
-  ownerDirectory;
-  ownerPath;
-  lockPath;
-  current;
-  isProcessAlive;
-  wait;
-  handoffGraceMs;
-  lockOptions;
-  state = "unclaimed";
-  terminalError;
-  acquirePending;
-  releasePending;
-  constructor(options) {
-    this.stableBaseDir = options.stableBaseDir;
-    this.ownerDirectory = path7.dirname(
-      getConversationRuntimeOwnerPath(options.stableBaseDir)
-    );
-    this.ownerPath = getConversationRuntimeOwnerPath(options.stableBaseDir);
-    this.lockPath = path7.join(this.ownerDirectory, OWNER_LOCK);
-    this.current = {
-      version: 1,
-      pid: options.pid,
-      instanceNonce: options.instanceNonce
-    };
-    this.isProcessAlive = options.isProcessAlive ?? processIsAlive;
-    this.wait = options.wait ?? delay;
-    this.handoffGraceMs = options.handoffGraceMs ?? DEFAULT_HANDOFF_GRACE_MS;
-    this.lockOptions = options.lockOptions ?? {
-      stale: 5e3,
-      update: 1e3,
-      retries: {
-        retries: 40,
-        minTimeout: 10,
-        maxTimeout: 50,
-        factor: 1.2,
-        randomize: true
-      }
-    };
-  }
-  acquire() {
-    if (this.acquirePending) return this.acquirePending;
-    const pending = this.acquireOnce().finally(() => {
-      if (this.acquirePending === pending) this.acquirePending = void 0;
-    });
-    this.acquirePending = pending;
-    return pending;
-  }
-  release() {
-    if (this.releasePending) return this.releasePending;
-    const pending = this.releaseOnce().finally(() => {
-      if (this.releasePending === pending) this.releasePending = void 0;
-    });
-    this.releasePending = pending;
-    return pending;
-  }
-  async acquireOnce() {
-    if (this.terminalError) throw this.terminalError;
-    if (this.state === "released") {
-      throw this.compromise();
-    }
-    if (this.releasePending) {
-      await this.releasePending.catch(() => void 0);
-      throw this.compromise();
-    }
-    const identity = await this.prepareOwnerDirectory();
-    let releaseLock;
-    let operationError;
-    let reclaimed = false;
-    let lockCompromise;
-    try {
-      await assertLockShapeIfPresent(this.lockPath);
-      const lockfile = (await import("./proper-lockfile-3LHWIM44.js")).default;
-      releaseLock = await lockfile.lock(this.ownerDirectory, {
-        realpath: false,
-        lockfilePath: this.lockPath,
-        ...this.lockOptions,
-        onCompromised: /* @__PURE__ */ __name((error2) => {
-          lockCompromise = error2;
-        }, "onCompromised")
-      });
-      await assertLockShapeIfPresent(this.lockPath);
-      await assertDirectoryIdentity(this.ownerDirectory, identity);
-      if (lockCompromise) throw new UnsafeOwnershipStateError();
-      const existing = await readOwnerRecord(this.ownerPath);
-      const commitOwner = /* @__PURE__ */ __name(async () => {
-        if (this.state === "owned") {
-          if (!existing || !sameRecord(existing, this.current)) {
-            throw new UnsafeOwnershipStateError();
-          }
-        } else if (existing && sameRecord(existing, this.current)) {
-          this.state = "provisional";
-        } else if (existing) {
-          if (existing.pid === this.current.pid || this.isProcessAlive(existing.pid)) {
-            throw conversationRuntimeInUseError();
-          }
-          reclaimed = true;
-          await this.commitRecord(identity, existing);
-        } else {
-          await this.commitRecord(identity, void 0);
-        }
-      }, "commitOwner");
-      const liveDiscovery = await import("./discovery-TUM3ZQ6U.js");
-      const handoff = await liveDiscovery.handoffLiveDiscoveryOwner(
-        this.stableBaseDir,
-        this.current,
-        commitOwner,
-        {
-          isProcessAlive: this.isProcessAlive,
-          waitForHandoffGrace: false
-        }
-      );
-      reclaimed ||= handoff.reclaimed;
-    } catch (error2) {
-      operationError = error2;
-    }
-    let releaseError;
-    if (releaseLock) {
-      try {
-        await releaseLock();
-      } catch (error2) {
-        releaseError = error2;
-      }
-    }
-    if (lockCompromise || releaseError) {
-      throw this.compromise(lockCompromise ?? releaseError);
-    }
-    if (operationError) {
-      throw this.mapAcquireError(operationError);
-    }
-    if (reclaimed) {
-      try {
-        await this.wait(this.handoffGraceMs);
-      } catch (error2) {
-        throw this.compromise(error2);
-      }
-    }
-    if (this.state === "provisional") this.state = "owned";
-    return { reclaimed };
-  }
-  async releaseOnce() {
-    if (this.acquirePending) {
-      await this.acquirePending.catch(() => void 0);
-    }
-    if (this.state === "unclaimed" || this.state === "released") return false;
-    if (this.state === "provisional" || this.terminalError) {
-      throw this.terminalError ?? this.compromise();
-    }
-    const identity = await this.prepareOwnerDirectory();
-    let releaseLock;
-    let operationError;
-    let lockCompromise;
-    try {
-      await assertLockShapeIfPresent(this.lockPath);
-      const lockfile = (await import("./proper-lockfile-3LHWIM44.js")).default;
-      releaseLock = await lockfile.lock(this.ownerDirectory, {
-        realpath: false,
-        lockfilePath: this.lockPath,
-        ...this.lockOptions,
-        onCompromised: /* @__PURE__ */ __name((error2) => {
-          lockCompromise = error2;
-        }, "onCompromised")
-      });
-      await assertLockShapeIfPresent(this.lockPath);
-      await assertDirectoryIdentity(this.ownerDirectory, identity);
-      const existing = await readOwnerRecord(this.ownerPath);
-      if (lockCompromise || !existing || !sameRecord(existing, this.current)) {
-        throw new UnsafeOwnershipStateError();
-      }
-      await assertDirectoryIdentity(this.ownerDirectory, identity);
-      await fs.unlink(this.ownerPath);
-      this.state = "released";
-      await syncDirectory(this.ownerDirectory);
-    } catch (error2) {
-      operationError = error2;
-    }
-    let releaseError;
-    if (releaseLock) {
-      try {
-        await releaseLock();
-      } catch (error2) {
-        releaseError = error2;
-      }
-    }
-    if (lockCompromise || releaseError) {
-      if (this.state !== "released") this.compromise(lockCompromise);
-      throw conversationRuntimeOwnershipCompromisedError(
-        lockCompromise ?? releaseError
-      );
-    }
-    if (operationError) {
-      if (this.state === "released") {
-        throw conversationRuntimeOwnershipCompromisedError(operationError);
-      }
-      if (operationError instanceof UnsafeOwnershipStateError) {
-        throw this.compromise(operationError);
-      }
-      throw conversationRuntimeUnavailableError(operationError);
-    }
-    return true;
-  }
-  async prepareOwnerDirectory() {
-    try {
-      if (this.state === "unclaimed") {
-        await ensureDirectory(this.stableBaseDir, false);
-        return await ensureDirectory(this.ownerDirectory, true);
-      }
-      await inspectDirectory(this.stableBaseDir, false);
-      return await inspectDirectory(this.ownerDirectory, true);
-    } catch (error2) {
-      if (error2 instanceof UnsafeOwnershipStateError || this.state !== "unclaimed" && isMissing(error2)) {
-        throw this.compromise(error2);
-      }
-      throw conversationRuntimeUnavailableError(error2);
-    }
-  }
-  async commitRecord(identity, expected) {
-    const temporaryPath = path7.join(
-      this.ownerDirectory,
-      `.runtime-owner.${this.current.pid}.${randomUUID3()}.tmp`
-    );
-    let handle;
-    let renamed = false;
-    try {
-      handle = await fs.open(temporaryPath, "wx", 384);
-      await handle.writeFile(`${JSON.stringify(this.current)}
-`, "utf8");
-      await handle.sync();
-      if (process.platform !== "win32") await handle.chmod(384);
-      await handle.close();
-      handle = void 0;
-      await assertDirectoryIdentity(this.ownerDirectory, identity);
-      const observed = await readOwnerRecord(this.ownerPath);
-      if (expected === void 0 && observed !== void 0 || expected !== void 0 && (!observed || !sameRecord(observed, expected))) {
-        throw new UnsafeOwnershipStateError();
-      }
-      await assertDirectoryIdentity(this.ownerDirectory, identity);
-      if (process.platform === "win32" && observed) {
-        await fs.unlink(this.ownerPath);
-        try {
-          await fs.rename(temporaryPath, this.ownerPath);
-        } catch (error2) {
-          await this.wait(this.handoffGraceMs);
-          throw error2;
-        }
-      } else {
-        await fs.rename(temporaryPath, this.ownerPath);
-      }
-      renamed = true;
-      this.state = "provisional";
-      await syncDirectory(this.ownerDirectory);
-    } finally {
-      await handle?.close().catch(() => void 0);
-      if (!renamed) {
-        await fs.unlink(temporaryPath).catch(() => void 0);
-      }
-    }
-  }
-  mapAcquireError(error2) {
-    if (error2 instanceof ConversationRuntimeOwnershipError) return error2;
-    if (error2 instanceof Error && error2.name === "LiveDiscoveryOwnerActiveError") {
-      return conversationRuntimeInUseError();
-    }
-    if (error2 instanceof UnsafeOwnershipStateError) {
-      return this.compromise(error2);
-    }
-    if (this.state === "provisional" || error2 instanceof Error && error2.name === "LiveDiscoveryStateError") {
-      return this.compromise(error2);
-    }
-    const code = error2.code;
-    if (code === "ECOMPROMISED") return this.compromise(error2);
-    return conversationRuntimeUnavailableError(error2);
-  }
-  compromise(cause) {
-    this.terminalError ??= conversationRuntimeOwnershipCompromisedError(cause);
-    return this.terminalError;
-  }
-};
-function createConversationRuntimeOwnership(options) {
-  if (!path7.isAbsolute(options.stableBaseDir) || !Number.isSafeInteger(options.pid) || options.pid <= 0 || !NONCE_PATTERN.test(options.instanceNonce) || !Number.isSafeInteger(options.handoffGraceMs ?? DEFAULT_HANDOFF_GRACE_MS) || (options.handoffGraceMs ?? DEFAULT_HANDOFF_GRACE_MS) < 0) {
-    throw new TypeError("Invalid Conversations runtime ownership options.");
-  }
-  return new FileConversationRuntimeOwnership(options);
-}
-__name(createConversationRuntimeOwnership, "createConversationRuntimeOwnership");
-
-// packages/cli/src/serve/conversations/standalone-deletion-journal.ts
 var JOURNAL_DIRECTORY = "deletions";
 var MAX_RECORD_BYTES = 8 * 1024;
 var STORAGE_SESSION_ID_PATTERN = /^[0-9a-fA-F-]{32,36}$/;
@@ -6771,10 +6313,10 @@ var StandaloneDeletionJournalError = class extends Error {
   }
   name = "StandaloneDeletionJournalError";
 };
-function isMissing2(error2) {
+function isMissing(error2) {
   return error2.code === "ENOENT";
 }
-__name(isMissing2, "isMissing");
+__name(isMissing, "isMissing");
 function parseSessionId(value) {
   const parsed = parseCallerSuppliedSessionId(value);
   if (parsed.kind !== "valid") {
@@ -6805,7 +6347,7 @@ function parseIdentity(value, pathField) {
   if (!isIdentityNumber(value["device"]) || !isIdentityNumber(value["inode"]) || typeof value["inodeVerifiable"] !== "boolean" || (value["inodeVerifiable"] ? value["inode"] === 0 : value["inode"] !== 0)) {
     return void 0;
   }
-  if (pathField && (typeof value["canonicalPath"] !== "string" || value["canonicalPath"].length === 0 || value["canonicalPath"].length > 4096 || !path8.isAbsolute(value["canonicalPath"]))) {
+  if (pathField && (typeof value["canonicalPath"] !== "string" || value["canonicalPath"].length === 0 || value["canonicalPath"].length > 4096 || !path7.isAbsolute(value["canonicalPath"]))) {
     return void 0;
   }
   return {
@@ -6900,25 +6442,26 @@ function sameImmutableRecord(prepared, staged) {
 }
 __name(sameImmutableRecord, "sameImmutableRecord");
 var StandaloneDeletionJournal = class {
+  constructor(stableBaseDir) {
+    this.stableBaseDir = stableBaseDir;
+    if (!path7.isAbsolute(stableBaseDir)) {
+      throw new TypeError("Standalone deletion journal base must be absolute.");
+    }
+    this.stateDirectory = path7.join(stableBaseDir, "conversations");
+    this.journalDirectory = path7.join(this.stateDirectory, JOURNAL_DIRECTORY);
+  }
   static {
     __name(this, "StandaloneDeletionJournal");
   }
-  ownerDirectory;
+  stateDirectory;
   journalDirectory;
+  directoryIdentities = /* @__PURE__ */ new Map();
+  canonicalBaseDir;
   pendingClears = /* @__PURE__ */ new Map();
-  constructor(stableBaseDir) {
-    if (!path8.isAbsolute(stableBaseDir)) {
-      throw new TypeError("Standalone deletion journal base must be absolute.");
-    }
-    this.ownerDirectory = path8.dirname(
-      getConversationRuntimeOwnerPath(stableBaseDir)
-    );
-    this.journalDirectory = path8.join(this.ownerDirectory, JOURNAL_DIRECTORY);
-  }
   async hasRecord(rawSessionId) {
     const sessionId = parseSessionId(rawSessionId);
-    if (this.pendingClears.has(sessionId)) return true;
     const identity = await this.inspectJournalDirectory();
+    if (this.pendingClears.has(sessionId)) return true;
     if (!identity) return false;
     const exists = await this.pathExists(this.recordPath(sessionId, "prepared")) || await this.pathExists(this.recordPath(sessionId, "staged"));
     await this.assertDirectoryIdentity(this.journalDirectory, identity);
@@ -6932,9 +6475,9 @@ var StandaloneDeletionJournal = class {
     }
     let names;
     try {
-      names = await fs2.readdir(this.journalDirectory);
+      names = await fs.readdir(this.journalDirectory);
     } catch (error2) {
-      if (isMissing2(error2)) {
+      if (isMissing(error2)) {
         return [...ids].sort().slice(0, Math.max(0, limit));
       }
       throw error2;
@@ -6948,11 +6491,11 @@ var StandaloneDeletionJournal = class {
   }
   async read(rawSessionId, currentRoot) {
     const sessionId = parseSessionId(rawSessionId);
+    const identity = await this.inspectJournalDirectory();
     const pending = this.pendingClears.get(sessionId);
     if (pending) {
       return this.validatePendingEntry(pending.entry, currentRoot);
     }
-    const identity = await this.inspectJournalDirectory();
     if (!identity) return void 0;
     const prepared = await this.readPhase(sessionId, "prepared", currentRoot);
     const staged = await this.readPhase(sessionId, "staged", currentRoot);
@@ -6995,6 +6538,7 @@ var StandaloneDeletionJournal = class {
   }
   async clear(rawSessionId, currentRoot) {
     const sessionId = parseSessionId(rawSessionId);
+    await this.inspectJournalDirectory();
     const pending = this.pendingClears.get(sessionId);
     if (pending) {
       this.validatePendingEntry(pending.entry, currentRoot);
@@ -7046,7 +6590,7 @@ var StandaloneDeletionJournal = class {
     return { prepared, ...staged ? { staged } : {} };
   }
   recordPath(sessionId, phase) {
-    return path8.join(
+    return path7.join(
       this.journalDirectory,
       `delete-${sessionId}.${phase}.json`
     );
@@ -7055,17 +6599,17 @@ var StandaloneDeletionJournal = class {
     const filePath = this.recordPath(sessionId, phase);
     let pathStat;
     try {
-      pathStat = await fs2.lstat(filePath);
+      pathStat = await fs.lstat(filePath);
     } catch (error2) {
-      if (isMissing2(error2)) return void 0;
+      if (isMissing(error2)) return void 0;
       throw error2;
     }
     this.assertRecordFile(pathStat);
     let handle;
     try {
-      handle = await fs2.open(
+      handle = await fs.open(
         filePath,
-        fsConstants3.O_RDONLY | (process.platform === "win32" ? 0 : fsConstants3.O_NOFOLLOW ?? 0)
+        fsConstants2.O_RDONLY | (process.platform === "win32" ? 0 : fsConstants2.O_NOFOLLOW ?? 0)
       );
     } catch (error2) {
       if (error2.code === "ELOOP") {
@@ -7100,9 +6644,9 @@ var StandaloneDeletionJournal = class {
     const identity = await this.ensureJournalDirectory();
     const target = this.recordPath(record.sessionId, record.phase);
     await this.assertPathAbsent(target);
-    const temporary = path8.join(
+    const temporary = path7.join(
       this.journalDirectory,
-      `.${path8.basename(target)}.${randomUUID4()}.tmp`
+      `.${path7.basename(target)}.${randomUUID3()}.tmp`
     );
     const directory = await this.openDurableDirectory(
       this.journalDirectory,
@@ -7111,9 +6655,9 @@ var StandaloneDeletionJournal = class {
     let handle;
     try {
       await this.assertDirectoryIdentity(this.journalDirectory, identity);
-      handle = await fs2.open(
+      handle = await fs.open(
         temporary,
-        fsConstants3.O_CREAT | fsConstants3.O_EXCL | fsConstants3.O_WRONLY | (process.platform === "win32" ? 0 : fsConstants3.O_NOFOLLOW ?? 0),
+        fsConstants2.O_CREAT | fsConstants2.O_EXCL | fsConstants2.O_WRONLY | (process.platform === "win32" ? 0 : fsConstants2.O_NOFOLLOW ?? 0),
         384
       );
       await handle.writeFile(serialized, "utf8");
@@ -7122,12 +6666,12 @@ var StandaloneDeletionJournal = class {
       handle = void 0;
       await this.assertDirectoryIdentity(this.journalDirectory, identity);
       await this.assertPathAbsent(target);
-      await fs2.rename(temporary, target);
-      if (process.platform !== "win32") await fs2.chmod(target, 384);
+      await fs.rename(temporary, target);
+      if (process.platform !== "win32") await fs.chmod(target, 384);
       await this.syncDurableDirectory(directory);
     } catch (error2) {
       await handle?.close().catch(() => void 0);
-      await fs2.unlink(temporary).catch(() => void 0);
+      await fs.unlink(temporary).catch(() => void 0);
       if (error2.code === "EEXIST") {
         throw new StandaloneDeletionJournalError("conflict");
       }
@@ -7137,48 +6681,107 @@ var StandaloneDeletionJournal = class {
     }
   }
   async ensureJournalDirectory() {
-    const owner = await this.inspectPrivateDirectory(this.ownerDirectory);
+    await this.ensureStateDirectory(this.stableBaseDir, false);
+    const owner = await this.ensureStateDirectory(this.stateDirectory, true);
     const ownerHandle = await this.openDurableDirectory(
-      this.ownerDirectory,
+      this.stateDirectory,
       owner
     );
     try {
       let created = false;
       try {
-        await fs2.mkdir(this.journalDirectory, { mode: 448 });
+        await fs.mkdir(this.journalDirectory, { mode: 448 });
         created = true;
       } catch (error2) {
         if (error2.code !== "EEXIST") throw error2;
       }
       if (created && process.platform !== "win32") {
-        await fs2.chmod(this.journalDirectory, 448);
+        await fs.chmod(this.journalDirectory, 448);
       }
       await this.syncDurableDirectory(ownerHandle);
     } finally {
       await ownerHandle.handle.close().catch(() => void 0);
     }
-    return this.inspectPrivateDirectory(this.journalDirectory);
+    return await this.inspectJournalDirectory();
+  }
+  async ensureStateDirectory(directory, requirePrivate) {
+    try {
+      return await this.inspectPrivateDirectory(directory, requirePrivate);
+    } catch (error2) {
+      if (!isMissing(error2)) throw error2;
+    }
+    const parent = path7.dirname(directory);
+    if (parent === directory)
+      throw new StandaloneDeletionJournalError("compromised");
+    const before = await this.ensureStateDirectory(parent, false);
+    let created = false;
+    try {
+      await fs.mkdir(directory, { mode: 448 });
+      created = true;
+    } catch (error2) {
+      if (error2.code !== "EEXIST") throw error2;
+    }
+    if (created && process.platform !== "win32")
+      await fs.chmod(directory, 448);
+    const after = await this.inspectPrivateDirectory(parent, false);
+    if (!sameDirectoryIdentity(before, after)) {
+      throw new StandaloneDeletionJournalError("compromised");
+    }
+    const handle = await fs.open(parent, fsConstants2.O_RDONLY);
+    try {
+      if (process.platform !== "win32") await handle.sync();
+    } finally {
+      await handle.close();
+    }
+    return this.inspectPrivateDirectory(directory, requirePrivate);
+  }
+  async inspectStateParent() {
+    await this.inspectPrivateDirectory(this.stableBaseDir, false);
+    const canonical = await fs.realpath(this.stableBaseDir);
+    if (this.canonicalBaseDir !== void 0 && this.canonicalBaseDir !== canonical) {
+      throw new StandaloneDeletionJournalError("compromised");
+    }
+    this.canonicalBaseDir = canonical;
+    await this.inspectPrivateDirectory(this.stateDirectory);
   }
   async inspectJournalDirectory() {
     try {
+      await this.inspectStateParent();
       return await this.inspectPrivateDirectory(this.journalDirectory);
     } catch (error2) {
-      if (isMissing2(error2)) return void 0;
+      if (isMissing(error2)) return void 0;
       throw error2;
     }
   }
-  async inspectPrivateDirectory(directory) {
-    const stat3 = await fs2.lstat(directory);
-    if (!stat3.isDirectory() || stat3.isSymbolicLink() || process.platform !== "win32" && ((stat3.mode & 511) !== 448 || typeof process.getuid === "function" && stat3.uid !== process.getuid())) {
+  async inspectPrivateDirectory(directory, requirePrivate = true) {
+    let stat3;
+    try {
+      stat3 = await fs.lstat(directory);
+    } catch (error2) {
+      if (isMissing(error2) && this.directoryIdentities.has(directory)) {
+        throw new StandaloneDeletionJournalError("compromised");
+      }
+      throw error2;
+    }
+    if (!stat3.isDirectory() || stat3.isSymbolicLink() || process.platform !== "win32" && (requirePrivate && (stat3.mode & 511) !== 448 || typeof process.getuid === "function" && stat3.uid !== process.getuid())) {
       throw new StandaloneDeletionJournalError("compromised");
     }
-    return {
+    const identity = {
       device: stat3.dev,
       inode: normalizedInode(stat3.ino),
       inodeVerifiable: hasVerifiableInode(stat3.ino)
     };
+    if (directory === this.stableBaseDir || directory === this.stateDirectory || directory === this.journalDirectory) {
+      const expected = this.directoryIdentities.get(directory);
+      if (expected && !sameDirectoryIdentity(identity, expected)) {
+        throw new StandaloneDeletionJournalError("compromised");
+      }
+      this.directoryIdentities.set(directory, identity);
+    }
+    return identity;
   }
   async assertDirectoryIdentity(directory, expected) {
+    await this.inspectStateParent();
     const current = await this.inspectPrivateDirectory(directory);
     if (!sameDirectoryIdentity(current, expected)) {
       throw new StandaloneDeletionJournalError("compromised");
@@ -7191,35 +6794,35 @@ var StandaloneDeletionJournal = class {
   }
   async assertPathAbsent(filePath) {
     try {
-      await fs2.lstat(filePath);
+      await fs.lstat(filePath);
     } catch (error2) {
-      if (isMissing2(error2)) return;
+      if (isMissing(error2)) return;
       throw error2;
     }
     throw new StandaloneDeletionJournalError("conflict");
   }
   async pathExists(filePath) {
     try {
-      await fs2.lstat(filePath);
+      await fs.lstat(filePath);
       return true;
     } catch (error2) {
-      if (isMissing2(error2)) return false;
+      if (isMissing(error2)) return false;
       throw error2;
     }
   }
   async unlinkIfExists(filePath) {
     try {
-      await fs2.unlink(filePath);
+      await fs.unlink(filePath);
     } catch (error2) {
-      if (!isMissing2(error2)) throw error2;
+      if (!isMissing(error2)) throw error2;
     }
   }
   async openDurableDirectory(directory, expected) {
     let handle;
     try {
-      handle = await fs2.open(
+      handle = await fs.open(
         directory,
-        fsConstants3.O_RDONLY | (process.platform === "win32" ? 0 : fsConstants3.O_NOFOLLOW ?? 0)
+        fsConstants2.O_RDONLY | (process.platform === "win32" ? 0 : fsConstants2.O_NOFOLLOW ?? 0)
       );
       const opened = await handle.stat();
       const openedIdentity = {
@@ -7376,6 +6979,7 @@ function mergeLiveStandaloneSummary(persisted, live) {
     updatedAt: laterTimestamp(live.updatedAt, persisted.updatedAt),
     clientCount: live.clientCount,
     hasActivePrompt: live.hasActivePrompt,
+    ...live.activeWorkState !== void 0 ? { activeWorkState: live.activeWorkState } : {},
     ...live.isWaitingForPermission !== void 0 ? { isWaitingForPermission: live.isWaitingForPermission } : {},
     ...live.isWaitingForUserQuestion !== void 0 ? { isWaitingForUserQuestion: live.isWaitingForUserQuestion } : {},
     ...live.pendingInteractionCount !== void 0 ? { pendingInteractionCount: live.pendingInteractionCount } : {},
@@ -7587,7 +7191,7 @@ var StandaloneSessionService = class {
     });
   }
   async repairDirectory(rawSessionId) {
-    const clientId = randomUUID5();
+    const clientId = randomUUID4();
     const restored = await this.restore("resume", rawSessionId, { clientId });
     try {
       await this.cleanupDisconnectedRestore(restored);
@@ -9059,7 +8663,7 @@ var StandaloneSessionService = class {
     }
     return { ...created, initialPrompt: created.initialPrompt };
   }
-  async createInternal(request2, prompt, parentSessionId, promptId = randomUUID5()) {
+  async createInternal(request2, prompt, parentSessionId, promptId = randomUUID4()) {
     const { sessionId } = parseRequiredSessionId(request2.sessionId);
     let entry;
     try {
@@ -9602,8 +9206,8 @@ var StandaloneSessionService = class {
 
 // packages/cli/src/serve/workspace-memory.ts
 init_esbuild_shims();
-import { promises as fs3 } from "node:fs";
-import * as path9 from "node:path";
+import { promises as fs2 } from "node:fs";
+import * as path8 from "node:path";
 function requireTrustedWorkspace2(deps, res) {
   if (deps.isWorkspaceTrusted?.() !== false) return true;
   res.status(403).json({
@@ -9926,9 +9530,9 @@ async function collectWorkspaceMemoryStatus(boundWorkspace) {
   files.push(...workspaceFiles);
   const globalDir = Storage.getGlobalQwenDir();
   for (const filename of filenames) {
-    const candidate = path9.join(globalDir, filename);
+    const candidate = path8.join(globalDir, filename);
     try {
-      const stat3 = await fs3.stat(candidate);
+      const stat3 = await fs2.stat(candidate);
       if (stat3.isFile()) {
         files.push({
           absolutePath: candidate,
@@ -9975,9 +9579,9 @@ __name(collectWorkspaceMemoryStatus, "collectWorkspaceMemoryStatus");
 async function walkWorkspaceForMemory(start, filenames, errors) {
   const out = [];
   for (const filename of filenames) {
-    const candidate = path9.join(start, filename);
+    const candidate = path8.join(start, filename);
     try {
-      const stat3 = await fs3.stat(candidate);
+      const stat3 = await fs2.stat(candidate);
       if (stat3.isFile()) {
         out.push({
           absolutePath: candidate,
@@ -10007,7 +9611,7 @@ __name(isEnoent, "isEnoent");
 
 // packages/cli/src/serve/workspace-agents.ts
 init_esbuild_shims();
-import { promises as fs4 } from "node:fs";
+import { promises as fs3 } from "node:fs";
 import { isDeepStrictEqual } from "node:util";
 var AGENT_TYPE_PATTERN = /^[\p{L}\p{N}_-]+$/u;
 var AGENT_TYPE_MAX_LENGTH = 64;
@@ -10460,7 +10064,7 @@ function mountWorkspaceAgentsRoutes(app, deps) {
           continue;
         }
         try {
-          await fs4.access(found.filePath);
+          await fs3.access(found.filePath);
           remaining.push(found);
         } catch {
           removed.push(found);
@@ -10809,7 +10413,7 @@ function mountWorkspaceQualifiedAgentsRoutes(app, deps) {
       }
       if (existing?.filePath) {
         try {
-          await fs4.access(existing.filePath);
+          await fs3.access(existing.filePath);
           writeStderrLine(
             `qwen serve: DELETE /workspaces/:workspace/agents/${safeLogValue(agentType)} partial \u2014 remaining=${existing.level}:${existing.filePath}`
           );
@@ -13384,6 +12988,7 @@ var AcpDispatcher = class {
               ...s.sourceId !== void 0 ? { sourceId: s.sourceId } : {},
               clientCount: s.clientCount,
               hasActivePrompt: s.hasActivePrompt,
+              ...s.activeWorkState !== void 0 ? { activeWorkState: s.activeWorkState } : {},
               isArchived: s.isArchived === true,
               ...s.isPinned !== void 0 ? { isPinned: s.isPinned } : {},
               ...s.pinnedAt !== void 0 ? { pinnedAt: s.pinnedAt } : {},
@@ -15705,6 +15310,7 @@ var AcpDispatcher = class {
               bridge: this.bridge,
               coordinator: this.archiveCoordinator,
               assertCanMutate: assertGenerationOpen,
+              runtimeWorkspaceCwd: this.boundWorkspace,
               onError: /* @__PURE__ */ __name(({ phase, sessionId, error: error2 }) => {
                 const safeSessionId = logSafe(sessionId.slice(0, 8));
                 const safeMessage = logSafe(error2);
@@ -16383,7 +15989,7 @@ var AcpDispatcher = class {
 
 // packages/cli/src/serve/acp-http/connection-registry.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID6 } from "node:crypto";
+import { randomUUID as randomUUID5 } from "node:crypto";
 var DEFAULT_MAX_CONNECTIONS = 64;
 var AcpConnection = class {
   constructor(connectionId, fromLoopback, onAbandonPending, onDetachSession, preAttachBudget = new AcpPreAttachBudget(), onFatalConnection, maxFramesPerConnection = ACP_PRE_ATTACH_MAX_FRAMES_PER_CONNECTION, maxPayloadBytesPerConnection = ACP_PRE_ATTACH_MAX_PAYLOAD_BYTES_PER_CONNECTION, onPreAttachGuardFailure) {
@@ -16394,8 +16000,8 @@ var AcpConnection = class {
     this.maxFramesPerConnection = maxFramesPerConnection;
     this.maxPayloadBytesPerConnection = maxPayloadBytesPerConnection;
     this.onPreAttachGuardFailure = onPreAttachGuardFailure;
-    this.connectionId = connectionId ?? randomUUID6();
-    this.clientId = randomUUID6();
+    this.connectionId = connectionId ?? randomUUID5();
+    this.clientId = randomUUID5();
     this.fromLoopback = fromLoopback;
   }
   static {
@@ -18446,6 +18052,23 @@ var CdpBrowserEmulator = class {
           });
         case "Target.getDevToolsTarget":
           return this.cb.reply({ id, result: {} });
+        // Target mutations the tunnel cannot perform: behind it is ONE tab the
+        // user already has open, so there is nothing to create, close, or
+        // isolate. These must not fall through to the empty ack below — a CDP
+        // client reads `targetId` out of the createTarget result and then waits
+        // for a target that never appears, so a fake success turns "open a new
+        // page" into a protocol timeout instead of an immediate refusal.
+        case "Target.createTarget":
+        case "Target.closeTarget":
+        case "Target.createBrowserContext":
+        case "Target.disposeBrowserContext":
+          return this.cb.reply({
+            id,
+            error: {
+              code: SERVER_ERROR,
+              message: `${method} is not supported by the CDP tunnel: it drives a single existing tab`
+            }
+          });
         case "Target.attachToTarget": {
           const targetId = params?.["targetId"];
           if (targetId !== PAGE_TARGET_ID) {
@@ -18805,10 +18428,10 @@ function isAcpChannelUnavailable(err) {
   return err?.data?.errorKind === "acp_channel_unavailable";
 }
 __name(isAcpChannelUnavailable, "isAcpChannelUnavailable");
-function delay2(ms) {
+function delay(ms) {
   return new Promise((resolve7) => setTimeout(resolve7, ms));
 }
-__name(delay2, "delay");
+__name(delay, "delay");
 function buildChromeDevToolsMcpRuntimeConfig(localPort, hostname, env) {
   if (localPort === void 0 || !Number.isInteger(localPort) || localPort <= 0) {
     return void 0;
@@ -19069,7 +18692,7 @@ function mountAcpHttp(app, bridge, opts) {
             if (!isAcpChannelUnavailable(err) || attempt >= RUNTIME_MCP_RETRY_ATTEMPTS || !opts.cdpTunnelRegistry?.hasActive()) {
               throw err;
             }
-            await delay2(RUNTIME_MCP_RETRY_DELAY_MS);
+            await delay(RUNTIME_MCP_RETRY_DELAY_MS);
           }
         }
         if (result.skipped) {
@@ -22062,9 +21685,9 @@ __name(registerWorkspaceAuthRoutes, "registerWorkspaceAuthRoutes");
 // packages/cli/src/serve/routes/workspace-extensions.ts
 init_esbuild_shims();
 import * as crypto2 from "node:crypto";
-import * as fs5 from "node:fs/promises";
+import * as fs4 from "node:fs/promises";
 import * as os from "node:os";
-import * as path10 from "node:path";
+import * as path9 from "node:path";
 var import_express2 = __toESM(require_express(), 1);
 
 // packages/cli/src/serve/extension-operation-scheduler.ts
@@ -22432,14 +22055,18 @@ function createExtensionsController(deps) {
               async (release) => {
                 assertGenerationOpen?.();
                 return await task((generation) => {
-                  reconciliationReservation ??= options.reserveRuntimeReconciliation?.();
+                  if (!options.skipRefresh) {
+                    reconciliationReservation ??= options.reserveRuntimeReconciliation?.();
+                  }
                   committedGeneration = generation;
                   release();
                 });
               }
             );
             if (committedGeneration === void 0) {
-              reconciliationReservation ??= options.reserveRuntimeReconciliation?.();
+              if (!options.skipRefresh) {
+                reconciliationReservation ??= options.reserveRuntimeReconciliation?.();
+              }
               committedGeneration = result.generation;
             }
             for (const warning of result.warnings ?? []) {
@@ -22847,7 +22474,7 @@ var extensionArchiveBodyParser = import_express2.default.raw({
 });
 var assertDaemonExtensionInstallSource = /* @__PURE__ */ __name((installMetadata, source, ref, autoUpdate) => {
   if (installMetadata.type === "local") {
-    if (!path10.isAbsolute(source)) {
+    if (!path9.isAbsolute(source)) {
       throw new Error(
         "Local extension sources must be absolute daemon-host paths; relative paths are not supported over the daemon endpoint."
       );
@@ -23303,11 +22930,6 @@ function registerWorkspaceExtensionRoutes(app, deps) {
     reserveRuntimeReconciliation,
     onRuntimeReconciled
   } : {}, "globalReconciliationOptions");
-  const workspaceReconciliationOptions = /* @__PURE__ */ __name(() => workspaceRegistry ? {
-    refreshRuntimes: [workspaceRegistry.primary],
-    reserveRuntimeReconciliation,
-    onRuntimeReconciled
-  } : {}, "workspaceReconciliationOptions");
   const mutationClientBridges = /* @__PURE__ */ __name((runtimes) => (typeof runtimes === "function" ? runtimes() : runtimes ?? workspaceRegistry?.listAll())?.map((runtime) => runtime.bridge) ?? [bridge], "mutationClientBridges");
   if (workspaceRegistry) {
     let observedGeneration;
@@ -23559,14 +23181,14 @@ function registerWorkspaceExtensionRoutes(app, deps) {
               let result;
               let failure;
               try {
-                uploadDir = await fs5.mkdtemp(
-                  path10.join(os.tmpdir(), "qwen-extension-upload-")
+                uploadDir = await fs4.mkdtemp(
+                  path9.join(os.tmpdir(), "qwen-extension-upload-")
                 );
-                const archivePath = path10.join(
+                const archivePath = path9.join(
                   uploadDir,
                   `extension${archiveName.suffix}`
                 );
-                await fs5.writeFile(archivePath, archive);
+                await fs4.writeFile(archivePath, archive);
                 archive = void 0;
                 const prepared = await context.prepare(async (signal) => {
                   supersedeActiveInstallOperations(ctrl, operationId);
@@ -23599,7 +23221,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
               }
               if (uploadDir) {
                 try {
-                  await fs5.rm(uploadDir, { recursive: true, force: true });
+                  await fs4.rm(uploadDir, { recursive: true, force: true });
                 } catch (error2) {
                   failure ??= sanitizeUploadError(error2);
                 }
@@ -23963,7 +23585,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
               return { status: "enabled", name: extension.name };
             },
             {
-              ...scope === "User" /* User */ ? globalReconciliationOptions() : workspaceReconciliationOptions()
+              skipRefresh: true
             }
           );
         } catch (err) {
@@ -24010,7 +23632,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
               return { status: "disabled", name: extension.name };
             },
             {
-              ...scope === "User" /* User */ ? globalReconciliationOptions() : workspaceReconciliationOptions()
+              skipRefresh: true
             }
           );
         } catch (err) {
@@ -24299,6 +23921,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
         };
       },
       {
+        skipRefresh: true,
         ...workspaceRegistry ? { refreshRuntimes: /* @__PURE__ */ __name(() => workspaceRegistry.listAll(), "refreshRuntimes") } : {}
       }
     );
@@ -24339,6 +23962,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
           };
         },
         {
+          skipRefresh: true,
           ...workspaceRegistry ? { refreshRuntimes: /* @__PURE__ */ __name(() => workspaceRegistry.listAll(), "refreshRuntimes") } : {}
         }
       );
@@ -24859,6 +24483,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
             };
           },
           {
+            skipRefresh: true,
             refreshRuntimes: [runtime],
             assertGenerationOpen: /* @__PURE__ */ __name(() => runtime.generationGuard?.assertOpen(), "assertGenerationOpen")
           }
@@ -24905,6 +24530,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
             };
           },
           {
+            skipRefresh: true,
             refreshRuntimes: [runtime],
             assertGenerationOpen: /* @__PURE__ */ __name(() => runtime.generationGuard?.assertOpen(), "assertGenerationOpen")
           }
@@ -24950,6 +24576,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
             return { status: activation.effective, name: extension.name };
           },
           {
+            skipRefresh: true,
             refreshRuntimes: [runtime],
             assertGenerationOpen: /* @__PURE__ */ __name(() => runtime.generationGuard?.assertOpen(), "assertGenerationOpen")
           }
@@ -24988,7 +24615,7 @@ __name(registerWorkspaceExtensionRoutes, "registerWorkspaceExtensionRoutes");
 // packages/cli/src/serve/routes/workspace-file-write.ts
 init_esbuild_shims();
 var import_express3 = __toESM(require_express(), 1);
-import * as path11 from "node:path";
+import * as path10 from "node:path";
 function getFsFactory3(req, res) {
   const context = getWorkspaceRouteContext(req);
   if (context) return context.runtime.routeFileSystemFactory;
@@ -25421,8 +25048,8 @@ function fileUploadAdmission(deps, opts) {
           sendParseError(res, ROUTE2, "`path` query parameter is required");
           return;
         }
-        const dir = path11.dirname(queryPath);
-        const basename9 = path11.basename(queryPath);
+        const dir = path10.dirname(queryPath);
+        const basename9 = path10.basename(queryPath);
         if (queryPath.endsWith("/") || basename9.length === 0 || basename9 === "." || basename9 === "..") {
           sendParseError(res, ROUTE2, "`path` must name a file");
           return;
@@ -25543,11 +25170,11 @@ async function handlePostFileUpload(req, res) {
         );
         return;
       }
-      const candidateAbs = path11.join(resolvedDir, candidateBasename);
+      const candidateAbs = path10.join(resolvedDir, candidateBasename);
       let resolved;
       try {
         resolved = await fs10.resolve(
-          path11.join(queryDir, candidateBasename),
+          path10.join(queryDir, candidateBasename),
           "write"
         );
       } catch (err) {
@@ -25902,6 +25529,12 @@ var legacySessionTelemetryRoutes = [
     attribution: "handler_resolved",
     route: "POST /session/:id/resume"
   },
+  {
+    method: "POST",
+    path: "/session/:id/worktree-reset",
+    attribution: "handler_resolved",
+    route: "POST /session/:id/worktree-reset"
+  },
   {
     method: "POST",
     path: "/session/:id/branch",
@@ -26877,11 +26510,92 @@ __name(registerPermissionRoutes, "registerPermissionRoutes");
 // packages/cli/src/serve/routes/session.ts
 init_esbuild_shims();
 import * as crypto3 from "node:crypto";
-import * as fs7 from "node:fs";
-import * as path12 from "node:path";
+import * as fs6 from "node:fs";
+import * as path11 from "node:path";
 import { inspect } from "node:util";
 var import_express4 = __toESM(require_express(), 1);
 
+// packages/cli/src/serve/server/worktree-reset-errors.ts
+init_esbuild_shims();
+var WorktreeSessionSupersededError = class extends Error {
+  static {
+    __name(this, "WorktreeSessionSupersededError");
+  }
+  sessionId;
+  replacementSessionId;
+  constructor(sessionId, replacementSessionId) {
+    super(
+      `Session ${sessionId} was superseded by a worktree reset; restore the replacement session instead`
+    );
+    this.name = "WorktreeSessionSupersededError";
+    this.sessionId = sessionId;
+    this.replacementSessionId = replacementSessionId;
+  }
+};
+var WorktreeMarkerMissingError = class extends Error {
+  static {
+    __name(this, "WorktreeMarkerMissingError");
+  }
+  sessionId;
+  constructor(sessionId) {
+    super(
+      `Worktree ownership marker for session ${sessionId} is missing; reset the task to recreate it`
+    );
+    this.name = "WorktreeMarkerMissingError";
+    this.sessionId = sessionId;
+  }
+};
+var WorktreeResetInterruptedError = class extends Error {
+  static {
+    __name(this, "WorktreeResetInterruptedError");
+  }
+  sessionId;
+  constructor(sessionId) {
+    super(
+      "A previous worktree reset was interrupted; retry the reset against the superseded session to finish or roll it back"
+    );
+    this.name = "WorktreeResetInterruptedError";
+    this.sessionId = sessionId;
+  }
+};
+var WorktreeResetActiveError = class extends Error {
+  static {
+    __name(this, "WorktreeResetActiveError");
+  }
+  sessionId;
+  constructor(sessionId) {
+    super(
+      `Session ${sessionId} has a prompt in progress; wait for it to finish before resetting`
+    );
+    this.name = "WorktreeResetActiveError";
+    this.sessionId = sessionId;
+  }
+};
+var WorktreeResetUnsupportedError = class extends Error {
+  static {
+    __name(this, "WorktreeResetUnsupportedError");
+  }
+  sessionId;
+  constructor(sessionId) {
+    super(`Session ${sessionId} is not a worktree session`);
+    this.name = "WorktreeResetUnsupportedError";
+    this.sessionId = sessionId;
+  }
+};
+var WorktreeResetInvalidStateError = class extends Error {
+  static {
+    __name(this, "WorktreeResetInvalidStateError");
+  }
+  sessionId;
+  constructor(sessionId) {
+    super(
+      `Session ${sessionId}'s worktree ownership state is invalid; the reset made no destructive change`
+    );
+    this.name = "WorktreeResetInvalidStateError";
+    this.sessionId = sessionId;
+  }
+};
+
 // packages/cli/src/serve/server/prompt-deadline.ts
 init_esbuild_shims();
 function resolvePromptDeadlineMs(serverMs, requestMs) {
@@ -27006,7 +26720,7 @@ __name(deleteBranch, "deleteBranch");
 
 // packages/cli/src/serve/virtual-subagent-sessions.ts
 init_esbuild_shims();
-import * as fs6 from "node:fs/promises";
+import * as fs5 from "node:fs/promises";
 import { createReadStream } from "node:fs";
 import readline from "node:readline";
 var PREFIX = "subagent.";
@@ -27216,7 +26930,7 @@ var VirtualSubagentTarget = class _VirtualSubagentTarget {
   async readNewRecords(endOffset) {
     let handle;
     try {
-      handle = await fs6.open(this.task.outputFile, "r");
+      handle = await fs5.open(this.task.outputFile, "r");
       const stat3 = await handle.stat();
       const identity = `${stat3.dev}:${stat3.ino}`;
       if (this.transcriptIdentity !== void 0 && this.transcriptIdentity !== identity || stat3.size < this.offset) {
@@ -27260,7 +26974,7 @@ var VirtualSubagentTarget = class _VirtualSubagentTarget {
     const filePath = `${this.task.outputFile}.stream`;
     let handle;
     try {
-      handle = await fs6.open(filePath, "r");
+      handle = await fs5.open(filePath, "r");
       const stat3 = await handle.stat();
       const identity = `${stat3.dev}:${stat3.ino}`;
       if (this.streamIdentity !== void 0 && this.streamIdentity !== identity) {
@@ -27425,7 +27139,7 @@ var VirtualSubagentTarget = class _VirtualSubagentTarget {
   async captureReadBounds() {
     const size = /* @__PURE__ */ __name(async (filePath) => {
       try {
-        return (await fs6.stat(filePath)).size;
+        return (await fs5.stat(filePath)).size;
       } catch (error2) {
         if (error2.code === "ENOENT") return 0;
         throw error2;
@@ -27554,7 +27268,7 @@ var VirtualSubagentSessions = class {
     const sessionDir = getSubagentSessionDir(projectDir, parentSessionId);
     let names;
     try {
-      names = await fs6.readdir(sessionDir);
+      names = await fs5.readdir(sessionDir);
     } catch (error2) {
       if (error2.code === "ENOENT") return void 0;
       throw error2;
@@ -27610,7 +27324,7 @@ var VirtualSubagentSessions = class {
     const sessionDir = getSubagentSessionDir(projectDir, parentSessionId);
     let names;
     try {
-      names = await fs6.readdir(sessionDir);
+      names = await fs5.readdir(sessionDir);
     } catch (error2) {
       if (error2.code === "ENOENT") return void 0;
       throw error2;
@@ -28135,34 +27849,6 @@ function registerSessionRoutes(app, deps) {
   const LANGUAGE_CODES = deps.languageCodes;
   const transcriptCursorMasterKey = crypto3.randomBytes(32);
   const transcriptCursorCodecs = /* @__PURE__ */ new Map();
-  const worktreeRestoreTails = /* @__PURE__ */ new WeakMap();
-  const acquireWorktreeRestore = /* @__PURE__ */ __name(async (bridge, sessionId) => {
-    let tails = worktreeRestoreTails.get(bridge);
-    if (!tails) {
-      tails = /* @__PURE__ */ new Map();
-      worktreeRestoreTails.set(bridge, tails);
-    }
-    const key = normalizeSessionIdForLookup(sessionId);
-    const previous = tails.get(key);
-    let releaseGate;
-    const gate = new Promise((resolve7) => {
-      releaseGate = resolve7;
-    });
-    const tail = (previous ?? Promise.resolve()).then(() => gate);
-    tails.set(key, tail);
-    if (previous) {
-      await previous;
-    }
-    let released = false;
-    return () => {
-      if (released) return;
-      released = true;
-      releaseGate();
-      if (tails.get(key) === tail) {
-        tails.delete(key);
-      }
-    };
-  }, "acquireWorktreeRestore");
   const activeBranchSessions = /* @__PURE__ */ new Map();
   const inFlightBranchWorkspaces = /* @__PURE__ */ new Set();
   const clearBranchSessionEntry = /* @__PURE__ */ __name((sessionId) => {
@@ -28271,28 +27957,28 @@ function registerSessionRoutes(app, deps) {
     const cwd = parseOptionalWorkspaceCwd(body, boundWorkspace, res);
     if (cwd === void 0) return void 0;
     const isWithinConversationRoot = /* @__PURE__ */ __name((root, candidate) => {
-      const relative5 = path12.relative(root, candidate);
-      return relative5 === "" || relative5 !== ".." && !relative5.startsWith(`..${path12.sep}`) && !path12.isAbsolute(relative5);
+      const relative5 = path11.relative(root, candidate);
+      return relative5 === "" || relative5 !== ".." && !relative5.startsWith(`..${path11.sep}`) && !path11.isAbsolute(relative5);
     }, "isWithinConversationRoot");
     const canonicalizeIfPresent = /* @__PURE__ */ __name((candidate) => {
-      const resolved = path12.resolve(candidate);
+      const resolved = path11.resolve(candidate);
       try {
-        return fs7.realpathSync.native(resolved);
+        return fs6.realpathSync.native(resolved);
       } catch {
         return resolved;
       }
     }, "canonicalizeIfPresent");
     const canonicalizeExistingAncestor = /* @__PURE__ */ __name((candidate) => {
-      let ancestor = path12.resolve(candidate);
+      let ancestor = path11.resolve(candidate);
       const missingTail = [];
       while (true) {
         try {
-          return path12.join(fs7.realpathSync.native(ancestor), ...missingTail);
+          return path11.join(fs6.realpathSync.native(ancestor), ...missingTail);
         } catch (error2) {
           if (error2.code !== "ENOENT") throw error2;
-          const parent = path12.dirname(ancestor);
+          const parent = path11.dirname(ancestor);
           if (parent === ancestor) throw error2;
-          missingTail.unshift(path12.basename(ancestor));
+          missingTail.unshift(path11.basename(ancestor));
           ancestor = parent;
         }
       }
@@ -28305,8 +27991,8 @@ function registerSessionRoutes(app, deps) {
       return void 0;
     }, "rejectReservedConversationRoot");
     if ("cwd" in body && deps.liveConversationRootPath && isWithinConversationRoot(
-      path12.resolve(deps.liveConversationRootPath),
-      path12.resolve(cwd)
+      path11.resolve(deps.liveConversationRootPath),
+      path11.resolve(cwd)
     )) {
       return rejectReservedConversationRoot();
     }
@@ -28329,7 +28015,7 @@ function registerSessionRoutes(app, deps) {
     const liveRoots = [
       ...workspaceRegistry.listAllEntries().filter((entry2) => entry2.internal).map((entry2) => entry2.workspaceCwd),
       ...deps.liveConversationRootPath ? [
-        path12.resolve(deps.liveConversationRootPath),
+        path11.resolve(deps.liveConversationRootPath),
         canonicalizeIfPresent(deps.liveConversationRootPath)
       ] : []
     ];
@@ -28379,7 +28065,7 @@ function registerSessionRoutes(app, deps) {
     const workspaceParam = req.params[paramName] ?? "";
     const byId = workspaceRegistry.getByWorkspaceId(workspaceParam);
     if (byId) return byId;
-    if (!path12.isAbsolute(workspaceParam)) {
+    if (!path11.isAbsolute(workspaceParam)) {
       res.status(400).json({
         error: `\`:${paramName}\` must decode to a workspace id or absolute path`
       });
@@ -28432,11 +28118,11 @@ function registerSessionRoutes(app, deps) {
     }
     const selector = req.params[paramName] ?? "";
     let entry = workspaceRegistry.getManagedEntryByWorkspaceId(selector);
-    if (!entry && path12.isAbsolute(selector)) {
+    if (!entry && path11.isAbsolute(selector)) {
       entry = workspaceRegistry.getManagedEntryByWorkspaceCwd(selector);
     }
-    const configuredRoot = deps.liveConversationRootPath ? path12.resolve(deps.liveConversationRootPath) : void 0;
-    const matchesConfiguredRoot = configuredRoot !== void 0 && selector === configuredRoot && path12.resolve(selector) === selector;
+    const configuredRoot = deps.liveConversationRootPath ? path11.resolve(deps.liveConversationRootPath) : void 0;
+    const matchesConfiguredRoot = configuredRoot !== void 0 && selector === configuredRoot && path11.resolve(selector) === selector;
     if ((!entry || !entry.internal) && !matchesConfiguredRoot) {
       return void 0;
     }
@@ -28465,7 +28151,7 @@ function registerSessionRoutes(app, deps) {
   }, "resolveLiveCatalogRuntime");
   const resolveQualifiedSessionTarget = /* @__PURE__ */ __name((req, res, options = {}) => {
     const selector = req.params["workspace"] ?? "";
-    const entry = workspaceRegistry.getManagedEntryByWorkspaceId(selector) ?? (path12.isAbsolute(selector) ? workspaceRegistry.getManagedEntryByWorkspaceCwd(selector) : void 0);
+    const entry = workspaceRegistry.getManagedEntryByWorkspaceId(selector) ?? (path11.isAbsolute(selector) ? workspaceRegistry.getManagedEntryByWorkspaceCwd(selector) : void 0);
     if (entry?.internal) return { kind: "internal", entry };
     const runtime = resolveWorkspaceRuntimeFromParam(
       workspaceRegistry,
@@ -28742,8 +28428,8 @@ function registerSessionRoutes(app, deps) {
   const resolveRuntimeForSessionRestore = /* @__PURE__ */ __name(async (body, res, route, sessionId) => {
     const cwd = parseOptionalWorkspaceCwd(body, boundWorkspace, res);
     if (cwd === void 0) return void 0;
-    const configuredRoot = deps.liveConversationRootPath ? path12.resolve(deps.liveConversationRootPath) : void 0;
-    const bootstrappedRuntime = "cwd" in body && configuredRoot !== void 0 && path12.isAbsolute(cwd) && path12.resolve(cwd) === configuredRoot && deps.ensureConversationRuntime ? await deps.ensureConversationRuntime() : void 0;
+    const configuredRoot = deps.liveConversationRootPath ? path11.resolve(deps.liveConversationRootPath) : void 0;
+    const bootstrappedRuntime = "cwd" in body && configuredRoot !== void 0 && path11.isAbsolute(cwd) && path11.resolve(cwd) === configuredRoot && deps.ensureConversationRuntime ? await deps.ensureConversationRuntime() : void 0;
     let key;
     try {
       key = canonicalizeWorkspace(cwd);
@@ -29452,6 +29138,7 @@ function registerSessionRoutes(app, deps) {
             coordinator: archiveCoordinator,
             coordinatorLockHeld,
             assertCanMutate,
+            runtimeWorkspaceCwd: runtime.workspaceCwd,
             onError: /* @__PURE__ */ __name(({ phase, sessionId, error: error2 }) => {
               writeStderrLine(
                 `qwen serve: ${phase}Session failed for ${safeLogValue(sessionId)}: ${safeLogValue(error2)}`
@@ -29902,7 +29589,7 @@ function registerSessionRoutes(app, deps) {
       } catch (error2) {
         if (!session.attached) {
           try {
-            const removed = await runWithWorkspaceRuntimeStorage(
+            await runWithWorkspaceRuntimeStorage(
               runtime,
               () => deleteDaemonSessionIfOrphan({
                 sessionId: session.sessionId,
@@ -29911,18 +29598,25 @@ function registerSessionRoutes(app, deps) {
                 coordinator: archiveCoordinator
               })
             );
-            if (removed) {
-              if (worktreeMeta) {
-                await new GitWorktreeService(workspaceCwd).removeUserWorktree(worktreeMeta.slug, { deleteBranch: true }).catch(() => {
-                });
-              }
-            }
           } catch {
           }
         } else {
           await runtime.bridge.detachClient(session.sessionId, session.clientId).catch(() => {
           });
         }
+        if (worktreeMeta) {
+          const rollbackSlug = worktreeMeta.slug;
+          await new GitWorktreeService(workspaceCwd).removeUserWorktree(rollbackSlug, { deleteBranch: true }).catch((removalError) => {
+            daemonLog?.warn(
+              "worktree removal failed during generation-closed rollback",
+              {
+                sessionId: session.sessionId,
+                slug: rollbackSlug,
+                error: removalError instanceof Error ? removalError.message : String(removalError)
+              }
+            );
+          });
+        }
         throw error2;
       }
       if (daemonLog) {
@@ -29987,7 +29681,7 @@ function registerSessionRoutes(app, deps) {
       if (worktreeMeta) {
         try {
           const createAllowedRoots = [
-            path12.join(workspaceCwd, ".qwen", "worktrees")
+            path11.join(workspaceCwd, ".qwen", "worktrees")
           ];
           let createRepoTop = null;
           try {
@@ -29998,10 +29692,10 @@ function registerSessionRoutes(app, deps) {
           }
           if (createRepoTop && createRepoTop !== workspaceCwd) {
             createAllowedRoots.push(
-              path12.join(createRepoTop, ".qwen", "worktrees")
+              path11.join(createRepoTop, ".qwen", "worktrees")
             );
           }
-          const expectedWorktreePath = fs7.realpathSync(worktreeMeta.path);
+          const expectedWorktreePath = fs6.realpathSync(worktreeMeta.path);
           const changed = await runtime.bridge.changeSessionCwd(
             session.sessionId,
             {
@@ -30351,21 +30045,42 @@ function registerSessionRoutes(app, deps) {
           };
           const isChannelRestore = restoreRequestMetadata.sourceType === "channel";
           let isPart4AWorktreeRestore = false;
-          if (isChannelRestore && runtime.provenance !== "live-conversation") {
+          let part4AWorktreeKey;
+          if (runtime.provenance !== "live-conversation") {
             const sidecarBeforeRestore = await readWorktreeSessionStrict(
               sessionService.getWorktreeSessionPath(restoredStorageSessionId)
             );
+            if (isChannelRestore) {
+              suppressWorktreeContextRestore = !(sidecarBeforeRestore.state === "valid" && sidecarBeforeRestore.session.workspaceCwd === void 0);
+            }
             isPart4AWorktreeRestore = sidecarBeforeRestore.state === "valid" && sidecarBeforeRestore.session.workspaceCwd !== void 0;
-            suppressWorktreeContextRestore = !(sidecarBeforeRestore.state === "valid" && sidecarBeforeRestore.session.workspaceCwd === void 0);
+            if (isPart4AWorktreeRestore && sidecarBeforeRestore.state === "valid") {
+              const recordedPath = sidecarBeforeRestore.session.worktreePath;
+              try {
+                part4AWorktreeKey = fs6.realpathSync(recordedPath);
+              } catch {
+                part4AWorktreeKey = recordedPath;
+              }
+            }
           } else {
             suppressWorktreeContextRestore = isChannelRestore;
           }
           deferRestoreAskUserQuestionPrompt = suppressWorktreeContextRestore && runtime.bridge.fireDeferredRestoreAskUserQuestionPrompt !== void 0 && runtime.bridge.discardDeferredRestoreAskUserQuestionPrompt !== void 0;
-          if (deferRestoreAskUserQuestionPrompt && isPart4AWorktreeRestore) {
-            releaseWorktreeRestore = await acquireWorktreeRestore(
-              runtime.bridge,
-              sessionId
-            );
+          if (isPart4AWorktreeRestore && part4AWorktreeKey !== void 0) {
+            releaseWorktreeRestore = await acquireWorktreeOwnershipOp(part4AWorktreeKey);
+            if (isChannelRestore) {
+              const sidecarUnderLock = await readWorktreeSessionStrict(
+                sessionService.getWorktreeSessionPath(
+                  restoredStorageSessionId
+                )
+              );
+              if (sidecarUnderLock.state === "valid" && sidecarUnderLock.session.supersededBy !== void 0) {
+                throw new WorktreeSessionSupersededError(
+                  restoredStorageSessionId,
+                  sidecarUnderLock.session.supersededBy
+                );
+              }
+            }
           }
           assertRuntimeGenerationOpen?.();
           if (isInternalWorkspaceRuntime(runtime)) {
@@ -30512,7 +30227,7 @@ function registerSessionRoutes(app, deps) {
           let candidateRoots = [];
           let validationError;
           try {
-            const workspaceRoots = [fs7.realpathSync(workspaceCwd)];
+            const workspaceRoots = [fs6.realpathSync(workspaceCwd)];
             let repoTop = null;
             try {
               repoTop = await new GitWorktreeService(
@@ -30521,24 +30236,24 @@ function registerSessionRoutes(app, deps) {
             } catch {
             }
             if (repoTop) {
-              const realRepoTop = fs7.realpathSync(repoTop);
+              const realRepoTop = fs6.realpathSync(repoTop);
               if (!workspaceRoots.includes(realRepoTop)) {
                 workspaceRoots.push(realRepoTop);
               }
             }
-            const realOriginalCwd = fs7.realpathSync(sidecar.originalCwd);
+            const realOriginalCwd = fs6.realpathSync(sidecar.originalCwd);
             if (!workspaceRoots.includes(realOriginalCwd)) {
               throw new Error("legacy sidecar belongs to another workspace");
             }
             candidateRoots = workspaceRoots.map(
-              (root) => path12.join(root, ".qwen", "worktrees")
+              (root) => path11.join(root, ".qwen", "worktrees")
             );
-            realTarget = fs7.realpathSync(sidecar.worktreePath);
+            realTarget = fs6.realpathSync(sidecar.worktreePath);
             const contained = candidateRoots.some((root) => {
               try {
-                const realRoot = fs7.realpathSync(root);
-                const relative5 = path12.relative(realRoot, realTarget);
-                return relative5.length > 0 && !relative5.startsWith("..") && !path12.isAbsolute(relative5);
+                const realRoot = fs6.realpathSync(root);
+                const relative5 = path11.relative(realRoot, realTarget);
+                return relative5.length > 0 && !relative5.startsWith("..") && !path11.isAbsolute(relative5);
               } catch {
                 return false;
               }
@@ -30585,11 +30300,17 @@ function registerSessionRoutes(app, deps) {
               throw new Error("Worktree sidecar is missing or invalid");
             }
             const sidecar = sidecarResult.session;
-            const realWorkspace = fs7.realpathSync(workspaceCwd);
+            if (sidecar.supersededBy !== void 0) {
+              throw new WorktreeSessionSupersededError(
+                restoredStorageSessionId,
+                sidecar.supersededBy
+              );
+            }
+            const realWorkspace = fs6.realpathSync(workspaceCwd);
             if (sidecar.workspaceCwd !== void 0) {
               let realSidecarWorkspace;
               try {
-                realSidecarWorkspace = fs7.realpathSync(sidecar.workspaceCwd);
+                realSidecarWorkspace = fs6.realpathSync(sidecar.workspaceCwd);
               } catch {
                 throw new Error(
                   "Worktree sidecar workspace is missing or inaccessible"
@@ -30610,11 +30331,11 @@ function registerSessionRoutes(app, deps) {
             } catch {
             }
             if (repoTop && repoTop !== realWorkspace) {
-              workspaceRoots.push(fs7.realpathSync(repoTop));
+              workspaceRoots.push(fs6.realpathSync(repoTop));
             }
             let realOriginalCwd;
             try {
-              realOriginalCwd = fs7.realpathSync(sidecar.originalCwd);
+              realOriginalCwd = fs6.realpathSync(sidecar.originalCwd);
             } catch {
               throw new Error(
                 "Worktree sidecar workspace is missing or inaccessible"
@@ -30626,19 +30347,19 @@ function registerSessionRoutes(app, deps) {
               );
             }
             const candidateRoots = workspaceRoots.map(
-              (root) => path12.join(root, ".qwen", "worktrees")
+              (root) => path11.join(root, ".qwen", "worktrees")
             );
             let realTarget;
             try {
-              realTarget = fs7.realpathSync(sidecar.worktreePath);
+              realTarget = fs6.realpathSync(sidecar.worktreePath);
             } catch {
               throw new Error("Worktree checkout is missing or inaccessible");
             }
             const contained = candidateRoots.some((root) => {
               try {
-                const realRoot = fs7.realpathSync(root);
-                const relative5 = path12.relative(realRoot, realTarget);
-                return relative5.length > 0 && !relative5.startsWith("..") && !path12.isAbsolute(relative5);
+                const realRoot = fs6.realpathSync(root);
+                const relative5 = path11.relative(realRoot, realTarget);
+                return relative5.length > 0 && !relative5.startsWith("..") && !path11.isAbsolute(relative5);
               } catch {
                 return false;
               }
@@ -30648,6 +30369,30 @@ function registerSessionRoutes(app, deps) {
             }
             const marker = await readWorktreeSessionMarkerStrict(realTarget);
             if (marker.state !== "valid" || marker.sessionId !== restoredStorageSessionId) {
+              if (sidecar.supersedes !== void 0 && (marker.state === "missing" || marker.state === "valid" && marker.sessionId === sidecar.supersedes)) {
+                const oldSidecar = await readWorktreeSessionStrict(
+                  createWorkspaceRuntimeSessionService(
+                    runtime
+                  ).getWorktreeSessionPath(sidecar.supersedes)
+                );
+                if (oldSidecar.state === "valid" && oldSidecar.session.supersededBy === restoredStorageSessionId) {
+                  daemonLog?.warn(
+                    "worktree restore found an interrupted reset",
+                    {
+                      sessionId: restoredStorageSessionId,
+                      supersedesSessionId: sidecar.supersedes
+                    }
+                  );
+                  throw new WorktreeResetInterruptedError(
+                    restoredStorageSessionId
+                  );
+                }
+              }
+              if (marker.state === "missing") {
+                throw new WorktreeMarkerMissingError(
+                  restoredStorageSessionId
+                );
+              }
               throw new Error("Worktree marker ownership is invalid");
             }
             const worktree = {
@@ -30655,28 +30400,28 @@ function registerSessionRoutes(app, deps) {
               path: realTarget,
               branch: sidecar.worktreeBranch
             };
-            const hasUnlocatedRestoredPrompt = session.hasActivePrompt && !session.attached && session.currentCwd === void 0;
+            const hasUnlocatedRestoredPrompt = session.hasActivePrompt && !session.attached && session.currentCwd === void 0 && !deferRestoreAskUserQuestionPrompt;
             if (hasUnlocatedRestoredPrompt) {
               runtime.bridge.setSessionWorktree(sessionId, worktree);
               session.worktree = worktree;
-            } else if (session.hasActivePrompt) {
-              if (session.currentCwd !== realTarget) {
-                throw new Error("Active session is outside its worktree");
-              }
             } else {
-              const changed = await runtime.bridge.changeSessionCwd(
-                sessionId,
-                {
-                  path: realTarget,
-                  allowedRoots: candidateRoots
+              if (session.hasActivePrompt) {
+                if (session.currentCwd !== realTarget) {
+                  throw new Error("Active session is outside its worktree");
                 }
-              );
-              if (changed.newCwd !== realTarget) {
-                throw new Error("Worktree relocation was rejected");
+              } else {
+                const changed = await runtime.bridge.changeSessionCwd(
+                  sessionId,
+                  {
+                    path: realTarget,
+                    allowedRoots: candidateRoots
+                  }
+                );
+                if (changed.newCwd !== realTarget) {
+                  throw new Error("Worktree relocation was rejected");
+                }
+                session.currentCwd = changed.newCwd;
               }
-              session.currentCwd = changed.newCwd;
-            }
-            if (!hasUnlocatedRestoredPrompt) {
               runtime.bridge.setSessionWorktree(sessionId, worktree);
               assertRuntimeGenerationOpen?.();
               session.worktree = worktree;
@@ -30751,6 +30496,448 @@ function registerSessionRoutes(app, deps) {
   }, "restoreSessionHandler");
   app.post("/session/:id/load", mutate(), restoreSessionHandler("load"));
   app.post("/session/:id/resume", mutate(), restoreSessionHandler("resume"));
+  const resolveWorktreeOwnershipTarget = /* @__PURE__ */ __name(async (runtime, workspaceCwd, sidecar, sessionId) => {
+    const invalidState = /* @__PURE__ */ __name((reason) => {
+      daemonLog?.warn("worktree reset rejected sidecar state", {
+        sessionId,
+        reason
+      });
+      return new WorktreeResetInvalidStateError(sessionId);
+    }, "invalidState");
+    const realWorkspace = fs6.realpathSync(workspaceCwd);
+    if (sidecar.workspaceCwd !== void 0) {
+      let realSidecarWorkspace;
+      try {
+        realSidecarWorkspace = fs6.realpathSync(sidecar.workspaceCwd);
+      } catch {
+        throw invalidState("sidecar workspace is missing or inaccessible");
+      }
+      if (realSidecarWorkspace !== realWorkspace) {
+        throw invalidState("sidecar belongs to another workspace");
+      }
+    }
+    const workspaceRoots = [realWorkspace];
+    let repoTop = null;
+    try {
+      repoTop = await new GitWorktreeService(realWorkspace).getRepoTopLevel();
+    } catch {
+    }
+    if (repoTop && repoTop !== realWorkspace) {
+      workspaceRoots.push(fs6.realpathSync(repoTop));
+    }
+    let realOriginalCwd;
+    try {
+      realOriginalCwd = fs6.realpathSync(sidecar.originalCwd);
+    } catch {
+      throw invalidState("sidecar original cwd is missing or inaccessible");
+    }
+    if (!workspaceRoots.includes(realOriginalCwd)) {
+      throw invalidState("sidecar original cwd is outside the accepted roots");
+    }
+    const candidateRoots = workspaceRoots.map(
+      (root) => path11.join(root, ".qwen", "worktrees")
+    );
+    let realTarget;
+    try {
+      realTarget = fs6.realpathSync(sidecar.worktreePath);
+    } catch {
+      throw invalidState("worktree checkout is missing or inaccessible");
+    }
+    const contained = candidateRoots.some((root) => {
+      try {
+        const realRoot = fs6.realpathSync(root);
+        const relative5 = path11.relative(realRoot, realTarget);
+        return relative5.length > 0 && !relative5.startsWith("..") && !path11.isAbsolute(relative5);
+      } catch {
+        return false;
+      }
+    });
+    if (!contained) {
+      throw invalidState("worktree path failed containment");
+    }
+    return { realTarget, candidateRoots };
+  }, "resolveWorktreeOwnershipTarget");
+  const worktreeResetHandler = /* @__PURE__ */ __name(async (req, res) => {
+    const route = "POST /session/:id/worktree-reset";
+    const sessionId = requireSessionId(req, res);
+    if (!sessionId) return;
+    if (parseVirtualSubagentSessionId(sessionId)) {
+      res.status(400).json({
+        error: "Virtual subagent sessions do not support worktree reset",
+        code: "unsupported_action",
+        sessionId
+      });
+      return;
+    }
+    const body = safeBody(req);
+    let resolvedRuntime;
+    try {
+      resolvedRuntime = await resolveRuntimeForSessionRestore(
+        body,
+        res,
+        route,
+        sessionId
+      );
+    } catch (err) {
+      if (sendConversationRuntimeError(res, err)) return;
+      sendBridgeError2(res, err, { route, sessionId });
+      return;
+    }
+    if (resolvedRuntime === void 0) return;
+    const { runtime, workspaceCwd } = resolvedRuntime;
+    const approvalMode = parseOptionalApprovalMode(body, res);
+    if (approvalMode === null) return;
+    const source = parseRequestedSessionSource(body, res);
+    if (source === null) return;
+    const modelServiceId = typeof body["modelServiceId"] === "string" ? body["modelServiceId"] : void 0;
+    const assertRuntimeGenerationOpen = captureRuntimeGenerationAssertion(runtime);
+    try {
+      await runOwnerRuntimeActivity(
+        runtime,
+        () => archiveCoordinator.runSharedMany([sessionId], async () => {
+          const sessionService = createWorkspaceRuntimeSessionService(runtime);
+          const storageSessionId = await resolveSessionIdForRestore(
+            sessionService,
+            sessionId
+          );
+          if (storageSessionId === void 0) {
+            throw new SessionNotFoundError(sessionId);
+          }
+          const oldSidecarPath = sessionService.getWorktreeSessionPath(storageSessionId);
+          if (runtime.bridge.setSessionResetPending === void 0 || runtime.bridge.clearSessionResetPending === void 0 || runtime.bridge.clearSessionWorktree === void 0 || runtime.bridge.severSessionClients === void 0) {
+            throw new Error("Bridge does not support worktree reset");
+          }
+          const preRead = await readWorktreeSessionStrict(oldSidecarPath);
+          if (preRead.state === "missing" || preRead.state === "valid" && preRead.session.workspaceCwd === void 0) {
+            throw new WorktreeResetUnsupportedError(sessionId);
+          }
+          if (preRead.state !== "valid") {
+            daemonLog?.warn("worktree reset rejected invalid sidecar", {
+              sessionId,
+              reason: preRead.reason
+            });
+            throw new WorktreeResetInvalidStateError(sessionId);
+          }
+          const preTarget = await resolveWorktreeOwnershipTarget(
+            runtime,
+            workspaceCwd,
+            preRead.session,
+            sessionId
+          );
+          const releaseOwnership = await acquireWorktreeOwnershipOp(
+            preTarget.realTarget
+          );
+          try {
+            const lockedRead = await readWorktreeSessionStrict(oldSidecarPath);
+            if (lockedRead.state === "missing" || lockedRead.state === "valid" && lockedRead.session.workspaceCwd === void 0) {
+              throw new WorktreeResetUnsupportedError(sessionId);
+            }
+            if (lockedRead.state !== "valid") {
+              daemonLog?.warn("worktree reset rejected invalid sidecar", {
+                sessionId,
+                reason: lockedRead.reason
+              });
+              throw new WorktreeResetInvalidStateError(sessionId);
+            }
+            const oldSidecar = lockedRead.session;
+            const { realTarget, candidateRoots } = await resolveWorktreeOwnershipTarget(
+              runtime,
+              workspaceCwd,
+              oldSidecar,
+              sessionId
+            );
+            if (realTarget !== preTarget.realTarget) {
+              daemonLog?.warn("worktree reset rejected: sidecar moved", {
+                sessionId
+              });
+              throw new WorktreeResetInvalidStateError(sessionId);
+            }
+            const readSummary = /* @__PURE__ */ __name((id) => {
+              try {
+                return runtime.bridge.getSessionSummary(id);
+              } catch (error2) {
+                if (error2 instanceof SessionNotFoundError) return void 0;
+                throw error2;
+              }
+            }, "readSummary");
+            runtime.bridge.setSessionResetPending(sessionId);
+            let barrierArmed = true;
+            try {
+              let effectiveOldSidecar = oldSidecar;
+              if (oldSidecar.supersededBy !== void 0) {
+                const replacementId = oldSidecar.supersededBy;
+                const newSidecarPath = sessionService.getWorktreeSessionPath(replacementId);
+                const newRead = await readWorktreeSessionStrict(newSidecarPath);
+                const linksAgree = newRead.state === "valid" && newRead.session.supersedes === storageSessionId;
+                const marker = await readWorktreeSessionMarkerStrict(realTarget);
+                if (marker.state === "invalid") {
+                  daemonLog?.warn("worktree reset resume rejected marker", {
+                    sessionId,
+                    reason: marker.reason
+                  });
+                  throw new WorktreeResetInvalidStateError(sessionId);
+                }
+                if (marker.state === "missing" || marker.state === "valid" && marker.sessionId === storageSessionId) {
+                  if (!linksAgree) {
+                    daemonLog?.warn(
+                      "worktree reset resume found inconsistent links",
+                      { sessionId, replacementSessionId: replacementId }
+                    );
+                    throw new WorktreeResetInvalidStateError(sessionId);
+                  }
+                  if (marker.state === "missing" && readSummary(replacementId) !== void 0) {
+                    daemonLog?.warn(
+                      "worktree reset resume found a live replacement with no marker",
+                      { sessionId, replacementSessionId: replacementId }
+                    );
+                    throw new WorktreeResetInvalidStateError(sessionId);
+                  }
+                  const { supersededBy: _drop, ...restoredOld } = oldSidecar;
+                  const removed = await runWithWorkspaceRuntimeStorage(
+                    runtime,
+                    () => deleteDaemonSessionIfOrphan({
+                      sessionId: replacementId,
+                      service: sessionService,
+                      bridge: runtime.bridge,
+                      coordinator: archiveCoordinator
+                    })
+                  ).catch(() => false);
+                  if (!removed) {
+                    daemonLog?.warn(
+                      "worktree reset could not remove the interrupted replacement",
+                      { sessionId, replacementSessionId: replacementId }
+                    );
+                    throw new WorktreeResetInvalidStateError(sessionId);
+                  }
+                  await clearWorktreeSession(newSidecarPath);
+                  await writeWorktreeSession(oldSidecarPath, restoredOld);
+                  daemonLog?.warn(
+                    "worktree reset rolled back an interrupted transfer",
+                    { sessionId, replacementSessionId: replacementId }
+                  );
+                  effectiveOldSidecar = restoredOld;
+                } else if (marker.state === "valid" && marker.sessionId === replacementId) {
+                  barrierArmed = false;
+                  if (!linksAgree) {
+                    daemonLog?.warn(
+                      "worktree reset resume found inconsistent links",
+                      { sessionId, replacementSessionId: replacementId }
+                    );
+                    throw new WorktreeResetInvalidStateError(sessionId);
+                  }
+                  const newSummary = readSummary(replacementId);
+                  if (newSummary && (newSummary.hasActivePrompt || (newSummary.pendingInteractionCount ?? 0) > 0)) {
+                    throw new WorktreeResetActiveError(replacementId);
+                  }
+                  runtime.bridge.clearSessionWorktree(sessionId);
+                  const severCompleted = await runtime.bridge.severSessionClients(sessionId);
+                  if (severCompleted) {
+                    runtime.bridge.clearSessionResetPending(sessionId);
+                  } else {
+                    daemonLog?.warn(
+                      "worktree reset left the superseded session live",
+                      { sessionId, replacementSessionId: replacementId }
+                    );
+                  }
+                  assertRuntimeGenerationOpen?.();
+                  daemonLog?.info(
+                    "worktree session reset resumed after interruption",
+                    { sessionId, replacementSessionId: replacementId }
+                  );
+                  res.status(200).json({
+                    sessionId: replacementId,
+                    workspaceCwd,
+                    currentCwd: realTarget,
+                    worktree: {
+                      slug: oldSidecar.slug,
+                      path: realTarget,
+                      branch: oldSidecar.worktreeBranch
+                    },
+                    worktreeState: "persisted-v1",
+                    attached: false,
+                    ...severCompleted ? {} : { supersededSessionLive: true }
+                  });
+                  return;
+                } else {
+                  daemonLog?.warn(
+                    "worktree reset resume found a marker naming another session",
+                    { sessionId }
+                  );
+                  throw new WorktreeResetInvalidStateError(sessionId);
+                }
+              }
+              const oldSummary = readSummary(sessionId);
+              if (oldSummary && (oldSummary.hasActivePrompt || (oldSummary.pendingInteractionCount ?? 0) > 0)) {
+                throw new WorktreeResetActiveError(sessionId);
+              }
+              let spawnedNew;
+              let newSidecarWritten = false;
+              let oldSupersededWritten = false;
+              let markerTransferred = false;
+              try {
+                assertRuntimeGenerationOpen?.();
+                const spawned = await runtime.bridge.spawnOrAttach({
+                  workspaceCwd,
+                  modelServiceId,
+                  sessionScope: "thread",
+                  ...approvalMode !== void 0 ? { approvalMode } : {},
+                  ...source.sourceType !== void 0 ? { sourceType: source.sourceType } : {},
+                  ...source.sourceId !== void 0 ? { sourceId: source.sourceId } : {}
+                });
+                spawnedNew = { sessionId: spawned.sessionId };
+                const changed = await runtime.bridge.changeSessionCwd(
+                  spawned.sessionId,
+                  { path: realTarget, allowedRoots: candidateRoots }
+                );
+                if (changed.newCwd !== realTarget) {
+                  throw new Error("Worktree relocation was rejected");
+                }
+                await writeWorktreeSession(oldSidecarPath, {
+                  ...effectiveOldSidecar,
+                  supersededBy: spawned.sessionId
+                });
+                oldSupersededWritten = true;
+                const newSidecarPath = sessionService.getWorktreeSessionPath(
+                  spawned.sessionId
+                );
+                const {
+                  supersededBy: _dropOld,
+                  supersedes: _dropOldLink,
+                  ...oldSidecarCore
+                } = effectiveOldSidecar;
+                await writeWorktreeSession(newSidecarPath, {
+                  ...oldSidecarCore,
+                  supersedes: storageSessionId
+                });
+                newSidecarWritten = true;
+                if (res.destroyed || res.socket?.writable === false) {
+                  throw new Error(
+                    "Client disconnected before the worktree ownership flip"
+                  );
+                }
+                const windingDown = readSummary(sessionId);
+                if (windingDown && (windingDown.hasActivePrompt || (windingDown.pendingInteractionCount ?? 0) > 0)) {
+                  throw new WorktreeResetActiveError(sessionId);
+                }
+                const markerBeforeFlip = await readWorktreeSessionMarkerStrict(realTarget);
+                try {
+                  await transferWorktreeSessionMarkerOwner(
+                    realTarget,
+                    markerBeforeFlip.state === "missing" ? null : storageSessionId,
+                    spawned.sessionId
+                  );
+                } catch (markerError) {
+                  daemonLog?.warn("worktree marker transfer failed", {
+                    sessionId,
+                    replacementSessionId: spawned.sessionId,
+                    error: markerError instanceof Error ? markerError.message : String(markerError)
+                  });
+                  if (markerError instanceof WorktreeMarkerCommittedError) {
+                    markerTransferred = true;
+                    barrierArmed = false;
+                    throw new Error(
+                      "Worktree ownership moved to the replacement, but the marker commit did not finish cleanly; retry the reset to complete the transfer"
+                    );
+                  }
+                  throw new WorktreeResetInvalidStateError(sessionId);
+                }
+                markerTransferred = true;
+                barrierArmed = false;
+                const newWorktree = {
+                  slug: effectiveOldSidecar.slug,
+                  path: realTarget,
+                  branch: effectiveOldSidecar.worktreeBranch
+                };
+                runtime.bridge.setSessionWorktree(
+                  spawned.sessionId,
+                  newWorktree
+                );
+                assertRuntimeGenerationOpen?.();
+                runtime.bridge.clearSessionWorktree(sessionId);
+                const severCompleted = await runtime.bridge.severSessionClients(sessionId);
+                if (severCompleted) {
+                  runtime.bridge.clearSessionResetPending(sessionId);
+                } else {
+                  daemonLog?.warn(
+                    "worktree reset left the superseded session live",
+                    {
+                      sessionId,
+                      replacementSessionId: spawned.sessionId
+                    }
+                  );
+                }
+                daemonLog?.info("worktree session reset", {
+                  sessionId,
+                  replacementSessionId: spawned.sessionId
+                });
+                res.status(200).json({
+                  ...spawned,
+                  currentCwd: realTarget,
+                  worktree: newWorktree,
+                  worktreeState: "persisted-v1",
+                  ...severCompleted ? {} : { supersededSessionLive: true }
+                });
+              } catch (transferError) {
+                if (markerTransferred) {
+                  daemonLog?.warn(
+                    "worktree reset failed after the ownership flip",
+                    {
+                      sessionId,
+                      replacementSessionId: spawnedNew?.sessionId,
+                      error: transferError instanceof Error ? transferError.message : String(transferError)
+                    }
+                  );
+                  throw transferError;
+                }
+                if (spawnedNew) {
+                  const orphanSessionId = spawnedNew.sessionId;
+                  const removed = await runWithWorkspaceRuntimeStorage(
+                    runtime,
+                    () => deleteDaemonSessionIfOrphan({
+                      sessionId: orphanSessionId,
+                      service: sessionService,
+                      bridge: runtime.bridge,
+                      coordinator: archiveCoordinator
+                    })
+                  ).catch(() => false);
+                  if (!removed) {
+                    daemonLog?.warn(
+                      "worktree reset could not remove the spawned replacement",
+                      { sessionId, replacementSessionId: orphanSessionId }
+                    );
+                    throw transferError;
+                  }
+                }
+                if (newSidecarWritten && spawnedNew) {
+                  await clearWorktreeSession(
+                    sessionService.getWorktreeSessionPath(spawnedNew.sessionId)
+                  );
+                }
+                if (oldSupersededWritten) {
+                  await writeWorktreeSession(
+                    oldSidecarPath,
+                    effectiveOldSidecar
+                  );
+                }
+                throw transferError;
+              }
+            } finally {
+              if (barrierArmed) {
+                runtime.bridge.clearSessionResetPending(sessionId);
+              }
+            }
+          } finally {
+            releaseOwnership();
+          }
+        })
+      );
+    } catch (err) {
+      if (!res.headersSent) {
+        sendBridgeError2(res, err, { route, sessionId });
+      }
+    }
+  }, "worktreeResetHandler");
+  app.post("/session/:id/worktree-reset", mutate(), worktreeResetHandler);
   app.get("/session/:id/subagents/:subagentRef", async (req, res) => {
     const route = "GET /session/:id/subagents/:subagentRef";
     const sessionId = requireSessionId(req, res);
@@ -31019,7 +31206,7 @@ function registerSessionRoutes(app, deps) {
       async (req, res, sessionId, runtime) => {
         const body = safeBody(req);
         const targetPath = body["path"];
-        if (typeof targetPath !== "string" || targetPath.length === 0 || !path12.isAbsolute(targetPath)) {
+        if (typeof targetPath !== "string" || targetPath.length === 0 || !path11.isAbsolute(targetPath)) {
           res.status(400).json({
             error: "`path` is required and must be an absolute path",
             code: "invalid_path"
@@ -33487,6 +33674,7 @@ function registerSessionRoutes(app, deps) {
         sessionId: session.sessionId,
         clientCount: session.clientCount,
         hasActivePrompt: session.hasActivePrompt,
+        ...session.activeWorkState !== void 0 ? { activeWorkState: session.activeWorkState } : {},
         isWaitingForPermission: session.isWaitingForPermission ?? false,
         isWaitingForUserQuestion: session.isWaitingForUserQuestion ?? false,
         // Bridge-local activity watermark, absent until a running prompt in
@@ -34084,8 +34272,8 @@ __name(registerSessionRoutes, "registerSessionRoutes");
 // packages/cli/src/serve/routes/session-pr-backfill.ts
 init_esbuild_shims();
 import { existsSync } from "node:fs";
-import * as fs8 from "node:fs/promises";
-import * as path13 from "node:path";
+import * as fs7 from "node:fs/promises";
+import * as path12 from "node:path";
 var SLUG_PR_PATTERN = /^pr-([1-9]\d{0,8})$/;
 var BRANCH_PR_PATTERN = /^worktree-pr-([1-9]\d{0,8})$/;
 function parsePrNumberFromWorktree(slug, branch) {
@@ -34174,7 +34362,7 @@ async function backfillWorkspaceSessionPrs(runtime, fetchPullRequests = fetchGit
     for (const sessionId of sessionIds) {
       if (!isValidSessionId(sessionId)) continue;
       result.scanned += 1;
-      const dir = path13.dirname(
+      const dir = path12.dirname(
         sessionService.getWorktreeSessionPathForArchiveState(
           sessionId,
           archiveState
@@ -34183,15 +34371,15 @@ async function backfillWorkspaceSessionPrs(runtime, fetchPullRequests = fetchGit
       let worktree;
       try {
         worktree = await readWorktreeSession(
-          path13.join(dir, `${sessionId}.worktree.json`)
+          path12.join(dir, `${sessionId}.worktree.json`)
         );
       } catch {
         worktree = null;
       }
       let transcriptRaw;
       try {
-        transcriptRaw = await fs8.readFile(
-          path13.join(dir, `${sessionId}.jsonl`),
+        transcriptRaw = await fs7.readFile(
+          path12.join(dir, `${sessionId}.jsonl`),
           "utf8"
         );
       } catch {
@@ -34211,7 +34399,7 @@ async function backfillWorkspaceSessionPrs(runtime, fetchPullRequests = fetchGit
       candidates.push({
         sessionId,
         archiveState,
-        transcriptPath: path13.join(dir, `${sessionId}.jsonl`),
+        transcriptPath: path12.join(dir, `${sessionId}.jsonl`),
         conventionNumber,
         mentions: reviewed.mentions,
         reviewedUrlForms: reviewed.reviewedUrlForms
@@ -34343,8 +34531,8 @@ async function backfillWorkspaceSessionPrs(runtime, fetchPullRequests = fetchGit
       candidate.sessionId,
       archiveState
     );
-    const transcriptPath = path13.join(
-      path13.dirname(prPath),
+    const transcriptPath = path12.join(
+      path12.dirname(prPath),
       `${candidate.sessionId}.jsonl`
     );
     const snapshotAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -34987,7 +35175,7 @@ __name(registerStandaloneSessionRoutes, "registerStandaloneSessionRoutes");
 
 // packages/cli/src/serve/routes/channel-notify.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID10 } from "node:crypto";
+import { randomUUID as randomUUID9 } from "node:crypto";
 function sendDeliveryError(res, error2) {
   if (!isChannelDeliveryError(error2)) {
     res.status(502).json({
@@ -35008,7 +35196,7 @@ function parseNotifyBody(body) {
     );
   }
   return normalizeChannelDelivery(
-    randomUUID10(),
+    randomUUID9(),
     parseChannelDelivery(body["delivery"]),
     body["text"]
   );
@@ -35211,7 +35399,7 @@ __name(registerUsageStatsRoutes, "registerUsageStatsRoutes");
 // packages/cli/src/serve/scheduled-task-keepalive.ts
 init_esbuild_shims();
 import * as fsSync from "node:fs";
-import * as path14 from "node:path";
+import * as path13 from "node:path";
 var log = createDebugLogger("SCHED_KEEPALIVE");
 function collectBoundSessionIds(tasks) {
   const seen = /* @__PURE__ */ new Set();
@@ -35443,8 +35631,8 @@ function startScheduledTaskKeepalive(opts) {
     opts.runtimeBaseDir,
     () => getCronFilePath(boundWorkspace)
   );
-  const cronDir = path14.dirname(cronFilePath);
-  const cronFileName = path14.basename(cronFilePath);
+  const cronDir = path13.dirname(cronFilePath);
+  const cronFileName = path13.basename(cronFilePath);
   let fileWatcher;
   try {
     fsSync.mkdirSync(cronDir, { recursive: true });
@@ -36167,6 +36355,10 @@ function workflowsEnabledForRuntime(runtime, daemonEnv) {
 }
 __name(workflowsEnabledForRuntime, "workflowsEnabledForRuntime");
 function registerCapabilitiesRoutes(app, deps) {
+  const configuredPollIntervalMs = Number(
+    deps.daemonEnv["QWEN_SESSION_LIVE_STATE_POLL_INTERVAL_MS"]
+  );
+  const sessionLiveStatePollIntervalMs = Number.isSafeInteger(configuredPollIntervalMs) && configuredPollIntervalMs >= 1e3 && configuredPollIntervalMs <= 2147483647 ? configuredPollIntervalMs : 5e3;
   app.get("/capabilities", (_req, res) => {
     const entries = deps.workspaceRegistry.listAllEntries().filter(
       (entry) => !entry.internal || entry.state === "active" && entry.current !== void 0
@@ -36183,6 +36375,7 @@ function registerCapabilitiesRoutes(app, deps) {
       ...deps.qwenCodeVersion ? { qwenCodeVersion: deps.qwenCodeVersion } : {},
       mode: deps.mode,
       features,
+      sessionLiveStatePollIntervalMs,
       modelServices: [],
       // Surface the primary workspace so clients can omit `cwd` on
       // `POST /session`; multi-workspace clients use `workspaces[]`.
@@ -37243,7 +37436,7 @@ __name(registerUserLanguageRoutes, "registerUserLanguageRoutes");
 
 // packages/cli/src/serve/routes/sse-events.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID11 } from "node:crypto";
+import { randomUUID as randomUUID10 } from "node:crypto";
 import { performance as performance3 } from "node:perf_hooks";
 
 // packages/cli/src/serve/server/error-response.ts
@@ -37624,6 +37817,63 @@ function sendBridgeError(res, err, ctx, daemonLog) {
     });
     return;
   }
+  if (err instanceof SessionResetPendingError) {
+    res.status(409).json({
+      error: err.message,
+      code: "worktree_reset_active",
+      sessionId: err.sessionId
+    });
+    return;
+  }
+  if (err instanceof WorktreeSessionSupersededError) {
+    res.status(409).json({
+      error: err.message,
+      code: "worktree_session_superseded",
+      sessionId: err.sessionId,
+      replacementSessionId: err.replacementSessionId
+    });
+    return;
+  }
+  if (err instanceof WorktreeMarkerMissingError) {
+    res.status(409).json({
+      error: err.message,
+      code: "worktree_marker_missing",
+      sessionId: err.sessionId
+    });
+    return;
+  }
+  if (err instanceof WorktreeResetInterruptedError) {
+    res.status(409).json({
+      error: err.message,
+      code: "worktree_reset_interrupted",
+      sessionId: err.sessionId
+    });
+    return;
+  }
+  if (err instanceof WorktreeResetActiveError) {
+    res.status(409).json({
+      error: err.message,
+      code: "worktree_reset_active",
+      sessionId: err.sessionId
+    });
+    return;
+  }
+  if (err instanceof WorktreeResetUnsupportedError) {
+    res.status(409).json({
+      error: err.message,
+      code: "worktree_reset_unsupported",
+      sessionId: err.sessionId
+    });
+    return;
+  }
+  if (err instanceof WorktreeResetInvalidStateError) {
+    res.status(409).json({
+      error: err.message,
+      code: "worktree_reset_invalid_state",
+      sessionId: err.sessionId
+    });
+    return;
+  }
   if (err instanceof TrustGateError) {
     res.status(403).json({
       error: err.message,
@@ -38089,7 +38339,7 @@ function registerSseEventsRoutes(app, deps) {
   app.get("/session/:id/events", async (req, res) => {
     const sessionId = req.params["id"];
     const diagnosticSessionId = boundedDiagnosticString(sessionId);
-    const streamId = randomUUID11();
+    const streamId = randomUUID10();
     const clientId = parseSseClientId(req.headers["x-qwen-client-id"]);
     const connectReason = parseSseConnectReason(req.query["connectReason"]);
     const previousStreamId = parsePreviousSseStreamId(
@@ -38981,7 +39231,7 @@ __name(registerWorkspaceModelsRoutes, "registerWorkspaceModelsRoutes");
 // packages/cli/src/serve/routes/a2ui-action.ts
 init_esbuild_shims();
 import * as fsp4 from "node:fs/promises";
-import * as path15 from "node:path";
+import * as path14 from "node:path";
 var A2UI_MIME = "application/a2ui+json";
 var ACTION_TOOL = "action";
 var CALL_TIMEOUT_MS = 15e3;
@@ -39004,7 +39254,7 @@ __name(usableServerConfig, "usableServerConfig");
 async function findFromSettingsFile(workspaceCwd) {
   try {
     const raw = await fsp4.readFile(
-      path15.join(workspaceCwd, ".qwen", "settings.json"),
+      path14.join(workspaceCwd, ".qwen", "settings.json"),
       "utf8"
     );
     const settings = JSON.parse(raw);
@@ -39165,7 +39415,7 @@ __name(registerA2uiActionRoutes, "registerA2uiActionRoutes");
 
 // packages/cli/src/serve/server/fs-factory.ts
 init_esbuild_shims();
-import * as path16 from "node:path";
+import * as path15 from "node:path";
 var IDE_WORKSPACE_PATH_ENV_VAR = "QWEN_CODE_IDE_WORKSPACE_PATH";
 var NEW_FILE_MODE_ENV_VAR = "QWEN_SERVE_NEW_FILE_MODE";
 function parseNewFileModePolicy(env = process.env) {
@@ -39254,14 +39504,14 @@ function parseIdeWorkspacePathEnv(value) {
       const parsed = JSON.parse(value);
       if (Array.isArray(parsed) && parsed.every((item) => typeof item === "string")) {
         return parsed.filter(
-          (workspace) => workspace.length > 0 && path16.isAbsolute(workspace)
+          (workspace) => workspace.length > 0 && path15.isAbsolute(workspace)
         );
       }
       throw new Error("IDE workspace path JSON must be a string array");
     } catch {
     }
   }
-  return value.split(path16.delimiter).filter((workspace) => workspace.length > 0 && path16.isAbsolute(workspace));
+  return value.split(path15.delimiter).filter((workspace) => workspace.length > 0 && path15.isAbsolute(workspace));
 }
 __name(parseIdeWorkspacePathEnv, "parseIdeWorkspacePathEnv");
 function dropNestedWorkspacesPreservingPrimary(workspaces) {
@@ -39750,7 +40000,7 @@ __name(registerWorkspaceQualifiedLifecycleRoutes, "registerWorkspaceQualifiedLif
 init_esbuild_shims();
 import { readdir as readdir3, stat as stat2 } from "node:fs/promises";
 import { realpathSync as realpathSync2 } from "node:fs";
-import { basename as basename7, dirname as dirname9, isAbsolute as isAbsolute10, join as join12, resolve as resolve5, sep as sep4 } from "node:path";
+import { basename as basename7, dirname as dirname8, isAbsolute as isAbsolute9, join as join11, resolve as resolve5, sep as sep4 } from "node:path";
 var MAX_PATH_SUGGESTIONS = 50;
 function registerWorkspaceManagementRoutes(app, deps) {
   const {
@@ -40139,7 +40389,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
         });
         return;
       }
-      if (!isAbsolute10(prefix)) {
+      if (!isAbsolute9(prefix)) {
         res.status(400).json({
           error: "`prefix` must be an absolute path",
           code: "invalid_prefix"
@@ -40147,7 +40397,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
         return;
       }
       const endsWithSep = prefix.endsWith("/") || process.platform === "win32" && prefix.endsWith("\\");
-      const dir = endsWithSep ? join12(prefix, ".") : dirname9(prefix);
+      const dir = endsWithSep ? join11(prefix, ".") : dirname8(prefix);
       const filter = endsWithSep ? "" : basename7(prefix);
       const filterLower = filter.toLowerCase();
       const suggestions = [];
@@ -40163,7 +40413,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
           let isDir = entry.isDirectory();
           if (!isDir && entry.isSymbolicLink()) {
             try {
-              isDir = (await stat2(join12(dir, entry.name))).isDirectory();
+              isDir = (await stat2(join11(dir, entry.name))).isDirectory();
             } catch {
               continue;
             }
@@ -40173,7 +40423,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
             truncated = true;
             break;
           }
-          suggestions.push({ name: entry.name, path: join12(dir, entry.name) });
+          suggestions.push({ name: entry.name, path: join11(dir, entry.name) });
         }
       } catch {
       }
@@ -45647,7 +45897,7 @@ init_esbuild_shims();
 
 // packages/cli/src/serve/live/live-host-coordinator.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID12, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
+import { randomUUID as randomUUID11, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
 var DEFAULT_HELLO_TIMEOUT_MS = 5e3;
 var DEFAULT_HEARTBEAT_INTERVAL_MS = 5e3;
 var DEFAULT_HEARTBEAT_TIMEOUT_MS = 15e3;
@@ -45830,7 +46080,7 @@ __name(projectStatusForHost, "projectStatusForHost");
 var LiveHostCoordinator = class {
   constructor(options) {
     this.options = options;
-    this.daemonInstanceNonce = options.daemonInstanceNonce ?? randomUUID12();
+    this.daemonInstanceNonce = options.daemonInstanceNonce ?? randomUUID11();
     this.handlers = options.handlers ?? {};
     this.now = options.now ?? Date.now;
     this.helloTimeoutMs = options.helloTimeoutMs ?? DEFAULT_HELLO_TIMEOUT_MS;
@@ -45861,6 +46111,7 @@ var LiveHostCoordinator = class {
   };
   call;
   pendingStartMode;
+  actionGeneration = 0;
   nextEpoch = 0;
   inputMuted = false;
   outputMuted = false;
@@ -45881,6 +46132,7 @@ var LiveHostCoordinator = class {
     return this.getStatus();
   }
   async deactivate() {
+    ++this.actionGeneration;
     this.pendingStartMode = void 0;
     if (this.call) {
       const stopped = new Promise((resolve7) => {
@@ -45996,6 +46248,18 @@ var LiveHostCoordinator = class {
       } : {}
     };
   }
+  async requestStart(mode) {
+    const generation = ++this.actionGeneration;
+    this.pendingStartMode = void 0;
+    try {
+      await this.handlers.beforeStart?.();
+    } catch (error2) {
+      if (generation !== this.actionGeneration) return this.getStatus();
+      throw error2;
+    }
+    if (generation !== this.actionGeneration) return this.getStatus();
+    return this.start(mode).status;
+  }
   start(mode) {
     const status = this.getStatus();
     if (!status.available) throw new LiveUnavailableError(status);
@@ -46022,7 +46286,7 @@ var LiveHostCoordinator = class {
   startCall(mode) {
     const call = {
       epoch: ++this.nextEpoch,
-      callId: randomUUID12(),
+      callId: randomUUID11(),
       mode,
       state: "starting",
       pendingPermission: false,
@@ -46047,6 +46311,7 @@ var LiveHostCoordinator = class {
     return { epoch: call.epoch, callId: call.callId, status: this.getStatus() };
   }
   stop() {
+    ++this.actionGeneration;
     this.pendingStartMode = void 0;
     if (this.call) this.beginCallStop(this.call);
     return this.getStatus();
@@ -46081,7 +46346,7 @@ var LiveHostCoordinator = class {
         new Error("Qwen Live Host must be connected to change the shortcut.")
       );
     }
-    const requestId = randomUUID12();
+    const requestId = randomUUID11();
     return new Promise((resolve7, reject) => {
       const timer = setTimeout(() => {
         this.rejectPendingShortcut(
@@ -46171,7 +46436,7 @@ var LiveHostCoordinator = class {
         )
       );
     }
-    const requestId = randomUUID12();
+    const requestId = randomUUID11();
     return new Promise((resolve7, reject) => {
       const timer = setTimeout(() => {
         this.pendingAppshots.delete(requestId);
@@ -46236,6 +46501,7 @@ var LiveHostCoordinator = class {
     this.sendHost({ type: "host.clear_output", epoch });
   }
   dispose() {
+    ++this.actionGeneration;
     this.pendingStartMode = void 0;
     if (this.call) this.finishCall(this.call);
     if (this.host) {
@@ -46460,19 +46726,14 @@ var LiveHostCoordinator = class {
     }
   }
   startFromHost(mode) {
-    try {
-      this.start(mode);
-    } catch (error2) {
+    void this.requestStart(mode).catch((error2) => {
       if (error2 instanceof LiveUnavailableError) {
         this.sendState(error2.status);
         return;
       }
-      this.sendState({
-        ...this.getStatus(),
-        state: "error",
-        message: "Live Voice failed to start."
-      });
-    }
+      this.lastCallError = error2 instanceof ConversationRuntimeOwnershipError ? error2.message : "Live Voice failed to start.";
+      this.sendState(this.buildStatus(false));
+    });
   }
   handleAudioFrame(lease, data) {
     if (!lease.hello) {
@@ -46514,7 +46775,7 @@ var LiveHostCoordinator = class {
       this.disconnectHost(lease, 4008, "Live Host heartbeat timed out.");
       return;
     }
-    const pingId = randomUUID12();
+    const pingId = randomUUID11();
     lease.pingId = pingId;
     this.sendHost({ type: "host.ping", pingId });
   }
@@ -46599,9 +46860,10 @@ var LiveHostCoordinator = class {
     this.broadcastState();
   }
   stopForReadinessLoss() {
+    ++this.actionGeneration;
+    this.pendingStartMode = void 0;
     const call = this.call;
     if (!call) return;
-    this.pendingStartMode = void 0;
     this.beginCallStop(call);
   }
   disconnectHost(lease, code, reason) {
@@ -46695,8 +46957,7 @@ function registerLiveRoutes(app, deps) {
   });
   app.post("/live/start", deps.mutate(), async (_req, res) => {
     try {
-      await deps.ensureRuntimeReady?.();
-      res.status(200).json(deps.coordinator.start("resume").status);
+      res.status(200).json(await deps.coordinator.requestStart("resume"));
     } catch (error2) {
       if (sendUnavailable(res, error2)) return;
       throw error2;
@@ -46704,8 +46965,7 @@ function registerLiveRoutes(app, deps) {
   });
   app.post("/live/new", deps.mutate(), async (_req, res) => {
     try {
-      await deps.ensureRuntimeReady?.();
-      res.status(200).json(deps.coordinator.start("new").status);
+      res.status(200).json(await deps.coordinator.requestStart("new"));
     } catch (error2) {
       if (sendUnavailable(res, error2)) return;
       throw error2;
@@ -46782,7 +47042,7 @@ init_esbuild_shims();
 
 // packages/cli/src/serve/live/live-setup-controller.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID14 } from "node:crypto";
+import { randomUUID as randomUUID13 } from "node:crypto";
 
 // packages/cli/src/serve/live/provider-credentials.ts
 init_esbuild_shims();
@@ -46880,7 +47140,7 @@ __name(resolveLiveProviderCredential, "resolveLiveProviderCredential");
 
 // packages/cli/src/serve/live/qwen-realtime-session.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID13 } from "node:crypto";
+import { randomUUID as randomUUID12 } from "node:crypto";
 var QWEN_REALTIME_LIMITS = {
   maxInputAudioFrameBytes: 64 * 1024,
   maxOutputAudioFrameBytes: 256 * 1024,
@@ -47295,7 +47555,7 @@ function openQwenRealtimeSession(config, callbacks = {}, deps = {}) {
     const sendJson = /* @__PURE__ */ __name((body) => {
       if (terminal || closedByClient || ws.readyState !== ws.OPEN) return false;
       try {
-        ws.send(JSON.stringify({ event_id: randomUUID13(), ...body }));
+        ws.send(JSON.stringify({ event_id: randomUUID12(), ...body }));
         return true;
       } catch (error2) {
         fail(
@@ -48658,7 +48918,7 @@ async function validateCredential(credential) {
     apiKey: credential.apiKey,
     model: credential.realtimeModel,
     voice: credential.voice,
-    callEpoch: `setup-${randomUUID14()}`
+    callEpoch: `setup-${randomUUID13()}`
   });
   session.close({ discardPendingInput: true });
 }
@@ -48965,11 +49225,11 @@ __name(registerLiveSetupRoutes, "registerLiveSetupRoutes");
 // packages/cli/src/serve/live/live-host-installer.ts
 init_esbuild_shims();
 import { execFile as execFile2 } from "node:child_process";
-import { createHash as createHash4, randomUUID as randomUUID15 } from "node:crypto";
-import * as fs9 from "node:fs";
+import { createHash as createHash4, randomUUID as randomUUID14 } from "node:crypto";
+import * as fs8 from "node:fs";
 import * as fsp5 from "node:fs/promises";
 import * as os2 from "node:os";
-import * as path17 from "node:path";
+import * as path16 from "node:path";
 import { Readable, Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { promisify as promisify2 } from "node:util";
@@ -49049,7 +49309,7 @@ async function readBundleValue(appPath, key) {
     "raw",
     "-o",
     "-",
-    path17.join(appPath, "Contents", "Info.plist")
+    path16.join(appPath, "Contents", "Info.plist")
   ]);
 }
 __name(readBundleValue, "readBundleValue");
@@ -49157,7 +49417,7 @@ async function downloadAsset(asset, url, destination, onProgress, fetchImpl) {
   await pipeline(
     Readable.fromWeb(response.body),
     guard,
-    fs9.createWriteStream(destination, { flags: "wx", mode: 384 })
+    fs8.createWriteStream(destination, { flags: "wx", mode: 384 })
   );
   if (received !== asset.size || hash.digest("hex") !== asset.sha256) {
     throw new Error("Live Host checksum verification failed.");
@@ -49191,13 +49451,13 @@ async function downloadLiveHostRelease(currentArchitecture, destination, onProgr
 __name(downloadLiveHostRelease, "downloadLiveHostRelease");
 async function installLatestHost(currentArchitecture, onStatus) {
   const temporaryDirectory = await fsp5.mkdtemp(
-    path17.join(os2.tmpdir(), "qwen-live-host-")
+    path16.join(os2.tmpdir(), "qwen-live-host-")
   );
-  const archivePath = path17.join(temporaryDirectory, "Qwen-Live-Host.zip");
-  const extractedPath = path17.join(temporaryDirectory, "extracted");
-  const candidatePath = path17.join(extractedPath, LIVE_HOST_APP_NAME);
-  const stagingPath = `/Applications/.Qwen Live Host.install-${randomUUID15()}.app`;
-  const backupPath = `/Applications/.Qwen Live Host.backup-${randomUUID15()}.app`;
+  const archivePath = path16.join(temporaryDirectory, "Qwen-Live-Host.zip");
+  const extractedPath = path16.join(temporaryDirectory, "extracted");
+  const candidatePath = path16.join(extractedPath, LIVE_HOST_APP_NAME);
+  const stagingPath = `/Applications/.Qwen Live Host.install-${randomUUID14()}.app`;
+  const backupPath = `/Applications/.Qwen Live Host.backup-${randomUUID14()}.app`;
   let movedExisting = false;
   let installedCandidate = false;
   try {
@@ -49348,15 +49608,15 @@ var LiveHostInstaller = class {
 
 // packages/cli/src/serve/live/live-session-coordinator.ts
 init_esbuild_shims();
-import { createHash as createHash5, randomUUID as randomUUID16 } from "node:crypto";
+import { createHash as createHash5, randomUUID as randomUUID15 } from "node:crypto";
 import { createWriteStream as createWriteStream2, mkdirSync as mkdirSync2 } from "node:fs";
-import { join as join15 } from "node:path";
+import { join as join14 } from "node:path";
 
 // packages/cli/src/serve/live/realtime-startup-context.ts
 init_esbuild_shims();
 import { readdirSync } from "node:fs";
 import { homedir } from "node:os";
-import { basename as basename8, join as join14 } from "node:path";
+import { basename as basename8, join as join13 } from "node:path";
 var STARTUP_CONTEXT_HEADER = "Startup context from Qwen Code.\nThis is background context about recent work and machine/workspace layout. It may be incomplete or stale. Use it to inform responses, and do not repeat it back unless relevant.";
 var CURRENT_THREAD_SECTION_TOKEN_BUDGET = 1200;
 var RECENT_WORK_SECTION_TOKEN_BUDGET = 2200;
@@ -49598,7 +49858,7 @@ function collectTreeLines(directory, depth, lines) {
     const indent = "  ".repeat(depth);
     lines.push(`${indent}- ${entry.name}${entry.isDirectory() ? "/" : ""}`);
     if (entry.isDirectory()) {
-      collectTreeLines(join14(directory, entry.name), depth + 1, lines);
+      collectTreeLines(join13(directory, entry.name), depth + 1, lines);
     }
   }
   if (entries.length > DIR_ENTRY_LIMIT) {
@@ -49717,7 +49977,7 @@ function openLiveAudioCapture(source, identifier) {
   try {
     mkdirSync2(directory, { recursive: true, mode: 448 });
     const safeIdentifier = identifier.replace(/[^A-Za-z0-9_-]/g, "_");
-    const path19 = join15(
+    const path19 = join14(
       directory,
       `${source}-${Date.now()}-${safeIdentifier}.pcm`
     );
@@ -50078,7 +50338,7 @@ var LiveSessionCoordinator = class {
         context.speechInProgress = true;
         context.inputCommitPending = true;
         context.inputAwaitingResponse = false;
-        const partialItemId = itemId ?? `partial:${randomUUID16()}`;
+        const partialItemId = itemId ?? `partial:${randomUUID15()}`;
         context.activePartialInputItemId = partialItemId;
         if (!context.partialInputTranscripts.has(partialItemId)) {
           context.partialInputTranscripts.set(partialItemId, "");
@@ -50108,7 +50368,7 @@ var LiveSessionCoordinator = class {
       }, "onInputCommitted"),
       onInputTranscriptDelta: /* @__PURE__ */ __name(({ itemId, text }) => {
         if (this.isCurrentSocket(context, generation)) {
-          const partialItemId = itemId ?? context.activePartialInputItemId ?? `partial:${randomUUID16()}`;
+          const partialItemId = itemId ?? context.activePartialInputItemId ?? `partial:${randomUUID15()}`;
           context.activePartialInputItemId = partialItemId;
           context.partialInputTranscripts.set(partialItemId, text);
           this.options.host.setTranscript?.(context.epoch, text);
@@ -50118,7 +50378,7 @@ var LiveSessionCoordinator = class {
         if (this.isCurrentSocket(context, generation)) {
           context.speechInProgress = false;
           context.inputCommitPending = false;
-          const completedItemId = itemId ?? context.activePartialInputItemId ?? `unattributed:${randomUUID16()}`;
+          const completedItemId = itemId ?? context.activePartialInputItemId ?? `unattributed:${randomUUID15()}`;
           context.partialInputTranscripts.delete(completedItemId);
           if (context.activePartialInputItemId === completedItemId) {
             context.activePartialInputItemId = void 0;
@@ -50850,7 +51110,7 @@ var LiveSessionCoordinator = class {
     const runtime = context.runtime;
     if (!runtime) throw new Error("Conversation workspace is unavailable.");
     const bridge = runtime.bridge;
-    const promptId = randomUUID16();
+    const promptId = randomUUID15();
     const lastEventId = bridge.getSessionLastEventId(locator.sessionId);
     const turnAbort = new AbortController();
     this.inFlightTurnAborts.add(turnAbort);
@@ -51167,7 +51427,7 @@ var LiveSessionCoordinator = class {
 
 // packages/cli/src/serve/live/live-task-service.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID17 } from "node:crypto";
+import { randomUUID as randomUUID16 } from "node:crypto";
 var DEFAULT_LIST_LIMIT = 20;
 var DEFAULT_READ_TURN_LIMIT = 3;
 var DEFAULT_WAIT_TIMEOUT_MS = 12e4;
@@ -51853,7 +52113,7 @@ var LiveTaskService = class {
     const record = target;
     if (record["type"] === "projectless") {
       const created = await this.getStandaloneSessionService().createWithInitialPrompt(
-        { sessionId: randomUUID17() },
+        { sessionId: randomUUID16() },
         prompt
       );
       return {
@@ -51905,7 +52165,7 @@ var LiveTaskService = class {
       { sessionId, prompt: [{ type: "text", text: prompt }] },
       void 0,
       {
-        promptId: randomUUID17(),
+        promptId: randomUUID16(),
         onPromptAdmitted: /* @__PURE__ */ __name(() => {
           admitted = true;
           onAdmitted?.();
@@ -52178,7 +52438,7 @@ var ConversationRuntimeManager = class {
   }
   async ensureOnce() {
     this.assertNotTerminal();
-    await this.options.ownership.acquire();
+    if (!this.runtime) await this.options.checkLegacyOwner();
     this.assertNotTerminal();
     const root = await this.revalidateRoot();
     this.assertNotTerminal();
@@ -52269,6 +52529,226 @@ var ConversationRuntimeManager = class {
   }
 };
 
+// packages/cli/src/serve/conversations/conversation-runtime-ownership.ts
+init_esbuild_shims();
+import { constants as fsConstants3 } from "node:fs";
+import * as fs9 from "node:fs/promises";
+import * as path17 from "node:path";
+var OWNER_DIRECTORY = "conversations";
+var OWNER_FILE = "runtime-owner.json";
+var OWNER_LOCK = ".runtime-owner.lock";
+var MAX_OWNER_BYTES = 4 * 1024;
+var NONCE_PATTERN = /^[A-Za-z0-9_-]{16,256}$/;
+var DEFAULT_HANDOFF_GRACE_MS = 1e3;
+var UnsafeOwnershipStateError = class extends Error {
+  static {
+    __name(this, "UnsafeOwnershipStateError");
+  }
+};
+function getConversationRuntimeOwnerPath(stableBaseDir) {
+  return path17.join(stableBaseDir, OWNER_DIRECTORY, OWNER_FILE);
+}
+__name(getConversationRuntimeOwnerPath, "getConversationRuntimeOwnerPath");
+function processIsAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error2) {
+    return error2.code !== "ESRCH";
+  }
+}
+__name(processIsAlive, "processIsAlive");
+function delay2(milliseconds) {
+  return new Promise((resolve7) => {
+    setTimeout(resolve7, milliseconds);
+  });
+}
+__name(delay2, "delay");
+function isMissing2(error2) {
+  return error2.code === "ENOENT";
+}
+__name(isMissing2, "isMissing");
+function assertOwnerRecord(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    throw new UnsafeOwnershipStateError();
+  }
+  const keys = Object.keys(value).sort();
+  if (keys.length !== 3 || keys[0] !== "instanceNonce" || keys[1] !== "pid" || keys[2] !== "version") {
+    throw new UnsafeOwnershipStateError();
+  }
+  const record = value;
+  if (record["version"] !== 1 || !Number.isSafeInteger(record["pid"]) || record["pid"] <= 0 || typeof record["instanceNonce"] !== "string" || !NONCE_PATTERN.test(record["instanceNonce"])) {
+    throw new UnsafeOwnershipStateError();
+  }
+  return {
+    version: 1,
+    pid: record["pid"],
+    instanceNonce: record["instanceNonce"]
+  };
+}
+__name(assertOwnerRecord, "assertOwnerRecord");
+function sameRecord(left, right) {
+  return left.version === right.version && left.pid === right.pid && left.instanceNonce === right.instanceNonce;
+}
+__name(sameRecord, "sameRecord");
+async function inspectDirectory(directory, requirePrivateMode) {
+  const stat3 = await fs9.lstat(directory);
+  if (!stat3.isDirectory() || stat3.isSymbolicLink()) {
+    throw new UnsafeOwnershipStateError();
+  }
+  if (process.platform !== "win32" && (typeof process.getuid === "function" && stat3.uid !== process.getuid() || requirePrivateMode && (stat3.mode & 511) !== 448)) {
+    throw new UnsafeOwnershipStateError();
+  }
+  return { dev: stat3.dev, ino: stat3.ino };
+}
+__name(inspectDirectory, "inspectDirectory");
+async function assertDirectoryIdentity(directory, expected, requirePrivateMode = true) {
+  const current = await inspectDirectory(directory, requirePrivateMode);
+  if (current.dev !== expected.dev || current.ino !== expected.ino) {
+    throw new UnsafeOwnershipStateError();
+  }
+}
+__name(assertDirectoryIdentity, "assertDirectoryIdentity");
+async function assertLockShapeIfPresent(lockPath) {
+  let stat3;
+  try {
+    stat3 = await fs9.lstat(lockPath);
+  } catch (error2) {
+    if (isMissing2(error2)) return;
+    throw error2;
+  }
+  if (!stat3.isDirectory() || stat3.isSymbolicLink() || process.platform !== "win32" && typeof process.getuid === "function" && stat3.uid !== process.getuid()) {
+    throw new UnsafeOwnershipStateError();
+  }
+}
+__name(assertLockShapeIfPresent, "assertLockShapeIfPresent");
+async function readOwnerRecord(ownerPath) {
+  let pathStat;
+  try {
+    pathStat = await fs9.lstat(ownerPath);
+  } catch (error2) {
+    if (isMissing2(error2)) return void 0;
+    throw error2;
+  }
+  if (!pathStat.isFile() || pathStat.isSymbolicLink() || pathStat.nlink !== 1 || pathStat.size <= 0 || pathStat.size > MAX_OWNER_BYTES || process.platform !== "win32" && ((pathStat.mode & 511) !== 384 || typeof process.getuid === "function" && pathStat.uid !== process.getuid())) {
+    throw new UnsafeOwnershipStateError();
+  }
+  let handle;
+  try {
+    handle = await fs9.open(
+      ownerPath,
+      process.platform === "win32" ? fsConstants3.O_RDONLY : fsConstants3.O_RDONLY | fsConstants3.O_NOFOLLOW
+    );
+  } catch (error2) {
+    if (error2.code === "ELOOP") {
+      throw new UnsafeOwnershipStateError(void 0, { cause: error2 });
+    }
+    throw error2;
+  }
+  try {
+    const handleStat = await handle.stat();
+    if (!handleStat.isFile() || handleStat.nlink !== 1 || handleStat.dev !== pathStat.dev || handleStat.ino !== pathStat.ino || handleStat.size !== pathStat.size || process.platform !== "win32" && ((handleStat.mode & 511) !== 384 || typeof process.getuid === "function" && handleStat.uid !== process.getuid())) {
+      throw new UnsafeOwnershipStateError();
+    }
+    const serialized = await handle.readFile("utf8");
+    let parsed;
+    try {
+      parsed = JSON.parse(serialized);
+    } catch (error2) {
+      throw new UnsafeOwnershipStateError(void 0, { cause: error2 });
+    }
+    return assertOwnerRecord(parsed);
+  } finally {
+    await handle.close();
+  }
+}
+__name(readOwnerRecord, "readOwnerRecord");
+async function syncDirectory(directory) {
+  if (process.platform === "win32") return;
+  const handle = await fs9.open(directory, fsConstants3.O_RDONLY);
+  try {
+    await handle.sync();
+  } finally {
+    await handle.close();
+  }
+}
+__name(syncDirectory, "syncDirectory");
+async function checkLegacyConversationRuntimeOwner(options) {
+  const ownerPath = getConversationRuntimeOwnerPath(options.stableBaseDir);
+  const directory = path17.dirname(ownerPath);
+  const lockPath = path17.join(directory, OWNER_LOCK);
+  let reclaimed = false;
+  try {
+    let base;
+    let identity;
+    try {
+      base = await inspectDirectory(options.stableBaseDir, false);
+      identity = await inspectDirectory(directory, true);
+    } catch (error2) {
+      if (isMissing2(error2)) return;
+      throw error2;
+    }
+    await assertLockShapeIfPresent(lockPath);
+    const lockfile = (await import("./proper-lockfile-3LHWIM44.js")).default;
+    let compromised = false;
+    const release = await lockfile.lock(directory, {
+      realpath: false,
+      lockfilePath: lockPath,
+      stale: 5e3,
+      update: 1e3,
+      retries: { retries: 40, minTimeout: 10, maxTimeout: 50 },
+      ...options.lockOptions,
+      onCompromised: /* @__PURE__ */ __name(() => {
+        compromised = true;
+      }, "onCompromised")
+    });
+    let operationError;
+    try {
+      await assertLockShapeIfPresent(lockPath);
+      await assertDirectoryIdentity(options.stableBaseDir, base, false);
+      await assertDirectoryIdentity(directory, identity);
+      const existing = await readOwnerRecord(ownerPath);
+      if (compromised) throw new UnsafeOwnershipStateError();
+      if (existing) {
+        if ((options.isProcessAlive ?? processIsAlive)(existing.pid)) {
+          throw conversationRuntimeInUseError();
+        }
+        const confirmed = await readOwnerRecord(ownerPath);
+        if (!confirmed || !sameRecord(existing, confirmed)) {
+          throw new UnsafeOwnershipStateError();
+        }
+        await assertDirectoryIdentity(options.stableBaseDir, base, false);
+        await assertDirectoryIdentity(directory, identity);
+        if (compromised) throw new UnsafeOwnershipStateError();
+        await fs9.unlink(ownerPath);
+        await syncDirectory(directory);
+        reclaimed = true;
+      }
+    } catch (error2) {
+      operationError = error2;
+    }
+    try {
+      await release();
+    } catch (error2) {
+      throw new UnsafeOwnershipStateError(void 0, { cause: error2 });
+    }
+    if (compromised) throw new UnsafeOwnershipStateError();
+    if (operationError) throw operationError;
+    if (reclaimed) {
+      await (options.wait ?? delay2)(
+        options.handoffGraceMs ?? DEFAULT_HANDOFF_GRACE_MS
+      );
+    }
+  } catch (error2) {
+    if (error2 instanceof ConversationRuntimeOwnershipError) throw error2;
+    if (error2 instanceof UnsafeOwnershipStateError || error2.code === "ECOMPROMISED") {
+      throw conversationRuntimeOwnershipCompromisedError(error2);
+    }
+    throw conversationRuntimeUnavailableError(error2);
+  }
+}
+__name(checkLegacyConversationRuntimeOwner, "checkLegacyConversationRuntimeOwner");
+
 // packages/cli/src/serve/server.ts
 var warnedDefaultTrust = false;
 function loadServeChannelWebhookConfigs(sources) {
@@ -52809,22 +53289,9 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
       }
     }, "getProviderReadiness")
   });
-  const conversationRuntimeOwnership = deps.liveConversationWorkspace ? deps.conversationRuntimeOwnershipFactory?.(
-    process.pid,
-    liveCoordinator.daemonInstanceNonce,
-    path18.resolve(
-      deps.liveDiscoveryStableBaseDir ?? getStableLiveDiscoveryBaseDir()
-    )
-  ) ?? createConversationRuntimeOwnership({
-    pid: process.pid,
-    instanceNonce: liveCoordinator.daemonInstanceNonce,
-    stableBaseDir: path18.resolve(
-      deps.liveDiscoveryStableBaseDir ?? getStableLiveDiscoveryBaseDir()
-    )
-  }) : void 0;
-  if (conversationRuntimeOwnership) {
-    serveAppLifecycle.setOwnership(conversationRuntimeOwnership);
-  }
+  const stableLiveDiscoveryBaseDir = path18.resolve(
+    deps.liveDiscoveryStableBaseDir ?? getStableLiveDiscoveryBaseDir()
+  );
   liveCoordinator.setAppshotReadiness(
     liveVoiceEnabled && deps.liveConversationWorkspace ? {
       state: "checking",
@@ -52836,7 +53303,9 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
   );
   let standaloneSessionService;
   const conversationRuntimeManager = deps.liveConversationWorkspace ? new ConversationRuntimeManager({
-    ownership: conversationRuntimeOwnership,
+    checkLegacyOwner: deps.checkLegacyConversationOwner ?? (() => checkLegacyConversationRuntimeOwner({
+      stableBaseDir: stableLiveDiscoveryBaseDir
+    })),
     workspace: deps.liveConversationWorkspace,
     registry: workspaceRegistry,
     publishRuntime: /* @__PURE__ */ __name(async (canonicalRoot, validate) => {
@@ -53120,6 +53589,14 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     interruptTaskWaits: /* @__PURE__ */ __name((callerSessionId) => liveTaskService.interruptWait(callerSessionId), "interruptTaskWaits")
   });
   liveCoordinator.setHandlers({
+    beforeStart: /* @__PURE__ */ __name(async () => {
+      await ensureConversationRuntimeWithLifecycle();
+      await publishLiveVoiceEnabled(true);
+      await assertLiveDiscoveryPublisher(stableLiveDiscoveryBaseDir, {
+        pid: process.pid,
+        instanceNonce: liveCoordinator.daemonInstanceNonce
+      });
+    }, "beforeStart"),
     onHostReady: /* @__PURE__ */ __name(() => {
       if (!liveVoiceEnabled) return;
       void verifyLiveAppshotChannel();
@@ -53413,10 +53890,6 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
   if (liveVoiceSurfaceAvailable) {
     registerLiveRoutes(app, {
       coordinator: liveCoordinator,
-      ensureRuntimeReady: /* @__PURE__ */ __name(async () => {
-        await ensureConversationRuntimeWithLifecycle();
-        await publishLiveVoiceEnabled(true);
-      }, "ensureRuntimeReady"),
       mutate,
       ...deps.persistSetting ? {
         persistShortcut: /* @__PURE__ */ __name(async (shortcut) => {