@qwen-code/qwen-code 0.19.9 → 0.19.10

package/chunks/{channel-worker-supervisor-WSOAAYUO.js → chunk-URU5UEK6.js}

@@ -2,28 +2,33 @@
 "use strict";
 import {
   CHANNEL_DAEMON_WORKER_SENTINEL,
-  CHANNEL_WEBHOOK_TASK_IPC_TIMEOUT_MS,
   CHANNEL_WORKER_HEARTBEAT_INTERVAL_MS,
-  ChannelWebhookEnqueueError,
   QWEN_DAEMON_TOKEN_ENV,
   QWEN_DAEMON_URL_ENV,
   QWEN_DAEMON_WORKSPACE_ENV,
-  QWEN_SERVER_TOKEN_ENV,
-  createChannelWebhookTaskMessage,
-  isChannelWebhookEnqueueErrorCode,
-  isChannelWebhookTaskResultMessage
-} from "./chunk-X4NKFGFJ.js";
+  QWEN_SERVER_TOKEN_ENV
+} from "./chunk-GYTKQYDB.js";
 import {
   channelSelectionNames
 } from "./chunk-TJTKSVIV.js";
 import {
   redactLogCredentials
 } from "./chunk-M5GB774H.js";
+import {
+  CHANNEL_WORKER_KILL_GRACE_MS,
+  CHANNEL_WORKER_STARTUP_TIMEOUT_MS,
+  CHANNEL_WORKER_STOP_GRACE_MS
+} from "./chunk-5HBA2Z7V.js";
+import {
+  CHANNEL_WEBHOOK_TASK_IPC_TIMEOUT_MS,
+  ChannelWebhookEnqueueError,
+  createChannelWebhookTaskMessage,
+  isChannelWebhookEnqueueErrorCode,
+  isChannelWebhookTaskResultMessage
+} from "./chunk-OJAMDVF5.js";
 import {
   sanitizeLogText
-} from "./chunk-34Z3U5RQ.js";
-import "./chunk-UDXSXLER.js";
-import "./chunk-H6XPXXMH.js";
+} from "./chunk-SXU3KKNI.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -35,9 +40,7 @@ import {
 init_esbuild_shims();
 import { fork } from "node:child_process";
 import { randomUUID } from "node:crypto";
-var DEFAULT_CHANNEL_WORKER_STARTUP_TIMEOUT_MS = 3e4;
 var DEFAULT_CHANNEL_WORKER_HEARTBEAT_TIMEOUT_MS = 45e3;
-var CHANNEL_WORKER_STOP_GRACE_MS = 1e4;
 var MAX_WORKER_LOG_LINE_LENGTH = 4096;
 var MAX_WORKER_LOG_BUFFER_LENGTH = 64 * 1024;
 var MAX_WORKER_LOG_DISCARDED_REMAINDER_LENGTH = MAX_WORKER_LOG_BUFFER_LENGTH;
@@ -47,6 +50,15 @@ var ANSI_CSI_SEQUENCE_RE = new RegExp(
 );
 var WORKER_LOG_INVISIBLE_RE = new RegExp("[\\p{Cf}\\u2028\\u2029]|\\p{Variation_Selector}", "gu");
 var WORKER_LOG_CONTROL_RE = /[\x00-\x08\x0a-\x1f\x7f]/g;
