@qwen-code/qwen-code 0.21.7 → 0.21.8-nightly.20260810.55e20db328

package/chunks/{run-qwen-serve-ZPKPKECF.js → run-qwen-serve-4NVSU75L.js}

@@ -34,18 +34,24 @@ import {
   resolveAcpHttpEnabled,
   setDeferredRuntimeRequestTiming,
   toDaemonStatusMemoryLimits
-} from "./chunk-RGSBTHSU.js";
+} from "./chunk-KMS57JDD.js";
 import {
   isLoopbackBind
-} from "./chunk-RXFQM6FQ.js";
+} from "./chunk-TQOF5KBL.js";
 import {
   formatMemoryBudgetStderr,
   resolveDaemonMemoryBudget
 } from "./chunk-HGCQ5SE7.js";
+import {
+  resolveSessionRestoreTimeoutMs
+} from "./chunk-4JRM2BSM.js";
 import {
   require_express,
   resolveWebShellDir
 } from "./chunk-GDXET5XU.js";
+import {
+  resolveChannelCwd
+} from "./chunk-67EWJE77.js";
 import {
   LIVE_HOST_PROTOCOL_VERSION
 } from "./chunk-NKLP3DCK.js";
@@ -61,27 +67,25 @@ import "./chunk-K6KS3LTN.js";
 import "./chunk-FC4KQFCS.js";
 import "./chunk-T3CHYWJZ.js";
 import {
-  resolveChannelCwd
-} from "./chunk-VWOVHOTT.js";
-import {
+  consumeServeFastPathRejectedLoaderKeys,
   loadServeFastPathSettings,
   preResolveServeFastPathHomeEnvOverrides
-} from "./chunk-D3UEZIQH.js";
+} from "./chunk-ZSNBQXMZ.js";
 import {
   MAX_REGISTERED_WORKSPACES,
   resolveWorkspaceInputs,
   workspaceRegistrationId
-} from "./chunk-P2AJ7FTI.js";
-import "./chunk-S7CV4KO6.js";
+} from "./chunk-H4JC7LZX.js";
+import "./chunk-AKJQSWV4.js";
 import {
   LOAD_REPLAY_META_KEY
-} from "./chunk-R574ATRM.js";
-import "./chunk-J26HHFI5.js";
+} from "./chunk-M2PNLYGY.js";
+import "./chunk-LP2QGNSP.js";
 import {
   canonicalizeWorkspace,
   translateAndCheckAbsoluteWorkspacePath
 } from "./chunk-6PLDPT2C.js";
-import "./chunk-MKVZE4ZJ.js";
+import "./chunk-MFDYOYZZ.js";
 import "./chunk-FYJ7W2PI.js";
 import {
   ChannelDeliveryError,
@@ -92,33 +96,39 @@ import {
 import {
   normalizeWorkerDiagnostic,
   sanitizeWorkerDiagnostic
-} from "./chunk-24ER7UV4.js";
+} from "./chunk-PBRVUF5B.js";
 import {
   channelSelectionNames
 } from "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
+import "./chunk-M5GB774H.js";
 import {
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
   EXTERNAL_TOOL_GUARD_TOKEN_ENV,
   PRIVATE_EXTERNAL_TOOL_GUARD_ENV
 } from "./chunk-BKHCW2BI.js";
-import "./chunk-M5GB774H.js";
-import "./chunk-5HBA2Z7V.js";
+import {
+  MAX_DAEMON_WORKSPACES
+} from "./chunk-5HBA2Z7V.js";
 import {
   sanitizeLogText
-} from "./chunk-DIEFUBV6.js";
+} from "./chunk-DX3RGJMS.js";
 import "./chunk-UDXSXLER.js";
 import "./chunk-GOXKNSDZ.js";
 import {
   getGlobalQwenDirLite,
   resolveConfigPathLite
 } from "./chunk-IDS7MSUP.js";
-import "./chunk-6PEXNQTX.js";
+import {
+  scrubAndReportInheritedLoaderEnv,
+  scrubInheritedLoaderEnv,
+  setLoaderKeyRejectionReporter
+} from "./chunk-R4ZA6GBK.js";
 import {
   getCliVersion
-} from "./chunk-FZBZSYKU.js";
+} from "./chunk-ZV7LTLFE.js";
 import "./chunk-VJNBRRZG.js";
-import "./chunk-ALGGS7UH.js";
+import "./chunk-NPQ5ZKRP.js";
 import {
   isWithinRoot
 } from "./chunk-MR3PXB6E.js";
