@qwen-code/qwen-code 0.23.3-nightly.20260910.c46cb85cf2 → 0.23.3

package/chunks/{run-qwen-serve-PPTGWC5B.js → run-qwen-serve-26KZDECC.js}

@@ -51,7 +51,7 @@ import {
   prepareManagedScratchRoot,
   resolveAcpHttpEnabled,
   toDaemonStatusMemoryLimits
-} from "./chunk-B2TGBZXY.js";
+} from "./chunk-NRXWJXJ4.js";
 import {
   ConversationDirectoryIdentityError,
   assertExactConversationRootIdentity,
@@ -109,18 +109,18 @@ import {
 import "./chunk-ZL4HFSL6.js";
 import {
   resolveChannelCwd
-} from "./chunk-CSHX5ZC4.js";
+} from "./chunk-76RGWKLS.js";
 import {
   assertChannelControlWorkspaceCapacity
-} from "./chunk-6UK77U7D.js";
+} from "./chunk-XGYHNWL3.js";
 import {
   LOAD_REPLAY_META_KEY
-} from "./chunk-YKK2XXHF.js";
+} from "./chunk-PSPAM24S.js";
 import "./chunk-FAWTMDX7.js";
 import {
   ExtraCaInspectionError,
   loadableCertificates
-} from "./chunk-XDQUDARC.js";
+} from "./chunk-EDMXGXAK.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-Z7B6SRPM.js";
 import {
@@ -129,11 +129,10 @@ import {
 import {
   normalizeWorkerDiagnostic,
   sanitizeWorkerDiagnostic
-} from "./chunk-LEGNDA46.js";
+} from "./chunk-NLNQNBZ2.js";
 import {
-  channelSelectionNames,
-  normalizeServeChannelSelection
-} from "./chunk-GDWE23OR.js";
+  channelSelectionNames
+} from "./chunk-ALMR3E6Q.js";
 import {
   QWEN_SERVER_TOKEN_ENV
 } from "./chunk-GYTKQYDB.js";
@@ -145,9 +144,7 @@ import {
   MAX_CHANNEL_CONTROL_WORKSPACES
 } from "./chunk-CJ3DHN5I.js";
 import "./chunk-UDG5EZJI.js";