+var ChannelWorkerStopError = class extends Error {
+  static {
+    __name(this, "ChannelWorkerStopError");
+  }
+  constructor(message = "Channel worker did not exit after SIGKILL.") {
+    super(message);
+    this.name = "ChannelWorkerStopError";
+  }
+};
 var DEFAULT_RESTART_POLICY = {
   maxRestarts: 3,
   windowMs: 5 * 6e4,
@@ -118,15 +130,17 @@ __name(notifyLog, "notifyLog");
 function waitForExit(child, timeoutMs) {
   return new Promise((resolve) => {
     let settled = false;
+    const onExit = /* @__PURE__ */ __name(() => done(true), "onExit");
     const done = /* @__PURE__ */ __name((exited) => {
       if (settled) return;
       settled = true;
-      if (timer) clearTimeout(timer);
+      clearTimeout(timer);
+      child.removeListener("exit", onExit);
       resolve(exited);
     }, "done");
     const timer = setTimeout(() => done(false), timeoutMs);
     timer.unref();
-    child.once("exit", () => done(true));
+    child.once("exit", onExit);
   });
 }
 __name(waitForExit, "waitForExit");
@@ -135,7 +149,7 @@ function hasObservedExit(snapshot) {
 }
 __name(hasObservedExit, "hasObservedExit");
 function createWorkerEnv(opts) {
-  const env = { ...process.env };
+  const env = { ...opts.baseEnv ?? process.env };
   env["QWEN_CODE_NO_RELAUNCH"] = "true";
   env[CHANNEL_DAEMON_WORKER_SENTINEL] = randomUUID();
   env[QWEN_DAEMON_URL_ENV] = opts.daemonUrl;
@@ -428,7 +442,8 @@ function createChannelWorkerSupervisor(opts) {
     const env = createWorkerEnv({
       daemonUrl: opts.daemonUrl,
       workspace: opts.workspace,
-      ...opts.daemonToken ? { daemonToken: opts.daemonToken } : {}
+      ...opts.daemonToken ? { daemonToken: opts.daemonToken } : {},
+      ...opts.workerBaseEnv ? { baseEnv: opts.workerBaseEnv } : {}
     });
     const redaction = workerLogRedactionOptions(opts.daemonToken, env);
     const requestedChannels = requestedChannelNames(opts.selection);
@@ -507,18 +522,27 @@ function createChannelWorkerSupervisor(opts) {
         cleanupLaunch();
         if (terminatingBeforeReady) return;
         terminatingBeforeReady = true;
-        const exited = waitForExit(startedChild, 2e3);
+        const exited = waitForExit(startedChild, CHANNEL_WORKER_KILL_GRACE_MS);
         startedChild.kill("SIGTERM");
         void exited.then(async (didExit) => {
           if (!didExit && child === startedChild && !exitObserved) {
-            const killed = waitForExit(startedChild, 2e3);
+            const killed = waitForExit(
+              startedChild,
+              CHANNEL_WORKER_KILL_GRACE_MS
+            );
             startedChild.kill("SIGKILL");
             if (!await killed && child === startedChild && !exitObserved) {
-              child = void 0;
-              if (kind === "restart" && !stopping) {
-                scheduleRestart();
-                notifyExit(opts.onExit, snapshotCopy());
-              }
+              stopping = true;
+              notifyLog(opts.onLog, {
+                stream: "stderr",
+                line: "Channel worker did not exit after SIGKILL; automatic restart is disabled."
+              });
+              snapshot = {
+                ...snapshot,
+                state: "failed",
+                error: snapshot.error ?? "Channel worker did not exit after SIGKILL."
+              };
+              notifyExit(opts.onExit, snapshotCopy());
             }
           }
         });
@@ -628,7 +652,7 @@ function createChannelWorkerSupervisor(opts) {
       }
       __name(settleError, "settleError");
       startupTimer = setTimeout(() => {
-        const timeoutMs = opts.startupTimeoutMs ?? DEFAULT_CHANNEL_WORKER_STARTUP_TIMEOUT_MS;
+        const timeoutMs = opts.startupTimeoutMs ?? CHANNEL_WORKER_STARTUP_TIMEOUT_MS;
         const error = `Channel worker did not become ready within ${timeoutMs}ms.`;
         snapshot = {
           ...snapshot,
@@ -639,7 +663,7 @@ function createChannelWorkerSupervisor(opts) {
         if (child === startedChild) {
           terminateBeforeReady();
         }
-      }, opts.startupTimeoutMs ?? DEFAULT_CHANNEL_WORKER_STARTUP_TIMEOUT_MS);
+      }, opts.startupTimeoutMs ?? CHANNEL_WORKER_STARTUP_TIMEOUT_MS);
       startupTimer.unref();
       startedChild.on("message", handleMessage);
       startedChild.once("exit", settleExit);
@@ -648,7 +672,15 @@ function createChannelWorkerSupervisor(opts) {
   }, "launch");
   const supervisor = {
     async start() {
-      if (disposed || child) return;
+      if (disposed) return;
+      if (child) {
+        if (stopping) {
+          throw new ChannelWorkerStopError(
+            "Channel worker stop is not yet confirmed."
+          );
+        }
+        return;
+      }
       stopping = false;
       clearRestartTimer();
       restartAttemptTimes = [];
@@ -666,22 +698,20 @@ function createChannelWorkerSupervisor(opts) {
         snapshot = { ...snapshot, state: "stopped" };
         return;
       }
-      const exited = waitForExit(child, CHANNEL_WORKER_STOP_GRACE_MS);
+      const stoppingChild = child;
+      const exited = waitForExit(stoppingChild, CHANNEL_WORKER_STOP_GRACE_MS);
       stopping = true;
-      child.kill("SIGTERM");
-      if (!await exited) {
-        const killed = waitForExit(child, 2e3);
-        child.kill("SIGKILL");
+      stoppingChild.kill("SIGTERM");
+      if (!await exited && child === stoppingChild) {
+        const killed = waitForExit(stoppingChild, CHANNEL_WORKER_KILL_GRACE_MS);
+        stoppingChild.kill("SIGKILL");
         if (!await killed) {
-          child = void 0;
-          stopping = false;
           snapshot = {
             ...snapshot,
             state: "failed",
-            signal: "SIGKILL",
             error: "Channel worker did not exit after SIGKILL."
           };
-          return;
+          throw new ChannelWorkerStopError();
         }
       }
       child = void 0;
@@ -784,6 +814,8 @@ function createChannelWorkerSupervisor(opts) {
   return supervisor;
 }
 __name(createChannelWorkerSupervisor, "createChannelWorkerSupervisor");
+
 export {
+  ChannelWorkerStopError,
   createChannelWorkerSupervisor
 };

package/chunks/{chunk-D5SKC4YG.js → chunk-V7EQTZYR.js}

@@ -1,14 +1,15 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
+  InvalidStreamError,
   OpenAIContentConverter,
   TaggedThinkingParser,
   getRateLimitErrorDetails,
   openaiRequestCaptureContext
-} from "./chunk-3VAGG5T5.js";
+} from "./chunk-P6LART6G.js";
 import {
   RequestTokenizer
-} from "./chunk-SJHDYNHF.js";
+} from "./chunk-GDQQRV43.js";
 import {
   DASHSCOPE_PROXY_BASE_URL,
   DEFAULT_DASHSCOPE_BASE_URL,
@@ -22,11 +23,11 @@ import {
   reconcileMaxTokens,
   resolveRequestTimeout,
   tokenLimit
-} from "./chunk-524RQP4Q.js";
+} from "./chunk-B7NUUEXC.js";
 import {
   runtimeDiagnostics,
   safeJsonParse
-} from "./chunk-JSG7ZSBC.js";
+} from "./chunk-TQBODCFD.js";
 import {
   GenerateContentResponse
 } from "./chunk-4LD5APFL.js";
@@ -36,13 +37,13 @@ import {
 import {
   buildRuntimeFetchOptions,
   redactProxyError
-} from "./chunk-4ZVWQHEQ.js";
+} from "./chunk-LQIDP6K5.js";
 import {
   createDebugLogger,
   getErrorStatus,
   getErrorType,
   isAbortError
-} from "./chunk-J4TSQ5EQ.js";
+} from "./chunk-7NFB7LBQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -7788,6 +7789,7 @@ var StreamingToolCallParser = class {
   escapes = /* @__PURE__ */ new Map();
   /** Metadata for each tool call index */
   toolCallMeta = /* @__PURE__ */ new Map();
+  namelessToolCallIndices = /* @__PURE__ */ new Set();
   /** Map from tool call ID to actual index used for storage */
   idToIndexMap = /* @__PURE__ */ new Map();
   /** Counter for generating new indices when collisions occur */
@@ -7809,8 +7811,16 @@ var StreamingToolCallParser = class {
    * @returns ToolCallParseResult with completion status, parsed value, and repair info
    */
   addChunk(index, chunk, id, name) {
+    if (!id && !name && !chunk.trim()) {
+      const depth2 = this.depths.get(index) ?? 0;
+      const inString2 = this.inStrings.get(index) ?? false;
+      if (!this.buffers.has(index) || depth2 === 0 && !inString2) {
+        return { complete: false };
+      }
+    }
     let actualIndex = index;
     const isKnownId = Boolean(id && this.idToIndexMap.has(id));
+    const isNameOnlyDelta = Boolean(name && chunk.length === 0);
     if (id) {
       if (this.idToIndexMap.has(id)) {
         actualIndex = this.idToIndexMap.get(id);
@@ -7835,7 +7845,7 @@ var StreamingToolCallParser = class {
         }
         this.idToIndexMap.set(id, actualIndex);
       }
-    } else {
+    } else if (!isNameOnlyDelta) {
       if (this.buffers.has(index)) {
         const existingBuffer = this.buffers.get(index);
         const existingDepth = this.depths.get(index);
@@ -7860,6 +7870,17 @@ var StreamingToolCallParser = class {
     }
     const currentBuffer = this.buffers.get(actualIndex);
     const currentDepth = this.depths.get(actualIndex);
+    const meta = this.toolCallMeta.get(actualIndex);
+    if (chunk.length === 0 && (id || name)) {
+      if (id) meta.id = id;
+      if (name && !meta.name) meta.name = name;
+      if (!meta.name && meta.id) {
+        this.namelessToolCallIndices.add(actualIndex);
+      } else {
+        this.namelessToolCallIndices.delete(actualIndex);
+      }
+      return { complete: false };
+    }
     if (isKnownId && currentDepth === 0) {
       if (currentBuffer.trim()) {
         try {
@@ -7870,20 +7891,19 @@ var StreamingToolCallParser = class {
           return { complete: false };
         } catch {
         }
-      } else if (this.toolCallMeta.get(actualIndex)?.name && name && !chunk.trim()) {
-        debugLogger3.debug(
-          `Ignoring replayed opener for no-argument toolCall id=${id}`
-        );
-        return { complete: false };
       }
     }
-    const meta = this.toolCallMeta.get(actualIndex);
     if (id) meta.id = id;
     if (name) meta.name = name;
     const currentInString = this.inStrings.get(actualIndex);
     const currentEscape = this.escapes.get(actualIndex);
     const newBuffer = currentBuffer + chunk;
     this.buffers.set(actualIndex, newBuffer);
+    if (!meta.name && (meta.id || /\S/.test(newBuffer))) {
+      this.namelessToolCallIndices.add(actualIndex);
+    } else {
+      this.namelessToolCallIndices.delete(actualIndex);
+    }
     let depth = currentDepth;
     let inString = currentInString;
     let escape2 = currentEscape;
@@ -7933,6 +7953,9 @@ var StreamingToolCallParser = class {
   getToolCallMeta(index) {
     return this.toolCallMeta.get(index) || {};
   }
+  hasNamelessToolCall() {
+    return this.namelessToolCallIndices.size > 0;
+  }
   /**
    * Gets all completed tool calls that are ready to be emitted
    *
@@ -8064,6 +8087,7 @@ var StreamingToolCallParser = class {
     this.inStrings.set(index, false);
     this.escapes.set(index, false);
     this.toolCallMeta.set(index, {});
+    this.namelessToolCallIndices.delete(index);
   }
   /**
    * Resets the entire parser state for processing a new stream
@@ -8078,6 +8102,7 @@ var StreamingToolCallParser = class {
     this.inStrings.clear();
     this.escapes.clear();
     this.toolCallMeta.clear();
+    this.namelessToolCallIndices.clear();
     this.idToIndexMap.clear();
     this.nextAvailableIndex = 0;
   }
@@ -8450,6 +8475,9 @@ var ContentGenerationPipeline = class {
         yield pendingFinishResponse;
       }
     } catch (error) {
+      if (error instanceof InvalidStreamError) {
+        throw error;
+      }
       if (error instanceof StreamContentError) {
         throw redactProxyError(error);
       }

package/chunks/{chunk-L6P4KPHR.js → chunk-VBRRNQB7.js}

@@ -1,14 +1,18 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  handleAtCommand
-} from "./chunk-77XJ3SWN.js";
+  settleChatRecording,
+  subscribeToHeadlessChatRecordingFailures
+} from "./chunk-CJFNEBYB.js";
 import {
   JsonOutputAdapter
-} from "./chunk-XUOOWUZS.js";
+} from "./chunk-F7NXQH4Y.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-B4G2WOFA.js";
+} from "./chunk-LTNI523B.js";
+import {
+  handleAtCommand
+} from "./chunk-X362TMXZ.js";
 import {
   buildInitialSystemReminders,
   buildSystemMessage,
@@ -20,10 +24,10 @@ import {
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-5U27BZ72.js";
+} from "./chunk-YX4LLZ3D.js";
 import {
   RunBudgetEnforcer
-} from "./chunk-5HOMWMCL.js";
+} from "./chunk-CEW4HDPK.js";
 import {
   AlreadyReportedError,
   handleBudgetExceededError,
@@ -31,17 +35,15 @@ import {
   handleError,
   handleMaxTurnsExceededError,
   handleToolError
-} from "./chunk-VA4KQY6V.js";
+} from "./chunk-65N2J6V2.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-34MW4KTI.js";
+} from "./chunk-GGJII3FM.js";
 import {
-  ORPHAN_TOOL_USE_REPAIR_REASON,
-  buildSyntheticToolResponseParts,
+  buildSessionRecoveryPlanFromApiHistory,
   createDuplicateProviderToolCallResponse,
   detectAutonomousSentinel,
   detectLoopSentinel,
-  detectTurnInterruption,
   executeToolCall,
   findRepeatedDuplicateProviderToolCall,
   isSystemReminderContent,
@@ -49,19 +51,19 @@ import {
   parseAndFormatApiError,
   promptIdContext,
   restoreWorktreeContext
-} from "./chunk-NVYTCB5Z.js";
+} from "./chunk-K7CRWKOE.js";
 import {
   isTelemetrySdkInitialized,
   shutdownTelemetry,
   uiTelemetryService
-} from "./chunk-3VAGG5T5.js";
+} from "./chunk-P6LART6G.js";
 import {
   ToolNames
-} from "./chunk-B5ORX3FG.js";
+} from "./chunk-2UUAIFQO.js";
 import {
   FatalInputError,
   createDebugLogger
-} from "./chunk-J4TSQ5EQ.js";
+} from "./chunk-7NFB7LBQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -140,6 +142,7 @@ async function emitNonInteractiveFinalMessage(params) {
   const usage = computeUsageFromMetrics(metrics);
   const outputFormat = config.getOutputFormat();
   const stats = outputFormat === "json" /* JSON */ ? uiTelemetryService.getMetrics() : void 0;
+  await params.beforeEmit();
   adapter.emitResult({
     isError,
     durationMs: Date.now() - params.startTimeMs,
@@ -166,7 +169,17 @@ async function runNonInteractive(config, settings, input, prompt_id, options = {
     } else {
       adapter = new JsonOutputAdapter(config);
     }
-    const emitResult = /* @__PURE__ */ __name((result) => {
+    const ownsAdapter = options.adapter === void 0;
+    const unsubscribeRecordingFailure = ownsAdapter ? subscribeToHeadlessChatRecordingFailures(config, adapter) : void 0;
+    let chatRecordingSettlement;
+    const settleBeforeTerminalOutput = /* @__PURE__ */ __name(() => {
+      chatRecordingSettlement ??= settleChatRecording(config, {
+        finalize: ownsAdapter
+      }).then(() => void 0);
+      return chatRecordingSettlement;
+    }, "settleBeforeTerminalOutput");
+    const emitResult = /* @__PURE__ */ __name(async (result) => {
+      await settleBeforeTerminalOutput();
       adapter.emitResult(result);
       options.onResultEmitted?.();
     }, "emitResult");
@@ -186,6 +199,7 @@ async function runNonInteractive(config, settings, input, prompt_id, options = {
     );
     budgetEnforcer.start();
     const routeAbort = /* @__PURE__ */ __name(async () => {
+      await settleBeforeTerminalOutput();
       const exceeded = budgetEnforcer.getExceeded();
       if (exceeded) {
         await handleBudgetExceededError(config, exceeded);
@@ -306,32 +320,30 @@ ${reason}
       );
       let inlineModelOverride;
       if (options.continueInterrupted) {
-        const detection = detectTurnInterruption(
-          geminiClient.getChat().getHistory()
-        );
-        debugLogger.info("[runNonInteractive] continueInterrupted detection", {
-          kind: detection.kind,
-          partsCount: detection.kind === "interrupted_prompt" ? detection.parts.length : 0,
-          danglingCallCount: detection.kind === "interrupted_turn" ? detection.danglingCalls.length : 0
+        const recoveryPlan = buildSessionRecoveryPlanFromApiHistory({
+          sessionId,
+          apiHistory: geminiClient.getChat().getHistory()
+        });
+        debugLogger.info("[runNonInteractive] continueInterrupted recovery", {
+          kind: recoveryPlan.kind,
+          repairs: recoveryPlan.repairs,
+          hasContinuation: recoveryPlan.continuation !== void 0
         });
-        if (detection.kind === "none") {
+        if (!recoveryPlan.continuation) {
           await emitNonInteractiveFinalMessage({
             message: "No interrupted turn to continue.",
             isError: false,
             adapter,
             config,
-            startTimeMs: startTime
+            startTimeMs: startTime,
+            beforeEmit: settleBeforeTerminalOutput
           });
           return 0;
         }
-        if (detection.kind === "interrupted_prompt") {
-          initialPartList = detection.parts;
+        initialPartList = recoveryPlan.continuation.parts;
+        if (recoveryPlan.continuation.mode === "retry_user_parts") {
           continueSendType = "retry" /* Retry */;
         } else {
-          initialPartList = buildSyntheticToolResponseParts(
-            detection.danglingCalls,
-            ORPHAN_TOOL_USE_REPAIR_REASON
-          );
           continueSendType = "toolResult" /* ToolResult */;
         }
         const reminderParts = buildInitialSystemReminders(config);
@@ -381,7 +393,8 @@ ${reason}
                 isError: slashCommandResult.messageType === "error",
                 adapter,
                 config,
-                startTimeMs: startTime
+                startTimeMs: startTime,
+                beforeEmit: settleBeforeTerminalOutput
               });
               return slashCommandResult.messageType === "error" ? 1 : 0;
             }
@@ -395,7 +408,8 @@ ${reason}
                 isError: true,
                 adapter,
                 config,
-                startTimeMs: startTime
+                startTimeMs: startTime,
+                beforeEmit: settleBeforeTerminalOutput
               });
               return 1;
             }
@@ -553,7 +567,7 @@ ${text}
         const metrics = uiTelemetryService.getMetrics();
         const usage = computeUsageFromMetrics(metrics);
         const stats = outputFormat === "json" /* JSON */ ? uiTelemetryService.getMetrics() : void 0;
-        emitResult({
+        await emitResult({
           isError: false,
           durationMs: Date.now() - startTime,
           apiDurationMs: totalApiDurationMs,
@@ -564,17 +578,18 @@ ${text}
         });
         return 0;
       }, "emitStructuredSuccess");
-      const emitLoopDetectedResult = /* @__PURE__ */ __name(() => {
+      const emitLoopDetectedResult = /* @__PURE__ */ __name(async () => {
         registry.abortAll();
         flushQueuedNotificationsToSdk(localQueue);
         finalizeOneShotMonitors();
         if (outputFormat === "text" /* TEXT */) {
+          await settleBeforeTerminalOutput();
           return 1;
         }
         const metrics = uiTelemetryService.getMetrics();
         const usage = computeUsageFromMetrics(metrics);
         const stats = outputFormat === "json" /* JSON */ ? uiTelemetryService.getMetrics() : void 0;
-        adapter.emitResult({
+        await emitResult({
           isError: true,
           durationMs: Date.now() - startTime,
           apiDurationMs: totalApiDurationMs,
@@ -773,6 +788,7 @@ ${text}
         hasUnsentToolResponse = false;
         turnCount++;
         if (config.getMaxSessionTurns() >= 0 && turnCount > config.getMaxSessionTurns()) {
+          await settleBeforeTerminalOutput();
           await handleMaxTurnsExceededError(config);
         }
         let sendType;
@@ -894,6 +910,7 @@ ${text}
             }
           }
           if (abortController.signal.aborted) {
+            await settleBeforeTerminalOutput();
             await handleCancellationError(config);
           }
           if (teamManager) {
@@ -923,6 +940,7 @@ ${text}
             };
             turnCount++;
             if (config.getMaxSessionTurns() >= 0 && turnCount > config.getMaxSessionTurns()) {
+              await settleBeforeTerminalOutput();
               await handleMaxTurnsExceededError(config);
             }
             let itemMessages = [
@@ -1117,7 +1135,7 @@ ${text}
             const previewSnippet = plainTextPreview.trim();
             const previewSuffix = previewSnippet ? ` Output preview (${plainTextPreview.length}${plainTextPreview.length >= PLAIN_TEXT_PREVIEW_LIMIT ? "+" : ""} chars): ${JSON.stringify(previewSnippet)}.` : "";
             const errorMessage = `Model produced plain text instead of calling the structured_output tool as required by --json-schema after ${turnCount} turn(s).` + previewSuffix;
-            emitResult({
+            await emitResult({
               isError: true,
               durationMs: Date.now() - startTime,
               apiDurationMs: totalApiDurationMs,
@@ -1128,7 +1146,7 @@ ${text}
             });
             return 1;
           }
-          emitResult({
+          await emitResult({
             isError: false,
             durationMs: Date.now() - startTime,
             apiDurationMs: totalApiDurationMs,
@@ -1153,9 +1171,10 @@ ${text}
       const stats = outputFormat === "json" /* JSON */ ? uiTelemetryService.getMetrics() : void 0;
       const isAlreadyReportedError = error instanceof AlreadyReportedError;
       const skipAdapterEmit = outputFormat === "text" /* TEXT */ && isAlreadyReportedError;
+      await settleBeforeTerminalOutput();
       if (!skipAdapterEmit) {
         try {
-          emitResult({
+          await emitResult({
             isError: true,
             durationMs: Date.now() - startTime,
             apiDurationMs: totalApiDurationMs,
@@ -1194,6 +1213,7 @@ ${text}
       if (options.captureMonitorRegistrations !== false) {
         monReg.setRegisterCallback(void 0);
       }
+      unsubscribeRecordingFailure?.();
       process.stdout.removeListener("error", stdoutErrorHandler);
       process.removeListener("SIGINT", shutdownHandler);
       process.removeListener("SIGTERM", shutdownHandler);

package/chunks/{chunk-BMGVRZN4.js → chunk-W34A5MJH.js}

@@ -6,7 +6,7 @@ import {
   getNestedProperty,
   getPersistScopeForModelSelection,
   restoreSettingsFromBackup
-} from "./chunk-4C5BQ2D2.js";
+} from "./chunk-6GETGQWP.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-PODM4SZ4.js → chunk-WDW64OW3.js}

@@ -9,19 +9,19 @@ import {
 import {
   DEFAULT_COMPACTED_REPLAY_MAX_BYTES
 } from "./chunk-COH43MRJ.js";
-import {
-  loadSettings
-} from "./chunk-4C5BQ2D2.js";
 import {
   normalizeServeChannelSelection
 } from "./chunk-TJTKSVIV.js";
+import {
+  loadSettings
+} from "./chunk-6GETGQWP.js";
 import {
   writeStderrLine
 } from "./chunk-YUZI3WAC.js";
 import {
   MCP_BUDGET_WARN_FRACTION,
   parsePositiveIntegerEnv
-} from "./chunk-NVYTCB5Z.js";
+} from "./chunk-K7CRWKOE.js";
 import {
   openBrowserSecurely,
   shouldLaunchBrowser
@@ -297,7 +297,7 @@ var serveCommand = {
         process.exit(1);
       }
     }
-    const { runQwenServe } = await import("./run-qwen-serve-DMWV5N6L.js");
+    const { runQwenServe } = await import("./run-qwen-serve-NWTGPERT.js");
     try {
       const handle = await runQwenServe({
         port: argv.port,