@qwen-code/qwen-code 0.23.3 → 0.23.4

package/chunks/{acpAgent-BBSW7XZG.js → acpAgent-5N3LHCO3.js}

@@ -1,18 +1,15 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  recomputeMcpGating
-} from "./chunk-7ICHPMBQ.js";
 import {
   PeerMessaging,
   classifyApiError
-} from "./chunk-DT75RKNH.js";
-import {
-  normalizePartList
-} from "./chunk-5IENVM7Z.js";
+} from "./chunk-ZXUKZHMV.js";
 import {
   fireSessionDeleteHook
 } from "./chunk-L34XSHIZ.js";
+import {
+  normalizePartList
+} from "./chunk-5IENVM7Z.js";
 import {
   EXTENSION_CONTEXT_BUDGET,
   buildExtensionMentionContext,
@@ -22,7 +19,7 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-MLQNSPRZ.js";
+} from "./chunk-3AYIKQTJ.js";
 import {
   getAvailableCommands,
   getSlashCommandFirstToken,
@@ -32,7 +29,10 @@ import {
   pLimit,
   recordDaemonSessionModel,
   restoreSessionModelThenAuthenticate
-} from "./chunk-SSGAAWLY.js";
+} from "./chunk-PNACDSCO.js";
+import {
+  recomputeMcpGating
+} from "./chunk-VELFTVEO.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -42,46 +42,44 @@ import {
   loadCliConfig,
   normalizeDisabledToolList,
   parseApprovalModeValue
-} from "./chunk-DYFOSJHU.js";
+} from "./chunk-QM2MRAG4.js";
+import {
+  getCommandSubcommandNames,
+  getEffectiveSupportedModes
+} from "./chunk-4XP7WXC4.js";
+import "./chunk-YGFJ6BRT.js";
 import "./chunk-NYX53SV4.js";
+import "./chunk-FBDHP23D.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-W5FIP7FC.js";
-import {
-  getCommandSubcommandNames
-} from "./chunk-7Q2AXRDJ.js";
-import {
-  getEffectiveSupportedModes
-} from "./chunk-BWAMMKIS.js";
-import "./chunk-S6Q6Q4P2.js";
+} from "./chunk-JLZ5YCMV.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-QMUYLYT5.js";
+import {
+  startNonInteractiveOpenAILogHousekeeping
+} from "./chunk-PCIYPEYV.js";
+import "./chunk-KW7NOTN6.js";
+import "./chunk-2XRE4KE4.js";
+import "./chunk-6TFZIA2L.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-GOXQL4YH.js";
-import "./chunk-2XRE4KE4.js";
+import "./chunk-LFNK4DGQ.js";
+import "./chunk-YAF2MQZ6.js";
 import {
-  startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-MHAADZOZ.js";
-import "./chunk-KW7NOTN6.js";
-import "./chunk-EVTNACMT.js";
+  computeCpuPercent
+} from "./chunk-LBOVL47Y.js";
+import "./chunk-24FVUD5P.js";
+import "./chunk-WKQX4FND.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-J3TJH52D.js";
-import "./chunk-SYLECP23.js";
-import "./chunk-GCDXVPFK.js";
-import "./chunk-AC6KDLH3.js";
-import "./chunk-YAF2MQZ6.js";
-import {
-  computeCpuPercent
-} from "./chunk-LBOVL47Y.js";
-import "./chunk-24FVUD5P.js";
+} from "./chunk-DOTF2PF2.js";
+import "./chunk-BBMOAZ2E.js";
+import "./chunk-TW2RLZPC.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -102,7 +100,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-KOKPXIAN.js";
+} from "./chunk-UL4DXZMP.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -113,14 +111,21 @@ import {
   hasFullSessionContext,
   observeAcpToolResultProjection,
   observeAcpToolResultWire
-} from "./chunk-3XLK2QMY.js";
+} from "./chunk-H7L725Z6.js";
 import "./chunk-M3JGHRMQ.js";
 import "./chunk-VFFQAOPR.js";
+import "./chunk-2S2WIGCM.js";
 import "./chunk-47ECGEJC.js";
-import "./chunk-6JACAGYH.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-TXASDT2M.js";
+import {
+  getConversationDirectoryName,
+  hasVerifiableInode,
+  isSameConversationPath,
+  isSameDirectoryIdentity
+} from "./chunk-PB7JBAHF.js";
+import "./chunk-DMEUXLSS.js";
 import {
   isCompatibleLiveSessionSource
 } from "./chunk-OHU2H5CS.js";
@@ -131,19 +136,12 @@ import {
   isReservedStandaloneSessionSourceType,
   parseSessionSource
 } from "./chunk-N4QWUPDM.js";
-import {
-  getConversationDirectoryName,
-  hasVerifiableInode,
-  isSameConversationPath,
-  isSameDirectoryIdentity
-} from "./chunk-PB7JBAHF.js";
-import "./chunk-UXEO7E3V.js";
 import {
   buildScheduledTaskRunPrompt,
   normalizeChannelDeliveryText,
   scheduledTaskRunSessionName,
   scheduledTaskRunSourceId
-} from "./chunk-Z3GF56ME.js";
+} from "./chunk-FRISMWG3.js";
 import {
   normalizeSessionIdForLookup,
   parseCallerSuppliedSessionId
@@ -154,36 +152,16 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-XBZTAGB7.js";
+} from "./chunk-OXDQETZA.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-2ALXPGB4.js";
+} from "./chunk-E6IR653O.js";
 import {
   readVoiceModel
-} from "./chunk-NE624IVP.js";
+} from "./chunk-ADQUK6WA.js";
 import "./chunk-Y53DG2HA.js";
-import {
-  mapSkillConfigToStatus
-} from "./chunk-BHTYRHJF.js";
-import "./chunk-FCQJLMA2.js";
-import "./chunk-DMEUXLSS.js";
-import {
-  createLoadedSettingsAdapter
-} from "./chunk-TWUKBNWM.js";
-import "./chunk-RWVD5RRY.js";
-import "./chunk-HBQ2NXOU.js";
-import "./chunk-JS73NNWF.js";
-import {
-  SCHEDULED_TASK_RUN_SOURCE_TYPE
-} from "./chunk-3KQBQ6FM.js";
-import "./chunk-7U5G6JXI.js";
-import "./chunk-WCCLLK7X.js";
-import "./chunk-OCPBI7J5.js";
-import {
-  ndJsonStream
-} from "./chunk-IUVIBDKU.js";
 import {
   PERSIST_REASONING_SELECTION_META_KEY,
   REASONING_EFFORT_DEFAULT,
@@ -200,16 +178,30 @@ import {
   isReasoningSelectionSupported,
   parseReasoningSelection,
   resolvePersistedReasoningConfigState
-} from "./chunk-BV6Q5HMY.js";
+} from "./chunk-MJHLKWGJ.js";
 import {
-  ACP_ROUTE_ID_PREFIX,
-  buildAcpModelOptions,
-  getCurrentAcpModelId,
-  parseAcpBaseModelId,
-  parseAcpModelOption,
-  resolveAcpModelOption,
-  sanitizeProviderBaseUrl
-} from "./chunk-MF6E7FSA.js";
+  mapSkillConfigToStatus
+} from "./chunk-ZJ7JQUGY.js";
+import {
+  resolveSkillSettings
+} from "./chunk-LMJSPC55.js";
+import "./chunk-Q3TFRP5G.js";
+import {
+  createLoadedSettingsAdapter
+} from "./chunk-RKXAOP6F.js";
+import "./chunk-BDDE4YNP.js";
+import "./chunk-M6MID3FA.js";
+import "./chunk-JS73NNWF.js";
+import {
+  SCHEDULED_TASK_RUN_SOURCE_TYPE
+} from "./chunk-SYDMM6IX.js";
+import "./chunk-7U5G6JXI.js";
+import "./chunk-WCCLLK7X.js";
+import "./chunk-OCPBI7J5.js";
+import {
+  ndJsonStream
+} from "./chunk-2YMRRI2C.js";
+import "./chunk-LYD3T3H7.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -217,16 +209,23 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-HGEUHUEV.js";
+} from "./chunk-54B2LTKP.js";
+import "./chunk-MFPAVOYJ.js";
 import {
-  resolveSkillSettings
-} from "./chunk-HWVUSYSN.js";
-import "./chunk-NHCZJQE4.js";
-import "./chunk-SODMFNAR.js";
+  ACP_ROUTE_ID_PREFIX,
+  buildAcpModelOptions,
+  getCurrentAcpModelId,
+  parseAcpBaseModelId,
+  parseAcpModelOption,
+  resolveAcpModelOption,
+  sanitizeProviderBaseUrl
+} from "./chunk-INGBUYL6.js";
+import "./chunk-WLFILD4T.js";
+import "./chunk-SQCZDHBQ.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-RZHU3K6M.js";
-import "./chunk-CUEXOHQH.js";
-import "./chunk-76RGWKLS.js";
+import "./chunk-IAS753HG.js";
+import "./chunk-5ODRE7E5.js";
+import "./chunk-ABNX6E6K.js";
 import "./chunk-V6WHFGST.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
@@ -246,6 +245,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,
@@ -261,25 +261,27 @@ 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
 } from "./chunk-FAWTMDX7.js";
