@qwen-code/qwen-code 0.21.1 → 0.21.2

package/chunks/{acpAgent-WN5SRDQO.js → acpAgent-PS6EDGH3.js}

@@ -12,53 +12,48 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-TV64SXKD.js";
+} from "./chunk-RG64CDT2.js";
 import {
   getAvailableCommands,
   handleSlashCommand,
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-J7OACQDE.js";
+} from "./chunk-FNDXMN7I.js";
+import {
+  collectContextData,
+  formatContextUsageText
+} from "./chunk-H6I4PGRV.js";
 import {
   recomputeMcpGating
-} from "./chunk-A4COXFB3.js";
+} from "./chunk-7SJN2IWT.js";
 import {
   appEvents,
   buildDisabledSkillNamesProvider,
   cleanupReviewWorktreeLeases,
   loadCliConfig,
   normalizeDisabledToolList
-} from "./chunk-7BAU433D.js";
+} from "./chunk-DEEABGH2.js";
 import {
   getCommandSubcommandNames
-} from "./chunk-JX27F6QS.js";
+} from "./chunk-RDJOB6S3.js";
 import {
   getEffectiveSupportedModes
-} from "./chunk-7AEJDLRA.js";
-import "./chunk-PQNHRFJC.js";
-import "./chunk-M7OONWYU.js";
-import {
-  collectContextData,
-  formatContextUsageText
-} from "./chunk-65PQENQP.js";
+} from "./chunk-UV6KF7T3.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-GATT5TKW.js";
-import "./chunk-EVKE2FZL.js";
-import "./chunk-T3O2B4XO.js";
-import "./chunk-7DXQIJID.js";
-import "./chunk-YAF2MQZ6.js";
-import {
-  computeCpuPercent
-} from "./chunk-HGT6JR3U.js";
-import "./chunk-S4WJVPZW.js";
-import "./chunk-6H67XLET.js";
+import "./chunk-PQNHRFJC.js";
+import "./chunk-NBD76HUW.js";
+import "./chunk-IGTHU3T4.js";
 import {
   beginAcpBootstrapConfigProfiling,
   buildAndFreezeAcpStartupProfile,
   endAcpBootstrapConfigProfiling,
   markAcpStartup
-} from "./chunk-3L2SPEBH.js";
+} from "./chunk-YGE3IXJP.js";
+import "./chunk-KXDONCPU.js";
+import "./chunk-CU47KXB5.js";
+import "./chunk-OFZKFPYG.js";
+import "./chunk-YAF2MQZ6.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -78,7 +73,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-6PE7N3A4.js";
+} from "./chunk-JLZ3RBQG.js";
 import {
   HistoryReplayer,
   MessageEmitter,
@@ -88,48 +83,57 @@ import {
   goalTerminalEventToHistoryItem,
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-LO4ROVP4.js";
-import "./chunk-LGAOC3ZS.js";
-import "./chunk-XFZYFU3I.js";
+} from "./chunk-PZEXDV3H.js";
+import "./chunk-675H6PLP.js";
 import "./chunk-YDLJGZHL.js";
+import "./chunk-PCK4B6LR.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-V4XNUDPE.js";
+import "./chunk-6H67XLET.js";
+import {
+  mapSkillConfigToStatus
+} from "./chunk-L55JWS76.js";
 import {
   PERMISSION_RULE_TYPES,
   PermissionRulesValidationError,
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-MR5EAQ5M.js";
+} from "./chunk-YANIWTRZ.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-CAPPWD3X.js";
+} from "./chunk-7KAXXBER.js";
 import {
   readVoiceModel
-} from "./chunk-JTV5K7NH.js";
-import "./chunk-ZHBO7WVX.js";
+} from "./chunk-P5VC5USY.js";
+import "./chunk-CNTR4GR6.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-WUZ7H6DP.js";
+} from "./chunk-PVNQRENX.js";
 import "./chunk-VXZBKKQR.js";
