@organizaone/o1-code 0.3.0 → 0.5.0

package/chunks/{acpAgent-WMX43ZDF.js → acpAgent-BLHUPR3S.js}

@@ -2,19 +2,19 @@
 "use strict";
 import {
   recomputeMcpGating
-} from "./chunk-FJKGFWXG.js";
+} from "./chunk-BWAJPJLA.js";
 import {
   PeerMessaging,
   classifyApiError,
   fireSessionDeleteHook
-} from "./chunk-JEX5DADO.js";
+} from "./chunk-EMOLKALJ.js";
 import {
   buildMcpServerContextText,
   extractAtPathCommands,
   matchMcpServerByRef,
   normalizePartList,
   parseMcpServerRef
-} from "./chunk-HEXJ5CP4.js";
+} from "./chunk-CKLLDG5Z.js";
 import {
   getAvailableCommands,
   getSlashCommandFirstToken,
@@ -26,7 +26,7 @@ import {
   pLimit,
   recordDaemonSessionModel,
   restoreSessionModelThenAuthenticate
-} from "./chunk-B6W2OL2D.js";
+} from "./chunk-JXBIVAJQ.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -36,7 +36,7 @@ import {
   loadCliConfig,
   normalizeDisabledToolList,
   parseApprovalModeValue
-} from "./chunk-YV5ECLPM.js";
+} from "./chunk-FCTP7NAC.js";
 import "./chunk-AYSIXE44.js";
 import {
   EXTENSION_CONTEXT_BUDGET,
@@ -45,33 +45,33 @@ import {
   formatContextUsageText,
   matchExtensionByRef,
   parseExtensionRef
-} from "./chunk-XF7WMIX5.js";
+} from "./chunk-3ZBJ5U4C.js";
 import {
   getCommandSubcommandNames,
   getEffectiveSupportedModes
-} from "./chunk-5ST67IZT.js";
-import "./chunk-JDUBQ632.js";
+} from "./chunk-2I5ETR2G.js";
+import "./chunk-BBVCA2GZ.js";
 import "./chunk-AHKE26WU.js";
 import "./chunk-R5WDYBMX.js";
 import "./chunk-64WBFX5X.js";
 import "./chunk-PLYNCSHX.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-TLWUCRTO.js";
+} from "./chunk-6AVPXLAG.js";
 import "./chunk-UMIHM32I.js";
-import "./chunk-JR2IXLNE.js";
+import "./chunk-D7MURDDC.js";
 import "./chunk-XZ3MQL2U.js";
-import "./chunk-NHKFCD4F.js";
+import "./chunk-4ZA2DNDT.js";
 import "./chunk-XG36NMOI.js";
 import "./chunk-7QM44EGU.js";
-import "./chunk-YNJSBU2B.js";
-import "./chunk-WGXPBRMN.js";
+import "./chunk-DZPGLX7M.js";
+import "./chunk-WOO572MR.js";
 import "./chunk-K5SPVYI4.js";
 import "./chunk-KD7GIK2D.js";
 import {
   computeCpuPercent
 } from "./chunk-KHVAC55H.js";
-import "./chunk-L425LZSD.js";
+import "./chunk-N4ANLNQG.js";
 import "./chunk-LXUIOY3M.js";
 import {
   beginAcpBootstrapConfigProfiling,
@@ -79,7 +79,7 @@ import {
   endAcpBootstrapConfigProfiling,
   markAcpStartup
 } from "./chunk-QCYRNA7B.js";
-import "./chunk-QQQRGEHT.js";
+import "./chunk-VIXCJWEM.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -100,7 +100,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-AE25P7KP.js";
+} from "./chunk-7QHVLAP5.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -111,7 +111,7 @@ import {
   hasFullSessionContext,
   observeAcpToolResultProjection,
   observeAcpToolResultWire
-} from "./chunk-AG2ELNEP.js";
+} from "./chunk-QFGGMNXV.js";
 import "./chunk-LL7XM3LM.js";
 import "./chunk-PJF3WRYZ.js";
 import "./chunk-2CATNMFQ.js";
@@ -129,12 +129,12 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-UNRHVAPY.js";
+} from "./chunk-QDZTSZTF.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-SXPTY2NJ.js";
+} from "./chunk-IAQGBZNZ.js";
 import {
   readVoiceModel
 } from "./chunk-RYBAJ5II.js";
@@ -148,23 +148,23 @@ import {
 } from "./chunk-R2CTAMNM.js";
 import {
   mapSkillConfigToStatus
-} from "./chunk-OPNBX4BU.js";
+} from "./chunk-26RB5MCN.js";
 import "./chunk-W2R46PFD.js";
 import {
   buildScheduledTaskRunPrompt,
   scheduledTaskRunSessionName,
   scheduledTaskRunSourceId
-} from "./chunk-LQY5SDPR.js";
+} from "./chunk-EG7FZ4GT.js";
 import {
   normalizeSessionIdForLookup,
   parseCallerSuppliedSessionId
 } from "./chunk-KQCQCJBL.js";
-import "./chunk-CCNABFR3.js";
-import "./chunk-CTIEFYP7.js";
+import "./chunk-6MRRD2YD.js";
+import "./chunk-VZIZZYZ2.js";
 import "./chunk-3XR24RBF.js";
 import {
   SCHEDULED_TASK_RUN_SOURCE_TYPE
-} from "./chunk-QSF42LP4.js";
+} from "./chunk-K2JYJWEF.js";
 import "./chunk-LPCPB2S5.js";
 import "./chunk-LD2T7YET.js";
 import "./chunk-KU7JLDL3.js";
@@ -214,7 +214,7 @@ import {
   PROTOCOL_VERSION,
   RequestError,
   ndJsonStream2 as ndJsonStream
-} from "./chunk-JYM2UKSC.js";
+} from "./chunk-6QGQ2AFR.js";
 import "./chunk-O7MSLRFZ.js";
 import {
   EXTERNAL_TOOL_GUARD_READY_META_KEY,
@@ -244,7 +244,7 @@ import {
   getGptReasoningOverrideState,
   isReasoningSelectionSupported,
   parseReasoningSelection
-} from "./chunk-UKS76REW.js";
+} from "./chunk-KFJXCZWZ.js";
 import {
   ACP_PREFLIGHT_KINDS,
   IDLE_HOOK_EVENTS,
@@ -252,8 +252,8 @@ import {
   SERVE_STATUS_EXT_METHODS,
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
-} from "./chunk-3CO4GKLV.js";
-import "./chunk-I3G7XU6U.js";
+} from "./chunk-ZHYAWJRF.js";
+import "./chunk-ZATS5TUZ.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -262,19 +262,19 @@ import {
   parseAcpModelOption,
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
-} from "./chunk-D4RCT4J4.js";
+} from "./chunk-F5TEGYB2.js";
 import {
   resolveSkillSettings
-} from "./chunk-623SEN5Q.js";
+} from "./chunk-UZLXX76B.js";
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-DB5UA5RL.js";
+} from "./chunk-HVELN6DV.js";
 import "./chunk-PHTNY4JK.js";
 import "./chunk-BI5UOCPD.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-JE64TPWB.js";
+} from "./chunk-WGHVI55A.js";
 import {
   deleteNestedPropertySafe,
   getOutputLanguageFilePath,
@@ -286,9 +286,9 @@ import {
   settingExistsInScope,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-ELIXZXZC.js";
+} from "./chunk-Y3KJFSGP.js";
 import "./chunk-EDRKBK4B.js";
-import "./chunk-IVAO4HY7.js";
+import "./chunk-3ILV7TTQ.js";
 import "./chunk-2JJLDP4A.js";
 import {
   getCurrentLanguage,
@@ -301,14 +301,14 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-GZNQS5UB.js";
+} from "./chunk-UP6Q42H2.js";
 import {
   ENV_ACP_REPEATED_TOOL_FAILURE_GUARD,
   O1CODE_SERVE_ENV
 } from "./chunk-7N5GDAXK.js";
 import "./chunk-JVJT5UI7.js";
 import "./chunk-FMWE3YMM.js";
-import "./chunk-KTH2NXBH.js";
+import "./chunk-RPOVX6MQ.js";
 import "./chunk-HQ5DN5W7.js";
 import "./chunk-FRITN2AG.js";
 import {
@@ -318,7 +318,7 @@ import {
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-BDKFE7EF.js";
+} from "./chunk-KRCRVCN5.js";
 import "./chunk-BHXBXELA.js";
 import "./chunk-MXCWSDSC.js";
 import "./chunk-YCZIOHKD.js";
@@ -346,7 +346,7 @@ import {
   readManyFiles,
   runManagedRememberByAgent,
   subagentGenerator
-} from "./chunk-FWXUI7DZ.js";
+} from "./chunk-AI2PV62X.js";
 import {
   buildToolWriteOriginMeta
 } from "./chunk-MYMATZAY.js";
@@ -355,17 +355,17 @@ import "./chunk-CJ7JDQEG.js";
 import {
   CreateSubSessionTool
 } from "./chunk-YO3SEHXM.js";
-import "./chunk-QUMGEZV4.js";
-import "./chunk-P7UNPKJM.js";
+import "./chunk-CG2QM2MI.js";
+import "./chunk-FQO3QDB5.js";
 import {
   restoreWorktreeContext
-} from "./chunk-KXN7Q6SB.js";
-import "./chunk-UXN7KJEI.js";
-import "./chunk-YIEC5SIW.js";
+} from "./chunk-6TWJYLJE.js";
+import "./chunk-VA7BGQ2G.js";
+import "./chunk-M2EBVYXC.js";
 import "./chunk-4JDEAIW5.js";
 import "./chunk-TIYFDYIF.js";
-import "./chunk-NNVR5V2I.js";
-import "./chunk-VNMKY2V3.js";
+import "./chunk-GNEHVPRR.js";
+import "./chunk-UT656E5I.js";
 import "./chunk-NWCDFCWK.js";
 import "./chunk-ZMZRVR62.js";
 import {
@@ -380,19 +380,19 @@ import {
   readWorkflowSnapshot,
   snapshotArgsUnavailable,
   toSnapshot
-} from "./chunk-JBMSEZDI.js";
-import "./chunk-AQVYFR7E.js";
-import "./chunk-UUNTJ2TR.js";
-import "./chunk-VKFY6KJC.js";
+} from "./chunk-FVYOYI7Y.js";
+import "./chunk-OMJU4YIQ.js";
+import "./chunk-IZHKBFYA.js";
+import "./chunk-GQ7GDOJ3.js";
 import "./chunk-F3FKDGHN.js";
-import "./chunk-C6LFEUFU.js";
+import "./chunk-MG64NR57.js";
 import "./chunk-UBWL27PO.js";
 import "./chunk-BWRP5ZMP.js";
 import "./chunk-DM6W2QYB.js";
 import "./chunk-UAACCQBD.js";
 import "./chunk-GVWQRVLV.js";
 import "./chunk-2QYMJSSC.js";
-import "./chunk-SGW7DY4F.js";
+import "./chunk-SFHAMYFI.js";
 import "./chunk-AVCUVYSA.js";
 import {
   APPROVAL_MODE_INFO,
@@ -529,7 +529,7 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-TNQJ66S4.js";
+} from "./chunk-S7EZBSGP.js";
 import "./chunk-FNALBCC7.js";
 import "./chunk-BZOAEOYF.js";
 import "./chunk-BIDB75DA.js";
@@ -537,7 +537,6 @@ import {
   shellResultText
 } from "./chunk-GYGA6V6B.js";
 import "./chunk-EYWIFUPJ.js";
-import "./chunk-DJOP5LOE.js";
 import "./chunk-GNUA6XPQ.js";
 import "./chunk-Y37FNMS7.js";
 import {
@@ -574,9 +573,10 @@ import {
   qualifySkillName,
   registerAcpEventLoopLagGauge,
   startEventLoopLagMonitor
-} from "./chunk-3YCUO772.js";
-import "./chunk-EXWAECKM.js";
-import "./chunk-S2LBLNBW.js";
+} from "./chunk-WOZVQEFV.js";
+import "./chunk-35RKSP4A.js";
+import "./chunk-CMZHL55Y.js";
+import "./chunk-DJOP5LOE.js";
 import {
   registerSession
 } from "./chunk-ZZVIBILR.js";
@@ -584,43 +584,43 @@ import "./chunk-OI7IVUEO.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-DS3COGEF.js";
-import "./chunk-IFBW6FYH.js";
+import "./chunk-EWJD7EIC.js";
 import "./chunk-OBPGYMIV.js";
 import "./chunk-RS2LNQEC.js";
 import "./chunk-SYMKXR42.js";
-import "./chunk-REAEIHLD.js";
+import "./chunk-LERXWKRT.js";
 import {
   SessionSourceError,
   SessionSourceService
 } from "./chunk-CDYMT4OZ.js";
 import "./chunk-TC7UXK4M.js";
-import "./chunk-TKHMBUSK.js";
+import "./chunk-FZUEC7ES.js";
 import "./chunk-WU3R2YUE.js";
 import "./chunk-M7AWQAB7.js";
-import "./chunk-J5BDFZYA.js";
+import "./chunk-V23Q4GBY.js";
 import "./chunk-Z2IHOXIK.js";
 import {
   promptIdContext,
   todoWorkChainContext
 } from "./chunk-5JTXPGNQ.js";
 import "./chunk-5QSLFAMR.js";
-import "./chunk-GUMLL5KC.js";
+import "./chunk-XKOGHPWS.js";
 import "./chunk-HPQNI3OQ.js";
-import "./chunk-3XCL57IX.js";
-import "./chunk-YCZXGP63.js";
-import "./chunk-QPGBAI7B.js";
+import "./chunk-GMR3LAWE.js";
+import "./chunk-NVNIFGY3.js";
+import "./chunk-QGVUKQPI.js";
 import {
   evaluateMediaPolicyToolCall
 } from "./chunk-CI2ZHR5C.js";
-import "./chunk-4JQ6AGCG.js";
+import "./chunk-L37WUEXT.js";
 import "./chunk-ZFZB6WC5.js";
 import "./chunk-4J6KRUQB.js";
 import {
   DEFERRED_TOOL_CALL_CANCELLATION_PREFIX,
   DEFERRED_TOOL_CALL_REFUSAL_PREFIX,
   resolveDeferredToolCall
-} from "./chunk-QFQQICSQ.js";
-import "./chunk-I7XXUDXZ.js";
+} from "./chunk-TCME6IG6.js";
+import "./chunk-NGPEFWU4.js";
 import {
   APPROVAL_MODES
 } from "./chunk-KQAVEXYD.js";
@@ -634,20 +634,21 @@ import {
 import "./chunk-IO32UWHY.js";
 import "./chunk-OSMXNPJP.js";
 import "./chunk-HX6AICAX.js";
-import "./chunk-G4NGNKM6.js";
+import "./chunk-3QFZFTMB.js";
 import {
   runOutsideAgentContext,
   runWithRuntimeContentGenerator
-} from "./chunk-PPR5SHEF.js";
+} from "./chunk-V75J4GJ2.js";
 import "./chunk-FOZEB37P.js";
 import "./chunk-BQAZCJF7.js";
 import {
   getToolCallPreparations
 } from "./chunk-65B6QBMP.js";
