@qwen-code/qwen-code 0.21.4 → 0.21.5-nightly.20260805.32e274157

package/chunks/{chunk-YXEVDA66.js → chunk-HU5TUALO.js}

@@ -6,6 +6,10 @@ import {
   DEFAULT_MAX_RETRIES,
   resolveRequestTimeout
 } from "./chunk-GLNBDYUX.js";
+import {
+  isQwenFamilyWireModel,
+  isTieredEffortWireModel
+} from "./chunk-WOJZWRAZ.js";
 import {
   defaultOutputCeiling,
   hasExplicitOutputLimit,
@@ -7136,14 +7140,17 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
     }
     const requestWithTokenLimits = this.applyOutputTokenLimit(request);
     const extraBody = this.contentGeneratorConfig.extra_body;
-    const enableThinkingFromEffort = this.shouldEnableThinkingFromEffort(
-      request.model
-    );
+    const qwenEffortConfig = this.buildQwenEffortConfig(request.model);
+    const requestParams = requestWithTokenLimits;
+    if ("reasoning_effort" in requestParams && "reasoning_effort" in qwenEffortConfig) {
+      qwenEffortConfig["reasoning_effort"] = requestParams["reasoning_effort"];
+    }
+    const hasQwenEffortConfig = Object.keys(qwenEffortConfig).length > 0;
     if (this.isVisionModel(request.model)) {
       const dashscopeExtras2 = {
         vl_high_resolution_images: true,
         preserve_thinking: true,
-        ...enableThinkingFromEffort ? { enable_thinking: true } : {}
+        ...qwenEffortConfig
       };
       const visionResult = {
         ...requestWithTokenLimits,
@@ -7152,17 +7159,18 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
         ...this.buildMetadata(userPromptId) || {},
         ...dashscopeExtras2
       };
-      if (enableThinkingFromEffort && "reasoning" in visionResult) {
+      if (hasQwenEffortConfig && "reasoning" in visionResult) {
         delete visionResult["reasoning"];
       }
-      return {
-        ...visionResult,
-        ...extraBody ? extraBody : {}
-      };
+      return this.mergeExtraBodyAndResolveKnobs(
+        visionResult,
+        extraBody,
+        request.model
+      );
     }
     const dashscopeExtras = {
       preserve_thinking: true,
-      ...enableThinkingFromEffort ? { enable_thinking: true } : {}
+      ...qwenEffortConfig
     };
     const result = {
       ...requestWithTokenLimits,
@@ -7172,30 +7180,110 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
       ...this.buildMetadata(userPromptId) || {},
       ...dashscopeExtras
     };
-    if (enableThinkingFromEffort && "reasoning" in result) {
+    if (hasQwenEffortConfig && "reasoning" in result) {
       delete result["reasoning"];
     }
-    return {
+    return this.mergeExtraBodyAndResolveKnobs(result, extraBody, request.model);
+  }
+  /**
+   * Shared tail for the vision and text branches: merge user extra_body
+   * last, then resolve thinking-knob conflicts against the wire model.
+   */
+  mergeExtraBodyAndResolveKnobs(result, extraBody, model) {
+    const merged = {
       ...result,
       ...extraBody ? extraBody : {}
     };
+    this.dropConflictingThinkingKnobs(model, merged);
+    return merged;
+  }
+  resolveWireModel(model) {
+    return (model ?? this.contentGeneratorConfig.model ?? "").toLowerCase();
   }
   /**
-   * Whether to send `enable_thinking: true` because the user selected a
-   * reasoning effort. qwen's hybrid-thinking models expose thinking as the
-   * boolean `enable_thinking` rather than a tiered `reasoning_effort`, so the
-   * unified effort ladder collapses to on/off here. Gated to qwen-family wire
-   * models (mirroring the pipeline's disable gate) so the qwen-specific field
-   * never leaks to a non-qwen model sharing the DashScope endpoint.
+   * Translate the unified reasoning effort into the wire shape the model
+   * accepts. The qwen3.8-max family takes the tiered `reasoning_effort`
+   * directly; older qwen hybrid models expose only the on/off
+   * `enable_thinking` switch, so the effort ladder collapses to on/off
+   * there. Gated to qwen-family wire models (mirroring the pipeline's
+   * disable gate) so the qwen-specific fields never leak to a non-qwen
+   * model sharing the DashScope endpoint.
    */
-  shouldEnableThinkingFromEffort(model) {
+  buildQwenEffortConfig(model) {
     const reasoning = this.contentGeneratorConfig.reasoning;
     if (!reasoning || reasoning.effort === void 0) {
-      return false;
+      return {};
+    }
+    const wireModel = this.resolveWireModel(model);
+    if (isTieredEffortWireModel(wireModel)) {
+      return { reasoning_effort: reasoning.effort };
+    }
+    if (isQwenFamilyWireModel(wireModel)) {
+      return { enable_thinking: true };
+    }
+    return {};
+  }
+  /**
+   * Resolve thinking knobs that conflict with a shipping `reasoning_effort`.
+   * Preset extra_body injects `enable_thinking` for models declared with
+   * enableThinking (provider-config.ts), and user extra_body merges last.
+   * Only the qwen3.8-max family reads `reasoning_effort` itself — there the
+   * tier ships alone: an `enable_thinking: true` alongside it is a second
+   * competing knob (the shape the nested-`reasoning` strip in buildRequest
+   * exists to prevent), and DashScope rejects `reasoning_effort` combined
+   * with `thinking_budget`. An explicit `enable_thinking: false` is the
+   * documented extra_body escape hatch winning over the config tier, so it
+   * is honoured as the family's canonical disable (`reasoning_effort:
+   * 'none'`, preserved by the pipeline's disable strip) rather than
+   * silently deleted. Older qwen hybrids read `enable_thinking` /
+   * `thinking_budget`, not `reasoning_effort`, so when an opaque
+   * reasoning_effort override conflicts with a meaningful thinking_budget
+   * the inert field goes and the knobs the model reads survive. Non-qwen
+   * models treat `reasoning_effort` as an opaque sampling override and
+   * keep every knob.
+   */
+  dropConflictingThinkingKnobs(model, merged) {
+    const effort = merged["reasoning_effort"];
+    if (typeof effort !== "string" || effort === "none") {
+      return;
+    }
+    const wireModel = this.resolveWireModel(model);
+    if (!isQwenFamilyWireModel(wireModel)) {
+      return;
+    }
+    const dropped = [];
+    if (isTieredEffortWireModel(wireModel)) {
+      if ("enable_thinking" in merged) {
+        if (merged["enable_thinking"] === false) {
+          merged["reasoning_effort"] = "none";
+        }
+        dropped.push("enable_thinking");
+      }
+      if ("thinking_budget" in merged) {
+        dropped.push("thinking_budget");
+      }
+    } else if ("thinking_budget" in merged) {
+      dropped.push("reasoning_effort");
+    }
+    if (dropped.length === 0) {
+      return;
+    }
+    for (const key of dropped) {
+      delete merged[key];
+    }
+    if (!this.conflictingKnobDropWarned) {
+      this.conflictingKnobDropWarned = true;
+      debugLogger.warn(
+        "DashScope: dropped extra_body thinking knobs that conflict with reasoning_effort",
+        {
+          model: wireModel,
+          reasoningEffort: merged["reasoning_effort"],
+          dropped
+        }
+      );
     }
-    const wireModel = (model ?? this.contentGeneratorConfig.model ?? "").toLowerCase();
-    return wireModel.startsWith("qwen") || wireModel === "coder-model";
   }
+  conflictingKnobDropWarned = false;
   buildMetadata(userPromptId) {
     const channel = this.cliConfig.getChannel?.();
     return {

package/chunks/{chunk-2JN5V3I7.js → chunk-ITZK3L4S.js}

@@ -6,7 +6,7 @@ import {
 import {
   loadSettings,
   saveSettings
-} from "./chunk-KB6VSG2U.js";
+} from "./chunk-GXP44JOS.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-5XGI4IPK.js → chunk-JEVHOCCA.js}

@@ -2,10 +2,10 @@
 "use strict";
 import {
   getExtensionManager
-} from "./chunk-O4IWFYUW.js";
+} from "./chunk-VY4TEQQ6.js";
 import {
   parseChannelConfig
-} from "./chunk-LEZFUYPM.js";
+} from "./chunk-7GYP5COR.js";
 import {
   getPlugin,
   registerPlugin
@@ -15,10 +15,10 @@ import {
 } from "./chunk-DIEFUBV6.js";
 import {
   loadSettings
-} from "./chunk-KB6VSG2U.js";
+} from "./chunk-GXP44JOS.js";
 import {
   hashDaemonWorkspace
-} from "./chunk-RPYYTL7E.js";
+} from "./chunk-MGSSJT27.js";
 import {
   Storage
 } from "./chunk-3RXUYQJI.js";

package/chunks/{chunk-6ME3PVMM.js → chunk-JNFWMBG6.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   loadSettings
-} from "./chunk-KB6VSG2U.js";
+} from "./chunk-GXP44JOS.js";
 import {
   getCurrentLanguage
-} from "./chunk-FV4TUUDE.js";
+} from "./chunk-O4WOWHMZ.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-URVJ4AZC.js";
+} from "./chunk-MKMUBBEX.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -22,7 +22,7 @@ import {
   hashMcpServerConfig,
   isGatedMcpScope,
   normalizeClaudeMcpServer
