@qwen-code/qwen-code 0.23.0 → 0.23.1-preview.1

package/chunks/{acpAgent-2GTFCIEP.js → acpAgent-WTDEY5KD.js}

@@ -18,19 +18,20 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-LOBDDFYK.js";
+} from "./chunk-HJ34U5J4.js";
 import {
   getAvailableCommands,
   getSlashCommandFirstToken,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
+  pLimit,
   recordDaemonSessionModel,
   restoreSessionModelThenAuthenticate
-} from "./chunk-NVVJTUSL.js";
+} from "./chunk-WR3SH3EY.js";
 import {
   recomputeMcpGating
-} from "./chunk-UUASLXHW.js";
+} from "./chunk-E4L5BM2B.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -40,46 +41,46 @@ import {
   loadCliConfig,
   normalizeDisabledToolList,
   parseApprovalModeValue
-} from "./chunk-MP6YZ4RK.js";
+} from "./chunk-ZAZ3NFL6.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-EIY7SUPZ.js";
+} from "./chunk-XHGGYCTA.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-5RTTI4GE.js";
+} from "./chunk-2RYWGYB3.js";
 import "./chunk-3SH53ANB.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-M4LBBSVP.js";
+import "./chunk-HY3DXYZK.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-SX2QIMJV.js";
+} from "./chunk-JOPC3FND.js";
 import "./chunk-4WGODMVR.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-GXUTFQXK.js";
+} from "./chunk-KE3Q4JMY.js";
 import "./chunk-KW7NOTN6.js";
-import "./chunk-JHN7UIDW.js";
-import "./chunk-5EIOJGCR.js";
-import "./chunk-37JFWFCD.js";
+import "./chunk-2XRE4KE4.js";
+import "./chunk-SFMCYMVF.js";
+import "./chunk-54TF2ZIQ.js";
+import "./chunk-4VZCORNT.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-UM2FFKXN.js";
+import "./chunk-43JNQAHO.js";
 import "./chunk-YAF2MQZ6.js";
 import {
   computeCpuPercent
 } from "./chunk-LBOVL47Y.js";
 import "./chunk-24FVUD5P.js";
-import "./chunk-EWRW2WQC.js";
+import "./chunk-IKLFS6SC.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-JZWOCUZ3.js";
-import "./chunk-VNAYZAFX.js";
+} from "./chunk-L4R7BCVV.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -100,7 +101,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-WP4AX3XD.js";
+} from "./chunk-PTFFWTTO.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -111,16 +112,14 @@ import {
   hasFullSessionContext,
   observeAcpToolResultProjection,
   observeAcpToolResultWire
-} from "./chunk-QI27MKNQ.js";
-import "./chunk-XEAAO654.js";
-import "./chunk-NRL5CUZT.js";
+} from "./chunk-KK2GZGBK.js";
+import "./chunk-M3JGHRMQ.js";
+import "./chunk-VFFQAOPR.js";
+import "./chunk-ZTAVGFKA.js";
 import "./chunk-47ECGEJC.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-TXASDT2M.js";
-import {
-  buildToolWriteOriginMeta
-} from "./chunk-VGHZT6JR.js";
 import {
   getConversationDirectoryName,
   hasVerifiableInode,
@@ -138,12 +137,13 @@ import {
   isReservedStandaloneSessionSourceType,
   parseSessionSource
 } from "./chunk-N4QWUPDM.js";
+import "./chunk-DMEUXLSS.js";
 import {
   buildScheduledTaskRunPrompt,
   normalizeChannelDeliveryText,
   scheduledTaskRunSessionName,
   scheduledTaskRunSourceId
-} from "./chunk-DTVQSSNM.js";
+} from "./chunk-PZUOHCWI.js";
 import {
   normalizeSessionIdForLookup,
   parseCallerSuppliedSessionId
@@ -154,28 +154,28 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-I5N4EAS6.js";
+} from "./chunk-MWHY26G3.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-LEPCWS5A.js";
+} from "./chunk-4MCY33Y2.js";
 import {
   readVoiceModel
-} from "./chunk-BA4WJC4L.js";
-import "./chunk-QAK5475D.js";
-import "./chunk-RN3YGDCA.js";
-import "./chunk-3JQZVCBI.js";
+} from "./chunk-XOVVCGZX.js";
+import "./chunk-Y53DG2HA.js";
+import "./chunk-P6LATTDG.js";
+import "./chunk-YCDL2SAS.js";
 import "./chunk-JS73NNWF.js";
 import {
   SCHEDULED_TASK_RUN_SOURCE_TYPE
-} from "./chunk-DSX7KQPM.js";
+} from "./chunk-NAKALAL4.js";
 import "./chunk-7U5G6JXI.js";
 import "./chunk-WCCLLK7X.js";
 import "./chunk-OCPBI7J5.js";
 import {
   ndJsonStream
-} from "./chunk-4HVH57J3.js";
+} from "./chunk-LMJQSPWB.js";
 import {
   PERSIST_REASONING_SELECTION_META_KEY,
   REASONING_EFFORT_DEFAULT,
@@ -199,7 +199,7 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-6A2D4QSO.js";
+} from "./chunk-O2GG7H4C.js";
 import {
   mapSkillConfigToStatus
 } from "./chunk-BHTYRHJF.js";
@@ -210,23 +210,23 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-64QH2UC6.js";
+} from "./chunk-KPXRFTT7.js";
 import {
   resolveSkillSettings
 } from "./chunk-HWVUSYSN.js";
-import "./chunk-DMEUXLSS.js";
-import "./chunk-F7NF2IOE.js";
-import "./chunk-AZJLY2XZ.js";
+import "./chunk-537SQ2AI.js";
+import "./chunk-IXSGOSEG.js";
+import "./chunk-AHBLRVD5.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-PCRBLMIN.js";
-import "./chunk-NXKOVOM5.js";
-import "./chunk-TSZSGQ3N.js";
+import "./chunk-TMWB67LS.js";
+import "./chunk-4IQKBLTQ.js";
+import "./chunk-WXC6OAWD.js";
 import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-32LU3APX.js";
-import "./chunk-S6H3ELPG.js";
-import "./chunk-7XL4WRXM.js";
+} from "./chunk-4F2QRVW6.js";
+import "./chunk-P4RUUG64.js";
+import "./chunk-N6VQ37ZZ.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_HEARTBEAT_META_KEY,
@@ -246,6 +246,7 @@ import {
   DAEMON_PROMPT_DISPLAY_TEXT_META_KEY,
   DAEMON_RESTORE_ASK_USER_QUESTION_META_KEY,
   DAEMON_SUPPRESS_RESTORE_ASK_USER_QUESTION_META_KEY,
+  DAEMON_SUPPRESS_WORKTREE_CONTEXT_RESTORE_META_KEY,
   LOAD_REPLAY_BULK_MODE,
   LOAD_REPLAY_HIDE_INHERITED_META_KEY,
   LOAD_REPLAY_MAX_BYTES,
@@ -264,7 +265,7 @@ import {
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-ZGCKTAL5.js";
+} from "./chunk-WEXA2DNG.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -272,11 +273,12 @@ import {
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-STUJ7IMZ.js";
+import "./chunk-4JAGXZR3.js";
 import "./chunk-GYTKQYDB.js";
-import "./chunk-M4KFODIP.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-RKFGE7JH.js";
 import "./chunk-UDG5EZJI.js";
+import "./chunk-M5GB774H.js";
 import {
   EXTERNAL_TOOL_GUARD_READY_META_KEY,
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
@@ -286,21 +288,21 @@ import {
   SHELL_EXECUTING_TOOL_NAMES,
   isValidExternalToolGuardDenialReason
 } from "./chunk-3VUENPWF.js";
-import "./chunk-M5GB774H.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS,
   CHANNEL_PROMPT_META_KEY
-} from "./chunk-U4DJ5XB3.js";
+} from "./chunk-VDXYYVCD.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-IW6RQPQB.js";
-import "./chunk-ZVP4PWBU.js";
+import "./chunk-5HBA2Z7V.js";
+import "./chunk-X35VIWWJ.js";
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-C2VWOXHS.js";
+} from "./chunk-DNPHKA72.js";
 import {
   deleteNestedPropertySafe,
   getOutputLanguageFilePath,
@@ -312,10 +314,10 @@ import {
   settingExistsInScope,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-VWTSRH6C.js";
-import "./chunk-NQ4L2CMD.js";
+} from "./chunk-AQ5NAGWI.js";
+import "./chunk-ER273QE6.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-O5CD7T4T.js";
+import "./chunk-BW4333PP.js";
 import {
   getSystemDefaultsPath,
   getSystemSettingsPath
@@ -323,7 +325,7 @@ import {
 import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-I4NRYS6A.js";
+} from "./chunk-MUZCSTOO.js";
 import {
   SUPPORTED_LANGUAGES
 } from "./chunk-5EJZE3FP.js";
@@ -331,19 +333,19 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-C4TIXFDZ.js";
+} from "./chunk-H3UDNQLO.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD,
   QWEN_CODE_SERVE_ENV
-} from "./chunk-2M3EWQNG.js";
+} from "./chunk-NUQFUXOG.js";
 import "./chunk-2EAZ43JQ.js";
 import "./chunk-NF5J2WFA.js";
-import "./chunk-VBWD6C27.js";
+import "./chunk-XUSOYE2I.js";
 import "./chunk-W3N5XAZ6.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-65HWLGA7.js";
+} from "./chunk-XY3USGFE.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import {
@@ -360,8 +362,10 @@ import {
   buildGoalContinuationParts,
   buildInstallPlan,
   buildSessionRecoveryPlanFromApiHistory,
+  countApiUserPrompts,
   detectAutonomousSentinel,
   detectLoopSentinel,
+  findApiRewindCutPoint,
   findExistingProviderModels,
   findProviderById,
   generatePromptSuggestion,
@@ -373,46 +377,59 @@ import {
   resolveBaseUrl,
   runManagedRememberByAgent,
   subagentGenerator
-} from "./chunk-JUARRUMA.js";
+} from "./chunk-UEZOXZNI.js";
+import {
+  buildToolWriteOriginMeta
+} from "./chunk-GELRJXE2.js";
+import "./chunk-32CM56LO.js";
 import {
   MAX_RETAINED_SNAPSHOTS,
   deleteWorkflowSnapshot,
+  extractAndStripMeta,
   listSavedWorkflows,
   listWorkflowSnapshots,
+  resolveSavedWorkflowScript,
   toSnapshot
-} from "./chunk-I2TMJPCV.js";
+} from "./chunk-JPEAQJNS.js";
 import "./chunk-XFSFZCM5.js";
 import {
   CreateSubSessionTool
-} from "./chunk-JR42V4UY.js";
+} from "./chunk-WTW36TJ3.js";
 import "./chunk-LJZSMWOH.js";
 import {
   restoreWorktreeContext
-} from "./chunk-RAFQIHN2.js";
-import "./chunk-L26ONV2Y.js";
-import "./chunk-47RYEQW5.js";
-import "./chunk-IG4W5SJR.js";
+} from "./chunk-VUSSAGKI.js";
+import "./chunk-O45WBTNS.js";
+import "./chunk-DJXSOEFB.js";
+import "./chunk-2WGJG2KW.js";
+import "./chunk-QMFOYPGV.js";
+import "./chunk-LDS57224.js";
 import "./chunk-ZPJWUGCS.js";
-import "./chunk-4UANMABT.js";
-import "./chunk-ZKFTS3OV.js";
-import "./chunk-ENYUKMFK.js";
-import "./chunk-UKYXYWI2.js";
+import "./chunk-HFTB354P.js";
+import "./chunk-BUQN5LTI.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-3AKCBZVW.js";
-import "./chunk-SULZPKTA.js";
+} from "./chunk-VU7O7CGQ.js";
+import "./chunk-QSC5YOEC.js";
 import "./chunk-VNOVK4I7.js";
 import {
   APPROVAL_MODE_INFO,
   BranchPointInvalidError,
   ExtensionManager,
   GLOBAL_DUPLICATE_THRESHOLD,
+  GOAL_PAUSE_REASON_SESSION_DISPOSED,
+  GOAL_PAUSE_REASON_SESSION_TOKEN_LIMIT,
+  GOAL_PAUSE_REASON_STOP_HOOK_CAP,
+  GOAL_PAUSE_REASON_USER_INTERRUPT,
   GoalConflictError,
   GoalInvalidTransitionError,
   GoalPersistenceUnavailableError,
   InvalidMcpConfigError,
   InvalidSessionTranscriptCursorError,
+  InvalidSessionTranscriptTurnAnchorError,
+  MAX_AGENT_TRACE_NODES,
+  MAX_RETAINED_TERMINAL_AGENTS,
   MAX_TRANSCRIPT_MESSAGES,
   MCPOAuthProvider,
   MCPOAuthTokenStorage,
@@ -452,7 +469,7 @@ import {
   convertToFunctionErrorResponse,
   convertToFunctionResponse,
   createDuplicateProviderToolCallResponse,
-  decorateClassifierUnavailableConfirmation,
+  decorateAutoModeFallbackConfirmation,
   decoratePlanModeShellConfirmation,
   dedupeToolCallsById,
   didWriteProjectContextFile,
@@ -475,15 +492,19 @@ import {
   formatStopHookBlockingCapWarning,
   generateToolUseId,
   getActiveGoal,
+  getAutoModeActionFingerprint,
   getAutoModePermissionDeniedReason,
   getEffectivePermissionForConfirmation,
   getFunctionCallFingerprint,
   getMCPDiscoveryState,
+  getOptInToolNotFoundMessage,
   getProviderToolCallId,
   getScopedEnvContents,
   getStopHookContinuationReason,
+  getSubagentSessionDir,
   getToolCallRepeatKey,
   getWorkflowTaskMutationKey,
+  goalPauseReasonForFailure,
   goalTurnContext,
   ideContextStore,
   injectPermissionRulesIfMissing,
@@ -506,6 +527,9 @@ import {
   parseGoalSnapshotV2,
   parseGoalStateCause,
   persistPermissionOutcome,
+  prepareAutoModeFallback,
+  readAgentMetaAsync,
+  readAgentTrace,
   recordAllow,
   recordFallbackApprove,
   recordHandledToolCall,
@@ -514,8 +538,8 @@ import {
   restorableAskUserQuestionCallIds,
   runForkedAgent,
   runManagedAutoMemoryDream,
+  sanitizeFilenameComponent,
   shouldClassifyAllShellForAutoMode,
-  shouldFallback,
   shouldFirePermissionDeniedForAutoMode,
   shouldForceAutoModeReviewForAllow,
   shouldHaltOnTurnToolCallCap,
@@ -527,47 +551,49 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-4F7GQGXB.js";
+} from "./chunk-I72PHOKL.js";
 import "./chunk-GOFAQQZA.js";
-import "./chunk-5M6IDOMF.js";
+import "./chunk-3K65MUKD.js";
 import "./chunk-6HUXPLB5.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
-import "./chunk-NSUKQ4DN.js";
-import "./chunk-DQCKVAF5.js";
-import "./chunk-AI35S34R.js";
-import "./chunk-KM3XVTMO.js";
+import "./chunk-YHDGABDC.js";
+import "./chunk-RDKXZ2LS.js";
+import "./chunk-B54PFQS5.js";
+import "./chunk-43NOB5NM.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
 import {
   RUNTIME_SNAPSHOT_PREFIX
-} from "./chunk-OKTNXDVO.js";
+} from "./chunk-565U2ANU.js";
 import {
   SESSION_ARTIFACT_PERSISTENCE_VERSION,
   normalizeEventPayload,
   normalizeSnapshotPayload,
   wrapUserPromptSubmitContext
-} from "./chunk-EFTPIZIC.js";
+} from "./chunk-FDOGGKAA.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-UJ4DUYIH.js";
+import "./chunk-F53KKZUD.js";
+import "./chunk-PZV2FASB.js";
 import "./chunk-QJNDUTOL.js";
+import "./chunk-OECNP26L.js";
 import {
   promptIdContext,
   todoWorkChainContext
 } from "./chunk-O6GEWCJA.js";
 import {
-  getArenaSystemReminder,
-  getOutputStyleTurnReminder,
-  getPlanModeSystemReminder,
-  resolveMainSessionOutputStyle
-} from "./chunk-OSSTATJF.js";
-import "./chunk-ZHO2CW6D.js";
-import "./chunk-CVX63TFJ.js";
-import "./chunk-373DQUVA.js";
+  escapeJsonTagCharacters
+} from "./chunk-CHEIIBT3.js";
+import "./chunk-UKKYOIVT.js";
+import "./chunk-B44JBZBB.js";
+import "./chunk-BF3RUIVP.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-JX6XHPTX.js";
 import {
   AgentOutputMessageCapture,
   addAgentInputMessageAttributes,
@@ -575,32 +601,30 @@ import {
   addToolCallResultAttributes,
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor
-} from "./chunk-H43PSPYS.js";
+} from "./chunk-R355CUNQ.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-U6D2PPMN.js";
-import "./chunk-VYIUNFEA.js";
-import "./chunk-KGV55H53.js";
-import "./chunk-7TBU7PU2.js";
-import "./chunk-E4JNFXNI.js";
-import {
-  escapeJsonTagCharacters
-} from "./chunk-CHEIIBT3.js";
-import "./chunk-TJYRTS4S.js";
-import {
-  APPROVAL_MODES
-} from "./chunk-JX6XHPTX.js";
+} from "./chunk-4VUVBN3Y.js";
+import "./chunk-ZSTCM3MX.js";
+import "./chunk-NXWYCSPL.js";
 import "./chunk-MLXTMF7H.js";