@@ -160,6 +170,46 @@ import * as path from "node:path";
 import * as os from "node:os";
 import { monitorEventLoopDelay, performance as performance2 } from "node:perf_hooks";
 
+// packages/acp-bridge/dist/child-heap-policy.js
+init_esbuild_shims();
+
+// packages/acp-bridge/dist/daemon-memory-budget.js
+init_esbuild_shims();
+var MIN_CHILD_HEAP_MB = 512;
+
+// packages/acp-bridge/dist/child-heap-policy.js
+function createChildHeapPolicy(options) {
+  const { budget, mode } = options;
+  let refusals = 0;
+  const admissible = Math.min(Math.floor(budget.childPoolMb / MIN_CHILD_HEAP_MB), MAX_DAEMON_WORKSPACES);
+  const rawCeilingMb = admissible > 0 ? Math.min(Math.floor(budget.childPoolMb / admissible), budget.legacyChildCeilingMb) : null;
+  const modelable = rawCeilingMb !== null && rawCeilingMb >= MIN_CHILD_HEAP_MB;
+  const maxConcurrentChildren = modelable ? admissible : 0;
+  const perChildCeilingMb = modelable ? rawCeilingMb : null;
+  return {
+    decide(concurrentChildren) {
+      if (mode === "off")
+        return { refuse: false };
+      const refuse = concurrentChildren > maxConcurrentChildren;
+      if (refuse)
+        refusals += 1;
+      return { refuse };
+    },
+    snapshot() {
+      const modeled = mode !== "off";
+      return {
+        mode,
+        childPoolMb: budget.childPoolMb,
+        minChildHeapMb: MIN_CHILD_HEAP_MB,
+        maxConcurrentChildren: modeled ? maxConcurrentChildren : null,
+        perChildCeilingMb: modeled ? perChildCeilingMb : null,
+        refusals
+      };
+    }
+  };
+}
+__name(createChildHeapPolicy, "createChildHeapPolicy");
+
 // packages/core/dist/src/memory/scopes.js
 init_esbuild_shims();
 var MEMORY_PROJECT_SCOPES = ["git-root", "workspace"];
