@qwen-code/qwen-code 0.23.2 → 0.23.3-nightly.20260911.aaa6a32aae

package/chunks/{acpAgent-H5XBKGB4.js → acpAgent-W43WM2K4.js}

@@ -1,8 +1,9 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
+  PeerMessaging,
   classifyApiError
-} from "./chunk-V7RNNPGC.js";
+} from "./chunk-YC6XOB5N.js";
 import {
   fireSessionDeleteHook
 } from "./chunk-L34XSHIZ.js";
@@ -18,7 +19,7 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-4JNHNVAZ.js";
+} from "./chunk-W547PYQ7.js";
 import {
   getAvailableCommands,
   getSlashCommandFirstToken,
@@ -28,10 +29,10 @@ import {
   pLimit,
   recordDaemonSessionModel,
   restoreSessionModelThenAuthenticate
-} from "./chunk-FAJPLSYF.js";
+} from "./chunk-QTQYLQ5A.js";
 import {
   recomputeMcpGating
-} from "./chunk-APXIW2TF.js";
+} from "./chunk-TVV5FA3G.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -41,46 +42,46 @@ import {
   loadCliConfig,
   normalizeDisabledToolList,
   parseApprovalModeValue
-} from "./chunk-3OAXF3UK.js";
+} from "./chunk-RRQEZBL2.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-CWVZBIZJ.js";
+} from "./chunk-YDW4ERSS.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-TOOOLHVS.js";
-import "./chunk-22GORRNY.js";
+} from "./chunk-FH5AVEWJ.js";
 import "./chunk-NYX53SV4.js";
-import "./chunk-UYDQYDW2.js";
+import "./chunk-7IBS746B.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-2BMXHB6N.js";
+} from "./chunk-DWBNQR53.js";
 import "./chunk-4WGODMVR.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-ELD3OBPU.js";
+} from "./chunk-GWOVD63C.js";
 import "./chunk-KW7NOTN6.js";
-import "./chunk-2XRE4KE4.js";
-import "./chunk-46MMBZHI.js";
-import "./chunk-R457KFV7.js";
-import "./chunk-RM244SCQ.js";
+import "./chunk-GZMNHAYC.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-IR6JKBAP.js";
+import "./chunk-NOUK63IR.js";
 import "./chunk-YAF2MQZ6.js";
-import {
-  computeCpuPercent
-} from "./chunk-LBOVL47Y.js";
-import "./chunk-24FVUD5P.js";
-import "./chunk-QFJZAY7W.js";
+import "./chunk-2XRE4KE4.js";
+import "./chunk-BKFRA4F5.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-J3TJH52D.js";
+} from "./chunk-DOTF2PF2.js";
+import "./chunk-KZYOFJ6V.js";
+import "./chunk-P42IUOAO.js";
+import "./chunk-5Z74GE4N.js";
+import {
+  computeCpuPercent
+} from "./chunk-LBOVL47Y.js";
+import "./chunk-24FVUD5P.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -101,7 +102,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-BK7D2JR6.js";
+} from "./chunk-JVTXAA35.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -112,21 +113,14 @@ import {
   hasFullSessionContext,
   observeAcpToolResultProjection,
   observeAcpToolResultWire
-} from "./chunk-WDN64MVT.js";
+} from "./chunk-O5VX66FB.js";
 import "./chunk-M3JGHRMQ.js";
-import "./chunk-VFFQAOPR.js";
-import "./chunk-ERXNTINK.js";
 import "./chunk-47ECGEJC.js";
+import "./chunk-VFFQAOPR.js";
+import "./chunk-CQZJYGRX.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-TXASDT2M.js";
-import {
-  getConversationDirectoryName,
-  hasVerifiableInode,
-  isSameConversationPath,
-  isSameDirectoryIdentity
-} from "./chunk-PB7JBAHF.js";
-import "./chunk-UXEO7E3V.js";
 import {
   isCompatibleLiveSessionSource
 } from "./chunk-OHU2H5CS.js";
@@ -137,13 +131,20 @@ import {
   isReservedStandaloneSessionSourceType,
   parseSessionSource
 } from "./chunk-N4QWUPDM.js";
+import {
+  getConversationDirectoryName,
+  hasVerifiableInode,
+  isSameConversationPath,
+  isSameDirectoryIdentity
+} from "./chunk-PB7JBAHF.js";
 import "./chunk-DMEUXLSS.js";
+import "./chunk-UXEO7E3V.js";
 import {
   buildScheduledTaskRunPrompt,
   normalizeChannelDeliveryText,
   scheduledTaskRunSessionName,
   scheduledTaskRunSourceId
-} from "./chunk-G37O7YO6.js";
+} from "./chunk-ZAWM6KRF.js";
 import {
   normalizeSessionIdForLookup,
   parseCallerSuppliedSessionId
@@ -154,28 +155,38 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-WXPPUPHM.js";
+} from "./chunk-KWFFJ6AK.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-GNY7B3CA.js";
+} from "./chunk-FUQK5ZNL.js";
 import {
   readVoiceModel
-} from "./chunk-NB3NDQQK.js";
+} from "./chunk-J6SBP5G2.js";
 import "./chunk-Y53DG2HA.js";
-import "./chunk-5OZUKLL7.js";
-import "./chunk-4WMGYG3F.js";
+import {
+  mapSkillConfigToStatus
+} from "./chunk-BHTYRHJF.js";
+import {
+  resolveSkillSettings
+} from "./chunk-HWVUSYSN.js";
+import "./chunk-6HI2I3OM.js";
+import {
+  createLoadedSettingsAdapter
+} from "./chunk-IUN5ZMFY.js";
+import "./chunk-QSMQKTXV.js";
+import "./chunk-22FWWGSM.js";
 import "./chunk-JS73NNWF.js";
 import {
   SCHEDULED_TASK_RUN_SOURCE_TYPE
-} from "./chunk-QTB4VP4K.js";
+} from "./chunk-CBGHRAWM.js";
 import "./chunk-7U5G6JXI.js";
 import "./chunk-WCCLLK7X.js";
 import "./chunk-OCPBI7J5.js";
 import {
   ndJsonStream
-} from "./chunk-KA5HR3G2.js";
+} from "./chunk-YKM6MITI.js";
 import {
   PERSIST_REASONING_SELECTION_META_KEY,
   REASONING_EFFORT_DEFAULT,
@@ -192,7 +203,7 @@ import {
   isReasoningSelectionSupported,
   parseReasoningSelection,
   resolvePersistedReasoningConfigState
-} from "./chunk-ZN5TKAVR.js";
+} from "./chunk-E5LTUWKZ.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -201,10 +212,7 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-7LTCFO6T.js";
-import {
-  mapSkillConfigToStatus
-} from "./chunk-BHTYRHJF.js";
+} from "./chunk-LQBAFO5D.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -212,23 +220,14 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-FETY36NQ.js";
-import {
-  resolveSkillSettings
-} from "./chunk-HWVUSYSN.js";
-import "./chunk-7PD7ZMX5.js";
-import "./chunk-G3ZUMSFS.js";
-import "./chunk-TODNHE76.js";
+} from "./chunk-HGEUHUEV.js";
+import "./chunk-K3U6VB3O.js";
+import "./chunk-MUFGTWQH.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-ULZECEIP.js";
-import "./chunk-PFKGV6PO.js";
-import "./chunk-AUTUFD5X.js";
+import "./chunk-LDQHA6L4.js";
+import "./chunk-465USTVK.js";
+import "./chunk-ABNX6E6K.js";
 import "./chunk-V6WHFGST.js";
-import {
-  createLoadedSettingsAdapter
-} from "./chunk-QHLHE2OT.js";
-import "./chunk-JYGIJA4W.js";
-import "./chunk-N6VQ37ZZ.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_HEARTBEAT_META_KEY,
@@ -247,6 +246,7 @@ import {
   DAEMON_PERMISSION_CANCEL_REASON_META_KEY,
   DAEMON_PROMPT_DISPLAY_TEXT_META_KEY,
   DAEMON_RESTORE_ASK_USER_QUESTION_META_KEY,
+  DAEMON_SUBMITTED_PROMPT_META_KEY,
   DAEMON_SUPPRESS_RESTORE_ASK_USER_QUESTION_META_KEY,
   DAEMON_SUPPRESS_WORKTREE_CONTEXT_RESTORE_META_KEY,
   LOAD_REPLAY_BULK_MODE,
@@ -262,12 +262,14 @@ import {
   REQUESTED_SESSION_ID_META_KEY,
   SESSION_INITIALIZATION_DEADLINE_META_KEY,
   SESSION_INITIALIZATION_TIMEOUT_ERROR_KIND,
+  SESSION_MODEL_PERSIST_DEFAULT_META_KEY,
+  SUBMITTED_PROMPT_META_KEY,
   TODO_STOP_GUARD_CONTINUATION_CLAIM_METHOD,
   TODO_STOP_GUARD_QUEUE_RELEASE_METHOD,
   WORKTREE_MCP_DEFER_META_KEY,
   clampActiveWorkIntervalMs,
   isValidTrustedModelPrompt
-} from "./chunk-PSPAM24S.js";
+} from "./chunk-TBSCTWKF.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -275,12 +277,12 @@ import {
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-STUJ7IMZ.js";
-import "./chunk-DARWOZY6.js";
 import "./chunk-GYTKQYDB.js";
-import "./chunk-ALMR3E6Q.js";
+import "./chunk-WD6YQI5M.js";
+import "./chunk-GDWE23OR.js";
 import "./chunk-RKFGE7JH.js";
+import "./chunk-CJ3DHN5I.js";
 import "./chunk-UDG5EZJI.js";
-import "./chunk-M5GB774H.js";
 import {
   EXTERNAL_TOOL_GUARD_READY_META_KEY,
   EXTERNAL_TOOL_GUARD_REQUIRED_VALUE,
@@ -290,21 +292,22 @@ import {
   SHELL_EXECUTING_TOOL_NAMES,
   isValidExternalToolGuardDenialReason
 } from "./chunk-3VUENPWF.js";
-import "./chunk-TGNNLRC3.js";
+import "./chunk-M5GB774H.js";
+import "./chunk-NFXXBWSE.js";
+import "./chunk-LWWRJRCD.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS,
   CHANNEL_PROMPT_META_KEY
-} from "./chunk-WDVV3LRM.js";
+} from "./chunk-EPVEPTI3.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
   RequestError
-} from "./chunk-IW6RQPQB.js";
-import "./chunk-NFXXBWSE.js";
+} from "./chunk-IJOS26LH.js";
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-RNAJVXUG.js";
+} from "./chunk-ENAUXRPG.js";
 import {
   deleteNestedPropertySafe,
   getOutputLanguageFilePath,
@@ -316,18 +319,13 @@ import {
   settingExistsInScope,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-WBU2PIZ5.js";
-import "./chunk-XSOXPG2L.js";
+} from "./chunk-CSDKDHWV.js";
+import "./chunk-XE46RQFI.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-BW4333PP.js";
-import {
-  getSystemDefaultsPath,
-  getSystemSettingsPath
-} from "./chunk-IDS7MSUP.js";
 import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-CRZBDVP2.js";
+} from "./chunk-432JQKIO.js";
 import {
   SUPPORTED_LANGUAGES
 } from "./chunk-5EJZE3FP.js";
