@qwen-code/qwen-code 0.22.2 → 0.22.3-nightly.20260829.e5cb60ad48

package/chunks/{acpAgent-MXEAN54C.js → acpAgent-ZKIVHQKW.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   recomputeMcpGating
-} from "./chunk-P5GGM4KS.js";
+} from "./chunk-MAQ2W4IF.js";
 import {
   classifyApiError,
   fireSessionDeleteHook
@@ -17,7 +17,7 @@ import {
   normalizePartList,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-OIP7C4FE.js";
+} from "./chunk-PO6YCWIQ.js";
 import {
   getAvailableCommands,
   getSlashCommandFirstToken,
@@ -26,7 +26,7 @@ import {
   isSlashCommand,
   recordDaemonSessionModel,
   restoreSessionModelThenAuthenticate
-} from "./chunk-F5SZP77N.js";
+} from "./chunk-BP5PTNCU.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -34,32 +34,32 @@ import {
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-BAJKAAOY.js";
+} from "./chunk-TGJ2PKCW.js";
 import "./chunk-NYX53SV4.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-AGR5UROZ.js";
+} from "./chunk-YN44TEOZ.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-IJKTMLBE.js";
+} from "./chunk-FIKYKQOO.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-K2NQPH5D.js";
-import "./chunk-FDY5RMGH.js";
+} from "./chunk-OJEMXKA4.js";
+import "./chunk-CFJY4DGX.js";
 import "./chunk-4WGODMVR.js";
 import "./chunk-3SH53ANB.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-QP4C6WCE.js";
+import "./chunk-PI6HYGBE.js";
 import "./chunk-YAF2MQZ6.js";
 import "./chunk-QFCDF5PL.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-JSHHYW6T.js";
+} from "./chunk-3WJLDA3X.js";
 import "./chunk-KW7NOTN6.js";
-import "./chunk-C6K43ZDE.js";
+import "./chunk-W7HH77GN.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
@@ -67,9 +67,9 @@ import {
   endAcpBootstrapConfigProfiling,
   markAcpStartup
 } from "./chunk-5JTIYALA.js";
-import "./chunk-A7YP63XN.js";
-import "./chunk-L6YT5H34.js";
-import "./chunk-CSMI4FP5.js";
+import "./chunk-J7SS77YW.js";
+import "./chunk-CVUBULIX.js";
+import "./chunk-UAOTD2BN.js";
 import {
   computeCpuPercent
 } from "./chunk-LBOVL47Y.js";
@@ -85,7 +85,6 @@ import {
   createWorkspaceMemoryExtractionErrorLogger,
   executeGeneration,
   formatWorkspaceMemoryForgetSummary,
-  isCompatibleLiveSessionSource,
   isValidServerName,
   projectAcpToolResultUpdate,
   redactMcpServerSecrets,
@@ -94,7 +93,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-4MQEPP3Y.js";
+} from "./chunk-PQZBDDNG.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -105,13 +104,17 @@ import {
   hasFullSessionContext,
   observeAcpToolResultProjection,
   observeAcpToolResultWire
-} from "./chunk-3SGB2UHX.js";
+} from "./chunk-NENQE7VH.js";
 import "./chunk-BFPESSTR.js";
 import "./chunk-E7REAOTN.js";
-import "./chunk-XDLEZ5HX.js";
+import "./chunk-ZZUKP7HV.js";
 import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-TXASDT2M.js";
+import {
+  isCompatibleLiveSessionSource
+} from "./chunk-36LGBEM6.js";
+import "./chunk-4VQBQLIZ.js";
 import {
   DAEMON_OWNED_STANDALONE_CREATION_KEY,
   SESSION_SOURCE_META_KEY,
@@ -122,9 +125,9 @@ import {
   buildToolWriteOriginMeta,
   getConversationDirectoryName,
   isSameConversationPath
-} from "./chunk-T3WXYEZ4.js";
-import "./chunk-UXEO7E3V.js";
+} from "./chunk-U54AYGEC.js";
 import "./chunk-RXFQM6FQ.js";
+import "./chunk-UXEO7E3V.js";
 import {
   normalizeChannelDeliveryText
 } from "./chunk-4CMJKUND.js";
@@ -138,19 +141,19 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-KEKZFOL6.js";
+} from "./chunk-44LKG3IY.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-JCQD3INC.js";
+} from "./chunk-URE3QBBB.js";
 import {
   readVoiceModel
-} from "./chunk-XRSOI3DL.js";
+} from "./chunk-A3LWD5MK.js";
 import "./chunk-YTDVNSUQ.js";
-import "./chunk-RJC5EIKY.js";
-import "./chunk-6CGL7E7G.js";
-import "./chunk-ZGXYO7DY.js";
+import "./chunk-HHQJANFM.js";
+import "./chunk-IZDKYNKN.js";
+import "./chunk-SS4MRMKE.js";
 import "./chunk-7U5G6JXI.js";
 import "./chunk-WCCLLK7X.js";
 import {
@@ -160,7 +163,7 @@ import {
   buildModelReasoningConfigOption,
   buildModelReasoningConfigPreview,
   getModelConfiguration
-} from "./chunk-4K7NQDCG.js";
+} from "./chunk-T4EFG2P5.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -169,23 +172,23 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-Q26AYA62.js";
+} from "./chunk-VKCJPNGU.js";
 import {
   mapSkillConfigToStatus
-} from "./chunk-BGXZBI5B.js";
+} from "./chunk-N4X7G4J2.js";
 import {
   resolveSkillSettings
-} from "./chunk-Z4X5MTRT.js";
-import "./chunk-FBSSIAAQ.js";
-import "./chunk-PFCQ62V4.js";
+} from "./chunk-HCOBAG2L.js";
+import "./chunk-AMLXTTJJ.js";
+import "./chunk-JWDMKJG5.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-HVQ3B7FF.js";
-import "./chunk-7JPW6IYH.js";
-import "./chunk-5XBFCMWD.js";
+import "./chunk-Y5S7LBOZ.js";
+import "./chunk-3XKLXHGK.js";
+import "./chunk-HVC3PNVC.js";
 import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-CPGJJJLU.js";
