@qwen-code/qwen-code 0.21.12 → 0.21.13

package/chunks/{acpAgent-7JOAESF5.js → acpAgent-XPES32S7.js}

@@ -13,17 +13,21 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-X5SLJOMF.js";
+} from "./chunk-76J3IJ3M.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-QSD4UH74.js";
+} from "./chunk-NNHNLJ2X.js";
+import {
+  collectContextData,
+  formatContextUsageText
+} from "./chunk-N5YPT6PH.js";
 import {
   recomputeMcpGating
-} from "./chunk-CIDQISGM.js";
+} from "./chunk-GGDBMYGZ.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -31,44 +35,40 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-IX4PWUDU.js";
+} from "./chunk-IGGGG5CX.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-4XA4QIUA.js";
+} from "./chunk-AFSG32D5.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-MDNUCDKZ.js";
+} from "./chunk-O4D7SPJN.js";
+import "./chunk-4WGODMVR.js";
 import "./chunk-3SH53ANB.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-NW2GIPG3.js";
-import {
-  collectContextData,
-  formatContextUsageText
-} from "./chunk-62X3CM7Q.js";
-import "./chunk-4WGODMVR.js";
+import "./chunk-DXIBNLBZ.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-OYWVIXHT.js";
+import "./chunk-2M55OBEB.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-5AFGJNY6.js";
+} from "./chunk-6YKYPVDV.js";
 import "./chunk-KW7NOTN6.js";
-import "./chunk-ZQUY3ZJU.js";
-import "./chunk-RDVNSJQU.js";
-import "./chunk-OPVF453Q.js";
-import "./chunk-YAF2MQZ6.js";
-import {
-  computeCpuPercent
-} from "./chunk-LBOVL47Y.js";
-import "./chunk-TDESMS7M.js";
-import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-FMIH5KMQ.js";
+} from "./chunk-CZBYX5MY.js";
+import "./chunk-GO7STP6N.js";
+import "./chunk-JUEPY766.js";
+import "./chunk-NEFOOD54.js";
+import "./chunk-YAF2MQZ6.js";
+import {
+  computeCpuPercent
+} from "./chunk-LBOVL47Y.js";
+import "./chunk-QRCNA3SR.js";
+import "./chunk-6H67XLET.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -91,7 +91,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-CZ4OWGQQ.js";
+} from "./chunk-ZZO74WKW.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -100,10 +100,10 @@ import {
   createTranscriptMessageUpdate,
   createTranscriptUsageUpdate,
   hasFullSessionContext
-} from "./chunk-UI5UGEF4.js";
-import "./chunk-TMFWI4RC.js";
+} from "./chunk-RLKC46YT.js";
+import "./chunk-BZ263IKX.js";
 import "./chunk-4NFY2S7N.js";
-import "./chunk-V6OBVAST.js";
+import "./chunk-3U3VAL47.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-3Z43GZUQ.js";
@@ -121,18 +121,25 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-YX2RDGAL.js";
+} from "./chunk-7UXUJ5T3.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-LCX5B364.js";
+} from "./chunk-6ORZ2EDC.js";
 import {
   readVoiceModel
-} from "./chunk-VIFA5VJD.js";
-import "./chunk-H7TMVHKE.js";
+} from "./chunk-QIH2HAEN.js";
+import "./chunk-WGHHA7ZH.js";
 import "./chunk-NTTBXH7U.js";
-import "./chunk-RQJA2YYO.js";
+import "./chunk-XHRY7BXD.js";
+import {
+  SESSION_SOURCE_META_KEY,
+  parseSessionSource
+} from "./chunk-LJQAUZMR.js";
+import "./chunk-7U5G6JXI.js";
+import "./chunk-WCCLLK7X.js";
+import "./chunk-OCPBI7J5.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -141,32 +148,26 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-ROIJYS5K.js";
+} from "./chunk-ZYYTZUI2.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-BGXZBI5B.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-WM3LUQLO.js";
-import "./chunk-IH4Z54RJ.js";
+import "./chunk-TUGSVUJB.js";
+import "./chunk-QV5YN5YD.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-BSR5AXZR.js";
+import "./chunk-OD2WU5QY.js";
 import "./chunk-45NQKMYB.js";
-import "./chunk-OK47XBYH.js";
+import "./chunk-A4QRWUDE.js";
+import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-2IVYL3IF.js";
-import {
-  SESSION_SOURCE_META_KEY,
-  parseSessionSource
-} from "./chunk-6P5EXEBL.js";
-import "./chunk-7U5G6JXI.js";
-import "./chunk-WCCLLK7X.js";
-import "./chunk-OCPBI7J5.js";
+} from "./chunk-BVJS5BSP.js";
 import {
   ndJsonStream
-} from "./chunk-DAV4QFD5.js";
+} from "./chunk-NHDR76JX.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -174,9 +175,9 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-HTYND72J.js";
+} from "./chunk-QNQAPSN2.js";
 import "./chunk-ZLCT4C5A.js";
-import "./chunk-V6WHFGST.js";
+import "./chunk-BKPPWD33.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_HEARTBEAT_META_KEY,
@@ -206,7 +207,7 @@ import {
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-FQDCO3CJ.js";
+} from "./chunk-S5DWMTHO.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -227,7 +228,6 @@ import {
   SHELL_EXECUTING_TOOL_NAMES,
   isValidExternalToolGuardDenialReason
 } from "./chunk-3VUENPWF.js";
