@qwen-code/qwen-code 0.21.7 → 0.21.8

package/chunks/{chunk-2U3WZGZG.js → chunk-3PY4LPJF.js}

@@ -9,20 +9,19 @@ import {
 import {
   isAnyAutoMemPath
 } from "./chunk-FVKHVJZQ.js";
+import {
+  runSideQuery
+} from "./chunk-COBO5EBO.js";
 import {
   STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-NG2R4N5O.js";
+} from "./chunk-6ZRFAKXK.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
-  SchemaValidator,
   StructuredToolError,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-IC4Z6LX6.js";
-import {
-  DEFAULT_QWEN_MODEL
-} from "./chunk-6EOI4HOK.js";
+} from "./chunk-PYQADEFD.js";
 import {
   estimateTextTokens,
   generateLegacyMcpToolName,
@@ -14791,17 +14790,21 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
    * keeping every other field (including the shared underlying
    * `CallableTool` / MCP transport) identical.
    *
-   * pool path: a single shared pool entry produces one
-   * `DiscoveredMCPTool` snapshot; each `SessionMcpView` clones with
-   * its own per-session trust before registering into its session's
-   * `ToolRegistry`. Without this clone, mutating `trust` on the shared
-   * instance would cross-contaminate sessions.
-   *
-   * Trust is the only field that legitimately varies per session;
-   * everything else (transport, schema, name) is transport-level.
+   * Kept as the trust-only convenience used by non-pool callers. Pooled
+   * session views use `withSessionConfig` because eager loading can differ
+   * between sessions too.
    */
   withTrust(trust) {
-    if (trust === this.trust) return this;
+    return this.withSessionConfig(trust, this.alwaysLoad);
+  }
+  /**
+   * Return a per-session projection of metadata that does not belong to the
+   * shared MCP transport snapshot. Pool entries can be shared by sessions
+   * whose trust and eager-loading settings differ, so neither field may be
+   * mutated on the canonical tool instance.
+   */
+  withSessionConfig(trust, alwaysLoad) {
+    if (trust === this.trust && alwaysLoad === this.alwaysLoad) return this;
     return new _DiscoveredMCPTool(
       this.mcpTool,
       this.serverName,
@@ -14819,7 +14822,7 @@ var DiscoveredMCPTool = class _DiscoveredMCPTool extends BaseDeclarativeTool {
       this.mcpTimeout,
       this.mcpToolIdleTimeoutMs,
       this.annotations,
-      this.alwaysLoad,
+      alwaysLoad,
       this.allowInvocationContext
     );
   }
@@ -16107,120 +16110,6 @@ __name(getFileReadDefaultPermission, "getFileReadDefaultPermission");
 
 // packages/core/src/services/visionBridge/vision-bridge-service.ts
 init_esbuild_shims();
-
-// packages/core/src/utils/sideQuery.ts
-init_esbuild_shims();
-import { readFile as readFile2 } from "node:fs/promises";
-function buildDefaultPromptId(purpose) {
-  return purpose ? `side-query:${purpose}` : "side-query";
-}
-__name(buildDefaultPromptId, "buildDefaultPromptId");
-function resolveDefaultModel(config, override) {
-  return override ?? config.getFastModel?.() ?? config.getModel() ?? DEFAULT_QWEN_MODEL;
-}
-__name(resolveDefaultModel, "resolveDefaultModel");
-function applyThinkingDefault(callerConfig) {
-  const thinkingOverride = callerConfig?.thinkingConfig;
-  return {
-    ...callerConfig ?? {},
-    thinkingConfig: thinkingOverride ? { includeThoughts: false, ...thinkingOverride } : { includeThoughts: false }
-  };
-}
-__name(applyThinkingDefault, "applyThinkingDefault");
-async function getOutputLanguageInstruction(config) {
-  const outputLanguageFilePath = config.getOutputLanguageFilePath?.();
-  if (!outputLanguageFilePath) return void 0;
-  try {
-    const preference = (await readFile2(outputLanguageFilePath, "utf8")).trim();
-    if (!preference) return void 0;
-    return [
-      "Follow the user-visible output language preference below for this side query.",
-      "This preference overrides any earlier language-selection rule in this system instruction.",
-      preference
-    ].join("\n\n");
-  } catch {
-    return void 0;
-  }
-}
-__name(getOutputLanguageInstruction, "getOutputLanguageInstruction");
-function appendSystemInstruction(systemInstruction, outputLanguageInstruction) {
-  if (!outputLanguageInstruction) return systemInstruction;
-  if (systemInstruction === void 0) return outputLanguageInstruction;
-  if (typeof systemInstruction === "string") {
-    return `${systemInstruction}
-
-${outputLanguageInstruction}`;
-  }
-  if (Array.isArray(systemInstruction)) {
-    return [...systemInstruction, { text: outputLanguageInstruction }];
-  }
-  if (typeof systemInstruction === "object" && "parts" in systemInstruction && Array.isArray(systemInstruction.parts)) {
-    return {
-      ...systemInstruction,
-      parts: [...systemInstruction.parts, { text: outputLanguageInstruction }]
-    };
-  }
-  return [systemInstruction, { text: outputLanguageInstruction }];
-}
-__name(appendSystemInstruction, "appendSystemInstruction");
-function isJsonOptions(options) {
-  return options.schema !== void 0 && options.schema !== null;
-}
-__name(isJsonOptions, "isJsonOptions");
-async function runSideQuery(config, options) {
-  const model = resolveDefaultModel(config, options.model);
-  const promptId = options.promptId ?? buildDefaultPromptId(options.purpose);
-  const requestConfig = applyThinkingDefault(options.config);
-  const outputLanguageInstruction = options.skipOutputLanguagePreference ? void 0 : await getOutputLanguageInstruction(config);
-  const systemInstruction = appendSystemInstruction(
-    options.systemInstruction,
-    outputLanguageInstruction
-  );
-  if (isJsonOptions(options)) {
-    const response = await config.getBaseLlmClient().generateJson({
-      contents: options.contents,
-      schema: options.schema,
-      abortSignal: options.abortSignal,
-      model,
-      systemInstruction,
-      promptId,
-      config: requestConfig,
-      ...options.maxAttempts !== void 0 && {
-        maxAttempts: options.maxAttempts
-      }
-    });
-    const schemaError = SchemaValidator.validate(options.schema, response);
-    if (schemaError) {
-      throw new Error(`Invalid side query response: ${schemaError}`);
-    }
-    const customError2 = options.validate?.(response);
-    if (customError2) {
-      throw new Error(customError2);
-    }
-    return response;
-  }
-  const result = await config.getBaseLlmClient().generateText({
-    contents: options.contents,
-    model,
-    systemInstruction,
-    abortSignal: options.abortSignal,
-    promptId,
-    config: requestConfig,
-    ...options.maxAttempts !== void 0 && {
-      maxAttempts: options.maxAttempts
-    },
-    ...options.stream !== void 0 && { stream: options.stream },
-    ...options.failClosed !== void 0 && { failClosed: options.failClosed }
-  });
-  const customError = options.validate?.(result.text);
-  if (customError) {
-    throw new Error(customError);
-  }
-  return result;
-}
-__name(runSideQuery, "runSideQuery");
-
-// packages/core/src/services/visionBridge/vision-bridge-service.ts
 var debugLogger8 = createDebugLogger("VISION_BRIDGE");
 var turnImageCounts = /* @__PURE__ */ new WeakMap();
 var BRIDGE_MAX_OUTPUT_TOKENS = 2048;
@@ -16961,7 +16850,6 @@ var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
 };
 
 export {
-  runSideQuery,
   VISION_BRIDGE_MAX_IMAGES,
   VISION_BRIDGE_MAX_IMAGE_BASE64_BYTES,
   normalizeParts,

package/chunks/{chunk-SPMY6CX6.js → chunk-3SE7J4DR.js}

@@ -2,11 +2,11 @@
 "use strict";
 import {
   getCliVersion
-} from "./chunk-FZBZSYKU.js";
+} from "./chunk-FN6YXJOP.js";
 import {
   IdeClient,
   formatMemoryUsage
-} from "./chunk-Y7E5LNLO.js";
+} from "./chunk-GXSNGY5M.js";
 import {
   createDebugLogger
 } from "./chunk-OIVKILPI.js";
