@qwen-code/qwen-code 0.21.12-preview.5 → 0.21.13

package/chunks/{acpAgent-NFRP4O5A.js → acpAgent-XPES32S7.js}

@@ -1,14 +1,9 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  recomputeMcpGating
-} from "./chunk-6YSSQFHQ.js";
-import {
-  classifyApiError
-} from "./chunk-V7RNNPGC.js";
-import {
+  classifyApiError,
   fireSessionDeleteHook
-} from "./chunk-L34XSHIZ.js";
+} from "./chunk-P5Y23G2L.js";
 import {
   EXTENSION_CONTEXT_BUDGET,
   buildExtensionMentionContext,
@@ -18,17 +13,21 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-62OKKUOX.js";
-import "./chunk-WLML6VIA.js";
+} from "./chunk-76J3IJ3M.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
+  isSlashCommand,
   normalizePartList
-} from "./chunk-5PLOQW7H.js";
+} from "./chunk-NNHNLJ2X.js";
+import {
+  collectContextData,
+  formatContextUsageText
+} from "./chunk-N5YPT6PH.js";
 import {
-  isSlashCommand
-} from "./chunk-N4LVA3S6.js";
+  recomputeMcpGating
+} from "./chunk-GGDBMYGZ.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -36,43 +35,40 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-Q7VJUIIB.js";
+} from "./chunk-IGGGG5CX.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-M3DWLXEO.js";
+} from "./chunk-AFSG32D5.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-DGNQ5AFX.js";
-import "./chunk-NYX53SV4.js";
-import "./chunk-UPUAGRKY.js";
-import {
-  collectContextData,
-  formatContextUsageText
-} from "./chunk-E7XJWIWC.js";
+} from "./chunk-O4D7SPJN.js";
 import "./chunk-4WGODMVR.js";
+import "./chunk-3SH53ANB.js";
+import "./chunk-NYX53SV4.js";
+import "./chunk-DXIBNLBZ.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-6LDLDK6E.js";
+import "./chunk-2M55OBEB.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-CPTIJGUK.js";
+} from "./chunk-6YKYPVDV.js";
 import "./chunk-KW7NOTN6.js";
-import "./chunk-6JFPUJ2O.js";
-import "./chunk-HOXEJHJQ.js";
-import "./chunk-72SKJ3E7.js";
-import "./chunk-YAF2MQZ6.js";
-import {
-  computeCpuPercent
-} from "./chunk-LBOVL47Y.js";
-import "./chunk-6DH5YA3X.js";
-import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-ZZ7RUTJ4.js";
+} from "./chunk-CZBYX5MY.js";
+import "./chunk-GO7STP6N.js";
+import "./chunk-JUEPY766.js";
+import "./chunk-NEFOOD54.js";
+import "./chunk-YAF2MQZ6.js";
+import {
+  computeCpuPercent
+} from "./chunk-LBOVL47Y.js";
+import "./chunk-QRCNA3SR.js";
+import "./chunk-6H67XLET.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -95,8 +91,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-RXX5T3IF.js";
-import "./chunk-ZBBVBZBR.js";
+} from "./chunk-ZZO74WKW.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -105,10 +100,10 @@ import {
   createTranscriptMessageUpdate,
   createTranscriptUsageUpdate,
   hasFullSessionContext
-} from "./chunk-LYRA6ZTI.js";
-import "./chunk-EGB2PIYM.js";
+} from "./chunk-RLKC46YT.js";
+import "./chunk-BZ263IKX.js";
 import "./chunk-4NFY2S7N.js";
-import "./chunk-HUDUANHL.js";
+import "./chunk-3U3VAL47.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-3Z43GZUQ.js";
@@ -126,24 +121,23 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-TIM7NVEO.js";
+} from "./chunk-7UXUJ5T3.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-HRAFAUM7.js";
+} from "./chunk-6ORZ2EDC.js";
 import {
   readVoiceModel
-} from "./chunk-N2G4RA77.js";
-import "./chunk-5KZNWF2M.js";
+} from "./chunk-QIH2HAEN.js";
+import "./chunk-WGHHA7ZH.js";
 import "./chunk-NTTBXH7U.js";
-import "./chunk-VAPNUDD5.js";
-import "./chunk-3SH53ANB.js";
+import "./chunk-XHRY7BXD.js";
 import {
   SESSION_SOURCE_META_KEY,
   parseSessionSource
-} from "./chunk-DLDVO2NY.js";
-import "./chunk-JVY7FHUZ.js";
+} from "./chunk-LJQAUZMR.js";
+import "./chunk-7U5G6JXI.js";
 import "./chunk-WCCLLK7X.js";
 import "./chunk-OCPBI7J5.js";
 import {
@@ -154,26 +148,26 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-7ATQGA6V.js";
+} from "./chunk-ZYYTZUI2.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-BGXZBI5B.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-EHXS5MAC.js";
-import "./chunk-3RC5Q66G.js";
+import "./chunk-TUGSVUJB.js";
+import "./chunk-QV5YN5YD.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-VUTOV2HG.js";
-import "./chunk-XY7DGTIC.js";
-import "./chunk-TN3REXN4.js";
+import "./chunk-OD2WU5QY.js";
+import "./chunk-45NQKMYB.js";
+import "./chunk-A4QRWUDE.js";
 import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-DXXYMK2U.js";
+} from "./chunk-BVJS5BSP.js";
 import {
   ndJsonStream
-} from "./chunk-2U3UCXZ3.js";
+} from "./chunk-NHDR76JX.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -181,14 +175,15 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-NHZF4VCD.js";
-import "./chunk-U7ROFHSH.js";
-import "./chunk-YMIQ24FR.js";
+} from "./chunk-QNQAPSN2.js";
+import "./chunk-ZLCT4C5A.js";
+import "./chunk-BKPPWD33.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_HEARTBEAT_META_KEY,
   ACTIVE_WORK_HEARTBEAT_VERSION,
   ACTIVE_WORK_HOLD_CATEGORIES,
+  ACTIVE_WORK_LEGACY_HOLD_CATEGORIES,
   ACTIVE_WORK_NOTIFICATION_METHOD,
   CHANNEL_STARTUP_PROFILE_META_KEY,
   CHANNEL_STARTUP_PROFILE_VERSION,
@@ -212,7 +207,7 @@ import {
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-UFHPAMAV.js";
+} from "./chunk-S5DWMTHO.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -220,7 +215,7 @@ import {
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-JW5UEE3V.js";
+import "./chunk-A6NRNRKE.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-M5GB774H.js";
@@ -229,22 +224,24 @@ import {
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
   EXTERNAL_TOOL_GUARD_TOKEN_ENV,
   PRIVATE_EXTERNAL_TOOL_GUARD_ENV,
+  PRIVATE_EXTERNAL_TOOL_GUARD_PROVIDER_ENV,
+  SHELL_EXECUTING_TOOL_NAMES,
   isValidExternalToolGuardDenialReason
-} from "./chunk-BKHCW2BI.js";
+} from "./chunk-3VUENPWF.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS,
   CHANNEL_PROMPT_META_KEY
-} from "./chunk-ADJDLEVO.js";
+} from "./chunk-AW27A43Y.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-IW6RQPQB.js";
-import "./chunk-7JL5YBSA.js";
+import "./chunk-H4A72DE5.js";
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-UALXTL5Y.js";
+} from "./chunk-JOOFMXGF.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -253,9 +250,9 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-YCGXJ4Q3.js";
+} from "./chunk-A267JX7H.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-J5SUM3ZJ.js";
+import "./chunk-E23IPNGS.js";
 import "./chunk-GOXKNSDZ.js";
 import {
   getSystemDefaultsPath,
@@ -264,7 +261,7 @@ import {
 import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-I3UEXUWJ.js";
+} from "./chunk-HUTNYWBG.js";
 import {
   SUPPORTED_LANGUAGES
 } from "./chunk-5EJZE3FP.js";
@@ -272,17 +269,17 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-5IW3FJGD.js";
+} from "./chunk-MC4TLKEI.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD
 } from "./chunk-MS7GNABG.js";
-import "./chunk-V6PERRH4.js";
+import "./chunk-CU6GJD55.js";
 import "./chunk-WZMH7II3.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-VE2UV7IN.js";
