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

package/chunks/{chunk-EGRFCIXD.js → chunk-TWAMIEQ2.js}

@@ -3,19 +3,19 @@
 import {
   settleChatRecording,
   subscribeToHeadlessChatRecordingFailures
-} from "./chunk-R7TKFIQO.js";
+} from "./chunk-CALNF3Z3.js";
 import {
   JsonOutputAdapter
-} from "./chunk-HZS3JRQW.js";
+} from "./chunk-WNISCNTA.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-RRCNEW2A.js";
+} from "./chunk-3VWPPK5Q.js";
 import {
   normalizePartList
 } from "./chunk-5IENVM7Z.js";
 import {
   handleAtCommand
-} from "./chunk-XNC2TCUO.js";
+} from "./chunk-ENZDGHGJ.js";
 import {
   buildInitialSystemReminders,
   buildSystemMessage,
@@ -26,11 +26,11 @@ import {
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand
-} from "./chunk-VMFPZXRT.js";
+} from "./chunk-ZNO5BUAD.js";
 import {
   RunBudgetEnforcer,
   cleanupReviewWorktreeLeases
-} from "./chunk-P5Z7VD23.js";
+} from "./chunk-DXQ6Z7AH.js";
 import {
   AlreadyReportedError,
   handleBudgetExceededError,
@@ -38,20 +38,20 @@ import {
   handleError,
   handleMaxTurnsExceededError,
   handleToolError
-} from "./chunk-YLFICBYK.js";
+} from "./chunk-6JXHO7LG.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-I7UNCY24.js";
+} from "./chunk-ARYNBBBM.js";
 import {
   buildGoalContinuationParts,
   buildSessionRecoveryPlanFromApiHistory,
   detectAutonomousSentinel,
   detectLoopSentinel,
   executeToolCall
-} from "./chunk-TXAEXF2B.js";
+} from "./chunk-ZU2T5JIS.js";
 import {
   restoreWorktreeContext
-} from "./chunk-E4VX6LXB.js";
+} from "./chunk-YZTGGCEE.js";
 import {
   GOAL_PAUSE_REASON_HEADLESS_RUN_ENDED,
   GOAL_PAUSE_REASON_USER_INTERRUPT,
@@ -72,7 +72,7 @@ import {
   parseAndFormatApiError,
   partitionByConcurrencySafety,
   recordHandledToolCall
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -91,7 +91,7 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-WQBR7LN5.js";
+} from "./chunk-6QV7Z74P.js";
 import {
   endInteractionSpan,
   getActiveInteractionSpan,
@@ -112,7 +112,7 @@ import {
 } from "./chunk-ZAFYHRVY.js";
 import {
   registerCleanup
-} from "./chunk-HPE4LEWX.js";
+} from "./chunk-USN6VNTO.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -193,8 +193,20 @@ function formatGoalState(snapshot, operation) {
   }
   const status = goal.status === "usage_limited" ? "usage limited" : goal.status;
   const summary = `Goal ${status}: ${goal.objective}`;
-  return goal.status !== "active" && goal.lastReason ? `${summary}
-Reason: ${goal.lastReason}` : summary;
+  const usage = [];
+  if (goal.turnCount > 0) {
+    usage.push(`${goal.turnCount} ${goal.turnCount === 1 ? "turn" : "turns"}`);
+  }
+  if (goal.tokensUsed > 0) {
+    const used = goal.tokensUsed.toLocaleString("en-US");
+    usage.push(
+      goal.tokenBudget === void 0 ? `${used} tokens` : `${used} of ${goal.tokenBudget.toLocaleString("en-US")} tokens`
+    );
+  }
+  const withUsage = usage.length > 0 ? `${summary}
+Usage: ${usage.join(" \xB7 ")}` : summary;
+  return goal.status !== "active" && goal.lastReason ? `${withUsage}
+Reason: ${goal.lastReason}` : withUsage;
 }
 __name(formatGoalState, "formatGoalState");
 async function claimUserGoalTurn(runtime, turnKey, signal) {
@@ -1153,6 +1165,52 @@ ${text}
         });
         return 1;
       }, "emitLoopDetectedResult");
