@qwen-code/qwen-code 0.21.12 → 0.21.14-preview.0

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

@@ -13,17 +13,22 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-X5SLJOMF.js";
+} from "./chunk-NV6LW6FT.js";
 import {
   getAvailableCommands,
+  getSlashCommandFirstToken,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-QSD4UH74.js";
+} from "./chunk-XO24LIZC.js";
+import {
+  collectContextData,
+  formatContextUsageText
+} from "./chunk-X3YA3YGG.js";
 import {
   recomputeMcpGating
-} from "./chunk-CIDQISGM.js";
+} from "./chunk-SA7GBPEA.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -31,44 +36,40 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-IX4PWUDU.js";
+} from "./chunk-KSGWAYNE.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-4XA4QIUA.js";
+} from "./chunk-PMS7O6SA.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-MDNUCDKZ.js";
+} from "./chunk-73G3Z7QS.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-SNQZZ765.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-OYWVIXHT.js";
+import "./chunk-2M55OBEB.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-5AFGJNY6.js";
+} from "./chunk-WVIABDXV.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-QEJZUXSK.js";
+import "./chunk-K3CECR5C.js";
+import "./chunk-LRDB2OLB.js";
+import "./chunk-4V4DFJBS.js";
+import "./chunk-YAF2MQZ6.js";
+import {
+  computeCpuPercent
+} from "./chunk-LBOVL47Y.js";
+import "./chunk-RAQBBGS6.js";
+import "./chunk-6H67XLET.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -91,7 +92,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-CZ4OWGQQ.js";
+} from "./chunk-ZXEAEZFN.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -99,11 +100,13 @@ import {
   ToolCallEmitter,
   createTranscriptMessageUpdate,
   createTranscriptUsageUpdate,
-  hasFullSessionContext
-} from "./chunk-UI5UGEF4.js";
-import "./chunk-TMFWI4RC.js";
-import "./chunk-4NFY2S7N.js";
-import "./chunk-V6OBVAST.js";
+  hasFullSessionContext,
+  observeAcpToolResultProjection,
+  observeAcpToolResultWire
+} from "./chunk-EOCQCNV4.js";
+import "./chunk-OVY67CYC.js";
+import "./chunk-E7REAOTN.js";
+import "./chunk-57KOJ2KZ.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-3Z43GZUQ.js";
@@ -121,18 +124,25 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-YX2RDGAL.js";
+} from "./chunk-SBRIBTYN.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-LCX5B364.js";
+} from "./chunk-PPTM4O4R.js";
 import {
   readVoiceModel
-} from "./chunk-VIFA5VJD.js";
-import "./chunk-H7TMVHKE.js";
-import "./chunk-NTTBXH7U.js";
-import "./chunk-RQJA2YYO.js";
+} from "./chunk-7OCSX7FC.js";
+import "./chunk-WGHHA7ZH.js";
+import "./chunk-UGK4K2N2.js";
+import "./chunk-G6FFFICU.js";
+import {
+  SESSION_SOURCE_META_KEY,
+  parseSessionSource
+} from "./chunk-VGAAAMRD.js";
+import "./chunk-7U5G6JXI.js";
+import "./chunk-WCCLLK7X.js";
+import "./chunk-OCPBI7J5.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -141,32 +151,26 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-ROIJYS5K.js";
+} from "./chunk-ISRHAMNL.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-BGXZBI5B.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-WM3LUQLO.js";
-import "./chunk-IH4Z54RJ.js";
+import "./chunk-2JXDFSVE.js";
+import "./chunk-HGPMOXLZ.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-BSR5AXZR.js";
+import "./chunk-NRPXRNN4.js";
 import "./chunk-45NQKMYB.js";
-import "./chunk-OK47XBYH.js";
+import "./chunk-5IYS4WWR.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-FCTLOVYW.js";
 import {
   ndJsonStream
-} from "./chunk-DAV4QFD5.js";
+} from "./chunk-BQWNIPTE.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -174,9 +178,9 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-HTYND72J.js";
+} from "./chunk-UC67T4SF.js";
 import "./chunk-ZLCT4C5A.js";
-import "./chunk-V6WHFGST.js";
+import "./chunk-DRKYT2TR.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_HEARTBEAT_META_KEY,
@@ -188,6 +192,7 @@ import {
   CHANNEL_STARTUP_PROFILE_VERSION,
   CLIENT_MCP_OVER_WS_CONFIG_FLAG,
   DAEMON_CHANNEL_DELIVERY_META_KEY,
+  DAEMON_MEDIA_REFERENCES_META_KEY,
   DAEMON_MODEL_PROMPT_META_KEY,
   DAEMON_PROMPT_DISPLAY_TEXT_META_KEY,
   LOAD_REPLAY_BULK_MODE,
@@ -206,7 +211,7 @@ import {
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-FQDCO3CJ.js";
+} from "./chunk-WP4WIUOJ.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -227,7 +232,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 +241,11 @@ import {
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-IW6RQPQB.js";
+import "./chunk-H4A72DE5.js";
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-3LDGOQXZ.js";
+} from "./chunk-QECSDJET.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -249,9 +254,9 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-3GDBZJD6.js";
+} from "./chunk-OLZSWUZR.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-FA5K6YI2.js";
+import "./chunk-YFPZ3NNC.js";
 import "./chunk-GOXKNSDZ.js";
 import {
   getSystemDefaultsPath,
@@ -260,7 +265,7 @@ import {
 import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-IRSLAS4M.js";
+} from "./chunk-IOTPI425.js";
 import {
   SUPPORTED_LANGUAGES
 } from "./chunk-5EJZE3FP.js";
@@ -268,18 +273,17 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-XH3KAV2G.js";
+} from "./chunk-SGLPDKRT.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD
-} from "./chunk-MS7GNABG.js";
-import "./chunk-7KJPO7YH.js";
-import "./chunk-OWXFBIB6.js";
+} from "./chunk-CXJHQVEK.js";
+import "./chunk-6DFPR7CS.js";
 import "./chunk-WZMH7II3.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-ZMY2P4L3.js";