+} from "./chunk-IWPYVAO2.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
@@ -290,6 +287,7 @@ import {
   ALL_PROVIDERS,
   APPROVAL_MODE_INFO,
   BTW_MAX_INPUT_LENGTH,
+  BranchPointInvalidError,
   ExtensionManager,
   GLOBAL_DUPLICATE_THRESHOLD,
   IMAGE_CAPABILITY,
@@ -395,7 +393,6 @@ import {
   readManyFiles,
   recordAllow,
   recordFallbackApprove,
-  redactUrlCredentials,
   refreshMemoryAfterManagedWrite,
   refreshMemoryInstruction,
   resolveBaseUrl,
@@ -414,25 +411,25 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-T7YMWGFY.js";
+} from "./chunk-4S5337WV.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
-import "./chunk-NM33GGOM.js";
-import "./chunk-A4BAHMJF.js";
-import "./chunk-ZPZANKVP.js";
-import "./chunk-A6GQUQ7I.js";
+import "./chunk-DGZEMW5R.js";
+import "./chunk-WSH6GRKG.js";
+import "./chunk-CKSJECTU.js";
+import "./chunk-OVZPVYZB.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-OZTGLK53.js";
+import "./chunk-5EYKMUUY.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-AAZWJAPQ.js";
-import "./chunk-7WUMS2UA.js";
+import "./chunk-Y3YCSWG5.js";
+import "./chunk-UPDOZBWO.js";
 import {
   promptIdContext,
   todoWorkChainContext
@@ -442,15 +439,15 @@ import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
 import {
   APPROVAL_MODES
-} from "./chunk-SNHBRO4C.js";
-import "./chunk-KTWUFHS4.js";
-import "./chunk-KRXPRVGL.js";
+} from "./chunk-RWDNJBWN.js";
+import "./chunk-25EYDK42.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-2ASWIM4A.js";
-import "./chunk-67F2BEYW.js";
-import "./chunk-TNETSI2A.js";
+} from "./chunk-MIPFDQAF.js";
+import "./chunk-MLXTMF7H.js";
+import "./chunk-KV27IEHM.js";
+import "./chunk-E3DYKPYZ.js";
 import {
   GoalPersistenceUnavailableError,
   emptyGoalSnapshot,
@@ -458,9 +455,11 @@ import {
   parseGoalSnapshotV2,
   parseGoalStateCause,
   wrapUserPromptSubmitContext
-} from "./chunk-B66LYK4B.js";
-import "./chunk-VPZMLGD3.js";
+} from "./chunk-OMLJNPBE.js";
+import "./chunk-OXCMMLED.js";
 import {
+  AgentOutputMessageCapture,
+  addAgentInputMessageAttributes,
   addDaemonRequestAttribute,
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
@@ -468,14 +467,43 @@ import {
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor,
   withDaemonSpan
-} from "./chunk-U5C2GIN2.js";
+} from "./chunk-TIGA2IVL.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-2RTRFLWH.js";
+import "./chunk-XLLKYULU.js";
 import {
   runWithRuntimeContentGenerator
-} from "./chunk-SKRHR6N2.js";
+} from "./chunk-PT4I7NBA.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-2J3OJGTL.js";
+import {
+  FORK_SUBAGENT_TYPE,
+  getStartupContextLength,
+  isSystemReminderContent
+} from "./chunk-SG7ZP5PG.js";
+import "./chunk-K623ENWT.js";
+import "./chunk-AQ37AY7B.js";
+import "./chunk-KBXKR5R2.js";
+import {
+  clearCachedCredentialFile,
+  qwenOAuth2Events
+} from "./chunk-GMIEIY3Y.js";
+import "./chunk-NAVJD2PQ.js";
+import "./chunk-ROIYNTHJ.js";
+import "./chunk-2B2BF7P7.js";
+import "./chunk-P3QQPMQA.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-QFJ5JHQR.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -508,26 +536,17 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-UAAWNTOC.js";
+} from "./chunk-RVOJ2FBP.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-6OJDN5ZT.js";
+} from "./chunk-CHHABXPE.js";
 import {
   runSideQuery
-} from "./chunk-JRTJEGSP.js";
-import "./chunk-O6SLWH4X.js";
-import "./chunk-C2DR57L6.js";
-import {
-  FORK_SUBAGENT_TYPE,
-  getStartupContextLength,
-  isSystemReminderContent
-} from "./chunk-TROB4PZY.js";
-import "./chunk-K623ENWT.js";
-import "./chunk-AQ37AY7B.js";
-import "./chunk-UHF5VBKO.js";
+} from "./chunk-MA2HEDVP.js";
+import "./chunk-XUJNK7Y6.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -535,49 +554,31 @@ import {
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-ZRT36RSF.js";
-import {
-  clearCachedCredentialFile,
-  qwenOAuth2Events
-} from "./chunk-CDDLHCC2.js";
-import "./chunk-NAVJD2PQ.js";
-import "./chunk-YI5G32RU.js";
-import "./chunk-QEWAHAW2.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-FTGU6G45.js";
-import "./chunk-PSTHNTHF.js";
+} from "./chunk-6HY6IF3Z.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-VGGNHRYZ.js";
+} from "./chunk-4PKCUT7F.js";
 import "./chunk-F6WFNA7U.js";
-import "./chunk-NW7SPXVG.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-KK3FEHPJ.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-FPGTNKCP.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-H6BFLALJ.js";
+import "./chunk-CPHEPGAO.js";
+import "./chunk-P7MPQI75.js";
+import "./chunk-FDGGZIYW.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
+  getActiveInteractionSpan,
   initializeTelemetry,
+  redactUrlCredentials,
   runInToolSpanContext,
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-3MJ44LNC.js";
+} from "./chunk-EL5SXY3T.js";
 import "./chunk-HHJLM3WQ.js";
 import {
   sessionIdContext
@@ -588,12 +589,12 @@ import {
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-YMB77M76.js";
+} from "./chunk-BUQDLC2G.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-RIDUB2GC.js";
+import "./chunk-AW4TRXOC.js";
 import {
   runExitCleanup
-} from "./chunk-OK727E5D.js";
+} from "./chunk-X26JYGTD.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -3136,6 +3137,7 @@ var DAEMON_INVALID_TOOL_PARAMS_THRESHOLD = 3;
 var PERMISSION_CANCEL_SKIP_MESSAGE = "Skipped because a permission request was cancelled before the user answered; user input is required before continuing.";
 var LOOP_DETECTED_SKIP_MESSAGE = "Skipped because loop detection stopped the current turn before this tool call could run.";
 var LOOP_DETECTED_CONTEXT_MESSAGE = "System: this turn was terminated because the model exceeded tool-call safety limits. Try a different approach on the next turn.";