+import {
+  getArenaSystemReminder,
+  getOutputStyleTurnReminder,
+  getPlanModeSystemReminder,
+  resolveMainSessionOutputStyle
+} from "./chunk-GXZHYPHZ.js";
+import "./chunk-3CZ2BQV6.js";
 import "./chunk-PQEISIKS.js";
-import "./chunk-FD5SJOWT.js";
+import "./chunk-3K456UJF.js";
 import {
   runWithRuntimeContentGenerator
-} from "./chunk-4LIFGNI4.js";
+} from "./chunk-VEFRT7NX.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-KFN2IZYR.js";
-import "./chunk-GB4UKWY5.js";
+import "./chunk-UKADFFL2.js";
+import "./chunk-EJNYBDYC.js";
 import "./chunk-QHMLYMMS.js";
 import {
   getToolCallPreparations
@@ -609,20 +633,18 @@ import {
   REASONING_EFFORT_TIERS
 } from "./chunk-2LD5U7Q3.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-S2T7H5MI.js";
-import "./chunk-LKODFJRD.js";
+import "./chunk-W4LL5RZO.js";
+import "./chunk-3UMWOKJC.js";
+import "./chunk-KFFCDLKV.js";
 import {
   addDaemonRequestAttribute,
   extractDaemonTraceContext,
   withDaemonSpan
-} from "./chunk-LB3WQQJK.js";
+} from "./chunk-7OCIQNKX.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
-  INVOCATION_CONTEXT_META_KEY,
   LoopDetectedEvent,
-  PRIVATE_ACP_CAPABILITY_ENV,
-  PRIVATE_PARENT_CAPABILITY_META_KEY,
   PromptSuggestionEvent,
   RepeatedToolFailureGuardEvent,
   UserPromptEvent,
@@ -630,7 +652,6 @@ import {
   formatFullTurnVisionNotice,
   formatVisionBridgeNotice,
   getFullTurnVisionModelSelector,
-  getInvocationContext,
   getMCPServerStatus,
   hasImageParts,
   logConversationFinishedEvent,
@@ -640,38 +661,45 @@ import {
   logToolCall,
   logUserPrompt,
   normalizeParts,
-  parseInvocationContext,
   runSideQuery,
   runVisionBridge,
-  runWithInvocationContext,
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-GH2S4GD5.js";
+} from "./chunk-P5LDR7FI.js";
+import {
+  INVOCATION_CONTEXT_META_KEY,
+  PRIVATE_ACP_CAPABILITY_ENV,
+  PRIVATE_PARENT_CAPABILITY_META_KEY,
+  getInvocationContext,
+  parseInvocationContext,
+  runWithInvocationContext
+} from "./chunk-5ETULJLP.js";
 import "./chunk-XBVNNDPK.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAllMemoryFilenames,
   getSpecificMimeType
-} from "./chunk-DYTW3QVG.js";
+} from "./chunk-J6MB5ZHZ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-HT5S5TRQ.js";
+} from "./chunk-EDIDYZBT.js";
+import "./chunk-HD7O6WLV.js";
 import "./chunk-WZAD4ZNJ.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-FPGTNKCP.js";
-import "./chunk-EIJT2PQ6.js";
+import "./chunk-TIGXX4PA.js";
 import {
   hasVertexProjectConfigured,
   preloadContentGenerator
-} from "./chunk-BFY33IB4.js";
-import "./chunk-KHP66DFN.js";
+} from "./chunk-5MTARK4Y.js";
+import "./chunk-XFFRI3WM.js";
 import {
   AuthType
-} from "./chunk-22UH7VTP.js";
+} from "./chunk-4HOEU2OR.js";
 import "./chunk-HHJLM3WQ.js";
 import {
   endToolExecutionSpan,
@@ -683,18 +711,17 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-QKDNS6FU.js";
+} from "./chunk-7VEYUF3N.js";
 import "./chunk-74TONY4F.js";
