@qwen-code/qwen-code 0.20.1-preview.7215 → 0.20.2-gdpval-vl-agent.0

package/chunks/{server-YPUPFV2O.js → server-DZ5ZSVRE.js}

@@ -14,15 +14,16 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-TTSKHF43.js";
+} from "./chunk-BK6UOUJ2.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-GKY2OJ7R.js";
+} from "./chunk-ZHERRXZJ.js";
 import {
   SetupGithubError,
   collectSessionData,
+  createTranscriptMessageUpdate,
   generateExportFilename,
   normalizeSessionData,
   setupGithub,
@@ -30,25 +31,21 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-FVS747N7.js";
+} from "./chunk-C54UTDOC.js";
 import {
   OBSERVED_CONTACT_MAX_FRESH_WITHIN_SECONDS,
   ObservedChannelContactStore
-} from "./chunk-KTUQMDEP.js";
+} from "./chunk-4K7VDKAD.js";
+import "./chunk-V4AKJQ26.js";
 import "./chunk-RS7MT2QG.js";
-import "./chunk-CVDW42JT.js";
 import "./chunk-H2XVO6NE.js";
-import "./chunk-QTERJVPZ.js";
 import "./chunk-QHTIBUWB.js";
-import "./chunk-L573Z2QZ.js";
-import {
-  createTotalSessionAdmissionController
-} from "./chunk-R3VWUU2E.js";
+import "./chunk-QTERJVPZ.js";
+import "./chunk-3Z43GZUQ.js";
 import {
   createSingleWorkspaceRegistry,
   createWorkspaceSessionOwnerIndex
-} from "./chunk-W7H223ZZ.js";
-import "./chunk-GRC5HGPI.js";
+} from "./chunk-UGYMA4EI.js";
 import {
   CAPABILITIES_SCHEMA_VERSION,
   CLIENT_ID_HEADER,
@@ -73,6 +70,7 @@ import {
   createBridgeFileSystemAdapter,
   createBuildWorkspaceCtx,
   createClientMcpServerProvider,
+  createManagedScratchDirectory,
   createMutationGate,
   createRateLimiter,
   denyBrowserOriginCors,
@@ -84,6 +82,7 @@ import {
   installAccessLogMiddleware,
   isBrowserAutomationMcpAvailable,
   isDeepHealthQuery,
+  isScratchRootCompatible,
   parseAllowOriginPatterns,
   parseAndValidateWorkspaceClientId,
   parseClientIdHeader,
@@ -104,42 +103,29 @@ import {
   setRateLimiter,
   unsafeRevealSecret,
   validateMcpRuntimeServerName
-} from "./chunk-7YBZGNEC.js";
+} from "./chunk-5G3ZVADU.js";
 import {
   isLoopbackBind
 } from "./chunk-RXFQM6FQ.js";
 import {
   createDaemonStatusProvider
-} from "./chunk-T7DDD7CZ.js";
+} from "./chunk-NAXEEGJU.js";
 import "./chunk-LXXMOYPL.js";
-import "./chunk-7KDI2IB2.js";
+import "./chunk-HDATOR4J.js";
 import "./chunk-E5Z2AVNV.js";
-import {
-  SessionArtifactAuthorizationError,
-  SessionArtifactValidationError,
-  createAcpSessionBridge,
-  parseSessionSource
-} from "./chunk-EVSTCA7S.js";
-import {
-  EVENT_SCHEMA_VERSION,
-  SubscriberLimitExceededError
-} from "./chunk-6RLROE6G.js";
-import "./chunk-COH43MRJ.js";
-import "./chunk-QR6U5QPP.js";
-import "./chunk-6GUTHAN7.js";
 import {
   createWorkspaceProvidersStatusProvider
-} from "./chunk-WKRXIHD6.js";
+} from "./chunk-COAARUPK.js";
 import {
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-TCKTNY66.js";
+} from "./chunk-M4VFMLQK.js";
 import {
   snapshotProcessEnv
-} from "./chunk-AR27OPIU.js";
+} from "./chunk-ZKFJKN23.js";
 import {
   createWorkspaceSkillsStatusProvider
-} from "./chunk-5NWV4NFB.js";
+} from "./chunk-PRAUGUNM.js";
 import "./chunk-2W3OOD4W.js";
 import {
   EMPTY_WORKSPACE_VOICE_UPDATE_ERROR,
@@ -154,14 +140,14 @@ import {
   validateWorkspaceSkillName,
   validateWorkspaceVoiceState,
   voiceSettingsScopeToWire
-} from "./chunk-Y4CRUWFZ.js";
+} from "./chunk-VTXX72XS.js";
 import {
   PermissionRulesValidationError,
   buildPermissionSettings,
   isPermissionRuleType,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-WAX3ITOA.js";
+} from "./chunk-A3TAEAHX.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isStreamingVoiceModel,
@@ -169,13 +155,36 @@ import {
   resolveVoiceTranscriptionConfig,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-B453NMZJ.js";
+} from "./chunk-M3EQ3GZC.js";
 import {
   isVoiceEnabled,
   isVoiceMode,
   readVoiceModel
-} from "./chunk-IB35C3IL.js";
-import "./chunk-BVLROR2T.js";
+} from "./chunk-AVQ6EX4J.js";
+import "./chunk-QLJUC7TG.js";
+import {
+  WorkspacePermissionRulesSessionRequiredError,
+  WorkspaceSettingsPartialPersistError,
+  WorkspaceSkillNotFoundError,
+  WorkspaceSkillNotToggleableError
+} from "./chunk-OA4JVLSA.js";
+import {
+  createTotalSessionAdmissionController
+} from "./chunk-VYPFXUCB.js";
+import "./chunk-GRC5HGPI.js";
+import {
+  SessionArtifactAuthorizationError,
+  SessionArtifactValidationError,
+  createAcpSessionBridge,
+  parseSessionSource
+} from "./chunk-RMY5SX7S.js";
+import {
+  EVENT_SCHEMA_VERSION,
+  EventBus,
+  SubscriberLimitExceededError
+} from "./chunk-6RLROE6G.js";
+import "./chunk-COH43MRJ.js";
+import "./chunk-QR6U5QPP.js";
 import {
   BranchWhilePromptActiveError,
   CancelSentinelCollisionError,
@@ -189,6 +198,7 @@ import {
   McpServerRestartFailedError,
   PermissionForbiddenError,
   PermissionPolicyNotImplementedError,
+  PromptDeadlineExceededError,
   PromptQueueFullError,
   RestoreInProgressError,
   SessionArchivedError,
@@ -207,42 +217,39 @@ import {
   WorkspaceInitRaceError,
   WorkspaceInitSymlinkError,
   WorkspaceMismatchError
-} from "./chunk-X6YQWCIJ.js";
-import {
-  STATUS_SCHEMA_VERSION,
-  createIdleWorkspaceMemoryStatus,
-  mapDomainErrorToErrorKind
-} from "./chunk-WXAXH7IJ.js";
-import {
-  WorkspacePermissionRulesSessionRequiredError,
-  WorkspaceSettingsPartialPersistError,
-  WorkspaceSkillNotFoundError,
-  WorkspaceSkillNotToggleableError
-} from "./chunk-OA4JVLSA.js";
+} from "./chunk-UH3WSE5L.js";
 import "./chunk-WBL3FJEU.js";
-import "./chunk-T2NCM2ET.js";
 import {
   daemonObservedContactsPath,
   loadChannelsConfig
-} from "./chunk-KXEGCGUG.js";
-import "./chunk-JVTCARQ6.js";
+} from "./chunk-Q22WWVR6.js";
+import "./chunk-FQI7LT7T.js";
 import "./chunk-57OAHC2Y.js";
 import {
   parseChannelWebhookConfigLenient
-} from "./chunk-OMH3276Y.js";
-import "./chunk-4ODB7WIB.js";
+} from "./chunk-GHRSKGHF.js";
+import "./chunk-6ZBPS62S.js";
 import "./chunk-V6WHFGST.js";
+import "./chunk-6HOCJNO5.js";
+import {
+  STATUS_SCHEMA_VERSION,
+  createIdleWorkspaceMemoryStatus,
+  mapDomainErrorToErrorKind
+} from "./chunk-ESQHGKPJ.js";
 import {
   MAX_REGISTERED_WORKSPACES,
+  WorkspaceDisplayNameValidationError,
   WorkspaceRegistrationStoreCommittedError,
   WorkspaceRegistrationStoreLimitError,
+  normalizeWorkspaceDisplayName,
   workspaceRegistrationId
-} from "./chunk-SDXIH6OA.js";
+} from "./chunk-IFUNDCQ6.js";
 import {
   MAX_WORKSPACE_PATH_LENGTH,
   canonicalizeWorkspace,
-  canonicalizeWorkspaces
-} from "./chunk-W7FJ3N32.js";
+  canonicalizeWorkspaces,
+  translateAndCheckAbsoluteWorkspacePath
+} from "./chunk-2RFKHEXL.js";
 import {
   MAX_CHANNEL_STARTUP_FAILURES,
   MAX_CHANNEL_STARTUP_FAILURE_CHANNEL_LENGTH,
@@ -251,7 +258,7 @@ import {
   QWEN_SERVER_TOKEN_ENV,
   isChannelWebhookEnqueueError,
   normalizeWorkerDiagnostic
-} from "./chunk-Y2ENGUD6.js";
+} from "./chunk-QKTHJXCS.js";
 import {
   normalizeServeChannelSelection
 } from "./chunk-TJTKSVIV.js";
@@ -259,9 +266,10 @@ import {
   redactLogCredentials
 } from "./chunk-M5GB774H.js";
 import "./chunk-5HBA2Z7V.js";
+import "./chunk-T2NCM2ET.js";
 import {
   sanitizeLogText
-} from "./chunk-NIJEXGV6.js";
+} from "./chunk-RVLZCXEE.js";
 import "./chunk-UDXSXLER.js";
 import {
   getDialogSettingKeys,
@@ -272,20 +280,23 @@ import {
   getWritableScopes,
   loadSettings,
   validateSettingValue
-} from "./chunk-KPZNOZPC.js";
+} from "./chunk-GWM4PDYK.js";
 import "./chunk-RKUWKYED.js";
+import {
+  SUPPORTED_LANGUAGES,
+  detectSystemLanguage,
+  resolveLanguageSetting,
+  resolveSupportedLanguage
+} from "./chunk-YLSB23Y2.js";
+import "./chunk-YNWJAOPL.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
-import {
-  SUPPORTED_LANGUAGES
-} from "./chunk-2DXOIVUI.js";
-import "./chunk-OF2BBLYQ.js";
 import "./chunk-QRUIS3DN.js";
-import "./chunk-IUSNI6IX.js";
+import "./chunk-ISMD2AB3.js";
 import "./chunk-VJNBRRZG.js";
 import {
   getWorkspaceTrustStatus
-} from "./chunk-MC2DOZS7.js";
+} from "./chunk-PVT6E3ZI.js";
 import "./chunk-ALGGS7UH.js";
 import {
   isWithinRoot as isWithinRoot2
@@ -299,15 +310,19 @@ import {
   BuiltinAgentRegistry,
   Client,
   ClientMcpRegistrar,
+  DEFAULT_LOG_LIMIT,
   ExtensionManager,
   GROUP_COLOR_OPTIONS,
+  GitWorktreeService,
   IMAGE_CAPABILITY,
   InvalidSessionTranscriptCursorError,
+  MAX_LOG_LIMIT,
   ModelsConfig,
   RUNTIME_MCP_IF_ABSENT_CONFIG_FLAG,
   SESSION_TRANSCRIPT_MAX_INDEX_BYTES,
   SESSION_TRANSCRIPT_MAX_LIMIT,
   SESSION_TRANSCRIPT_MAX_PAGE_BYTES,
+  SESSION_WRITER_RPC_CODES,
   SessionOrganizationError,
   SessionOrganizationService,
   SessionService,
@@ -316,6 +331,7 @@ import {
   SessionTranscriptReader,
   SessionTranscriptSnapshotUnavailableError,
   SessionTranscriptTooLargeError,
+  SessionWriterError,
   StandardFileSystemService,
   StdioClientTransport,
   StreamableHTTPClientTransport,
@@ -326,13 +342,18 @@ import {
   buildUsageDashboard,
   detectLineEnding,
   encodeTextFileContent,
+  fetchGitCommitDetail,
   fetchGitDiff,
   fetchGitDiffHunksForFile,
+  fetchGitLog,
   getGitWorkingTreeStatus,
+  getSubagentSessionDir,
   glob,
   loadIgnoreRules,
   loadUsageHistoryWithLive,
   parseInstallSource,
+  readAgentMeta,
+  readWorktreeSession,
   redactUrlCredentials,
   resolveBranchName,
   resolveProviderProtocol,
@@ -340,16 +361,22 @@ import {
   stripAnsiAndControl,
   stripTerminalControlSequences,
   watchRepoBranch,
-  writeWorkspaceContextFile
-} from "./chunk-6OH6A5EX.js";
-import "./chunk-5M6IDOMF.js";
+  writeWorkspaceContextFile,
+  writeWorktreeSession,
+  writeWorktreeSessionMarker
+} from "./chunk-BLAEKN6K.js";
 import "./chunk-T4TZQJ7W.js";
 import "./chunk-H6XPXXMH.js";
-import "./chunk-OONJNQ42.js";
+import "./chunk-5M6IDOMF.js";
+import "./chunk-T2L47JJK.js";
+import "./chunk-GPSKDNEE.js";
+import "./chunk-X6N25LXS.js";
+import "./chunk-E2UVIFI2.js";
+import "./chunk-L5F3T6TQ.js";
 import {
   MAX_JOBS,
   nextDurableFireMs
-} from "./chunk-JDI67JFB.js";
+} from "./chunk-Q2YKNMLS.js";
 import {
   nextFireTime,
   parseCron
@@ -362,24 +389,22 @@ import {
   readCronTasks,
   taskHasLegacyCondition,
   updateCronTasks
-} from "./chunk-EIAK6Q2B.js";
-import "./chunk-FSL5W5TI.js";
-import "./chunk-D2VIDMVM.js";
-import "./chunk-E2UVIFI2.js";
-import "./chunk-WBTZGWQ6.js";
+} from "./chunk-KHOVYUHX.js";
 import "./chunk-SZRN75WQ.js";
-import "./chunk-HTO4JFDZ.js";
+import "./chunk-6PVPNMXU.js";
 import "./chunk-CPBF7KYF.js";
+import "./chunk-NABLFI57.js";
+import "./chunk-QBUDF33N.js";
+import "./chunk-LIZRAKPB.js";
 import {
   APPROVAL_MODES,
   SubagentError,
   SubagentErrorCode
-} from "./chunk-ETD6K42I.js";
+} from "./chunk-WHGVTP7Q.js";
 import "./chunk-6AM5D4ME.js";
-import "./chunk-G45X5TRN.js";
-import "./chunk-PBATSWUQ.js";
-import "./chunk-ZEOZL37W.js";
-import "./chunk-OOCI5VVU.js";
+import "./chunk-JCW2R7WC.js";
+import "./chunk-57FIIFJN.js";
+import "./chunk-HTO4JFDZ.js";
 import {
   QwenOAuth2Client,
   QwenOAuthPollError,
@@ -388,10 +413,15 @@ import {
   isDeviceAuthorizationSuccess,
   isDeviceTokenPending,
   isDeviceTokenSuccess
-} from "./chunk-UQES76OO.js";
-import "./chunk-OKWRU4NO.js";
-import "./chunk-XNP57UDV.js";
+} from "./chunk-2HGTVAOW.js";
 import "./chunk-JESCGQM3.js";
+import "./chunk-RC7A7SSL.js";
+import "./chunk-C3EXYVFX.js";
+import "./chunk-XVNQMZ2I.js";
+import "./chunk-CR3C7WXL.js";
+import "./chunk-FODK6UMO.js";
+import "./chunk-GLNBDYUX.js";
+import "./chunk-DJ2GSRLV.js";
 import {
   addDaemonRequestAttribute,
   decodeBufferWithEncodingInfo,
@@ -400,43 +430,42 @@ import {
   hashDaemonWorkspace,
   isBinaryFile,
   isWithinRoot,
+  parseLineTolerant,
+  read,
   recordDaemonBridgeError,
   recordDaemonError,
   recordDaemonHttpRequest,
   recordDaemonHttpResponse,
   withDaemonRequestSpan
-} from "./chunk-ONWW74X6.js";
-import "./chunk-4WKAA4KS.js";
-import "./chunk-CR3C7WXL.js";
+} from "./chunk-U6TQGUNB.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-JD3MKVKL.js";
-import "./chunk-UEY4AYUL.js";
-import "./chunk-BDBMYST4.js";
-import "./chunk-467G3SV5.js";
-import "./chunk-S35ZDXOS.js";
-import "./chunk-XVNQMZ2I.js";
-import "./chunk-FODK6UMO.js";
-import "./chunk-GLNBDYUX.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-6EFTQYW7.js";
-import "./chunk-MAQQGNQ5.js";
+import "./chunk-4K56OJFJ.js";
+import "./chunk-CBOQ3HY7.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
+import "./chunk-QNLNLENL.js";
+import "./chunk-6X4GWOPW.js";
 import "./chunk-TYQMGACW.js";
 import {
   import_websocket_server
 } from "./chunk-TYAMGABM.js";
 import "./chunk-FCMNKVXT.js";
+import "./chunk-RCUEYZDE.js";
+import "./chunk-HTR4WV6U.js";
+import "./chunk-BULDBTYC.js";
+import "./chunk-U7ZFW55U.js";
+import "./chunk-NPQDJGKU.js";
+import "./chunk-YM3SZTH4.js";
 import {
   FatalConfigError,
   Storage,
   createDebugLogger,
   runWithoutDebugLogSession
-} from "./chunk-C27BYUX6.js";
+} from "./chunk-OQB4EXO4.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
-import "./chunk-TB6UDU4T.js";
+import "./chunk-THJNPLI4.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -455,7 +484,6 @@ import { createHash as createHash3, timingSafeEqual } from "node:crypto";
 
 // packages/cli/src/serve/acp-http/dispatch.ts
 init_esbuild_shims();
-import path9 from "node:path";
 
 // packages/cli/src/serve/fs/errors.ts
 init_esbuild_shims();