-} from "./chunk-E2SYUEIA.js";
+} from "./chunk-5OAMVWFL.js";
 import {
   atomicWriteFile
 } from "./chunk-UH7Z7Y45.js";
@@ -222,7 +222,7 @@ var addCommand = {
     describe: "Set connection timeout in milliseconds",
     type: "number"
   }).option("trust", {
-    describe: "Trust the server (bypass all tool call confirmation prompts)",
+    describe: "Trust the server (bypass its tool call confirmations in a trusted workspace)",
     type: "boolean"
   }).option("description", {
     describe: "Set the description for the server",

package/chunks/{chunk-3PHUGFPH.js → chunk-JXPOBM4B.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   t
-} from "./chunk-FV4TUUDE.js";
+} from "./chunk-O4WOWHMZ.js";
 import {
   createDebugLogger
 } from "./chunk-3RXUYQJI.js";

package/chunks/{chunk-TXZDRD36.js → chunk-LCCBAGRT.js}

@@ -407,18 +407,18 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
   try {
     if (authType === "openai" /* USE_OPENAI */) {
       loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-        const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-PGFSOMIQ.js");
+        const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-YHF3FIYI.js");
         return createOpenAIContentGenerator(generatorConfig, config);
       }, "loadBaseGenerator");
     } else if (authType === "qwen-oauth" /* QWEN_OAUTH */) {
-      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-IOAXKJ3L.js");
+      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-D62OJZFU.js");
       try {
         const qwenClient = await getQwenOauthClient(
           config,
           isInitialAuth ? { requireCachedCredentials: true } : void 0
         );
         loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-          const { QwenContentGenerator } = await import("./qwenContentGenerator-QC3KSHSX.js");
+          const { QwenContentGenerator } = await import("./qwenContentGenerator-46476NL4.js");
           return new QwenContentGenerator(qwenClient, generatorConfig, config);
         }, "loadBaseGenerator");
       } catch (error) {
@@ -434,7 +434,7 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
       }, "loadBaseGenerator");
     } else if (authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */) {
       loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-        const { createGeminiContentGenerator } = await import("./geminiContentGenerator-M3HJTHKR.js");
+        const { createGeminiContentGenerator } = await import("./geminiContentGenerator-DZB3GPNQ.js");
         return createGeminiContentGenerator(generatorConfig, config);
       }, "loadBaseGenerator");
     } else {
@@ -450,7 +450,7 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
       try {
         const [baseGenerator, { LoggingContentGenerator }] = await Promise.all([
           loadBaseGenerator(),
-          import("./loggingContentGenerator-2JEFU25T.js")
+          import("./loggingContentGenerator-SFT5CMPU.js")
         ]);
         return new LoggingContentGenerator(
           baseGenerator,

package/chunks/{chunk-G7XXKQYS.js → chunk-LKRMNRSN.js}

@@ -65,6 +65,19 @@ var SPAN_TOOL_EXECUTION = "qwen-code.tool.execution";
 var SPAN_TOOL_BLOCKED_ON_USER = "qwen-code.tool.blocked_on_user";
 var SPAN_HOOK = "qwen-code.hook";
 var SPAN_SUBAGENT = "qwen-code.subagent";
+var TOOL_FAILURE_KIND_ATTRIBUTE = "tool.failure_kind";
+var TOOL_FAILURE_KIND_CANCELLED = "cancelled";
+var TOOL_FAILURE_KIND_PRE_HOOK_BLOCKED = "pre_hook_blocked";
+var TOOL_FAILURE_KIND_INVOCATION_GUARD_DENIED = "invocation_guard_denied";
+var TOOL_FAILURE_KIND_POST_HOOK_STOPPED = "post_hook_stopped";
+var TOOL_FAILURE_KIND_TOOL_ERROR = "tool_error";
+var TOOL_FAILURE_KIND_TOOL_EXCEPTION = "tool_exception";
+var TOOL_FAILURE_KIND_PERMISSION_DENIED = "permission_denied";
+var TOOL_FAILURE_KIND_PERMISSION_HOOK_DENIED = "permission_hook_denied";
+var TOOL_FAILURE_KIND_PLAN_MODE_BLOCKED = "plan_mode_blocked";
+var TOOL_FAILURE_KIND_NON_INTERACTIVE_DENIED = "non_interactive_denied";
+var TOOL_FAILURE_KIND_BACKGROUND_AGENT_DENIED = "background_agent_denied";
+var TOOL_FAILURE_KIND_TIMEOUT = "timeout";
 
 export {
   SERVICE_NAME,
@@ -119,7 +132,20 @@ export {
   SPAN_TOOL_EXECUTION,
   SPAN_TOOL_BLOCKED_ON_USER,
   SPAN_HOOK,
-  SPAN_SUBAGENT
+  SPAN_SUBAGENT,
+  TOOL_FAILURE_KIND_ATTRIBUTE,
+  TOOL_FAILURE_KIND_CANCELLED,
+  TOOL_FAILURE_KIND_PRE_HOOK_BLOCKED,
+  TOOL_FAILURE_KIND_INVOCATION_GUARD_DENIED,
+  TOOL_FAILURE_KIND_POST_HOOK_STOPPED,
+  TOOL_FAILURE_KIND_TOOL_ERROR,
+  TOOL_FAILURE_KIND_TOOL_EXCEPTION,
+  TOOL_FAILURE_KIND_PERMISSION_DENIED,
+  TOOL_FAILURE_KIND_PERMISSION_HOOK_DENIED,
+  TOOL_FAILURE_KIND_PLAN_MODE_BLOCKED,
+  TOOL_FAILURE_KIND_NON_INTERACTIVE_DENIED,
+  TOOL_FAILURE_KIND_BACKGROUND_AGENT_DENIED,
+  TOOL_FAILURE_KIND_TIMEOUT
 };
 /**
  * @license

package/chunks/{chunk-DOCBJIBL.js → chunk-MB3ILUB7.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   BaseJsonOutputAdapter
-} from "./chunk-M2L4TMH3.js";
+} from "./chunk-6HTEECQY.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-HFVW54NL.js → chunk-MBEMTXQT.js}

@@ -12,6 +12,7 @@ init_esbuild_shims();
 var GOAL_STATE_VERSION = 2;
 var GOAL_PROPOSAL_REASON_MAX_CHARACTERS = 8e3;
 var GOAL_PROPOSAL_REASON_MAX_BYTES = 16e3;
+var GOAL_EVIDENCE_CATALOG_EXHAUSTED_REASON = "The current Goal revision exceeded the bounded evidence catalog. Automatic retries cannot recover. Edit or replace the Goal before resuming it.";
 var PAUSED_GOAL_SYSTEM_REMINDER = "<system-reminder>\nThe Goal is paused. Do not continue its objective unless the user resumes it. Treat this message as ordinary conversation.\n</system-reminder>";
 function goalRequiresExactPermit(snapshot) {
   return snapshot.goal !== null && (snapshot.goal.status === "active" || snapshot.activity === "running");
@@ -94,7 +95,7 @@ function validateGoalEvidenceReferences(input) {
   if (input.proposal.status === "complete" && analysis.catalogTruncated) {
     throw new InvalidGoalEvidenceReferenceError(
       "catalog_truncated",
-      "A complete Goal proposal requires an exhaustive bounded evidence catalog."
+      GOAL_EVIDENCE_CATALOG_EXHAUSTED_REASON
     );
   }
   const evidenceBytes = citedRecords.reduce(
@@ -582,6 +583,12 @@ function reduceGoalControl(current, transition) {
       snapshotOf(current)
     );
   }
+  if (current.status === "usage_limited" && current.lastReason === GOAL_EVIDENCE_CATALOG_EXHAUSTED_REASON) {
+    throw new GoalInvalidTransitionError(
+      "An evidence-limited Goal cannot be resumed; edit or replace the Goal first",
+      snapshotOf(current)
+    );
+  }
   if (request.action !== "resume") {
     return assertNever(request, snapshotOf(current));
   }
@@ -1227,7 +1234,7 @@ function createGoalRuntime(options) {
     } catch (error) {
       if (attempt.controller.signal.aborted) return;
       if (error instanceof InvalidGoalEvidenceReferenceError) {
-        outcome = {
+        outcome = error.code === "catalog_truncated" ? { kind: "usage_limited", reason: error.message } : {
           kind: "decision",
           result: { decision: "reject", reason: error.message }
         };

package/chunks/{chunk-RNKGMZEW.js → chunk-MFTOMYE2.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   isGitRepository
-} from "./chunk-E2SYUEIA.js";
+} from "./chunk-5OAMVWFL.js";
 import {
   createDebugLogger
 } from "./chunk-3RXUYQJI.js";

package/chunks/{chunk-RPYYTL7E.js → chunk-MGSSJT27.js}

@@ -7,7 +7,7 @@ import {
   getMeter,
   isTelemetrySdkInitialized,
   truncateSpanError
-} from "./chunk-O2ZYHG33.js";
+} from "./chunk-5L6CQ4ZU.js";
 import {
   require_src
 } from "./chunk-W4RQUHY3.js";
@@ -16,7 +16,7 @@ import {
   SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH_LIMIT,
   SERVICE_NAME,
   isValidSensitiveSpanAttributeMaxLength
-} from "./chunk-G7XXKQYS.js";
+} from "./chunk-LKRMNRSN.js";
 import {
   FatalConfigError,
   createDebugLogger,

package/chunks/{chunk-URVJ4AZC.js → chunk-MKMUBBEX.js}

@@ -10,7 +10,7 @@ import {
 } from "./chunk-MR3PXB6E.js";
 import {
   ideContextStore
-} from "./chunk-E2SYUEIA.js";
+} from "./chunk-5OAMVWFL.js";
 import {
   require_proper_lockfile
 } from "./chunk-KRXPRVGL.js";

package/chunks/{chunk-RL2NPV5E.js → chunk-N5QPOGRQ.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   parseRule
-} from "./chunk-E2SYUEIA.js";
+} from "./chunk-5OAMVWFL.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-2CCUHZP5.js → chunk-N7PF4KZR.js}

@@ -5,10 +5,10 @@ import {
 } from "./chunk-DP3IHZGG.js";
 import {
   t
-} from "./chunk-FV4TUUDE.js";
+} from "./chunk-O4WOWHMZ.js";
 import {
   getNpmCliPath
-} from "./chunk-RNKGMZEW.js";
+} from "./chunk-MFTOMYE2.js";
 import {
   getPackageJson
 } from "./chunk-VJNBRRZG.js";