-import "./chunk-3AEKDXKT.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS,
   CHANNEL_PROMPT_META_KEY
@@ -237,10 +237,11 @@ import {
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-IW6RQPQB.js";
+import "./chunk-H4A72DE5.js";
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-3LDGOQXZ.js";
+} from "./chunk-JOOFMXGF.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -249,9 +250,9 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-3GDBZJD6.js";
+} from "./chunk-A267JX7H.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-FA5K6YI2.js";
+import "./chunk-E23IPNGS.js";
 import "./chunk-GOXKNSDZ.js";
 import {
   getSystemDefaultsPath,
@@ -260,7 +261,7 @@ import {
 import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-IRSLAS4M.js";
+} from "./chunk-HUTNYWBG.js";
 import {
   SUPPORTED_LANGUAGES
 } from "./chunk-5EJZE3FP.js";
@@ -268,18 +269,17 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-XH3KAV2G.js";
+} from "./chunk-MC4TLKEI.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD
 } from "./chunk-MS7GNABG.js";
-import "./chunk-7KJPO7YH.js";
-import "./chunk-OWXFBIB6.js";
+import "./chunk-CU6GJD55.js";
 import "./chunk-WZMH7II3.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-ZMY2P4L3.js";
+} from "./chunk-IWPYVAO2.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
@@ -287,6 +287,7 @@ import {
   ALL_PROVIDERS,
   APPROVAL_MODE_INFO,
   BTW_MAX_INPUT_LENGTH,
+  BranchPointInvalidError,
   ExtensionManager,
   GLOBAL_DUPLICATE_THRESHOLD,
   IMAGE_CAPABILITY,
@@ -410,25 +411,25 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-EBPLKY6U.js";
+} from "./chunk-4S5337WV.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
-import "./chunk-QPBFRWCP.js";
-import "./chunk-JRIVMPD2.js";
-import "./chunk-YILJKX2T.js";
-import "./chunk-D2RNVVH6.js";
+import "./chunk-DGZEMW5R.js";
+import "./chunk-WSH6GRKG.js";
+import "./chunk-CKSJECTU.js";
+import "./chunk-OVZPVYZB.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-I7BT2MME.js";
+import "./chunk-5EYKMUUY.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-AKBFSOC5.js";
-import "./chunk-DEDESZDL.js";
+import "./chunk-Y3YCSWG5.js";
+import "./chunk-UPDOZBWO.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -436,14 +437,17 @@ import {
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-5RUCD4ED.js";
-import "./chunk-KRXPRVGL.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-RWDNJBWN.js";
+import "./chunk-25EYDK42.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-YBVVOSOH.js";
-import "./chunk-CPFFU46D.js";
-import "./chunk-ULNWG62W.js";
+} from "./chunk-MIPFDQAF.js";
+import "./chunk-MLXTMF7H.js";
+import "./chunk-KV27IEHM.js";
+import "./chunk-E3DYKPYZ.js";
 import {
   GoalPersistenceUnavailableError,
   emptyGoalSnapshot,
@@ -451,11 +455,8 @@ import {
   parseGoalSnapshotV2,
   parseGoalStateCause,
   wrapUserPromptSubmitContext
-} from "./chunk-DPTMKFIH.js";
-import {
-  APPROVAL_MODES
-} from "./chunk-63FNZTWG.js";
-import "./chunk-3GM5DLBI.js";
+} from "./chunk-OMLJNPBE.js";
+import "./chunk-OXCMMLED.js";
 import {
   AgentOutputMessageCapture,
   addAgentInputMessageAttributes,
@@ -466,32 +467,32 @@ import {
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor,
   withDaemonSpan
-} from "./chunk-K34GJQOZ.js";
+} from "./chunk-TIGA2IVL.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-KLOMACIR.js";
+import "./chunk-XLLKYULU.js";
 import {
   runWithRuntimeContentGenerator
-} from "./chunk-VPV7WBVT.js";
+} from "./chunk-PT4I7NBA.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-2J3OJGTL.js";
 import {
   FORK_SUBAGENT_TYPE,
   getStartupContextLength,
   isSystemReminderContent
-} from "./chunk-TTRH3RTQ.js";
+} from "./chunk-SG7ZP5PG.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
-import "./chunk-FRHQQC2Z.js";
+import "./chunk-KBXKR5R2.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-DG4IQ6JG.js";
+} from "./chunk-GMIEIY3Y.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-KEC5FHLM.js";
-import "./chunk-2ZWH53I4.js";
+import "./chunk-ROIYNTHJ.js";
+import "./chunk-2B2BF7P7.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-TB4YFWXG.js";
-import "./chunk-D7QGE3RT.js";
+import "./chunk-YZHRN3CF.js";
+import "./chunk-FAAUPSY2.js";
 import {
   REASONING_EFFORT_TIERS,
   applyReasoningEffort
@@ -502,7 +503,7 @@ import {
   getToolCallPreparations
 } from "./chunk-GLCZKT5V.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-NLFLYSS4.js";
+import "./chunk-QFJ5JHQR.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -535,17 +536,17 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-4KM2SYK5.js";
+} from "./chunk-RVOJ2FBP.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-G6MUFRNI.js";
+} from "./chunk-CHHABXPE.js";
 import {
   runSideQuery
-} from "./chunk-LSRI3ND3.js";
-import "./chunk-PVXEJB66.js";
+} from "./chunk-MA2HEDVP.js";
+import "./chunk-XUJNK7Y6.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -553,20 +554,20 @@ import {
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-YIGGWOJE.js";
+} from "./chunk-6HY6IF3Z.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-KWX56CHZ.js";
+} from "./chunk-4PKCUT7F.js";
 import "./chunk-F6WFNA7U.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-FPGTNKCP.js";