+      const emitRetryProgress = /* @__PURE__ */ __name((event, discardedToolCallCount, preserveText) => {
+        if (event.type === "model_fallback" /* ModelFallback */) {
+          process.stderr.write(
+            `Falling back from ${event.fromModel} to ${event.toModel} (${discardedToolCallCount} buffered tool call(s) discarded).
+`
+          );
+          return;
+        }
+        if (event.type !== "retry" /* Retry */) return;
+        if (!event.retryInfo) {
+          process.stderr.write(
+            `Retrying provider attempt (${discardedToolCallCount} buffered tool call(s) discarded${preserveText ? "; preserving delivered text" : ""}).
+`
+          );
+          return;
+        }
+        const { attempt, maxRetries, delayMs, message } = event.retryInfo;
+        const delaySeconds = Math.ceil(delayMs / 1e3);
+        process.stderr.write(
+          `Retrying in ${delaySeconds}s (attempt ${attempt}/${maxRetries})${message ? `: ${message}` : ""}
+`
+        );
+      }, "emitRetryProgress");
+      const discardAbandonedAttempt = /* @__PURE__ */ __name((event, pendingRequests, onDiscardText) => {
+        if (event.type !== "retry" /* Retry */ && event.type !== "model_fallback" /* ModelFallback */) {
+          return;
+        }
+        const discardedToolCalls = pendingRequests.splice(0);
+        const preserveText = event.type === "retry" /* Retry */ && event.isContinuation === true;
+        adapter.restartAttempt(preserveText, discardedToolCalls);
+        if (!preserveText) {
+          onDiscardText?.();
+        }
+        const retryInfo = event.type === "retry" /* Retry */ ? event.retryInfo : void 0;
+        adapter.emitSystemMessage("retry", {
+          reason: event.type === "retry" /* Retry */ ? "retry" : "model_fallback",
+          ...retryInfo ? {
+            attempt: retryInfo.attempt,
+            maxRetries: retryInfo.maxRetries,
+            delayMs: retryInfo.delayMs
+          } : {},
+          discardedToolCalls: discardedToolCalls.length,
+          preserveText
+        });
+        emitRetryProgress(event, discardedToolCalls.length, preserveText);
+      }, "discardAbandonedAttempt");
       const handledToolCallFingerprints = new Map(
         llmClient.getHistoryToolCallFingerprints()
       );
@@ -1558,6 +1616,7 @@ ${text}
           sendType !== "toolResult" /* ToolResult */
         );
         const toolCallRequests = [];
+        const attemptPreviewLength = plainTextPreview.length;
         const apiStartTime = Date.now();
         const responseStream = llmClient.sendMessageStream(
           currentMessages[0]?.parts || [],
@@ -1602,13 +1661,13 @@ ${text}
             adapter.finalizeAssistantMessage();
             await routeAbort();
           }
+          discardAbandonedAttempt(event, toolCallRequests, () => {
+            plainTextPreview = plainTextPreview.slice(0, attemptPreviewLength);
+          });
           adapter.processEvent(event);
           if (event.type === "tool_call_request" /* ToolCallRequest */) {
             toolCallRequests.push(event.value);
           }
-          if (event.type === "model_fallback" /* ModelFallback */) {
-            toolCallRequests.length = 0;
-          }
           if (event.type === "content" /* Content */ && plainTextPreview.length < PLAIN_TEXT_PREVIEW_LIMIT) {
             const remaining = PLAIN_TEXT_PREVIEW_LIMIT - plainTextPreview.length;
             plainTextPreview += String(event.value).slice(0, remaining);
@@ -1821,6 +1880,7 @@ ${text}
                   finalizeOneShotMonitors();
                   await routeAbort();
                 }
