@qwen-code/qwen-code 0.21.1-simplify-system-prompt.0 → 0.21.2

package/chunks/{chunk-NL7LTRLR.js → chunk-E2BHWIDT.js}

@@ -4,7 +4,7 @@ import {
   init_esm,
   isSpanContextValid,
   trace
-} from "./chunk-TARRHLLG.js";
+} from "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -110,7 +110,7 @@ function getErrorMessage(error) {
         `${error.message} (cause: ${detail})`
       );
     }
-    return error.message;
+    return truncateStringifiedErrorMessage(error.message);
   }
   if (error !== null && typeof error === "object" && !Array.isArray(error)) {
     const { message, cause } = error;
@@ -176,14 +176,6 @@ var FatalError = class extends Error {
     __name(this, "FatalError");
   }
 };
-var FatalAuthenticationError = class extends FatalError {
-  static {
-    __name(this, "FatalAuthenticationError");
-  }
-  constructor(message) {
-    super(message, 41);
-  }
-};
 var FatalInputError = class extends FatalError {
   static {
     __name(this, "FatalInputError");
@@ -216,14 +208,6 @@ var FatalTurnLimitedError = class extends FatalError {
     super(message, 53);
   }
 };
-var FatalToolExecutionError = class extends FatalError {
-  static {
-    __name(this, "FatalToolExecutionError");
-  }
-  constructor(message) {
-    super(message, 54);
-  }
-};
 var FatalBudgetExceededError = class extends FatalError {
   static {
     __name(this, "FatalBudgetExceededError");
@@ -289,13 +273,8 @@ import path from "node:path";
 import os from "node:os";
 import * as crypto from "node:crypto";
 var QWEN_DIR = ".qwen";
-var GOOGLE_ACCOUNTS_FILENAME = "google_accounts.json";
 var isDirectoryCache = /* @__PURE__ */ new Map();
 var VALIDATE_PATH_CACHE_MAX = 1024;
-function _resetValidatePathCacheForTest() {
-  isDirectoryCache.clear();
-}
-__name(_resetValidatePathCacheForTest, "_resetValidatePathCacheForTest");
 var SHELL_SPECIAL_CHARS = /[ \t()[\]{};|*?$`'"#&<>!~,]/;
 var PATH_ARG_KEYS = [
   "file_path",
@@ -554,7 +533,7 @@ import * as path2 from "node:path";
 import * as os2 from "node:os";
 import * as fs2 from "node:fs";
 import { AsyncLocalStorage } from "node:async_hooks";
-var GOOGLE_ACCOUNTS_FILENAME2 = "google_accounts.json";
+var GOOGLE_ACCOUNTS_FILENAME = "google_accounts.json";
 var OAUTH_FILE = "oauth_creds.json";
 var SKILL_PROVIDER_CONFIG_DIRS = [".qwen", ".agents"];
 var TMP_DIR_NAME = "tmp";
@@ -633,8 +612,20 @@ var Storage = class _Storage {
    * This is used to isolate runtime output paths between concurrent sessions.
    */
   static runWithRuntimeBaseDir(dir, cwd, fn) {
+    if (_Storage.runtimeBaseDirContext.getStore()?.pinned) {
+      return fn();
+    }
     const resolved = _Storage.resolveRuntimeBaseDir(dir, cwd);
-    return _Storage.runtimeBaseDirContext.run(resolved, fn);
+    return _Storage.runtimeBaseDirContext.run(
+      { dir: resolved, pinned: false },
+      fn
+    );
+  }
+  static runWithResolvedRuntimeBaseDir(dir, fn) {
+    return _Storage.runtimeBaseDirContext.run(
+      { dir: path2.resolve(dir), pinned: true },
+      fn
+    );
   }
   static hasRuntimeBaseDirContext() {
     return _Storage.runtimeBaseDirContext.getStore() !== void 0;
@@ -643,17 +634,20 @@ var Storage = class _Storage {
    * Returns the base directory for all runtime output (temp files, debug logs,
    * session data, todos, insights, etc.).
    *
-   * Priority: QWEN_RUNTIME_DIR env var > setRuntimeBaseDir() value > getGlobalQwenDir()
+   * Priority: pinned runtime context > QWEN_RUNTIME_DIR env var > configurable context > setRuntimeBaseDir() value > getGlobalQwenDir()
    * @returns Absolute path to the runtime output base directory
    */
   static getRuntimeBaseDir() {
+    const contextualDir = _Storage.runtimeBaseDirContext.getStore();
+    if (contextualDir?.pinned) {
+      return contextualDir.dir ?? _Storage.getGlobalQwenDir();
+    }
     const envDir = process.env["QWEN_RUNTIME_DIR"];
     if (envDir) {
       return _Storage.resolveRuntimeBaseDir(envDir) ?? _Storage.getGlobalQwenDir();
     }
-    const contextualDir = _Storage.runtimeBaseDirContext.getStore();
     if (contextualDir !== void 0) {
-      return contextualDir ?? _Storage.getGlobalQwenDir();
+      return contextualDir.dir ?? _Storage.getGlobalQwenDir();
     }
     if (_Storage.runtimeBaseDir) {
       return _Storage.runtimeBaseDir;
@@ -681,7 +675,7 @@ var Storage = class _Storage {
     return path2.join(_Storage.getGlobalQwenDir(), "installation_id");
   }
   static getGoogleAccountsPath() {
-    return path2.join(_Storage.getGlobalQwenDir(), GOOGLE_ACCOUNTS_FILENAME2);
+    return path2.join(_Storage.getGlobalQwenDir(), GOOGLE_ACCOUNTS_FILENAME);
   }
   static getUserCommandsDir() {
     return path2.join(_Storage.getGlobalQwenDir(), "commands");
@@ -886,6 +880,31 @@ var Storage = class _Storage {
   }
 };
 
+// packages/core/src/telemetry/session-context.ts
+init_esbuild_shims();
+var sessionRootContext;
+var currentSessionId;
+function setSessionContext(ctx, sessionId) {
+  sessionRootContext = ctx;
+  currentSessionId = sessionId;
+}
+__name(setSessionContext, "setSessionContext");
+function getSessionContext() {
+  return sessionRootContext;
+}
+__name(getSessionContext, "getSessionContext");
+function getCurrentSessionId() {
+  return currentSessionId;
+}
+__name(getCurrentSessionId, "getCurrentSessionId");
+
+// packages/core/src/utils/debugLogger.ts
+init_esbuild_shims();
+import { promises as fs4 } from "node:fs";
+import path4 from "node:path";
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+import util from "node:util";
+
 // packages/core/src/utils/symlink.ts
 init_esbuild_shims();
 import { promises as fs3 } from "node:fs";
@@ -912,24 +931,6 @@ async function updateSymlink(linkPath, targetPath, options) {
 }
 __name(updateSymlink, "updateSymlink");
 
-// packages/core/src/telemetry/session-context.ts
-init_esbuild_shims();
-var sessionRootContext;
-var currentSessionId;
-function setSessionContext(ctx, sessionId) {
-  sessionRootContext = ctx;
-  currentSessionId = sessionId;
-}
-__name(setSessionContext, "setSessionContext");
-function getSessionContext() {
-  return sessionRootContext;
-}
-__name(getSessionContext, "getSessionContext");
-function getCurrentSessionId() {
-  return currentSessionId;
-}
-__name(getCurrentSessionId, "getCurrentSessionId");
-
 // packages/core/src/telemetry/trace-context.ts
 init_esbuild_shims();
 init_esm();
@@ -984,11 +985,6 @@ function isShellTracePropagationEnabled() {
 __name(isShellTracePropagationEnabled, "isShellTracePropagationEnabled");
 
 // packages/core/src/utils/debugLogger.ts
-init_esbuild_shims();
-import { promises as fs4 } from "node:fs";
-import path4 from "node:path";
-import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
-import util from "node:util";
 var ensureDebugDirPromise = null;
 var ensuredDebugDirPath = null;
 var hasWriteFailure = false;
@@ -1055,12 +1051,6 @@ function isDebugLoggingDegraded() {
   return hasWriteFailure;
 }
 __name(isDebugLoggingDegraded, "isDebugLoggingDegraded");
-function resetDebugLoggingState() {
-  hasWriteFailure = false;
-  ensureDebugDirPromise = null;
-  ensuredDebugDirPath = null;
-}
-__name(resetDebugLoggingState, "resetDebugLoggingState");
 var DEBUG_LATEST_ALIAS = "latest";
 var SESSION_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function updateLatestDebugLogAlias(sessionId) {
@@ -1083,10 +1073,6 @@ function setDebugLogSession(session) {
   }
 }
 __name(setDebugLogSession, "setDebugLogSession");
-function runWithDebugLogSession(session, fn) {
-  return sessionContext.run(session, fn);
-}
-__name(runWithDebugLogSession, "runWithDebugLogSession");
 function runWithoutDebugLogSession(fn) {
   return sessionContext.run(false, fn);
 }
@@ -1125,22 +1111,15 @@ export {
   getErrorStatus,
   getErrorType,
   FatalError,
-  FatalAuthenticationError,
   FatalInputError,
   FatalSandboxError,
   FatalConfigError,
   FatalTurnLimitedError,
-  FatalToolExecutionError,
   FatalBudgetExceededError,
   FatalCancellationError,
-  ForbiddenError,
   UnauthorizedError,
-  BadRequestError,
   toFriendlyError,
   QWEN_DIR,
-  GOOGLE_ACCOUNTS_FILENAME,
-  _resetValidatePathCacheForTest,
-  SHELL_SPECIAL_CHARS,
   PATH_ARG_KEYS,
   tildeifyPath,
   expandHomeDir,
@@ -1154,7 +1133,6 @@ export {
   isSubpath,
   isSubpaths,
   resolvePath,
-  validatePath,
   resolveAndValidatePath,
   SKILL_PROVIDER_CONFIG_DIRS,
   Storage,
@@ -1168,9 +1146,7 @@ export {
   isShellTracePropagationEnabled,
   isDebugLogFileEnabled,
   isDebugLoggingDegraded,
-  resetDebugLoggingState,
   setDebugLogSession,
-  runWithDebugLogSession,
   runWithoutDebugLogSession,
   createDebugLogger
 };

package/chunks/{chunk-3MSHSCSN.js → chunk-E2FN6SM7.js}

@@ -1,12 +1,21 @@
 // Force strict mode and setup for ESM
 "use strict";
+import {
+  CLIENT_MCP_OVER_WS_CONFIG_FLAG
+} from "./chunk-CPZAH673.js";
+import {
+  SessionNotFoundError
+} from "./chunk-B4AJNNOL.js";
 import {
   ChannelWorkerStartupError
-} from "./chunk-N3FAY5CM.js";
+} from "./chunk-FCYYAB4S.js";
 import {
   ChannelDeliveryError,
   ChannelWebhookEnqueueError
 } from "./chunk-U4VTUMMK.js";
+import {
+  CHANNEL_LOOP_MCP_SERVER_NAME
+} from "./chunk-JCJ7LKNA.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -122,6 +131,75 @@ function createChannelWorkerGroup(opts) {
       ...opts.shared.restartPolicy ? { restartPolicy: opts.shared.restartPolicy } : {},
       ...opts.shared.startupTimeoutMs !== void 0 ? { startupTimeoutMs: opts.shared.startupTimeoutMs } : {},
       ...opts.shared.heartbeatTimeoutMs !== void 0 ? { heartbeatTimeoutMs: opts.shared.heartbeatTimeoutMs } : {},
+      registerChannelLoopMcp: /* @__PURE__ */ __name(async ({ sessionId, ownerId, sendMessage }) => {
+        runtime.clientMcpSenderRegistry.setSession(
+          CHANNEL_LOOP_MCP_SERVER_NAME,
+          sessionId,
+          sendMessage,
+          ownerId
+        );
+        try {
+          const config = {
+            type: "sdk",
+            [CLIENT_MCP_OVER_WS_CONFIG_FLAG]: true
+          };
+          const result = await runtime.bridge.addSessionRuntimeMcpServer(
+            sessionId,
+            CHANNEL_LOOP_MCP_SERVER_NAME,
+            config,
+            ownerId
+          );
+          if (result.skipped) {
+            throw new Error(
+              `runtime MCP add skipped: ${result.reason ?? "unknown"}`
+            );
+          }
+          if (result.shadowedSettings) {
+            throw new Error(
+              `channel loop MCP server conflicts with a configured MCP server`
+            );
+          }
+          if (!runtime.clientMcpSenderRegistry.ownsSession(
+            CHANNEL_LOOP_MCP_SERVER_NAME,
+            sessionId,
+            ownerId
+          )) {
+            throw new Error("Channel loop MCP registration was superseded.");
+          }
+        } catch (error) {
+          if (runtime.clientMcpSenderRegistry.deleteSession(
+            CHANNEL_LOOP_MCP_SERVER_NAME,
+            sessionId,
+            ownerId
+          )) {
+            await runtime.bridge.removeSessionRuntimeMcpServer(
+              sessionId,
+              CHANNEL_LOOP_MCP_SERVER_NAME,
+              ownerId
+            ).catch(() => {
+            });
+          }
+          throw error;
+        }
+      }, "registerChannelLoopMcp"),
+      unregisterChannelLoopMcp: /* @__PURE__ */ __name(async (sessionId, ownerId) => {
+        if (!runtime.clientMcpSenderRegistry.deleteSession(
+          CHANNEL_LOOP_MCP_SERVER_NAME,
+          sessionId,
+          ownerId
+        )) {
+          return;
+        }
+        try {
+          await runtime.bridge.removeSessionRuntimeMcpServer(
+            sessionId,
+            CHANNEL_LOOP_MCP_SERVER_NAME,
+            ownerId
+          );
+        } catch (error) {
+          if (!(error instanceof SessionNotFoundError)) throw error;
+        }
+      }, "unregisterChannelLoopMcp"),
       ...opts.onReady ? {
         onReady: /* @__PURE__ */ __name((snapshot) => {
           if (entries.get(runtime.workspaceCwd)?.generation === entryGeneration) {
@@ -544,7 +622,13 @@ function createChannelWorkerGroup(opts) {
     async deliverChannelMessage(request, workspaceCwd) {
       const entry = routeEntry(request.channelName, workspaceCwd);
       const deliver = entry?.supervisor.deliverChannelMessage;
-      if (!entry || drainingWorkspaces.has(entry.workspaceCwd) || !deliver) {
+      if (entry && drainingWorkspaces.has(entry.workspaceCwd)) {
+        throw new ChannelDeliveryError(
+          "channel_worker_unavailable",
+          `Channel worker for channel "${request.channelName}" is unavailable while its workspace is draining.`
+        );
+      }
+      if (!entry || !deliver) {
         const hint = workspaceCwd ? `No channel worker for the selected workspace owns channel "${request.channelName}".` : `No channel worker owns channel "${request.channelName}".`;
         throw new ChannelDeliveryError("channel_worker_unavailable", hint);
       }
@@ -552,7 +636,13 @@ function createChannelWorkerGroup(opts) {
     },
     async enqueueWebhookTask(task) {
       const entry = routeEntry(task.channelName);
-      if (!entry || drainingWorkspaces.has(entry.workspaceCwd)) {
+      if (entry && drainingWorkspaces.has(entry.workspaceCwd)) {
+        throw new ChannelWebhookEnqueueError(
+          "channel_worker_unavailable",
+          `Channel worker for channel "${task.channelName}" is unavailable while its workspace is draining.`
+        );
+      }
+      if (!entry) {
         throw new ChannelWebhookEnqueueError(
           "channel_worker_unavailable",
           `No channel worker owns channel "${task.channelName}".`

package/chunks/{chunk-USTWD7QV.js → chunk-E6CJ2SMM.js}

@@ -4,17 +4,19 @@ import {
   retryContext
 } from "./chunk-P3QQPMQA.js";
 import {
+  formatQuotaExhaustedMessage,
   getRateLimitErrorDetails,
   getRetryAfterDelayMs,
   getRetryDelayMs,
+  isQuotaExhaustedError,
   isQwenQuotaExceededError,
   isRateLimitError
-} from "./chunk-6FGBXPWM.js";
+} from "./chunk-XQK4XXTN.js";
 import {
   createDebugLogger,
   getErrorStatus,
   isAbortError
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-E2BHWIDT.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -138,20 +140,18 @@ function isRetryAbortError(error) {
   return error instanceof Error && error.name === "CanceledError";
 }
 __name(isRetryAbortError, "isRetryAbortError");
+var MAX_TRANSPORT_CAUSE_DEPTH = 4;
 function getTransportCode(error) {
-  if (typeof error !== "object" || error === null) {
-    return void 0;
-  }
-  const directCode = error.code;
-  if (typeof directCode === "string" && isTransportCode(directCode)) {
-    return directCode;
-  }
-  const cause = error instanceof Error ? error.cause : void 0;
-  if (typeof cause === "object" && cause !== null) {
-    const causeCode = cause.code;
-    if (typeof causeCode === "string" && isTransportCode(causeCode)) {
-      return causeCode;
+  let current = error;
+  for (let depth = 0; depth <= MAX_TRANSPORT_CAUSE_DEPTH; depth++) {
+    if (typeof current !== "object" || current === null) {
+      return void 0;
     }
+    const code = current.code;
+    if (typeof code === "string" && isTransportCode(code)) {
+      return code;
+    }
+    current = current instanceof Error ? current.cause : void 0;
   }
   return void 0;
 }
@@ -216,7 +216,10 @@ var DEFAULT_RETRY_OPTIONS = {
 };
 function defaultShouldRetry(error, extraRetryErrorCodes) {
   const status = getErrorStatus(error);
-  return isRateLimitError(error, extraRetryErrorCodes) || status !== void 0 && status >= 500 && status < 600;
+  if (isRateLimitError(error, extraRetryErrorCodes) || status !== void 0 && status >= 500 && status < 600) {
+    return true;
+  }
+  return classifyRetryError(error, { extraRetryErrorCodes }).kind === "transport";
 }
 __name(defaultShouldRetry, "defaultShouldRetry");
 function hasRetryAfterStatus(status) {
@@ -371,6 +374,14 @@ To continue using Qwen Code, try one of these alternatives:
 After setting up your API key, run /auth to configure your provider.`
         );
       }
+      if (isQuotaExhaustedError(error)) {
+        debugLogger.error(
+          "Quota exhausted, fast-failing",
+          retryDiagnostics,
+          error
+        );
+        throw new Error(formatQuotaExhaustedMessage(error), { cause: error });
+      }
       const isTransient = isTransientCapacityError(error);
       const callerAllowsRetry = hasCustomShouldRetryOnError ? shouldRetryOnError(error) : defaultShouldRetry(error, extraRetryErrorCodes);
       const isFailFast = retryDiagnostics.diagnosis === "fail-fast";
@@ -498,7 +509,6 @@ __name(logRetryAtStatusLevel, "logRetryAtStatusLevel");
 export {
   classifyRetryError,
   isFallbackEligible,
-  isTransientCapacityError,
   isUnattendedMode,
   delay,
   retryWithBackoff

package/chunks/{chunk-TF2X2WCT.js → chunk-EQNUDTL6.js}

@@ -2,11 +2,11 @@
 "use strict";
 import {
   getPlugin
-} from "./chunk-MK7VQDN3.js";
+} from "./chunk-KWHKHSIS.js";
 import {
   loadSettings,
   saveSettings
-} from "./chunk-JALU3ZDU.js";
+} from "./chunk-W3UKBMSI.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-PANH4R3B.js → chunk-EU5TBFJI.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-6PEXNQTX.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-VCBZUOSI.js";
+} from "./chunk-P755N4CS.js";
 import {
   require_main
 } from "./chunk-5M6IDOMF.js";