@@ -2932,12 +2982,12 @@ var retryableChannelWorkerShutdownErrors = /* @__PURE__ */ new WeakSet();
 var channelWorkerRuntimePromise;
 async function loadChannelWorkerRuntime() {
   channelWorkerRuntimePromise ??= Promise.all([
-    import("./channel-worker-supervisor-62YWUGP2.js"),
-    import("./pidfile-JOIIRN2C.js"),
-    import("./runtime-2FLNNM36.js"),
+    import("./channel-worker-supervisor-IVSDIMI4.js"),
+    import("./pidfile-QJQ65RJ2.js"),
+    import("./runtime-QLRVP6HM.js"),
     import("./cli-entry-path-4VJ3Y6T2.js"),
-    import("./channel-worker-group-JWQK224X.js"),
-    import("./channel-worker-manager-77E3OXRQ.js")
+    import("./channel-worker-group-MSHT6CWR.js"),
+    import("./channel-worker-manager-XXD3GDSK.js")
   ]).then(
     ([
       supervisor,
@@ -3042,7 +3092,7 @@ function shouldPreheatBridge(deps) {
 __name(shouldPreheatBridge, "shouldPreheatBridge");
 var coreRuntimePromise;
 function loadCoreRuntime() {
-  coreRuntimePromise ??= import("./core-runtime-QMJPWHCI.js");
+  coreRuntimePromise ??= import("./core-runtime-FBSP5IIG.js");
   return coreRuntimePromise;
 }
 __name(loadCoreRuntime, "loadCoreRuntime");
@@ -3078,10 +3128,10 @@ __name(resolveDaemonLogBaseDirForRun, "resolveDaemonLogBaseDirForRun");
 var settingsRuntimePromise;
 function loadSettingsRuntimeModules() {
   settingsRuntimePromise ??= Promise.all([
-    import("./settings-KULVPCQC.js"),
-    import("./environment-GJ2HWJOS.js"),
-    import("./loadedSettingsAdapter-QRYRJSWL.js"),
-    import("./trustedFolders-TJ5S26N7.js")
+    import("./settings-BRAOSJIM.js"),
+    import("./environment-LRTBTDXH.js"),
+    import("./loadedSettingsAdapter-HNPKQMFA.js"),
+    import("./trustedFolders-5RWP5OB7.js")
   ]).then(([settings, environment, loadedSettingsAdapter, trustedFolders]) => ({
     settings,
     environment,
@@ -3094,8 +3144,8 @@ __name(loadSettingsRuntimeModules, "loadSettingsRuntimeModules");
 var channelWebhookConfigRuntimePromise;
 function loadChannelWebhookConfigRuntime() {
   channelWebhookConfigRuntimePromise ??= Promise.all([
-    import("./runtime-2FLNNM36.js"),
-    import("./config-utils-K7SCOWHD.js")
+    import("./runtime-QLRVP6HM.js"),
+    import("./config-utils-ULCSRMWD.js")
   ]).then(([channelRuntime, configUtils]) => ({
     loadChannelsConfig: channelRuntime.loadChannelsConfig,
     parseChannelWebhookConfig: configUtils.parseChannelWebhookConfig
@@ -3120,17 +3170,17 @@ async function loadServeRuntimeModules() {
     totalSessionAdmissionModule,
     workspaceRegistryModule
   ] = await Promise.all([
-    import("./server-XLJVLTYM.js"),
-    import("./bridge-NU6YEEHK.js"),
-    import("./spawnChannel-ZKS4Q5OU.js"),
-    import("./process-registry-2CHQBXH5.js"),
-    import("./workspace-service-HFIFDMU7.js"),
-    import("./types-ML3TRJQ5.js"),
-    import("./daemon-status-provider-FSWDPE2G.js"),
-    import("./workspace-providers-status-HZ474RA4.js"),
-    import("./workspace-skills-status-HAHEIHGK.js"),
-    import("./total-session-admission-MK4SINFK.js"),
-    import("./workspace-registry-R4APRRNC.js")
+    import("./server-E7CH7WPK.js"),
+    import("./bridge-Y32B5S3G.js"),
+    import("./spawnChannel-4KO7YTFM.js"),
+    import("./process-registry-PMJOA5CO.js"),
+    import("./workspace-service-2EHSPRJB.js"),
+    import("./types-WYCFCEHR.js"),
+    import("./daemon-status-provider-WW2AD2T7.js"),
+    import("./workspace-providers-status-YZ2IJ4DK.js"),
+    import("./workspace-skills-status-5VJ2D5HN.js"),
+    import("./total-session-admission-LS6EY5KT.js"),
+    import("./workspace-registry-7LFBZQLT.js")
   ]);
   return {
     createServeApp: serverModule.createServeApp,
@@ -3220,7 +3270,8 @@ function createBootstrapCapabilities(input) {
     limits: {
       maxPendingPromptsPerSession: advertisedMaxPendingPromptsPerSession(
         input.opts.maxPendingPromptsPerSession
-      )
+      ),
+      sessionRestoreTimeoutMs: resolveSessionRestoreTimeoutMs(input.opts)
     }
   };
 }
@@ -3515,6 +3566,9 @@ function createBootstrapServeApp(input) {
         channelIdleTimeoutMs: channelIdleTimeoutMs(opts.channelIdleTimeoutMs),
         sessionIdleTimeoutMs: sessionIdleTimeoutMs(opts.sessionIdleTimeoutMs),
         acpConnectionCap: null,
+        // No child-heap policy during bootstrap: it is built with the
+        // runtime, so `enforced` is correctly false and `childHeap` null in
+        // this window even when the flag says `enforce`.
         memory: toDaemonStatusMemoryLimits(opts.daemonMemoryBudget)
       },
       capabilities: {
@@ -3767,6 +3821,7 @@ __name(validateAndCanonicalizeWorkspaceInput, "validateAndCanonicalizeWorkspaceI
 async function runQwenServe(optsIn, deps = {}) {
   let daemonLog;
   let owner = "startup";
+  let restoreScrubbedLoaderEnv;
   try {
     return await runQwenServeImpl(optsIn, deps, {
       initialized: /* @__PURE__ */ __name((logger) => {
@@ -3777,9 +3832,15 @@ async function runQwenServe(optsIn, deps = {}) {
       }, "published"),
       signalOwned: /* @__PURE__ */ __name(() => {
         if (owner === "startup") owner = "signal";
-      }, "signalOwned")
+      }, "signalOwned"),
+      scrubApplied: /* @__PURE__ */ __name((restore) => {
+        restoreScrubbedLoaderEnv = restore;
+      }, "scrubApplied")
     });
   } catch (error) {
+    if (daemonLog) {
+      setLoaderKeyRejectionReporter(void 0);
+    }
     if (daemonLog && owner === "startup") {
       const startupLog = daemonLog;
       writeDaemonLifecycleBestEffort(
@@ -3790,6 +3851,7 @@ async function runQwenServe(optsIn, deps = {}) {
       );
       await startupLog.close();
     }
+    restoreScrubbedLoaderEnv?.();
     throw error;
   }
 }
@@ -3815,12 +3877,31 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     );
   }
   preResolveServeFastPathHomeEnvOverrides();
-  const daemonRuntimeBaseEnv = Object.freeze({
+  const launchEnv = { ...process.env };
+  const baseEnv = {
     ...process.env,
     ...optsIn.memoryProjectScope !== void 0 ? {
       QWEN_CODE_MEMORY_PROJECT_SCOPE: optsIn.memoryProjectScope
     } : {}
-  });
+  };
+  if (process.env["DEV"] !== "true") {
+    scrubInheritedLoaderEnv(baseEnv);
+  }
+  const daemonRuntimeBaseEnv = Object.freeze(baseEnv);
+  const scrubbedLoaderEnvKeys = scrubAndReportInheritedLoaderEnv(
+    process.env,
+    "qwen serve",
+    "daemon"
+  );
+  const restoreScrubbedLoaderEnv = /* @__PURE__ */ __name(() => {
+    for (const key of scrubbedLoaderEnvKeys) {
+      if (Object.hasOwn(process.env, key)) continue;
+      const value = launchEnv[key];
+      if (value === void 0) continue;
+      process.env[key] = value;
+    }
+  }, "restoreScrubbedLoaderEnv");
+  loggerLifecycle.scrubApplied(restoreScrubbedLoaderEnv);
   const rawToken = optsIn.token ?? process.env[QWEN_SERVER_TOKEN_ENV];
   const token = typeof rawToken === "string" && rawToken.trim().length > 0 ? rawToken.trim() : void 0;
   const channelDeliveryDiagnosticRedaction = {
@@ -4054,7 +4135,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
   }
   let workspaceRegistrationStore = deps.workspaceRegistrationStore;
   if (workspaceRegistrationStore === void 0 && process.env["QWEN_SERVE_NO_PERSISTENT_REGISTRATION"] !== "1") {
-    const { WorkspaceRegistrationStore } = await import("./workspace-registration-store-6EUP4JXG.js");
+    const { WorkspaceRegistrationStore } = await import("./workspace-registration-store-IYN72LBS.js");
     workspaceRegistrationStore = new WorkspaceRegistrationStore(boundWorkspace);
   }
   if (workspaceRegistrationStore) {
@@ -4153,6 +4234,25 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     baseDir: daemonLogBaseDir
   });
   loggerLifecycle.initialized(daemonLog);
+  setLoaderKeyRejectionReporter((source, freshKeys) => {
+    daemonLog.warn(
+      "rejected loader-affecting env keys; they were not applied",
+      { source, rejectedKeys: freshKeys }
+    );
+  });
+  if (scrubbedLoaderEnvKeys.length > 0) {
+    daemonLog.info(
+      "scrubbed inherited loader env vars from the daemon process; session subprocesses will not inherit them",
+      { removedKeys: scrubbedLoaderEnvKeys }
+    );
+  }
+  const fastPathRejectedLoaderKeys = consumeServeFastPathRejectedLoaderKeys();
+  if (fastPathRejectedLoaderKeys.length > 0) {
+    daemonLog.info(
+      "rejected loader-affecting env keys during serve fast-path boot; they were not applied to the daemon process",
+      { rejectedKeys: fastPathRejectedLoaderKeys }
+    );
+  }
   let loggerPublished = false;
   let loggerSignalOwned = false;
   writeStderrLine(
@@ -4251,6 +4351,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     }
     assertTimerDelayInRange("initializeTimeoutMs", opts.initializeTimeoutMs);
   }
+  const sessionRestoreTimeoutMs = resolveSessionRestoreTimeoutMs(opts);
+  opts.sessionRestoreTimeoutMs = sessionRestoreTimeoutMs;
   if (opts.permissionResponseTimeoutMs !== void 0) {
     if (!Number.isFinite(opts.permissionResponseTimeoutMs) || !Number.isInteger(opts.permissionResponseTimeoutMs) || opts.permissionResponseTimeoutMs < 0) {
       throw new TypeError(
@@ -4326,6 +4428,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
   let runtimeAppForCleanup;
   let bridgeRef = deps.bridge;
   let managedProcessRegistry;
+  let managedChildHeapPolicy;
   const internalRuntimeBridgesForCleanup = [];
   let daemonEventLoopMonitor;
   let daemonMetricsSampler;
@@ -4592,7 +4695,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       loadCoreRuntime(),
       loadSettingsRuntimeModules(),
       cliVersionPromise,
-      import("./daemon-trust-policy-P5L5VFAY.js")
+      import("./daemon-trust-policy-E4MAYWPI.js")
     ]);
     cliVersion = resolvedCliVersion;
     settingsRuntime.environment.preResolveHomeEnvOverrides();
@@ -4870,6 +4973,11 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     const runWorkspaceTrustOperation = /* @__PURE__ */ __name((operation) => workspaceTrustOperationGate.runExclusive("runtime-topology", operation), "runWorkspaceTrustOperation");
     const processRegistry = new runtime.ProcessRegistry();
     managedProcessRegistry = processRegistry;
+    const childHeapPolicy = opts.daemonMemoryBudget && !deps.bridge ? createChildHeapPolicy({
+      budget: opts.daemonMemoryBudget,
+      mode: opts.childHeapMode ?? "observe"
+    }) : void 0;
+    managedChildHeapPolicy = childHeapPolicy;
     const fsFactory = runtime.resolveBridgeFsFactory({
       // Secondary roots share a write-capable factory only after their own
       // folder trust check passes; untrusted secondary roots stay outside.
@@ -4893,6 +5001,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     });
     const channelFactory = runtime.createSpawnChannelFactory({
       processRegistry,
+      childHeapPolicy,
       sourceEnv: runtimeEffectiveEnv,
       onDiagnosticLine: diagnosticSink,
       pipeHooks: {
@@ -4958,7 +5067,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         resolveSkillSettings,
         skillSettingStrings,
         updateWorkspaceSkillSettingLists
-      } = await import("./skill-settings-NMY4JEJC.js");
+      } = await import("./skill-settings-DRPU7YI5.js");
       const fresh = loadSettingsForPersistence(workspace);
       const normalizedName = skillName.trim().toLowerCase();
       const resolved = resolveSkillSettings(fresh);
@@ -5017,6 +5126,77 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         settingsChanges
       };
     }), "persistDisabledSkillsFn");
+    const persistDisabledSkillsBatchFn = /* @__PURE__ */ __name((workspace, skillNames, enabled, assertGenerationOpen) => withSettingsLock(workspace, async () => {
+      assertGenerationOpen?.();
+      const {
+        resolveSkillSettings,
+        skillSettingStrings,
+        updateWorkspaceSkillSettingLists
+      } = await import("./skill-settings-DRPU7YI5.js");
+      const fresh = loadSettingsForPersistence(workspace);
+      const resolved = resolveSkillSettings(fresh);
+      const initialDisabled = skillSettingStrings(
+        fresh,
+        WORKSPACE_SETTING_SCOPE,
+        "disabled"
+      );
+      const initialEnabled = skillSettingStrings(
+        fresh,
+        WORKSPACE_SETTING_SCOPE,
+        "enabled"
+      );
+      let next = { disabled: initialDisabled, enabled: initialEnabled };
+      const outcomes = [];
+      for (const skillName of skillNames) {
+        const normalizedName = skillName.trim().toLowerCase();
+        const disablement = resolved.disablements.get(normalizedName);
+        if (disablement?.reason === "hard" && disablement.lockedScope) {
+          outcomes.push({
+            skillName,
+            error: new runtime.WorkspaceSkillNotToggleableError(
+              skillName,
+              "locked",
+              disablement.lockedScope
+            )
+          });
+          continue;
+        }
+        const updated = updateWorkspaceSkillSettingLists(
+          next,
+          skillName,
+          enabled,
+          resolved.defaultDisabledNames.has(normalizedName) && !resolved.enabledNames.has(normalizedName)
+        );
+        const changed = JSON.stringify(updated.disabled) !== JSON.stringify(next.disabled) || JSON.stringify(updated.enabled) !== JSON.stringify(next.enabled);
+        next = updated;
+        outcomes.push({ skillName, changed });
+      }
+      const settingsChanges = [];
+      if (JSON.stringify(next.disabled) !== JSON.stringify(initialDisabled)) {
+        settingsChanges.push({
+          key: "skills.disabled",
+          value: next.disabled.length > 0 ? next.disabled : void 0
+        });
+      }
+      if (JSON.stringify(next.enabled) !== JSON.stringify(initialEnabled)) {
+        settingsChanges.push({
+          key: "skills.enabled",
+          value: next.enabled.length > 0 ? next.enabled : void 0
+        });
+      }
+      if (settingsChanges.length > 0) {
+        assertGenerationOpen?.();
+        fresh.setValues(
+          settingsChanges.map((change) => ({
+            scope: WORKSPACE_SETTING_SCOPE,
+            ...change
+          })),
+          void 0,
+          assertGenerationOpen
+        );
+      }
+      return { outcomes, settingsChanges };
+    }), "persistDisabledSkillsBatchFn");
     const persistSettingFn = /* @__PURE__ */ __name((workspace, scope, key, value, assertGenerationOpen) => withSettingsLock(workspace, async () => {
       assertGenerationOpen?.();
       const fresh = loadSettingsForPersistence(workspace);
@@ -5057,7 +5237,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         );
       }
     }), "persistSettingsFn");
-    const { createSubSessionLauncher } = await import("./create-sub-session-DJE6XICH.js");
+    const { createSubSessionLauncher } = await import("./create-sub-session-WC7YGVSL.js");
     const subSessionLauncher = createSubSessionLauncher({
       getBridge: /* @__PURE__ */ __name(() => bridgeRef, "getBridge"),
       boundWorkspace,
@@ -5092,6 +5272,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       ...opts.maxJournalBytes !== void 0 ? { maxJournalBytes: opts.maxJournalBytes } : {},
       ...opts.channelIdleTimeoutMs !== void 0 ? { channelIdleTimeoutMs: opts.channelIdleTimeoutMs } : {},
       ...opts.initializeTimeoutMs !== void 0 ? { initializeTimeoutMs: opts.initializeTimeoutMs } : {},
+      sessionRestoreTimeoutMs,
       ...opts.sessionReapIntervalMs !== void 0 ? { sessionReapIntervalMs: opts.sessionReapIntervalMs } : {},
       ...opts.sessionIdleTimeoutMs !== void 0 ? { sessionIdleTimeoutMs: opts.sessionIdleTimeoutMs } : {},
       ...opts.permissionResponseTimeoutMs !== void 0 ? { permissionResponseTimeoutMs: opts.permissionResponseTimeoutMs } : {},
@@ -5106,6 +5287,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       ...permissionConsensusQuorum !== void 0 ? { permissionConsensusQuorum } : {},
       permissionAudit: permissionAuditPublisher,
       statusProvider,
+      delegateReadTextFileToClient: false,
       fileSystem: createBridgeFileSystemAdapter(fsFactory),
       persistApprovalMode: /* @__PURE__ */ __name((workspace, mode) => withSettingsLock(workspace, async () => {
         primaryGenerationGuard.assertOpen();
@@ -5147,6 +5329,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       isChannelLive: /* @__PURE__ */ __name(() => bridge.isChannelLive(), "isChannelLive"),
       persistDisabledTools: persistDisabledToolsFn,
       persistDisabledSkills: persistDisabledSkillsFn,
+      persistDisabledSkillsBatch: persistDisabledSkillsBatchFn,
       persistSetting: persistSettingFn,
       persistSettings: persistSettingsFn,
       preheatAcpChild: /* @__PURE__ */ __name(() => bridge.preheat(), "preheatAcpChild"),
@@ -5346,6 +5529,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       });
       const secondaryChannelFactory = runtime.createSpawnChannelFactory({
         processRegistry,
+        childHeapPolicy,
         sourceEnv: secondaryEnv.effectiveEnv,
         onDiagnosticLine: diagnosticSink,
         pipeHooks: {
@@ -5393,6 +5577,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         ...opts.maxJournalBytes !== void 0 ? { maxJournalBytes: opts.maxJournalBytes } : {},
         ...opts.channelIdleTimeoutMs !== void 0 ? { channelIdleTimeoutMs: opts.channelIdleTimeoutMs } : {},
         ...opts.initializeTimeoutMs !== void 0 ? { initializeTimeoutMs: opts.initializeTimeoutMs } : {},
+        sessionRestoreTimeoutMs,
         ...opts.sessionReapIntervalMs !== void 0 ? { sessionReapIntervalMs: opts.sessionReapIntervalMs } : {},
         ...opts.sessionIdleTimeoutMs !== void 0 ? { sessionIdleTimeoutMs: opts.sessionIdleTimeoutMs } : {},
         ...opts.permissionResponseTimeoutMs !== void 0 ? { permissionResponseTimeoutMs: opts.permissionResponseTimeoutMs } : {},
@@ -5409,6 +5594,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         } : {},
         permissionAudit: permissionAuditPublisher,
         statusProvider: secondaryStatusProvider,
+        delegateReadTextFileToClient: false,
         fileSystem: createBridgeFileSystemAdapter(secondaryBridgeFsFactory),
         persistApprovalMode: /* @__PURE__ */ __name((workspace, mode) => withSettingsLock(workspace, async () => {
           secondaryGenerationGuard.assertOpen();
@@ -5454,6 +5640,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         preheatAcpChild: /* @__PURE__ */ __name(() => secondaryBridge.preheat(), "preheatAcpChild"),
         persistDisabledTools: persistDisabledToolsFn,
         persistDisabledSkills: persistDisabledSkillsFn,
+        persistDisabledSkillsBatch: persistDisabledSkillsBatchFn,
         persistSetting: persistSettingFn,
         persistSettings: persistSettingsFn,
         reloadDaemonEnv: /* @__PURE__ */ __name((workspace, assertGenerationOpen) => withSettingsLock(workspace, async () => {
@@ -5581,11 +5768,14 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         const primaryRuntimeBridge = primaryEntry.state === "active" ? primaryEntry.current?.runtime.bridge : void 0;
         const child = primaryRuntimeBridge?.getChildResourceSnapshot?.();
         if (runtime.getActiveSseCount() > 0 || (acp?.wsStreams ?? 0) > 0) {
-          void primaryRuntimeBridge?.refreshChildResource?.().catch((err) => {
-            daemonLog.warn(
-              `ACP child resource refresh failed: ${err instanceof Error ? err.message : String(err)}`
-            );
-          });
+          for (const managed of workspaceRegistry.listManaged()) {
+            void managed.bridge.refreshChildResource?.().catch((err) => {
+              daemonLog.warn("ACP child resource refresh failed", {
+                workspaceId: managed.workspaceId,
+                error: err instanceof Error ? err.message : String(err)
+              });
+            });
+          }
         }
         metricsRing.sample(nowMs, {
           cpuPercent,
@@ -5690,6 +5880,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       }) : wsFsFactory;
       const wsChannelFactory = runtime.createSpawnChannelFactory({
         processRegistry,
+        childHeapPolicy,
         sourceEnv: wsEnv.effectiveEnv,
         onDiagnosticLine: diagnosticSink,
         pipeHooks: {
@@ -5748,6 +5939,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           ...opts.maxJournalBytes !== void 0 ? { maxJournalBytes: opts.maxJournalBytes } : {},
           ...opts.channelIdleTimeoutMs !== void 0 ? { channelIdleTimeoutMs: opts.channelIdleTimeoutMs } : {},
           ...opts.initializeTimeoutMs !== void 0 ? { initializeTimeoutMs: opts.initializeTimeoutMs } : {},
+          sessionRestoreTimeoutMs,
           ...opts.sessionReapIntervalMs !== void 0 ? { sessionReapIntervalMs: opts.sessionReapIntervalMs } : {},
           ...opts.sessionIdleTimeoutMs !== void 0 ? { sessionIdleTimeoutMs: opts.sessionIdleTimeoutMs } : {},
           ...opts.permissionResponseTimeoutMs !== void 0 ? { permissionResponseTimeoutMs: opts.permissionResponseTimeoutMs } : {},
@@ -5766,6 +5958,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           statusProvider: runtime.createDaemonStatusProvider({
             env: wsEnv.effectiveEnv
           }),
+          delegateReadTextFileToClient: false,
           fileSystem: createBridgeFileSystemAdapter(wsFsFactory),
           persistApprovalMode: /* @__PURE__ */ __name((workspace, mode) => withSettingsLock(workspace, async () => {
             generationGuard.assertOpen();
@@ -5816,6 +6009,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           preheatAcpChild: /* @__PURE__ */ __name(() => wsBridge.preheat(), "preheatAcpChild"),
           persistDisabledTools: persistDisabledToolsFn,
           persistDisabledSkills: persistDisabledSkillsFn,
+          persistDisabledSkillsBatch: persistDisabledSkillsBatchFn,
           persistSetting: persistSettingFn,
           persistSettings: persistSettingsFn,
           reloadDaemonEnv: /* @__PURE__ */ __name((workspace, assertGenerationOpen) => withSettingsLock(workspace, async () => {
@@ -6195,8 +6389,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
           { createChannelManagementService },
           { WorkspaceChannelSettingsStore }
         ] = await Promise.all([
-          import("./channel-management-service-FSQ7SHYI.js"),
-          import("./channel-settings-store-35VQVUVV.js")
+          import("./channel-management-service-PHELKOW2.js"),
+          import("./channel-settings-store-OW43U6VB.js")
         ]);
         return createChannelManagementService({
           workspaceCwd: targetRuntime.workspaceCwd,
@@ -6251,6 +6445,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     }, "validateWorkspaceRuntimeForPublication");
     const app2 = runtime.createServeApp(opts, () => actualPort, {
       workspaceRegistry,
+      getSessionBridges: /* @__PURE__ */ __name(() => runtimeBridges, "getSessionBridges"),
       createWorkspaceRuntime: createDynamicWorkspaceRuntime,
       ...workspaceTrustHotReloadAvailable ? {
         validateWorkspaceRuntimeForPublication,
@@ -6329,6 +6524,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       }), "getPerfSnapshot"),
       getMetricsSeries: /* @__PURE__ */ __name(() => metricsRing.snapshot(), "getMetricsSeries"),
       getTotalSessionAdmissionSnapshot: totalSessionAdmission.snapshot,
+      getChildHeapPolicySnapshot: /* @__PURE__ */ __name(() => managedChildHeapPolicy?.snapshot(), "getChildHeapPolicySnapshot"),
       recordDaemonRequest: /* @__PURE__ */ __name((durationMs, statusCode) => metricsRing.recordRequest(durationMs, statusCode), "recordDaemonRequest"),
       workspace: workspaceService,
       // Reverse tool channel (#5626): the SAME registry wired into `bridge` above,
@@ -6336,6 +6532,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       clientMcpSenderRegistry,
       persistDisabledTools: persistDisabledToolsFn,
       persistDisabledSkills: persistDisabledSkillsFn,
+      persistDisabledSkillsBatch: persistDisabledSkillsBatchFn,
       persistSetting: persistSettingFn,
       persistSettings: persistSettingsFn,
       sessionArtifactsPersistenceAvailable: sessionArtifactsPersistenceAvailableFromSettings(
@@ -6394,8 +6591,8 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
         { createWorkspaceTrustReconciler },
         { createDaemonTrustPolicyMonitor }
       ] = await Promise.all([
-        import("./workspace-trust-reconciler-65GTAGDK.js"),
-        import("./daemon-trust-policy-monitor-73JYN6ET.js")
+        import("./workspace-trust-reconciler-X2LZ6XCI.js"),
+        import("./daemon-trust-policy-monitor-XVIDV6T4.js")
       ]);
       const materializationFor = /* @__PURE__ */ __name((entry, snapshot, decision) => {
         const boundWorkspaces2 = entry.primary && decision.targetTrusted ? runtime.resolveBoundWorkspacesFromIdeEnv(
@@ -6610,7 +6807,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
     );
   }
   const channelValidationSettingsRuntime = opts.channelSelection ? await loadSettingsRuntimeModules() : void 0;
-  const channelValidationTrustPolicy = opts.channelSelection ? await import("./daemon-trust-policy-P5L5VFAY.js") : void 0;
+  const channelValidationTrustPolicy = opts.channelSelection ? await import("./daemon-trust-policy-E4MAYWPI.js") : void 0;
   const channelValidationTrustSnapshot = channelValidationTrustPolicy ? await channelValidationTrustPolicy.readDaemonTrustPolicySnapshot() : void 0;
   const resolveChannelWorkspaceGroupsAtListen = /* @__PURE__ */ __name(() => {
     if (!opts.channelSelection || !channelValidationSettingsRuntime || !channelRuntime) {
@@ -7441,8 +7638,10 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
                       daemonLog.info("daemon stopped");
                     }
                   });
+                  setLoaderKeyRejectionReporter(void 0);
                   await daemonLog.close();
                 }
+                restoreScrubbedLoaderEnv();
                 if (finalErr) rej(finalErr);
                 else res();
               });
@@ -7672,7 +7871,7 @@ async function runQwenServeImpl(optsIn, deps, loggerLifecycle) {
       server.once("error", (err) => {
         server.close();
         const nextPort = attemptPort + 1;
-        if (err.code === "EADDRINUSE" && opts.port !== 0 && nextPort <= 65535 && attempt < MAX_PORT_ATTEMPTS - 1) {
+        if (err.code === "EADDRINUSE" && opts.strictPort !== true && opts.port !== 0 && nextPort <= 65535 && attempt < MAX_PORT_ATTEMPTS - 1) {
           writeStderrLine(
             `qwen serve: port ${attemptPort} is in use, trying ${nextPort}...`
           );
@@ -7708,11 +7907,11 @@ export {
 };
 /**
  * @license
- * Copyright 2025 Qwen Team
+ * Copyright 2026 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
  * @license
- * Copyright 2026 Qwen Team
+ * Copyright 2025 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */