@qwen-code/qwen-code 0.15.0 → 0.15.1

package/cli.js

@@ -145656,7 +145656,6 @@ var init_converter = __esm({
       model;
       schemaCompliance;
       modalities;
-      streamingToolCallParser = new StreamingToolCallParser();
       constructor(model, schemaCompliance = "auto", modalities = {}) {
         this.model = model;
         this.schemaCompliance = schemaCompliance;
@@ -145676,12 +145675,21 @@ var init_converter = __esm({
         this.modalities = modalities;
       }
       /**
-       * Reset streaming tool calls parser for new stream processing
-       * This should be called at the beginning of each stream to prevent
-       * data pollution from previous incomplete streams
+       * Create fresh per-stream state for processing one OpenAI streaming
+       * response. The returned context is passed into every
+       * `convertOpenAIChunkToGemini` call for that stream, then discarded.
+       *
+       * Previously the tool-call parser lived on the Converter instance and
+       * was shared by every caller of the singleton `Config.contentGenerator`.
+       * Concurrent streams (e.g. two subagents running in parallel after
+       * PR #3463) raced on that shared state: each stream's stream-start
+       * `reset()` wiped the other's partial tool-call buffers, chunks from
+       * different streams landed at the same `index=0` bucket, and
+       * `getCompletedToolCalls()` returned interleaved corrupt JSON that
+       * surfaced upstream as `NO_RESPONSE_TEXT` (issue #3516).
        */
-      resetStreamingToolCalls() {
-        this.streamingToolCallParser.reset();
+      createStreamContext() {
+        return { toolCallParser: new StreamingToolCallParser() };
       }
       /**
        * Convert Gemini tool parameters to OpenAI JSON Schema format
@@ -146270,9 +146278,15 @@ var init_converter = __esm({
         return response;
       }
       /**
-       * Convert OpenAI stream chunk to Gemini format
+       * Convert OpenAI stream chunk to Gemini format.
+       *
+       * `ctx` carries the tool-call parser for this stream. Callers MUST
+       * obtain it from `createStreamContext()` at the start of the stream
+       * and pass the same instance for every chunk of that stream. Concurrent
+       * streams MUST use distinct contexts or their tool-call buffers will
+       * interleave (issue #3516).
        */
-      convertOpenAIChunkToGemini(chunk) {
+      convertOpenAIChunkToGemini(chunk, ctx) {
         const choice2 = chunk.choices?.[0];
         const response = new GenerateContentResponse();
         if (choice2) {
@@ -146290,9 +146304,9 @@ var init_converter = __esm({
             for (const toolCall of choice2.delta.tool_calls) {
               const index = toolCall.index ?? 0;
               if (toolCall.function?.arguments) {
-                this.streamingToolCallParser.addChunk(index, toolCall.function.arguments, toolCall.id, toolCall.function.name);
+                ctx.toolCallParser.addChunk(index, toolCall.function.arguments, toolCall.id, toolCall.function.name);
               } else {
-                this.streamingToolCallParser.addChunk(
+                ctx.toolCallParser.addChunk(
                   index,
                   "",
                   // Empty chunk for metadata-only updates
@@ -146304,8 +146318,8 @@ var init_converter = __esm({
           }
           let toolCallsTruncated = false;
           if (choice2.finish_reason) {
-            toolCallsTruncated = this.streamingToolCallParser.hasIncompleteToolCalls();
-            const completedToolCalls = this.streamingToolCallParser.getCompletedToolCalls();
+            toolCallsTruncated = ctx.toolCallParser.hasIncompleteToolCalls();
+            const completedToolCalls = ctx.toolCallParser.getCompletedToolCalls();
             for (const toolCall of completedToolCalls) {
               if (toolCall.name) {
                 parts2.push({
@@ -146317,7 +146331,6 @@ var init_converter = __esm({
                 });
               }
             }
-            this.streamingToolCallParser.reset();
           }
           const effectiveFinishReason = toolCallsTruncated && choice2.finish_reason !== "length" ? "length" : choice2.finish_reason;
           const candidate = {
@@ -156670,7 +156683,7 @@ var init_pipeline = __esm({
        */
       async *processStreamWithLogging(stream5, context2, request4) {
         const collectedGeminiResponses = [];
-        this.converter.resetStreamingToolCalls();
+        const streamCtx = this.converter.createStreamContext();
         let pendingFinishResponse = null;
         let finishYielded = false;
         try {
@@ -156679,7 +156692,7 @@ var init_pipeline = __esm({
               const errorContent = chunk.choices?.[0]?.delta?.content?.trim() || "Unknown stream error";
               throw new StreamContentError(errorContent);
             }
-            const response = this.converter.convertOpenAIChunkToGemini(chunk);
+            const response = this.converter.convertOpenAIChunkToGemini(chunk, streamCtx);
             if (response.candidates?.[0]?.content?.parts?.length === 0 && !response.candidates?.[0]?.finishReason && !response.usageMetadata) {
               continue;
             }
@@ -156710,7 +156723,6 @@ var init_pipeline = __esm({
           }
           context2.duration = Date.now() - context2.startTime;
         } catch (error40) {
-          this.converter.resetStreamingToolCalls();
           if (error40 instanceof StreamContentError) {
             throw error40;
           }
@@ -171534,7 +171546,7 @@ __export(geminiContentGenerator_exports, {
   createGeminiContentGenerator: () => createGeminiContentGenerator
 });
 function createGeminiContentGenerator(config2, gcConfig) {
-  const version2 = "0.15.0";
+  const version2 = "0.15.1";
   const userAgent2 = config2.userAgent || `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -458987,7 +458999,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.15.0";
+  return "0.15.1";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -468031,7 +468043,7 @@ var formatTokenCount = /* @__PURE__ */ __name((count) => {
   }
   return `${Math.floor(count / 1e3)}k`;
 }, "formatTokenCount");
-var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
+var formatDuration = /* @__PURE__ */ __name((milliseconds, options2) => {
   if (milliseconds <= 0) {
     return "0s";
   }
@@ -468040,7 +468052,11 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
   }
   const totalSeconds = milliseconds / 1e3;
   if (totalSeconds < 60) {
-    return `${totalSeconds.toFixed(1)}s`;
+    const formatted = totalSeconds.toFixed(1);
+    if (options2?.hideTrailingZeros && formatted.endsWith(".0")) {
+      return `${formatted.slice(0, -2)}s`;
+    }
+    return `${formatted}s`;
   }
   const hours = Math.floor(totalSeconds / 3600);
   const minutes = Math.floor(totalSeconds % 3600 / 60);
@@ -468065,7 +468081,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "f2fac208f";
+var GIT_COMMIT_INFO = "9010c0912";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -497790,16 +497806,12 @@ var AnsiOutputText = /* @__PURE__ */ __name(({
 var ShellStatsBar = /* @__PURE__ */ __name(({
   totalLines,
   totalBytes,
-  timeoutMs,
   displayHeight = DEFAULT_HEIGHT
 }) => {
   const parts2 = [];
   if (totalLines && totalLines > displayHeight) {
     parts2.push(`+${totalLines - displayHeight} lines`);
   }
-  if (timeoutMs) {
-    parts2.push(`timeout ${formatDuration(timeoutMs)}`);
-  }
   if (totalBytes && totalBytes > 0) {
     parts2.push(formatMemoryUsage2(totalBytes));
   }
@@ -505280,21 +505292,10 @@ init_esbuild_shims();
 var import_react64 = __toESM(require_react(), 1);
 init_types22();
 var import_jsx_runtime35 = __toESM(require_jsx_runtime(), 1);
-function formatElapsed(seconds) {
-  if (seconds < 60) return `${seconds}s`;
-  const minutes = Math.floor(seconds / 60);
-  const remainingSeconds = seconds % 60;
-  if (minutes < 60) {
-    return remainingSeconds > 0 ? `${minutes}m ${remainingSeconds}s` : `${minutes}m`;
-  }
-  const hours = Math.floor(minutes / 60);
-  const remainingMinutes = minutes % 60;
-  return remainingMinutes > 0 ? `${hours}h ${remainingMinutes}m` : `${hours}h`;
-}
-__name(formatElapsed, "formatElapsed");
 var ToolElapsedTime = /* @__PURE__ */ __name(({
   status,
-  executionStartTime
+  executionStartTime,
+  timeoutMs
 }) => {
   const [elapsedSeconds, setElapsedSeconds] = (0, import_react64.useState)(0);
   (0, import_react64.useEffect)(() => {
@@ -505308,8 +505309,14 @@ var ToolElapsedTime = /* @__PURE__ */ __name(({
     }, 1e3);
     return () => clearInterval(interval);
   }, [status, executionStartTime]);
-  if (status !== "Executing" /* Executing */ || elapsedSeconds < 3) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { flexShrink: 0, marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text3, { color: theme.text.secondary, children: formatElapsed(elapsedSeconds) }) });
+  if (status !== "Executing" /* Executing */) return null;
+  const hasTimeout = timeoutMs != null && timeoutMs > 0;
+  if (!hasTimeout && elapsedSeconds < 3) return null;
+  const elapsedStr = formatDuration(elapsedSeconds * 1e3, {
+    hideTrailingZeros: true
+  });
+  const label = hasTimeout ? `(${elapsedStr} \xB7 timeout ${formatDuration(timeoutMs, { hideTrailingZeros: true })})` : elapsedStr;
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { flexShrink: 0, marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text3, { color: theme.text.secondary, children: label }) });
 }, "ToolElapsedTime");
 
 // packages/cli/src/ui/components/messages/ToolMessage.tsx
@@ -505363,8 +505370,7 @@ var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_
       data: display.ansiOutput,
       stats: {
         totalLines: display.totalLines,
-        totalBytes: display.totalBytes,
-        timeoutMs: display.timeoutMs
+        totalBytes: display.totalBytes
       }
     };
   }
@@ -505458,6 +505464,12 @@ var ToolMessage = /* @__PURE__ */ __name(({
       setLastUpdateTime(/* @__PURE__ */ new Date());
     }
   }, [resultDisplay]);
+  const shellTimeoutMs = import_react65.default.useMemo(() => {
+    if (typeof resultDisplay === "object" && resultDisplay !== null && "ansiOutput" in resultDisplay) {
+      return resultDisplay.timeoutMs;
+    }
+    return void 0;
+  }, [resultDisplay]);
   import_react65.default.useEffect(() => {
     if (!lastUpdateTime) {
       return;
@@ -505509,7 +505521,8 @@ var ToolMessage = /* @__PURE__ */ __name(({
         ToolElapsedTime,
         {
           status,
-          executionStartTime
+          executionStartTime,
+          timeoutMs: shellTimeoutMs
         }
       ),
       emphasis === "high" && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(TrailingIndicator, {})
@@ -505641,6 +505654,14 @@ function getActiveTool(toolCalls) {
   return toolCalls.find((t5) => t5.status === "Confirming" /* Confirming */) ?? toolCalls.find((t5) => t5.status === "Executing" /* Executing */) ?? toolCalls[toolCalls.length - 1];
 }
 __name(getActiveTool, "getActiveTool");
+function getShellTimeoutMs(tool) {
+  const display = tool.resultDisplay;
+  if (typeof display === "object" && display !== null && "ansiOutput" in display) {
+    return display.timeoutMs;
+  }
+  return void 0;
+}
+__name(getShellTimeoutMs, "getShellTimeoutMs");
 var CompactToolGroupDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth }) => {
   if (toolCalls.length === 0) return null;
   const overallStatus = getOverallStatus(toolCalls);
@@ -505680,7 +505701,8 @@ var CompactToolGroupDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth
             ToolElapsedTime,
             {
               status: overallStatus,
-              executionStartTime: activeTool.executionStartTime
+              executionStartTime: activeTool.executionStartTime,
+              timeoutMs: getShellTimeoutMs(activeTool)
             }
           )
         ] }),
@@ -524187,9 +524209,11 @@ function useResumeCommand(options2) {
     setResumeMatchedSessions(void 0);
   }, []);
   const { config: config2, historyManager, startNewSession, setSessionName, remount } = options2 ?? {};
+  const hasHistoryManager = !!historyManager;
+  const { clearItems, loadHistory } = historyManager || {};
   const handleResume = (0, import_react146.useCallback)(
     async (sessionId) => {
-      if (!config2 || !historyManager || !startNewSession) {
+      if (!config2 || !hasHistoryManager || !startNewSession) {
         return;
       }
       closeResumeDialog();
@@ -524203,8 +524227,8 @@ function useResumeCommand(options2) {
       const customTitle = sessionService.getSessionTitle(sessionId);
       setSessionName?.(customTitle ?? null);
       const uiHistoryItems = buildResumedHistoryItems(sessionData, config2);
-      historyManager.clearItems();
-      historyManager.loadHistory(uiHistoryItems);
+      clearItems?.();
+      loadHistory?.(uiHistoryItems);
       config2.startNewSession(sessionId, sessionData);
       await config2.getGeminiClient()?.initialize?.();
       try {
@@ -524221,7 +524245,9 @@ function useResumeCommand(options2) {
     [
       closeResumeDialog,
       config2,
-      historyManager,
+      hasHistoryManager,
+      clearItems,
+      loadHistory,
       startNewSession,
       setSessionName,
       remount
@@ -538367,7 +538393,7 @@ var QwenAgent = class {
   async initialize(args2) {
     this.clientCapabilities = args2.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version2 = "0.15.0";
+    const version2 = "0.15.1";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Qwen Code - AI-powered coding assistant",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "bundled"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.15.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.15.1"
   },
   "dependencies": {},
   "optionalDependencies": {