+import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-STUJ7IMZ.js";
-import "./chunk-NLNQNBZ2.js";
-import "./chunk-ALMR3E6Q.js";
 import "./chunk-GYTKQYDB.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,
@@ -289,12 +291,13 @@ import {
   SHELL_EXECUTING_TOOL_NAMES,
   isValidExternalToolGuardDenialReason
 } from "./chunk-3VUENPWF.js";
+import "./chunk-M5GB774H.js";
 import "./chunk-NFXXBWSE.js";
-import "./chunk-X6K77VHC.js";
+import "./chunk-LWWRJRCD.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS,
   CHANNEL_PROMPT_META_KEY
-} from "./chunk-7QYWGTHB.js";
+} from "./chunk-EPVEPTI3.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -303,7 +306,7 @@ import {
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-2ZN3O5FT.js";
+} from "./chunk-JZ3FFPES.js";
 import {
   deleteNestedPropertySafe,
   getOutputLanguageFilePath,
@@ -315,41 +318,40 @@ import {
   settingExistsInScope,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-7BXXIQG4.js";
+} from "./chunk-PVKEYO5D.js";
+import "./chunk-P6XVYPWA.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-ZU47FBOC.js";
+import {
+  getCurrentLanguage,
+  setLanguageAsync
+} from "./chunk-I6YJZGHS.js";
+import {
+  SUPPORTED_LANGUAGES
+} from "./chunk-5EJZE3FP.js";
 import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-NOAG7N22.js";
-import "./chunk-N6VQ37ZZ.js";
+} from "./chunk-IGLX6UXJ.js";
+import "./chunk-SFL6U7U7.js";
 import "./chunk-BW4333PP.js";
-import {
-  ENV_ACP_REPEATED_TOOL_FAILURE_GUARD,
-  QWEN_CODE_SERVE_ENV
-} from "./chunk-VX63RJXE.js";
-import "./chunk-6PLDPT2C.js";
 import {
   getSystemDefaultsPath,
   getSystemSettingsPath
 } from "./chunk-IDS7MSUP.js";
 import {
-  getCurrentLanguage,
-  setLanguageAsync
-} from "./chunk-VZUCTJ2P.js";
-import {
-  SUPPORTED_LANGUAGES
-} from "./chunk-5EJZE3FP.js";
+  ENV_ACP_REPEATED_TOOL_FAILURE_GUARD,
+  QWEN_CODE_SERVE_ENV
+} from "./chunk-XX5HQLCZ.js";
 import "./chunk-XFSFZCM5.js";
 import "./chunk-2EAZ43JQ.js";
 import "./chunk-NF5J2WFA.js";
-import "./chunk-R4Q2PEFV.js";
+import "./chunk-E7HXORS7.js";
 import "./chunk-W3N5XAZ6.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-53GWJOLP.js";
+} from "./chunk-2P2IXKDR.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import {
@@ -362,7 +364,6 @@ import {
   TURN_INTERRUPTION_HISTORY_TAIL_COUNT,
   WorkspaceMcpBudget,
   abortGoalForStopHookCap,
-  applyProviderInstallPlan,
   buildBtwCacheSafeParams,
   buildBtwPrompt,
   buildGoalContinuationParts,
@@ -379,36 +380,38 @@ import {
   readManyFiles,
   runManagedRememberByAgent,
   subagentGenerator
-} from "./chunk-BZM5U74J.js";
+} from "./chunk-I6JRN375.js";
 import {
   buildToolWriteOriginMeta
 } from "./chunk-GELRJXE2.js";
 import "./chunk-32CM56LO.js";
+import {
+  CreateSubSessionTool
+} from "./chunk-6WXVEDT2.js";
+import "./chunk-LJZSMWOH.js";
 import {
   ALL_PROVIDERS,
+  applyProviderInstallPlan,
   buildInstallPlan,
   findExistingProviderModels,
   findProviderById,
   getDefaultBaseUrlForProtocol,
   getDefaultModelIds,
-  resolveBaseUrl
-} from "./chunk-AEY27Z35.js";
-import {
-  CreateSubSessionTool
-} from "./chunk-Y2MYW47X.js";
-import "./chunk-LJZSMWOH.js";
-import "./chunk-F42YYSCK.js";
-import "./chunk-NUQVB25K.js";
+  resolveBaseUrl,
+  resolveOwnsModel
+} from "./chunk-7JGH6IMU.js";
+import "./chunk-KLGCF6G7.js";
+import "./chunk-EKMJR7M3.js";
+import "./chunk-EDB556X7.js";
 import {
   restoreWorktreeContext
-} from "./chunk-ZKZHSB5W.js";
-import "./chunk-MSNHNAQZ.js";
+} from "./chunk-QR4Q425T.js";
+import "./chunk-UUT7EFX3.js";
 import "./chunk-DJXSOEFB.js";
-import "./chunk-ZKYR7QS4.js";
-import "./chunk-532WHF4F.js";
+import "./chunk-5VQR2DD7.js";
 import "./chunk-BUQN5LTI.js";
 import "./chunk-ZPJWUGCS.js";
-import "./chunk-LK2WUCDQ.js";
+import "./chunk-YM6KUQ2S.js";
 import {
   MAX_RETAINED_SNAPSHOTS,
   deleteWorkflowSnapshot,
@@ -417,8 +420,8 @@ import {
   listWorkflowSnapshots,
   resolveSavedWorkflowScript,
   toSnapshot
-} from "./chunk-UKZ45TJL.js";
-import "./chunk-RLLRJJDR.js";
+} from "./chunk-LMDMYMSS.js";
+import "./chunk-TJDUJSVH.js";
 import {
   APPROVAL_MODE_INFO,
   BranchPointInvalidError,
@@ -460,15 +463,15 @@ import {
   SessionWriterUnavailableError,
   TURN_RESULT_CODE_TEXT_TRUNCATED,
   TURN_RESULT_TEXT_MAX_CHARS,
+  ToolMode,
   acquireSleepInhibitor,
   ambientGoalToolResultProvenance,
   applyAutoModeDecision,
-  approxBase64Bytes,
+  applyPendingGoalProposal,
   bridgeToolResultImages,
   buildBackgroundEntryLabel,
   buildContextUsage,
   buildPermissionCheckContext,
-  clampInlineMediaPart,
   collectSessionTurnState,
   computeUniqueBranchTitle,
   convertToFunctionErrorResponse,
@@ -494,6 +497,8 @@ import {
   firePostToolUseHook,
   firePreToolUseHook,
   formatDenialStateLog,
+  formatProposeGoalRecoveryFailed,
+  formatProposeGoalRecoveryNotStarted,
   formatStopHookBlockingCapWarning,
   generateToolUseId,
   getAutoModeActionFingerprint,
@@ -512,6 +517,7 @@ import {
   ideContextStore,
   injectPermissionRulesIfMissing,
   isApproveOutcome,
+  isCodeModeToolCallAllowed,
   isCompressionFailureStatus,
   isDenialFallbackReason,
   isGatedMcpScope,
@@ -554,60 +560,66 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-N7VWZDWW.js";
+} from "./chunk-DCRVSIK6.js";
 import "./chunk-GOFAQQZA.js";
+import "./chunk-HEOH7JZY.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
 import "./chunk-65I7S4Z3.js";
-import "./chunk-6HUXPLB5.js";
 import "./chunk-7CLLH5TI.js";
-import "./chunk-XKBFYTCD.js";
+import "./chunk-WK6DEH3Q.js";
+import {
+  parsePositiveIntegerEnv
+} from "./chunk-6PVPNMXU.js";
 import {
   RUNTIME_SNAPSHOT_PREFIX
-} from "./chunk-ZTTC7T4X.js";
+} from "./chunk-5JG3DAKS.js";
 import {
   SESSION_ARTIFACT_PERSISTENCE_VERSION,
   normalizeEventPayload,
   normalizeSnapshotPayload,
   wrapUserPromptSubmitContext
-} from "./chunk-E4UEO3XM.js";
-import "./chunk-IAEXTMED.js";
-import "./chunk-IRH27ZC2.js";
+} from "./chunk-ME4JBHSB.js";
+import "./chunk-GNV2SFO7.js";
+import "./chunk-5EZRLTLQ.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-F53KKZUD.js";
+import {
+  isValidCronTaskRoutingId
+} from "./chunk-3LMDSCLU.js";
 import {
   promptIdContext,
   todoWorkChainContext
 } from "./chunk-O6GEWCJA.js";
-import "./chunk-36HCNKDS.js";
-import {
-  parsePositiveIntegerEnv
-} from "./chunk-6PVPNMXU.js";
+import "./chunk-WKVZES7O.js";
 import {
   AgentOutputMessageCapture,
   addAgentInputMessageAttributes,
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
+  authoredSkillName,
+  qualifySkillName,
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor
-} from "./chunk-2SZH22YO.js";
-import "./chunk-DTNV6UZY.js";
+} from "./chunk-NJ2OFVUX.js";
+import "./chunk-HFJSQ4GL.js";
 import "./chunk-QJNDUTOL.js";
-import "./chunk-JXNIF2O5.js";
-import "./chunk-NFYEQRLG.js";
+import "./chunk-V545KI73.js";
+import "./chunk-MQRLLBMQ.js";
 import {
   SessionSourceError,
   SessionSourceService
 } from "./chunk-ELRMZTPF.js";
