@qwen-code/qwen-code 0.20.2-jobbench-no-todo-write.0 → 0.21.0

package/chunks/{acpAgent-BBQZ33CA.js → acpAgent-6J2U72PQ.js}

@@ -1,8 +1,5 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  recomputeMcpGating
-} from "./chunk-6S5HSCOI.js";
 import {
   classifyApiError
 } from "./chunk-V7RNNPGC.js";
@@ -15,36 +12,49 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-PLQODS7F.js";
-import {
-  getCommandSubcommandNames
-} from "./chunk-ZUTM4LHM.js";
+} from "./chunk-VULLI6WQ.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-26CBI4DC.js";
+} from "./chunk-LB6DUZ26.js";
+import {
+  collectContextData,
+  formatContextUsageText
+} from "./chunk-R5AFZNQW.js";
+import {
+  recomputeMcpGating
+} from "./chunk-OFDOK3VM.js";
 import {
   appEvents,
   buildDisabledSkillNamesProvider,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-ACZIBDYD.js";
+} from "./chunk-TPRQ7RZH.js";
 import {
-  getEffectiveSupportedModes
-} from "./chunk-7MWABCXU.js";
-import "./chunk-5DTTYNB7.js";
-import "./chunk-4LVZNIDO.js";
+  getCommandSubcommandNames
+} from "./chunk-RZIX2G32.js";
 import {
-  collectContextData,
-  formatContextUsageText
-} from "./chunk-WSYKDFYR.js";
+  getEffectiveSupportedModes
+} from "./chunk-U7M2DMGW.js";
+import "./chunk-J56UI34H.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-5WDRI7US.js";
+import "./chunk-PQNHRFJC.js";
+import "./chunk-M4FMGVY4.js";
+import "./chunk-L5UHQJTJ.js";
+import "./chunk-GSN55ZRI.js";
+import "./chunk-6H67XLET.js";
+import {
+  beginAcpBootstrapConfigProfiling,
+  buildAndFreezeAcpStartupProfile,
+  endAcpBootstrapConfigProfiling,
+  markAcpStartup
+} from "./chunk-HIJQF5B5.js";
+import "./chunk-7MVVZO4N.js";
+import "./chunk-IKYJHJNF.js";
 import "./chunk-YAF2MQZ6.js";
-import "./chunk-7Z6JQEL6.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -57,13 +67,14 @@ import {
   executeGeneration,
   formatWorkspaceMemoryForgetSummary,
   isValidServerName,
+  normalizeChannelDeliveryText,
   redactMcpServerSecrets,
   replayTranscriptRecordPage,
   restoreRedactedMcpSecrets,
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-SXPSOMQ4.js";
+} from "./chunk-RIBKPMRP.js";
 import {
   HistoryReplayer,
   MessageEmitter,
@@ -73,93 +84,83 @@ import {
   goalTerminalEventToHistoryItem,
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-6NRFYMKG.js";
-import "./chunk-4K7VDKAD.js";
-import "./chunk-RS7MT2QG.js";
-import "./chunk-GN45XAAU.js";
-import "./chunk-H2XVO6NE.js";
+} from "./chunk-EBJQ6AXW.js";
+import "./chunk-RHLZR4E5.js";
+import "./chunk-IPUUTYMV.js";
+import "./chunk-WCXCRJYB.js";
+import "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import {
   isTerminalGoalStatusKind
 } from "./chunk-QTERJVPZ.js";
 import "./chunk-3Z43GZUQ.js";
-import {
-  computeCpuPercent
-} from "./chunk-HGT6JR3U.js";
-import "./chunk-RXFQM6FQ.js";
-import "./chunk-CXIOPXRR.js";
-import "./chunk-6H67XLET.js";
-import {
-  beginAcpBootstrapConfigProfiling,
-  buildAndFreezeAcpStartupProfile,
-  endAcpBootstrapConfigProfiling,
-  markAcpStartup
-} from "./chunk-TDKQP3M6.js";
-import "./chunk-4MWNZNJ4.js";
-import "./chunk-7SSWNGEJ.js";
-import "./chunk-LXXMOYPL.js";
-import "./chunk-CJQ3FZ2G.js";
-import "./chunk-E5Z2AVNV.js";
-import {
-  ACP_ROUTE_ID_PREFIX,
-  buildAcpModelOptions,
-  getCurrentAcpModelId,
-  parseAcpBaseModelId,
-  parseAcpModelOption,
-  resolveAcpModelOption,
-  sanitizeProviderBaseUrl
-} from "./chunk-42W5BDEY.js";
-import {
-  mapSkillConfigToStatus
-} from "./chunk-2W3OOD4W.js";
 import {
   PERMISSION_RULE_TYPES,
   PermissionRulesValidationError,
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-3BJDQVE6.js";
+} from "./chunk-VRYUBFMC.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-LVA5OHQO.js";
+} from "./chunk-H4SBPHSA.js";
 import {
   readVoiceModel
-} from "./chunk-7ZD5EKXE.js";
-import "./chunk-QLJUC7TG.js";
-import "./chunk-5XORMWA2.js";
-import "./chunk-4SCOLXTD.js";
+} from "./chunk-YBL3QUDD.js";
+import "./chunk-ZD6UTE4A.js";
+import {
+  computeCpuPercent
+} from "./chunk-HGT6JR3U.js";
+import "./chunk-RXFQM6FQ.js";
+import "./chunk-PSOO6YXD.js";
+import "./chunk-PC6JANNU.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-GPMVHZP4.js";
-import "./chunk-6ZBPS62S.js";
-import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-64XKYOXK.js";
+} from "./chunk-IO3IX5Q4.js";
+import "./chunk-LXXMOYPL.js";
+import "./chunk-MVSUYZDT.js";
+import "./chunk-E5Z2AVNV.js";
 import {
   parseSessionSource
-} from "./chunk-K7EUPLIP.js";
-import "./chunk-6RLROE6G.js";
+} from "./chunk-KIM5GUMA.js";
+import "./chunk-GLWP3FDB.js";
+import {
+  NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
+  isNotCurrentlyGeneratingCancelError
+} from "./chunk-UH3WSE5L.js";
 import "./chunk-COH43MRJ.js";
 import {
   CHANNEL_STARTUP_PROFILE_META_KEY,
   CHANNEL_STARTUP_PROFILE_VERSION,
   CLIENT_MCP_OVER_WS_CONFIG_FLAG,
+  DAEMON_CHANNEL_DELIVERY_META_KEY,
   LOAD_REPLAY_BULK_MODE,
   LOAD_REPLAY_META_KEY,
   LOAD_REPLAY_MODE_META_KEY,
   LOAD_REPLAY_PAGE_SIZE_META_KEY,
   LOAD_REPLAY_VERSION,
   MID_TURN_QUEUE_DRAIN_METHOD,
+  PROMPT_CANCEL_METHOD,
   TODO_STOP_GUARD_QUEUE_RELEASE_METHOD
-} from "./chunk-QR6U5QPP.js";
-import {
-  NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE
-} from "./chunk-UH3WSE5L.js";
+} from "./chunk-3SJ43L4W.js";
 import {
   ndJsonStream
-} from "./chunk-77OZOGPT.js";
+} from "./chunk-7JURR4JT.js";
+import {
+  ACP_ROUTE_ID_PREFIX,
+  buildAcpModelOptions,
+  getCurrentAcpModelId,
+  parseAcpBaseModelId,
+  parseAcpModelOption,
+  resolveAcpModelOption,
+  sanitizeProviderBaseUrl
+} from "./chunk-KMQ33DO4.js";
+import {
+  mapSkillConfigToStatus
+} from "./chunk-2W3OOD4W.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -167,22 +168,28 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-TDDFEPBX.js";
-import "./chunk-QKTHJXCS.js";
-import "./chunk-TJTKSVIV.js";
+} from "./chunk-VIA5XA4U.js";
+import "./chunk-X5XDDSSH.js";
+import "./chunk-4WIZGAH3.js";
+import "./chunk-7ZCNENPP.js";
+import "./chunk-V6WHFGST.js";
+import {
+  assembleMcpServers,
+  loadMcpApprovals
+} from "./chunk-JVPM2ULZ.js";
+import "./chunk-ZNAUOR2I.js";
+import "./chunk-2RFKHEXL.js";
+import "./chunk-LK7CHLVP.js";
+import "./chunk-JLU636DO.js";
+import "./chunk-BK2UNYWD.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-RV4C2ZFG.js";
-import "./chunk-2LI23QA6.js";
-import "./chunk-RVLZCXEE.js";
+import "./chunk-RWTEFFPU.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
   RequestError
 } from "./chunk-UDXSXLER.js";