@@ -25,7 +25,7 @@ import { execFile } from "node:child_process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "0639ef724";
+var GIT_COMMIT_INFO = "d171d692f7";
 
 // packages/cli/src/utils/systemInfo.ts
 var debugLogger = createDebugLogger("STATUS");

package/chunks/{chunk-6UWFTUQL.js → chunk-3WNQOYHQ.js}

@@ -15,20 +15,20 @@ import {
   estimateCompactToolGroupHeight,
   isCollapsibleTool,
   wrapAnsi
-} from "./chunk-OH2VKQXH.js";
+} from "./chunk-7DVT4LVV.js";
 import {
   disableMouseEvents,
   enableMouseEvents,
   useKeypress,
   useKeypressContext
-} from "./chunk-MAJS7AT4.js";
+} from "./chunk-QGHSP65Z.js";
 import {
   formatSupportedModes,
   getCommandDisplayName,
   getCommandSourceBadge,
   getCommandSourceGroup,
   getCommandSubcommandNames
-} from "./chunk-QETYKPMG.js";
+} from "./chunk-NVRDQFCX.js";
 import {
   INLINE_CODE_SPAN_PATTERN_SOURCE,
   calculateAverageLatency,
@@ -43,7 +43,7 @@ import {
   readInlineMathSpanAt,
   unescapeMarkdownBeforeMath,
   unescapeMarkdownDollars
-} from "./chunk-RNVQB725.js";
+} from "./chunk-XHD7CRP2.js";
 import {
   MINIMUM_MAX_HEIGHT,
   MaxSizedBox
@@ -72,13 +72,13 @@ import {
   renderMermaidImageAsync,
   renderTerminalImage,
   wasKittyImageWritten
-} from "./chunk-7UFKAV7Y.js";
+} from "./chunk-S6HYI3MF.js";
 import {
   formatInlineImageOverflow
-} from "./chunk-2VSTGY6M.js";
+} from "./chunk-PJRW65JO.js";
 import {
   relaunchApp
-} from "./chunk-HQB2KUAN.js";
+} from "./chunk-NPUXXRJI.js";
 import {
   resolveColor,
   themeManager
@@ -108,7 +108,7 @@ import {
 } from "./chunk-57OAHC2Y.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-5KH532V7.js";
+} from "./chunk-WV5J6Q6N.js";
 import {
   formatDuration,
   formatRelativeTime,
@@ -116,15 +116,15 @@ import {
 } from "./chunk-3SH53ANB.js";
 import {
   getPersistScopeForModelSelection
-} from "./chunk-PQBHU2IA.js";
+} from "./chunk-OHKJVAKG.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
   t