+import "./chunk-U6H3XTFA.js";
+import "./chunk-ACHCT36C.js";
 import {
   escapeJsonTagCharacters
 } from "./chunk-CHEIIBT3.js";
-import "./chunk-PLLIWEM3.js";
+import "./chunk-AEWCOE64.js";
 import {
   registerSession
-} from "./chunk-5GLDOLNQ.js";
+} from "./chunk-OWUAZXXN.js";
 import "./chunk-CH2YDT6X.js";
 import {
   APPROVAL_MODES
@@ -619,49 +631,53 @@ import {
   getOutputStyleTurnReminder,
   getPlanModeSystemReminder,
   resolveMainSessionOutputStyle
-} from "./chunk-LILGKQ4B.js";
-import "./chunk-3CZ2BQV6.js";
-import "./chunk-SAH4BD2J.js";
-import "./chunk-CXTPVBFA.js";
+} from "./chunk-AXZMWAJV.js";
+import "./chunk-NXUZFW3G.js";
+import {
+  approxBase64Bytes,
+  clampInlineMediaPart
+} from "./chunk-WFNEY5G7.js";
+import "./chunk-GSS4SZNG.js";
 import {
   runWithRuntimeContentGenerator
-} from "./chunk-U7O65WKL.js";
+} from "./chunk-BW2SMO6L.js";
 import "./chunk-S6LOFUVP.js";
 import {
   FORK_SUBAGENT_TYPE,
   isSystemReminderContent,
   wrapSystemReminder
-} from "./chunk-FN3JNDRU.js";
-import "./chunk-EUURTIV6.js";
+} from "./chunk-VVI7MK3V.js";
+import "./chunk-WBSJ6VPZ.js";
 import {
   HookEventName,
   createHookOutput
 } from "./chunk-G6UUOCUT.js";
 import "./chunk-IZ2U57NY.js";
+import "./chunk-Z72PLR74.js";
 import "./chunk-NUQ4GK5I.js";
-import "./chunk-K2OJUPOE.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-AXTFYDXT.js";
+} from "./chunk-CXXAZ2LZ.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-YBUMTY7B.js";
-import "./chunk-HNLMYDQE.js";
-import "./chunk-QHMLYMMS.js";
+import "./chunk-66N6C4EH.js";
+import "./chunk-FMLBBXHB.js";
 import "./chunk-VNOVK4I7.js";
 import {
   getToolCallPreparations
-} from "./chunk-CFKIH3D3.js";
+} from "./chunk-S7UQ3V2H.js";
 import "./chunk-JL6APGBX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-4ALNJDHL.js";
-import "./chunk-NOO4QFXM.js";
+import "./chunk-ZKIAGIGH.js";
+import "./chunk-VGY2RGXL.js";
+import "./chunk-C75BXMPM.js";
 import "./chunk-KFFCDLKV.js";
+import "./chunk-KP2FHIFR.js";
 import {
   addDaemonRequestAttribute,
   extractDaemonTraceContext,
   withDaemonSpan
-} from "./chunk-ZW2EUO2A.js";
+} from "./chunk-L6DIANLD.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -687,7 +703,7 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-HBU7EKY4.js";
+} from "./chunk-TRKIKBUW.js";
 import {
   INVOCATION_CONTEXT_META_KEY,
   PRIVATE_ACP_CAPABILITY_ENV,
@@ -696,23 +712,28 @@ import {
   parseInvocationContext,
   runWithInvocationContext
 } from "./chunk-5ETULJLP.js";
-import "./chunk-ZHKTKHMO.js";
+import "./chunk-7MIBD3LG.js";
 import "./chunk-VGC4I5JJ.js";
+import {
+  getAllMemoryFilenames,
+  getSpecificMimeType
+} from "./chunk-QZW6WRB7.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
 } from "./chunk-EDIDYZBT.js";
 import "./chunk-HD7O6WLV.js";
 import {
-  getAllMemoryFilenames,
-  getSpecificMimeType
-} from "./chunk-J6MB5ZHZ.js";
+  extractCodeModeImageContent,
+  runWithToolCallRuntime,
+  runWithoutToolCallRuntime
+} from "./chunk-CFMZLE3L.js";
 import "./chunk-WZAD4ZNJ.js";
 import {
   REASONING_EFFORT_TIERS,
   getGptReasoningCapabilities,
   parseModelReasoningCapabilities
-} from "./chunk-3FPYT6QC.js";
+} from "./chunk-ARDHE6MM.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
@@ -721,7 +742,7 @@ import "./chunk-TIGXX4PA.js";
 import {
   hasVertexProjectConfigured,
   preloadContentGenerator
-} from "./chunk-3UXUOFO6.js";
+} from "./chunk-7W2Y3PZD.js";
 import "./chunk-XFFRI3WM.js";
 import {
   AuthType
@@ -738,9 +759,9 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-W5ZQMAEM.js";
+} from "./chunk-4Y2I3CI3.js";
 import "./chunk-74TONY4F.js";
-import "./chunk-HUXPEUFL.js";
+import "./chunk-SYROIHU7.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -748,7 +769,7 @@ import {
   ToolNames,
   canonicalToolName,
   isShellProgressData
