@qwen-code/qwen-code 0.23.2 → 0.23.3-nightly.20260911.aaa6a32aae

package/chunks/{run-qwen-serve-WBSWWIRV.js → run-qwen-serve-AOPYFCVP.js}

@@ -51,7 +51,7 @@ import {
   prepareManagedScratchRoot,
   resolveAcpHttpEnabled,
   toDaemonStatusMemoryLimits
-} from "./chunk-VJJXG73H.js";
+} from "./chunk-ZMQL5BL5.js";
 import {
   ConversationDirectoryIdentityError,
   assertExactConversationRootIdentity,
@@ -64,6 +64,11 @@ import {
   materializeConversationDirectoryIdentity,
   revalidateConversationRootIdentity
 } from "./chunk-PB7JBAHF.js";
+import {
+  formatHostForAuthority,
+  isLoopbackAddress,
+  isLoopbackBind
+} from "./chunk-DMEUXLSS.js";
 import {
   formatMemoryBudgetStderr,
   resolveDaemonMemoryBudget,
@@ -72,24 +77,23 @@ import {
 import {
   setDeferredRuntimeRequestTiming
 } from "./chunk-LAUEEBDL.js";
+import {
+  normalizeSessionIdForLookup
+} from "./chunk-ZEZKIS2K.js";
 import {
   require_express
 } from "./chunk-SVWWF5TZ.js";
 import {
   resolveWebShellDir
 } from "./chunk-FBX2SDQ4.js";
-import {
-  formatHostForAuthority,
-  isLoopbackAddress,
-  isLoopbackBind
-} from "./chunk-DMEUXLSS.js";
-import {
-  normalizeSessionIdForLookup
-} from "./chunk-ZEZKIS2K.js";
 import "./chunk-NYWWQ437.js";
 import {
   resolveSessionRestoreTimeoutMs
 } from "./chunk-4JRM2BSM.js";
+import {
+  ConversationRuntimeOwnershipError,
+  LIVE_HOST_PROTOCOL_VERSION
+} from "./chunk-Y5TM7SBV.js";
 import {
   DEFAULT_RING_SIZE
 } from "./chunk-7U5G6JXI.js";
@@ -102,30 +106,21 @@ import {
   normalizeMaxJournalBytes,
   normalizeMaxJournalEvents
 } from "./chunk-WCCLLK7X.js";
-import {
-  resolveChannelCwd
-} from "./chunk-AUTUFD5X.js";
-import {
-  ConversationRuntimeOwnershipError,
-  LIVE_HOST_PROTOCOL_VERSION
-} from "./chunk-2Z3T52OC.js";
 import "./chunk-ZL4HFSL6.js";
-import "./chunk-K6KS3LTN.js";
-import "./chunk-OSHQMOBS.js";
 import {
-  consumeServeFastPathRejectedLoaderKeys,
-  loadServeFastPathSettings,
-  preResolveServeFastPathHomeEnvOverrides
-} from "./chunk-FV4DM2M4.js";
+  resolveChannelCwd
+} from "./chunk-ABNX6E6K.js";
 import {
-  MAX_REGISTERED_WORKSPACES,
+  resolveMaxRegisteredWorkspaces,
   resolveWorkspaceInputs,
   workspaceRegistrationId
-} from "./chunk-LWX4WDFF.js";
-import "./chunk-TRQNRP2H.js";
+} from "./chunk-2S5RIGZJ.js";
+import {
+  assertChannelControlWorkspaceCapacity
+} from "./chunk-J7LBAKDH.js";
 import {
   LOAD_REPLAY_META_KEY
-} from "./chunk-PSPAM24S.js";
+} from "./chunk-TBSCTWKF.js";
 import "./chunk-FAWTMDX7.js";
 import {
   canonicalizeWorkspace,
@@ -134,28 +129,31 @@ import {
 import {
   ExtraCaInspectionError,
   loadableCertificates
-} from "./chunk-KEPC5BOL.js";
+} from "./chunk-IBRQG2MP.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-Z7B6SRPM.js";
 import {
   ChannelWebhookEnqueueError
 } from "./chunk-STUJ7IMZ.js";
-import {
-  normalizeWorkerDiagnostic,
-  sanitizeWorkerDiagnostic
-} from "./chunk-DARWOZY6.js";
 import {
   QWEN_SERVER_TOKEN_ENV
 } from "./chunk-GYTKQYDB.js";
 import {
-  channelSelectionNames
-} from "./chunk-ALMR3E6Q.js";
+  normalizeWorkerDiagnostic,
+  sanitizeWorkerDiagnostic
+} from "./chunk-WD6YQI5M.js";
+import {
+  channelSelectionNames,
+  normalizeServeChannelSelection
+} from "./chunk-GDWE23OR.js";
 import {
   ChannelDeliveryError,
   isChannelDeliveryError
 } from "./chunk-RKFGE7JH.js";
+import {
+  MAX_CHANNEL_CONTROL_WORKSPACES
+} from "./chunk-CJ3DHN5I.js";
 import "./chunk-UDG5EZJI.js";