+var LOOP_DETECTED_TURN_ERROR_MESSAGE = "Tool-call loop protection stopped this turn. The session is still available; send a more specific instruction to continue.";
 var TOOL_EXECUTION_CANCELLED_MESSAGE = "Tool execution was cancelled.";
 var TOOL_POST_EXECUTION_CANCELLED_MESSAGE = "The tool had already completed; its output was discarded.";
 function createDaemonToolLoopState(repeatedToolFailureMode) {
@@ -3204,6 +3206,7 @@ __name(recordRepeatedToolFailureDecision, "recordRepeatedToolFailureDecision");
 function recordDaemonLoopDetected(config, promptId, loopType, message, loopState, options = {}) {
   if (!loopState.loopDetected) {
     loopState.loopDetected = true;
+    loopState.loopType = loopType;
     debugLogger6.warn(message);
     try {
       logLoopDetected(
@@ -3221,6 +3224,25 @@ function recordDaemonLoopDetected(config, promptId, loopType, message, loopState
   return true;
 }
 __name(recordDaemonLoopDetected, "recordDaemonLoopDetected");
+function createLoopDetectedTurnError(loopState) {
+  return new RequestError(-32603, LOOP_DETECTED_TURN_ERROR_MESSAGE, {
+    code: "LOOP_DETECTED",
+    errorKind: "loop_detected",
+    ...loopState.loopType ? { loopType: loopState.loopType } : {}
+  });
+}
+__name(createLoopDetectedTurnError, "createLoopDetectedTurnError");
+function cancelledOrThrowLoopDetected(signal, loopState) {
+  if (signal.aborted) return "cancelled";
+  throw createLoopDetectedTurnError(loopState);
+}
+__name(cancelledOrThrowLoopDetected, "cancelledOrThrowLoopDetected");
+function isLoopDetectedTurnError(error) {
+  if (!(error instanceof RequestError)) return false;
+  const data = error.data;
+  return typeof data === "object" && data !== null && data.code === "LOOP_DETECTED";
+}
+__name(isLoopDetectedTurnError, "isLoopDetectedTurnError");
 function recordDaemonToolCalls(config, promptId, loopState, calls) {
   if (!loopState || loopState.loopDetected)
     return loopState?.loopDetected ?? false;
@@ -3484,14 +3506,16 @@ var TodoStopGuardClaimTimeoutError = class extends Error {
   }
 };
 function beginChannelDeliveryResponseBlock(capture) {
-  if (!capture) return void 0;
-  capture.finalText = "";
+  capture?.agentOutput.beginResponse();
+  if (!capture?.channelDelivery) return void 0;
+  capture.channelDelivery.finalText = "";
   return [];
 }
 __name(beginChannelDeliveryResponseBlock, "beginChannelDeliveryResponseBlock");
 function commitChannelDeliveryResponseBlock(capture, responseBlock, hasFunctionCalls) {
-  if (capture && responseBlock && !hasFunctionCalls) {
-    capture.finalText = responseBlock.join("");
+  capture?.agentOutput.commitResponse(hasFunctionCalls);
+  if (capture?.channelDelivery && responseBlock && !hasFunctionCalls) {
+    capture.channelDelivery.finalText = responseBlock.join("");
   }
 }
 __name(commitChannelDeliveryResponseBlock, "commitChannelDeliveryResponseBlock");
@@ -3677,10 +3701,11 @@ async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.
 }
 __name(buildAvailableCommandsSnapshot, "buildAvailableCommandsSnapshot");
 var Session = class {
-  constructor(id, config, client, settings, onActiveWorkChanged) {
+  constructor(id, config, client, settings, runExclusiveAutomaticHistoryMutation = (operation) => operation(), onActiveWorkChanged) {
     this.config = config;
     this.client = client;
     this.settings = settings;
+    this.runExclusiveAutomaticHistoryMutation = runExclusiveAutomaticHistoryMutation;
     this.onActiveWorkChanged = onActiveWorkChanged;
     this.sessionId = id;
     this.runtimeBaseDir = config.storage.getRuntimeBaseDir();
@@ -3784,6 +3809,7 @@ var Session = class {
   notificationAbortController = null;
   notificationCompletion = null;
   currentAgentNotificationTaskId = null;
+  currentShellNotificationActive = false;
   persistedBackgroundNotificationTaskIds = /* @__PURE__ */ new Set();
   backgroundNotificationAcceptances = /* @__PURE__ */ new Map();
   activeAgentNotificationAcceptances = /* @__PURE__ */ new Set();
@@ -3805,12 +3831,14 @@ var Session = class {
   // on a session whose registries are already unregistered.
   disposed = false;
   closing = false;
+  historyMutationActive = false;
   closeGateCompletion = null;
   resolveCloseGate = null;
   unsubscribeChatRecordingFailure;
   /** The exact status-change callback this Session installed, so dispose can
    *  retract its own and nobody else's. */
   #statusChangeCallback;
+  #shellStatusChangeCallback;
   workflowApprovalAbortController = new AbortController();
   activeTodoPlanRevision;
   // Modular components
@@ -4025,6 +4053,12 @@ var Session = class {
     return publication;
   }
   async #drainGoalQueue() {
+    if (this.goalQueue.length === 0) return;
+    await this.runExclusiveAutomaticHistoryMutation(
+      () => this.#drainGoalQueueExclusive()
+    );
+  }
+  async #drainGoalQueueExclusive() {
     if (this.disposed || this.closing || this.goalProcessing || this.pendingPrompt || this.pendingPromptCompletion || this.cronProcessing || this.cronAbortController || this.notificationProcessing || this.notificationAbortController) {
       return;
     }
@@ -4723,6 +4757,12 @@ var Session = class {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
+    if (this.historyMutationActive) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Session history mutation is in progress"
+      );
+    }
     try {
       await this.config.assertCanStartTurn();
     } catch (error) {
@@ -4736,9 +4776,18 @@ var Session = class {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
+    if (this.historyMutationActive) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Session history mutation is in progress"
+      );
+    }
+  }
+  isTurnIdle() {
+    return !this.closing && !this.#hasActiveTurn();
   }
   isIdle() {
-    return !this.closing && !this.#hasActiveTurn() && this.collectActiveWorkHolds().length === 0;
+    return this.isTurnIdle() && this.collectActiveWorkHolds().length === 0;
   }
   /**
    * The Session's current active-work holds, derived on every call.
@@ -4779,6 +4828,10 @@ var Session = class {
     for (const taskId of notificationIds) {
       holds.push({ category: "notification", id: taskId });
     }
+    const shellActive = this.config.getBackgroundShellRegistry().hasRunningEntries() || this.notificationQueue.some((item) => item.kind === "shell") || this.currentShellNotificationActive;
+    if (shellActive) {
+      holds.push({ category: "shell", id: "background-shells" });
+    }
     return holds;
   }
   #activeWorkChanged() {
@@ -4786,9 +4839,29 @@ var Session = class {
   }
   #hasActiveTurn() {
     return Boolean(
-      this.pendingPrompt || this.pendingPromptCompletion || this.goalProcessing || this.cronProcessing || this.cronAbortController || this.cronCompletion || this.notificationProcessing || this.notificationAbortController || this.notificationCompletion
+      this.pendingPrompt || this.historyMutationActive || this.pendingPromptCompletion || this.goalProcessing || this.cronProcessing || this.cronAbortController || this.cronCompletion || this.notificationProcessing || this.notificationAbortController || this.notificationCompletion
     );
   }
+  beginHistoryMutation() {
+    if (this.closing) {
+      throw RequestError.invalidParams(void 0, "Session is closing");
+    }
+    if (this.#hasActiveTurn()) {
+      throw new RequestError(-32602, "Session is busy processing a turn", {
+        errorKind: "session_busy"
+      });
+    }
+    this.historyMutationActive = true;
+    let released = false;
+    return () => {
+      if (released) return;
+      released = true;
+      this.historyMutationActive = false;
+      if (this.disposed) return;
+      void this.#drainCronQueue();
+      void this.#drainNotificationQueue();
+    };
+  }
   beginClose() {
     if (this.closing) {
       throw RequestError.invalidParams(
@@ -4906,7 +4979,12 @@ var Session = class {
       this.#statusChangeCallback = void 0;
     }
     this.config.getMonitorRegistry().setNotificationCallback(void 0);
-    this.config.getBackgroundShellRegistry().setNotificationCallback(void 0);
+    const shellRegistry = this.config.getBackgroundShellRegistry();
+    shellRegistry.setNotificationCallback(void 0);
+    if (this.#shellStatusChangeCallback) {
+      shellRegistry.clearStatusChangeCallback(this.#shellStatusChangeCallback);
+      this.#shellStatusChangeCallback = void 0;
+    }
     this.config.getChatRecordingService()?.setTitleRecordedCallback(void 0);
     this.unsubscribeChatRecordingFailure?.();
     this.unsubscribeChatRecordingFailure = void 0;
@@ -5133,6 +5211,12 @@ var Session = class {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
+    if (this.historyMutationActive) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Session history mutation is in progress"
+      );
+    }
     if (modelPrompt !== void 0 && invocationContext === void 0) {
       throw RequestError.invalidParams(
         void 0,
@@ -5152,6 +5236,12 @@ var Session = class {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
+    if (this.historyMutationActive) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Session history mutation is in progress"
+      );
+    }
     if (admissionCancellation?.aborted) {
       return { stopReason: "cancelled" };
     }
@@ -5270,6 +5360,9 @@ var Session = class {
       this.todoStopGuard.suspend();
       return { stopReason: "cancelled" };
     }
+    const channelPromptTurn = params._meta?.[CHANNEL_PROMPT_META_KEY] === true;
+    const recording = this.config.getChatRecordingService();
+    const branchCheckpointCursor = scheduledGoalTurn === void 0 && !channelPromptTurn ? recording?.getBranchCheckpointCursor() : void 0;
     if (todoStopGuardPreparation.startsWorkChain) {
       this.#clearTodoStopGuardQueuedPromptWait();
       this.todoStopGuard.startOrdinaryPrompt();
@@ -5277,40 +5370,79 @@ var Session = class {
     }
     this.duplicateProviderToolCallResponseIds.clear();
     const channelDelivery = parsePromptChannelDelivery(params);
-    const channelDeliveryCapture = channelDelivery ? { finalText: "" } : void 0;
+    const responseCapture = {
+      ...channelDelivery ? { channelDelivery: { finalText: "" } } : {},
+      agentOutput: new AgentOutputMessageCapture(this.config)
+    };
     let resolveCompletion;
     this.pendingPromptCompletion = new Promise((resolve6) => {
       resolveCompletion = resolve6;
     });
+    let rejectedByLoopProtection = false;
     let promptResult;
     let promptFailed = false;
     try {
       const result = await this.#executePrompt(
         params,
         pendingSend,
-        channelDeliveryCapture,
+        responseCapture,
         invocationContext,
         modelPrompt,
-        goalTurn
+        // Channel turns are non-interactive deliveries: like cron,
+        // background-notification, and goal turns they keep the graceful
+        // end-turn handling so the collected response text is still
+        // delivered. Only the authenticated CHANNEL_PROMPT_META_KEY turns
+        // sent by the channel bridges qualify; the delivery meta alone
+        // schedules the delivery but keeps the foreground rejection. Goal
+        // turns bypass the bridge entirely, so a rejection there would
+        // settle the turn as failed and pause the goal without any
+        // turn_error ever being published.
+        !channelPromptTurn && goalTurn === void 0,
+        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,
           source: "prompt",
           target: channelDelivery.target,
           text: normalizeChannelDeliveryText(
-            channelDeliveryCapture?.finalText ?? ""
+            responseCapture.channelDelivery?.finalText ?? ""
           ),
           promptId: channelDelivery.deliveryId
         });
       }
-      return result;
+      return completedResult;
     } catch (error) {
       promptFailed = true;
       if (error instanceof SessionWriterError) {
@@ -5318,11 +5450,17 @@ var Session = class {
           errorKind: error.errorKind
         });
       }
+      rejectedByLoopProtection = isLoopDetectedTurnError(error);
       throw error;
     } finally {
       const stillOwnsPendingPrompt = this.pendingPrompt === pendingSend;
       releasePendingSend();
-      const shouldDrainAutomaticQueues = todoStopGuardPreparation.drainSupersededAutomaticQueues || this.todoStopGuardDrainAutomaticQueuesWhenIdle || this.todoStopGuard.blocksUnrelatedAutomaticTurns || this.todoStopGuard.hasCommittedContinuation || this.todoStopGuardQueuedPromptPriority;
+      const shouldDrainAutomaticQueues = (
+        // Loop-detected turns resolved end_turn (and drained) before loop
+        // stops became rejections; keep that invariant on the new path so
+        // queued cron/notification work is not stranded.
+        rejectedByLoopProtection || todoStopGuardPreparation.drainSupersededAutomaticQueues || this.todoStopGuardDrainAutomaticQueuesWhenIdle || this.todoStopGuard.blocksUnrelatedAutomaticTurns || this.todoStopGuard.hasCommittedContinuation || this.todoStopGuardQueuedPromptPriority
+      );
       if (stillOwnsPendingPrompt) {
         this.todoStopGuardDrainAutomaticQueuesWhenIdle = false;
       }
@@ -5460,7 +5598,7 @@ var Session = class {
       }
     })();
   }
-  async #executePrompt(params, pendingSend, channelDeliveryCapture, invocationContext, modelPrompt, goalTurn) {
+  async #executePrompt(params, pendingSend, responseCapture, invocationContext, modelPrompt, rejectOnLoopDetected = false, goalTurn, channelTurn = false) {
     const sessionId = this.config.getSessionId();
     if (invocationContext !== void 0 && invocationContext.sessionId !== sessionId) {
       throw RequestError.invalidParams(
@@ -5475,15 +5613,17 @@ var Session = class {
         () => this.#executePromptInner(
           params,
           pendingSend,
-          channelDeliveryCapture,
+          responseCapture,
           modelPrompt,
-          goalTurn
+          rejectOnLoopDetected,
+          goalTurn,
+          channelTurn
         )
       )
     ), "execute");
     return goalTurn ? goalTurnContext.run(goalTurn.permit, execute) : goalTurnContext.exit(execute);
   }
-  async #executePromptInner(params, pendingSend, channelDeliveryCapture, modelPrompt, goalTurn) {
+  async #executePromptInner(params, pendingSend, responseCapture, modelPrompt, rejectOnLoopDetected = false, goalTurn, channelTurn = false) {
     return Storage.runWithRuntimeBaseDir(
       this.runtimeBaseDir,
       this.config.getWorkingDir(),
@@ -5521,6 +5661,16 @@ var Session = class {
             );
             const isRetry = params.retry === true || params._meta?.[DAEMON_RETRY_META_KEY] === true;
             const isContinue = params._meta?.[DAEMON_CONTINUE_META_KEY] === true;
+            if (!isRetry && !isContinue && goalTurn?.origin !== "runtime") {
+              const interactionSpan = getActiveInteractionSpan();
+              if (interactionSpan) {
+                addAgentInputMessageAttributes(
+                  this.config,
+                  interactionSpan,
+                  promptDisplayText ?? promptText
+                );
+              }
+            }
             let continuationParts = null;
             let strippedOrphanEntries = null;
             let orphanPushCountSnapshot = 0;
@@ -5719,7 +5869,7 @@ ${this.pendingRecoveredAgentsNotice}
             let nextMessage = { role: "user", parts };
             let turnCount = 0;
             const toolLoopState = createDaemonToolLoopState(
-              promptMetadata?.[CHANNEL_PROMPT_META_KEY] === true ? "off" : this.repeatedToolFailureGuardMode
+              channelTurn ? "off" : this.repeatedToolFailureGuardMode
             );
             try {
               while (nextMessage !== null) {
@@ -5739,6 +5889,7 @@ ${this.pendingRecoveredAgentsNotice}
                   pendingSend.signal
                 );
                 let channelDeliveryResponseBlock;
+                let channelDeliveryCheckpoint = 0;
                 try {
                   if (goalTurn) goalTurn.modelStarted = true;
                   const sendResult = await this.#sendMessageStreamWithAutoCompression(
@@ -5757,8 +5908,8 @@ ${this.pendingRecoveredAgentsNotice}
                   }
                   const responseStream = sendResult.responseStream;
                   nextMessage = null;
-                  channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(channelDeliveryCapture);
-                  const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
+                  channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(responseCapture);
+                  channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
                   let streamFailed = false;
                   try {
                     for await (const resp of responseStream) {
@@ -5778,10 +5929,14 @@ ${this.pendingRecoveredAgentsNotice}
                             part.thought
                           );
                           if (!part.thought) {
+                            responseCapture.agentOutput.appendText(part.text);
                             channelDeliveryResponseBlock?.push(part.text);
                             messageDisplay?.addChunk(part.text);
                           }
                         }
+                        responseCapture.agentOutput.observeFinishReason(
+                          candidate.finishReason
+                        );
                       }
                       if (resp.type === "chunk" /* CHUNK */ && resp.value.usageMetadata) {
                         usageMetadata = resp.value.usageMetadata;
@@ -5794,6 +5949,9 @@ ${this.pendingRecoveredAgentsNotice}
                         }
                       }
                       if (resp.type === "retry" /* RETRY */ || resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                        responseCapture.agentOutput.restartAttempt(
+                          resp.type === "retry" /* RETRY */ && resp.isContinuation === true
+                        );
                         if (resp.type === "model_fallback" /* MODEL_FALLBACK */ || !resp.isContinuation) {
                           if (channelDeliveryResponseBlock) {
                             channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
@@ -5854,7 +6012,7 @@ ${this.pendingRecoveredAgentsNotice}
                   await messageDisplay?.finish();
                 }
                 commitChannelDeliveryResponseBlock(
-                  channelDeliveryCapture,
+                  responseCapture,
                   channelDeliveryResponseBlock,
                   functionCalls.length > 0
                 );
@@ -5898,14 +6056,16 @@ ${this.pendingRecoveredAgentsNotice}
                     pendingSend.signal,
                     promptId,
                     toolLoopState,
-                    onFullTurnModel
+                    onFullTurnModel,
+                    rejectOnLoopDetected
                   );
                   nextMessage = nextAfterTools.message;
                   if (nextAfterTools.stoppedByRepeatedToolFailure) {
                     return {
-                      stopReason: getAbortAwareEndTurnStopReason(
-                        pendingSend.signal
-                      )
+                      stopReason: rejectOnLoopDetected ? cancelledOrThrowLoopDetected(
+                        pendingSend.signal,
+                        toolLoopState
+                      ) : getAbortAwareEndTurnStopReason(pendingSend.signal)
                     };
                   }
                   if (toolRun.loopDetected) {
@@ -5915,9 +6075,10 @@ ${this.pendingRecoveredAgentsNotice}
                       pendingSend.signal
                     );
                     return {
-                      stopReason: getAbortAwareEndTurnStopReason(
-                        pendingSend.signal
-                      )
+                      stopReason: rejectOnLoopDetected ? cancelledOrThrowLoopDetected(
+                        pendingSend.signal,
+                        toolLoopState
+                      ) : getAbortAwareEndTurnStopReason(pendingSend.signal)
                     };
                   }
                 }
@@ -5925,15 +6086,22 @@ ${this.pendingRecoveredAgentsNotice}
               if (this.messageRewriter) {
                 await this.messageRewriter.waitForPendingRewrites();
               }
-              return await this.#handleStopHookLoop(
+              const result = await this.#handleStopHookLoop(
                 pendingSend,
                 promptId,
                 hooksEnabled,
                 messageBus,
                 true,
                 fullTurnModelOverride,
-                channelDeliveryCapture
+                responseCapture,
+                rejectOnLoopDetected
               );
+              if (result.stopReason !== "cancelled") {
+                responseCapture.agentOutput.writeToSpan(
+                  getActiveInteractionSpan()
+                );
+              }
+              return result;
             } finally {
               logConversationFinishedEvent(
                 this.config,
@@ -5954,7 +6122,7 @@ ${this.pendingRecoveredAgentsNotice}
       }
     );
   }
-  async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride, channelDeliveryCapture) {
+  async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride, responseCapture, rejectOnLoopDetected = false) {
     const stopHookBlockingCap = this.config.getStopHookBlockingCap();
     let stopHookIterationCount = 0;
     let stopHookReasons = [];
@@ -6014,7 +6182,8 @@ ${this.pendingRecoveredAgentsNotice}
             {
               onFullTurnModel,
               getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
-              channelDeliveryCapture
+              responseCapture,
+              rejectOnLoopDetected
             }
           );
           if (continuation2.kind === "terminal") {
@@ -6098,7 +6267,8 @@ ${this.pendingRecoveredAgentsNotice}
               {
                 onFullTurnModel,
                 getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
-                channelDeliveryCapture
+                responseCapture,
+                rejectOnLoopDetected
               }
             );
             if (continuation2.kind === "terminal") {
@@ -6197,7 +6367,8 @@ ${this.pendingRecoveredAgentsNotice}
           } : {},
           onFullTurnModel,
           getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