@@ -335,19 +333,26 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-5BH2AIEY.js";
+} from "./chunk-RUE62UH6.js";
+import "./chunk-N6VQ37ZZ.js";
+import "./chunk-BW4333PP.js";
+import {
+  getSystemDefaultsPath,
+  getSystemSettingsPath
+} from "./chunk-IDS7MSUP.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD,
   QWEN_CODE_SERVE_ENV
-} from "./chunk-QTNCGZHQ.js";
+} from "./chunk-XX5HQLCZ.js";
+import "./chunk-XFSFZCM5.js";
 import "./chunk-2EAZ43JQ.js";
 import "./chunk-NF5J2WFA.js";
-import "./chunk-MV5DTLJV.js";
+import "./chunk-OHCR4O3U.js";
 import "./chunk-W3N5XAZ6.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-NX7ZTXFF.js";
+} from "./chunk-JSKEW4E7.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import {
@@ -359,6 +364,7 @@ import {
   McpTransportPool,
   TURN_INTERRUPTION_HISTORY_TAIL_COUNT,
   WorkspaceMcpBudget,
+  abortGoalForStopHookCap,
   applyProviderInstallPlan,
   buildBtwCacheSafeParams,
   buildBtwPrompt,
@@ -371,32 +377,20 @@ import {
   findApiRewindCutPoint,
   generatePromptSuggestion,
   generateSessionRecap,
+  getStopHookContinuationReason,
   projectGoalStateToLegacy,
   readManyFiles,
   runManagedRememberByAgent,
   subagentGenerator
-} from "./chunk-GOEVQADN.js";
+} from "./chunk-GDIPPCW6.js";
 import {
   buildToolWriteOriginMeta
 } from "./chunk-GELRJXE2.js";
 import "./chunk-32CM56LO.js";
-import {
-  MAX_RETAINED_SNAPSHOTS,
-  deleteWorkflowSnapshot,
-  extractAndStripMeta,
-  listSavedWorkflows,
-  listWorkflowSnapshots,
-  resolveSavedWorkflowScript,
-  toSnapshot
-} from "./chunk-OXR34GCD.js";
-import "./chunk-XFSFZCM5.js";
 import {
   CreateSubSessionTool
-} from "./chunk-2EKVPSIJ.js";
+} from "./chunk-D754KKNZ.js";
 import "./chunk-LJZSMWOH.js";
-import {
-  restoreWorktreeContext
-} from "./chunk-YZTGGCEE.js";
 import {
   ALL_PROVIDERS,
   buildInstallPlan,
@@ -405,21 +399,29 @@ import {
   getDefaultBaseUrlForProtocol,
   getDefaultModelIds,
   resolveBaseUrl
-} from "./chunk-2WC3Y7YY.js";
-import "./chunk-IWABUX6T.js";
+} from "./chunk-AEY27Z35.js";
+import "./chunk-MFQWRBFB.js";
+import "./chunk-4O2AXZXU.js";
+import "./chunk-5CZMWDJI.js";
+import {
+  restoreWorktreeContext
+} from "./chunk-H3TFIFX3.js";
+import "./chunk-GX5FF2IE.js";
 import "./chunk-DJXSOEFB.js";
-import "./chunk-YQGW3M6Z.js";
-import "./chunk-J3VZF2AL.js";
-import "./chunk-OWCFKIFQ.js";
-import "./chunk-ZPJWUGCS.js";
-import "./chunk-X7LFJF5D.js";
+import "./chunk-VGBOJH2D.js";
 import "./chunk-BUQN5LTI.js";
+import "./chunk-ZPJWUGCS.js";
+import "./chunk-YM6KUQ2S.js";
 import {
-  clearCachedCredentialFile,
-  qwenOAuth2Events
-} from "./chunk-XDNFODER.js";
-import "./chunk-GOKAOSCN.js";
-import "./chunk-VNOVK4I7.js";
+  MAX_RETAINED_SNAPSHOTS,
+  deleteWorkflowSnapshot,
+  extractAndStripMeta,
+  listSavedWorkflows,
+  listWorkflowSnapshots,
+  resolveSavedWorkflowScript,
+  toSnapshot
+} from "./chunk-IILWL3KY.js";
+import "./chunk-BRFOZEPA.js";
 import {
   APPROVAL_MODE_INFO,
   BranchPointInvalidError,
@@ -461,10 +463,11 @@ import {
   SessionWriterUnavailableError,
   TURN_RESULT_CODE_TEXT_TRUNCATED,
   TURN_RESULT_TEXT_MAX_CHARS,
-  abortGoalForStopHookCap,
+  ToolMode,
   acquireSleepInhibitor,
   ambientGoalToolResultProvenance,
   applyAutoModeDecision,
+  applyPendingGoalProposal,
   approxBase64Bytes,
   bridgeToolResultImages,
   buildBackgroundEntryLabel,
@@ -496,9 +499,10 @@ import {
   firePostToolUseHook,
   firePreToolUseHook,
   formatDenialStateLog,
+  formatProposeGoalRecoveryFailed,
+  formatProposeGoalRecoveryNotStarted,
   formatStopHookBlockingCapWarning,
   generateToolUseId,
-  getActiveGoal,
   getAutoModeActionFingerprint,
   getAutoModePermissionDeniedReason,
   getEffectivePermissionForConfirmation,
@@ -507,7 +511,6 @@ import {
   getOptInToolNotFoundMessage,
   getProviderToolCallId,
   getScopedEnvContents,
-  getStopHookContinuationReason,
   getSubagentSessionDir,
   getToolCallRepeatKey,
   getWorkflowTaskMutationKey,
@@ -516,6 +519,7 @@ import {
   ideContextStore,
   injectPermissionRulesIfMissing,
   isApproveOutcome,
+  isCodeModeToolCallAllowed,
   isCompressionFailureStatus,
   isDenialFallbackReason,
   isGatedMcpScope,
@@ -558,49 +562,39 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-HJ5UJQQL.js";
+} from "./chunk-2UKKQGRA.js";
 import "./chunk-GOFAQQZA.js";
-import "./chunk-65I7S4Z3.js";
 import "./chunk-6HUXPLB5.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
-import "./chunk-XKBFYTCD.js";
-import "./chunk-LYT2OU7D.js";
+import "./chunk-65I7S4Z3.js";
 import "./chunk-7CLLH5TI.js";
-import "./chunk-HIXUUCGY.js";
+import "./chunk-XKBFYTCD.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
 import {
   RUNTIME_SNAPSHOT_PREFIX
-} from "./chunk-565U2ANU.js";
+} from "./chunk-ZTTC7T4X.js";
 import {
   SESSION_ARTIFACT_PERSISTENCE_VERSION,
   normalizeEventPayload,
   normalizeSnapshotPayload,
   wrapUserPromptSubmitContext
-} from "./chunk-GSFV5RQW.js";
+} from "./chunk-EYN3G5XD.js";
+import "./chunk-IXXV6BVB.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-F53KKZUD.js";
-import "./chunk-TRWQQBVH.js";
-import "./chunk-QJNDUTOL.js";
-import "./chunk-N6S3NUYJ.js";
+import {
+  isValidCronTaskRoutingId
+} from "./chunk-3LMDSCLU.js";
 import {
   promptIdContext,
   todoWorkChainContext
 } from "./chunk-O6GEWCJA.js";
-import {
-  escapeJsonTagCharacters
-} from "./chunk-CHEIIBT3.js";
-import "./chunk-QAZ2MGYT.js";
-import "./chunk-QQK4L3UU.js";
-import "./chunk-CH2YDT6X.js";
-import {
-  APPROVAL_MODES
-} from "./chunk-JX6XHPTX.js";
+import "./chunk-RPMXMR6U.js";
 import {
   AgentOutputMessageCapture,
   addAgentInputMessageAttributes,
@@ -608,44 +602,79 @@ import {
   addToolCallResultAttributes,
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor
-} from "./chunk-CLKE4IY3.js";
+} from "./chunk-2SZH22YO.js";
+import "./chunk-YGCTOXUT.js";
+import "./chunk-QJNDUTOL.js";
+import "./chunk-55VOWZ4C.js";
+import "./chunk-LT2XFADM.js";
+import {
+  SessionSourceError,
+  SessionSourceService
+} from "./chunk-ELRMZTPF.js";
+import "./chunk-U6H3XTFA.js";
+import "./chunk-ACHCT36C.js";
+import {
+  escapeJsonTagCharacters
+} from "./chunk-CHEIIBT3.js";
+import "./chunk-W7JJLUSB.js";
+import {
+  registerSession
+} from "./chunk-OWUAZXXN.js";
+import "./chunk-CH2YDT6X.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-JX6XHPTX.js";
 import "./chunk-ZSTCM3MX.js";
-import "./chunk-SOA4HKRJ.js";
 import "./chunk-MLXTMF7H.js";
 import {
   getArenaSystemReminder,
   getOutputStyleTurnReminder,
   getPlanModeSystemReminder,
   resolveMainSessionOutputStyle
-} from "./chunk-3LPJ776W.js";
+} from "./chunk-63GQZKXL.js";
 import "./chunk-3CZ2BQV6.js";
-import "./chunk-PQEISIKS.js";
-import "./chunk-S5QR6CB5.js";
+import "./chunk-SAH4BD2J.js";
+import "./chunk-CAAMI77K.js";
 import {
   runWithRuntimeContentGenerator
-} from "./chunk-H3Q3RSKZ.js";
+} from "./chunk-ZFIWHBJ3.js";
 import "./chunk-S6LOFUVP.js";
+import {
+  FORK_SUBAGENT_TYPE,
+  isSystemReminderContent,
+  wrapSystemReminder
+} from "./chunk-RF5RQRTD.js";
+import "./chunk-6GDELAVL.js";
+import {
+  HookEventName,
+  createHookOutput
+} from "./chunk-G6UUOCUT.js";
+import "./chunk-IZ2U57NY.js";
+import "./chunk-C5CECJ46.js";
+import "./chunk-K2OJUPOE.js";
+import {
+  clearCachedCredentialFile,
+  qwenOAuth2Events
+} from "./chunk-TUIW5LLK.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-OFVAS4AR.js";
-import "./chunk-HNLMYDQE.js";
+import "./chunk-NWDPOFJI.js";
+import "./chunk-33LYAC4R.js";
 import "./chunk-QHMLYMMS.js";
+import "./chunk-VNOVK4I7.js";
 import {
   getToolCallPreparations
 } from "./chunk-CFKIH3D3.js";