+                discardAbandonedAttempt(event, itemToolCallRequests);
                 adapter.processEvent(event);
                 if (event.type === "tool_call_request" /* ToolCallRequest */) {
                   itemToolCallRequests.push(event.value);
@@ -2121,6 +2181,7 @@ __name(runNonInteractive, "runNonInteractive");
 
 export {
   TurnInterruptedError,
+  formatGoalState,
   skipHeadlessLoopSentinel,
   runNonInteractive
 };

package/chunks/{chunk-PMGWY6ZP.js → chunk-TWWS7XUW.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-VFFQAOPR.js";
 import {
   formatHistoryGapNotice
-} from "./chunk-37SOBIA3.js";
+} from "./chunk-ERXNTINK.js";
 import {
   sanitizeTerminalText
 } from "./chunk-47ECGEJC.js";
@@ -18,21 +18,22 @@ import {
   finalizeOfflineDaemonTranscriptState,
   normalizeDaemonEvent,
   reduceDaemonTranscriptEvents
-} from "./chunk-537SQ2AI.js";
+} from "./chunk-5WC2ECUK.js";
 import {
   LOAD_REPLAY_META_KEY
-} from "./chunk-Z6KFLEG7.js";
+} from "./chunk-PSPAM24S.js";
 import {
   isGoalCheckpointBookkeepingRecord,
   projectGoalStateToLegacy
-} from "./chunk-TXAEXF2B.js";
+} from "./chunk-ZU2T5JIS.js";
 import {
+  GOAL_PAUSE_REASON_COMMAND,
   observeToolResultBoundary,
   parseGoalSnapshotV2,
   parseGoalStateCause,
   parseGoalStateRecordPayloadV2,
   toolResultBoundaryArtifact
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   TranscriptRecordPreparationError,
   prepareTranscriptRecords,
@@ -42,7 +43,7 @@ import {
 import {
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-WQBR7LN5.js";
+} from "./chunk-6QV7Z74P.js";
 import {
   SchemaValidator,
   ToolNames
@@ -1166,6 +1167,7 @@ function projectGoalControlCommand(cause, snapshot) {
     case "edit":
       return snapshot.goal ? `/goal edit ${snapshot.goal.objective}` : void 0;
     case "pause":
+      return snapshot.goal?.lastReason === void 0 || snapshot.goal.lastReason === GOAL_PAUSE_REASON_COMMAND ? `/goal ${cause}` : void 0;
     case "resume":
     case "clear":
       return `/goal ${cause}`;
@@ -2803,7 +2805,7 @@ async function collectSessionMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./deferred-core-runtime-DWOXIU5S.js");
+    const { getGitRepoName } = await import("./deferred-core-runtime-LO5NTQQ4.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;
@@ -3592,14 +3594,14 @@ var DOCUMENT_HTML_TEMPLATE = `<!doctype html>
     <script
       nonce="__EXPORT_NONCE__"
       id="transcript-renderer"
-      integrity="sha384-GJ2CkCgMyW2FpL2AIjDKL3cHsSCVDximEkEhmJaaLhtQp2lw2FZmRnHykpwnXH2T"
+      integrity="sha384-4TMV2TILlJMjhAIoxd/ONpxsCLyeebW0L96G5kw0oLdOORJBp+yDIqISXx1qjVpK"
       crossorigin="anonymous"
-      src="https://unpkg.com/@qwen-code/qwen-code@0.23.1-preview.2/export-transcript-document.js"
+      src="https://unpkg.com/@qwen-code/qwen-code@0.23.1/export-transcript-document.js"
     ></script>
   </body>
 </html>
 `;
-var EXPORT_TRANSCRIPT_RENDERER_VERSION = "0.23.1-preview.2+534a412e06fbc276";
+var EXPORT_TRANSCRIPT_RENDERER_VERSION = "0.23.1+cac701cab376ff66";
 var EXPORT_TRANSCRIPT_RENDERER_LIMITS = Object.freeze({
   maxBlocks: 1e3,
   maxEnvelopeBytes: 33554432
@@ -4377,6 +4379,7 @@ function projectGoalControlCommand2(cause, snapshot) {
     case "edit":
       return snapshot.goal ? `/goal edit ${snapshot.goal.objective}` : void 0;
     case "pause":
+      return snapshot.goal?.lastReason === void 0 || snapshot.goal.lastReason === GOAL_PAUSE_REASON_COMMAND ? `/goal ${cause}` : void 0;
     case "resume":
     case "clear":
       return `/goal ${cause}`;

package/chunks/{chunk-RGAQDQ3Z.js → chunk-UHUT4IDM.js}

@@ -99,6 +99,15 @@ function managementFieldsWithSharedControls(fields, defaultSessionScope) {
         kind: "boolean",
         description: "Retain an owner-scoped catalog of named tasks in daemon-managed mode"
       }
+    ],
+    ...declared.has("instructions") ? [] : [
+      {
+        key: "instructions",
+        label: "Instructions",
+        kind: "string",
+        multiline: true,
+        description: "Guidance injected into each channel session context; some channels replace their own default guidance when this is set"
+      }
     ]
   ];
 }
@@ -246,15 +255,15 @@ function ensureBuiltins() {
   if (!builtinsPromise) {
     builtinsPromise = (async () => {
       const labelled = [
-        { name: "telegram", promise: import("./dist-3H3WODVS.js") },
-        { name: "weixin", promise: import("./dist-YNQU4CKC.js") },
-        { name: "dingtalk", promise: import("./dist-P6YWBITG.js") },
-        { name: "dws", promise: import("./dist-NXW4DUUX.js") },
-        { name: "wecom", promise: import("./dist-AI25RVRA.js") },
-        { name: "feishu", promise: import("./dist-XINEKB5A.js") },
-        { name: "qqbot", promise: import("./dist-T4PRA5EZ.js") },
-        { name: "github", promise: import("./dist-I74QLLQS.js") },
-        { name: "gitlab", promise: import("./dist-VCAS67N5.js") }
+        { name: "telegram", promise: import("./dist-OR2ZQTXZ.js") },
+        { name: "weixin", promise: import("./dist-WZTUKIDR.js") },
+        { name: "dingtalk", promise: import("./dist-STAGIFNB.js") },
+        { name: "dws", promise: import("./dist-24TCWK5H.js") },
+        { name: "wecom", promise: import("./dist-NQ2636VT.js") },
+        { name: "feishu", promise: import("./dist-FDISN4AK.js") },
+        { name: "qqbot", promise: import("./dist-XJ25G6OH.js") },
+        { name: "github", promise: import("./dist-5I4HLUTO.js") },
+        { name: "gitlab", promise: import("./dist-M4CBX53H.js") }
       ];
       const results = await Promise.allSettled(labelled.map((l) => l.promise));
       for (let i = 0; i < results.length; i++) {

package/chunks/{chunk-HPE4LEWX.js → chunk-USN6VNTO.js}

@@ -64,7 +64,7 @@ async function runExitCleanup(options = {}) {
 }
 __name(runExitCleanup, "runExitCleanup");
 async function cleanupCheckpoints() {
-  const { Storage } = await import("./deferred-core-runtime-DWOXIU5S.js");
+  const { Storage } = await import("./deferred-core-runtime-LO5NTQQ4.js");
   const storage = new Storage(process.cwd());
   const tempDir = storage.getProjectTempDir();
   const checkpointsDir = join(tempDir, "checkpoints");

package/chunks/{chunk-BNWIX6BM.js → chunk-UXDVUFKU.js}

@@ -3,13 +3,13 @@
 import {
   getPlugin,
   supportedTypes
-} from "./chunk-RGAQDQ3Z.js";
+} from "./chunk-UHUT4IDM.js";
 import {
   resolveChannelCwd
-} from "./chunk-RH344FKI.js";
+} from "./chunk-3BTHHXXE.js";
 import {
   isInternalSecretEnvVar
-} from "./chunk-3K65MUKD.js";
+} from "./chunk-65I7S4Z3.js";
 import {
   APPROVAL_MODES
 } from "./chunk-JX6XHPTX.js";

package/chunks/{chunk-HY3DXYZK.js → chunk-UYDQYDW2.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   wrapForMultiplexer
-} from "./chunk-VU7O7CGQ.js";
+} from "./chunk-XDNFODER.js";
 import {
   createDebugLogger
 } from "./chunk-ZAFYHRVY.js";

package/chunks/{chunk-3K456UJF.js → chunk-VF6D6EGV.js}

@@ -7,10 +7,10 @@ import {
   REASONING_EFFORT_TIERS,
   clampReasoningEffort,
   resolveRequestTimeout
-} from "./chunk-2LD5U7Q3.js";
+} from "./chunk-6YEOCHSE.js";
 import {
   buildSessionAwareFetch
-} from "./chunk-3UMWOKJC.js";
+} from "./chunk-NOO4QFXM.js";
 import {
   isQwenFamilyWireModel,
   isTieredEffortWireModel
@@ -6955,7 +6955,11 @@ var DefaultOpenAICompatibleProvider = class {
       maxRetries,
       defaultHeaders,
       ...runtimeOptions || {},
-      fetch: buildSessionAwareFetch(runtimeOptions?.fetch, this.cliConfig)
+      fetch: buildSessionAwareFetch(
+        runtimeOptions?.fetch,
+        this.cliConfig,
+        this.contentGeneratorConfig.customHeaders
+      )
     });
   }
   /**
@@ -7270,7 +7274,11 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
       maxRetries,
       defaultHeaders,
       ...runtimeOptions || {},
-      fetch: buildSessionAwareFetch(runtimeOptions?.fetch, this.cliConfig)
+      fetch: buildSessionAwareFetch(
+        runtimeOptions?.fetch,
+        this.cliConfig,
+        this.contentGeneratorConfig.customHeaders
+      )
     });
   }
   /**

package/chunks/{chunk-ZNI3V2XA.js → chunk-WAASYFPK.js}

@@ -2,14 +2,14 @@
 "use strict";
 import {
   SCHEDULED_TASK_RUN_SOURCE_ID_PREFIX
-} from "./chunk-ZT3XUGSU.js";
+} from "./chunk-2TMJRF46.js";
 import {
   ChannelDeliveryError,
   MAX_CHANNEL_DELIVERY_TEXT_LENGTH
 } from "./chunk-RKFGE7JH.js";
 import {
   stripTerminalControlSequences
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   MAX_CHANNEL_DELIVERY_NAME_LENGTH,
   MAX_CHANNEL_DELIVERY_TARGET_ID_LENGTH

package/chunks/{chunk-OHOO527W.js → chunk-WG7BL3FY.js}

@@ -1,8 +1,12 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  LIVE_HOST_PROTOCOL_VERSION
-} from "./chunk-IQAFKVXS.js";
+  ConversationRuntimeOwnershipError,
+  LIVE_HOST_PROTOCOL_VERSION,
+  conversationRuntimeInUseError,
+  conversationRuntimeOwnershipCompromisedError,
+  conversationRuntimeUnavailableError
+} from "./chunk-2Z3T52OC.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -312,6 +316,51 @@ async function syncDirectory(directory) {
   }
 }
 __name(syncDirectory, "syncDirectory");
+async function assertLiveDiscoveryPublisher(stableBaseDir, owner) {
+  try {
+    const target = await prepareDirectory(stableBaseDir, false);
+    if (!target) throw conversationRuntimeUnavailableError();
+    const lock = await lockDirectory(target);
+    let operationError;
+    try {
+      lock.assertHealthy();
+      await assertDirectoryIdentity(target);
+      const current = await readExistingRecord(
+        getLiveDiscoveryPath(stableBaseDir)
+      );
+      await assertDirectoryIdentity(target);
+      lock.assertHealthy();
+      if (!current) throw conversationRuntimeUnavailableError();
+      if (current.pid !== owner.pid || current.instanceNonce !== owner.instanceNonce) {
+        throw conversationRuntimeInUseError();
+      }
+      if (current.protocolVersion !== LIVE_HOST_PROTOCOL_VERSION) {
+        throw new LiveDiscoveryStateError();
+      }
+    } catch (error) {
+      operationError = error;
+    }
+    try {
+      await lock.release();
+      lock.assertHealthy();
+    } catch (error) {
+      throw new LiveDiscoveryStateError(
+        operationError ? new AggregateError(
+          [operationError, error],
+          "Live discovery admission cleanup failed."
+        ) : error
+      );
+    }
+    if (operationError) throw operationError;
+  } catch (error) {
+    if (error instanceof ConversationRuntimeOwnershipError) throw error;
+    if (error instanceof LiveDiscoveryStateError || error.code === "ECOMPROMISED") {
+      throw conversationRuntimeOwnershipCompromisedError(error);
+    }
+    throw conversationRuntimeUnavailableError(error);
+  }
+}
+__name(assertLiveDiscoveryPublisher, "assertLiveDiscoveryPublisher");
 async function handoffLiveDiscoveryOwner(runtimeBaseDir, owner, commitOwner, options = {}) {
   const target = await prepareDirectory(runtimeBaseDir, false);
   if (!target) {
@@ -481,6 +530,7 @@ export {
   LiveDiscoveryPublicationError,
   getStableLiveDiscoveryBaseDir,
   getLiveDiscoveryPath,
+  assertLiveDiscoveryPublisher,
   handoffLiveDiscoveryOwner,
   writeLiveDiscoveryFile,
   removeLiveDiscoveryFile

package/chunks/{chunk-C7M445SS.js → chunk-WJDXKQIO.js}

@@ -4,7 +4,7 @@ import {
   isActiveWorkflowStatus,
   isTerminalWorkflowStatus,
   isWorkflowRunPersistenceActive
-} from "./chunk-TSLRORQR.js";
+} from "./chunk-PDUMGZ2P.js";
 import {
   atomicWriteFile
 } from "./chunk-XFFRI3WM.js";

package/chunks/{chunk-HZS3JRQW.js → chunk-WNISCNTA.js}

@@ -2,10 +2,10 @@
 "use strict";
 import {
   BaseJsonOutputAdapter
-} from "./chunk-RRCNEW2A.js";
+} from "./chunk-3VWPPK5Q.js";
 import {
   observeHeadlessJsonToolResultWire
-} from "./chunk-PMGWY6ZP.js";
+} from "./chunk-TWWS7XUW.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -20,6 +20,8 @@ var JsonOutputAdapter = class extends BaseJsonOutputAdapter {
     __name(this, "JsonOutputAdapter");
   }
   messages = [];
+  attemptMessageCheckpoint = 0;
+  lastAssistantMessageAtAttemptStart = null;
   constructor(config) {
     super(config);
   }
@@ -39,6 +41,42 @@ var JsonOutputAdapter = class extends BaseJsonOutputAdapter {
   shouldEmitStreamEvents() {
     return false;
   }
+  startAssistantMessage() {
+    this.attemptMessageCheckpoint = this.messages.length;
+    this.lastAssistantMessageAtAttemptStart = this.lastAssistantMessage;
+    super.startAssistantMessage();
+  }
+  restartAttempt(preserveText, discardedToolCalls) {
+    if (preserveText) {
+      const discardedIds = new Set(
+        discardedToolCalls.map((request) => request.callId)
+      );
+      if (discardedIds.size > 0) {
+        const retained = this.messages.slice(this.attemptMessageCheckpoint).filter(
+          (message) => message.type !== "assistant" || !message.message.content.some(
+            (block) => block.type === "tool_use" && discardedIds.has(block.id)
+          )
+        );
+        this.messages.splice(
+          this.attemptMessageCheckpoint,
+          this.messages.length - this.attemptMessageCheckpoint,
+          ...retained
+        );
+        this.lastAssistantMessage = this.messages.findLast(
+          (message) => message.type === "assistant"
+        ) ?? this.lastAssistantMessageAtAttemptStart;
+      }
+    } else {
+      const retained = this.messages.slice(this.attemptMessageCheckpoint).filter((message) => message.type !== "assistant");
+      this.messages.splice(
+        this.attemptMessageCheckpoint,
+        this.messages.length - this.attemptMessageCheckpoint,
+        ...retained
+      );
+      this.lastAssistantMessage = this.lastAssistantMessageAtAttemptStart;
+    }
+    super.restartAttempt(preserveText, discardedToolCalls);
+  }
   finalizeAssistantMessage() {
     return this.finalizeAssistantMessageInternal(
       this.mainAgentMessageState,

package/chunks/{chunk-AWDF462I.js → chunk-WQMUGQ6G.js}

@@ -16,7 +16,7 @@ import {
   MODIFIER_SHIFT_BIT,
   MODIFIER_SUPER_BIT,
   clipboardHasImage
-} from "./chunk-HY3DXYZK.js";
+} from "./chunk-UYDQYDW2.js";
 import {
   noteInteraction
 } from "./chunk-KW7NOTN6.js";
@@ -33,7 +33,7 @@ import {
 import {
   KittySequenceOverflowEvent,
   logKittySequenceOverflow
-} from "./chunk-WQBR7LN5.js";
+} from "./chunk-6QV7Z74P.js";
 import {
   createDebugLogger
 } from "./chunk-ZAFYHRVY.js";

package/chunks/{chunk-VU7O7CGQ.js → chunk-XDNFODER.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-NAVJD2PQ.js";
 import {
   formatFetchErrorForUser
-} from "./chunk-UKADFFL2.js";
+} from "./chunk-OFVAS4AR.js";
 import {
   combineAbortSignals
 } from "./chunk-DJ2GSRLV.js";