-          channelDeliveryCapture
+          responseCapture,
+          rejectOnLoopDetected
         }
       );
       if (continuation.supersededAutomaticContinuation && externalReason) {
@@ -6264,6 +6435,7 @@ ${this.pendingRecoveredAgentsNotice}
         pendingSend.signal
       );
       let channelDeliveryResponseBlock;
+      let channelDeliveryCheckpoint = 0;
       let providerSendChat;
       let userContentPushCountBeforeSend = 0;
       try {
@@ -6494,9 +6666,9 @@ ${this.pendingRecoveredAgentsNotice}
         const responseStream = sendResult.responseStream;
         nextMessage = null;
         channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(
-          options.channelDeliveryCapture
+          options.responseCapture
         );
-        const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
+        channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
         initialSend = false;
         if (guardForThisSend) {
           const guardCommitted = this.todoStopGuard.commitContinuation(
@@ -6528,10 +6700,14 @@ ${this.pendingRecoveredAgentsNotice}
                 part.thought
               );
               if (!part.thought) {
+                options.responseCapture?.agentOutput.appendText(part.text);
                 channelDeliveryResponseBlock?.push(part.text);
                 messageDisplay?.addChunk(part.text);
               }
             }
+            options.responseCapture?.agentOutput.observeFinishReason(
+              candidate.finishReason
+            );
           }
           if (response.type === "chunk" /* CHUNK */ && response.value.usageMetadata) {
             usageMetadata = response.value.usageMetadata;
@@ -6544,6 +6720,9 @@ ${this.pendingRecoveredAgentsNotice}
             }
           }
           if (response.type === "retry" /* RETRY */ || response.type === "model_fallback" /* MODEL_FALLBACK */) {
+            options.responseCapture?.agentOutput.restartAttempt(
+              response.type === "retry" /* RETRY */ && response.isContinuation === true
+            );
             if (response.type === "model_fallback" /* MODEL_FALLBACK */ || !response.isContinuation) {
               if (channelDeliveryResponseBlock) {
                 channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
@@ -6606,7 +6785,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
       }
       commitChannelDeliveryResponseBlock(
-        options.channelDeliveryCapture,
+        options.responseCapture,
         channelDeliveryResponseBlock,
         functionCalls.length > 0
       );
@@ -6630,7 +6809,7 @@ ${this.pendingRecoveredAgentsNotice}
             options.onFullTurnModel
           )
         );