-import "./chunk-4OCNSFYL.js";
+import "./chunk-WUKHAI4J.js";
 import "./chunk-O4IWNFDK.js";
+import "./chunk-WCRZJ5HN.js";
 import "./chunk-NGE3GHMN.js";
-import "./chunk-ZNNZZ4BW.js";
+import "./chunk-X6T6YORO.js";
 import "./chunk-WMJL2XAM.js";
 import "./chunk-CP63SY5N.js";
 import {
@@ -667,7 +668,7 @@ import {
   resolveOwnsModel,
   resolveReasoningCapabilities,
   tryResolveModelProtocol
-} from "./chunk-4NV74I76.js";
+} from "./chunk-I2XHQTBX.js";
 import {
   addDaemonRequestAttribute,
   extractDaemonTraceContext,
@@ -697,12 +698,12 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-RYKMFNWC.js";
+} from "./chunk-FXPZKL6H.js";
 import "./chunk-242JUBPM.js";
 import {
   getAllMemoryFilenames,
   getSpecificMimeType
-} from "./chunk-E4BNWSC7.js";
+} from "./chunk-H5L5E5NI.js";
 import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot
@@ -716,7 +717,7 @@ import {
 import {
   runSideQuery
 } from "./chunk-KV5QCRFB.js";
-import "./chunk-L3YLV3RI.js";
+import "./chunk-V4XETRAG.js";
 import {
   INVOCATION_CONTEXT_META_KEY,
   PRIVATE_ACP_CAPABILITY_ENV,
@@ -742,7 +743,7 @@ import {
   parseModelReasoningCapabilities,
   preloadContentGenerator,
   tokenLimit
-} from "./chunk-LVFKSBH3.js";
+} from "./chunk-HOVKZNOX.js";
 import "./chunk-PLWOHBC7.js";
 import "./chunk-LEXKU5FI.js";
 import "./chunk-IQEM74QW.js";
@@ -751,7 +752,7 @@ import {
   FORK_SUBAGENT_TYPE,
   isSystemReminderContent,
   wrapSystemReminder
-} from "./chunk-M2WG4ESD.js";
+} from "./chunk-ZQBNP2ZQ.js";
 import "./chunk-YCTMVTDP.js";
 import "./chunk-JSFADKTB.js";
 import "./chunk-OHAUN3Q5.js";
@@ -796,12 +797,12 @@ import {
 import "./chunk-EPSJPAHV.js";
 import "./chunk-HBBBH6YA.js";
 import "./chunk-HHIX6THS.js";
-import "./chunk-2S34HMND.js";
+import "./chunk-MNGG2WBY.js";
 import "./chunk-LPFK3TO2.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-MVE72SO7.js";
+} from "./chunk-2RYXWLLJ.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -1284,6 +1285,51 @@ function prefixMidTurnUserMessageParts(parts, displayText) {
 }
 __name(prefixMidTurnUserMessageParts, "prefixMidTurnUserMessageParts");
 