-import "./chunk-4AOVQPJU.js";
-import "./chunk-PZW46OTB.js";
-import "./chunk-YBHUXEC6.js";
+import "./chunk-CPHEPGAO.js";
+import "./chunk-P7MPQI75.js";
+import "./chunk-FDGGZIYW.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
@@ -577,7 +578,7 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-N4SVADAV.js";
+} from "./chunk-EL5SXY3T.js";
 import "./chunk-HHJLM3WQ.js";
 import {
   sessionIdContext
@@ -588,12 +589,12 @@ import {
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-HOSVOUDK.js";
+} from "./chunk-BUQDLC2G.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-MELQSJOU.js";
+import "./chunk-AW4TRXOC.js";
 import {
   runExitCleanup
-} from "./chunk-OR64CU46.js";
+} from "./chunk-X26JYGTD.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -3700,10 +3701,11 @@ async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.
 }
 __name(buildAvailableCommandsSnapshot, "buildAvailableCommandsSnapshot");
 var Session = class {
-  constructor(id, config, client, settings, onActiveWorkChanged) {
+  constructor(id, config, client, settings, runExclusiveAutomaticHistoryMutation = (operation) => operation(), onActiveWorkChanged) {
     this.config = config;
     this.client = client;
     this.settings = settings;
+    this.runExclusiveAutomaticHistoryMutation = runExclusiveAutomaticHistoryMutation;
     this.onActiveWorkChanged = onActiveWorkChanged;
     this.sessionId = id;
     this.runtimeBaseDir = config.storage.getRuntimeBaseDir();
@@ -3829,6 +3831,7 @@ var Session = class {
   // on a session whose registries are already unregistered.
   disposed = false;
   closing = false;
+  historyMutationActive = false;
   closeGateCompletion = null;
   resolveCloseGate = null;
   unsubscribeChatRecordingFailure;
@@ -4050,6 +4053,12 @@ var Session = class {
     return publication;
   }
   async #drainGoalQueue() {
+    if (this.goalQueue.length === 0) return;
+    await this.runExclusiveAutomaticHistoryMutation(
+      () => this.#drainGoalQueueExclusive()
+    );
+  }
+  async #drainGoalQueueExclusive() {
     if (this.disposed || this.closing || this.goalProcessing || this.pendingPrompt || this.pendingPromptCompletion || this.cronProcessing || this.cronAbortController || this.notificationProcessing || this.notificationAbortController) {
       return;
     }
@@ -4748,6 +4757,12 @@ var Session = class {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
+    if (this.historyMutationActive) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Session history mutation is in progress"
+      );
+    }
     try {
       await this.config.assertCanStartTurn();
     } catch (error) {
@@ -4761,9 +4776,18 @@ var Session = class {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
+    if (this.historyMutationActive) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Session history mutation is in progress"
+      );
+    }
+  }
+  isTurnIdle() {
+    return !this.closing && !this.#hasActiveTurn();
   }
   isIdle() {
-    return !this.closing && !this.#hasActiveTurn() && this.collectActiveWorkHolds().length === 0;
+    return this.isTurnIdle() && this.collectActiveWorkHolds().length === 0;
   }
   /**
    * The Session's current active-work holds, derived on every call.
@@ -4815,9 +4839,29 @@ var Session = class {
   }
   #hasActiveTurn() {
     return Boolean(
-      this.pendingPrompt || this.pendingPromptCompletion || this.goalProcessing || this.cronProcessing || this.cronAbortController || this.cronCompletion || this.notificationProcessing || this.notificationAbortController || this.notificationCompletion
+      this.pendingPrompt || this.historyMutationActive || this.pendingPromptCompletion || this.goalProcessing || this.cronProcessing || this.cronAbortController || this.cronCompletion || this.notificationProcessing || this.notificationAbortController || this.notificationCompletion
     );
   }
+  beginHistoryMutation() {
+    if (this.closing) {
+      throw RequestError.invalidParams(void 0, "Session is closing");
+    }
+    if (this.#hasActiveTurn()) {
+      throw new RequestError(-32602, "Session is busy processing a turn", {
+        errorKind: "session_busy"
+      });
+    }
+    this.historyMutationActive = true;
+    let released = false;
+    return () => {
+      if (released) return;
+      released = true;
+      this.historyMutationActive = false;
+      if (this.disposed) return;
+      void this.#drainCronQueue();
+      void this.#drainNotificationQueue();
+    };
+  }
   beginClose() {
     if (this.closing) {
       throw RequestError.invalidParams(
@@ -5167,6 +5211,12 @@ var Session = class {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
+    if (this.historyMutationActive) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Session history mutation is in progress"
+      );
+    }
     if (modelPrompt !== void 0 && invocationContext === void 0) {
       throw RequestError.invalidParams(
         void 0,
@@ -5186,6 +5236,12 @@ var Session = class {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
+    if (this.historyMutationActive) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Session history mutation is in progress"
+      );
+    }
     if (admissionCancellation?.aborted) {
       return { stopReason: "cancelled" };
     }
@@ -5304,6 +5360,9 @@ var Session = class {
       this.todoStopGuard.suspend();
       return { stopReason: "cancelled" };
     }
+    const channelPromptTurn = params._meta?.[CHANNEL_PROMPT_META_KEY] === true;
+    const recording = this.config.getChatRecordingService();
+    const branchCheckpointCursor = scheduledGoalTurn === void 0 && !channelPromptTurn ? recording?.getBranchCheckpointCursor() : void 0;
     if (todoStopGuardPreparation.startsWorkChain) {
       this.#clearTodoStopGuardQueuedPromptWait();
       this.todoStopGuard.startOrdinaryPrompt();
@@ -5315,7 +5374,6 @@ var Session = class {
       ...channelDelivery ? { channelDelivery: { finalText: "" } } : {},
       agentOutput: new AgentOutputMessageCapture(this.config)
     };
-    const channelPromptTurn = params._meta?.[CHANNEL_PROMPT_META_KEY] === true;
     let resolveCompletion;
     this.pendingPromptCompletion = new Promise((resolve6) => {
       resolveCompletion = resolve6;
@@ -5343,12 +5401,36 @@ var Session = class {
         goalTurn,
         channelPromptTurn
       );
-      promptResult = result;
+      let branchPoint;
+      if (recording && branchCheckpointCursor) {
+        try {
+          branchPoint = await recording.recordBranchCheckpointTransaction({
+            cursor: branchCheckpointCursor,
+            stopReason: result.stopReason
+          });
+        } catch (error) {
+          debugLogger6.warn(
+            "Failed to record branch checkpoint; completing the turn without a branch point",
+            error
+          );
+        }
+      }
+      const completedResult = branchPoint ? {
+        ...result,
+        _meta: {
+          ...result._meta,
+          "qwen.branchPoint": {
+            assistantRecordUuid: branchPoint.assistantRecordUuid,
+            checkpointUuid: branchPoint.checkpointUuid
+          }
+        }
+      } : result;
+      promptResult = completedResult;
       releasePendingSend();
       void this.#drainCronQueue();
       void this.#drainNotificationQueue();
-      this.#maybeEmitFollowupSuggestion(result);
-      if (channelDelivery && result.stopReason === "end_turn") {
+      this.#maybeEmitFollowupSuggestion(completedResult);
+      if (channelDelivery && completedResult.stopReason === "end_turn") {
         this.#scheduleChannelDelivery({
           sessionId: this.sessionId,
           deliveryId: channelDelivery.deliveryId,
@@ -5360,7 +5442,7 @@ var Session = class {
           promptId: channelDelivery.deliveryId
         });
       }
-      return result;
+      return completedResult;
     } catch (error) {
       promptFailed = true;
       if (error instanceof SessionWriterError) {
@@ -7501,6 +7583,15 @@ ${this.pendingRecoveredAgentsNotice}
     if (this.notificationProcessing) return;
     if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
     if (this.#nextCronQueueIndex() < 0) return;
+    await this.runExclusiveAutomaticHistoryMutation(
+      () => this.#drainCronQueueExclusive()
+    );
+  }
+  async #drainCronQueueExclusive() {
+    if (this.disposed || this.closing || this.cronProcessing) return;
+    if (this.pendingPrompt || this.notificationProcessing) return;
+    if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
+    if (this.#nextCronQueueIndex() < 0) return;
     try {
       await this.assertCanStartTurn();
     } catch (error) {
@@ -8094,6 +8185,18 @@ ${this.pendingRecoveredAgentsNotice}
     if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
     if (this.notificationQueue.length === 0) return;
     if (this.#nextNotificationQueueIndex() < 0) return;
+    await this.runExclusiveAutomaticHistoryMutation(
+      () => this.#drainNotificationQueueExclusive()
+    );
+  }
+  async #drainNotificationQueueExclusive() {
+    if (this.disposed || this.closing || this.notificationProcessing) return;
+    if (this.pendingPrompt || this.cronProcessing || this.cronAbortController) {
+      return;
+    }
+    if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
+    if (this.notificationQueue.length === 0) return;
+    if (this.#nextNotificationQueueIndex() < 0) return;
     try {
       await this.assertCanStartTurn();
     } catch (error) {
@@ -11523,11 +11626,15 @@ async function shutdownSessionConfig(config) {
   }
 }
 __name(shutdownSessionConfig, "shutdownSessionConfig");
-async function waitForSessionDrain(operation, timeoutMs, kind) {
+async function waitForSessionDrain(operation, timeoutMs, kind, displayTimeoutMs) {
   let timer;
   const timeout = new Promise((_, reject) => {
     timer = setTimeout(
-      () => reject(new Error(`Session ${kind} timed out after ${timeoutMs}ms`)),
+      () => reject(
+        new Error(
+          `Session ${kind} timed out after ${displayTimeoutMs ?? timeoutMs}ms`
+        )
+      ),
       timeoutMs
     );
     timer.unref();
@@ -11833,6 +11940,15 @@ function getLoadReplayPageSize(params) {
   return value;
 }
 __name(getLoadReplayPageSize, "getLoadReplayPageSize");
+function deriveForkBaseName(name, recording, sessionId) {
+  if (typeof name === "string" && name.trim().length > 0) {
+    return name.trim();
+  }
+  const existingTitle = recording?.getCurrentCustomTitle();
+  const stripped = existingTitle?.replace(/\s*\(Branch(?:\s+\d+)?\)\s*$/, "").trim();
+  return stripped && stripped.length > 0 ? stripped : sessionId.slice(0, 8);
+}
+__name(deriveForkBaseName, "deriveForkBaseName");
 function createHiddenWorkspaceMemoryConfig(config) {
   return new Proxy(config, {
     get(target, prop) {
@@ -13839,6 +13955,7 @@ var QwenAgent = class {
     __name(this, "QwenAgent");
   }
   sessions = /* @__PURE__ */ new Map();
+  historyMutationTails = /* @__PURE__ */ new Map();
   startingSessionIds = /* @__PURE__ */ new Set();
   activePromptCalls = /* @__PURE__ */ new Map();
   workspaceMcpDiscoveryConfig;
@@ -13902,6 +14019,43 @@ var QwenAgent = class {
       throw new SessionWriterUnavailableError();
     }
   }
