@qwen-code/qwen-code 0.23.1-preview.2 → 0.23.1

package/chunks/{chunk-ZT3XUGSU.js → chunk-2TMJRF46.js}

@@ -75,7 +75,7 @@ import {
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt,
   sessionCloseDrainBudgetMs
-} from "./chunk-Z6KFLEG7.js";
+} from "./chunk-PSPAM24S.js";
 import {
   BranchWhilePromptActiveError,
   BridgeChannelQuarantinedError,
@@ -94,12 +94,13 @@ import {
   SessionBusyError,
   SessionLimitExceededError,
   SessionNotFoundError,
+  SessionResetPendingError,
   SessionShellClientRequiredError,
   SessionShellDisabledError,
   StandaloneSessionSpawnError,
   WorkspaceMismatchError,
   isNotCurrentlyGeneratingCancelError
-} from "./chunk-F47DITLZ.js";
+} from "./chunk-FAWTMDX7.js";
 import {
   canonicalizeWorkspace,
   translateAndCheckAbsoluteWorkspacePath
@@ -147,7 +148,7 @@ import {
   canonicalSessionPrUrl,
   normalizeTurnResultError,
   toSessionPrInfo
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   isUnverifiableIdentityError,
   openNoFollow
@@ -4245,7 +4246,7 @@ var BridgeClient = class {
           v: ACTIVE_WORK_HEARTBEAT_VERSION,
           seq: snapshot.seq,
           sessions: snapshot.sessions.filter(
-            (session) => this.ownsSession(session.sessionId)
+            (session) => this.ownsSession(session.sessionId) || this.hasSessionSpawnInFlight()
           )
         });
       }
@@ -7843,6 +7844,10 @@ function getChannelPromptDisplayText(entry, displayText) {
   return entry.sourceType === "channel" && typeof displayText === "string" ? displayText : void 0;
 }
 __name(getChannelPromptDisplayText, "getChannelPromptDisplayText");