+// packages/cli/src/acp-integration/session-approval-mode-persistence.ts
+init_esbuild_shims();
+var debugLogger3 = createDebugLogger("SESSION_APPROVAL_MODE");
+function asApprovalMode(value) {
+  return typeof value === "string" && APPROVAL_MODES.includes(value) ? value : void 0;
+}
+__name(asApprovalMode, "asApprovalMode");
+async function recordDaemonSessionApprovalModeFromConfig(config) {
+  const recording = config.getChatRecordingService?.();
+  if (!recording?.recordSessionApprovalMode) return;
+  const mode = config.getApprovalMode();
+  const planExecutionMode = mode === "plan" /* PLAN */ ? config.getPlanExecutionMode?.() : void 0;
+  const payload = {
+    mode,
+    ...planExecutionMode && planExecutionMode !== "plan" /* PLAN */ ? { planExecutionMode } : {}
+  };
+  try {
+    await recording.recordSessionApprovalMode(payload);
+  } catch (error) {
+    debugLogger3.debug("recordSessionApprovalMode failed", error);
+  }
+}
+__name(recordDaemonSessionApprovalModeFromConfig, "recordDaemonSessionApprovalModeFromConfig");
+function applyRestoredSessionApprovalMode(config, projection) {
+  const recorded = projection?.runtime.recording.sessionApprovalMode;
+  const mode = asApprovalMode(recorded?.mode);
+  if (!mode) return;
+  const planExecutionMode = asApprovalMode(recorded?.planExecutionMode);
+  if (config.getApprovalMode() === mode && (mode !== "plan" /* PLAN */ || planExecutionMode === void 0 || config.getPlanExecutionMode?.() === planExecutionMode)) {
+    return;
+  }
+  try {
+    if (mode === "plan" /* PLAN */ && planExecutionMode !== void 0 && planExecutionMode !== "plan" /* PLAN */) {
+      config.setPlanMode(true, planExecutionMode);
+    } else {
+      config.setApprovalMode(mode);
+    }
+  } catch (error) {
+    debugLogger3.warn(
+      `restore session approval mode (${mode}) skipped: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+__name(applyRestoredSessionApprovalMode, "applyRestoredSessionApprovalMode");
+
 // packages/cli/src/acp-integration/session/tool-call-preparation-tracker.ts
 init_esbuild_shims();
 var ToolCallPreparationTracker = class {
@@ -1941,7 +1987,7 @@ function toPermissionOptions(confirmation, forceHideAlwaysAllow = false, persist
 __name(toPermissionOptions, "toPermissionOptions");
 
 // packages/cli/src/acp-integration/session/SubAgentTracker.ts
-var debugLogger3 = createDebugLogger("ACP_SUBAGENT_TRACKER");
+var debugLogger4 = createDebugLogger("ACP_SUBAGENT_TRACKER");
 var SubAgentTracker = class {
   constructor(ctx, client, parentToolCallId, subagentType, onPermissionCancel, permissionRequester = (params, signal) => requestPermissionWithAbort(this.client, params, signal), permissionPersistencePolicy) {
     this.ctx = ctx;
@@ -2004,7 +2050,7 @@ var SubAgentTracker = class {
         try {
           invocation = tool.build(event.args);
         } catch (e) {
-          debugLogger3.warn(`Failed to build subagent tool ${event.name}:`, e);
+          debugLogger4.warn(`Failed to build subagent tool ${event.name}:`, e);
         }
       }
       this.toolStates.set(event.callId, {
@@ -2019,7 +2065,7 @@ var SubAgentTracker = class {
         progressMessage,
         event.name
       ).catch((error) => {
-        debugLogger3.debug(
+        debugLogger4.debug(
           "Failed to emit subagent progress update for tool call:",
           error
         );
@@ -2030,7 +2076,7 @@ var SubAgentTracker = class {
         args: event.args,
         subagentMeta: this.subagentMeta
       }).catch((error) => {
-        debugLogger3.debug(
+        debugLogger4.debug(
           `Failed to emit subagent tool start for ${event.name}:`,
           error
         );
@@ -2055,7 +2101,7 @@ var SubAgentTracker = class {
         args: state?.args,
         subagentMeta: this.subagentMeta
       }).catch((error) => {
-        debugLogger3.debug(
+        debugLogger4.debug(
           `Failed to emit subagent tool result for ${event.name}:`,
           error
         );
@@ -2079,7 +2125,7 @@ var SubAgentTracker = class {
           `Waiting for permission: ${state?.tool?.displayName ?? event.name}`,
           event.name
         ).catch((error) => {
-          debugLogger3.debug(
+          debugLogger4.debug(
             "Failed to emit subagent progress update for approval:",
             error
           );
@@ -2134,7 +2180,7 @@ var SubAgentTracker = class {
           this.onPermissionCancel?.();
         }
       } catch (error) {
-        debugLogger3.error(
+        debugLogger4.error(
           `Permission request failed for subagent tool ${event.name}:`,
           error
         );
@@ -2144,7 +2190,7 @@ var SubAgentTracker = class {
         try {
           await event.respond("cancel" /* Cancel */);
         } catch (respondError) {
-          debugLogger3.error(
+          debugLogger4.error(
             `Failed to cancel subagent tool ${event.name} after permission request failure:`,
             respondError
           );
@@ -2160,7 +2206,7 @@ var SubAgentTracker = class {
       const event = args[0];
       if (abortSignal.aborted) return;
       void this.messageEmitter.emitUsageMetadata(event.usage, "", event.durationMs, this.subagentMeta).catch((error) => {
-        debugLogger3.debug("Failed to emit subagent usage metadata:", error);
+        debugLogger4.debug("Failed to emit subagent usage metadata:", error);
       });
     };
   }
@@ -2179,7 +2225,7 @@ var SubAgentTracker = class {
         void 0,
         this.subagentMeta
       ).catch((error) => {
-        debugLogger3.debug("Failed to emit subagent stream text:", error);
+        debugLogger4.debug("Failed to emit subagent stream text:", error);
       });
     };
   }
@@ -2242,7 +2288,7 @@ var TurnBuffer = class {
 init_esbuild_shims();
 import { readFileSync, existsSync } from "node:fs";
 import { resolve as resolve2 } from "node:path";
-var debugLogger4 = createDebugLogger("MESSAGE_REWRITER");
+var debugLogger5 = createDebugLogger("MESSAGE_REWRITER");
 var DEFAULT_REWRITE_PROMPT = `You are an assistant that rewrites raw coding-agent output into concise, user-friendly progress updates.
 
 The agent is a software engineering assistant that reads files, writes code, runs commands, and uses tools. Its raw output mixes internal reasoning with user-facing information. Your job: extract what the user cares about, drop what they don't.
@@ -2270,18 +2316,18 @@ var LlmRewriter = class {
     if (rewriteConfig.promptFile) {
       const filePath = resolve2(rewriteConfig.promptFile);
       if (!existsSync(filePath)) {
-        debugLogger4.warn(
+        debugLogger5.warn(
           `Rewrite prompt file not found: ${filePath}, using default`
         );
         this.prompt = DEFAULT_REWRITE_PROMPT;
       } else {
         try {
           this.prompt = readFileSync(filePath, "utf-8").trim();
-          debugLogger4.info(
+          debugLogger5.info(
             `Loaded rewrite prompt from file: ${filePath} (${this.prompt.length} chars)`
           );
         } catch (error) {
-          debugLogger4.warn(
+          debugLogger5.warn(
             `Rewrite prompt file could not be read: ${filePath} (${error instanceof Error ? error.message : String(error)}), using default`
           );
           this.prompt = DEFAULT_REWRITE_PROMPT;
@@ -2319,7 +2365,7 @@ var LlmRewriter = class {
     const inputText = inputParts.join("\n\n");
     if (!inputText.trim()) return null;
     if (inputText.length < 10) return null;
-    debugLogger4.info(
+    debugLogger5.info(
       `[REWRITE INPUT] system_prompt_len=${this.prompt.length} input_len=${inputText.length} context_turns=${this.outputHistory.length}
 --- INPUT TEXT ---
 ${inputText}
@@ -2348,10 +2394,10 @@ ${inputText}
       });
       const rewritten = result.text;
       if (!rewritten || rewritten.length < 5) {
-        debugLogger4.info(`[REWRITE OUTPUT] empty or too short, skipping`);
+        debugLogger5.info(`[REWRITE OUTPUT] empty or too short, skipping`);
         return null;
       }
-      debugLogger4.info(
+      debugLogger5.info(
         `[REWRITE OUTPUT] len=${rewritten.length}
 --- OUTPUT ---
 ${rewritten}
@@ -2365,7 +2411,7 @@ ${rewritten}
       }
       return rewritten;
     } catch (error) {
-      debugLogger4.warn(
+      debugLogger5.warn(
         `LLM rewrite failed, skipping: ${error instanceof Error ? error.message : String(error)}`
       );
       return null;
@@ -2374,7 +2420,7 @@ ${rewritten}
 };
 
 // packages/cli/src/acp-integration/session/rewrite/MessageRewriteMiddleware.ts
-var debugLogger5 = createDebugLogger("MESSAGE_REWRITE");
+var debugLogger6 = createDebugLogger("MESSAGE_REWRITE");
 var DEFAULT_REWRITE_TIMEOUT_MS = 3e4;
 var REWRITE_META_EXCLUDED_KEYS = /* @__PURE__ */ new Set([]);
 var MessageRewriteMiddleware = class {
@@ -2458,10 +2504,10 @@ var MessageRewriteMiddleware = class {
         try {
           const rewritten = await this.rewriter.rewrite(content, rewriteSignal);
           if (!rewritten) {
-            debugLogger5.info(`Turn ${turnIdx}: no rewrite output`);
+            debugLogger6.info(`Turn ${turnIdx}: no rewrite output`);
             return;
           }
-          debugLogger5.info(
+          debugLogger6.info(
             `Turn ${turnIdx}: rewritten ${rewritten.length} chars`
           );
           await this.sendUpdate({
@@ -2474,7 +2520,7 @@ var MessageRewriteMiddleware = class {
             }
           });
         } catch (error) {
-          debugLogger5.warn(
+          debugLogger6.warn(
             `Turn ${turnIdx}: rewrite failed: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -2892,7 +2938,7 @@ function reduceRepeatedToolFailureGuard(state, input) {
 __name(reduceRepeatedToolFailureGuard, "reduceRepeatedToolFailureGuard");
 
 // packages/cli/src/acp-integration/session/Session.ts
-var debugLogger6 = createDebugLogger("SESSION");
+var debugLogger7 = createDebugLogger("SESSION");
 var MAX_RETAINED_SESSION_ROUTE_COUNTS = 8;
 var USER_CANCEL_ABORT_REASON = "o1-code:user-cancel";
 var NEW_PROMPT_ABORT_REASON = "o1-code:new-prompt";
@@ -2954,14 +3000,17 @@ function isTodoStopGuardPromptText(text) {
 }
 __name(isTodoStopGuardPromptText, "isTodoStopGuardPromptText");
 var ACP_API_USER_PROMPT_OPTIONS = {
-  excludeTextPart: isTodoStopGuardPromptText
+  excludeTextPart: isTodoStopGuardPromptText,
+  // A delivered background-notification turn never produced a client-visible
+  // turn, so counting it would shift every rewind ordinal after it.
+  excludeTaskNotifications: true
 };
 async function finalizeToolCallPreparations(tracker, includeResolved, streamName) {
   try {
     await tracker.discard(includeResolved);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    debugLogger6.warn(
+    debugLogger7.warn(
       `Failed to discard tool preparations for ${streamName}; continuing stream: ${message}`
     );
   }
@@ -3108,7 +3157,7 @@ function recordDaemonLoopDetected(config, promptId, loopType, message, loopState
   if (!loopState.loopDetected) {
     loopState.loopDetected = true;
     loopState.loopType = loopType;
-    debugLogger6.warn(message);
+    debugLogger7.warn(message);
     try {
       logLoopDetected(
         config,
@@ -3116,7 +3165,7 @@ function recordDaemonLoopDetected(config, promptId, loopType, message, loopState
         options
       );
     } catch (error) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         "[Session] Failed to record loop detection telemetry",
         error
       );
@@ -3232,7 +3281,7 @@ function isContentBlock(value) {
     case "resource":
       return isEmbeddedResourceResource(value["resource"]);
     default:
-      debugLogger6.warn(`Unknown ContentBlock type: ${value["type"]}`);
+      debugLogger7.warn(`Unknown ContentBlock type: ${value["type"]}`);
       return false;
   }
 }
@@ -3348,7 +3397,7 @@ ${resource.text}`;
 __name(stripReferencedAttachmentDataParts, "stripReferencedAttachmentDataParts");
 function capMidTurnDrainItems(items, fieldName) {
   if (items.length <= MAX_MID_TURN_DRAIN_ITEMS) return items;
-  debugLogger6.warn(
+  debugLogger7.warn(
     `Mid-turn drain response had ${items.length} ${fieldName}; processing first ${MAX_MID_TURN_DRAIN_ITEMS}`
   );
   return items.slice(0, MAX_MID_TURN_DRAIN_ITEMS);
@@ -3363,7 +3412,7 @@ function getMidTurnItemDisplayTextForLog(displayText) {
 __name(getMidTurnItemDisplayTextForLog, "getMidTurnItemDisplayTextForLog");
 function getValidMidTurnContentBlocks(content, displayText) {
   if (!Array.isArray(content)) {
-    debugLogger6.warn(
+    debugLogger7.warn(
       `Dropped invalid mid-turn item: ${getMidTurnItemDisplayTextForLog(
         displayText
       )}`
@@ -3373,7 +3422,7 @@ function getValidMidTurnContentBlocks(content, displayText) {
   const validBlocks = content.filter(isContentBlock);
   const invalidBlockCount = content.length - validBlocks.length;
   if (invalidBlockCount > 0) {
-    debugLogger6.warn(
+    debugLogger7.warn(
       `Dropped ${invalidBlockCount} invalid mid-turn content block(s): ${getMidTurnItemDisplayTextForLog(
         displayText
       )}`
@@ -3431,7 +3480,7 @@ function parseMidTurnDrainResponse(response) {
     );
   }
   if (!Array.isArray(response["messages"])) {
-    debugLogger6.warn(
+    debugLogger7.warn(
       `Mid-turn drain response had no recognized 'items' or 'messages' field; keys: ${Object.keys(
         response
       ).join(", ")}`
@@ -3566,7 +3615,7 @@ async function fireSessionPermissionDeniedForAutoMode(config, decision, outcome,
         callId
       );
     } catch (hookError) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `PermissionDenied hook failed for tool ${callId}: ${hookError instanceof Error ? hookError.message : String(hookError)}`
       );
     }
@@ -3709,7 +3758,7 @@ async function buildAvailableCommandsSnapshot(config, abortSignal = AbortSignal.
       }
     }
   } catch (error) {
-    debugLogger6.error("Error loading available skills:", error);
+    debugLogger7.error("Error loading available skills:", error);
   }
   for (const command of visibleSlashCommands) {
     if (command.kind !== "skill" /* SKILL */ || !command.skillDetail) {
@@ -3756,7 +3805,7 @@ var Session = class {
     const todoWriteEnabled = this.settings.merged.tools?.todoWrite?.enabled === true;
     const todoStopGuardEnabled = todoStopGuardConfigured && todoStopGuardModeAllowed && todoWriteEnabled;
     if (todoStopGuardConfigured && todoStopGuardModeAllowed && !todoWriteEnabled) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         "experimental.todoStopGuard requires tools.todoWrite.enabled; the Todo Stop Guard is disabled."
       );
     }
@@ -3769,7 +3818,7 @@ var Session = class {
     const parsedGuardMode = parseRepeatedToolFailureGuardMode(configuredGuardMode);
     this.repeatedToolFailureGuardMode = parsedGuardMode ?? "shadow";
     if (configuredGuardMode?.trim() && parsedGuardMode === void 0) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `${ENV_ACP_REPEATED_TOOL_FAILURE_GUARD} has an invalid value; defaulting to shadow. Expected off, shadow, warn, or enforce.`
       );
     }
@@ -4011,7 +4060,7 @@ var Session = class {
           this.heldGoalProposal = void 0;
         }
         void this.#queueGoalState(snapshot, cause, previousGoal).catch(
-          (error) => debugLogger6.warn(
+          (error) => debugLogger7.warn(
             `Failed to emit ACP Goal state: ${error instanceof Error ? error.message : String(error)}`
           )
         );
@@ -4046,7 +4095,7 @@ var Session = class {
       if (!(error instanceof GoalPersistenceUnavailableError)) {
         throw error;
       }
-      debugLogger6.debug("Canonical Goal runtime is unavailable for ACP");
+      debugLogger7.debug("Canonical Goal runtime is unavailable for ACP");
     }
   }
   /**
@@ -4240,7 +4289,7 @@ var Session = class {
         void 0,
         error instanceof Error ? error.message : String(error)
       );
-      debugLogger6.warn(
+      debugLogger7.warn(
         `ACP Goal turn failed: ${error instanceof Error ? error.message : String(error)}`
       );
     } finally {
@@ -4266,7 +4315,7 @@ var Session = class {
     try {
       this.config.getGoalRuntime().markTurnDelivered(turnKey);
     } catch (error) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Failed to confirm ACP Goal turn delivery: ${error instanceof Error ? error.message : String(error)}`
       );
     }
@@ -4287,7 +4336,7 @@ var Session = class {
               reason: turn.controller.signal.reason === SESSION_DISPOSE_ABORT_REASON ? GOAL_PAUSE_REASON_SESSION_DISPOSED : GOAL_PAUSE_REASON_USER_INTERRUPT
             });
           } catch (error) {
-            debugLogger6.warn(
+            debugLogger7.warn(
               `Failed to record pre-model ACP Goal turn settlement: ${error instanceof Error ? error.message : String(error)}`
             );
             await runtime.releaseTurn(turn.turnKey, { requeue: false });
@@ -4300,7 +4349,7 @@ var Session = class {
       try {
         await this.config.getChatRecordingService()?.flush();
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Failed to flush ACP Goal turn: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -4319,7 +4368,7 @@ var Session = class {
         }
         await runtime.finishTurn(turn.permit);
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Failed to record ACP Goal turn settlement: ${error instanceof Error ? error.message : String(error)}`
         );
         if (pauseReason !== void 0) {
@@ -4342,12 +4391,12 @@ var Session = class {
               turn.endingToolCallId
             ]);
           } catch (error) {
-            debugLogger6.warn("Failed to record ACP Goal turn end:", error);
+            debugLogger7.warn("Failed to record ACP Goal turn end:", error);
           }
         }
       }
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Failed to settle ACP Goal turn: ${error instanceof Error ? error.message : String(error)}`
       );
     }
@@ -4371,7 +4420,7 @@ var Session = class {
         reason: GOAL_PAUSE_REASON_STOP_HOOK_CAP
       });
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Failed to pause the Goal after the Stop hook cap: ${error instanceof Error ? error.message : String(error)}`
       );
     }
@@ -4443,7 +4492,7 @@ var Session = class {
         resolved && outcome === "proceed_once" /* ProceedOnce */
       );
     } catch (error) {
-      debugLogger6.error("Workflow permission request failed:", error);
+      debugLogger7.error("Workflow permission request failed:", error);
       await registry.resolvePendingApproval(
         runId,
         approval.approvalId,
@@ -4470,7 +4519,7 @@ var Session = class {
         }
       });
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         "Failed to finalize workflow approval tool call:",
         error
       );
@@ -4644,7 +4693,7 @@ var Session = class {
       }
       return "unavailable";
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Todo Stop Guard continuation claim unavailable [session ${this.sessionId}]: ${this.#formatError(error)}`
       );
       return "unavailable";
@@ -4874,7 +4923,7 @@ var Session = class {
   startCronScheduler() {
     if (this.#isAutomaticWorkHeld()) return;
     this.#startCronSchedulerInRuntime().catch((error) => {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Cron scheduler startup failed [session ${this.sessionId}]: ${error}`
       );
     });
@@ -5093,7 +5142,7 @@ var Session = class {
       try {
         activation.onRelease?.();
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Managed conversation release callback failed [session ${this.sessionId}]: ${error}`
         );
       }
@@ -5430,7 +5479,7 @@ var Session = class {
   installRewriter() {
     const rewriteConfig = loadRewriteConfig(this.settings);
     if (rewriteConfig?.enabled) {
-      debugLogger6.info("Message rewrite middleware enabled");
+      debugLogger7.info("Message rewrite middleware enabled");
       this.messageRewriter = new MessageRewriteMiddleware(
         this.config,
         rewriteConfig,
@@ -5604,7 +5653,7 @@ var Session = class {
           });
         }
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Failed to pause queued ACP Goal turn: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -5831,7 +5880,7 @@ var Session = class {
         try {
           await reservedGoalRuntime.releaseTurn(reservedGoalTurnKey);
         } catch (releaseError) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             `Failed to release Goal reservation after admission failure: ${releaseError instanceof Error ? releaseError.message : String(releaseError)}`
           );
         } finally {
@@ -5896,7 +5945,7 @@ var Session = class {
             stopReason: result.stopReason
           });
         } catch (error) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             "Failed to record branch checkpoint; completing the turn without a branch point",
             error
           );
@@ -5947,7 +5996,7 @@ var Session = class {
         try {
           await this.config.getLlmClient().setTools();
         } catch (error) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             "Failed to refresh Goal proposal availability",
             error
           );
@@ -6023,7 +6072,7 @@ var Session = class {
   async continueLastTurn() {
     const recovery = this.getRecoveryStatus();
     if (!recovery.canContinue && recovery.kind !== "clean") {
-      debugLogger6.debug("[Session] recovery canContinue vetoed", {
+      debugLogger7.debug("[Session] recovery canContinue vetoed", {
         kind: recovery.kind,
         closing: this.closing,
         pendingPrompt: Boolean(this.pendingPrompt),
@@ -6082,7 +6131,7 @@ var Session = class {
         const conversationHistory = chat.getHistoryTail(40, true);
         const lastEntry = conversationHistory[conversationHistory.length - 1];
         if (!lastEntry || lastEntry.role !== "model") {
-          debugLogger6.debug(
+          debugLogger7.debug(
             "Skipping followup suggestion: last history entry is not model"
           );
           return;
@@ -6122,9 +6171,9 @@ var Session = class {
         }
       } catch (error) {
         if (ac.signal.aborted) {
-          debugLogger6.debug("Follow-up suggestion generation aborted");
+          debugLogger7.debug("Follow-up suggestion generation aborted");
         } else {
-          debugLogger6.warn("Follow-up suggestion generation failed", error);
+          debugLogger7.warn("Follow-up suggestion generation failed", error);
         }
       } finally {
         if (this.followupAbort === ac) {
@@ -6197,7 +6246,7 @@ var Session = class {
               goalId: current.goalId,
               revision: current.revision
             };
-            debugLogger6.warn(
+            debugLogger7.warn(
               "Failed to pause the cancelled Goal proposal",
               error
             );
@@ -6207,7 +6256,7 @@ var Session = class {
           }
         }
       } else if (!result.applied) {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `Dropping an approved Goal proposal: ${result.reason}`
         );
         await this.messageEmitter.emitAgentMessage(
@@ -6215,7 +6264,7 @@ var Session = class {
         );
       }
     } catch (error) {
-      debugLogger6.warn("Failed to apply an approved Goal proposal", error);
+      debugLogger7.warn("Failed to apply an approved Goal proposal", error);
       await this.messageEmitter.emitAgentMessage(
         formatProposeGoalRecoveryFailed(proposal.objective)
       );
@@ -6312,7 +6361,7 @@ var Session = class {
             } else if (isContinue) {
               const recoveryPlan = this.#getRecoveryPlan(true);
               if (!recoveryPlan?.continuation) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `[Session] continue ${promptId}: no interrupted turn on re-detection, nothing to continue`
                 );
                 logConversationFinishedEvent(
@@ -6510,10 +6559,10 @@ var Session = class {
                     this.config.getChatRecordingService()?.recordFileHistorySnapshot(latestSnapshot);
                   }
                 } catch (e) {
-                  debugLogger6.error(`FileHistory: recordSnapshot failed: ${e}`);
+                  debugLogger7.error(`FileHistory: recordSnapshot failed: ${e}`);
                 }
               } catch (e) {
-                debugLogger6.error(`FileHistory: makeSnapshot failed: ${e}`);
+                debugLogger7.error(`FileHistory: makeSnapshot failed: ${e}`);
               }
             }
             const systemReminders = await this.#buildInitialSystemReminders();
@@ -6828,7 +6877,7 @@ ${this.pendingRecoveredAgentsNotice}
                   const hooksEnabledForStopFailure = !this.config.getDisableAllHooks?.();
                   if (hooksEnabledForStopFailure && hookSystem && this.config.hasHooksForEvent?.("StopFailure")) {
                     hookSystem.fireStopFailureEvent(errorType, errorMessage).catch((err) => {
-                      debugLogger6.warn(`StopFailure hook failed: ${err}`);
+                      debugLogger7.warn(`StopFailure hook failed: ${err}`);
                     });
                   }
                   if (errorStatus === 429) {
@@ -7224,7 +7273,7 @@ ${this.pendingRecoveredAgentsNotice}
         this.todoStopGuard.suspend();
         blockGoalProposalSettlement();
         await this.messageEmitter.emitAgentMessage(warning);
-        debugLogger6.warn(warning);
+        debugLogger7.warn(warning);
         return { stopReason: "end_turn" };
       }
       if (!externalReason && !guardContinuation) {
@@ -7682,7 +7731,7 @@ ${this.pendingRecoveredAgentsNotice}
         const hookSystem = this.config.getHookSystem?.();
         if (!this.config.getDisableAllHooks?.() && hookSystem && this.config.hasHooksForEvent?.("StopFailure")) {
           hookSystem.fireStopFailureEvent(errorType, errorMessage).catch((err) => {
-            debugLogger6.warn(`StopFailure hook failed: ${err}`);
+            debugLogger7.warn(`StopFailure hook failed: ${err}`);
           });
         }
         if (errorStatus === 429) {
@@ -7849,7 +7898,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
       });
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Failed to emit Todo Stop Guard status: ${this.#formatError(error)}`
       );
     }
@@ -7998,7 +8047,7 @@ ${this.pendingRecoveredAgentsNotice}
         await recording.recordingService?.flush();
       }
     } catch (recordError) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Failed to record turn result: ${this.#formatError(recordError)}`
       );
     }
@@ -8032,7 +8081,7 @@ ${this.pendingRecoveredAgentsNotice}
     return new MessageDisplayDispatcher(
       messageBus,
       signal,
-      (message) => debugLogger6.warn(message)
+      (message) => debugLogger7.warn(message)
     );
   }
   /**
@@ -8053,7 +8102,7 @@ ${this.pendingRecoveredAgentsNotice}
       message = decision.message;
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Send aborted after pre-compression preparation for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -8082,26 +8131,26 @@ ${this.pendingRecoveredAgentsNotice}
         }
       } catch (compressionError) {
         if (abortSignal.aborted) {
-          debugLogger6.debug(`Auto-compression aborted for prompt ${promptId}`);
+          debugLogger7.debug(`Auto-compression aborted for prompt ${promptId}`);
           return { responseStream: null, stopReason: "cancelled" };
         }
         if (this.#isAbortError(compressionError)) {
           throw compressionError;
         }
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Auto-compression failed for prompt ${promptId}; proceeding without compression: ` + this.#formatError(compressionError)
         );
         compressionFailed = true;
       }
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug(`Auto-compression aborted for prompt ${promptId}`);
+      debugLogger7.debug(`Auto-compression aborted for prompt ${promptId}`);
       return { responseStream: null, stopReason: "cancelled" };
     }
     const model = options.getModelOverride?.() ?? options.modelOverride ?? this.config.getModel();
     const requestRouteKey = await this.#requestRouteKeyForModel(model);
     if (abortSignal.aborted) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Send aborted after request route key resolution for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -8118,7 +8167,7 @@ ${this.pendingRecoveredAgentsNotice}
         requestRouteKey
       );
       if (lastPromptTokenCount > sessionTokenLimit) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Session token limit exceeded for prompt ${promptId}: ${lastPromptTokenCount} > ${sessionTokenLimit}. requestRoute=${requestRouteKey}, activeModel=${this.config.getModel()}. Send dropped.`
         );
         await this.#emitAgentDiagnosticMessageSafely(
@@ -8135,7 +8184,7 @@ ${this.pendingRecoveredAgentsNotice}
       );
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Send aborted after compression diagnostic for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -8148,7 +8197,7 @@ ${this.pendingRecoveredAgentsNotice}
       message = decision.message;
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Send aborted after pre-send validation for prompt ${promptId}`
       );
       return { responseStream: null, stopReason: "cancelled" };
@@ -8193,7 +8242,7 @@ ${this.pendingRecoveredAgentsNotice}
     ) ?? [];
     const droppedParts = (message.parts?.length ?? 0) - functionResponseParts.length;
     if (droppedParts > 0) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Dropping ${droppedParts} non-functionResponse part(s) from unsent ACP message after send was skipped.`
       );
     }
@@ -8274,7 +8323,7 @@ ${this.pendingRecoveredAgentsNotice}
       history,
       config: this.config
     }).catch((error) => {
-      debugLogger6.warn(
+      debugLogger7.warn(
         "Failed to schedule ACP managed auto-memory extraction.",
         error
       );
@@ -8284,7 +8333,7 @@ ${this.pendingRecoveredAgentsNotice}
       sessionId: this.config.getSessionId(),
       config: this.config
     }).catch((error) => {
-      debugLogger6.warn(
+      debugLogger7.warn(
         "Failed to schedule ACP managed auto-memory dream.",
         error
       );
@@ -8292,7 +8341,7 @@ ${this.pendingRecoveredAgentsNotice}
   }
   async #buildNextMessageAfterToolRun(toolRun, abortSignal, promptId, toolLoopState, onFullTurnModel, rejectOnLoopDetected = false) {
     if (toolRun.loopDetected) {
-      debugLogger6.debug("Stopping ACP turn after daemon loop detection.");
+      debugLogger7.debug("Stopping ACP turn after daemon loop detection.");
       return { message: null, hadMidTurnUserInput: false };
     }
     const drained = await this.#drainMidTurnInput(abortSignal, {
@@ -8350,7 +8399,7 @@ ${this.pendingRecoveredAgentsNotice}
     toolLoopState.repeatedToolFailureState = repeatedToolFailureDecision.state;
     if (repeatedToolFailureDecision.kind !== "none") {
       const { state } = repeatedToolFailureDecision;
-      debugLogger6.debug(
+      debugLogger7.debug(
         `[repeated-tool-failure-guard] mode=${toolLoopState.repeatedToolFailureMode} decision=${repeatedToolFailureDecision.kind} phase=${state.phase} candidate=${state.candidateOrdinal} failures=${state.failureCount} batches=${state.batchCount}`
       );
     }
@@ -8388,7 +8437,7 @@ ${this.pendingRecoveredAgentsNotice}
             REPEATED_TOOL_FAILURE_STOP_MESSAGE
           );
         } catch (error) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             `Failed to emit repeated tool failure stop message: ${this.#formatError(error)}`
           );
         }
@@ -8542,7 +8591,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.#emitAgentDiagnosticMessage(text);
     } catch (notifyError) {
-      debugLogger6.warn(`${failureContext}: ${this.#formatError(notifyError)}`);
+      debugLogger7.warn(`${failureContext}: ${this.#formatError(notifyError)}`);
     }
   }
   async #emitAgentDiagnosticMessage(text) {
@@ -8615,7 +8664,7 @@ ${this.pendingRecoveredAgentsNotice}
       if (isPermanentError) {
         this.midTurnDrainUnavailable = true;
       }
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Mid-turn queue drain ${isPermanentError ? "permanently " : ""}unavailable [session ${this.sessionId}]: ${errorMessage}`
       );
       return {
@@ -8661,14 +8710,14 @@ ${this.pendingRecoveredAgentsNotice}
       clearTimeout(timer);
     }
     if (late === expired) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `[mid-turn] dropped a drain response that arrived after the ${MID_TURN_QUEUE_RECOVERY_TIMEOUT_MS}ms recovery deadline [session ${this.sessionId}]`
       );
       return;
     }
     const lateMessages = parseMidTurnDrainResponse(late);
     if (lateMessages.length > 0) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `[mid-turn] recovered ${lateMessages.length} message(s) from a timed-out drain [session ${this.sessionId}]`
       );
       this.midTurnRecoveredMessages.push(...lateMessages);
@@ -8713,7 +8762,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         if (!abortSignal.aborted) {
           const errorMessage = this.#formatError(messageError);
-          debugLogger6.warn(
+          debugLogger7.warn(
             `Failed to resolve mid-turn message: ${errorMessage}`
           );
         }
@@ -8760,7 +8809,7 @@ ${this.pendingRecoveredAgentsNotice}
       try {
         await scheduler.enableDurable(this.sessionId);
       } catch (err) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Durable cron init failed \u2014 persistent tasks will not fire in this session: ${err}`
         );
       }
@@ -8800,7 +8849,7 @@ ${this.pendingRecoveredAgentsNotice}
     const record = /* @__PURE__ */ __name(async (outcome) => {
       if (!job.id || firedAt === void 0) return;
       await scheduler.annotateRunSession(job.id, firedAt, outcome).catch((error) => {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Scheduled task ${taskId} could not record its run session: ${error instanceof Error ? error.message : String(error)}`
         );
       });
@@ -8810,18 +8859,18 @@ ${this.pendingRecoveredAgentsNotice}
       try {
         const restored = await scheduler.restoreConsumedOneShot(job.id);
         if (!restored) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             `Scheduled task ${taskId} could not find its consumed one-shot to restore`
           );
         }
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Scheduled task ${taskId} could not restore its unexecuted one-shot: ${error instanceof Error ? error.message : String(error)}`
         );
       }
     }, "restoreOneShot");
     if (job.modelServiceId !== void 0 && !isValidCronTaskRoutingId(job.modelServiceId) || job.groupId !== void 0 && !isValidCronTaskRoutingId(job.groupId)) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Scheduled task ${taskId} has invalid model or group routing; it was not dispatched`
       );
       await record({ dispatchFailed: true });
@@ -8866,7 +8915,7 @@ ${this.pendingRecoveredAgentsNotice}
     } catch (error) {
       const requiresFreshSessionRouting = job.modelServiceId !== void 0 || job.groupId !== void 0;
       const errorMessage = error instanceof Error ? error.message : typeof error === "object" && error !== null && typeof error["message"] === "string" ? error["message"] : String(error);
-      debugLogger6.warn(
+      debugLogger7.warn(
         requiresFreshSessionRouting ? `Scheduled task ${taskId} could not create a fresh session with its requested routing: ${errorMessage}` : `Scheduled task ${taskId} could not create a fresh session, running it in the task session instead: ${errorMessage}`
       );
       await record(
@@ -8931,7 +8980,7 @@ ${this.pendingRecoveredAgentsNotice}
         unrelatedCount--;
       }
       if (evictedTaskIds.length > 0) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Cron queue overflow while automatic work is deferred: evicted ${evictedTaskIds.length} unrelated task(s): ${evictedTaskIds.join(", ")}`
         );
       }
@@ -8966,7 +9015,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.assertCanStartTurn();
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Cron turn rejected [session ${this.sessionId}]: ${error instanceof Error ? error.message : String(error)}`
       );
       return;
@@ -9089,7 +9138,7 @@ ${this.pendingRecoveredAgentsNotice}
                   loopTick = await resolver.resolve(loopMode, trustedAtResolve);
                 } catch (resolveErr) {
                   const code = resolveErr.code ?? "unknown";
-                  debugLogger6.warn(
+                  debugLogger7.warn(
                     `loop.md sentinel resolution failed (mode=${loopMode}, code=${code}) \u2014 check .o1-code/loop.md permissions/IO`,
                     resolveErr
                   );
@@ -9112,7 +9161,7 @@ ${this.pendingRecoveredAgentsNotice}
               }
               const modelText = loopTick ? loopTick.modelText : prompt;
               if (loopTick) {
-                debugLogger6.debug(
+                debugLogger7.debug(
                   `loop tick: mode=${loopMode ?? autonomousMode} delivery=${loopTick.full ? "full" : loopTick.transientError ? "transient-error" : loopTick.autonomous ? "autonomous-tick" : loopTick.sourceLabel ? "reminder" : "absent"} source=${loopTick.sourceLabel ?? "none"} autonomous=${loopTick.autonomous ?? false} transient=${loopTick.transientError ?? false}`
                 );
               }
@@ -9323,7 +9372,7 @@ ${this.pendingRecoveredAgentsNotice}
               }
               this.todoStopGuard.pauseForTrustedRetry();
               cronHadError = true;
-              debugLogger6.error("Error processing cron prompt:", error);
+              debugLogger7.error("Error processing cron prompt:", error);
               const msg = error instanceof Error ? error.message : String(error);
               await this.messageEmitter.emitAgentMessage(
                 `[${item.source} error] ${msg}`
@@ -9516,7 +9565,7 @@ ${this.pendingRecoveredAgentsNotice}
       );
       if (admission.action === "drop") {
         const incomingIsRelated = this.#notificationContinuesTodoStopGuardWorkChain(item);
-        debugLogger6.warn(
+        debugLogger7.warn(
           incomingIsRelated ? `Notification queue overflow: dropping related task=${item.taskId} kind=${item.kind} because all queued items are related` : `Notification queue overflow: dropping unrelated task=${item.taskId} kind=${item.kind} while automatic work is deferred`
         );
         this.droppedNotifications.record(toAdmissibleNotification(item));
@@ -9524,7 +9573,7 @@ ${this.pendingRecoveredAgentsNotice}
       }
       if (admission.action === "push") break;
       const [evicted] = this.notificationQueue.splice(admission.index, 1);
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Notification queue overflow: evicting task=${evicted?.taskId ?? "unknown"} kind=${evicted?.kind ?? "unknown"}`
       );
       if (evicted) {
@@ -9547,7 +9596,7 @@ ${this.pendingRecoveredAgentsNotice}
       item,
       "background_task_completed"
     ).catch((error) => {
-      debugLogger6.warn("Failed to publish background task completion:", error);
+      debugLogger7.warn("Failed to publish background task completion:", error);
     });
     this.#activeWorkChanged();
     void this.#drainNotificationQueue();
@@ -9594,7 +9643,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
       );
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Daemon notification persistence rejected [session ${this.sessionId}, task ${item.taskId}]: ${error instanceof Error ? error.message : String(error)}`
       );
       return false;
@@ -9630,7 +9679,7 @@ ${this.pendingRecoveredAgentsNotice}
         try {
           await this.#emitDroppedNotificationSummary(droppedSummary);
         } catch (error) {
-          debugLogger6.warn(
+          debugLogger7.warn(
             "Failed to display dropped notification summary:",
             error
           );
@@ -9650,7 +9699,7 @@ ${this.pendingRecoveredAgentsNotice}
       try {
         await this.#emitBackgroundNotificationDisplay(item);
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           "Failed to display consumed background result:",
           error
         );
@@ -9715,7 +9764,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.assertCanStartTurn();
     } catch (error) {
-      debugLogger6.warn(
+      debugLogger7.warn(
         `Notification turn rejected [session ${this.sessionId}]: ${error instanceof Error ? error.message : String(error)}`
       );
       const index = this.#nextNotificationQueueIndex();
@@ -9828,7 +9877,7 @@ ${this.pendingRecoveredAgentsNotice}
               await this.messageRewriter?.flushTurn(ac.signal);
               await this.messageRewriter?.waitForPendingRewrites();
             } catch (error) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `Failed to complete background notification response: ${this.#formatError(error)}`
               );
             }
@@ -10128,7 +10177,7 @@ ${this.pendingRecoveredAgentsNotice}
         } catch (error) {
           if (!admitted) {
             this.#deferBackgroundAdmission(item);
-            debugLogger6.warn(
+            debugLogger7.warn(
               "Background turn could not start; retaining result:",
               error
             );
@@ -10140,14 +10189,14 @@ ${this.pendingRecoveredAgentsNotice}
             return;
           }
           this.todoStopGuard.pauseForTrustedRetry();
-          debugLogger6.error("Error processing background notification:", error);
+          debugLogger7.error("Error processing background notification:", error);
           const msg = error instanceof Error ? error.message : String(error);
           try {
             await this.messageEmitter.emitAgentMessage(
               `[notification error] ${msg}`
             );
           } catch (emitError) {
-            debugLogger6.error(
+            debugLogger7.error(
               "Failed to emit background notification error:",
               emitError
             );
@@ -10232,7 +10281,7 @@ ${this.pendingRecoveredAgentsNotice}
         source: "background_notification"
       });
     } catch (error) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Background notification end-turn extNotification dropped: ${this.#formatError(error)}`
       );
     }
@@ -10250,7 +10299,7 @@ ${this.pendingRecoveredAgentsNotice}
         source: "goal"
       });
     } catch (error) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Goal start-turn extNotification dropped: ${this.#formatError(error)}`
       );
     }
@@ -10264,7 +10313,7 @@ ${this.pendingRecoveredAgentsNotice}
         promptId: this.config.getSessionId() + "########" + String(this.turn)
       });
     } catch (error) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `Goal end-turn extNotification dropped: ${this.#formatError(error)}`
       );
     }
@@ -10273,7 +10322,7 @@ ${this.pendingRecoveredAgentsNotice}
     try {
       await this.sendAvailableCommandsUpdateOrThrow();
     } catch (error) {
-      debugLogger6.error("Error sending available commands update:", error);
+      debugLogger7.error("Error sending available commands update:", error);
     }
   }
   async refreshSkillsFromSettings(options = {}) {
@@ -10295,7 +10344,7 @@ ${this.pendingRecoveredAgentsNotice}
         await skillManager.notifyConfigChanged();
       } catch (error) {
         if (!updateFailed) throw error;
-        debugLogger6.error(
+        debugLogger7.error(
           "SkillManager refresh failed after command update failure:",
           error
         );
@@ -10384,6 +10433,7 @@ ${this.pendingRecoveredAgentsNotice}
     }
     const previousApprovalMode = this.config.getApprovalMode();
     this.config.setApprovalMode(approvalMode);
+    void recordDaemonSessionApprovalModeFromConfig(this.config);
     if (previousApprovalMode !== approvalMode && (previousApprovalMode === "plan" /* PLAN */ || approvalMode === "plan" /* PLAN */)) {
       this.clearActiveTodoPlanRevision();
     }
@@ -10398,7 +10448,7 @@ ${this.pendingRecoveredAgentsNotice}
         planExecutionMode: this.config.getPlanExecutionMode?.() ?? this.config.getPrePlanMode?.()
       } : {}
     }).catch((error) => {
-      debugLogger6.debug("mode-update extNotification failed", error);
+      debugLogger7.debug("mode-update extNotification failed", error);
     });
   }
   /**
@@ -10461,7 +10511,7 @@ ${this.pendingRecoveredAgentsNotice}
       sessionId: this.sessionId,
       currentModelId: currentAcpModelId
     }).catch((error) => {
-      debugLogger6.debug("model-update extNotification failed", error);
+      debugLogger7.debug("model-update extNotification failed", error);
     });
     if (persistDefault) {
       const persistScope = getPersistScopeForModelSelection(this.settings);
@@ -10537,7 +10587,7 @@ ${this.pendingRecoveredAgentsNotice}
             );
           } catch (rollbackError) {
             this.settings.reloadScopeFromDisk(previousWrite.scope);
-            debugLogger6.warn(
+            debugLogger7.warn(
               `Failed to roll back reasoning preference: ${rollbackError instanceof Error ? rollbackError.message : String(rollbackError)}`
             );
           }
@@ -10576,7 +10626,7 @@ ${this.pendingRecoveredAgentsNotice}
       try {
         this.persistReasoningSelection(REASONING_EFFORT_DEFAULT);
       } catch (error) {
-        debugLogger6.warn(
+        debugLogger7.warn(
           `Failed to clear incompatible reasoning preference: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -10619,7 +10669,7 @@ ${this.pendingRecoveredAgentsNotice}
       await this.sendUpdate(update);
       legacyFrameSent = true;
     } catch (error) {
-      debugLogger6.debug("current_mode_update notification failed", error);
+      debugLogger7.debug("current_mode_update notification failed", error);
     }
     try {
       await this.client.extNotification("o1code/notify/session/mode-update", {
@@ -10632,7 +10682,7 @@ ${this.pendingRecoveredAgentsNotice}
         legacyFrameSent
       });
     } catch (error) {
-      debugLogger6.debug("mode-update extNotification failed", error);
+      debugLogger7.debug("mode-update extNotification failed", error);
     }
   }
   /**
@@ -10784,7 +10834,7 @@ ${this.pendingRecoveredAgentsNotice}
         }
         await this.toolCallEmitter.emitError(callId, toolName, error);
       } catch (recordError) {
-        debugLogger6.error("Failed to record skipped tool call:", recordError);
+        debugLogger7.error("Failed to record skipped tool call:", recordError);
       }
       return part;
     }, "recordSkippedToolCall");
@@ -10818,7 +10868,7 @@ ${this.pendingRecoveredAgentsNotice}
           toolLoopState
         );
       } else {
-        debugLogger6.warn(message);
+        debugLogger7.warn(message);
       }
       await Promise.all(
         dedupedFunctionCalls.map(
@@ -10844,7 +10894,7 @@ ${this.pendingRecoveredAgentsNotice}
         this.duplicateProviderToolCallResponseIds
       );
       const response = createDuplicateProviderToolCallResponse(request);
-      debugLogger6.debug(
+      debugLogger7.debug(
         `[Session.runToolCalls] Suppressing duplicate provider tool-call id: ${providerCallId} (tool: ${request.name})`
       );
       batches.push({ kind: "duplicate", fc, request, response });
@@ -10890,7 +10940,7 @@ ${this.pendingRecoveredAgentsNotice}
           });
         }
       } catch (emitError) {
-        debugLogger6.debug(
+        debugLogger7.debug(
           "[Session.runToolCalls] Failed to emit duplicate tool update",
           emitError
         );
@@ -10994,13 +11044,13 @@ ${this.pendingRecoveredAgentsNotice}
         memoryWriteCandidates,
         this.config.getProjectRoot()
       );
-      debugLogger6.debug(
+      debugLogger7.debug(
         `ACP session ${this.sessionId} checked marked context-file memory tool batch; matched=${matchedContextFileWrite}`
       );
       if (!matchedContextFileWrite) {
         return;
       }
-      debugLogger6.debug(
+      debugLogger7.debug(
         `ACP session ${this.sessionId} refreshing memory after context-file memory write`
       );
       await refreshMemoryInstruction(this.config, {
@@ -11061,7 +11111,7 @@ ${this.pendingRecoveredAgentsNotice}
           results[idx] = r;
           if (r.loopDetected && executing.size > 1 && !warnedWaitingForInFlight) {
             warnedWaitingForInFlight = true;
-            debugLogger6.warn(
+            debugLogger7.warn(
               `Loop detection stopped this ACP turn; waiting for ${executing.size - 1} in-flight tool call(s) to settle before returning.`
             );
           }
@@ -11341,7 +11391,7 @@ ${this.pendingRecoveredAgentsNotice}
           mcp_server_name: mcpServerName
         });
       } catch (telemetryError) {
-        debugLogger6.debug(
+        debugLogger7.debug(
           "[Session.runTool] Failed to record terminal tool telemetry",
           telemetryError
         );
@@ -11384,7 +11434,7 @@ ${this.pendingRecoveredAgentsNotice}
             await this.toolCallEmitter.emitError(callId, toolName2, error);
           }
         } catch (emitError) {
-          debugLogger6.debug(
+          debugLogger7.debug(
             "[Session.runTool] Failed to emit terminal tool update",
             emitError
           );
@@ -11793,7 +11843,7 @@ ${this.pendingRecoveredAgentsNotice}
             forceAutoReviewForAllow
           );
           if (finalPermission === "allow" && forceAutoReviewForAllow) {
-            debugLogger6.info(
+            debugLogger7.info(
               `Auto mode: L4 allow overridden by protected-write guard for ${policyToolName}`
             );
           }
@@ -11862,7 +11912,7 @@ ${this.pendingRecoveredAgentsNotice}
                 autoModeAllowed = true;
                 break;
               case "blocked":
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `Auto mode blocked (${outcome.reason}): tool=${policyToolName}, ` + formatDenialStateLog(denialState)
                 );
                 return earlyErrorResponse(
@@ -11883,7 +11933,7 @@ ${this.pendingRecoveredAgentsNotice}
                   };
                 }
                 if (wasAutoModeManualFallback) {
-                  debugLogger6.warn(
+                  debugLogger7.warn(
                     `Auto mode fallback to manual approval (${outcome.reason}): ` + formatDenialStateLog(denialState)
                   );
                 }
@@ -11906,7 +11956,7 @@ ${this.pendingRecoveredAgentsNotice}
                 "cancel" /* Cancel */
               );
             } catch (error) {
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `Failed to cancel stale plan approval: ${this.#formatError(error)}`
               );
             }