+} from "./chunk-SEDFP3ZI.js";
 import {
   ndJsonStream
 } from "./chunk-H72BQNM3.js";
@@ -196,8 +199,8 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-JHS74YAB.js";
-import "./chunk-MZS7GEC7.js";
+} from "./chunk-KID24ZFN.js";
+import "./chunk-FTF2YIZ5.js";
 import {
   ACTIVE_WORK_CLOSE_IF_UNHELD_PARAM,
   ACTIVE_WORK_HEARTBEAT_META_KEY,
@@ -241,9 +244,9 @@ import {
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-STUJ7IMZ.js";
-import "./chunk-JVPFTDBK.js";
-import "./chunk-ALMR3E6Q.js";
 import "./chunk-GYTKQYDB.js";
+import "./chunk-RFIDDFAL.js";
+import "./chunk-ALMR3E6Q.js";
 import "./chunk-RKFGE7JH.js";
 import "./chunk-UDG5EZJI.js";
 import {
@@ -260,7 +263,7 @@ import "./chunk-7EQQR46F.js";
 import {
   ACP_EVENT_LOOP_STALL_RESTART_MS,
   CHANNEL_PROMPT_META_KEY
-} from "./chunk-E55H6BZ7.js";
+} from "./chunk-ICURCKIU.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -269,7 +272,7 @@ import {
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-5O72BNDD.js";
+} from "./chunk-F5RB4S23.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -278,9 +281,9 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-F7TNAPZ4.js";
+} from "./chunk-5SBVOOA2.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-JSC3H3TD.js";
+import "./chunk-RZKOA4JE.js";
 import "./chunk-GOXKNSDZ.js";
 import {
   getSystemDefaultsPath,
@@ -289,7 +292,7 @@ import {
 import {
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-LDP5OD6N.js";
+} from "./chunk-CLWO3B77.js";
 import {
   SUPPORTED_LANGUAGES
 } from "./chunk-5EJZE3FP.js";
@@ -297,19 +300,19 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-IK5BW3CS.js";
+} from "./chunk-5ZJL3AIV.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD,
   QWEN_CODE_SERVE_ENV
-} from "./chunk-5PA6UEYA.js";
-import "./chunk-V2NDP3I4.js";
-import "./chunk-7UYV53BC.js";
+} from "./chunk-MZCJWS5Y.js";
+import "./chunk-2AEHQRY2.js";
+import "./chunk-GIHXH2KO.js";
 import "./chunk-W3N5XAZ6.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-V4QXXQJ2.js";
+} from "./chunk-H4LCV44K.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import {
@@ -339,8 +342,8 @@ import {
   resolveBaseUrl,
   runManagedRememberByAgent,
   subagentGenerator
-} from "./chunk-KUX5D6DK.js";
-import "./chunk-3DXFGHAJ.js";
+} from "./chunk-BFYGL2XL.js";
+import "./chunk-VNMZLAVG.js";
 import "./chunk-XFSFZCM5.js";
 import "./chunk-2EAZ43JQ.js";
 import "./chunk-NF5J2WFA.js";
@@ -348,21 +351,21 @@ import {
   CreateSubSessionTool
 } from "./chunk-CQH5KTKC.js";
 import "./chunk-LJZSMWOH.js";
-import "./chunk-6LFTG244.js";
-import "./chunk-PKAYJDB3.js";
-import "./chunk-6IUNAPLR.js";
+import "./chunk-TU6WVK67.js";
+import "./chunk-WNPDGUJO.js";
+import "./chunk-K5KXUXWC.js";
 import {
   restoreWorktreeContext
-} from "./chunk-OIVXBW3W.js";
-import "./chunk-4CDSK5AZ.js";
+} from "./chunk-62GQFYID.js";
+import "./chunk-AYFA7MZV.js";
 import "./chunk-XQFT3QUF.js";
 import "./chunk-VTHREBQM.js";
 import "./chunk-ZPJWUGCS.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-H2WDGQ6D.js";