-} from "./chunk-DBOFL3LQ.js";
+} from "./chunk-PG62DFWD.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-6XU3PH66.js";
+} from "./chunk-HA3SAB64.js";
 import {
   ALL_PROVIDERS,
   IdeClient,
@@ -147,7 +147,7 @@ import {
   resolveBaseUrl,
   resolveMetadataKey,
   resolveOwnsModel
-} from "./chunk-Y7E5LNLO.js";
+} from "./chunk-GXSNGY5M.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";
@@ -155,20 +155,20 @@ import {
   sanitizeForOsc,
   supportsHyperlinks,
   wrapForMultiplexer
-} from "./chunk-22NBYCPD.js";
+} from "./chunk-3P2LV43B.js";
 import {
   MAIN_SOURCE,
   formatVisionBridgeNoticeDisplay,
   getMCPServerStatus,
   isVisionBridgeNoticeDisplay,
   uiTelemetryService
-} from "./chunk-2U3WZGZG.js";
+} from "./chunk-3PY4LPJF.js";
 import {
   ToolDisplayNames,
   ToolNames,
   ToolNamesMigration,
   isTerminalImageDisplay
-} from "./chunk-IC4Z6LX6.js";
+} from "./chunk-PYQADEFD.js";
 import {
   createDebugLogger,
   escapePath,
@@ -11884,7 +11884,15 @@ var ToolConfirmationMessage = /* @__PURE__ */ __name(({
       key: "No, suggest changes (esc)"
     });
     bodyContent = /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, marginLeft: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Text, { color: theme.text.link, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(RenderInline, { text: infoProps.prompt, textColor: theme.text.link }) }),
+      infoProps.renderPromptAsPlainText ? /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+        MaxSizedBox,
+        {
+          maxHeight: availableBodyContentHeight(),
+          maxWidth: warningContentWidth,
+          overflowDirection: "bottom",
+          children: infoProps.prompt.split("\n").map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Text, { color: theme.text.link, wrap: "wrap", children: line }) }, index))
+        }
+      ) : /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Text, { color: theme.text.link, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(RenderInline, { text: infoProps.prompt, textColor: theme.text.link }) }),
       displayUrls && infoProps.urls && infoProps.urls.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
         /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Text, { color: theme.text.primary, children: t("URLs to fetch:") }),
         infoProps.urls.map((url) => /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(Text, { children: [
@@ -12441,6 +12449,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
   name,
   description,
   resultDisplay,
+  confirmationDetails,
   images,
   omittedImageCount,
   visionBridgeNotice,
@@ -12535,7 +12544,11 @@ var ToolMessage = /* @__PURE__ */ __name(({
           name,
           status,
           description,
-          emphasis
+          emphasis,
+          hideDescription: status === "Confirming" /* Confirming */ && confirmationDetails?.type === "info" && confirmationDetails.renderPromptAsPlainText === true && isDescriptionRepeatedInPrompt(
+            description,
+            confirmationDetails.prompt
+          )
         }
       ),
       shouldShowFocusHint && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { marginLeft: 1, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.accent, children: isThisShellFocused ? "(Focused)" : "(ctrl+f to focus)" }) }),
@@ -12652,11 +12665,36 @@ var ToolMessage = /* @__PURE__ */ __name(({
     ) })
   ] });
 }, "ToolMessage");