-        if (toolRun.stopAfterPermissionCancel || toolRun.loopDetected || pendingSend.signal.aborted) {
+        if (toolRun.stopAfterPermissionCancel || pendingSend.signal.aborted) {
           this.todoStopGuard.suspend();
           await this.#preserveStoppedToolRun(toolRun, pendingSend.signal);
           return {
@@ -6639,12 +6818,25 @@ ${this.pendingRecoveredAgentsNotice}
             ...supersededAutomaticContinuation ? { supersededAutomaticContinuation: true } : {}
           };
         }
+        if (toolRun.loopDetected) {
+          this.todoStopGuard.suspend();
+          await this.#preserveStoppedToolRun(toolRun, pendingSend.signal);
+          return {
+            kind: "terminal",
+            // Only the foreground chain rejects a loop-detected stop; cron
+            // and background-notification turns keep the graceful end-turn
+            // handling they had before loop stops became rejections.
+            stopReason: options.rejectOnLoopDetected ? cancelledOrThrowLoopDetected(pendingSend.signal, toolLoopState) : getAbortAwareEndTurnStopReason(pendingSend.signal),
+            ...supersededAutomaticContinuation ? { supersededAutomaticContinuation: true } : {}
+          };
+        }
         const nextAfterTools = await this.#buildNextMessageAfterToolRun(
           toolRun,
           pendingSend.signal,
           toolPromptId,
           toolLoopState,
-          options.onFullTurnModel
+          options.onFullTurnModel,
+          options.rejectOnLoopDetected ?? false
         );
         nextMessage = nextAfterTools.message;
         if (nextAfterTools.hadMidTurnUserInput) {
@@ -6949,7 +7141,7 @@ ${this.pendingRecoveredAgentsNotice}
     );
     await this.messageRewriter?.waitForPendingRewrites();
   }
-  async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, toolLoopState, onFullTurnModel) {
+  async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, toolLoopState, onFullTurnModel, rejectOnLoopDetected = false) {
     if (toolRun.loopDetected) {
       debugLogger6.debug("Stopping ACP turn after daemon loop detection.");
       return { message: null, hadMidTurnUserInput: false };
@@ -7039,14 +7231,16 @@ ${this.pendingRecoveredAgentsNotice}
         toolLoopState,
         { recordToQwenLogger: false }
       );
-      try {
-        await this.messageEmitter.emitAgentMessage(
-          REPEATED_TOOL_FAILURE_STOP_MESSAGE
-        );
-      } catch (error) {
-        debugLogger6.warn(
-          `Failed to emit repeated tool failure stop message: ${this.#formatError(error)}`
-        );
+      if (!rejectOnLoopDetected) {
+        try {
+          await this.messageEmitter.emitAgentMessage(
+            REPEATED_TOOL_FAILURE_STOP_MESSAGE
+          );
+        } catch (error) {
+          debugLogger6.warn(
+            `Failed to emit repeated tool failure stop message: ${this.#formatError(error)}`
+          );
+        }
       }
       return {
         message: null,
@@ -7389,6 +7583,15 @@ ${this.pendingRecoveredAgentsNotice}
     if (this.notificationProcessing) return;
     if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
     if (this.#nextCronQueueIndex() < 0) return;
+    await this.runExclusiveAutomaticHistoryMutation(
+      () => this.#drainCronQueueExclusive()
+    );
+  }
+  async #drainCronQueueExclusive() {
+    if (this.disposed || this.closing || this.cronProcessing) return;
+    if (this.pendingPrompt || this.notificationProcessing) return;
+    if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
+    if (this.#nextCronQueueIndex() < 0) return;
     try {
       await this.assertCanStartTurn();
     } catch (error) {
@@ -7483,7 +7686,10 @@ ${this.pendingRecoveredAgentsNotice}
         const promptId = this.config.getSessionId() + "########cron" + Date.now();
         let cronHadError = false;
         let cronCompleted = false;
-        const channelDeliveryCapture = item.delivery ? { finalText: "" } : void 0;
+        const responseCapture = {
+          ...item.delivery ? { channelDelivery: { finalText: "" } } : {},
+          agentOutput: new AgentOutputMessageCapture(this.config)
+        };
         await withInteractionSpan(
           this.config,
           {
@@ -7596,7 +7802,7 @@ ${this.pendingRecoveredAgentsNotice}
                   return;
                 }
                 const responseStream = sendResult.responseStream;
-                const channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(channelDeliveryCapture);
+                const channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(responseCapture);
                 const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
                 if (loopTick && turnCount === 1) {
                   this.loopTickResolver?.markDelivered();
@@ -7622,10 +7828,14 @@ ${this.pendingRecoveredAgentsNotice}
                           part.thought
                         );
                         if (!part.thought) {
+                          responseCapture.agentOutput.appendText(part.text);
                           channelDeliveryResponseBlock?.push(part.text);
                           messageDisplay?.addChunk(part.text);
                         }
                       }
+                      responseCapture.agentOutput.observeFinishReason(
+                        candidate.finishReason
+                      );
                     }
                     if (resp.type === "chunk" /* CHUNK */ && resp.value.usageMetadata) {
                       usageMetadata = resp.value.usageMetadata;
@@ -7638,6 +7848,9 @@ ${this.pendingRecoveredAgentsNotice}
                       }
                     }
                     if (resp.type === "retry" /* RETRY */ || resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                      responseCapture.agentOutput.restartAttempt(
+                        resp.type === "retry" /* RETRY */ && resp.isContinuation === true
+                      );
                       if (resp.type === "model_fallback" /* MODEL_FALLBACK */ || !resp.isContinuation) {
                         if (channelDeliveryResponseBlock) {
                           channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
@@ -7666,7 +7879,7 @@ ${this.pendingRecoveredAgentsNotice}
                   }
                 }
                 commitChannelDeliveryResponseBlock(
-                  channelDeliveryCapture,
+                  responseCapture,
                   channelDeliveryResponseBlock,
                   functionCalls.length > 0
                 );
@@ -7717,7 +7930,7 @@ ${this.pendingRecoveredAgentsNotice}
                   void 0,
                   false,
                   void 0,
-                  channelDeliveryCapture
+                  responseCapture
                 );
                 stopReason = guardStop.stopReason;
                 if (guardStop.stopReason === "max_tokens") {
@@ -7750,6 +7963,11 @@ ${this.pendingRecoveredAgentsNotice}
                 )
               );
             }
+            if (!ac.signal.aborted && !cronHadError) {
+              responseCapture.agentOutput.writeToSpan(
+                getActiveInteractionSpan()
+              );
+            }
           },
           () => ac.signal.aborted ? "cancelled" : cronHadError ? "error" : "ok"
         );
@@ -7760,7 +7978,7 @@ ${this.pendingRecoveredAgentsNotice}
             source: "scheduled",
             target: item.delivery.target,
             text: normalizeChannelDeliveryText(
-              channelDeliveryCapture?.finalText ?? ""
+              responseCapture.channelDelivery?.finalText ?? ""
             ),
             taskId: item.taskId,
             firedAt: item.firedAt
@@ -7832,6 +8050,10 @@ ${this.pendingRecoveredAgentsNotice}
       });
     });
     const shellRegistry = this.config.getBackgroundShellRegistry();