-import "./chunk-QIZKCVM3.js";
+import "./chunk-Q5WZTTWE.js";
 import "./chunk-E5Z2AVNV.js";
 import {
+  SESSION_SOURCE_META_KEY,
   parseSessionSource
-} from "./chunk-ZURDMIDR.js";
+} from "./chunk-44F4LBWZ.js";
 import "./chunk-GLWP3FDB.js";
 import "./chunk-XCGIMOLN.js";
 import "./chunk-OCPBI7J5.js";
 import {
   ndJsonStream
-} from "./chunk-KAMYKP7E.js";
+} from "./chunk-XUGZYLDH.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -138,10 +142,7 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-KCO4FLFJ.js";
-import {
-  mapSkillConfigToStatus
-} from "./chunk-L55JWS76.js";
+} from "./chunk-6TAASXWL.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -149,16 +150,16 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-FTD6DP4T.js";
+} from "./chunk-GURGAJTX.js";
 import {
   resolveSkillSettings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-BNWB5CYE.js";
-import "./chunk-5MKRTI4T.js";
+import "./chunk-D6MDRSZ6.js";
+import "./chunk-A7Y5H4TX.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-2XSLTRFZ.js";
-import "./chunk-TFRMVU6R.js";
-import "./chunk-XBYYDKAZ.js";
+import "./chunk-I5BT7ADR.js";
+import "./chunk-FANRZEAJ.js";
+import "./chunk-KWHKHSIS.js";
 import "./chunk-V6WHFGST.js";
 import {
   CHANNEL_STARTUP_PROFILE_META_KEY,
@@ -166,6 +167,7 @@ import {
   CLIENT_MCP_OVER_WS_CONFIG_FLAG,
   DAEMON_CHANNEL_DELIVERY_META_KEY,
   LOAD_REPLAY_BULK_MODE,
+  LOAD_REPLAY_HIDE_INHERITED_META_KEY,
   LOAD_REPLAY_META_KEY,
   LOAD_REPLAY_MODE_META_KEY,
   LOAD_REPLAY_PAGE_SIZE_META_KEY,
@@ -173,8 +175,9 @@ import {
   MID_TURN_QUEUE_DRAIN_METHOD,
   PROMPT_CANCEL_METHOD,
   TODO_STOP_GUARD_CONTINUATION_CLAIM_METHOD,
-  TODO_STOP_GUARD_QUEUE_RELEASE_METHOD
-} from "./chunk-XZC5VLBZ.js";
+  TODO_STOP_GUARD_QUEUE_RELEASE_METHOD,
+  WORKTREE_MCP_DEFER_META_KEY
+} from "./chunk-CPZAH673.js";
 import {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
   isNotCurrentlyGeneratingCancelError
@@ -182,13 +185,13 @@ import {
 import "./chunk-2RFKHEXL.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-U4VTUMMK.js";
-import "./chunk-GZ3RCT54.js";
+import "./chunk-6MPDY6ZG.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-BK2UNYWD.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-4G2BISNC.js";
-import "./chunk-GEBV2JGB.js";
-import "./chunk-7I5GTCT4.js";
+import "./chunk-IIUGIWWY.js";
+import "./chunk-ZPZ7ZJEE.js";
+import "./chunk-JCJ7LKNA.js";
 import {
   AgentSideConnection,
   PROTOCOL_VERSION,
@@ -197,7 +200,7 @@ import {
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-6RPMI2AB.js";
+} from "./chunk-KR32NIAN.js";
 import {
   getOutputLanguageFilePath,
   getPersistScopeForModelSelection,
@@ -206,35 +209,35 @@ import {
   resolveOutputLanguageOrPreserveAuto,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-EIF3FXTB.js";
+} from "./chunk-W3UKBMSI.js";
 import "./chunk-RKUWKYED.js";
+import "./chunk-GOXKNSDZ.js";
+import {
+  getSystemDefaultsPath,
+  getSystemSettingsPath
+} from "./chunk-IDS7MSUP.js";
 import {
   SUPPORTED_LANGUAGES,
   getCurrentLanguage,
   setLanguageAsync
-} from "./chunk-TCIFAA7K.js";
+} from "./chunk-3F2WDAV6.js";
 import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-2N7CODY5.js";
-import "./chunk-VWOOBLTY.js";
-import "./chunk-GOXKNSDZ.js";
-import {
-  getSystemDefaultsPath,
-  getSystemSettingsPath
-} from "./chunk-IDS7MSUP.js";
+} from "./chunk-EU5TBFJI.js";
 import "./chunk-6PEXNQTX.js";
-import "./chunk-XFSFZCM5.js";
-import "./chunk-VYOXCEPJ.js";
-import "./chunk-VJNBRRZG.js";
+import "./chunk-GJ2GBPBD.js";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-Q43KPN7X.js";
+} from "./chunk-P755N4CS.js";
 import "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
+import "./chunk-XFSFZCM5.js";
+import "./chunk-2KKCCLPT.js";
+import "./chunk-VJNBRRZG.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -339,7 +342,6 @@ import {
   normalizeEventPayload,
   normalizeSnapshotPayload,
   persistPermissionOutcome,
-  promptIdContext,
   readManyFiles,
   recordAllow,
   recordFallbackApprove,
@@ -362,57 +364,65 @@ import {
   unregisterGoalHook,
   updateSetting,
   validatePlanModeShellApproval,
-  validatePlanModeShellContext
-} from "./chunk-X5WNMMIA.js";
+  validatePlanModeShellContext,
+  wrapUserPromptSubmitContext
+} from "./chunk-54YCNSK5.js";
+import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
 } from "./chunk-H6XPXXMH.js";
-import "./chunk-5M6IDOMF.js";
-import "./chunk-UPUG4GXM.js";
-import "./chunk-64LQLPL7.js";
-import "./chunk-2LQTH543.js";
+import "./chunk-AOHY3QJ3.js";
+import "./chunk-5NNHICSA.js";
+import "./chunk-SHN4KHDK.js";
+import "./chunk-JXVC2PL3.js";
 import "./chunk-KRXPRVGL.js";
-import "./chunk-BMFALVGQ.js";
-import "./chunk-CVHIL5IG.js";
-import "./chunk-IRH27ZC2.js";
-import "./chunk-QHWCP53L.js";
-import "./chunk-PONHVBRT.js";
-import "./chunk-T26EAKDL.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
+import "./chunk-ZMOJ7ISP.js";
+import "./chunk-IRH27ZC2.js";
+import "./chunk-QHWCP53L.js";
+import "./chunk-TEGJSJDF.js";
+import "./chunk-TIRRPCFS.js";
+import {
+  promptIdContext,
+  todoWorkChainContext
+} from "./chunk-O6GEWCJA.js";
+import "./chunk-T26EAKDL.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-6QIGFD5W.js";
+import "./chunk-4KP2F2TE.js";
 import {
   HookEventName,
   createHookOutput
-} from "./chunk-XWWKIXVD.js";
-import "./chunk-75GFAX4R.js";
-import "./chunk-OKF7JF3R.js";
+} from "./chunk-3APUUXRF.js";
+import "./chunk-THVU3RNH.js";
+import "./chunk-LHKCY7DY.js";
+import "./chunk-6FMJLI5M.js";
 import {
   APPROVAL_MODES,
   FORK_SUBAGENT_TYPE,
   getStartupContextLength,
   isSystemReminderContent,
   runWithRuntimeContentGenerator
-} from "./chunk-JSD33JG6.js";
+} from "./chunk-CBBP4BMC.js";
 import "./chunk-S6LOFUVP.js";
-import "./chunk-JCW2R7WC.js";
-import "./chunk-2DN4J57Y.js";
+import "./chunk-K623ENWT.js";
+import "./chunk-AQ37AY7B.js";
+import "./chunk-N4ACHWNH.js";
 import "./chunk-ZPJWUGCS.js";
 import {
   clearCachedCredentialFile,
   qwenOAuth2Events
-} from "./chunk-2LKVPASC.js";
+} from "./chunk-D4HTUMGX.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-LW3RFMG7.js";
-import "./chunk-W4MIWP6M.js";
+import "./chunk-LOY7RWQG.js";
+import "./chunk-E6CJ2SMM.js";
 import "./chunk-DGEIYUC3.js";
 import "./chunk-MPHPFVKK.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-5KTQXHPY.js";