-} from "./chunk-TP6FYVQT.js";
+} from "./chunk-RSWBT7AZ.js";
 import {
   Storage,
   createDebugLogger,
@@ -758,13 +779,13 @@ import {
   sessionIdContext
 } from "./chunk-ZAFYHRVY.js";
 import "./chunk-TBWQLLFO.js";
+import "./chunk-WNQRJXKP.js";
 import "./chunk-V5U2NZNJ.js";
-import "./chunk-6W4HBUA2.js";
-import "./chunk-TPKQIA7G.js";
+import "./chunk-BSIOCNDK.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-JYKWOREU.js";
+} from "./chunk-WMEX6CFP.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -784,7 +805,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
@@ -1025,6 +1046,7 @@ var AcpFileSystemService = class {
 
 // packages/cli/src/acp-integration/acpAgent.ts
 import { Readable as Readable2, Writable as Writable2 } from "node:stream";
+import { realpathSync as realpathSync3 } from "node:fs";
 import * as fs4 from "node:fs/promises";
 import * as os3 from "node:os";
 import * as path7 from "node:path";
@@ -1162,7 +1184,11 @@ function inactiveExtensionSkillRefs(config) {
 }
 __name(inactiveExtensionSkillRefs, "inactiveExtensionSkillRefs");
 function isInactiveExtensionSkill(skill, inactiveSkillRefs) {
-  return skill.level === "extension" && skill.extensionName !== void 0 && inactiveSkillRefs.has(extensionSkillRef(skill.extensionName, skill.name));
+  return skill.level === "extension" && skill.extensionName !== void 0 && // The ref set holds authored names because it is built from the manifest,
+  // while the registry name carries the owner prefix.
+  inactiveSkillRefs.has(
+    extensionSkillRef(skill.extensionName, authoredSkillName(skill))
+  );
 }
 __name(isInactiveExtensionSkill, "isInactiveExtensionSkill");
 
@@ -2154,6 +2180,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");
@@ -3289,6 +3321,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;
@@ -4052,6 +4085,7 @@ async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.
     const isInactiveExtensionCommand = cmd.skillDetail.level === "extension" && isInactiveExtensionSkill(
       {
         name: cmd.skillDetail.name,
+        authoredName: cmd.skillDetail.authoredName,
         level: "extension",
         extensionName: "extensionName" in cmd.skillDetail && typeof cmd.skillDetail.extensionName === "string" ? cmd.skillDetail.extensionName : void 0
       },
@@ -4137,6 +4171,7 @@ var Session = class {
     this.onActiveWorkChanged = onActiveWorkChanged;
     this.isWorkflowRunLiveInSiblingSession = isWorkflowRunLiveInSiblingSession;
     this.sessionId = id;
+    this.restoredHistoryGaps = config.getSessionRestoreRuntime?.()?.historyGaps;
     this.workflowHistory = [...workflowHistory];
     this.requiresManagedConversationBinding = isReservedStandaloneSessionSourceType(
       this.config.getSessionSourceType?.()
@@ -4183,6 +4218,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
@@ -4200,6 +4236,7 @@ var Session = class {
    */
   followupAbort = null;
   turn = 0;
+  codeModeNestedSequence = 0;
   refreshContextFilesOnWrite = false;
   activeTodoWorkChainPromptId;
   createdAt = Date.now();
@@ -4277,6 +4314,7 @@ var Session = class {
   backgroundNotificationAcceptances = /* @__PURE__ */ new Map();
   activeNotificationAcceptances = /* @__PURE__ */ new Set();
   goalQueue = [];
+  heldGoalProposal;
   goalProcessing = false;
   activeGoalTurn;
   goalHostUnbind;
@@ -4379,6 +4417,7 @@ var Session = class {
   // Implement SessionContext interface
   sessionId;
   sessionReasoningSelection;
+  restoredHistoryGaps;
   #bindGoalRuntime() {
     try {
       const runtime = this.config.getGoalRuntime();
@@ -4386,6 +4425,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)}`
@@ -4571,6 +4613,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;
@@ -5485,7 +5531,7 @@ var Session = class {
       }
     }
   }
-  reloadModelProvidersFromDisk() {
+  async reloadModelProvidersFromDisk() {
     if (!this.settings.reloadScopesFromDiskAtomically([
       "User" /* User */,
       "Workspace" /* Workspace */
@@ -5496,6 +5542,7 @@ var Session = class {
       this.settings.merged.modelProviders,
       this.settings.merged.providerProtocol ?? {}
     );
+    await this.config.setImageModel(this.settings.merged.imageModel);
   }
   installPendingManagedConversationBinding(expectation, assertIdentity) {
     if (!this.requiresManagedConversationBinding || expectation.canonicalSessionId !== this.sessionId) {
@@ -5974,15 +6021,15 @@ var Session = class {
     llmClient.truncateHistory(apiTruncateIndex);
     chat.stripThoughtsFromHistory();
     this.clearActiveTodoPlanRevision();
+    this.activeTodoWorkChainPromptId = void 0;
     const preserveQueuedPromptPriority = this.todoStopGuardQueuedPromptPriority;
     const shouldDrainAutomaticQueues = (this.todoStopGuard.blocksUnrelatedAutomaticTurns || this.todoStopGuard.hasCommittedContinuation) && !preserveQueuedPromptPriority;
     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) },
@@ -6012,6 +6059,7 @@ var Session = class {
     }
     this.config.getLlmClient().setHistory(structuredClone(history));
     this.clearActiveTodoPlanRevision();
+    this.activeTodoWorkChainPromptId = void 0;
     this.#clearTodoStopGuardTrustAndDrainAutomaticQueues();
   }
   #computeApiTruncationIndexForUserTurn(apiHistory, targetTurnIndex) {
@@ -6095,6 +6143,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,
@@ -6104,7 +6163,7 @@ var Session = class {
         scheduledGoalTurn,
         turnRecording
       );
-      this.#settleTurnRecording(
+      await this.#settleTurnRecording(
         result.stopReason === "cancelled" ? "cancelled" : "completed",
         turnRecording,
         result
@@ -6116,11 +6175,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) {
@@ -6168,7 +6232,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);
@@ -6184,6 +6258,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, {
@@ -6194,6 +6276,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;
       }
@@ -6346,6 +6429,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();
@@ -6373,6 +6461,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 = (
@@ -6404,6 +6509,29 @@ var Session = class {
       await this.#consumeLiveEndInstruction();
     }
   }
+  #getRecoveryPlan(fullHistory) {
+    const llmClient = this.config.getLlmClient();
+    if (!llmClient || !llmClient.isInitialized()) {
+      return void 0;
+    }
+    const chat = this.#getCurrentChat();
+    if (this.config.getRestoreAskUserQuestion?.() === true && findRestorableAskUserQuestion(chat.peekLastHistoryEntry()) !== void 0) {
+      return void 0;
+    }
+    const runtimeGaps = this.config.getSessionRestoreRuntime?.()?.historyGaps ?? (normalizeSessionIdForLookup(this.config.getSessionId()) === this.sessionId ? this.restoredHistoryGaps : void 0);
+    return buildSessionRecoveryPlanFromApiHistory({
+      sessionId: this.sessionId,
+      apiHistory: fullHistory ? chat.getHistory() : chat.getHistoryTailShallow?.(TURN_INTERRUPTION_HISTORY_TAIL_COUNT) ?? chat.getHistoryTail(TURN_INTERRUPTION_HISTORY_TAIL_COUNT),
+      historyGaps: runtimeGaps?.length ? runtimeGaps : this.config.getResumedSessionData?.()?.historyGaps
+    });
+  }
+  getRecoveryStatus() {
+    const recoveryPlan = this.#getRecoveryPlan(false);
+    return {
+      kind: recoveryPlan?.kind ?? "clean",
+      canContinue: recoveryPlan?.canContinue === true && !(this.pendingPrompt && !this.pendingPrompt.signal.aborted)
+    };
+  }
   /**
    * Classify whether an unfinished previous turn can be resumed — an
    * interrupted prompt (the model never answered) or a turn left with dangling
@@ -6418,26 +6546,11 @@ var Session = class {
    * authoritatively. Powers `qwen/control/session/continue`.
    */
   async continueLastTurn() {
-    const llmClient = this.config.getLlmClient();
-    if (!llmClient || !llmClient.isInitialized()) {
-      return { accepted: false, interruption: "none" };
-    }
-    const chat = this.#getCurrentChat();
-    if (this.config.getRestoreAskUserQuestion?.() === true && findRestorableAskUserQuestion(chat.peekLastHistoryEntry()) !== void 0) {
-      return { accepted: false, interruption: "none" };
-    }
-    const recoveryPlan = buildSessionRecoveryPlanFromApiHistory({
-      sessionId: this.sessionId,
-      apiHistory: chat.getHistoryTailShallow?.(TURN_INTERRUPTION_HISTORY_TAIL_COUNT) ?? chat.getHistoryTail(TURN_INTERRUPTION_HISTORY_TAIL_COUNT)
-    });
-    if (!recoveryPlan.continuation) {
-      return { accepted: false, interruption: "none" };
-    }
-    const interruption = recoveryPlan.kind === "interrupted_prompt" ? "interrupted_prompt" : "interrupted_turn";
-    if (this.pendingPrompt && !this.pendingPrompt.signal.aborted) {
-      return { accepted: false, interruption };
-    }
-    return { accepted: true, interruption };
+    const recovery = this.getRecoveryStatus();
+    return {
+      accepted: recovery.canContinue,
+      interruption: recovery.kind === "interrupted_prompt" || recovery.kind === "interrupted_turn" ? recovery.kind : "none"
+    };
   }
   /**
    * Generate a server-side follow-up suggestion for the just-completed
@@ -6554,6 +6667,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(
@@ -6566,6 +6743,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;
@@ -6583,6 +6773,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,
@@ -6626,11 +6818,8 @@ var Session = class {
                 goalTurn.permit
               );
             } else if (isContinue) {
-              const recoveryPlan = buildSessionRecoveryPlanFromApiHistory({
-                sessionId: this.sessionId,
-                apiHistory: this.#getCurrentChat().getHistory()
-              });
-              if (!recoveryPlan.continuation) {
+              const recoveryPlan = this.#getRecoveryPlan(true);
+              if (!recoveryPlan?.continuation) {
                 debugLogger6.warn(
                   `[Session] continue ${promptId}: no interrupted turn on re-detection, nothing to continue`
                 );
@@ -6765,13 +6954,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
                 },
@@ -6800,9 +6991,14 @@ var Session = class {
             if (!continuesCurrentWorkChain && !this.todoStopGuard.enabled) {
               this.#resetTodoStopGuardBackgroundLineage();
             }
+            const continuesTodoWorkChain = continuesCurrentWorkChain || this.activeTodoWorkChainPromptId !== void 0 && this.config.getActiveTodoReminder(
+              this.activeTodoWorkChainPromptId
+            ) !== void 0 && this.config.getActiveTodoWorkChainOwner(
+              this.activeTodoWorkChainPromptId
+            ) === this.config.getActiveTodoPlanWriterOwner();
             this.config.startActiveTodoWorkChain(
               promptId,
-              continuesCurrentWorkChain ? this.activeTodoWorkChainPromptId : void 0
+              continuesTodoWorkChain ? this.activeTodoWorkChainPromptId : void 0
             );
             this.activeTodoWorkChainPromptId = promptId;
             if (!isRestoreAskUserQuestion) {
@@ -6858,7 +7054,8 @@ ${this.pendingRecoveredAgentsNotice}
               parts = insertAfterFunctionResponses(parts, [noticePart]);
               this.pendingRecoveredAgentsNotice = null;
             }
-            const activeTodoReminder = isRestoreAskUserQuestion ? void 0 : this.config.takeActiveTodoReminder(promptId, true);
+            const isMachineContinuation = isRetry || isContinue || isRuntimeContinuation;
+            const activeTodoReminder = isRestoreAskUserQuestion || !isMachineContinuation ? void 0 : this.config.takeActiveTodoReminder(promptId, true);
             if (activeTodoReminder && !parts.some((part) => part.text === activeTodoReminder)) {
               parts = insertAfterFunctionResponses(parts, [
                 { text: activeTodoReminder }
@@ -7286,6 +7483,7 @@ ${this.pendingRecoveredAgentsNotice}
   async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride, responseCapture, rejectOnLoopDetected = false, goalTurn, channelTurn = false) {
     const stopHookBlockingCap = this.config.getStopHookBlockingCap();
     let stopHookIterationCount = 0;
+    let stopHookForcedTurn = false;
     let stopHookReasons = [];
     const onFullTurnModel = /* @__PURE__ */ __name((model) => {
       if (modelOverride === model) {
@@ -7297,6 +7495,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) {
@@ -7310,6 +7513,7 @@ ${this.pendingRecoveredAgentsNotice}
         this.#clearTodoStopGuardTrustAndDrainAutomaticQueues();
       }
       if (this.todoStopGuardQueuedPromptPriority) {
+        blockGoalProposalSettlement();
         return { stopReason: "end_turn" };
       }
       if (this.todoStopGuard.needsStopInspection) {
@@ -7323,6 +7527,7 @@ ${this.pendingRecoveredAgentsNotice}
               pendingSend.signal
             );
             if (claim === "queued") {
+              blockGoalProposalSettlement();
               this.#preserveUnsentMessageHistory(
                 { role: "user", parts: drained.parts },
                 true
@@ -7333,7 +7538,11 @@ ${this.pendingRecoveredAgentsNotice}
               this.todoStopGuard.blockUntilOrdinaryPromptStarts();
             }
           }
+          stopHookForcedTurn = false;
+          stopHookIterationCount = 0;
+          stopHookReasons = [];
           this.todoStopGuard.acceptMidTurnUserInput();
+          blockGoalProposalSettlement();
           const continuation2 = await this.#runStopContinuation(
             pendingSend,
             promptId + "_mid_turn_" + ++midTurnContinuationCount,
@@ -7361,6 +7570,7 @@ ${this.pendingRecoveredAgentsNotice}
             pendingSend.signal
           );
           if (claim === "queued") {
+            blockGoalProposalSettlement();
             return { stopReason: "end_turn" };
           }
           if (claim === "unavailable") {
@@ -7383,7 +7593,7 @@ ${this.pendingRecoveredAgentsNotice}
               type: "hook-execution-request" /* HOOK_EXECUTION_REQUEST */,
               eventName: "Stop",
               input: {
-                stop_hook_active: true,
+                stop_hook_active: stopHookForcedTurn,
                 last_assistant_message: responseText,
                 ...contextUsage
               },
@@ -7410,6 +7620,7 @@ ${this.pendingRecoveredAgentsNotice}
                 pendingSend.signal
               );
               if (claim === "queued") {
+                blockGoalProposalSettlement();
                 this.#preserveUnsentMessageHistory(
                   { role: "user", parts: drained.parts },
                   true
@@ -7420,7 +7631,11 @@ ${this.pendingRecoveredAgentsNotice}
                 this.todoStopGuard.blockUntilOrdinaryPromptStarts();
               }
             }
+            stopHookForcedTurn = false;
+            stopHookIterationCount = 0;
+            stopHookReasons = [];
             this.todoStopGuard.acceptMidTurnUserInput();
+            blockGoalProposalSettlement();
             const continuation2 = await this.#runStopContinuation(
               pendingSend,
               promptId + "_mid_turn_" + ++midTurnContinuationCount,
@@ -7448,6 +7663,7 @@ ${this.pendingRecoveredAgentsNotice}
               pendingSend.signal
             );
             if (claim === "queued") {
+              blockGoalProposalSettlement();
               return { stopReason: "end_turn" };
             }
             if (claim === "unavailable") {
@@ -7477,7 +7693,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(
@@ -7492,6 +7711,7 @@ ${this.pendingRecoveredAgentsNotice}
           await this.#pauseGoalForStopHookCap();
         }
         this.todoStopGuard.suspend();
+        blockGoalProposalSettlement();
         await this.messageEmitter.emitAgentMessage(warning);
         debugLogger6.warn(warning);
         return { stopReason: "end_turn" };
@@ -7514,6 +7734,7 @@ ${this.pendingRecoveredAgentsNotice}
           stopHookCount
         );
       }
+      stopHookForcedTurn = Boolean(externalReason);
       const continuation = await this.#runStopContinuation(
         pendingSend,
         continuationPromptId,
@@ -7538,6 +7759,9 @@ ${this.pendingRecoveredAgentsNotice}
           ...channelTurn ? { channelTurn: true } : {}
         }
       );
+      if (continuation.supersededAutomaticContinuation) {
+        stopHookForcedTurn = false;
+      }
       if (continuation.supersededAutomaticContinuation && externalReason) {
         stopHookIterationCount--;
         stopHookReasons = stopHookReasons.slice(0, -1);
@@ -7564,6 +7788,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);
@@ -7670,6 +7900,7 @@ ${this.pendingRecoveredAgentsNotice}
                 nextGuardContinuation = void 0;
                 if (!options.externalParts) {
                   preserveGuardOnSkippedSend = true;
+                  blockGoalProposalSettlement();
                   return { kind: "stop", stopReason: "end_turn" };
                 }
                 if (!initialSend && nextMessage) {
@@ -7688,6 +7919,7 @@ ${this.pendingRecoveredAgentsNotice}
                   guardForThisSend = void 0;
                   nextGuardContinuation = void 0;
                   preserveGuardOnSkippedSend = true;
+                  blockGoalProposalSettlement();
                   if (initialSend) {
                     supersededAutomaticContinuation = true;
                   }
@@ -7745,6 +7977,7 @@ ${this.pendingRecoveredAgentsNotice}
                   guardForThisSend = void 0;
                   nextGuardContinuation = void 0;
                   preserveGuardOnSkippedSend = true;
+                  blockGoalProposalSettlement();
                   if (initialSend) {
                     supersededAutomaticContinuation = true;
                   }
@@ -8227,8 +8460,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 = {
@@ -8237,6 +8483,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 } : {},
@@ -8249,6 +8496,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)}`
@@ -8556,7 +8806,10 @@ ${this.pendingRecoveredAgentsNotice}
     if (hadMidTurnUserInput) {
       this.todoStopGuard.acceptMidTurnUserInput();
     }
-    const activeTodoReminder = this.config.takeActiveTodoReminder(promptId);
+    const carriesAgentToolResult = toolRun.parts.some(
+      (part) => canonicalToolName(part.functionResponse?.name ?? "") === ToolNames.AGENT
+    );
+    const activeTodoReminder = carriesAgentToolResult ? this.config.takeActiveTodoReminder(promptId, true) : this.config.takeActiveTodoReminder(promptId);
     if (abortSignal.aborted) {
       return {
         message: {
@@ -8922,6 +9175,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;
@@ -9043,6 +9300,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(
@@ -9068,6 +9348,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
         }
       );
@@ -9077,10 +9359,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",
@@ -10685,50 +10975,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;
         }
@@ -10743,6 +11015,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),
@@ -11057,7 +11366,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) {
@@ -11186,7 +11497,9 @@ ${this.pendingRecoveredAgentsNotice}
               recordSkippedToolCall,
               queueToolResultRecord,
               executionCallIds.get(fc),
-              onFullTurnModel
+              onFullTurnModel,
+              void 0,
+              finalizeNestedToolResult
             );
             parts.push(...r.parts);
             collectMemoryWriteCandidates(r);
@@ -11263,13 +11576,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";
@@ -11317,6 +11632,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,
@@ -11463,6 +11782,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) {
@@ -11498,7 +11830,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
@@ -11507,6 +11843,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
@@ -12483,12 +12832,85 @@ ${this.pendingRecoveredAgentsNotice}
             });
             executionStatus = "error";
             executeAttempted = true;
+            executionStartedAt = performance.now();
             try {
-              toolResult = await invocation.execute(
+              const execute = /* @__PURE__ */ __name(() => invocation.execute(
                 activeToolAbortSignal,
                 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;
@@ -12602,7 +13024,8 @@ ${this.pendingRecoveredAgentsNotice}
               toolUseId,
               permissionMode,
               activeToolAbortSignal,
-              callId
+              callId,
+              elapsedExecutionMs()
             );
             if (activeToolAbortSignal.aborted) {
               return earlyErrorResponse(
@@ -12657,7 +13080,8 @@ ${this.pendingRecoveredAgentsNotice}
                 isInterrupt,
                 permissionMode,
                 activeToolAbortSignal,
-                callId
+                callId,
+                elapsedExecutionMs()
               );
               if (failureHookResult.additionalContext) {
                 debugLogger6.debug(
@@ -12752,6 +13176,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,
@@ -12810,8 +13238,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,
@@ -12838,7 +13267,8 @@ ${this.pendingRecoveredAgentsNotice}
                 isInterrupt,
                 String(approvalMode),
                 activeToolAbortSignal,
-                callId
+                callId,
+                elapsedExecutionMs()
               );
               if (failureHookResult.additionalContext) {
                 debugLogger6.debug(
@@ -13059,7 +13489,9 @@ ${this.pendingRecoveredAgentsNotice}
               }
             };
           } else {
-            return { text: `@${part.uri}` };
+            return {
+              text: part.name ? `@${part.uri} (original filename: ${JSON.stringify(part.name)})` : `@${part.uri}`
+            };
           }
         }
         case "resource": {
@@ -14976,7 +15408,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`,
@@ -14995,7 +15427,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) {
@@ -15007,7 +15439,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) {
@@ -15692,14 +16124,38 @@ function readExistingProviderConfig(config, settings) {
     // Never serialize the raw secret over the ACP wire. Expose only whether a
     // key is stored; the client can omit `apiKey` on connect to keep it.
     ...apiKey ? { hasApiKey: true } : {},
-    ...existing ? { modelIds: existing.models.map((model) => model.id) } : {},
+    ...existing ? {
+      modelIds: existing.models.filter(
+        (model) => model.baseUrl === firstModel?.baseUrl && model.envKey === firstModel?.envKey
+      ).map((model) => model.id)
+    } : {},
     ...advancedConfig ? { advancedConfig } : {}
   };
 }
 __name(readExistingProviderConfig, "readExistingProviderConfig");
-function resolveExistingProviderApiKey(config, settings, protocol, baseUrl) {
-  const envKey = resolveProviderEnvKey(config, protocol, baseUrl);
-  return readSettingsEnv(settings, envKey);
+function resolveExistingProviderApiKey(config, settings, protocol, baseUrl, modelIds) {
+  const owns = resolveOwnsModel(config);
+  const models = (settings.merged.modelProviders?.[protocol] ?? []).filter(
+    (model) => owns?.(model) && model.baseUrl === baseUrl && modelIds.includes(model.id)
+  );
+  const conversation = models.filter(
+    (model) => !model.imageOnly && !model.voiceOnly
+  );
+  if (!conversation.length && modelIds.some((id) => !models.some((model) => model.id === id))) {
+    return readSettingsEnv(
+      settings,
+      resolveProviderEnvKey(config, protocol, baseUrl)
+    );
+  }
+  const keys = new Set(
+    (conversation.length ? conversation : models).map((model) => model.envKey)
+  );
+  if (keys.size === 1) return readSettingsEnv(settings, [...keys][0]);
+  if (keys.size > 1) return void 0;
+  return readSettingsEnv(
+    settings,
+    resolveProviderEnvKey(config, protocol, baseUrl)
+  );
 }
 __name(resolveExistingProviderApiKey, "resolveExistingProviderApiKey");
 function serializeProviderConfig(config, settings) {
@@ -15747,14 +16203,6 @@ function readProviderSetupInputs(config, params, resolveExistingApiKey) {
       `Invalid or missing baseUrl for provider "${config.id}"`
     );
   }
-  const apiKey = readOptionalString3(params["apiKey"], "apiKey") ?? resolveExistingApiKey?.(protocol ?? config.protocol, baseUrl);
-  if (!apiKey) {
-    throw RequestError.invalidParams(void 0, "Invalid or missing apiKey");
-  }
-  const apiKeyError = config.validateApiKey?.(apiKey, baseUrl);
-  if (apiKeyError) {
-    throw RequestError.invalidParams(void 0, apiKeyError);
-  }
   const defaultModelIds = getDefaultModelIds(config);
   const modelIds = readStringArray(params["modelIds"], "modelIds");
   const resolvedModelIds = modelIds.length > 0 ? modelIds : defaultModelIds;
@@ -15764,6 +16212,18 @@ function readProviderSetupInputs(config, params, resolveExistingApiKey) {
       `Invalid or missing modelIds for provider "${config.id}"`
     );
   }
+  const apiKey = readOptionalString3(params["apiKey"], "apiKey") ?? resolveExistingApiKey?.(
+    protocol ?? config.protocol,
+    baseUrl,
+    resolvedModelIds
+  );
+  if (!apiKey) {
+    throw RequestError.invalidParams(void 0, "Invalid or missing apiKey");
+  }
+  const apiKeyError = config.validateApiKey?.(apiKey, baseUrl);
+  if (apiKeyError) {
+    throw RequestError.invalidParams(void 0, apiKeyError);
+  }
   const advancedConfig = readProviderAdvancedConfig(params["advancedConfig"]);
   return {
     ...protocol ? { protocol } : {},
@@ -16559,52 +17019,81 @@ async function runAcpAgent(config, settings, argv, options) {
     eventLoopMonitor.dispose();
     throw err;
   }
+  let drainPoolPromise;
   const drainPoolBeforeExit = /* @__PURE__ */ __name(async (label, strict = false) => {
     if (!agentInstance) return;
     try {
-      await agentInstance.shutdownMcpPool(8e3);
+      drainPoolPromise ??= agentInstance.shutdownMcpPool(8e3);
+      await drainPoolPromise;
     } catch (err) {
       debugLogger9.error(`[ACP] MCP pool drain (${label}) error:`, err);
       if (strict) throw err;
     }
   }, "drainPoolBeforeExit");
+  let disposeSessionsPromise;
+  const disposeSessionsOnce = /* @__PURE__ */ __name(() => {
+    if (!agentInstance) return Promise.resolve();
+    disposeSessionsPromise ??= agentInstance.disposeSessions();
+    return disposeSessionsPromise;
+  }, "disposeSessionsOnce");
   let shuttingDown = false;
   let managedShutdownPromise;
-  let sessionEndFired = false;
-  const fireSessionEndOnce = /* @__PURE__ */ __name(async (reason, managedConfigs) => {
-    if (sessionEndFired) return;
-    sessionEndFired = true;
-    const configs = new Set(managedConfigs ?? [config]);
-    if (!managedConfigs) {
-      const sessions = agentInstance?.getActiveSessions();
-      if (sessions) {
-        for (const session of sessions) {
-          const sessionConfig = session.getConfig?.();
-          if (sessionConfig) {
-            configs.add(sessionConfig);
+  let sessionEndPromise;
+  const fireSessionEndOnce = /* @__PURE__ */ __name((reason, managedConfigs) => {
+    if (sessionEndPromise) return sessionEndPromise;
+    sessionEndPromise = (async () => {
+      const configs = new Set(managedConfigs ?? [config]);
+      if (!managedConfigs) {
+        const sessions = agentInstance?.getActiveSessions();
+        if (sessions) {
+          for (const session of sessions) {
+            const sessionConfig = session.getConfig?.();
+            if (sessionConfig) {
+              configs.add(sessionConfig);
+            }
           }
         }
       }
-    }
-    const failures = [];
-    for (const cfg of configs) {
-      const hookSystem = cfg.getHookSystem?.();
-      const hooksEnabled = !cfg.getDisableAllHooks?.();
-      if (!hooksEnabled || !hookSystem || !cfg.hasHooksForEvent?.("SessionEnd")) {
-        continue;
-      }
+      const controller = new AbortController();
+      const timeout = setTimeout(() => controller.abort(), 3e4);
+      timeout.unref();
       try {
-        await hookSystem.fireSessionEndEvent(reason);
-      } catch (err) {
-        if (managedConfigs) failures.push(err);
-        debugLogger9.warn(
-          `SessionEnd hook failed: ${err instanceof Error ? err.message : String(err)}`
+        const results = await Promise.allSettled(
+          [...configs].flatMap((cfg) => {
+            const hookSystem = cfg.getHookSystem?.();
+            if (cfg.getDisableAllHooks?.() || !hookSystem || typeof hookSystem.fireSessionEndEvent !== "function" || !cfg.hasHooksForEvent?.("SessionEnd")) {
+              return [];
+            }
+            return [
+              Promise.resolve().then(
+                () => hookSystem.fireSessionEndEvent(reason, controller.signal)
+              )
+            ];
+          })
         );
+        const failures = results.filter(
+          (result) => result.status === "rejected"
+        ).map((result) => result.reason);
+        if (controller.signal.aborted) {
+          failures.push(
+            new Error(
+              "SessionEnd hook did not complete within 30s (cancelled)"
+            )
+          );
+        }
+        for (const failure2 of failures) {
+          debugLogger9.warn(
+            `SessionEnd hook failed: ${failure2 instanceof Error ? failure2.message : String(failure2)}`
+          );
+        }
+        if (managedConfigs && failures.length > 0) {
+          throw new AggregateError(failures, "SessionEnd hook shutdown failed");
+        }
+      } finally {
+        clearTimeout(timeout);
       }
-    }
-    if (failures.length > 0) {
-      throw new AggregateError(failures, "SessionEnd hook shutdown failed");
-    }
+    })();
+    return sessionEndPromise;
   }, "fireSessionEndOnce");
   const shutdownManagedAgent = /* @__PURE__ */ __name((reason, label) => {
     if (managedShutdownPromise) return managedShutdownPromise;
@@ -16691,7 +17180,7 @@ async function runAcpAgent(config, settings, argv, options) {
     }
     try {
       await fireSessionEndOnce("other" /* Other */);
-      await agentInstance?.disposeSessions();
+      await disposeSessionsOnce();
       try {
         process.stdin.destroy();
       } catch {
@@ -16729,7 +17218,7 @@ async function runAcpAgent(config, settings, argv, options) {
     } else {
       await fireSessionEndOnce("prompt_input_exit" /* PromptInputExit */);
       await drainPoolBeforeExit("ide_close");
-      await agentInstance?.disposeSessions();
+      await disposeSessionsOnce();
     }
   } finally {
     process.off("SIGTERM", shutdownHandler);
@@ -18082,7 +18571,7 @@ var QwenAgent = class _QwenAgent {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.23.3";
+    const version = "0.23.4";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -18515,7 +19004,8 @@ var QwenAgent = class _QwenAgent {
           sessionSource,
           sessionId,
           true,
-          {},
+          // Restore token counts only after the model route is authenticated.
+          { skipLlmInitialization: true },
           void 0,
           restoreOptions
         )
@@ -18851,7 +19341,8 @@ var QwenAgent = class _QwenAgent {
           sessionSource,
           sessionId,
           true,
-          {},
+          // Restore token counts only after the model route is authenticated.
+          { skipLlmInitialization: true },
           void 0,
           RESUME_RESTORE_OPTIONS
         )
@@ -19028,7 +19519,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) {
@@ -19165,13 +19656,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;
@@ -19251,8 +19753,105 @@ var QwenAgent = class _QwenAgent {
     });
   }
   loadPermissionSettings(cwd) {
-    this.settings = loadSettings(cwd);
-    return this.settings;
+    return this.adoptRequestSettings(this.loadRequestSettings(cwd), cwd);
+  }
+  /**
+   * Publish a freshly loaded `LoadedSettings` into the process-wide
+   * `this.settings` cache only when it was loaded for the daemon's own
+   * workspace. `this.settings` is the "latest loaded" cache read by the
+   * daemon-global control handlers (`workspaceReload`,
+   * `workspaceModelProvidersReload`, `qwen/settings/getPath`, workspace
+   * status): a session-scoped load for a foreign workspace (worktree) must
+   * stay request-local, or that workspace's settings, approval mode, MCP
+   * servers, hooks and permission rules would bleed into every other live
+   * session. The load still returns the caller's instance either way.
+   */
+  adoptRequestSettings(settings, settingsCwd) {
+    if (this.canonicalWorkspacePath(settingsCwd) === this.canonicalWorkspacePath(this.config.getTargetDir())) {
+      this.settings = settings;
+    }
+    return settings;
+  }
+  /**
+   * Canonical spelling for workspace-coordinate comparisons. A session's
+   * admission root and a request's settings cwd can name the same directory
+   * through a symlink (`/tmp` vs `/private/tmp` on macOS) or a different case
+   * on a case-insensitive volume; a plain string compare then turns a
+   * workspace grant's *revocation* into a no-op on the live session while the
+   * caller is told it saved (fail-open). `realpathSync.native()` resolves
+   * both through the filesystem — including the on-disk casing on macOS and
+   * Windows — and deliberately does NOT fold case itself: on a case-sensitive
+   * volume `proj` and `PROJ` are genuinely different workspaces, and folding
+   * would silently authorise one under a rule written for the other.
+   */
+  canonicalWorkspacePath(workspacePath) {
+    const resolved = path7.resolve(workspacePath);
+    try {
+      return realpathSync3.native(resolved);
+    } catch {
+      return resolved;
+    }
+  }
+  /**
+   * Load settings for a single `qwen/settings/*` / `qwen/permissions/*`
+   * request. `skipLoadEnvironment` is set because a per-request read — and, for
+   * session-scoped calls, a foreign-workspace read — must not inject that
+   * workspace's `.env` into the daemon's process-wide `process.env`; env
+   * application stays with the daemon-global reload handlers that call
+   * `reloadEnvironment` deliberately. `consumeCorruptionEnvVars` is stated
+   * explicitly because passing an options object replaces `loadSettings`'s
+   * `= true` default.
+   */
+  loadRequestSettings(settingsCwd) {
+    return loadSettings(settingsCwd, {
+      consumeCorruptionEnvVars: true,
+      skipLoadEnvironment: true
+    });
+  }
+  /**
+   * Resolve the workspace root for the session-aware `qwen/settings/*` +
+   * `qwen/permissions/*` handlers — the ones whose write and read-back share
+   * the resolved coordinate. The handlers whose status/apply routes are
+   * workspace-global (`setMcpServer`, `removeMcpServer`, `setHook`,
+   * `removeHook`, `setExtensionSetting`) deliberately do NOT resolve
+   * `sessionId`: their write would land in the session's worktree while the
+   * status and reload routes keep reading the bootstrap workspace, so the
+   * handler would answer "saved" for a server no route ever lists or applies.
+   * Those five resolve `requestedCwd || this.config.getTargetDir()` instead
+   * (`||`, not `??`: a present-but-empty `cwd` is not a workspace and falls to
+   * the bootstrap dir like an absent one).
+   *
+   * `sessionId` names the requesting session, whose own Config is
+   * relocated to its worktree; without one the daemon's bootstrap
+   * `this.config` is used — nothing relocates the agent-level Config, so that
+   * is the boot workspace and swapping `process.cwd()` for
+   * `this.config.getTargetDir()` is a no-op there. An unresolvable `sessionId`
+   * is rejected rather than silently retargeting the read/write to the
+   * bootstrap workspace, whose trust decision and settings the caller never
+   * selected.
+   */
+  settingsCwdFor(requestedCwd, params) {
+    if (requestedCwd) {
+      return requestedCwd;
+    }
+    const sessionId = params["sessionId"];
+    if (sessionId !== void 0 && sessionId !== null) {
+      if (typeof sessionId !== "string" || sessionId.length === 0) {
+        throw RequestError.invalidParams(
+          void 0,
+          "Invalid sessionId: expected a non-empty string"
+        );
+      }
+      const session = this.sessions.get(sessionId);
+      if (!session) {
+        throw new RequestError(-32004, `Session not found: ${sessionId}`, {
+          errorKind: "session_not_found",
+          sessionId
+        });
+      }
+      return this.sessionWorkspaceRoot(session.getConfig());
+    }
+    return this.config.getTargetDir();
   }
   async buildCoreSettings(settings, cwd) {
     const userSettings = settings.user.settings;
@@ -19376,7 +19975,7 @@ var QwenAgent = class _QwenAgent {
       isTrusted: settings.isTrusted
     };
   }
-  syncLivePermissionManagers(before, after) {
+  syncLivePermissionManagers(before, after, settingScope, settingsCwd) {
     for (const ruleType of PERMISSION_RULE_TYPES) {
       const oldRules = new Set(before[ruleType]);
       const newRules = new Set(after[ruleType]);
@@ -19384,6 +19983,14 @@ var QwenAgent = class _QwenAgent {
       const added = after[ruleType].filter((rule) => !oldRules.has(rule));
       if (removed.length === 0 && added.length === 0) continue;
       for (const session of this.sessions.values()) {
+        if (settingScope === "Workspace" /* Workspace */) {
+          const sessionWorkspace = this.sessionWorkspaceRoot(
+            session.getConfig()
+          );
+          if (this.canonicalWorkspacePath(sessionWorkspace) !== this.canonicalWorkspacePath(settingsCwd)) {
+            continue;
+          }
+        }
         const pm = session.getConfig().getPermissionManager?.();
         if (!pm) continue;
         try {
@@ -19404,6 +20011,20 @@ var QwenAgent = class _QwenAgent {
   workspaceCwd(config) {
     return config.getTargetDir();
   }
+  /**
+   * The stable workspace root a session was admitted under. Unlike
+   * `workspaceCwd` (the live `getTargetDir()`) and `Config.getProjectRoot()`
+   * (also live `targetDir`), this reads the admission-bound `storage`, which
+   * `relocateWorkingDirectory` leaves untouched when `session/cd` moves a
+   * session into a subdirectory (`skipArtifactMigration: true`). Keying the
+   * twelve `qwen/settings/*` / `qwen/permissions/*` handlers and the
+   * workspace-scoped permission fan-out on this root — rather than the live
+   * cwd — is what keeps a post-`cd` request from reading/writing a stray
+   * `<subdir>/.qwen/settings.json`.
+   */
+  sessionWorkspaceRoot(config) {
+    return config.storage.getProjectRoot();
+  }
   safeWorkspaceCwd(config) {
     try {
       return this.workspaceCwd(config);
@@ -20020,13 +20641,22 @@ var QwenAgent = class _QwenAgent {
         if (extension.isActive) continue;
         for (const skill of extension.skills ?? []) {
           const extensionName = extension.name;
-          const key = `extension:${extensionName}:${skill.name}`;
+          const key = `extension:${extensionName}:${qualifySkillName(
+            extensionName,
+            skill.name
+          )}`;
           if (skillsByKey.has(key)) continue;
           skillsByKey.set(
             key,
             mapSkillConfigToStatus(
               {
                 ...skill,
+                // Carry the qualified name like the registry rows do: a
+                // surface that persists this row's name verbatim (the web
+                // shell's Enable toggle) would otherwise write a bare entry
+                // that can never grant once the extension activates.
+                name: qualifySkillName(extensionName, skill.name),
+                authoredName: skill.name,
                 level: "extension",
                 extensionName,
                 extensionDisplayName: extension.displayName
@@ -20520,6 +21150,7 @@ var QwenAgent = class _QwenAgent {
       v: STATUS_SCHEMA_VERSION,
       sessionId,
       workspaceCwd: this.workspaceCwd(config),
+      recovery: session.getRecoveryStatus(),
       state: {
         models: this.buildAvailableModels(config),
         modes: this.buildModesData(config),
@@ -21147,15 +21778,20 @@ var QwenAgent = class _QwenAgent {
         const inputs = readProviderSetupInputs(
           providerConfig,
           params,
-          (protocol, baseUrl) => resolveExistingProviderApiKey(
+          (protocol, baseUrl, modelIds) => resolveExistingProviderApiKey(
             providerConfig,
             this.settings,
             protocol,
-            baseUrl
+            baseUrl,
+            modelIds
           )
         );
         const persistScope = readProviderConnectScope(params["scope"]);
-        const plan = buildInstallPlan(providerConfig, inputs);
+        const plan = buildInstallPlan(
+          providerConfig,
+          inputs,
+          this.settings.merged.modelProviders?.[inputs.protocol ?? providerConfig.protocol]
+        );
         const adapter = createLoadedSettingsAdapter(
           this.settings,
           persistScope
@@ -21191,15 +21827,17 @@ var QwenAgent = class _QwenAgent {
         return setManagedSkillEnabled(this.config, params, requestedCwd);
       }
       case "qwen/settings/getMemory": {
-        const settings = loadSettings(cwd);
-        this.settings = settings;
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadRequestSettings(settingsCwd);
+        this.adoptRequestSettings(settings, settingsCwd);
         return {
           settings: normalizeQwenMemorySettings(settings.merged.memory)
         };
       }
       case "qwen/settings/setMemory": {
         const updates = toRecord3(params["updates"]);
-        const settings = loadSettings(cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadRequestSettings(settingsCwd);
         for (const key of QWEN_MEMORY_SETTING_KEYS) {
           if (updates[key] === void 0) continue;
           if (typeof updates[key] !== "boolean") {
@@ -21210,7 +21848,7 @@ var QwenAgent = class _QwenAgent {
           }
           settings.setValue("User" /* User */, `memory.${key}`, updates[key]);
         }
-        this.settings = settings;
+        this.adoptRequestSettings(settings, settingsCwd);
         return {
           settings: normalizeQwenMemorySettings(settings.merged.memory)
         };
@@ -21219,9 +21857,13 @@ var QwenAgent = class _QwenAgent {
         return { path: this.settings.user.path };
       }
       case "qwen/settings/getMemoryPaths": {
-        const projectRoot = typeof params["projectRoot"] === "string" ? params["projectRoot"] : cwd;
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const projectRoot = typeof params["projectRoot"] === "string" ? params["projectRoot"] : settingsCwd;
         return {
-          paths: await resolveQwenMemoryPaths({ cwd, projectRoot })
+          paths: await resolveQwenMemoryPaths({
+            cwd: settingsCwd,
+            projectRoot
+          })
         };
       }
       case SERVE_STATUS_EXT_METHODS.workspaceMcp:
@@ -24783,9 +25425,10 @@ ${outputText}
         return { newSessionId, title, displayName: title };
       }
       case "qwen/settings/getCore": {
-        const settings = loadSettings(cwd);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadRequestSettings(settingsCwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/setCoreValue": {
         const key = params["key"];
@@ -24795,7 +25438,8 @@ ${outputText}
             "Unsupported Qwen setting key"
           );
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingKey = key;
         const normalizedValue = normalizeCoreSettingValue(
           settingKey,
@@ -24809,8 +25453,8 @@ ${outputText}
         if (settingKey === "general.outputLanguage" && typeof normalizedValue === "string" && scope === "User" /* User */) {
           updateOutputLanguageFile(normalizedValue);
         }
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/setMcpServer": {
         const name = params["name"];
@@ -24820,7 +25464,8 @@ ${outputText}
             "MCP server name is required"
           );
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingScope = toSettingsScope(params["scope"]);
         const scope = settingScope === "Workspace" /* Workspace */ ? "workspace" : "user";
         const existing = readScopeSettings(settings, scope);
@@ -24835,8 +25480,8 @@ ${outputText}
           )
         };
         settings.setValue(settingScope, "mcpServers", mcpServers);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/removeMcpServer": {
         const name = params["name"];
@@ -24846,22 +25491,24 @@ ${outputText}
             "MCP server name is required"
           );
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingScope = toSettingsScope(params["scope"]);
         const scope = settingScope === "Workspace" /* Workspace */ ? "workspace" : "user";
         const existing = readScopeSettings(settings, scope);
         const mcpServers = { ...toRecord3(existing["mcpServers"]) };
         delete mcpServers[name.trim()];
         settings.setValue(settingScope, "mcpServers", mcpServers);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/setHook": {
         const event = params["event"];
         if (!isHookEvent(event)) {
           throw RequestError.invalidParams(void 0, "Invalid hook event");
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingScope = toSettingsScope(params["scope"]);
         const scope = settingScope === "Workspace" /* Workspace */ ? "workspace" : "user";
         const existing = readScopeSettings(settings, scope);
@@ -24881,8 +25528,8 @@ ${outputText}
         }
         hooksRoot[event] = eventHooks;
         settings.setValue(settingScope, "hooks", hooksRoot);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/removeHook": {
         const event = params["event"];
@@ -24893,7 +25540,8 @@ ${outputText}
         if (typeof index !== "number" || !Number.isInteger(index) || index < 0) {
           throw RequestError.invalidParams(void 0, "Invalid hook index");
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingScope = toSettingsScope(params["scope"]);
         const scope = settingScope === "Workspace" /* Workspace */ ? "workspace" : "user";
         const existing = readScopeSettings(settings, scope);
@@ -24908,8 +25556,8 @@ ${outputText}
         eventHooks.splice(index, 1);
         hooksRoot[event] = eventHooks;
         settings.setValue(settingScope, "hooks", hooksRoot);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/setExtensionSetting": {
         const extensionId = params["extensionId"];
@@ -24927,9 +25575,10 @@ ${outputText}
         if (typeof value !== "string") {
           throw RequestError.invalidParams(void 0, "value must be a string");
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const extensionManager = new ExtensionManager({
-          workspaceDir: cwd,
+          workspaceDir: settingsCwd,
           isWorkspaceTrusted: isWorkspaceTrusted(settings.merged).isTrusted ?? true,
           locale: getCurrentLanguage()
         });
@@ -24946,11 +25595,12 @@ ${outputText}
           async () => value,
           extScope
         );
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/permissions/getSettings": {
-        const settings = this.loadPermissionSettings(cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadPermissionSettings(settingsCwd);
         return buildPermissionSettings(settings);
       }
       case "qwen/permissions/setRules": {
@@ -24968,7 +25618,8 @@ ${outputText}
             'ruleType must be "allow", "ask", or "deny"'
           );
         }
-        const settings = this.loadPermissionSettings(cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadPermissionSettings(settingsCwd);
         const before = readPermissionRuleSet(settings.merged);
         const settingScope = scope === "workspace" ? "Workspace" /* Workspace */ : "User" /* User */;
         const scopeSettings = scope === "workspace" ? settings.workspace.settings : settings.user.settings;
@@ -24986,7 +25637,12 @@ ${outputText}
         }
         settings.setValue(settingScope, `permissions.${ruleType}`, rules);
         const after = readPermissionRuleSet(settings.merged);
-        this.syncLivePermissionManagers(before, after);
+        this.syncLivePermissionManagers(
+          before,
+          after,
+          settingScope,
+          settingsCwd
+        );
         return buildPermissionSettings(settings);
       }
       case SERVE_CONTROL_EXT_METHODS.workspaceModelProvidersReload: {
@@ -24997,33 +25653,35 @@ ${outputText}
           debugLogger9.warn("Model-provider settings reload failed");
           return { configsRefreshed: 0, configsFailed: 1 };
         }
-        this.modelProviderReloadRevision += 1;
+        const reloadRevision = ++this.modelProviderReloadRevision;
         const merged = this.settings.merged;
         reloadEnvironment(merged, cwd);
         const providerProtocol = merged.providerProtocol ?? {};
         let configsRefreshed = 0;
         let configsFailed = 0;
-        const reloadConfig = /* @__PURE__ */ __name((config, id) => {
+        const reloadConfig = /* @__PURE__ */ __name(async (config, id) => {
+          if (reloadRevision !== this.modelProviderReloadRevision) return;
           try {
             config.reloadModelProvidersConfig(
               merged.modelProviders,
               providerProtocol
             );
+            await config.setImageModel(merged.imageModel);
             configsRefreshed += 1;
           } catch {
             configsFailed += 1;
             debugLogger9.warn(`Model-provider reload failed for ${id}`);
           }
         }, "reloadConfig");
-        reloadConfig(this.config, "bootstrap");
+        await reloadConfig(this.config, "bootstrap");
         for (const config of this.initializingConfigs) {
           if (config !== this.config) {
-            reloadConfig(config, `initializing:${config.getSessionId()}`);
+            await reloadConfig(config, `initializing:${config.getSessionId()}`);
           }
         }
         for (const [id, session] of this.sessions) {
           try {
-            session.reloadModelProvidersFromDisk();
+            await session.reloadModelProvidersFromDisk();
             configsRefreshed += 1;
           } catch {
             configsFailed += 1;
@@ -25071,7 +25729,8 @@ ${outputText}
             }
             const config = session.getConfig();
             const authType = config.getAuthType();
-            if (providersChanged) {
+            const sessionProvidersChanged = JSON.stringify(config.getModelProvidersConfig()) !== JSON.stringify(newMerged.modelProviders) || JSON.stringify(config.getProviderProtocolConfig()) !== JSON.stringify(newMerged.providerProtocol ?? {});
+            if (sessionProvidersChanged) {
               try {
                 config.reloadModelProvidersConfig(
                   newMerged.modelProviders,
@@ -25083,6 +25742,13 @@ ${outputText}
                 );
               }
             }
+            try {
+              await config.setImageModel(newMerged.imageModel);
+            } catch (err) {
+              debugLogger9.warn(
+                `reload: setImageModel failed for session ${id}: ${err}`
+              );
+            }
             const newModelName = newMerged.model?.name;
             if (changed.has("model") && newModelName && newModelName !== config.getModel() && authType) {
               try {
@@ -25093,7 +25759,7 @@ ${outputText}
                   `reload: switchModel failed for session ${id}: ${err}`
                 );
               }
-            } else if ((providersChanged || envChanged) && authType) {
+            } else if ((sessionProvidersChanged || envChanged) && authType) {
               try {
                 await this.refreshAuthWithPersistedReasoning(
                   config,
@@ -25531,6 +26197,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);
     }
@@ -25946,6 +26616,7 @@ ${outputText}
           settings.merged.modelProviders,
           settings.merged.providerProtocol ?? {}
         );
+        await config.setImageModel(settings.merged.imageModel);
         if (options.deferWorkspaceActivation !== true) {
           const envReload = reloadEnvironment(
             settings.merged,