+} from "./chunk-YXC7JYUI.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
@@ -287,6 +291,7 @@ import {
   ALL_PROVIDERS,
   APPROVAL_MODE_INFO,
   BTW_MAX_INPUT_LENGTH,
+  BranchPointInvalidError,
   ExtensionManager,
   GLOBAL_DUPLICATE_THRESHOLD,
   IMAGE_CAPABILITY,
@@ -317,6 +322,8 @@ import {
   SessionWriterError,
   SessionWriterUnavailableError,
   TURN_INTERRUPTION_HISTORY_TAIL_COUNT,
+  TURN_RESULT_CODE_TEXT_TRUNCATED,
+  TURN_RESULT_TEXT_MAX_CHARS,
   WorkspaceMcpBudget,
   abortGoalForStopHookCap,
   acquireSleepInhibitor,
@@ -381,12 +388,15 @@ import {
   isDenialFallbackReason,
   isGatedMcpScope,
   isPlanModeBlocked,
+  isTurnResultRecordPayload,
   markDuplicateProviderToolCallResponseSent,
   matchesAnyServerPattern,
   mcpServerRequiresOAuth,
   needsConfirmation,
   normalizeEventPayload,
   normalizeSnapshotPayload,
+  normalizeTurnResultError,
+  observeToolResultBoundary,
   persistPermissionOutcome,
   projectGoalStateToLegacy,
   readManyFiles,
@@ -406,29 +416,31 @@ import {
   shouldHaltOnTurnToolCallCap,
   shouldRunAutoModeForCall,
   subagentGenerator,
+  toolResultBoundaryArtifact,
+  toolResultPartDiagnosticValues,
   truncateNotificationLabel,
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-EBPLKY6U.js";
+} from "./chunk-XC377TLN.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-FS5NGKWC.js";
+import "./chunk-SLILKYV2.js";
+import "./chunk-NVRMCWTP.js";
+import "./chunk-AKBOLMUF.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-I7BT2MME.js";
+import "./chunk-SR2LYSMT.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-AKBFSOC5.js";
-import "./chunk-DEDESZDL.js";
+import "./chunk-OBJYN4MX.js";
+import "./chunk-2C6HJMG3.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -436,14 +448,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-WPVUOVYX.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 +466,8 @@ import {
   parseGoalSnapshotV2,
   parseGoalStateCause,
   wrapUserPromptSubmitContext
-} from "./chunk-DPTMKFIH.js";
-import {
-  APPROVAL_MODES
-} from "./chunk-63FNZTWG.js";
-import "./chunk-3GM5DLBI.js";
+} from "./chunk-4ZMS3JCR.js";
+import "./chunk-DGJ7O55J.js";
 import {
   AgentOutputMessageCapture,
   addAgentInputMessageAttributes,
@@ -466,43 +478,42 @@ import {
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor,
   withDaemonSpan
-} from "./chunk-K34GJQOZ.js";
+} from "./chunk-OO4FKHLO.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-I3N2Z25H.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
 } from "./chunk-KM73TBQ4.js";
-import "./chunk-MPHPFVKK.js";
 import "./chunk-AXMWHKXA.js";
 import {
   getToolCallPreparations
 } from "./chunk-GLCZKT5V.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-NLFLYSS4.js";
+import "./chunk-QFJ5JHQR.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -516,11 +527,9 @@ import {
   apiActivityTracker,
   formatFullTurnVisionNotice,
   formatVisionBridgeNotice,
-  getAllGeminiMdFilenames,
   getFullTurnVisionModelSelector,
   getInvocationContext,
   getMCPServerStatus,
-  getSpecificMimeType,
   hasImageParts,
   logConversationFinishedEvent,
   logLoopDetected,
@@ -535,17 +544,21 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-4KM2SYK5.js";
+} from "./chunk-KC4WMLZO.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
+import {
+  getAllGeminiMdFilenames,
+  getSpecificMimeType
+} from "./chunk-3PWCMXIR.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 +566,21 @@ import {
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-YIGGWOJE.js";
+} from "./chunk-6HY6IF3Z.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-KWX56CHZ.js";
+} from "./chunk-QIHHJKXT.js";
 import "./chunk-F6WFNA7U.js";
-import "./chunk-46UV252V.js";
+import "./chunk-WZAD4ZNJ.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-FPGTNKCP.js";
-import "./chunk-4AOVQPJU.js";
-import "./chunk-PZW46OTB.js";
-import "./chunk-YBHUXEC6.js";
+import "./chunk-YHC2EYYG.js";
+import "./chunk-CPHEPGAO.js";
+import "./chunk-DVR7XKO5.js";
+import "./chunk-YECDICIO.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
@@ -577,23 +591,23 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-N4SVADAV.js";
+} from "./chunk-XT4RKHVE.js";
 import "./chunk-HHJLM3WQ.js";
 import {
   sessionIdContext
-} from "./chunk-K5IDV3PC.js";
+} from "./chunk-D34RDOLP.js";
 import {
   Storage,
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-HOSVOUDK.js";
+} from "./chunk-BUQDLC2G.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-MELQSJOU.js";
+import "./chunk-TNPWODIZ.js";
 import {
   runExitCleanup
-} from "./chunk-OR64CU46.js";
+} from "./chunk-L6CCLB3G.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -2212,6 +2226,7 @@ var SubAgentTracker = class {
         success: event.success,
         message: event.responseParts ?? [],
         resultDisplay: event.resultDisplay,
