@qwen-code/qwen-code 0.23.3 → 0.23.4

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

@@ -7,12 +7,12 @@ import {
   hostAssignsIpv6Loopback,
   isOwnInterfaceAddress
 } from "./chunk-24FVUD5P.js";
-import {
-  RUNTIME_STARTUP_CANCELLED_MESSAGE
-} from "./chunk-QUPXZXLV.js";
 import {
   resolveRemoteServeToken
 } from "./chunk-F23YN37B.js";
+import {
+  RUNTIME_STARTUP_CANCELLED_MESSAGE
+} from "./chunk-QUPXZXLV.js";
 import {
   ACCESS_LOG_CONTROLLER_LOCAL,
   CAPABILITIES_SCHEMA_VERSION,
@@ -51,7 +51,7 @@ import {
   prepareManagedScratchRoot,
   resolveAcpHttpEnabled,
   toDaemonStatusMemoryLimits
-} from "./chunk-NRXWJXJ4.js";
+} from "./chunk-7GKPKIUB.js";
 import {
   ConversationDirectoryIdentityError,
   assertExactConversationRootIdentity,
@@ -65,35 +65,30 @@ import {
   revalidateConversationRootIdentity
 } from "./chunk-PB7JBAHF.js";
 import {
-  formatMemoryBudgetStderr,
-  resolveDaemonMemoryBudget,
-  serveJournalGrowthPoolMb
-} from "./chunk-UXEO7E3V.js";
+  formatHostForAuthority,
+  isLoopbackAddress,
+  isLoopbackBind
+} from "./chunk-DMEUXLSS.js";
 import {
   setDeferredRuntimeRequestTiming
 } from "./chunk-LAUEEBDL.js";
 import {
   normalizeSessionIdForLookup
 } from "./chunk-ZEZKIS2K.js";
+import "./chunk-NYWWQ437.js";
+import {
+  resolveSessionRestoreTimeoutMs
+} from "./chunk-4JRM2BSM.js";
 import {
   require_express
 } from "./chunk-SVWWF5TZ.js";
 import {
   resolveWebShellDir
 } from "./chunk-FBX2SDQ4.js";
-import {
-  formatHostForAuthority,
-  isLoopbackAddress,
-  isLoopbackBind
-} from "./chunk-DMEUXLSS.js";
-import "./chunk-NYWWQ437.js";
-import {
-  resolveSessionRestoreTimeoutMs
-} from "./chunk-4JRM2BSM.js";
 import {
   ConversationRuntimeOwnershipError,
   LIVE_HOST_PROTOCOL_VERSION
-} from "./chunk-2Z3T52OC.js";
+} from "./chunk-Y5TM7SBV.js";
 import {
   DEFAULT_RING_SIZE
 } from "./chunk-7U5G6JXI.js";
@@ -106,36 +101,51 @@ import {
   normalizeMaxJournalBytes,
   normalizeMaxJournalEvents
 } from "./chunk-WCCLLK7X.js";
+import {
+  formatMemoryBudgetStderr,
+  resolveDaemonMemoryBudget,
+  serveJournalGrowthPoolMb
+} from "./chunk-LYD3T3H7.js";
 import "./chunk-ZL4HFSL6.js";
 import {
   resolveChannelCwd
-} from "./chunk-76RGWKLS.js";
+} from "./chunk-ABNX6E6K.js";
+import {
+  resolveMaxRegisteredWorkspaces,
+  resolveWorkspaceInputs,
+  workspaceRegistrationId
+} from "./chunk-P225AM5U.js";
 import {
   assertChannelControlWorkspaceCapacity
-} from "./chunk-XGYHNWL3.js";
+} from "./chunk-J7LBAKDH.js";
 import {
   LOAD_REPLAY_META_KEY
-} from "./chunk-PSPAM24S.js";
+} from "./chunk-TBSCTWKF.js";
 import "./chunk-FAWTMDX7.js";