-import "./chunk-ZDFQGHZH.js";
+import "./chunk-GMNLYQOS.js";
 import {
   FORK_SUBAGENT_TYPE,
-  getStartupContextLength,
   isSystemReminderContent,
   wrapSystemReminder
-} from "./chunk-G7HBEEX7.js";
-import "./chunk-QQD2GART.js";
-import "./chunk-AQ37AY7B.js";
-import "./chunk-ODZF64DM.js";
+} from "./chunk-D6PIMKY3.js";
+import "./chunk-NGX4NUNP.js";
+import "./chunk-FKJM6JKY.js";
+import "./chunk-IZ2U57NY.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -702,7 +729,7 @@ import {
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-7JMGTOH7.js";
+} from "./chunk-RPBMP6BN.js";
 import {
   Storage,
   createDebugLogger,
@@ -710,12 +737,12 @@ import {
   getErrorStatus,
   isSubpath,
   sessionIdContext
-} from "./chunk-EAHOJF6V.js";
-import "./chunk-QJGYU5PG.js";
+} from "./chunk-ZAFYHRVY.js";
+import "./chunk-TDP7UULF.js";
 import "./chunk-HRPFBHW7.js";
 import {
   runExitCleanup
-} from "./chunk-RJUVTJEZ.js";
+} from "./chunk-BKNY7PDI.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -723,7 +750,7 @@ import {
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
-import "./chunk-AMDSOFFV.js";
+import "./chunk-MATEIJZF.js";
 import "./chunk-TBWQLLFO.js";
 import {
   init_esbuild_shims
@@ -967,9 +994,9 @@ var AcpFileSystemService = class {
 
 // packages/cli/src/acp-integration/acpAgent.ts
 import { Readable as Readable2, Writable as Writable2 } from "node:stream";
-import * as fs3 from "node:fs/promises";
+import * as fs4 from "node:fs/promises";
 import * as os3 from "node:os";
-import * as path6 from "node:path";
+import * as path7 from "node:path";
 
 // packages/cli/src/config/settings-cache.ts
 init_esbuild_shims();
@@ -1133,8 +1160,8 @@ function failure(message) {
   };
 }
 __name(failure, "failure");
-function resolvePrivatePngPath(path7, captureDirectory) {
-  const resolvedPath = resolve2(path7);
+function resolvePrivatePngPath(path8, captureDirectory) {
+  const resolvedPath = resolve2(path8);
   if (dirname(resolvedPath) !== resolve2(captureDirectory)) {
     throw new Error(
       "Host returned a screenshot outside its private directory."
@@ -1143,11 +1170,11 @@ function resolvePrivatePngPath(path7, captureDirectory) {
   return resolvedPath;
 }
 __name(resolvePrivatePngPath, "resolvePrivatePngPath");
-async function readPrivatePng(path7) {
-  if ((await lstat(path7)).isSymbolicLink()) {
+async function readPrivatePng(path8) {
+  if ((await lstat(path8)).isSymbolicLink()) {
     throw new Error("Host returned a symbolic link screenshot path.");
   }
-  const handle = await open(path7, constants.O_RDONLY | constants.O_NOFOLLOW);
+  const handle = await open(path8, constants.O_RDONLY | constants.O_NOFOLLOW);
   try {
     const stat2 = await handle.stat();
     if (!stat2.isFile() || stat2.size <= 0 || stat2.size > MAX_SCREENSHOT_BYTES) {
@@ -2028,7 +2055,9 @@ __name(supportsHideAlwaysAllow, "supportsHideAlwaysAllow");
 function filterAlwaysAllowOptions(confirmation, options, forceHideAlwaysAllow = false) {
   const hideAlwaysAllow = forceHideAlwaysAllow || confirmation.autoModeFallback !== void 0 || supportsHideAlwaysAllow(confirmation) && confirmation.hideAlwaysAllow === true;
   const visibleOptions = hideAlwaysAllow ? options.filter((option) => option.kind !== "allow_always") : options;
-  if (!confirmation.autoModeFallback) return visibleOptions;
+  if (confirmation.autoModeFallback?.reason !== "classifier_unavailable" && confirmation.autoModeFallback?.reason !== "consecutive_unavailable") {
+    return visibleOptions;
+  }
   const switchOption = {
     optionId: "proceed_once_and_switch_to_default" /* ProceedOnceAndSwitchToDefault */,
     name: "Switch to Default Mode and allow once (recommended)",
@@ -2300,6 +2329,7 @@ var SubAgentTracker = class {
   messageEmitter;
   subagentMeta;
   toolStates = /* @__PURE__ */ new Map();
+  approvalNotified = /* @__PURE__ */ new Set();
   /**
    * Sets up event listeners for a sub-agent's tool events.
    *
@@ -2351,6 +2381,18 @@ var SubAgentTracker = class {
         invocation,
         args: event.args
       });
+      const progressMessage = event.description ? `${tool?.displayName ?? event.name}: ${event.description}` : `Running tool: ${tool?.displayName ?? event.name}`;
+      void this.toolCallEmitter.emitProgressUpdate(
+        this.subagentMeta.parentToolCallId,
+        this.subagentMeta.subagentType,
+        progressMessage,
+        event.name
+      ).catch((error) => {
+        debugLogger3.debug(
+          "Failed to emit subagent progress update for tool call:",
+          error
+        );
+      });
       void this.toolCallEmitter.emitStart({
         toolName: event.name,
         callId: event.callId,
@@ -2398,6 +2440,20 @@ var SubAgentTracker = class {
       const event = args[0];
       if (abortSignal.aborted) return;
       const state = this.toolStates.get(event.callId);
+      if (!this.approvalNotified.has(event.callId) && !abortSignal.aborted) {
+        this.approvalNotified.add(event.callId);
+        void this.toolCallEmitter.emitProgressUpdate(
+          this.subagentMeta.parentToolCallId,
+          this.subagentMeta.subagentType,
+          `Waiting for permission: ${state?.tool?.displayName ?? event.name}`,
+          event.name
+        ).catch((error) => {
+          debugLogger3.debug(
+            "Failed to emit subagent progress update for approval:",
+            error
+          );
+        });
+      }
       const fullConfirmationDetails = {
         ...event.confirmationDetails,
         onConfirm: /* @__PURE__ */ __name(async () => {
@@ -3255,6 +3311,9 @@ function isTodoStopGuardPromptText(text) {
   return remainder === body || remainder === body + TODO_STOP_GUARD_FINAL_PROMPT_SUFFIX;
 }
 __name(isTodoStopGuardPromptText, "isTodoStopGuardPromptText");
+var ACP_API_USER_PROMPT_OPTIONS = {
+  excludeTextPart: isTodoStopGuardPromptText
+};
 async function finalizeToolCallPreparations(tracker, includeResolved, streamName) {
   try {
     await tracker.discard(includeResolved);
@@ -4054,7 +4113,15 @@ var Session = class {
     this.requiresManagedConversationActivation = this.requiresManagedConversationBinding && this.config.isProvisionalWorkspace?.() === true;
     this.slashCommandPolicy = this.requiresManagedConversationBinding ? STANDALONE_SLASH_COMMAND_POLICY : void 0;
     this.runtimeBaseDir = config.storage.getRuntimeBaseDir();
-    const todoStopGuardEnabled = this.settings.merged.experimental?.todoStopGuard === true && !this.config.getBareMode() && !this.config.isSafeMode();
+    const todoStopGuardConfigured = this.settings.merged.experimental?.todoStopGuard === true;
+    const todoStopGuardModeAllowed = todoStopGuardConfigured && !this.config.getBareMode() && !this.config.isSafeMode();
+    const todoWriteEnabled = this.settings.merged.tools?.todoWrite?.enabled === true;
+    const todoStopGuardEnabled = todoStopGuardConfigured && todoStopGuardModeAllowed && todoWriteEnabled;
+    if (todoStopGuardConfigured && todoStopGuardModeAllowed && !todoWriteEnabled) {
+      debugLogger6.warn(
+        "experimental.todoStopGuard requires tools.todoWrite.enabled; the Todo Stop Guard is disabled."
+      );
+    }
     const sessionWorkflowEnabledFromSettings = this.settings.merged.experimental?.sessionWorkflow === true;
     this.config.setSessionWorkflowEnabledProvider?.(
       () => sessionWorkflowEnabledFromSettings
@@ -4491,7 +4558,11 @@ var Session = class {
         turn
       );
     } catch (error) {
-      await this.#settleGoalTurn(turn, void 0, true);
+      await this.#settleGoalTurn(
+        turn,
+        void 0,
+        error instanceof Error ? error.message : String(error)
+      );
       debugLogger6.warn(
         `ACP Goal turn failed: ${error instanceof Error ? error.message : String(error)}`
       );
@@ -4522,19 +4593,27 @@ var Session = class {
       );
     }
   }
-  async #settleGoalTurn(turn, result, failed) {
+  async #settleGoalTurn(turn, result, failureMessage) {
     try {
       const runtime = await this.config.getGoalRuntimeReady();
       if (!sameGoalPermit(runtime.permitForTurn(turn.turnKey), turn.permit)) {
         return;
       }
       if (!turn.modelStarted) {
-        if (turn.controller.signal.reason === USER_CANCEL_ABORT_REASON && runtime.getSnapshot().goal?.status === "active") {
-          await runtime.dispatch({
-            action: "pause",
-            expectedGoalId: turn.permit.goalId,
-            expectedRevision: turn.permit.revision
-          });
+        if ((turn.controller.signal.reason === USER_CANCEL_ABORT_REASON || turn.controller.signal.reason === SESSION_DISPOSE_ABORT_REASON) && runtime.getSnapshot().goal?.status === "active") {
+          try {
+            await runtime.dispatch({
+              action: "pause",
+              expectedGoalId: turn.permit.goalId,
+              expectedRevision: turn.permit.revision,
+              reason: turn.controller.signal.reason === SESSION_DISPOSE_ABORT_REASON ? GOAL_PAUSE_REASON_SESSION_DISPOSED : GOAL_PAUSE_REASON_USER_INTERRUPT
+            });
+          } catch (error) {
+            debugLogger6.warn(
+              `Failed to record pre-model ACP Goal turn settlement: ${error instanceof Error ? error.message : String(error)}`
+            );
+            await runtime.releaseTurn(turn.turnKey, { requeue: false });
+          }
         } else {
           await runtime.releaseTurn(turn.turnKey);
         }
@@ -4549,13 +4628,14 @@ var Session = class {
       }
       const cancelledByUser = result?.stopReason === "cancelled" && turn.controller.signal.reason === USER_CANCEL_ABORT_REASON;
       const supersededByNewPrompt = turn.controller.signal.reason === NEW_PROMPT_ABORT_REASON;
-      const shouldPause = !supersededByNewPrompt && (failed || result?.stopReason === "max_tokens" || cancelledByUser || turn.controller.signal.reason === SESSION_DISPOSE_ABORT_REASON);
+      const pauseReason = supersededByNewPrompt ? void 0 : cancelledByUser ? GOAL_PAUSE_REASON_USER_INTERRUPT : result?.stopReason === "max_tokens" ? GOAL_PAUSE_REASON_SESSION_TOKEN_LIMIT : turn.controller.signal.reason === SESSION_DISPOSE_ABORT_REASON ? GOAL_PAUSE_REASON_SESSION_DISPOSED : failureMessage !== void 0 ? goalPauseReasonForFailure(failureMessage) : void 0;
       try {
-        if (shouldPause && runtime.getSnapshot().goal?.status === "active") {
+        if (pauseReason !== void 0 && runtime.getSnapshot().goal?.status === "active") {
           await runtime.dispatch({
             action: "pause",
             expectedGoalId: turn.permit.goalId,
-            expectedRevision: turn.permit.revision
+            expectedRevision: turn.permit.revision,
+            reason: pauseReason
           });
           return;
         }
@@ -4564,7 +4644,11 @@ var Session = class {
         debugLogger6.warn(
           `Failed to record ACP Goal turn settlement: ${error instanceof Error ? error.message : String(error)}`
         );
-        await runtime.releaseTurn(turn.turnKey);
+        if (pauseReason !== void 0) {
+          await runtime.releaseTurn(turn.turnKey, { requeue: false });
+        } else {
+          await runtime.releaseTurn(turn.turnKey);
+        }
       }
     } catch (error) {
       debugLogger6.warn(
@@ -4587,7 +4671,8 @@ var Session = class {
       await runtime.dispatch({
         action: "pause",
         expectedGoalId: goal.goalId,
-        expectedRevision: goal.revision
+        expectedRevision: goal.revision,
+        reason: GOAL_PAUSE_REASON_STOP_HOOK_CAP
       });
     } catch (error) {
       debugLogger6.warn(
@@ -5247,6 +5332,9 @@ var Session = class {
   getConfig() {
     return this.config;
   }
+  getSettings() {
+    return this.settings;
+  }
   getWorkflowHistory() {
     return this.workflowHistory;
   }
@@ -5823,7 +5911,8 @@ var Session = class {
         "Cannot rewind while a prompt is running"
       );
     }
-    const chat = this.config.getLlmClient().getChat();
+    const llmClient = this.config.getLlmClient();
+    const chat = llmClient.getChat();
     const apiHistory = chat.getHistoryShallow();
     const apiTruncateIndex = this.#computeApiTruncationIndexForUserTurn(
       apiHistory,
@@ -5835,7 +5924,7 @@ var Session = class {
         "Cannot rewind to the requested turn. It may have been compressed or does not exist."
       );
     }
-    chat.truncateHistory(apiTruncateIndex);
+    llmClient.truncateHistory(apiTruncateIndex);
     chat.stripThoughtsFromHistory();
     this.clearActiveTodoPlanRevision();
     const preserveQueuedPromptPriority = this.todoStopGuardQueuedPromptPriority;
@@ -5862,17 +5951,10 @@ var Session = class {
     return this.config.getLlmClient().getChat().getHistoryShallow();
   }
   getRewindableUserTurnCount() {
-    const apiHistory = this.captureHistorySnapshot();
-    const startIndex = getStartupContextLength(apiHistory, {
-      includeCompressed: true
-    });
-    let count = 0;
-    for (let i = startIndex; i < apiHistory.length; i++) {
-      if (this.#isUserTextContent(apiHistory[i])) {
-        count += 1;
-      }
-    }
-    return count;
+    return countApiUserPrompts(
+      this.captureHistorySnapshot(),
+      ACP_API_USER_PROMPT_OPTIONS
+    );
   }
   restoreHistory(history) {
     if (this.closing || this.#hasActiveTurn()) {
@@ -5881,43 +5963,16 @@ var Session = class {
         "Cannot restore history while a prompt is running"
       );
     }
-    this.config.getLlmClient().getChat().setHistory(structuredClone(history));
+    this.config.getLlmClient().setHistory(structuredClone(history));
     this.clearActiveTodoPlanRevision();
     this.#clearTodoStopGuardTrustAndDrainAutomaticQueues();
   }
   #computeApiTruncationIndexForUserTurn(apiHistory, targetTurnIndex) {
-    const startIndex = getStartupContextLength(apiHistory, {
-      includeCompressed: true
-    });
-    if (targetTurnIndex === 0) {
-      return startIndex;
-    }
-    let realUserPromptCount = 0;
-    for (let i = startIndex; i < apiHistory.length; i++) {
-      if (!this.#isUserTextContent(apiHistory[i])) {
-        continue;
-      }
-      if (realUserPromptCount === targetTurnIndex) {
-        return i;
-      }
-      realUserPromptCount += 1;
-    }
-    return -1;
-  }
-  #isUserTextContent(content) {
-    if (content.role !== "user") return false;
-    if (!content.parts || content.parts.length === 0) return false;
-    const hasFunctionResponse = content.parts.some(
-      (part) => "functionResponse" in part
+    return findApiRewindCutPoint(
+      apiHistory,
+      targetTurnIndex,
+      ACP_API_USER_PROMPT_OPTIONS
     );
-    if (hasFunctionResponse) return false;
-    if (isSystemReminderContent(content)) return false;
-    if (content.parts.some(
-      (part) => "text" in part && isTodoStopGuardPromptText(part.text)
-    )) {
-      return false;
-    }
-    return content.parts.some((part) => "text" in part && part.text);
   }
   async cancelPendingPrompt() {
     const hadPrompt = !!this.pendingPrompt;
@@ -5933,12 +5988,13 @@ var Session = class {
       throw new Error(NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE);
     }
     this.todoStopGuard.suspend();
+    const abortReason = this.closing || this.disposed ? SESSION_DISPOSE_ABORT_REASON : USER_CANCEL_ABORT_REASON;
     if (this.pendingPrompt) {
-      this.pendingPrompt.abort(USER_CANCEL_ABORT_REASON);
+      this.pendingPrompt.abort(abortReason);
       this.pendingPrompt = null;
     }
     for (const turn of queuedGoalTurns) {
-      turn.controller.abort(USER_CANCEL_ABORT_REASON);
+      turn.controller.abort(abortReason);
     }
     if (this.cronAbortController) {
       this.cronAbortController.abort();
@@ -5963,7 +6019,8 @@ var Session = class {
           await runtime.dispatch({
             action: "pause",
             expectedGoalId: queuedGoalTurn.permit.goalId,
-            expectedRevision: queuedGoalTurn.permit.revision
+            expectedRevision: queuedGoalTurn.permit.revision,
+            reason: abortReason === SESSION_DISPOSE_ABORT_REASON ? GOAL_PAUSE_REASON_SESSION_DISPOSED : GOAL_PAUSE_REASON_USER_INTERRUPT
           });
         }
       } catch (error) {
@@ -6193,7 +6250,7 @@ var Session = class {
     });
     let rejectedByLoopProtection = false;
     let promptResult;
-    let promptFailed = false;
+    let promptFailureMessage;
     if (turnRecording) turnRecording.startedAt = Date.now();
     try {
       const result = await this.#executePrompt(
@@ -6258,7 +6315,7 @@ var Session = class {
       }
       return completedResult;
     } catch (error) {
-      promptFailed = true;
+      promptFailureMessage = error instanceof Error ? error.message : String(error);
       if (error instanceof SessionWriterError) {
         throw new RequestError(error.rpcCode, error.message, {
           errorKind: error.errorKind
@@ -6283,7 +6340,11 @@ var Session = class {
         void this.#drainNotificationQueue();
       }
       if (goalTurn) {
-        await this.#settleGoalTurn(goalTurn, promptResult, promptFailed);
+        await this.#settleGoalTurn(
+          goalTurn,
+          promptResult,
+          promptFailureMessage
+        );
       } else if (reservedGoalRuntime && reservedGoalTurnKey) {
         await reservedGoalRuntime.releaseTurn(reservedGoalTurnKey);
       }
@@ -6533,7 +6594,7 @@ var Session = class {
                 return { stopReason: "end_turn" };
               }
               if (recoveryPlan.continuation.mode === "retry_user_parts") {
-                strippedOrphanEntries = this.#getCurrentChat().stripOrphanedUserEntriesFromHistory() ?? null;
+                strippedOrphanEntries = this.config.getLlmClient().stripOrphanedUserEntriesFromHistory() ?? null;
                 orphanPushCountSnapshot = this.#getCurrentChat().getUserContentPushCount?.() ?? 0;
                 continuationParts = recoveryPlan.continuation.parts;
               } else {
@@ -6543,7 +6604,7 @@ var Session = class {
             if (goalTurn?.origin === "runtime") {
             } else if (isContinue || isRestoreAskUserQuestion) {
             } else if (isRetry) {
-              this.#getCurrentChat().stripOrphanedUserEntriesFromHistory();
+              this.config.getLlmClient().stripOrphanedUserEntriesFromHistory();
             } else if (!isSlashInput || slashCommandName !== "advisor") {
               const attachmentReferences = readDaemonAttachmentReferences(
                 promptMetadata?.[DAEMON_ATTACHMENT_REFERENCES_META_KEY]
@@ -7082,6 +7143,24 @@ ${this.pendingRecoveredAgentsNotice}
                       )
                     };
                   }
+                  if (await this.#endGoalTurnAfterToolRun(
+                    toolRun,
+                    goalTurn,
+                    channelTurn,
+                    responseCapture.channelDelivery !== void 0
+                  )) {
+                    const result2 = {
+                      stopReason: getAbortAwareEndTurnStopReason(
+                        pendingSend.signal
+                      )
+                    };
+                    this.#recordPromptCompletionEffects(
+                      result2,
+                      responseCapture,
+                      isFreshUserTurn
+                    );
+                    return result2;
+                  }
                   const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                     toolRun,
                     pendingSend.signal,
@@ -7125,38 +7204,15 @@ ${this.pendingRecoveredAgentsNotice}
                 true,
                 fullTurnModelOverride,
                 responseCapture,
-                rejectOnLoopDetected
+                rejectOnLoopDetected,
+                goalTurn,
+                channelTurn
+              );
+              this.#recordPromptCompletionEffects(
+                result,
+                responseCapture,
+                isFreshUserTurn
               );
-              if (result.stopReason !== "cancelled") {
-                responseCapture.agentOutput.writeToSpan(
-                  getActiveInteractionSpan()
-                );
-              }
-              if (isFreshUserTurn && result.stopReason === "end_turn" && !result.loopProtectionStopped && this.config.getManagedAutoMemoryEnabled()) {
-                const memoryManager = this.config.getMemoryManager();
-                const history = this.#getCurrentChat().getHistoryShallow();
-                void memoryManager.scheduleExtract({
-                  projectRoot: this.config.getProjectRoot(),
-                  sessionId: this.config.getSessionId(),
-                  history,
-                  config: this.config
-                }).catch((error) => {
-                  debugLogger6.warn(
-                    "Failed to schedule ACP managed auto-memory extraction.",
-                    error
-                  );
-                });
-                void memoryManager.scheduleDream({
-                  projectRoot: this.config.getProjectRoot(),
-                  sessionId: this.config.getSessionId(),
-                  config: this.config
-                }).catch((error) => {
-                  debugLogger6.warn(
-                    "Failed to schedule ACP managed auto-memory dream.",
-                    error
-                  );
-                });
-              }
               return { stopReason: result.stopReason };
             } finally {
               logConversationFinishedEvent(
@@ -7182,7 +7238,7 @@ ${this.pendingRecoveredAgentsNotice}
       }
     });
   }
-  async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride, responseCapture, rejectOnLoopDetected = false) {
+  async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride, responseCapture, rejectOnLoopDetected = false, goalTurn, channelTurn = false) {
     const stopHookBlockingCap = this.config.getStopHookBlockingCap();
     let stopHookIterationCount = 0;
     let stopHookReasons = [];
@@ -7243,7 +7299,9 @@ ${this.pendingRecoveredAgentsNotice}
               onFullTurnModel,
               getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
               responseCapture,
-              rejectOnLoopDetected
+              rejectOnLoopDetected,
+              ...goalTurn ? { goalTurn } : {},
+              ...channelTurn ? { channelTurn: true } : {}
             }
           );
           if (continuation2.kind === "terminal") {
@@ -7328,7 +7386,9 @@ ${this.pendingRecoveredAgentsNotice}
                 onFullTurnModel,
                 getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
                 responseCapture,
-                rejectOnLoopDetected
+                rejectOnLoopDetected,
+                ...goalTurn ? { goalTurn } : {},
+                ...channelTurn ? { channelTurn: true } : {}
               }
             );
             if (continuation2.kind === "terminal") {
@@ -7428,7 +7488,9 @@ ${this.pendingRecoveredAgentsNotice}
           onFullTurnModel,
           getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
           responseCapture,
-          rejectOnLoopDetected
+          rejectOnLoopDetected,
+          ...goalTurn ? { goalTurn } : {},
+          ...channelTurn ? { channelTurn: true } : {}
         }
       );
       if (continuation.supersededAutomaticContinuation && externalReason) {
@@ -7900,6 +7962,18 @@ ${this.pendingRecoveredAgentsNotice}
             ...supersededAutomaticContinuation ? { supersededAutomaticContinuation: true } : {}
           };
         }
+        if (await this.#endGoalTurnAfterToolRun(
+          toolRun,
+          options.goalTurn,
+          options.channelTurn ?? false,
+          options.responseCapture?.channelDelivery !== void 0
+        )) {
+          return {
+            kind: "terminal",
+            stopReason: getAbortAwareEndTurnStopReason(pendingSend.signal),
+            ...supersededAutomaticContinuation ? { supersededAutomaticContinuation: true } : {}
+          };
+        }
         const nextAfterTools = await this.#buildNextMessageAfterToolRun(
           toolRun,
           pendingSend.signal,
@@ -8356,6 +8430,74 @@ ${this.pendingRecoveredAgentsNotice}
     );
     await this.messageRewriter?.waitForPendingRewrites();
   }
+  /**
+   * Ends a Goal turn whose tool batch asked for it, mirroring the interactive
+   * and headless paths.
+   *
+   * `update_goal` sets the flag when verification or evidence checkpointing
+   * needs a turn boundary. Feeding a queued proposal back to the model leaves
+   * it parked: the objective is already satisfied, so the model has nothing
+   * left to do but call the Goal tools again, and the runtime rejects every
+   * later proposal for the same turn. Observed runs looped between the two
+   * Goal tools until a human cancelled them, with the turn count never leaving
+   * zero.
+   *
+   * The batch's own responses are preserved so the transcript keeps a
+   * response for every call, but mid-turn user input is deliberately left
+   * queued for the next continuation rather than drained into a turn that is
+   * already over.
+   *
+   * Channel turns and requested channel deliveries keep the loop alive for
+   * their final tool-free response; ending on the tool batch would return or
+   * submit an empty response because only a tool-free response is committed
+   * as the channel final.
+   *
+   * Returns false outside a Goal turn, where nothing sets the flag today and
+   * a turn has no verification boundary to reach.
+   */
+  async #endGoalTurnAfterToolRun(toolRun, goalTurn, channelTurn, hasChannelDelivery) {
+    if (!goalTurn || toolRun.terminateTurn !== true || toolRun.loopDetected || channelTurn || hasChannelDelivery) {
+      return false;
+    }
+    this.todoStopGuard.suspend();
+    this.#preserveUnsentMessageHistory(
+      { role: "user", parts: toolRun.parts },
+      true
+    );
+    await this.messageRewriter?.waitForPendingRewrites();
+    return true;
+  }
+  #recordPromptCompletionEffects(result, responseCapture, isFreshUserTurn) {
+    if (result.stopReason !== "cancelled") {
+      responseCapture.agentOutput.writeToSpan(getActiveInteractionSpan());
+    }
+    if (!isFreshUserTurn || result.stopReason !== "end_turn" || result.loopProtectionStopped || !this.config.getManagedAutoMemoryEnabled()) {
+      return;
+    }
+    const memoryManager = this.config.getMemoryManager();
+    const history = this.#getCurrentChat().getHistoryShallow();
+    void memoryManager.scheduleExtract({
+      projectRoot: this.config.getProjectRoot(),
+      sessionId: this.config.getSessionId(),
+      history,
+      config: this.config
+    }).catch((error) => {
+      debugLogger6.warn(
+        "Failed to schedule ACP managed auto-memory extraction.",
+        error
+      );
+    });
+    void memoryManager.scheduleDream({
+      projectRoot: this.config.getProjectRoot(),
+      sessionId: this.config.getSessionId(),
+      config: this.config
+    }).catch((error) => {
+      debugLogger6.warn(
+        "Failed to schedule ACP managed auto-memory dream.",
+        error
+      );
+    });
+  }
   async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, toolLoopState, onFullTurnModel, rejectOnLoopDetected = false) {
     if (toolRun.loopDetected) {
       debugLogger6.debug("Stopping ACP turn after daemon loop detection.");
@@ -9494,6 +9636,14 @@ ${this.pendingRecoveredAgentsNotice}
       });
     });
     this.config.getChatRecordingService()?.setTitleRecordedCallback((customTitle, titleSource, sessionId) => {
+      void this.client.sessionUpdate({
+        sessionId,
+        update: {
+          sessionUpdate: "session_info_update",
+          title: customTitle
+        }
+      }).catch(() => {
+      });
       void this.client.extNotification("qwen/notify/session/title-update", {
         v: 1,
         sessionId,
@@ -10410,6 +10560,7 @@ ${this.pendingRecoveredAgentsNotice}
         sequence: toolResultRecordSequence++
       });
     }, "queueToolResultRecord");
+    let batchTerminatesTurn = false;
     const finalizeRunToolResult = /* @__PURE__ */ __name(async (result) => {
       const orderedRecords = [...pendingToolResultRecords].sort(
         (left, right) => left.ordinal - right.ordinal || left.sequence - right.sequence
@@ -10427,7 +10578,11 @@ ${this.pendingRecoveredAgentsNotice}
         }))
       };
       if (orderedRecords.length === 0) {
-        return { ...result, repeatedToolFailureBatch };
+        return {
+          ...result,
+          repeatedToolFailureBatch,
+          ...batchTerminatesTurn ? { terminateTurn: true } : {}
+        };
       }
       const finalized = await finalizeToolResponses(
         this.config,
@@ -10458,7 +10613,8 @@ ${this.pendingRecoveredAgentsNotice}
       return {
         ...result,
         parts: finalized.flatMap((entry) => entry.responseParts),
-        repeatedToolFailureBatch
+        repeatedToolFailureBatch,
+        ...batchTerminatesTurn ? { terminateTurn: true } : {}
       };
     }, "finalizeRunToolResult");
     let skippedToolCallCounter = 0;
@@ -10857,6 +11013,7 @@ ${this.pendingRecoveredAgentsNotice}
           for (const r of results) {
             parts.push(...r.parts);
             collectMemoryWriteCandidates(r);
+            batchTerminatesTurn ||= r.terminateTurn === true;
             shouldStop ||= r.stopAfterPermissionCancel;
             shouldStopForLoop ||= r.loopDetected === true;
           }
@@ -10900,6 +11057,7 @@ ${this.pendingRecoveredAgentsNotice}
             );
             parts.push(...r.parts);
             collectMemoryWriteCandidates(r);
+            batchTerminatesTurn ||= r.terminateTurn === true;
             if (r.loopDetected) {
               await appendSkippedAfter(
                 parts,
@@ -11175,8 +11333,15 @@ ${this.pendingRecoveredAgentsNotice}
     const toolRegistry = this.config.getToolRegistry();
     const tool = toolRegistry.getTool(toolName);
     if (!tool) {
+      const optInToolMessage = await getOptInToolNotFoundMessage(
+        this.config,
+        toolName,
+        (canonicalName) => Boolean(toolRegistry.getTool(canonicalName))
+      );
       return earlyErrorResponse(
-        new Error(`Tool "${toolName}" not found in registry.`),
+        new Error(
+          optInToolMessage ?? `Tool "${toolName}" not found in registry.`
+        ),
         toolName,
         {
           status: "error",
@@ -11295,6 +11460,7 @@ ${this.pendingRecoveredAgentsNotice}
             );
           }
           const isAskUserQuestionTool = policyToolName === ToolNames.ASK_USER_QUESTION;
+          const isTrustedAskUserQuestionTool = isAskUserQuestionTool && tool.kind === "think" /* Think */ && tool.constructor.name === "AskUserQuestionTool";
           let toolParams = invocation.params;
           const flowResult = isTrustedLiveScreenContextTool || isTrustedLiveTaskTool ? {
             defaultPermission: "allow",
@@ -11406,21 +11572,39 @@ ${this.pendingRecoveredAgentsNotice}
           }
           let autoModeAllowed = finalPermission === "allow" && !forceAutoReviewForAllow && !planShellRequiresConfirmation;
           if (autoModeAllowed && approvalMode === "auto" /* AUTO */) {
+            const actionFingerprint = getAutoModeActionFingerprint(
+              policyToolName,
+              toolParams,
+              this.config.getCwd()
+            );
             this.config.setAutoModeDenialState(
-              recordAllow(this.config.getAutoModeDenialState())
+              recordAllow(
+                this.config.getAutoModeDenialState(),
+                actionFingerprint
+              )
             );
           }
           let wasAutoModeManualFallback = false;
-          let autoModeFallbackMessage;
+          let autoModeFallback;
           if (!autoModeAllowed && !requiresUserInteraction && shouldRunAutoModeForCall(approvalMode, policyToolName)) {
-            const denialState = this.config.getAutoModeDenialState();
-            const fallback = shouldFallback(denialState);
-            const messages = this.config.getLlmClient?.()?.getHistoryTail(MAX_TRANSCRIPT_MESSAGES, false) ?? [];
+            const actionFingerprint = getAutoModeActionFingerprint(
+              policyToolName,
+              toolParams,
+              this.config.getCwd()
+            );
+            const { denialState, fallback } = prepareAutoModeFallback(
+              this.config,
+              actionFingerprint
+            );
+            const llmClient = this.config.getLlmClient?.();
+            const messages = llmClient?.getHistoryTail(MAX_TRANSCRIPT_MESSAGES, false) ?? [];
+            const trustedUserAnswers = llmClient?.getTrustedUserAnswers?.() ?? [];
             const decision = await evaluateAutoMode({
               ctx: pmCtx,
               pmForcedAsk,
               toolParams,
               messages,
+              trustedUserAnswers,
               config: this.config,
               signal: abortSignal,
               skipClassifierReason: fallback.fallback ? fallback.reason : void 0
@@ -11430,7 +11614,8 @@ ${this.pendingRecoveredAgentsNotice}
             const outcome = applyAutoModeDecision(
               decision,
               this.config,
-              denialState
+              denialState,
+              actionFingerprint
             );
             await fireSessionPermissionDeniedForAutoMode(
               this.config,
@@ -11464,8 +11649,11 @@ ${this.pendingRecoveredAgentsNotice}
                 );
               case "fallback":
                 wasAutoModeManualFallback = isDenialFallbackReason(outcome.reason) || outcome.reason === "classifier_unavailable" || outcome.reason === "external_write";
-                if (outcome.reason === "classifier_unavailable" || outcome.reason === "external_write") {
-                  autoModeFallbackMessage = outcome.message;
+                if (outcome.message && (outcome.reason === "classifier_unavailable" || outcome.reason === "external_write" || isDenialFallbackReason(outcome.reason))) {
+                  autoModeFallback = {
+                    reason: outcome.reason,
+                    message: outcome.message
+                  };
                 }
                 if (wasAutoModeManualFallback) {
                   debugLogger6.warn(
@@ -11538,10 +11726,11 @@ ${this.pendingRecoveredAgentsNotice}
             if (confirmationDetailsCancellation) {
               return confirmationDetailsCancellation;
             }
-            if (autoModeFallbackMessage) {
-              confirmationDetails = decorateClassifierUnavailableConfirmation(
+            if (autoModeFallback && confirmationDetails) {
+              confirmationDetails = decorateAutoModeFallbackConfirmation(
                 confirmationDetails,
-                autoModeFallbackMessage
+                autoModeFallback.reason,
+                autoModeFallback.message
               );
             }
             if (planShellDecision.classification !== "not-applicable") {
@@ -11879,6 +12068,13 @@ ${this.pendingRecoveredAgentsNotice}
                 if (confirmationCancellation) {
                   return confirmationCancellation;
                 }
+                if (isTrustedAskUserQuestionTool && isApproveOutcome(outcome) && confirmationDetails.type === "ask_user_question") {
+                  this.config.getLlmClient?.()?.recordTrustedUserAnswers(
+                    callId,
+                    confirmationDetails.questions,
+                    output.answers
+                  );
+                }
               } catch (error) {
                 if (outcome !== "cancel" /* Cancel */) {
                   throw error;
@@ -12466,6 +12662,7 @@ ${this.pendingRecoveredAgentsNotice}
           return {
             parts: responseParts,
             stopAfterPermissionCancel: nestedPermissionCancelled,
+            ...toolResult.terminateTurn ? { terminateTurn: true } : {},
             memoryWriteCandidates: status === "success" ? [
               {
                 toolName,
@@ -14176,6 +14373,11 @@ __name(setGlobalSkillEnabled, "setGlobalSkillEnabled");
 
 // packages/cli/src/acp-integration/session/tasksSnapshot.ts
 init_esbuild_shims();
+import * as fs3 from "node:fs";
+import * as path6 from "node:path";
+var MAX_AGENT_SIDECAR_CACHE_ENTRIES = 20;
+var MAX_AGENT_SIDECAR_READ_CONCURRENCY = 8;
+var agentSidecarCache = /* @__PURE__ */ new Map();
 function runtimeMs(entry, now) {
   return Math.max(0, (entry.endTime ?? now) - entry.startTime);
 }
@@ -14184,6 +14386,24 @@ function optionalField(key, value) {
   return value !== void 0 ? { [key]: value } : {};
 }
 __name(optionalField, "optionalField");
+function retainAgentTasks(tasks) {
+  const pausedIds = new Set(
+    tasks.filter((task) => task.status === "paused").sort(
+      (a, b) => (b.endTime ?? b.startTime) - (a.endTime ?? a.startTime) || b.id.localeCompare(a.id)
+    ).slice(0, MAX_RETAINED_TERMINAL_AGENTS).map((task) => task.id)
+  );
+  const terminalIds = new Set(
+    tasks.filter(
+      (task) => task.status === "completed" || task.status === "failed" || task.status === "cancelled"
+    ).sort(
+      (a, b) => (b.endTime ?? b.startTime) - (a.endTime ?? a.startTime) || b.startTime - a.startTime || b.id.localeCompare(a.id)
+    ).slice(0, MAX_RETAINED_TERMINAL_AGENTS).map((task) => task.id)
+  );
+  return tasks.filter(
+    (task) => task.status === "running" || pausedIds.has(task.id) || terminalIds.has(task.id)
+  ).sort((a, b) => a.startTime - b.startTime || a.id.localeCompare(b.id));
+}
+__name(retainAgentTasks, "retainAgentTasks");
 function serializeAgentTask(entry, now) {
   return {
     kind: "agent",
@@ -14263,9 +14483,10 @@ function serializeWorkflowTask(entry, now) {
     kind: "workflow",
     id: entry.runId,
     ...optionalField("toolUseId", entry.toolUseId),
+    ...optionalField("workflowName", entry.workflowName),
     ...optionalField("sourceRunId", entry.sourceRunId),
     ...optionalField("startMode", entry.startMode),
-    label: entry.meta?.name ?? entry.description ?? entry.runId,
+    label: entry.meta?.name ?? entry.workflowName ?? entry.description ?? entry.runId,
     description: entry.meta?.description ?? entry.description,
     status: entry.status,
     startTime: entry.startTime,
@@ -14302,9 +14523,11 @@ function serializeWorkflowSnapshot(snapshot) {
     kind: "workflow",
     id: snapshot.runId,
     isHistorical: true,
+    ...optionalField("toolUseId", snapshot.toolUseId),
+    ...optionalField("workflowName", snapshot.workflowName),
     ...optionalField("sourceRunId", snapshot.sourceRunId),
     ...optionalField("startMode", snapshot.startMode),
-    label: snapshot.meta?.name ?? snapshot.description ?? snapshot.runId,
+    label: snapshot.meta?.name ?? snapshot.workflowName ?? snapshot.description ?? snapshot.runId,
     description: snapshot.meta?.description ?? snapshot.description ?? snapshot.runId,
     status: snapshot.status,
     startTime: snapshot.startTime,
@@ -14352,6 +14575,123 @@ function buildSessionTasksStatus(sessionId, config, now = Date.now(), workflowHi
   };
 }
 __name(buildSessionTasksStatus, "buildSessionTasksStatus");
+async function buildSessionAgentsStatus(sessionId, config, now = Date.now()) {
+  const projectDir = config.storage.getProjectDir();
+  const dir = getSubagentSessionDir(projectDir, sessionId);
+  const cacheKey = `${dir}\0${sessionId}`;
+  const agents = /* @__PURE__ */ new Map();
+  const metaSignatures = /* @__PURE__ */ new Map();
+  let directoryMtimeNs;
+  let files = [];
+  try {
+    directoryMtimeNs = (await fs3.promises.stat(dir, { bigint: true })).mtimeNs;
+    const cached = agentSidecarCache.get(cacheKey);
+    const cachedSidecarsUnchanged = cached?.directoryMtimeNs === directoryMtimeNs && (await Promise.all(
+      [...cached.metaSignatures].map(async ([agentId, signature]) => {
+        const meta = await readAgentMetaAsync(
+          path6.join(
+            dir,
+            `agent-${sanitizeFilenameComponent(agentId)}.meta.json`
+          )
+        );
+        return meta !== void 0 && JSON.stringify(meta) === signature;
+      })
+    )).every(Boolean);
+    if (cached && cachedSidecarsUnchanged) {
+      for (const task of cached.tasks) {
+        agents.set(task.id, task);
+      }
+    } else {
+      files = (await fs3.promises.readdir(dir)).filter((fileName) => fileName.endsWith(".meta.json")).sort().slice(0, MAX_AGENT_TRACE_NODES);
+    }
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+  }
+  const limitAgentSidecarRead = pLimit(MAX_AGENT_SIDECAR_READ_CONCURRENCY);
+  let sidecarScanIncomplete = false;
+  await Promise.all(
+    files.map(
+      (fileName) => limitAgentSidecarRead(async () => {
+        if (!fileName.endsWith(".meta.json")) return;
+        let meta;
+        try {
+          meta = await readAgentMetaAsync(path6.join(dir, fileName), {
+            throwOnReadError: true
+          });
+        } catch {
+          sidecarScanIncomplete = true;
+          return;
+        }
+        if (!meta || typeof meta.agentId !== "string" || meta.agentId.length === 0 || typeof meta.agentType !== "string" || typeof meta.description !== "string" || typeof meta.createdAt !== "string" || meta.parentSessionId !== sessionId || meta.subagentName !== void 0 && typeof meta.subagentName !== "string" || meta.lastUpdatedAt !== void 0 && typeof meta.lastUpdatedAt !== "string" || meta.lastError !== void 0 && typeof meta.lastError !== "string" || meta.toolUseId !== void 0 && typeof meta.toolUseId !== "string" || meta.parentAgentId !== null && typeof meta.parentAgentId !== "string" || meta.depth !== void 0 && !Number.isFinite(meta.depth) || meta.isBackgrounded !== void 0 && typeof meta.isBackgrounded !== "boolean" || fileName !== `agent-${sanitizeFilenameComponent(meta.agentId)}.meta.json` || meta.status !== void 0 && !["running", "paused", "completed", "failed", "cancelled"].includes(
+          meta.status
+        )) {
+          sidecarScanIncomplete = true;
+          return;
+        }
+        metaSignatures.set(meta.agentId, JSON.stringify(meta));
+        const startTime = Date.parse(meta.createdAt);
+        if (!Number.isFinite(startTime) || !meta.status) {
+          sidecarScanIncomplete = true;
+          return;
+        }
+        if (meta.status === "running" && meta.isBackgrounded !== true) return;
+        const status = meta.status === "running" ? "paused" : meta.status;
+        const endTime = Date.parse(meta.lastUpdatedAt ?? meta.createdAt);
+        const subagentType = meta.subagentName ?? meta.agentType;
+        agents.set(meta.agentId, {
+          kind: "agent",
+          id: meta.agentId,
+          label: buildBackgroundEntryLabel({
+            description: meta.description,
+            subagentType
+          }),
+          description: meta.description,
+          status,
+          startTime,
+          ...Number.isFinite(endTime) ? { endTime } : {},
+          runtimeMs: Math.max(
+            0,
+            (Number.isFinite(endTime) ? endTime : startTime) - startTime
+          ),
+          outputFile: path6.join(
+            dir,
+            `agent-${sanitizeFilenameComponent(meta.agentId)}.jsonl`
+          ),
+          subagentType,
+          isBackgrounded: meta.isBackgrounded === true,
+          ...optionalField("error", meta.lastError),
+          ...optionalField("toolUseId", meta.toolUseId),
+          ...optionalField("parentAgentId", meta.parentAgentId ?? void 0),
+          ...optionalField("depth", meta.depth)
+        });
+      })
+    )
+  );
+  if (directoryMtimeNs !== void 0 && files.length > 0 && !sidecarScanIncomplete) {
+    const tasks = retainAgentTasks([...agents.values()]);
+    agentSidecarCache.delete(cacheKey);
+    agentSidecarCache.set(cacheKey, {
+      directoryMtimeNs,
+      tasks,
+      metaSignatures
+    });
+    while (agentSidecarCache.size > MAX_AGENT_SIDECAR_CACHE_ENTRIES) {
+      const oldest = agentSidecarCache.keys().next().value;
+      if (!oldest) break;
+      agentSidecarCache.delete(oldest);
+    }
+  }
+  for (const entry of config.getBackgroundTaskRegistry().getAll()) {
+    agents.set(entry.id, serializeAgentTask(entry, now));
+  }
+  return {
+    v: STATUS_SCHEMA_VERSION,
+    sessionId,
+    now,
+    tasks: retainAgentTasks([...agents.values()])
+  };
+}
+__name(buildSessionAgentsStatus, "buildSessionAgentsStatus");
 
 // packages/cli/src/acp-integration/runtimeOutputDirContext.ts
 init_esbuild_shims();
@@ -14625,7 +14965,7 @@ __name(beginSessionCloseAfterCurrentGate, "beginSessionCloseAfterCurrentGate");
 var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger9);
 function parseAcpLocalReadRootsEnv(raw = process.env[QWEN_ACP_LOCAL_READ_ROOTS_ENV]) {
   if (!raw) return [];
-  return raw.split(path6.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0 && path6.isAbsolute(entry));
+  return raw.split(path7.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0 && path7.isAbsolute(entry));
 }
 __name(parseAcpLocalReadRootsEnv, "parseAcpLocalReadRootsEnv");
 function defaultAcpOnlyLocalReadRoots() {
@@ -14638,8 +14978,8 @@ function buildAcpLocalReadRoots(config) {
     // including auto-memory roots. The ACP-only additions below expand only
     // local read fallback, not read_file's default permission.
     config.storage.getProjectTempDir(),
-    path6.join(config.storage.getProjectDir(), "subagents"),
-    path6.join(config.getSessionRuntimeBaseDir(), "tmp"),
+    path7.join(config.storage.getProjectDir(), "subagents"),
+    path7.join(config.getSessionRuntimeBaseDir(), "tmp"),
     getAutoMemoryRoot(config.getTargetDir()),
     getUserAutoMemoryRoot(),
     ...config.storage.getUserSkillsDirs(),
@@ -14647,6 +14987,10 @@ function buildAcpLocalReadRoots(config) {
     // Saved plan files (see ReadFileTool.getDefaultPermission for why the
     // plans dir must be readable without a confirmation prompt).
     config.getPlansDir(),
+    Storage.getUserWorkflowsDir(),
+    // Workflow run artifacts: resume journals, run snapshots, and persisted
+    // inline scripts named by workflow results and notifications.
+    config.storage.getWorkflowRunsDir(),
     ...defaultAcpOnlyLocalReadRoots(),
     ...parseAcpLocalReadRootsEnv()
   ];
@@ -15731,14 +16075,14 @@ function readScopeSettings(settings, scope) {
 __name(readScopeSettings, "readScopeSettings");
 async function resolvePreferredMemoryFile(dir, fallbackFilename) {
   for (const filename of getAllMemoryFilenames()) {
-    const filePath = path6.join(dir, filename);
+    const filePath = path7.join(dir, filename);
     try {
-      await fs3.access(filePath);
+      await fs4.access(filePath);
       return filePath;
     } catch {
     }
   }
-  return path6.join(dir, fallbackFilename);
+  return path7.join(dir, fallbackFilename);
 }
 __name(resolvePreferredMemoryFile, "resolvePreferredMemoryFile");
 async function resolveQwenMemoryPaths(params) {
@@ -15948,7 +16292,8 @@ async function addRuntimeMcpServer(manager, request) {
 }
 __name(addRuntimeMcpServer, "addRuntimeMcpServer");
 async function runAcpAgent(config, settings, argv, options) {
-  const sessionWriterLeaseEnabledAtStartup = typeof config.isSessionWriterLeaseEnabled === "function" ? config.isSessionWriterLeaseEnabled() : settings.merged.experimental?.sessionWriterLease === true;
+  const conversationsRuntimeProvenance = options?.conversationsRuntimeProvenance === true;
+  const sessionWriterLeaseEnabledAtStartup = conversationsRuntimeProvenance || (typeof config.isSessionWriterLeaseEnabled === "function" ? config.isSessionWriterLeaseEnabled() : settings.merged.experimental?.sessionWriterLease === true);
   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];
@@ -16051,7 +16396,8 @@ async function runAcpAgent(config, settings, argv, options) {
         privateParentCapability,
         sessionWriterLeaseEnabledAtStartup,
         managedToolInvocationGuard,
-        externalToolGuardProviderAttached
+        externalToolGuardProviderAttached,
+        conversationsRuntimeProvenance
       );
       return agentInstance;
     }, stream);
@@ -16128,7 +16474,7 @@ async function runAcpAgent(config, settings, argv, options) {
             return [];
           }
           return [
-            path6.join(
+            path7.join(
               config2.getSessionRuntimeBaseDir(),
               "tmp",
               "session-writer-locks",
@@ -16370,7 +16716,7 @@ function hasOnlyKeys(value, keys) {
 }
 __name(hasOnlyKeys, "hasOnlyKeys");
 function isManagedConversationPath(value) {
-  return typeof value === "string" && value.length > 0 && !value.includes("\0") && path6.isAbsolute(value);
+  return typeof value === "string" && value.length > 0 && !value.includes("\0") && path7.isAbsolute(value);
 }
 __name(isManagedConversationPath, "isManagedConversationPath");
 function isManagedConversationIdentityNumber(value) {
@@ -16390,9 +16736,9 @@ function parseConversationDirectoryExpectation(value) {
   const child = value["child"];
   const parsedSessionId = parseCallerSuppliedSessionId(canonicalSessionId);
   if (parsedSessionId.kind !== "valid" || parsedSessionId.sessionId !== canonicalSessionId || !isObjectRecord(root) || !hasOnlyKeys(root, ["canonicalPath", "device", "inode"]) || !isManagedConversationPath(root["canonicalPath"]) || !isManagedConversationIdentityNumber(root["device"]) || !isManagedConversationIdentityNumber(root["inode"]) || !isObjectRecord(child) || !hasOnlyKeys(child, ["name", "canonicalPath", "device", "inode"]) || typeof child["name"] !== "string" || child["name"] !== getConversationDirectoryName(canonicalSessionId) || !isManagedConversationPath(child["canonicalPath"]) || !isManagedConversationIdentityNumber(child["device"]) || !isManagedConversationIdentityNumber(child["inode"]) || !isSameConversationPath(
-    path6.dirname(child["canonicalPath"]),
+    path7.dirname(child["canonicalPath"]),
     root["canonicalPath"]
-  ) || path6.basename(child["canonicalPath"]) !== child["name"]) {
+  ) || path7.basename(child["canonicalPath"]) !== child["name"]) {
     throw RequestError.invalidParams(
       void 0,
       "Invalid managed conversation directory expectation"
@@ -16429,9 +16775,9 @@ async function assertManagedConversationDirectoryIdentity(expectation) {
   let canonicalRoot;
   let rootAfter;
   try {
-    rootBefore = await fs3.lstat(expectation.root.canonicalPath);
-    canonicalRoot = await fs3.realpath(expectation.root.canonicalPath);
-    rootAfter = await fs3.lstat(canonicalRoot);
+    rootBefore = await fs4.lstat(expectation.root.canonicalPath);
+    canonicalRoot = await fs4.realpath(expectation.root.canonicalPath);
+    rootAfter = await fs4.lstat(canonicalRoot);
   } catch (error) {
     throw managedConversationDirectoryError(
       error.code === "ENOENT"
@@ -16444,9 +16790,9 @@ async function assertManagedConversationDirectoryIdentity(expectation) {
   let canonicalChild;
   let childAfter;
   try {
-    childBefore = await fs3.lstat(expectation.child.canonicalPath);
-    canonicalChild = await fs3.realpath(expectation.child.canonicalPath);
-    childAfter = await fs3.lstat(canonicalChild);
+    childBefore = await fs4.lstat(expectation.child.canonicalPath);
+    canonicalChild = await fs4.realpath(expectation.child.canonicalPath);
+    childAfter = await fs4.lstat(canonicalChild);
   } catch (error) {
     throw managedConversationDirectoryError(
       error.code === "ENOENT"
@@ -16458,7 +16804,7 @@ async function assertManagedConversationDirectoryIdentity(expectation) {
 }
 __name(assertManagedConversationDirectoryIdentity, "assertManagedConversationDirectoryIdentity");
 var QwenAgent = class _QwenAgent {
-  constructor(config, settings, argv, connection, expectedPrivateParentCapability, sessionWriterLeaseEnabledAtStartup = false, managedToolInvocationGuard, externalToolGuardProviderAttached = false) {
+  constructor(config, settings, argv, connection, expectedPrivateParentCapability, sessionWriterLeaseEnabledAtStartup = false, managedToolInvocationGuard, externalToolGuardProviderAttached = false, conversationsRuntimeProvenance = false) {
     this.config = config;
     this.settings = settings;
     this.argv = argv;
@@ -16467,6 +16813,7 @@ var QwenAgent = class _QwenAgent {
     this.sessionWriterLeaseEnabledAtStartup = sessionWriterLeaseEnabledAtStartup;
     this.managedToolInvocationGuard = managedToolInvocationGuard;
     this.externalToolGuardProviderAttached = externalToolGuardProviderAttached;
+    this.conversationsRuntimeProvenance = conversationsRuntimeProvenance;
     if (process.env["QWEN_SERVE_NO_MCP_POOL"] === "1") {
       this.mcpPool = void 0;
       this.workspaceMcpBudget = void 0;
@@ -17133,7 +17480,7 @@ var QwenAgent = class _QwenAgent {
     throw sessionId ? mapSessionRestoreRequestError(error, sessionId) : mapSessionWriterRequestError(error);
   }
   pendingConfigCleanupKey(runtimeBaseDir, sessionId) {
-    return `${path6.resolve(runtimeBaseDir)}\0${sessionId}`;
+    return `${path7.resolve(runtimeBaseDir)}\0${sessionId}`;
   }
   withAskUserQuestionRestoreHint(session, response) {
     if (this.argv.restoreAskUserQuestion !== true) {
@@ -17151,11 +17498,11 @@ var QwenAgent = class _QwenAgent {
     };
   }
   async retryPendingConfigCleanup(runtimeBaseDir, requiredSessionId) {
-    const resolvedRuntimeBaseDir = path6.resolve(runtimeBaseDir);
+    const resolvedRuntimeBaseDir = path7.resolve(runtimeBaseDir);
     const configs = /* @__PURE__ */ new Set();
     for (const pending of this.pendingConfigCleanup.values()) {
       for (const config of pending) {
-        if (path6.resolve(config.getSessionRuntimeBaseDir()) === resolvedRuntimeBaseDir) {
+        if (path7.resolve(config.getSessionRuntimeBaseDir()) === resolvedRuntimeBaseDir) {
           configs.add(config);
         }
       }
@@ -17315,9 +17662,43 @@ var QwenAgent = class _QwenAgent {
     );
     this.disposeTranscriptReplayConfigs();
   }
+  /**
+   * Single choke point for pinning the runtime root of an operation to a
+   * settings object and a cwd. Every caller in this class goes through here
+   * rather than calling `runWithAcpRuntimeOutputDir` directly, so the routing
+   * is composed in exactly one place. Which settings to pin with is still the
+   * caller's decision at this level: callers that already hold deliberately
+   * scoped settings (workspace MCP discovery, live-session scope checks,
+   * session creation) pass them in. Per-request session-management handlers
+   * (list, delete, rename, transcript page, transcript turn index, settled
+   * turn status, and the non-live branch of loadUpdates) must not make that
+   * decision themselves — they use `runWithPinnedRuntimeBaseDirForRequest`
+   * below. Session load and
+   * resume resolve the request's settings at the call site deliberately,
+   * under profiler instrumentation, because they adopt those settings for
+   * the session afterwards.
+   */
   runWithPinnedRuntimeBaseDir(settings, cwd, operation) {
     return runWithAcpRuntimeOutputDir(settings, cwd, operation);
   }
+  /**
+   * Per-request form of `runWithPinnedRuntimeBaseDir` for handlers that act
+   * on a caller-supplied cwd. It resolves the settings for THAT cwd itself,
+   * so the "which settings pin this operation" decision is made here, once,
+   * and a handler cannot reach the pin with the process-wide `this.settings`
+   * cache — the bug class fixed in #10095 (three handlers composed the
+   * routing by hand and pinned another workspace's runtime root). The
+   * operation receives the resolved settings for handlers that also need
+   * them inside the pinned scope.
+   */
+  runWithPinnedRuntimeBaseDirForRequest(cwd, operation) {
+    const settings = loadSettingsCached(cwd);
+    return this.runWithPinnedRuntimeBaseDir(
+      settings,
+      cwd,
+      () => operation(settings)
+    );
+  }
   /**
    * Whether an ungated restore replay (qwen/session/loadUpdates) may
    * finalize dangling tool calls. A session with an active turn — a client
@@ -17340,7 +17721,7 @@ var QwenAgent = class _QwenAgent {
     return finalize;
   }
   async assertLiveSessionScope(config, settings, cwd) {
-    if (path6.resolve(config.storage.getProjectRoot()) !== path6.resolve(cwd)) {
+    if (path7.resolve(config.storage.getProjectRoot()) !== path7.resolve(cwd)) {
       throw RequestError.invalidParams(
         void 0,
         "The live session belongs to another workspace."
@@ -17351,7 +17732,7 @@ var QwenAgent = class _QwenAgent {
       cwd,
       () => Storage.getRuntimeBaseDir()
     );
-    if (path6.resolve(config.getSessionRuntimeBaseDir()) !== path6.resolve(requestedRuntimeBaseDir)) {
+    if (path7.resolve(config.getSessionRuntimeBaseDir()) !== path7.resolve(requestedRuntimeBaseDir)) {
       throw mapSessionWriterRequestError(new SessionWriterUnavailableError());
     }
   }
@@ -17409,7 +17790,7 @@ var QwenAgent = class _QwenAgent {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.23.0";
+    const version = "0.23.1-preview.1";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -17703,6 +18084,7 @@ var QwenAgent = class _QwenAgent {
     }
     const restoreOptions = loadRestoreOptions(params);
     const suppressRestoreAskUserQuestion = params._meta?.[DAEMON_SUPPRESS_RESTORE_ASK_USER_QUESTION_META_KEY] === true;
+    const suppressWorktreeContextRestore = params._meta?.[DAEMON_SUPPRESS_WORKTREE_CONTEXT_RESTORE_META_KEY] === true;
     const withRestoreHint = /* @__PURE__ */ __name((session, response) => suppressRestoreAskUserQuestion ? response : this.withAskUserQuestionRestoreHint(session, response), "withRestoreHint");
     const liveSession = this.sessions.get(sessionId);
     if (liveSession) {
@@ -18044,7 +18426,7 @@ var QwenAgent = class _QwenAgent {
                 }
               }
               await profiler.time("post_replay_services", async () => {
-                if (!provisionalStandalone) {
+                if (!provisionalStandalone && !suppressWorktreeContextRestore) {
                   await this.#restoreWorktreeOnResume(config, createdSession);
                 }
                 await this.#restoreBackgroundAgentsOnResume(
@@ -18105,6 +18487,7 @@ var QwenAgent = class _QwenAgent {
       );
     }
     const suppressRestoreAskUserQuestion = params._meta?.[DAEMON_SUPPRESS_RESTORE_ASK_USER_QUESTION_META_KEY] === true;
+    const suppressWorktreeContextRestore = params._meta?.[DAEMON_SUPPRESS_WORKTREE_CONTEXT_RESTORE_META_KEY] === true;
     const withRestoreHint = /* @__PURE__ */ __name((session, response) => suppressRestoreAskUserQuestion ? response : this.withAskUserQuestionRestoreHint(session, response), "withRestoreHint");
     const liveSession = this.sessions.get(sessionId);
     if (liveSession) {
@@ -18233,7 +18616,7 @@ var QwenAgent = class _QwenAgent {
             }, "primeSession"),
             beforeStartPostReplayServices: /* @__PURE__ */ __name(async (createdSession) => {
               await profiler.time("post_replay_services", async () => {
-                if (!provisionalStandalone) {
+                if (!provisionalStandalone && !suppressWorktreeContextRestore) {
                   await this.#restoreWorktreeOnResume(config, createdSession);
                 }
                 await this.#restoreBackgroundAgentsOnResume(
@@ -18288,7 +18671,7 @@ var QwenAgent = class _QwenAgent {
     const cwd = params.cwd || process.cwd();
     const numericCursor = parseAcpSessionListCursor(params.cursor);
     const size = normalizeAcpSessionListSize(params._meta?.["size"]);
-    const result = await runWithAcpRuntimeOutputDir(this.settings, cwd, () => {
+    const result = await this.runWithPinnedRuntimeBaseDirForRequest(cwd, () => {
       const sessionService = new SessionService(cwd);
       return sessionService.listSessions({
         cursor: numericCursor,
@@ -18767,23 +19150,25 @@ var QwenAgent = class _QwenAgent {
         return "not_started";
     }
   }
-  async buildWorkspaceMcpStatus(config) {
+  async buildWorkspaceMcpStatus(config, scope = "workspace", sessionSettings) {
     try {
       const workspaceCwd = this.workspaceCwd(config);
-      const settings = loadSettings(config.getTargetDir());
+      const settings = sessionSettings ?? loadSettings(config.getTargetDir());
       const userServers = settings.user?.settings.mcpServers ?? {};
       const systemDefaultServers = settings.systemDefaults?.settings.mcpServers ?? {};
       const servers = config.getMcpServers() ?? {};
       const approvals = loadMcpApprovals();
       let poolByName = {};
-      try {
-        const snap = this.mcpPool?.getSnapshot();
-        if (snap) poolByName = snap.byName;
-      } catch (err) {
-        process.stderr.write(
-          `qwen serve: pool snapshot for workspace MCP status failed: ${err instanceof Error ? err.message : String(err)}
+      if (scope === "workspace") {
+        try {
+          const snap = this.mcpPool?.getSnapshot();
+          if (snap) poolByName = snap.byName;
+        } catch (err) {
+          process.stderr.write(
+            `qwen serve: pool snapshot for workspace MCP status failed: ${err instanceof Error ? err.message : String(err)}
 `
-        );
+          );
+        }
       }
       let clientCount;
       let clientBudget;
@@ -18791,7 +19176,7 @@ var QwenAgent = class _QwenAgent {
       let refusedSet = /* @__PURE__ */ new Set();
       let budgetCellScope = "session";
       const wsBudget = this.workspaceMcpBudget;
-      if (wsBudget !== void 0) {
+      if (scope === "workspace" && wsBudget !== void 0) {
         budgetCellScope = "workspace";
         clientCount = wsBudget.getReservedCount();
         clientBudget = wsBudget.getBudget();
@@ -18814,7 +19199,7 @@ var QwenAgent = class _QwenAgent {
           );
         }
       }
-      const sharedTokenStorage = new MCPOAuthTokenStorage();
+      const sharedTokenStorage = scope === "workspace" ? new MCPOAuthTokenStorage() : void 0;
       return {
         v: STATUS_SCHEMA_VERSION,
         workspaceCwd,
@@ -18823,11 +19208,14 @@ var QwenAgent = class _QwenAgent {
         servers: await Promise.all(
           Object.entries(servers).map(async ([name, server]) => {
             const disabled = config.isMcpServerDisabled(name);
-            let hasOAuthTokens = false;
-            try {
-              const credentials = await sharedTokenStorage.getCredentials(name);
-              hasOAuthTokens = credentials !== null;
-            } catch {
+            let hasOAuthTokens;
+            if (sharedTokenStorage) {
+              hasOAuthTokens = false;
+              try {
+                const credentials = await sharedTokenStorage.getCredentials(name);
+                hasOAuthTokens = credentials !== null;
+              } catch {
+              }
             }
             const poolRow = poolByName[name];
             const rawStatus = poolRow ? poolRow.entrySummary.some(
@@ -18835,7 +19223,7 @@ var QwenAgent = class _QwenAgent {
             ) ? "connected" /* CONNECTED */ : poolRow.entrySummary.some(
               (entry) => entry.status === "connecting" /* CONNECTING */
             ) ? "connecting" /* CONNECTING */ : "disconnected" /* DISCONNECTED */ : this.getMcpServerStatus(config, name);
-            const requiresAuth = rawStatus !== "connected" /* CONNECTED */ && (mcpServerRequiresOAuth.get(name) === true || server.oauth?.enabled === true && !hasOAuthTokens);
+            const requiresAuth = scope === "workspace" && rawStatus !== "connected" /* CONNECTED */ && (mcpServerRequiresOAuth.get(name) === true || server.oauth?.enabled === true && !hasOAuthTokens);
             const refusedByBudget = refusedSet.has(name);
             const effectivelyRefused = refusedByBudget && !disabled;
             const out = {
@@ -18849,7 +19237,7 @@ var QwenAgent = class _QwenAgent {
               mcpStatus: this.mcpStatus(rawStatus),
               transport: this.mcpTransport(server),
               disabled,
-              hasOAuthTokens,
+              ...hasOAuthTokens !== void 0 ? { hasOAuthTokens } : {},
               ...requiresAuth ? { requiresAuth: true } : {}
             };
             if (isGatedMcpScope(server.scope)) {
@@ -18866,14 +19254,16 @@ var QwenAgent = class _QwenAgent {
                 }
               }
             }
-            if (this.pendingMcpAuthentications.has(name)) {
-              out.authenticationState = "pending";
-            } else {
-              const authentication = this.mcpAuthenticationResults.get(name);
-              if (authentication) {
-                out.authenticationState = authentication.state;
-                if (authentication.error) {
-                  out.authenticationError = authentication.error;
+            if (scope === "workspace") {
+              if (this.pendingMcpAuthentications.has(name)) {
+                out.authenticationState = "pending";
+              } else {
+                const authentication = this.mcpAuthenticationResults.get(name);
+                if (authentication) {
+                  out.authenticationState = authentication.state;
+                  if (authentication.error) {
+                    out.authenticationError = authentication.error;
+                  }
                 }
               }
             }
@@ -18935,11 +19325,13 @@ var QwenAgent = class _QwenAgent {
             if (!disabled) {
               out.resourceCount = this.resolveServerMcpResources(
                 config,
-                name
+                name,
+                scope === "workspace"
               ).length;
               out.promptCount = this.resolveServerMcpPrompts(
                 config,
-                name
+                name,
+                scope === "workspace"
               ).length;
             }
             return out;
@@ -18961,7 +19353,7 @@ var QwenAgent = class _QwenAgent {
             budgetCellScope
           )
         } : {},
-        ...this.workspaceMcpDiscoveryError ? {
+        ...scope === "workspace" && this.workspaceMcpDiscoveryError ? {
           errors: [
             this.errorCell(
               "mcp",
@@ -19090,14 +19482,18 @@ var QwenAgent = class _QwenAgent {
    * workspace `Config`'s `ResourceRegistry` is authoritative in
    * single-session mode, but in pool mode resources are registered into
    * per-session registries (`SessionMcpView.applyResources`), leaving the
-   * workspace registry empty. Fall back to the first active session that
-   * has this server's resources.
+   * workspace registry empty. Workspace snapshots may fall back to the first
+   * active session that has this server's resources; exact session snapshots
+   * disable that fallback.
    */
-  resolveServerMcpResources(config, serverName) {
+  resolveServerMcpResources(config, serverName, allowSessionFallback = true) {
     const resources = config.getResourceRegistry?.()?.getResourcesByServer(serverName) ?? [];
     if (resources.length > 0) {
       return resources;
     }
+    if (!allowSessionFallback) {
+      return resources;
+    }
     for (const session of this.getActiveSessions()) {
       try {
         const sessionResources = session.getConfig().getResourceRegistry?.()?.getResourcesByServer(serverName) ?? [];
@@ -19115,11 +19511,14 @@ var QwenAgent = class _QwenAgent {
    * `promptCount` on the base status — prompts have no drill-down
    * endpoint (they surface as slash commands).
    */
-  resolveServerMcpPrompts(config, serverName) {
+  resolveServerMcpPrompts(config, serverName, allowSessionFallback = true) {
     const prompts = config.getPromptRegistry?.()?.getPromptsByServer(serverName) ?? [];
     if (prompts.length > 0) {
       return prompts;
     }
+    if (!allowSessionFallback) {
+      return prompts;
+    }
     for (const session of this.getActiveSessions()) {
       try {
         const sessionPrompts = session.getConfig().getPromptRegistry?.()?.getPromptsByServer(serverName) ?? [];
@@ -19263,7 +19662,7 @@ var QwenAgent = class _QwenAgent {
       debugLogger9.warn("Extension source revalidation failed:", error);
     }
   }
-  async buildWorkspaceSkillsStatus(config) {
+  async buildWorkspaceSkillsStatus(config, settings = this.settings) {
     const skillManager = config.getSkillManager();
     if (!skillManager) {
       return {
@@ -19284,7 +19683,7 @@ var QwenAgent = class _QwenAgent {
           skills: []
         };
       }
-      const resolved = resolveSkillSettings(this.settings);
+      const resolved = resolveSkillSettings(settings);
       const disablements = new Map(
         Array.from(config.getDisabledSkillNames(), (name) => {
           const normalizedName = name.trim().toLowerCase();
@@ -19343,6 +19742,22 @@ var QwenAgent = class _QwenAgent {
       };
     }
   }
+  async buildSessionResourcesStatus(sessionId) {
+    const session = this.sessionOrThrow(sessionId);
+    const config = session.getConfig();
+    const settings = session.getSettings();
+    const [skills, mcp] = await Promise.all([
+      this.buildWorkspaceSkillsStatus(config, settings),
+      this.buildWorkspaceMcpStatus(config, "session", settings)
+    ]);
+    return {
+      v: STATUS_SCHEMA_VERSION,
+      sessionId,
+      workspaceCwd: this.workspaceCwd(config),
+      skills,
+      mcp
+    };
+  }
   buildWorkspaceProvidersStatus(config) {
     try {
       const workspaceCwd = this.workspaceCwd(config);
@@ -19871,6 +20286,68 @@ var QwenAgent = class _QwenAgent {
       { includeWorkflows }
     );
   }
+  async buildSessionAgentsStatus(sessionId) {
+    const session = this.sessionOrThrow(sessionId);
+    const status = await buildSessionAgentsStatus(
+      session.getConfig().getSessionId(),
+      session.getConfig()
+    );
+    return { ...status, sessionId };
+  }
+  async buildSessionAgentTrace(sessionId, rootAgentId) {
+    const session = this.sessionOrThrow(sessionId);
+    const persistedSessionId = session.getConfig().getSessionId();
+    const trace = await readAgentTrace(
+      session.getConfig().storage.getProjectDir(),
+      persistedSessionId,
+      rootAgentId
+    );
+    return { v: STATUS_SCHEMA_VERSION, sessionId, ...trace };
+  }
+  /**
+   * Resolve one saved workflow for display. Fails closed to `workflow: null`
+   * on every miss — unknown name, illegal name, unreadable file, or Workflow
+   * controls unavailable — so the daemon never has to distinguish them and
+   * cannot be used to probe the filesystem by name.
+   */
+  async buildSessionSavedWorkflowStatus(sessionId, name) {
+    const session = this.sessionOrThrow(sessionId);
+    const config = session.getConfig();
+    const envelope = /* @__PURE__ */ __name((workflow) => ({
+      v: STATUS_SCHEMA_VERSION,
+      sessionId,
+      name,
+      workflow
+    }), "envelope");
+    if (!this.canUseWorkflowControls(config)) return envelope(null);
+    const entry = (await listSavedWorkflows(config)).find(
+      (candidate) => candidate.name === name
+    );
+    if (!entry) return envelope(null);
+    let script;
+    try {
+      script = (await resolveSavedWorkflowScript(name, config)).script;
+    } catch {
+      return envelope(null);
+    }
+    let meta = null;
+    let metaError;
+    try {
+      meta = extractAndStripMeta(script).meta;
+    } catch (error) {
+      metaError = error instanceof Error ? error.message : String(error);
+    }
+    return envelope({
+      v: STATUS_SCHEMA_VERSION,
+      sessionId,
+      name: entry.name,
+      source: entry.source,
+      scriptPath: entry.scriptPath,
+      script,
+      meta,
+      ...metaError !== void 0 ? { metaError } : {}
+    });
+  }
   buildSessionLspStatus(sessionId) {
     const session = this.sessionOrThrow(sessionId);
     const config = session.getConfig();
@@ -20526,6 +21003,32 @@ var QwenAgent = class _QwenAgent {
           params["includeWorkflows"] === true && this.canUseWorkflowControls(session.getConfig())
         );
       }
+      case SERVE_STATUS_EXT_METHODS.sessionAgents: {
+        const sessionId = params["sessionId"];
+        if (typeof sessionId !== "string" || sessionId.length === 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing sessionId"
+          );
+        }
+        return await this.buildSessionAgentsStatus(
+          sessionId
+        );
+      }
+      case SERVE_STATUS_EXT_METHODS.sessionAgentTrace: {
+        const sessionId = params["sessionId"];
+        const rootAgentId = params["rootAgentId"];
+        if (typeof sessionId !== "string" || sessionId.length === 0 || rootAgentId !== void 0 && (typeof rootAgentId !== "string" || rootAgentId.length === 0 || rootAgentId.length > 500)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid sessionId or rootAgentId"
+          );
+        }
+        return await this.buildSessionAgentTrace(
+          sessionId,
+          rootAgentId
+        );
+      }
       case SERVE_STATUS_EXT_METHODS.sessionLspStatus: {
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || sessionId.length === 0) {
@@ -20536,6 +21039,38 @@ var QwenAgent = class _QwenAgent {
         }
         return this.buildSessionLspStatus(sessionId);
       }
+      case SERVE_STATUS_EXT_METHODS.sessionResources: {
+        const sessionId = params["sessionId"];
+        if (typeof sessionId !== "string" || sessionId.length === 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing sessionId"
+          );
+        }
+        return await this.buildSessionResourcesStatus(
+          sessionId
+        );
+      }
+      case SERVE_STATUS_EXT_METHODS.sessionSavedWorkflow: {
+        const sessionId = params["sessionId"];
+        if (typeof sessionId !== "string" || sessionId.length === 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing sessionId"
+          );
+        }
+        const name = params["name"];
+        if (typeof name !== "string" || name.length === 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing name"
+          );
+        }
+        return await this.buildSessionSavedWorkflowStatus(
+          sessionId,
+          name
+        );
+      }
       case SERVE_STATUS_EXT_METHODS.sessionTranscript: {
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || !SESSION_ID_RE.test(sessionId)) {
@@ -20551,6 +21086,20 @@ var QwenAgent = class _QwenAgent {
             "Invalid transcript cursor"
           );
         }
+        const rawAtRecordId = params["atRecordId"];
+        if (rawAtRecordId !== void 0 && (typeof rawAtRecordId !== "string" || rawAtRecordId.length === 0)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid transcript turn anchor"
+          );
+        }
+        const rawSnapshot = params["snapshot"];
+        if (rawSnapshot !== void 0 && (typeof rawSnapshot !== "string" || rawSnapshot.length === 0)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid transcript snapshot"
+          );
+        }
         const rawBeforeRecordId = params["beforeRecordId"];
         if (rawBeforeRecordId !== void 0 && (typeof rawBeforeRecordId !== "string" || rawBeforeRecordId.length === 0)) {
           throw RequestError.invalidParams(
@@ -20558,7 +21107,7 @@ var QwenAgent = class _QwenAgent {
             "Invalid transcript record boundary"
           );
         }
-        if (rawCursor !== void 0 && rawBeforeRecordId !== void 0) {
+        if (rawCursor !== void 0 && (rawBeforeRecordId !== void 0 || rawAtRecordId !== void 0 || rawSnapshot !== void 0)) {
           throw RequestError.invalidParams(
             void 0,
             "Transcript cursor and record boundary are mutually exclusive"
@@ -20583,6 +21132,18 @@ var QwenAgent = class _QwenAgent {
             "Transcript record boundary and direction are mutually exclusive"
           );
         }
+        if (rawAtRecordId !== void 0 && (rawBeforeRecordId !== void 0 || rawDirection !== void 0 || rawSnapshot === void 0)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Transcript turn anchor requires its snapshot and no other anchor"
+          );
+        }
+        if (rawSnapshot !== void 0 && rawAtRecordId === void 0 && rawBeforeRecordId === void 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Transcript snapshot requires a record anchor"
+          );
+        }
         const rawLimit = params["limit"];
         if (rawLimit !== void 0 && (!Number.isSafeInteger(rawLimit) || rawLimit < 1 || rawLimit > SESSION_TRANSCRIPT_MAX_LIMIT)) {
           throw RequestError.invalidParams(
@@ -20591,8 +21152,7 @@ var QwenAgent = class _QwenAgent {
           );
         }
         try {
-          const settings = loadSettingsCached(cwd);
-          return await runWithAcpRuntimeOutputDir(settings, cwd, async () => {
+          const readTranscriptPage = /* @__PURE__ */ __name(async (settings) => {
             if (rawDirection === "backward") {
               await this.sessions.get(sessionId)?.getConfig().getChatRecordingService()?.flush();
             }
@@ -20601,6 +21161,8 @@ var QwenAgent = class _QwenAgent {
             const page = await reader.readPage(sessionId, {
               ...typeof rawCursor === "string" ? { cursor: rawCursor } : {},
               ...typeof rawBeforeRecordId === "string" ? { beforeRecordId: rawBeforeRecordId } : {},
+              ...typeof rawAtRecordId === "string" ? { atRecordId: rawAtRecordId } : {},
+              ...typeof rawSnapshot === "string" ? { snapshot: rawSnapshot } : {},
               ...rawDirection === "backward" ? { direction: rawDirection } : {},
               ...typeof rawLimit === "number" ? { limit: rawLimit } : {},
               maxBytes: SESSION_TRANSCRIPT_MAX_PAGE_BYTES
@@ -20626,16 +21188,22 @@ var QwenAgent = class _QwenAgent {
               hasMore: replay.hasMore,
               startTime: replay.startTime,
               lastUpdated: replay.lastUpdated,
-              ...replay.replayError !== void 0 ? { partial: true, replayError: replay.replayError } : {}
+              ...replay.replayError !== void 0 ? { partial: true, replayError: replay.replayError } : {},
+              ...page.targetRecordId ? { targetRecordId: page.targetRecordId } : {},
+              ...page.hasOlder !== void 0 ? { hasOlder: page.hasOlder } : {}
             };
-          });
+          }, "readTranscriptPage");
+          return await this.runWithPinnedRuntimeBaseDirForRequest(
+            cwd,
+            readTranscriptPage
+          );
         } catch (error) {
-          if (error instanceof InvalidSessionTranscriptCursorError || error instanceof RangeError) {
+          if (error instanceof InvalidSessionTranscriptCursorError || error instanceof InvalidSessionTranscriptTurnAnchorError || error instanceof RangeError) {
             throw new RequestError(
               -32602,
               error instanceof Error ? error.message : "Invalid transcript",
               {
-                errorKind: error instanceof InvalidSessionTranscriptCursorError ? "invalid_transcript_cursor" : "invalid_transcript_limit"
+                errorKind: error instanceof InvalidSessionTranscriptCursorError ? "invalid_transcript_cursor" : error instanceof InvalidSessionTranscriptTurnAnchorError ? "invalid_turn_anchor" : "invalid_transcript_limit"
               }
             );
           }
@@ -20662,7 +21230,90 @@ var QwenAgent = class _QwenAgent {
             });
           }
           if (error.code === "ENOENT") {
-            if (typeof rawCursor === "string") {
+            if (typeof rawCursor === "string" || typeof rawSnapshot === "string") {
+              throw new RequestError(
+                -32010,
+                `Transcript snapshot is unavailable for session ${sessionId}`,
+                {
+                  errorKind: "transcript_snapshot_unavailable",
+                  sessionId
+                }
+              );
+            }
+            throw RequestError.resourceNotFound(`session:${sessionId}`);
+          }
+          throw error;
+        }
+      }
+      case SERVE_STATUS_EXT_METHODS.sessionTurnIndex: {
+        const sessionId = params["sessionId"];
+        if (typeof sessionId !== "string" || !SESSION_ID_RE.test(sessionId)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing sessionId"
+          );
+        }
+        const rawSnapshot = params["snapshot"];
+        if (rawSnapshot !== void 0 && (typeof rawSnapshot !== "string" || rawSnapshot.length === 0)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid transcript snapshot"
+          );
+        }
+        const rawStart = params["start"];
+        if (rawStart !== void 0 && (!Number.isSafeInteger(rawStart) || rawStart < 0 || rawSnapshot === void 0)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid transcript turn index start"
+          );
+        }
+        const rawLimit = params["limit"];
+        if (rawLimit !== void 0 && (!Number.isSafeInteger(rawLimit) || rawLimit < 1 || rawLimit > SESSION_TRANSCRIPT_MAX_LIMIT)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid transcript limit"
+          );
+        }
+        try {
+          const readTurnIndexPage = /* @__PURE__ */ __name(async () => {
+            if (rawSnapshot === void 0) {
+              await this.sessions.get(sessionId)?.getConfig().getChatRecordingService()?.flush();
+            }
+            return await new SessionTranscriptReader(cwd).readTurnIndexPage(
+              sessionId,
+              {
+                ...typeof rawSnapshot === "string" ? { snapshot: rawSnapshot } : {},
+                ...typeof rawStart === "number" ? { start: rawStart } : {},
+                ...typeof rawLimit === "number" ? { limit: rawLimit } : {}
+              }
+            );
+          }, "readTurnIndexPage");
+          return await this.runWithPinnedRuntimeBaseDirForRequest(
+            cwd,
+            readTurnIndexPage
+          );
+        } catch (error) {
+          if (error instanceof InvalidSessionTranscriptCursorError || error instanceof RangeError) {
+            throw new RequestError(-32602, error.message, {
+              errorKind: error instanceof InvalidSessionTranscriptCursorError ? "invalid_transcript_cursor" : "invalid_transcript_limit"
+            });
+          }
+          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.code === "ENOENT") {
+            if (typeof rawSnapshot === "string") {
               throw new RequestError(
                 -32010,
                 `Transcript snapshot is unavailable for session ${sessionId}`,
@@ -21853,7 +22504,7 @@ var QwenAgent = class _QwenAgent {
             "Invalid or missing sessionId"
           );
         }
-        if (typeof targetPath !== "string" || targetPath.length === 0 || !path6.isAbsolute(targetPath) || targetPath.includes("\0")) {
+        if (typeof targetPath !== "string" || targetPath.length === 0 || !path7.isAbsolute(targetPath) || targetPath.includes("\0")) {
           throw RequestError.invalidParams(
             void 0,
             "Invalid or missing path (must be an absolute path)"
@@ -21908,7 +22559,7 @@ var QwenAgent = class _QwenAgent {
         }
         let stats;
         try {
-          stats = await fs3.stat(targetPath);
+          stats = await fs4.stat(targetPath);
         } catch {
           if (conversationDirectoryExpectation !== void 0) {
             throw managedConversationDirectoryError(true);
@@ -21929,7 +22580,7 @@ var QwenAgent = class _QwenAgent {
         }
         let canonicalPath;
         try {
-          canonicalPath = await fs3.realpath(targetPath);
+          canonicalPath = await fs4.realpath(targetPath);
         } catch (error) {
           if (conversationDirectoryExpectation !== void 0) {
             throw managedConversationDirectoryError(
@@ -21947,7 +22598,7 @@ var QwenAgent = class _QwenAgent {
               "Live managed relocation requires a trusted private ACP parent"
             );
           }
-          if (!Array.isArray(allowedRoots) || allowedRoots.length !== 1 || typeof allowedRoots[0] !== "string" || !path6.isAbsolute(allowedRoots[0]) || allowedRoots[0].includes("\0")) {
+          if (!Array.isArray(allowedRoots) || allowedRoots.length !== 1 || typeof allowedRoots[0] !== "string" || !path7.isAbsolute(allowedRoots[0]) || allowedRoots[0].includes("\0")) {
             throw RequestError.invalidParams(
               void 0,
               "Live managed relocation requires one absolute allowed root"
@@ -21958,9 +22609,9 @@ var QwenAgent = class _QwenAgent {
           let canonicalRoot;
           let rootAfter;
           try {
-            rootBefore = await fs3.lstat(rootPath);
-            canonicalRoot = await fs3.realpath(rootPath);
-            rootAfter = await fs3.lstat(canonicalRoot);
+            rootBefore = await fs4.lstat(rootPath);
+            canonicalRoot = await fs4.realpath(rootPath);
+            rootAfter = await fs4.lstat(canonicalRoot);
           } catch {
             if (conversationDirectoryExpectation !== void 0) {
               throw managedConversationDirectoryError(false);
@@ -21990,8 +22641,8 @@ var QwenAgent = class _QwenAgent {
           let targetBefore;
           let targetAfter;
           try {
-            targetBefore = await fs3.lstat(targetPath);
-            targetAfter = await fs3.lstat(canonicalPath);
+            targetBefore = await fs4.lstat(targetPath);
+            targetAfter = await fs4.lstat(canonicalPath);
           } catch (error) {
             if (conversationDirectoryExpectation !== void 0) {
               throw managedConversationDirectoryError(
@@ -22004,14 +22655,14 @@ var QwenAgent = class _QwenAgent {
               { errorKind: "containment_violation", path: canonicalPath }
             );
           }
-          const relativeTarget = path6.relative(canonicalRoot, canonicalPath);
+          const relativeTarget = path7.relative(canonicalRoot, canonicalPath);
           if (!isOwnerOnlyDirectory(targetBefore) || !isOwnerOnlyDirectory(targetAfter) || !isSameDirectoryIdentity(targetBefore, targetAfter) || conversationDirectoryExpectation !== void 0 && (!isSameConversationPath(
             canonicalPath,
             conversationDirectoryExpectation.child.canonicalPath
           ) || !hasExpectedManagedDirectoryIdentity(
             targetAfter,
             conversationDirectoryExpectation.child
-          )) || relativeTarget.length === 0 || relativeTarget.startsWith("..") || path6.isAbsolute(relativeTarget) || relativeTarget.includes(path6.sep)) {
+          )) || relativeTarget.length === 0 || relativeTarget.startsWith("..") || path7.isAbsolute(relativeTarget) || relativeTarget.includes(path7.sep)) {
             if (conversationDirectoryExpectation !== void 0) {
               throw managedConversationDirectoryError(false);
             }
@@ -22023,7 +22674,7 @@ var QwenAgent = class _QwenAgent {
           }
           let rootFinal;
           try {
-            rootFinal = await fs3.lstat(canonicalRoot);
+            rootFinal = await fs4.lstat(canonicalRoot);
           } catch {
             if (conversationDirectoryExpectation !== void 0) {
               throw managedConversationDirectoryError(false);
@@ -22053,8 +22704,8 @@ var QwenAgent = class _QwenAgent {
         if (Array.isArray(containmentRoots) && containmentRoots.length > 0) {
           const contained = containmentRoots.some((root) => {
             if (typeof root !== "string") return false;
-            const rel = path6.relative(root, canonicalPath);
-            return !rel.startsWith("..") && !path6.isAbsolute(rel);
+            const rel = path7.relative(root, canonicalPath);
+            return !rel.startsWith("..") && !path7.isAbsolute(rel);
           });
           if (!contained) {
             if (conversationDirectoryExpectation !== void 0) {
@@ -22821,9 +23472,12 @@ ${outputText}
                   "The workflow tool is unavailable; cannot run this saved workflow."
                 );
               }
-              const result = await workflowTool.buildSessionOwnedBackground({
-                scriptPath: savedWorkflow.scriptPath
-              }).execute(new AbortController().signal);
+              const result = await workflowTool.buildSessionOwnedBackground(
+                {
+                  scriptPath: savedWorkflow.scriptPath
+                },
+                savedWorkflow.name
+              ).execute(new AbortController().signal);
               const startedTask = result.workflowRunId ? registry.get(result.workflowRunId) : void 0;
               return startedTask ? {
                 changed: true,
@@ -22842,7 +23496,8 @@ ${outputText}
         if (action === "retry" || action === "rerun") {
           const liveElsewhere = action === "retry" && (registry.isStarting?.(taskId) === true || this.isWorkflowRunLiveOutsideSession(sessionId, taskId));
           const canStart = action === "retry" ? task.status === "failed" && !registry.getHandle(taskId) && !liveElsewhere : task.status === "completed" || task.status === "failed" || task.status === "cancelled";
-          if (!canStart || !task.script) {
+          const savedScriptPath = task.scriptPath;
+          if (!canStart || !task.script && !savedScriptPath) {
             return { changed: false, status: task.status };
           }
           const attempt = await tryWithWorkflowTaskMutation(
@@ -22855,12 +23510,30 @@ ${outputText}
                   `The workflow tool is unavailable; cannot ${action} this run.`
                 );
               }
+              let readableScriptPath;
+              if (savedScriptPath) {
+                try {
+                  await resolveSavedWorkflowScript(
+                    { scriptPath: savedScriptPath },
+                    config
+                  );
+                  readableScriptPath = savedScriptPath;
+                } catch {
+                  readableScriptPath = void 0;
+                }
+              }
+              if (!readableScriptPath && !task.script) {
+                return { changed: false, status: task.status };
+              }
               const startParams = {
-                script: task.script,
+                ...readableScriptPath ? { scriptPath: readableScriptPath } : { script: task.script },
                 args: task.args,
                 ...action === "retry" ? { resumeFromRunId: task.runId } : {}
               };
-              const result = await workflowTool.buildSessionOwnedBackground(startParams).execute(new AbortController().signal);
+              const result = await workflowTool.buildSessionOwnedBackground(
+                startParams,
+                readableScriptPath ? task.workflowName : void 0
+              ).execute(new AbortController().signal);
               if (action === "rerun") {
                 const rerunTask = result.workflowRunId ? registry.get(result.workflowRunId) : void 0;
                 if (rerunTask) {
@@ -22991,8 +23664,7 @@ ${outputText}
           );
         }
         const session = this.sessionOrThrow(sessionId);
-        const settings = loadSettingsCached(cwd);
-        return await runWithAcpRuntimeOutputDir(settings, cwd, async () => {
+        const readSettledTurnResult = /* @__PURE__ */ __name(async () => {
           try {
             await session.getConfig().getChatRecordingService()?.flush();
           } catch {
@@ -23017,7 +23689,7 @@ ${outputText}
             }
             if (error instanceof SessionTranscriptSnapshotUnavailableError && reader) {
               try {
-                const transcript = await fs3.stat(
+                const transcript = await fs4.stat(
                   reader.getSessionFilePath(sessionId)
                 );
                 if (transcript.size === 0) {
@@ -23058,7 +23730,11 @@ ${outputText}
             }
             throw error;
           }
-        });
+        }, "readSettledTurnResult");
+        return await this.runWithPinnedRuntimeBaseDirForRequest(
+          cwd,
+          readSettledTurnResult
+        );
       }
       case SERVE_CONTROL_EXT_METHODS.sessionContinue: {
         const sessionId = params["sessionId"];
@@ -23235,8 +23911,7 @@ ${outputText}
             "Invalid or missing sessionId"
           );
         }
-        const success = await runWithAcpRuntimeOutputDir(
-          this.settings,
+        const success = await this.runWithPinnedRuntimeBaseDirForRequest(
           cwd,
           async () => {
             const sessionService = new SessionService(cwd);
@@ -23274,8 +23949,7 @@ ${outputText}
           const ok = await liveRecording.recordCustomTitle(title, "manual");
           return { success: ok };
         }
-        const success = await runWithAcpRuntimeOutputDir(
-          this.settings,
+        const success = await this.runWithPinnedRuntimeBaseDirForRequest(
           cwd,
           async () => {
             const sessionService = new SessionService(cwd);
@@ -23465,9 +24139,7 @@ ${outputText}
           sessionData = recording ? await recording.runWithWriteBarrier(loadAuthoritative) : await loadAuthoritative();
           replayConfig = config;
         } else {
-          const settings = loadSettingsCached(cwd);
-          sessionData = await this.runWithPinnedRuntimeBaseDir(
-            settings,
+          sessionData = await this.runWithPinnedRuntimeBaseDirForRequest(
             cwd,
             async () => {
               const sessionService = new SessionService(cwd);
@@ -24170,7 +24842,7 @@ ${outputText}
     this.transcriptReplayConfigCache.clear();
   }
   async getTranscriptReplayConfig(cwd, settings) {
-    const key = path6.resolve(cwd);
+    const key = path7.resolve(cwd);
     const cached = this.transcriptReplayConfigCache.get(key);
     if (cached?.settings === settings) {
       if (cached.config) {
@@ -24406,7 +25078,9 @@ ${outputText}
     try {
       this.assertManagedSessionAdmission();
       if (this.isTrustedManagedParent()) {
-        config.setSessionWriterReclaimPolicy("never");
+        config.setSessionWriterReclaimPolicy(
+          this.conversationsRuntimeProvenance ? "local" : "never"
+        );
         config.setSessionWriterTakeoverPolicy("certified");
       }
     } catch (error) {
@@ -24828,6 +25502,9 @@ ${outputText}
       if (options.deferWorkspaceActivation !== true) {
         config.finalizeSessionRestore?.();
       }
+      if (this.conversationsRuntimeProvenance) {
+        config.getCronScheduler().setSkipDurableFire((job) => job.boundSessionId === void 0);
+      }
       session.startCronScheduler();
       setTimeout(() => {
         void session.sendAvailableCommandsUpdate();