+        boundaryArtifact: event.boundaryArtifact,
         args: state?.args,
         subagentMeta: this.subagentMeta
       }).catch((error) => {
@@ -3033,6 +3048,30 @@ var NEW_PROMPT_ABORT_REASON = "qwen:new-prompt";
 var SESSION_DISPOSE_ABORT_REASON = "qwen:session-dispose";
 var DAEMON_RETRY_META_KEY = "qwen.daemon.retry";
 var DAEMON_CONTINUE_META_KEY = "qwen.daemon.continueLastTurn";
+var MAX_DAEMON_MEDIA_REFERENCES = 256;
+function readDaemonMediaReferences(value) {
+  if (!Array.isArray(value) || value.length === 0 || value.length > MAX_DAEMON_MEDIA_REFERENCES) {
+    return void 0;
+  }
+  const references = [];
+  for (const item of value) {
+    if (!item || typeof item !== "object" || Array.isArray(item)) {
+      return void 0;
+    }
+    const reference = item;
+    if (reference["type"] !== "image" || typeof reference["mediaId"] !== "string" || reference["mediaId"].length === 0 || reference["mediaId"].length > 128 || typeof reference["mimeType"] !== "string" || reference["mimeType"].length === 0 || reference["mimeType"].length > 128 || typeof reference["size"] !== "number" || !Number.isSafeInteger(reference["size"]) || reference["size"] <= 0) {
+      return void 0;
+    }
+    references.push({
+      type: reference["type"],
+      mediaId: reference["mediaId"],
+      mimeType: reference["mimeType"],
+      size: reference["size"]
+    });
+  }
+  return references;
+}
+__name(readDaemonMediaReferences, "readDaemonMediaReferences");
 var TODO_STOP_GUARD_PROMPT_PREFIX = "[Todo Stop Guard] ";
 var TODO_STOP_GUARD_PROMPT_BODY_SUFFIX = " todo item(s) are still pending or in progress. Continue executing the current task now. Do not ask the user whether to continue. If progress requires user input, use the structured question or permission flow. If progress depends on external state, report the blocker explicitly.";
 var TODO_STOP_GUARD_FINAL_PROMPT_SUFFIX = " This is the final automatic continuation. Before ending, either complete/update the todos or report the completed progress and the exact blocker.";
@@ -3385,6 +3424,43 @@ function hasInlineMediaContentBlock(content) {
   return content.some((part) => part.type === "image" || part.type === "audio");
 }
 __name(hasInlineMediaContentBlock, "hasInlineMediaContentBlock");
+function extractTurnPromptText(content) {
+  let hasImage = false;
+  for (const block of content) {
+    if (block.type === "image") hasImage = true;
+    if (block.type === "text" && block.text.length > 0) return block.text;
+  }
+  return hasImage ? "[image]" : "";
+}
+__name(extractTurnPromptText, "extractTurnPromptText");
+function truncateTurnText(text) {
+  if (text.length <= TURN_RESULT_TEXT_MAX_CHARS) {
+    return { text, truncated: false };
+  }
+  return { text: text.slice(0, TURN_RESULT_TEXT_MAX_CHARS), truncated: true };
+}
+__name(truncateTurnText, "truncateTurnText");
+function stripReferencedInlineDataParts(parts, content) {
+  const coveredByKey = /* @__PURE__ */ new Map();
+  for (const block of content) {
+    if (block.type !== "image") continue;
+    const key = `${block.mimeType}\0${block.data}`;
+    coveredByKey.set(key, (coveredByKey.get(key) ?? 0) + 1);
+  }
+  if (coveredByKey.size === 0) return parts;
+  return parts.filter((part) => {
+    const inlineData = part.inlineData;
+    if (inlineData === void 0 || typeof inlineData.data !== "string") {
+      return true;
+    }
+    const key = `${inlineData.mimeType ?? ""}\0${inlineData.data}`;
+    const remaining = coveredByKey.get(key) ?? 0;
+    if (remaining === 0) return true;
+    coveredByKey.set(key, remaining - 1);
+    return false;
+  });
+}
+__name(stripReferencedInlineDataParts, "stripReferencedInlineDataParts");
 function capMidTurnDrainItems(items, fieldName) {
   if (items.length <= MAX_MID_TURN_DRAIN_ITEMS) return items;
   debugLogger6.warn(
@@ -3421,14 +3497,18 @@ function getValidMidTurnContentBlocks(content, displayText) {
   return validBlocks;
 }
 __name(getValidMidTurnContentBlocks, "getValidMidTurnContentBlocks");
-function getStructuredMidTurnDisplayText(content, displayText) {
+function getStructuredMidTurnDisplayText(content, displayText, willPersistReferences) {
   if (typeof displayText === "string" && displayText.trim().length > 0) {
     return displayText.trim();
   }
   const text = content.filter(
     (part) => part.type === "text"
   ).map((part) => part.text).join("\n").trim();
-  return text || "[User message with attachments]";
+  if (text) return text;
+  if (!willPersistReferences && hasInlineMediaContentBlock(content)) {
+    return "[User message with attachments]";
+  }
+  return text;
 }
 __name(getStructuredMidTurnDisplayText, "getStructuredMidTurnDisplayText");
 function parseMidTurnDrainResponse(response) {
@@ -3444,14 +3524,20 @@ function parseMidTurnDrainResponse(response) {
           item["displayText"]
         );
         if (content.length === 0) return [];
+        const mediaReferences = readDaemonMediaReferences(
+          item["mediaReferences"]
+        );
+        const willPersistReferences = mediaReferences !== void 0 && mediaReferences.length === content.filter((block) => block.type === "image").length;
         return [
           {
             kind: "structured",
             content,
             displayText: getStructuredMidTurnDisplayText(
               content,
-              item["displayText"]
-            )
+              item["displayText"],
+              willPersistReferences
+            ),
+            ...mediaReferences ? { mediaReferences } : {}
           }
         ];
       }
@@ -3476,7 +3562,7 @@ function isValidMidTurnDrainResponse(response, requireQueuedPromptState) {
   }
   if (Array.isArray(response["items"])) {
     return response["items"].every(
-      (item) => isRecord2(item) && Array.isArray(item["content"]) && item["content"].length > 0 && item["content"].every(isContentBlock)
+      (item) => isRecord2(item) && Array.isArray(item["content"]) && item["content"].length > 0 && item["content"].every(isContentBlock) && (item["mediaReferences"] === void 0 || readDaemonMediaReferences(item["mediaReferences"]) !== void 0)
     );
   }
   return Array.isArray(response["messages"]) && response["messages"].every(
@@ -3506,15 +3592,37 @@ var TodoStopGuardClaimTimeoutError = class extends Error {
 };
 function beginChannelDeliveryResponseBlock(capture) {
   capture?.agentOutput.beginResponse();
-  if (!capture?.channelDelivery) return void 0;
-  capture.channelDelivery.finalText = "";
-  return [];
+  if (capture?.channelDelivery) capture.channelDelivery.finalText = "";
+  if (capture?.turnResult) capture.turnResult.finalText = "";
+  if (!capture?.channelDelivery && !capture?.turnResult) return void 0;
+  return {
+    parts: [],
+    chars: 0,
+    ...capture?.channelDelivery ? {} : { capChars: TURN_RESULT_TEXT_MAX_CHARS + 1 }
+  };
 }
 __name(beginChannelDeliveryResponseBlock, "beginChannelDeliveryResponseBlock");
+function appendChannelDeliveryResponseText(responseBlock, text) {
+  if (!responseBlock) return;
+  if (responseBlock.capChars !== void 0 && responseBlock.chars >= responseBlock.capChars) {
+    return;
+  }
+  responseBlock.parts.push(text);
+  responseBlock.chars += text.length;
+}
+__name(appendChannelDeliveryResponseText, "appendChannelDeliveryResponseText");
+function rewindChannelDeliveryResponseBlock(responseBlock, checkpoint) {
+  if (!responseBlock) return;
+  const removed = responseBlock.parts.splice(checkpoint);
+  for (const part of removed) responseBlock.chars -= part.length;
+}
+__name(rewindChannelDeliveryResponseBlock, "rewindChannelDeliveryResponseBlock");
 function commitChannelDeliveryResponseBlock(capture, responseBlock, hasFunctionCalls) {
   capture?.agentOutput.commitResponse(hasFunctionCalls);
-  if (capture?.channelDelivery && responseBlock && !hasFunctionCalls) {
-    capture.channelDelivery.finalText = responseBlock.join("");
+  if (responseBlock && !hasFunctionCalls) {
+    const finalText = responseBlock.parts.join("");
+    if (capture?.channelDelivery) capture.channelDelivery.finalText = finalText;
+    if (capture?.turnResult) capture.turnResult.finalText = finalText;
   }
 }
 __name(commitChannelDeliveryResponseBlock, "commitChannelDeliveryResponseBlock");
@@ -3700,10 +3808,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 +3938,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 +4160,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 +4864,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 +4883,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 +4946,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(
@@ -5164,9 +5315,51 @@ var Session = class {
     }
   }
   async prompt(params, invocationContext, admissionCancellation, modelPrompt, scheduledGoalTurn) {
+    if (invocationContext !== void 0 && invocationContext.sessionId !== this.config.getSessionId()) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Invocation context session does not match the active session"
+      );
+    }
+    const turnRecording = this.#beginTurnRecording(params, invocationContext);
+    try {
+      const result = await this.#promptWithTurnRecording(
+        params,
+        invocationContext,
+        admissionCancellation,
+        modelPrompt,
+        scheduledGoalTurn,
+        turnRecording
+      );
+      this.#settleTurnRecording(
+        result.stopReason === "cancelled" ? "cancelled" : "completed",
+        turnRecording,
+        result
+      );
+      return result;
+    } catch (error) {
+      const pendingSend = turnRecording?.abortController;
+      const abortReason = pendingSend?.signal.aborted === true ? pendingSend.signal.reason : void 0;
+      const controlledAbort = abortReason === USER_CANCEL_ABORT_REASON || abortReason === SESSION_DISPOSE_ABORT_REASON || abortReason === NEW_PROMPT_ABORT_REASON && this.#isAbortError(error);
+      if (controlledAbort) {
+        const result = { stopReason: "cancelled" };
+        this.#settleTurnRecording("cancelled", turnRecording, result);
+        return result;
+      }
+      this.#settleTurnRecording("error", turnRecording, void 0, error);
+      throw error;
+    }
+  }
+  async #promptWithTurnRecording(params, invocationContext, admissionCancellation, modelPrompt, scheduledGoalTurn, turnRecording) {
     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 +5379,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" };
     }
@@ -5211,6 +5410,7 @@ var Session = class {
     }
     this.pendingPrompt?.abort(NEW_PROMPT_ABORT_REASON);
     const pendingSend = goalTurn?.controller ?? new AbortController();
+    if (turnRecording) turnRecording.abortController = pendingSend;
     const cancelPendingSend = /* @__PURE__ */ __name(() => pendingSend.abort(USER_CANCEL_ABORT_REASON), "cancelPendingSend");
     if (admissionCancellation) {
       admissionCancellation.addEventListener("abort", cancelPendingSend, {
@@ -5304,6 +5504,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();
@@ -5313,9 +5516,9 @@ var Session = class {
     const channelDelivery = parsePromptChannelDelivery(params);
     const responseCapture = {
       ...channelDelivery ? { channelDelivery: { finalText: "" } } : {},
+      ...turnRecording ? { turnResult: turnRecording.finalAnswer } : {},
       agentOutput: new AgentOutputMessageCapture(this.config)
     };
-    const channelPromptTurn = params._meta?.[CHANNEL_PROMPT_META_KEY] === true;
     let resolveCompletion;
     this.pendingPromptCompletion = new Promise((resolve6) => {
       resolveCompletion = resolve6;
@@ -5323,6 +5526,7 @@ var Session = class {
     let rejectedByLoopProtection = false;
     let promptResult;
     let promptFailed = false;
+    if (turnRecording) turnRecording.startedAt = Date.now();
     try {
       const result = await this.#executePrompt(
         params,
@@ -5343,12 +5547,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 +5588,7 @@ var Session = class {
           promptId: channelDelivery.deliveryId
         });
       }
-      return result;
+      return completedResult;
     } catch (error) {
       promptFailed = true;
       if (error instanceof SessionWriterError) {
@@ -5436,7 +5664,7 @@ var Session = class {
    * `qwen/notify/session/prompt-suggestion` extNotification. Mirrors
    * the CLI's `AppContainer.tsx` integration: same `generatePromptSuggestion`
    * call, same `enableCacheSharing` flag forwarding, same curated
-   * history slice (`getHistory(true).slice(-40)`).
+   * history tail (`getHistoryTail(40, true)`).
    *
    * Differences from the CLI:
    *   - Triggers only on `stopReason === 'end_turn'` (the daemon
@@ -5466,21 +5694,25 @@ var Session = class {
     const promptId = this.config.getSessionId() + "########" + String(this.turn);
     void (async () => {
       try {
-        const fullHistory = chat.getHistory(true);
-        const lastEntry = fullHistory[fullHistory.length - 1];
+        const conversationHistory = chat.getHistoryTail(40, true);
+        const lastEntry = conversationHistory[conversationHistory.length - 1];
         if (!lastEntry || lastEntry.role !== "model") {
           debugLogger6.debug(
             "Skipping followup suggestion: last history entry is not model"
           );
           return;
         }
-        const conversationHistory = fullHistory.length > 40 ? fullHistory.slice(-40) : fullHistory;
         const r = await generatePromptSuggestion(
           this.config,
           conversationHistory,
           ac.signal,
           {
-            enableCacheSharing: this.settings.merged.ui?.enableCacheSharing === true
+            // On by default: the schema declares `default: true`, but
+            // `mergeSettings` doesn't apply schema defaults, so an unset value
+            // is `undefined` and a `=== true` gate left the cache-aware fork
+            // as dead code unless the flag was explicitly set (#9230). Mirrors
+            // AppContainer — only an explicit `false` opts out.
+            enableCacheSharing: this.settings.merged.ui?.enableCacheSharing !== false
           }
         );
         if (ac.signal.aborted) return;
@@ -5566,7 +5798,8 @@ var Session = class {
           },
           async () => {
             const promptText = params.prompt.filter((block) => block.type === "text").map((block) => block.type === "text" ? block.text : "").join(" ");
-            const promptDisplayText = typeof promptMetadata?.[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY] === "string" ? promptMetadata[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY] : void 0;
+            const promptDisplayTextValue = promptMetadata?.[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+            const promptDisplayText = typeof promptDisplayTextValue === "string" ? promptDisplayTextValue : void 0;
             const modelPromptBlocks = modelPrompt === void 0 ? params.prompt : [{ type: "text", text: modelPrompt }];
             logUserPrompt(
               this.config,
@@ -5589,6 +5822,12 @@ var Session = class {
                 );
               }
             }
+            const firstTextBlock = modelPromptBlocks.find(
+              (block) => block.type === "text"
+            );
+            const inputText = firstTextBlock?.text || "";
+            const isSlashInput = !isContinue && isSlashCommand(inputText);
+            const slashCommandName = getSlashCommandFirstToken(inputText);
             let continuationParts = null;
             let strippedOrphanEntries = null;
             let orphanPushCountSnapshot = 0;
@@ -5627,12 +5866,16 @@ var Session = class {
             } else if (isContinue) {
             } else if (isRetry) {
               this.#getCurrentChat().stripOrphanedUserEntriesFromHistory();
-            } else {
+            } else if (!isSlashInput || slashCommandName !== "advisor") {
+              const mediaReferences = readDaemonMediaReferences(
+                promptMetadata?.[DAEMON_MEDIA_REFERENCES_META_KEY]
+              );
               const recorder = this.config.getChatRecordingService();
-              if (promptDisplayText !== void 0) {
+              if (promptDisplayText !== void 0 || mediaReferences) {
                 recorder?.recordUserMessage(promptText, goalTurn?.permit, {
-                  displayText: promptDisplayText,
-                  hookContext: ""
+                  displayText: promptDisplayText ?? promptText,
+                  hookContext: "",
+                  ...mediaReferences ? { mediaReferences } : {}
                 });
               } else if (goalTurn) {
                 recorder?.recordUserMessage(promptText, goalTurn.permit);
@@ -5640,11 +5883,6 @@ var Session = class {
                 recorder?.recordUserMessage(promptText);
               }
             }
-            const firstTextBlock = modelPromptBlocks.find(
-              (block) => block.type === "text"
-            );
-            const inputText = firstTextBlock?.text || "";
-            const isSlashInput = !isContinue && isSlashCommand(inputText);
             if (!isSlashInput && !isContinue && !isRetry) {
               this.refreshContextFilesOnWrite = false;
             }
@@ -5675,13 +5913,58 @@ var Session = class {
                   startNewSession: /* @__PURE__ */ __name(() => this.rebindGoalRuntimeForNewSession(), "startNewSession")
                 }
               );
-              parts = await this.#processSlashCommandResult(
-                slashCommandResult,
-                modelPromptBlocks,
-                pendingSend.signal,
-                onFullTurnModel
-              );
+              if (slashCommandName === "advisor" && pendingSend.signal.aborted && slashCommandResult.type === "message") {
+                this.todoStopGuard.suspend();
+                logConversationFinishedEvent(
+                  this.config,
+                  new ConversationFinishedEvent(
+                    this.config.getApprovalMode(),
+                    0
+                  )
+                );
+                return { stopReason: "cancelled" };
+              }
+              const resolvedCommandInfo = slashCommandResult.resolvedCommand;
+              const shouldRecordSlashCommand = !(resolvedCommandInfo?.kind === "built-in" /* BUILT_IN */ && resolvedCommandInfo.name === "advisor");
+              if (slashCommandName === "advisor" && shouldRecordSlashCommand && goalTurn?.origin !== "runtime" && !isRetry) {
+                const recorder = this.config.getChatRecordingService();
+                if (promptDisplayText !== void 0) {
+                  recorder?.recordUserMessage(promptText, goalTurn?.permit, {
+                    displayText: promptDisplayText,
+                    hookContext: ""
+                  });
+                } else if (goalTurn) {
+                  recorder?.recordUserMessage(promptText, goalTurn.permit);
+                } else {
+                  recorder?.recordUserMessage(promptText);
+                }
+              }
+              try {
+                parts = await this.#processSlashCommandResult(
+                  slashCommandResult,
+                  modelPromptBlocks,
+                  pendingSend.signal,
+                  onFullTurnModel,
+                  shouldRecordSlashCommand
+                );
+              } catch (error) {
+                logConversationFinishedEvent(
+                  this.config,
+                  new ConversationFinishedEvent(
+                    this.config.getApprovalMode(),
+                    0
+                  )
+                );
+                throw error;
+              }
               if (parts === null) {
+                logConversationFinishedEvent(
+                  this.config,
+                  new ConversationFinishedEvent(
+                    this.config.getApprovalMode(),
+                    0
+                  )
+                );
                 return { stopReason: "end_turn" };
               }
             } else {
@@ -5827,7 +6110,7 @@ ${this.pendingRecoveredAgentsNotice}
                   const responseStream = sendResult.responseStream;
                   nextMessage = null;
                   channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(responseCapture);
-                  channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
+                  channelDeliveryCheckpoint = channelDeliveryResponseBlock?.parts.length ?? 0;
                   let streamFailed = false;
                   try {
                     for await (const resp of responseStream) {
@@ -5848,7 +6131,10 @@ ${this.pendingRecoveredAgentsNotice}
                           );
                           if (!part.thought) {
                             responseCapture.agentOutput.appendText(part.text);
-                            channelDeliveryResponseBlock?.push(part.text);
+                            appendChannelDeliveryResponseText(
+                              channelDeliveryResponseBlock,
+                              part.text
+                            );
                             messageDisplay?.addChunk(part.text);
                           }
                         }
@@ -5871,9 +6157,10 @@ ${this.pendingRecoveredAgentsNotice}
                           resp.type === "retry" /* RETRY */ && resp.isContinuation === true
                         );
                         if (resp.type === "model_fallback" /* MODEL_FALLBACK */ || !resp.isContinuation) {
-                          if (channelDeliveryResponseBlock) {
-                            channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
-                          }
+                          rewindChannelDeliveryResponseBlock(
+                            channelDeliveryResponseBlock,
+                            channelDeliveryCheckpoint
+                          );
                         }
                         await finalizeToolCallPreparations(
                           preparationTracker,
@@ -6586,7 +6873,7 @@ ${this.pendingRecoveredAgentsNotice}
         channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(
           options.responseCapture
         );
-        channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
+        channelDeliveryCheckpoint = channelDeliveryResponseBlock?.parts.length ?? 0;
         initialSend = false;
         if (guardForThisSend) {
           const guardCommitted = this.todoStopGuard.commitContinuation(
@@ -6619,7 +6906,10 @@ ${this.pendingRecoveredAgentsNotice}
               );
               if (!part.thought) {
                 options.responseCapture?.agentOutput.appendText(part.text);
-                channelDeliveryResponseBlock?.push(part.text);
+                appendChannelDeliveryResponseText(
+                  channelDeliveryResponseBlock,
+                  part.text
+                );
                 messageDisplay?.addChunk(part.text);
               }
             }
@@ -6642,9 +6932,10 @@ ${this.pendingRecoveredAgentsNotice}
               response.type === "retry" /* RETRY */ && response.isContinuation === true
             );
             if (response.type === "model_fallback" /* MODEL_FALLBACK */ || !response.isContinuation) {
-              if (channelDeliveryResponseBlock) {
-                channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
-              }
+              rewindChannelDeliveryResponseBlock(
+                channelDeliveryResponseBlock,
+                channelDeliveryCheckpoint
+              );
             }
             await finalizeToolCallPreparations(
               preparationTracker,
@@ -6836,9 +7127,11 @@ ${this.pendingRecoveredAgentsNotice}
     }
   }
   async sendUpdate(update) {
+    const projectedUpdate = projectAcpToolResultUpdate(update);
+    observeAcpToolResultProjection(update, projectedUpdate, this.sessionId);
     const params = {
       sessionId: this.sessionId,
-      update: projectAcpToolResultUpdate(update)
+      update: projectedUpdate
     };
     if (update.sessionUpdate === "plan") {
       this.activeTodoPlanRevision = void 0;
@@ -6869,6 +7162,52 @@ ${this.pendingRecoveredAgentsNotice}
     }, 0);
     timer.unref();
   }
+  #beginTurnRecording(params, invocationContext) {
+    if (!invocationContext) return null;
+    const promptMetadata = params._meta;
+    const rawPromptDisplayText = promptMetadata?.[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+    const promptDisplayText = typeof rawPromptDisplayText === "string" && rawPromptDisplayText !== "" ? rawPromptDisplayText : void 0;
+    const { text, truncated } = truncateTurnText(
+      promptDisplayText ?? extractTurnPromptText(params.prompt)
+    );
+    const recordingService = this.config.getChatRecordingService();
+    return {
+      promptId: invocationContext.promptId,
+      ...invocationContext.originatorClientId !== void 0 ? { originatorClientId: invocationContext.originatorClientId } : {},
+      promptText: text,
+      promptTextTruncated: truncated,
+      finalAnswer: { finalText: "" },
+      ...recordingService !== void 0 ? { recordingService } : {}
+    };
+  }
+  #settleTurnRecording(state, recording, response, error) {
+    if (recording === null) return;
+    const finalAnswer = truncateTurnText(recording.finalAnswer.finalText);
+    const stopReason = response?.stopReason ?? (state === "cancelled" ? "cancelled" : void 0);
+    const payload = {
+      promptId: recording.promptId,
+      state,
+      ...stopReason !== void 0 ? { stopReason } : {},
+      ...state === "error" ? { error: normalizeTurnResultError(error) } : {},
+      ...recording.startedAt !== void 0 ? { startedAt: recording.startedAt } : {},
+      endedAt: Date.now(),
+      promptText: recording.promptText,
+      ...recording.promptTextTruncated ? { promptTextTruncated: true } : {},
+      ...finalAnswer.text.length > 0 ? { resultText: finalAnswer.text } : {},
+      ...finalAnswer.truncated ? {
+        resultTruncated: true,
+        resultCode: TURN_RESULT_CODE_TEXT_TRUNCATED
+      } : {},
+      ...recording.originatorClientId !== void 0 ? { originatorClientId: recording.originatorClientId } : {}
+    };
+    try {
+      recording.recordingService?.recordTurnResult(payload);
+    } catch (recordError) {
+      debugLogger6.warn(
+        `Failed to record turn result: ${this.#formatError(recordError)}`
+      );
+    }
+  }
   #getCurrentChat() {
     return this.config.getGeminiClient().getChat();
   }
@@ -7399,7 +7738,22 @@ ${this.pendingRecoveredAgentsNotice}
         }
       }
       const built = prefixMidTurnUserMessageParts(rawParts, displayText);
-      this.config.getChatRecordingService()?.recordMidTurnUserMessage(built, displayText);
+      const recorder = this.config.getChatRecordingService();
+      if (message.kind === "structured" && message.mediaReferences) {
+        const everyMediaBlockHasAReference = message.mediaReferences.length === message.content.filter((block) => block.type === "image").length;
+        if (everyMediaBlockHasAReference) {
+          recorder?.recordMidTurnUserMessage(
+            stripReferencedInlineDataParts(built, message.content),
+            displayText,
+            void 0,
+            message.mediaReferences
+          );
+        } else {
+          recorder?.recordMidTurnUserMessage(built, displayText);
+        }
+      } else {
+        recorder?.recordMidTurnUserMessage(built, displayText);
+      }
       parts.push(...built);
     }
     return parts;
@@ -7501,6 +7855,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) {
@@ -7712,7 +8075,7 @@ ${this.pendingRecoveredAgentsNotice}
                 }
                 const responseStream = sendResult.responseStream;
                 const channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(responseCapture);
-                const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
+                const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.parts.length ?? 0;
                 if (loopTick && turnCount === 1) {
                   this.loopTickResolver?.markDelivered();
                 }
@@ -7738,7 +8101,10 @@ ${this.pendingRecoveredAgentsNotice}
                         );
                         if (!part.thought) {
                           responseCapture.agentOutput.appendText(part.text);
-                          channelDeliveryResponseBlock?.push(part.text);
+                          appendChannelDeliveryResponseText(
+                            channelDeliveryResponseBlock,
+                            part.text
+                          );
                           messageDisplay?.addChunk(part.text);
                         }
                       }
@@ -7761,9 +8127,10 @@ ${this.pendingRecoveredAgentsNotice}
                         resp.type === "retry" /* RETRY */ && resp.isContinuation === true
                       );
                       if (resp.type === "model_fallback" /* MODEL_FALLBACK */ || !resp.isContinuation) {
-                        if (channelDeliveryResponseBlock) {
-                          channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
-                        }
+                        rewindChannelDeliveryResponseBlock(
+                          channelDeliveryResponseBlock,
+                          channelDeliveryCheckpoint
+                        );
                       }
                       await finalizeToolCallPreparations(
                         preparationTracker,
@@ -8094,6 +8461,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) {
@@ -8731,11 +9110,17 @@ ${this.pendingRecoveredAgentsNotice}
           callId: record.callId,
           toolName: record.toolName,
           responseParts: record.responseParts,
-          persistedOutputFiles: record.persistedOutputFiles
-        }))
+          persistedOutputFiles: record.persistedOutputFiles,
+          artifacts: record.metadata.artifacts
+        })),
+        new Map(orderedRecords.map((record) => [record.callId, promptId]))
       );
       orderedRecords.forEach((record, index) => {
-        this.config.getChatRecordingService()?.recordToolResult(finalized[index].responseParts, record.metadata);
+        this.config.getChatRecordingService()?.recordToolResult(finalized[index].responseParts, {
+          ...record.metadata,
+          persistedOutputFiles: finalized[index].persistedOutputFiles,
+          artifacts: finalized[index].artifacts
+        });
       });
       return {
         ...result,
@@ -8851,7 +9236,9 @@ ${this.pendingRecoveredAgentsNotice}
             message: response.responseParts,
             resultDisplay: response.resultDisplay,
             error: response.error,
-            success: false
+            success: false,
+            artifacts: response.artifacts,
+            persistedOutputFiles: response.persistedOutputFiles
           });
         }
       } catch (emitError) {
@@ -8872,7 +9259,8 @@ ${this.pendingRecoveredAgentsNotice}
           executionStatus: response.executionStatus ?? "not_started",
           resultDisplay: response.resultDisplay,
           error: response.error,
-          errorType: response.errorType
+          errorType: response.errorType,
+          artifacts: response.artifacts
         }
       });
     }, "emitDuplicateBatch");