-import "./chunk-MIIVI25Q.js";
+} from "./chunk-3JXM2CVW.js";
+import "./chunk-ST5V3ZOC.js";
 import {
   APPROVAL_MODE_INFO,
   BranchPointInvalidError,
@@ -380,7 +383,6 @@ import {
   MessageDisplayDispatcher,
   PLAN_MODE_ENTRY_SIBLING_SKIP_MESSAGE,
   POOLED_TRANSPORTS_DEFAULT,
-  SESSION_ARTIFACT_PERSISTENCE_VERSION,
   SESSION_TITLE_MAX_LENGTH,
   SESSION_TRANSCRIPT_MAX_LIMIT,
   SESSION_TRANSCRIPT_MAX_PAGE_BYTES,
@@ -397,6 +399,7 @@ import {
   TURN_RESULT_TEXT_MAX_CHARS,
   abortGoalForStopHookCap,
   acquireSleepInhibitor,
+  ambientGoalToolResultProvenance,
   applyAutoModeDecision,
   approxBase64Bytes,
   bridgeToolResultImages,
@@ -431,12 +434,10 @@ import {
   formatStopHookBlockingCapWarning,
   generateToolUseId,
   getActiveGoal,
-  getArenaSystemReminder,
   getAutoModePermissionDeniedReason,
   getEffectivePermissionForConfirmation,
   getFunctionCallFingerprint,
   getMCPDiscoveryState,
-  getPlanModeSystemReminder,
   getProviderToolCallId,
   getScopedEnvContents,
   getStopHookContinuationReason,
@@ -454,8 +455,6 @@ import {
   mcpServerRequiresOAuth,
   needsConfirmation,
   normalizeDerivedBranchTitle,
-  normalizeEventPayload,
-  normalizeSnapshotPayload,
   normalizeTurnResultError,
   observeToolResultBoundary,
   persistPermissionOutcome,
@@ -479,7 +478,7 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-TGWAQ5RB.js";
+} from "./chunk-ECE3UYVO.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
@@ -487,15 +486,20 @@ import {
   external_exports
 } from "./chunk-CQ35AJ4Z.js";
 import "./chunk-EKSCLBBF.js";
-import "./chunk-P2SU6ZTI.js";
-import "./chunk-IZIVM7LZ.js";
-import "./chunk-SFPGAQUL.js";
+import "./chunk-LUEHOUHM.js";
+import "./chunk-WXEA74YB.js";
+import "./chunk-42IDLQWS.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
 import {
   RUNTIME_SNAPSHOT_PREFIX
 } from "./chunk-JB4JIVTJ.js";
+import {
+  SESSION_ARTIFACT_PERSISTENCE_VERSION,
+  normalizeEventPayload,
+  normalizeSnapshotPayload
+} from "./chunk-DJBQCO2E.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-D5LUXLUH.js";
@@ -503,19 +507,30 @@ import {
   promptIdContext,
   todoWorkChainContext
 } from "./chunk-O6GEWCJA.js";
-import "./chunk-T26EAKDL.js";
-import "./chunk-EOGELB3H.js";
+import {
+  getArenaSystemReminder,
+  getPlanModeSystemReminder
+} from "./chunk-LGO7DEXL.js";
+import "./chunk-2SXSLSQE.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-EFUM7RVY.js";
+import {
+  AgentOutputMessageCapture,
+  addAgentInputMessageAttributes,
+  addToolArgumentsAttributes,
+  addToolCallResultAttributes,
+  registerAcpEventLoopLagGauge,
+  startEventLoopLagMonitor
+} from "./chunk-KJO2LBUK.js";
 import {
   HookEventName,
   createHookOutput
 } from "./chunk-TTX2JUE6.js";
-import "./chunk-43GGFFLY.js";
-import "./chunk-SMPR7SPO.js";
+import "./chunk-4K7KNVWH.js";
+import "./chunk-QJNDUTOL.js";
+import "./chunk-UVY67MSH.js";
 import "./chunk-JWALNCLT.js";
 import "./chunk-NIFYWDYN.js";
-import "./chunk-3AFMQUTI.js";
+import "./chunk-C2X7KY45.js";
 import {
   GoalConflictError,
   GoalInvalidTransitionError,
@@ -524,50 +539,41 @@ import {
   goalTurnContext,
   parseGoalControlRequest,
   parseGoalSnapshotV2,
-  parseGoalStateCause,
+  parseGoalStateCause
+} from "./chunk-JHYH6PYQ.js";
+import {
   wrapUserPromptSubmitContext
-} from "./chunk-WKK5BQNP.js";
+} from "./chunk-7J6OTNGO.js";
 import {
   APPROVAL_MODES
 } from "./chunk-V5J4J5TP.js";
 import "./chunk-MLXTMF7H.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-3JGZSIDA.js";
-import "./chunk-VVW4ZNFY.js";
+import "./chunk-B466ZSHZ.js";
+import "./chunk-4QHPPXK2.js";
 import "./chunk-QHMLYMMS.js";
-import {
-  AgentOutputMessageCapture,
-  addAgentInputMessageAttributes,
-  addToolArgumentsAttributes,
-  addToolCallResultAttributes,
-  registerAcpEventLoopLagGauge,
-  startEventLoopLagMonitor
-} from "./chunk-7DJCPZE3.js";
-import "./chunk-P3QQPMQA.js";
 import {
   addDaemonRequestAttribute,
   extractDaemonTraceContext,
   withDaemonSpan
-} from "./chunk-HVEYF6VT.js";
+} from "./chunk-3WK3QDNV.js";
 import "./chunk-VNOVK4I7.js";
-import "./chunk-SAH4BD2J.js";
-import "./chunk-PDMJ3KGS.js";
+import "./chunk-PQEISIKS.js";
+import "./chunk-EB6QRGHM.js";
 import {
   runWithRuntimeContentGenerator
 } from "./chunk-CMHFCLBU.js";
 import "./chunk-S6LOFUVP.js";
+import {
+  getToolCallPreparations
+} from "./chunk-CFKIH3D3.js";
 import {
   REASONING_EFFORT_TIERS,
   applyReasoningEffort
 } from "./chunk-2LD5U7Q3.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-J2OSJFP3.js";
-import "./chunk-K2OJUPOE.js";
-import {
-  getToolCallPreparations
-} from "./chunk-CFKIH3D3.js";
-import "./chunk-4FTKQNWJ.js";
-import "./chunk-Y3QL45LS.js";
+import "./chunk-DYXFD5RO.js";
+import "./chunk-V4264FEG.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -598,13 +604,13 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-L2M46FP5.js";
-import "./chunk-YRLW2MSX.js";
+} from "./chunk-QYMAKPY5.js";
+import "./chunk-XBVNNDPK.js";
 import "./chunk-VGC4I5JJ.js";
 import {
-  getAllGeminiMdFilenames,
+  getAllMemoryFilenames,
   getSpecificMimeType
-} from "./chunk-3I6UTTDX.js";
+} from "./chunk-BKWNKLZB.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
@@ -621,7 +627,7 @@ import "./chunk-6DIGWMGT.js";
 import {
   hasVertexProjectConfigured,
   preloadContentGenerator
-} from "./chunk-Z7FLBQPR.js";
+} from "./chunk-ARF6IJHM.js";
 import "./chunk-XZA32HII.js";
 import "./chunk-23RFD54N.js";
 import {
@@ -638,7 +644,7 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-L6BZRIUL.js";
+} from "./chunk-B5PHIJGI.js";
 import "./chunk-74TONY4F.js";
 import "./chunk-XF63PKEN.js";
 import {
@@ -665,14 +671,15 @@ import {
   isSubpath,
   sessionIdContext
 } from "./chunk-UHQFIS7N.js";
-import "./chunk-W5MJJ2V7.js";
+import "./chunk-BIJEBAAQ.js";
+import "./chunk-WLEYH7CD.js";
 import {
   runExitCleanup
-} from "./chunk-Y6LSMB6J.js";
+} from "./chunk-K6CTN5TU.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
-} from "./chunk-KGJGEEVR.js";
+} from "./chunk-7FA2II6K.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
@@ -1050,9 +1057,6 @@ function inactiveExtensionSkillRefs(config) {
     if (extension.isActive) continue;
     for (const skill of extension.skills ?? []) {
       refs.add(extensionSkillRef(extension.name, skill.name));
-      if (extension.displayName) {
-        refs.add(extensionSkillRef(extension.displayName, skill.name));
-      }
     }
   }
   return refs;