-import {
-  REASONING_EFFORT_TIERS,
-  getGptReasoningCapabilities,
-  parseModelReasoningCapabilities
-} from "./chunk-VBLAI2HA.js";
+import "./chunk-JL6APGBX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-4ALNJDHL.js";
-import "./chunk-NOO4QFXM.js";
+import "./chunk-RSGEAWFJ.js";
+import "./chunk-VGY2RGXL.js";
+import "./chunk-C75BXMPM.js";
 import "./chunk-KFFCDLKV.js";
 import {
   addDaemonRequestAttribute,
   extractDaemonTraceContext,
   withDaemonSpan
-} from "./chunk-7OCIQNKX.js";
+} from "./chunk-ZW2EUO2A.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -671,7 +700,7 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-F2NYVASI.js";
+} from "./chunk-WXAWG3JS.js";
 import {
   INVOCATION_CONTEXT_META_KEY,
   PRIVATE_ACP_CAPABILITY_ENV,
@@ -680,18 +709,28 @@ import {
   parseInvocationContext,
   runWithInvocationContext
 } from "./chunk-5ETULJLP.js";
-import "./chunk-XBVNNDPK.js";
+import "./chunk-ZHKTKHMO.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAllMemoryFilenames,
   getSpecificMimeType
-} from "./chunk-J6MB5ZHZ.js";
+} from "./chunk-QZW6WRB7.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
 } from "./chunk-EDIDYZBT.js";
 import "./chunk-HD7O6WLV.js";
+import {
+  extractCodeModeImageContent,
+  runWithToolCallRuntime,
+  runWithoutToolCallRuntime
+} from "./chunk-CFMZLE3L.js";
 import "./chunk-WZAD4ZNJ.js";
+import {
+  REASONING_EFFORT_TIERS,
+  getGptReasoningCapabilities,
+  parseModelReasoningCapabilities
+} from "./chunk-3FPYT6QC.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
@@ -700,11 +739,12 @@ import "./chunk-TIGXX4PA.js";
 import {
   hasVertexProjectConfigured,
   preloadContentGenerator
-} from "./chunk-JO77FGNZ.js";
+} from "./chunk-SDUIETBG.js";
 import "./chunk-XFFRI3WM.js";
 import {
   AuthType
-} from "./chunk-4HOEU2OR.js";
+} from "./chunk-ERU3SDXT.js";
+import "./chunk-EWJTAP3Y.js";
 import "./chunk-HHJLM3WQ.js";
 import {
   endToolExecutionSpan,
@@ -716,20 +756,9 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-7VEYUF3N.js";
+} from "./chunk-W5ZQMAEM.js";
 import "./chunk-74TONY4F.js";
-import "./chunk-E6TI726I.js";
-import {
-  FORK_SUBAGENT_TYPE,
-  isSystemReminderContent,
-  wrapSystemReminder
-} from "./chunk-4VY3ITHR.js";
-import "./chunk-O2FEO2CB.js";
-import {
-  HookEventName,
-  createHookOutput
-} from "./chunk-G6UUOCUT.js";
-import "./chunk-IZ2U57NY.js";
+import "./chunk-DGC7BKEZ.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -737,7 +766,7 @@ import {
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-MWIO7MF6.js";
+} from "./chunk-2WSLXP3W.js";
 import {
   Storage,
   createDebugLogger,
@@ -746,20 +775,23 @@ import {
   isSubpath,
   sessionIdContext
 } from "./chunk-ZAFYHRVY.js";
-import "./chunk-CMWU6P4D.js";
-import "./chunk-HRPFBHW7.js";
+import "./chunk-TBWQLLFO.js";
+import "./chunk-IRJRB3OD.js";
+import "./chunk-V5U2NZNJ.js";
+import "./chunk-TPKQIA7G.js";
 import {
+  registerCleanup,
   runExitCleanup
-} from "./chunk-DAI65CMX.js";
+} from "./chunk-FJZWRNEW.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
 } from "./chunk-7FA2II6K.js";
+import "./chunk-UKMWZ5NS.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
 import "./chunk-MATEIJZF.js";
-import "./chunk-TBWQLLFO.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -770,7 +802,7 @@ import {
 // packages/cli/src/acp-integration/acpAgent.ts
 init_esbuild_shims();
 import { randomUUID as randomUUID2, timingSafeEqual } from "node:crypto";
-import { performance } from "node:perf_hooks";
+import { performance as performance2 } from "node:perf_hooks";
 import { isDeepStrictEqual } from "node:util";
 
 // packages/cli/src/acp-integration/authMethods.ts
@@ -785,6 +817,15 @@ function buildAuthMethods() {
         type: "terminal",
         args: ["--auth-type=openai"]
       }
+    },
+    {
+      id: "openai-responses" /* USE_OPENAI_RESPONSES */,
+      name: "Use OpenAI Responses API key",
+      description: "Requires setting the `OPENAI_API_KEY` environment variable",
+      _meta: {
+        type: "terminal",
+        args: ["--auth-type=openai-responses"]
+      }
     }
   ];
 }
@@ -1793,7 +1834,6 @@ var MessageEmitter = class extends BaseEmitter {
    * @param stopHookCount - Number of Stop hooks that were executed
    */
   async emitStopHookLoop(iterationCount, reasons, stopHookCount) {
-    const activeGoal = getActiveGoal(this.sessionId);
     await this.sendUpdate({
       sessionUpdate: "agent_message_chunk",
       content: { type: "text", text: "" },
@@ -1801,15 +1841,7 @@ var MessageEmitter = class extends BaseEmitter {
         stopHookLoop: {
           iterationCount,
           reasons,
-          stopHookCount,
-          ...activeGoal ? {
-            goal: {
-              condition: activeGoal.condition,
-              iterations: activeGoal.iterations,
-              setAt: activeGoal.setAt,
-              lastReason: activeGoal.lastReason
-            }
-          } : {}
+          stopHookCount
         }
       }
     });
@@ -2140,6 +2172,12 @@ function buildPermissionRequestContent(confirmation) {
       }
     });
   }
+  if (confirmation.type === "info" && confirmation.renderPromptAsPlainText) {
+    content.push({
+      type: "content",
+      content: { type: "text", text: confirmation.prompt }
+    });
+  }
   return content;
 }
 __name(buildPermissionRequestContent, "buildPermissionRequestContent");
@@ -3275,6 +3313,7 @@ var MAX_RETAINED_SESSION_ROUTE_COUNTS = 8;
 var USER_CANCEL_ABORT_REASON = "qwen:user-cancel";
 var NEW_PROMPT_ABORT_REASON = "qwen:new-prompt";
 var SESSION_DISPOSE_ABORT_REASON = "qwen:session-dispose";
+var GOAL_HELD_RECOVERY_COMMANDS = "Run:\n/goal pause\nThen, when ready:\n/goal resume";
 var DAEMON_RETRY_META_KEY = "qwen.daemon.retry";
 var DAEMON_CONTINUE_META_KEY = "qwen.daemon.continueLastTurn";
 var MAX_DAEMON_ATTACHMENT_REFERENCES = 256;
@@ -4169,6 +4208,7 @@ var Session = class {
     __name(this, "Session");
   }
   pendingPrompt = null;
+  activeGoalProposalTurn;
   /**
    * Tracks the completion of the current prompt so that the next prompt
    * can await it.  This prevents a new prompt from reading chat history
@@ -4186,6 +4226,7 @@ var Session = class {
    */
   followupAbort = null;
   turn = 0;
+  codeModeNestedSequence = 0;
   refreshContextFilesOnWrite = false;
   activeTodoWorkChainPromptId;
   createdAt = Date.now();