@@ -9219,6 +9607,8 @@ ${this.pendingRecoveredAgentsNotice}
     let executionStatus = "not_started";
     let executionErrorType;
     let executeReturned = false;
+    let executeAttempted = false;
+    let producerObserved = false;
     let terminalStatus;
     let toolType = "native";
     let mcpServerName = void 0;
@@ -9298,9 +9688,28 @@ ${this.pendingRecoveredAgentsNotice}
       terminalStatus = opts.status;
       spanError = opts.status === "error" ? error.message : void 0;
       cleanupAgentToolResources();
+      const errorParts = errorResponse(
+        error,
+        toolName2,
+        opts.status,
+        opts.errorType
+      );
       if (toolName2 !== ToolNames.TODO_WRITE) {
         try {
-          await this.toolCallEmitter.emitError(callId, toolName2, error);
+          if (opts.settledMetadata) {
+            await this.toolCallEmitter.emitResult({
+              callId,
+              toolName: toolName2,
+              args,
+              message: errorParts,
+              error,
+              success: false,
+              artifacts: opts.settledMetadata.artifacts,
+              persistedOutputFiles: opts.settledMetadata.persistedOutputFiles
+            });
+          } else {
+            await this.toolCallEmitter.emitError(callId, toolName2, error);
+          }
         } catch (emitError) {
           debugLogger6.debug(
             "[Session.runTool] Failed to emit terminal tool update",
@@ -9308,16 +9717,28 @@ ${this.pendingRecoveredAgentsNotice}
           );
         }
       }