-import {
-  assembleMcpServers,
-  loadMcpApprovals
-} from "./chunk-7PIL2BYF.js";
+import "./chunk-BIQWWWJN.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -191,40 +198,38 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-RHYFF54J.js";
+} from "./chunk-TEHGS6UP.js";
 import "./chunk-RKUWKYED.js";
+import "./chunk-GOXKNSDZ.js";
+import {
+  getSystemDefaultsPath,
+  getSystemSettingsPath
+} from "./chunk-IDS7MSUP.js";
 import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-V7WNRZL7.js";
+} from "./chunk-LKEJ26GS.js";
 import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-UTGFTJ2H.js";
-import "./chunk-XAGLQITN.js";
-import "./chunk-GOXKNSDZ.js";
-import "./chunk-QRUIS3DN.js";
-import "./chunk-2RFKHEXL.js";
-import {
-  getSystemDefaultsPath,
-  getSystemSettingsPath
-} from "./chunk-IDS7MSUP.js";
-import "./chunk-XFSFZCM5.js";
-import "./chunk-3F2JUWCH.js";
+} from "./chunk-LH2BYDQ5.js";
+import "./chunk-6PEXNQTX.js";
+import "./chunk-YX324OPW.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-CGIDQG6J.js";
+} from "./chunk-Z2BC6UJ5.js";
 import "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
 } from "./chunk-OWAK7LMW.js";
+import "./chunk-XFSFZCM5.js";
 import {
   ALL_PROVIDERS,
   APPROVAL_MODE_INFO,
@@ -347,61 +352,77 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-IWALV67J.js";
-import "./chunk-T4TZQJ7W.js";
+} from "./chunk-PHOF65IG.js";
+import "./chunk-5M6IDOMF.js";
+import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-H6XPXXMH.js";
-import "./chunk-5M6IDOMF.js";
-import "./chunk-GPSKDNEE.js";
-import "./chunk-T2L47JJK.js";
-import "./chunk-X6N25LXS.js";
-import "./chunk-E2UVIFI2.js";
-import "./chunk-Q2YKNMLS.js";
-import "./chunk-XU457J4V.js";
+import "./chunk-K4XWPEWB.js";
+import "./chunk-TOFQCPDC.js";
+import "./chunk-IRH27ZC2.js";
 import "./chunk-VDDGDZMA.js";
-import "./chunk-KHOVYUHX.js";
-import "./chunk-SZRN75WQ.js";
+import "./chunk-FNQ6T3CV.js";
+import "./chunk-ZOIFNCKL.js";
+import "./chunk-PWTZEM3C.js";
+import "./chunk-KRXPRVGL.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
-import "./chunk-6FZYKBKV.js";
+import "./chunk-MZAXJAUM.js";
+import "./chunk-SZRN75WQ.js";
+import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
-import {
-  HookEventName,
-  createHookOutput
-} from "./chunk-7VUQQBR7.js";
-import "./chunk-LIZRAKPB.js";
 import {
   APPROVAL_MODES,
   FORK_SUBAGENT_TYPE,
   getStartupContextLength,
   isSystemReminderContent,
   runWithRuntimeContentGenerator
-} from "./chunk-WHGVTP7Q.js";
+} from "./chunk-L26JL52R.js";
 import "./chunk-6AM5D4ME.js";
+import "./chunk-JZA3JUDJ.js";
+import {
+  HookEventName,
+  createHookOutput
+} from "./chunk-3QMGYBFN.js";
 import "./chunk-JCW2R7WC.js";
-import "./chunk-57FIIFJN.js";
-import "./chunk-HTO4JFDZ.js";
+import "./chunk-M5JM7OSF.js";
+import "./chunk-OHNBB4XR.js";
+import "./chunk-E5TUC6CA.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-HABKX6LY.js";
+} from "./chunk-EPDRMGT4.js";
 import "./chunk-JESCGQM3.js";
-import "./chunk-32L4D2O2.js";
-import "./chunk-SRPZG4ER.js";
+import "./chunk-NH6KE4JX.js";
+import "./chunk-USTWD7QV.js";
 import "./chunk-XVNQMZ2I.js";
 import "./chunk-FODK6UMO.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
+import "./chunk-ZJHVAS7M.js";
+import {
+  extractDaemonTraceContext,
+  registerAcpEventLoopLagGauge,
+  startEventLoopLagMonitor,
+  withDaemonSpan
+} from "./chunk-NIBLUX3Y.js";
+import "./chunk-BPJSQIJX.js";
+import "./chunk-P3QQPMQA.js";
+import "./chunk-6FGBXPWM.js";
+import {
+  getToolCallPreparations
+} from "./chunk-LS77BEZP.js";
 import {
-  AuthType,
   ConversationFinishedEvent,
   DiscoveredMCPTool,
+  INVOCATION_CONTEXT_META_KEY,
   LoopDetectedEvent,
+  PRIVATE_ACP_CAPABILITY_ENV,
+  PRIVATE_PARENT_CAPABILITY_META_KEY,
   PromptSuggestionEvent,
   UserPromptEvent,
-  extractDaemonTraceContext,
   formatFullTurnVisionNotice,
   formatVisionBridgeNotice,
   getAllGeminiMdFilenames,
@@ -415,64 +436,66 @@ import {
   logToolCall,
   logUserPrompt,
   normalizeParts,
-  registerAcpEventLoopLagGauge,
+  parseInvocationContext,
   runSideQuery,
   runVisionBridge,
+  runWithInvocationContext,
   shouldRunVisionBridge,
   splitImageParts,
-  startEventLoopLagMonitor,
-  uiTelemetryService,
-  withDaemonSpan
-} from "./chunk-H4A4A2SY.js";
+  uiTelemetryService
+} from "./chunk-CIKQ7KKO.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-4K56OJFJ.js";
+} from "./chunk-MUP3T3AD.js";
 import {
-  DEFAULT_TOKEN_LIMIT,
-  getToolCallPreparations,
-  tokenLimit
-} from "./chunk-CBOQ3HY7.js";
+  AuthType
+} from "./chunk-IKCX4CCL.js";
+import "./chunk-46UV252V.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
-import "./chunk-QNLNLENL.js";
-import "./chunk-6X4GWOPW.js";
-import "./chunk-TYQMGACW.js";
-import "./chunk-TYAMGABM.js";
-import "./chunk-FCMNKVXT.js";
+import {
+  DEFAULT_TOKEN_LIMIT,
+  tokenLimit
+} from "./chunk-UW5EOVUN.js";
+import "./chunk-2JZBVYTU.js";
+import "./chunk-5I2IWRSH.js";
+import "./chunk-A5L3JMUA.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
+  initializeTelemetry,
   runInToolSpanContext,
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-7362QS5B.js";
+} from "./chunk-MB4MZHMJ.js";
 import "./chunk-HTR4WV6U.js";
