@qwen-code/qwen-code 0.19.7-nightly.20260708.394c1a289 → 0.19.8

package/chunks/{server-GEOYEPYT.js → server-SGNPKX2O.js}

@@ -11,7 +11,7 @@ import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-2YELHTUE.js";
+} from "./chunk-PUVCVELY.js";
 import {
   SetupGithubError,
   collectSessionData,
@@ -22,62 +22,10 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-FK77ILF5.js";
-import "./chunk-ZK5EI6NR.js";
+} from "./chunk-BVYU3ZTI.js";
+import "./chunk-XYR5RUA5.js";
 import "./chunk-LGFAYIKX.js";
 import "./chunk-54YZOP7P.js";
-import {
-  createDaemonStatusProvider
-} from "./chunk-FB2ULV4M.js";
-import "./chunk-BHRU4SDF.js";
-import "./chunk-KHDZHZMH.js";
-import {
-  createWorkspaceProvidersStatusProvider
-} from "./chunk-B6WUEODT.js";
-import {
-  getAuthTypeFromEnv,
-  resolveCliGenerationConfig
-} from "./chunk-KT3SI3CQ.js";
-import {
-  createWorkspaceSkillsStatusProvider
-} from "./chunk-VTCPREC7.js";
-import "./chunk-6IAWPIQ6.js";
-import {
-  EMPTY_WORKSPACE_VOICE_UPDATE_ERROR,
-  WorkspaceVoiceError,
-  buildWorkspaceVoiceSettingsWrites,
-  buildWorkspaceVoiceStatus,
-  createDaemonWorkspaceService,
-  hasConfiguredBatchVoiceTranscriptionModel,
-  transcribeWorkspaceVoiceAudio,
-  validateWorkspaceVoiceState,
-  voiceSettingsScopeToWire
-} from "./chunk-UZCT5OLN.js";
-import {
-  PermissionRulesValidationError,
-  buildPermissionSettings,
-  isPermissionRuleType,
-  normalizePermissionRules,
-  readPermissionRuleSet
-} from "./chunk-5FL2K3ZB.js";
-import {
-  assertVoiceBaseUrlNetworkAllowed,
-  isStreamingVoiceModel,
-  resolveVoiceStreamConfig,
-  resolveVoiceTranscriptionConfig,
-  sanitizeVoiceErrorMessage,
-  transcribeVoiceAudio
-} from "./chunk-B5FOCTEZ.js";
-import {
-  isVoiceEnabled,
-  isVoiceMode,
-  readVoiceModel
-} from "./chunk-3QDZDAJG.js";
-import "./chunk-E7KNELIZ.js";
-import {
-  WorkspacePermissionRulesSessionRequiredError,
-  WorkspaceSettingsPartialPersistError
-} from "./chunk-BMFMJINR.js";
 import {
   CAPABILITIES_SCHEMA_VERSION,
   CLIENT_ID_HEADER,
@@ -123,28 +71,84 @@ import {
   setRateLimiter,
   unsafeRevealSecret,
   validateMcpRuntimeServerName
-} from "./chunk-RFIL6REB.js";
+} from "./chunk-YKZIAK7C.js";
 import {
   isLoopbackBind
 } from "./chunk-RNBYOUGV.js";
 import "./chunk-3HX5LZ6R.js";
 import "./chunk-7RYW5LQV.js";
 import {
-  getDialogSettingKeys,
-  getNestedProperty,
-  getSettingDefinition,
-  loadSettings,
-  validateSettingValue
-} from "./chunk-QHT5USLK.js";
+  createDaemonStatusProvider
+} from "./chunk-L46XKEGM.js";
+import "./chunk-JZHIQJOE.js";
+import "./chunk-KHDZHZMH.js";
 import {
-  SUPPORTED_LANGUAGES
-} from "./chunk-TBLJNMI7.js";
-import "./chunk-TLRYABYP.js";
-import "./chunk-4RQIB5UZ.js";
+  createWorkspaceProvidersStatusProvider
+} from "./chunk-SQ2UATK7.js";
+import {
+  getAuthTypeFromEnv,
+  resolveCliGenerationConfig
+} from "./chunk-DIWVZ3VM.js";
+import {
+  snapshotProcessEnv
+} from "./chunk-O7FIRWJV.js";
+import {
+  createWorkspaceSkillsStatusProvider
+} from "./chunk-OQXDAMKY.js";
+import "./chunk-6IAWPIQ6.js";
+import {
+  EMPTY_WORKSPACE_VOICE_UPDATE_ERROR,
+  WorkspaceVoiceError,
+  buildWorkspaceVoiceSettingsWrites,
+  buildWorkspaceVoiceStatus,
+  createDaemonWorkspaceService,
+  hasConfiguredBatchVoiceTranscriptionModel,
+  transcribeWorkspaceVoiceAudio,
+  validateWorkspaceVoiceState,
+  voiceSettingsScopeToWire
+} from "./chunk-YHKAK72D.js";
+import {
+  PermissionRulesValidationError,
+  buildPermissionSettings,
+  isPermissionRuleType,
+  normalizePermissionRules,
+  readPermissionRuleSet
+} from "./chunk-JRQ7EVGE.js";
+import {
+  assertVoiceBaseUrlNetworkAllowed,
+  isStreamingVoiceModel,
+  resolveVoiceStreamConfig,
+  resolveVoiceTranscriptionConfig,
+  sanitizeVoiceErrorMessage,
+  transcribeVoiceAudio
+} from "./chunk-VGGOPZUL.js";
+import {
+  isVoiceEnabled,
+  isVoiceMode,
+  readVoiceModel
+} from "./chunk-ZE6E424U.js";
+import "./chunk-E7KNELIZ.js";
+import {
+  WorkspacePermissionRulesSessionRequiredError,
+  WorkspaceSettingsPartialPersistError
+} from "./chunk-BMFMJINR.js";
+import {
+  createTotalSessionAdmissionController
+} from "./chunk-ZL5HN75Q.js";
+import {
+  createSingleWorkspaceRegistry
+} from "./chunk-XNXVCNAT.js";
+import "./chunk-V35MD7KN.js";
 import {
   SessionArtifactValidationError,
   createAcpSessionBridge
-} from "./chunk-OU6FPTJZ.js";
+} from "./chunk-PMFULMLX.js";
+import "./chunk-AGHU5VRK.js";
+import {
+  EVENT_SCHEMA_VERSION,
+  SubscriberLimitExceededError
+} from "./chunk-3UP777ZS.js";
+import "./chunk-GLE2YUPU.js";
 import "./chunk-P7M4GA57.js";
 import {
   BranchWhilePromptActiveError,
@@ -169,36 +173,49 @@ import {
   SessionNotFoundError,
   SessionShellClientRequiredError,
   SessionShellDisabledError,
+  TotalSessionLimitExceededError,
   WorkspaceInitConflictError,
   WorkspaceInitPathEscapeError,
   WorkspaceInitRaceError,
   WorkspaceInitSymlinkError,
   WorkspaceMismatchError
-} from "./chunk-B34OV7K2.js";
-import "./chunk-AGHU5VRK.js";
+} from "./chunk-GGQQA4JW.js";
 import {
   MAX_WORKSPACE_PATH_LENGTH,
   canonicalizeWorkspace,
   canonicalizeWorkspaces
 } from "./chunk-ER3BKOLB.js";
 import {
-  EVENT_SCHEMA_VERSION,
-  SubscriberLimitExceededError
-} from "./chunk-G7ZG7CA6.js";
+  QWEN_SERVER_TOKEN_ENV
+} from "./chunk-S6RLAIUR.js";
 import "./chunk-VRDMOSQS.js";
-import "./chunk-K34DD7FH.js";
+import {
+  getDialogSettingKeys,
+  getNestedProperty,
+  getSettingDefinition,
+  loadSettings,
+  validateSettingValue
+} from "./chunk-M7S4GK5Z.js";
+import {
+  SUPPORTED_LANGUAGES
+} from "./chunk-O33TBKDC.js";
+import "./chunk-TLRYABYP.js";
+import "./chunk-BOBRZZKD.js";
+import "./chunk-O2YT7VB4.js";
+import "./chunk-Z3I3QJK3.js";
+import "./chunk-BOBOCR5H.js";
 import "./chunk-EXPMGZZV.js";
 import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceMemoryStatus,
   mapDomainErrorToErrorKind