+import "./chunk-6CQWRWUC.js";
 import {
   addToolArgumentsAttributes,
   addToolCallResultAttributes,
@@ -420,14 +430,14 @@ import {
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor,
   withDaemonSpan
-} from "./chunk-75MIQ3LV.js";
+} from "./chunk-Z3S5EMOW.js";
 import "./chunk-2J3OJGTL.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-RPLGZJV2.js";
+import "./chunk-XQK4XXTN.js";
 import {
   getToolCallPreparations
 } from "./chunk-GLCZKT5V.js";
-import "./chunk-DZLYR4U3.js";
+import "./chunk-QDK4F2N5.js";
 import {
   ConversationFinishedEvent,
   DiscoveredMCPTool,
@@ -458,30 +468,30 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-PT722TDT.js";
+} from "./chunk-DUNI4EBW.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
-} from "./chunk-SGFT55XI.js";
-import "./chunk-Y4IHBGBP.js";
+} from "./chunk-3I6DUGQD.js";
+import "./chunk-7ULQIS27.js";
 import {
   ToolConfirmationOutcome,
   ToolNames,
   isShellProgressData
-} from "./chunk-Y6AXW2OG.js";
+} from "./chunk-MM7TH7ZM.js";
 import {
   AuthType,
   preloadContentGenerator
-} from "./chunk-VCPIZRYH.js";
+} from "./chunk-HIVKI6O6.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT,
   tokenLimit
 } from "./chunk-ZBVS26BY.js";
-import "./chunk-WZRWHXFE.js";
-import "./chunk-A3NDJ5SB.js";
-import "./chunk-7XATOOE7.js";
+import "./chunk-Q3T5KA2V.js";
+import "./chunk-R2XWGR75.js";
+import "./chunk-HC45LTEN.js";
 import {
   endToolExecutionSpan,
   endToolSpan,
@@ -490,21 +500,21 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   withInteractionSpan
-} from "./chunk-BGTQCTQW.js";
+} from "./chunk-QARJNL2V.js";
 import "./chunk-W4RQUHY3.js";