-import "./chunk-M7WBGLYP.js";
+import "./chunk-BULDBTYC.js";
 import "./chunk-U7ZFW55U.js";
-import "./chunk-NPQDJGKU.js";
+import "./chunk-UUUTRMI2.js";
 import {
   ToolConfirmationOutcome,
   ToolNames,
   isShellProgressData
-} from "./chunk-YM3SZTH4.js";
+} from "./chunk-PR75REBZ.js";
 import {
   Storage,
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-OQB4EXO4.js";
-import "./chunk-3EHJ44GG.js";
+} from "./chunk-NL7LTRLR.js";
+import "./chunk-QAF7NMK7.js";
 import {
   runExitCleanup
-} from "./chunk-GSX6P2JW.js";
+} from "./chunk-PWVFN2LF.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
-import "./chunk-THJNPLI4.js";
+import "./chunk-AMDSOFFV.js";
+import "./chunk-TARRHLLG.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -482,7 +505,7 @@ import {
 
 // packages/cli/src/acp-integration/acpAgent.ts
 init_esbuild_shims();
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID2, timingSafeEqual } from "node:crypto";
 import { performance } from "node:perf_hooks";
 
 // packages/cli/src/acp-integration/authMethods.ts
@@ -2207,6 +2230,43 @@ var MidTurnDrainTimeoutError = class extends Error {
     );
   }
 };
+function beginChannelDeliveryResponseBlock(capture) {
+  if (!capture) return void 0;
+  capture.finalText = "";
+  return [];
+}
+__name(beginChannelDeliveryResponseBlock, "beginChannelDeliveryResponseBlock");
+function commitChannelDeliveryResponseBlock(capture, responseBlock, hasFunctionCalls) {
+  if (capture && responseBlock && !hasFunctionCalls) {
+    capture.finalText = responseBlock.join("");
+  }
+}
+__name(commitChannelDeliveryResponseBlock, "commitChannelDeliveryResponseBlock");
+function parsePromptChannelDelivery(params) {
+  const meta = params._meta;
+  const value = meta?.[DAEMON_CHANNEL_DELIVERY_META_KEY];
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return void 0;
+  }
+  const delivery = value;
+  const target = delivery["target"];
+  if (typeof delivery["deliveryId"] !== "string" || delivery["deliveryId"].length === 0 || typeof target !== "object" || target === null || Array.isArray(target)) {
+    return void 0;
+  }
+  const targetRecord = target;
+  if (typeof targetRecord["channelName"] !== "string" || targetRecord["channelName"].length === 0 || targetRecord["type"] !== "user" && targetRecord["type"] !== "chat" || typeof targetRecord["id"] !== "string" || targetRecord["id"].length === 0) {
+    return void 0;
+  }
+  return {
+    deliveryId: delivery["deliveryId"],
+    target: {
+      channelName: targetRecord["channelName"],
+      type: targetRecord["type"],
+      id: targetRecord["id"]
+    }
+  };
+}
+__name(parsePromptChannelDelivery, "parsePromptChannelDelivery");
 var MAX_NOTIFICATION_QUEUE = 20;
 var MAX_DEFERRED_UNRELATED_CRON_QUEUE = 20;
 function isExistingFile(resolved, fileExists = existsSync2, statFile = statSync2) {
@@ -2542,6 +2602,8 @@ var Session = class {
    * that produces this string.
    */
   pendingWorktreeNotice = null;
+  /** One-shot model notice for background agents restored with the session. */
+  pendingRecoveredAgentsNotice = null;
   // Implement SessionContext interface
   sessionId;
   #prepareTodoStopGuardForPrompt(params) {
@@ -2883,6 +2945,7 @@ var Session = class {
     if (this.config.isCronEnabled()) {
       this.#stopCronSchedulerInRuntime();
     }
+    this.config.getBackgroundTaskRegistry().abortAll({ notify: false });
     this.config.getBackgroundTaskRegistry().setNotificationCallback(void 0);
     this.config.getMonitorRegistry().setNotificationCallback(void 0);
     this.config.getBackgroundShellRegistry().setNotificationCallback(void 0);
@@ -3102,15 +3165,31 @@ var Session = class {
       }
     }
   }
-  async prompt(params) {
+  async prompt(params, invocationContext, admissionCancellation) {
     if (this.closing) {
       throw RequestError.invalidParams(void 0, "Session is closing");
     }
     await this.assertCanStartTurn();
+    if (admissionCancellation?.aborted) {
+      return { stopReason: "cancelled" };
+    }
     const todoStopGuardPreparation = this.#prepareTodoStopGuardForPrompt(params);
     this.pendingPrompt?.abort();
     const pendingSend = new AbortController();
+    const cancelPendingSend = /* @__PURE__ */ __name(() => pendingSend.abort(USER_CANCEL_ABORT_REASON), "cancelPendingSend");
+    if (admissionCancellation) {
+      admissionCancellation.addEventListener("abort", cancelPendingSend, {
+        once: true
+      });
+      if (admissionCancellation.aborted) cancelPendingSend();
+    }
     this.pendingPrompt = pendingSend;
+    const releasePendingSend = /* @__PURE__ */ __name(() => {
+      admissionCancellation?.removeEventListener("abort", cancelPendingSend);
+      if (this.pendingPrompt === pendingSend) {
+        this.pendingPrompt = null;
+      }
+    }, "releasePendingSend");
     if (this.followupAbort) {
       this.followupAbort.abort();
       this.followupAbort = null;
@@ -3147,6 +3226,8 @@ var Session = class {
       }
     }
     if (pendingSend.signal.aborted) {
+      releasePendingSend();
+      this.todoStopGuard.suspend();
       return { stopReason: "cancelled" };
     }
     if (todoStopGuardPreparation.startsWorkChain) {
@@ -3155,16 +3236,35 @@ var Session = class {
       this.todoStopGuardBackgroundBaseline = this.#captureTodoStopGuardBackgroundBaseline();
     }
     this.duplicateProviderToolCallResponseIds.clear();
+    const channelDelivery = parsePromptChannelDelivery(params);
+    const channelDeliveryCapture = channelDelivery ? { finalText: "" } : void 0;
     let resolveCompletion;
     this.pendingPromptCompletion = new Promise((resolve5) => {
       resolveCompletion = resolve5;
     });
     try {
-      const result = await this.#executePrompt(params, pendingSend);
-      this.pendingPrompt = null;
+      const result = await this.#executePrompt(
+        params,
+        pendingSend,
+        channelDeliveryCapture,
+        invocationContext
+      );
+      releasePendingSend();
       void this.#drainCronQueue();
       void this.#drainNotificationQueue();
       this.#maybeEmitFollowupSuggestion(result);
+      if (channelDelivery && result.stopReason === "end_turn") {
+        this.#scheduleChannelDelivery({
+          sessionId: this.sessionId,
+          deliveryId: channelDelivery.deliveryId,
+          source: "prompt",
+          target: channelDelivery.target,
+          text: normalizeChannelDeliveryText(
+            channelDeliveryCapture?.finalText ?? ""
+          ),
+          promptId: channelDelivery.deliveryId
+        });
+      }
       return result;
     } catch (error) {
       if (error instanceof SessionWriterError) {
@@ -3174,7 +3274,7 @@ var Session = class {
       }
       throw error;
     } finally {
-      this.pendingPrompt = null;
+      releasePendingSend();
       const shouldDrainAutomaticQueues = todoStopGuardPreparation.drainSupersededAutomaticQueues || this.todoStopGuardDrainAutomaticQueuesWhenIdle || this.todoStopGuard.blocksUnrelatedAutomaticTurns || this.todoStopGuard.hasCommittedContinuation || this.todoStopGuardQueuedPromptPriority;
       this.todoStopGuardDrainAutomaticQueuesWhenIdle = false;
       if (shouldDrainAutomaticQueues) {
@@ -3304,13 +3404,23 @@ var Session = class {
       }
     })();
   }
-  async #executePrompt(params, pendingSend) {
-    return sessionIdContext.run(
-      this.config.getSessionId(),
-      () => this.#executePromptInner(params, pendingSend)
+  async #executePrompt(params, pendingSend, channelDeliveryCapture, invocationContext) {
+    const sessionId = this.config.getSessionId();
+    if (invocationContext !== void 0 && invocationContext.sessionId !== sessionId) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Invocation context session does not match the active session"
+      );
+    }
+    return runWithInvocationContext(
+      invocationContext,
+      () => sessionIdContext.run(
+        sessionId,
+        () => this.#executePromptInner(params, pendingSend, channelDeliveryCapture)
+      )
     );
   }