@@ -629,9 +657,9 @@ async function findExistingAncestor(absolute) {
   let current = absolute;
   const tailParts = [];
   for (let i = 0; i < MAX_ANCESTOR_HOPS; i++) {
-    let stat2 = null;
+    let stat3 = null;
     try {
-      stat2 = await fsp.stat(current);
+      stat3 = await fsp.stat(current);
     } catch (err) {
       const code = err?.code;
       if (code === "ENOENT" || code === "ENOTDIR") {
@@ -639,8 +667,8 @@ async function findExistingAncestor(absolute) {
         throw err;
       }
     }
-    if (stat2) {
-      if (tailParts.length > 0 && !stat2.isDirectory()) {
+    if (stat3) {
+      if (tailParts.length > 0 && !stat3.isDirectory()) {
         throw new FsError(
           "parse_error",
           `path component is not a directory: ${absolute}`,
@@ -713,7 +741,7 @@ async function resolveWithinWorkspace(input, boundWorkspaces, intent) {
             boundCanonicals
           );
           if (boundCanonical !== void 0) {
-            const finalPathIsSymlink = await fsp.lstat(absolute).then((stat2) => stat2.isSymbolicLink()).catch((lstatErr) => {
+            const finalPathIsSymlink = await fsp.lstat(absolute).then((stat3) => stat3.isSymbolicLink()).catch((lstatErr) => {
               if (lstatErr.code === "ENOENT" || lstatErr.code === "ENOTDIR") {
                 return false;
               }
@@ -1204,8 +1232,8 @@ var WorkspaceFileSystemImpl = class {
         const toRead = Math.min(maxBytes, available);
         buf = Buffer.allocUnsafe(toRead);
         if (toRead > 0) {
-          const read = await fh.read(buf, 0, toRead, offset);
-          buf = read.bytesRead === toRead ? buf : buf.subarray(0, read.bytesRead);
+          const read2 = await fh.read(buf, 0, toRead, offset);
+          buf = read2.bytesRead === toRead ? buf : buf.subarray(0, read2.bytesRead);
         }
         const afterRead = await fh.stat();
         assertSameFile(st, afterRead, p, "read");
@@ -1746,17 +1774,17 @@ var WorkspaceFileSystemImpl = class {
    *     for their `sendFsError` serializer.
    */
   recordAndWrap(err, intent, input) {
-    const fs3 = wrapAsFsError(err);
+    const fs6 = wrapAsFsError(err);
     this.deps.audit.recordDenied(this.deps.ctx, {
       intent,
       input,
-      errorKind: fs3.kind,
-      hint: fs3.hint,
+      errorKind: fs6.kind,
+      hint: fs6.hint,
       // Quote the underlying OS / FsError message so audit
       // consumers debugging a production incident can see the
       // actual cause (errno text, byte counts, glob pattern,
       // etc.) rather than just `errorKind` + `hint`.
-      message: fs3.message,
+      message: fs6.message,
       // For glob denials (parse_error pattern rejection,
       // catastrophic walk failures) the input IS the pattern
       // already; surfacing it on the dedicated `pattern` field
@@ -1765,7 +1793,7 @@ var WorkspaceFileSystemImpl = class {
       // branching on intent.
       pattern: intent === "glob" ? input : void 0
     });
-    return fs3;
+    return fs6;
   }
 };
 var CONTENT_HASH_RE = /^sha256:[0-9a-f]{64}$/;
@@ -1873,9 +1901,9 @@ async function readStableRegularFileBuffer(p, pre) {
     const out = Buffer.alloc(opened.size);
     let offset = 0;
     while (offset < opened.size) {
-      const read = await fh.read(out, offset, opened.size - offset, offset);
-      if (read.bytesRead === 0) break;
-      offset += read.bytesRead;
+      const read2 = await fh.read(out, offset, opened.size - offset, offset);
+      if (read2.bytesRead === 0) break;
+      offset += read2.bytesRead;
     }
     const afterRead = await fh.stat();
     assertSameFile(opened, afterRead, p, "read");
@@ -2130,15 +2158,15 @@ async function hashRegularFileAtPath(p, pre) {
     const buf = Buffer.allocUnsafe(64 * 1024);
     let offset = 0;
     while (offset < opened.size) {
-      const read = await fh.read(
+      const read2 = await fh.read(
         buf,
         0,
         Math.min(buf.length, opened.size - offset),
         offset
       );
-      if (read.bytesRead === 0) break;
-      hash.update(buf.subarray(0, read.bytesRead));
-      offset += read.bytesRead;
+      if (read2.bytesRead === 0) break;
+      hash.update(buf.subarray(0, read2.bytesRead));
+      offset += read2.bytesRead;
     }
   } finally {
     await fh.close();
@@ -2247,7 +2275,7 @@ async function renameWithRetryLocal(src, dest, retries, delayMs) {
       const retryable = code === "EPERM" || code === "EACCES";
       if (!retryable || attempt === retries) throw err;
       await new Promise(
-        (resolve5) => setTimeout(resolve5, delayMs * 2 ** attempt)
+        (resolve6) => setTimeout(resolve6, delayMs * 2 ** attempt)
       );
     }
   }
@@ -2502,12 +2530,12 @@ __name(applyReadHeaders, "applyReadHeaders");
 function sendFsError(res, err, route) {
   applyReadHeaders(res);
   if (isFsError(err)) {
-    const fs3 = err;
-    res.status(fs3.status).json({
-      errorKind: fs3.kind,
-      error: fs3.message,
-      hint: fs3.hint,
-      status: fs3.status
+    const fs6 = err;
+    res.status(fs6.status).json({
+      errorKind: fs6.kind,
+      error: fs6.message,
+      hint: fs6.hint,
+      status: fs6.status
     });
     return;
   }
@@ -2609,13 +2637,13 @@ async function handleGetFile(req, res, deps) {
     });
     return;
   }
-  const fs3 = factory.forRequest({
+  const fs6 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "read");
-    const out = await fs3.readText(resolved, { maxBytes, line, limit });
+    const resolved = await fs6.resolve(queryPath, "read");
+    const out = await fs6.readText(resolved, { maxBytes, line, limit });
     const returnedBytes = Buffer.byteLength(out.content, "utf-8");
     applyReadHeaders(res);
     res.status(200).json({
@@ -2669,13 +2697,13 @@ async function handleGetFileBytes(req, res, deps) {
     });
     return;
   }
-  const fs3 = factory.forRequest({
+  const fs6 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "read");
-    const out = await fs3.readBytesWindow(resolved, {
+    const resolved = await fs6.resolve(queryPath, "read");
+    const out = await fs6.readBytesWindow(resolved, {
       offset: offset ?? 0,
       maxBytes: maxBytes ?? DEFAULT_FILE_BYTES_MAX_BYTES
     });
@@ -2703,13 +2731,13 @@ async function handleGetStat(req, res, deps) {
   if (clientId === null) return;
   const queryPath = requireStringQuery(res, req.query["path"], "path", ROUTE2);
   if (queryPath === null) return;
-  const fs3 = factory.forRequest({
+  const fs6 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "stat");
-    const st = await fs3.stat(resolved);
+    const resolved = await fs6.resolve(queryPath, "stat");
+    const st = await fs6.stat(resolved);
     applyReadHeaders(res);
     res.status(200).json({
       kind: "stat",
@@ -2732,13 +2760,13 @@ async function handleGetList(req, res, deps) {
   const queryPath = requireStringQuery(res, req.query["path"], "path", ROUTE2);
   if (queryPath === null) return;
   const includeIgnored = parseBoolFlag(req.query["includeIgnored"]);
-  const fs3 = factory.forRequest({
+  const fs6 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "list");
-    const entries = await fs3.list(resolved, {
+    const resolved = await fs6.resolve(queryPath, "list");
+    const entries = await fs6.list(resolved, {
       includeIgnored,
       maxEntries: MAX_LIST_ENTRIES + 1
     });
@@ -2791,15 +2819,15 @@ async function handleGetGlob(req, res, deps) {
   }
   const cwdRaw = req.query["cwd"];
   const cwdString = typeof cwdRaw === "string" && cwdRaw.length > 0 ? cwdRaw : void 0;
-  const fs3 = factory.forRequest({
+  const fs6 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   const start = performance.now();
   try {
-    const cwdResolved = cwdString ? await fs3.resolve(cwdString, "list") : void 0;
+    const cwdResolved = cwdString ? await fs6.resolve(cwdString, "list") : void 0;
     const cap = maxResults ?? DEFAULT_GLOB_MAX_RESULTS;
-    const probe = await fs3.glob(pattern, {
+    const probe = await fs6.glob(pattern, {
       cwd: cwdResolved,
       includeIgnored,
       maxResults: cap + 1
@@ -2861,7 +2889,7 @@ function registerWorkspaceFileReadRoutes(app, deps) {
 }
 __name(registerWorkspaceFileReadRoutes, "registerWorkspaceFileReadRoutes");
 function registerWorkspaceQualifiedFileReadRoutes(app, deps) {
-  const resolve5 = /* @__PURE__ */ __name((req, res) => {
+  const resolve6 = /* @__PURE__ */ __name((req, res) => {
     const runtime = resolveWorkspaceRuntimeFromParam(
       deps.workspaceRegistry,
       req,
@@ -2875,23 +2903,23 @@ function registerWorkspaceQualifiedFileReadRoutes(app, deps) {
     return true;
   }, "resolve");
   app.get("/workspaces/:workspace/file", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetFile(req, res, deps);
   });
   app.get("/workspaces/:workspace/file/bytes", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetFileBytes(req, res, deps);
   });
   app.get("/workspaces/:workspace/stat", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetStat(req, res, deps);
   });
   app.get("/workspaces/:workspace/list", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetList(req, res, deps);
   });
   app.get("/workspaces/:workspace/glob", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetGlob(req, res, deps);
   });
 }
@@ -2973,7 +3001,7 @@ function validateClientId(clientId, deps, res) {
 }
 __name(validateClientId, "validateClientId");
 function createSetupGithubFileOps(factory, route, originatorClientId) {
-  const fs3 = factory.forRequest({
+  const fs6 = factory.forRequest({
     route,
     ...originatorClientId ? { originatorClientId } : {}
   });
@@ -2996,14 +3024,14 @@ function createSetupGithubFileOps(factory, route, originatorClientId) {
       ]);
     },
     async writeTextFile(_gitRepoRoot, relativePath, content) {
-      const resolved = await fs3.resolve(relativePath, "write");
-      const out = await fs3.writeTextOverwrite(resolved, content);
+      const resolved = await fs6.resolve(relativePath, "write");
+      const out = await fs6.writeTextOverwrite(resolved, content);
       return { sizeBytes: out.sizeBytes };
     },
     async readTextFile(_gitRepoRoot, relativePath) {
       try {
-        const resolved = await fs3.resolve(relativePath, "read");
-        const out = await fs3.readText(resolved);
+        const resolved = await fs6.resolve(relativePath, "read");
+        const out = await fs6.readText(resolved);
         return out.content;
       } catch (error2) {
         if (isFsError(error2) && error2.kind === "path_not_found") {
@@ -3024,15 +3052,15 @@ async function ensureDirectoryWithoutSymlink(root, segments) {
     checkedSegments.push(segment);
     const label = `Workspace path "${checkedSegments.join("/")}"`;
     try {
-      const stat2 = await fsp3.lstat(current);
-      if (stat2.isSymbolicLink()) {
+      const stat3 = await fsp3.lstat(current);
+      if (stat3.isSymbolicLink()) {
         throw new SetupGithubError(
           "github_setup_invalid_workspace",
           `${label} must not be a symlink.`,
           400
         );
       }
-      if (!stat2.isDirectory()) {
+      if (!stat3.isDirectory()) {
         throw new SetupGithubError(
           "github_setup_invalid_workspace",
           `${label} must be a directory.`,
@@ -3069,15 +3097,15 @@ async function ensureDirectoryWithoutSymlink(root, segments) {
 }
 __name(ensureDirectoryWithoutSymlink, "ensureDirectoryWithoutSymlink");
 async function assertDirectoryWithoutSymlink(target, label) {
-  const stat2 = await fsp3.lstat(target);
-  if (stat2.isSymbolicLink()) {
+  const stat3 = await fsp3.lstat(target);
+  if (stat3.isSymbolicLink()) {
     throw new SetupGithubError(
       "github_setup_invalid_workspace",
       `${label} must not be a symlink.`,
       400
     );
   }
-  if (!stat2.isDirectory()) {
+  if (!stat3.isDirectory()) {
     throw new SetupGithubError(
       "github_setup_invalid_workspace",
       `${label} must be a directory.`,
@@ -4718,12 +4746,12 @@ async function collectWorkspaceMemoryStatus(boundWorkspace) {
   for (const filename of filenames) {
     const candidate = path8.join(globalDir, filename);
     try {
-      const stat2 = await fs.stat(candidate);
-      if (stat2.isFile()) {
+      const stat3 = await fs.stat(candidate);
+      if (stat3.isFile()) {
         files.push({
           absolutePath: candidate,
           scope: "global",
-          bytes: stat2.size
+          bytes: stat3.size
         });
       }
     } catch (err) {
@@ -4767,12 +4795,12 @@ async function walkWorkspaceForMemory(start, filenames, errors) {
   for (const filename of filenames) {
     const candidate = path8.join(start, filename);
     try {
-      const stat2 = await fs.stat(candidate);
-      if (stat2.isFile()) {
+      const stat3 = await fs.stat(candidate);
+      if (stat3.isFile()) {
         out.push({
           absolutePath: candidate,
           scope: "workspace",
-          bytes: stat2.size
+          bytes: stat3.size
         });
       }
     } catch (err) {
@@ -6563,6 +6591,43 @@ function errMsg(err) {
   return err instanceof Error ? err.message : String(err);
 }
 __name(errMsg, "errMsg");
+var SESSION_WRITER_RPC_ERRORS = {
+  session_writer_conflict: {
+    code: SESSION_WRITER_RPC_CODES.session_writer_conflict,
+    message: "This session is already open in another Qwen process."
+  },
+  session_writer_lost: {
+    code: SESSION_WRITER_RPC_CODES.session_writer_lost,
+    message: "Write ownership for this session was lost."
+  },
+  session_transcript_changed: {
+    code: SESSION_WRITER_RPC_CODES.session_transcript_changed,
+    message: "The session transcript changed outside its active writer."
+  },
+  session_writer_unavailable: {
+    code: SESSION_WRITER_RPC_CODES.session_writer_unavailable,
+    message: "Session write ownership could not be verified."
+  }
+};
+function sessionWriterRpcError(err) {
+  if (!err || typeof err !== "object") return void 0;
+  const candidate = err;
+  const data = isObject(candidate["data"]) ? candidate["data"] : void 0;
+  const errorKind = data?.["errorKind"] ?? candidate["errorKind"];
+  if (typeof errorKind !== "string" || !(errorKind in SESSION_WRITER_RPC_ERRORS)) {
+    return void 0;
+  }
+  const typedKind = errorKind;
+  const expected = SESSION_WRITER_RPC_ERRORS[typedKind];
+  const code = candidate["code"] ?? candidate["rpcCode"];
+  if (code !== expected.code) return void 0;
+  return {
+    code: expected.code,
+    message: expected.message,
+    data: { errorKind: typedKind }
+  };
+}
+__name(sessionWriterRpcError, "sessionWriterRpcError");
 var debugLogger2 = createDebugLogger("ACP_HTTP_DISPATCH");
 var SESSION_SHELL_METHOD = `${QWEN_METHOD_NS}session/shell`;
 var INVALID_PERMISSION_OUTCOME_ERROR = '`outcome` must be `{ outcome: "cancelled" }` or `{ outcome: "selected", optionId: string }`';
@@ -6695,10 +6760,11 @@ function parseOptionalWorkspaceCwd2(params, boundWorkspace) {
       `\`cwd\` exceeds the ${MAX_WORKSPACE_PATH_LENGTH}-character limit`
     );
   }
-  if (!path9.isAbsolute(cwd)) {
+  const sandboxCwd = translateAndCheckAbsoluteWorkspacePath(cwd);
+  if (sandboxCwd === null) {
     throw new AcpParamError("`cwd` must be an absolute path when provided");
   }
-  return cwd;
+  return sandboxCwd;
 }
 __name(parseOptionalWorkspaceCwd2, "parseOptionalWorkspaceCwd");
 function validatePrompt(params) {
@@ -6775,6 +6841,8 @@ function pickSessionArtifactInput(params) {
 }
 __name(pickSessionArtifactInput, "pickSessionArtifactInput");
 function toRpcError(err) {
+  const writerError = sessionWriterRpcError(err);
+  if (writerError) return writerError;
   if (err instanceof AcpParamError || err instanceof InvalidCursorError) {
     return { code: RPC.INVALID_PARAMS, message: err.message };
   }
@@ -7511,22 +7579,21 @@ var AcpDispatcher = class {
           conn.ownedSessions.delete(sessionId);
           conn.closingSessions.add(sessionId);
           let closeStarted = false;
-          const closeSession = /* @__PURE__ */ __name(async () => {
-            closeStarted = true;
+          const closeLocalSessionStream = /* @__PURE__ */ __name(() => {
             try {
-              await this.bridge.closeSession(
-                sessionId,
-                this.sessionCtx(conn, sessionId, loopback)
+              conn.closeSessionStream(sessionId);
+            } catch (teardownErr) {
+              writeStderrLine(
+                `qwen serve: /acp session/close local teardown failed (${logSafe(sessionId)}): ${logSafe(errMsg(teardownErr))}`
               );
-            } finally {
-              try {
-                conn.closeSessionStream(sessionId);
-              } catch (teardownErr) {
-                writeStderrLine(
-                  `qwen serve: /acp session/close local teardown failed (${logSafe(sessionId)}): ${logSafe(errMsg(teardownErr))}`
-                );
-              }
             }
+          }, "closeLocalSessionStream");
+          const closeSession = /* @__PURE__ */ __name(async () => {
+            closeStarted = true;
+            await this.bridge.closeSession(
+              sessionId,
+              this.sessionCtx(conn, sessionId, loopback)
+            );
           }, "closeSession");
           try {
             try {
@@ -7548,11 +7615,19 @@ var AcpDispatcher = class {
           } catch (err) {
             if (!closeStarted) {
               conn.ownedSessions.add(sessionId);
+            } else {
+              try {
+                this.bridge.getSessionSummary(sessionId);
+                conn.ownedSessions.add(sessionId);
+              } catch {
+                closeLocalSessionStream();
+              }
             }
             throw err;
           } finally {
             conn.closingSessions.delete(sessionId);
           }
+          closeLocalSessionStream();
           this.replyConn(conn, id, {});
           return;
         }
@@ -8977,7 +9052,7 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs6 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
@@ -9029,8 +9104,8 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const resolved = await fs3.resolve(p, "read");
-          const out = await fs3.readText(resolved, { maxBytes, line, limit });
+          const resolved = await fs6.resolve(p, "read");
+          const out = await fs6.readText(resolved, { maxBytes, line, limit });
           this.replyConn(conn, id, {
             path: p,
             content: out.content,
@@ -9052,7 +9127,7 @@ var AcpDispatcher = class {
               conn.sendConn(error(id, RPC.INVALID_PARAMS, "`path` required"));
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs6 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
@@ -9088,8 +9163,8 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const resolved = await fs3.resolve(p, "read");
-          const buf = await fs3.readBytesWindow(resolved, { offset, maxBytes });
+          const resolved = await fs6.resolve(p, "read");
+          const buf = await fs6.readBytesWindow(resolved, { offset, maxBytes });
           this.replyConn(conn, id, { path: p, ...buf });
           return;
         }
@@ -9107,12 +9182,12 @@ var AcpDispatcher = class {
               conn.sendConn(error(id, RPC.INVALID_PARAMS, "`path` required"));
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs6 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
-          const resolved = await fs3.resolve(p, "read");
-          const result = await fs3.stat(resolved);
+          const resolved = await fs6.resolve(p, "read");
+          const result = await fs6.stat(resolved);
           this.replyConn(conn, id, { path: p, ...result });
           return;
         }
@@ -9130,13 +9205,13 @@ var AcpDispatcher = class {
               conn.sendConn(error(id, RPC.INVALID_PARAMS, "`path` required"));
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs6 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
-          const resolved = await fs3.resolve(p, "read");
+          const resolved = await fs6.resolve(p, "read");
           const MAX_LIST = 2e3;
-          const entries = await fs3.list(resolved, { maxEntries: MAX_LIST + 1 });
+          const entries = await fs6.list(resolved, { maxEntries: MAX_LIST + 1 });
           const truncated = entries.length > MAX_LIST;
           this.replyConn(conn, id, {
             path: p,
@@ -9161,7 +9236,7 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs6 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
@@ -9181,7 +9256,7 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const matches = await fs3.glob(pattern, {
+          const matches = await fs6.glob(pattern, {
             maxResults: maxResults + 1
           });
           const truncated = matches.length > maxResults;
@@ -9213,11 +9288,11 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs6 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
-          const resolved = await fs3.resolve(p, "write");
+          const resolved = await fs6.resolve(p, "write");
           if (Buffer.byteLength(params["content"], "utf8") > 10 * 1024 * 1024) {
             if (id !== void 0)
               conn.sendConn(
@@ -9225,7 +9300,7 @@ var AcpDispatcher = class {
               );
             return;
           }
-          await fs3.writeTextOverwrite(resolved, params["content"]);
+          await fs6.writeTextOverwrite(resolved, params["content"]);
           this.replyConn(conn, id, { ok: true, path: p });
           return;
         }
@@ -9254,12 +9329,12 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs6 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
-          const resolved = await fs3.resolve(p, "write");
-          const result = await fs3.edit(
+          const resolved = await fs6.resolve(p, "write");
+          const result = await fs6.edit(
             resolved,
             params["oldText"],
             params["newText"]
@@ -10802,9 +10877,9 @@ var SseStream = class {
     return next;
   }
   doWrite(chunk) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       if (this.closed || this.res.writableEnded) {
-        resolve5();
+        resolve6();
         return;
       }
       let ok;
@@ -10815,7 +10890,7 @@ var SseStream = class {
         return;
       }
       if (ok) {
-        resolve5();
+        resolve6();
         return;
       }
       const cleanup = /* @__PURE__ */ __name(() => {
@@ -10825,11 +10900,11 @@ var SseStream = class {
       }, "cleanup");
       const onDrain = /* @__PURE__ */ __name(() => {
         cleanup();
-        resolve5();
+        resolve6();
       }, "onDrain");
       const onCloseEv = /* @__PURE__ */ __name(() => {
         cleanup();
-        resolve5();
+        resolve6();
       }, "onCloseEv");
       const onErrorEv = /* @__PURE__ */ __name((err) => {
         cleanup();
@@ -10891,14 +10966,14 @@ var WsStream = class {
   send(message, _id) {
     const data = JSON.stringify(message);
     const next = this.writeChain.then(
-      () => new Promise((resolve5, reject) => {
+      () => new Promise((resolve6, reject) => {
         if (this._closed) {
-          resolve5();
+          resolve6();
           return;
         }
         this.ws.send(data, (err) => {
           if (err) reject(err);
-          else resolve5();
+          else resolve6();
         });
       })
     );
@@ -11203,7 +11278,7 @@ var CdpReverseLink = class {
       throw { code: -32e3, message: "CDP tunnel closed" };
     }
     await this.attach();
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       if (this.disposed) {
         reject({ code: -32e3, message: "CDP tunnel closed" });
         return;
@@ -11214,7 +11289,7 @@ var CdpReverseLink = class {
         `CDP command id=${id} method=${method} timed out after ${this.commandTimeoutMs}ms`
       );
       const progressTimer = this.armProgressLog(id, method);
-      this.pending.set(id, { resolve: resolve5, reject, timer, progressTimer });
+      this.pending.set(id, { resolve: resolve6, reject, timer, progressTimer });
       try {
         this.log?.(
           `qwen serve: /cdp forwarded command id=${id} method=${method} to extension`
@@ -11241,7 +11316,7 @@ var CdpReverseLink = class {
     if (this.attached) return Promise.resolve({});
     if (this.attachPromise) return this.attachPromise;
     this.attachPromise = new Promise(
-      (resolve5, reject) => {
+      (resolve6, reject) => {
         if (this.disposed) {
           reject({ code: -32e3, message: "CDP tunnel closed" });
           return;
@@ -11251,7 +11326,7 @@ var CdpReverseLink = class {
         this.pendingAttach = {
           id,
           pending: {
-            resolve: /* @__PURE__ */ __name((result) => resolve5(result ?? {}), "resolve"),
+            resolve: /* @__PURE__ */ __name((result) => resolve6(result ?? {}), "resolve"),
             reject,
             timer
           }
@@ -11819,7 +11894,7 @@ function isAcpChannelUnavailable(err) {
 }
 __name(isAcpChannelUnavailable, "isAcpChannelUnavailable");
 function delay(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
 __name(delay, "delay");
 function buildChromeDevToolsMcpRuntimeConfig(localPort, hostname, env) {
@@ -13700,7 +13775,7 @@ var CdpTunnelRegistry = class {
 // packages/cli/src/serve/web-shell-static.ts
 init_esbuild_shims();
 var import_express2 = __toESM(require_express(), 1);
-import * as path10 from "node:path";
+import * as path9 from "node:path";
 var WEB_SHELL_CSP_DIRECTIVES = [
   "default-src 'self'",
   "script-src 'self' 'unsafe-inline' 'unsafe-eval' 'wasm-unsafe-eval'",
@@ -13728,7 +13803,7 @@ function isDocumentNavigation(req) {
 }
 __name(isDocumentNavigation, "isDocumentNavigation");
 function createSendIndex(webShellDir, frameAncestors = []) {
-  const indexPath = path10.join(webShellDir, "index.html");
+  const indexPath = path9.join(webShellDir, "index.html");
   const csp = buildWebShellCsp(frameAncestors);
   return (res) => {
     res.status(200).set("Content-Security-Policy", csp).set("X-Content-Type-Options", "nosniff").set("Referrer-Policy", "no-referrer").set(
@@ -13764,7 +13839,7 @@ function mountWebShellAssets(app, webShellDir, frameAncestors = []) {
   const sendIndex = createSendIndex(webShellDir, frameAncestors);
   app.use(
     "/assets",
-    import_express2.default.static(path10.join(webShellDir, "assets"), {
+    import_express2.default.static(path9.join(webShellDir, "assets"), {
       index: false,
       immutable: true,
       maxAge: "1y"
@@ -15109,7 +15184,7 @@ function createFifoTaskQueue(limit) {
       Promise.resolve().then(() => item.task(release)).then(item.resolve, item.reject).finally(release);
     }
   }, "pump");
-  const enqueue = /* @__PURE__ */ __name((task, options = {}) => new Promise((resolve5, reject) => {
+  const enqueue = /* @__PURE__ */ __name((task, options = {}) => new Promise((resolve6, reject) => {
     if (options.signal?.aborted) {
       reject(abortReason(options.signal));
       return;
@@ -15118,7 +15193,7 @@ function createFifoTaskQueue(limit) {
       task,
       ...options.signal ? { signal: options.signal } : {},
       ...options.onStart ? { onStart: options.onStart } : {},
-      resolve: resolve5,
+      resolve: resolve6,
       reject
     };
     if (options.signal) {
@@ -15160,6 +15235,14 @@ var redactExtensionDisplaySource = /* @__PURE__ */ __name((source) => {
 var EXTENSION_PREPARATION_CONCURRENCY = 2;
 var EXTENSION_REFRESH_TIMEOUT_MS = 3e4;
 var RECONCILE_SLOW_MS = 3e4;
+var resolveExtensionLocale = /* @__PURE__ */ __name((workspaceDir) => {
+  const configuredLanguage = loadSettings(workspaceDir).merged.general?.language;
+  const requestedLocale = resolveLanguageSetting(configuredLanguage);
+  if (requestedLocale === "auto") {
+    return detectSystemLanguage();
+  }
+  return resolveSupportedLanguage(requestedLocale) ?? requestedLocale;
+}, "resolveExtensionLocale");
 var EXTENSION_QUEUE_FULL_MESSAGE = "Extension operation queue is full";
 function createExtensionsController(deps) {
   const { boundWorkspace, bridge, workspace } = deps;
@@ -15187,6 +15270,7 @@ function createExtensionsController(deps) {
   }, "acquireOperationSlot");
   const createExtensionManager = /* @__PURE__ */ __name((workspaceDir = boundWorkspace, trustedOverride, interactions) => new ExtensionManager({
     workspaceDir,
+    locale: resolveExtensionLocale(workspaceDir),
     isWorkspaceTrusted: trustedOverride ?? getWorkspaceTrustStatus(loadSettings(workspaceDir).merged, workspaceDir).effective.state === "trusted",
     requestConsent: /* @__PURE__ */ __name(() => Promise.resolve(), "requestConsent"),
     networkPolicy: "public",
@@ -15714,8 +15798,9 @@ function createExtensionsController(deps) {
     })();
   }, "runQueuedExtensionMutation");
   const buildLocalExtensionsStatus = /* @__PURE__ */ __name(async () => {
+    const locale = resolveExtensionLocale(boundWorkspace);
     const now = Date.now();
-    if (extensionsStatusCache && extensionsStatusCache.expiresAt > now) {
+    if (extensionsStatusCache?.locale === locale && extensionsStatusCache.expiresAt > now) {
       return extensionsStatusCache.value;
     }
     const extensionManager = createExtensionManager();
@@ -15771,6 +15856,7 @@ function createExtensionsController(deps) {
       extensions: entries
     };
     extensionsStatusCache = {
+      locale,
       expiresAt: Date.now() + 2e3,
       value: status
     };
@@ -15939,7 +16025,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       ...interaction,
       id: crypto2.randomUUID()
     };
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const timeout = setTimeout(() => {
         pendingExtensionInteractions.delete(operationId);
         controller.updateOperation(operationId, {
@@ -15953,7 +16039,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       timeout.unref?.();
       pendingExtensionInteractions.set(operationId, {
         interaction: pendingInteraction,
-        resolve: resolve5,
+        resolve: resolve6,
         reject,
         timeout
       });
@@ -15998,8 +16084,8 @@ function registerWorkspaceExtensionRoutes(app, deps) {
   const reserveRuntimeReconciliation = /* @__PURE__ */ __name(() => {
     let provideTask;
     const task = new Promise(
-      (resolve5) => {
-        provideTask = resolve5;
+      (resolve6) => {
+        provideTask = resolve6;
       }
     );
     const queued = runtimeReconciliationQueue.run(async () => {
@@ -16100,9 +16186,9 @@ function registerWorkspaceExtensionRoutes(app, deps) {
     generationPoller.unref();
     app.locals.stopExtensionGenerationReconciler = () => clearInterval(generationPoller);
   }
-  const registerFor = /* @__PURE__ */ __name((base, resolve5) => {
+  const registerFor = /* @__PURE__ */ __name((base, resolve6) => {
     app.get(base, async (req, res) => {
-      const ctrl = resolve5(req, res, false);
+      const ctrl = resolve6(req, res, false);
       if (!ctrl) return;
       try {
         res.status(200).json(await ctrl.buildLocalExtensionsStatus());
@@ -16111,12 +16197,12 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       }
     });
     app.get(`${base}/operations`, async (req, res) => {
-      const ctrl = resolve5(req, res, false);
+      const ctrl = resolve6(req, res, false);
       if (!ctrl) return;
       res.status(200).json({ v: 1, operations: ctrl.getActiveOperations() });
     });
     app.get(`${base}/operations/:operationId`, async (req, res) => {
-      const ctrl = resolve5(req, res, false);
+      const ctrl = resolve6(req, res, false);
       if (!ctrl) return;
       try {
         const operationId = req.params["operationId"];
@@ -16160,7 +16246,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/operations/:operationId/interactions/:interactionId`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, false);
+        const ctrl = resolve6(req, res, false);
         if (!ctrl) return;
         try {
           if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16229,7 +16315,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       }
     );
     app.post(`${base}/install`, mutate({ strict: true }), async (req, res) => {
-      const ctrl = resolve5(req, res, true);
+      const ctrl = resolve6(req, res, true);
       if (!ctrl) return;
       try {
         if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16412,7 +16498,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/check-updates`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, true);
+        const ctrl = resolve6(req, res, true);
         if (!ctrl) return;
         let timer;
         let releaseOperationSlot;
@@ -16476,7 +16562,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       }
     );
     app.post(`${base}/refresh`, mutate({ strict: true }), async (req, res) => {
-      const ctrl = resolve5(req, res, true);
+      const ctrl = resolve6(req, res, true);
       if (!ctrl) return;
       try {
         if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16500,7 +16586,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/:name/enable`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, true);
+        const ctrl = resolve6(req, res, true);
         if (!ctrl) return;
         try {
           if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16547,7 +16633,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/:name/disable`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, true);
+        const ctrl = resolve6(req, res, true);
         if (!ctrl) return;
         try {
           if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16594,7 +16680,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/:name/update`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, true);
+        const ctrl = resolve6(req, res, true);
         if (!ctrl) return;
         try {
           if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16677,7 +16763,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       }
     );
     app.delete(`${base}/:name`, mutate({ strict: true }), async (req, res) => {
-      const ctrl = resolve5(req, res, true);
+      const ctrl = resolve6(req, res, true);
       if (!ctrl) return;
       try {
         if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -17439,13 +17525,13 @@ async function handlePostFileWrite(req, res, deps) {
     req
   );
   if (originatorClientId === null) return;
-  const fs3 = factory.forRequest({
+  const fs6 = factory.forRequest({
     originatorClientId,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "write");
-    const out = await fs3.writeTextAtomic(resolved, content, {
+    const resolved = await fs6.resolve(queryPath, "write");
+    const out = await fs6.writeTextAtomic(resolved, content, {
       mode,
       ...expectedHash ? { expectedHash } : {},
       ...bom !== void 0 ? { bom } : {},
@@ -17498,13 +17584,13 @@ async function handlePostFileEdit(req, res, deps) {
     req
   );
   if (originatorClientId === null) return;
-  const fs3 = factory.forRequest({
+  const fs6 = factory.forRequest({
     originatorClientId,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "edit");
-    const out = await fs3.editAtomic(resolved, oldText, newText, {
+    const resolved = await fs6.resolve(queryPath, "edit");
+    const out = await fs6.editAtomic(resolved, oldText, newText, {
       expectedHash
     });
     applyReadHeaders(res);
@@ -17538,7 +17624,7 @@ function registerWorkspaceFileWriteRoutes(app, deps) {
 }
 __name(registerWorkspaceFileWriteRoutes, "registerWorkspaceFileWriteRoutes");
 function registerWorkspaceQualifiedFileWriteRoutes(app, deps) {
-  const resolve5 = /* @__PURE__ */ __name((req, res) => {
+  const resolve6 = /* @__PURE__ */ __name((req, res) => {
     const runtime = resolveWorkspaceRuntimeFromParam(
       deps.workspaceRegistry,
       req,
@@ -17556,7 +17642,7 @@ function registerWorkspaceQualifiedFileWriteRoutes(app, deps) {
     "/workspaces/:workspace/file/write",
     deps.mutate({ strict: true }),
     (req, res) => {
-      if (!resolve5(req, res)) return;
+      if (!resolve6(req, res)) return;
       void handlePostFileWrite(req, res, deps);
     }
   );
@@ -17564,7 +17650,7 @@ function registerWorkspaceQualifiedFileWriteRoutes(app, deps) {
     "/workspaces/:workspace/file/edit",
     deps.mutate({ strict: true }),
     (req, res) => {
-      if (!resolve5(req, res)) return;
+      if (!resolve6(req, res)) return;
       void handlePostFileEdit(req, res, deps);
     }
   );
@@ -17832,6 +17918,18 @@ var legacySessionTelemetryRoutes = [
     attribution: "handler_resolved",
     route: "GET /session/:id/tasks"
   },
+  {
+    method: "GET",
+    path: "/session/:id/subagents/:toolCallId",
+    attribution: "handler_resolved",
+    route: "GET /session/:id/subagents/:toolCallId"
+  },
+  {
+    method: "POST",
+    path: "/session/:id/subagents/:toolCallId/cancel",
+    attribution: "handler_resolved",
+    route: "POST /session/:id/subagents/:toolCallId/cancel"
+  },
   {
     method: "GET",
     path: "/session/:id/lsp",
@@ -18309,7 +18407,7 @@ function daemonTelemetryMiddleware(resolveWorkspaceCwd, recordRequest) {
           deferredRuntimePath: deferredRuntime.path
         } : {}
       },
-      async (span) => await new Promise((resolve5, reject) => {
+      async (span) => await new Promise((resolve6, reject) => {
         let done = false;
         const finish = /* @__PURE__ */ __name(() => {
           if (done) return;
@@ -18339,7 +18437,7 @@ function daemonTelemetryMiddleware(resolveWorkspaceCwd, recordRequest) {
           if (!successfulSse && route.route !== "GET /daemon/status" && route.route !== "POST /session/:id/heartbeat") {
             recordRequest?.(durationMs, res.statusCode);
           }
-          resolve5();
+          resolve6();
         }, "finish");
         res.once("finish", finish);
         res.once("close", finish);
@@ -18514,21 +18612,11 @@ __name(registerPermissionRoutes, "registerPermissionRoutes");
 // packages/cli/src/serve/routes/session.ts
 init_esbuild_shims();
 import * as crypto3 from "node:crypto";
-import * as path11 from "node:path";
+import * as fs4 from "node:fs";
+import * as path10 from "node:path";
 
 // packages/cli/src/serve/server/prompt-deadline.ts
 init_esbuild_shims();
-var PromptDeadlineExceededError = class extends Error {
-  static {
-    __name(this, "PromptDeadlineExceededError");
-  }
-  deadlineMs;
-  constructor(deadlineMs) {
-    super(`prompt exceeded the ${deadlineMs}ms deadline`);
-    this.name = "PromptDeadlineExceededError";
-    this.deadlineMs = deadlineMs;
-  }
-};
 function resolvePromptDeadlineMs(serverMs, requestMs) {
   if (serverMs === void 0 || !Number.isFinite(serverMs) || serverMs <= 0) {
     return void 0;
@@ -18638,6 +18726,25 @@ function encodeMetadataSessionCursor(last, filter, archiveState) {
   ).toString("base64url");
 }
 __name(encodeMetadataSessionCursor, "encodeMetadataSessionCursor");
+async function enrichWorktreeSidecars(bySessionId, sessionService, archiveState = "active") {
+  for (const [sessionId, summary] of bySessionId) {
+    if (summary.worktree) continue;
+    const sidecar = await readWorktreeSession(
+      sessionService.getWorktreeSessionPathForArchiveState(
+        sessionId,
+        archiveState
+      )
+    ).catch(() => null);
+    if (sidecar) {
+      summary.worktree = {
+        slug: sidecar.slug,
+        path: sidecar.worktreePath,
+        branch: sidecar.worktreeBranch
+      };
+    }
+  }
+}
+__name(enrichWorktreeSidecars, "enrichWorktreeSidecars");
 function toSummary2(item) {
   return {
     sessionId: item.sessionId,
@@ -18783,6 +18890,7 @@ async function listOrganizedWorkspaceSessionsForResponse(bridge, workspaceCwd, o
       applyOrganization(session, snapshot.sessions.get(session.sessionId))
     );
   }
+  await enrichWorktreeSidecars(bySessionId, sessionService, archiveState);
   if (readOptions.mergeLive !== false && archiveState !== "archived" && isFirstPage) {
     try {
       const liveSessions = bridge.listWorkspaceSessions(workspaceCwd);
@@ -18868,6 +18976,7 @@ async function listWorkspaceSessionsByMetadataForResponse(bridge, workspaceCwd,
   for (const session of persisted.sessions) {
     bySessionId.set(session.sessionId, session);
   }
+  await enrichWorktreeSidecars(bySessionId, sessionService, archiveState);
   let liveMergeFailed = false;
   if (readOptions.mergeLive !== false && archiveState !== "archived") {
     try {
@@ -18970,6 +19079,7 @@ async function listWorkspaceSessionsForResponse(bridge, workspaceCwd, options, r
   for (const item of persisted.items) {
     bySessionId.set(item.sessionId, toSummary2(item));
   }
+  await enrichWorktreeSidecars(bySessionId, sessionService, archiveState);
   if (archiveState === "archived" || readOptions.mergeLive === false) {
     const sessions2 = [...bySessionId.values()];
     const nextCursor2 = persisted.nextCursor != null ? String(persisted.nextCursor) : void 0;
@@ -19108,123 +19218,831 @@ async function exportSessionTranscript(params) {
 }
 __name(exportSessionTranscript, "exportSessionTranscript");
 
-// packages/cli/src/serve/routes/session.ts
-var WORKSPACE_TRANSCRIPT_RESPONSE_MAX_BYTES = 32 * 1024 * 1024;
-var WORKSPACE_TRANSCRIPT_CURSOR_MAX_BYTES = 64 * 1024;
-var TRANSCRIPT_CURSOR_TOO_LARGE_REPLAY_ERROR = "Transcript pagination state exceeds the safe limit";
-var GENERATION_HEARTBEAT_MS = 15e3;
-var PRIMARY_ONLY_LIVE_SESSION_ROUTES = [
-  "POST /session/:id/branch",
-  "POST /session/:id/fork",
-  "POST /session/:id/cd"
-];
-function isPrimaryOnlyLiveSessionRoute(route) {
-  return PRIMARY_ONLY_LIVE_SESSION_ROUTES.includes(
-    route
-  );
+// packages/cli/src/serve/virtual-subagent-sessions.ts
+init_esbuild_shims();
+import * as fs3 from "node:fs/promises";
+import { createReadStream } from "node:fs";
+import readline from "node:readline";
+var PREFIX = "subagent.";
+var POLL_INTERVAL_MS = 250;
+var TARGET_RETENTION_MS = 6e4;
+async function readFirstUserText(filePath) {
+  const stream = createReadStream(filePath);
+  const lines = readline.createInterface({
+    input: stream,
+    crlfDelay: Infinity
+  });
+  try {
+    for await (const line of lines) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      for (const record of parseLineTolerant(trimmed, filePath)) {
+        if (record.type !== "user") continue;
+        return record.message?.parts?.find(
+          (part) => typeof part.text === "string"
+        )?.text;
+      }
+    }
+    return void 0;
+  } catch (error2) {
+    if (error2.code === "ENOENT") return void 0;
+    throw error2;
+  } finally {
+    lines.close();
+    stream.destroy();
+  }
+}
+__name(readFirstUserText, "readFirstUserText");
+function asRecord(value) {
+  return typeof value === "object" && value !== null ? value : void 0;
+}
+__name(asRecord, "asRecord");
+function finiteNonNegative(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
+}
+__name(finiteNonNegative, "finiteNonNegative");
+function normalizeTaskStatus(status) {
+  if (typeof status !== "string") return void 0;
+  if (status === "success") return "completed";
+  if (status === "error") return "failed";
+  if (status === "background") return "running";
+  return status;
+}
+__name(normalizeTaskStatus, "normalizeTaskStatus");
+function durationBetween(start, end) {
+  if (!end) return void 0;
+  const startTime = Date.parse(start);
+  const endTime = Date.parse(end);
+  return Number.isFinite(startTime) && Number.isFinite(endTime) ? Math.max(0, endTime - startTime) : void 0;
+}
+__name(durationBetween, "durationBetween");
+function findToolCallMetrics(records, toolCallId) {
+  const toolResult = records.find(
+    (record) => record.toolCallResult?.callId === toolCallId
+  )?.toolCallResult;
+  const display = asRecord(toolResult?.resultDisplay);
+  const summary = asRecord(display?.["executionSummary"]);
+  return {
+    status: normalizeTaskStatus(display?.["status"]) ?? normalizeTaskStatus(toolResult?.status),
+    durationMs: finiteNonNegative(summary?.["totalDurationMs"]),
+    totalTokens: finiteNonNegative(summary?.["totalTokens"]) ?? finiteNonNegative(display?.["tokenCount"]),
+    inputTokens: finiteNonNegative(summary?.["inputTokens"]),
+    outputTokens: finiteNonNegative(summary?.["outputTokens"]),
+    cachedTokens: finiteNonNegative(summary?.["cachedTokens"])
+  };
 }
-__name(isPrimaryOnlyLiveSessionRoute, "isPrimaryOnlyLiveSessionRoute");
-function formatGenerationSse(event, data) {
-  return `event: ${event}
-data: ${JSON.stringify({ v: 1, ...data })}
-
-`;
+__name(findToolCallMetrics, "findToolCallMetrics");
+function encodePart(value) {
+  return Buffer.from(value, "utf8").toString("base64url");
 }
-__name(formatGenerationSse, "formatGenerationSse");
-function writeGenerationSseChunk(res, chunk) {
-  if (res.destroyed) {
-    return Promise.reject(new Error("Generation SSE connection destroyed"));
-  }
-  const writable = res.write(chunk);
-  const flush = res.flush;
-  flush?.call(res);
-  if (writable) {
-    return res.destroyed ? Promise.reject(new Error("Generation SSE connection destroyed")) : Promise.resolve();
+__name(encodePart, "encodePart");
+function decodePart(value) {
+  try {
+    return Buffer.from(value, "base64url").toString("utf8");
+  } catch {
+    return void 0;
   }
-  return new Promise((resolve5, reject) => {
-    const cleanup = /* @__PURE__ */ __name(() => {
-      res.off("drain", onDrain);
-      res.off("close", onClose);
-      res.off("error", onError);
-    }, "cleanup");
-    const onDrain = /* @__PURE__ */ __name(() => {
-      cleanup();
-      resolve5();
-    }, "onDrain");
-    const onClose = /* @__PURE__ */ __name(() => {
-      cleanup();
-      reject(new Error("Generation SSE connection closed"));
-    }, "onClose");
-    const onError = /* @__PURE__ */ __name((error2) => {
-      cleanup();
-      reject(error2);
-    }, "onError");
-    res.once("drain", onDrain);
-    res.once("close", onClose);
-    res.once("error", onError);
-    if (res.destroyed) onClose();
-  });
 }
-__name(writeGenerationSseChunk, "writeGenerationSseChunk");
-function isReadOnlyWorkspaceInspection(runtime) {
-  return !runtime.primary && !runtime.trusted;
-}
-__name(isReadOnlyWorkspaceInspection, "isReadOnlyWorkspaceInspection");
-function runWorkspaceInspectionWithLogPolicy(runtime, read) {
-  return isReadOnlyWorkspaceInspection(runtime) ? runWithoutDebugLogSession(read) : read();
+__name(decodePart, "decodePart");
+function isValidVirtualSessionPart(value) {
+  return /^[a-zA-Z0-9_-]{1,500}$/.test(value);
 }
-__name(runWorkspaceInspectionWithLogPolicy, "runWorkspaceInspectionWithLogPolicy");
-function requireSessionArtifactClientId(clientId, res) {
-  if (clientId !== void 0) return true;
-  res.status(403).json({
-    error: "Session artifact access requires a session-bound client id",
-    code: "client_id_required",
-    errorKind: "client_id_required"
-  });
-  return false;
+__name(isValidVirtualSessionPart, "isValidVirtualSessionPart");
+function createVirtualSubagentSessionId(parentSessionId, agentId) {
+  if (!isValidVirtualSessionPart(parentSessionId) || !isValidVirtualSessionPart(agentId)) {
+    throw new Error("Virtual subagent session ids require valid id parts");
+  }
+  return `${PREFIX}${encodePart(parentSessionId)}.${encodePart(agentId)}`;
 }
-__name(requireSessionArtifactClientId, "requireSessionArtifactClientId");
-function sendArtifactValidationError(res, err) {
-  if (!(err instanceof SessionArtifactValidationError)) {
-    return false;
+__name(createVirtualSubagentSessionId, "createVirtualSubagentSessionId");
+function parseVirtualSubagentSessionId(sessionId) {
+  if (!sessionId.startsWith(PREFIX) || sessionId.length > 2e3) {
+    return void 0;
   }
-  res.status(400).json({
+  const parts = sessionId.slice(PREFIX.length).split(".");
+  if (parts.length !== 2) return void 0;
+  const parentSessionId = decodePart(parts[0]);
+  const agentId = decodePart(parts[1]);
+  if (!parentSessionId || !agentId || !isValidVirtualSessionPart(parentSessionId) || !isValidVirtualSessionPart(agentId)) {
+    return void 0;
+  }
+  return { parentSessionId, agentId };
+}
+__name(parseVirtualSubagentSessionId, "parseVirtualSubagentSessionId");
+function replayCursorState(sessionId, position, leafUuid, startTime, lastUpdated) {
+  return {
     v: 1,
-    error: {
-      code: err.code,
-      message: err.message,
-      ...err.field ? { field: err.field } : {}
-    }
-  });
-  return true;
+    sessionId,
+    fileIdentity: { dev: 0, ino: 0 },
+    snapshotSize: position,
+    position,
+    leafUuid,
+    startTime,
+    lastUpdated
+  };
 }
-__name(sendArtifactValidationError, "sendArtifactValidationError");
-function sendSessionOrganizationError(res, err) {
-  if (!(err instanceof SessionOrganizationError)) {
-    return false;
+__name(replayCursorState, "replayCursorState");
+var VirtualSubagentTarget = class _VirtualSubagentTarget {
+  constructor(sessionId, parentSessionId, task, workspaceCwd, onExpired) {
+    this.sessionId = sessionId;
+    this.parentSessionId = parentSessionId;
+    this.task = task;
+    this.workspaceCwd = workspaceCwd;
+    this.onExpired = onExpired;
   }
-  const status = err.code === "group_name_conflict" ? 409 : err.code === "group_not_found" ? 404 : err.code === "session_organization_store_unreadable" ? 500 : 400;
-  res.status(status).json({
-    error: err.message,
-    code: err.code,
-    ...err.field !== void 0 ? { field: err.field } : {}
-  });
-  return true;
-}
-__name(sendSessionOrganizationError, "sendSessionOrganizationError");
-function parseTranscriptLimitQuery(rawLimit, res) {
-  if (rawLimit === void 0) return void 0;
-  if (typeof rawLimit !== "string" || rawLimit.trim() === "") {
-    res.status(400).json({
-      error: "`limit` must be a positive integer",
-      code: "invalid_transcript_limit"
-    });
-    return null;
+  static {
+    __name(this, "VirtualSubagentTarget");
+  }
+  bus = new EventBus(1024, 8);
+  events = [];
+  snapshotDelivered = false;
+  offset = 0;
+  transcriptIdentity;
+  streamOffset = 0;
+  streamIdentity;
+  streamReady = false;
+  canonicalThroughTimestamp = 0;
+  completedStreamRounds = /* @__PURE__ */ new Set();
+  streamedRounds = /* @__PURE__ */ new Set();
+  streamRunIds = /* @__PURE__ */ new Set();
+  legacyStreamedSinceCanonical = false;
+  replayState;
+  initialized = false;
+  refreshPromise = Promise.resolve();
+  snapshotPromise = Promise.resolve();
+  pollTimer;
+  subscribers = 0;
+  retentionTimer;
+  updateStatus(status) {
+    const wasRunning = this.task.status === "running";
+    this.task.status = status;
+    if (status !== "running" && this.pollTimer) {
+      clearInterval(this.pollTimer);
+      this.pollTimer = void 0;
+    }
+    if (wasRunning && status !== "running") {
+      void this.refreshLive().catch(() => void 0);
+    }
+  }
+  rememberEvent(event) {
+    if (event && !this.snapshotDelivered) this.events.push(event);
+  }
+  resetCanonicalState() {
+    this.offset = 0;
+    this.replayState = void 0;
+    this.canonicalThroughTimestamp = 0;
+    this.completedStreamRounds.clear();
+    this.streamRunIds.clear();
+    this.streamedRounds.clear();
+    this.legacyStreamedSinceCanonical = false;
+  }
+  resetStreamState() {
+    this.streamOffset = 0;
+    this.completedStreamRounds.clear();
+    this.streamRunIds.clear();
+    this.streamedRounds.clear();
+    this.legacyStreamedSinceCanonical = false;
+  }
+  async readNewRecords(endOffset) {
+    let handle;
+    try {
+      handle = await fs3.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) {
+        this.resetCanonicalState();
+      }
+      this.transcriptIdentity = identity;
+      const size = Math.min(stat3.size, endOffset ?? stat3.size);
+      if (size <= this.offset) return [];
+      const bytes = Buffer.alloc(size - this.offset);
+      const { bytesRead } = await handle.read(
+        bytes,
+        0,
+        bytes.length,
+        this.offset
+      );
+      const chunk = bytes.subarray(0, bytesRead);
+      const lastNewline = chunk.lastIndexOf(10);
+      if (lastNewline < 0) return [];
+      const complete = chunk.subarray(0, lastNewline + 1);
+      this.offset += complete.length;
+      return complete.toString("utf8").split("\n").flatMap((line) => {
+        const trimmed = line.trim();
+        return trimmed ? parseLineTolerant(trimmed, this.task.outputFile) : [];
+      });
+    } catch (error2) {
+      if (error2.code === "ENOENT") {
+        if (this.transcriptIdentity !== void 0) {
+          this.transcriptIdentity = void 0;
+          this.resetCanonicalState();
+        }
+        return [];
+      }
+      throw error2;
+    } finally {
+      await handle?.close();
+    }
   }
-  if (!/^\d+$/.test(rawLimit)) {
-    res.status(400).json({
-      error: "`limit` must be a positive integer",
-      code: "invalid_transcript_limit"
+  async readStreamUpdates(endOffset) {
+    const replayingExisting = !this.streamReady;
+    this.streamReady = true;
+    const filePath = `${this.task.outputFile}.stream`;
+    let handle;
+    try {
+      handle = await fs3.open(filePath, "r");
+      const stat3 = await handle.stat();
+      const identity = `${stat3.dev}:${stat3.ino}`;
+      if (this.streamIdentity !== void 0 && this.streamIdentity !== identity) {
+        this.resetStreamState();
+      }
+      this.streamIdentity = identity;
+      if (stat3.size < this.streamOffset) this.resetStreamState();
+      const size = Math.min(stat3.size, endOffset ?? stat3.size);
+      if (size <= this.streamOffset) return;
+      const bytes = Buffer.alloc(size - this.streamOffset);
+      const { bytesRead } = await handle.read(
+        bytes,
+        0,
+        bytes.length,
+        this.streamOffset
+      );
+      const chunk = bytes.subarray(0, bytesRead);
+      const lastNewline = chunk.lastIndexOf(10);
+      if (lastNewline < 0) return;
+      const complete = chunk.subarray(0, lastNewline + 1);
+      this.streamOffset += complete.length;
+      const records = complete.toString("utf8").split("\n").flatMap((line) => {
+        const trimmed = line.trim();
+        return trimmed ? parseLineTolerant(trimmed, filePath) : [];
+      });
+      for (const record of records) {
+        if (record.v !== 1 || typeof record.text !== "string" || typeof record.timestamp !== "number") {
+          continue;
+        }
+        const roundKey = typeof record.runId === "string" && typeof record.round === "number" ? `${record.runId}:${record.round}` : void 0;
+        if (typeof record.runId === "string") {
+          this.streamRunIds.add(record.runId);
+        }
+        if ((roundKey ? this.completedStreamRounds.has(roundKey) : record.timestamp <= this.canonicalThroughTimestamp) || replayingExisting && typeof record.round !== "number") {
+          continue;
+        }
+        const event = this.bus.publish({
+          type: "session_update",
+          data: createTranscriptMessageUpdate({
+            role: "assistant",
+            text: record.text,
+            timestamp: record.timestamp,
+            ...record.thought ? { thought: true } : {}
+          })
+        });
+        this.rememberEvent(event);
+        if (roundKey) this.streamedRounds.add(roundKey);
+        else this.legacyStreamedSinceCanonical = true;
+      }
+      for (const completed of this.completedStreamRounds) {
+        const runId = completed.slice(0, completed.lastIndexOf(":"));
+        if (!this.streamRunIds.has(runId)) {
+          this.completedStreamRounds.delete(completed);
+        }
+      }
+    } catch (error2) {
+      if (error2.code !== "ENOENT") throw error2;
+      this.streamIdentity = void 0;
+      this.streamOffset = 0;
+      this.streamRunIds.clear();
+      this.streamedRounds.clear();
+      this.legacyStreamedSinceCanonical = false;
+    } finally {
+      await handle?.close();
+    }
+  }
+  refreshOnce = /* @__PURE__ */ __name(async (endOffset) => {
+    let records = await this.readNewRecords(endOffset);
+    if (records.length === 0) {
+      this.initialized = true;
+      return;
+    }
+    for (const record of records) {
+      if (record.type === "assistant" && (record.usageMetadata !== void 0 || record.message?.parts?.some((part) => typeof part.text === "string"))) {
+        if (typeof record.agentRunId === "string" && typeof record.agentRound === "number") {
+          this.completedStreamRounds.add(
+            `${record.agentRunId}:${record.agentRound}`
+          );
+        }
+        const timestamp = Date.parse(record.timestamp);
+        if (Number.isFinite(timestamp)) {
+          this.canonicalThroughTimestamp = Math.max(
+            this.canonicalThroughTimestamp,
+            timestamp
+          );
+        }
+      }
+    }
+    if (this.streamedRounds.size > 0 || this.legacyStreamedSinceCanonical) {
+      records = records.filter((record) => {
+        const roundKey = typeof record.agentRunId === "string" && typeof record.agentRound === "number" ? `${record.agentRunId}:${record.agentRound}` : void 0;
+        if (roundKey && this.streamedRounds.delete(roundKey)) return false;
+        if (!this.legacyStreamedSinceCanonical || record.type !== "assistant" || record.message?.parts?.some((part) => part.functionCall)) {
+          return true;
+        }
+        this.legacyStreamedSinceCanonical = false;
+        return false;
+      });
+      if (records.length === 0) {
+        this.initialized = true;
+        return;
+      }
+    }
+    const startTime = records[0]?.timestamp ?? (/* @__PURE__ */ new Date()).toISOString();
+    const lastUpdated = records[records.length - 1]?.timestamp ?? (/* @__PURE__ */ new Date()).toISOString();
+    const page = {
+      sessionId: this.sessionId,
+      filePath: this.task.outputFile,
+      records,
+      gaps: [],
+      hasMore: true,
+      replay: this.replayState,
+      startTime,
+      lastUpdated,
+      nextCursorState: replayCursorState(
+        this.sessionId,
+        this.offset,
+        records[records.length - 1]?.uuid ?? "",
+        startTime,
+        lastUpdated
+      )
+    };
+    let nextReplayState;
+    const replay = await replayTranscriptRecordPage({
+      sessionId: this.sessionId,
+      page,
+      encodeCursor: /* @__PURE__ */ __name((state) => {
+        nextReplayState = state.replay;
+        return "virtual-subagent-replay";
+      }, "encodeCursor")
+    });
+    this.replayState = nextReplayState;
+    const inputs = replay.updates.map((update) => ({
+      type: "session_update",
+      data: update
+    }));
+    const published = this.initialized ? inputs.flatMap((input) => {
+      const event = this.bus.publish(input);
+      return event ? [event] : [];
+    }) : this.bus.seedReplayEvents(inputs);
+    if (!this.snapshotDelivered) this.events.push(...published);
+    this.initialized = true;
+  }, "refreshOnce");
+  refreshAt(bounds) {
+    return this.refreshOnce(bounds?.transcript).then(async () => {
+      if (this.task.status === "running") {
+        await this.readStreamUpdates(bounds?.stream);
+      }
+    });
+  }
+  enqueueRefresh(work) {
+    const result = this.refreshPromise.catch(() => void 0).then(work);
+    this.refreshPromise = result.then(
+      () => void 0,
+      () => void 0
+    );
+    return result;
+  }
+  refreshLive() {
+    return this.enqueueRefresh(() => this.refreshAt());
+  }
+  async captureReadBounds() {
+    const size = /* @__PURE__ */ __name(async (filePath) => {
+      try {
+        return (await fs3.stat(filePath)).size;
+      } catch (error2) {
+        if (error2.code === "ENOENT") return 0;
+        throw error2;
+      }
+    }, "size");
+    const [transcript, stream] = await Promise.all([
+      size(this.task.outputFile),
+      size(`${this.task.outputFile}.stream`)
+    ]);
+    return { transcript, stream };
+  }
+  async createSnapshotOnce() {
+    if (!this.snapshotDelivered) {
+      await this.refreshLive();
+      const snapshot = [...this.events];
+      this.events.length = 0;
+      this.snapshotDelivered = true;
+      return { events: snapshot, lastEventId: this.bus.lastEventId };
+    }
+    return this.enqueueRefresh(async () => {
+      const bounds = await this.captureReadBounds();
+      const target = new _VirtualSubagentTarget(
+        this.sessionId,
+        this.parentSessionId,
+        this.task,
+        this.workspaceCwd,
+        () => void 0
+      );
+      await target.refreshAt(bounds);
+      await this.refreshAt(bounds);
+      return {
+        events: [...target.events],
+        lastEventId: this.bus.lastEventId
+      };
+    });
+  }
+  createSnapshot() {
+    const snapshot = this.snapshotPromise.then(() => this.createSnapshotOnce());
+    this.snapshotPromise = snapshot.then(
+      () => void 0,
+      () => void 0
+    );
+    return snapshot;
+  }
+  async load(clientId) {
+    const snapshot = await this.createSnapshot();
+    if (this.subscribers === 0) this.scheduleRetention();
+    return {
+      sessionId: this.sessionId,
+      workspaceCwd: this.workspaceCwd,
+      attached: true,
+      ...clientId ? { clientId } : {},
+      createdAt: new Date(this.task.startTime).toISOString(),
+      hasActivePrompt: this.task.status === "running",
+      state: {},
+      compactedReplay: snapshot.events,
+      liveJournal: [],
+      historyHasMore: false,
+      lastEventId: snapshot.lastEventId
+    };
+  }
+  async *iterate(opts) {
+    if (this.retentionTimer) {
+      clearTimeout(this.retentionTimer);
+      this.retentionTimer = void 0;
+    }
+    this.subscribers++;
+    try {
+      await this.refreshLive();
+      if (!this.snapshotDelivered) {
+        this.events.length = 0;
+        this.snapshotDelivered = true;
+      }
+      if (this.task.status === "running" && !this.pollTimer) {
+        this.pollTimer = setInterval(() => {
+          void this.refreshLive().catch(() => void 0);
+        }, POLL_INTERVAL_MS);
+        this.pollTimer.unref();
+      }
+      yield* this.bus.subscribe(opts);
+    } finally {
+      this.subscribers--;
+      if (this.subscribers === 0) {
+        if (this.pollTimer) clearInterval(this.pollTimer);
+        this.pollTimer = void 0;
+        this.scheduleRetention();
+      }
+    }
+  }
+  subscribe(opts) {
+    return {
+      [Symbol.asyncIterator]: () => this.iterate(opts)
+    };
+  }
+  scheduleRetention() {
+    if (this.retentionTimer) clearTimeout(this.retentionTimer);
+    this.retentionTimer = setTimeout(this.onExpired, TARGET_RETENTION_MS);
+    this.retentionTimer.unref();
+  }
+};
+var VirtualSubagentSessions = class {
+  static {
+    __name(this, "VirtualSubagentSessions");
+  }
+  targets = /* @__PURE__ */ new Map();
+  async findTask(runtime, parentSessionId, predicate) {
+    const status = await runtime.bridge.getSessionTasksStatus(parentSessionId);
+    const task = status.tasks.find(
+      (candidate) => candidate.kind === "agent" && typeof candidate.outputFile === "string" && predicate(candidate)
+    );
+    if (task?.kind === "agent" && task.outputFile) {
+      return {
+        id: task.id,
+        title: task.label,
+        outputFile: task.outputFile,
+        status: task.status,
+        startTime: task.startTime,
+        durationMs: task.stats?.durationMs ?? (task.endTime === void 0 ? void 0 : Math.max(0, task.endTime - task.startTime)),
+        totalTokens: task.stats?.totalTokens
+      };
+    }
+    const runtimeDir = runtime.env.effectiveEnv?.["QWEN_RUNTIME_DIR"];
+    const projectDir = Storage.runWithRuntimeBaseDir(
+      runtimeDir,
+      runtime.workspaceCwd,
+      () => new Storage(runtime.workspaceCwd).getProjectDir()
+    );
+    const sessionDir = getSubagentSessionDir(projectDir, parentSessionId);
+    let names;
+    try {
+      names = await fs3.readdir(sessionDir);
+    } catch (error2) {
+      if (error2.code === "ENOENT") return void 0;
+      throw error2;
+    }
+    for (const name of names) {
+      if (!name.endsWith(".meta.json")) continue;
+      const metaPath = `${sessionDir}/${name}`;
+      const meta = readAgentMeta(metaPath);
+      if (!meta || !predicate({
+        kind: "agent",
+        id: meta.agentId,
+        toolUseId: meta.toolUseId,
+        outputFile: metaPath.slice(0, -".meta.json".length) + ".jsonl"
+      })) {
+        continue;
+      }
+      return {
+        id: meta.agentId,
+        title: meta.description || meta.agentType,
+        outputFile: metaPath.slice(0, -".meta.json".length) + ".jsonl",
+        status: meta.status ?? "completed",
+        startTime: Number.isFinite(Date.parse(meta.createdAt)) ? Date.parse(meta.createdAt) : Date.now(),
+        durationMs: durationBetween(meta.createdAt, meta.lastUpdatedAt)
+      };
+    }
+    return void 0;
+  }
+  async findLegacyTaskByToolCall(runtime, parentSessionId, toolCallId) {
+    const runtimeDir = runtime.env.effectiveEnv?.["QWEN_RUNTIME_DIR"];
+    const projectDir = Storage.runWithRuntimeBaseDir(
+      runtimeDir,
+      runtime.workspaceCwd,
+      () => new Storage(runtime.workspaceCwd).getProjectDir()
+    );
+    const parentRecords = await read(
+      `${projectDir}/chats/${parentSessionId}.jsonl`
+    );
+    let root;
+    for (const record of parentRecords) {
+      for (const part of record.message?.parts ?? []) {
+        const call = part.functionCall;
+        if (call?.id !== toolCallId || call.name !== "agent") continue;
+        const args = call.args;
+        root = {
+          timestamp: Date.parse(record.timestamp),
+          ...typeof args?.["description"] === "string" ? { description: args["description"] } : {},
+          ...typeof args?.["prompt"] === "string" ? { prompt: args["prompt"] } : {},
+          ...typeof args?.["subagent_type"] === "string" ? { agentType: args["subagent_type"] } : {}
+        };
+        break;
+      }
+      if (root) break;
+    }
+    if (!root) return void 0;
+    const sessionDir = getSubagentSessionDir(projectDir, parentSessionId);
+    let names;
+    try {
+      names = await fs3.readdir(sessionDir);
+    } catch (error2) {
+      if (error2.code === "ENOENT") return void 0;
+      throw error2;
+    }
+    const candidates = [];
+    for (const name of names) {
+      if (!name.endsWith(".meta.json")) continue;
+      const metaPath = `${sessionDir}/${name}`;
+      const meta = readAgentMeta(metaPath);
+      if (!meta) continue;
+      const outputFile = metaPath.slice(0, -".meta.json".length) + ".jsonl";
+      const launchPrompt = await readFirstUserText(outputFile);
+      let score = 0;
+      if (root.prompt && launchPrompt === root.prompt) score += 8;
+      if (root.description && meta.description === root.description) score += 4;
+      if (root.agentType && meta.agentType === root.agentType) score += 2;
+      const startTime = Date.parse(meta.createdAt);
+      const delta = Math.abs(startTime - root.timestamp);
+      if (Number.isFinite(delta) && delta <= 6e4) score += 1;
+      if (score === 0) continue;
+      candidates.push({
+        id: meta.agentId,
+        title: meta.description || meta.agentType,
+        outputFile,
+        status: meta.status ?? "completed",
+        startTime: Number.isFinite(startTime) ? startTime : Date.now(),
+        durationMs: durationBetween(meta.createdAt, meta.lastUpdatedAt),
+        score,
+        delta
+      });
+    }
+    candidates.sort((a, b) => b.score - a.score || a.delta - b.delta);
+    const selected = candidates[0];
+    if (!selected) return void 0;
+    const metrics = findToolCallMetrics(parentRecords, toolCallId);
+    return {
+      ...selected,
+      status: metrics.status ?? selected.status,
+      durationMs: metrics.durationMs ?? selected.durationMs,
+      totalTokens: metrics.totalTokens ?? selected.totalTokens,
+      inputTokens: metrics.inputTokens ?? selected.inputTokens,
+      outputTokens: metrics.outputTokens ?? selected.outputTokens,
+      cachedTokens: metrics.cachedTokens ?? selected.cachedTokens
+    };
+  }
+  async readParentToolCallMetrics(runtime, parentSessionId, toolCallId) {
+    const runtimeDir = runtime.env.effectiveEnv?.["QWEN_RUNTIME_DIR"];
+    const projectDir = Storage.runWithRuntimeBaseDir(
+      runtimeDir,
+      runtime.workspaceCwd,
+      () => new Storage(runtime.workspaceCwd).getProjectDir()
+    );
+    const records = await read(
+      `${projectDir}/chats/${parentSessionId}.jsonl`
+    );
+    return findToolCallMetrics(records, toolCallId);
+  }
+  async resolve(runtime, parentSessionId, toolCallId) {
+    let task = await this.findTask(
+      runtime,
+      parentSessionId,
+      (candidate) => candidate.toolUseId === toolCallId || candidate.id.endsWith(`-${toolCallId}`)
+    );
+    const metrics = task && task.status !== "running" ? await this.readParentToolCallMetrics(
+      runtime,
+      parentSessionId,
+      toolCallId
+    ) : void 0;
+    task ??= await this.findLegacyTaskByToolCall(
+      runtime,
+      parentSessionId,
+      toolCallId
+    );
+    if (!task) return void 0;
+    const sessionId = createVirtualSubagentSessionId(parentSessionId, task.id);
+    const status = task.status;
+    this.targets.get(`${runtime.workspaceId}:${sessionId}`)?.updateStatus(status);
+    return {
+      sessionId,
+      taskId: task.id,
+      title: task.title,
+      status,
+      durationMs: metrics?.durationMs ?? task.durationMs,
+      totalTokens: metrics?.totalTokens ?? task.totalTokens,
+      inputTokens: metrics?.inputTokens ?? task.inputTokens,
+      outputTokens: metrics?.outputTokens ?? task.outputTokens,
+      cachedTokens: metrics?.cachedTokens ?? task.cachedTokens
+    };
+  }
+  async getTarget(runtime, sessionId) {
+    const targetKey = `${runtime.workspaceId}:${sessionId}`;
+    const cached = this.targets.get(targetKey);
+    if (cached) return cached;
+    const key = parseVirtualSubagentSessionId(sessionId);
+    if (!key) return void 0;
+    const task = await this.findTask(
+      runtime,
+      key.parentSessionId,
+      (candidate) => candidate.id === key.agentId
+    );
+    if (!task) return void 0;
+    const existing = this.targets.get(targetKey);
+    if (existing) return existing;
+    const target = new VirtualSubagentTarget(
+      sessionId,
+      key.parentSessionId,
+      task,
+      runtime.workspaceCwd,
+      () => this.targets.delete(targetKey)
+    );
+    this.targets.set(targetKey, target);
+    return target;
+  }
+  async load(runtime, sessionId, clientId) {
+    return (await this.getTarget(runtime, sessionId))?.load(clientId);
+  }
+  async subscribe(runtime, sessionId, opts) {
+    return (await this.getTarget(runtime, sessionId))?.subscribe(opts);
+  }
+};
+
+// packages/cli/src/serve/routes/session.ts
+var WORKSPACE_TRANSCRIPT_RESPONSE_MAX_BYTES = 32 * 1024 * 1024;
+var WORKSPACE_TRANSCRIPT_CURSOR_MAX_BYTES = 64 * 1024;
+var TRANSCRIPT_CURSOR_TOO_LARGE_REPLAY_ERROR = "Transcript pagination state exceeds the safe limit";
+var GENERATION_HEARTBEAT_MS = 15e3;
+var PRIMARY_ONLY_LIVE_SESSION_ROUTES = [
+  "POST /session/:id/branch",
+  "POST /session/:id/fork",
+  "POST /session/:id/cd"
+];
+function isPrimaryOnlyLiveSessionRoute(route) {
+  return PRIMARY_ONLY_LIVE_SESSION_ROUTES.includes(
+    route
+  );
+}
+__name(isPrimaryOnlyLiveSessionRoute, "isPrimaryOnlyLiveSessionRoute");
+function formatGenerationSse(event, data) {
+  return `event: ${event}
+data: ${JSON.stringify({ v: 1, ...data })}
+
+`;
+}
+__name(formatGenerationSse, "formatGenerationSse");
+function writeGenerationSseChunk(res, chunk) {
+  if (res.destroyed) {
+    return Promise.reject(new Error("Generation SSE connection destroyed"));
+  }
+  const writable = res.write(chunk);
+  const flush = res.flush;
+  flush?.call(res);
+  if (writable) {
+    return res.destroyed ? Promise.reject(new Error("Generation SSE connection destroyed")) : Promise.resolve();
+  }
+  return new Promise((resolve6, reject) => {
+    const cleanup = /* @__PURE__ */ __name(() => {
+      res.off("drain", onDrain);
+      res.off("close", onClose);
+      res.off("error", onError);
+    }, "cleanup");
+    const onDrain = /* @__PURE__ */ __name(() => {
+      cleanup();
+      resolve6();
+    }, "onDrain");
+    const onClose = /* @__PURE__ */ __name(() => {
+      cleanup();
+      reject(new Error("Generation SSE connection closed"));
+    }, "onClose");
+    const onError = /* @__PURE__ */ __name((error2) => {
+      cleanup();
+      reject(error2);
+    }, "onError");
+    res.once("drain", onDrain);
+    res.once("close", onClose);
+    res.once("error", onError);
+    if (res.destroyed) onClose();
+  });
+}
+__name(writeGenerationSseChunk, "writeGenerationSseChunk");
+function isReadOnlyWorkspaceInspection(runtime) {
+  return !runtime.primary && !runtime.trusted;
+}
+__name(isReadOnlyWorkspaceInspection, "isReadOnlyWorkspaceInspection");
+function runWorkspaceInspectionWithLogPolicy(runtime, read2) {
+  return isReadOnlyWorkspaceInspection(runtime) ? runWithoutDebugLogSession(read2) : read2();
+}
+__name(runWorkspaceInspectionWithLogPolicy, "runWorkspaceInspectionWithLogPolicy");
+function requireSessionArtifactClientId(clientId, res) {
+  if (clientId !== void 0) return true;
+  res.status(403).json({
+    error: "Session artifact access requires a session-bound client id",
+    code: "client_id_required",
+    errorKind: "client_id_required"
+  });
+  return false;
+}
+__name(requireSessionArtifactClientId, "requireSessionArtifactClientId");
+function sendArtifactValidationError(res, err) {
+  if (!(err instanceof SessionArtifactValidationError)) {
+    return false;
+  }
+  res.status(400).json({
+    v: 1,
+    error: {
+      code: err.code,
+      message: err.message,
+      ...err.field ? { field: err.field } : {}
+    }
+  });
+  return true;
+}
+__name(sendArtifactValidationError, "sendArtifactValidationError");
+function sendSessionOrganizationError(res, err) {
+  if (!(err instanceof SessionOrganizationError)) {
+    return false;
+  }
+  const status = err.code === "group_name_conflict" ? 409 : err.code === "group_not_found" ? 404 : err.code === "session_organization_store_unreadable" ? 500 : 400;
+  res.status(status).json({
+    error: err.message,
+    code: err.code,
+    ...err.field !== void 0 ? { field: err.field } : {}
+  });
+  return true;
+}
+__name(sendSessionOrganizationError, "sendSessionOrganizationError");
+function parseTranscriptLimitQuery(rawLimit, res) {
+  if (rawLimit === void 0) return void 0;
+  if (typeof rawLimit !== "string" || rawLimit.trim() === "") {
+    res.status(400).json({
+      error: "`limit` must be a positive integer",
+      code: "invalid_transcript_limit"
+    });
+    return null;
+  }
+  if (!/^\d+$/.test(rawLimit)) {
+    res.status(400).json({
+      error: "`limit` must be a positive integer",
+      code: "invalid_transcript_limit"
     });
     return null;
   }
@@ -19334,7 +20152,8 @@ function registerSessionRoutes(app, deps) {
     sendBridgeError: sendBridgeError2,
     daemonLog,
     promptDeadlineMs,
-    sessionShellCommandEnabled
+    sessionShellCommandEnabled,
+    virtualSubagentSessions
   } = deps;
   const LANGUAGE_CODES = deps.languageCodes;
   const transcriptCursorMasterKey = crypto3.randomBytes(32);
@@ -19433,7 +20252,7 @@ function registerSessionRoutes(app, deps) {
     const workspaceParam = req.params[paramName] ?? "";
     const byId = workspaceRegistry.getByWorkspaceId(workspaceParam);
     if (byId) return byId;
-    if (!path11.isAbsolute(workspaceParam)) {
+    if (!path10.isAbsolute(workspaceParam)) {
       res.status(400).json({
         error: `\`:${paramName}\` must decode to a workspace id or absolute path`
       });
@@ -19847,7 +20666,7 @@ function registerSessionRoutes(app, deps) {
   })), "serializeSessionErrors");
   const resolveWorkspaceParam = /* @__PURE__ */ __name((req, res) => {
     const workspaceCwd = req.params["id"] ?? "";
-    if (!path11.isAbsolute(workspaceCwd)) {
+    if (!path10.isAbsolute(workspaceCwd)) {
       res.status(400).json({ error: "`:id` must decode to an absolute workspace path" });
       return null;
     }
@@ -19919,6 +20738,68 @@ function registerSessionRoutes(app, deps) {
     }
     const clientId = parseClientIdHeader(req, res);
     if (clientId === null) return;
+    let worktreeMeta;
+    const rawWorktree = body["worktree"];
+    if (rawWorktree !== void 0 && rawWorktree !== null) {
+      if (typeof rawWorktree !== "object" || Array.isArray(rawWorktree)) {
+        res.status(400).json({
+          error: '`worktree` must be an object (e.g. `{}` or `{"slug":"my-task"}`)',
+          code: "invalid_worktree"
+        });
+        return;
+      }
+      const wtReq = rawWorktree;
+      let wtService;
+      try {
+        wtService = new GitWorktreeService(workspaceCwd);
+      } catch {
+        res.status(500).json({
+          error: "Failed to initialize worktree service",
+          code: "worktree_init_failed"
+        });
+        return;
+      }
+      if (!await wtService.isGitRepository()) {
+        res.status(400).json({
+          error: "Worktree isolation requires a git repository",
+          code: "worktree_not_git_repo"
+        });
+        return;
+      }
+      const rawSlug = wtReq["slug"];
+      let slug;
+      if (rawSlug === void 0 || rawSlug === null) {
+        slug = GitWorktreeService.generateAutoSlug();
+      } else if (typeof rawSlug !== "string" || rawSlug.length === 0) {
+        res.status(400).json({
+          error: "`worktree.slug` must be a non-empty string when provided",
+          code: "worktree_invalid_slug"
+        });
+        return;
+      } else {
+        slug = rawSlug;
+      }
+      const slugError = GitWorktreeService.validateUserWorktreeSlug(slug);
+      if (slugError) {
+        res.status(400).json({ error: slugError, code: "worktree_invalid_slug" });
+        return;
+      }
+      const baseBranch = await wtService.getCurrentBranch().catch(() => void 0);
+      const wtResult = await wtService.createUserWorktree(slug, baseBranch);
+      if (!wtResult.success || !wtResult.worktree) {
+        res.status(500).json({
+          error: wtResult.error ?? "Failed to create worktree",
+          code: "worktree_create_failed"
+        });
+        return;
+      }
+      worktreeMeta = {
+        slug,
+        path: wtResult.worktree.path,
+        branch: wtResult.worktree.branch
+      };
+      sessionScope = "thread";
+    }
     try {
       const session = await runtime.bridge.spawnOrAttach({
         workspaceCwd,
@@ -19927,7 +20808,8 @@ function registerSessionRoutes(app, deps) {
         ...sessionScope !== void 0 ? { sessionScope } : {},
         ...approvalMode !== void 0 ? { approvalMode } : {},
         ...source.sourceType !== void 0 ? { sourceType: source.sourceType } : {},
-        ...source.sourceId !== void 0 ? { sourceId: source.sourceId } : {}
+        ...source.sourceId !== void 0 ? { sourceId: source.sourceId } : {},
+        ...worktreeMeta ? { worktree: worktreeMeta } : {}
       });
       if (daemonLog) {
         daemonLog.info(
@@ -19954,6 +20836,10 @@ function registerSessionRoutes(app, deps) {
               await new SessionService(runtime.workspaceCwd).removeSession(
                 session.sessionId
               );
+              if (worktreeMeta) {
+                await new GitWorktreeService(workspaceCwd).removeUserWorktree(worktreeMeta.slug, { deleteBranch: true }).catch(() => {
+                });
+              }
             }
           } catch {
           }
@@ -19963,14 +20849,128 @@ function registerSessionRoutes(app, deps) {
         }
         return;
       }
+      if (worktreeMeta) {
+        try {
+          const createAllowedRoots = [
+            path10.join(workspaceCwd, ".qwen", "worktrees")
+          ];
+          let createRepoTop = null;
+          try {
+            createRepoTop = await new GitWorktreeService(
+              workspaceCwd
+            ).getRepoTopLevel();
+          } catch {
+          }
+          if (createRepoTop && createRepoTop !== workspaceCwd) {
+            createAllowedRoots.push(
+              path10.join(createRepoTop, ".qwen", "worktrees")
+            );
+          }
+          await runtime.bridge.changeSessionCwd(session.sessionId, {
+            path: worktreeMeta.path,
+            allowedRoots: createAllowedRoots
+          });
+          await writeWorktreeSessionMarker(
+            worktreeMeta.path,
+            session.sessionId
+          ).catch(() => {
+          });
+          await writeWorktreeSession(
+            new SessionService(workspaceCwd).getWorktreeSessionPath(
+              session.sessionId
+            ),
+            {
+              slug: worktreeMeta.slug,
+              worktreePath: worktreeMeta.path,
+              worktreeBranch: worktreeMeta.branch,
+              originalCwd: workspaceCwd,
+              originalBranch: "",
+              originalHeadCommit: ""
+            }
+          ).catch(() => {
+          });
+        } catch (cdErr) {
+          if (daemonLog) {
+            daemonLog.warn("worktree cd failed, rolling back", {
+              sessionId: session.sessionId,
+              error: cdErr instanceof Error ? cdErr.message : String(cdErr)
+            });
+          }
+          const killed = await runtime.bridge.killSession(session.sessionId, { requireZeroAttaches: true }).catch(() => false);
+          if (killed) {
+            await new SessionService(workspaceCwd).removeSession(session.sessionId).catch(() => {
+            });
+          }
+          await new GitWorktreeService(workspaceCwd).removeUserWorktree(worktreeMeta.slug, { deleteBranch: true }).catch(() => {
+          });
+          res.status(500).json({
+            error: "Failed to relocate session into worktree",
+            code: "worktree_relocate_failed"
+          });
+          return;
+        }
+      }
       res.status(200).json(session);
     } catch (err) {
+      if (worktreeMeta) {
+        await new GitWorktreeService(workspaceCwd).removeUserWorktree(worktreeMeta.slug, { deleteBranch: true }).catch(() => {
+        });
+      }
       sendBridgeError2(res, err, { route: "POST /session" });
     }
   });
   const restoreSessionHandler = /* @__PURE__ */ __name((action) => async (req, res) => {
     const sessionId = requireSessionId(req, res);
     if (!sessionId) return;
+    const virtualKey = parseVirtualSubagentSessionId(sessionId);
+    if (virtualKey) {
+      const route2 = `POST /session/:id/${action}`;
+      if (action !== "load") {
+        res.status(400).json({
+          error: `Virtual subagent sessions do not support ${action}`,
+          code: "unsupported_action",
+          sessionId
+        });
+        return;
+      }
+      if (!virtualSubagentSessions) {
+        res.status(404).json({
+          error: `No session with id "${sessionId}"`,
+          code: "session_not_found",
+          sessionId
+        });
+        return;
+      }
+      const runtime2 = requireSessionRuntime({
+        sessionId: virtualKey.parentSessionId,
+        route: route2,
+        res,
+        workspaceRegistry,
+        daemonLog
+      });
+      if (!runtime2) return;
+      const clientId2 = parseClientIdHeader(req, res);
+      if (clientId2 === null) return;
+      try {
+        const session = await virtualSubagentSessions.load(
+          runtime2,
+          sessionId,
+          clientId2
+        );
+        if (!session) {
+          res.status(404).json({
+            error: "Subagent session not found",
+            code: "session_not_found",
+            sessionId
+          });
+          return;
+        }
+        res.status(200).json(session);
+      } catch (err) {
+        sendBridgeError2(res, err, { route: route2, sessionId });
+      }
+      return;
+    }
     const body = safeBody(req);
     const route = `POST /session/:id/${action}`;
     let resolvedRuntime;
@@ -20050,6 +21050,72 @@ function registerSessionRoutes(app, deps) {
         }
         return;
       }
+      if (!session.worktree) {
+        const sidecar = await readWorktreeSession(
+          new SessionService(workspaceCwd).getWorktreeSessionPath(sessionId)
+        ).catch(() => null);
+        if (sidecar) {
+          let realTarget;
+          const candidateRoots = [
+            path10.join(workspaceCwd, ".qwen", "worktrees")
+          ];
+          try {
+            realTarget = fs4.realpathSync(sidecar.worktreePath);
+            let repoTop = null;
+            try {
+              repoTop = await new GitWorktreeService(
+                workspaceCwd
+              ).getRepoTopLevel();
+            } catch {
+            }
+            if (repoTop && repoTop !== workspaceCwd) {
+              candidateRoots.push(path10.join(repoTop, ".qwen", "worktrees"));
+            }
+            const contained = candidateRoots.some((root) => {
+              try {
+                const realRoot = fs4.realpathSync(root);
+                const rel = path10.relative(realRoot, realTarget);
+                return !rel.startsWith("..") && !path10.isAbsolute(rel);
+              } catch {
+                return false;
+              }
+            });
+            if (!contained) {
+              realTarget = void 0;
+            }
+          } catch {
+            realTarget = void 0;
+          }
+          if (!realTarget) {
+            daemonLog?.warn("worktree sidecar path failed containment", {
+              sessionId,
+              path: sidecar.worktreePath
+            });
+          } else {
+            const wt = {
+              slug: sidecar.slug,
+              path: realTarget,
+              branch: sidecar.worktreeBranch
+            };
+            try {
+              if (!session.hasActivePrompt) {
+                await runtime.bridge.changeSessionCwd(sessionId, {
+                  path: wt.path,
+                  allowedRoots: candidateRoots
+                });
+              }
+              runtime.bridge.setSessionWorktree(sessionId, wt);
+              session.worktree = wt;
+            } catch (restoreErr) {
+              daemonLog?.warn("worktree restore failed on load/resume", {
+                sessionId,
+                worktreePath: wt.path,
+                error: restoreErr instanceof Error ? restoreErr.message : String(restoreErr)
+              });
+            }
+          }
+        }
+      }
       res.status(200).json(session);
     } catch (err) {
       sendBridgeError2(res, err, {
@@ -20062,6 +21128,112 @@ function registerSessionRoutes(app, deps) {
   }, "restoreSessionHandler");
   app.post("/session/:id/load", mutate(), restoreSessionHandler("load"));
   app.post("/session/:id/resume", mutate(), restoreSessionHandler("resume"));
+  app.get("/session/:id/subagents/:toolCallId", async (req, res) => {
+    const route = "GET /session/:id/subagents/:toolCallId";
+    const sessionId = requireSessionId(req, res);
+    if (!sessionId) return;
+    if (!virtualSubagentSessions) {
+      res.status(404).json({
+        error: `No session with id "${sessionId}"`,
+        code: "session_not_found",
+        sessionId
+      });
+      return;
+    }
+    const toolCallId = req.params["toolCallId"];
+    if (!toolCallId || toolCallId.length > 500) {
+      res.status(400).json({
+        error: "`toolCallId` must be a non-empty tool call id",
+        code: "invalid_tool_call_id"
+      });
+      return;
+    }
+    const runtime = requireSessionRuntime({
+      sessionId,
+      route,
+      res,
+      workspaceRegistry,
+      daemonLog
+    });
+    if (!runtime) return;
+    try {
+      const resolved = await virtualSubagentSessions.resolve(
+        runtime,
+        sessionId,
+        toolCallId
+      );
+      if (!resolved) {
+        res.status(404).json({
+          error: "Subagent session not found",
+          code: "session_not_found",
+          sessionId,
+          toolCallId
+        });
+        return;
+      }
+      res.status(200).set("Cache-Control", "no-store").json(resolved);
+    } catch (err) {
+      sendBridgeError2(res, err, { route, sessionId });
+    }
+  });
+  app.post(
+    "/session/:id/subagents/:toolCallId/cancel",
+    mutate(),
+    async (req, res) => {
+      const route = "POST /session/:id/subagents/:toolCallId/cancel";
+      const sessionId = requireSessionId(req, res);
+      if (!sessionId) return;
+      if (!virtualSubagentSessions) {
+        res.status(404).json({
+          error: `No session with id "${sessionId}"`,
+          code: "session_not_found",
+          sessionId
+        });
+        return;
+      }
+      const toolCallId = req.params["toolCallId"];
+      if (!toolCallId || toolCallId.length > 500) {
+        res.status(400).json({
+          error: "`toolCallId` must be a non-empty tool call id",
+          code: "invalid_tool_call_id"
+        });
+        return;
+      }
+      const runtime = requireSessionRuntime({
+        sessionId,
+        route,
+        res,
+        workspaceRegistry,
+        daemonLog
+      });
+      if (!runtime) return;
+      try {
+        const resolved = await virtualSubagentSessions.resolve(
+          runtime,
+          sessionId,
+          toolCallId
+        );
+        if (!resolved) {
+          res.status(404).json({
+            error: "Subagent session not found",
+            code: "session_not_found",
+            sessionId,
+            toolCallId
+          });
+          return;
+        }
+        res.status(200).json(
+          await runtime.bridge.cancelSessionTask(
+            sessionId,
+            resolved.taskId,
+            "agent"
+          )
+        );
+      } catch (err) {
+        sendBridgeError2(res, err, { route, sessionId });
+      }
+    }
+  );
   app.post(
     "/session/:id/branch",
     mutate(),
@@ -20131,7 +21303,7 @@ function registerSessionRoutes(app, deps) {
       async (req, res, sessionId) => {
         const body = safeBody(req);
         const targetPath = body["path"];
-        if (typeof targetPath !== "string" || targetPath.length === 0 || !path11.isAbsolute(targetPath)) {
+        if (typeof targetPath !== "string" || targetPath.length === 0 || !path10.isAbsolute(targetPath)) {
           res.status(400).json({
             error: "`path` is required and must be an absolute path",
             code: "invalid_path"
@@ -20361,6 +21533,28 @@ function registerSessionRoutes(app, deps) {
   });
   app.get(
     "/session/:id/context",
+    (req, res, next) => {
+      const sessionId = req.params["id"];
+      const key = sessionId ? parseVirtualSubagentSessionId(sessionId) : void 0;
+      if (!sessionId || !key) {
+        next();
+        return;
+      }
+      const runtime = requireSessionRuntime({
+        sessionId: key.parentSessionId,
+        route: "GET /session/:id/context",
+        res,
+        workspaceRegistry,
+        daemonLog
+      });
+      if (!runtime) return;
+      res.status(200).json({
+        v: 1,
+        sessionId,
+        workspaceCwd: runtime.workspaceCwd,
+        state: {}
+      });
+    },
     withOwnerReadSession(
       "GET /session/:id/context",
       async (_req, res, sessionId, runtime) => {
@@ -20392,6 +21586,28 @@ function registerSessionRoutes(app, deps) {
   );
   app.get(
     "/session/:id/supported-commands",
+    (req, res, next) => {
+      const sessionId = req.params["id"];
+      const key = sessionId ? parseVirtualSubagentSessionId(sessionId) : void 0;
+      if (!sessionId || !key) {
+        next();
+        return;
+      }
+      const runtime = requireSessionRuntime({
+        sessionId: key.parentSessionId,
+        route: "GET /session/:id/supported-commands",
+        res,
+        workspaceRegistry,
+        daemonLog
+      });
+      if (!runtime) return;
+      res.status(200).json({
+        v: 1,
+        sessionId,
+        availableCommands: [],
+        availableSkills: []
+      });
+    },
     withOwnerReadSession(
       "GET /session/:id/supported-commands",
       async (_req, res, sessionId, runtime) => {
@@ -20633,15 +21849,6 @@ function registerSessionRoutes(app, deps) {
           promptDeadlineMs,
           requestDeadlineMs
         );
-        let deadlineTimer;
-        if (effectiveDeadlineMs !== void 0) {
-          deadlineTimer = setTimeout(() => {
-            if (!abort.signal.aborted) {
-              abort.abort(new PromptDeadlineExceededError(effectiveDeadlineMs));
-            }
-          }, effectiveDeadlineMs);
-          deadlineTimer.unref();
-        }
         let promptPromise;
         try {
           promptPromise = ownerBridge.sendPrompt(
@@ -20654,11 +21861,11 @@ function registerSessionRoutes(app, deps) {
             abort.signal,
             {
               ...clientId !== void 0 ? { clientId } : {},
-              promptId
+              promptId,
+              ...effectiveDeadlineMs !== void 0 ? { deadlineMs: effectiveDeadlineMs } : {}
             }
           );
         } catch (err) {
-          if (deadlineTimer !== void 0) clearTimeout(deadlineTimer);
           res.off("close", onResClose);
           res.off("finish", onResFinish);
           if (daemonLog && err instanceof PromptQueueFullError) {
@@ -20703,9 +21910,7 @@ function registerSessionRoutes(app, deps) {
               );
             }
           }
-        ).finally(() => {
-          if (deadlineTimer !== void 0) clearTimeout(deadlineTimer);
-        }).catch(() => {
+        ).catch(() => {
         });
         if (daemonLog) {
           daemonLog.info("prompt enqueued", { sessionId, promptId, clientId });
@@ -20799,6 +22004,29 @@ function registerSessionRoutes(app, deps) {
   app.post(
     "/session/:id/heartbeat",
     mutate(),
+    (req, res, next) => {
+      const sessionId = req.params["id"];
+      const key = sessionId ? parseVirtualSubagentSessionId(sessionId) : void 0;
+      if (!sessionId || !key) {
+        next();
+        return;
+      }
+      const runtime = requireSessionRuntime({
+        sessionId: key.parentSessionId,
+        route: "POST /session/:id/heartbeat",
+        res,
+        workspaceRegistry,
+        daemonLog
+      });
+      if (!runtime) return;
+      const clientId = parseClientIdHeader(req, res);
+      if (clientId === null) return;
+      res.status(200).json({
+        sessionId,
+        ...clientId ? { clientId } : {},
+        lastSeenAt: Date.now()
+      });
+    },
     withOwnerMutableSession(
       "POST /session/:id/heartbeat",
       (req, res, sessionId, runtime) => {
@@ -20815,6 +22043,25 @@ function registerSessionRoutes(app, deps) {
   app.post(
     "/session/:id/detach",
     mutate(),
+    (req, res, next) => {
+      const sessionId = req.params["id"];
+      const key = sessionId ? parseVirtualSubagentSessionId(sessionId) : void 0;
+      if (!sessionId || !key) {
+        next();
+        return;
+      }
+      const runtime = requireSessionRuntime({
+        sessionId: key.parentSessionId,
+        route: "POST /session/:id/detach",
+        res,
+        workspaceRegistry,
+        daemonLog
+      });
+      if (!runtime) return;
+      const clientId = parseClientIdHeader(req, res);
+      if (clientId === null) return;
+      res.status(204).end();
+    },
     withOwnerMutableSession(
       "POST /session/:id/detach",
       async (req, res, sessionId, runtime) => {
@@ -22578,7 +23825,7 @@ __name(registerUsageStatsRoutes, "registerUsageStatsRoutes");
 // packages/cli/src/serve/scheduled-task-keepalive.ts
 init_esbuild_shims();
 import * as fsSync from "node:fs";
-import * as path12 from "node:path";
+import * as path11 from "node:path";
 var log = createDebugLogger("SCHED_KEEPALIVE");
 function collectBoundSessionIds(tasks) {
   const seen = /* @__PURE__ */ new Set();
@@ -22789,8 +24036,8 @@ function startScheduledTaskKeepalive(opts) {
   timer.unref?.();
   let bindDebounce;
   const cronFilePath = getCronFilePath(boundWorkspace);
-  const cronDir = path12.dirname(cronFilePath);
-  const cronFileName = path12.basename(cronFilePath);
+  const cronDir = path11.dirname(cronFilePath);
+  const cronFileName = path11.basename(cronFilePath);
   let fileWatcher;
   try {
     fsSync.mkdirSync(cronDir, { recursive: true });
@@ -22881,7 +24128,7 @@ async function rehydrateScheduledTaskSessions(deps) {
 }
 __name(rehydrateScheduledTaskSessions, "rehydrateScheduledTaskSessions");
 function withTimeout(p, ms, label) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const timer = setTimeout(() => {
       reject(new Error(`${label} timed out after ${ms}ms`));
     }, ms);
@@ -22889,7 +24136,7 @@ function withTimeout(p, ms, label) {
     p.then(
       (v) => {
         clearTimeout(timer);
-        resolve5(v);
+        resolve6(v);
       },
       (e) => {
         clearTimeout(timer);
@@ -22973,7 +24220,7 @@ function registerWorkspaceStatusRoutes(app, deps) {
       const ctx = buildWorkspaceCtx("POST /workspace/acp/preheat");
       const timeoutMsRaw = req.query["timeoutMs"];
       const timeoutMs = typeof timeoutMsRaw === "string" && timeoutMsRaw.trim() ? Number(timeoutMsRaw) : void 0;
-      if (timeoutMs !== void 0 && (!Number.isFinite(timeoutMs) || !Number.isInteger(timeoutMs) || timeoutMs <= 0 || timeoutMs > MAX_ACP_PREHEAT_TIMEOUT_MS)) {
+      if (timeoutMsRaw !== void 0 && (timeoutMs === void 0 || !Number.isFinite(timeoutMs) || !Number.isInteger(timeoutMs) || timeoutMs <= 0 || timeoutMs > MAX_ACP_PREHEAT_TIMEOUT_MS)) {
         res.status(400).json({
           error: "`timeoutMs` must be a positive integer no greater than 60000",
           code: "invalid_timeout"
@@ -23203,7 +24450,9 @@ function createServeFeatures(deps) {
     channelControlAvailable,
     sessionShellCommandEnabled,
     multiWorkspaceSessionsEnabled,
+    dynamicWorkspaceRegistrationAvailable,
     persistentWorkspaceRegistrationAvailable,
+    scratchWorkspaceRegistrationAvailable,
     workspaceRuntimeRemovalAvailable
   } = deps;
   const env = deps.env ?? process.env;
@@ -23237,7 +24486,9 @@ function createServeFeatures(deps) {
       channelReloadAvailable: channelReloadAvailable(),
       channelControlAvailable,
       multiWorkspaceSessionsEnabled: multiWorkspaceSessionsEnabled(),
+      dynamicWorkspaceRegistrationAvailable,
       persistentWorkspaceRegistrationAvailable,
+      scratchWorkspaceRegistrationAvailable: scratchWorkspaceRegistrationAvailable(),
       workspaceRuntimeRemovalAvailable,
       acpHttpEnabled: resolveAcpHttpEnabled(),
       clientMcpOverWsEnabled: opts.clientMcpOverWs === true,
@@ -23307,6 +24558,7 @@ function registerCapabilitiesRoutes(app, deps) {
       workspaces: runtimes.map((runtime) => ({
         id: runtime.workspaceId,
         cwd: runtime.workspaceCwd,
+        ...runtime.displayName !== void 0 ? { displayName: runtime.displayName } : {},
         primary: runtime.primary,
         trusted: runtime.trusted,
         ...runtimeRemoval ? { removable: runtime.removable === true } : {}
@@ -23979,6 +25231,12 @@ init_esbuild_shims();
 
 // packages/cli/src/serve/server/error-response.ts
 init_esbuild_shims();
+var SESSION_WRITER_ERROR_MESSAGES = {
+  session_writer_conflict: "This session is already open in another Qwen process.",
+  session_writer_lost: "Write ownership for this session was lost.",
+  session_transcript_changed: "The session transcript changed outside its active writer.",
+  session_writer_unavailable: "Session write ownership could not be verified."
+};
 function bridgeErrorExtraContext(ctx) {
   const extra = {};
   for (const [key, value] of Object.entries(ctx ?? {})) {
@@ -24031,6 +25289,14 @@ function sendPermissionVoteError(res, err, ctx, daemonLog) {
 }
 __name(sendPermissionVoteError, "sendPermissionVoteError");
 function sendBridgeError(res, err, ctx, daemonLog) {
+  if (err instanceof SessionWriterError) {
+    res.status(err.httpStatus).json({
+      error: err.message,
+      code: err.errorKind,
+      errorKind: err.errorKind
+    });
+    return;
+  }
   if (err instanceof WorkspaceSkillNotFoundError) {
     res.status(404).json({
       error: err.message,
@@ -24343,6 +25609,22 @@ function sendBridgeError(res, err, ctx, daemonLog) {
     const data = err.data;
     if (data && typeof data === "object") {
       const kind = data.errorKind;
+      if (kind === "session_writer_conflict" || kind === "session_writer_lost" || kind === "session_transcript_changed") {
+        res.status(409).json({
+          error: SESSION_WRITER_ERROR_MESSAGES[kind],
+          code: kind,
+          errorKind: kind
+        });
+        return;
+      }
+      if (kind === "session_writer_unavailable") {
+        res.status(503).json({
+          error: SESSION_WRITER_ERROR_MESSAGES[kind],
+          code: kind,
+          errorKind: kind
+        });
+        return;
+      }
       if (kind === "mcp_budget_would_exceed") {
         const d = data;
         res.status(409).json({
@@ -24544,7 +25826,7 @@ data: ${dataJson}
 __name(formatSseFrame, "formatSseFrame");
 function registerSseEventsRoutes(app, deps) {
   const { workspaceRegistry, daemonLog, sendBridgeError: sendBridgeError2, writerIdleTimeoutMs } = deps;
-  app.get("/session/:id/events", (req, res) => {
+  app.get("/session/:id/events", async (req, res) => {
     const sessionId = req.params["id"];
     const lastEventId = parseLastEventId(req.headers["last-event-id"]);
     const maxQueued = parseMaxQueuedQuery(req.query["maxQueued"], res);
@@ -24552,8 +25834,9 @@ function registerSseEventsRoutes(app, deps) {
     let iter;
     const abort = new AbortController();
     try {
+      const virtualKey = parseVirtualSubagentSessionId(sessionId);
       const runtime = requireSessionRuntime({
-        sessionId,
+        sessionId: virtualKey?.parentSessionId ?? sessionId,
         route: "GET /session/:id/events",
         res,
         workspaceRegistry,
@@ -24561,12 +25844,24 @@ function registerSseEventsRoutes(app, deps) {
       });
       if (!runtime) return;
       const snapshot = req.query["snapshot"] === "1";
-      const iterable = runtime.bridge.subscribeEvents(sessionId, {
+      const iterable = virtualKey ? await deps.virtualSubagentSessions?.subscribe(runtime, sessionId, {
+        signal: abort.signal,
+        lastEventId,
+        ...maxQueued !== void 0 ? { maxQueued } : {}
+      }) : runtime.bridge.subscribeEvents(sessionId, {
         signal: abort.signal,
         lastEventId,
         ...maxQueued !== void 0 ? { maxQueued } : {},
         ...snapshot ? { snapshot: true } : {}
       });
+      if (!iterable) {
+        res.status(404).json({
+          error: "Subagent session not found",
+          code: "session_not_found",
+          sessionId
+        });
+        return;
+      }
       iter = iterable[Symbol.asyncIterator]();
     } catch (err) {
       if (err instanceof SubscriberLimitExceededError) {
@@ -24619,9 +25914,9 @@ function registerSseEventsRoutes(app, deps) {
     let writeChain = Promise.resolve();
     const trackWriterIdle = writerIdleTimeoutMs !== void 0 && writerIdleTimeoutMs > 0;
     let lastWriteAt = trackWriterIdle ? Date.now() : 0;
-    const doWrite = /* @__PURE__ */ __name((chunk) => new Promise((resolve5, reject) => {
+    const doWrite = /* @__PURE__ */ __name((chunk) => new Promise((resolve6, reject) => {
       if (res.writableEnded) {
-        resolve5();
+        resolve6();
         return;
       }
       let ok;
@@ -24633,19 +25928,19 @@ function registerSseEventsRoutes(app, deps) {
       }
       if (ok) {
         if (trackWriterIdle) lastWriteAt = Date.now();
-        resolve5();
+        resolve6();
         return;
       }
       const onDrain = /* @__PURE__ */ __name(() => {
         res.off("close", onClose);
         res.off("error", onError);
         if (trackWriterIdle) lastWriteAt = Date.now();
-        resolve5();
+        resolve6();
       }, "onDrain");
       const onClose = /* @__PURE__ */ __name(() => {
         res.off("drain", onDrain);
         res.off("error", onError);
-        resolve5();
+        resolve6();
       }, "onClose");
       const onError = /* @__PURE__ */ __name((err) => {
         res.off("drain", onDrain);
@@ -24974,7 +26269,7 @@ __name(registerWorkspaceModelsRoutes, "registerWorkspaceModelsRoutes");
 // packages/cli/src/serve/routes/a2ui-action.ts
 init_esbuild_shims();
 import * as fsp4 from "node:fs/promises";
-import * as path13 from "node:path";
+import * as path12 from "node:path";
 var A2UI_MIME = "application/a2ui+json";
 var ACTION_TOOL = "action";
 var CALL_TIMEOUT_MS = 15e3;
@@ -24997,7 +26292,7 @@ __name(usableServerConfig, "usableServerConfig");
 async function findFromSettingsFile(workspaceCwd) {
   try {
     const raw = await fsp4.readFile(
-      path13.join(workspaceCwd, ".qwen", "settings.json"),
+      path12.join(workspaceCwd, ".qwen", "settings.json"),
       "utf8"
     );
     const settings = JSON.parse(raw);
@@ -25134,7 +26429,7 @@ __name(registerA2uiActionRoutes, "registerA2uiActionRoutes");
 
 // packages/cli/src/serve/server/fs-factory.ts
 init_esbuild_shims();
-import * as path14 from "node:path";
+import * as path13 from "node:path";
 var IDE_WORKSPACE_PATH_ENV_VAR = "QWEN_CODE_IDE_WORKSPACE_PATH";
 function createDefaultFsAuditEmit() {
   const WARN_EVERY = 100;
@@ -25208,14 +26503,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 && path14.isAbsolute(workspace)
+          (workspace) => workspace.length > 0 && path13.isAbsolute(workspace)
         );
       }
       throw new Error("IDE workspace path JSON must be a string array");
     } catch {
     }
   }
-  return value.split(path14.delimiter).filter((workspace) => workspace.length > 0 && path14.isAbsolute(workspace));
+  return value.split(path13.delimiter).filter((workspace) => workspace.length > 0 && path13.isAbsolute(workspace));
 }
 __name(parseIdeWorkspacePathEnv, "parseIdeWorkspacePathEnv");
 function dropNestedWorkspacesPreservingPrimary(workspaces) {
@@ -25714,45 +27009,201 @@ function registerWorkspaceQualifiedLifecycleRoutes(app, deps) {
         deps.sendBridgeError(res, err, { route });
       }
     }
-  );
-}
-__name(registerWorkspaceQualifiedLifecycleRoutes, "registerWorkspaceQualifiedLifecycleRoutes");
-
-// packages/cli/src/serve/routes/workspace-management.ts
-init_esbuild_shims();
-import { readdir, stat } from "node:fs/promises";
-import { realpathSync } from "node:fs";
-import { basename as basename4, dirname as dirname4, isAbsolute as isAbsolute7, join as join7, resolve as resolve4, sep as sep3 } from "node:path";
-var MAX_PATH_SUGGESTIONS = 50;
-function registerWorkspaceManagementRoutes(app, deps) {
-  const {
-    workspaceRegistry,
-    mutate,
-    safeBody: safeBody2,
-    createWorkspaceRuntime,
-    workspaceRegistrationStore,
-    getAcpHandle,
-    runtimeRemoval
-  } = deps;
-  const inFlight = /* @__PURE__ */ new Map();
-  let sealed = false;
-  let activeOperations = 0;
-  const idleWaiters = /* @__PURE__ */ new Set();
-  const operationStarted = /* @__PURE__ */ __name(() => {
-    activeOperations++;
-  }, "operationStarted");
-  const operationFinished = /* @__PURE__ */ __name(() => {
-    activeOperations--;
-    if (activeOperations !== 0) return;
-    for (const resolveIdle of idleWaiters) resolveIdle();
-    idleWaiters.clear();
-  }, "operationFinished");
-  const sendSealed = /* @__PURE__ */ __name((res) => {
-    res.status(503).json({
-      error: "Daemon is shutting down",
-      code: "daemon_shutting_down"
-    });
-  }, "sendSealed");
+  );
+}
+__name(registerWorkspaceQualifiedLifecycleRoutes, "registerWorkspaceQualifiedLifecycleRoutes");
+
+// packages/cli/src/serve/routes/workspace-management.ts
+init_esbuild_shims();
+import { readdir as readdir2, stat as stat2 } from "node:fs/promises";
+import { realpathSync as realpathSync2 } from "node:fs";
+import { basename as basename4, dirname as dirname4, isAbsolute as isAbsolute7, join as join8, resolve as resolve4, sep as sep3 } from "node:path";
+var MAX_PATH_SUGGESTIONS = 50;
+function registerWorkspaceManagementRoutes(app, deps) {
+  const {
+    workspaceRegistry,
+    mutate,
+    safeBody: safeBody2,
+    createWorkspaceRuntime,
+    managedScratchRoot,
+    workspaceRegistrationStore,
+    getAcpHandle,
+    runtimeRemoval
+  } = deps;
+  const inFlight = /* @__PURE__ */ new Map();
+  let sealed = false;
+  let activeOperations = 0;
+  let pendingScratchCreations = 0;
+  const idleWaiters = /* @__PURE__ */ new Set();
+  const operationStarted = /* @__PURE__ */ __name(() => {
+    activeOperations++;
+  }, "operationStarted");
+  const operationFinished = /* @__PURE__ */ __name(() => {
+    activeOperations--;
+    if (activeOperations !== 0) return;
+    for (const resolveIdle of idleWaiters) resolveIdle();
+    idleWaiters.clear();
+  }, "operationFinished");
+  const sendSealed = /* @__PURE__ */ __name((res) => {
+    res.status(503).json({
+      error: "Daemon is shutting down",
+      code: "daemon_shutting_down"
+    });
+  }, "sendSealed");
+  const attachRegistrationIds = /* @__PURE__ */ __name((runtime, registrationIds) => {
+    runtime.registrationIds ??= [];
+    for (const registrationId of registrationIds) {
+      if (!runtime.registrationIds.includes(registrationId)) {
+        runtime.registrationIds.push(registrationId);
+      }
+    }
+  }, "attachRegistrationIds");
+  const restorePersistedDisplayName = /* @__PURE__ */ __name(async (runtime, canonical) => {
+    const snapshot = await workspaceRegistrationStore.read();
+    const storedWorkspace = snapshot.workspaces.find(
+      (stored) => process.platform === "win32" ? stored.toLowerCase() === canonical.toLowerCase() : stored === canonical
+    );
+    const storedDisplayName = storedWorkspace ? snapshot.displayNames?.[workspaceRegistrationId(storedWorkspace)] : void 0;
+    if (storedWorkspace) {
+      attachRegistrationIds(runtime, [
+        workspaceRegistrationId(storedWorkspace)
+      ]);
+    }
+    if (storedDisplayName === void 0) {
+      delete runtime.displayName;
+    } else {
+      runtime.displayName = storedDisplayName;
+    }
+  }, "restorePersistedDisplayName");
+  const projectedWorkspaceCount = /* @__PURE__ */ __name(() => {
+    const cwdSet = new Set(
+      workspaceRegistry.listManaged().map((runtime) => runtime.workspaceCwd)
+    );
+    for (const [cwd, operation] of inFlight) {
+      if (operation === "addition") cwdSet.add(cwd);
+    }
+    return cwdSet.size + pendingScratchCreations;
+  }, "projectedWorkspaceCount");
+  const createScratchWorkspace = /* @__PURE__ */ __name(async (res) => {
+    if (!createWorkspaceRuntime || !managedScratchRoot || !runtimeRemoval) {
+      res.status(501).json({
+        error: "Scratch workspace registration is not available",
+        code: "scratch_not_available"
+      });
+      return;
+    }
+    if (sealed) {
+      sendSealed(res);
+      return;
+    }
+    if (workspaceRegistry.listManaged().some(
+      (runtime2) => !isScratchRootCompatible(
+        runtime2.workspaceCwd,
+        managedScratchRoot.canonicalRoot
+      )
+    ) || [...inFlight].some(
+      ([cwd, operation]) => operation === "addition" && !isScratchRootCompatible(cwd, managedScratchRoot.canonicalRoot)
+    )) {
+      res.status(409).json({
+        error: "Managed scratch root conflicts with a registered workspace",
+        code: "scratch_root_conflict"
+      });
+      return;
+    }
+    if (projectedWorkspaceCount() >= MAX_REGISTERED_WORKSPACES) {
+      res.status(409).json({
+        error: "Workspace registration limit reached",
+        code: "workspace_limit_reached"
+      });
+      return;
+    }
+    pendingScratchCreations++;
+    operationStarted();
+    let reservationHeld = true;
+    let canonical;
+    let runtime;
+    let registered = false;
+    try {
+      canonical = await createManagedScratchDirectory(managedScratchRoot);
+      if (sealed) {
+        sendSealed(res);
+        return;
+      }
+      pendingScratchCreations--;
+      reservationHeld = false;
+      inFlight.set(canonical, "addition");
+      const boundCwds = workspaceRegistry.listManaged().map((entry) => entry.workspaceCwd);
+      for (const [cwd, operation] of inFlight) {
+        if (operation === "addition" && cwd !== canonical) boundCwds.push(cwd);
+      }
+      if (boundCwds.some(
+        (cwd) => !isScratchRootCompatible(cwd, managedScratchRoot.canonicalRoot) || isWithinRoot(canonical, cwd) || isWithinRoot(cwd, canonical)
+      )) {
+        res.status(409).json({
+          error: "Workspace path nests with an existing workspace",
+          code: "workspace_nested"
+        });
+        return;
+      }
+      if (sealed) {
+        sendSealed(res);
+        return;
+      }
+      runtime = await createWorkspaceRuntime(canonical, {
+        provenance: "managed-scratch"
+      });
+      if (runtime.workspaceCwd !== canonical || runtime.primary || !runtime.trusted) {
+        throw new Error(
+          "Scratch runtime violated the managed runtime contract"
+        );
+      }
+      if (sealed) {
+        sendSealed(res);
+        return;
+      }
+      workspaceRegistry.add(runtime);
+      registered = true;
+      try {
+        await runtimeRemoval.runtimeAdded?.(runtime);
+      } catch (err) {
+        try {
+          writeStderrLine(
+            `qwen serve: workspace runtime adapter notification failed after registry add: ${err instanceof Error ? err.message : String(err)}`
+          );
+        } catch {
+        }
+      }
+      res.status(201).json({
+        id: runtime.workspaceId,
+        cwd: runtime.workspaceCwd,
+        primary: false,
+        trusted: true,
+        persisted: false
+      });
+    } catch (err) {
+      writeStderrLine(
+        `qwen serve: scratch workspace registration failed: ${err instanceof Error ? err.message : String(err)}${canonical ? `; retained directory: ${canonical}` : ""}`
+      );
+      if (!res.headersSent) {
+        res.status(500).json({
+          error: "Failed to register scratch workspace",
+          code: "runtime_creation_failed"
+        });
+      }
+    } finally {
+      if (runtime && !registered) {
+        await runtimeRemoval.disposeRuntime(runtime, "workspace_removed").catch(() => {
+          try {
+            runtime?.bridge.killAllSync();
+          } catch {
+          }
+        });
+      }
+      if (reservationHeld) pendingScratchCreations--;
+      if (canonical) inFlight.delete(canonical);
+      operationFinished();
+    }
+  }, "createScratchWorkspace");
   app.get(
     "/workspace-path-suggestions",
     async (req, res) => {
@@ -25780,13 +27231,13 @@ function registerWorkspaceManagementRoutes(app, deps) {
         return;
       }
       const endsWithSep = prefix.endsWith("/") || process.platform === "win32" && prefix.endsWith("\\");
-      const dir = endsWithSep ? join7(prefix, ".") : dirname4(prefix);
+      const dir = endsWithSep ? join8(prefix, ".") : dirname4(prefix);
       const filter = endsWithSep ? "" : basename4(prefix);
       const filterLower = filter.toLowerCase();
       const suggestions = [];
       let truncated = false;
       try {
-        const entries = await readdir(dir, { withFileTypes: true });
+        const entries = await readdir2(dir, { withFileTypes: true });
         entries.sort((a, b) => a.name.localeCompare(b.name));
         for (const entry of entries) {
           if (entry.name.startsWith(".") && !filter.startsWith(".")) continue;
@@ -25796,7 +27247,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
           let isDir = entry.isDirectory();
           if (!isDir && entry.isSymbolicLink()) {
             try {
-              isDir = (await stat(join7(dir, entry.name))).isDirectory();
+              isDir = (await stat2(join8(dir, entry.name))).isDirectory();
             } catch {
               continue;
             }
@@ -25806,7 +27257,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
             truncated = true;
             break;
           }
-          suggestions.push({ name: entry.name, path: join7(dir, entry.name) });
+          suggestions.push({ name: entry.name, path: join8(dir, entry.name) });
         }
       } catch {
       }
@@ -25824,8 +27275,33 @@ function registerWorkspaceManagementRoutes(app, deps) {
     mutate({ strict: true }),
     async (req, res) => {
       const body = safeBody2(req);
+      if ("kind" in body) {
+        if (body["kind"] !== "scratch" || "cwd" in body || "persist" in body || Object.keys(body).some((key) => key !== "kind")) {
+          res.status(400).json({
+            error: 'Scratch workspace requests must be exactly { kind: "scratch" }',
+            code: "invalid_workspace_request"
+          });
+          return;
+        }
+        await createScratchWorkspace(res);
+        return;
+      }
       const cwd = body["cwd"];
       const persist = body["persist"] ?? false;
+      const hasDisplayName = Object.hasOwn(body, "displayName");
+      let displayName;
+      if (hasDisplayName) {
+        try {
+          displayName = normalizeWorkspaceDisplayName(body["displayName"]);
+        } catch (err) {
+          if (!(err instanceof WorkspaceDisplayNameValidationError)) throw err;
+          res.status(400).json({
+            error: err.message,
+            code: "invalid_display_name"
+          });
+          return;
+        }
+      }
       if (typeof cwd !== "string" || cwd.trim().length === 0) {
         res.status(400).json({
           error: "`cwd` must be a non-empty string",
@@ -25854,23 +27330,24 @@ function registerWorkspaceManagementRoutes(app, deps) {
         });
         return;
       }
-      if (!isAbsolute7(cwd)) {
+      if (cwd.length > MAX_WORKSPACE_PATH_LENGTH) {
         res.status(400).json({
-          error: "`cwd` must be an absolute path",
+          error: `\`cwd\` exceeds the ${MAX_WORKSPACE_PATH_LENGTH}-character limit`,
           code: "invalid_path"
         });
         return;
       }
-      if (cwd.length > MAX_WORKSPACE_PATH_LENGTH) {
+      const sandboxCwd = translateAndCheckAbsoluteWorkspacePath(cwd);
+      if (sandboxCwd === null) {
         res.status(400).json({
-          error: `\`cwd\` exceeds the ${MAX_WORKSPACE_PATH_LENGTH}-character limit`,
+          error: "`cwd` must be an absolute path",
           code: "invalid_path"
         });
         return;
       }
       let canonical;
       try {
-        canonical = realpathSync.native(resolve4(cwd));
+        canonical = realpathSync2.native(resolve4(sandboxCwd));
       } catch {
         res.status(400).json({
           error: "Path does not exist or is not accessible",
@@ -25878,12 +27355,19 @@ function registerWorkspaceManagementRoutes(app, deps) {
         });
         return;
       }
+      if (managedScratchRoot && !isScratchRootCompatible(canonical, managedScratchRoot.canonicalRoot)) {
+        res.status(409).json({
+          error: "Workspace path conflicts with the managed scratch root",
+          code: "scratch_root_conflict"
+        });
+        return;
+      }
       if (sealed) {
         sendSealed(res);
         return;
       }
       try {
-        const s = await stat(canonical);
+        const s = await stat2(canonical);
         if (!s.isDirectory()) {
           res.status(400).json({
             error: "Path is not a directory",
@@ -25945,11 +27429,12 @@ function registerWorkspaceManagementRoutes(app, deps) {
         operationStarted();
         try {
           const snapshot = await workspaceRegistrationStore.read();
-          const alreadyPersisted = snapshot.workspaces.some(
+          const persistedWorkspaces = snapshot.workspaces.filter(
             (stored) => existingRuntime.registrationIds?.includes(
               workspaceRegistrationId(stored)
             ) === true || (process.platform === "win32" ? stored.toLowerCase() === canonical.toLowerCase() : stored === canonical)
           );
+          const alreadyPersisted = persistedWorkspaces.length > 0;
           if (!alreadyPersisted && snapshot.workspaces.length >= MAX_REGISTERED_WORKSPACES - 1) {
             res.status(409).json({
               error: "Workspace registration limit reached",
@@ -25957,22 +27442,56 @@ function registerWorkspaceManagementRoutes(app, deps) {
             });
             return;
           }
-          if (!alreadyPersisted) {
+          if (alreadyPersisted) {
+            attachRegistrationIds(
+              existingRuntime,
+              persistedWorkspaces.map(workspaceRegistrationId)
+            );
+            const storedDisplayName = persistedWorkspaces.map(
+              (stored) => snapshot.displayNames?.[workspaceRegistrationId(stored)]
+            ).find((name) => name !== void 0);
+            if (storedDisplayName === void 0) {
+              delete existingRuntime.displayName;
+            } else {
+              existingRuntime.displayName = storedDisplayName;
+            }
+          } else {
+            let added = false;
             try {
-              await workspaceRegistrationStore.add(canonical);
+              const persistedDisplayName = hasDisplayName ? displayName : existingRuntime.displayName;
+              added = persistedDisplayName === void 0 ? await workspaceRegistrationStore.add(canonical) : await workspaceRegistrationStore.add(
+                canonical,
+                persistedDisplayName
+              );
             } catch (err) {
               if (!(err instanceof WorkspaceRegistrationStoreCommittedError)) {
                 throw err;
               }
+              added = true;
               try {
                 writeStderrLine(`qwen serve: ${err.message}`);
               } catch {
               }
             }
+            if (added) {
+              attachRegistrationIds(existingRuntime, [
+                workspaceRegistrationId(canonical)
+              ]);
+            }
+            if (added && hasDisplayName) {
+              if (displayName === void 0) {
+                delete existingRuntime.displayName;
+              } else {
+                existingRuntime.displayName = displayName;
+              }
+            } else if (!added) {
+              await restorePersistedDisplayName(existingRuntime, canonical);
+            }
           }
           res.status(200).json({
             id: existingRuntime.workspaceId,
             cwd: existingRuntime.workspaceCwd,
+            ...existingRuntime.displayName !== void 0 ? { displayName: existingRuntime.displayName } : {},
             primary: existingRuntime.primary,
             trusted: existingRuntime.trusted,
             persisted: true
@@ -26027,13 +27546,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
           return;
         }
       }
-      const projectedWorkspaceCwds = new Set(
-        workspaceRegistry.listManaged().map((runtime) => runtime.workspaceCwd)
-      );
-      for (const [cwd2, operation] of inFlight) {
-        if (operation === "addition") projectedWorkspaceCwds.add(cwd2);
-      }
-      if (projectedWorkspaceCwds.size >= MAX_REGISTERED_WORKSPACES) {
+      if (projectedWorkspaceCount() >= MAX_REGISTERED_WORKSPACES) {
         res.status(409).json({
           error: "Workspace registration limit reached",
           code: "workspace_limit_reached"
@@ -26044,13 +27557,21 @@ function registerWorkspaceManagementRoutes(app, deps) {
       operationStarted();
       let persistenceFailed = false;
       try {
-        const runtime = await createWorkspaceRuntime(canonical);
+        const runtime = await createWorkspaceRuntime(canonical, {
+          provenance: "existing"
+        });
+        if (!persist && displayName !== void 0) {
+          runtime.displayName = displayName;
+        }
         let persistedRecordAdded = false;
         try {
           if (persist) {
             try {
               try {
-                persistedRecordAdded = await workspaceRegistrationStore.add(canonical);
+                persistedRecordAdded = displayName === void 0 ? await workspaceRegistrationStore.add(canonical) : await workspaceRegistrationStore.add(
+                  canonical,
+                  displayName
+                );
               } catch (err) {
                 if (!(err instanceof WorkspaceRegistrationStoreCommittedError)) {
                   throw err;
@@ -26061,6 +27582,16 @@ function registerWorkspaceManagementRoutes(app, deps) {
                 } catch {
                 }
               }
+              if (persistedRecordAdded) {
+                attachRegistrationIds(runtime, [
+                  workspaceRegistrationId(canonical)
+                ]);
+                if (displayName !== void 0) {
+                  runtime.displayName = displayName;
+                }
+              } else {
+                await restorePersistedDisplayName(runtime, canonical);
+              }
             } catch (err) {
               persistenceFailed = true;
               throw err;
@@ -26104,6 +27635,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
         res.status(201).json({
           id: runtime.workspaceId,
           cwd: runtime.workspaceCwd,
+          ...runtime.displayName !== void 0 ? { displayName: runtime.displayName } : {},
           primary: runtime.primary,
           trusted: runtime.trusted,
           ...persist ? { persisted: true } : {}
@@ -26171,6 +27703,98 @@ function registerWorkspaceManagementRoutes(app, deps) {
     });
     return void 0;
   }, "resolveManagedRuntime");
+  app.patch(
+    "/workspaces/:workspace",
+    mutate({ strict: true }),
+    async (req, res) => {
+      const body = safeBody2(req);
+      const unsupportedField = Object.keys(body).find(
+        (field) => field !== "displayName"
+      );
+      if (unsupportedField) {
+        res.status(400).json({
+          error: `\`${unsupportedField}\` is not an updatable workspace field`,
+          code: "unsupported_field"
+        });
+        return;
+      }
+      if (!Object.hasOwn(body, "displayName")) {
+        res.status(400).json({
+          error: "No updatable fields provided",
+          code: "empty_patch"
+        });
+        return;
+      }
+      let displayName;
+      try {
+        displayName = body["displayName"] === null ? void 0 : normalizeWorkspaceDisplayName(body["displayName"]);
+      } catch (err) {
+        if (!(err instanceof WorkspaceDisplayNameValidationError)) throw err;
+        res.status(400).json({
+          error: err.message,
+          code: "invalid_display_name"
+        });
+        return;
+      }
+      if (sealed) {
+        sendSealed(res);
+        return;
+      }
+      const runtime = resolveManagedRuntime(req, res);
+      if (!runtime) return;
+      if (inFlight.has(runtime.workspaceCwd)) {
+        res.status(409).json({
+          error: "Workspace registration is in progress",
+          code: "workspace_registration_in_progress"
+        });
+        return;
+      }
+      inFlight.set(runtime.workspaceCwd, "update");
+      operationStarted();
+      try {
+        if (workspaceRegistrationStore && runtime.registrationIds !== void 0 && runtime.registrationIds.length > 0) {
+          try {
+            await workspaceRegistrationStore.setDisplayNameByIds(
+              runtime.registrationIds,
+              displayName
+            );
+          } catch (err) {
+            if (!(err instanceof WorkspaceRegistrationStoreCommittedError)) {
+              throw err;
+            }
+            try {
+              writeStderrLine(`qwen serve: ${err.message}`);
+            } catch {
+            }
+          }
+        }
+        if (displayName === void 0) {
+          delete runtime.displayName;
+        } else {
+          runtime.displayName = displayName;
+        }
+        res.status(200).json({
+          id: runtime.workspaceId,
+          cwd: runtime.workspaceCwd,
+          ...runtime.displayName !== void 0 ? { displayName: runtime.displayName } : {},
+          primary: runtime.primary,
+          trusted: runtime.trusted,
+          ...runtimeRemoval ? { removable: runtime.removable === true } : {}
+        });
+      } catch (err) {
+        writeStderrLine(
+          `qwen serve: failed to persist workspace display name: ${err instanceof Error ? err.message : String(err)}`
+        );
+        res.status(500).json({
+          error: "Failed to persist workspace display name",
+          code: "workspace_registration_store_error"
+        });
+      } finally {
+        inFlight.delete(runtime.workspaceCwd);
+        operationFinished();
+      }
+    }
+  );
   app.delete(
     "/workspaces/:workspace",
     mutate({ strict: true }),
@@ -26406,11 +28030,13 @@ function registerWorkspaceManagementRoutes(app, deps) {
         schemaVersion: snapshot.schemaVersion,
         primaryWorkspace: snapshot.primaryWorkspace,
         entries: snapshot.workspaces.map((cwd) => {
+          const registrationId = workspaceRegistrationId(cwd);
           const runtime = workspaceRegistry.getByWorkspaceCwd(cwd);
           return {
-            id: workspaceRegistrationId(cwd),
+            id: registrationId,
             cwd,
-            active: runtime !== void 0 || registrationIsActive(workspaceRegistrationId(cwd)),
+            ...snapshot.displayNames?.[registrationId] !== void 0 ? { displayName: snapshot.displayNames[registrationId] } : {},
+            active: runtime !== void 0 || registrationIsActive(registrationId),
             persisted: true
           };
         })
@@ -26468,7 +28094,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
           }
           if (storedCwd) {
             try {
-              operationCwd = realpathSync.native(resolve4(storedCwd));
+              operationCwd = realpathSync2.native(resolve4(storedCwd));
             } catch {
               operationCwd = resolve4(storedCwd);
             }
@@ -26508,6 +28134,11 @@ function registerWorkspaceManagementRoutes(app, deps) {
           });
           return;
         }
+        if (runtime?.registrationIds) {
+          runtime.registrationIds = runtime.registrationIds.filter(
+            (id) => id !== registrationId
+          );
+        }
         res.json({
           removed: true,
           active,
@@ -26539,6 +28170,8 @@ __name(registerWorkspaceManagementRoutes, "registerWorkspaceManagementRoutes");
 
 // packages/cli/src/serve/routes/workspace-git.ts
 init_esbuild_shims();
+import * as fs5 from "node:fs";
+import * as path14 from "node:path";
 function registerWorkspaceGitRoutes(app, deps) {
   app.get("/workspace/git", async (_req, res) => {
     try {
@@ -26560,10 +28193,43 @@ function registerWorkspaceQualifiedGitRoutes(app, deps) {
     const runtime = resolveTrustedRuntime2(deps.workspaceRegistry, req, res);
     if (!runtime) return;
     const route = "GET /workspaces/:workspace/git";
+    const rawCwd = req.query["cwd"];
+    let gitCwd = runtime.workspaceCwd;
+    if (typeof rawCwd === "string" && rawCwd.length > 0) {
+      try {
+        const resolved = fs5.realpathSync(path14.resolve(rawCwd));
+        const root = fs5.realpathSync(runtime.workspaceCwd);
+        const rel = path14.relative(root, resolved);
+        if (!rel.startsWith("..") && !path14.isAbsolute(rel)) {
+          gitCwd = resolved;
+        }
+      } catch {
+      }
+    }
     try {
-      res.status(200).json(
-        await deps.gitState.getStatus(runtime.workspaceCwd, runtime.bridge)
-      );
+      if (gitCwd !== runtime.workspaceCwd) {
+        const status = await getGitWorkingTreeStatus(gitCwd).catch(() => null);
+        res.status(200).json(
+          status ? {
+            v: 2,
+            workspaceCwd: gitCwd,
+            branch: status.branch ?? null,
+            detached: status.detached,
+            staged: status.staged,
+            unstaged: status.unstaged,
+            untracked: status.untracked,
+            conflicted: status.conflicted,
+            hasUpstream: status.hasUpstream,
+            ahead: status.ahead,
+            behind: status.behind,
+            stashCount: status.stashCount,
+            ...status.operation ? { operation: status.operation } : {},
+            computedAt: Date.now()
+          } : { v: 2, workspaceCwd: gitCwd, branch: null }
+        );
+      } else {
+        res.status(200).json(await deps.gitState.getStatus(gitCwd, runtime.bridge));
+      }
     } catch (err) {
       deps.sendBridgeError(res, err, { route });
     }
@@ -26716,6 +28382,163 @@ function registerWorkspaceQualifiedGitDiffRoutes(app, deps) {
 }
 __name(registerWorkspaceQualifiedGitDiffRoutes, "registerWorkspaceQualifiedGitDiffRoutes");
 
+// packages/cli/src/serve/routes/workspace-git-log.ts
+init_esbuild_shims();
+function buildLogList(workspaceCwd, result) {
+  if (!result) {
+    return {
+      v: 1,
+      workspaceCwd,
+      available: false,
+      entries: [],
+      hasMore: false
+    };
+  }
+  return {
+    v: 1,
+    workspaceCwd,
+    available: true,
+    entries: result.entries.map((e) => ({
+      sha: e.sha,
+      shortSha: e.shortSha,
+      authorName: e.authorName,
+      authorEmail: e.authorEmail,
+      authorDate: e.authorDate,
+      subject: e.subject,
+      ...e.refs ? { refs: e.refs } : {},
+      parents: e.parents
+    })),
+    hasMore: result.hasMore
+  };
+}
+__name(buildLogList, "buildLogList");
+function buildCommitDetail(workspaceCwd, result) {
+  if (!result) {
+    return { v: 1, workspaceCwd, available: false };
+  }
+  return {
+    v: 1,
+    workspaceCwd,
+    available: true,
+    sha: result.sha,
+    shortSha: result.shortSha,
+    authorName: result.authorName,
+    authorEmail: result.authorEmail,
+    authorDate: result.authorDate,
+    subject: result.subject,
+    body: result.body,
+    ...result.refs ? { refs: result.refs } : {},
+    parents: result.parents,
+    files: result.files.map((f) => ({
+      path: f.path,
+      added: f.added,
+      removed: f.removed,
+      isBinary: f.isBinary
+    })),
+    filesCount: result.filesCount,
+    linesAdded: result.linesAdded,
+    linesRemoved: result.linesRemoved,
+    hiddenCount: result.hiddenCount
+  };
+}
+__name(buildCommitDetail, "buildCommitDetail");
+function parsePagination(req) {
+  const rawLimit = req.query["limit"];
+  const rawSkip = req.query["skip"];
+  const parsedLimit = typeof rawLimit === "string" ? parseInt(rawLimit, 10) : NaN;
+  const parsedSkip = typeof rawSkip === "string" ? parseInt(rawSkip, 10) : NaN;
+  const limit = Math.min(
+    Math.max(Number.isNaN(parsedLimit) ? DEFAULT_LOG_LIMIT : parsedLimit, 1),
+    MAX_LOG_LIMIT
+  );
+  const skip = Math.max(Number.isNaN(parsedSkip) ? 0 : parsedSkip, 0);
+  return { limit, skip };
+}
+__name(parsePagination, "parsePagination");
+async function handleLogList(req, res, workspaceCwd, sendBridgeError2, route) {
+  try {
+    applyReadHeaders(res);
+    const { limit, skip } = parsePagination(req);
+    const result = await fetchGitLog(workspaceCwd, { limit, skip });
+    res.status(200).json(buildLogList(workspaceCwd, result));
+  } catch (err) {
+    sendBridgeError2(res, err, { route });
+  }
+}
+__name(handleLogList, "handleLogList");
+async function handleCommitDetail(req, res, workspaceCwd, sendBridgeError2, route) {
+  const sha = req.query["sha"];
+  if (typeof sha !== "string" || sha.length === 0 || !/^[0-9a-f]{7,40}$/i.test(sha)) {
+    applyReadHeaders(res);
+    res.status(400).json({
+      errorKind: "parse_error",
+      error: "sha query parameter is required",
+      status: 400
+    });
+    return;
+  }
+  try {
+    applyReadHeaders(res);
+    const result = await fetchGitCommitDetail(workspaceCwd, sha);
+    res.status(200).json(buildCommitDetail(workspaceCwd, result));
+  } catch (err) {
+    sendBridgeError2(res, err, { route });
+  }
+}
+__name(handleCommitDetail, "handleCommitDetail");
+function registerWorkspaceGitLogRoutes(app, deps) {
+  app.get("/workspace/git/log", (req, res) => {
+    void handleLogList(
+      req,
+      res,
+      deps.boundWorkspace,
+      deps.sendBridgeError,
+      "GET /workspace/git/log"
+    );
+  });
+  app.get("/workspace/git/log/commit", (req, res) => {
+    void handleCommitDetail(
+      req,
+      res,
+      deps.boundWorkspace,
+      deps.sendBridgeError,
+      "GET /workspace/git/log/commit"
+    );
+  });
+}
+__name(registerWorkspaceGitLogRoutes, "registerWorkspaceGitLogRoutes");
+function resolveTrustedRuntime4(registry, req, res) {
+  const runtime = resolveWorkspaceRuntimeFromParam(registry, req, res);
+  if (!runtime) return null;
+  return requireTrustedWorkspaceRuntime(runtime, res) ? runtime : null;
+}
+__name(resolveTrustedRuntime4, "resolveTrustedRuntime");
+function registerWorkspaceQualifiedGitLogRoutes(app, deps) {
+  app.get("/workspaces/:workspace/git/log", (req, res) => {
+    const runtime = resolveTrustedRuntime4(deps.workspaceRegistry, req, res);
+    if (!runtime) return;
+    void handleLogList(
+      req,
+      res,
+      runtime.workspaceCwd,
+      deps.sendBridgeError,
+      "GET /workspaces/:workspace/git/log"
+    );
+  });
+  app.get("/workspaces/:workspace/git/log/commit", (req, res) => {
+    const runtime = resolveTrustedRuntime4(deps.workspaceRegistry, req, res);
+    if (!runtime) return;
+    void handleCommitDetail(
+      req,
+      res,
+      runtime.workspaceCwd,
+      deps.sendBridgeError,
+      "GET /workspaces/:workspace/git/log/commit"
+    );
+  });
+}
+__name(registerWorkspaceQualifiedGitLogRoutes, "registerWorkspaceQualifiedGitLogRoutes");
+
 // packages/cli/src/serve/workspace-git-state.ts
 init_esbuild_shims();
 var WorkspaceGitState = class {
@@ -28423,7 +30246,16 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     }, "channelReloadAvailable"),
     sessionShellCommandEnabled,
     multiWorkspaceSessionsEnabled: /* @__PURE__ */ __name(() => workspaceRegistry.list().length > 1, "multiWorkspaceSessionsEnabled"),
+    dynamicWorkspaceRegistrationAvailable: deps.createWorkspaceRuntime !== void 0,
     persistentWorkspaceRegistrationAvailable: deps.workspaceRegistrationStore !== void 0,
+    // Scratch creation is advertised only while every managed runtime still
+    // respects the root boundary and a complete disposal owner is present.
+    scratchWorkspaceRegistrationAvailable: /* @__PURE__ */ __name(() => deps.createWorkspaceRuntime !== void 0 && deps.managedScratchRoot !== void 0 && deps.workspaceRuntimeRemoval !== void 0 && workspaceRegistry.listManaged().every(
+      (runtime) => isScratchRootCompatible(
+        runtime.workspaceCwd,
+        deps.managedScratchRoot.canonicalRoot
+      )
+    ), "scratchWorkspaceRegistrationAvailable"),
     workspaceRuntimeRemovalAvailable: deps.workspaceRuntimeRemoval !== void 0,
     ...primaryEffectiveEnv ? { env: primaryEffectiveEnv } : {}
   });
@@ -28446,6 +30278,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     maxPendingPromptsPerSession: opts.maxPendingPromptsPerSession,
     eventRingSize: opts.eventRingSize,
     compactedReplayMaxBytes: opts.compactedReplayMaxBytes,
+    initializeTimeoutMs: opts.initializeTimeoutMs,
     permissionResponseTimeoutMs: opts.permissionResponseTimeoutMs,
     boundWorkspace,
     sessionShellCommandEnabled,
@@ -28722,6 +30555,14 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     workspaceRegistry,
     sendBridgeError: sendBridgeError2
   });
+  registerWorkspaceGitLogRoutes(app, {
+    boundWorkspace: primaryBoundWorkspace,
+    sendBridgeError: sendBridgeError2
+  });
+  registerWorkspaceQualifiedGitLogRoutes(app, {
+    workspaceRegistry,
+    sendBridgeError: sendBridgeError2
+  });
   mountWorkspaceMemoryRoutes(app, {
     bridge: primaryBridge,
     boundWorkspace: primaryBoundWorkspace,
@@ -28821,6 +30662,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     mutate,
     safeBody,
     createWorkspaceRuntime: deps.createWorkspaceRuntime,
+    managedScratchRoot: deps.managedScratchRoot,
     workspaceRegistrationStore: deps.workspaceRegistrationStore,
     getAcpHandle: /* @__PURE__ */ __name(() => acpHandleRef.current, "getAcpHandle"),
     runtimeRemoval: deps.workspaceRuntimeRemoval
@@ -28924,6 +30766,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     allowPrivateAuthBaseUrl: opts.allowPrivateAuthBaseUrl === true,
     installAuthProvider: deps.installAuthProvider
   });
+  const virtualSubagentSessions = new VirtualSubagentSessions();
   registerSessionRoutes(app, {
     boundWorkspace: primaryBoundWorkspace,
     bridge: primaryBridge,
@@ -28934,7 +30777,8 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     daemonLog,
     promptDeadlineMs: opts.promptDeadlineMs,
     sessionShellCommandEnabled,
-    languageCodes
+    languageCodes,
+    virtualSubagentSessions
   });
   registerWorkspaceMcpControlRoutes(app, {
     boundWorkspace: primaryBoundWorkspace,
@@ -29100,7 +30944,8 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     workspaceRegistry,
     daemonLog,
     writerIdleTimeoutMs: opts.writerIdleTimeoutMs,
-    sendBridgeError: sendBridgeError2
+    sendBridgeError: sendBridgeError2,
+    virtualSubagentSessions
   });
   acpHandleRef.current = mountAcpHttp(app, primaryBridge, {
     boundWorkspace: primaryBoundWorkspace,