@@ -11929,12 +11979,12 @@ ${this.pendingRecoveredAgentsNotice}
               const before = this.config.getAutoModeDenialState();
               const after = recordFallbackApprove(before);
               if (after === before) {
-                debugLogger6.warn(
+                debugLogger7.warn(
                   `Auto mode denial counters already clear after fallback approval: ` + formatDenialStateLog(before)
                 );
                 return;
               }
-              debugLogger6.warn(
+              debugLogger7.warn(
                 `Auto mode denial counters reset after fallback approval: ${formatDenialStateLog(before)} -> ${formatDenialStateLog(after)}`
               );
               this.config.setAutoModeDenialState(after);
@@ -12219,7 +12269,7 @@ ${this.pendingRecoveredAgentsNotice}
                   offeredPermissionOptions
                 );
               } catch (error) {
-                debugLogger6.error(
+                debugLogger7.error(
                   `Permission request failed for tool ${toolName}:`,
                   error
                 );
@@ -12228,7 +12278,7 @@ ${this.pendingRecoveredAgentsNotice}
                     "cancel" /* Cancel */
                   );
                 } catch (confirmError) {
-                  debugLogger6.error(
+                  debugLogger7.error(
                     `Failed to cancel tool ${toolName} after permission request failure:`,
                     confirmError
                   );
@@ -12309,7 +12359,7 @@ ${this.pendingRecoveredAgentsNotice}
                 if (outcome !== "cancel" /* Cancel */) {
                   throw error;
                 }
-                debugLogger6.error(
+                debugLogger7.error(
                   `Failed to confirm cancellation for tool ${toolName}:`,
                   error
                 );
@@ -12384,7 +12434,7 @@ ${this.pendingRecoveredAgentsNotice}
             try {
               await this.toolCallEmitter.emitStart(startParams);
             } catch (emitError) {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 "[Session.runTool] Failed to emit tool start update",
                 emitError
               );
@@ -12414,7 +12464,7 @@ ${this.pendingRecoveredAgentsNotice}
                   `\u2717 **PreToolUse blocked**: ${toolName} - ${blockReason}`
                 );
               } catch (emitError) {
-                debugLogger6.debug(
+                debugLogger7.debug(
                   "[Session.runTool] Failed to emit PreToolUse block message",
                   emitError
                 );
@@ -12428,7 +12478,7 @@ ${this.pendingRecoveredAgentsNotice}
               });
             }
             if (preHookResult.additionalContext) {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 `PreToolUse hook additional context for ${toolName}: ${preHookResult.additionalContext}`
               );
             }