-  async #executePromptInner(params, pendingSend) {
+  async #executePromptInner(params, pendingSend, channelDeliveryCapture) {
     return Storage.runWithRuntimeBaseDir(
       this.runtimeBaseDir,
       this.config.getWorkingDir(),
@@ -3382,6 +3492,7 @@ var Session = class {
               (block) => block.type === "text"
             );
             const inputText = firstTextBlock?.text || "";
+            const isSlashInput = !isContinue && isSlashCommand(inputText);
             let parts;
             let fullTurnModelOverride;
             const onFullTurnModel = /* @__PURE__ */ __name((model) => {
@@ -3393,7 +3504,7 @@ var Session = class {
             }, "onFullTurnModel");
             if (isContinue) {
               parts = continuationParts;
-            } else if (isSlashCommand(inputText)) {
+            } else if (isSlashInput) {
               const slashCommandResult = await handleSlashCommand(
                 inputText,
                 pendingSend,
@@ -3477,6 +3588,17 @@ ${this.pendingWorktreeNotice}
               parts = insertAfterFunctionResponses(parts, [noticePart]);
               this.pendingWorktreeNotice = null;
             }
+            if (this.pendingRecoveredAgentsNotice && !isContinue && !isSlashInput) {
+              const noticePart = {
+                text: `<system-reminder>
+${this.pendingRecoveredAgentsNotice}
+</system-reminder>
+
+`
+              };
+              parts = insertAfterFunctionResponses(parts, [noticePart]);
+              this.pendingRecoveredAgentsNotice = null;
+            }
             let nextMessage = { role: "user", parts };
             let turnCount = 0;
             const toolLoopState = createDaemonToolLoopState();
@@ -3497,6 +3619,7 @@ ${this.pendingWorktreeNotice}
                 const messageDisplay = this.#createMessageDisplayDispatcher(
                   pendingSend.signal
                 );
+                let channelDeliveryResponseBlock;
                 try {
                   const sendResult = await this.#sendMessageStreamWithAutoCompression(
                     promptId,
@@ -3514,6 +3637,8 @@ ${this.pendingWorktreeNotice}
                   }
                   const responseStream = sendResult.responseStream;
                   nextMessage = null;
+                  channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(channelDeliveryCapture);
+                  const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
                   let streamFailed = false;
                   try {
                     for await (const resp of responseStream) {
@@ -3533,6 +3658,7 @@ ${this.pendingWorktreeNotice}
                             part.thought
                           );
                           if (!part.thought) {
+                            channelDeliveryResponseBlock?.push(part.text);
                             messageDisplay?.addChunk(part.text);
                           }
                         }
@@ -3548,6 +3674,11 @@ ${this.pendingWorktreeNotice}
                         }
                       }
                       if (resp.type === "retry" /* RETRY */ || resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                        if (resp.type === "model_fallback" /* MODEL_FALLBACK */ || !resp.isContinuation) {
+                          if (channelDeliveryResponseBlock) {
+                            channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
+                          }
+                        }
                         await finalizeToolCallPreparations(
                           preparationTracker,
                           true,
@@ -3601,6 +3732,11 @@ ${this.pendingWorktreeNotice}
                 } finally {
                   await messageDisplay?.finish();
                 }
+                commitChannelDeliveryResponseBlock(
+                  channelDeliveryCapture,
+                  channelDeliveryResponseBlock,
+                  functionCalls.length > 0
+                );
                 if (usageMetadata) {
                   this.#recordPromptTokenCount(usageMetadata);
                   if (this.messageRewriter) {
@@ -3664,7 +3800,8 @@ ${this.pendingWorktreeNotice}
                 hooksEnabled,
                 messageBus,
                 true,
-                fullTurnModelOverride
+                fullTurnModelOverride,
+                channelDeliveryCapture
               );
             } finally {
               logConversationFinishedEvent(
@@ -3681,7 +3818,7 @@ ${this.pendingWorktreeNotice}
       }
     );
   }
-  async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride) {
+  async #handleStopHookLoop(pendingSend, promptId, hooksEnabled, messageBus, allowExternalHooks = true, modelOverride, channelDeliveryCapture) {
     const stopHookBlockingCap = this.config.getStopHookBlockingCap();
     let stopHookIterationCount = 0;
     let stopHookReasons = [];
@@ -3723,7 +3860,8 @@ ${this.pendingWorktreeNotice}
             false,
             {
               onFullTurnModel,
-              getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride")
+              getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
+              channelDeliveryCapture
             }
           );
           if (continuation2.kind === "terminal") {
@@ -3785,7 +3923,8 @@ ${this.pendingWorktreeNotice}
               false,
               {
                 onFullTurnModel,
-                getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride")
+                getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
+                channelDeliveryCapture
               }
             );
             if (continuation2.kind === "terminal") {
@@ -3866,7 +4005,8 @@ ${this.pendingWorktreeNotice}
             ), "onAutomaticContinuationValidated")
           } : {},
           onFullTurnModel,
-          getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride")
+          getModelOverride: /* @__PURE__ */ __name(() => modelOverride, "getModelOverride"),
+          channelDeliveryCapture
         }
       );
       if (continuation.supersededAutomaticContinuation && externalReason) {
@@ -3909,6 +4049,7 @@ ${this.pendingWorktreeNotice}
       const messageDisplay = this.#createMessageDisplayDispatcher(
         pendingSend.signal
       );
+      let channelDeliveryResponseBlock;
       try {
         const sendResult = await this.#sendMessageStreamWithAutoCompression(
           promptIdForSend,
@@ -4040,6 +4181,10 @@ ${this.pendingWorktreeNotice}
         }
         const responseStream = sendResult.responseStream;
         nextMessage = null;
