@qwen-code/qwen-code 0.18.4 → 0.18.5-preview.0

package/chunks/{chunk-LXUQBWQA.js → chunk-T336V435.js}

@@ -2,37 +2,38 @@
 "use strict";
 import {
   RequestTokenizer
-} from "./chunk-IUEQOXOI.js";
+} from "./chunk-KBXLIVWQ.js";
 import {
   OpenAIContentConverter,
   TaggedThinkingParser,
   openaiRequestCaptureContext
-} from "./chunk-6Z2MVJIJ.js";
+} from "./chunk-UMRZ7XCR.js";
 import {
   createChildAbortController
 } from "./chunk-64WXLC72.js";
-import {
-  buildRuntimeFetchOptions,
-  redactProxyError
-} from "./chunk-HU3RKEK2.js";
 import {
   CAPPED_DEFAULT_MAX_TOKENS,
   DASHSCOPE_PROXY_BASE_URL,
   DEFAULT_DASHSCOPE_BASE_URL,
   DEFAULT_MAX_RETRIES,
   DEFAULT_TIMEOUT,
+  buildRuntimeFetchOptions,
   hasExplicitOutputLimit,
-  runtimeDiagnostics,
-  safeJsonParse,
+  parsePositiveIntegerEnvValue,
+  redactProxyError,
   tokenLimit
-} from "./chunk-PTGKSUUJ.js";
+} from "./chunk-F6XNTYNE.js";
+import {
+  runtimeDiagnostics,
+  safeJsonParse
+} from "./chunk-CGEGHF2C.js";
 import {
   GenerateContentResponse
 } from "./chunk-55ZMG67I.js";
 import {
   createDebugLogger,
   isAbortError
-} from "./chunk-IKOWINH4.js";
+} from "./chunk-C4K3FEQ2.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -7025,9 +7026,10 @@ var DefaultOpenAICompatibleProvider = class {
         effectiveMaxTokens = userMaxTokens;
       }
     } else {
-      const envVal = process.env["QWEN_CODE_MAX_OUTPUT_TOKENS"];
-      const envMaxTokens = envVal ? parseInt(envVal, 10) : NaN;
-      if (!isNaN(envMaxTokens) && envMaxTokens > 0) {
+      const envMaxTokens = parsePositiveIntegerEnvValue(
+        process.env["QWEN_CODE_MAX_OUTPUT_TOKENS"]
+      );
+      if (envMaxTokens !== void 0) {
         effectiveMaxTokens = isKnownModel ? Math.min(envMaxTokens, modelLimit) : envMaxTokens;
       } else {
         effectiveMaxTokens = Math.min(modelLimit, CAPPED_DEFAULT_MAX_TOKENS);
@@ -7049,7 +7051,14 @@ var ModelScopeOpenAICompatibleProvider = class extends DefaultOpenAICompatiblePr
    * Checks if the configuration is for ModelScope.
    */
   static isModelScopeProvider(config) {
-    return !!config.baseUrl?.includes("modelscope");
+    const baseUrl = config.baseUrl ?? "";
+    if (!baseUrl) return false;
+    try {
+      const hostname = new URL(baseUrl).hostname.toLowerCase();
+      return hostname === "modelscope.cn" || hostname.endsWith(".modelscope.cn");
+    } catch {
+      return false;
+    }
   }
   /**
    * ModelScope does not support `stream_options` when `stream` is false.
@@ -7165,7 +7174,10 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
   buildRequest(request, userPromptId) {
     let messages = request.messages;
     let tools = request.tools;
-    if (this.shouldEnableCacheControl()) {
+    const flattenPlainTextForGlm = this.isGlmModel(request.model) && !this.hasFunctionCallingContext(request);
+    if (flattenPlainTextForGlm) {
+      messages = this.flattenTextContent(messages);
+    } else if (this.shouldEnableCacheControl()) {
       const { messages: updatedMessages, tools: updatedTools } = this.addDashScopeCacheControl(
         request,
         request.stream ? "all" : "system_only"
@@ -7183,6 +7195,12 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
         ...this.buildMetadata(userPromptId) || {},
         /* @ts-expect-error dashscope exclusive */
         vl_high_resolution_images: true,
+        // Default-on for supported reasoning models; user extra_body wins.
+        // Several vision models (e.g. qwen3.6-plus, qwen3.7-plus) are reasoning
+        // models that need this flag for multi-turn reasoning continuity.
+        // (No @ts-expect-error needed: TS flags only the first excess property
+        // in this cast, already suppressed on vl_high_resolution_images above.)
+        preserve_thinking: true,
         ...extraBody ? extraBody : {}
       };
     }
@@ -7192,6 +7210,9 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
       messages,
       ...tools ? { tools } : {},
       ...this.buildMetadata(userPromptId) || {},
+      // Default-on for supported reasoning models; user extra_body wins.
+      /* @ts-expect-error dashscope exclusive */
+      preserve_thinking: true,
       ...extraBody ? extraBody : {}
     };
   }
@@ -7280,6 +7301,63 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
     };
     return contentArray;
   }