+function isDescriptionRepeatedInPrompt(description, prompt) {
+  try {
+    const parsed = JSON.parse(description);
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return false;
+    }
+    const values = Object.values(parsed);
+    if (values.length === 0 || !values.every((value) => typeof value === "string")) {
+      return false;
+    }
+    const promptValues = prompt.split("\n").flatMap((line) => {
+      try {
+        const value = JSON.parse(line);
+        return typeof value === "string" ? [value] : [];
+      } catch {
+        return [];
+      }
+    });
+    return values.every((value) => promptValues.includes(value));
+  } catch {
+    return false;
+  }
+}
+__name(isDescriptionRepeatedInPrompt, "isDescriptionRepeatedInPrompt");
 var ToolInfo = /* @__PURE__ */ __name(({
   name,
   description,
   status,
-  emphasis
+  emphasis,
+  hideDescription
 }) => {
   const nameColor = import_react28.default.useMemo(() => {
     switch (emphasis) {
@@ -12674,8 +12712,10 @@ var ToolInfo = /* @__PURE__ */ __name(({
   }, [emphasis]);
   return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { wrap: "wrap", strikethrough: status === "Canceled" /* Canceled */, children: [
     /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: nameColor, bold: true, children: localizeToolDisplayName(name) }),
-    " ",
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.secondary, children: description })
+    !hideDescription && /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_jsx_runtime20.Fragment, { children: [
+      " ",
+      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.secondary, children: description })
+    ] })
   ] }) });
 }, "ToolInfo");
 var TrailingIndicator = /* @__PURE__ */ __name(() => /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { color: theme.text.primary, wrap: "truncate", children: [
@@ -16004,6 +16044,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
   isEstimated,
   showDetails = false
 }) => {
+  const hasTokenCount = totalTokens > 0;
   const percentage = contextWindowSize > 0 ? totalTokens / contextWindowSize * 100 : 0;
   const isOverLimit = percentage > 100;
   const sortedBuiltinTools = [...builtinTools].sort(
@@ -16030,7 +16071,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.accent, children: t("Context Usage") }),
         /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { height: 1 }),
-        isEstimated ? /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
+        !hasTokenCount ? /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
           /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.warning, italic: true, children: t("No API response yet. Send a message to see actual usage.") }) }),
           /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Estimated pre-conversation overhead") }),
           /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
@@ -16060,6 +16101,9 @@ var ContextUsage = /* @__PURE__ */ __name(({
               t("tokens")
             ] }) })
           ] }),
+          isEstimated && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.warning, italic: true, children: t(
+            "Token usage is estimated until provider usage is received."
+          ) }) }),
           /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: CONTENT_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
             ProgressBar,
             {
@@ -16154,7 +16198,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
             symbolColor: theme.text.accent
           }
         ),