+import {
+  canonicalizeWorkspace,
+  translateAndCheckAbsoluteWorkspacePath
+} from "./chunk-6PLDPT2C.js";
 import {
   ExtraCaInspectionError,
   loadableCertificates
-} from "./chunk-EDMXGXAK.js";
+} from "./chunk-IBRQG2MP.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-Z7B6SRPM.js";
 import {
   ChannelWebhookEnqueueError
 } from "./chunk-STUJ7IMZ.js";
+import {
+  QWEN_SERVER_TOKEN_ENV
+} from "./chunk-GYTKQYDB.js";
 import {
   normalizeWorkerDiagnostic,
   sanitizeWorkerDiagnostic
-} from "./chunk-NLNQNBZ2.js";
+} from "./chunk-WD6YQI5M.js";
 import {
-  channelSelectionNames
-} from "./chunk-ALMR3E6Q.js";
-import {
-  QWEN_SERVER_TOKEN_ENV
-} from "./chunk-GYTKQYDB.js";
+  channelSelectionNames,
+  normalizeServeChannelSelection
+} from "./chunk-GDWE23OR.js";
 import {
   ChannelDeliveryError,
   isChannelDeliveryError
@@ -144,7 +154,6 @@ 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,
@@ -152,40 +161,34 @@ import {
   PRIVATE_EXTERNAL_TOOL_GUARD_ENV,
   PRIVATE_EXTERNAL_TOOL_GUARD_PROVIDER_ENV
 } from "./chunk-3VUENPWF.js";
+import {
+  redactLogCredentials
+} from "./chunk-M5GB774H.js";
 import "./chunk-K6KS3LTN.js";
 import "./chunk-OSHQMOBS.js";
 import {
   sanitizeLogText
-} from "./chunk-7QYWGTHB.js";
+} from "./chunk-EPVEPTI3.js";
 import "./chunk-IJOS26LH.js";
 import {
   consumeServeFastPathRejectedLoaderKeys,
   loadServeFastPathSettings,
   preResolveServeFastPathHomeEnvOverrides
-} from "./chunk-VG3Q2NC4.js";
+} from "./chunk-ZNI3YJHS.js";
 import "./chunk-BW4333PP.js";