+        channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(
+          options.channelDeliveryCapture
+        );
+        const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
         initialSend = false;
         if (guardForThisSend) {
           const guardCommitted = this.todoStopGuard.commitContinuation(
@@ -4070,7 +4215,10 @@ ${this.pendingWorktreeNotice}
                 "assistant",
                 part.thought
               );
-              if (!part.thought) messageDisplay?.addChunk(part.text);
+              if (!part.thought) {
+                channelDeliveryResponseBlock?.push(part.text);
+                messageDisplay?.addChunk(part.text);
+              }
             }
           }
           if (response.type === "chunk" /* CHUNK */ && response.value.usageMetadata) {
@@ -4084,6 +4232,11 @@ ${this.pendingWorktreeNotice}
             }
           }
           if (response.type === "retry" /* RETRY */ || response.type === "model_fallback" /* MODEL_FALLBACK */) {
+            if (response.type === "model_fallback" /* MODEL_FALLBACK */ || !response.isContinuation) {
+              if (channelDeliveryResponseBlock) {
+                channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
+              }
+            }
             await finalizeToolCallPreparations(
               preparationTracker,
               true,
@@ -4122,6 +4275,11 @@ ${this.pendingWorktreeNotice}
           await messageDisplay?.finish();
         }
       }
+      commitChannelDeliveryResponseBlock(
+        options.channelDeliveryCapture,
+        channelDeliveryResponseBlock,
+        functionCalls.length > 0
+      );
       if (usageMetadata) {
         this.#recordPromptTokenCount(usageMetadata);
         const durationMs = Date.now() - streamStartTime;
@@ -4241,6 +4399,19 @@ ${this.pendingWorktreeNotice}
     };
     await this.client.sessionUpdate(params);
   }
+  #scheduleChannelDelivery(params) {
+    const timer = setTimeout(() => {
+      void this.client.extMethod(SERVE_CONTROL_EXT_METHODS.channelDelivery, params).catch((error) => {
+        try {
+          debugLogger6.warn(
+            `Channel delivery submission failed: ${error instanceof Error ? error.message : String(error)}`
+          );
+        } catch {
+        }
+      });
+    }, 0);
+    timer.unref();
+  }
   #getCurrentChat() {
     return this.config.getGeminiClient().getChat();
   }
@@ -4688,7 +4859,9 @@ ${this.pendingWorktreeNotice}
       this.#enqueueCronPrompt({
         prompt: job.prompt,
         source: job.cronExpr === "@wakeup" ? "loop" : "cron",
-        ...job.id ? { taskId: job.id } : {}
+        ...job.id ? { taskId: job.id } : {},
+        ...job.lastFiredAt !== void 0 ? { firedAt: job.lastFiredAt } : {},
+        ...job.delivery ? { delivery: job.delivery } : {}
       });
       void this.#drainCronQueue();
     });
@@ -4815,9 +4988,12 @@ ${this.pendingWorktreeNotice}
    * `_meta.source='cron'`, streams the model response, and handles tool calls.
    */
   async #executeCronPrompt(item) {
-    return sessionIdContext.run(
-      this.config.getSessionId(),
-      () => this.#executeCronPromptInner(item)
+    return runWithInvocationContext(
+      void 0,
+      () => sessionIdContext.run(
+        this.config.getSessionId(),
+        () => this.#executeCronPromptInner(item)
+      )
     );
   }
   async #executeCronPromptInner(item) {
@@ -4833,6 +5009,8 @@ ${this.pendingWorktreeNotice}
         );
         const promptId = this.config.getSessionId() + "########cron" + Date.now();
         let cronHadError = false;
+        let cronCompleted = false;
+        const channelDeliveryCapture = item.delivery ? { finalText: "" } : void 0;
         await withInteractionSpan(
           this.config,
           {
@@ -4933,6 +5111,8 @@ ${this.pendingWorktreeNotice}
                   return;
                 }
                 const responseStream = sendResult.responseStream;
+                const channelDeliveryResponseBlock = beginChannelDeliveryResponseBlock(channelDeliveryCapture);
+                const channelDeliveryCheckpoint = channelDeliveryResponseBlock?.length ?? 0;
                 if (loopTick && turnCount === 1) {
                   this.loopTickResolver?.markDelivered();
                 }
@@ -4957,6 +5137,7 @@ ${this.pendingWorktreeNotice}
                           part.thought
                         );
                         if (!part.thought) {
+                          channelDeliveryResponseBlock?.push(part.text);
                           messageDisplay?.addChunk(part.text);
                         }
                       }
@@ -4972,6 +5153,11 @@ ${this.pendingWorktreeNotice}
                       }
                     }
                     if (resp.type === "retry" /* RETRY */ || resp.type === "model_fallback" /* MODEL_FALLBACK */) {
+                      if (resp.type === "model_fallback" /* MODEL_FALLBACK */ || !resp.isContinuation) {
+                        if (channelDeliveryResponseBlock) {
+                          channelDeliveryResponseBlock.length = channelDeliveryCheckpoint;
+                        }
+                      }
                       await finalizeToolCallPreparations(
                         preparationTracker,
                         true,
@@ -4994,6 +5180,11 @@ ${this.pendingWorktreeNotice}
                     await messageDisplay?.finish();
                   }
                 }
+                commitChannelDeliveryResponseBlock(
+                  channelDeliveryCapture,
+                  channelDeliveryResponseBlock,
+                  functionCalls.length > 0
+                );
                 if (usageMetadata) {
                   this.#recordPromptTokenCount(usageMetadata);
                   if (this.messageRewriter) {
@@ -5030,18 +5221,23 @@ ${this.pendingWorktreeNotice}
                   }
                 }
               }
+              let stopReason = "end_turn";
               if (this.todoStopGuard.needsStopInspection) {
                 const guardStop = await this.#handleStopHookLoop(
                   ac,
                   promptId,
                   false,
                   void 0,
-                  false
+                  false,
+                  void 0,
+                  channelDeliveryCapture
                 );
+                stopReason = guardStop.stopReason;
                 if (guardStop.stopReason === "max_tokens") {
                   this.#stopCronAfterTokenLimit();
                 }
               }
+              cronCompleted = stopReason === "end_turn" && !ac.signal.aborted;
             } catch (error) {
               if (ac.signal.aborted) {
                 this.todoStopGuard.suspend();
@@ -5069,6 +5265,19 @@ ${this.pendingWorktreeNotice}
           },
           () => ac.signal.aborted ? "cancelled" : cronHadError ? "error" : "ok"
         );
+        if (cronCompleted && item.delivery && item.taskId && item.firedAt !== void 0) {
+          this.#scheduleChannelDelivery({
+            sessionId: this.sessionId,
+            deliveryId: `${item.taskId}:${item.firedAt}`,
+            source: "scheduled",
+            target: item.delivery.target,
+            text: normalizeChannelDeliveryText(
+              channelDeliveryCapture?.finalText ?? ""
+            ),
+            taskId: item.taskId,
+            firedAt: item.firedAt
+          });
+        }
       }
     );
   }
@@ -5208,9 +5417,12 @@ ${this.pendingWorktreeNotice}
         if (nextIndex < 0) break;
         const [item] = this.notificationQueue.splice(nextIndex, 1);
         if (!item) break;
