add session resume supervisor for faster codex rotation

lib/codex-manager/settings-hub.ts

@@ -186,6 +186,7 @@ type ThemeConfigAction =
 
 type BackendToggleSettingKey =
 	| "liveAccountSync"
+	| "codexCliSessionSupervisor"
 	| "sessionAffinity"
 	| "proactiveRefreshGuardian"
 	| "retryAllAccountsRateLimited"
@@ -272,6 +273,7 @@ type SettingsHubAction =
 	| { type: "back" };
 
 type ExperimentalSettingsAction =
+	| { type: "toggle-session-supervisor" }
 	| { type: "sync" }
 	| { type: "backup" }
 	| { type: "toggle-refresh-guardian" }
@@ -300,9 +302,10 @@ function getExperimentalSelectOptions(
 function mapExperimentalMenuHotkey(
 	raw: string,
 ): ExperimentalSettingsAction | undefined {
-	if (raw === "1") return { type: "sync" };
-	if (raw === "2") return { type: "backup" };
-	if (raw === "3") return { type: "toggle-refresh-guardian" };
+	if (raw === "1") return { type: "toggle-session-supervisor" };
+	if (raw === "2") return { type: "sync" };
+	if (raw === "3") return { type: "backup" };
+	if (raw === "4") return { type: "toggle-refresh-guardian" };
 	if (raw === "[" || raw === "-") return { type: "decrease-refresh-interval" };
 	if (raw === "]" || raw === "+") return { type: "increase-refresh-interval" };
 	const lower = raw.toLowerCase();
@@ -323,6 +326,11 @@ const BACKEND_TOGGLE_OPTIONS: BackendToggleSettingOption[] = [
 		label: "Enable Live Sync",
 		description: "Keep accounts synced when files change in another window.",
 	},
+	{
+		key: "codexCliSessionSupervisor",
+		label: "Enable Session Resume Supervisor",
+		description: "Wrap interactive Codex sessions so they can relaunch with resume after rotation.",
+	},
 	{
 		key: "sessionAffinity",
 		label: "Enable Session Affinity",
@@ -2568,6 +2576,11 @@ async function promptExperimentalSettings(
 	while (true) {
 		const action = await select<ExperimentalSettingsAction>(
 			[
+				{
+					label: `${formatDashboardSettingState(draft.codexCliSessionSupervisor ?? BACKEND_DEFAULTS.codexCliSessionSupervisor ?? false)} ${UI_COPY.settings.experimentalSessionSupervisor}`,
+					value: { type: "toggle-session-supervisor" },
+					color: "yellow",
+				},
 				{
 					label: UI_COPY.settings.experimentalSync,
 					value: { type: "sync" },
@@ -2619,6 +2632,17 @@ async function promptExperimentalSettings(
 		);
 		if (!action || action.type === "back") return null;
 		if (action.type === "save") return draft;
+		if (action.type === "toggle-session-supervisor") {
+			draft = {
+				...draft,
+				codexCliSessionSupervisor: !(
+					draft.codexCliSessionSupervisor ??
+					BACKEND_DEFAULTS.codexCliSessionSupervisor ??
+					false
+				),
+			};
+			continue;
+		}
 		if (action.type === "toggle-refresh-guardian") {
 			draft = {
 				...draft,

lib/config.ts

@@ -2,6 +2,7 @@ import { readFileSync, existsSync, promises as fs } from "node:fs";
 import { dirname, join } from "node:path";
 import type { PluginConfig } from "./types.js";
 import { logWarn } from "./logger.js";
+import { DEFAULT_PREEMPTIVE_QUOTA_REMAINING_PERCENT_5H } from "./preemptive-quota-scheduler.js";
 import { PluginConfigSchema, getValidationErrors } from "./schemas.js";
 import { getCodexHomeDir, getCodexMultiAuthDir, getLegacyCodexDir } from "./runtime-paths.js";
 import {
@@ -145,6 +146,7 @@ export const DEFAULT_PLUGIN_CONFIG: PluginConfig = {
 	liveAccountSync: true,
 	liveAccountSyncDebounceMs: 250,
 	liveAccountSyncPollMs: 2_000,
+	codexCliSessionSupervisor: false,
 	sessionAffinity: true,
 	sessionAffinityTtlMs: 20 * 60_000,
 	sessionAffinityMaxEntries: 512,
@@ -155,7 +157,8 @@ export const DEFAULT_PLUGIN_CONFIG: PluginConfig = {
 	serverErrorCooldownMs: 4_000,
 	storageBackupEnabled: true,
 	preemptiveQuotaEnabled: true,
-	preemptiveQuotaRemainingPercent5h: 5,
+	preemptiveQuotaRemainingPercent5h:
+		DEFAULT_PREEMPTIVE_QUOTA_REMAINING_PERCENT_5H,
 	preemptiveQuotaRemainingPercent7d: 5,
 	preemptiveQuotaMaxDeferralMs: 2 * 60 * 60_000,
 };
@@ -857,6 +860,25 @@ export function getLiveAccountSyncPollMs(pluginConfig: PluginConfig): number {
 	);
 }
 
+/**
+ * Determines whether the CLI session supervisor wrapper is enabled.
+ *
+ * This accessor is synchronous, side-effect free, and safe for concurrent reads.
+ * It performs no filesystem I/O and does not expose token material.
+ *
+ * @param pluginConfig - The plugin configuration object used as the non-environment fallback
+ * @returns `true` when the session supervisor should wrap interactive Codex sessions
+ */
+export function getCodexCliSessionSupervisor(
+	pluginConfig: PluginConfig,
+): boolean {
+	return resolveBooleanSetting(
+		"CODEX_AUTH_CLI_SESSION_SUPERVISOR",
+		pluginConfig.codexCliSessionSupervisor,
+		false,
+	);
+}
+
 /**
  * Indicates whether session affinity is enabled.
  *
@@ -1057,7 +1079,8 @@ export function getPreemptiveQuotaRemainingPercent5h(pluginConfig: PluginConfig)
 	return resolveNumberSetting(
 		"CODEX_AUTH_PREEMPTIVE_QUOTA_5H_REMAINING_PCT",
 		pluginConfig.preemptiveQuotaRemainingPercent5h,
-		5,
+		// Keep this fallback aligned with PreemptiveQuotaScheduler's shared 5h default.
+		DEFAULT_PREEMPTIVE_QUOTA_REMAINING_PERCENT_5H,
 		{ min: 0, max: 100 },
 	);
 }

lib/preemptive-quota-scheduler.ts

@@ -24,7 +24,11 @@ export interface QuotaSchedulerOptions {
 	maxDeferralMs?: number;
 }
 
-const DEFAULT_REMAINING_PERCENT_THRESHOLD = 5;
+export const DEFAULT_PREEMPTIVE_QUOTA_REMAINING_PERCENT_5H = 5;
+// Keep the 7d default separate so it can diverge from
+// DEFAULT_PREEMPTIVE_QUOTA_REMAINING_PERCENT_5H without changing callers.
+// It currently matches the 5h default.
+const DEFAULT_SECONDARY_REMAINING_PERCENT_THRESHOLD = 5;
 const DEFAULT_MAX_DEFERRAL_MS = 2 * 60 * 60_000;
 
 /**
@@ -148,8 +152,8 @@ export class PreemptiveQuotaScheduler {
 
 	constructor(options: QuotaSchedulerOptions = {}) {
 		this.enabled = true;
-		this.primaryRemainingPercentThreshold = DEFAULT_REMAINING_PERCENT_THRESHOLD;
-		this.secondaryRemainingPercentThreshold = DEFAULT_REMAINING_PERCENT_THRESHOLD;
+		this.primaryRemainingPercentThreshold = DEFAULT_PREEMPTIVE_QUOTA_REMAINING_PERCENT_5H;
+		this.secondaryRemainingPercentThreshold = DEFAULT_SECONDARY_REMAINING_PERCENT_THRESHOLD;
 		this.maxDeferralMs = DEFAULT_MAX_DEFERRAL_MS;
 		this.configure(options);
 	}

lib/quota-probe.ts

@@ -305,6 +305,13 @@ export interface ProbeCodexQuotaOptions {
 	model?: string;
 	fallbackModels?: readonly string[];
 	timeoutMs?: number;
+	signal?: AbortSignal;
+}
+
+function createAbortError(message: string): Error {
+	const error = new Error(message);
+	error.name = "AbortError";
+	return error;
 }
 
 /**
@@ -331,6 +338,9 @@ export async function fetchCodexQuotaSnapshot(
 	let lastError: Error | null = null;
 
 	for (const model of models) {
+		if (options.signal?.aborted) {
+			throw createAbortError("Quota probe aborted");
+		}
 		try {
 			const instructions = await getCodexInstructions(model);
 			const probeBody: RequestBody = {
@@ -356,6 +366,12 @@ export async function fetchCodexQuotaSnapshot(
 			headers.set("content-type", "application/json");
 
 			const controller = new AbortController();
+			const onAbort = () => controller.abort(options.signal?.reason);
+			if (options.signal?.aborted) {
+				controller.abort(options.signal.reason);
+			} else {
+				options.signal?.addEventListener("abort", onAbort, { once: true });
+			}
 			const timeout = setTimeout(() => controller.abort(), timeoutMs);
 			let response: Response;
 			try {
@@ -367,6 +383,7 @@ export async function fetchCodexQuotaSnapshot(
 				});
 			} finally {
 				clearTimeout(timeout);
+				options.signal?.removeEventListener("abort", onAbort);
 			}
 
 			const snapshotBase = parseQuotaSnapshotBase(response.headers, response.status);
@@ -406,9 +423,16 @@ export async function fetchCodexQuotaSnapshot(
 			}
 			lastError = new Error("Codex response did not include quota headers");
 		} catch (error) {
+			if (options.signal?.aborted) {
+				throw error instanceof Error ? error : createAbortError("Quota probe aborted");
+			}
 			lastError = error instanceof Error ? error : new Error(String(error));
 		}
 	}
 
+	if (options.signal?.aborted) {
+		throw createAbortError("Quota probe aborted");
+	}
+
 	throw lastError ?? new Error("Failed to fetch quotas");
 }

lib/schemas.ts

@@ -44,6 +44,7 @@ export const PluginConfigSchema = z.object({
 	liveAccountSync: z.boolean().optional(),
 	liveAccountSyncDebounceMs: z.number().min(50).optional(),
 	liveAccountSyncPollMs: z.number().min(500).optional(),
+	codexCliSessionSupervisor: z.boolean().optional(),
 	sessionAffinity: z.boolean().optional(),
 	sessionAffinityTtlMs: z.number().min(1_000).optional(),
 	sessionAffinityMaxEntries: z.number().min(8).optional(),