+    this.#shellStatusChangeCallback = () => {
+      this.#activeWorkChanged();
+    };
+    shellRegistry.setStatusChangeCallback(this.#shellStatusChangeCallback);
     shellRegistry.setNotificationCallback((displayText, modelText, meta) => {
       const entry = shellRegistry.get(meta.shellId);
       this.#enqueueBackgroundNotification({
@@ -7963,6 +8185,18 @@ ${this.pendingRecoveredAgentsNotice}
     if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
     if (this.notificationQueue.length === 0) return;
     if (this.#nextNotificationQueueIndex() < 0) return;
+    await this.runExclusiveAutomaticHistoryMutation(
+      () => this.#drainNotificationQueueExclusive()
+    );
+  }
+  async #drainNotificationQueueExclusive() {
+    if (this.disposed || this.closing || this.notificationProcessing) return;
+    if (this.pendingPrompt || this.cronProcessing || this.cronAbortController) {
+      return;
+    }
+    if (this.#deferAutomaticQueueDrainUntilTurnsSettle()) return;
+    if (this.notificationQueue.length === 0) return;
+    if (this.#nextNotificationQueueIndex() < 0) return;
     try {
       await this.assertCanStartTurn();
     } catch (error) {
@@ -7990,6 +8224,7 @@ ${this.pendingRecoveredAgentsNotice}
         const [item] = this.notificationQueue.splice(nextIndex, 1);
         if (!item) break;
         this.currentAgentNotificationTaskId = item.kind === "agent" ? item.taskId : null;
+        this.currentShellNotificationActive = item.kind === "shell";
         this.#activeWorkChanged();
         try {
           await runWithInvocationContext(
@@ -8001,6 +8236,7 @@ ${this.pendingRecoveredAgentsNotice}
           );
         } finally {
           this.currentAgentNotificationTaskId = null;
+          this.currentShellNotificationActive = false;
           this.#activeWorkChanged();
         }
       }
@@ -10016,6 +10252,13 @@ ${this.pendingRecoveredAgentsNotice}
                 toolName: policyToolName,
                 args: invocation.params,
                 signal: activeToolAbortSignal,
+                // Same identity and execution scope `CoreToolScheduler`
+                // supplies. This is the path daemon ACP sessions actually
+                // take, so without them a host policy that falls back to the
+                // session — or reasons about where the tool runs — sees
+                // neither on every call made here.
+                sessionId: this.config.getSessionId(),
+                cwd: this.config.getTargetDir(),
                 ...invocationContext ? { invocationContext } : {}
               }
             );
@@ -11022,10 +11265,11 @@ ${contextPart.text}`
 init_esbuild_shims();
 var debugLogger7 = createDebugLogger("ACTIVE_WORK");
 var ActiveWorkReporter = class {
-  constructor(send, listSources, intervalMs) {
+  constructor(send, listSources, intervalMs, enabledCategories) {
     this.send = send;
     this.listSources = listSources;
     this.intervalMs = intervalMs;
+    this.#enabledCategories = new Set(enabledCategories);
     this.#timer = setInterval(() => {
       this.#publish();
     }, intervalMs);
@@ -11040,6 +11284,7 @@ var ActiveWorkReporter = class {
   #coalescing = false;
   #timer;
   #disposed = false;
+  #enabledCategories;
   /**
    * Note that some Session's derived state may have changed. Coalesced to
    * one snapshot per microtask so a burst of transitions (an agent finishing
@@ -11087,7 +11332,7 @@ var ActiveWorkReporter = class {
       for (const source of this.listSources()) {
         sessions.push({
           sessionId: source.sessionId,
-          holds: source.collectActiveWorkHolds()
+          holds: source.collectActiveWorkHolds().filter((hold) => this.#enabledCategories.has(hold.category))
         });
       }
     } catch (error) {
@@ -11381,11 +11626,15 @@ async function shutdownSessionConfig(config) {
   }
 }
 __name(shutdownSessionConfig, "shutdownSessionConfig");
-async function waitForSessionDrain(operation, timeoutMs, kind) {
+async function waitForSessionDrain(operation, timeoutMs, kind, displayTimeoutMs) {
   let timer;
   const timeout = new Promise((_, reject) => {
     timer = setTimeout(
-      () => reject(new Error(`Session ${kind} timed out after ${timeoutMs}ms`)),
+      () => reject(
+        new Error(
+          `Session ${kind} timed out after ${displayTimeoutMs ?? timeoutMs}ms`
+        )
+      ),
       timeoutMs
     );
     timer.unref();
@@ -11691,6 +11940,15 @@ function getLoadReplayPageSize(params) {
   return value;
 }
 __name(getLoadReplayPageSize, "getLoadReplayPageSize");
+function deriveForkBaseName(name, recording, sessionId) {
+  if (typeof name === "string" && name.trim().length > 0) {
+    return name.trim();
+  }
+  const existingTitle = recording?.getCurrentCustomTitle();
+  const stripped = existingTitle?.replace(/\s*\(Branch(?:\s+\d+)?\)\s*$/, "").trim();
+  return stripped && stripped.length > 0 ? stripped : sessionId.slice(0, 8);
+}
+__name(deriveForkBaseName, "deriveForkBaseName");
 function createHiddenWorkspaceMemoryConfig(config) {
   return new Proxy(config, {
     get(target, prop) {
@@ -13086,23 +13344,28 @@ async function deliverClientMcpMessage(connection, serverName, message, sessionI
   return payload;
 }
 __name(deliverClientMcpMessage, "deliverClientMcpMessage");
-function createManagedExternalToolGuard(connection) {
+function createManagedExternalToolGuard(connection, options = {
+  externalProviderAttached: false
+}) {
   return async (context) => {
+    if (!options.externalProviderAttached && !SHELL_EXECUTING_TOOL_NAMES.has(context.toolName)) {
+      return { allowed: true };
+    }
     const invocation = context.invocationContext;
-    if (!invocation) {
+    if (!invocation && options.externalProviderAttached) {
       throw new Error(
         "Managed external tool guard requires a runtime invocation context."
       );
     }
+    const sessionId = invocation?.sessionId ?? context.sessionId;
+    if (typeof sessionId !== "string" || sessionId.length === 0) {
+      throw new Error(
+        "Managed external tool guard requires a session identity."
+      );
+    }
     if (context.signal.aborted) {
       throw new DOMException("Tool invocation aborted", "AbortError");
     }
-    if (context.toolName === ToolNames.AGENT || context.toolName === ToolNames.WORKFLOW || context.toolName === ToolNames.CREATE_SUB_SESSION || context.toolName === ToolNames.SEND_MESSAGE) {
-      return {
-        allowed: false,
-        reason: "Managed external tool guard v1 does not support nested or delegated agent execution."
-      };
-    }
     let rejectOnAbort;
     const aborted = new Promise((_resolve, reject) => {
       rejectOnAbort = reject;
@@ -13117,11 +13380,14 @@ function createManagedExternalToolGuard(connection) {
         connection.extMethod(
           SERVE_CONTROL_EXT_METHODS.externalToolGuardPrepare,
           {
-            sessionId: invocation.sessionId,
-            promptId: invocation.promptId,
+            sessionId,
+            ...invocation ? { promptId: invocation.promptId } : {},
             toolCallId: context.callId,
             toolName: context.toolName,
-            arguments: context.args
+            arguments: context.args,
+            // A sub-agent pinned to a worktree executes here, not in the
+            // session's own directory; the host validates this before use.
+            ...typeof context.cwd === "string" && context.cwd.length > 0 ? { invocationCwd: context.cwd } : {}
           }
         ),
         aborted
@@ -13248,8 +13514,10 @@ async function runAcpAgent(config, settings, argv, options) {
   const privateParentCapability = options === void 0 ? process.env[PRIVATE_ACP_CAPABILITY_ENV] : options.privateParentCapability;
   delete process.env[PRIVATE_ACP_CAPABILITY_ENV];
   delete process.env[PRIVATE_EXTERNAL_TOOL_GUARD_ENV];
+  delete process.env[PRIVATE_EXTERNAL_TOOL_GUARD_PROVIDER_ENV];
   delete process.env[EXTERNAL_TOOL_GUARD_TOKEN_ENV];
   const externalToolGuardRequired = options?.externalToolGuardRequired === true;
+  const externalToolGuardProviderAttached = options?.externalToolGuardProviderAttached === true;
   if (externalToolGuardRequired && privateParentCapability === void 0) {
     throw new Error(
       "Required external tool guard is available only to a private managed ACP parent."
@@ -13331,7 +13599,9 @@ async function runAcpAgent(config, settings, argv, options) {
     });
     connection = new AgentSideConnection((conn) => {
       acpConnection = conn;
-      const managedToolInvocationGuard = externalToolGuardRequired ? createManagedExternalToolGuard(conn) : void 0;
+      const managedToolInvocationGuard = externalToolGuardRequired ? createManagedExternalToolGuard(conn, {
+        externalProviderAttached: externalToolGuardProviderAttached
+      }) : void 0;
       agentInstance = new QwenAgent(
         config,
         settings,
@@ -13339,7 +13609,8 @@ async function runAcpAgent(config, settings, argv, options) {
         conn,
         privateParentCapability,
         sessionWriterLeaseEnabledAtStartup,
-        managedToolInvocationGuard
+        managedToolInvocationGuard,
+        externalToolGuardProviderAttached
       );
       return agentInstance;
     }, stream);
@@ -13645,7 +13916,7 @@ function isOwnerOnlyDirectory(stats) {
 }
 __name(isOwnerOnlyDirectory, "isOwnerOnlyDirectory");
 var QwenAgent = class {
-  constructor(config, settings, argv, connection, expectedPrivateParentCapability, sessionWriterLeaseEnabledAtStartup = false, managedToolInvocationGuard) {
+  constructor(config, settings, argv, connection, expectedPrivateParentCapability, sessionWriterLeaseEnabledAtStartup = false, managedToolInvocationGuard, externalToolGuardProviderAttached = false) {
     this.config = config;
     this.settings = settings;
     this.argv = argv;
@@ -13653,6 +13924,7 @@ var QwenAgent = class {
     this.expectedPrivateParentCapability = expectedPrivateParentCapability;
     this.sessionWriterLeaseEnabledAtStartup = sessionWriterLeaseEnabledAtStartup;
     this.managedToolInvocationGuard = managedToolInvocationGuard;
+    this.externalToolGuardProviderAttached = externalToolGuardProviderAttached;
     if (process.env["QWEN_SERVE_NO_MCP_POOL"] === "1") {
       this.mcpPool = void 0;
       this.workspaceMcpBudget = void 0;
@@ -13683,6 +13955,7 @@ var QwenAgent = class {
     __name(this, "QwenAgent");
   }
   sessions = /* @__PURE__ */ new Map();
+  historyMutationTails = /* @__PURE__ */ new Map();
   startingSessionIds = /* @__PURE__ */ new Set();
   activePromptCalls = /* @__PURE__ */ new Map();
   workspaceMcpDiscoveryConfig;
@@ -13746,8 +14019,45 @@ 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) {
+    if (this.managedToolInvocationGuard && this.externalToolGuardProviderAttached) {
       throw RequestError.invalidParams(
         void 0,
         `Managed external tool guard v1 does not support ${operation}.`
@@ -14245,11 +14555,10 @@ var QwenAgent = class {
     }
     const recorder = session.getConfig().getChatRecordingService();
     const requireFlush = opts?.requireFlush === true;
-    if (requireFlush) {
-      await recorder?.flush();
-    }
+    if (requireFlush) await recorder?.flush();
     const drainTimeoutMs = opts?.drainTimeoutMs ?? SESSION_DRAIN_TIMEOUT_MS;
     const cancelClose = opts?.waitForCloseGate ? await beginSessionCloseAfterCurrentGate(session, drainTimeoutMs) : session.beginClose();
+    const conditionalDrainDeadline = opts?.onlyIfUnheld ? Date.now() + drainTimeoutMs : void 0;
     if (opts?.onlyIfUnheld) {
       const holds = session.collectActiveWorkHolds();
       if (holds.length > 0) {
@@ -14257,13 +14566,24 @@ var QwenAgent = class {
         return { closed: false, holds };
       }
     }
-    for (const [requestId, generation] of this.generationControllers) {
-      if (generation.sessionId !== sessionId) continue;
-      generation.controller.abort();
-      this.generationControllers.delete(requestId);
-    }
     let removedFromStore = false;
     try {
+      if (opts?.onlyIfUnheld) {
+        await waitForSessionDrain(
+          session.waitForActiveTurnsToSettle(),
+          drainTimeoutMs,
+          "close"
+        );
+        const holds = session.collectActiveWorkHolds();
+        if (holds.length > 0) {
+          return { closed: false, holds };
+        }
+      }
+      for (const [requestId, generation] of this.generationControllers) {
+        if (generation.sessionId !== sessionId) continue;
+        generation.controller.abort();
+        this.generationControllers.delete(requestId);
+      }
       await waitForSessionDrain(
         (async () => {
           try {
@@ -14275,35 +14595,68 @@ var QwenAgent = class {
           }
           await session.waitForActiveTurnsToSettle();
         })(),
-        drainTimeoutMs,
-        "close"
+        conditionalDrainDeadline === void 0 ? drainTimeoutMs : Math.max(1, conditionalDrainDeadline - Date.now()),
+        "close",
+        // Report the shared budget, not the phase-2 residue — a residue like
+        // "1ms" hides that the settle phase consumed the budget and sends
+        // oncall grepping for a timeout setting that does not exist.
+        drainTimeoutMs
       );
-      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();
     }
@@ -14411,7 +14764,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.12-preview.5";
+    const version = "0.21.13";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -14455,12 +14808,17 @@ var QwenAgent = class {
     const activeWorkIntervalMs = activeWorkRequested ? clampActiveWorkIntervalMs(
       requestedActiveWork["intervalMs"]
     ) : void 0;
+    const requestedActiveWorkCategories = activeWorkRequested ? requestedActiveWork["categories"] : void 0;
+    const activeWorkCategories = activeWorkRequested ? Array.isArray(requestedActiveWorkCategories) ? ACTIVE_WORK_HOLD_CATEGORIES.filter(
+      (category) => requestedActiveWorkCategories.includes(category)
+    ) : ACTIVE_WORK_LEGACY_HOLD_CATEGORIES : void 0;
     if (activeWorkIntervalMs !== void 0) {
       this.activeWorkReporter?.dispose();
       this.activeWorkReporter = new ActiveWorkReporter(
         (method, params) => this.connection.extNotification(method, params),
         () => this.sessions.values(),
-        activeWorkIntervalMs
+        activeWorkIntervalMs,
+        activeWorkCategories ?? []
       );
     }
     const responseMeta = {
@@ -14472,7 +14830,7 @@ var QwenAgent = class {
         [ACTIVE_WORK_HEARTBEAT_META_KEY]: {
           v: ACTIVE_WORK_HEARTBEAT_VERSION,
           intervalMs: activeWorkIntervalMs,
-          categories: [...ACTIVE_WORK_HOLD_CATEGORIES]
+          categories: [...activeWorkCategories ?? []]
         }
       } : {}
     };
@@ -15234,13 +15592,23 @@ var QwenAgent = class {
     const suppliedContext = meta[INVOCATION_CONTEXT_META_KEY];
     const suppliedModelPrompt = meta[DAEMON_MODEL_PROMPT_META_KEY];
     const suppliedPromptDisplayText = meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+    const suppliedChannelPrompt = meta[CHANNEL_PROMPT_META_KEY];
+    const suppliedChannelDelivery = meta[DAEMON_CHANNEL_DELIVERY_META_KEY];
     delete meta[INVOCATION_CONTEXT_META_KEY];
     delete meta[DAEMON_MODEL_PROMPT_META_KEY];
     delete meta[PRIVATE_PARENT_CAPABILITY_META_KEY];
     delete meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+    delete meta[CHANNEL_PROMPT_META_KEY];
+    delete meta[DAEMON_CHANNEL_DELIVERY_META_KEY];
     if (this.privateParentState === "trusted" && typeof suppliedPromptDisplayText === "string") {
       meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY] = suppliedPromptDisplayText;
     }
+    if (this.privateParentState === "trusted" && suppliedChannelPrompt === true) {
+      meta[CHANNEL_PROMPT_META_KEY] = true;
+    }
+    if (this.privateParentState === "trusted" && suppliedChannelDelivery !== void 0) {
+      meta[DAEMON_CHANNEL_DELIVERY_META_KEY] = suppliedChannelDelivery;
+    }
     if (Object.keys(meta).length > 0) {
       sanitizedParams._meta = meta;
     } else {
@@ -15303,6 +15671,9 @@ var QwenAgent = class {
         throw error;
       }
     }
+    for (const call of this.activePromptCalls.get(sessionId) ?? []) {
+      call.controller.abort();
+    }
   }
   loadPermissionSettings(cwd) {
     this.settings = loadSettings(cwd);
@@ -17597,7 +17968,7 @@ var QwenAgent = class {
         );
       case SERVE_CONTROL_EXT_METHODS.workspaceMemoryRememberAvailability:
         return {
-          available: !this.managedToolInvocationGuard && this.config.isManagedMemoryAvailable()
+          available: !(this.managedToolInvocationGuard && this.externalToolGuardProviderAttached) && this.config.isManagedMemoryAvailable()
         };
       case SERVE_CONTROL_EXT_METHODS.workspaceMemoryRemember: {
         this.rejectUnsupportedGuardedHiddenAgent(
@@ -19154,7 +19525,7 @@ var QwenAgent = class {
         return { sessionId, answer: result.text || null };
       }
       case SERVE_CONTROL_EXT_METHODS.sessionForkAgent: {
-        if (this.managedToolInvocationGuard) {
+        if (this.managedToolInvocationGuard && this.externalToolGuardProviderAttached) {
           throw RequestError.invalidParams(
             void 0,
             "Managed external tool guard v1 does not support /fork."
@@ -19637,9 +20008,25 @@ ${outputText}
             `Session not found for id: ${sessionId}`
           );
         }
+        if (!session.isTurnIdle()) {
+          throw new RequestError(
+            -32602,
+            "Cannot rewind while a prompt is running",
+            {
+              errorKind: "session_busy"
+            }
+          );
+        }
+        const rawPromptId = params["promptId"];
+        if (rawPromptId !== void 0 && typeof rawPromptId !== "string") {
+          throw new RequestError(-32602, "Invalid promptId format", {
+            errorKind: "invalid_rewind_target"
+          });
+        }
+        const promptId = typeof rawPromptId === "string" ? rawPromptId : void 0;
         let turnIndex = params["targetTurnIndex"];
-        const promptId = params["promptId"];
-        if (promptId && (turnIndex === void 0 || turnIndex === null)) {
+        const resolveFromPromptId = promptId !== void 0 && (turnIndex === void 0 || turnIndex === null);
+        if (resolveFromPromptId) {
           const prefix = sessionId + "########";
           if (!promptId.startsWith(prefix)) {
             throw new RequestError(-32602, "Invalid promptId format", {
@@ -19654,104 +20041,113 @@ ${outputText}
               { errorKind: "invalid_rewind_target" }
             );
           }
-          const fhs = session.getConfig().getFileHistoryService();
-          const snapshots = fhs.getSnapshots();
-          const snapshotIdx = snapshots.findIndex(
-            (s) => s.promptId === promptId
-          );
-          if (snapshotIdx < 0) {
-            throw new RequestError(
-              -32602,
-              "Snapshot not found for the given promptId",
-              { errorKind: "invalid_rewind_target" }
-            );
-          }
-          turnIndex = snapshotIdx;
-        }
-        if (!Number.isInteger(turnIndex) || turnIndex < 0) {
+        } else if (!Number.isInteger(turnIndex) || turnIndex < 0) {
           throw RequestError.invalidParams(
             void 0,
             "Invalid or missing targetTurnIndex"
           );
         }
-        const rewindFiles = params["rewindFiles"] !== false;
-        const historyBeforeRewind = session.captureHistorySnapshot();
-        let rewindResult;
-        try {
-          rewindResult = session.rewindToTurn(turnIndex, {
-            rewindFiles
-          });
-        } catch (err) {
-          if (err instanceof RequestError) {
-            const msg = err.message;
-            if (msg.includes("Cannot rewind while a prompt is running")) {
-              throw new RequestError(err.code, msg, {
-                errorKind: "session_busy"
-              });
-            }
-            if (msg.includes("compressed or does not exist")) {
-              throw new RequestError(err.code, msg, {
-                errorKind: "invalid_rewind_target"
-              });
+        return await this.runExclusiveHistoryMutation(sessionId, async () => {
+          if (resolveFromPromptId) {
+            const fhs = session.getConfig().getFileHistoryService();
+            const snapshots = fhs.getSnapshots();
+            const snapshotIdx = snapshots.findIndex(
+              (s) => s.promptId === promptId
+            );
+            if (snapshotIdx < 0) {
+              throw new RequestError(
+                -32602,
+                "Snapshot not found for the given promptId",
+                { errorKind: "invalid_rewind_target" }
+              );
             }
+            turnIndex = snapshotIdx;
           }
-          throw err;
-        }
-        let filesChanged = [];
-        let filesFailed = [];
-        if (rewindFiles && promptId) {
-          const fhs = session.getConfig().getFileHistoryService();
+          const rewindFiles = params["rewindFiles"] !== false;
+          const historyBeforeRewind = session.captureHistorySnapshot();
+          let rewindResult;
+          let releaseHistoryMutation;
           try {
-            const fileResult = await fhs.rewind(promptId, true);
-            filesChanged = fileResult.filesChanged;
-            filesFailed = fileResult.filesFailed;
+            rewindResult = session.rewindToTurn(turnIndex, {
+              rewindFiles
+            });
+            releaseHistoryMutation = session.beginHistoryMutation();
           } catch (err) {
-            const reason = err instanceof Error ? err.message : String(err);
-            debugLogger8.error(
-              `[ACP] File-history rewind failed for session=${sessionId} promptId=${promptId}: ${reason}`
-            );
-            filesFailed = [`file-history-rewind: ${reason}`];
+            if (err instanceof RequestError) {
+              const msg = err.message;
+              if (msg.includes("Cannot rewind while a prompt is running") || msg.includes("Session is busy processing a turn")) {
+                throw new RequestError(err.code, msg, {
+                  errorKind: "session_busy"
+                });
+              }
+              if (msg.includes("compressed or does not exist")) {
+                throw new RequestError(err.code, msg, {
+                  errorKind: "invalid_rewind_target"
+                });
+              }
+            }
+            throw err;
           }
-        }
-        let artifactSnapshot;
-        let artifactSnapshotUnavailable;
-        try {
-          const config = session.getConfig();
-          const recording = config.getChatRecordingService();
-          await recording?.flush();
-          const loadAuthoritative = /* @__PURE__ */ __name(() => config.getSessionService().loadSession(sessionId), "loadAuthoritative");
-          const sessionData = recording ? await recording.runWithWriteBarrier(loadAuthoritative) : await loadAuthoritative();
-          if (sessionData === void 0) {
-            artifactSnapshotUnavailable = "session data unavailable after rewind";
-          } else if (sessionData.artifactSnapshot) {
-            artifactSnapshot = sessionData.artifactSnapshot;
-          } else {
-            artifactSnapshot = {
-              v: SESSION_ARTIFACT_PERSISTENCE_VERSION,
-              sessionId,
-              sequence: 0,
-              artifacts: [],
-              tombstonedIds: [],
-              stickyEphemeralIds: [],
-              warnings: []
+          try {
+            let filesChanged = [];
+            let filesFailed = [];
+            if (rewindFiles && promptId) {
+              const fhs = session.getConfig().getFileHistoryService();
+              try {
+                const fileResult = await fhs.rewind(promptId, true);
+                filesChanged = fileResult.filesChanged;
+                filesFailed = fileResult.filesFailed;
+              } catch (err) {
+                const reason = err instanceof Error ? err.message : String(err);
+                debugLogger8.error(
+                  `[ACP] File-history rewind failed for session=${sessionId} promptId=${promptId}: ${reason}`
+                );
+                filesFailed = [`file-history-rewind: ${reason}`];
+              }
+            }
+            let artifactSnapshot;
+            let artifactSnapshotUnavailable;
+            try {
+              const config = session.getConfig();
+              const recording = config.getChatRecordingService();
+              await recording?.flush();
+              const loadAuthoritative = /* @__PURE__ */ __name(() => config.getSessionService().loadSession(sessionId), "loadAuthoritative");
+              const sessionData = recording ? await recording.runWithWriteBarrier(loadAuthoritative) : await loadAuthoritative();
+              if (sessionData === void 0) {
+                artifactSnapshotUnavailable = "session data unavailable after rewind";
+              } else if (sessionData.artifactSnapshot) {
+                artifactSnapshot = sessionData.artifactSnapshot;
+              } else {
+                artifactSnapshot = {
+                  v: SESSION_ARTIFACT_PERSISTENCE_VERSION,
+                  sessionId,
+                  sequence: 0,
+                  artifacts: [],
+                  tombstonedIds: [],
+                  stickyEphemeralIds: [],
+                  warnings: []
+                };
+              }
+            } catch (err) {
+              const reason = err instanceof Error ? err.message : String(err);
+              artifactSnapshotUnavailable = "artifact snapshot unavailable after rewind";
+              debugLogger8.warn(
+                `[ACP] Failed to rebuild artifact snapshot after rewind for session=${sessionId}: ${reason}`
+              );
+            }
+            return {
+              success: true,
+              historyBeforeRewind,
+              ...rewindResult,
+              filesChanged,
+              filesFailed,
+              ...artifactSnapshot ? { artifactSnapshot } : {},
+              ...artifactSnapshotUnavailable ? { artifactSnapshotUnavailable } : {}
             };
+          } finally {
+            releaseHistoryMutation();
           }
-        } catch (err) {
-          const reason = err instanceof Error ? err.message : String(err);
-          artifactSnapshotUnavailable = "artifact snapshot unavailable after rewind";
-          debugLogger8.warn(
-            `[ACP] Failed to rebuild artifact snapshot after rewind for session=${sessionId}: ${reason}`
-          );
-        }
-        return {
-          success: true,
-          historyBeforeRewind,
-          ...rewindResult,
-          filesChanged,
-          filesFailed,
-          ...artifactSnapshot ? { artifactSnapshot } : {},
-          ...artifactSnapshotUnavailable ? { artifactSnapshotUnavailable } : {}
-        };
+        });
       }
       case "qwen/session/loadUpdates": {
         const sessionId = params["sessionId"];
@@ -19854,6 +20250,16 @@ ${outputText}
           );
         }
         const name = params["name"];
+        const atRecordId = params["atRecordId"];
+        if (atRecordId !== void 0 && typeof atRecordId !== "string") {
+          throw RequestError.invalidParams(void 0, "Invalid atRecordId");
+        }
+        if (isSideTask && atRecordId !== void 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "atRecordId is not supported for side tasks"
+          );
+        }
         const sourceSession = this.sessions.get(sessionId);
         if (!sourceSession) {
           throw new RequestError(-32004, `Session not found: ${sessionId}`, {
@@ -19861,60 +20267,77 @@ ${outputText}
             sessionId
           });
         }
+        if (!isSideTask) {
+          if (!sourceSession.isTurnIdle()) {
+            throw new RequestError(
+              -32602,
+              "Cannot branch while a prompt is running",
+              { errorKind: "session_busy" }
+            );
+          }
+          try {
+            return await this.runExclusiveHistoryMutation(
+              sessionId,
+              async () => {
+                await sourceSession.assertCanStartTurn();
+                const releaseHistoryMutation = sourceSession.beginHistoryMutation();
+                try {
+                  const sourceConfig2 = sourceSession.getConfig();
+                  const recording2 = sourceConfig2.getChatRecordingService();
+                  const sessionService2 = sourceConfig2.getSessionService();
+                  const baseName = deriveForkBaseName(
+                    name,
+                    recording2,
+                    sessionId
+                  );
+                  const title2 = await computeUniqueBranchTitle(
+                    baseName,
+                    sessionService2
+                  );
+                  const newSessionId2 = randomUUID2();
+                  const fork2 = /* @__PURE__ */ __name(() => sessionService2.forkSession(sessionId, newSessionId2, {
+                    title: title2,
+                    ...atRecordId !== void 0 ? { atRecordId } : {}
+                  }), "fork");
+                  if (recording2) {
+                    await recording2.runWithWriteBarrier(fork2);
+                  } else {
+                    await fork2();
+                  }
+                  return { newSessionId: newSessionId2, title: title2, displayName: title2 };
+                } finally {
+                  releaseHistoryMutation();
+                }
+              }
+            );
+          } catch (error) {
+            if (error instanceof BranchPointInvalidError) {
+              throw new RequestError(-32009, error.message, {
+                errorKind: "branch_point_invalid",
+                recordId: error.recordId
+              });
+            }
+            throw error;
+          }
+        }
         const sourceConfig = sourceSession.getConfig();
         const recording = sourceConfig.getChatRecordingService();
-        if (recording) {
-          await recording.flush();
-        }
-        const newSessionId = randomUUID2();
+        if (recording) await recording.flush();
         const sessionService = sourceConfig.getSessionService();
-        const fork = /* @__PURE__ */ __name(() => isSideTask ? sessionService.forkSession(sessionId, newSessionId, {
+        const title = deriveForkBaseName(name, recording, sessionId);
+        const newSessionId = randomUUID2();
+        const fork = /* @__PURE__ */ __name(() => sessionService.forkSession(sessionId, newSessionId, {
           source: {
             sourceType: "side_task",
             sourceId: sessionId
-          }
-        }) : sessionService.forkSession(sessionId, newSessionId), "fork");
-        if (isSideTask && recording) {
+          },
+          title
+        }), "fork");
+        if (recording) {
           await recording.runWithWriteBarrier(fork);
         } else {
           await fork();
         }
-        let title;
-        try {
-          let baseName;
-          if (typeof name === "string" && name.trim().length > 0) {
-            baseName = name.trim();
-          } else {
-            const existingTitle = recording?.getCurrentCustomTitle();
-            const stripped = existingTitle?.replace(/\s*\(Branch(?:\s+\d+)?\)\s*$/, "").trim();
-            if (stripped && stripped.length > 0) {
-              baseName = stripped;
-            } else {
-              baseName = sessionId.slice(0, 8);
-            }
-          }
-          title = isSideTask ? baseName : await computeUniqueBranchTitle(baseName, sessionService);
-          const renamed = await sessionService.renameSession(
-            newSessionId,
-            title,
-            "manual"
-          );
-          if (!renamed) {
-            throw new RequestError(
-              -32603,
-              `Failed to set title on forked session ${newSessionId}`,
-              { errorKind: "internal", sessionId: newSessionId }
-            );
-          }
-        } catch (err) {
-          sessionService.removeSession(newSessionId).catch((rmErr) => {
-            process.stderr.write(
-              `qwen serve: failed to clean up orphan session ${newSessionId}: ${rmErr instanceof Error ? rmErr.message : rmErr}
-`
-            );
-          });
-          throw err;
-        }
         return { newSessionId, title, displayName: title };
       }
       case "qwen/settings/getCore": {
@@ -20699,6 +21122,7 @@ ${outputText}
       config,
       this.connection,
       settings,
+      (operation) => this.runExclusiveHistoryMutation(sessionId, operation),
       () => this.activeWorkReporter?.notifyChanged()
     );
     let published = false;