-      const errorParts = errorResponse(
-        error,
-        toolName2,
-        opts.status,
-        opts.errorType
-      );
+      if (executeAttempted && !producerObserved) {
+        observeToolResultBoundary({
+          stage: "producer",
+          sessionId: this.sessionId,
+          promptId,
+          toolCallId: callId,
+          toolName: toolName2,
+          artifacts: [
+            opts.settledMetadata ? toolResultBoundaryArtifact(
+              opts.settledMetadata.persistedOutputFiles,
+              opts.settledMetadata.artifacts
+            ) : toolResultBoundaryArtifact([], [])
+          ],
+          values: /* @__PURE__ */ __name(() => toolResultPartDiagnosticValues(errorParts), "values")
+        });
+        producerObserved = true;
+      }
       queueToolResultRecord?.(fc, {
         callId,
         toolName: toolName2,
         responseParts: errorParts,
+        persistedOutputFiles: opts.settledMetadata?.persistedOutputFiles,
         policyToolName: guardContext.policyToolName,
         toolType,
         executionErrorType: executionStatus === "error" ? executionErrorType ?? opts.errorType : void 0,
@@ -9326,6 +9747,7 @@ ${this.pendingRecoveredAgentsNotice}
           status: opts.status,
           executionStatus,
           resultDisplay: void 0,
+          artifacts: opts.settledMetadata?.artifacts,
           error: opts.status === "error" ? error : void 0,
           errorType: opts.status === "error" ? opts.errorType : void 0
         }
@@ -10245,6 +10667,8 @@ ${this.pendingRecoveredAgentsNotice}
               }
             }
           } : void 0, "heartbeatSpanAttributes");