-import "./chunk-S7W2GKIO.js";
+import "./chunk-G7XXKQYS.js";
 import {
   Storage,
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   isSubpath
-} from "./chunk-UHUSJ6X7.js";
+} from "./chunk-E2BHWIDT.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-RCUQIPTN.js";
+import "./chunk-6PQPKTXP.js";
 import {
   runExitCleanup
-} from "./chunk-52ZSWYEG.js";
+} from "./chunk-DQ2O5QOJ.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
@@ -2525,12 +2535,7 @@ var Session = class {
     this.runtimeBaseDir = config.storage.getRuntimeBaseDir();
     const todoStopGuardEnabled = this.settings.merged.experimental?.todoStopGuard === true && !this.config.getBareMode() && !this.config.isSafeMode();
     this.todoStopGuard = new DaemonTodoStopGuard(todoStopGuardEnabled);
-    this.todoStopGuardBackgroundBaseline = todoStopGuardEnabled ? this.#captureTodoStopGuardBackgroundBaseline() : {
-      agents: /* @__PURE__ */ new Set(),
-      shells: /* @__PURE__ */ new Set(),
-      monitors: /* @__PURE__ */ new Set(),
-      wakeups: /* @__PURE__ */ new Set()
-    };
+    this.todoStopGuardBackgroundBaseline = this.#captureTodoStopGuardBackgroundBaseline();
     this.toolCallEmitter = new ToolCallEmitter(this);
     this.planEmitter = new PlanEmitter(this);
     this.historyReplayer = new HistoryReplayer(this, {
@@ -2562,6 +2567,7 @@ var Session = class {
    */
   followupAbort = null;
   turn = 0;
+  activeTodoWorkChainPromptId;
   createdAt = Date.now();
   /**
    * Running cumulative usage for this session, snapshotted onto each todo/plan
@@ -3603,6 +3609,8 @@ var Session = class {
         }
         this.turn += 1;
         const promptId = this.config.getSessionId() + "########" + this.turn;
+        const promptMetadata = params._meta;
+        const continuesCurrentWorkChain = params.retry === true || promptMetadata?.[DAEMON_RETRY_META_KEY] === true || promptMetadata?.[DAEMON_CONTINUE_META_KEY] === true;
         promptIdContext.enterWith(promptId);
         const parentContext = extractDaemonTraceContext(params);
         return await withInteractionSpan(
@@ -3727,9 +3735,20 @@ var Session = class {
               }
               const additionalContext = hookOutput?.getAdditionalContext();
               if (additionalContext) {
-                parts = [...parts, { text: additionalContext }];
+                parts = [
+                  ...parts,
+                  { text: wrapUserPromptSubmitContext(additionalContext) }
+                ];
               }
             }
+            if (!continuesCurrentWorkChain && !this.todoStopGuard.enabled) {
+              this.#resetTodoStopGuardBackgroundLineage();
+            }
+            this.config.startActiveTodoWorkChain(
+              promptId,
+              continuesCurrentWorkChain ? this.activeTodoWorkChainPromptId : void 0
+            );
+            this.activeTodoWorkChainPromptId = promptId;
             try {
               const fileHistoryService = this.config.getFileHistoryService();
               await fileHistoryService.makeSnapshot(promptId);
@@ -3775,6 +3794,15 @@ ${this.pendingRecoveredAgentsNotice}
               parts = insertAfterFunctionResponses(parts, [noticePart]);
               this.pendingRecoveredAgentsNotice = null;
             }
+            const activeTodoReminder = this.config.takeActiveTodoReminder(
+              promptId,
+              true
+            );
+            if (activeTodoReminder && !parts.some((part) => part.text === activeTodoReminder)) {
+              parts = insertAfterFunctionResponses(parts, [
+                { text: activeTodoReminder }
+              ]);
+            }
             let nextMessage = { role: "user", parts };
             let turnCount = 0;
             const toolLoopState = createDaemonToolLoopState();
@@ -3952,6 +3980,7 @@ ${this.pendingRecoveredAgentsNotice}
                   const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                     toolRun,
                     pendingSend.signal,
+                    promptId,
                     onFullTurnModel
                   );
                   nextMessage = nextAfterTools.message;
@@ -4687,6 +4716,7 @@ ${this.pendingRecoveredAgentsNotice}
         const nextAfterTools = await this.#buildNextMessageAfterToolRun(
           toolRun,
           pendingSend.signal,
+          toolPromptId,
           options.onFullTurnModel
         );
         nextMessage = nextAfterTools.message;
@@ -4976,7 +5006,7 @@ ${this.pendingRecoveredAgentsNotice}
     );
     await this.messageRewriter?.waitForPendingRewrites();
   }
-  async #buildNextMessageAfterToolRun(toolRun, abortSignal, onFullTurnModel) {
+  async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, onFullTurnModel) {
     if (toolRun.loopDetected) {
       debugLogger6.debug("Stopping ACP turn after daemon loop detection.");
       return { message: null, hadMidTurnUserInput: false };
@@ -4995,7 +5025,12 @@ ${this.pendingRecoveredAgentsNotice}
     if (hadMidTurnUserInput) {
       this.todoStopGuard.acceptMidTurnUserInput();
     }
-    const parts = [...toolRun.parts, ...drained.parts];
+    const activeTodoReminder = this.config.takeActiveTodoReminder(promptId);
+    const parts = [
+      ...toolRun.parts,
+      ...activeTodoReminder ? [{ text: activeTodoReminder }] : [],
+      ...drained.parts
+    ];
     return {
       message: { role: "user", parts },
       hadMidTurnUserInput
@@ -5260,7 +5295,8 @@ ${this.pendingRecoveredAgentsNotice}
         source: job.cronExpr === "@wakeup" ? "loop" : "cron",
         ...job.id ? { taskId: job.id } : {},
         ...job.lastFiredAt !== void 0 ? { firedAt: job.lastFiredAt } : {},
-        ...job.delivery ? { delivery: job.delivery } : {}
+        ...job.delivery ? { delivery: job.delivery } : {},
+        ...job.todoWorkChainId ? { todoWorkChainId: job.todoWorkChainId } : {}
       });
       void this.#drainCronQueue();
     });
@@ -5416,9 +5452,8 @@ ${this.pendingRecoveredAgentsNotice}
       async () => {
         const ac = new AbortController();
         this.cronAbortController = ac;
-        this.#prepareTodoStopGuardForAutomaticTurn(
-          this.#cronContinuesTodoStopGuardWorkChain(item)
-        );
+        const continuesCurrentWorkChain = this.#cronContinuesTodoStopGuardWorkChain(item);
+        this.#prepareTodoStopGuardForAutomaticTurn(continuesCurrentWorkChain);
         const promptId = this.config.getSessionId() + "########cron" + Date.now();
         let cronHadError = false;
         let cronCompleted = false;
@@ -5435,6 +5470,10 @@ ${this.pendingRecoveredAgentsNotice}
             try {
               await this.assertCanStartTurn();
               if (ac.signal.aborted) return;
+              this.config.startAutomaticActiveTodoWorkChain(
+                promptId,
+                item.todoWorkChainId
+              );
               const loopMode = detectLoopSentinel(prompt);
               const autonomousMode = loopMode ? null : detectAutonomousSentinel(prompt);
               let loopTick = null;
@@ -5489,9 +5528,17 @@ ${this.pendingRecoveredAgentsNotice}
                 _meta: { source: item.source }
               });
               const cronReminders = await this.#buildInitialSystemReminders();
+              const activeTodoReminder = this.config.takeActiveTodoReminder(
+                promptId,
+                true
+              );
               let nextMessage = {
                 role: "user",
-                parts: [...cronReminders, { text: modelText }]
+                parts: [
+                  ...cronReminders,
+                  ...activeTodoReminder ? [{ text: activeTodoReminder }] : [],
+                  { text: modelText }
+                ]
               };
               const toolLoopState = createDaemonToolLoopState();
               while (nextMessage !== null) {
@@ -5623,7 +5670,8 @@ ${this.pendingRecoveredAgentsNotice}
                   }
                   const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                     toolRun,
-                    ac.signal
+                    ac.signal,
+                    promptId
                   );
                   nextMessage = nextAfterTools.message;
                   if (toolRun.loopDetected) {
@@ -5663,6 +5711,7 @@ ${this.pendingRecoveredAgentsNotice}
                 `[${item.source} error] ${msg}`
               );
             } finally {
+              this.config.endAutomaticActiveTodoWorkChain(promptId);
               if (this.cronAbortController === ac) {
                 this.cronAbortController = null;
               }
@@ -5715,7 +5764,8 @@ ${this.pendingRecoveredAgentsNotice}
           status: meta.status,
           kind: "agent",
           continuesTodoStopGuardWorkChain: this.#agentContinuesTodoStopGuardWorkChain(meta.agentId),
-          toolUseId: meta.toolUseId
+          toolUseId: meta.toolUseId,
+          todoWorkChainId: meta.todoWorkChainId
         });
       }
     );
@@ -5734,7 +5784,8 @@ ${this.pendingRecoveredAgentsNotice}
           meta.monitorId,
           meta.ownerAgentId
         ),
-        toolUseId: meta.toolUseId
+        toolUseId: meta.toolUseId,
+        todoWorkChainId: meta.todoWorkChainId
       });
     });
     const shellRegistry = this.config.getBackgroundShellRegistry();
@@ -5745,7 +5796,8 @@ ${this.pendingRecoveredAgentsNotice}
         taskId: meta.shellId,
         status: meta.status,
         kind: "shell",
-        continuesTodoStopGuardWorkChain: !this.todoStopGuardBackgroundBaseline.shells.has(meta.shellId)
+        continuesTodoStopGuardWorkChain: !this.todoStopGuardBackgroundBaseline.shells.has(meta.shellId),
+        todoWorkChainId: meta.todoWorkChainId
       });
     });
     this.config.getChatRecordingService()?.setTitleRecordedCallback((customTitle, titleSource, sessionId) => {
@@ -5868,13 +5920,16 @@ ${this.pendingRecoveredAgentsNotice}
       async () => {
         const ac = new AbortController();
         this.notificationAbortController = ac;
-        this.#prepareTodoStopGuardForAutomaticTurn(
-          this.#notificationContinuesTodoStopGuardWorkChain(item)
-        );
+        const continuesCurrentWorkChain = this.#notificationContinuesTodoStopGuardWorkChain(item);
+        this.#prepareTodoStopGuardForAutomaticTurn(continuesCurrentWorkChain);
         const promptId = this.config.getSessionId() + "########notification" + Date.now();
         try {
           await this.assertCanStartTurn();
           if (ac.signal.aborted) return;
+          this.config.startAutomaticActiveTodoWorkChain(
+            promptId,
+            item.todoWorkChainId
+          );
           await this.#emitBackgroundNotificationDisplay(item);
           const notificationParts = [{ text: item.modelText }];
           this.config.getChatRecordingService()?.recordNotification(notificationParts, item.displayText, {
@@ -5884,9 +5939,17 @@ ${this.pendingRecoveredAgentsNotice}
             toolUseId: item.toolUseId
           });
           const notificationReminders = await this.#buildInitialSystemReminders();
+          const activeTodoReminder = this.config.takeActiveTodoReminder(
+            promptId,
+            true
+          );
           let nextMessage = {
             role: "user",
-            parts: [...notificationReminders, ...notificationParts]
+            parts: [
+              ...notificationReminders,
+              ...activeTodoReminder ? [{ text: activeTodoReminder }] : [],
+              ...notificationParts
+            ]
           };
           const toolLoopState = createDaemonToolLoopState();
           while (nextMessage !== null) {
@@ -6016,7 +6079,8 @@ ${this.pendingRecoveredAgentsNotice}
               }
               const nextAfterTools = await this.#buildNextMessageAfterToolRun(
                 toolRun,
-                ac.signal
+                ac.signal,
+                promptId
               );
               nextMessage = nextAfterTools.message;
               if (toolRun.loopDetected) {
@@ -6067,6 +6131,7 @@ ${this.pendingRecoveredAgentsNotice}
             await this.#emitBackgroundNotificationEndTurn("end_turn");
           }
         } finally {
+          this.config.endAutomaticActiveTodoWorkChain(promptId);
           if (this.notificationAbortController === ac) {
             this.notificationAbortController = null;
           }
@@ -6131,8 +6196,10 @@ ${this.pendingRecoveredAgentsNotice}
       debugLogger6.error("Error sending available commands update:", error);
     }
   }
-  async refreshSkillsFromSettings() {
-    this.settings.reloadScopeFromDisk("Workspace" /* Workspace */);
+  async refreshSkillsFromSettings(options = {}) {
+    if (options.reloadSettings ?? true) {
+      this.reloadSkillSettings();
+    }
     const skillManager = this.config.getSkillManager();
     let updateFailed = false;
     let updateError;
@@ -6142,7 +6209,7 @@ ${this.pendingRecoveredAgentsNotice}
       updateFailed = true;
       updateError = error;
     }
-    if (skillManager) {
+    if (skillManager && (options.notifyConfigChanged ?? true)) {
       try {
         skillManager.suppressNextSlashReload();
         await skillManager.notifyConfigChanged();
@@ -6156,6 +6223,9 @@ ${this.pendingRecoveredAgentsNotice}
     }
     if (updateFailed) throw updateError;
   }
+  reloadSkillSettings() {
+    this.settings.reloadScopeFromDisk("Workspace" /* Workspace */);
+  }
   async sendAvailableCommandsUpdateOrThrow() {
     const { availableCommands, availableSkills, availableSkillDetails } = await buildAvailableCommandsSnapshot(
       this.config,
@@ -6336,6 +6406,10 @@ ${this.pendingRecoveredAgentsNotice}
    * on. Response-part ordering matches the original `functionCalls` order.
    */
   async runToolCalls(abortSignal, promptId, functionCalls, toolLoopState, onFullTurnModel) {
+    promptIdContext.enterWith(promptId);
+    todoWorkChainContext.enterWith(
+      this.config.getActiveTodoWorkChainOwner(promptId)
+    );
     const dedupedFunctionCalls = dedupeToolCallsById(functionCalls);
     const generatedCallIdBase = randomUUID();
     const executionCallIds = new Map(
@@ -8688,6 +8762,32 @@ function isBulkLoadReplayRequest(params) {
   return meta?.[LOAD_REPLAY_MODE_META_KEY] === LOAD_REPLAY_BULK_MODE;
 }
 __name(isBulkLoadReplayRequest, "isBulkLoadReplayRequest");
+function shouldHideInheritedHistory(params) {
+  const meta = isObjectRecord(params._meta) ? params._meta : void 0;
+  return meta?.[LOAD_REPLAY_HIDE_INHERITED_META_KEY] === true;
+}
+__name(shouldHideInheritedHistory, "shouldHideInheritedHistory");
+function selectVisibleHistoryRecords(records, hideInheritedHistory) {
+  const sourceBoundary = records.findIndex(
+    (record) => record.type === "system" && record.subtype === "session_source" && isObjectRecord(record.systemPayload) && record.systemPayload["sourceType"] === "side_task"
+  );
+  if (sourceBoundary >= 0) {
+    return records.slice(sourceBoundary).filter((record) => record.forkedFrom === void 0);
+  }
+  return hideInheritedHistory ? records.filter((record) => record.forkedFrom === void 0) : records;
+}
+__name(selectVisibleHistoryRecords, "selectVisibleHistoryRecords");
+function isChannelSessionRequest(params) {
+  const meta = isObjectRecord(params._meta) ? params._meta : void 0;
+  const value = meta?.[SESSION_SOURCE_META_KEY];
+  return isObjectRecord(value) && value["sourceType"] === "channel";
+}
+__name(isChannelSessionRequest, "isChannelSessionRequest");
+function shouldDeferMcpDiscovery(params) {
+  const meta = isObjectRecord(params._meta) ? params._meta : void 0;
+  return meta?.[WORKTREE_MCP_DEFER_META_KEY] === true;
+}
+__name(shouldDeferMcpDiscovery, "shouldDeferMcpDiscovery");
 function getLoadReplayPageSize(params) {
   const meta = isObjectRecord(params._meta) ? params._meta : void 0;
   const value = meta?.[LOAD_REPLAY_PAGE_SIZE_META_KEY];
@@ -10629,6 +10729,7 @@ var QwenAgent = class {
   workspaceMcpDiscoveryConfig;
   workspaceMcpDiscoveryPromise;
   workspaceMcpDiscoveryError;
+  workspaceExtensionStatusRefreshPromise;
   pendingMcpAuthentications = /* @__PURE__ */ new Map();
   mcpAuthenticationResults = /* @__PURE__ */ new Map();
   generationControllers = /* @__PURE__ */ new Map();
@@ -10720,7 +10821,7 @@ var QwenAgent = class {
     const writerTerminals = [];
     for (const config of configList) {
       try {
-        writerTerminals.push(config.closeSessionWriter());
+        writerTerminals.push(config.closeSessionWriter({ handoff: true }));
       } catch (error) {
         writerTerminals.push(Promise.reject(error));
       }
@@ -10772,6 +10873,39 @@ var QwenAgent = class {
     }
     return this.workspaceMcpDiscoveryConfig ?? this.config;
   }
+  refreshBootstrapExtensionStatus() {
+    if (this.workspaceExtensionStatusRefreshPromise) {
+      return this.workspaceExtensionStatusRefreshPromise;
+    }
+    const promise = (async () => {
+      const errors = [];
+      try {
+        await this.config.getExtensionManager().refreshCache();
+      } catch (error) {
+        errors.push(error);
+      }
+      try {
+        await this.config.getSkillManager()?.refreshCache();
+      } catch (error) {
+        errors.push(error);
+      }
+      if (errors.length === 1) throw errors[0];
+      if (errors.length > 1) {
+        throw new AggregateError(
+          errors,
+          "Bootstrap extension status refresh failed"
+        );
+      }
+    })();
+    this.workspaceExtensionStatusRefreshPromise = promise;
+    const clear = /* @__PURE__ */ __name(() => {
+      if (this.workspaceExtensionStatusRefreshPromise === promise) {
+        this.workspaceExtensionStatusRefreshPromise = void 0;
+      }
+    }, "clear");
+    void promise.then(clear, clear);
+    return promise;
+  }
   getLiveMcpConfigs(serverName) {
     return [
       .../* @__PURE__ */ new Set([
@@ -11302,7 +11436,7 @@ var QwenAgent = class {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.21.1";
+    const version = "0.21.2";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -11376,6 +11510,7 @@ var QwenAgent = class {
   }
   async newSession(params) {
     const { cwd, mcpServers } = params;
+    const isChannelSession = isChannelSessionRequest(params);
     const parentContext = extractDaemonTraceContext(params);
     return await withDaemonSpan(
       "qwen-code.daemon.session_start",
@@ -11389,7 +11524,15 @@ var QwenAgent = class {
         this.settings = settings;
         const config = await profiler.time(
           "config_setup",
-          () => this.newSessionConfig(cwd, mcpServers, settings)
+          () => this.newSessionConfig(
+            cwd,
+            mcpServers,
+            settings,
+            isChannelSession,
+            void 0,
+            void 0,
+            shouldDeferMcpDiscovery(params) ? { skipMcpDiscovery: true } : void 0
+          )
         );
         let session;
         try {
@@ -11421,6 +11564,7 @@ var QwenAgent = class {
     );
   }
   async loadSession(params) {
+    const isChannelSession = isChannelSessionRequest(params);
     const settings = loadSettingsCached(params.cwd);
     const liveSession = this.sessions.get(params.sessionId);
     if (liveSession) {
@@ -11437,9 +11581,16 @@ var QwenAgent = class {
             ...sessionData2.artifactSnapshot ? { artifactSnapshot: sessionData2.artifactSnapshot } : {}
           };
           const records = sessionData2.conversation.messages;
-          if (records.length === 0) return response2;
+          const visibleRecords = selectVisibleHistoryRecords(
+            records,
+            shouldHideInheritedHistory(params)
+          );
+          if (visibleRecords.length === 0) return response2;
           const bulkReplay2 = isBulkLoadReplayRequest(params);
-          const replayPage = bulkReplay2 ? selectRecentHistoryRecords(records, getLoadReplayPageSize(params)) : { records, hasMore: false };
+          const replayPage = bulkReplay2 ? selectRecentHistoryRecords(
+            visibleRecords,
+            getLoadReplayPageSize(params)
+          ) : { records: visibleRecords, hasMore: false };
           const replay = await collectHistoryReplayUpdates({
             sessionId: params.sessionId,
             config: config2,
@@ -11491,6 +11642,7 @@ var QwenAgent = class {
       // a `null`/`undefined` would otherwise throw `TypeError`.
       params.mcpServers ?? [],
       settings,
+      isChannelSession,
       params.sessionId,
       true
     );
@@ -11509,8 +11661,12 @@ var QwenAgent = class {
             let replayUpdates = [];
             if (records) {
               createdSession.primeTurnFromHistory(records);
-              const replayPage = selectRecentHistoryRecords(
+              const visibleRecords = selectVisibleHistoryRecords(
                 records,
+                shouldHideInheritedHistory(params)
+              );
+              const replayPage = selectRecentHistoryRecords(
+                visibleRecords,
                 replayPageSize
               );
               const replayUsage = createReplayCumulativeUsage();
@@ -11577,6 +11733,7 @@ var QwenAgent = class {
     };
   }
   async unstable_resumeSession(params) {
+    const isChannelSession = isChannelSessionRequest(params);
     const settings = loadSettingsCached(params.cwd);
     const liveSession = this.sessions.get(params.sessionId);
     if (liveSession) {
@@ -11609,6 +11766,7 @@ var QwenAgent = class {
       params.cwd,
       params.mcpServers ?? [],
       settings,
+      isChannelSession,
       params.sessionId,
       true
     );
@@ -12535,23 +12693,56 @@ var QwenAgent = class {
       ...inferred ? { errorKind: inferred } : {}
     };
   }
+  /**
+   * Keeps the extension-derived half of the skill snapshot self-healing.
+   *
+   * Skills have a watcher (`SkillManager.startWatching`); extensions do not, so
+   * without this the child would never notice an extension installed, removed,
+   * enabled, or disabled outside the daemon — and extension-level skills are
+   * derived from that set, so a skill-watcher tick alone cannot recover it.
+   *
+   * The check is one `readdir` plus a bounded number of `stat`s, and refreshes
+   * only when the sources actually moved, so a steady-state read still parses
+   * no manifest and no `SKILL.md`. Failures are logged and swallowed: a status
+   * read must not fail because revalidation could not run.
+   *
+   * Skipped in safe and bare mode. Those modes deliberately never populate the
+   * extension cache (`Config.initialize` omits the refresh), and the snapshot
+   * derives extension skills from `getExtensions()` — so revalidating here
+   * would load the extensions those modes exist to exclude.
+   */
+  async revalidateExtensionSources(config) {
+    try {
+      if (config.isSafeMode() || config.getBareMode()) return;
+      const changed = await config.getExtensionManager().refreshCacheIfSourcesChanged();
+      if (!changed) return;
+      await config.getSkillManager()?.refreshCache();
+    } catch (error) {
+      debugLogger7.warn("Extension source revalidation failed:", error);
+    }
+  }
   async buildWorkspaceSkillsStatus(config) {
     const skillManager = config.getSkillManager();
     if (!skillManager) {
       return {
         v: STATUS_SCHEMA_VERSION,
         workspaceCwd: this.workspaceCwd(config),
-        initialized: true,
+        initialized: false,
         skills: []
       };
     }
+    await this.revalidateExtensionSources(config);
     try {
-      const resolved = resolveSkillSettings(
-        loadSettings(this.workspaceCwd(config), {
-          consumeCorruptionEnvVars: false,
-          skipLoadEnvironment: true
-        })
-      );
+      const skills = skillManager.getCachedSkills();
+      if (skills === null) {
+        return {
+          v: STATUS_SCHEMA_VERSION,
+          workspaceCwd: this.workspaceCwd(config),
+          initialized: false,
+          skills: []
+        };
+      }
+      const resolved = resolveSkillSettings(this.settings);
       const disablements = new Map(
         Array.from(config.getDisabledSkillNames(), (name) => {
           const normalizedName = name.trim().toLowerCase();
@@ -12561,17 +12752,6 @@ var QwenAgent = class {
           ];
         })
       );
-      try {
-        await config.getExtensionManager().refreshCache();
-      } catch (error) {
-        debugLogger7.warn("Extension cache refresh failed:", error);
-      }
-      try {
-        await skillManager.refreshCache();
-      } catch (error) {
-        debugLogger7.warn("Skill cache refresh failed:", error);
-      }
-      const skills = await skillManager.listSkills();
       const inactiveSkillRefs = inactiveExtensionSkillRefs(config);
       const skillsByKey = new Map(
         skills.map((skill) => [
@@ -15151,6 +15331,11 @@ var QwenAgent = class {
               `Memory refresh failed: ${relocation.memoryRefreshError instanceof Error ? relocation.memoryRefreshError.message : String(relocation.memoryRefreshError)}`
             );
           }
+          if (relocation.mcpRefreshError) {
+            warnings.push(
+              `MCP refresh failed: ${relocation.mcpRefreshError instanceof Error ? relocation.mcpRefreshError.message : String(relocation.mcpRefreshError)}`
+            );
+          }
           try {
             await config.getGeminiClient()?.addWorkingDirectoryChangedContext(
               settledPreviousCwd,
@@ -15762,6 +15947,13 @@ ${outputText}
       }
       case SERVE_CONTROL_EXT_METHODS.workspaceExtensionsRefresh: {
         const sessionId = params["sessionId"];
+        const rawRefreshBootstrap = params["refreshBootstrap"];
+        if (rawRefreshBootstrap !== void 0 && typeof rawRefreshBootstrap !== "boolean") {
+          throw RequestError.invalidParams(
+            void 0,
+            "refreshBootstrap must be a boolean"
+          );
+        }
         const session = this.sessionOrThrow(sessionId);
         const config = session.getConfig();
         const extensionManager = config.getExtensionManager();
@@ -15775,6 +15967,12 @@ ${outputText}
         }, "runRefresh");
         await runRefresh(async () => await extensionManager.refreshCache());
         await runRefresh(async () => await extensionManager.refreshTools());
+        const bootstrapConfig = this.config;
+        if (rawRefreshBootstrap !== false && bootstrapConfig !== config) {
+          await runRefresh(
+            async () => await this.refreshBootstrapExtensionStatus()
+          );
+        }
         const discoveryConfig = this.workspaceMcpDiscoveryConfig;
         if (discoveryConfig && discoveryConfig !== config) {
           const discoveryExtensionManager = discoveryConfig.getExtensionManager();
@@ -16078,7 +16276,9 @@ ${outputText}
           apiKeyEnvKey: cfg?.apiKeyEnvKey ?? null
         };
       }
-      case SERVE_CONTROL_EXT_METHODS.sessionBranch: {
+      case SERVE_CONTROL_EXT_METHODS.sessionBranch:
+      case SERVE_CONTROL_EXT_METHODS.sessionSideTask: {
+        const isSideTask = method === SERVE_CONTROL_EXT_METHODS.sessionSideTask;
         const sessionId = params["sessionId"];
         if (typeof sessionId !== "string" || !SESSION_ID_RE.test(sessionId)) {
           throw RequestError.invalidParams(
@@ -16101,7 +16301,17 @@ ${outputText}
         }
         const newSessionId = randomUUID2();
         const sessionService = sourceConfig.getSessionService();
-        await sessionService.forkSession(sessionId, newSessionId);
+        const fork = /* @__PURE__ */ __name(() => isSideTask ? sessionService.forkSession(sessionId, newSessionId, {
+          source: {
+            sourceType: "side_task",
+            sourceId: sessionId
+          }
+        }) : sessionService.forkSession(sessionId, newSessionId), "fork");
+        if (isSideTask && recording) {
+          await recording.runWithWriteBarrier(fork);
+        } else {
+          await fork();
+        }
         let title;
         try {
           let baseName;
@@ -16116,7 +16326,7 @@ ${outputText}
               baseName = sessionId.slice(0, 8);
             }
           }
-          title = await computeUniqueBranchTitle(baseName, sessionService);
+          title = isSideTask ? baseName : await computeUniqueBranchTitle(baseName, sessionService);
           const renamed = await sessionService.renameSession(
             newSessionId,
             title,
@@ -16450,16 +16660,58 @@ ${outputText}
         };
       }
       case SERVE_CONTROL_EXT_METHODS.workspaceSkillsRefresh: {
-        this.settings.reloadScopeFromDisk("Workspace" /* Workspace */);
+        const rawReason = params["reason"];
+        if (rawReason !== void 0 && rawReason !== "settings" && rawReason !== "content" && rawReason !== "all") {
+          throw RequestError.invalidParams(
+            void 0,
+            "reason must be settings, content, or all"
+          );
+        }
+        const reason = rawReason ?? "all";
+        const refreshSettings = reason !== "content";
+        const refreshContent = reason !== "settings";
+        if (refreshSettings) {
+          this.settings.reloadScopeFromDisk("Workspace" /* Workspace */);
+        }
         const sessions = this.getActiveSessions();
+        const settingsReloadResults = refreshSettings ? await Promise.allSettled(
+          sessions.map(
+            (session) => Promise.resolve().then(() => session.reloadSkillSettings())
+          )
+        ) : void 0;
+        let configResults = [];
+        if (refreshContent) {
+          const skillManagers = new Set(
+            [this.config, ...sessions.map((session) => session.getConfig())].map((config) => config.getSkillManager()).filter(
+              (manager) => manager !== void 0
+            )
+          );
+          configResults = await Promise.allSettled(
+            [...skillManagers].map((manager) => manager.refreshCache())
+          );
+          for (const result of configResults) {
+            if (result.status === "rejected") {
+              debugLogger7.warn(`Skill config refresh failed: ${result.reason}`);
+            }
+          }
+        }
         const results = await Promise.allSettled(
-          sessions.map((session) => session.refreshSkillsFromSettings())
+          sessions.map((session, index) => {
+            const settingsReload = settingsReloadResults?.[index];
+            if (settingsReload?.status === "rejected") {
+              return Promise.reject(settingsReload.reason);
+            }
+            return session.refreshSkillsFromSettings({
+              reloadSettings: false,
+              notifyConfigChanged: !refreshContent
+            });
+          })
         );
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
-            const reason = results[i].reason;
+            const reason2 = results[i].reason;
             debugLogger7.warn(
-              `Session ${sessions[i].getId()} skill refresh failed: ${reason}`
+              `Session ${sessions[i].getId()} skill refresh failed: ${reason2}`
             );
           }
         }
@@ -16469,7 +16721,14 @@ ${outputText}
           ).length,
           sessionsFailed: results.filter(
             (result) => result.status === "rejected"
-          ).length
+          ).length,
+          configsRefreshed: configResults.filter(
+            (result) => result.status === "fulfilled"
+          ).length,
+          configsFailed: configResults.filter(
+            (result) => result.status === "rejected"
+          ).length,
+          reason
         };
       }
       default:
@@ -16532,6 +16791,7 @@ ${outputText}
       [],
       settings,
       void 0,
+      void 0,
       false,
       {
         skipMcpDiscovery: true,
@@ -16573,7 +16833,7 @@ ${outputText}
       throw error;
     }
   }
-  async newSessionConfig(cwd, mcpServers, settings, sessionId, resume, initializeOptions = {}, chatRecording) {
+  async newSessionConfig(cwd, mcpServers, settings, isChannelSession, sessionId, resume, initializeOptions = {}, chatRecording) {
     try {
       this.assertManagedSessionAdmission();
       return await this.runWithPinnedRuntimeBaseDir(settings, cwd, async () => {
@@ -16585,6 +16845,7 @@ ${outputText}
           cwd,
           mcpServers,
           settings,
+          isChannelSession,
           sessionId,
           resume,
           initializeOptions,
@@ -16601,7 +16862,7 @@ ${outputText}
       throw error;
     }
   }
-  async newSessionConfigInRuntimeContext(cwd, mcpServers, settings, sessionId, resume, initializeOptions = {}, chatRecording) {
+  async newSessionConfigInRuntimeContext(cwd, mcpServers, settings, isChannelSession, sessionId, resume, initializeOptions = {}, chatRecording) {
     const sessionMcpServers = {};
     for (const server of mcpServers) {
       const stdioServer = toStdioServer(server);
@@ -16613,8 +16874,7 @@ ${outputText}
         sessionMcpServers[stdioServer.name] = new MCPServerConfig(
           stdioServer.command,
           stdioServer.args,
-          env,
-          cwd
+          env
         );
         continue;
       }
@@ -16657,7 +16917,8 @@ ${outputText}
       ...settings.merged,
       experimental: {
         ...settings.merged.experimental,
-        sessionWriterLease: this.sessionWriterLeaseEnabledAtStartup
+        sessionWriterLease: this.sessionWriterLeaseEnabledAtStartup,
+        ...isChannelSession ? { cron: false } : {}
       }
     };
     const sessionArg = resume === true ? { resume: sessionId, sessionId: void 0 } : { sessionId, resume: void 0 };
@@ -16701,6 +16962,7 @@ ${outputText}
       this.assertManagedSessionAdmission();
       if (this.isTrustedManagedParent()) {
         config.setSessionWriterReclaimPolicy("never");
+        config.setSessionWriterTakeoverPolicy("certified");
       }
     } catch (error) {
       return this.cleanupAfterRequestFailure(
@@ -16969,6 +17231,7 @@ export {
   fetchAllowedGitHub,
   normalizeCoreSettingValue,
   runAcpAgent,
+  selectVisibleHistoryRecords,
   toHttpServer,
   toSseServer,
   toStdioServer