@@ -16,7 +16,7 @@ import {
   QWEN_DIR,
   Storage,
   getErrorMessage
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-E2BHWIDT.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -148,18 +148,14 @@ function getHomeEnvFallbackVars(onReadError) {
   return result;
 }
 __name(getHomeEnvFallbackVars, "getHomeEnvFallbackVars");
-function findEnvFiles(settings, startDir, userLevelPaths = getUserLevelEnvPaths()) {
+function findEnvFiles(settings, startDir, userLevelPaths = getUserLevelEnvPaths(), workspaceTrusted) {
   const homeDir = os.homedir();
   let realStartDir = path.resolve(startDir);
   try {
     realStartDir = fs.realpathSync(realStartDir);
   } catch {
   }
-  const isTrusted = isWorkspaceTrusted(
-    settings,
-    void 0,
-    realStartDir
-  ).isTrusted;
+  const isTrusted = workspaceTrusted ?? isWorkspaceTrusted(settings, void 0, realStartDir).isTrusted;
   const globalQwenDir = Storage.getGlobalQwenDir();
   const legacyQwenDir = path.normalize(path.join(homeDir, QWEN_DIR));
   const hasCustomConfigDir = path.normalize(globalQwenDir) !== legacyQwenDir;
@@ -284,9 +280,14 @@ function setRuntimeEnvIfUnset(env, key, value) {
   }
 }
 __name(setRuntimeEnvIfUnset, "setRuntimeEnvIfUnset");
-function buildRuntimeEnvironment(settings, startDir = process.cwd(), baseEnv = process.env) {
+function buildRuntimeEnvironment(settings, startDir = process.cwd(), baseEnv = process.env, workspaceTrusted) {
   const userLevelPaths = getUserLevelEnvPaths();
-  const envFilePaths = findEnvFiles(settings, startDir, userLevelPaths);
+  const envFilePaths = findEnvFiles(
+    settings,
+    startDir,
+    userLevelPaths,
+    workspaceTrusted
+  );
   const parsedEnvFiles = parseEnvFiles(envFilePaths, userLevelPaths);
   const effectiveEnv = { ...baseEnv };
   if (baseEnv["CLOUD_SHELL"] === "true") {
@@ -366,9 +367,14 @@ function loadEnvironment(settings, startDir = process.cwd()) {
   publishPendingCompileCache();
 }
 __name(loadEnvironment, "loadEnvironment");
-function reloadEnvironment(settings, workspaceCwd) {
+function reloadEnvironment(settings, workspaceCwd, workspaceTrusted) {
   const userLevelPaths = getUserLevelEnvPaths();
-  const envFilePaths = findEnvFiles(settings, workspaceCwd, userLevelPaths);
+  const envFilePaths = findEnvFiles(
+    settings,
+    workspaceCwd,
+    userLevelPaths,
+    workspaceTrusted
+  );
   const parsedEnvFiles = parseEnvFiles(envFilePaths, userLevelPaths);
   if (process.env["CLOUD_SHELL"] === "true") {
     setUpCloudShellEnvironmentInEnv(process.env, parsedEnvFiles.files);

package/chunks/{chunk-W4CQXHT6.js → chunk-FANRZEAJ.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   resolvePath
-} from "./chunk-ML52PL6O.js";
+} from "./chunk-JCJ7LKNA.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-WBL3FJEU.js → chunk-FC4KQFCS.js}

@@ -4,7 +4,7 @@ import {
   require_call_bind_apply_helpers,
   require_get_intrinsic,
   require_type
-} from "./chunk-T2NCM2ET.js";
+} from "./chunk-T3CHYWJZ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";