+import {
+  getGlobalQwenDirLite,
+  resolveConfigPathLite
+} from "./chunk-IDS7MSUP.js";
 import {
   acquireInheritedLoaderEnvScrub,
   clearLoaderKeyRejectionReporterIfCurrent,
   scrubInheritedLoaderEnv,
   setLoaderKeyRejectionReporter
-} from "./chunk-VX63RJXE.js";
-import {
-  resolveMaxRegisteredWorkspaces,
-  resolveWorkspaceInputs,
-  workspaceRegistrationId
-} from "./chunk-SBRX4BDI.js";
-import {
-  canonicalizeWorkspace,
-  translateAndCheckAbsoluteWorkspacePath
-} from "./chunk-6PLDPT2C.js";
-import {
-  getGlobalQwenDirLite,
-  resolveConfigPathLite
-} from "./chunk-IDS7MSUP.js";
+} from "./chunk-XX5HQLCZ.js";
 import {
   getCliVersion
-} from "./chunk-R4Q2PEFV.js";
+} from "./chunk-E7HXORS7.js";
 import "./chunk-W3N5XAZ6.js";
 import "./chunk-NPQ5ZKRP.js";
 import {
@@ -198,10 +201,10 @@ import {
 } from "./chunk-32CM56LO.js";
 import "./chunk-LJZSMWOH.js";
 import "./chunk-GOFAQQZA.js";
+import "./chunk-HEOH7JZY.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
 import "./chunk-65I7S4Z3.js";
-import "./chunk-6HUXPLB5.js";
 import {
   require_proper_lockfile
 } from "./chunk-MLXTMF7H.js";
@@ -3102,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":
@@ -3929,12 +3942,12 @@ __name(hasRetryableChannelWorkerShutdownError, "hasRetryableChannelWorkerShutdow
 var channelWorkerRuntimePromise;
 async function loadChannelWorkerRuntime() {
   channelWorkerRuntimePromise ??= Promise.all([
-    import("./channel-worker-supervisor-ZFNWMG6D.js"),
-    import("./pidfile-H32FEPWA.js"),
-    import("./runtime-BMEIVDDG.js"),
+    import("./channel-worker-supervisor-OOYY7BAQ.js"),
+    import("./pidfile-I5SWEJDX.js"),
+    import("./runtime-FVTTOB4E.js"),
     import("./cli-entry-path-4VJ3Y6T2.js"),
-    import("./channel-worker-group-F2ZZMLNS.js"),
-    import("./channel-worker-manager-2SZLJJSJ.js")
+    import("./channel-worker-group-JR6JOELM.js"),
+    import("./channel-worker-manager-AVKJEZFL.js")
   ]).then(
     ([
       supervisor,
@@ -4040,13 +4053,13 @@ function shouldPreheatBridge(deps) {
 __name(shouldPreheatBridge, "shouldPreheatBridge");
 var coreRuntimePromise;
 function loadCoreRuntime() {
-  coreRuntimePromise ??= import("./core-runtime-NVHT3Z3V.js");
+  coreRuntimePromise ??= import("./core-runtime-ZDUA5DYE.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");
@@ -4076,10 +4089,10 @@ __name(resolveDaemonLogBaseDirForRun, "resolveDaemonLogBaseDirForRun");
 var settingsRuntimePromise;
 function loadSettingsRuntimeModules() {
   settingsRuntimePromise ??= Promise.all([
-    import("./settings-DDNHJX2L.js"),
-    import("./environment-DKXHG4HB.js"),
-    import("./loadedSettingsAdapter-3DXLASK7.js"),
-    import("./trustedFolders-5VCBXFOP.js")
+    import("./settings-WAWJIZHR.js"),
+    import("./environment-HYMXOTVB.js"),
+    import("./loadedSettingsAdapter-NNU4BY5Q.js"),
+    import("./trustedFolders-SXPNZESV.js")
   ]).then(([settings, environment, loadedSettingsAdapter, trustedFolders]) => ({
     settings,
     environment,
@@ -4092,8 +4105,8 @@ __name(loadSettingsRuntimeModules, "loadSettingsRuntimeModules");
 var channelWebhookConfigRuntimePromise;
 function loadChannelWebhookConfigRuntime() {
   channelWebhookConfigRuntimePromise ??= Promise.all([
-    import("./runtime-BMEIVDDG.js"),
-    import("./config-utils-L6KLDYIV.js")
+    import("./runtime-FVTTOB4E.js"),
+    import("./config-utils-73C3RGYN.js")
   ]).then(([channelRuntime, configUtils]) => ({
     loadChannelsConfig: channelRuntime.loadChannelsConfig,
     parseChannelWebhookConfig: configUtils.parseChannelWebhookConfig
@@ -4120,19 +4133,19 @@ async function loadServeRuntimeModules() {
     workspaceRuntimeCoordinatorModule,
     promptLedgerModule
   ] = await Promise.all([
-    import("./server-LBPYXZ5G.js"),
-    import("./bridge-DAFMI72L.js"),
-    import("./spawnChannel-GQ45QFGB.js"),
+    import("./server-U7K7EJEP.js"),
+    import("./bridge-P34XQP3D.js"),
+    import("./spawnChannel-D35CB5JB.js"),
     import("./process-registry-X6ZCASEN.js"),
-    import("./workspace-service-RQTTAGGC.js"),
+    import("./workspace-service-GJ2GOHKU.js"),
     import("./types-HKLPXZB3.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")
+    import("./daemon-status-provider-2PO7NLDQ.js"),
+    import("./workspace-providers-status-4E4XWBFS.js"),
+    import("./workspace-skills-status-CRWHV35X.js"),
+    import("./total-session-admission-FZSHBR32.js"),
+    import("./workspace-registry-H2ENI5G2.js"),
+    import("./workspace-runtime-coordinator-CRRNB7PC.js"),
+    import("./prompt-terminal-ledger-KWBANHUE.js")
   ]);
   return {
     createServeApp: serverModule.createServeApp,
@@ -5226,7 +5239,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-A7RGKW62.js");
+    const { WorkspaceRegistrationStore } = await import("./workspace-registration-store-M3QEP27F.js");
     workspaceRegistrationStore = new WorkspaceRegistrationStore(boundWorkspace);
   }
   if (workspaceRegistrationStore) {
@@ -5325,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({
@@ -5338,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,
@@ -5515,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-FOW4RQSK.js");
+  const { createDaemonToolGuard } = await import("./daemon-git-worktree-guard-QU2CCJIE.js");
   const daemonToolGuardHandler = createDaemonToolGuard(
     externalToolGuardHandler
   );
@@ -5866,7 +5927,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       loadCoreRuntime(),
       loadSettingsRuntimeModules(),
       cliVersionPromise,
-      import("./daemon-trust-policy-3ATXEON7.js")
+      import("./daemon-trust-policy-IMDTIUWB.js")
     ]);
     getWorkspaceRuntimeCoordinatorIfSupported = runtime.getWorkspaceRuntimeCoordinatorIfSupported;
     cliVersion = resolvedCliVersion;
@@ -6274,7 +6335,11 @@ 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-XERQCUXZ.js");
+      const {
+        skillSettingStrings,
+        skillToggleBlockForName,
+        updateWorkspaceSkillSettingLists
+      } = await import("./skill-settings-ALFUQQD6.js");
       const fresh = loadSettingsForPersistence(workspace);
       const workspaceDisabled = skillSettingStrings(
         fresh,
@@ -6286,6 +6351,12 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         WORKSPACE_SETTING_SCOPE,
         "enabled"
       );
+      if (enabled) {
+        const block = skillToggleBlockForName(fresh, skillName);
+        if (block) {
+          return { changed: false, disabled: workspaceDisabled, block };
+        }
+      }
       const next = updateWorkspaceSkillSettingLists(
         { disabled: workspaceDisabled, enabled: workspaceEnabled },
         skillName,
@@ -6324,7 +6395,11 @@ 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-XERQCUXZ.js");
+      const {
+        skillSettingStrings,
+        skillToggleBlockForName,
+        updateWorkspaceSkillSettingLists
+      } = await import("./skill-settings-ALFUQQD6.js");
       const fresh = loadSettingsForPersistence(workspace);
       const initialDisabled = skillSettingStrings(
         fresh,
@@ -6339,6 +6414,15 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       let next = { disabled: initialDisabled, enabled: initialEnabled };
       const outcomes = [];
       for (const skillName of skillNames) {
+        if (enabled) {
+          const block = skillToggleBlockForName(fresh, skillName);
+          if (block && !(block.scope === "Workspace" && block.list === "disabled" && !next.disabled.some(
+            (name) => name.trim().toLowerCase() === block.entry
+          ))) {
+            outcomes.push({ skillName, changed: false });
+            continue;
+          }
+        }
         const updated = updateWorkspaceSkillSettingLists(
           next,
           skillName,
@@ -6415,10 +6499,10 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       }
     }), "persistSettingsFn");
     const [{ createSubSessionLauncher }, scheduledTaskRoutes] = await Promise.all([
-      import("./create-sub-session-YWASE5VH.js"),
-      import("./scheduled-tasks-NCFPP6VQ.js")
+      import("./create-sub-session-JK3SSJKO.js"),
+      import("./scheduled-tasks-RN6DUY7E.js")
     ]);
-    const { sessionAttachmentsRoots } = await import("./session-attachments-root-OUBQDYC4.js");
+    const { sessionAttachmentsRoots } = await import("./session-attachments-root-LQDHWZST.js");
     const createCurrentSessionScheduledTaskHandler = /* @__PURE__ */ __name((workspaceCwd, runtimeBaseDir, getBridge, assertGenerationOpen) => async ({
       callerSessionId,
       cron,
@@ -6455,6 +6539,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     const subSessionLauncher = createSubSessionLauncher({
       getBridge: /* @__PURE__ */ __name(() => bridgeRef, "getBridge"),
       boundWorkspace,
+      runtimeBaseDir: primarySessionRuntimeBaseDir,
       ...subSessionConcurrencyCapsFromSettings(
         runtimeBootSettings?.merged.serve ?? {}
       )
@@ -6464,6 +6549,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
@@ -6903,6 +6989,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 ?? {}
         )
@@ -6912,6 +6999,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,
@@ -7259,7 +7347,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     };
     sessionPrRefreshTimer?.dispose();
     const refreshGeneration = ++sessionPrRefreshGeneration;
-    void import("./session-pr-refresh-EKGMYNAW.js").then((mod) => {
+    void import("./session-pr-refresh-J7DQYX2I.js").then((mod) => {
       if (refreshGeneration !== sessionPrRefreshGeneration) return;
       sessionPrRefreshTimer = mod.startSessionPrRefreshTimer({
         workspaceRegistry,
@@ -7343,6 +7431,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"),
@@ -7366,6 +7455,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           wsEnv.sessionRuntimeBaseDir
         );
         wsBridge = runtime.createAcpSessionBridge({
+          artifactSnapshotRuntimeBaseDir: wsEnv.sessionRuntimeBaseDir,
           sessionAttachmentsRoot: wsAttachmentsRoots.root,
           sessionAttachmentsFallbackRoot: wsAttachmentsRoots.fallback,
           clientMcpSender: wsClientMcpRegistry.lookup,
@@ -7929,8 +8019,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           { createChannelManagementService },
           { WorkspaceChannelSettingsStore }
         ] = await Promise.all([
-          import("./channel-management-service-OWDXVL7R.js"),
-          import("./channel-settings-store-4I6JONT7.js")
+          import("./channel-management-service-AFVIT4VH.js"),
+          import("./channel-settings-store-VE4ARRSR.js")
         ]);
         return createChannelManagementService({
           workspaceCwd: targetRuntime.workspaceCwd,
@@ -8083,6 +8173,16 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       sessionArtifactsPersistenceAvailable: sessionArtifactsPersistenceAvailableFromSettings(
         runtimeBootSettings?.merged
       ),
+      updateModelContextWindow: /* @__PURE__ */ __name((workspace, key, size, assertGenerationOpen) => withSettingsLock(workspace, async () => {
+        assertGenerationOpen();
+        const { updateModelContextWindow } = await import("./model-configuration-E5M35A3M.js");
+        return updateModelContextWindow(
+          loadSettingsForPersistence(workspace),
+          key,
+          size,
+          assertGenerationOpen
+        );
+      }), "updateModelContextWindow"),
       installAuthProvider: /* @__PURE__ */ __name((req, assertGenerationOpen) => withSettingsLock(
         boundWorkspace,
         async () => {
@@ -8095,11 +8195,17 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
             getDefaultModelIds: core.getDefaultModelIds,
             resolveBaseUrl: core.resolveBaseUrl
           });
-          const plan = core.buildInstallPlan(provider, inputs);
           const fresh = loadSettingsForPersistence(boundWorkspace);
+          const plan = core.buildInstallPlan(
+            provider,
+            inputs,
+            fresh.merged.modelProviders?.[inputs.protocol ?? provider.protocol]
+          );
           const adapter = settingsRuntime.loadedSettingsAdapter.createLoadedSettingsAdapter(
             fresh
           );
+          const { getAuthTypeFromEnv } = await import("./modelConfigUtils-43SY2EDS.js");
+          const hasConversationAuth = adapter.getValue("security.auth.selectedType") || getAuthTypeFromEnv(primaryRuntimeEnv.effectiveEnv);
           await core.applyProviderInstallPlan(plan, {
             settings: adapter,
             doRefreshAuth: false
@@ -8118,7 +8224,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
             authType: plan.authType,
             ...effectiveModelId ? { modelId: effectiveModelId } : {},
             ...effectiveBaseUrl ? { baseUrl: effectiveBaseUrl } : {},
-            message: `Successfully configured ${provider.label}. Use /model to switch models.`
+            message: !plan.modelSelection ? hasConversationAuth ? "Service models saved." : "Service models saved. Configure a conversation model to start chatting." : `Successfully configured ${provider.label}. Use /model to switch models.`
           };
         }
       ), "installAuthProvider")
@@ -8136,8 +8242,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         { createWorkspaceTrustReconciler },
         { createDaemonTrustPolicyMonitor }
       ] = await Promise.all([
-        import("./workspace-trust-reconciler-KFWATZUU.js"),
-        import("./daemon-trust-policy-monitor-7MCNDNEC.js")
+        import("./workspace-trust-reconciler-GG2JA7KI.js"),
+        import("./daemon-trust-policy-monitor-6IVBNUAD.js")
       ]);
       const materializationFor = /* @__PURE__ */ __name((entry, snapshot, decision) => {
         const boundWorkspaces2 = entry.primary && decision.targetTrusted ? runtime.resolveBoundWorkspacesFromIdeEnv(
@@ -8334,7 +8440,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-CCN4JZEE.js").then(
+    isPreAuthRequest: webShellMounted ? (req) => import("./web-shell-static-T7UGLVE4.js").then(
       (webShellStatic) => webShellStatic.isPreAuthWebShellRequest(req)
     ) : void 0
   });
@@ -8353,11 +8459,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-3ATXEON7.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"];
@@ -8397,15 +8504,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
@@ -8416,7 +8520,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,
@@ -8427,7 +8531,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,
@@ -8458,13 +8562,23 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     return grouping.groups;
   }, "resolveChannelWorkspaceGroupsAtListen");
   if (opts.channelSelection) {
-    if (opts.channelSelection.mode === "names" && workspaceInputs.length > MAX_CHANNEL_CONTROL_WORKSPACES) {
-      const groups = resolveChannelWorkspaceGroupsAtListen();
-      assertChannelControlWorkspaceCapacity(
-        groups?.map((group) => group.workspaceCwd) ?? []
-      );
+    try {
+      channelValidationSettingsRuntime = await loadSettingsRuntimeModules();
+      channelValidationTrustPolicy = await import("./daemon-trust-policy-IMDTIUWB.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);
     }
-    reserveChannelServicePidfile(opts.channelSelection);
   }
   return await new Promise((resolve3, reject) => {
     let closeHost;
@@ -8831,11 +8945,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");
@@ -9062,8 +9175,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;
@@ -9073,7 +9210,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(() => {
@@ -9081,6 +9256,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";
@@ -9114,7 +9290,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));
@@ -9431,14 +9607,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) {
@@ -9449,7 +9630,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."
           );
         }
       }
@@ -9497,9 +9678,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();
@@ -9511,6 +9693,11 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           acpHandle?.attachServer?.(server);
           markServeAppStartupReady();
           void publishLiveDiscovery(preparedRuntimeApp);
+          if (!runtimeStartupSettled) {
+            runtimeStartupSettled = true;
+            clearRuntimeStartupTimer();
+            markRuntimeReady();
+          }
         }
       } else if (deferRuntimeUntilFirstHealth) {
         scheduleRuntimeStartFallback();