+  /**
+   * True for glm-* models (e.g. glm-4.5, glm-5.2). Uses the same `^glm-` prefix
+   * convention as the GLM matchers in tokenLimits.ts, keeping model detection
+   * consistent across the codebase.
+   */
+  isGlmModel(model) {
+    return !!model && model.toLowerCase().startsWith("glm-");
+  }
+  /**
+   * Whether the request is in "function-calling mode" — it declares `tools`, or
+   * its history already contains a tool result / assistant tool_call. glm needs
+   * one of these present to parse structured content-part arrays.
+   */
+  hasFunctionCallingContext(request) {
+    if (request.tools && request.tools.length > 0) {
+      return true;
+    }
+    return request.messages.some((message) => {
+      if (message.role === "tool") {
+        return true;
+      }
+      if (message.role === "assistant") {
+        const toolCalls = message.tool_calls;
+        return Array.isArray(toolCalls) && toolCalls.length > 0;
+      }
+      return false;
+    });
+  }
+  /**
+   * Collapse text-only content arrays back to a plain string, leaving
+   * media-bearing parts (image/audio/...) as arrays. Used for glm tool-less
+   * requests, where the array form would otherwise be dropped server-side.
+   * Multiple text parts are joined with a blank line, matching the DeepSeek
+   * provider's flattening (separate parts read as separate blocks).
+   * Only called on the flatten branch, which skips cache control, so no part
+   * here carries a `cache_control` marker.
+   */
+  flattenTextContent(messages) {
+    return messages.map((message) => {
+      if (!("content" in message) || !Array.isArray(message.content)) {
+        return message;
+      }
+      const parts = message.content;
+      if (parts.length === 0) {
+        return message;
+      }
+      const isTextOnly = parts.every((part) => part && part.type === "text");
+      if (!isTextOnly) {
+        return message;
+      }
+      const text = parts.map((part) => part.text ?? "").join("\n\n");
+      return {
+        ...message,
+        content: text
+      };
+    });
+  }
   /**
    * Vision-capable model patterns.
    * Supports exact matches and prefix patterns for easy extension.
@@ -7459,29 +7537,6 @@ function translateReasoningEffort(request) {
 }
 __name(translateReasoningEffort, "translateReasoningEffort");
 
-// packages/core/src/core/openaiContentGenerator/provider/openrouter.ts
-init_esbuild_shims();
-var OpenRouterOpenAICompatibleProvider = class extends DefaultOpenAICompatibleProvider {
-  static {
-    __name(this, "OpenRouterOpenAICompatibleProvider");
-  }
-  constructor(contentGeneratorConfig, cliConfig) {
-    super(contentGeneratorConfig, cliConfig);
-  }
-  static isOpenRouterProvider(contentGeneratorConfig) {
-    const baseURL = contentGeneratorConfig.baseUrl || "";
-    return baseURL.includes("openrouter.ai");
-  }
-  buildHeaders() {
-    const baseHeaders = super.buildHeaders();
-    return {
-      ...baseHeaders,
-      "HTTP-Referer": "https://github.com/QwenLM/qwen-code.git",
-      "X-OpenRouter-Title": "Qwen Code"
-    };
-  }
-};
-
 // packages/core/src/core/openaiContentGenerator/provider/minimax.ts
 init_esbuild_shims();
 var MINIMAX_KNOWN_HOSTS = ["api.minimaxi.com", "api.minimax.io"];
@@ -8474,12 +8529,6 @@ function determineProvider(contentGeneratorConfig, cliConfig) {
   if (MiMoOpenAICompatibleProvider.isMiMoProvider(config)) {
     return new MiMoOpenAICompatibleProvider(contentGeneratorConfig, cliConfig);
   }
-  if (OpenRouterOpenAICompatibleProvider.isOpenRouterProvider(config)) {
-    return new OpenRouterOpenAICompatibleProvider(
-      contentGeneratorConfig,
-      cliConfig
-    );
-  }
   if (ModelScopeOpenAICompatibleProvider.isModelScopeProvider(config)) {
     return new ModelScopeOpenAICompatibleProvider(
       contentGeneratorConfig,
@@ -8505,7 +8554,6 @@ __name(determineProvider, "determineProvider");
 export {
   DashScopeOpenAICompatibleProvider,
   DeepSeekOpenAICompatibleProvider,
-  OpenRouterOpenAICompatibleProvider,
   MiniMaxOpenAICompatibleProvider,
   MistralOpenAICompatibleProvider,
   MiMoOpenAICompatibleProvider,

package/chunks/{chunk-4TW2JM5Q.js → chunk-TXVGVZYR.js}

@@ -3,17 +3,17 @@
 import {
   getInboxesDir,
   require_proper_lockfile
-} from "./chunk-M5VYHAHT.js";
+} from "./chunk-2BIF2NVV.js";
 import {
   Mutex
 } from "./chunk-OMX7CUOE.js";
 import {
   atomicWriteJSON
-} from "./chunk-N5QHMPZU.js";
+} from "./chunk-3UALQ56H.js";
 import {
   createDebugLogger,
   isNodeError
-} from "./chunk-IKOWINH4.js";
+} from "./chunk-C4K3FEQ2.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";