-} from "./chunk-ME344634.js";
+} from "./chunk-LAXNEOBG.js";
 import "./chunk-HLKG6CZN.js";
-import "./chunk-XUSONNJ4.js";
+import "./chunk-UXEW557D.js";
 import "./chunk-43W4YSO6.js";
 import {
   getWorkspaceTrustStatus
-} from "./chunk-MOQOAH7N.js";
+} from "./chunk-DICGXFAI.js";
 import {
   writeStderrLine
 } from "./chunk-Y6Z2O3WR.js";
@@ -232,13 +249,13 @@ import {
   encodeTextFileContent,
   glob,
   loadIgnoreRules,
-  loadUsageHistory,
+  loadUsageHistoryWithLive,
   parseInstallSource,
   redactUrlCredentials,
   shouldShowStep,
   stripTerminalControlSequences,
   writeWorkspaceContextFile
-} from "./chunk-E7HM76PR.js";
+} from "./chunk-3GNOQZDC.js";
 import "./chunk-5P5XGNYH.js";
 import "./chunk-SKAZWEV5.js";
 import "./chunk-K5PGHDBN.js";
@@ -269,7 +286,7 @@ import {
   APPROVAL_MODES,
   SubagentError,
   SubagentErrorCode
-} from "./chunk-VEB3NYSO.js";
+} from "./chunk-5MBO76SL.js";
 import "./chunk-GO6LNQXT.js";
 import "./chunk-NQKLOAVJ.js";
 import "./chunk-WMPVYQ4P.js";
@@ -288,12 +305,12 @@ import {
   recordDaemonHttpRequest,
   recordDaemonHttpResponse,
   withDaemonRequestSpan
-} from "./chunk-7I4MGFBN.js";
+} from "./chunk-BUZ6HGL4.js";
 import "./chunk-E6US47KI.js";
 import "./chunk-UWCTAVOD.js";
 import "./chunk-OFEVLU4C.js";
 import "./chunk-OMX7CUOE.js";
-import "./chunk-4KJ2BPIT.js";
+import "./chunk-OACJLMLD.js";
 import "./chunk-SUAKHHK7.js";
 import "./chunk-FEJ2FZ3U.js";
 import "./chunk-X3YGAX7V.js";
@@ -350,9 +367,6 @@ import { createHash as createHash3, timingSafeEqual } from "node:crypto";
 init_esbuild_shims();
 import path8 from "node:path";
 
-// packages/cli/src/serve/acp-session-bridge.ts
-init_esbuild_shims();
-
 // packages/cli/src/serve/fs/errors.ts
 init_esbuild_shims();
 var DEFAULT_STATUS_BY_KIND = {
@@ -3252,7 +3266,8 @@ function cloneTask(task) {
         removedEntries: task.result.removedEntries.map((entry) => ({
           ...entry
         })),
-        touchedTopics: [...task.result.touchedTopics]
+        touchedTopics: [...task.result.touchedTopics],
+        touchedScopes: [...task.result.touchedScopes]
       } : void 0
     };
   }