@@ -4263,6 +4304,7 @@ var Session = class {
   backgroundNotificationAcceptances = /* @__PURE__ */ new Map();
   activeNotificationAcceptances = /* @__PURE__ */ new Set();
   goalQueue = [];
+  heldGoalProposal;
   goalProcessing = false;
   activeGoalTurn;
   goalHostUnbind;
@@ -4372,6 +4414,9 @@ var Session = class {
       this.goalRuntimeUnsubscribe = runtime.subscribe((snapshot, cause) => {
         const previousGoal = this.lastGoalSnapshot?.goal ?? null;
         this.lastGoalSnapshot = snapshot;
+        if (this.heldGoalProposal && (snapshot.goal?.goalId !== this.heldGoalProposal.goalId || snapshot.goal.revision !== this.heldGoalProposal.revision || snapshot.goal.status !== "active" || cause === "resume")) {
+          this.heldGoalProposal = void 0;
+        }
         void this.#queueGoalState(snapshot, cause, previousGoal).catch(
           (error) => debugLogger6.warn(
             `Failed to emit ACP Goal state: ${error instanceof Error ? error.message : String(error)}`
@@ -4557,6 +4602,10 @@ var Session = class {
     if (this.disposed || this.closing || this.goalProcessing || this.pendingPrompt || this.pendingPromptCompletion || this.cronProcessing || this.cronAbortController || this.notificationProcessing || this.notificationAbortController || this.#isAutomaticWorkHeld()) {
       return;
     }
+    const next = this.goalQueue[0];
+    if (this.heldGoalProposal && next?.permit.goalId === this.heldGoalProposal.goalId && next.permit.revision === this.heldGoalProposal.revision) {
+      return;
+    }
     const turn = this.goalQueue.shift();
     if (!turn) return;
     this.goalProcessing = true;
@@ -5965,10 +6014,9 @@ var Session = class {
     this.todoStopGuard.blockUntilOrdinaryPromptStarts();
     const rewindFiles = opts?.rewindFiles !== false;
     const fileHistoryService = this.config.getFileHistoryService();
-    const survivingSnapshots = rewindFiles ? fileHistoryService.getSnapshots().slice(0, targetTurnIndex + 1) : void 0;
-    if (survivingSnapshots) {
-      fileHistoryService.restoreFromSnapshots(survivingSnapshots);
-    }
+    const snapshotsBeforeRewind = fileHistoryService.getSnapshots();
+    const survivingSnapshots = rewindFiles ? snapshotsBeforeRewind.slice(0, targetTurnIndex + 1) : snapshotsBeforeRewind.slice(0, targetTurnIndex);
+    fileHistoryService.restoreFromSnapshots(survivingSnapshots);
     this.config.getChatRecordingService()?.rewindRecording(
       targetTurnIndex,
       { truncatedCount: Math.max(0, apiHistory.length - apiTruncateIndex) },
@@ -6081,6 +6129,17 @@ var Session = class {
       );
     }
     const turnRecording = this.#beginTurnRecording(params, invocationContext);
+    const recordAdmissionCancellation = /* @__PURE__ */ __name(() => {
+      if (turnRecording) turnRecording.cancelledAt ??= Date.now();
+    }, "recordAdmissionCancellation");
+    admissionCancellation?.addEventListener(
+      "abort",
+      recordAdmissionCancellation,
+      {
+        once: true
+      }
+    );
+    if (admissionCancellation?.aborted) recordAdmissionCancellation();
     try {
       const result = await this.#promptWithTurnRecording(
         params,
@@ -6090,7 +6149,7 @@ var Session = class {
         scheduledGoalTurn,
         turnRecording
       );
-      this.#settleTurnRecording(
+      await this.#settleTurnRecording(
         result.stopReason === "cancelled" ? "cancelled" : "completed",
         turnRecording,
         result
@@ -6102,11 +6161,16 @@ var Session = class {
       const controlledAbort = abortReason === USER_CANCEL_ABORT_REASON || abortReason === SESSION_DISPOSE_ABORT_REASON || abortReason === NEW_PROMPT_ABORT_REASON && this.#isAbortError(error);
       if (controlledAbort) {
         const result = { stopReason: "cancelled" };
-        this.#settleTurnRecording("cancelled", turnRecording, result);
+        await this.#settleTurnRecording("cancelled", turnRecording, result);
         return result;
       }
-      this.#settleTurnRecording("error", turnRecording, void 0, error);
+      await this.#settleTurnRecording("error", turnRecording, void 0, error);
       throw error;
+    } finally {
+      admissionCancellation?.removeEventListener(
+        "abort",
+        recordAdmissionCancellation
+      );
     }
   }
   async #promptWithTurnRecording(params, invocationContext, admissionCancellation, modelPrompt, scheduledGoalTurn, turnRecording) {
@@ -6154,7 +6218,17 @@ var Session = class {
     if (!goalTurn) {
       try {
         const runtime = this.config.getGoalRuntime();
-        if (runtime.getSnapshot().goal?.status === "active") {
+        const activeGoal = runtime.getSnapshot().goal;
+        const heldGoalMatches = this.heldGoalProposal?.goalId === activeGoal?.goalId && this.heldGoalProposal?.revision === activeGoal?.revision;
+        if (activeGoal?.status === "active" && heldGoalMatches) {
+          for (const queued of this.goalQueue.splice(0)) {
+            queued.controller.abort(NEW_PROMPT_ABORT_REASON);
+            await runtime.releaseTurn(queued.turnKey, { requeue: false });
+          }
+          await this.messageEmitter.emitAgentMessage(
+            `Automatic Goal execution is still held. ${GOAL_HELD_RECOVERY_COMMANDS}`
+          );
+        } else if (activeGoal?.status === "active") {
           reservedGoalRuntime = runtime;
           reservedGoalTurnKey = `goal-user:${randomUUID()}`;
           runtime.beginTurn(reservedGoalTurnKey);
@@ -6170,6 +6244,14 @@ var Session = class {
     this.pendingPrompt?.abort(NEW_PROMPT_ABORT_REASON);
     const pendingSend = goalTurn?.controller ?? new AbortController();
     if (turnRecording) turnRecording.abortController = pendingSend;
+    const recordCancellation = /* @__PURE__ */ __name(() => {
+      if (turnRecording && pendingSend.signal.reason === USER_CANCEL_ABORT_REASON) {
+        turnRecording.cancelledAt ??= Date.now();
+      }
+    }, "recordCancellation");
+    pendingSend.signal.addEventListener("abort", recordCancellation, {
+      once: true
+    });
     const cancelPendingSend = /* @__PURE__ */ __name(() => pendingSend.abort(USER_CANCEL_ABORT_REASON), "cancelPendingSend");
     if (admissionCancellation) {
       admissionCancellation.addEventListener("abort", cancelPendingSend, {
@@ -6180,6 +6262,7 @@ var Session = class {
     this.pendingPrompt = pendingSend;
     const releasePendingSend = /* @__PURE__ */ __name(() => {
       admissionCancellation?.removeEventListener("abort", cancelPendingSend);
+      pendingSend.signal.removeEventListener("abort", recordCancellation);
       if (this.pendingPrompt === pendingSend) {
         this.pendingPrompt = null;
       }
@@ -6332,6 +6415,11 @@ var Session = class {
         }
       } : result;
       promptResult = completedResult;
+      const proposalTurn = responseCapture.goalProposalTurn;
+      if (proposalTurn) {
+        proposalTurn.completedNormally = completedResult.stopReason === "end_turn" && !pendingSend.signal.aborted && proposalTurn.settlementBlocked !== true;
+      }
+      await this.#settleGoalProposal(responseCapture);
       releasePendingSend();
       void this.#drainCronQueue();
       void this.#drainNotificationQueue();
@@ -6359,6 +6447,23 @@ var Session = class {
       rejectedByLoopProtection = isLoopDetectedTurnError(error);
       throw error;
     } finally {
+      const proposalTurn = responseCapture.goalProposalTurn;
+      if (proposalTurn) {
+        this.config.takePendingGoalProposal(proposalTurn.turnKey);
+        if (this.activeGoalProposalTurn === proposalTurn) {
+          this.activeGoalProposalTurn = void 0;
+        }
+      }
+      if (this.config.getGoalProposalHostSupported() && this.config.setGoalProposalTurnKey(void 0)) {
+        try {
+          await this.config.getLlmClient().setTools();
+        } catch (error) {
+          debugLogger6.warn(
+            "Failed to refresh Goal proposal availability",
+            error
+          );
+        }
+      }
       const stillOwnsPendingPrompt = this.pendingPrompt === pendingSend;
       releasePendingSend();
       const shouldDrainAutomaticQueues = (
@@ -6370,7 +6475,7 @@ var Session = class {
       if (stillOwnsPendingPrompt) {
         this.todoStopGuardDrainAutomaticQueuesWhenIdle = false;
       }
-      if (shouldDrainAutomaticQueues) {
+      if (shouldDrainAutomaticQueues || stillOwnsPendingPrompt) {
         void this.#drainCronQueue();
         void this.#drainNotificationQueue();
       }
@@ -6540,6 +6645,70 @@ var Session = class {
     ), "execute");
     return goalTurn ? goalTurnContext.run(goalTurn.permit, execute) : goalTurnContext.exit(execute);
   }
+  async #settleGoalProposal(capture) {
+    const turn = capture.goalProposalTurn;
+    if (!turn) return;
+    const proposal = this.config.takePendingGoalProposal(turn.turnKey);
+    if (!proposal) return;
+    const ownsTurn = /* @__PURE__ */ __name(() => turn.completedNormally && !turn.controller.signal.aborted && this.pendingPrompt === turn.controller && this.activeGoalProposalTurn === turn && !this.disposed && !this.closing, "ownsTurn");
+    if (!ownsTurn()) {
+      if (!this.disposed && !this.closing) {
+        await this.messageEmitter.emitAgentMessage(
+          formatProposeGoalRecoveryNotStarted(proposal.objective)
+        );
+      }
+      return;
+    }
+    try {
+      const runtime = await this.config.getGoalRuntimeReady();
+      if (!ownsTurn()) {
+        if (!this.disposed && !this.closing) {
+          await this.messageEmitter.emitAgentMessage(
+            formatProposeGoalRecoveryNotStarted(proposal.objective)
+          );
+        }
+        return;
+      }
+      const result = await applyPendingGoalProposal(runtime, proposal);
+      if (result.applied && (!ownsTurn() || proposal.approvalSignal?.aborted)) {
+        try {
+          await runtime.dispatch({
+            action: "pause",
+            expectedGoalId: result.goal.goalId,
+            expectedRevision: result.goal.revision,
+            reason: this.closing || this.disposed ? GOAL_PAUSE_REASON_SESSION_DISPOSED : GOAL_PAUSE_REASON_USER_INTERRUPT
+          });
+        } catch (error) {
+          const current = runtime.getSnapshot().goal;
+          if (current?.goalId === result.goal.goalId && current.revision === result.goal.revision && current.status === "active") {
+            this.heldGoalProposal = {
+              goalId: current.goalId,
+              revision: current.revision
+            };
+            debugLogger6.warn(
+              "Failed to pause the cancelled Goal proposal",
+              error
+            );
+            await this.messageEmitter.emitAgentMessage(
+              `The Goal was created, but its cancellation could not be saved. Automatic execution is held in this session. ${GOAL_HELD_RECOVERY_COMMANDS}`
+            );
+          }
+        }
+      } else if (!result.applied) {
+        debugLogger6.debug(
+          `Dropping an approved Goal proposal: ${result.reason}`
+        );
+        await this.messageEmitter.emitAgentMessage(
+          result.kind === "changed" ? result.reason : formatProposeGoalRecoveryFailed(proposal.objective)
+        );
+      }
+    } catch (error) {
+      debugLogger6.warn("Failed to apply an approved Goal proposal", error);
+      await this.messageEmitter.emitAgentMessage(
+        formatProposeGoalRecoveryFailed(proposal.objective)
+      );
+    }
+  }
   async #executePromptInner(params, pendingSend, responseCapture, modelPrompt, rejectOnLoopDetected = false, goalTurn, channelTurn = false) {
     let managedMemoryRecallStarted = false;
     return Storage.runWithRuntimeBaseDir(
@@ -6552,6 +6721,19 @@ var Session = class {
         }
         this.turn += 1;
         const promptId = this.config.getSessionId() + "########" + this.turn;
+        if (!goalTurn && !channelTurn && params._meta?.["qwen.goalProposalApproval"] === true) {
+          responseCapture.goalProposalTurn = {
+            turnKey: promptId,
+            controller: pendingSend,
+            completedNormally: false
+          };
+          this.activeGoalProposalTurn = responseCapture.goalProposalTurn;
+        }
+        if (this.config.getGoalProposalHostSupported() && this.config.setGoalProposalTurnKey(
+          responseCapture.goalProposalTurn?.turnKey
+        )) {
+          await this.config.getLlmClient().setTools();
+        }
         const daemonPromptId = getInvocationContext()?.promptId;
         const promptMetadata = params._meta;
         const continuesCurrentWorkChain = params.retry === true || promptMetadata?.[DAEMON_RETRY_META_KEY] === true || promptMetadata?.[DAEMON_CONTINUE_META_KEY] === true || promptMetadata?.[DAEMON_RESTORE_ASK_USER_QUESTION_META_KEY] === true;
@@ -6569,6 +6751,8 @@ var Session = class {
             const promptText = params.prompt.filter((block) => block.type === "text").map((block) => block.type === "text" ? block.text : "").join(" ");
             const promptDisplayTextValue = promptMetadata?.[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
             const promptDisplayText = typeof promptDisplayTextValue === "string" ? promptDisplayTextValue : void 0;
+            const declaredSubmission = promptMetadata?.[DAEMON_SUBMITTED_PROMPT_META_KEY];
+            const submittedPrompt = typeof declaredSubmission === "string" ? declaredSubmission : "";
             const modelPromptBlocks = modelPrompt === void 0 ? params.prompt : [{ type: "text", text: modelPrompt }];
             logUserPrompt(
               this.config,
@@ -6751,13 +6935,15 @@ var Session = class {
             const messageBus = this.config.getMessageBus?.();
             const isRuntimeContinuation = goalTurn?.origin === "runtime";
             const isFreshUserTurn = !isRetry && !isContinue && !isRestoreAskUserQuestion && !isRuntimeContinuation;
+            const isUserSubmissionTurn = isFreshUserTurn && !channelTurn;
             if (!isContinue && !isRestoreAskUserQuestion && !isRuntimeContinuation && hooksEnabled && messageBus && this.config.hasHooksForEvent?.("UserPromptSubmit")) {
               const response = await messageBus.request(
                 {
                   type: "hook-execution-request" /* HOOK_EXECUTION_REQUEST */,
                   eventName: "UserPromptSubmit",
                   input: {
-                    prompt: promptText
+                    prompt: promptText,
+                    ...isUserSubmissionTurn && submittedPrompt.trim().length > 0 ? { submitted_prompt: submittedPrompt } : {}
                   },
                   signal: pendingSend.signal
                 },
@@ -7283,6 +7469,11 @@ ${this.pendingRecoveredAgentsNotice}
       modelOverride = model;
       return true;
     }, "onFullTurnModel");
+    const blockGoalProposalSettlement = /* @__PURE__ */ __name(() => {
+      if (responseCapture?.goalProposalTurn) {
+        responseCapture.goalProposalTurn.settlementBlocked = true;
+      }
+    }, "blockGoalProposalSettlement");
     let midTurnContinuationCount = 0;
     while (true) {
       if (this.pendingPrompt && this.pendingPrompt !== pendingSend) {
@@ -7296,6 +7487,7 @@ ${this.pendingRecoveredAgentsNotice}
         this.#clearTodoStopGuardTrustAndDrainAutomaticQueues();
       }
       if (this.todoStopGuardQueuedPromptPriority) {
+        blockGoalProposalSettlement();
         return { stopReason: "end_turn" };
       }
       if (this.todoStopGuard.needsStopInspection) {
@@ -7309,6 +7501,7 @@ ${this.pendingRecoveredAgentsNotice}
               pendingSend.signal
             );
             if (claim === "queued") {
+              blockGoalProposalSettlement();
               this.#preserveUnsentMessageHistory(
                 { role: "user", parts: drained.parts },
                 true
@@ -7320,6 +7513,7 @@ ${this.pendingRecoveredAgentsNotice}
             }
           }
           this.todoStopGuard.acceptMidTurnUserInput();
+          blockGoalProposalSettlement();
           const continuation2 = await this.#runStopContinuation(
             pendingSend,
             promptId + "_mid_turn_" + ++midTurnContinuationCount,
@@ -7347,6 +7541,7 @@ ${this.pendingRecoveredAgentsNotice}
             pendingSend.signal
           );
           if (claim === "queued") {
+            blockGoalProposalSettlement();
             return { stopReason: "end_turn" };
           }
           if (claim === "unavailable") {
@@ -7396,6 +7591,7 @@ ${this.pendingRecoveredAgentsNotice}
                 pendingSend.signal
               );
               if (claim === "queued") {
+                blockGoalProposalSettlement();
                 this.#preserveUnsentMessageHistory(
                   { role: "user", parts: drained.parts },
                   true
@@ -7407,6 +7603,7 @@ ${this.pendingRecoveredAgentsNotice}
               }
             }
             this.todoStopGuard.acceptMidTurnUserInput();
+            blockGoalProposalSettlement();
             const continuation2 = await this.#runStopContinuation(
               pendingSend,
               promptId + "_mid_turn_" + ++midTurnContinuationCount,
@@ -7434,6 +7631,7 @@ ${this.pendingRecoveredAgentsNotice}
               pendingSend.signal
             );
             if (claim === "queued") {
+              blockGoalProposalSettlement();
               return { stopReason: "end_turn" };
             }
             if (claim === "unavailable") {
@@ -7463,7 +7661,10 @@ ${this.pendingRecoveredAgentsNotice}
       const guardContinuation = guardDecision?.kind === "continue" ? guardDecision : null;
       if (guardDecision?.kind === "exhausted") {
         await this.#emitTodoStopGuardExhausted(guardDecision);
-        if (!externalReason) return { stopReason: "end_turn" };
+        if (!externalReason) {
+          blockGoalProposalSettlement();
+          return { stopReason: "end_turn" };
+        }
       }
       if (externalReason && stopHookIterationCount >= stopHookBlockingCap) {
         const warning = formatStopHookBlockingCapWarning(
@@ -7478,6 +7679,7 @@ ${this.pendingRecoveredAgentsNotice}
           await this.#pauseGoalForStopHookCap();
         }
         this.todoStopGuard.suspend();
+        blockGoalProposalSettlement();
         await this.messageEmitter.emitAgentMessage(warning);
         debugLogger6.warn(warning);
         return { stopReason: "end_turn" };
@@ -7550,6 +7752,12 @@ ${this.pendingRecoveredAgentsNotice}
         true
       );
     }, "preservePendingMessage");
+    const blockGoalProposalSettlement = /* @__PURE__ */ __name(() => {
+      const proposalTurn = options.responseCapture?.goalProposalTurn;
+      if (proposalTurn) {
+        proposalTurn.settlementBlocked = true;
+      }
+    }, "blockGoalProposalSettlement");
     while (nextMessage !== null) {
       if (this.pendingPrompt && this.pendingPrompt !== pendingSend) {
         preservePendingMessage(nextMessage);
@@ -7656,6 +7864,7 @@ ${this.pendingRecoveredAgentsNotice}
                 nextGuardContinuation = void 0;
                 if (!options.externalParts) {
                   preserveGuardOnSkippedSend = true;
+                  blockGoalProposalSettlement();
                   return { kind: "stop", stopReason: "end_turn" };
                 }
                 if (!initialSend && nextMessage) {
@@ -7674,6 +7883,7 @@ ${this.pendingRecoveredAgentsNotice}
                   guardForThisSend = void 0;
                   nextGuardContinuation = void 0;
                   preserveGuardOnSkippedSend = true;
+                  blockGoalProposalSettlement();
                   if (initialSend) {
                     supersededAutomaticContinuation = true;
                   }
@@ -7731,6 +7941,7 @@ ${this.pendingRecoveredAgentsNotice}
                   guardForThisSend = void 0;
                   nextGuardContinuation = void 0;
                   preserveGuardOnSkippedSend = true;
+                  blockGoalProposalSettlement();
                   if (initialSend) {
                     supersededAutomaticContinuation = true;
                   }
@@ -8213,8 +8424,21 @@ ${this.pendingRecoveredAgentsNotice}
       ...recordingService !== void 0 ? { recordingService } : {}
     };
   }
-  #settleTurnRecording(state, recording, response, error) {
+  async #settleTurnRecording(state, recording, response, error) {
     if (recording === null) return;
+    const cancelledAt = state === "cancelled" ? recording.cancelledAt : void 0;
+    if (cancelledAt !== void 0 && response) {
+      response._meta = {
+        ...response._meta,
+        "qwen.promptCancelled": {
+          cancelledAt,
+          elapsedMs: Math.max(
+            0,
+            cancelledAt - (recording.startedAt ?? cancelledAt)
+          )
+        }
+      };
+    }
     const finalAnswer = truncateTurnText(recording.finalAnswer.finalText);
     const stopReason = response?.stopReason ?? (state === "cancelled" ? "cancelled" : void 0);
     const payload = {
@@ -8223,6 +8447,7 @@ ${this.pendingRecoveredAgentsNotice}
       ...stopReason !== void 0 ? { stopReason } : {},
       ...state === "error" ? { error: normalizeTurnResultError(error) } : {},
       ...recording.startedAt !== void 0 ? { startedAt: recording.startedAt } : {},
+      ...cancelledAt !== void 0 ? { cancelledAt } : {},
       endedAt: Date.now(),
       promptText: recording.promptText,
       ...recording.promptTextTruncated ? { promptTextTruncated: true } : {},
@@ -8235,6 +8460,9 @@ ${this.pendingRecoveredAgentsNotice}
     };
     try {
       recording.recordingService?.recordTurnResult(payload);
+      if (cancelledAt !== void 0) {
+        await recording.recordingService?.flush();
+      }
     } catch (recordError) {
       debugLogger6.warn(
         `Failed to record turn result: ${this.#formatError(recordError)}`
@@ -8908,6 +9136,10 @@ ${this.pendingRecoveredAgentsNotice}
    * timed-out drain is still recorded exactly once.
    */
   async #buildMidTurnParts(messages, abortSignal, options = {}) {
+    const proposalTurn = this.activeGoalProposalTurn;
+    if (messages.length > 0 && proposalTurn?.controller.signal === abortSignal) {
+      proposalTurn.settlementBlocked = true;
+    }
     const parts = [];
     for (const message of messages) {
       const displayText = message.kind === "text" ? message.message : message.displayText;
@@ -9029,6 +9261,29 @@ ${this.pendingRecoveredAgentsNotice}
         );
       });
     }, "record");
+    const restoreOneShot = /* @__PURE__ */ __name(async () => {
+      if (job.recurring !== false || !job.id) return;
+      try {
+        const restored = await scheduler.restoreConsumedOneShot(job.id);
+        if (!restored) {
+          debugLogger6.warn(
+            `Scheduled task ${taskId} could not find its consumed one-shot to restore`
+          );
+        }
+      } catch (error) {
+        debugLogger6.warn(
+          `Scheduled task ${taskId} could not restore its unexecuted one-shot: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }, "restoreOneShot");
+    if (job.modelServiceId !== void 0 && !isValidCronTaskRoutingId(job.modelServiceId) || job.groupId !== void 0 && !isValidCronTaskRoutingId(job.groupId)) {
+      debugLogger6.warn(
+        `Scheduled task ${taskId} has invalid model or group routing; it was not dispatched`
+      );
+      await record({ dispatchFailed: true });
+      await restoreOneShot();
+      return;
+    }
     let sessionId;
     try {
       const response = await this.client.extMethod(
@@ -9054,6 +9309,8 @@ ${this.pendingRecoveredAgentsNotice}
             sourceType: SCHEDULED_TASK_RUN_SOURCE_TYPE,
             sourceId: scheduledTaskRunSourceId(job.id)
           } : {},
+          ...job.modelServiceId ? { model: job.modelServiceId } : {},
+          ...job.groupId ? { groupId: job.groupId } : {},
           callerSessionId: this.sessionId
         }
       );
@@ -9063,10 +9320,18 @@ ${this.pendingRecoveredAgentsNotice}
       }
       sessionId = responseSessionId;
     } catch (error) {
+      const requiresFreshSessionRouting = job.modelServiceId !== void 0 || job.groupId !== void 0;
+      const errorMessage = error instanceof Error ? error.message : typeof error === "object" && error !== null && typeof error["message"] === "string" ? error["message"] : String(error);
       debugLogger6.warn(
-        `Scheduled task ${taskId} could not create a fresh session, running it in the task session instead: ${error instanceof Error ? error.message : String(error)}`
+        requiresFreshSessionRouting ? `Scheduled task ${taskId} could not create a fresh session with its requested routing: ${errorMessage}` : `Scheduled task ${taskId} could not create a fresh session, running it in the task session instead: ${errorMessage}`
       );
-      await record({ sessionId: this.sessionId, dispatchFailed: true });
+      await record(
+        requiresFreshSessionRouting ? { dispatchFailed: true } : { sessionId: this.sessionId, dispatchFailed: true }
+      );
+      if (requiresFreshSessionRouting) {
+        await restoreOneShot();
+        return;
+      }
       this.#enqueueCronPrompt({
         prompt: job.prompt,
         source: "cron",
@@ -10671,50 +10936,32 @@ ${this.pendingRecoveredAgentsNotice}
       ])
     );
     const pendingToolResultRecords = [];
+    const pendingNestedToolResultRecords = [];
     let toolResultRecordSequence = 0;
     const queueToolResultRecord = /* @__PURE__ */ __name((fc, record) => {
-      pendingToolResultRecords.push({
+      const ordinal = dedupedFunctionCalls.indexOf(fc);
+      const target = ordinal === -1 ? pendingNestedToolResultRecords : pendingToolResultRecords;
+      target.push({
         ...record,
-        ordinal: dedupedFunctionCalls.indexOf(fc),
+        ordinal: Math.max(0, ordinal),
         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
-      );
-      const repeatedToolFailureBatch = {
-        complete: orderedRecords.length === dedupedFunctionCalls.length && new Set(orderedRecords.map((record) => record.ordinal)).size === dedupedFunctionCalls.length,
-        observations: orderedRecords.map((record) => ({
-          callId: record.callId,
-          policyToolName: record.policyToolName,
-          toolType: record.toolType,
-          terminalStatus: record.metadata.status,
-          executionStatus: record.metadata.executionStatus,
-          executionErrorType: record.executionErrorType,
-          providerDuplicate: record.providerDuplicate
-        }))
-      };
-      if (orderedRecords.length === 0) {
-        return {
-          ...result,
-          repeatedToolFailureBatch,
-          ...batchTerminatesTurn ? { terminateTurn: true } : {}
-        };
-      }
+    const finalizeAndRecord = /* @__PURE__ */ __name(async (records) => {
+      if (records.length === 0) return [];
       const finalized = await finalizeToolResponses(
         this.config,
-        orderedRecords.map((record) => ({
+        records.map((record) => ({
           callId: record.callId,
           toolName: record.toolName,
           responseParts: record.responseParts,
           persistedOutputFiles: record.persistedOutputFiles,
           artifacts: record.metadata.artifacts
         })),
-        new Map(orderedRecords.map((record) => [record.callId, promptId]))
+        new Map(records.map((record) => [record.callId, promptId]))
       );
-      orderedRecords.forEach((record, index) => {
+      records.forEach((record, index) => {
         if (record.skipPersistence === true || this.#shouldSkipRestoredAskUserQuestionPersistence(record.callId)) {
           return;
         }
@@ -10729,6 +10976,43 @@ ${this.pendingRecoveredAgentsNotice}
           ...goalProvenance ? [goalProvenance] : []
         );
       });
+      return finalized;
+    }, "finalizeAndRecord");
+    const finalizeNestedToolResult = /* @__PURE__ */ __name(async (result) => {
+      const records = pendingNestedToolResultRecords.splice(0);
+      if (records.length === 0) return result.parts;
+      const finalized = await finalizeAndRecord(records);
+      return finalized.flatMap((entry) => entry.responseParts);
+    }, "finalizeNestedToolResult");
+    const finalizeRunToolResult = /* @__PURE__ */ __name(async (result) => {
+      await finalizeAndRecord(
+        [...pendingNestedToolResultRecords].sort(
+          (left, right) => left.sequence - right.sequence
+        )
+      );
+      const orderedRecords = [...pendingToolResultRecords].sort(
+        (left, right) => left.ordinal - right.ordinal || left.sequence - right.sequence
+      );
+      const repeatedToolFailureBatch = {
+        complete: orderedRecords.length === dedupedFunctionCalls.length && new Set(orderedRecords.map((record) => record.ordinal)).size === dedupedFunctionCalls.length,
+        observations: orderedRecords.map((record) => ({
+          callId: record.callId,
+          policyToolName: record.policyToolName,
+          toolType: record.toolType,
+          terminalStatus: record.metadata.status,
+          executionStatus: record.metadata.executionStatus,
+          executionErrorType: record.executionErrorType,
+          providerDuplicate: record.providerDuplicate
+        }))
+      };
+      if (orderedRecords.length === 0) {
+        return {
+          ...result,
+          repeatedToolFailureBatch,
+          ...batchTerminatesTurn ? { terminateTurn: true } : {}
+        };
+      }
+      const finalized = await finalizeAndRecord(orderedRecords);
       return {
         ...result,
         parts: finalized.flatMap((entry) => entry.responseParts),
@@ -11043,7 +11327,9 @@ ${this.pendingRecoveredAgentsNotice}
           recordSkippedToolCall,
           queueToolResultRecord,
           executionCallIds.get(calls[idx]),
-          onFullTurnModel
+          onFullTurnModel,
+          void 0,
+          finalizeNestedToolResult
         ).then((r) => {
           results[idx] = r;
           if (r.loopDetected && executing.size > 1 && !warnedWaitingForInFlight) {
@@ -11172,7 +11458,9 @@ ${this.pendingRecoveredAgentsNotice}
               recordSkippedToolCall,
               queueToolResultRecord,
               executionCallIds.get(fc),
-              onFullTurnModel
+              onFullTurnModel,
+              void 0,
+              finalizeNestedToolResult
             );
             parts.push(...r.parts);
             collectMemoryWriteCandidates(r);
@@ -11249,13 +11537,15 @@ ${this.pendingRecoveredAgentsNotice}
     }
     return reminders;
   }
-  async runTool(abortSignal, promptId, fc, onStopAfterPermissionCancel, toolLoopState, recordSkippedToolCall, queueToolResultRecord, generatedCallId, onFullTurnModel) {
+  async runTool(abortSignal, promptId, fc, onStopAfterPermissionCancel, toolLoopState, recordSkippedToolCall, queueToolResultRecord, generatedCallId, onFullTurnModel, codeModeContext, finalizeCodeModeToolResult) {
     const callId = fc.id ?? generatedCallId ?? `${fc.name}-${Date.now()}`;
     let args = fc.args ?? {};
     let executionStatus = "not_started";
     let executionErrorType;
     let executeReturned = false;
     let executeAttempted = false;
+    let executionStartedAt;
+    const elapsedExecutionMs = /* @__PURE__ */ __name(() => executionStartedAt === void 0 ? void 0 : Math.round(performance.now() - executionStartedAt), "elapsedExecutionMs");
     let producerObserved = false;
     let terminalStatus;
     let toolType = "native";
@@ -11303,6 +11593,10 @@ ${this.pendingRecoveredAgentsNotice}
           "event.name": "tool_call",
           "event.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
           call_id: callId,
+          ...codeModeContext ? {
+            parent_call_id: codeModeContext.parentCallId,
+            source: codeModeContext.source
+          } : {},
           prompt_id: promptId,
           function_name: toolName2,
           function_args: args,
@@ -11449,6 +11743,19 @@ ${this.pendingRecoveredAgentsNotice}
       );
     }
     const toolName = fc.name;
+    if (this.config.getToolMode?.() === ToolMode.CodeModeOnly && !isCodeModeToolCallAllowed(toolName, codeModeContext?.source ?? "model")) {
+      return earlyErrorResponse(
+        new Error(
+          `Tool "${toolName}" is unavailable on this CodeModeOnly call surface.`
+        ),
+        toolName,
+        {
+          status: "error",
+          errorType: "execution_denied" /* EXECUTION_DENIED */,
+          executionStatus: "not_started"
+        }
+      );
+    }
     const toolRegistry = this.config.getToolRegistry();
     const tool = toolRegistry.getTool(toolName);
     if (!tool) {
@@ -11484,7 +11791,11 @@ ${this.pendingRecoveredAgentsNotice}
         // (coreToolScheduler.ts) so pre-Phase-2 dashboards keyed off call_id keep
         // matching daemon/ACP tool spans during the migration window.
         call_id: callId,
-        tool_name: policyToolName
+        tool_name: policyToolName,
+        ...codeModeContext ? {
+          "tool.parent_call_id": codeModeContext.parentCallId,
+          "tool.source": codeModeContext.source
+        } : {}
       },
       tool.description,
       promptId
@@ -11493,6 +11804,19 @@ ${this.pendingRecoveredAgentsNotice}
       return await runInToolSpanContext(toolSpan, async () => {
         const entryCancellation = cancelBeforeExecutionIfAborted(toolName);
         if (entryCancellation) return entryCancellation;
+        if (policyToolName === ToolNames.PROPOSE_GOAL && (this.activeGoalProposalTurn?.turnKey !== promptId || this.activeGoalProposalTurn.controller.signal.aborted)) {
+          return earlyErrorResponse(
+            new Error(
+              "The Goal was not set: this turn cannot own a Goal approval. Hand the user a `/goal set <objective>` line instead."
+            ),
+            toolName,
+            {
+              status: "error",
+              errorType: "execution_denied" /* EXECUTION_DENIED */,
+              executionStatus: "not_started"
+            }
+          );
+        }
         const isTrustedLiveScreenContextTool = tool === this.liveScreenContextTool;
         const isTrustedLiveTaskTool = this.liveTaskTools.includes(
           tool
@@ -12469,11 +12793,85 @@ ${this.pendingRecoveredAgentsNotice}
             });
             executionStatus = "error";
             executeAttempted = true;
+            executionStartedAt = performance.now();
             try {
-              toolResult = await invocation.execute(
+              const execute = /* @__PURE__ */ __name(() => invocation.execute(
                 activeToolAbortSignal,
-                onToolProgress
-              );
+                onToolProgress,
+                this.config.getShellExecutionConfig()
+              ), "execute");
+              if (toolName !== ToolNames.EXEC) {
+                toolResult = await execute();
+              } else {
+                let dispatchTail = Promise.resolve();
+                const dispatch = /* @__PURE__ */ __name((nestedName, nestedArgs, nestedSignal, onResult) => {
+                  const next = dispatchTail.then(async () => {
+                    if (!isCodeModeToolCallAllowed(nestedName, "code_mode")) {
+                      throw new Error(
+                        `Tool "${nestedName}" is not callable from exec.`
+                      );
+                    }
+                    const nestedCallId = `${callId}:code:${++this.codeModeNestedSequence}`;
+                    const nested = await runWithoutToolCallRuntime(
+                      () => this.runTool(
+                        nestedSignal,
+                        promptId,
+                        {
+                          id: nestedCallId,
+                          name: nestedName,
+                          args: nestedArgs
+                        },
+                        onStopAfterPermissionCancel,
+                        toolLoopState,
+                        recordSkippedToolCall,
+                        queueToolResultRecord,
+                        nestedCallId,
+                        onFullTurnModel,
+                        { parentCallId: callId, source: "code_mode" }
+                      )
+                    );
+                    const nestedParts = finalizeCodeModeToolResult ? await finalizeCodeModeToolResult(nested) : nested.parts;
+                    const functionResponse = nestedParts.map((part) => part.functionResponse).find((part) => part?.id === nestedCallId);
+                    const response = functionResponse?.response;
+                    const nestedError = response?.["error"];
+                    onResult?.({
+                      callId: nestedCallId,
+                      responseParts: nestedParts,
+                      resultDisplay: void 0,
+                      error: nestedError === void 0 ? void 0 : new Error(String(nestedError)),
+                      errorType: void 0,
+                      ..."modelOverride" in nested ? { modelOverride: nested.modelOverride } : {},
+                      ...nested.terminateTurn ? { terminateTurn: true } : {}
+                    });
+                    if (nestedError !== void 0) {
+                      throw new Error(
+                        typeof nestedError === "string" ? nestedError : JSON.stringify(nestedError)
+                      );
+                    }
+                    const nestedOutput = response?.["output"] ?? response?.["content"] ?? "";
+                    const content = extractCodeModeImageContent(nestedParts);
+                    return {
+                      callId: nestedCallId,
+                      name: nestedName,
+                      status: "success",
+                      output: typeof nestedOutput === "string" ? nestedOutput : JSON.stringify(nestedOutput),
+                      ...content ? { content } : {}
+                    };
+                  });
+                  dispatchTail = next.then(
+                    () => void 0,
+                    () => void 0
+                  );
+                  return next;
+                }, "dispatch");
+                toolResult = await runWithToolCallRuntime(
+                  {
+                    parentCallId: callId,
+                    dispatch
+                  },
+                  execute
+                );
+              }
               executeReturned = true;
               try {
                 settledArtifacts = toolResult.artifacts;
@@ -12587,7 +12985,8 @@ ${this.pendingRecoveredAgentsNotice}
               toolUseId,
               permissionMode,
               activeToolAbortSignal,
-              callId
+              callId,
+              elapsedExecutionMs()
             );
             if (activeToolAbortSignal.aborted) {
               return earlyErrorResponse(
@@ -12642,7 +13041,8 @@ ${this.pendingRecoveredAgentsNotice}
                 isInterrupt,
                 permissionMode,
                 activeToolAbortSignal,
-                callId
+                callId,
+                elapsedExecutionMs()
               );
               if (failureHookResult.additionalContext) {
                 debugLogger6.debug(
@@ -12737,6 +13137,10 @@ ${this.pendingRecoveredAgentsNotice}
               "event.name": "tool_call",
               "event.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
               call_id: callId,
+              ...codeModeContext ? {
+                parent_call_id: codeModeContext.parentCallId,
+                source: codeModeContext.source
+              } : {},
               function_name: toolName,
               function_args: args,
               duration_ms: durationMs,
@@ -12795,8 +13199,9 @@ ${this.pendingRecoveredAgentsNotice}
           }
           return {
             parts: responseParts,
+            ..."modelOverride" in toolResult && succeeded ? { modelOverride: toolResult.modelOverride } : {},
             stopAfterPermissionCancel: nestedPermissionCancelled,
-            ...toolResult.terminateTurn ? { terminateTurn: true } : {},
+            ...toolResult.terminateTurn && succeeded ? { terminateTurn: true } : {},
             memoryWriteCandidates: status === "success" ? [
               {
                 toolName,
@@ -12823,7 +13228,8 @@ ${this.pendingRecoveredAgentsNotice}
                 isInterrupt,
                 String(approvalMode),
                 activeToolAbortSignal,
-                callId
+                callId,
+                elapsedExecutionMs()
               );
               if (failureHookResult.additionalContext) {
                 debugLogger6.debug(
@@ -14961,7 +15367,7 @@ function createAcpSessionProfiler(span, attributePrefix) {
     }
   }, "setAttribute");
   const recordStage = /* @__PURE__ */ __name((stage, start) => {
-    const durationMs = Math.round((performance.now() - start) * 100) / 100;
+    const durationMs = Math.round((performance2.now() - start) * 100) / 100;
     if (Number.isFinite(durationMs) && durationMs >= 0) {
       setAttribute(
         `qwen-code.daemon.${attributePrefix}.${stage}_ms`,
@@ -14980,7 +15386,7 @@ function createAcpSessionProfiler(span, attributePrefix) {
     },
     async time(stage, fn) {
       if (!span) return await fn();
-      const start = performance.now();
+      const start = performance2.now();
       try {
         return await fn();
       } catch (error) {
@@ -14992,7 +15398,7 @@ function createAcpSessionProfiler(span, attributePrefix) {
     },
     timeSync(stage, fn) {
       if (!span) return fn();
-      const start = performance.now();
+      const start = performance2.now();
       try {
         return fn();
       } catch (error) {
@@ -15437,6 +15843,7 @@ function hasFailedDisplayStatus(display) {
 __name(hasFailedDisplayStatus, "hasFailedDisplayStatus");
 var AUTH_PREFLIGHT_ENV_KEYS = {
   openai: ["OPENAI_API_KEY"],
+  "openai-responses": ["OPENAI_API_KEY"],
   anthropic: ["ANTHROPIC_API_KEY"],
   gemini: ["GEMINI_API_KEY"],
   "vertex-ai": ["GOOGLE_API_KEY"]
@@ -16538,6 +16945,7 @@ async function runAcpAgent(config, settings, argv, options) {
       return agentInstance;
     }, stream);
     markAcpStartup("transportSetupEnd");
+    registerCleanup(() => agentInstance?.closePeerMessaging());
   } catch (err) {
     eventLoopMonitor.dispose();
     throw err;
@@ -16980,6 +17388,30 @@ var QwenAgent = class _QwenAgent {
     __name(this, "QwenAgent");
   }
   sessions = /* @__PURE__ */ new Map();
+  /**
+   * Cross-session messaging for every session this process hosts.
+   *
+   * One inbox, not one per session: the address is a socket, the sessions
+   * are told apart by the `toSessionId` every sender pins on its frame,
+   * and binding a socket per session would multiply file descriptors by
+   * the session count for no added reach.
+   *
+   * Outbound only for now. Inbound is refused rather than held, because a
+   * hold is a question put to a person and nobody is watching a hold list
+   * on a daemon-managed session's behalf; a sender is told so at once
+   * instead of waiting out an expiry.
+   */
+  peerMessagingStart = null;
+  // Set by closePeerMessaging: a retry must not resurrect an inbox after
+  // teardown ran.
+  peerMessagingClosed = false;
+  /**
+   * Sessions already given a record. A session is published once, but a
+   * reload can hand the same id back through the same path, and two
+   * records for one session would be two names for it in every listing.
+   */
+  registeredSessions = /* @__PURE__ */ new Set();
+  inboxAddress = null;
   modelProviderReloadRevision = 0;
   historyMutationTails = /* @__PURE__ */ new Map();
   startingSessionIds = /* @__PURE__ */ new Set();
@@ -17184,6 +17616,7 @@ var QwenAgent = class _QwenAgent {
   }
   async finishManagedShutdown(configs) {
     const failures = [];
+    await this.closePeerMessaging();
     for (const [sessionId, session] of [...this.sessions]) {
       await this.removeStoredSessionEntry(sessionId, session, failures, {
         shutdownConfig: false
@@ -17522,6 +17955,12 @@ var QwenAgent = class _QwenAgent {
     } catch (error) {
       cleanupErrors.push(error);
     }
+    this.registeredSessions.delete(sessionId);
+    try {
+      await session.getConfig().unregisterSessionRegistry();
+    } catch (error) {
+      cleanupErrors.push(error);
+    }
     if (options.shutdownConfig !== false) {
       try {
         await session.getConfig().shutdown({ shutdownTelemetry: false });
@@ -17775,6 +18214,113 @@ var QwenAgent = class _QwenAgent {
     }
     await this.closeStoredSession(sessionId, opts);
   }
+  /**
+   * Bind the one inbox every session this process hosts shares.
+   *
+   * Not awaited: binding a socket must not delay the first prompt, and a
+   * session published before it resolves still registers — the address
+   * is patched into every record when it arrives (`publishInboxAddress`).
+   */
+  startPeerMessaging() {
+    if (this.peerMessagingStart) return;
+    if (this.peerMessagingClosed) return;
+    this.peerMessagingStart = (async () => {
+      try {
+        const messaging = await PeerMessaging.start({
+          // Inbound is refused outright, so neither the approval mode nor
+          // the parity rule it feeds is ever consulted. Stated rather than
+          // left to a default: what a daemon-managed session may be told
+          // is settled here and nowhere else.
+          getApprovalMode: /* @__PURE__ */ __name(() => null, "getApprovalMode"),
+          getPolicySetting: /* @__PURE__ */ __name(() => "refuse", "getPolicySetting"),
+          updateSessionRegistryIpcPath: /* @__PURE__ */ __name((ipcPath, ipcToken) => this.publishInboxAddress(ipcPath, ipcToken), "updateSessionRegistryIpcPath"),
+          ownsSessionId: /* @__PURE__ */ __name((id) => {
+            const wanted = normalizeSessionIdForLookup(id);
+            return this.sessions.has(wanted) || [...this.sessions.values()].some(
+              (session) => normalizeSessionIdForLookup(
+                session.getConfig().getSessionId()
+              ) === wanted
+            );
+          }, "ownsSessionId")
+        });
+        if (messaging === null) this.peerMessagingStart = null;
+        return messaging;
+      } catch (error) {
+        debugLogger9.error(
+          "[ACP] cross-session messaging failed to start:",
+          error
+        );
+        this.peerMessagingStart = null;
+        return null;
+      }
+    })();
+  }
+  /** Close the inbox and stop advertising it. Safe to call more than once. */
+  async closePeerMessaging() {
+    this.peerMessagingClosed = true;
+    const pending = this.peerMessagingStart;
+    if (!pending) return;
+    this.peerMessagingStart = null;
+    try {
+      await (await pending)?.close();
+    } catch (error) {
+      debugLogger9.debug(
+        `[ACP] closing cross-session messaging failed: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+    this.inboxAddress = null;
+  }
+  /**
+   * Give a newly published session a registry record of its own.
+   *
+   * Only when that session's own settings turn messaging on. A record
+   * with no inbox behind it would put a name in every peer's listing
+   * that can be addressed and never answered, which is worse than not
+   * appearing at all — the interactive UI registers unconditionally
+   * because its record also answers "what is running right now", a
+   * question nobody asks of a session a daemon is driving.
+   */
+  registerHostedSession(sessionId, config, settings) {
+    if (settings.merged.agents?.crossSessionMessaging !== true) return;
+    this.startPeerMessaging();
+    if (this.registeredSessions.has(sessionId)) return;
+    this.registeredSessions.add(sessionId);
+    config.trackSessionRegistration(
+      registerSession({
+        sessionId,
+        cwd: config.getTargetDir(),
+        qwenVersion: config.getCliVersion() ?? null,
+        // What spawned this process, as far as it can tell: the daemon
+        // marks the children it starts, and anything else running
+        // `qwen --acp` is a client driving it directly.
+        kind: process.env[QWEN_CODE_SERVE_ENV] === "1" ? "serve" : "headless",
+        // One record per session rather than one per process: they have
+        // separate ids, names and working directories.
+        slot: "own"
+      })
+    );
+    if (this.inboxAddress) {
+      void config.updateSessionRegistryIpcPath(
+        this.inboxAddress.ipcPath,
+        this.inboxAddress.ipcToken
+      );
+    }
+  }
+  /**
+   * Write the inbox address into every hosted session's record.
+   *
+   * They share one address, so this runs once per bind rather than once
+   * per session, and again with `undefined` at close so no record
+   * advertises a socket that is gone.
+   */
+  async publishInboxAddress(ipcPath, ipcToken) {
+    this.inboxAddress = ipcPath !== void 0 && ipcToken !== void 0 ? { ipcPath, ipcToken } : null;
+    await Promise.allSettled(
+      [...this.sessions.values()].map(
+        (session) => session.getConfig().updateSessionRegistryIpcPath(ipcPath, ipcToken)
+      )
+    );
+  }
   async disposeSessions() {
     this.activeWorkReporter?.dispose();
     this.activeWorkReporter = void 0;
@@ -17786,6 +18332,7 @@ var QwenAgent = class _QwenAgent {
       controller.abort();
     }
     this.workspaceGenerationControllers.clear();
+    await this.closePeerMessaging();
     await Promise.allSettled(
       [...this.sessions.entries()].map(
         ([sessionId, session]) => this.discardStoredSessionIfCurrent(sessionId, session, {
@@ -17926,7 +18473,7 @@ var QwenAgent = class _QwenAgent {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.23.2";
+    const version = "0.23.3-nightly.20260911.aaa6a32aae";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -18872,7 +19419,7 @@ var QwenAgent = class _QwenAgent {
     }
     return await this.runInSessionContext(
       session,
-      () => session.setModel({ ...params, sessionId })
+      () => params._meta?.[SESSION_MODEL_PERSIST_DEFAULT_META_KEY] === false ? session.setModel({ ...params, sessionId }, { persistDefault: false }) : session.setModel({ ...params, sessionId })
     );
   }
   async setSessionConfigOption(params) {
@@ -19009,13 +19556,24 @@ var QwenAgent = class _QwenAgent {
     const suppliedContext = meta[INVOCATION_CONTEXT_META_KEY];
     const suppliedModelPrompt = meta[DAEMON_MODEL_PROMPT_META_KEY];
     const suppliedPromptDisplayText = meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+    const submittedPrompt = this.privateParentState === "trusted" ? meta[DAEMON_SUBMITTED_PROMPT_META_KEY] : meta[SUBMITTED_PROMPT_META_KEY];
     const suppliedChannelPrompt = meta[CHANNEL_PROMPT_META_KEY];
+    const suppliedGoalProposalApproval = meta["qwen.goalProposalApproval"];
     const suppliedChannelDelivery = meta[DAEMON_CHANNEL_DELIVERY_META_KEY];
     delete meta[INVOCATION_CONTEXT_META_KEY];
     delete meta[DAEMON_MODEL_PROMPT_META_KEY];
     delete meta[PRIVATE_PARENT_CAPABILITY_META_KEY];
     delete meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY];
+    delete meta[SUBMITTED_PROMPT_META_KEY];
+    delete meta[DAEMON_SUBMITTED_PROMPT_META_KEY];
+    if (typeof submittedPrompt === "string" && suppliedChannelPrompt !== true) {
+      meta[DAEMON_SUBMITTED_PROMPT_META_KEY] = submittedPrompt;
+    }
     delete meta[CHANNEL_PROMPT_META_KEY];
+    delete meta["qwen.goalProposalApproval"];
+    if (this.privateParentState === "trusted" && suppliedGoalProposalApproval === true) {
+      meta["qwen.goalProposalApproval"] = true;
+    }
     delete meta[DAEMON_CHANNEL_DELIVERY_META_KEY];
     if (this.privateParentState === "trusted" && typeof suppliedPromptDisplayText === "string") {
       meta[DAEMON_PROMPT_DISPLAY_TEXT_META_KEY] = suppliedPromptDisplayText;
@@ -20879,6 +21437,22 @@ var QwenAgent = class _QwenAgent {
       }
       return await this.extMethodInternal(method, normalizedParams);
     } catch (error) {
+      if ([
+        "qwen/session/sources/list",
+        "qwen/session/sources/upsert",
+        "qwen/session/sources/remove",
+        "qwen/session/sources/copy"
+      ].includes(method)) {
+        if (!(error instanceof SessionSourceError)) {
+          debugLogger9.error("[ACP] Session source ext-method error:", error);
+        }
+        return {
+          sourceError: error instanceof SessionSourceError ? { code: error.code, message: error.message } : {
+            code: "source_persistence_unavailable",
+            message: "Session source operation failed"
+          }
+        };
+      }
       const writerError = getSessionWriterError(error);
       if (writerError) {
         throw new RequestError(writerError.rpcCode, writerError.message, {
@@ -22339,6 +22913,101 @@ var QwenAgent = class _QwenAgent {
         }
         return { requestId, cancelled };
       }
+      case "qwen/session/sources/list":
+      case "qwen/session/sources/upsert":
+      case "qwen/session/sources/remove":
+      case "qwen/session/sources/copy": {
+        if (!this.isTrustedManagedParent()) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Sources require a trusted private ACP parent"
+          );
+        }
+        const sessionId = params["sessionId"];
+        if (typeof sessionId !== "string" || !sessionId) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid source sessionId"
+          );
+        }
+        const session = this.sessionOrThrow(sessionId);
+        const sourceConfig = session.getConfig();
+        const service = sourceConfig.getSessionSourceService();
+        if (method === "qwen/session/sources/copy" && !service && !sourceConfig.getChatRecordingService()) {
+          return { warnings: [] };
+        }
+        if (!service)
+          throw new SessionSourceError(
+            "source_persistence_unavailable",
+            "Session sources unavailable"
+          );
+        if (method === "qwen/session/sources/list")
+          return { ...await service.list() };
+        if (method === "qwen/session/sources/upsert")
+          return { ...await service.upsert(params["input"]) };
+        if (method === "qwen/session/sources/remove") {
+          const sourceId = params["sourceId"];
+          if (typeof sourceId !== "string" || !sourceId || sourceId.length > 200)
+            throw new SessionSourceError("invalid_source", "Invalid source ID");
+          return { ...await service.remove(sourceId) };
+        }
+        const targetSessionId = params["targetSessionId"];
+        const targetCwd = params["targetCwd"];
+        const attachmentIds = params["attachmentIds"];
+        if (typeof targetSessionId !== "string" || !SESSION_ID_RE.test(targetSessionId) || targetSessionId === sessionId || typeof targetCwd !== "string" || path7.resolve(targetCwd) !== path7.resolve(sourceConfig.storage.getProjectRoot()) || !Array.isArray(attachmentIds) || attachmentIds.some((id) => typeof id !== "string")) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid source copy target"
+          );
+        }
+        const sources = (await service.list()).sources;
+        if (!sources.length) return { warnings: [] };
+        const targetData = await sourceConfig.getSessionService().loadSession(targetSessionId);
+        if (!targetData?.conversation.messages.some(
+          (record) => record.forkedFrom?.sessionId === sessionId
+        )) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Source copy target is not a fork of this session"
+          );
+        }
+        let temporaryConfig;
+        try {
+          const targetConfig = this.sessions.get(targetSessionId)?.getConfig() ?? (temporaryConfig = await this.newSessionConfig(
+            targetCwd,
+            [],
+            loadSettings(targetCwd),
+            void 0,
+            targetSessionId,
+            true,
+            {
+              skipMcpDiscovery: true,
+              skipHooks: true,
+              skipSkillManager: true,
+              skipFileCheckpointing: true,
+              lenientToolWarmup: true
+            }
+          ));
+          const targetService = targetConfig.getSessionSourceService();
+          if (!targetService)
+            throw new SessionSourceError(
+              "source_persistence_unavailable",
+              "Target sources unavailable"
+            );
+          return await targetService.copyFrom(
+            sources,
+            attachmentIds
+          );
+        } finally {
+          if (temporaryConfig) {
+            try {
+              await this.cleanupUnstoredConfig(temporaryConfig);
+            } catch (error) {
+              debugLogger9.warn("Failed to clean up source copy config:", error);
+            }
+          }
+        }
+      }
       case SERVE_CONTROL_EXT_METHODS.sessionArtifactsPersist: {
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || sessionId.length === 0) {
@@ -24851,9 +25520,7 @@ ${outputText}
               config.setDisabledTools(new Set(disabled));
             }
             const workflowsWereEnabled = config.isWorkflowsEnabled();
-            config.setWorkflowsEnabled(
-              newMerged.tools?.workflowsEnabled === true
-            );
+            config.setWorkflowsEnabled(newMerged.tools?.workflowsEnabled);
             if (config.isWorkflowsEnabled() !== workflowsWereEnabled) {
               try {
                 await session.sendAvailableCommandsUpdate();
@@ -25266,6 +25933,10 @@ ${outputText}
     if (sessionSource) {
       config.setSessionSource(sessionSource.sourceType, sessionSource.sourceId);
     }
+    config.setArtifactSnapshotsEnabled(this.isTrustedManagedParent());
+    if (this.clientCapabilities?._meta?.["qwen.goalProposals"] === true) {
+      config.setGoalProposalHostSupported(true);
+    }
     if (chatRecording !== false) {
       this.initializingConfigs.add(config);
     }
@@ -25315,6 +25986,9 @@ ${outputText}
         });
       });
     }
+    if (!provisionalWorkspace && chatRecording !== false) {
+      this.bindSessionSourceService(config);
+    }
     try {
       await config.initialize({
         ...initializeOptions,
@@ -25340,6 +26014,41 @@ ${outputText}
     }
     return config;
   }
+  bindSessionSourceService(config) {
+    if (this.isTrustedManagedParent() && config.getChatRecordingService()) {
+      config.setSessionSourceServiceFactory(() => {
+        const sourceSessionId = config.getSessionId();
+        const recording = config.getChatRecordingService();
+        const sourceSessions = config.getSessionService();
+        const workspaceCwd = config.storage.getProjectRoot();
+        return new SessionSourceService({
+          sessionId: sourceSessionId,
+          workspaceCwd: /* @__PURE__ */ __name(() => workspaceCwd, "workspaceCwd"),
+          load: /* @__PURE__ */ __name(async () => {
+            if (!recording)
+              throw new SessionSourceError(
+                "source_persistence_unavailable",
+                "Chat recording service unavailable"
+              );
+            await recording.flush();
+            return sourceSessions.readSessionSources(sourceSessionId);
+          }, "load"),
+          persist: /* @__PURE__ */ __name(async (snapshot) => {
+            if (!recording)
+              throw new SessionSourceError(
+                "source_persistence_unavailable",
+                "Chat recording service unavailable"
+              );
+            await recording.recordSessionSourcesSnapshot(snapshot);
+          }, "persist"),
+          notify: /* @__PURE__ */ __name((revision) => this.connection.extNotification(
+            "qwen/notify/session/sources-changed",
+            { sessionId: sourceSessionId, revision }
+          ), "notify")
+        });
+      });
+    }
+  }
   async surfaceMcpFailuresWhenReady(config) {
     try {
       await config.waitForMcpReady();
@@ -25596,6 +26305,9 @@ ${outputText}
           this.assertManagedSessionAdmission();
           await config.activateProvisionalWorkspace();
           this.assertManagedSessionAdmission();
+          this.bindSessionSourceService(config);
+          await config.registerSessionSourceTool();
+          await config.getLlmClient().setTools();
           this.setupFileSystem(config);
           config.hydrateSessionRestoreFileHistory?.();
           if (sessionData?.fileHistorySnapshots?.length) {
@@ -25603,6 +26315,7 @@ ${outputText}
           }
           await replaySessionHistory();
           await options.beforeStartPostReplayServices?.(session);
+          await config.getLlmClient().refreshStartupContextReminder();
           session.installRewriter();
           config.finalizeSessionRestore?.();
           startNonInteractiveOpenAILogHousekeeping(config, settings);
@@ -25669,6 +26382,7 @@ ${outputText}
         );
       }
       this.sessions.set(sessionId, session);
+      this.registerHostedSession(sessionId, config, settings);
       this.sessionApprovalModeConverged.set(
         sessionId,
         config.getApprovalMode()