-import "./chunk-M5GB774H.js";
 import {
   EXTERNAL_TOOL_GUARD_PROVIDER_ATTACHED_VALUE,
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
@@ -163,11 +161,20 @@ import {
   PRIVATE_EXTERNAL_TOOL_GUARD_ENV,
   PRIVATE_EXTERNAL_TOOL_GUARD_PROVIDER_ENV
 } from "./chunk-3VUENPWF.js";
-import "./chunk-TGNNLRC3.js";
+import {
+  redactLogCredentials
+} from "./chunk-M5GB774H.js";
+import "./chunk-K6KS3LTN.js";
+import "./chunk-OSHQMOBS.js";
 import {
   sanitizeLogText
-} from "./chunk-WDVV3LRM.js";
-import "./chunk-IW6RQPQB.js";
+} from "./chunk-EPVEPTI3.js";
+import "./chunk-IJOS26LH.js";
+import {
+  consumeServeFastPathRejectedLoaderKeys,
+  loadServeFastPathSettings,
+  preResolveServeFastPathHomeEnvOverrides
+} from "./chunk-ZNI3YJHS.js";
 import "./chunk-BW4333PP.js";
 import {
   getGlobalQwenDirLite,
@@ -178,10 +185,10 @@ import {
   clearLoaderKeyRejectionReporterIfCurrent,
   scrubInheritedLoaderEnv,
   setLoaderKeyRejectionReporter
-} from "./chunk-QTNCGZHQ.js";
+} from "./chunk-XX5HQLCZ.js";
 import {
   getCliVersion
-} from "./chunk-MV5DTLJV.js";
+} from "./chunk-OHCR4O3U.js";
 import "./chunk-W3N5XAZ6.js";
 import "./chunk-NPQ5ZKRP.js";
 import {
@@ -194,10 +201,10 @@ import {
 } from "./chunk-32CM56LO.js";
 import "./chunk-LJZSMWOH.js";
 import "./chunk-GOFAQQZA.js";
-import "./chunk-65I7S4Z3.js";
 import "./chunk-6HUXPLB5.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
+import "./chunk-65I7S4Z3.js";
 import {
   require_proper_lockfile
 } from "./chunk-MLXTMF7H.js";
@@ -206,6 +213,12 @@ import "./chunk-5ETULJLP.js";
 import {
   MEMORY_PROJECT_SCOPES
 } from "./chunk-HD7O6WLV.js";
+import {
+  TraceFlags,
+  init_esm,
+  isSpanContextValid,
+  trace
+} from "./chunk-TBWQLLFO.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -218,12 +231,6 @@ import {
 } from "./chunk-7FA2II6K.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
-import {
-  TraceFlags,
-  init_esm,
-  isSpanContextValid,
-  trace
-} from "./chunk-TBWQLLFO.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -3098,6 +3105,16 @@ var QWEN_SERVE_WRITER_IDLE_TIMEOUT_MS_ENV = "QWEN_SERVE_WRITER_IDLE_TIMEOUT_MS";
 var SHUTDOWN_FORCE_CLOSE_MS = 5e3;
 var DAEMON_LOG_FORCED_FLUSH_BUDGET_MS = 250;
 var DEFAULT_LIVE_DISCOVERY_RETRY_MS = 5e3;