@@ -3457,7 +3472,8 @@ var WorkspaceRememberTaskLane = class _WorkspaceRememberTaskLane {
         task.result = {
           summary: result.summary ?? formatWorkspaceMemoryForgetSummary(result.removedEntries.length),
           removedEntries: result.removedEntries,
-          touchedTopics: result.touchedTopics
+          touchedTopics: result.touchedTopics,
+          touchedScopes: result.touchedScopes
         };
         task.updatedAt = nowIso();
       } catch (err) {
@@ -3479,7 +3495,7 @@ var WorkspaceRememberTaskLane = class _WorkspaceRememberTaskLane {
           this.publishManagedMemoryChanged({
             source: "workspace_memory_forget",
             taskId: task.taskId,
-            touchedScopes: touchedScopesFromTopics(task.result.touchedTopics),
+            touchedScopes: task.result.touchedScopes,
             ...params.originatorClientId ? { originatorClientId: params.originatorClientId } : {}
           });
         }
@@ -5720,7 +5736,27 @@ function toRpcError(err) {
     case "InvalidClientIdError":
       return { code: RPC.INVALID_PARAMS, message: errMsg(err) };
     case "SessionLimitExceededError":
-      return { code: RPC.INTERNAL_ERROR, message: errMsg(err) };
+      return {
+        code: RPC.INTERNAL_ERROR,
+        message: errMsg(err),
+        data: {
+          errorKind: "session_limit_exceeded",
+          limit: err.limit,
+          scope: "workspace",
+          retryable: true
+        }
+      };
+    case "TotalSessionLimitExceededError":
+      return {
+        code: RPC.INTERNAL_ERROR,
+        message: errMsg(err),
+        data: {
+          errorKind: "session_limit_exceeded",
+          limit: err.limit,
+          scope: err.scope,
+          retryable: true
+        }
+      };
     case "PromptQueueFullError": {
       const promptErr = err;
       return {
@@ -11447,14 +11483,14 @@ function readVoiceModel2(settings) {
   return trimmed.length > 0 ? trimmed : void 0;
 }
 __name(readVoiceModel2, "readVoiceModel");
-function buildModelsConfig(settings) {
+function buildModelsConfig(settings, env) {
   const merged = settings.merged;
-  const selectedAuthType = merged.security?.auth?.selectedType ?? getAuthTypeFromEnv();
+  const selectedAuthType = merged.security?.auth?.selectedType ?? getAuthTypeFromEnv(env);
   const resolvedCliConfig = resolveCliGenerationConfig({
     argv: {},
     settings: merged,
     selectedAuthType,
-    env: process.env
+    env
   });
   return new ModelsConfig({
     initialAuthType: selectedAuthType,
@@ -11464,17 +11500,29 @@ function buildModelsConfig(settings) {
   });
 }
 __name(buildModelsConfig, "buildModelsConfig");
-function loadDaemonVoiceContext(workspaceCwd) {
-  const settings = loadSettings(workspaceCwd);
+function loadDaemonVoiceContext(workspaceCwd, options = {}) {
+  const settings = loadSettings(
+    workspaceCwd,
+    options.env ? { skipLoadEnvironment: true } : true
+  );
   const voiceModel = readVoiceModel2(settings);
   if (!voiceModel) {
     throw new Error("No voice model is configured for this workspace.");
   }
-  const models = buildModelsConfig(settings);
-  resolveVoiceTranscriptionConfig({ config: models, settings, voiceModel });
+  const models = buildModelsConfig(
+    settings,
+    options.env ?? snapshotProcessEnv()
+  );
+  resolveVoiceTranscriptionConfig({
+    config: models,
+    settings,
+    voiceModel,
+    env: options.env
+  });
   return {
     settings,
     models,
+    ...options.env ? { env: options.env } : {},
     voiceModel,
     streaming: isStreamingVoiceModel(voiceModel)
   };
@@ -11514,7 +11562,8 @@ async function defaultOpenStream(ctx, callbacks) {
     const cfg = resolveVoiceStreamConfig({
       config: ctx.models,
       settings: ctx.settings,
-      voiceModel: ctx.voiceModel
+      voiceModel: ctx.voiceModel,
+      env: ctx.env
     });
     await assertVoiceBaseUrlNetworkAllowed(cfg);
     return await openVoiceStreamWithRetry(
@@ -11529,7 +11578,12 @@ __name(defaultOpenStream, "defaultOpenStream");
 function defaultTranscribe(ctx, pcm) {
   return transcribeVoiceAudio(
     { data: encodeWav(pcm), mimeType: "audio/wav" },
-    { config: ctx.models, settings: ctx.settings, voiceModel: ctx.voiceModel }
+    {
+      config: ctx.models,
+      settings: ctx.settings,
+      voiceModel: ctx.voiceModel,
+      env: ctx.env
+    }
   ).catch((error2) => {
     debugLogger3.debug(
       `[voice-ws] batch transcription error: ${errMessage(error2)}`
@@ -11568,7 +11622,7 @@ function parseControl(text) {
 }
 __name(parseControl, "parseControl");
 function createVoiceWsConnectionHandler(boundWorkspace, deps = {}) {
-  const loadContext = deps.loadContext ?? loadDaemonVoiceContext;
+  const loadContext = deps.loadContext ?? ((workspaceCwd) => loadDaemonVoiceContext(workspaceCwd, { env: deps.env }));
   const openStream = deps.openStream ?? defaultOpenStream;
   const transcribe = deps.transcribe ?? defaultTranscribe;
   let activeSessions = 0;
@@ -11976,6 +12030,7 @@ function registerDaemonStatusRoutes(app, deps) {
           opts: deps.opts,
           boundWorkspace: deps.boundWorkspace,
           bridge: deps.bridge,
+          workspaceRegistry: deps.workspaceRegistry,
           workspace: deps.workspace,
           daemonLog: deps.daemonLog,
           startup: deps.startup,
@@ -11990,7 +12045,8 @@ function registerDaemonStatusRoutes(app, deps) {
           sessionShellCommandEnabled: deps.sessionShellCommandEnabled,
           getChannelWorkerSnapshot: deps.getChannelWorkerSnapshot,
           getPerfSnapshot: deps.getPerfSnapshot,
-          getMetricsSeries: deps.getMetricsSeries
+          getMetricsSeries: deps.getMetricsSeries,
+          getTotalSessionAdmissionSnapshot: deps.getTotalSessionAdmissionSnapshot
         })
       );
     } catch (err) {
@@ -14282,8 +14338,88 @@ __name(registerWorkspaceTrustRoutes, "registerWorkspaceTrustRoutes");
 
 // packages/cli/src/serve/routes/permission.ts
 init_esbuild_shims();
+
+// packages/cli/src/serve/routes/session-runtime.ts
+init_esbuild_shims();
+function requireSessionRuntime(opts) {
+  const {
+    sessionId,
+    route,
+    res,
+    workspaceRegistry,
+    daemonLog,
+    details = {}
+  } = opts;
+  if (workspaceRegistry.list().length === 1) {
+    return workspaceRegistry.primary;
+  }
+  const resolution = workspaceRegistry.resolveLiveSessionOwner(sessionId);
+  if (resolution.kind === "found") {
+    const runtime = resolution.runtime;
+    if (!runtime.primary && !runtime.trusted) {
+      daemonLog?.warn("session routing failed", {
+        route,
+        resolutionKind: "untrusted_workspace",
+        sessionId,
+        workspaceId: runtime.workspaceId,
+        workspaceCwd: runtime.workspaceCwd,
+        ...details
+      });
+      res.status(403).json({
+        error: `Workspace "${runtime.workspaceCwd}" is not trusted.`,
+        code: "untrusted_workspace",
+        sessionId,
+        workspaceId: runtime.workspaceId,
+        workspaceCwd: runtime.workspaceCwd
+      });
+      return void 0;
+    }
+    return runtime;
+  }
+  if (resolution.kind === "not_found") {
+    daemonLog?.warn("session routing failed", {
+      route,
+      resolutionKind: "not_found",
+      sessionId,
+      ...details
+    });
+    res.status(404).json({
+      error: `No session with id "${sessionId}"`,
+      code: "session_not_found",
+      sessionId
+    });
+    return void 0;
+  }
+  const workspaceIds = resolution.runtimes.map(
+    (runtime) => runtime.workspaceId
+  );
+  daemonLog?.warn("session routing failed", {
+    route,
+    resolutionKind: "ambiguous",
+    sessionId,
+    workspaceIds,
+    ...details
+  });
+  res.status(500).json({
+    error: `Session owner is ambiguous for "${sessionId}"`,
+    code: "ambiguous_session_owner",
+    sessionId,
+    route,
+    workspaceIds
+  });
+  return void 0;
+}
+__name(requireSessionRuntime, "requireSessionRuntime");
+
+// packages/cli/src/serve/routes/permission.ts
 function registerPermissionRoutes(app, deps) {
-  const { bridge, mutate, sendPermissionVoteError: sendPermissionVoteError2 } = deps;
+  const {
+    bridge,
+    workspaceRegistry,
+    daemonLog,
+    mutate,
+    sendPermissionVoteError: sendPermissionVoteError2
+  } = deps;
   app.post("/session/:id/permission/:requestId", mutate(), (req, res) => {
     const sessionId = req.params["id"];
     const requestId = req.params["requestId"];
@@ -14298,7 +14434,16 @@ function registerPermissionRoutes(app, deps) {
     };
     let accepted;
     try {
-      accepted = bridge.respondToSessionPermission(
+      const runtime = requireSessionRuntime({
+        sessionId,
+        route: "POST /session/:id/permission/:requestId",
+        res,
+        workspaceRegistry,
+        daemonLog,
+        details: { requestId }
+      });
+      if (!runtime) return;
+      accepted = runtime.bridge.respondToSessionPermission(
         sessionId,
         requestId,
         response,
@@ -14425,6 +14570,25 @@ function encodeOrganizedCursor(last, group, archiveState) {
   ).toString("base64url");
 }
 __name(encodeOrganizedCursor, "encodeOrganizedCursor");
+function parseLiveSessionCursor(cursor) {
+  if (cursor === "") return void 0;
+  try {
+    const parsed = JSON.parse(
+      Buffer.from(cursor, "base64url").toString("utf8")
+    );
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed) || typeof parsed.activityTime !== "number" || !Number.isFinite(parsed.activityTime) || typeof parsed.sessionId !== "string" || parsed.sessionId.length === 0) {
+      throw new Error("invalid live cursor");
+    }
+    return parsed;
+  } catch {
+    throw new InvalidCursorError(cursor, "live");
+  }
+}
+__name(parseLiveSessionCursor, "parseLiveSessionCursor");
+function encodeLiveSessionCursor(last) {
+  return Buffer.from(JSON.stringify(last), "utf8").toString("base64url");
+}
+__name(encodeLiveSessionCursor, "encodeLiveSessionCursor");
 function toSummary2(item) {
   return {
     sessionId: item.sessionId,
@@ -14470,6 +14634,19 @@ function getSummaryActivityTime(session) {
   return Number.isFinite(time) ? time : 0;
 }
 __name(getSummaryActivityTime, "getSummaryActivityTime");
+function getLiveSessionCursorKey(session) {
+  return {
+    activityTime: getSummaryActivityTime(session),
+    sessionId: session.sessionId
+  };
+}
+__name(getLiveSessionCursorKey, "getLiveSessionCursorKey");
+function compareLiveSessionCursorKeys(a, b) {
+  const byTime = b.activityTime - a.activityTime;
+  if (byTime !== 0) return byTime;
+  return a.sessionId.localeCompare(b.sessionId);
+}
+__name(compareLiveSessionCursorKeys, "compareLiveSessionCursorKeys");
 function compareOrganizedSessions(activityTimeById, a, b) {
   return compareOrganizedCursorKeys(
     getOrganizedCursorKey(activityTimeById, a),
@@ -14677,6 +14854,31 @@ async function listWorkspaceSessionsForResponse(bridge, workspaceCwd, options) {
   return { sessions, nextCursor };
 }
 __name(listWorkspaceSessionsForResponse, "listWorkspaceSessionsForResponse");
+function listLiveWorkspaceSessionsForResponse(bridge, workspaceCwd, options) {
+  const rawSize = options?.size;
+  const requestedSize = typeof rawSize === "number" && Number.isSafeInteger(rawSize) ? rawSize : DEFAULT_SESSION_PAGE_SIZE;
+  const pageSize = Math.min(Math.max(requestedSize, 1), MAX_SESSION_PAGE_SIZE);
+  const cursorKey = options?.cursor !== void 0 ? parseLiveSessionCursor(options.cursor) : void 0;
+  const sessions = bridge.listWorkspaceSessions(workspaceCwd).sort(
+    (a, b) => compareLiveSessionCursorKeys(
+      getLiveSessionCursorKey(a),
+      getLiveSessionCursorKey(b)
+    )
+  );
+  const afterCursor = cursorKey === void 0 ? sessions : sessions.filter(
+    (session) => compareLiveSessionCursorKeys(
+      cursorKey,
+      getLiveSessionCursorKey(session)
+    ) < 0
+  );
+  const page = afterCursor.slice(0, pageSize);
+  const nextCursor = page.length < afterCursor.length ? encodeLiveSessionCursor(getLiveSessionCursorKey(page[page.length - 1])) : void 0;
+  return {
+    sessions: page,
+    ...nextCursor !== void 0 ? { nextCursor } : {}
+  };
+}
+__name(listLiveWorkspaceSessionsForResponse, "listLiveWorkspaceSessionsForResponse");
 function parseSessionPageSizeQuery(raw) {
   if (typeof raw !== "string") return void 0;
   const trimmed = raw.trim();
@@ -14780,6 +14982,7 @@ function registerSessionRoutes(app, deps) {
   const {
     boundWorkspace,
     bridge,
+    workspaceRegistry,
     archiveCoordinator,
     mutate,
     sendBridgeError: sendBridgeError2,
@@ -14788,6 +14991,158 @@ function registerSessionRoutes(app, deps) {
     sessionShellCommandEnabled
   } = deps;
   const LANGUAGE_CODES = deps.languageCodes;
+  const logSessionRoutingFailure = /* @__PURE__ */ __name((route, resolutionKind, details = {}) => {
+    daemonLog?.warn("session routing failed", {
+      route,
+      resolutionKind,
+      ...details
+    });
+  }, "logSessionRoutingFailure");
+  const sendWorkspaceMismatch = /* @__PURE__ */ __name((res, requestedWorkspace) => {
+    const runtimes = workspaceRegistry.list();
+    if (runtimes.length > 1) {
+      res.status(400).json({
+        error: `Workspace mismatch: daemon is bound to ${runtimes.length} workspaces; none matched the requested workspace.`,
+        code: "workspace_mismatch",
+        boundWorkspace,
+        workspaceCount: runtimes.length,
+        requestedWorkspace
+      });
+      return;
+    }
+    res.status(400).json({
+      error: `Workspace mismatch: daemon is bound to "${boundWorkspace}"`,
+      code: "workspace_mismatch",
+      boundWorkspace,
+      requestedWorkspace
+    });
+  }, "sendWorkspaceMismatch");
+  const resolveRuntimeForSessionCreation = /* @__PURE__ */ __name((body, res) => {
+    const cwd = parseOptionalWorkspaceCwd(body, boundWorkspace, res);
+    if (cwd === void 0) return void 0;
+    let key;
+    try {
+      key = canonicalizeWorkspace(cwd);
+    } catch (err) {
+      if (workspaceRegistry.list().length > 1 && "cwd" in body) {
+        logSessionRoutingFailure("POST /session", "workspace_mismatch", {
+          requestedWorkspace: cwd
+        });
+        sendWorkspaceMismatch(res, cwd);
+        return void 0;
+      }
+      sendBridgeError2(res, err, { route: "POST /session" });
+      return void 0;
+    }
+    if (workspaceRegistry.list().length === 1) {
+      return {
+        runtime: workspaceRegistry.primary,
+        workspaceCwd: "cwd" in body ? key : workspaceRegistry.primary.workspaceCwd
+      };
+    }
+    const runtime = workspaceRegistry.resolveWorkspaceCwd(
+      "cwd" in body ? key : void 0
+    );
+    if (!runtime) {
+      logSessionRoutingFailure("POST /session", "workspace_mismatch", {
+        requestedWorkspace: key
+      });
+      sendWorkspaceMismatch(res, key);
+      return void 0;
+    }
+    if (!runtime.primary && !runtime.trusted) {
+      logSessionRoutingFailure("POST /session", "untrusted_workspace", {
+        workspaceId: runtime.workspaceId,
+        workspaceCwd: runtime.workspaceCwd
+      });
+      res.status(403).json({
+        error: `Workspace "${runtime.workspaceCwd}" is not trusted.`,
+        code: "untrusted_workspace",
+        workspaceCwd: runtime.workspaceCwd
+      });
+      return void 0;
+    }
+    return { runtime, workspaceCwd: runtime.workspaceCwd };
+  }, "resolveRuntimeForSessionCreation");
+  const resolveRuntimeFromWorkspaceParam = /* @__PURE__ */ __name((req, res) => {
+    const workspaceParam = req.params["id"] ?? "";
+    const byId = workspaceRegistry.getByWorkspaceId(workspaceParam);
+    if (byId) return byId;
+    if (!path10.isAbsolute(workspaceParam)) {
+      res.status(400).json({
+        error: "`:id` must decode to a workspace id or absolute path"
+      });
+      return null;
+    }
+    let key;
+    try {
+      key = canonicalizeWorkspace(workspaceParam);
+    } catch {
+      sendWorkspaceMismatch(res, workspaceParam);
+      return null;
+    }
+    const runtime = workspaceRegistry.getByWorkspaceCwd(key);
+    if (!runtime) {
+      sendWorkspaceMismatch(res, key);
+      return null;
+    }
+    return runtime;
+  }, "resolveRuntimeFromWorkspaceParam");
+  const resolvePrimaryOnlyWorkspaceCwd = /* @__PURE__ */ __name((cwd, res, route) => {
+    let key;
+    try {
+      key = canonicalizeWorkspace(cwd);
+    } catch (err) {
+      sendBridgeError2(res, err, { route });
+      return void 0;
+    }
+    if (key !== boundWorkspace) {
+      const runtime = workspaceRegistry.getByWorkspaceCwd(key);
+      if (runtime && !runtime.primary) {
+        res.status(400).json({
+          error: "Non-primary persisted session load/resume is not supported in Phase 2a.",
+          code: "secondary_workspace_load_not_supported",
+          workspaceCwd: runtime.workspaceCwd,
+          workspaceId: runtime.workspaceId,
+          route
+        });
+        return void 0;
+      }
+      sendWorkspaceMismatch(res, key);
+      return void 0;
+    }
+    return key;
+  }, "resolvePrimaryOnlyWorkspaceCwd");
+  const resolveLiveSessionRuntime = /* @__PURE__ */ __name((sessionId, res, route) => requireSessionRuntime({
+    sessionId,
+    route,
+    res,
+    workspaceRegistry,
+    daemonLog
+  }), "resolveLiveSessionRuntime");
+  const sendNonPrimarySessionRouteUnsupported = /* @__PURE__ */ __name((res, route, sessionId, runtime) => {
+    res.status(400).json({
+      error: `Route "${route}" is primary-only for non-primary workspace sessions in Phase 2a.`,
+      code: "non_primary_session_route_not_supported",
+      sessionId,
+      workspaceId: runtime.workspaceId,
+      workspaceCwd: runtime.workspaceCwd,
+      route
+    });
+  }, "sendNonPrimarySessionRouteUnsupported");
+  const withOwnerMutableSession = /* @__PURE__ */ __name((route, handler) => async (req, res) => {
+    const sessionId = requireSessionId(req, res);
+    if (sessionId === null) return;
+    const runtime = resolveLiveSessionRuntime(sessionId, res, route);
+    if (!runtime) return;
+    try {
+      await archiveCoordinator.runSharedMany([sessionId], async () => {
+        await handler(req, res, sessionId, runtime);
+      });
+    } catch (err) {
+      sendBridgeError2(res, err, { route, sessionId });
+    }
+  }, "withOwnerMutableSession");
   const parseSessionIdsBody = /* @__PURE__ */ __name((req, res) => {
     const body = safeBody(req);
     const sessionIds = body["sessionIds"];
@@ -14825,6 +15180,12 @@ function registerSessionRoutes(app, deps) {
   const withMutableSession = /* @__PURE__ */ __name((route, handler) => async (req, res) => {
     const sessionId = requireSessionId(req, res);
     if (sessionId === null) return;
+    const runtime = resolveLiveSessionRuntime(sessionId, res, route);
+    if (!runtime) return;
+    if (!runtime.primary) {
+      sendNonPrimarySessionRouteUnsupported(res, route, sessionId, runtime);
+      return;
+    }
     try {
       await archiveCoordinator.runSharedMany([sessionId], async () => {
         await handler(req, res, sessionId);
@@ -14835,8 +15196,9 @@ function registerSessionRoutes(app, deps) {
   }, "withMutableSession");
   app.post("/session", mutate(), async (req, res) => {
     const body = safeBody(req);
-    const cwd = parseOptionalWorkspaceCwd(body, boundWorkspace, res);
-    if (cwd === void 0) return;
+    const resolvedRuntime = resolveRuntimeForSessionCreation(body, res);
+    if (resolvedRuntime === void 0) return;
+    const { runtime, workspaceCwd } = resolvedRuntime;
     const modelServiceId = typeof body["modelServiceId"] === "string" ? body["modelServiceId"] : void 0;
     const rawSessionScope = body["sessionScope"];
     let sessionScope;
@@ -14853,8 +15215,8 @@ function registerSessionRoutes(app, deps) {
     const clientId = parseClientIdHeader(req, res);
     if (clientId === null) return;
     try {
-      const session = await bridge.spawnOrAttach({
-        workspaceCwd: cwd,
+      const session = await runtime.bridge.spawnOrAttach({
+        workspaceCwd,
         modelServiceId,
         ...clientId !== void 0 ? { clientId } : {},
         ...sessionScope !== void 0 ? { sessionScope } : {}
@@ -14876,10 +15238,10 @@ function registerSessionRoutes(app, deps) {
           );
         }
         if (!session.attached) {
-          bridge.killSession(session.sessionId, { requireZeroAttaches: true }).catch(() => {
+          runtime.bridge.killSession(session.sessionId, { requireZeroAttaches: true }).catch(() => {
           });
         } else {
-          bridge.detachClient(session.sessionId, session.clientId).catch(() => {
+          runtime.bridge.detachClient(session.sessionId, session.clientId).catch(() => {
           });
         }
         return;
@@ -14895,21 +15257,27 @@ function registerSessionRoutes(app, deps) {
     const body = safeBody(req);
     const cwd = parseOptionalWorkspaceCwd(body, boundWorkspace, res);
     if (cwd === void 0) return;
+    const primaryCwd = resolvePrimaryOnlyWorkspaceCwd(
+      cwd,
+      res,
+      `POST /session/:id/${action}`
+    );
+    if (primaryCwd === void 0) return;
     const clientId = parseClientIdHeader(req, res);
     if (clientId === null) return;
     try {
       const session = await archiveCoordinator.runSharedMany(
         [sessionId],
         async () => {
-          await assertSessionLoadable(cwd, sessionId);
+          await assertSessionLoadable(primaryCwd, sessionId);
           return action === "load" ? await bridge.loadSession({
             sessionId,
-            workspaceCwd: cwd,
+            workspaceCwd: primaryCwd,
             historyReplay: "response",
             ...clientId !== void 0 ? { clientId } : {}
           }) : await bridge.resumeSession({
             sessionId,
-            workspaceCwd: cwd,
+            workspaceCwd: primaryCwd,
             ...clientId !== void 0 ? { clientId } : {}
           });
         }
@@ -15027,8 +15395,14 @@ function registerSessionRoutes(app, deps) {
   app.get("/session/:id/status", (req, res) => {
     const sessionId = requireSessionId(req, res);
     if (sessionId === null) return;
+    const runtime = resolveLiveSessionRuntime(
+      sessionId,
+      res,
+      "GET /session/:id/status"
+    );
+    if (!runtime) return;
     try {
-      res.status(200).json(bridge.getSessionSummary(sessionId));
+      res.status(200).json(runtime.bridge.getSessionSummary(sessionId));
     } catch (err) {
       sendBridgeError2(res, err, {
         route: "GET /session/:id/status",
@@ -15297,9 +15671,10 @@ function registerSessionRoutes(app, deps) {
   app.post(
     "/session/:id/prompt",
     mutate(),
-    withMutableSession(
+    withOwnerMutableSession(
       "POST /session/:id/prompt",
-      async (req, res, sessionId) => {
+      async (req, res, sessionId, runtime) => {
+        const ownerBridge = runtime.bridge;
         const body = safeBody(req);
         const prompt = body["prompt"];
         if (!Array.isArray(prompt) || prompt.length === 0) {
@@ -15333,7 +15708,7 @@ function registerSessionRoutes(app, deps) {
         const promptId = crypto2.randomUUID();
         const forwardedBody = { ...body };
         delete forwardedBody["deadlineMs"];
-        const lastEventId = bridge.getSessionLastEventId(sessionId);
+        const lastEventId = ownerBridge.getSessionLastEventId(sessionId);
         addDaemonRequestAttribute("qwen-code.prompt_id", promptId);
         const abort = new AbortController();
         let responseFinished = false;
@@ -15361,7 +15736,7 @@ function registerSessionRoutes(app, deps) {
         }
         let promptPromise;
         try {
-          promptPromise = bridge.sendPrompt(
+          promptPromise = ownerBridge.sendPrompt(
             sessionId,
             {
               ...forwardedBody,
@@ -15434,25 +15809,28 @@ function registerSessionRoutes(app, deps) {
   app.post(
     "/session/:id/heartbeat",
     mutate(),
-    withMutableSession("POST /session/:id/heartbeat", (req, res, sessionId) => {
-      const clientId = parseClientIdHeader(req, res);
-      if (clientId === null) return;
-      const result = bridge.recordHeartbeat(
-        sessionId,
-        clientId !== void 0 ? { clientId } : void 0
-      );
-      res.status(200).json(result);
-    })
+    withOwnerMutableSession(
+      "POST /session/:id/heartbeat",
+      (req, res, sessionId, runtime) => {
+        const clientId = parseClientIdHeader(req, res);
+        if (clientId === null) return;
+        const result = runtime.bridge.recordHeartbeat(
+          sessionId,
+          clientId !== void 0 ? { clientId } : void 0
+        );
+        res.status(200).json(result);
+      }
+    )
   );
   app.post(
     "/session/:id/detach",
     mutate(),
-    withMutableSession(
+    withOwnerMutableSession(
       "POST /session/:id/detach",
-      async (req, res, sessionId) => {
+      async (req, res, sessionId, runtime) => {
         const clientId = parseClientIdHeader(req, res);
         if (clientId === null) return;
-        await bridge.detachClient(sessionId, clientId);
+        await runtime.bridge.detachClient(sessionId, clientId);
         res.status(204).end();
       }
     )
@@ -15460,13 +15838,13 @@ function registerSessionRoutes(app, deps) {
   app.post(
     "/session/:id/cancel",
     mutate(),
-    withMutableSession(
+    withOwnerMutableSession(
       "POST /session/:id/cancel",
-      async (req, res, sessionId) => {
+      async (req, res, sessionId, runtime) => {
         const body = safeBody(req);
         const clientId = parseClientIdHeader(req, res);
         if (clientId === null) return;
-        await bridge.cancelSession(
+        await runtime.bridge.cancelSession(
           sessionId,
           {
             ...body,
@@ -15485,10 +15863,16 @@ function registerSessionRoutes(app, deps) {
     const sessionId = req.params["id"];
     const clientId = parseClientIdHeader(req, res);
     if (clientId === null) return;
+    const runtime = resolveLiveSessionRuntime(
+      sessionId,
+      res,
+      "DELETE /session/:id"
+    );
+    if (!runtime) return;
     try {
       await archiveCoordinator.runExclusiveMany(
         [sessionId],
-        async () => bridge.closeSession(
+        async () => runtime.bridge.closeSession(
           sessionId,
           clientId !== void 0 ? { clientId } : void 0
         )
@@ -15734,21 +16118,9 @@ function registerSessionRoutes(app, deps) {
     }
   );
   app.get("/workspace/:id/sessions", async (req, res) => {
-    const workspaceCwd = req.params["id"] ?? "";
-    if (!path10.isAbsolute(workspaceCwd)) {
-      res.status(400).json({ error: "`:id` must decode to an absolute workspace path" });
-      return;
-    }
-    const key = canonicalizeWorkspace(workspaceCwd);
-    if (key !== boundWorkspace) {
-      res.status(400).json({
-        error: `Workspace mismatch: daemon is bound to "${boundWorkspace}"`,
-        code: "workspace_mismatch",
-        boundWorkspace,
-        requestedWorkspace: key
-      });
-      return;
-    }
+    const runtime = resolveRuntimeFromWorkspaceParam(req, res);
+    if (runtime === null) return;
+    const key = runtime.workspaceCwd;
     try {
       const cursor = typeof req.query["cursor"] === "string" ? req.query["cursor"] : void 0;
       const size = parseSessionPageSizeQuery(req.query["size"]);
@@ -15784,13 +16156,21 @@ function registerSessionRoutes(app, deps) {
         }
         archiveState = rawArchiveState;
       }
-      const result = await listWorkspaceSessionsForResponse(bridge, key, {
+      if (!runtime.primary && (archiveState === "archived" || view)) {
+        res.status(400).json({
+          error: "Non-primary workspace session listing is live-only in Phase 2a.",
+          code: "non_primary_live_sessions_only"
+        });
+        return;
+      }
+      const options = {
         ...cursor !== void 0 ? { cursor } : {},
         ...size !== void 0 ? { size } : {},
         ...archiveState !== void 0 ? { archiveState } : {},
         ...view !== void 0 ? { view } : {},
         ...group !== void 0 ? { group } : {}
-      });
+      };
+      const result = runtime.primary ? await listWorkspaceSessionsForResponse(runtime.bridge, key, options) : listLiveWorkspaceSessionsForResponse(runtime.bridge, key, options);
       res.status(200).json({
         sessions: result.sessions,
         ...result.nextCursor != null ? { nextCursor: result.nextCursor } : {},
@@ -15948,10 +16328,16 @@ function registerSessionRoutes(app, deps) {
   app.get("/session/:id/pending-prompts", (req, res) => {
     const sessionId = requireSessionId(req, res);
     if (sessionId === null) return;
+    const runtime = resolveLiveSessionRuntime(
+      sessionId,
+      res,
+      "GET /session/:id/pending-prompts"
+    );
+    if (!runtime) return;
     const clientId = parseClientIdHeader(req, res);
     if (clientId === null) return;
     try {
-      const pendingPrompts = bridge.getPendingPrompts(
+      const pendingPrompts = runtime.bridge.getPendingPrompts(
         sessionId,
         clientId !== void 0 ? { clientId } : void 0
       );
@@ -15966,9 +16352,9 @@ function registerSessionRoutes(app, deps) {
   app.delete(
     "/session/:id/pending-prompts/:promptId",
     mutate(),
-    withMutableSession(
+    withOwnerMutableSession(
       "DELETE /session/:id/pending-prompts/:promptId",
-      (req, res, sessionId) => {
+      (req, res, sessionId, runtime) => {
         const clientId = parseClientIdHeader(req, res);
         if (clientId === null) return;
         const promptId = req.params["promptId"];
@@ -15976,7 +16362,7 @@ function registerSessionRoutes(app, deps) {
           res.status(400).json({ error: "`promptId` route parameter is required" });
           return;
         }
-        const result = bridge.removePendingPrompt(
+        const result = runtime.bridge.removePendingPrompt(
           sessionId,
           promptId,
           clientId !== void 0 ? { clientId } : void 0
@@ -16094,7 +16480,7 @@ function registerSessionRoutes(app, deps) {
   );
   app.post(
     "/session/:id/approval-mode",
-    mutate({ strict: true }),
+    mutate(),
     withMutableSession(
       "POST /session/:id/approval-mode",
       async (req, res, sessionId) => {
@@ -16675,7 +17061,7 @@ function parseHeatmapDays(raw) {
 }
 __name(parseHeatmapDays, "parseHeatmapDays");
 function registerUsageStatsRoutes(app, deps = {}) {
-  const loadHistory = deps.loadHistory ?? (() => loadUsageHistory(void 0, { persistRebuild: false }));
+  const loadHistory = deps.loadHistory ?? (() => loadUsageHistoryWithLive());
   const ttlMs = deps.cacheTtlMs ?? DEFAULT_CACHE_TTL_MS;
   let cache = null;
   const getRecords = /* @__PURE__ */ __name(() => {
@@ -17148,6 +17534,7 @@ init_esbuild_shims();
 
 // packages/cli/src/serve/server/serve-features.ts
 init_esbuild_shims();
+var DEFAULT_MAX_SESSIONS = 20;
 var DEFAULT_MAX_PENDING_PROMPTS_PER_SESSION = 5;
 var SERVE_LANGUAGE_CODES = [
   ...SUPPORTED_LANGUAGES.map((language) => language.code),
@@ -17159,13 +17546,20 @@ function advertisedMaxPendingPromptsPerSession(value) {
   return value;
 }
 __name(advertisedMaxPendingPromptsPerSession, "advertisedMaxPendingPromptsPerSession");
+function advertisedMaxSessions(value) {
+  if (value === void 0) return DEFAULT_MAX_SESSIONS;
+  if (value === 0 || value === Number.POSITIVE_INFINITY) return null;
+  return value;
+}
+__name(advertisedMaxSessions, "advertisedMaxSessions");
 function createServeFeatures(deps) {
   const {
     opts,
     boundWorkspace,
     persistSettingAvailable,
     reloadAvailable,
-    sessionShellCommandEnabled
+    sessionShellCommandEnabled,
+    multiWorkspaceSessionsEnabled
   } = deps;
   let cachedVoiceTranscriptionAvailable;
   const invalidateServeFeaturesCache = /* @__PURE__ */ __name(() => {
@@ -17188,6 +17582,7 @@ function createServeFeatures(deps) {
       sessionShellCommandEnabled,
       rateLimit: opts.rateLimit === true,
       reloadAvailable,
+      multiWorkspaceSessionsEnabled,
       clientMcpOverWsEnabled: opts.clientMcpOverWs === true,
       cdpTunnelOverWsEnabled: opts.cdpTunnelOverWs === true,
       voiceTranscriptionAvailable: getCachedVoiceTranscriptionAvailable(),
@@ -17217,6 +17612,8 @@ __name(isWorkspaceVoiceTranscriptionAvailable, "isWorkspaceVoiceTranscriptionAva
 // packages/cli/src/serve/routes/capabilities.ts
 function registerCapabilitiesRoutes(app, deps) {
   app.get("/capabilities", (_req, res) => {
+    const runtimes = deps.workspaceRegistry.list();
+    const multiWorkspace = runtimes.length > 1;
     const envelope = {
       v: CAPABILITIES_SCHEMA_VERSION,
       protocolVersions: getServeProtocolVersions(),
@@ -17224,8 +17621,8 @@ function registerCapabilitiesRoutes(app, deps) {
       mode: deps.mode,
       features: deps.currentServeFeatures(),
       modelServices: [],
-      // Surface the bound workspace so clients can detect mismatch pre-flight
-      // and omit `cwd` on `POST /session`.
+      // Surface the primary workspace so clients can omit `cwd` on
+      // `POST /session`; multi-workspace clients use `workspaces[]`.
       workspaceCwd: deps.boundWorkspace,
       // Advertise supported transport families so SDK clients can
       // auto-negotiate the best available transport via negotiateTransport().
@@ -17235,8 +17632,22 @@ function registerCapabilitiesRoutes(app, deps) {
       limits: {
         maxPendingPromptsPerSession: advertisedMaxPendingPromptsPerSession(
           deps.maxPendingPromptsPerSession
-        )
+        ),
+        ...multiWorkspace ? {
+          maxSessionsPerWorkspace: advertisedMaxSessions(
+            deps.maxSessionsPerWorkspace
+          ),
+          maxTotalSessions: deps.maxTotalSessions === void 0 || deps.maxTotalSessions === 0 || deps.maxTotalSessions === Number.POSITIVE_INFINITY ? null : deps.maxTotalSessions
+        } : {}
       },
+      ...multiWorkspace ? {
+        workspaces: runtimes.map((runtime) => ({
+          id: runtime.workspaceId,
+          cwd: runtime.workspaceCwd,
+          primary: runtime.primary,
+          trusted: runtime.trusted
+        }))
+      } : {},
       supportedLanguages: deps.languageCodes
     };
     res.status(200).json(envelope);
@@ -17760,7 +18171,28 @@ function sendBridgeError(res, err, ctx, daemonLog) {
     res.status(503).json({
       error: err.message,
       code: "session_limit_exceeded",
-      limit: err.limit
+      limit: err.limit,
+      scope: "workspace"
+    });
+    return;
+  }
+  if (err instanceof TotalSessionLimitExceededError) {
+    const totalSessionError = err;
+    daemonLog?.warn("total session admission rejected", {
+      ...ctx?.route ? { route: ctx.route } : {},
+      ...ctx?.sessionId ? { sessionId: ctx.sessionId } : {},
+      limit: totalSessionError.limit,
+      scope: totalSessionError.scope,
+      ...totalSessionError.operation ? { operation: totalSessionError.operation } : {},
+      ...totalSessionError.workspaceCwd ? { workspaceCwd: totalSessionError.workspaceCwd } : {},
+      ...totalSessionError.sourceSessionId ? { sourceSessionId: totalSessionError.sourceSessionId } : {}
+    });
+    res.set("Retry-After", "5");
+    res.status(503).json({
+      error: err.message,
+      code: "session_limit_exceeded",
+      limit: err.limit,
+      scope: err.scope
     });
     return;
   }
@@ -17962,7 +18394,7 @@ data: ${dataJson}
 }
 __name(formatSseFrame, "formatSseFrame");
 function registerSseEventsRoutes(app, deps) {
-  const { bridge, daemonLog, sendBridgeError: sendBridgeError2, writerIdleTimeoutMs } = deps;
+  const { workspaceRegistry, daemonLog, sendBridgeError: sendBridgeError2, writerIdleTimeoutMs } = deps;
   app.get("/session/:id/events", (req, res) => {
     const sessionId = req.params["id"];
     const lastEventId = parseLastEventId(req.headers["last-event-id"]);
@@ -17971,8 +18403,16 @@ function registerSseEventsRoutes(app, deps) {
     let iter;
     const abort = new AbortController();
     try {
+      const runtime = requireSessionRuntime({
+        sessionId,
+        route: "GET /session/:id/events",
+        res,
+        workspaceRegistry,
+        daemonLog
+      });
+      if (!runtime) return;
       const snapshot = req.query["snapshot"] === "1";
-      const iterable = bridge.subscribeEvents(sessionId, {
+      const iterable = runtime.bridge.subscribeEvents(sessionId, {
         signal: abort.signal,
         lastEventId,
         ...maxQueued !== void 0 ? { maxQueued } : {},
@@ -18182,6 +18622,9 @@ import * as path12 from "node:path";
 var A2UI_MIME = "application/a2ui+json";
 var ACTION_TOOL = "action";
 var CALL_TIMEOUT_MS = 15e3;
+var SCRUBBED_STDIO_ENV_KEYS = /* @__PURE__ */ new Set([
+  QWEN_SERVER_TOKEN_ENV
+]);
 function usableServerConfig(cfg) {
   if (!cfg) return false;
   if (typeof cfg.httpUrl === "string") {
@@ -18212,22 +18655,34 @@ async function findFromSettingsFile(workspaceCwd) {
   return null;
 }
 __name(findFromSettingsFile, "findFromSettingsFile");
-function buildTransport(cfg) {
+function buildTransport(cfg, baseEnv = snapshotProcessEnv()) {
   if (typeof cfg.httpUrl === "string") {
     return new StreamableHTTPClientTransport(new URL(cfg.httpUrl));
   }
   return new StdioClientTransport({
     command: cfg.command,
     args: cfg.args ?? [],
-    // spawn() treats `env` as a complete replacement, not a merge — a partial
-    // env (e.g. {API_KEY}) would strip PATH/HOME and break the child. Merge
-    // over process.env like packages/core/src/tools/mcp-client.ts does; when
-    // unset, let the SDK apply its safe default environment.
-    ...cfg.env ? { env: { ...process.env, ...cfg.env } } : {},
+    // Passing `env` prevents the SDK from reading live process.env while
+    // keeping daemon MCP stdio behavior aligned with the core CLI client.
+    env: buildStdioServerEnv(baseEnv, cfg.env),
     cwd: cfg.cwd
   });
 }
 __name(buildTransport, "buildTransport");
+function buildStdioServerEnv(baseEnv, serverEnv) {
+  const env = {};
+  for (const [key, value] of Object.entries(baseEnv)) {
+    if (value !== void 0 && !key.startsWith("BASH_FUNC_") && !value.startsWith("()") && !SCRUBBED_STDIO_ENV_KEYS.has(key)) {
+      env[key] = value;
+    }
+  }
+  const merged = { ...env, ...serverEnv ?? {} };
+  for (const key of SCRUBBED_STDIO_ENV_KEYS) {
+    delete merged[key];
+  }
+  return merged;
+}
+__name(buildStdioServerEnv, "buildStdioServerEnv");
 function extractA2uiActionResult(result) {
   if (result.isError) {
     const errMsg2 = (result.content ?? []).filter(
@@ -18253,8 +18708,8 @@ function extractA2uiActionResult(result) {
   return { commands, fallback };
 }
 __name(extractA2uiActionResult, "extractA2uiActionResult");
-async function callA2uiAction(cfg, args) {
-  const transport = buildTransport(cfg);
+async function callA2uiAction(cfg, args, env) {
+  const transport = buildTransport(cfg, env);
   const client = new Client({ name: "qwen-serve-a2ui", version: "0.0.1" });
   try {
     await client.connect(transport, { timeout: CALL_TIMEOUT_MS });
@@ -18274,7 +18729,7 @@ async function callA2uiAction(cfg, args) {
 __name(callA2uiAction, "callA2uiAction");
 function registerA2uiActionRoutes(app, opts) {
   const { boundWorkspace, mutate, safeBody: safeBody2, getMcpServers } = opts;
-  const callAction = opts.callAction ?? callA2uiAction;
+  const callAction = opts.callAction ?? ((cfg, args) => callA2uiAction(cfg, args, opts.env));
   app.post(
     "/session/:id/a2ui-action",
     mutate(),
@@ -18982,73 +19437,6 @@ function installSelfOriginStripMiddleware(app, getPort) {
 }
 __name(installSelfOriginStripMiddleware, "installSelfOriginStripMiddleware");
 
-// packages/cli/src/serve/workspace-registry.ts
-init_esbuild_shims();
-function createWorkspaceRegistry(inputRuntimes) {
-  if (inputRuntimes.length === 0) {
-    throw new Error(
-      "WorkspaceRegistry requires at least one workspace runtime."
-    );
-  }
-  const primaryRuntimes = inputRuntimes.filter((runtime) => runtime.primary);
-  if (primaryRuntimes.length !== 1) {
-    throw new Error(
-      "WorkspaceRegistry requires exactly one primary workspace runtime."
-    );
-  }
-  const byCwd = /* @__PURE__ */ new Map();
-  const byId = /* @__PURE__ */ new Map();
-  for (const runtime of inputRuntimes) {
-    if (byCwd.has(runtime.workspaceCwd)) {
-      throw new Error(
-        `Duplicate workspace runtime cwd ${JSON.stringify(
-          runtime.workspaceCwd
-        )}.`
-      );
-    }
-    byCwd.set(runtime.workspaceCwd, runtime);
-    if (byId.has(runtime.workspaceId)) {
-      throw new Error(
-        `Duplicate workspace runtime id ${JSON.stringify(
-          runtime.workspaceId
-        )}.`
-      );
-    }
-    byId.set(runtime.workspaceId, runtime);
-  }
-  const runtimes = Object.freeze([...inputRuntimes]);
-  const primary = primaryRuntimes[0];
-  return {
-    primary,
-    list: /* @__PURE__ */ __name(() => runtimes, "list"),
-    getByWorkspaceCwd: /* @__PURE__ */ __name((workspaceCwd) => byCwd.get(workspaceCwd), "getByWorkspaceCwd"),
-    getByWorkspaceId: /* @__PURE__ */ __name((workspaceId) => byId.get(workspaceId), "getByWorkspaceId"),
-    resolveWorkspaceCwd: /* @__PURE__ */ __name((workspaceCwd) => workspaceCwd === void 0 ? primary : byCwd.get(workspaceCwd), "resolveWorkspaceCwd"),
-    resolveLiveSessionOwner: /* @__PURE__ */ __name((sessionId) => {
-      const matches = [];
-      for (const runtime of runtimes) {
-        try {
-          runtime.bridge.getSessionSummary(sessionId);
-          matches.push(runtime);
-        } catch (err) {
-          if (err instanceof SessionNotFoundError) continue;
-          throw err;
-        }
-      }
-      if (matches.length === 0) return { kind: "not_found" };
-      if (matches.length === 1) {
-        return { kind: "found", runtime: matches[0] };
-      }
-      return { kind: "ambiguous", runtimes: matches };
-    }, "resolveLiveSessionOwner")
-  };
-}
-__name(createWorkspaceRegistry, "createWorkspaceRegistry");
-function createSingleWorkspaceRegistry(runtime) {
-  return createWorkspaceRegistry([runtime]);
-}
-__name(createSingleWorkspaceRegistry, "createSingleWorkspaceRegistry");
-
 // packages/cli/src/serve/routes/workspace-lifecycle.ts
 init_esbuild_shims();
 function registerWorkspaceLifecycleRoutes(app, deps) {
@@ -19351,6 +19739,10 @@ function describeRegistryPrimaryForConflict(registry) {
   return `registry primary cwd=${JSON.stringify(registry.primary.workspaceCwd)}, workspaceId=${JSON.stringify(registry.primary.workspaceId)}`;
 }
 __name(describeRegistryPrimaryForConflict, "describeRegistryPrimaryForConflict");
+function getRuntimeEffectiveEnv(metadata) {
+  return metadata?.effectiveEnv;
+}
+__name(getRuntimeEffectiveEnv, "getRuntimeEffectiveEnv");
 var DEFAULT_SESSION_IDLE_TIMEOUT_MS = 30 * 6e4;
 var KEEPALIVE_MIN_INTERVAL_MS = 3e4;
 var KEEPALIVE_MAX_INTERVAL_MS = 10 * 6e4;
@@ -19431,6 +19823,8 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     );
   }
   const clientMcpSenderRegistry = injectedWorkspaceRegistry?.primary.clientMcpSenderRegistry ?? deps.clientMcpSenderRegistry ?? new ClientMcpSenderRegistry();
+  const primaryRuntimeEnvMetadata = injectedWorkspaceRegistry?.primary.env ?? deps.primaryRuntimeEnv;
+  const primaryEffectiveEnv = getRuntimeEffectiveEnv(primaryRuntimeEnvMetadata);
   const { languageCodes, currentServeFeatures, invalidateServeFeaturesCache } = createServeFeatures({
     opts,
     boundWorkspace,
@@ -19438,13 +19832,23 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     // Registry injection supplies the primary workspace service through the
     // runtime, so it has the same reload surface as legacy deps.workspace.
     reloadAvailable: deps.workspace !== void 0 || injectedWorkspaceRegistry !== void 0,
-    sessionShellCommandEnabled
+    sessionShellCommandEnabled,
+    multiWorkspaceSessionsEnabled: (injectedWorkspaceRegistry?.list().length ?? 1) > 1
   });
-  const statusProvider = deps.statusProvider ?? createDaemonStatusProvider();
+  const statusProvider = deps.statusProvider ?? createDaemonStatusProvider(
+    primaryEffectiveEnv ? { env: primaryEffectiveEnv } : {}
+  );
+  let defaultBridgeForAdmission;
+  const totalSessionAdmission = !deps.bridge && !injectedWorkspaceRegistry ? createTotalSessionAdmissionController({
+    maxTotalSessions: opts.maxTotalSessions,
+    getBridges: /* @__PURE__ */ __name(() => defaultBridgeForAdmission ? [defaultBridgeForAdmission] : [], "getBridges")
+  }) : void 0;
   const bridge = injectedWorkspaceRegistry?.primary.bridge ?? deps.bridge ?? createAcpSessionBridge({
     maxSessions: opts.maxSessions,
+    ...totalSessionAdmission ? { freshSessionAdmission: totalSessionAdmission.admit } : {},
     maxPendingPromptsPerSession: opts.maxPendingPromptsPerSession,
     eventRingSize: opts.eventRingSize,
+    compactedReplayMaxBytes: opts.compactedReplayMaxBytes,
     permissionResponseTimeoutMs: opts.permissionResponseTimeoutMs,
     boundWorkspace,
     sessionShellCommandEnabled,
@@ -19458,6 +19862,9 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     // ext-method by reaching the WS connection that hosts the named server.
     clientMcpSender: clientMcpSenderRegistry.lookup
   });
+  if (!injectedWorkspaceRegistry && !deps.bridge) {
+    defaultBridgeForAdmission = bridge;
+  }
   const archiveCoordinator = new SessionArchiveCoordinator();
   installSelfOriginStripMiddleware(app, getPort);
   app.locals.fsFactory = fsFactory;
@@ -19475,7 +19882,9 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     boundWorkspace,
     contextFilename: deps.contextFilename ?? "QWEN.md",
     statusProvider,
-    workspaceProvidersStatusProvider: createWorkspaceProvidersStatusProvider(),
+    workspaceProvidersStatusProvider: createWorkspaceProvidersStatusProvider(
+      primaryEffectiveEnv ? { env: primaryEffectiveEnv } : {}
+    ),
     workspaceSkillsStatusProvider: createWorkspaceSkillsStatusProvider(),
     isChannelLive: /* @__PURE__ */ __name(() => bridge.isChannelLive(), "isChannelLive"),
     persistDisabledTools: deps.persistDisabledTools ?? (async () => {
@@ -19500,7 +19909,10 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     workspaceCwd: boundWorkspace,
     primary: true,
     trusted: deps.primaryWorkspaceTrusted ?? false,
-    env: { mode: "parent-process", overlayKeys: [] },
+    env: primaryRuntimeEnvMetadata ?? {
+      mode: "parent-process",
+      overlayKeys: []
+    },
     bridge,
     workspaceService: workspace,
     routeFileSystemFactory: fsFactory,
@@ -19566,6 +19978,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     opts,
     boundWorkspace: primaryBoundWorkspace,
     bridge: primaryBridge,
+    workspaceRegistry,
     workspace: primaryWorkspace,
     daemonLog,
     startup: deps.startup,
@@ -19579,14 +19992,18 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     sessionShellCommandEnabled,
     getChannelWorkerSnapshot: deps.getChannelWorkerSnapshot,
     getPerfSnapshot: deps.getPerfSnapshot,
-    getMetricsSeries: deps.getMetricsSeries
+    getMetricsSeries: deps.getMetricsSeries,
+    getTotalSessionAdmissionSnapshot: deps.getTotalSessionAdmissionSnapshot ?? totalSessionAdmission?.snapshot
   });
   registerCapabilitiesRoutes(app, {
     qwenCodeVersion: deps.qwenCodeVersion,
     mode: opts.mode,
     currentServeFeatures,
     boundWorkspace: primaryBoundWorkspace,
+    workspaceRegistry,
     permissionPolicy: primaryBridge.permissionPolicy,
+    maxSessionsPerWorkspace: opts.maxSessions,
+    maxTotalSessions: opts.maxTotalSessions,
     maxPendingPromptsPerSession: opts.maxPendingPromptsPerSession,
     languageCodes
   });
@@ -19697,6 +20114,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     boundWorkspace: primaryBoundWorkspace,
     mutate,
     safeBody,
+    env: getRuntimeEffectiveEnv(primaryRuntime.env),
     // UI-server discovery uses the daemon's workspace MCP status, which
     // includes servers registered at runtime.
     getMcpServers: /* @__PURE__ */ __name(async () => {
@@ -19717,6 +20135,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
   registerSessionRoutes(app, {
     boundWorkspace: primaryBoundWorkspace,
     bridge: primaryBridge,
+    workspaceRegistry,
     archiveCoordinator,
     mutate,
     sendBridgeError: sendBridgeError2,
@@ -19789,11 +20208,14 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
   }
   registerPermissionRoutes(app, {
     bridge: primaryBridge,
+    workspaceRegistry,
+    daemonLog,
     mutate,
     sendPermissionVoteError: sendPermissionVoteError2
   });
   registerSseEventsRoutes(app, {
     bridge: primaryBridge,
+    workspaceRegistry,
     daemonLog,
     writerIdleTimeoutMs: opts.writerIdleTimeoutMs,
     sendBridgeError: sendBridgeError2
@@ -19836,7 +20258,9 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     extraWsRoutes: [
       {
         path: "/voice/stream",
-        onConnection: createVoiceWsConnectionHandler(primaryBoundWorkspace)
+        onConnection: createVoiceWsConnectionHandler(primaryBoundWorkspace, {
+          env: getRuntimeEffectiveEnv(primaryRuntime.env)
+        })
       }
     ]
   });