-import {
-  redactLogCredentials
-} from "./chunk-M5GB774H.js";
+import "./chunk-M5GB774H.js";
 import {
   EXTERNAL_TOOL_GUARD_PROVIDER_ATTACHED_VALUE,
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
@@ -159,13 +156,13 @@ import "./chunk-K6KS3LTN.js";
 import "./chunk-OSHQMOBS.js";
 import {
   sanitizeLogText
-} from "./chunk-C4NLHK7X.js";
+} from "./chunk-7QYWGTHB.js";
 import "./chunk-IJOS26LH.js";
 import {
   consumeServeFastPathRejectedLoaderKeys,
   loadServeFastPathSettings,
   preResolveServeFastPathHomeEnvOverrides
-} from "./chunk-WXFK4MH7.js";
+} from "./chunk-VG3Q2NC4.js";
 import "./chunk-BW4333PP.js";
 import {
   acquireInheritedLoaderEnvScrub,
@@ -177,7 +174,7 @@ import {
   resolveMaxRegisteredWorkspaces,
   resolveWorkspaceInputs,
   workspaceRegistrationId
-} from "./chunk-SNZWDV67.js";
+} from "./chunk-SBRX4BDI.js";
 import {
   canonicalizeWorkspace,
   translateAndCheckAbsoluteWorkspacePath
@@ -188,7 +185,7 @@ import {
 } from "./chunk-IDS7MSUP.js";
 import {
   getCliVersion
-} from "./chunk-ONGZNOIP.js";
+} from "./chunk-R4Q2PEFV.js";
 import "./chunk-W3N5XAZ6.js";
 import "./chunk-NPQ5ZKRP.js";
 import {
@@ -3105,16 +3102,6 @@ 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":
@@ -3942,12 +3929,12 @@ __name(hasRetryableChannelWorkerShutdownError, "hasRetryableChannelWorkerShutdow
 var channelWorkerRuntimePromise;
 async function loadChannelWorkerRuntime() {
   channelWorkerRuntimePromise ??= Promise.all([
-    import("./channel-worker-supervisor-HSFAKML6.js"),
-    import("./pidfile-JAIOWPI3.js"),
-    import("./runtime-5RO22P2N.js"),
+    import("./channel-worker-supervisor-ZFNWMG6D.js"),
+    import("./pidfile-H32FEPWA.js"),
+    import("./runtime-BMEIVDDG.js"),
     import("./cli-entry-path-4VJ3Y6T2.js"),
-    import("./channel-worker-group-X6WH4XWF.js"),
-    import("./channel-worker-manager-SICFJDPJ.js")
+    import("./channel-worker-group-F2ZZMLNS.js"),
+    import("./channel-worker-manager-2SZLJJSJ.js")
   ]).then(
     ([
       supervisor,
@@ -4053,7 +4040,7 @@ function shouldPreheatBridge(deps) {
 __name(shouldPreheatBridge, "shouldPreheatBridge");
 var coreRuntimePromise;
 function loadCoreRuntime() {
-  coreRuntimePromise ??= import("./core-runtime-YGUA42AZ.js");
+  coreRuntimePromise ??= import("./core-runtime-NVHT3Z3V.js");
   return coreRuntimePromise;
 }
 __name(loadCoreRuntime, "loadCoreRuntime");
@@ -4089,10 +4076,10 @@ __name(resolveDaemonLogBaseDirForRun, "resolveDaemonLogBaseDirForRun");
 var settingsRuntimePromise;
 function loadSettingsRuntimeModules() {
   settingsRuntimePromise ??= Promise.all([
-    import("./settings-SWQH36PO.js"),
-    import("./environment-URPO5ORZ.js"),
-    import("./loadedSettingsAdapter-NZORJLSD.js"),
-    import("./trustedFolders-GKQZXZSV.js")
+    import("./settings-DDNHJX2L.js"),
+    import("./environment-DKXHG4HB.js"),
+    import("./loadedSettingsAdapter-3DXLASK7.js"),
+    import("./trustedFolders-5VCBXFOP.js")
   ]).then(([settings, environment, loadedSettingsAdapter, trustedFolders]) => ({
     settings,
     environment,
@@ -4105,8 +4092,8 @@ __name(loadSettingsRuntimeModules, "loadSettingsRuntimeModules");
 var channelWebhookConfigRuntimePromise;
 function loadChannelWebhookConfigRuntime() {
   channelWebhookConfigRuntimePromise ??= Promise.all([
-    import("./runtime-5RO22P2N.js"),
-    import("./config-utils-S5LFS4RN.js")
+    import("./runtime-BMEIVDDG.js"),
+    import("./config-utils-L6KLDYIV.js")
   ]).then(([channelRuntime, configUtils]) => ({
     loadChannelsConfig: channelRuntime.loadChannelsConfig,
     parseChannelWebhookConfig: configUtils.parseChannelWebhookConfig
@@ -4133,19 +4120,19 @@ async function loadServeRuntimeModules() {
     workspaceRuntimeCoordinatorModule,
     promptLedgerModule
   ] = await Promise.all([
-    import("./server-SWXVPRCS.js"),
-    import("./bridge-YF6NYRPZ.js"),
-    import("./spawnChannel-7ZVM3GBU.js"),
+    import("./server-LBPYXZ5G.js"),
+    import("./bridge-DAFMI72L.js"),
+    import("./spawnChannel-GQ45QFGB.js"),
     import("./process-registry-X6ZCASEN.js"),
-    import("./workspace-service-HWXZSA4J.js"),
+    import("./workspace-service-RQTTAGGC.js"),
     import("./types-HKLPXZB3.js"),
-    import("./daemon-status-provider-RTKHKUFJ.js"),
-    import("./workspace-providers-status-QBRBEFTO.js"),
-    import("./workspace-skills-status-D6QXUWCC.js"),
-    import("./total-session-admission-BOARHBZU.js"),
-    import("./workspace-registry-CJV7KVGF.js"),
-    import("./workspace-runtime-coordinator-7LYMFMFF.js"),
-    import("./prompt-terminal-ledger-BYXHEUHX.js")
+    import("./daemon-status-provider-O5KQZYMP.js"),
+    import("./workspace-providers-status-AEYISSU2.js"),
+    import("./workspace-skills-status-5HWZU3HX.js"),
+    import("./total-session-admission-JIHSTJ5S.js"),
+    import("./workspace-registry-C2NGE6SD.js"),
+    import("./workspace-runtime-coordinator-QKMZ24YF.js"),
+    import("./prompt-terminal-ledger-I5SLL6UF.js")
   ]);
   return {
     createServeApp: serverModule.createServeApp,
@@ -5239,7 +5226,7 @@ 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-WUKTMJPW.js");
+    const { WorkspaceRegistrationStore } = await import("./workspace-registration-store-A7RGKW62.js");
     workspaceRegistrationStore = new WorkspaceRegistrationStore(boundWorkspace);
   }
   if (workspaceRegistrationStore) {
@@ -5338,7 +5325,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       throw err;
     }
     writeStderrLine(
-      `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.`
+      `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.`
     );
   }
   const daemonLogBaseDir = await resolveDaemonLogBaseDirForRun({
@@ -5351,54 +5338,6 @@ 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,
@@ -5576,7 +5515,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       "qwen serve: required external tool guard handshake succeeded."
     );
   }
-  const { createDaemonToolGuard } = await import("./daemon-git-worktree-guard-3AWINPPX.js");
+  const { createDaemonToolGuard } = await import("./daemon-git-worktree-guard-FOW4RQSK.js");
   const daemonToolGuardHandler = createDaemonToolGuard(
     externalToolGuardHandler
   );
@@ -5927,7 +5866,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       loadCoreRuntime(),
       loadSettingsRuntimeModules(),
       cliVersionPromise,
-      import("./daemon-trust-policy-6YQOC7B6.js")
+      import("./daemon-trust-policy-3ATXEON7.js")
     ]);
     getWorkspaceRuntimeCoordinatorIfSupported = runtime.getWorkspaceRuntimeCoordinatorIfSupported;
     cliVersion = resolvedCliVersion;
@@ -6335,7 +6274,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-JU72PCII.js");
+      const { skillSettingStrings, updateWorkspaceSkillSettingLists } = await import("./skill-settings-XERQCUXZ.js");
       const fresh = loadSettingsForPersistence(workspace);
       const workspaceDisabled = skillSettingStrings(
         fresh,
@@ -6385,7 +6324,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-JU72PCII.js");
+      const { skillSettingStrings, updateWorkspaceSkillSettingLists } = await import("./skill-settings-XERQCUXZ.js");
       const fresh = loadSettingsForPersistence(workspace);
       const initialDisabled = skillSettingStrings(
         fresh,
@@ -6476,10 +6415,10 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       }
     }), "persistSettingsFn");
     const [{ createSubSessionLauncher }, scheduledTaskRoutes] = await Promise.all([
-      import("./create-sub-session-SEK6KCYR.js"),
-      import("./scheduled-tasks-YGERFWLZ.js")
+      import("./create-sub-session-YWASE5VH.js"),
+      import("./scheduled-tasks-NCFPP6VQ.js")
     ]);
-    const { sessionAttachmentsRoots } = await import("./session-attachments-root-SOZCTQWW.js");
+    const { sessionAttachmentsRoots } = await import("./session-attachments-root-OUBQDYC4.js");
     const createCurrentSessionScheduledTaskHandler = /* @__PURE__ */ __name((workspaceCwd, runtimeBaseDir, getBridge, assertGenerationOpen) => async ({
       callerSessionId,
       cron,
@@ -7320,7 +7259,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     };
     sessionPrRefreshTimer?.dispose();
     const refreshGeneration = ++sessionPrRefreshGeneration;
-    void import("./session-pr-refresh-F7XUBQBH.js").then((mod) => {
+    void import("./session-pr-refresh-EKGMYNAW.js").then((mod) => {
       if (refreshGeneration !== sessionPrRefreshGeneration) return;
       sessionPrRefreshTimer = mod.startSessionPrRefreshTimer({
         workspaceRegistry,
@@ -7990,8 +7929,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           { createChannelManagementService },
           { WorkspaceChannelSettingsStore }
         ] = await Promise.all([
-          import("./channel-management-service-E4HTMU7T.js"),
-          import("./channel-settings-store-FZ5VKHQD.js")
+          import("./channel-management-service-OWDXVL7R.js"),
+          import("./channel-settings-store-4I6JONT7.js")
         ]);
         return createChannelManagementService({
           workspaceCwd: targetRuntime.workspaceCwd,
@@ -8197,8 +8136,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         { createWorkspaceTrustReconciler },
         { createDaemonTrustPolicyMonitor }
       ] = await Promise.all([
-        import("./workspace-trust-reconciler-VZX7G7CZ.js"),
-        import("./daemon-trust-policy-monitor-EN5L23GS.js")
+        import("./workspace-trust-reconciler-KFWATZUU.js"),
+        import("./daemon-trust-policy-monitor-7MCNDNEC.js")
       ]);
       const materializationFor = /* @__PURE__ */ __name((entry, snapshot, decision) => {
         const boundWorkspaces2 = entry.primary && decision.targetTrusted ? runtime.resolveBoundWorkspacesFromIdeEnv(
@@ -8414,12 +8353,11 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       `Invalid maxConnections: ${opts.maxConnections}. Must be >= 0 (0 / Infinity = unlimited).`
     );
   }
-  let channelValidationSettingsRuntime;
-  let channelValidationTrustPolicy;
-  let channelValidationTrustSnapshot;
+  const channelValidationSettingsRuntime = opts.channelSelection ? await loadSettingsRuntimeModules() : void 0;
+  const channelValidationTrustPolicy = opts.channelSelection ? await import("./daemon-trust-policy-3ATXEON7.js") : void 0;
+  const channelValidationTrustSnapshot = channelValidationTrustPolicy ? await channelValidationTrustPolicy.readDaemonTrustPolicySnapshot() : void 0;
   const resolveChannelWorkspaceGroupsAtListen = /* @__PURE__ */ __name(() => {
-    const validationSettingsRuntime = channelValidationSettingsRuntime;
-    if (!opts.channelSelection || !validationSettingsRuntime || !channelRuntime) {
+    if (!opts.channelSelection || !channelValidationSettingsRuntime || !channelRuntime) {
       return void 0;
     }
     const registry = (runtimeApp ?? runtimeAppForCleanup)?.locals?.["workspaceRegistry"];
@@ -8459,12 +8397,15 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           { code: "untrusted_workspace" }
         );
       }
-      const effectiveEnv = runtime ? workspaceRuntimeEffectiveEnv(runtime, daemonRuntimeBaseEnv) : validationSettingsRuntime.environment.buildRuntimeEnvironment(
-        validationSettingsRuntime.settings.loadSettings(workspace.cwd, {
-          skipLoadEnvironment: true,
-          skipWorkspaceSettings: false,
-          workspaceTrusted: true
-        }).merged,
+      const effectiveEnv = runtime ? workspaceRuntimeEffectiveEnv(runtime, daemonRuntimeBaseEnv) : channelValidationSettingsRuntime.environment.buildRuntimeEnvironment(
+        channelValidationSettingsRuntime.settings.loadSettings(
+          workspace.cwd,
+          {
+            skipLoadEnvironment: true,
+            skipWorkspaceSettings: false,
+            workspaceTrusted: true
+          }
+        ).merged,
         workspace.cwd,
         daemonRuntimeBaseEnv,
         trusted
@@ -8475,7 +8416,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 = validationSettingsRuntime.settings.loadSettings(
+      const settings = channelValidationSettingsRuntime.settings.loadSettings(
         workspace.cwd,
         {
           skipLoadEnvironment: true,
@@ -8486,7 +8427,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       settingsByWorkspace.set(workspace.cwd, settings);
       channelWebhookEnvByWorkspace.set(
         workspace.cwd,
-        runtime ? workspaceRuntimeEffectiveEnv(runtime, daemonRuntimeBaseEnv) : validationSettingsRuntime.environment.buildRuntimeEnvironment(
+        runtime ? workspaceRuntimeEffectiveEnv(runtime, daemonRuntimeBaseEnv) : channelValidationSettingsRuntime.environment.buildRuntimeEnvironment(
           settings.merged,
           workspace.cwd,
           daemonRuntimeBaseEnv,
@@ -8517,23 +8458,13 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     return grouping.groups;
   }, "resolveChannelWorkspaceGroupsAtListen");
   if (opts.channelSelection) {
-    try {
-      channelValidationSettingsRuntime = await loadSettingsRuntimeModules();
-      channelValidationTrustPolicy = await import("./daemon-trust-policy-6YQOC7B6.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);
+    if (opts.channelSelection.mode === "names" && workspaceInputs.length > MAX_CHANNEL_CONTROL_WORKSPACES) {
+      const groups = resolveChannelWorkspaceGroupsAtListen();
+      assertChannelControlWorkspaceCapacity(
+        groups?.map((group) => group.workspaceCwd) ?? []
+      );
     }
+    reserveChannelServicePidfile(opts.channelSelection);
   }
   return await new Promise((resolve3, reject) => {
     let closeHost;
@@ -8900,10 +8831,11 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       const armRuntimeStartupTimer = /* @__PURE__ */ __name(() => {
         if (runtimeStartupTimeoutMs <= 0 || runtimeStartupTimer) return;
         runtimeStartupTimer = setTimeout(() => {
-          const timeoutError = new Error(
-            `Daemon runtime startup timed out after ${runtimeStartupTimeoutMs}ms.`
+          void failRuntimeStartup(
+            new Error(
+              `Daemon runtime startup timed out after ${runtimeStartupTimeoutMs}ms.`
+            )
           );
-          void failRuntimeStartup(timeoutError);
         }, runtimeStartupTimeoutMs);
         runtimeStartupTimer.unref();
       }, "armRuntimeStartupTimer");
@@ -9130,32 +9062,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         acpHandle?.attachServer?.(server);
         if (opts.channelSelection) {
           closeServerAfterChannelWorkerStartupFailure = true;
-          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);
-            }
-          }
+          const manager = await ensureChannelWorkerManager();
+          await manager.startInitial(opts.channelSelection);
           if (runtimeStartupSettled) return;
         }
         if (runtimeStartupSettled) return;
@@ -9165,45 +9073,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         clearRuntimeStartupTimer();
         markRuntimeReady();
       }, "completeRuntimeStartup");
-      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) => {
+      const startBridgePreheat = /* @__PURE__ */ __name((bridge) => {
         startup.preheat.status = "running";
         const preheatStartedAt = performance2.now();
         bridge.preheat().then(() => {
@@ -9211,7 +9081,6 @@ 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";
@@ -9245,7 +9114,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
             return;
           }
           if (shouldPreheat && runtime.bridge) {
-            startBridgePreheat(runtime.bridge, runtime.app);
+            startBridgePreheat(runtime.bridge);
           }
           await completeRuntimeStartup(runtime.app);
         }).catch((err) => failRuntimeStartup(err));
@@ -9562,19 +9431,14 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       } catch (err) {
         removeCurrentServePidfile();
         const error2 = err instanceof Error ? err : new Error(String(err));
-        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;
-        }
+        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) {
@@ -9585,7 +9449,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         }
         if (opts.channelSelection?.mode === "all") {
           writeStderrLine(
-            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."
+            "qwen serve: --channel all is primary-workspace only; non-primary workspace channels are not hosted."
           );
         }
       }
@@ -9633,10 +9497,9 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       });
       const preparedRuntimeApp = runtimeApp ?? runtimeAppForCleanup;
       if (preparedRuntimeApp && bridgeRef && deps.bridge) {
-        runtimeApp ??= preparedRuntimeApp;
         attachLiveDiscoveryControl(preparedRuntimeApp);
         if (shouldPreheat) {
-          startBridgePreheat(bridgeRef, preparedRuntimeApp);
+          startBridgePreheat(bridgeRef);
         }
         if (opts.channelSelection && !runtimeStartupSettled) {
           armRuntimeStartupTimer();
@@ -9648,11 +9511,6 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           acpHandle?.attachServer?.(server);
           markServeAppStartupReady();
           void publishLiveDiscovery(preparedRuntimeApp);
-          if (!runtimeStartupSettled) {
-            runtimeStartupSettled = true;
-            clearRuntimeStartupTimer();
-            markRuntimeReady();
-          }
         }
       } else if (deferRuntimeUntilFirstHealth) {
         scheduleRuntimeStartFallback();