+var ENSURE_KEEP_ALIVE_MS = 10 * 6e4;
+function deepestErrorMessage(err) {
+  if (!(err instanceof Error)) return String(err);
+  let deepest = err;
+  while (deepest.cause instanceof Error) {
+    deepest = deepest.cause;
+  }
+  return deepest.message;
+}
+__name(deepestErrorMessage, "deepestErrorMessage");
 function channelDeliveryPublicError(code) {
   switch (code) {
     case "channel_worker_unavailable":
@@ -3246,7 +3263,8 @@ function isNonNegativeIntegerOrInfinity(value) {
   return value === Number.POSITIVE_INFINITY || Number.isFinite(value) && Number.isInteger(value) && value >= 0;
 }
 __name(isNonNegativeIntegerOrInfinity, "isNonNegativeIntegerOrInfinity");
-function deriveDefaultMaxTotalSessions(maxSessionsPerWorkspace, workspaceCount) {
+function deriveDefaultMaxTotalSessions(maxSessionsPerWorkspace, workspaceCount, maxRegisteredWorkspaces) {
+  if (maxRegisteredWorkspaces > 25) return 800;
   if (workspaceCount <= 1) return void 0;
   const perWorkspace = maxSessionsPerWorkspace ?? DEFAULT_MAX_SESSIONS;
   if (perWorkspace === 0 || perWorkspace === Number.POSITIVE_INFINITY) {
@@ -3924,12 +3942,12 @@ __name(hasRetryableChannelWorkerShutdownError, "hasRetryableChannelWorkerShutdow
 var channelWorkerRuntimePromise;
 async function loadChannelWorkerRuntime() {
   channelWorkerRuntimePromise ??= Promise.all([
-    import("./channel-worker-supervisor-EMITFMCP.js"),
-    import("./pidfile-B7DZC4TP.js"),
-    import("./runtime-VRVBX2E5.js"),
+    import("./channel-worker-supervisor-OOYY7BAQ.js"),
+    import("./pidfile-RCC6TCEM.js"),
+    import("./runtime-TZMHKZAP.js"),
     import("./cli-entry-path-4VJ3Y6T2.js"),
-    import("./channel-worker-group-SQ5FRWOH.js"),
-    import("./channel-worker-manager-TU4ZNWOE.js")
+    import("./channel-worker-group-JR6JOELM.js"),
+    import("./channel-worker-manager-AVKJEZFL.js")
   ]).then(
     ([
       supervisor,
@@ -4035,13 +4053,13 @@ function shouldPreheatBridge(deps) {
 __name(shouldPreheatBridge, "shouldPreheatBridge");
 var coreRuntimePromise;
 function loadCoreRuntime() {
-  coreRuntimePromise ??= import("./core-runtime-WKYKWVYU.js");
+  coreRuntimePromise ??= import("./core-runtime-XQFZLA2V.js");
   return coreRuntimePromise;
 }
 __name(loadCoreRuntime, "loadCoreRuntime");
 var liveDiscoveryRuntimePromise;
 function loadLiveDiscoveryRuntime() {
-  liveDiscoveryRuntimePromise ??= import("./discovery-XP4RMDUM.js");
+  liveDiscoveryRuntimePromise ??= import("./discovery-5KUEPR65.js");
   return liveDiscoveryRuntimePromise;
 }
 __name(loadLiveDiscoveryRuntime, "loadLiveDiscoveryRuntime");
@@ -4071,10 +4089,10 @@ __name(resolveDaemonLogBaseDirForRun, "resolveDaemonLogBaseDirForRun");
 var settingsRuntimePromise;
 function loadSettingsRuntimeModules() {
   settingsRuntimePromise ??= Promise.all([
-    import("./settings-D44YMZFT.js"),
-    import("./environment-HP3AXFTB.js"),
-    import("./loadedSettingsAdapter-DVKROEJD.js"),
-    import("./trustedFolders-OVAQKNV5.js")
+    import("./settings-QQRQ2LR7.js"),
+    import("./environment-ON6GIQ4F.js"),
+    import("./loadedSettingsAdapter-HZUAX5CX.js"),
+    import("./trustedFolders-2ETDL7OD.js")
   ]).then(([settings, environment, loadedSettingsAdapter, trustedFolders]) => ({
     settings,
     environment,
@@ -4087,8 +4105,8 @@ __name(loadSettingsRuntimeModules, "loadSettingsRuntimeModules");
 var channelWebhookConfigRuntimePromise;
 function loadChannelWebhookConfigRuntime() {
   channelWebhookConfigRuntimePromise ??= Promise.all([
-    import("./runtime-VRVBX2E5.js"),
-    import("./config-utils-GPLIABL2.js")
+    import("./runtime-TZMHKZAP.js"),
+    import("./config-utils-JUG3MOYN.js")
   ]).then(([channelRuntime, configUtils]) => ({
     loadChannelsConfig: channelRuntime.loadChannelsConfig,
     parseChannelWebhookConfig: configUtils.parseChannelWebhookConfig
@@ -4115,19 +4133,19 @@ async function loadServeRuntimeModules() {
     workspaceRuntimeCoordinatorModule,
     promptLedgerModule
   ] = await Promise.all([
-    import("./server-FLY5JERG.js"),
-    import("./bridge-AOX5IY44.js"),
-    import("./spawnChannel-T6MX2ZDN.js"),
-    import("./process-registry-OAEG6WGC.js"),
-    import("./workspace-service-5IFDCNN3.js"),
+    import("./server-MD2X5U5L.js"),
+    import("./bridge-ID6N4IH5.js"),
+    import("./spawnChannel-KBGZHW2G.js"),
+    import("./process-registry-X6ZCASEN.js"),
+    import("./workspace-service-5Q6LWBYR.js"),
     import("./types-HKLPXZB3.js"),
-    import("./daemon-status-provider-OK7VONJG.js"),
-    import("./workspace-providers-status-MAM42IZS.js"),
-    import("./workspace-skills-status-FJ3HNH4H.js"),
-    import("./total-session-admission-3SNSJJ32.js"),
-    import("./workspace-registry-7RDDOBLN.js"),
-    import("./workspace-runtime-coordinator-LEPDPXJO.js"),
-    import("./prompt-terminal-ledger-FYYTAOXS.js")
+    import("./daemon-status-provider-GMD7QD4T.js"),
+    import("./workspace-providers-status-YGXL6N5U.js"),
+    import("./workspace-skills-status-PJZTFPVV.js"),
+    import("./total-session-admission-ENKTM2KX.js"),
+    import("./workspace-registry-KX6BIBYK.js"),
+    import("./workspace-runtime-coordinator-2KYYGDDR.js"),
+    import("./prompt-terminal-ledger-2LXWAGWU.js")
   ]);
   return {
     createServeApp: serverModule.createServeApp,
@@ -4240,6 +4258,14 @@ function createBootstrapCapabilities(input) {
     transports: ["rest"],
     policy: { permission: input.permissionPolicy ?? "first-responder" },
     limits: {
+      maxRegisteredWorkspaces: input.opts.maxRegisteredWorkspaces,
+      maxChannelControlWorkspaces: MAX_CHANNEL_CONTROL_WORKSPACES,
+      ...input.opts.maxTotalSessions !== void 0 ? {
+        maxSessionsPerWorkspace: advertisedMaxSessions(
+          input.opts.maxSessions
+        ),
+        maxTotalSessions: positiveFiniteOrNull(input.opts.maxTotalSessions)
+      } : {},
       maxPendingPromptsPerSession: advertisedMaxPendingPromptsPerSession(
         input.opts.maxPendingPromptsPerSession
       ),
@@ -4500,6 +4526,8 @@ function createBootstrapServeApp(input) {
         sessionShellCommandEnabled
       },
       limits: {
+        maxRegisteredWorkspaces: opts.maxRegisteredWorkspaces,
+        maxChannelControlWorkspaces: MAX_CHANNEL_CONTROL_WORKSPACES,
         maxSessions: advertisedMaxSessions(opts.maxSessions),
         maxTotalSessions: positiveFiniteOrNull(opts.maxTotalSessions),
         maxPendingPromptsPerSession: advertisedMaxPendingPromptsPerSession(
@@ -4941,6 +4969,10 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
   const opts = {
     ...optsIn,
     hostname: bindHostname,
+    maxRegisteredWorkspaces: resolveMaxRegisteredWorkspaces(
+      optsIn.maxRegisteredWorkspaces,
+      daemonRuntimeBaseEnv
+    ),
     token,
     promptDeadlineMs,
     writerIdleTimeoutMs,
@@ -5163,9 +5195,9 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       }
     }
   }
-  if (workspaceInputs.length > MAX_REGISTERED_WORKSPACES) {
+  if (workspaceInputs.length > opts.maxRegisteredWorkspaces) {
     throw new Error(
-      `At most ${MAX_REGISTERED_WORKSPACES} --workspace values may be registered.`
+      `At most ${opts.maxRegisteredWorkspaces} --workspace values may be registered.`
     );
   }
   opts.daemonMemoryBudget = resolveDaemonMemoryBudget({
@@ -5205,8 +5237,9 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     );
   }
   let workspaceRegistrationStore = deps.workspaceRegistrationStore;
+  const explicitWorkspaceCount = workspaceInputs.length;
   if (workspaceRegistrationStore === void 0 && process.env["QWEN_SERVE_NO_PERSISTENT_REGISTRATION"] !== "1") {
-    const { WorkspaceRegistrationStore } = await import("./workspace-registration-store-HKLJEDQX.js");
+    const { WorkspaceRegistrationStore } = await import("./workspace-registration-store-E4IAOFFZ.js");
     workspaceRegistrationStore = new WorkspaceRegistrationStore(boundWorkspace);
   }
   if (workspaceRegistrationStore) {
@@ -5261,14 +5294,6 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           );
           continue;
         }
-        if (workspaceInputs.length >= MAX_REGISTERED_WORKSPACES) {
-          writeStderrLine(
-            `qwen serve: skipping persisted workspace registration ${JSON.stringify(
-              storedWorkspace
-            )}: workspace limit reached`
-          );
-          continue;
-        }
         workspaceInputs.push({
           raw: storedWorkspace,
           cwd,
@@ -5283,6 +5308,11 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       );
     }
   }
+  if (workspaceInputs.length > opts.maxRegisteredWorkspaces) {
+    throw new Error(
+      `${explicitWorkspaceCount} explicit + ${workspaceInputs.length - explicitWorkspaceCount} restored workspaces exceed the configured limit of ${opts.maxRegisteredWorkspaces}. Restart with the previous capacity, forget registrations and reduce explicit --workspace values before lowering the limit. The registration store was not changed.`
+    );
+  }
   if (workspaceInputs.length > 1 && deps.bridge) {
     throw new Error(
       "Injected bridge dependencies are only supported with a single workspace; multiple --workspace values require runQwenServe to construct one bridge per workspace."
@@ -5308,7 +5338,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       throw err;
     }
     writeStderrLine(
-      `qwen serve: could not read settings for context.fileName / policy.* (${err instanceof Error ? err.message : String(err)}); falling back to defaults. Restart with a valid settings.json to apply context.fileName / policy.* overrides.`
+      `qwen serve: could not read settings for context.fileName / policy.* / serve.channels (${err instanceof Error ? err.message : String(err)}); falling back to defaults. Restart with a valid settings.json to apply context.fileName / policy.* / serve.channels overrides.`
     );
   }
   const daemonLogBaseDir = await resolveDaemonLogBaseDirForRun({
@@ -5321,6 +5351,54 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     baseDir: daemonLogBaseDir
   });
   loggerLifecycle.initialized(daemonLog);
+  let channelSelectionFromSettings = false;
+  const reportConfiguredChannelStartupFailure = /* @__PURE__ */ __name((error) => {
+    const message = sanitizeLogText(
+      redactLogCredentials(
+        error instanceof Error ? error.message : String(error)
+      ),
+      512
+    );
+    const detail = /[.!?]$/.test(message) ? message : `${message}.`;
+    writeStderrLine(
+      `qwen serve: workspace serve.channels was not restored: ${detail} Continuing without channels.`
+    );
+    daemonLog.warn(
+      `workspace serve.channels was not restored: ${detail} Continuing without channels`
+    );
+  }, "reportConfiguredChannelStartupFailure");
+  if (!opts.channelSelection && bootSettings?.serve?.channels !== void 0) {
+    try {
+      const rawChannels = bootSettings.serve.channels;
+      if (!Array.isArray(rawChannels) || !rawChannels.every((name) => typeof name === "string")) {
+        throw new Error("serve.channels must be a string array.");
+      }
+      const configuredChannels = rawChannels.filter((name, index) => {
+        if (!name || name !== name.trim() || sanitizeLogText(name, name.length) !== name) {
+          daemonLog.warn(
+            `ignored invalid workspace serve.channels entry at index ${index}`
+          );
+          return false;
+        }
+        return true;
+      });
+      opts.channelSelection = normalizeServeChannelSelection(
+        configuredChannels,
+        "serve.channels"
+      );
+      if (opts.channelSelection) {
+        channelSelectionFromSettings = true;
+        channelRuntime = await ensureChannelRuntime();
+        daemonLog.info("restoring channels from workspace serve.channels", {
+          channels: channelSelectionNames(opts.channelSelection),
+          workspaceCwd: boundWorkspace
+        });
+      }
+    } catch (error) {
+      opts.channelSelection = void 0;
+      reportConfiguredChannelStartupFailure(error);
+    }
+  }
   daemonLog.info("project memory scope resolved", {
     projectMemoryScope: resolvedMemoryProjectScope,
     projectMemoryScopeSource: memoryProjectScopeSource,
@@ -5472,7 +5550,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
   }
   opts.maxTotalSessions ??= deriveDefaultMaxTotalSessions(
     opts.maxSessions,
-    workspaceInputs.length
+    workspaceInputs.length,
+    opts.maxRegisteredWorkspaces
   );
   const inheritedNoPool = process.env["QWEN_SERVE_NO_MCP_POOL"] === "1";
   if (opts.mcpPoolActive === void 0 && inheritedNoPool) {
@@ -5497,7 +5576,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       "qwen serve: required external tool guard handshake succeeded."
     );
   }
-  const { createDaemonToolGuard } = await import("./daemon-git-worktree-guard-73ZWOLKL.js");
+  const { createDaemonToolGuard } = await import("./daemon-git-worktree-guard-5WEMZ64U.js");
   const daemonToolGuardHandler = createDaemonToolGuard(
     externalToolGuardHandler
   );
@@ -5848,7 +5927,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       loadCoreRuntime(),
       loadSettingsRuntimeModules(),
       cliVersionPromise,
-      import("./daemon-trust-policy-CAUCREG2.js")
+      import("./daemon-trust-policy-IPBZES2Z.js")
     ]);
     getWorkspaceRuntimeCoordinatorIfSupported = runtime.getWorkspaceRuntimeCoordinatorIfSupported;
     cliVersion = resolvedCliVersion;
@@ -6256,7 +6335,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     }), "persistDisabledToolsFn");
     const persistDisabledSkillsFn = /* @__PURE__ */ __name((workspace, skillName, enabled, assertGenerationOpen) => withSettingsLock(workspace, async () => {
       assertGenerationOpen?.();
-      const { skillSettingStrings, updateWorkspaceSkillSettingLists } = await import("./skill-settings-VHEJMBFL.js");
+      const { skillSettingStrings, updateWorkspaceSkillSettingLists } = await import("./skill-settings-INLEGDEZ.js");
       const fresh = loadSettingsForPersistence(workspace);
       const workspaceDisabled = skillSettingStrings(
         fresh,
@@ -6306,7 +6385,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     }), "persistDisabledSkillsFn");
     const persistDisabledSkillsBatchFn = /* @__PURE__ */ __name((workspace, skillNames, enabled, assertGenerationOpen) => withSettingsLock(workspace, async () => {
       assertGenerationOpen?.();
-      const { skillSettingStrings, updateWorkspaceSkillSettingLists } = await import("./skill-settings-VHEJMBFL.js");
+      const { skillSettingStrings, updateWorkspaceSkillSettingLists } = await import("./skill-settings-INLEGDEZ.js");
       const fresh = loadSettingsForPersistence(workspace);
       const initialDisabled = skillSettingStrings(
         fresh,
@@ -6397,10 +6476,10 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       }
     }), "persistSettingsFn");
     const [{ createSubSessionLauncher }, scheduledTaskRoutes] = await Promise.all([
-      import("./create-sub-session-PPLXB3JJ.js"),
-      import("./scheduled-tasks-D65KJDA3.js")
+      import("./create-sub-session-T4IYIOC7.js"),
+      import("./scheduled-tasks-7RL6ZOYT.js")
     ]);
-    const { sessionAttachmentsRoots } = await import("./session-attachments-root-7ACGLHXA.js");
+    const { sessionAttachmentsRoots } = await import("./session-attachments-root-QPN3YWTY.js");
     const createCurrentSessionScheduledTaskHandler = /* @__PURE__ */ __name((workspaceCwd, runtimeBaseDir, getBridge, assertGenerationOpen) => async ({
       callerSessionId,
       cron,
@@ -6437,6 +6516,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     const subSessionLauncher = createSubSessionLauncher({
       getBridge: /* @__PURE__ */ __name(() => bridgeRef, "getBridge"),
       boundWorkspace,
+      runtimeBaseDir: primarySessionRuntimeBaseDir,
       ...subSessionConcurrencyCapsFromSettings(
         runtimeBootSettings?.merged.serve ?? {}
       )
@@ -6446,6 +6526,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       primarySessionRuntimeBaseDir
     );
     const bridge = deps.bridge ?? runtime.createAcpSessionBridge({
+      artifactSnapshotRuntimeBaseDir: primarySessionRuntimeBaseDir,
       sessionAttachmentsRoot: attachmentsRoots.root,
       sessionAttachmentsFallbackRoot: attachmentsRoots.fallback,
       // Reverse tool channel: let `BridgeClient.extMethod` reach the WS
@@ -6885,6 +6966,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       const secondarySubSessionLauncher = createSubSessionLauncher({
         getBridge: /* @__PURE__ */ __name(() => secondaryBridgeRef, "getBridge"),
         boundWorkspace: workspaceInput.cwd,
+        runtimeBaseDir: secondaryEnv.sessionRuntimeBaseDir,
         ...subSessionConcurrencyCapsFromSettings(
           secondarySettings?.merged.serve ?? {}
         )
@@ -6894,6 +6976,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         secondaryEnv.sessionRuntimeBaseDir
       );
       const secondaryBridge = runtime.createAcpSessionBridge({
+        artifactSnapshotRuntimeBaseDir: secondaryEnv.sessionRuntimeBaseDir,
         sessionAttachmentsRoot: secondaryAttachmentsRoots.root,
         sessionAttachmentsFallbackRoot: secondaryAttachmentsRoots.fallback,
         clientMcpSender: secondaryClientMcpSenderRegistry.lookup,
@@ -7241,7 +7324,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     };
     sessionPrRefreshTimer?.dispose();
     const refreshGeneration = ++sessionPrRefreshGeneration;
-    void import("./session-pr-refresh-TQS57SDK.js").then((mod) => {
+    void import("./session-pr-refresh-4Y2ANMJX.js").then((mod) => {
       if (refreshGeneration !== sessionPrRefreshGeneration) return;
       sessionPrRefreshTimer = mod.startSessionPrRefreshTimer({
         workspaceRegistry,
@@ -7325,6 +7408,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       const wsSubSessionLauncher = createSubSessionLauncher({
         getBridge: /* @__PURE__ */ __name(() => wsBridgeRef, "getBridge"),
         boundWorkspace: cwd,
+        runtimeBaseDir: wsEnv.sessionRuntimeBaseDir,
         ...provenance === "live-conversation" ? {
           notifySentCompletion: true,
           getStandaloneSessionService: /* @__PURE__ */ __name(() => (runtimeApp ?? runtimeAppForCleanup)?.locals?.["standaloneSessionService"], "getStandaloneSessionService"),
@@ -7348,6 +7432,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           wsEnv.sessionRuntimeBaseDir
         );
         wsBridge = runtime.createAcpSessionBridge({
+          artifactSnapshotRuntimeBaseDir: wsEnv.sessionRuntimeBaseDir,
           sessionAttachmentsRoot: wsAttachmentsRoots.root,
           sessionAttachmentsFallbackRoot: wsAttachmentsRoots.fallback,
           clientMcpSender: wsClientMcpRegistry.lookup,
@@ -7911,8 +7996,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           { createChannelManagementService },
           { WorkspaceChannelSettingsStore }
         ] = await Promise.all([
-          import("./channel-management-service-MWQGHPAS.js"),
-          import("./channel-settings-store-XZCGDGHW.js")
+          import("./channel-management-service-ASCXI7FR.js"),
+          import("./channel-settings-store-TPJFQAZY.js")
         ]);
         return createChannelManagementService({
           workspaceCwd: targetRuntime.workspaceCwd,
@@ -7966,6 +8051,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       throw new Error("Workspace runtime publication validation failed.");
     }, "validateWorkspaceRuntimeForPublication");
     const app2 = runtime.createServeApp(opts, () => actualPort, {
+      maxChannelControlWorkspaces: MAX_CHANNEL_CONTROL_WORKSPACES,
       serveAppLifecycle,
       liveDiscoveryStableBaseDir,
       workspaceRegistry,
@@ -8117,8 +8203,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         { createWorkspaceTrustReconciler },
         { createDaemonTrustPolicyMonitor }
       ] = await Promise.all([
-        import("./workspace-trust-reconciler-PQFHIWLR.js"),
-        import("./daemon-trust-policy-monitor-3Y36OOEQ.js")
+        import("./workspace-trust-reconciler-HS6PWNEA.js"),
+        import("./daemon-trust-policy-monitor-MHYEN7X7.js")
       ]);
       const materializationFor = /* @__PURE__ */ __name((entry, snapshot, decision) => {
         const boundWorkspaces2 = entry.primary && decision.targetTrusted ? runtime.resolveBoundWorkspacesFromIdeEnv(
@@ -8315,7 +8401,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     // through (and start the runtime) exactly like the warm app would.
     // Dynamic import keeps web-shell-static out of the serve fast-path
     // static closure (see the import-boundary guards in fast-path.test.ts).
-    isPreAuthRequest: webShellMounted ? (req) => import("./web-shell-static-BFDESDD4.js").then(
+    isPreAuthRequest: webShellMounted ? (req) => import("./web-shell-static-T7UGLVE4.js").then(
       (webShellStatic) => webShellStatic.isPreAuthWebShellRequest(req)
     ) : void 0
   });
@@ -8334,11 +8420,12 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       `Invalid maxConnections: ${opts.maxConnections}. Must be >= 0 (0 / Infinity = unlimited).`
     );
   }
-  const channelValidationSettingsRuntime = opts.channelSelection ? await loadSettingsRuntimeModules() : void 0;
-  const channelValidationTrustPolicy = opts.channelSelection ? await import("./daemon-trust-policy-CAUCREG2.js") : void 0;
-  const channelValidationTrustSnapshot = channelValidationTrustPolicy ? await channelValidationTrustPolicy.readDaemonTrustPolicySnapshot() : void 0;
+  let channelValidationSettingsRuntime;
+  let channelValidationTrustPolicy;
+  let channelValidationTrustSnapshot;
   const resolveChannelWorkspaceGroupsAtListen = /* @__PURE__ */ __name(() => {
-    if (!opts.channelSelection || !channelValidationSettingsRuntime || !channelRuntime) {
+    const validationSettingsRuntime = channelValidationSettingsRuntime;
+    if (!opts.channelSelection || !validationSettingsRuntime || !channelRuntime) {
       return void 0;
     }
     const registry = (runtimeApp ?? runtimeAppForCleanup)?.locals?.["workspaceRegistry"];
@@ -8378,15 +8465,12 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           { code: "untrusted_workspace" }
         );
       }
-      const effectiveEnv = runtime ? workspaceRuntimeEffectiveEnv(runtime, daemonRuntimeBaseEnv) : channelValidationSettingsRuntime.environment.buildRuntimeEnvironment(
-        channelValidationSettingsRuntime.settings.loadSettings(
-          workspace.cwd,
-          {
-            skipLoadEnvironment: true,
-            skipWorkspaceSettings: false,
-            workspaceTrusted: true
-          }
-        ).merged,
+      const effectiveEnv = runtime ? workspaceRuntimeEffectiveEnv(runtime, daemonRuntimeBaseEnv) : validationSettingsRuntime.environment.buildRuntimeEnvironment(
+        validationSettingsRuntime.settings.loadSettings(workspace.cwd, {
+          skipLoadEnvironment: true,
+          skipWorkspaceSettings: false,
+          workspaceTrusted: true
+        }).merged,
         workspace.cwd,
         daemonRuntimeBaseEnv,
         trusted
@@ -8397,7 +8481,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     const workspaces = workspaceInputs.map((workspace, index) => {
       const runtime = resolveRuntime(workspace.cwd);
       const trusted = resolveTrusted(workspace.cwd, index === 0, runtime);
-      const settings = channelValidationSettingsRuntime.settings.loadSettings(
+      const settings = validationSettingsRuntime.settings.loadSettings(
         workspace.cwd,
         {
           skipLoadEnvironment: true,
@@ -8408,7 +8492,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       settingsByWorkspace.set(workspace.cwd, settings);
       channelWebhookEnvByWorkspace.set(
         workspace.cwd,
-        runtime ? workspaceRuntimeEffectiveEnv(runtime, daemonRuntimeBaseEnv) : channelValidationSettingsRuntime.environment.buildRuntimeEnvironment(
+        runtime ? workspaceRuntimeEffectiveEnv(runtime, daemonRuntimeBaseEnv) : validationSettingsRuntime.environment.buildRuntimeEnvironment(
           settings.merged,
           workspace.cwd,
           daemonRuntimeBaseEnv,
@@ -8439,7 +8523,23 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     return grouping.groups;
   }, "resolveChannelWorkspaceGroupsAtListen");
   if (opts.channelSelection) {
-    reserveChannelServicePidfile(opts.channelSelection);
+    try {
+      channelValidationSettingsRuntime = await loadSettingsRuntimeModules();
+      channelValidationTrustPolicy = await import("./daemon-trust-policy-IPBZES2Z.js");
+      channelValidationTrustSnapshot = await channelValidationTrustPolicy.readDaemonTrustPolicySnapshot();
+      if (opts.channelSelection.mode === "names" && workspaceInputs.length > MAX_CHANNEL_CONTROL_WORKSPACES) {
+        const groups = resolveChannelWorkspaceGroupsAtListen();
+        assertChannelControlWorkspaceCapacity(
+          groups?.map((group) => group.workspaceCwd) ?? []
+        );
+      }
+      reserveChannelServicePidfile(opts.channelSelection);
+    } catch (error) {
+      if (!channelSelectionFromSettings) throw error;
+      removeCurrentServePidfile();
+      opts.channelSelection = void 0;
+      reportConfiguredChannelStartupFailure(error);
+    }
   }
   return await new Promise((resolve3, reject) => {
     let closeHost;
@@ -8806,11 +8906,10 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       const armRuntimeStartupTimer = /* @__PURE__ */ __name(() => {
         if (runtimeStartupTimeoutMs <= 0 || runtimeStartupTimer) return;
         runtimeStartupTimer = setTimeout(() => {
-          void failRuntimeStartup(
-            new Error(
-              `Daemon runtime startup timed out after ${runtimeStartupTimeoutMs}ms.`
-            )
+          const timeoutError = new Error(
+            `Daemon runtime startup timed out after ${runtimeStartupTimeoutMs}ms.`
           );
+          void failRuntimeStartup(timeoutError);
         }, runtimeStartupTimeoutMs);
         runtimeStartupTimer.unref();
       }, "armRuntimeStartupTimer");
@@ -9037,8 +9136,32 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         acpHandle?.attachServer?.(server);
         if (opts.channelSelection) {
           closeServerAfterChannelWorkerStartupFailure = true;
-          const manager = await ensureChannelWorkerManager();
-          await manager.startInitial(opts.channelSelection);
+          let manager;
+          try {
+            manager = await ensureChannelWorkerManager();
+            await manager.startInitial(opts.channelSelection);
+          } catch (error2) {
+            if (!channelSelectionFromSettings || runtimeStartupSettled) {
+              throw error2;
+            }
+            closeServerAfterChannelWorkerStartupFailure = false;
+            opts.channelSelection = void 0;
+            reportConfiguredChannelStartupFailure(error2);
+            try {
+              if (manager) {
+                await manager.stopSelection();
+              } else {
+                removeCurrentServePidfile();
+                if (channelPidfileReserved) {
+                  throw new Error(
+                    "Failed to release the channel service lease."
+                  );
+                }
+              }
+            } catch (cleanupError) {
+              reportConfiguredChannelStartupFailure(cleanupError);
+            }
+          }
           if (runtimeStartupSettled) return;
         }
         if (runtimeStartupSettled) return;
@@ -9048,7 +9171,45 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         clearRuntimeStartupTimer();
         markRuntimeReady();
       }, "completeRuntimeStartup");
-      const startBridgePreheat = /* @__PURE__ */ __name((bridge) => {
+      const scheduleWorkspaceMcpDiscoveryAfterPreheat = /* @__PURE__ */ __name((app2) => {
+        if (runtimeStartupError !== void 0) {
+          daemonLog.info(
+            "workspace runtime ensure after preheat skipped: runtime startup failed"
+          );
+          return;
+        }
+        if (shuttingDown) {
+          daemonLog.info(
+            "workspace runtime ensure after preheat skipped: shutting down"
+          );
+          return;
+        }
+        const registry = app2.locals?.["workspaceRegistry"];
+        const primaryEntry = registry?.primaryEntry;
+        const runtime = primaryEntry?.state === "active" ? primaryEntry.current?.runtime : void 0;
+        if (!runtime) {
+          daemonLog.info(
+            "workspace runtime ensure after preheat skipped: no primary runtime"
+          );
+          return;
+        }
+        const coordinator = getWorkspaceRuntimeCoordinatorIfSupported?.(runtime);
+        if (!coordinator) {
+          daemonLog.info(
+            "workspace runtime ensure after preheat skipped: workspace runtime lifecycle is not supported"
+          );
+          return;
+        }
+        void coordinator.ensure({ keepAliveMs: ENSURE_KEEP_ALIVE_MS }).catch((err) => {
+          if (shuttingDown || runtimeStartupError !== void 0) {
+            return;
+          }
+          daemonLog.warn(
+            `workspace runtime ensure after preheat failed: ${deepestErrorMessage(err)}`
+          );
+        });
+      }, "scheduleWorkspaceMcpDiscoveryAfterPreheat");
+      const startBridgePreheat = /* @__PURE__ */ __name((bridge, app2) => {
         startup.preheat.status = "running";
         const preheatStartedAt = performance2.now();
         bridge.preheat().then(() => {
@@ -9056,6 +9217,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           startup.preheat.durationMs = Math.round(
             performance2.now() - preheatStartedAt
           );
+          scheduleWorkspaceMcpDiscoveryAfterPreheat(app2);
         }).catch((err) => {
           const message = err instanceof Error ? err.message : String(err);
           startup.preheat.status = "failed";
@@ -9089,7 +9251,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
             return;
           }
           if (shouldPreheat && runtime.bridge) {
-            startBridgePreheat(runtime.bridge);
+            startBridgePreheat(runtime.bridge, runtime.app);
           }
           await completeRuntimeStartup(runtime.app);
         }).catch((err) => failRuntimeStartup(err));
@@ -9406,14 +9568,19 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       } catch (err) {
         removeCurrentServePidfile();
         const error2 = err instanceof Error ? err : new Error(String(err));
-        markServeAppStartupFailed(error2);
-        void serveAppLifecycle.close().then(
-          () => reject(error2),
-          (closeError) => reject(
-            closeError instanceof Error ? new AggregateError([error2, closeError], error2.message) : error2
-          )
-        );
-        return;
+        if (channelSelectionFromSettings) {
+          opts.channelSelection = void 0;
+          reportConfiguredChannelStartupFailure(error2);
+        } else {
+          markServeAppStartupFailed(error2);
+          void serveAppLifecycle.close().then(
+            () => reject(error2),
+            (closeError) => reject(
+              closeError instanceof Error ? new AggregateError([error2, closeError], error2.message) : error2
+            )
+          );
+          return;
+        }
       }
       if (channelWorkspaceGroups) {
         for (const group of channelWorkspaceGroups) {
@@ -9424,7 +9591,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         }
         if (opts.channelSelection?.mode === "all") {
           writeStderrLine(
-            "qwen serve: --channel all is primary-workspace only; non-primary workspace channels are not hosted."
+            channelSelectionFromSettings ? 'qwen serve: workspace serve.channels selection "all" is primary-workspace only; non-primary workspace channels are not hosted.' : "qwen serve: --channel all is primary-workspace only; non-primary workspace channels are not hosted."
           );
         }
       }
@@ -9472,9 +9639,10 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       });
       const preparedRuntimeApp = runtimeApp ?? runtimeAppForCleanup;
       if (preparedRuntimeApp && bridgeRef && deps.bridge) {
+        runtimeApp ??= preparedRuntimeApp;
         attachLiveDiscoveryControl(preparedRuntimeApp);
         if (shouldPreheat) {
-          startBridgePreheat(bridgeRef);
+          startBridgePreheat(bridgeRef, preparedRuntimeApp);
         }
         if (opts.channelSelection && !runtimeStartupSettled) {
           armRuntimeStartupTimer();
@@ -9486,6 +9654,11 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           acpHandle?.attachServer?.(server);
           markServeAppStartupReady();
           void publishLiveDiscovery(preparedRuntimeApp);
+          if (!runtimeStartupSettled) {
+            runtimeStartupSettled = true;
+            clearRuntimeStartupTimer();
+            markRuntimeReady();
+          }
         }
       } else if (deferRuntimeUntilFirstHealth) {
         scheduleRuntimeStartFallback();