+          let settledArtifacts;
+          let settledPersistedOutputFiles;
           const sleepInhibitorHandle = acquireSleepInhibitor(
             this.config,
             `Qwen Code is executing tool ${toolName}`
@@ -10266,12 +10690,21 @@ ${this.pendingRecoveredAgentsNotice}
               callId
             });
             executionStatus = "error";
+            executeAttempted = true;
             try {
               toolResult = await invocation.execute(
                 activeToolAbortSignal,
                 onToolProgress
               );
               executeReturned = true;
+              try {
+                settledArtifacts = toolResult.artifacts;
+              } catch {
+              }
+              try {
+                settledPersistedOutputFiles = toolResult.persistedOutputFiles;
+              } catch {
+              }
               parentAbortedAtExecutionSettle = activeToolAbortSignal.aborted;
               isExecutionTimeout = toolResult.error?.type === "execution_timeout" /* EXECUTION_TIMEOUT */;
               aborted = parentAbortedAtExecutionSettle && !isExecutionTimeout;
@@ -10306,6 +10739,32 @@ ${this.pendingRecoveredAgentsNotice}
             toolSettled = true;
             sleepInhibitorHandle.release();
           }
+          producerObserved = true;
+          try {
+            observeToolResultBoundary({
+              stage: "producer",
+              sessionId: this.sessionId,
+              promptId,
+              toolCallId: callId,
+              toolName,
+              artifacts: [
+                toolResultBoundaryArtifact(
+                  settledPersistedOutputFiles,
+                  settledArtifacts
+                )
+              ],
+              values: /* @__PURE__ */ __name(() => [
+                ...toolResultPartDiagnosticValues(toolResult.llmContent),
+                ...typeof toolResult.returnDisplay === "string" ? [
+                  {
+                    representation: "display",
+                    value: toolResult.returnDisplay
+                  }
+                ] : []
+              ], "values")
+            });
+          } catch {
+          }
           cleanupAgentToolResources();
           if ((isEnterPlanModeTool || isExitPlanModeTool) && !toolResult.error && this.config.getApprovalMode() !== approvalMode) {
             await this.sendCurrentModeUpdateNotification();
@@ -10359,7 +10818,11 @@ ${this.pendingRecoveredAgentsNotice}
                 {
                   status: "cancelled",
                   errorType: void 0,
-                  executionStatus
+                  executionStatus,
+                  settledMetadata: {
+                    artifacts: settledArtifacts,
+                    persistedOutputFiles: settledPersistedOutputFiles
+                  }
                 }
               );
             }