-        await sessionIdContext.run(
-          this.config.getSessionId(),
-          () => this.#executeBackgroundNotificationPromptInner(item)
+        await runWithInvocationContext(
+          void 0,
+          () => sessionIdContext.run(
+            this.config.getSessionId(),
+            () => this.#executeBackgroundNotificationPromptInner(item)
+          )
         );
       }
     } finally {
@@ -6307,6 +6519,7 @@ ${this.pendingWorktreeNotice}
     const originalPolicyRequestArgs = policyToolName === ToolNames.SHELL || policyToolName === ToolNames.MONITOR ? structuredClone(args) : args;
     const toolSpan = startToolSpan(policyToolName, {
       "tool.call_id": callId,
+      "gen_ai.tool.call.id": getProviderToolCallId(fc) ?? callId,
       // Dual-emit the legacy call_id/tool_name aliases like CoreToolScheduler
       // (coreToolScheduler.ts) so pre-Phase-2 dashboards keyed off call_id keep
       // matching daemon/ACP tool spans during the migration window.
@@ -7689,7 +7902,8 @@ function serializeAgentTask(entry, now) {
         at: a.at
       }))
     } : {},
-    ...optionalField("prompt", entry.prompt)
+    ...optionalField("prompt", entry.prompt),
+    ...optionalField("toolUseId", entry.toolUseId)
   };
 }
 __name(serializeAgentTask, "serializeAgentTask");
@@ -9397,7 +9611,9 @@ async function deliverClientMcpMessage(connection, serverName, message, sessionI
   return payload;
 }
 __name(deliverClientMcpMessage, "deliverClientMcpMessage");