-        !isEstimated && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        hasTokenCount && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
           CategoryRow,
           {
             symbol: FILLED,

package/chunks/{chunk-KXSDEOFU.js → chunk-4ALIARFY.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   t
-} from "./chunk-DBOFL3LQ.js";
+} from "./chunk-PG62DFWD.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-D3UEZIQH.js → chunk-4DU3NCHG.js}

@@ -13,15 +13,18 @@ import {
 import {
   DEFAULT_EXCLUDED_ENV_VARS,
   HOME_ENV_BOOTSTRAP_KEYS,
-  PROJECT_ENV_HARDCODED_EXCLUSIONS,
-  publishPendingCompileCache
-} from "./chunk-6PEXNQTX.js";
+  isHardcodedProjectEnvExclusion,
+  isLoaderEnvKey,
+  publishPendingCompileCache,
+  reportRejectedLoaderKeys
+} from "./chunk-UA5H3DS2.js";
 import {
-  require_strip_json_comments
-} from "./chunk-ALGGS7UH.js";
+  buildTrustPrecedenceRules,
+  require_strip_json_comments,
+  resolveTrustDecision
+} from "./chunk-NPQ5ZKRP.js";
 import {
-  getPathComparisonVariants,
-  isWithinRoot
+  getPathComparisonVariants
 } from "./chunk-MR3PXB6E.js";
 import {
   require_main
@@ -42,9 +45,6 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 var V2_SETTINGS_VERSION = 2;
-var TRUST_FOLDER = "TRUST_FOLDER";
-var TRUST_PARENT = "TRUST_PARENT";
-var DO_NOT_TRUST = "DO_NOT_TRUST";
 var homeEnvBootstrapped = false;
 var cachedTrustedFoldersPath;
 var cachedTrustedFolderRules;
@@ -87,7 +87,7 @@ function readHomeEnvIntoFastPath(file) {
   if (!fs.existsSync(file)) return;
   try {
     const parsed = dotenv.parse(fs.readFileSync(file, "utf8"));
-    for (const key of PROJECT_ENV_HARDCODED_EXCLUSIONS) {
+    for (const key of HOME_ENV_BOOTSTRAP_KEYS) {
       if (parsed[key] && !Object.hasOwn(process.env, key)) {
         process.env[key] = parsed[key];
       }
@@ -205,9 +205,11 @@ function setUpCloudShellEnvironmentFromFilesFastPath(envFilePaths) {
   process.env["GOOGLE_CLOUD_PROJECT"] = "cloudshell-gca";
 }
 __name(setUpCloudShellEnvironmentFromFilesFastPath, "setUpCloudShellEnvironmentFromFilesFastPath");
+var serveFastPathRejectedLoaderKeys = [];
 function loadServeFastPathEnvironment(settings, startDir = process.cwd()) {
   const userLevelPaths = getUserLevelEnvPathsFastPath();
   const envFilePaths = findEnvFilesFastPath(settings, startDir, userLevelPaths);
+  const rejectedLoaderKeys = [];
   if (process.env["CLOUD_SHELL"] === "true") {
     setUpCloudShellEnvironmentFromFilesFastPath(envFilePaths);
   }
@@ -220,7 +222,8 @@ function loadServeFastPathEnvironment(settings, startDir = process.cwd()) {
       const isQwenScopedEnvFile = isHomeScopedEnvFile || path.basename(path.dirname(normalizedEnvFilePath)) === SETTINGS_DIRECTORY_NAME;
       for (const key in parsedEnv) {
         if (!Object.hasOwn(parsedEnv, key)) continue;
-        if (!isHomeScopedEnvFile && PROJECT_ENV_HARDCODED_EXCLUSIONS.includes(key)) {
+        if (isLoaderEnvKey(key)) continue;
+        if (!isHomeScopedEnvFile && isHardcodedProjectEnvExclusion(key)) {
           continue;
         }
         if (!isQwenScopedEnvFile && excludedVars.includes(key)) {
@@ -230,20 +233,44 @@ function loadServeFastPathEnvironment(settings, startDir = process.cwd()) {
           process.env[key] = parsedEnv[key];
         }
       }
+      rejectedLoaderKeys.push(
+        ...reportRejectedLoaderKeys(
+          // Raw candidate path, matching the source label environment.ts
+          // reports — the warn-once dedup is keyed on this string.
+          `.env file ${envFilePath}`,
+          Object.keys(parsedEnv)
+        )
+      );
     } catch {
     }
   }
   if (settings.env) {
     for (const [key, value] of Object.entries(settings.env)) {
-      if (PROJECT_ENV_HARDCODED_EXCLUSIONS.includes(key)) continue;
+      if (isHardcodedProjectEnvExclusion(key)) continue;
+      if (isLoaderEnvKey(key)) continue;
       if (!Object.hasOwn(process.env, key) && typeof value === "string") {
         process.env[key] = value;
       }
     }
+    rejectedLoaderKeys.push(
+      ...reportRejectedLoaderKeys(
+        `settings.env (${startDir})`,
+        Object.keys(settings.env)
+      )
+    );
   }
   publishPendingCompileCache();
+  serveFastPathRejectedLoaderKeys = [
+    .../* @__PURE__ */ new Set([...serveFastPathRejectedLoaderKeys, ...rejectedLoaderKeys])
+  ];
 }
 __name(loadServeFastPathEnvironment, "loadServeFastPathEnvironment");
+function consumeServeFastPathRejectedLoaderKeys() {
+  const keys = serveFastPathRejectedLoaderKeys;
+  serveFastPathRejectedLoaderKeys = [];
+  return keys;
+}
+__name(consumeServeFastPathRejectedLoaderKeys, "consumeServeFastPathRejectedLoaderKeys");
 function readTrustedFolderRulesFastPath() {
   const trustedFoldersPath = getTrustedFoldersPathFastPath();
   if (cachedTrustedFolderRules && cachedTrustedFoldersPath === trustedFoldersPath) {
@@ -281,52 +308,17 @@ function readTrustedFolderRulesFastPath() {
 }
 __name(readTrustedFolderRulesFastPath, "readTrustedFolderRulesFastPath");
 function buildTrustedFolderRules(trustedFolders) {
-  const rules = [];
-  for (const [rulePath, trustLevel] of Object.entries(trustedFolders)) {
-    if (trustLevel === TRUST_FOLDER) {
-      rules.push({
-        level: "trusted",
-        variants: getPathComparisonVariants(rulePath)
-      });
-    } else if (trustLevel === TRUST_PARENT) {
-      rules.push({
-        level: "trusted",
-        variants: getPathComparisonVariants(path.dirname(rulePath))
-      });
-    } else if (trustLevel === DO_NOT_TRUST) {
-      rules.push({
-        level: "untrusted",
-        variants: getPathComparisonVariants(rulePath)
-      });
-    }
-  }
-  return rules;
+  return buildTrustPrecedenceRules(
+    Object.entries(trustedFolders).map(([rulePath, trustLevel]) => ({
+      path: rulePath,
+      trustLevel
+    }))
+  );
 }
 __name(buildTrustedFolderRules, "buildTrustedFolderRules");
 function isPathTrustedFastPath(location) {
   const rules = readTrustedFolderRulesFastPath();
-  const locationVariants = getPathComparisonVariants(location);
-  for (const rule of rules) {
-    if (rule.level !== "trusted") continue;
-    for (const locationVariant of locationVariants) {
-      for (const trustedVariant of rule.variants) {
-        if (isWithinRoot(locationVariant, trustedVariant)) {
-          return true;
-        }
-      }
-    }
-  }
-  for (const rule of rules) {
-    if (rule.level !== "untrusted") continue;
-    for (const locationVariant of locationVariants) {
-      for (const untrustedVariant of rule.variants) {
-        if (locationVariant === untrustedVariant) {
-          return false;
-        }
-      }
-    }
-  }
-  return void 0;
+  return resolveTrustDecision(rules, getPathComparisonVariants(location));
 }
 __name(isPathTrustedFastPath, "isPathTrustedFastPath");
 function isWorkspaceTrustedFastPath(settings, realWorkspaceDir) {
@@ -641,6 +633,7 @@ export {
   preResolveServeFastPathHomeEnvOverrides,
   resetServeFastPathHomeEnvBootstrapForTesting,
   loadServeFastPathEnvironment,
+  consumeServeFastPathRejectedLoaderKeys,
   loadServeFastPathSettings
 };
 /**