+function hasInFlightPromptActivity(entry) {
+  return entry.promptActive || entry.goalTurnActive === true || (entry.deferredRestoreAskUserQuestionPrompts?.size ?? 0) > 0;
+}
+__name(hasInFlightPromptActivity, "hasInFlightPromptActivity");
 function isDefinitiveAcpRequestError(error) {
   if (error instanceof RequestError) return true;
   if (!isRecord3(error)) return false;
@@ -9164,6 +9169,20 @@ function createAcpSessionBridge(opts) {
     return entryHasLocalWork(entry) || childReportsHeldWork(entry) || childWorkIsUnknown(entry);
   }
   __name(entryHasActiveWork, "entryHasActiveWork");
+  function entryActiveWorkState(entry) {
+    if (entryHasLocalWork(entry) || childReportsHeldWork(entry)) {
+      return "active";
+    }
+    const capability = channelInfoForEntry(entry)?.activeWork;
+    if (!capability) return "unsupported";
+    if (childWorkIsUnknown(entry) || ACTIVE_WORK_HOLD_CATEGORIES.some(
+      (category) => !capability.categories.includes(category)
+    )) {
+      return "unknown";
+    }
+    return "idle";
+  }
+  __name(entryActiveWorkState, "entryActiveWorkState");
   function entryIsAutoCloseCandidate(entry) {
     if (byId.get(entry.sessionId) !== entry) return false;
     if (isClosingOrAuthorizingClose(entry)) return false;
@@ -9345,6 +9364,7 @@ function createAcpSessionBridge(opts) {
       for (const hold of session.holds) holds.set(hold.id, hold.category);
       reported.set(session.sessionId, holds);
     }
+    info.activeWork.snapshot = { receivedAt: now, sessions: reported };
     for (const sessionId of Array.from(info.sessionIds)) {
       const entry = byId.get(sessionId);
       if (!entry || entry.channel !== info.channel) continue;
@@ -9750,7 +9770,8 @@ function createAcpSessionBridge(opts) {
       ...entry.sourceType ? { sourceType: entry.sourceType } : {},
       ...entry.sourceId !== void 0 ? { sourceId: entry.sourceId } : {},
       clientCount: entry.clientIds.size,
-      hasActivePrompt: entry.promptActive || entry.goalTurnActive === true,
+      hasActivePrompt: hasInFlightPromptActivity(entry),
+      activeWorkState: entryActiveWorkState(entry),
       isWaitingForPermission,
       isWaitingForUserQuestion,
       pendingInteractionCount: entry.pendingInteractions.size,
@@ -9799,6 +9820,13 @@ function createAcpSessionBridge(opts) {
   const inFlightSessionIdReservations = /* @__PURE__ */ new Map();
   const abandonedSessionIdReservations = /* @__PURE__ */ new Set();
   const inFlightRestores = /* @__PURE__ */ new Map();
+  const resetPendingSessions = /* @__PURE__ */ new Set();
+  function assertSessionResetNotPending(sessionId) {
+    if (resetPendingSessions.has(sessionId)) {
+      throw new SessionResetPendingError(sessionId);
+    }
+  }
+  __name(assertSessionResetNotPending, "assertSessionResetNotPending");
   async function settleReleasedRuntimeWork(context, armIdleTimer = true) {
     for (const ci2 of Array.from(aliveChannels)) {
       await reapPendingEmptyChannel(ci2);
@@ -11595,6 +11623,8 @@ function createAcpSessionBridge(opts) {
     }
   }, "reconcileAfterRoundtrip");
   const createSessionEntry = /* @__PURE__ */ __name((ci, sessionId, workspaceCwd, events = createSessionEventBus(sessionId), options = {}) => {
+    const childSnapshot = ci.activeWork?.snapshot;
+    const reportedChildHolds = childSnapshot?.sessions.get(sessionId);
     const entry = {
       sessionId,
       workspaceCwd,
@@ -11650,8 +11680,8 @@ function createAcpSessionBridge(opts) {
       attachRefs: /* @__PURE__ */ new Map(),
       spawnOwnerWantedKill: false,
       promptActive: false,
-      childHolds: null,
-      childHoldsAt: null,
+      childHolds: reportedChildHolds ?? null,
+      childHoldsAt: childSnapshot && reportedChildHolds !== void 0 ? childSnapshot.receivedAt : null,
       activeWorkCloseInFlight: false,
       activeWorkCloseFailures: 0,
       activeWorkCloseRetryAt: null,
@@ -12326,7 +12356,11 @@ function createAcpSessionBridge(opts) {
         attached: true,
         clientId,
         createdAt: entry.createdAt,
-        hasActivePrompt: entry.promptActive || entry.goalTurnActive === true,
+        // Unlike the owner-side restore responses, the waiter has no
+        // `restorePromptAdmitted` term; a prompt the owner parked while the
+        // restore was in flight must still read as active here so the
+        // waiter's caller never relocates or resets under a deferred prompt.
+        hasActivePrompt: hasInFlightPromptActivity(entry),
         ...entry.sourceType ? { sourceType: entry.sourceType } : {},
         ...entry.sourceId !== void 0 ? { sourceId: entry.sourceId } : {},
         ...sourcePersisted !== void 0 ? { sourcePersisted } : {},
@@ -13281,7 +13315,7 @@ function createAcpSessionBridge(opts) {
             attachCount: entry.attachCount,
             pendingPromptCount: entry.pendingPromptCount,
             pendingPermissionCount: entry.pendingPermissionIds.size,
-            hasActivePrompt: entry.promptActive || entry.goalTurnActive === true,
+            hasActivePrompt: hasInFlightPromptActivity(entry),
             lastEventId: entry.events.lastEventId,
             ...entry.sessionLastSeenAt !== void 0 ? { lastSeenAt: entry.sessionLastSeenAt } : {},
             ...entry.currentModelId ? { currentModelId: entry.currentModelId } : {},
@@ -13694,6 +13728,9 @@ function createAcpSessionBridge(opts) {
           )
         );
       }
+      if (resetPendingSessions.has(sessionId)) {
+        throw new SessionResetPendingError(sessionId);
+      }
       if (isReservedStandaloneSessionSourceType(entry.sourceType) && entry.managedConversationBinding?.released !== true) {
         return Promise.reject(standaloneWorkingDirectoryMissingError());
       }
@@ -14354,6 +14391,7 @@ function createAcpSessionBridge(opts) {
       if (context?.clientId !== void 0) {
         resolveTrustedClientId(entry, context.clientId);
       }
+      assertSessionResetNotPending(sessionId);
       const concurrentSideTask = isSideTask && entry.promptActive;
       if (!isSideTask && (entry.pendingPromptCount > 0 || entry.promptActive)) {
         throw new BranchWhilePromptActiveError(sessionId);
@@ -14591,6 +14629,7 @@ function createAcpSessionBridge(opts) {
         entry,
         context?.clientId
       );
+      assertSessionResetNotPending(sessionId);
       const cdPromise = entry.promptQueue.then(async () => {
         const ci = assertLivePromptEntry(sessionId, entry);
         runtimeOperationReservations++;
@@ -14773,6 +14812,39 @@ function createAcpSessionBridge(opts) {
         markSessionCatalogChanged();
       }
     },
+    clearSessionWorktree(sessionId) {
+      const entry = byId.get(sessionId);
+      if (entry?.worktree !== void 0) {
+        delete entry.worktree;
+        markSessionCatalogChanged();
+      }
+    },
+    setSessionResetPending(sessionId) {
+      resetPendingSessions.add(sessionId);
+      return byId.has(sessionId);
+    },
+    clearSessionResetPending(sessionId) {
+      resetPendingSessions.delete(sessionId);
+    },
+    async severSessionClients(sessionId) {
+      const entry = byId.get(sessionId);
+      if (!entry) return true;
+      const registrations = /* @__PURE__ */ __name(() => {
+        let total = 0;
+        for (const count of entry.clientIds.values()) total += count;
+        return total;
+      }, "registrations");
+      let outstanding = registrations();
+      while (outstanding > 0 && byId.get(sessionId) === entry) {
+        for (const clientId of [...entry.clientIds.keys()]) {
+          await bridgeApi.detachClient(sessionId, clientId);
+        }
+        const remaining = registrations();
+        if (remaining >= outstanding) break;
+        outstanding = remaining;
+      }
+      return !byId.has(sessionId);
+    },
     fireDeferredRestoreAskUserQuestionPrompt(sessionId, clientId) {
       if (clientId === void 0) return false;
       const entry = byId.get(sessionId);
@@ -15354,6 +15426,7 @@ function createAcpSessionBridge(opts) {
       const entry = byId.get(sessionId);
       if (!entry) throw new SessionNotFoundError(sessionId);
       resolveTrustedClientId(entry, context?.clientId);
+      assertSessionResetNotPending(sessionId);
       return requestSessionStatus(sessionId, SERVE_CONTROL_EXT_METHODS.sessionWorkflowTaskAction, {
         taskId,
         action
@@ -15365,6 +15438,7 @@ function createAcpSessionBridge(opts) {
       const info = channelInfoForEntry(entry);
       if (!info || info.isDying) throw new SessionNotFoundError(sessionId);
       resolveTrustedClientId(entry, context?.clientId);
+      assertSessionResetNotPending(sessionId);
       return requestSessionStatus(
         sessionId,
         SERVE_CONTROL_EXT_METHODS.sessionGoalControl,
@@ -16250,6 +16324,7 @@ function createAcpSessionBridge(opts) {
       if (!trimmed) {
         throw new Error("Fork directive is required");
       }
+      assertSessionResetNotPending(sessionId);
       if (entry.pendingPromptCount > 0 || entry.promptActive) {
         throw new SessionBusyError(
           sessionId,
@@ -16319,6 +16394,7 @@ function createAcpSessionBridge(opts) {
         entry,
         context.clientId
       );
+      assertSessionResetNotPending(sessionId);
       if (signal?.aborted) {
         return { exitCode: null, output: "", aborted: true };
       }
@@ -16461,6 +16537,7 @@ function createAcpSessionBridge(opts) {
         entry,
         context?.clientId
       );
+      assertSessionResetNotPending(sessionId);
       if (entry.pendingPromptCount > 0 || entry.promptActive) {
         throw new SessionBusyError(
           sessionId,

package/chunks/{chunk-HWZOOSEB.js → chunk-2YS3NU4A.js}

@@ -2,15 +2,15 @@
 "use strict";
 import {
   appEvents
-} from "./chunk-P5Z7VD23.js";
+} from "./chunk-DXQ6Z7AH.js";
 import {
   assembleMcpServers,
   getPendingGatedMcpServers,
   getPromptableMcpServers
-} from "./chunk-C55CR5I4.js";
+} from "./chunk-TGC4264Q.js";
 import {
   getMCPServerStatus
-} from "./chunk-WQBR7LN5.js";
+} from "./chunk-6QV7Z74P.js";
 import {
   require_fast_deep_equal
 } from "./chunk-MWIO7MF6.js";

package/chunks/chunk-2Z3T52OC.js

@@ -0,0 +1,82 @@
+// Force strict mode and setup for ESM
+"use strict";
+import {
+  init_esbuild_shims
+} from "./chunk-5O2XNYP6.js";
+import {
+  __name
+} from "./chunk-J2S4EL5Y.js";
+
+// packages/cli/src/serve/conversations/conversation-runtime-errors.ts
+init_esbuild_shims();
+var DEFAULT_MESSAGES = {
+  conversation_runtime_in_use: "The Conversations runtime is owned by another daemon.",
+  conversation_runtime_unavailable: "The Conversations runtime is temporarily unavailable.",
+  conversation_root_compromised: "The Conversations root could not be verified.",
+  conversation_runtime_ownership_compromised: "The Conversations runtime ownership state could not be verified."
+};
+var ConversationRuntimeOwnershipError = class extends Error {
+  constructor(code, retryable, options) {
+    super(DEFAULT_MESSAGES[code], options);
+    this.code = code;
+    this.retryable = retryable;
+    this.name = "ConversationRuntimeOwnershipError";
+  }
+  static {
+    __name(this, "ConversationRuntimeOwnershipError");
+  }
+  status = 503;
+};
+function conversationRuntimeInUseError() {
+  return new ConversationRuntimeOwnershipError(
+    "conversation_runtime_in_use",
+    true
+  );
+}
+__name(conversationRuntimeInUseError, "conversationRuntimeInUseError");
+function conversationRuntimeUnavailableError(cause) {
+  return new ConversationRuntimeOwnershipError(
+    "conversation_runtime_unavailable",
+    true,
+    { cause }
+  );
+}
+__name(conversationRuntimeUnavailableError, "conversationRuntimeUnavailableError");
+function conversationRuntimeOwnershipCompromisedError(cause) {
+  return new ConversationRuntimeOwnershipError(
+    "conversation_runtime_ownership_compromised",
+    false,
+    { cause }
+  );
+}
+__name(conversationRuntimeOwnershipCompromisedError, "conversationRuntimeOwnershipCompromisedError");
+function conversationRootCompromisedError(cause) {
+  return new ConversationRuntimeOwnershipError(
+    "conversation_root_compromised",
+    false,
+    { cause }
+  );
+}
+__name(conversationRootCompromisedError, "conversationRootCompromisedError");
+
+// packages/cli/src/serve/live/types.ts
+init_esbuild_shims();
+var LIVE_HOST_PROTOCOL_VERSION = 7;
+var LIVE_HOST_BUNDLE_ID = "com.alibaba.qwen-code.live-host";
+var LIVE_INPUT_AUDIO_EPOCH_BYTES = 8;
+
+export {
+  ConversationRuntimeOwnershipError,
+  conversationRuntimeInUseError,
+  conversationRuntimeUnavailableError,
+  conversationRuntimeOwnershipCompromisedError,
+  conversationRootCompromisedError,
+  LIVE_HOST_PROTOCOL_VERSION,
+  LIVE_HOST_BUNDLE_ID,
+  LIVE_INPUT_AUDIO_EPOCH_BYTES
+};
+/**
+ * @license
+ * Copyright 2026 Qwen Team
+ * SPDX-License-Identifier: Apache-2.0
+ */

package/chunks/{chunk-QW7BUOSI.js → chunk-2ZFO5JD7.js}

@@ -10,11 +10,12 @@ import {
   DEFAULT_TOOL_OUTPUT_BATCH_BUDGET,
   DEFAULT_TOOL_RESULTS_TOTAL_CHARS_THRESHOLD,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-  DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD
-} from "./chunk-TSLRORQR.js";
+  DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+  GOAL_CHECKPOINT_TIMEOUT_SECONDS_CAP
+} from "./chunk-PDUMGZ2P.js";
 import {
   REASONING_EFFORT_TIERS
-} from "./chunk-2LD5U7Q3.js";
+} from "./chunk-6YEOCHSE.js";
 import {
   DEFAULT_SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH,
   SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH_LIMIT
@@ -1249,6 +1250,11 @@ var SETTINGS_SCHEMA = {
           description: "Requires `telemetry.enabled: true`. Inject W3C `traceparent` on outbound `fetch` requests (LLM SDK calls, MCP StreamableHTTP, WebFetch, ...) AND as a `TRACEPARENT` environment variable in shell child processes (Bash tool, hooks, monitor). When enabled, any existing `TRACEPARENT` in the parent environment is overwritten with qwen-code's own trace context. Default: false \u2014 trace context stays internal to the operator's OTLP collector. Set true when you want cross-process trace stitching with an OTel-aware LLM provider (e.g. ARMS+DashScope) or need shell scripts / CLI tools to participate in distributed tracing.",
           type: "boolean",
           default: false
+        },
+        allowDynamicHeaderValues: {
+          description: "SECURITY-RELEVANT. Allow `modelProviders[].generationConfig.customHeaders` values to contain runtime placeholders \u2014 currently `${session_id}` \u2014 expanded per request instead of frozen at client construction. Default false: a value containing a placeholder is dropped rather than sent. Enable when a gateway requires a stable per-conversation identifier (e.g. OpenCode Go requires `x-opencode-session`). Which hosts receive the value and what the header is called are decided by the provider entry you attach the header to; this switch only decides whether `${session_id}` may be expanded from live session state and does not identify which settings source supplied the header.",
+          type: "boolean",
+          default: false
         }
       },
       additionalProperties: false
@@ -1405,6 +1411,17 @@ var SETTINGS_SCHEMA = {
         description: "Autonomous spend window armed on each new Goal, in tokens as counted by the Goal meter (totalTokenCount summed over every model call the Goal makes in its own turns; side queries and checkpoint verification are not metered). When a Goal spends its window it gets one wind-down turn to hand off, then stops until you resume it, which arms another window. Unset uses the built-in default of 30,000,000; -1 means unlimited. Zero, values above 300,000,000 (10x the default, a typo guard), other negative, fractional, or non-number values are rejected at startup.",
         showInDialog: false
       },
+      goalCheckpointTimeoutSeconds: {
+        type: "integer",
+        label: "Goal Checkpoint Timeout (seconds)",
+        category: "Model",
+        requiresRestart: false,
+        default: void 0,
+        minimum: 1,
+        maximum: GOAL_CHECKPOINT_TIMEOUT_SECONDS_CAP,
+        description: "Ceiling on one Goal evidence-checkpoint call, in seconds. A long Goal periodically compresses its evidence into checkpoint claims with a side model call; a call that does not finish in time is abandoned as an inconclusive check \u2014 the checkpoint stall streak is preserved rather than incremented \u2014 and a later turn retries it. Unset uses the built-in default of 180. Must be an integer between 1 and 900; other values are rejected at startup. The call is streamed, so the per-request transport timeout (model.generationConfig.timeout, default 120 s) bounds only connect and first response, and values above 900 are rejected because past the default stream lifetime guard that guard, not this setting, ends the call. The 900 ceiling is fixed: raising QWEN_STREAM_MAX_LIFETIME_MS does not lift it.",
+        showInDialog: false
+      },
       maxToolCalls: {
         type: "number",
         label: "Max Tool Calls",

package/chunks/{chunk-RH344FKI.js → chunk-3BTHHXXE.js}

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

package/chunks/{chunk-OFB36ZBA.js → chunk-3LPJ776W.js}

@@ -369,7 +369,7 @@ ${taskManagementToolGuidance}- **Parallel Tool Calls:** You can call multiple to
 - **Background Processes:** Use background execution with \`is_background: true\` for commands that are unlikely to stop on their own, e.g. \`node server.js\`. Do not append a trailing \`&\` when using the shell tool's managed background mode. If unsure, follow the active interaction mode's question guidance.
 - **Interactive Commands:** Try to avoid shell commands that are likely to require user interaction (e.g. \`git rebase -i\`). Use non-interactive versions of commands (e.g. \`npm init -y\` instead of \`npm init\`) when available, and otherwise remind the user that interactive shell commands are not supported and may cause hangs until canceled by the user.
 - **Questions:** ${interaction.questions}
-- **Subagent Delegation:** Use the '${ToolNames.AGENT}' tool with specialized agents when the task at hand matches the agent's description. Subagents are valuable for parallelizing independent queries or for protecting the main context window from excessive results, but they should not be used excessively when not needed. Importantly, avoid duplicating work that subagents are already doing - if you delegate research to a subagent, do not also perform the same searches yourself.
+- **Subagent Delegation:** Use the '${ToolNames.AGENT}' tool with specialized agents when the task at hand matches the agent's description. Subagents are valuable for parallelizing independent queries or for protecting the main context window from excessive results, but they should not be used excessively when not needed. Importantly, avoid duplicating work that subagents are already doing - if you delegate research to a subagent, do not also perform the same searches yourself. A background subagent's result arrives as a task notification in a later turn; while waiting, do not read its transcript, predict its findings, or launch a replacement for the same task.
 - **Codebase Search:** For simple, directed codebase searches (e.g. for a specific file/class/function) use the '${ToolNames.GREP}' or '${ToolNames.GLOB}' tools directly. For broader codebase exploration and deep research, use the '${ToolNames.AGENT}' tool with subagent_type=Explore. This is slower than using '${ToolNames.GREP}' or '${ToolNames.GLOB}' directly, so use this only when a simple, directed search proves to be insufficient or when your task will clearly require more than 3 queries.
 - **Respect Tool Decisions:** Tool permissions are enforced by the runtime. If a call is denied or canceled, respect that decision and do _not_ try the same action through another path. Retry only if the user subsequently requests that action.
 

package/chunks/{chunk-GEV66YGE.js → chunk-3VDLQUR2.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-MR3PXB6E.js";
 import {
   ideContextStore
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   require_proper_lockfile
 } from "./chunk-MLXTMF7H.js";

package/chunks/{chunk-RRCNEW2A.js → chunk-3VWPPK5Q.js}

@@ -2,20 +2,21 @@
 "use strict";
 import {
   functionResponsePartsToString
-} from "./chunk-VMFPZXRT.js";
+} from "./chunk-ZNO5BUAD.js";
 import {
   observeHeadlessToolResultProjection,
   observeHeadlessToolResultWire,
   projectJsonStringToByteBudget
-} from "./chunk-PMGWY6ZP.js";
+} from "./chunk-TWWS7XUW.js";
 import {
+  createNotStartedToolErrorResponse,
   parseAndFormatApiError,
   toolResultBoundaryArtifact
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-WQBR7LN5.js";
+} from "./chunk-6QV7Z74P.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -378,6 +379,49 @@ var BaseJsonOutputAdapter = class {
   startAssistantMessage() {
     this.startAssistantMessageInternal(this.mainAgentMessageState);
   }
+  /**
+   * Starts a replacement provider attempt. Continuation retries keep the
+   * already-delivered text; fresh retries and fallbacks discard the pending
+   * assistant state. Streaming adapters override this to pair any tool_use
+   * frames that are already on the wire before resetting.
+   */
+  restartAttempt(preserveText, discardedToolCalls) {
+    if (preserveText) {
+      const discardedIds = new Set(
+        discardedToolCalls.map((request) => request.callId)
+      );
+      if (discardedIds.size > 0) {
+        const state = this.mainAgentMessageState;
+        const retainedBlocks = [];
+        const retainedOpenBlocks = /* @__PURE__ */ new Set();
+        for (const [index, block] of state.blocks.entries()) {
+          if (block.type === "tool_use" && discardedIds.has(block.id)) {
+            continue;
+          }
+          const retainedIndex = retainedBlocks.length;
+          retainedBlocks.push(block);
+          if (state.openBlocks.has(index)) {
+            retainedOpenBlocks.add(retainedIndex);
+          }
+        }
+        state.blocks = retainedBlocks;
+        state.openBlocks = retainedOpenBlocks;
+        state.currentBlockType = retainedBlocks.at(-1)?.type ?? null;
+        state.messageStarted = retainedBlocks.length > 0;
+      }
+      return;
+    }
+    this.startAssistantMessageInternal(this.mainAgentMessageState);
+  }
+  emitDiscardedAttemptToolResults(discardedToolCalls) {
+    const message = "Skipped because the provider attempt was retried before execution.";
+    for (const request of discardedToolCalls) {
+      this.emitToolResult(
+        request,
+        createNotStartedToolErrorResponse(request, message)
+      );
+    }
+  }
   /**
    * Processes an LLM stream event.
    * This is a shared implementation used by both streaming and non-streaming adapters.
@@ -1072,6 +1116,16 @@ var StreamJsonOutputAdapter = class extends BaseJsonOutputAdapter {
     this.mainTurnMessageStartEmitted = false;
     super.startAssistantMessage();
   }
+  restartAttempt(preserveText, discardedToolCalls) {
+    if (preserveText && discardedToolCalls.length === 0) {
+      return;
+    }
+    if (this.mainAgentMessageState.messageStarted && !this.mainAgentMessageState.finalized) {
+      this.finalizeAssistantMessage();
+    }
+    this.emitDiscardedAttemptToolResults(discardedToolCalls);
+    super.restartAttempt(false, discardedToolCalls);
+  }
   finalizeAssistantMessage() {
     const message = this.finalizeAssistantMessageInternal(
       this.mainAgentMessageState,

package/chunks/{chunk-L36LLVA5.js → chunk-3YQMUBTS.js}

@@ -27,10 +27,10 @@ import {
 } from "./chunk-3VUENPWF.js";
 import {
   loadSettings
-} from "./chunk-RUMSY4ES.js";
+} from "./chunk-66JBCTJF.js";
 import {
   MCP_BUDGET_WARN_FRACTION
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -447,7 +447,7 @@ var serveCommand = {
     delete process.env[EXTERNAL_TOOL_GUARD_TOKEN_ENV];
     const openWithAuth = argv["open-with-auth"];
     const open = argv.open || openWithAuth;
-    const { runQwenServe } = await import("./run-qwen-serve-CTFL5R6U.js");
+    const { runQwenServe } = await import("./run-qwen-serve-A3JBOZCM.js");
     try {
       const serveOptions = {
         port: argv.port,

package/chunks/{chunk-LTCI6ZOJ.js → chunk-45ROPFQY.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   getGlobalQwenDir
-} from "./chunk-65GHQ4FX.js";
+} from "./chunk-XVTCSVBK.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-W4LL5RZO.js → chunk-4ALNJDHL.js}

@@ -146,12 +146,49 @@ init_esbuild_shims();
 var RATE_LIMIT_ERROR_CODES = /* @__PURE__ */ new Set([429, 503, 1302, 1305]);
 function isRateLimitError(error, extraCodes) {
   const code = getErrorCode(error);
-  if (code === null) return false;
+  if (code === null) return isStatuslessThrottle(error);
   if (RATE_LIMIT_ERROR_CODES.has(code)) return true;
   if (extraCodes && extraCodes.includes(code)) return true;
   return false;
 }
 __name(isRateLimitError, "isRateLimitError");
+function isStatuslessThrottle(error) {
+  for (const payload of [error, ...getJsonPayloads(error)]) {
+    const selected = providerErrorSource(payload);
+    if (!selected) continue;
+    const { source } = selected;
+    const { type, message } = source;
+    if (type === "rate_limit_error" || type === "overloaded_error") return true;
+    if (type !== "invalid_request_error" || typeof message !== "string")
+      continue;
+    const detail = decodeProviderMessage(message)?.["message"] ?? message;
+    if (typeof detail === "string" && /^too many requests\b/i.test(detail.trim()) && /\b(?:wait|try(?:ing)? again)\b/i.test(detail)) {
+      return true;
+    }
+  }
+  return false;
+}
+__name(isStatuslessThrottle, "isStatuslessThrottle");
+function providerErrorSource(payload) {
+  if (typeof payload !== "object" || payload === null) return null;
+  const direct = payload;
+  const nested = direct["error"];
+  const source = typeof nested === "object" && nested !== null ? nested : direct;
+  return { source, direct };
+}
+__name(providerErrorSource, "providerErrorSource");
+function decodeProviderMessage(message) {
+  try {
+    const selected = providerErrorSource(JSON.parse(message));
+    if (!selected || typeof selected.source["message"] !== "string") {
+      return null;
+    }
+    return { ...selected.direct, ...selected.source };
+  } catch {
+    return null;
+  }
+}
+__name(decodeProviderMessage, "decodeProviderMessage");
 function getRateLimitErrorDetails(error) {
   const statusCode = getErrorStatus(error);
   const payload = getProviderErrorPayload(error);
@@ -159,7 +196,7 @@ function getRateLimitErrorDetails(error) {
   const transport = message?.includes("event:error") || message?.includes("HTTP_STATUS/") ? "sse" : statusCode !== void 0 ? "http" : "unknown";
   return {
     ...statusCode !== void 0 ? { statusCode } : {},
-    ...payload?.code !== void 0 ? { providerCode: String(payload.code) } : {},
+    ...payload?.code !== void 0 || payload?.type !== void 0 ? { providerCode: String(payload.code ?? payload.type) } : {},
     ...payload?.message !== void 0 ? { providerMessage: payload.message } : {},
     ...payload?.requestId !== void 0 ? { requestId: payload.requestId } : {},
     transport
@@ -208,22 +245,24 @@ function getErrorCode(error) {
 __name(getErrorCode, "getErrorCode");
 function getProviderErrorPayload(error) {
   for (const payload of getJsonPayloads(error)) {
-    if (typeof payload !== "object" || payload === null) continue;
-    const direct = payload;
-    const nestedError = payload.error;
-    const nested = typeof nestedError === "object" && nestedError !== null ? nestedError : void 0;
-    const source = nested ?? direct;
-    const code = typeof source.code === "string" || typeof source.code === "number" ? source.code : void 0;
-    const message = typeof source.message === "string" ? source.message : void 0;
-    const requestId = typeof source.request_id === "string" ? source.request_id : typeof source.requestId === "string" ? source.requestId : typeof direct.request_id === "string" ? direct.request_id : typeof direct.requestId === "string" ? direct.requestId : void 0;
-    if (code !== void 0 || message !== void 0 || requestId !== void 0) {
-      return { code, message, requestId };
+    const selected = providerErrorSource(payload);
+    if (!selected) continue;
+    const { source, direct } = selected;
+    const decoded = typeof source["message"] === "string" ? decodeProviderMessage(source["message"]) : null;
+    const code = typeof source["code"] === "string" || typeof source["code"] === "number" ? source["code"] : typeof decoded?.["code"] === "string" || typeof decoded?.["code"] === "number" ? decoded["code"] : void 0;
+    const type = typeof source["type"] === "string" ? source["type"] : typeof decoded?.["type"] === "string" ? decoded["type"] : void 0;
+    const message = typeof decoded?.["message"] === "string" ? decoded["message"] : typeof source["message"] === "string" ? source["message"] : void 0;
+    const requestId = typeof source["request_id"] === "string" ? source["request_id"] : typeof source["requestId"] === "string" ? source["requestId"] : typeof direct["request_id"] === "string" ? direct["request_id"] : typeof direct["requestId"] === "string" ? direct["requestId"] : typeof decoded?.["request_id"] === "string" ? decoded["request_id"] : typeof decoded?.["requestId"] === "string" ? decoded["requestId"] : void 0;
+    if (code !== void 0 || type !== void 0 || message !== void 0 || requestId !== void 0) {
+      return { code, type, message, requestId };
     }
   }
   if (isApiError(error)) {
+    const decoded = decodeProviderMessage(error.error.message);
     return {
       code: error.error.code,
-      message: error.error.message
+      ...typeof decoded?.["type"] === "string" ? { type: decoded["type"] } : {},
+      message: typeof decoded?.["message"] === "string" ? decoded["message"] : error.error.message
     };
   }
   return null;