@@ -10372,7 +10835,11 @@ ${this.pendingRecoveredAgentsNotice}
               return earlyErrorResponse(new Error(stopMessage), toolName, {
                 status: "error",
                 errorType: "execution_denied" /* EXECUTION_DENIED */,
-                executionStatus
+                executionStatus,
+                settledMetadata: {
+                  artifacts: settledArtifacts,
+                  persistedOutputFiles: settledPersistedOutputFiles
+                }
               });
             }
             if (postHookResult.additionalContext) {
@@ -10476,7 +10943,8 @@ ${this.pendingRecoveredAgentsNotice}
                 resultDisplay: toolResult.returnDisplay,
                 error: responseError,
                 success: succeeded,
-                artifacts: toolResult.artifacts
+                artifacts: settledArtifacts,
+                persistedOutputFiles: settledPersistedOutputFiles
               });
             } catch (emitError) {
               debugLogger6.debug(
@@ -10515,7 +10983,7 @@ ${this.pendingRecoveredAgentsNotice}
             callId,
             toolName,
             responseParts,
-            persistedOutputFiles: toolResult.persistedOutputFiles,
+            persistedOutputFiles: settledPersistedOutputFiles,
             policyToolName,
             toolType,
             executionErrorType: executionStatus === "error" ? executionErrorType : void 0,
@@ -10525,6 +10993,7 @@ ${this.pendingRecoveredAgentsNotice}
               executionStatus,
               resultDisplay: toolResult.returnDisplay,
               ...visionBridgeNotice !== void 0 ? { visionBridgeNotice } : {},
+              artifacts: settledArtifacts,
               error: status === "error" && toolResult.error ? new Error(toolResult.error.message) : void 0,
               errorType: status === "error" ? executionErrorType : void 0
             }
@@ -10633,19 +11102,18 @@ ${this.pendingRecoveredAgentsNotice}
    *
    * Supported result types in ACP mode:
    * - submit_prompt: Submits content to the model
+   * - message: Emits a single message to the client
    * - stream_messages: Streams multiple messages to the client (ACP-specific)
    * - unsupported: Command cannot be executed in ACP mode
    * - no_command: No command was found, use original prompt
    *
-   * Note: 'message' type is not supported in ACP mode - commands should use
-   * 'stream_messages' instead for consistent async handling.
-   *
    * @param result The result from handleSlashCommand
    * @param originalPrompt The original prompt blocks
    * @returns Parts to use for the prompt, or null if command was handled without needing model interaction
    */
-  async #processSlashCommandResult(result, originalPrompt, abortSignal, onFullTurnModel) {
+  async #processSlashCommandResult(result, originalPrompt, abortSignal, onFullTurnModel, shouldRecordResult) {
     this.refreshContextFilesOnWrite = result.type === "submit_prompt" && Boolean(result.refreshContextFilesOnWrite);
+    const recorder = shouldRecordResult ? this.config.getChatRecordingService() : void 0;
     switch (result.type) {
       case "submit_prompt":
         return this.#applyBridgeConversionsIfNeeded(
@@ -10659,7 +11127,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         const rendered = (result.content || "").replace(/\n/g, "  \n");
         await this.messageEmitter.emitSlashCommandOutput(rendered);
-        this.config.getChatRecordingService()?.recordSlashCommand({
+        recorder?.recordSlashCommand({
           phase: "result",
           rawCommand: originalPrompt.filter((b) => b.type === "text").map((b) => b.type === "text" ? b.text : "").join(" "),
           outputHistoryItems: [
@@ -10680,7 +11148,7 @@ ${this.pendingRecoveredAgentsNotice}
           chunks.push(msg.content || "");
         }
         if (chunks.length > 0) {
-          this.config.getChatRecordingService()?.recordSlashCommand({
+          recorder?.recordSlashCommand({
             phase: "result",
             rawCommand: originalPrompt.filter((b) => b.type === "text").map((b) => b.type === "text" ? b.text : "").join(" "),
             outputHistoryItems: [
@@ -11414,6 +11882,38 @@ var ACP_REASONING_EFFORT_NAMES = {
   max: "Max"
 };
 var WORKSPACE_MEMORY_REMEMBER_CHILD_TIMEOUT_MS = 295e3;
+var TURN_STATUS_SCAN_PAGE_LIMIT = 500;
+var TURN_STATUS_SCAN_MAX_PAGES = 10;
+async function findSettledTurnResult(reader, sessionId, promptId, workspaceCwd) {
+  let cursor;
+  for (let page = 0; page < TURN_STATUS_SCAN_MAX_PAGES; page++) {
+    const result = await reader.readPage(sessionId, {
+      ...cursor !== void 0 ? { cursor } : { direction: "backward" },
+      limit: TURN_STATUS_SCAN_PAGE_LIMIT,
+      maxBytes: SESSION_TRANSCRIPT_MAX_PAGE_BYTES
+    });
+    for (let i = result.records.length - 1; i >= 0; i--) {
+      const record = result.records[i];
+      if (record.type !== "system" || record.subtype !== "turn_result") {
+        continue;
+      }
+      const payload = record.systemPayload;
+      if (!isTurnResultRecordPayload(payload)) continue;
+      if (promptId === void 0 || payload.promptId === promptId) {
+        return payload;
+      }
+    }
+    if (!result.hasMore || result.nextCursorState === void 0) {
+      return void 0;
+    }
+    cursor = encodeSessionTranscriptCursor(
+      result.nextCursorState,
+      workspaceCwd
+    );
+  }
+  return void 0;
+}
+__name(findSettledTurnResult, "findSettledTurnResult");
 function createAcpSessionProfiler(span, attributePrefix) {
   let failedStage;
   const setAttribute = /* @__PURE__ */ __name((name, value) => {
@@ -11523,11 +12023,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 +12337,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) {
@@ -13447,7 +13960,10 @@ async function runAcpAgent(config, settings, argv, options) {
     let initializeRequestId;
     const pendingNewSessionRequestIds = /* @__PURE__ */ new Set();
     const stream = ndJsonStream(stdout, stdin, {
-      onMessageObserved: /* @__PURE__ */ __name(({ direction, message }) => {
+      onMessageObserved: /* @__PURE__ */ __name(({ direction, bytes, message }) => {
+        if (direction === "sent") {
+          observeAcpToolResultWire(message, bytes);
+        }
         if (direction === "received" && "id" in message && "method" in message) {
           if (message.method === "session/new") {
             pendingNewSessionRequestIds.add(message.id);
@@ -13839,6 +14355,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 +14419,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 +14955,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 +14966,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 +14995,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 +15164,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.12";
+    const version = "0.21.14-preview.0";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -15480,6 +16071,9 @@ var QwenAgent = class {
         throw error;
       }
     }
+    for (const call of this.activePromptCalls.get(sessionId) ?? []) {
+      call.controller.abort();
+    }
   }
   loadPermissionSettings(cwd) {
     this.settings = loadSettings(cwd);
@@ -19594,6 +20188,91 @@ ${outputText}
           } : null
         };
       }
+      case SERVE_CONTROL_EXT_METHODS.sessionTurnStatus: {
+        const sessionId = params["sessionId"];
+        if (typeof sessionId !== "string" || !SESSION_ID_RE.test(sessionId)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing sessionId"
+          );
+        }
+        const rawPromptId = params["promptId"];
+        if (rawPromptId !== void 0 && (typeof rawPromptId !== "string" || rawPromptId.length === 0)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing promptId"
+          );
+        }
+        const session = this.sessionOrThrow(sessionId);
+        const settings = loadSettingsCached(cwd);
+        return await runWithAcpRuntimeOutputDir(settings, cwd, async () => {
+          try {
+            await session.getConfig().getChatRecordingService()?.flush();
+          } catch {
+          }
+          let reader;
+          try {
+            reader = new SessionTranscriptReader(cwd);
+            const turnResult = await findSettledTurnResult(
+              reader,
+              sessionId,
+              typeof rawPromptId === "string" ? rawPromptId : void 0,
+              cwd
+            );
+            return {
+              v: 1,
+              sessionId,
+              turnResult: turnResult ?? null
+            };
+          } catch (error) {
+            if (error.code === "ENOENT") {
+              return { v: 1, sessionId, turnResult: null };
+            }
+            if (error instanceof SessionTranscriptSnapshotUnavailableError && reader) {
+              try {
+                const transcript = await fs2.stat(
+                  reader.getSessionFilePath(sessionId)
+                );
+                if (transcript.size === 0) {
+                  return { v: 1, sessionId, turnResult: null };
+                }
+              } catch (statError) {
+                if (statError.code === "ENOENT") {
+                  return { v: 1, sessionId, turnResult: null };
+                }
+              }
+            }
+            if (error instanceof InvalidSessionTranscriptCursorError) {
+              throw new RequestError(-32602, error.message, {
+                errorKind: "invalid_transcript_cursor"
+              });
+            }
+            if (error instanceof SessionTranscriptSnapshotUnavailableError) {
+              throw new RequestError(-32010, error.message, {
+                errorKind: "transcript_snapshot_unavailable",
+                sessionId
+              });
+            }
+            if (error instanceof SessionTranscriptTooLargeError) {
+              throw new RequestError(-32011, error.message, {
+                errorKind: "transcript_too_large",
+                sessionId,
+                snapshotSize: error.snapshotSize,
+                maxBytes: error.maxBytes
+              });
+            }
+            if (error instanceof SessionTranscriptPageTooLargeError) {
+              throw new RequestError(-32012, error.message, {
+                errorKind: "transcript_page_too_large",
+                sessionId,
+                pageBytes: error.pageBytes,
+                maxBytes: error.maxBytes
+              });
+            }
+            throw error;
+          }
+        });
+      }
       case SERVE_CONTROL_EXT_METHODS.sessionContinue: {
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || sessionId.length === 0) {
@@ -19814,9 +20493,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 +20526,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 +20735,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 +20752,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 +21607,7 @@ ${outputText}
       config,
       this.connection,
       settings,
+      (operation) => this.runExclusiveHistoryMutation(sessionId, operation),
       () => this.activeWorkReporter?.notifyChanged()
     );
     let published = false;