-async function runAcpAgent(config, settings, argv) {
+async function runAcpAgent(config, settings, argv, options) {
+  const privateParentCapability = options === void 0 ? process.env[PRIVATE_ACP_CAPABILITY_ENV] : options.privateParentCapability;
+  delete process.env[PRIVATE_ACP_CAPABILITY_ENV];
   let acpConnection;
   const bootstrapClientMcpSender = /* @__PURE__ */ __name((serverName, message) => deliverClientMcpMessage(acpConnection, serverName, message), "bootstrapClientMcpSender");
   beginAcpBootstrapConfigProfiling();
@@ -9434,10 +9650,33 @@ async function runAcpAgent(config, settings, argv) {
     console.log = console.error;
     console.info = console.error;
     console.debug = console.error;
-    const stream = ndJsonStream(stdout, stdin);
+    let initializeRequestId;
+    const stream = ndJsonStream(stdout, stdin, {
+      onMessageObserved: /* @__PURE__ */ __name(({ direction, message }) => {
+        if (direction === "received" && "id" in message && "method" in message && message.method === "initialize") {
+          initializeRequestId = message.id;
+          return;
+        }
+        if (direction !== "sent" || initializeRequestId === void 0 || !("id" in message) || "method" in message || message.id !== initializeRequestId) {
+          return;
+        }
+        initializeRequestId = void 0;
+        if ("result" in message) {
+          void initializeTelemetry(config).then(() => {
+            registerAcpEventLoopLagGauge(() => eventLoopMonitor.snapshot());
+          });
+        }
+      }, "onMessageObserved")
+    });
     connection = new AgentSideConnection((conn) => {
       acpConnection = conn;
-      agentInstance = new QwenAgent(config, settings, argv, conn);
+      agentInstance = new QwenAgent(
+        config,
+        settings,
+        argv,
+        conn,
+        privateParentCapability
+      );
       return agentInstance;
     }, stream);
     markAcpStartup("transportSetupEnd");
@@ -9445,7 +9684,6 @@ async function runAcpAgent(config, settings, argv) {
     eventLoopMonitor.dispose();
     throw err;
   }
-  registerAcpEventLoopLagGauge(() => eventLoopMonitor.snapshot());
   const drainPoolBeforeExit = /* @__PURE__ */ __name(async (label) => {
     if (!agentInstance) return;
     try {
@@ -9634,11 +9872,12 @@ function parseAcpSessionListCursor(value) {
 }
 __name(parseAcpSessionListCursor, "parseAcpSessionListCursor");
 var QwenAgent = class {
-  constructor(config, settings, argv, connection) {
+  constructor(config, settings, argv, connection, expectedPrivateParentCapability) {
     this.config = config;
     this.settings = settings;
     this.argv = argv;
     this.connection = connection;
+    this.expectedPrivateParentCapability = expectedPrivateParentCapability;
     if (process.env["QWEN_SERVE_NO_MCP_POOL"] === "1") {
       this.mcpPool = void 0;
       this.workspaceMcpBudget = void 0;
@@ -9669,15 +9908,18 @@ var QwenAgent = class {
     __name(this, "QwenAgent");
   }
   sessions = /* @__PURE__ */ new Map();
+  activePromptCalls = /* @__PURE__ */ new Map();
   workspaceMcpDiscoveryConfig;
   workspaceMcpDiscoveryPromise;
   workspaceMcpDiscoveryError;
   pendingMcpAuthentications = /* @__PURE__ */ new Map();
   mcpAuthenticationResults = /* @__PURE__ */ new Map();
   generationControllers = /* @__PURE__ */ new Map();
+  workspaceGenerationControllers = /* @__PURE__ */ new Map();
   transcriptReplayConfigCache = /* @__PURE__ */ new Map();
   pendingConfigCleanup = /* @__PURE__ */ new Map();
   clientCapabilities;
+  privateParentState = "uninitialized";
   // CPU-usage delta baseline for the daemon's `workspaceResource` extMethod
   // (Daemon Status child-resource chart). The daemon polls this at a fixed
   // cadence, so successive calls form a clean delta window independent of tool
@@ -9838,7 +10080,7 @@ var QwenAgent = class {
       await this.createWorkspaceMcpDiscoveryConfig(settings);
     });
   }
-  reloadWorkspaceMcpDiscovery() {
+  reloadWorkspaceMcpDiscovery(options = {}) {
     return this.enqueueWorkspaceMcpDiscovery("reload", async () => {
       const settings = loadSettings(this.config.getTargetDir());
       const discoveryConfig = this.workspaceMcpDiscoveryConfig;
@@ -9884,8 +10126,62 @@ var QwenAgent = class {
           "Failed to synchronize MCP settings with live sessions"
         );
       }
+      if (options.forceReconnectAll === true || options.forceReconnectWhich !== void 0) {
+        await this.forceReconnectWorkspaceMcp(options.forceReconnectWhich);
+      }
     });
   }
+  async forceReconnectWorkspaceMcp(requestedServerNames) {
+    const serverNames = /* @__PURE__ */ new Set();
+    for (const config of [
+      this.workspaceMcpDiscoveryConfig,
+      this.config,
+      ...this.getActiveSessions().map((session) => session.getConfig())
+    ]) {
+      for (const name of Object.keys(config?.getMcpServers() ?? {})) {
+        serverNames.add(name);
+      }
+    }
+    const selectedServerNames = requestedServerNames ? [...new Set(requestedServerNames)].filter(
+      (name) => serverNames.has(name)
+    ) : [...serverNames];
+    const errors = [];
+    for (const serverName of selectedServerNames) {
+      try {
+        const poolHasEntries = (this.mcpPool?.getSnapshot().byName[serverName]?.entryCount ?? 0) > 0;
+        if (this.mcpPool && poolHasEntries) {
+          const results = await this.mcpPool.restartByName(serverName);
+          const failed = results.find((result) => !result.restarted);
+          if (failed) {
+            throw new Error(
+              `MCP server ${JSON.stringify(serverName)} failed to reconnect: ${failed.reason ?? "unknown error"}`
+            );
+          }
+          await Promise.all(
+            this.getLiveMcpConfigs(serverName).map(async (config) => {
+              const geminiClient = config.getGeminiClient?.();
+              if (geminiClient?.isInitialized?.()) {
+                await geminiClient.setTools?.();
+              }
+            })
+          );
+        } else {
+          await this.reconcileMcpServerAcrossLiveConfigs(
+            serverName,
+            "discover"
+          );
+        }
+      } catch (error) {
+        errors.push(error);
+      }
+    }
+    if (errors.length > 0) {
+      throw new AggregateError(
+        errors,
+        "Failed to force reconnect one or more MCP servers"
+      );
+    }
+  }
   /**
    * Drain the workspace MCP transport pool. Called on shutdown so all
    * pool entries get a coordinated SIGTERM before process.exit. No-op
@@ -10094,6 +10390,10 @@ var QwenAgent = class {
       generation.controller.abort();
     }
     this.generationControllers.clear();
+    for (const controller of this.workspaceGenerationControllers.values()) {
+      controller.abort();
+    }
+    this.workspaceGenerationControllers.clear();
     await Promise.allSettled(
       [...this.sessions.entries()].map(
         ([sessionId, session]) => this.discardStoredSessionIfCurrent(sessionId, session, {
@@ -10152,9 +10452,34 @@ var QwenAgent = class {
   }
   async initialize(args) {
     markAcpStartup("initializeHandlerStart");
+    if (this.privateParentState === "rejected") {
+      throw RequestError.invalidParams(
+        void 0,
+        "Invalid private ACP parent capability"
+      );
+    }
+    if (this.privateParentState === "uninitialized") {
+      const expectedCapability = this.expectedPrivateParentCapability;
+      if (expectedCapability === void 0) {
+        this.privateParentState = "untrusted";
+      } else {
+        const suppliedCapability = args._meta?.[PRIVATE_PARENT_CAPABILITY_META_KEY];
+        const suppliedBuffer = typeof suppliedCapability === "string" ? Buffer.from(suppliedCapability) : void 0;
+        const expectedBuffer = Buffer.from(expectedCapability);
+        if (suppliedBuffer !== void 0 && suppliedBuffer.length === expectedBuffer.length && timingSafeEqual(suppliedBuffer, expectedBuffer)) {
+          this.privateParentState = "trusted";
+        } else {
+          this.privateParentState = "rejected";
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid private ACP parent capability"
+          );
+        }
+      }
+    }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.20.2-jobbench-no-todo-write.0";
+    const version = "0.21.0";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -10430,6 +10755,7 @@ var QwenAgent = class {
       }
     }
     await this.#restoreWorktreeOnResume(config, session);
+    await this.#restoreBackgroundAgentsOnResume(config, session);
     this.#restoreGoalOnResume(config, session);
     const modesData = this.buildModesData(config);
     const availableModels = this.buildAvailableModels(config);
@@ -10504,6 +10830,7 @@ var QwenAgent = class {
       });
     }
     await this.#restoreWorktreeOnResume(config, session);
+    await this.#restoreBackgroundAgentsOnResume(config, session);
     this.#restoreGoalOnResume(config, session);
     const modesData = this.buildModesData(config);
     const availableModels = this.buildAvailableModels(config);
@@ -10533,6 +10860,10 @@ var QwenAgent = class {
       debugLogger7.warn(`ACP worktree restore failed: ${error}`);
     }
   }
+  async #restoreBackgroundAgentsOnResume(config, session) {
+    await config.loadPausedBackgroundAgents(config.getSessionId());
+    session.pendingRecoveredAgentsNotice = config.consumePendingRecoveredAgentsNotice();
+  }
   /**
    * Re-registers the `/goal` Stop hook when a resumed transcript ends on an
    * unsatisfied goal — the daemon counterpart of the TUI's resume restore.
@@ -10666,14 +10997,63 @@ var QwenAgent = class {
     if (!session) {
       throw new Error(`Session not found: ${params.sessionId}`);
     }
-    return session.prompt(params);
+    const sanitizedParams = { ...params };
+    const meta = params._meta && typeof params._meta === "object" ? { ...params._meta } : {};
+    const suppliedContext = meta[INVOCATION_CONTEXT_META_KEY];
+    delete meta[INVOCATION_CONTEXT_META_KEY];
+    delete meta[PRIVATE_PARENT_CAPABILITY_META_KEY];
+    if (Object.keys(meta).length > 0) {
+      sanitizedParams._meta = meta;
+    } else {
+      delete sanitizedParams._meta;
+    }
+    const invocationContext = this.privateParentState === "trusted" && suppliedContext !== void 0 ? parseInvocationContext(suppliedContext) : void 0;
+    if (this.privateParentState === "trusted" && suppliedContext !== void 0 && invocationContext === void 0) {
+      throw RequestError.invalidParams(
+        void 0,
+        "Invalid trusted ACP invocation context"
+      );
+    }
+    let settleCall = /* @__PURE__ */ __name(() => {
+    }, "settleCall");
+    const call = {
+      controller: new AbortController(),
+      settled: new Promise((resolve5) => {
+        settleCall = resolve5;
+      })
+    };
+    let calls = this.activePromptCalls.get(params.sessionId);
+    if (!calls) {
+      calls = /* @__PURE__ */ new Set();
+      this.activePromptCalls.set(params.sessionId, calls);
+    }
+    calls.add(call);
+    try {
+      return await session.prompt(
+        sanitizedParams,
+        invocationContext,
+        call.controller.signal
+      );
+    } finally {
+      calls.delete(call);
+      if (calls.size === 0) {
+        this.activePromptCalls.delete(params.sessionId);
+      }
+      settleCall();
+    }
   }
   async cancel(params) {
     const session = this.sessions.get(params.sessionId);
     if (!session) {
       throw new Error(`Session not found: ${params.sessionId}`);
     }
-    await session.cancelPendingPrompt();
+    try {
+      await session.cancelPendingPrompt();
+    } catch (error) {
+      if (!isNotCurrentlyGeneratingCancelError(error)) {
+        throw error;
+      }
+    }
   }
   loadPermissionSettings(cwd) {
     this.settings = loadSettings(cwd);
@@ -11695,7 +12075,7 @@ var QwenAgent = class {
   }
   buildProvidersPreflightCell(config) {
     try {
-      const models = config.getAllConfiguredModels();
+      const models = config.getAllConfiguredModels().filter((model) => !model.imageOnly);
       const authType = config.getAuthType?.();
       if (models.length === 0) {
         return this.acpCell("providers", {
@@ -12433,6 +12813,31 @@ var QwenAgent = class {
     const cwd = requestedCwd || process.cwd();
     const SESSION_ID_RE = /^[0-9a-fA-F-]{32,36}$/;
     switch (method) {
+      case PROMPT_CANCEL_METHOD: {
+        const sessionId = params["sessionId"];
+        if (typeof sessionId !== "string" || sessionId.length === 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing sessionId"
+          );
+        }
+        const session = this.sessions.get(sessionId);
+        if (!session) {
+          throw RequestError.invalidParams(
+            void 0,
+            `Session not found for id: ${sessionId}`
+          );
+        }
+        const targetedCalls = new Set(
+          this.activePromptCalls.get(sessionId) ?? []
+        );
+        if (targetedCalls.size === 0) {
+          return { cancelled: false };
+        }
+        targetedCalls.forEach((call) => call.controller.abort());
+        await Promise.all(Array.from(targetedCalls, (call) => call.settled));
+        return { cancelled: true };
+      }
       case TODO_STOP_GUARD_QUEUE_RELEASE_METHOD: {
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || sessionId.length === 0) {
@@ -12702,6 +13107,25 @@ var QwenAgent = class {
             "Transcript cursor and record boundary are mutually exclusive"
           );
         }
+        const rawDirection = params["direction"];
+        if (rawDirection !== void 0 && rawDirection !== "backward") {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid transcript direction"
+          );
+        }
+        if (rawCursor !== void 0 && rawDirection !== void 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Transcript cursor and direction are mutually exclusive"
+          );
+        }
+        if (rawBeforeRecordId !== void 0 && rawDirection !== void 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Transcript record boundary and direction are mutually exclusive"
+          );
+        }
         const rawLimit = params["limit"];
         if (rawLimit !== void 0 && (!Number.isSafeInteger(rawLimit) || rawLimit < 1 || rawLimit > SESSION_TRANSCRIPT_MAX_LIMIT)) {
           throw RequestError.invalidParams(
@@ -12712,10 +13136,14 @@ var QwenAgent = class {
         try {
           const settings = loadSettingsCached(cwd);
           return await runWithAcpRuntimeOutputDir(settings, cwd, async () => {
+            if (rawDirection === "backward") {
+              await this.sessions.get(sessionId)?.getConfig().getChatRecordingService()?.flush();
+            }
             const reader = new SessionTranscriptReader(cwd);
             const page = await reader.readPage(sessionId, {
               ...typeof rawCursor === "string" ? { cursor: rawCursor } : {},
               ...typeof rawBeforeRecordId === "string" ? { beforeRecordId: rawBeforeRecordId } : {},
+              ...rawDirection === "backward" ? { direction: rawDirection } : {},
               ...typeof rawLimit === "number" ? { limit: rawLimit } : {},
               maxBytes: SESSION_TRANSCRIPT_MAX_PAGE_BYTES
             });
@@ -13261,8 +13689,34 @@ var QwenAgent = class {
       }
       case SERVE_CONTROL_EXT_METHODS.workspaceMcpInitialize:
         return this.initializeWorkspaceMcpDiscovery();
-      case SERVE_CONTROL_EXT_METHODS.workspaceMcpReload:
-        return this.reloadWorkspaceMcpDiscovery();
+      case SERVE_CONTROL_EXT_METHODS.workspaceMcpReload: {
+        const forceReconnectAll = params["forceReconnectAll"];
+        const forceReconnectWhich = params["forceReconnectWhich"];
+        if (forceReconnectAll !== void 0 && typeof forceReconnectAll !== "boolean") {
+          throw RequestError.invalidParams(
+            void 0,
+            "forceReconnectAll must be a boolean"
+          );
+        }
+        if (forceReconnectWhich !== void 0 && (!Array.isArray(forceReconnectWhich) || forceReconnectWhich.some(
+          (serverName) => typeof serverName !== "string" || serverName.length === 0
+        ))) {
+          throw RequestError.invalidParams(
+            void 0,
+            "forceReconnectWhich must be an array of server names"
+          );
+        }
+        if (forceReconnectAll === true && forceReconnectWhich !== void 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "forceReconnectAll and forceReconnectWhich cannot be used together"
+          );
+        }
+        return this.reloadWorkspaceMcpDiscovery({
+          forceReconnectAll: forceReconnectAll === true,
+          forceReconnectWhich
+        });
+      }
       case SERVE_CONTROL_EXT_METHODS.workspaceMcpManage: {
         const serverName = params["serverName"];
         const action = params["action"];
@@ -13514,6 +13968,52 @@ var QwenAgent = class {
           authUrl
         };
       }
+      case SERVE_CONTROL_EXT_METHODS.workspaceGenerationStart: {
+        const requestId = params["requestId"];
+        const prompt = params["prompt"];
+        if (typeof requestId !== "string" || requestId.length === 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing requestId"
+          );
+        }
+        if (typeof prompt !== "string" || !prompt.trim() || Buffer.byteLength(prompt, "utf8") > GENERATION_MAX_PROMPT_BYTES || params["purpose"] !== "text") {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid workspace generation request"
+          );
+        }
+        if (this.workspaceGenerationControllers.has(requestId)) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Duplicate workspace generation requestId"
+          );
+        }
+        const controller = new AbortController();
+        this.workspaceGenerationControllers.set(requestId, controller);
+        const signal = AbortSignal.any([
+          controller.signal,
+          AbortSignal.timeout(GENERATION_TIMEOUT_MS)
+        ]);
+        try {
+          const emit = /* @__PURE__ */ __name(async (event) => {
+            await this.connection.extNotification(
+              "qwen/notify/workspace/generation/event",
+              { v: 1, requestId, event }
+            );
+          }, "emit");
+          const result = await executeGeneration(
+            this.config,
+            requestId,
+            prompt.trim(),
+            signal,
+            emit
+          );
+          return { requestId, ...result };
+        } finally {
+          this.workspaceGenerationControllers.delete(requestId);
+        }
+      }
       case SERVE_CONTROL_EXT_METHODS.workspaceAgentGenerate: {
         const description = params["description"];
         if (typeof description !== "string" || !description.trim() || description.length > 4096) {
@@ -13528,6 +14028,22 @@ var QwenAgent = class {
           AbortSignal.timeout(5 * 6e4)
         );
       }
+      case SERVE_CONTROL_EXT_METHODS.workspaceGenerationCancel: {
+        const requestId = params["requestId"];
+        if (typeof requestId !== "string" || requestId.length === 0) {
+          throw RequestError.invalidParams(
+            void 0,
+            "Invalid or missing requestId"
+          );
+        }
+        const controller = this.workspaceGenerationControllers.get(requestId);
+        const cancelled = controller !== void 0;
+        if (cancelled) {
+          controller.abort();
+          this.workspaceGenerationControllers.delete(requestId);
+        }
+        return { requestId, cancelled };
+      }
       case SERVE_CONTROL_EXT_METHODS.sessionArtifactsPersist: {
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || sessionId.length === 0) {
@@ -15526,7 +16042,7 @@ ${outputText}
   buildAvailableModels(config) {
     const rawCurrentModelId = (config.getModel() || this.config.getModel() || "").trim();
     const currentAuthType = config.getAuthType();
-    const modelOptions = buildAcpModelOptions(config.getAllConfiguredModels());
+    const modelOptions = this.buildSelectableModelOptions(config);
     const activeRuntimeSnapshot = config.getActiveRuntimeModelSnapshot?.();
     const currentModelId = getCurrentAcpModelId(
       modelOptions,
@@ -15561,7 +16077,7 @@ ${outputText}
   }
   buildConfigOptions(config) {
     const currentApprovalMode = config.getApprovalMode();
-    const modelOptions = buildAcpModelOptions(config.getAllConfiguredModels());
+    const modelOptions = this.buildSelectableModelOptions(config);
     const rawCurrentModelId = (config.getModel() || "").trim();
     const currentAuthType = config.getAuthType?.();
     const activeRuntimeSnapshot = config.getActiveRuntimeModelSnapshot?.();
@@ -15601,6 +16117,14 @@ ${outputText}
     };
     return [modeConfigOption, modelConfigOption];
   }
+  buildSelectableModelOptions(config) {
+    const currentAuthType = config.getAuthType();
+    return buildAcpModelOptions(
+      config.getAllConfiguredModels().filter(
+        (model) => model.authType !== "qwen-oauth" /* QWEN_OAUTH */ || currentAuthType === "qwen-oauth" /* QWEN_OAUTH */
+      )
+    );
+  }
 };
 function diffSettingsKeys(oldMerged, newMerged) {
   const changed = /* @__PURE__ */ new Set();