@@ -12526,7 +12576,7 @@ ${this.pendingRecoveredAgentsNotice}
                 toolCallId: callId,
                 _meta: { toolName, subagentSessionReady: true }
               }).catch((err) => {
-                debugLogger6.debug(
+                debugLogger7.debug(
                   `[Session.runTool] subagent readiness update failed for ${callId}: ${err}`
                 );
               });
@@ -12540,7 +12590,7 @@ ${this.pendingRecoveredAgentsNotice}
               status: "in_progress",
               _meta: { toolName, shellProgress: chunk }
             }).catch((err) => {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 `[Session.runTool] heartbeat update failed for ${callId}: ${err}`
               );
             });
@@ -12567,7 +12617,7 @@ ${this.pendingRecoveredAgentsNotice}
                 invocation.params
               );
             } catch {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 "[Session.runTool] Failed to record tool arguments telemetry"
               );
             }
@@ -12750,7 +12800,7 @@ ${this.pendingRecoveredAgentsNotice}
           );
           let status = aborted ? "cancelled" : toolResult.error ? "error" : "success";
           if (status === "success" && !nestedPermissionCancelled && tool.mediaPolicyDescriptor && toolResult.artifacts && toolResult.artifacts.length > 0) {
-            const { collectModelPolicyCall } = await import("./model-call-collection-OJVM2GWV.js");
+            const { collectModelPolicyCall } = await import("./model-call-collection-KSMSHS7L.js");
             await collectModelPolicyCall({
               config: this.config,
               batch: {
@@ -12808,7 +12858,7 @@ ${this.pendingRecoveredAgentsNotice}
             }
             if (postHookResult.shouldStop) {
               const stopMessage = postHookResult.stopReason || "Execution stopped by PostToolUse hook";
-              debugLogger6.info(
+              debugLogger7.info(
                 `PostToolUse hook requested stop for ${toolName}: ${stopMessage}`
               );
               this.todoStopGuard.suspend();
@@ -12848,7 +12898,7 @@ ${this.pendingRecoveredAgentsNotice}
                 elapsedExecutionMs()
               );
               if (failureHookResult.additionalContext) {
-                debugLogger6.debug(
+                debugLogger7.debug(
                   `PostToolUseFailure hook additional context for ${toolName}: ${failureHookResult.additionalContext}`
                 );
               }
@@ -12859,14 +12909,14 @@ ${this.pendingRecoveredAgentsNotice}
                 artifacts: failureHookResult.artifacts
               });
             } catch (hookError) {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 "[Session.runTool] PostToolUseFailure hook failed",
                 hookError
               );
             }
           }
           if (this.config.isOmniEnabled?.()) {
-            const { processToolResultOmniMedia } = await import("./omni-TSSGKDWK.js");
+            const { processToolResultOmniMedia } = await import("./omni-47LNNZAF.js");
             responseParts = await processToolResultOmniMedia(
               responseParts,
               this.config,
@@ -12886,7 +12936,7 @@ ${this.pendingRecoveredAgentsNotice}
             try {
               await this.messageEmitter.emitAgentMessage(visionBridgeNotice);
             } catch (emitError) {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 "[Session.runTool] Failed to emit vision bridge notice",
                 emitError
               );
@@ -12916,7 +12966,7 @@ ${this.pendingRecoveredAgentsNotice}
               try {
                 await this.planEmitter.emitPlan(plan, callId);
               } catch (emitError) {
-                debugLogger6.debug(
+                debugLogger7.debug(
                   "[Session.runTool] Failed to emit plan update",
                   emitError
                 );
@@ -12936,7 +12986,7 @@ ${this.pendingRecoveredAgentsNotice}
                 persistedOutputFiles: settledPersistedOutputFiles
               });
             } catch (emitError) {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 "[Session.runTool] Failed to emit terminal tool update",
                 emitError
               );
@@ -12967,7 +13017,7 @@ ${this.pendingRecoveredAgentsNotice}
               mcp_server_name: mcpServerName
             });
           } catch (telemetryError) {
-            debugLogger6.debug(
+            debugLogger7.debug(
               "[Session.runTool] Failed to record terminal tool telemetry",
               telemetryError
             );
@@ -12999,7 +13049,7 @@ ${this.pendingRecoveredAgentsNotice}
               try {
                 addToolCallResultAttributes(this.config, toolSpan, result);
               } catch {
-                debugLogger6.debug(
+                debugLogger7.debug(
                   "[Session.runTool] Failed to record tool result telemetry"
                 );
               }
@@ -13043,7 +13093,7 @@ ${this.pendingRecoveredAgentsNotice}
                 elapsedExecutionMs()
               );
               if (failureHookResult.additionalContext) {
-                debugLogger6.debug(
+                debugLogger7.debug(
                   `PostToolUseFailure hook additional context for ${toolName}: ${failureHookResult.additionalContext}`
                 );
               }
@@ -13054,7 +13104,7 @@ ${this.pendingRecoveredAgentsNotice}
                 artifacts: failureHookResult.artifacts
               });
             } catch (hookError) {
-              debugLogger6.debug(
+              debugLogger7.debug(
                 "[Session.runTool] PostToolUseFailure hook failed",
                 hookError
               );
@@ -13449,7 +13499,7 @@ ${contextPart.text}`
             formatFullTurnVisionNotice(fullTurnModel)
           );
         } catch (error) {
-          debugLogger6.debug(
+          debugLogger7.debug(
             `full-turn vision: failed to emit notice; continuing error=${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -13458,19 +13508,19 @@ ${contextPart.text}`
     }
     let bridgeResult;
     try {
-      debugLogger6.debug("vision bridge: gate matched, running conversion");
+      debugLogger7.debug("vision bridge: gate matched, running conversion");
       bridgeResult = await runVisionBridge({
         config: this.config,
         parts,
         signal: abortSignal
       });
     } catch (error) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `vision bridge: failed before replacement; falling back to text-only parts error=${String(error instanceof Error ? error.message : error)}`
       );
       return splitImageParts(parts).nonImageParts;
     }
-    debugLogger6.debug(
+    debugLogger7.debug(
       `vision bridge: status=${bridgeResult.status} applied=${bridgeResult.applied} model=${bridgeResult.modelId ?? "(none)"}${bridgeResult.error ? ` error=${bridgeResult.error}` : ""}`
     );
     if (bridgeResult.status !== "skipped" || bridgeResult.egressOccurred) {
@@ -13480,13 +13530,13 @@ ${contextPart.text}`
           bridgeResult
         );
       } catch (error) {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `vision bridge: failed to emit notice; continuing with bridge result error=${String(error instanceof Error ? error.message : error)}`
         );
       }
     }
     if (abortSignal.aborted) {
-      debugLogger6.debug("vision bridge: turn aborted after bridge returned");
+      debugLogger7.debug("vision bridge: turn aborted after bridge returned");
       return splitImageParts(parts).nonImageParts;
     }
     if (bridgeResult.applied && bridgeResult.parts != null) {
@@ -13500,7 +13550,7 @@ ${contextPart.text}`
     }
     const voiceModel = readVoiceModel(this.settings);
     if (!voiceModel) {
-      debugLogger6.debug(
+      debugLogger7.debug(
         "voice bridge: no voice model configured; replacing audio with note"
       );
       return parts.map(
@@ -13519,14 +13569,14 @@ ${contextPart.text}`
       }
       const inlineData = part.inlineData;
       if (approxBase64Bytes(inlineData.data) > MAX_AUDIO_BYTES) {
-        debugLogger6.debug(
+        debugLogger7.debug(
           "voice bridge: audio too large; replacing audio with note"
         );
         converted.push({ text: buildVoiceUnavailableBlock("audio too large") });
         continue;
       }
       try {
-        debugLogger6.debug(`voice bridge: transcribing audio via ${voiceModel}`);
+        debugLogger7.debug(`voice bridge: transcribing audio via ${voiceModel}`);
         const transcript = (await transcribeVoiceAudio(
           {
             data: new Uint8Array(Buffer2.from(inlineData.data, "base64")),
@@ -13543,7 +13593,7 @@ ${contextPart.text}`
           }
         )).trim();
         if (abortSignal.aborted) {
-          debugLogger6.debug("voice bridge: turn aborted after transcription");
+          debugLogger7.debug("voice bridge: turn aborted after transcription");
           return converted;
         }
         if (transcript.length > 0) {
@@ -13556,10 +13606,10 @@ ${contextPart.text}`
         });
       } catch (error) {
         if (abortSignal.aborted) {
-          debugLogger6.debug("voice bridge: transcription cancelled");
+          debugLogger7.debug("voice bridge: transcription cancelled");
           return converted;
         }
-        debugLogger6.debug(
+        debugLogger7.debug(
           `voice bridge: transcription failed; replacing audio with note error=${sanitizeVoiceErrorMessage(String(error instanceof Error ? error.message : error))}`
         );
         converted.push({
@@ -13573,7 +13623,7 @@ ${contextPart.text}`
           transcribedCount > 0 ? this.#formatVoiceBridgeNotice(voiceModel, transcribedCount) : this.#formatVoiceBridgeEgressNotice(voiceModel, egressCount)
         );
       } catch (error) {
-        debugLogger6.debug(
+        debugLogger7.debug(
           `voice bridge: failed to emit notice; continuing with bridge result error=${String(error instanceof Error ? error.message : error)}`
         );
       }
@@ -13634,7 +13684,7 @@ ${contextPart.text}`
   }
   debug(msg) {
     if (this.config.getDebugMode()) {
-      debugLogger6.warn(msg);
+      debugLogger7.warn(msg);
     }
   }
   async emitHookArtifactsNotification(args) {
@@ -13677,7 +13727,7 @@ ${contextPart.text}`
         }
       );
     }).catch((err) => {
-      debugLogger6.debug(
+      debugLogger7.debug(
         `ACP terminalSequence notification dropped (session=${this.sessionId}): ${err instanceof Error ? err.message : String(err)}`
       );
     });
@@ -13686,7 +13736,7 @@ ${contextPart.text}`
 
 // packages/cli/src/acp-integration/active-work-reporter.ts
 init_esbuild_shims();
-var debugLogger7 = createDebugLogger("ACTIVE_WORK");
+var debugLogger8 = createDebugLogger("ACTIVE_WORK");
 var ActiveWorkReporter = class {
   constructor(send, listSources, intervalMs, enabledCategories) {
     this.send = send;
@@ -13762,7 +13812,7 @@ var ActiveWorkReporter = class {
         });
       }
     } catch (error) {
-      debugLogger7.warn(
+      debugLogger8.warn(
         `active-work snapshot collection failed; skipping this report: ${error instanceof Error ? error.message : String(error)}`
       );
       return;
@@ -13905,7 +13955,7 @@ import { Readable, Writable as Writable2 } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import * as path4 from "node:path";
 import { createGunzip } from "node:zlib";
-var debugLogger8 = createDebugLogger("ACP_AGENT");
+var debugLogger9 = createDebugLogger("ACP_AGENT");
 function toRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
@@ -14337,7 +14387,7 @@ async function downloadGitHubSkillDirectory(githubUrl, directoryPath) {
     githubUrl,
     directoryPath
   ).catch((error) => {
-    debugLogger8.warn(
+    debugLogger9.warn(
       "GitHub API directory listing failed, falling back to archive download:",
       error
     );
@@ -15180,14 +15230,14 @@ async function startSessionOwnedWorkflow(tool, params, workflowName) {
     result = await invocation.execute(new AbortController().signal);
   } catch (error) {
     if (error instanceof WorkflowJournalUnavailableError) {
-      debugLogger9.debug(error.message);
+      debugLogger10.debug(error.message);
       throw RequestError.invalidParams(
         { errorKind: "workflow_journal_unavailable" },
         error.reason === "missing" ? `Workflow run ${error.runId} has no journal on disk, so a retry has nothing to resume; rerun it to start it from the beginning.` : `The journal of workflow run ${error.runId} could not be read, so a retry cannot resume it; rerun it to start it from the beginning.`
       );
     }
     if (error instanceof WorkflowCheckpointUnwritableError) {
-      debugLogger9.debug(error.message);
+      debugLogger10.debug(error.message);
       throw RequestError.invalidParams(
         { errorKind: "workflow_not_recorded" },
         error.message
@@ -15204,7 +15254,7 @@ async function startSessionOwnedWorkflow(tool, params, workflowName) {
   return result;
 }
 __name(startSessionOwnedWorkflow, "startSessionOwnedWorkflow");
-var debugLogger9 = createDebugLogger("ACP_AGENT");
+var debugLogger10 = createDebugLogger("ACP_AGENT");
 var ACP_EVENT_LOOP_STALL_SUSPEND_MS = 5 * 60 * 1e3;
 var O1CODE_ACP_LOCAL_READ_ROOTS_ENV = "O1CODE_ACP_LOCAL_READ_ROOTS";
 var POSIX_TMP_LOCAL_READ_ROOT = "/tmp";
@@ -15436,7 +15486,7 @@ async function beginSessionCloseAfterCurrentGate(session, timeoutMs) {
   }
 }
 __name(beginSessionCloseAfterCurrentGate, "beginSessionCloseAfterCurrentGate");
-var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger9);
+var logWorkspaceMemoryExtractionError = createWorkspaceMemoryExtractionErrorLogger(debugLogger10);
 function parseAcpLocalReadRootsEnv(raw = process.env[O1CODE_ACP_LOCAL_READ_ROOTS_ENV]) {
   if (!raw) return [];
   return raw.split(path7.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0 && path7.isAbsolute(entry));
@@ -15626,7 +15676,7 @@ function appendGoalUpdatesWithinLimits(sessionId, envelope, goalUpdates, enforce
     validateLoadReplayEnvelope(sessionId, withGoal, enforceLimits);
   } catch (error) {
     if (!(error instanceof HistoryReplayLimitError)) throw error;
-    debugLogger9.debug(
+    debugLogger10.debug(
       `Kept ${goalUpdates.length} Goal update(s) off a full replay page: ${error.message}`
     );
     return false;
@@ -16479,7 +16529,7 @@ function readMcpServers(source, scope) {
       const server = toMcpServerConfig(value);
       return server ? { name, scope, server: redactMcpServerSecrets(server) } : void 0;
     } catch (error) {
-      debugLogger9.warn(
+      debugLogger10.warn(
         `Skipping malformed MCP server config [${scope}:${name}]:`,
         error
       );
@@ -16575,7 +16625,7 @@ function readHooks(source, scope, extensionName) {
           extensionName
         });
       } catch (error) {
-        debugLogger9.warn(
+        debugLogger10.warn(
           `Skipping malformed hook entry [${scope}:${event}:${index}]:`,
           error
         );
@@ -16897,7 +16947,7 @@ async function runAcpAgent(config, settings, argv, options) {
             void preloadContentGenerator(
               session.getConfig().getContentGenerator()
             ).catch((error) => {
-              debugLogger9.debug(
+              debugLogger10.debug(
                 `[ACP] Session provider preload failed for ${sessionId}: ${error instanceof Error ? error.message : String(error)}`
               );
             });
@@ -16945,7 +16995,7 @@ async function runAcpAgent(config, settings, argv, options) {
       drainPoolPromise ??= agentInstance.shutdownMcpPool(8e3);
       await drainPoolPromise;
     } catch (err) {
-      debugLogger9.error(`[ACP] MCP pool drain (${label}) error:`, err);
+      debugLogger10.error(`[ACP] MCP pool drain (${label}) error:`, err);
       if (strict) throw err;
     }
   }, "drainPoolBeforeExit");
@@ -17001,7 +17051,7 @@ async function runAcpAgent(config, settings, argv, options) {
           );
         }
         for (const failure of failures) {
-          debugLogger9.warn(
+          debugLogger10.warn(
             `SessionEnd hook failed: ${failure instanceof Error ? failure.message : String(failure)}`
           );
         }
@@ -17029,7 +17079,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await terminal.writerShutdown;
       } catch (error) {
         failures.push(error);
-        debugLogger9.error("[ACP] Managed writer shutdown error:", error);
+        debugLogger10.error("[ACP] Managed writer shutdown error:", error);
         const retainedLockPaths = terminal.configs.flatMap((config2) => {
           if (typeof config2.getSessionRuntimeBaseDir !== "function" || typeof config2.getSessionId !== "function") {
             return [];
@@ -17056,7 +17106,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await agent.finishManagedShutdown(terminal.configs);
       } catch (error) {
         failures.push(error);
-        debugLogger9.error("[ACP] Managed resource shutdown error:", error);
+        debugLogger10.error("[ACP] Managed resource shutdown error:", error);
       }
       try {
         await drainPoolBeforeExit(label, true);
@@ -17067,7 +17117,7 @@ async function runAcpAgent(config, settings, argv, options) {
         await runExitCleanup();
       } catch (error) {
         failures.push(error);
-        debugLogger9.error("[ACP] Cleanup error:", error);
+        debugLogger10.error("[ACP] Cleanup error:", error);
       }
       if (failures.length > 0) {
         throw new AggregateError(failures, "Managed ACP shutdown failed");
@@ -17079,14 +17129,14 @@ async function runAcpAgent(config, settings, argv, options) {
     if (shuttingDown) return;
     shuttingDown = true;
     prepareFileWatchersForProcessExit();
-    debugLogger9.debug("[ACP] Shutdown signal received, closing streams");
+    debugLogger10.debug("[ACP] Shutdown signal received, closing streams");
     if (agentInstance?.isTrustedManagedParent()) {
       let exitCode = 0;
       try {
         await shutdownManagedAgent("other" /* Other */, "signal");
       } catch (err) {
         exitCode = 1;
-        debugLogger9.error("[ACP] Managed shutdown error:", err);
+        debugLogger10.error("[ACP] Managed shutdown error:", err);
       } finally {
         eventLoopMonitor.dispose();
       }
@@ -17111,12 +17161,12 @@ async function runAcpAgent(config, settings, argv, options) {
       }
       await drainPoolBeforeExit("signal");
     } catch (err) {
-      debugLogger9.error("[ACP] Shutdown error:", err);
+      debugLogger10.error("[ACP] Shutdown error:", err);
     } finally {
       eventLoopMonitor.dispose();
     }
     runExitCleanup().catch((err) => {
-      debugLogger9.error("[ACP] Cleanup error:", err);
+      debugLogger10.error("[ACP] Cleanup error:", err);
     }).finally(() => {
       process.exit(0);
     });
@@ -17612,12 +17662,12 @@ var O1CodeAgent = class _O1CodeAgent {
       try {
         session.beginCloseIfAvailable();
       } catch (error) {
-        debugLogger9.debug(
+        debugLogger10.debug(
           `Session ${session.getId()} admission close during managed shutdown failed: ${error instanceof Error ? error.message : String(error)}`
         );
       }
       void session.cancelPendingPrompt().catch((error) => {
-        debugLogger9.debug(
+        debugLogger10.debug(
           `Session ${session.getId()} cancel during managed shutdown failed: ${error instanceof Error ? error.message : String(error)}`
         );
       });
@@ -17772,7 +17822,7 @@ var O1CodeAgent = class _O1CodeAgent {
       await run();
     }).catch((err) => {
       this.workspaceMcpDiscoveryError = err instanceof Error ? err.message : String(err);
-      debugLogger9.error(
+      debugLogger10.error(
         `Workspace MCP ${label} failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }).finally(() => {
@@ -17971,7 +18021,7 @@ var O1CodeAgent = class _O1CodeAgent {
     try {
       const result = await this.mcpPool.drainAll({ force: true, timeoutMs });
       if (result.forced > 0 || result.errors.length > 0) {
-        debugLogger9.warn(
+        debugLogger10.warn(
           `MCP pool drain: ${result.drained} clean, ${result.forced} timed out, ${result.errors.length} errors`
         );
         throw new Error(
@@ -17979,7 +18029,7 @@ var O1CodeAgent = class _O1CodeAgent {
         );
       }
     } catch (err) {
-      debugLogger9.error(
+      debugLogger10.error(
         `MCP pool drainAll failed: ${err instanceof Error ? err.message : String(err)}`
       );
       throw err;
@@ -18024,14 +18074,14 @@ var O1CodeAgent = class _O1CodeAgent {
         this.detachedWorkflowRegistries.add(registry);
       }
     } catch (error) {
-      debugLogger9.warn(
+      debugLogger10.warn(
         `Session ${sessionId}: could not retain its workflow registry for liveness checks:`,
         error
       );
     }
     this.activeWorkReporter?.notifyChanged();
     if (cleanupErrors.length > 0) {
-      debugLogger9.warn(
+      debugLogger10.warn(
         `Session ${sessionId} closed after ${cleanupErrors.length} cleanup failure(s): ${cleanupErrors.map(
           (error) => error instanceof Error ? error.message : String(error)
         ).join("; ")}`
@@ -18085,7 +18135,7 @@ var O1CodeAgent = class _O1CodeAgent {
     try {
       await cleanup();
     } catch (cleanupError) {
-      debugLogger9.warn(
+      debugLogger10.warn(
         `Session cleanup failed while preserving the original request error: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}`
       );
     }
@@ -18136,7 +18186,7 @@ var O1CodeAgent = class _O1CodeAgent {
         await this.cleanupUnstoredConfig(config);
       } catch (error) {
         if (config.getSessionId() === requiredSessionId) throw error;
-        debugLogger9.warn(
+        debugLogger10.warn(
           `Deferred Config cleanup retry failed for session ${config.getSessionId()}: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -18184,7 +18234,7 @@ var O1CodeAgent = class _O1CodeAgent {
           try {
             await session.cancelPendingPrompt();
           } catch (err) {
-            debugLogger9.debug(
+            debugLogger10.debug(
               `Session ${sessionId} cancel during close failed: ${err instanceof Error ? err.message : String(err)}`
             );
           }
@@ -18297,7 +18347,7 @@ var O1CodeAgent = class _O1CodeAgent {
         }
         return messaging;
       } catch (error) {
-        debugLogger9.error(
+        debugLogger10.error(
           "[ACP] cross-session messaging failed to start:",
           error
         );
@@ -18315,7 +18365,7 @@ var O1CodeAgent = class _O1CodeAgent {
     try {
       await (await pending)?.close();
     } catch (error) {
-      debugLogger9.debug(
+      debugLogger10.debug(
         `[ACP] closing cross-session messaging failed: ${error instanceof Error ? error.message : String(error)}`
       );
     }
@@ -18449,7 +18499,7 @@ var O1CodeAgent = class _O1CodeAgent {
   finalizeDanglingForRestore(session, turnIdleBeforeRead) {
     const idleAtReplay = session?.isTurnIdle() ?? true;
     const finalize = turnIdleBeforeRead && idleAtReplay;
-    debugLogger9.debug(
+    debugLogger10.debug(
       `[ACP] restore replay finalizeDangling=${finalize} (idleBeforeRead=${turnIdleBeforeRead}, idleAtReplay=${idleAtReplay}) session=${session?.getId() ?? "(non-live)"}`
     );
     return finalize;
@@ -18489,7 +18539,7 @@ var O1CodeAgent = class _O1CodeAgent {
         scope: "workspace",
         ...event
       }).catch((err) => {
-        debugLogger9.debug(
+        debugLogger10.debug(
           `MCP workspace budget event delivery to session ${sid} failed (kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
         );
       });
@@ -18526,7 +18576,7 @@ var O1CodeAgent = class _O1CodeAgent {
     const authMethods = pickAuthMethodsForAuthRequired(
       this.config.getCurrentAuthType?.() ?? this.config.getAuthType?.()
     );
-    const version = "0.3.0";
+    const version = "0.5.0";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -18883,7 +18933,7 @@ var O1CodeAgent = class _O1CodeAgent {
                     maxUpdates: LOAD_REPLAY_MAX_UPDATES
                   }
                 } : {},
-                logger: debugLogger9
+                logger: debugLogger10
               })
             );
             addDaemonRequestAttribute(
@@ -18897,7 +18947,7 @@ var O1CodeAgent = class _O1CodeAgent {
                   replayPage.records
                 );
               } catch (error) {
-                debugLogger9.debug(
+                debugLogger10.debug(
                   `Failed to render the legacy Goal supersession: ${error instanceof Error ? error.message : String(error)}`
                 );
                 return [];
@@ -18918,7 +18968,7 @@ var O1CodeAgent = class _O1CodeAgent {
                 try {
                   await liveSession.sendUpdate(update);
                 } catch (error) {
-                  debugLogger9.debug(
+                  debugLogger10.debug(
                     `Failed to send the legacy Goal supersession: ${error instanceof Error ? error.message : String(error)}`
                   );
                 }
@@ -18997,6 +19047,7 @@ var O1CodeAgent = class _O1CodeAgent {
         config.suppressRestorableAskUserQuestionPreservation();
       }
       const projection = config.consumeSessionRestoreProjection?.();
+      applyRestoredSessionApprovalMode(config, projection);
       const suppressRecoveredGoalPresentation = projection?.runtime.goalRecoverySourceUuid !== void 0 && projection.runtime.goalRecoverySourceUuid !== projection.replay?.goalRecoverySourceUuid;
       const bulkReplay = isBulkLoadReplayRequest(params);
       let replayEnvelope;
@@ -19075,7 +19126,7 @@ var O1CodeAgent = class _O1CodeAgent {
                         maxUpdates: LOAD_REPLAY_MAX_UPDATES
                       }
                     } : {},
-                    logger: debugLogger9
+                    logger: debugLogger10
                   })
                 );
                 addDaemonRequestAttribute(
@@ -19109,7 +19160,7 @@ var O1CodeAgent = class _O1CodeAgent {
                 }
               ).catch((error) => {
                 if (suppressRecoveredGoalPresentation) throw error;
-                debugLogger9.debug(
+                debugLogger10.debug(
                   `Failed to render recovered Goal state: ${error instanceof Error ? error.message : String(error)}`
                 );
                 return {
@@ -19193,7 +19244,7 @@ var O1CodeAgent = class _O1CodeAgent {
                   await createdSession.sendUpdate(update);
                 }
               } catch (error) {
-                debugLogger9.debug(
+                debugLogger10.debug(
                   `Failed to publish recovered Goal state: ${error instanceof Error ? error.message : String(error)}`
                 );
               }
@@ -19336,6 +19387,7 @@ var O1CodeAgent = class _O1CodeAgent {
         config.suppressRestorableAskUserQuestionPreservation();
       }
       const projection = config.consumeSessionRestoreProjection?.();
+      applyRestoredSessionApprovalMode(config, projection);
       let response;
       try {
         if (!provisionalStandalone) {
@@ -19440,7 +19492,7 @@ var O1CodeAgent = class _O1CodeAgent {
         session.pendingWorktreeNotice = restored.contextMessage;
       }
     } catch (error) {
-      debugLogger9.warn(`ACP worktree restore failed: ${error}`);
+      debugLogger10.warn(`ACP worktree restore failed: ${error}`);
     }
   }
   async #restoreBackgroundAgentsOnResume(config, session) {
@@ -19834,7 +19886,7 @@ var O1CodeAgent = class _O1CodeAgent {
       await extensionManager.refreshCache();
       extensions = extensionManager.getLoadedExtensions();
     } catch (error) {
-      debugLogger9.warn(
+      debugLogger10.warn(
         "Extension loading failed, continuing without extensions:",
         error
       );
@@ -19968,7 +20020,7 @@ var O1CodeAgent = class _O1CodeAgent {
             pm.addPersistentRule(rule, ruleType);
           }
         } catch (error) {
-          debugLogger9.warn(
+          debugLogger10.warn(
             `Failed to sync permission rules to a live session: ${error instanceof Error ? error.message : String(error)}`
           );
         }
@@ -20560,7 +20612,7 @@ var O1CodeAgent = class _O1CodeAgent {
       if (!changed) return;
       await config.getSkillManager()?.refreshCache();
     } catch (error) {
-      debugLogger9.warn("Extension source revalidation failed:", error);
+      debugLogger10.warn("Extension source revalidation failed:", error);
     }
   }
   async buildWorkspaceSkillsStatus(config, settings = this.settings) {
@@ -21638,7 +21690,7 @@ var O1CodeAgent = class _O1CodeAgent {
         "o1code/session/sources/copy"
       ].includes(method)) {
         if (!(error instanceof SessionSourceError)) {
-          debugLogger9.error("[ACP] Session source ext-method error:", error);
+          debugLogger10.error("[ACP] Session source ext-method error:", error);
         }
         return {
           sourceError: error instanceof SessionSourceError ? { code: error.code, message: error.message } : {
@@ -22139,7 +22191,7 @@ var O1CodeAgent = class _O1CodeAgent {
               config,
               finalizeDangling: !activePromptBeforeRead && !this.activePromptCalls.has(sessionId2),
               encodeCursor: /* @__PURE__ */ __name((state) => encodeSessionTranscriptCursor(state, cwd), "encodeCursor"),
-              logger: debugLogger9
+              logger: debugLogger10
             });
             return {
               v: 1,
@@ -22429,7 +22481,7 @@ var O1CodeAgent = class _O1CodeAgent {
           );
           if (childSignal.aborted) {
             const timeoutCode = "remember_timeout";
-            debugLogger9.error("Workspace memory remember timed out:", {
+            debugLogger10.error("Workspace memory remember timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -22441,7 +22493,7 @@ var O1CodeAgent = class _O1CodeAgent {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger9.error("Workspace memory remember failed:", {
+          debugLogger10.error("Workspace memory remember failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -22520,7 +22572,7 @@ var O1CodeAgent = class _O1CodeAgent {
           );
           if (childSignal.aborted) {
             const timeoutCode = "forget_timeout";
-            debugLogger9.error("Workspace memory forget timed out:", {
+            debugLogger10.error("Workspace memory forget timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -22532,7 +22584,7 @@ var O1CodeAgent = class _O1CodeAgent {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger9.error("Workspace memory forget failed:", {
+          debugLogger10.error("Workspace memory forget failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -22600,7 +22652,7 @@ var O1CodeAgent = class _O1CodeAgent {
           );
           if (childSignal.aborted) {
             const timeoutCode = "dream_timeout";
-            debugLogger9.error("Workspace memory dream timed out:", {
+            debugLogger10.error("Workspace memory dream timed out:", {
               projectRoot,
               code: timeoutCode,
               details: diagnostics.debugDetails,
@@ -22612,7 +22664,7 @@ var O1CodeAgent = class _O1CodeAgent {
               workspaceMemoryErrorData(timeoutCode, diagnostics)
             );
           }
-          debugLogger9.error("Workspace memory dream failed:", {
+          debugLogger10.error("Workspace memory dream failed:", {
             projectRoot,
             code,
             details: diagnostics.debugDetails,
@@ -23022,7 +23074,7 @@ var O1CodeAgent = class _O1CodeAgent {
                   error: error instanceof Error ? error.message : String(error)
                 });
                 rejectStarted(error);
-                debugLogger9.warn(
+                debugLogger10.warn(
                   `MCP OAuth authentication failed for ${serverName}:`,
                   error
                 );
@@ -23034,7 +23086,7 @@ var O1CodeAgent = class _O1CodeAgent {
                   "discover"
                 );
               } catch (error) {
-                debugLogger9.warn(
+                debugLogger10.warn(
                   `MCP OAuth authenticated for ${serverName}, but tool synchronization failed:`,
                   error
                 );
@@ -23225,7 +23277,7 @@ var O1CodeAgent = class _O1CodeAgent {
             try {
               await this.cleanupUnstoredConfig(temporaryConfig);
             } catch (error) {
-              debugLogger9.warn("Failed to clean up source copy config:", error);
+              debugLogger10.warn("Failed to clean up source copy config:", error);
             }
           }
         }
@@ -23892,6 +23944,7 @@ var O1CodeAgent = class _O1CodeAgent {
           }
           throw err;
         }
+        void recordDaemonSessionApprovalModeFromConfig(config);
         const current = config.getApprovalMode();
         if (current === "plan") {
           if (previous !== "plan") {
@@ -23947,7 +24000,7 @@ var O1CodeAgent = class _O1CodeAgent {
         try {
           await setLanguageAsync(language);
         } catch (err) {
-          debugLogger9.warn("setLanguageAsync failed:", err);
+          debugLogger10.warn("setLanguageAsync failed:", err);
           throw new RequestError(
             -32603,
             `Failed to switch UI language: ${err instanceof Error ? err.message : String(err)}`
@@ -23961,7 +24014,7 @@ var O1CodeAgent = class _O1CodeAgent {
             language
           );
         } catch (err) {
-          debugLogger9.warn("Failed to persist UI language setting:", err);
+          debugLogger10.warn("Failed to persist UI language setting:", err);
         }
         let outputLanguage = null;
         let refreshed = false;
@@ -23975,7 +24028,7 @@ var O1CodeAgent = class _O1CodeAgent {
             );
             fileWriteOk = true;
           } catch (err) {
-            debugLogger9.warn("Failed to write output-language.md:", err);
+            debugLogger10.warn("Failed to write output-language.md:", err);
           }
           if (fileWriteOk) {
             try {
@@ -23985,7 +24038,7 @@ var O1CodeAgent = class _O1CodeAgent {
                 settingValue
               );
             } catch (err) {
-              debugLogger9.warn(
+              debugLogger10.warn(
                 "Failed to persist output language setting:",
                 err
               );
@@ -24005,7 +24058,7 @@ var O1CodeAgent = class _O1CodeAgent {
                     writeOutputLanguageAndRegisterPath(settingValue, cfg);
                   }
                 } catch (err) {
-                  debugLogger9.warn(
+                  debugLogger10.warn(
                     `Failed to write output-language.md for session ${s.getId()} (path=${sessionPath ?? "global-default"}):`,
                     err
                   );
@@ -24018,7 +24071,7 @@ var O1CodeAgent = class _O1CodeAgent {
               (r) => r.status === "rejected"
             ).length;
             if (failedCount > 0) {
-              debugLogger9.warn(
+              debugLogger10.warn(
                 `Language refresh failed for ${failedCount}/${results.length} session(s)`
               );
             }
@@ -24044,7 +24097,7 @@ var O1CodeAgent = class _O1CodeAgent {
         try {
           await setLanguageAsync(language);
         } catch (err) {
-          debugLogger9.warn("setLanguageAsync failed:", err);
+          debugLogger10.warn("setLanguageAsync failed:", err);
           throw new RequestError(
             -32603,
             `Failed to switch UI language: ${err instanceof Error ? err.message : String(err)}`
@@ -24066,7 +24119,7 @@ var O1CodeAgent = class _O1CodeAgent {
           sessions = results.length;
           failed = results.filter((r) => r.status === "rejected").length;
           if (failed > 0) {
-            debugLogger9.warn(
+            debugLogger10.warn(
               `User language refresh failed for ${failed}/${results.length} session(s)`
             );
           }
@@ -24081,14 +24134,14 @@ var O1CodeAgent = class _O1CodeAgent {
             "Invalid or missing sessionId"
           );
         }
-        debugLogger9.debug(`recap ext-method received for session=${sessionId2}`);
+        debugLogger10.debug(`recap ext-method received for session=${sessionId2}`);
         const session = this.sessionOrThrow(sessionId2);
         const config = session.getConfig();
         const recap = await generateSessionRecap(
           config,
           new AbortController().signal
         );
-        debugLogger9.debug(
+        debugLogger10.debug(
           `recap ext-method completed for session=${sessionId2} result=${recap ? `len=${recap.length}` : "null"}`
         );
         return { sessionId: sessionId2, recap };
@@ -24170,7 +24223,7 @@ var O1CodeAgent = class _O1CodeAgent {
         const config = session.getConfig();
         const cacheSafeParams = buildBtwCacheSafeParams(config);
         if (!cacheSafeParams) {
-          debugLogger9.debug(`btw: no cacheSafeParams for session=${sessionId2}`);
+          debugLogger10.debug(`btw: no cacheSafeParams for session=${sessionId2}`);
           return { sessionId: sessionId2, answer: null };
         }
         const childSignal = AbortSignal.timeout(BTW_CHILD_TIMEOUT_MS);
@@ -24224,7 +24277,7 @@ var O1CodeAgent = class _O1CodeAgent {
         try {
           hasHistory = (config.getLlmClient().getHistoryShallow() ?? []).length > 0;
         } catch (error) {
-          debugLogger9.debug("Failed to read history before /fork:", error);
+          debugLogger10.debug("Failed to read history before /fork:", error);
         }
         if (!hasHistory) {
           throw RequestError.invalidParams(
@@ -24266,7 +24319,7 @@ var O1CodeAgent = class _O1CodeAgent {
             ]
           });
         } catch (error) {
-          debugLogger9.debug("Failed to record fork event in history:", error);
+          debugLogger10.debug("Failed to record fork event in history:", error);
         }
         return { sessionId: sessionId2, description, launched: true };
       }
@@ -24329,7 +24382,7 @@ ${outputText}
             'taskKind must be "agent", "shell", "monitor", or "workflow"'
           );
         }
-        debugLogger9.info(
+        debugLogger10.info(
           `sessionTaskCancel requested sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind}`
         );
         const session = this.sessionOrThrow(sessionId2);
@@ -24339,7 +24392,7 @@ ${outputText}
             const task = config.getBackgroundTaskRegistry().get(taskId);
             if (!task || task.status !== "running" && task.status !== "paused") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger9.info(
+              debugLogger10.info(
                 `sessionTaskCancel skipped sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
@@ -24349,7 +24402,7 @@ ${outputText}
             } else {
               config.getBackgroundTaskRegistry().cancel(taskId);
             }
-            debugLogger9.info(
+            debugLogger10.info(
               `sessionTaskCancel completed sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -24358,13 +24411,13 @@ ${outputText}
             const task = config.getBackgroundShellRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger9.info(
+              debugLogger10.info(
                 `sessionTaskCancel skipped sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
             }
             config.getBackgroundShellRegistry().requestCancel(taskId);
-            debugLogger9.info(
+            debugLogger10.info(
               `sessionTaskCancel completed sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -24373,13 +24426,13 @@ ${outputText}
             const task = config.getMonitorRegistry().get(taskId);
             if (!task || task.status !== "running") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger9.info(
+              debugLogger10.info(
                 `sessionTaskCancel skipped sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
             }
             config.getMonitorRegistry().cancel(taskId);
-            debugLogger9.info(
+            debugLogger10.info(
               `sessionTaskCancel completed sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -24392,14 +24445,14 @@ ${outputText}
             const task = registry.get(taskId);
             if ((!task || isTerminalWorkflowStatus(task.status)) && registry.isStarting?.(taskId)) {
               registry.cancelStarting(taskId);
-              debugLogger9.info(
+              debugLogger10.info(
                 `sessionTaskCancel completed sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} status=starting`
               );
               return { cancelled: true, status: "cancelled" };
             }
             if (!task || task.status !== "running" && task.status !== "pausing" && task.status !== "paused") {
               const reason = task ? "not_running" : "not_found";
-              debugLogger9.info(
+              debugLogger10.info(
                 `sessionTaskCancel skipped sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} reason=${reason} status=${task?.status ?? "missing"}`
               );
               return { cancelled: false, reason, status: task?.status };
@@ -24407,7 +24460,7 @@ ${outputText}
             const handle = registry.getHandle(taskId);
             registry.cancel(taskId, Date.now());
             if (handle) await handle.completion;
-            debugLogger9.info(
+            debugLogger10.info(
               `sessionTaskCancel completed sessionId=${sessionId2} taskId=${taskId} taskKind=${taskKind} status=${task.status}`
             );
             return { cancelled: true, status: task.status };
@@ -24597,7 +24650,7 @@ ${outputText}
           runtime = await config.getGoalRuntimeReady();
         } catch (error) {
           if (!(error instanceof GoalPersistenceUnavailableError)) throw error;
-          debugLogger9.info(
+          debugLogger10.info(
             `sessionGoalClear sessionId=${sessionId2} cleared=false (goal persistence unavailable)`
           );
           return {
@@ -24613,7 +24666,7 @@ ${outputText}
           expectedGoalId: goal.goalId,
           expectedRevision: goal.revision
         }) : { snapshot: before };
-        debugLogger9.info(
+        debugLogger10.info(
           `sessionGoalClear sessionId=${sessionId2} cleared=${!!goal} objective=${goal?.objective ?? "(none)"}`
         );
         return {
@@ -24769,7 +24822,7 @@ ${outputText}
         }
         const session = this.sessionOrThrow(sessionId2);
         const result = await session.continueLastTurn();
-        debugLogger9.info(
+        debugLogger10.info(
           `sessionContinue sessionId=${sessionId2} accepted=${result.accepted} interruption=${result.interruption}`
         );
         return result;
@@ -24791,7 +24844,7 @@ ${outputText}
                 request.runtimeClientId
               );
             } catch (sessionErr) {
-              debugLogger9.warn(
+              debugLogger10.warn(
                 `workspaceMcpRuntimeAdd: failed to add runtime MCP server '${request.name}' to active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -24814,7 +24867,7 @@ ${outputText}
                 request.runtimeClientId
               );
             } catch (sessionErr) {
-              debugLogger9.warn(
+              debugLogger10.warn(
                 `workspaceMcpRuntimeRemove: failed to remove runtime MCP server '${request.name}' from active session ${session.getConfig().getSessionId()}: ${sessionErr instanceof Error ? sessionErr.message : String(sessionErr)}`
               );
             }
@@ -24942,7 +24995,7 @@ ${outputText}
           }
         );
         if (success) {
-          fireSessionDeleteHook(this.config, sessionId2, debugLogger9);
+          fireSessionDeleteHook(this.config, sessionId2, debugLogger10);
         }
         return { success };
       }
@@ -25088,7 +25141,7 @@ ${outputText}
                 filesFailed = fileResult.filesFailed;
               } catch (err) {
                 const reason = err instanceof Error ? err.message : String(err);
-                debugLogger9.error(
+                debugLogger10.error(
                   `[ACP] File-history rewind failed for session=${sessionId2} promptId=${promptId}: ${reason}`
                 );
                 filesFailed = [`file-history-rewind: ${reason}`];
@@ -25120,7 +25173,7 @@ ${outputText}
             } catch (err) {
               const reason = err instanceof Error ? err.message : String(err);
               artifactSnapshotUnavailable = "artifact snapshot unavailable after rewind";
-              debugLogger9.warn(
+              debugLogger10.warn(
                 `[ACP] Failed to rebuild artifact snapshot after rewind for session=${sessionId2}: ${reason}`
               );
             }
@@ -25179,7 +25232,7 @@ ${outputText}
           records: sessionData.conversation.messages,
           gaps: sessionData.historyGaps,
           cumulativeUsage: createReplayCumulativeUsage(),
-          logger: debugLogger9,
+          logger: debugLogger10,
           // Read-only history dump never re-hangs the question. Skip
           // finalize only on load/resume that will actually restore.
           suppressRestoreAskUserQuestion: true,
@@ -25570,7 +25623,7 @@ ${outputText}
           "User" /* User */,
           "Workspace" /* Workspace */
         ])) {
-          debugLogger9.warn("Model-provider settings reload failed");
+          debugLogger10.warn("Model-provider settings reload failed");
           return { configsRefreshed: 0, configsFailed: 1 };
         }
         const reloadRevision = ++this.modelProviderReloadRevision;
@@ -25590,7 +25643,7 @@ ${outputText}
             configsRefreshed += 1;
           } catch {
             configsFailed += 1;
-            debugLogger9.warn(`Model-provider reload failed for ${id}`);
+            debugLogger10.warn(`Model-provider reload failed for ${id}`);
           }
         }, "reloadConfig");
         await reloadConfig(this.config, "bootstrap");
@@ -25605,7 +25658,7 @@ ${outputText}
             configsRefreshed += 1;
           } catch {
             configsFailed += 1;
-            debugLogger9.warn(`Model-provider reload failed for session ${id}`);
+            debugLogger10.warn(`Model-provider reload failed for session ${id}`);
           }
         }
         return {
@@ -25634,7 +25687,7 @@ ${outputText}
           newMerged.tools?.approvalMode
         );
         if (reloadedApprovalMode === void 0) {
-          debugLogger9.warn(
+          debugLogger10.warn(
             "reload: tools.approvalMode holds a value boot would reject; live sessions keep their current modes until the file is corrected"
           );
         }
@@ -25653,7 +25706,7 @@ ${outputText}
                 content: { type: "text", text: reasoningError },
                 _meta: { o1codeDiscreteMessage: true }
               }).catch(
-                (error) => debugLogger9.warn("Reasoning notice delivery failed", error)
+                (error) => debugLogger10.warn("Reasoning notice delivery failed", error)
               );
             if (!session.isIdle()) {
               skipped.push(id);
@@ -25669,7 +25722,7 @@ ${outputText}
                   newMerged.providerProtocol ?? {}
                 );
               } catch (err) {
-                debugLogger9.warn(
+                debugLogger10.warn(
                   `reload: reloadModelProvidersConfig failed for session ${id}: ${err}`
                 );
               }
@@ -25677,7 +25730,7 @@ ${outputText}
             try {
               await config.setImageModel(newMerged.imageModel);
             } catch (err) {
-              debugLogger9.warn(
+              debugLogger10.warn(
                 `reload: setImageModel failed for session ${id}: ${err}`
               );
             }
@@ -25687,7 +25740,7 @@ ${outputText}
                 await config.switchModel(authType, newModelName);
                 session.reloadReasoningSelection();
               } catch (err) {
-                debugLogger9.warn(
+                debugLogger10.warn(
                   `reload: switchModel failed for session ${id}: ${err}`
                 );
               }
@@ -25701,7 +25754,7 @@ ${outputText}
                 );
                 session.reloadReasoningSelection();
               } catch (err) {
-                debugLogger9.warn(
+                debugLogger10.warn(
                   `reload: refreshAuth failed for session ${id}: ${err}`
                 );
               }
@@ -25720,7 +25773,7 @@ ${outputText}
               try {
                 await session.sendAvailableCommandsUpdate();
               } catch (err) {
-                debugLogger9.warn(
+                debugLogger10.warn(
                   `reload: sendAvailableCommandsUpdate failed for session ${id}: ${err}`
                 );
               }
@@ -25743,7 +25796,7 @@ ${outputText}
                     reloadedSessionMode
                   );
                 } catch (err) {
-                  debugLogger9.warn(
+                  debugLogger10.warn(
                     `reload: setApprovalMode failed for session ${id}: ${err}`
                   );
                 }
@@ -25754,14 +25807,14 @@ ${outputText}
             try {
               await config.refreshHierarchicalMemory();
             } catch (err) {
-              debugLogger9.warn(
+              debugLogger10.warn(
                 `reload: refreshHierarchicalMemory failed for session ${id}: ${err}`
               );
             }
             try {
               await config.getLlmClient()?.refreshSystemInstruction();
             } catch (err) {
-              debugLogger9.warn(
+              debugLogger10.warn(
                 `reload: refreshSystemInstruction failed for session ${id}: ${err}`
               );
             }
@@ -25771,7 +25824,7 @@ ${outputText}
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
             const reason = results[i].reason;
-            debugLogger9.warn(
+            debugLogger10.warn(
               `Session ${sessions[i][0]} reload failed: ${reason}`
             );
             skipped.push(sessions[i][0]);
@@ -25816,7 +25869,7 @@ ${outputText}
           );
           for (const result of configResults) {
             if (result.status === "rejected") {
-              debugLogger9.warn(`Skill config refresh failed: ${result.reason}`);
+              debugLogger10.warn(`Skill config refresh failed: ${result.reason}`);
             }
           }
         }
@@ -25835,7 +25888,7 @@ ${outputText}
         for (let i = 0; i < results.length; i++) {
           if (results[i].status === "rejected") {
             const reason2 = results[i].reason;
-            debugLogger9.warn(
+            debugLogger10.warn(
               `Session ${sessions[i].getId()} skill refresh failed: ${reason2}`
             );
           }
@@ -25879,12 +25932,12 @@ ${outputText}
   disposeTranscriptReplayConfig(config) {
     try {
       void Promise.resolve(config.getToolRegistry()?.stop()).catch((err) => {
-        debugLogger9.debug(
+        debugLogger10.debug(
           `Transcript replay config tool registry stop failed: ${err instanceof Error ? err.message : String(err)}`
         );
       });
     } catch (err) {
-      debugLogger9.debug(
+      debugLogger10.debug(
         `Transcript replay config tool registry stop failed: ${err instanceof Error ? err.message : String(err)}`
       );
     }
@@ -26174,7 +26227,7 @@ ${outputText}
             sessionId: acpSessionId,
             ...event
           }).catch((err) => {
-            debugLogger9.debug(
+            debugLogger10.debug(
               `MCP budget extNotification dropped (session=${acpSessionId}, kind=${event.kind}): ${err instanceof Error ? err.message : String(err)}`
             );
           });
@@ -26248,7 +26301,7 @@ ${outputText}
     try {
       await config.waitForMcpReady();
     } catch (err) {
-      debugLogger9.error(
+      debugLogger10.error(
         `MCP discovery readiness failed: ${err instanceof Error ? err.message : String(err)}`
       );
       return;
@@ -26300,7 +26353,7 @@ ${outputText}
         selectedType
       );
     } catch (e) {
-      debugLogger9.error(`Authentication failed: ${e}`);
+      debugLogger10.error(`Authentication failed: ${e}`);
       throw RequestError.authRequired(
         {
           authMethods: pickAuthMethodsForAuthRequired(selectedType)
@@ -26556,7 +26609,7 @@ ${outputText}
     try {
       await claimInterruptedWorkflowRuns(config);
     } catch (error) {
-      debugLogger9.debug(`Claiming interrupted workflow runs failed: ${error}`);
+      debugLogger10.debug(`Claiming interrupted workflow runs failed: ${error}`);
     }
     const workflowHistory = await listWorkflowSnapshots(config);
     const session = new Session(
@@ -26582,7 +26635,7 @@ ${outputText}
           sessionData.conversation.messages
         );
       } catch (error) {
-        debugLogger9.debug(
+        debugLogger10.debug(
           `Failed to publish recovered Goal state: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -26598,7 +26651,7 @@ ${outputText}
           if (settingsReloaded) {
             reloadEnvironment(settings.merged, config.getTargetDir());
           } else {
-            debugLogger9.warn(
+            debugLogger10.warn(
               "Deferred session settings reload failed; keeping current environment"
             );
           }
@@ -26649,7 +26702,7 @@ ${outputText}
               "Unable to reload model-provider settings from disk."
             );
           }
-          debugLogger9.warn(
+          debugLogger10.warn(
             "Final model-provider settings reload failed; keeping current settings"
           );
         }
@@ -26727,7 +26780,7 @@ ${outputText}
         try {
           session.dispose();
         } catch (disposeError) {
-          debugLogger9.warn(
+          debugLogger10.warn(
             `Failed to dispose unpublished session ${sessionId}: ${disposeError instanceof Error ? disposeError.message : String(disposeError)}`
           );
         }
@@ -26968,6 +27021,11 @@ export {
  * Copyright 2026 Qwen
  * SPDX-License-Identifier: Apache-2.0
  */
+/**
+ * @license
+ * Copyright 2026 o1-code contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 /**
  * @license
  * Copyright 2025 Qwen