@@ -3871,13 +3875,13 @@ async function registerCreateSubSessionTool(config) {
       ToolNames.CREATE_SUB_SESSION,
       async () => new CreateSubSessionTool(config)
     );
-    await config.getGeminiClient().setTools();
+    await config.getLlmClient().setTools();
     return;
   }
   toolRegistry.registerTool(new CreateSubSessionTool(config));
   toolRegistry.revealDeferredTool(ToolNames.CREATE_SUB_SESSION);
   toolRegistry.pinDeferredToolReveal(ToolNames.CREATE_SUB_SESSION);
-  await config.getGeminiClient().setTools();
+  await config.getLlmClient().setTools();
 }
 __name(registerCreateSubSessionTool, "registerCreateSubSessionTool");
 var STANDALONE_SLASH_COMMAND_POLICY = Object.freeze({
@@ -4211,6 +4215,7 @@ var Session = class {
             controller: new AbortController(),
             origin: "runtime",
             continuationContext: input.continuationContext,
+            ...input.objectiveUpdated ? { objectiveUpdated: input.objectiveUpdated } : {},
             ...input.windDown ? { windDown: true } : {},
             ...input.verifierFeedback ? { verifierFeedback: input.verifierFeedback } : {},
             modelStarted: false
@@ -4413,6 +4418,24 @@ var Session = class {
       void this.#drainGoalQueue();
     }
   }
+  /**
+   * Confirms the continuation's prompt reached the model.
+   *
+   * `startGoalTurn` resolves at enqueue time, so the runtime cannot tell a
+   * delivered turn from a queued one when it settles; `#settleGoalTurn`'s
+   * degraded-persistence fallback settles a model-started turn through
+   * `releaseTurn`, and only this confirmation keeps that turn's objective
+   * announcement from rolling back and re-firing on the next continuation.
+   */
+  #markGoalTurnDelivered(turnKey) {
+    try {
+      this.config.getGoalRuntime().markTurnDelivered(turnKey);
+    } catch (error) {
+      debugLogger6.debug(
+        `Failed to confirm ACP Goal turn delivery: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
   async #settleGoalTurn(turn, result, failed) {
     try {
       const runtime = await this.config.getGoalRuntimeReady();
@@ -5044,11 +5067,11 @@ var Session = class {
     await this.#syncLiveToolDeclarations();
   }
   async #syncLiveToolDeclarations() {
-    const geminiClient = this.config.getGeminiClient();
-    if (!geminiClient) {
+    const llmClient = this.config.getLlmClient();
+    if (!llmClient) {
       throw new Error("The Live backend model client is unavailable.");
     }
-    await geminiClient.setTools();
+    await llmClient.setTools();
   }
   async setLiveConversationActive(active) {
     if (this.liveConversationActive === active) return;
@@ -5065,7 +5088,7 @@ var Session = class {
       this.liveEndInstructionPending = true;
       this.config.setLiveAppendSystemPrompt(LIVE_BACKEND_END_INSTRUCTIONS);
     }
-    await this.config.getGeminiClient()?.refreshSystemInstruction();
+    await this.config.getLlmClient()?.refreshSystemInstruction();
   }
   async appendLiveConversationTranscript(entries, model) {
     if (this.liveConversationActive !== true) {
@@ -5103,7 +5126,7 @@ var Session = class {
     if (this.liveConversationActive || !this.liveEndInstructionPending) return;
     this.liveEndInstructionPending = false;
     this.config.setLiveAppendSystemPrompt(void 0);
-    await this.config.getGeminiClient()?.refreshSystemInstruction();
+    await this.config.getLlmClient()?.refreshSystemInstruction();
   }
   getId() {
     return this.sessionId;
@@ -5555,7 +5578,7 @@ var Session = class {
         "Cannot rewind while a prompt is running"
       );
     }
-    const chat = this.config.getGeminiClient().getChat();
+    const chat = this.config.getLlmClient().getChat();
     const apiHistory = chat.getHistoryShallow();
     const apiTruncateIndex = this.#computeApiTruncationIndexForUserTurn(
       apiHistory,
@@ -5591,7 +5614,7 @@ var Session = class {
     return { targetTurnIndex, apiTruncateIndex };
   }
   captureHistorySnapshot() {
-    return this.config.getGeminiClient().getChat().getHistoryShallow();
+    return this.config.getLlmClient().getChat().getHistoryShallow();
   }
   getRewindableUserTurnCount() {
     const apiHistory = this.captureHistorySnapshot();
@@ -5613,7 +5636,7 @@ var Session = class {
         "Cannot restore history while a prompt is running"
       );
     }
-    this.config.getGeminiClient().getChat().setHistory(structuredClone(history));
+    this.config.getLlmClient().getChat().setHistory(structuredClone(history));
     this.activeTodoPlanRevision = void 0;
     this.#clearTodoStopGuardTrustAndDrainAutomaticQueues();
   }
@@ -6040,8 +6063,8 @@ var Session = class {
    * authoritatively. Powers `qwen/control/session/continue`.
    */
   async continueLastTurn() {
-    const geminiClient = this.config.getGeminiClient();
-    if (!geminiClient || !geminiClient.isInitialized()) {
+    const llmClient = this.config.getLlmClient();
+    if (!llmClient || !llmClient.isInitialized()) {
       return { accepted: false, interruption: "none" };
     }
     const chat = this.#getCurrentChat();
@@ -6090,7 +6113,7 @@ var Session = class {
     }
     if (this.settings.merged.ui?.enableFollowupSuggestions === false) return;
     if (this.config.getApprovalMode() === "plan" /* PLAN */) return;
-    const chat = this.config.getGeminiClient()?.getChat();
+    const chat = this.config.getLlmClient()?.getChat();
     if (!chat) return;
     const ac = new AbortController();
     this.followupAbort = ac;
@@ -6421,7 +6444,7 @@ var Session = class {
             }
             if (isFreshUserTurn) {
               managedMemoryRecallStarted = true;
-              this.config.getGeminiClient().beginManagedAutoMemoryRecall(promptText, pendingSend.signal);
+              this.config.getLlmClient().beginManagedAutoMemoryRecall(promptText, pendingSend.signal);
             }
             if (!continuesCurrentWorkChain && !this.todoStopGuard.enabled) {
               this.#resetTodoStopGuardBackgroundLineage();
@@ -6449,7 +6472,7 @@ var Session = class {
             }
             const systemReminders = await this.#buildInitialSystemReminders();
             if (isFreshUserTurn) {
-              const memory = await this.config.getGeminiClient().consumeManagedAutoMemoryRecall("initial");
+              const memory = await this.config.getLlmClient().consumeManagedAutoMemoryRecall("initial");
               if (memory?.prompt) {
                 systemReminders.unshift({ text: memory.prompt });
               }
@@ -6630,7 +6653,12 @@ ${this.pendingRecoveredAgentsNotice}
                 let channelDeliveryResponseBlock;
                 let channelDeliveryCheckpoint = 0;
                 try {
-                  if (goalTurn) goalTurn.modelStarted = true;
+                  if (goalTurn) {
+                    goalTurn.modelStarted = true;
+                    if (goalTurn.origin === "runtime") {
+                      this.#markGoalTurnDelivered(goalTurn.turnKey);
+                    }
+                  }
                   const sendResult = await this.#sendMessageStreamWithAutoCompression(
                     promptId,
                     nextMessage?.parts ?? [],
@@ -6897,7 +6925,7 @@ ${this.pendingRecoveredAgentsNotice}
       }
     ).finally(() => {
       if (managedMemoryRecallStarted) {
-        this.config.getGeminiClient().finishManagedAutoMemoryRecall();
+        this.config.getLlmClient().finishManagedAutoMemoryRecall();
       }
     });
   }
@@ -7792,7 +7820,7 @@ ${this.pendingRecoveredAgentsNotice}
     }
   }
   #getCurrentChat() {
-    return this.config.getGeminiClient().getChat();
+    return this.config.getLlmClient().getChat();
   }
   async #runWithFullTurnModel(modelOverride, fn) {
     if (!modelOverride?.endsWith("\0")) {
@@ -7804,9 +7832,9 @@ ${this.pendingRecoveredAgentsNotice}
   /**
    * Create the MessageDisplay hook dispatcher for one model call's streamed
    * reply, or null when the hook isn't registered (the common case — keeps
-   * the streaming loops zero-cost). The ACP surface consumes GeminiChat's
+   * the streaming loops zero-cost). The ACP surface consumes LlmChat's
    * raw stream directly rather than going through
-   * GeminiClient.sendMessageStream, so it has to fire this hook itself —
+   * LlmClient.sendMessageStream, so it has to fire this hook itself —
    * with the same contract as the terminal UI path in client.ts: debounced
    * cumulative text, one message_id per model call, and an is_final firing
    * on every non-aborted exit (delivered by awaiting `finish()` in a
@@ -7832,7 +7860,7 @@ ${this.pendingRecoveredAgentsNotice}
    * was cancelled or the session token limit was exceeded.
    */
   async #sendMessageStreamWithAutoCompression(promptId, message, abortSignal, options = {}) {
-    const geminiClient = this.config.getGeminiClient();
+    const llmClient = this.config.getLlmClient();
     if (options.prepareBeforeCompression) {
       const decision = await options.prepareBeforeCompression();
       if (decision.kind === "stop") {
@@ -7851,7 +7879,7 @@ ${this.pendingRecoveredAgentsNotice}
     let compressionFailed = false;
     if (!options.skipCompression && !(options.getModelOverride?.() ?? options.modelOverride)) {
       try {
-        const compressed = await geminiClient.tryCompressChat(
+        const compressed = await llmClient.tryCompressChat(
           promptId,
           false,
           abortSignal
@@ -7930,7 +7958,7 @@ ${this.pendingRecoveredAgentsNotice}
       return { responseStream: null, stopReason: "cancelled" };
     }
     if (message[0]?.functionResponse) {
-      const memory = await geminiClient.consumeManagedAutoMemoryRecall("tool_result");
+      const memory = await llmClient.consumeManagedAutoMemoryRecall("tool_result");
       if (memory?.prompt) {
         message = insertAfterFunctionResponses(message, [
           { text: memory.prompt }
@@ -8549,11 +8577,13 @@ ${this.pendingRecoveredAgentsNotice}
    * `_meta.source='cron'`, streams the model response, and handles tool calls.
    */
   async #executeCronPrompt(item) {
-    return runWithInvocationContext(
-      void 0,
-      () => sessionIdContext.run(
-        this.config.getSessionId(),
-        () => this.#executeCronPromptInner(item)
+    return goalTurnContext.exit(
+      () => runWithInvocationContext(
+        void 0,
+        () => sessionIdContext.run(
+          this.config.getSessionId(),
+          () => this.#executeCronPromptInner(item)
+        )
       )
     );
   }
@@ -9117,11 +9147,13 @@ ${this.pendingRecoveredAgentsNotice}
         this.currentShellNotificationActive = item.kind === "shell";
         this.#activeWorkChanged();
         try {
-          await runWithInvocationContext(
-            void 0,
-            () => sessionIdContext.run(
-              this.config.getSessionId(),
-              () => this.#executeBackgroundNotificationPromptInner(item)
+          await goalTurnContext.exit(
+            () => runWithInvocationContext(
+              void 0,
+              () => sessionIdContext.run(
+                this.config.getSessionId(),
+                () => this.#executeBackgroundNotificationPromptInner(item)
+              )
             )
           );
         } finally {
@@ -9778,11 +9810,16 @@ ${this.pendingRecoveredAgentsNotice}
         if (record.skipPersistence === true || this.#shouldSkipRestoredAskUserQuestionPersistence(record.callId)) {
           return;
         }
-        this.config.getChatRecordingService()?.recordToolResult(finalized[index].responseParts, {
-          ...record.metadata,
-          persistedOutputFiles: finalized[index].persistedOutputFiles,
-          artifacts: finalized[index].artifacts
-        });
+        const goalProvenance = ambientGoalToolResultProvenance(record.toolName);
+        this.config.getChatRecordingService()?.recordToolResult(
+          finalized[index].responseParts,
+          {
+            ...record.metadata,
+            persistedOutputFiles: finalized[index].persistedOutputFiles,
+            artifacts: finalized[index].artifacts
+          },
+          ...goalProvenance ? [goalProvenance] : []
+        );
       });
       return {
         ...result,
@@ -10266,9 +10303,14 @@ ${this.pendingRecoveredAgentsNotice}
   /**
    * Assemble the per-turn system reminders the model needs to see at the
    * start of a user query or cron fire. Mirrors the subagent/plan/arena
-   * branches in `GeminiClient.sendMessageStream` (`client.ts:848-878`) —
+   * branches in `LlmClient.sendMessageStream` (`client.ts:848-878`) —
    * the ACP path bypasses that code, so without this helper plan mode is
    * silently inert and subagent/arena sessions lose context.
+   *
+   * Scope note: the `relevantAutoMemory` reminder is intentionally NOT
+   * included here. Managed auto-memory requires a prefetch pipeline that
+   * lives in `LlmClient`, and porting it into the ACP path is tracked
+   * separately as part of the broader middleware-alignment work.
    */
   async #buildInitialSystemReminders() {
     const reminders = [];
@@ -10729,7 +10771,7 @@ ${this.pendingRecoveredAgentsNotice}
           if (!autoModeAllowed && !requiresUserInteraction && shouldRunAutoModeForCall(approvalMode, policyToolName)) {
             const denialState = this.config.getAutoModeDenialState();
             const fallback = shouldFallback(denialState);
-            const messages = this.config.getGeminiClient?.()?.getHistoryTail(MAX_TRANSCRIPT_MESSAGES, false) ?? [];
+            const messages = this.config.getLlmClient?.()?.getHistoryTail(MAX_TRANSCRIPT_MESSAGES, false) ?? [];
             const decision = await evaluateAutoMode({
               ctx: pmCtx,
               pmForcedAsk,
@@ -11812,7 +11854,7 @@ ${this.pendingRecoveredAgentsNotice}
       });
     } finally {
       if (terminalStatus && terminalStatus !== "cancelled") {
-        this.config.getGeminiClient().recordCompletedToolCall(toolName, args);
+        this.config.getLlmClient().recordCompletedToolCall(toolName, args);
       }
       if (terminalStatus === "cancelled") {
         endToolSpan(toolSpan, { success: false, cancelled: true });
@@ -14867,7 +14909,7 @@ function readScopeSettings(settings, scope) {
 }
 __name(readScopeSettings, "readScopeSettings");
 async function resolvePreferredMemoryFile(dir, fallbackFilename) {
-  for (const filename of getAllGeminiMdFilenames()) {
+  for (const filename of getAllMemoryFilenames()) {
     const filePath = path6.join(dir, filename);
     try {
       await fs3.access(filePath);
@@ -14879,7 +14921,7 @@ async function resolvePreferredMemoryFile(dir, fallbackFilename) {
 }
 __name(resolvePreferredMemoryFile, "resolvePreferredMemoryFile");
 async function resolveQwenMemoryPaths(params) {
-  const fallbackFilename = getAllGeminiMdFilenames()[0] ?? "QWEN.md";
+  const fallbackFilename = getAllMemoryFilenames()[0] ?? "QWEN.md";
   const userMemoryFile = await resolvePreferredMemoryFile(
     Storage.getGlobalQwenDir(),
     fallbackFilename
@@ -15103,7 +15145,7 @@ async function runAcpAgent(config, settings, argv, options) {
   beginAcpBootstrapConfigProfiling();
   try {
     await config.initialize({
-      skipGeminiInitialization: true,
+      skipLlmInitialization: true,
       // Bootstrap skips MCP discovery — each session runs its own
       // pool-routed discovery, so bootstrap-level spawns would be
       // redundant subprocess leaks (W119).
@@ -15884,9 +15926,9 @@ var QwenAgent = class {
         const registry = config.getToolRegistry();
         if (operation === "discover") {
           await registry?.discoverToolsForServer(serverName);
-          const geminiClient = config.getGeminiClient?.();
-          if (geminiClient?.isInitialized?.()) {
-            await geminiClient.setTools?.();
+          const llmClient = config.getLlmClient?.();
+          if (llmClient?.isInitialized?.()) {
+            await llmClient.setTools?.();
           }
         } else if (operation === "disable") {
           await registry?.disableMcpServer(serverName);
@@ -15956,7 +15998,7 @@ var QwenAgent = class {
     config.setMcpTransportPool(this.mcpPool);
     try {
       await config.initialize({
-        skipGeminiInitialization: true,
+        skipLlmInitialization: true,
         skipFileCheckpointing: true,
         skipHooks: true,
         skipSkillManager: true,
@@ -16072,9 +16114,9 @@ var QwenAgent = class {
           }
           await Promise.all(
             this.getLiveMcpConfigs(serverName).map(async (config) => {
-              const geminiClient = config.getGeminiClient?.();
-              if (geminiClient?.isInitialized?.()) {
-                await geminiClient.setTools?.();
+              const llmClient = config.getLlmClient?.();
+              if (llmClient?.isInitialized?.()) {
+                await llmClient.setTools?.();
               }
             })
           );
@@ -16483,7 +16525,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.22.2";
+    const version = "0.22.3-nightly.20260829.e5cb60ad48";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -17381,15 +17423,17 @@ var QwenAgent = class {
           break;
         }
         case "reasoning_effort": {
+          const generation = session.getConfig().getContentGeneratorConfig();
+          const thinkingMandatory = generation.thinkingMandatory === true;
           const modelReasoning = this.getModelReasoningConfiguration(
             session.getConfig()
           );
           if (modelReasoning) {
             const effortValues = modelReasoning.toggleOnly ? void 0 : modelReasoning.efforts;
-            const selected = value === REASONING_EFFORT_NONE ? REASONING_EFFORT_NONE : modelReasoning.toggleOnly ? value === REASONING_EFFORT_DEFAULT ? REASONING_EFFORT_DEFAULT : void 0 : effortValues?.find((effort2) => effort2 === value);
+            const selected = value === REASONING_EFFORT_NONE && !thinkingMandatory ? REASONING_EFFORT_NONE : modelReasoning.toggleOnly ? value === REASONING_EFFORT_DEFAULT ? REASONING_EFFORT_DEFAULT : void 0 : effortValues?.find((effort2) => effort2 === value);
             if (!selected) {
               const choices = [
-                REASONING_EFFORT_NONE,
+                ...thinkingMandatory ? [] : [REASONING_EFFORT_NONE],
                 ...effortValues ?? [REASONING_EFFORT_DEFAULT]
               ];
               throw RequestError.invalidParams(
@@ -17397,7 +17441,17 @@ var QwenAgent = class {
                 `Unknown reasoning effort: ${value}. Choose one of: ${choices.join(", ")}`
               );
             }
-            const generation = session.getConfig().getContentGeneratorConfig();
+            if (!modelReasoning.toggleOnly) {
+              for (const source of ["extra_body", "samplingParams"]) {
+                const layer = generation[source];
+                if (!layer) continue;
+                const next = { ...layer };
+                delete next["enable_thinking"];
+                delete next["reasoning_effort"];
+                delete next["thinking_budget"];
+                generation[source] = next;
+              }
+            }
             if (selected === REASONING_EFFORT_NONE) {
               generation.reasoning = false;
             } else if (selected === REASONING_EFFORT_DEFAULT) {
@@ -18281,18 +18335,17 @@ var QwenAgent = class {
       for (const extension of config.getExtensions()) {
         if (extension.isActive) continue;
         for (const skill of extension.skills ?? []) {
-          const extensionName = extension.displayName ?? extension.name;
+          const extensionName = extension.name;
           const key = `extension:${extensionName}:${skill.name}`;
-          if (skillsByKey.has(`extension:${extension.name}:${skill.name}`) || skillsByKey.has(key)) {
-            continue;
-          }
+          if (skillsByKey.has(key)) continue;
           skillsByKey.set(
             key,
             mapSkillConfigToStatus(
               {
                 ...skill,
                 level: "extension",
-                extensionName
+                extensionName,
+                extensionDisplayName: extension.displayName
               },
               disablements,
               { disabled: true }
@@ -18351,7 +18404,13 @@ var QwenAgent = class {
           providers.set(authType, provider);
         }
         const isCurrent = currentAuth === model.authType && currentAcpModelId === modelId;
-        const configOptions = model.isRuntimeModel || modelId.startsWith(ACP_ROUTE_ID_PREFIX) ? void 0 : buildModelReasoningConfigPreview(model.id);
+        const configOptions = model.isRuntimeModel || modelId.startsWith(ACP_ROUTE_ID_PREFIX) ? void 0 : buildModelReasoningConfigPreview(model.id, {
+          thinkingMandatory: config.getResolvedModelConfig?.(
+            model.authType,
+            model.id,
+            model.registryBaseUrl ?? model.baseUrl
+          )?.generationConfig.thinkingMandatory === true
+        });
         const providerModel = {
           modelId,
           baseModelId: parseAcpBaseModelId(effectiveModelId),
@@ -20049,9 +20108,9 @@ var QwenAgent = class {
           });
           await Promise.all(
             this.getLiveMcpConfigs(serverName).map(async (liveConfig) => {
-              const geminiClient = liveConfig.getGeminiClient?.();
-              if (geminiClient?.isInitialized?.()) {
-                await geminiClient.setTools?.();
+              const llmClient = liveConfig.getLlmClient?.();
+              if (llmClient?.isInitialized?.()) {
+                await llmClient.setTools?.();
               }
             })
           );
@@ -21065,7 +21124,7 @@ var QwenAgent = class {
             );
           }
           try {
-            await config.getGeminiClient()?.addWorkingDirectoryChangedContext(
+            await config.getLlmClient()?.addWorkingDirectoryChangedContext(
               settledPreviousCwd,
               canonicalPath
             );
@@ -21243,7 +21302,7 @@ var QwenAgent = class {
                   );
                 }
                 await cfg.refreshHierarchicalMemory();
-                await cfg.getGeminiClient()?.refreshSystemInstruction();
+                await cfg.getLlmClient()?.refreshSystemInstruction();
               })
             );
             const failedCount = results.filter(
@@ -21409,7 +21468,7 @@ var QwenAgent = class {
         }
         let hasHistory = false;
         try {
-          hasHistory = (config.getGeminiClient().getHistoryShallow() ?? []).length > 0;
+          hasHistory = (config.getLlmClient().getHistoryShallow() ?? []).length > 0;
         } catch (error) {
           debugLogger9.debug("Failed to read history before /fork:", error);
         }
@@ -21442,7 +21501,7 @@ var QwenAgent = class {
           );
         }
         try {
-          config.getGeminiClient().addHistory({
+          config.getLlmClient().addHistory({
             role: "user",
             parts: [
               {
@@ -21474,9 +21533,9 @@ var QwenAgent = class {
         }
         const session = this.sessionOrThrow(sessionId);
         const config = session.getConfig();
-        const geminiClient = config.getGeminiClient();
+        const llmClient = config.getLlmClient();
         const outputText = typeof params["output"] === "string" ? params["output"] : "";
-        geminiClient.addHistory({
+        llmClient.addHistory({
           role: "user",
           parts: [
             {
@@ -21882,7 +21941,7 @@ ${outputText}
           );
         }
         await runRefresh(
-          async () => await config.getGeminiClient()?.refreshSystemInstruction()
+          async () => await config.getLlmClient()?.refreshSystemInstruction()
         );
         await runRefresh(
           async () => await session.sendAvailableCommandsUpdate()
@@ -22605,7 +22664,7 @@ ${outputText}
               );
             }
             try {
-              await config.getGeminiClient()?.refreshSystemInstruction();
+              await config.getLlmClient()?.refreshSystemInstruction();
             } catch (err) {
               debugLogger9.warn(
                 `reload: refreshSystemInstruction failed for session ${id}: ${err}`
@@ -23083,10 +23142,10 @@ ${outputText}
   async createAndStoreSession(config, settings, sessionData, options = {}) {
     this.assertManagedSessionAdmission();
     const sessionId = normalizeSessionIdForLookup(config.getSessionId());
-    const geminiClient = config.getGeminiClient();
-    const needsInitialize = !geminiClient.isInitialized();
+    const llmClient = config.getLlmClient();
+    const needsInitialize = !llmClient.isInitialized();
     if (needsInitialize && options.deferWorkspaceActivation !== true) {
-      await geminiClient.initialize();
+      await llmClient.initialize();
     }
     this.assertManagedSessionAdmission();
     if (this.sessions.has(sessionId)) {
@@ -23299,11 +23358,29 @@ ${outputText}
       currentValue: currentModelId,
       options: configModelOptions
     };
-    const modelReasoning = this.getModelReasoningConfiguration(config);
+    const generation = config.getContentGeneratorConfig();
+    const modelReasoning = this.getModelReasoningConfiguration(
+      config,
+      currentModelId
+    );
     const currentModelEffort = config.getReasoningEffort?.();
+    const reasoningOverride = config.getReasoningEffortOverride?.();
+    const reasoningOverrideValue = reasoningOverride ? generation[reasoningOverride.source]?.[reasoningOverride.field] : void 0;
+    const normalizedEffortOverride = reasoningOverride?.field === "reasoning_effort" && typeof reasoningOverrideValue === "string" ? reasoningOverrideValue === "minimal" ? "low" : REASONING_EFFORT_TIERS.find(
+      (effort) => effort === reasoningOverrideValue
+    ) : void 0;
+    const normalizedBudgetOverride = reasoningOverride?.field === "thinking_budget" && typeof reasoningOverrideValue === "number" && Number.isFinite(reasoningOverrideValue) && reasoningOverrideValue >= 0 && reasoningOverrideValue <= 262144 ? reasoningOverrideValue <= 4096 ? "low" : reasoningOverrideValue <= 16384 ? "medium" : "xhigh" : void 0;
+    const normalizedOverrideEffort = normalizedEffortOverride ?? normalizedBudgetOverride;
+    const overrideDisablesReasoning = reasoningOverride?.field === "enable_thinking" && reasoningOverrideValue === false || reasoningOverride?.field === "reasoning_effort" && reasoningOverrideValue === REASONING_EFFORT_NONE;
+    const mandatoryUsesDefaultEffort = generation.thinkingMandatory === true && (overrideDisablesReasoning || generation.reasoning === false && reasoningOverride?.field === "reasoning_effort");
+    const effectiveModelEffort = modelReasoning && !modelReasoning.toggleOnly ? mandatoryUsesDefaultEffort ? modelReasoning.defaultEffort : normalizedOverrideEffort ? modelReasoning.efforts.find(
+      (effort) => effort === normalizedOverrideEffort
+    ) ?? modelReasoning.defaultEffort : currentModelEffort : currentModelEffort;
+    const reasoningEnabled = generation.reasoning !== false && (!reasoningOverride || !overrideDisablesReasoning);
     const reasoningEffortConfigOption = (modelReasoning ? buildModelReasoningConfigOption(rawCurrentModelId, {
-      enabled: config.getContentGeneratorConfig().reasoning !== false,
-      effort: currentModelEffort
+      enabled: reasoningEnabled,
+      effort: effectiveModelEffort,
+      thinkingMandatory: generation.thinkingMandatory === true
     }) : void 0) ?? {
       id: "reasoning_effort",
       name: "Reasoning effort",
@@ -23326,13 +23403,21 @@ ${outputText}
     };
     return [modeConfigOption, modelConfigOption, reasoningEffortConfigOption];
   }
-  getModelReasoningConfiguration(config) {
-    if (config.getActiveRuntimeModelSnapshot?.() || config.getReasoningEffortOverride?.() || config.getContentGeneratorConfig().thinkingMandatory === true) {
+  getModelReasoningConfiguration(config, currentAcpModelId) {
+    if (config.getActiveRuntimeModelSnapshot?.()) {
+      return void 0;
+    }
+    const completeModelId = currentAcpModelId ?? getCurrentAcpModelId(
+      this.buildSelectableModelOptions(config),
+      (config.getModel() || "").trim(),
+      config.getAuthType?.(),
+      config.getCurrentModelRegistryBaseUrl?.()
+    );
+    if (completeModelId.startsWith(ACP_ROUTE_ID_PREFIX)) {
       return void 0;
     }
     const reasoning = getModelConfiguration(config.getModel())?.reasoning;
-    const currentEffort = config.getReasoningEffort?.();
-    return reasoning?.thinking && (reasoning.toggleOnly || !currentEffort || reasoning.efforts.includes(currentEffort)) ? reasoning : void 0;
+    return reasoning?.thinking ? reasoning : void 0;
   }
   buildSelectableModelOptions(config) {
     const currentAuthType = config.getAuthType();