+  async runExclusiveHistoryMutation(sessionId, operation, waitTimeoutMs, waitDisplayTimeoutMs) {
+    const previous = this.historyMutationTails.get(sessionId) ?? Promise.resolve();
+    let release;
+    const gate = new Promise((resolve6) => {
+      release = resolve6;
+    });
+    const current = previous.then(() => gate);
+    this.historyMutationTails.set(sessionId, current);
+    try {
+      if (waitTimeoutMs === void 0) {
+        await previous;
+      } else {
+        await waitForSessionDrain(
+          previous,
+          waitTimeoutMs,
+          "close",
+          waitDisplayTimeoutMs
+        );
+      }
+    } catch (error) {
+      release();
+      void current.then(() => {
+        if (this.historyMutationTails.get(sessionId) === current) {
+          this.historyMutationTails.delete(sessionId);
+        }
+      });
+      throw error;
+    }
+    try {
+      return await operation();
+    } finally {
+      release();
+      if (this.historyMutationTails.get(sessionId) === current) {
+        this.historyMutationTails.delete(sessionId);
+      }
+    }
+  }
   rejectUnsupportedGuardedHiddenAgent(operation) {
     if (this.managedToolInvocationGuard && this.externalToolGuardProviderAttached) {
       throw RequestError.invalidParams(
@@ -14401,11 +14555,10 @@ var QwenAgent = class {
     }
     const recorder = session.getConfig().getChatRecordingService();
     const requireFlush = opts?.requireFlush === true;
-    if (requireFlush) {
-      await recorder?.flush();
-    }
+    if (requireFlush) await recorder?.flush();
     const drainTimeoutMs = opts?.drainTimeoutMs ?? SESSION_DRAIN_TIMEOUT_MS;
     const cancelClose = opts?.waitForCloseGate ? await beginSessionCloseAfterCurrentGate(session, drainTimeoutMs) : session.beginClose();
+    const conditionalDrainDeadline = opts?.onlyIfUnheld ? Date.now() + drainTimeoutMs : void 0;
     if (opts?.onlyIfUnheld) {
       const holds = session.collectActiveWorkHolds();
       if (holds.length > 0) {
@@ -14413,13 +14566,24 @@ var QwenAgent = class {
         return { closed: false, holds };
       }
     }
-    for (const [requestId, generation] of this.generationControllers) {
-      if (generation.sessionId !== sessionId) continue;
-      generation.controller.abort();
-      this.generationControllers.delete(requestId);
-    }
     let removedFromStore = false;
     try {
+      if (opts?.onlyIfUnheld) {
+        await waitForSessionDrain(
+          session.waitForActiveTurnsToSettle(),
+          drainTimeoutMs,
+          "close"
+        );
+        const holds = session.collectActiveWorkHolds();
+        if (holds.length > 0) {
+          return { closed: false, holds };
+        }
+      }
+      for (const [requestId, generation] of this.generationControllers) {
+        if (generation.sessionId !== sessionId) continue;
+        generation.controller.abort();
+        this.generationControllers.delete(requestId);
+      }
       await waitForSessionDrain(
         (async () => {
           try {
@@ -14431,41 +14595,68 @@ var QwenAgent = class {
           }
           await session.waitForActiveTurnsToSettle();
         })(),
-        drainTimeoutMs,
-        "close"
+        conditionalDrainDeadline === void 0 ? drainTimeoutMs : Math.max(1, conditionalDrainDeadline - Date.now()),
+        "close",
+        // Report the shared budget, not the phase-2 residue — a residue like
+        // "1ms" hides that the settle phase consumed the budget and sends
+        // oncall grepping for a timeout setting that does not exist.
+        drainTimeoutMs
       );
-      if (opts?.onlyIfUnheld) {
-        const holds = session.collectActiveWorkHolds();
-        if (holds.length > 0) {
-          return { closed: false, holds };
-        }
-      }
-      recorder?.finalize();
-      let flushError;
-      try {
-        await recorder?.flush();
-      } catch (error) {
-        flushError = error;
-      }
-      if (flushError !== void 0 && requireFlush) {
-        throw flushError;
-      }
-      let closeError;
-      try {
-        await recorder?.close();
-      } catch (error) {
-        closeError = error;
-      }
-      if (recorder?.hasWriteOwnership()) {
-        throw closeError ?? new SessionWriterUnavailableError();
-      }
-      const cleanupErrors = [];
-      if (flushError !== void 0) cleanupErrors.push(flushError);
-      if (closeError !== void 0) cleanupErrors.push(closeError);
-      await this.removeStoredSessionEntry(sessionId, session, cleanupErrors, {
-        shutdownConfig: opts?.shutdownConfig
-      });
-      removedFromStore = true;
+      const blockedByHolds = await this.runExclusiveHistoryMutation(
+        sessionId,
+        async () => {
+          if (this.sessions.get(sessionId) !== session) {
+            removedFromStore = true;
+            return void 0;
+          }
+          if (opts?.onlyIfUnheld) {
+            const holds = session.collectActiveWorkHolds();
+            if (holds.length > 0) {
+              return { closed: false, holds };
+            }
+          }
+          recorder?.finalize();
+          let flushError;
+          try {
+            await recorder?.flush();
+          } catch (error) {
+            flushError = error;
+          }
+          if (flushError !== void 0 && requireFlush) {
+            throw flushError;
+          }
+          let closeError;
+          try {
+            await recorder?.close();
+          } catch (error) {
+            closeError = error;
+          }
+          if (recorder?.hasWriteOwnership()) {
+            throw closeError ?? new SessionWriterUnavailableError();
+          }
+          const cleanupErrors = [];
+          if (flushError !== void 0) cleanupErrors.push(flushError);
+          if (closeError !== void 0) cleanupErrors.push(closeError);
+          await this.removeStoredSessionEntry(
+            sessionId,
+            session,
+            cleanupErrors,
+            {
+              shutdownConfig: opts?.shutdownConfig
+            }
+          );
+          removedFromStore = true;
+          return void 0;
+        },
+        // The mutation wait shares the conditional close's budget too, or
+        // the whole round trip can outlast the daemon's outer wait — the
+        // coupling the drain budget exists to keep. The mutation body
+        // itself stays untimed, so the guarantee remains approximate. The
+        // message reports the shared budget, not the residue.
+        conditionalDrainDeadline === void 0 ? drainTimeoutMs : Math.max(1, conditionalDrainDeadline - Date.now()),
+        drainTimeoutMs
+      );
+      if (blockedByHolds) return blockedByHolds;
     } finally {
       if (!removedFromStore) cancelClose();
     }
@@ -14573,7 +14764,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.12";
+    const version = "0.21.13";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -15480,6 +15671,9 @@ var QwenAgent = class {
         throw error;
       }
     }
+    for (const call of this.activePromptCalls.get(sessionId) ?? []) {
+      call.controller.abort();
+    }
   }
   loadPermissionSettings(cwd) {
     this.settings = loadSettings(cwd);
@@ -19814,9 +20008,25 @@ ${outputText}
             `Session not found for id: ${sessionId}`
           );
         }
+        if (!session.isTurnIdle()) {
+          throw new RequestError(
+            -32602,
+            "Cannot rewind while a prompt is running",
+            {
+              errorKind: "session_busy"
+            }
+          );
+        }
+        const rawPromptId = params["promptId"];
+        if (rawPromptId !== void 0 && typeof rawPromptId !== "string") {
+          throw new RequestError(-32602, "Invalid promptId format", {
+            errorKind: "invalid_rewind_target"
+          });
+        }
+        const promptId = typeof rawPromptId === "string" ? rawPromptId : void 0;
         let turnIndex = params["targetTurnIndex"];
-        const promptId = params["promptId"];
-        if (promptId && (turnIndex === void 0 || turnIndex === null)) {
+        const resolveFromPromptId = promptId !== void 0 && (turnIndex === void 0 || turnIndex === null);
+        if (resolveFromPromptId) {
           const prefix = sessionId + "########";
           if (!promptId.startsWith(prefix)) {
             throw new RequestError(-32602, "Invalid promptId format", {
@@ -19831,104 +20041,113 @@ ${outputText}
               { errorKind: "invalid_rewind_target" }
             );
           }
-          const fhs = session.getConfig().getFileHistoryService();
-          const snapshots = fhs.getSnapshots();
-          const snapshotIdx = snapshots.findIndex(
-            (s) => s.promptId === promptId
-          );
-          if (snapshotIdx < 0) {
-            throw new RequestError(
-              -32602,
-              "Snapshot not found for the given promptId",
-              { errorKind: "invalid_rewind_target" }
-            );
-          }
-          turnIndex = snapshotIdx;
-        }
-        if (!Number.isInteger(turnIndex) || turnIndex < 0) {
+        } else if (!Number.isInteger(turnIndex) || turnIndex < 0) {
           throw RequestError.invalidParams(
             void 0,
             "Invalid or missing targetTurnIndex"
           );
         }
-        const rewindFiles = params["rewindFiles"] !== false;
-        const historyBeforeRewind = session.captureHistorySnapshot();
-        let rewindResult;
-        try {
-          rewindResult = session.rewindToTurn(turnIndex, {
-            rewindFiles
-          });
-        } catch (err) {
-          if (err instanceof RequestError) {
-            const msg = err.message;
-            if (msg.includes("Cannot rewind while a prompt is running")) {
-              throw new RequestError(err.code, msg, {
-                errorKind: "session_busy"
-              });
-            }
-            if (msg.includes("compressed or does not exist")) {
-              throw new RequestError(err.code, msg, {
-                errorKind: "invalid_rewind_target"
-              });
+        return await this.runExclusiveHistoryMutation(sessionId, async () => {
+          if (resolveFromPromptId) {
+            const fhs = session.getConfig().getFileHistoryService();
+            const snapshots = fhs.getSnapshots();
+            const snapshotIdx = snapshots.findIndex(
+              (s) => s.promptId === promptId
+            );
+            if (snapshotIdx < 0) {
+              throw new RequestError(
+                -32602,
+                "Snapshot not found for the given promptId",
+                { errorKind: "invalid_rewind_target" }
+              );
             }
+            turnIndex = snapshotIdx;
           }
-          throw err;
-        }
-        let filesChanged = [];
-        let filesFailed = [];
-        if (rewindFiles && promptId) {
-          const fhs = session.getConfig().getFileHistoryService();
+          const rewindFiles = params["rewindFiles"] !== false;
+          const historyBeforeRewind = session.captureHistorySnapshot();
+          let rewindResult;
+          let releaseHistoryMutation;
           try {
-            const fileResult = await fhs.rewind(promptId, true);
-            filesChanged = fileResult.filesChanged;
-            filesFailed = fileResult.filesFailed;
+            rewindResult = session.rewindToTurn(turnIndex, {
+              rewindFiles
+            });
+            releaseHistoryMutation = session.beginHistoryMutation();
           } catch (err) {
-            const reason = err instanceof Error ? err.message : String(err);
-            debugLogger8.error(
-              `[ACP] File-history rewind failed for session=${sessionId} promptId=${promptId}: ${reason}`
-            );
-            filesFailed = [`file-history-rewind: ${reason}`];
+            if (err instanceof RequestError) {
+              const msg = err.message;
+              if (msg.includes("Cannot rewind while a prompt is running") || msg.includes("Session is busy processing a turn")) {
+                throw new RequestError(err.code, msg, {
+                  errorKind: "session_busy"
+                });
+              }
+              if (msg.includes("compressed or does not exist")) {
+                throw new RequestError(err.code, msg, {
+                  errorKind: "invalid_rewind_target"
+                });
+              }
+            }
+            throw err;
           }
-        }
-        let artifactSnapshot;
-        let artifactSnapshotUnavailable;
-        try {
-          const config = session.getConfig();
-          const recording = config.getChatRecordingService();
-          await recording?.flush();
-          const loadAuthoritative = /* @__PURE__ */ __name(() => config.getSessionService().loadSession(sessionId), "loadAuthoritative");
-          const sessionData = recording ? await recording.runWithWriteBarrier(loadAuthoritative) : await loadAuthoritative();
-          if (sessionData === void 0) {
-            artifactSnapshotUnavailable = "session data unavailable after rewind";
-          } else if (sessionData.artifactSnapshot) {
-            artifactSnapshot = sessionData.artifactSnapshot;
-          } else {
-            artifactSnapshot = {
-              v: SESSION_ARTIFACT_PERSISTENCE_VERSION,
-              sessionId,
-              sequence: 0,
-              artifacts: [],
-              tombstonedIds: [],
-              stickyEphemeralIds: [],
-              warnings: []
+          try {
+            let filesChanged = [];
+            let filesFailed = [];
+            if (rewindFiles && promptId) {
+              const fhs = session.getConfig().getFileHistoryService();
+              try {
+                const fileResult = await fhs.rewind(promptId, true);
+                filesChanged = fileResult.filesChanged;
+                filesFailed = fileResult.filesFailed;
+              } catch (err) {
+                const reason = err instanceof Error ? err.message : String(err);
+                debugLogger8.error(
+                  `[ACP] File-history rewind failed for session=${sessionId} promptId=${promptId}: ${reason}`
+                );
+                filesFailed = [`file-history-rewind: ${reason}`];
+              }
+            }
+            let artifactSnapshot;
+            let artifactSnapshotUnavailable;
+            try {
+              const config = session.getConfig();
+              const recording = config.getChatRecordingService();
+              await recording?.flush();
+              const loadAuthoritative = /* @__PURE__ */ __name(() => config.getSessionService().loadSession(sessionId), "loadAuthoritative");
+              const sessionData = recording ? await recording.runWithWriteBarrier(loadAuthoritative) : await loadAuthoritative();
+              if (sessionData === void 0) {
+                artifactSnapshotUnavailable = "session data unavailable after rewind";
+              } else if (sessionData.artifactSnapshot) {
+                artifactSnapshot = sessionData.artifactSnapshot;
+              } else {
+                artifactSnapshot = {
+                  v: SESSION_ARTIFACT_PERSISTENCE_VERSION,
+                  sessionId,
+                  sequence: 0,
+                  artifacts: [],
+                  tombstonedIds: [],
+                  stickyEphemeralIds: [],
+                  warnings: []
+                };
+              }
+            } catch (err) {
+              const reason = err instanceof Error ? err.message : String(err);
+              artifactSnapshotUnavailable = "artifact snapshot unavailable after rewind";
+              debugLogger8.warn(
+                `[ACP] Failed to rebuild artifact snapshot after rewind for session=${sessionId}: ${reason}`
+              );
+            }
+            return {
+              success: true,
+              historyBeforeRewind,
+              ...rewindResult,
+              filesChanged,
+              filesFailed,
+              ...artifactSnapshot ? { artifactSnapshot } : {},
+              ...artifactSnapshotUnavailable ? { artifactSnapshotUnavailable } : {}
             };
+          } finally {
+            releaseHistoryMutation();
           }
-        } catch (err) {
-          const reason = err instanceof Error ? err.message : String(err);
-          artifactSnapshotUnavailable = "artifact snapshot unavailable after rewind";
-          debugLogger8.warn(
-            `[ACP] Failed to rebuild artifact snapshot after rewind for session=${sessionId}: ${reason}`
-          );
-        }
-        return {
-          success: true,
-          historyBeforeRewind,
-          ...rewindResult,
-          filesChanged,
-          filesFailed,
-          ...artifactSnapshot ? { artifactSnapshot } : {},
-          ...artifactSnapshotUnavailable ? { artifactSnapshotUnavailable } : {}
-        };
+        });
       }
       case "qwen/session/loadUpdates": {
         const sessionId = params["sessionId"];
@@ -20031,6 +20250,16 @@ ${outputText}
           );
         }
         const name = params["name"];
+        const atRecordId = params["atRecordId"];
+        if (atRecordId !== void 0 && typeof atRecordId !== "string") {
+          throw RequestError.invalidParams(void 0, "Invalid atRecordId");
+        }
+        if (isSideTask && atRecordId !== void 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "atRecordId is not supported for side tasks"
+          );
+        }
         const sourceSession = this.sessions.get(sessionId);
         if (!sourceSession) {
           throw new RequestError(-32004, `Session not found: ${sessionId}`, {
@@ -20038,60 +20267,77 @@ ${outputText}
             sessionId
           });
         }
+        if (!isSideTask) {
+          if (!sourceSession.isTurnIdle()) {
+            throw new RequestError(
+              -32602,
+              "Cannot branch while a prompt is running",
+              { errorKind: "session_busy" }
+            );
+          }
+          try {
+            return await this.runExclusiveHistoryMutation(
+              sessionId,
+              async () => {
+                await sourceSession.assertCanStartTurn();
+                const releaseHistoryMutation = sourceSession.beginHistoryMutation();
+                try {
+                  const sourceConfig2 = sourceSession.getConfig();
+                  const recording2 = sourceConfig2.getChatRecordingService();
+                  const sessionService2 = sourceConfig2.getSessionService();
+                  const baseName = deriveForkBaseName(
+                    name,
+                    recording2,
+                    sessionId
+                  );
+                  const title2 = await computeUniqueBranchTitle(
+                    baseName,
+                    sessionService2
+                  );
+                  const newSessionId2 = randomUUID2();
+                  const fork2 = /* @__PURE__ */ __name(() => sessionService2.forkSession(sessionId, newSessionId2, {
+                    title: title2,
+                    ...atRecordId !== void 0 ? { atRecordId } : {}
+                  }), "fork");
+                  if (recording2) {
+                    await recording2.runWithWriteBarrier(fork2);
+                  } else {
+                    await fork2();
+                  }
+                  return { newSessionId: newSessionId2, title: title2, displayName: title2 };
+                } finally {
+                  releaseHistoryMutation();
+                }
+              }
+            );
+          } catch (error) {
+            if (error instanceof BranchPointInvalidError) {
+              throw new RequestError(-32009, error.message, {
+                errorKind: "branch_point_invalid",
+                recordId: error.recordId
+              });
+            }
+            throw error;
+          }
+        }
         const sourceConfig = sourceSession.getConfig();
         const recording = sourceConfig.getChatRecordingService();
-        if (recording) {
-          await recording.flush();
-        }
-        const newSessionId = randomUUID2();
+        if (recording) await recording.flush();
         const sessionService = sourceConfig.getSessionService();
-        const fork = /* @__PURE__ */ __name(() => isSideTask ? sessionService.forkSession(sessionId, newSessionId, {
+        const title = deriveForkBaseName(name, recording, sessionId);
+        const newSessionId = randomUUID2();
+        const fork = /* @__PURE__ */ __name(() => sessionService.forkSession(sessionId, newSessionId, {
           source: {
             sourceType: "side_task",
             sourceId: sessionId
-          }
-        }) : sessionService.forkSession(sessionId, newSessionId), "fork");
-        if (isSideTask && recording) {
+          },
+          title
+        }), "fork");
+        if (recording) {
           await recording.runWithWriteBarrier(fork);
         } else {
           await fork();
         }
-        let title;
-        try {
-          let baseName;
-          if (typeof name === "string" && name.trim().length > 0) {
-            baseName = name.trim();
-          } else {
-            const existingTitle = recording?.getCurrentCustomTitle();
-            const stripped = existingTitle?.replace(/\s*\(Branch(?:\s+\d+)?\)\s*$/, "").trim();
-            if (stripped && stripped.length > 0) {
-              baseName = stripped;
-            } else {
-              baseName = sessionId.slice(0, 8);
-            }
-          }
-          title = isSideTask ? baseName : await computeUniqueBranchTitle(baseName, sessionService);
-          const renamed = await sessionService.renameSession(
-            newSessionId,
-            title,
-            "manual"
-          );
-          if (!renamed) {
-            throw new RequestError(
-              -32603,
-              `Failed to set title on forked session ${newSessionId}`,
-              { errorKind: "internal", sessionId: newSessionId }
-            );
-          }
-        } catch (err) {
-          sessionService.removeSession(newSessionId).catch((rmErr) => {
-            process.stderr.write(
-              `qwen serve: failed to clean up orphan session ${newSessionId}: ${rmErr instanceof Error ? rmErr.message : rmErr}
-`
-            );
-          });
-          throw err;
-        }
         return { newSessionId, title, displayName: title };
       }
       case "qwen/settings/getCore": {
@@ -20876,6 +21122,7 @@ ${outputText}
       config,
       this.connection,
       settings,
+      (operation) => this.runExclusiveHistoryMutation(sessionId, operation),
       () => this.activeWorkReporter?.notifyChanged()
     );
     let published = false;