codexuse-cli 3.9.7 → 3.9.9

package/dist/server/index.mjs

@@ -48769,8 +48769,10 @@ const WS_METHODS = {
 	officialCodexFocusProfile: "officialCodex.focusProfile",
 	officialCodexStopProfile: "officialCodex.stopProfile",
 	officialCodexRestartProfile: "officialCodex.restartProfile",
+	officialCodexUseProfile: "officialCodex.useProfile",
 	officialCodexLaunchProfiles: "officialCodex.launchProfiles",
 	officialCodexStopProfiles: "officialCodex.stopProfiles",
+	officialCodexActivateProfiles: "officialCodex.activateProfiles",
 	cliInfo: "cli.info",
 	cliStatus: "cli.status",
 	cliCheckFreshness: "cli.checkFreshness",
@@ -48936,8 +48938,10 @@ const WebSocketRequestBody = Union([
 	tagRequestBody(WS_METHODS.officialCodexFocusProfile, Struct({ name: TrimmedNonEmptyString })),
 	tagRequestBody(WS_METHODS.officialCodexStopProfile, Struct({ name: TrimmedNonEmptyString })),
 	tagRequestBody(WS_METHODS.officialCodexRestartProfile, Struct({ name: TrimmedNonEmptyString })),
+	tagRequestBody(WS_METHODS.officialCodexUseProfile, Struct({ name: TrimmedNonEmptyString })),
 	tagRequestBody(WS_METHODS.officialCodexLaunchProfiles, Struct({ names: Array$1(TrimmedNonEmptyString) })),
 	tagRequestBody(WS_METHODS.officialCodexStopProfiles, Struct({ names: Array$1(TrimmedNonEmptyString) })),
+	tagRequestBody(WS_METHODS.officialCodexActivateProfiles, Struct({ names: Array$1(TrimmedNonEmptyString) })),
 	tagRequestBody(WS_METHODS.cliInfo, Struct({})),
 	tagRequestBody(WS_METHODS.cliStatus, Struct({})),
 	tagRequestBody(WS_METHODS.cliCheckFreshness, Struct({})),
@@ -58299,7 +58303,7 @@ const SQLITE_BUSY_MAX_ATTEMPTS = 3;
 const SQLITE_BUSY_RETRY_DELAY_MS = 100;
 const writeQueueByDbPath = /* @__PURE__ */ new Map();
 const initializedDbPaths = /* @__PURE__ */ new Set();
-function isRecord$8(value) {
+function isRecord$9(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function clone$1(value) {
@@ -58411,7 +58415,7 @@ function resolveAppStorageDbPath(userDataDir) {
 async function readDocument(dbPath, namespace, normalize) {
 	return withDatabase(dbPath, (db) => {
 		const row = useStatement(db, `SELECT value_json AS valueJson FROM ${APP_STORAGE_TABLE} WHERE namespace = ?`, (statement) => statement.get(namespace));
-		const parsed = isRecord$8(row) ? safeParseJson(row.valueJson) : null;
+		const parsed = isRecord$9(row) ? safeParseJson(row.valueJson) : null;
 		if (parsed === null) return null;
 		return normalize(parsed);
 	});
@@ -58442,7 +58446,7 @@ async function updateDocument(input) {
 		beginImmediate(db);
 		try {
 			const row = useStatement(db, `SELECT value_json AS valueJson FROM ${APP_STORAGE_TABLE} WHERE namespace = ?`, (statement) => statement.get(input.namespace));
-			const current = isRecord$8(row) ? input.normalize(safeParseJson(row.valueJson) ?? input.fallback()) : input.fallback();
+			const current = isRecord$9(row) ? input.normalize(safeParseJson(row.valueJson) ?? input.fallback()) : input.fallback();
 			const next = input.normalize(input.transform(clone$1(current)));
 			useStatement(db, `
               INSERT INTO ${APP_STORAGE_TABLE} (namespace, value_json, updated_at)
@@ -58469,7 +58473,7 @@ let configuredUserDataDir = null;
 let appStateCache = null;
 let writeLock = Promise.resolve();
 const writeLockContext = new AsyncLocalStorage();
-function isRecord$7(value) {
+function isRecord$8(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function clone(value) {
@@ -58516,7 +58520,9 @@ function createDefaultAppState() {
 			lastObservedPid: null,
 			lastRestartStatus: null,
 			lastRestartReason: null,
-			instancesByProfileName: {}
+			activity: [],
+			instancesByProfileName: {},
+			pendingRestartDebt: null
 		},
 		app: {
 			lastAppVersion: null,
@@ -58604,7 +58610,7 @@ function createDefaultAppState() {
 		}
 	};
 }
-function asString$9(value) {
+function asString$10(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
@@ -58612,57 +58618,97 @@ function asString$9(value) {
 function asNumberOrNull(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
+function asBooleanOrNull(value) {
+	return typeof value === "boolean" ? value : null;
+}
 function normalizeAppState(raw) {
 	const defaults = createDefaultAppState();
-	if (!isRecord$7(raw)) return defaults;
-	const rawAutoRoll = isRecord$7(raw.autoRoll) ? raw.autoRoll : void 0;
+	if (!isRecord$8(raw)) return defaults;
+	const rawAutoRoll = isRecord$8(raw.autoRoll) ? raw.autoRoll : void 0;
 	const merged = clone(deepMerge(defaults, raw));
 	merged.schemaVersion = 1;
 	merged.autoRoll = normalizeAutoRollSettings(rawAutoRoll);
-	if (!isRecord$7(merged.officialCodex)) merged.officialCodex = clone(defaults.officialCodex);
+	if (!isRecord$8(merged.officialCodex)) merged.officialCodex = clone(defaults.officialCodex);
 	merged.officialCodex.lastProfileSwitchAt = asNumberOrNull(merged.officialCodex.lastProfileSwitchAt);
-	merged.officialCodex.lastProfileSwitchProfileKey = asString$9(merged.officialCodex.lastProfileSwitchProfileKey);
+	merged.officialCodex.lastProfileSwitchProfileKey = asString$10(merged.officialCodex.lastProfileSwitchProfileKey);
 	merged.officialCodex.lastVerifiedLaunchAt = asNumberOrNull(merged.officialCodex.lastVerifiedLaunchAt);
-	merged.officialCodex.lastVerifiedLaunchProfileKey = asString$9(merged.officialCodex.lastVerifiedLaunchProfileKey);
+	merged.officialCodex.lastVerifiedLaunchProfileKey = asString$10(merged.officialCodex.lastVerifiedLaunchProfileKey);
 	merged.officialCodex.lastObservedPid = asNumberOrNull(merged.officialCodex.lastObservedPid);
-	merged.officialCodex.lastRestartStatus = asString$9(merged.officialCodex.lastRestartStatus);
-	merged.officialCodex.lastRestartReason = asString$9(merged.officialCodex.lastRestartReason);
-	if (!isRecord$7(merged.officialCodex.instancesByProfileName)) merged.officialCodex.instancesByProfileName = {};
+	merged.officialCodex.lastRestartStatus = asString$10(merged.officialCodex.lastRestartStatus);
+	merged.officialCodex.lastRestartReason = asString$10(merged.officialCodex.lastRestartReason);
+	merged.officialCodex.activity = Array.isArray(merged.officialCodex.activity) ? merged.officialCodex.activity.filter((entry) => isRecord$8(entry)).map((entry) => ({
+		id: asString$10(entry.id) ?? "",
+		at: asString$10(entry.at) ?? (/* @__PURE__ */ new Date(0)).toISOString(),
+		kind: entry.kind === "auto-roll-eval" || entry.kind === "profile-switch" || entry.kind === "auth-verified" || entry.kind === "official-codex-restart" || entry.kind === "reset-window-activation" || entry.kind === "low-remaining-alert" ? entry.kind : "auto-roll-eval",
+		status: asString$10(entry.status) ?? "unknown",
+		reason: asString$10(entry.reason),
+		decisionId: asString$10(entry.decisionId),
+		profileName: asString$10(entry.profileName),
+		sourceProfileName: asString$10(entry.sourceProfileName),
+		targetProfileName: asString$10(entry.targetProfileName),
+		remainingPercent: asNumberOrNull(entry.remainingPercent),
+		threshold: asNumberOrNull(entry.threshold),
+		snapshotAgeMs: asNumberOrNull(entry.snapshotAgeMs),
+		snapshotSource: asString$10(entry.snapshotSource),
+		phase: asString$10(entry.phase),
+		pid: asNumberOrNull(entry.pid),
+		profileKeyHash: asString$10(entry.profileKeyHash),
+		switchVerified: asBooleanOrNull(entry.switchVerified),
+		restartRequested: asBooleanOrNull(entry.restartRequested),
+		restartResult: asString$10(entry.restartResult),
+		observedProfileName: asString$10(entry.observedProfileName),
+		observedProfileKeyHash: asString$10(entry.observedProfileKeyHash),
+		observedProfileMatchSource: asString$10(entry.observedProfileMatchSource)
+	})).filter((entry) => entry.id && entry.at).slice(-50) : [];
+	if (!isRecord$8(merged.officialCodex.instancesByProfileName)) merged.officialCodex.instancesByProfileName = {};
 	else {
 		const nextInstances = {};
 		for (const [key, value] of Object.entries(merged.officialCodex.instancesByProfileName)) {
-			if (!isRecord$7(value)) continue;
-			const profileName = asString$9(value.profileName) ?? asString$9(key);
+			if (!isRecord$8(value)) continue;
+			const profileName = asString$10(value.profileName) ?? asString$10(key);
 			if (!profileName) continue;
 			nextInstances[profileName] = {
 				profileName,
-				profileKey: asString$9(value.profileKey),
-				profileHome: asString$9(value.profileHome),
-				appPath: asString$9(value.appPath),
-				bundleId: asString$9(value.bundleId),
+				profileKey: asString$10(value.profileKey),
+				profileHome: asString$10(value.profileHome),
+				appPath: asString$10(value.appPath),
+				bundleId: asString$10(value.bundleId),
 				pid: asNumberOrNull(value.pid),
 				appServerPid: asNumberOrNull(value.appServerPid),
 				launchedAt: asNumberOrNull(value.launchedAt),
 				lastVerifiedAt: asNumberOrNull(value.lastVerifiedAt),
-				lastStatus: asString$9(value.lastStatus),
-				lastError: asString$9(value.lastError)
+				lastStatus: asString$10(value.lastStatus),
+				lastError: asString$10(value.lastError)
 			};
 		}
 		merged.officialCodex.instancesByProfileName = nextInstances;
 	}
-	merged.app.lastAppVersion = asString$9(merged.app.lastAppVersion);
-	merged.app.pendingUpdateVersion = asString$9(merged.app.pendingUpdateVersion);
-	merged.app.lastProfileName = asString$9(merged.app.lastProfileName);
+	if (isRecord$8(merged.officialCodex.pendingRestartDebt)) {
+		const debt = merged.officialCodex.pendingRestartDebt;
+		const targetProfileName = asString$10(debt.targetProfileName);
+		merged.officialCodex.pendingRestartDebt = targetProfileName ? {
+			targetProfileName,
+			targetProfileKey: asString$10(debt.targetProfileKey),
+			sourceProfileName: asString$10(debt.sourceProfileName),
+			sourceProfileKey: asString$10(debt.sourceProfileKey),
+			decisionId: asString$10(debt.decisionId),
+			attempts: asNumberOrNull(debt.attempts) ?? 0,
+			lastReason: asString$10(debt.lastReason)
+		} : null;
+	} else merged.officialCodex.pendingRestartDebt = null;
+	merged.app.lastAppVersion = asString$10(merged.app.lastAppVersion);
+	merged.app.pendingUpdateVersion = asString$10(merged.app.pendingUpdateVersion);
+	merged.app.lastProfileName = asString$10(merged.app.lastProfileName);
 	{
 		const allowedAppKeys = new Set(Object.keys(defaults.app));
 		for (const key of Object.keys(merged.app)) if (!allowedAppKeys.has(key)) delete merged.app[key];
 	}
-	merged.license.licenseKey = asString$9(merged.license.licenseKey);
-	merged.license.purchaseEmail = asString$9(merged.license.purchaseEmail);
-	merged.license.lastVerifiedAt = asString$9(merged.license.lastVerifiedAt);
-	merged.license.nextCheckAt = asString$9(merged.license.nextCheckAt);
-	merged.license.lastVerificationError = asString$9(merged.license.lastVerificationError);
-	merged.license.signature = asString$9(merged.license.signature);
+	merged.license.licenseKey = asString$10(merged.license.licenseKey);
+	merged.license.purchaseEmail = asString$10(merged.license.purchaseEmail);
+	merged.license.lastVerifiedAt = asString$10(merged.license.lastVerifiedAt);
+	merged.license.nextCheckAt = asString$10(merged.license.nextCheckAt);
+	merged.license.lastVerificationError = asString$10(merged.license.lastVerificationError);
+	merged.license.signature = asString$10(merged.license.signature);
 	if (![
 		"inactive",
 		"active",
@@ -58681,63 +58727,63 @@ function normalizeAppState(raw) {
 		const allowedPreferenceKeys = new Set(Object.keys(defaults.preferences));
 		for (const key of Object.keys(merged.preferences)) if (!allowedPreferenceKeys.has(key)) delete merged.preferences[key];
 	}
-	if (!isRecord$7(merged.runtimeSettings)) merged.runtimeSettings = {};
-	if (!isRecord$7(merged.ui)) merged.ui = clone(defaults.ui);
+	if (!isRecord$8(merged.runtimeSettings)) merged.runtimeSettings = {};
+	if (!isRecord$8(merged.ui)) merged.ui = clone(defaults.ui);
 	merged.ui.themeMode = merged.ui.themeMode === "light" || merged.ui.themeMode === "dark" ? merged.ui.themeMode : null;
-	if (!isRecord$7(merged.ui.layout)) merged.ui.layout = clone(defaults.ui.layout);
+	if (!isRecord$8(merged.ui.layout)) merged.ui.layout = clone(defaults.ui.layout);
 	if (typeof merged.ui.layout.sidebarCollapsed !== "boolean") merged.ui.layout.sidebarCollapsed = null;
-	if (!isRecord$7(merged.ui.profiles)) merged.ui.profiles = clone(defaults.ui.profiles);
+	if (!isRecord$8(merged.ui.profiles)) merged.ui.profiles = clone(defaults.ui.profiles);
 	merged.ui.profiles.viewMode = merged.ui.profiles.viewMode === "cards" || merged.ui.profiles.viewMode === "compact" ? merged.ui.profiles.viewMode : null;
-	merged.ui.profiles.sortBy = asString$9(merged.ui.profiles.sortBy);
-	merged.ui.profiles.groupBy = asString$9(merged.ui.profiles.groupBy);
-	merged.ui.profiles.planFilter = asString$9(merged.ui.profiles.planFilter);
-	merged.ui.profiles.healthFilter = asString$9(merged.ui.profiles.healthFilter);
-	merged.ui.profiles.customGroupFilter = asString$9(merged.ui.profiles.customGroupFilter);
+	merged.ui.profiles.sortBy = asString$10(merged.ui.profiles.sortBy);
+	merged.ui.profiles.groupBy = asString$10(merged.ui.profiles.groupBy);
+	merged.ui.profiles.planFilter = asString$10(merged.ui.profiles.planFilter);
+	merged.ui.profiles.healthFilter = asString$10(merged.ui.profiles.healthFilter);
+	merged.ui.profiles.customGroupFilter = asString$10(merged.ui.profiles.customGroupFilter);
 	if (typeof merged.ui.profiles.toolbarOpen !== "boolean") merged.ui.profiles.toolbarOpen = null;
-	if (!isRecord$7(merged.ui.profiles.collapsedSections)) merged.ui.profiles.collapsedSections = {};
+	if (!isRecord$8(merged.ui.profiles.collapsedSections)) merged.ui.profiles.collapsedSections = {};
 	else merged.ui.profiles.collapsedSections = Object.fromEntries(Object.entries(merged.ui.profiles.collapsedSections).flatMap(([key, value]) => {
-		const normalizedKey = asString$9(key);
+		const normalizedKey = asString$10(key);
 		if (!normalizedKey || typeof value !== "boolean") return [];
 		return [[normalizedKey, value]];
 	}));
-	if (!isRecord$7(merged.ui.onboarding)) merged.ui.onboarding = clone(defaults.ui.onboarding);
+	if (!isRecord$8(merged.ui.onboarding)) merged.ui.onboarding = clone(defaults.ui.onboarding);
 	if (typeof merged.ui.onboarding.welcomeCompleted !== "boolean") merged.ui.onboarding.welcomeCompleted = false;
 	if (!Number.isFinite(merged.ui.onboarding.welcomeCompletedAt)) merged.ui.onboarding.welcomeCompletedAt = null;
 	merged.ui.onboarding.welcomeResumeStep = merged.ui.onboarding.welcomeResumeStep === 2 ? 2 : null;
-	if (!isRecord$7(merged.ui.onboarding.milestones)) merged.ui.onboarding.milestones = clone(defaults.ui.onboarding.milestones);
+	if (!isRecord$8(merged.ui.onboarding.milestones)) merged.ui.onboarding.milestones = clone(defaults.ui.onboarding.milestones);
 	if (typeof merged.ui.onboarding.milestones.firstProfileAdded !== "boolean") merged.ui.onboarding.milestones.firstProfileAdded = false;
 	if (typeof merged.ui.onboarding.milestones.secondProfileAdded !== "boolean") merged.ui.onboarding.milestones.secondProfileAdded = false;
 	if (!Number.isFinite(merged.ui.onboarding.sessionCount)) merged.ui.onboarding.sessionCount = 0;
-	if (!isRecord$7(merged.ui.onboarding.nudgeCooldowns)) merged.ui.onboarding.nudgeCooldowns = {};
+	if (!isRecord$8(merged.ui.onboarding.nudgeCooldowns)) merged.ui.onboarding.nudgeCooldowns = {};
 	else merged.ui.onboarding.nudgeCooldowns = Object.fromEntries(Object.entries(merged.ui.onboarding.nudgeCooldowns).flatMap(([key, value]) => {
-		const normalizedKey = asString$9(key);
+		const normalizedKey = asString$10(key);
 		if (!normalizedKey || !Number.isFinite(value)) return [];
 		return [[normalizedKey, Number(value)]];
 	}));
-	if (!isRecord$7(merged.ui.onboarding.nudgeDismissCount)) merged.ui.onboarding.nudgeDismissCount = {};
+	if (!isRecord$8(merged.ui.onboarding.nudgeDismissCount)) merged.ui.onboarding.nudgeDismissCount = {};
 	else merged.ui.onboarding.nudgeDismissCount = Object.fromEntries(Object.entries(merged.ui.onboarding.nudgeDismissCount).flatMap(([key, value]) => {
-		const normalizedKey = asString$9(key);
+		const normalizedKey = asString$10(key);
 		if (!normalizedKey || !Number.isFinite(value)) return [];
 		return [[normalizedKey, Number(value)]];
 	}));
 	if (typeof merged.ui.onboarding.proUnlockedCelebrated !== "boolean") merged.ui.onboarding.proUnlockedCelebrated = false;
-	if (!isRecord$7(merged.ui.projectThreadSelections)) merged.ui.projectThreadSelections = {};
+	if (!isRecord$8(merged.ui.projectThreadSelections)) merged.ui.projectThreadSelections = {};
 	else merged.ui.projectThreadSelections = Object.fromEntries(Object.entries(merged.ui.projectThreadSelections).flatMap(([projectId, threadId]) => {
-		const normalizedProjectId = asString$9(projectId);
+		const normalizedProjectId = asString$10(projectId);
 		if (!normalizedProjectId) return [];
 		return [[normalizedProjectId, typeof threadId === "string" && threadId.trim().length > 0 ? threadId.trim() : null]];
 	}));
-	merged.ui.duplicateWarningDismissedKey = asString$9(merged.ui.duplicateWarningDismissedKey);
+	merged.ui.duplicateWarningDismissedKey = asString$10(merged.ui.duplicateWarningDismissedKey);
 	if (typeof merged.ui.pendingLicenseActivation !== "boolean") merged.ui.pendingLicenseActivation = false;
 	{
 		const allowedUiKeys = new Set(Object.keys(defaults.ui));
 		for (const key of Object.keys(merged.ui)) if (!allowedUiKeys.has(key)) delete merged.ui[key];
 	}
-	if (!isRecord$7(merged.profileDashboard)) merged.profileDashboard = clone(defaults.profileDashboard);
-	if (!isRecord$7(merged.profileDashboard.customGroupsByAccountKey)) merged.profileDashboard.customGroupsByAccountKey = {};
+	if (!isRecord$8(merged.profileDashboard)) merged.profileDashboard = clone(defaults.profileDashboard);
+	if (!isRecord$8(merged.profileDashboard.customGroupsByAccountKey)) merged.profileDashboard.customGroupsByAccountKey = {};
 	else merged.profileDashboard.customGroupsByAccountKey = Object.fromEntries(Object.entries(merged.profileDashboard.customGroupsByAccountKey).flatMap(([key, value]) => {
-		const normalizedKey = asString$9(key);
-		const normalizedValue = asString$9(value);
+		const normalizedKey = asString$10(key);
+		const normalizedValue = asString$10(value);
 		if (!normalizedKey || !normalizedValue) return [];
 		return [[normalizedKey, normalizedValue]];
 	}));
@@ -58745,54 +58791,54 @@ function normalizeAppState(raw) {
 		const allowedProfileDashboardKeys = new Set(Object.keys(defaults.profileDashboard));
 		for (const key of Object.keys(merged.profileDashboard)) if (!allowedProfileDashboardKeys.has(key)) delete merged.profileDashboard[key];
 	}
-	const legacyProjectSettingsByPath = isRecord$7(raw.projectSettingsByPath) ? raw.projectSettingsByPath : null;
-	if (!isRecord$7(merged.workspaceSettingsByPath)) merged.workspaceSettingsByPath = {};
+	const legacyProjectSettingsByPath = isRecord$8(raw.projectSettingsByPath) ? raw.projectSettingsByPath : null;
+	if (!isRecord$8(merged.workspaceSettingsByPath)) merged.workspaceSettingsByPath = {};
 	if (legacyProjectSettingsByPath) merged.workspaceSettingsByPath = {
 		...legacyProjectSettingsByPath,
 		...merged.workspaceSettingsByPath
 	};
 	delete merged.projectSettingsByPath;
-	if (!isRecord$7(merged.conversationCategoriesByCwd)) merged.conversationCategoriesByCwd = {};
-	if (!isRecord$7(merged.conversationCategoryAssignmentsByCwd)) merged.conversationCategoryAssignmentsByCwd = {};
-	if (!isRecord$7(merged.git)) merged.git = clone(defaults.git);
+	if (!isRecord$8(merged.conversationCategoriesByCwd)) merged.conversationCategoriesByCwd = {};
+	if (!isRecord$8(merged.conversationCategoryAssignmentsByCwd)) merged.conversationCategoryAssignmentsByCwd = {};
+	if (!isRecord$8(merged.git)) merged.git = clone(defaults.git);
 	merged.git.commitMessagePrompt = normalizeCommitMessagePrompt(merged.git.commitMessagePrompt) ?? DEFAULT_COMMIT_MESSAGE_PROMPT;
 	{
 		const allowedGitKeys = new Set(Object.keys(defaults.git));
 		for (const key of Object.keys(merged.git)) if (!allowedGitKeys.has(key)) delete merged.git[key];
 	}
-	if (!isRecord$7(merged.skills)) merged.skills = clone(defaults.skills);
+	if (!isRecord$8(merged.skills)) merged.skills = clone(defaults.skills);
 	if (!Array.isArray(merged.skills.sources)) merged.skills.sources = [];
-	if (!isRecord$7(merged.skills.installsBySlug)) merged.skills.installsBySlug = {};
-	if (!isRecord$7(merged.sync)) merged.sync = clone(defaults.sync);
-	merged.sync.lastPushAt = asString$9(merged.sync.lastPushAt);
-	merged.sync.lastPullAt = asString$9(merged.sync.lastPullAt);
-	merged.sync.lastError = asString$9(merged.sync.lastError);
-	merged.sync.remoteUpdatedAt = asString$9(merged.sync.remoteUpdatedAt);
-	if (!isRecord$7(merged.analytics)) merged.analytics = isRecord$7(merged.telemetry) ? clone(merged.telemetry) : clone(defaults.analytics);
-	merged.analytics.anonymousId = asString$9(merged.analytics.anonymousId);
+	if (!isRecord$8(merged.skills.installsBySlug)) merged.skills.installsBySlug = {};
+	if (!isRecord$8(merged.sync)) merged.sync = clone(defaults.sync);
+	merged.sync.lastPushAt = asString$10(merged.sync.lastPushAt);
+	merged.sync.lastPullAt = asString$10(merged.sync.lastPullAt);
+	merged.sync.lastError = asString$10(merged.sync.lastError);
+	merged.sync.remoteUpdatedAt = asString$10(merged.sync.remoteUpdatedAt);
+	if (!isRecord$8(merged.analytics)) merged.analytics = isRecord$8(merged.telemetry) ? clone(merged.telemetry) : clone(defaults.analytics);
+	merged.analytics.anonymousId = asString$10(merged.analytics.anonymousId);
 	if (!merged.analytics.anonymousId) {
-		const legacyInstallId = asString$9(merged.telemetry?.installId);
+		const legacyInstallId = asString$10(merged.telemetry?.installId);
 		merged.analytics.anonymousId = legacyInstallId;
 	}
 	if (typeof merged.analytics.enabled !== "boolean") merged.analytics.enabled = true;
-	merged.analytics.lastFlushAt = asString$9(merged.analytics.lastFlushAt);
-	merged.analytics.lastError = asString$9(merged.analytics.lastError);
+	merged.analytics.lastFlushAt = asString$10(merged.analytics.lastFlushAt);
+	merged.analytics.lastError = asString$10(merged.analytics.lastError);
 	if ("telemetry" in merged) delete merged.telemetry;
-	if (!isRecord$7(merged.profilesByName)) merged.profilesByName = {};
-	if (!isRecord$7(merged.migration)) merged.migration = clone(defaults.migration);
+	if (!isRecord$8(merged.profilesByName)) merged.profilesByName = {};
+	if (!isRecord$8(merged.migration)) merged.migration = clone(defaults.migration);
 	if (![
 		"pending",
 		"pending_local_storage",
 		"complete"
 	].includes(merged.migration.status)) merged.migration.status = "pending";
-	merged.migration.startedAt = asString$9(merged.migration.startedAt);
-	merged.migration.completedAt = asString$9(merged.migration.completedAt);
-	merged.migration.localStorageImportedAt = asString$9(merged.migration.localStorageImportedAt);
-	merged.migration.lastError = asString$9(merged.migration.lastError);
+	merged.migration.startedAt = asString$10(merged.migration.startedAt);
+	merged.migration.completedAt = asString$10(merged.migration.completedAt);
+	merged.migration.localStorageImportedAt = asString$10(merged.migration.localStorageImportedAt);
+	merged.migration.lastError = asString$10(merged.migration.lastError);
 	return merged;
 }
 function deepMerge(base, patch) {
-	if (!isRecord$7(base) || !isRecord$7(patch)) return clone(patch ?? base);
+	if (!isRecord$8(base) || !isRecord$8(patch)) return clone(patch ?? base);
 	const next = { ...base };
 	for (const [key, patchValue] of Object.entries(patch)) {
 		if (patchValue === void 0) continue;
@@ -58801,7 +58847,7 @@ function deepMerge(base, patch) {
 			next[key] = clone(patchValue);
 			continue;
 		}
-		if (isRecord$7(currentValue) && isRecord$7(patchValue)) {
+		if (isRecord$8(currentValue) && isRecord$8(patchValue)) {
 			next[key] = deepMerge(currentValue, patchValue);
 			continue;
 		}
@@ -58948,12 +58994,12 @@ function isGeneralChatWorkspaceRoot(workspaceRoot) {
 }
 //#endregion
 //#region ../../packages/runtime-codex/src/codex/settings.ts
-function asString$8(value) {
+function asString$9(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
 }
-function isRecord$6(value) {
+function isRecord$7(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function parseAutoRoll(raw) {
@@ -58965,8 +59011,8 @@ function parseAutoRoll(raw) {
 	}
 }
 function parseStoredLicense(raw) {
-	if (!isRecord$6(raw)) return null;
-	const statusCandidate = asString$8(raw.status);
+	if (!isRecord$7(raw)) return null;
+	const statusCandidate = asString$9(raw.status);
 	const status = [
 		"inactive",
 		"active",
@@ -58974,13 +59020,13 @@ function parseStoredLicense(raw) {
 		"error"
 	].includes(statusCandidate ?? "") ? statusCandidate : void 0;
 	const license = {
-		licenseKey: asString$8(raw.licenseKey ?? raw.license_key),
-		purchaseEmail: asString$8(raw.purchaseEmail ?? raw.purchase_email),
-		lastVerifiedAt: asString$8(raw.lastVerifiedAt ?? raw.last_verified_at),
-		nextCheckAt: asString$8(raw.nextCheckAt ?? raw.next_check_at),
-		lastVerificationError: asString$8(raw.lastVerificationError ?? raw.last_verification_error),
+		licenseKey: asString$9(raw.licenseKey ?? raw.license_key),
+		purchaseEmail: asString$9(raw.purchaseEmail ?? raw.purchase_email),
+		lastVerifiedAt: asString$9(raw.lastVerifiedAt ?? raw.last_verified_at),
+		nextCheckAt: asString$9(raw.nextCheckAt ?? raw.next_check_at),
+		lastVerificationError: asString$9(raw.lastVerificationError ?? raw.last_verification_error),
 		status,
-		signature: asString$8(raw.signature)
+		signature: asString$9(raw.signature)
 	};
 	return Boolean(license.licenseKey || license.purchaseEmail || license.lastVerifiedAt || license.nextCheckAt || license.lastVerificationError || license.status) ? license : null;
 }
@@ -59047,14 +59093,14 @@ async function readCodexSettingsJsonRaw() {
 	};
 }
 async function writeCodexSettingsJsonRaw(payload) {
-	if (!isRecord$6(payload)) return;
+	if (!isRecord$7(payload)) return;
 	const autoRoll = parseAutoRoll(payload.autoRoll ?? payload.auto_roll);
 	const license = parseStoredLicense(payload.license);
 	await patchAppState({
 		app: {
-			lastProfileName: asString$8(payload.lastProfileName ?? payload.last_profile_name),
-			lastAppVersion: asString$8(payload.lastAppVersion ?? payload.last_app_version),
-			pendingUpdateVersion: asString$8(payload.pendingUpdateVersion ?? payload.pending_update_version)
+			lastProfileName: asString$9(payload.lastProfileName ?? payload.last_profile_name),
+			lastAppVersion: asString$9(payload.lastAppVersion ?? payload.last_app_version),
+			pendingUpdateVersion: asString$9(payload.pendingUpdateVersion ?? payload.pending_update_version)
 		},
 		autoRoll: autoRoll ? {
 			enabled: autoRoll.enabled,
@@ -59084,11 +59130,11 @@ async function writeCodexSettingsJsonRaw(payload) {
 			folderHistory: Array.isArray(payload.folderHistory) ? payload.folderHistory : void 0,
 			pinnedPaths: Array.isArray(payload.pinnedPaths) ? payload.pinnedPaths : void 0
 		},
-		workspaceSettingsByPath: isRecord$6(payload.workspaceSettingsByPath) ? payload.workspaceSettingsByPath : isRecord$6(payload.projectSettingsByPath) ? payload.projectSettingsByPath : void 0,
-		conversationCategoriesByCwd: isRecord$6(payload.categoriesByCwd) ? payload.categoriesByCwd : void 0,
-		conversationCategoryAssignmentsByCwd: isRecord$6(payload.conversationCategoryByCwd) ? payload.conversationCategoryByCwd : void 0,
-		git: isRecord$6(payload.git) ? payload.git : void 0,
-		sync: isRecord$6(payload.sync) ? payload.sync : void 0
+		workspaceSettingsByPath: isRecord$7(payload.workspaceSettingsByPath) ? payload.workspaceSettingsByPath : isRecord$7(payload.projectSettingsByPath) ? payload.projectSettingsByPath : void 0,
+		conversationCategoriesByCwd: isRecord$7(payload.categoriesByCwd) ? payload.categoriesByCwd : void 0,
+		conversationCategoryAssignmentsByCwd: isRecord$7(payload.conversationCategoryByCwd) ? payload.conversationCategoryByCwd : void 0,
+		git: isRecord$7(payload.git) ? payload.git : void 0,
+		sync: isRecord$7(payload.sync) ? payload.sync : void 0
 	});
 }
 //#endregion
@@ -59964,12 +60010,12 @@ function logError(...args) {
 	console.error(...args);
 }
 function logInfo(...args) {
-	if (isTestEnv && !isMocked(console.warn)) return;
-	console.warn(...args);
+	if (isTestEnv && !isMocked(console.info)) return;
+	console.info(...args);
 }
 //#endregion
 //#region ../../packages/runtime-codex/src/codex/app-server.ts
-function isRecord$5(value) {
+function isRecord$6(value) {
 	return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function asTrimmedString$2(value) {
@@ -59990,7 +60036,7 @@ function isThreadNotFoundError$1(error) {
 	const lower = message.toLowerCase();
 	return lower.includes("thread not found") || lower.includes("rollout");
 }
-function asString$7(value) {
+function asString$8(value) {
 	return typeof value === "string" ? value : value != null ? String(value) : "";
 }
 function isInlineImageValue(value) {
@@ -59998,12 +60044,12 @@ function isInlineImageValue(value) {
 	return normalized.startsWith("data:") || normalized.startsWith("http://") || normalized.startsWith("https://");
 }
 function normalizeSendUserMessageItem(value) {
-	if (!isRecord$5(value)) return null;
-	const type = asString$7(value.type).trim();
+	if (!isRecord$6(value)) return null;
+	const type = asString$8(value.type).trim();
 	if (!type) return null;
-	const data = isRecord$5(value.data) ? value.data : {};
+	const data = isRecord$6(value.data) ? value.data : {};
 	if (type === "text") {
-		const text = asString$7(data.text ?? value.text);
+		const text = asString$8(data.text ?? value.text);
 		if (!text.trim()) return null;
 		return {
 			type: "text",
@@ -60011,7 +60057,7 @@ function normalizeSendUserMessageItem(value) {
 		};
 	}
 	if (type === "image") {
-		const imageUrl = asString$7(data.image_url ?? data.imageUrl ?? data.url ?? value.image_url ?? value.imageUrl ?? value.url).trim();
+		const imageUrl = asString$8(data.image_url ?? data.imageUrl ?? data.url ?? value.image_url ?? value.imageUrl ?? value.url).trim();
 		if (!imageUrl) return null;
 		return {
 			type: "image",
@@ -60019,7 +60065,7 @@ function normalizeSendUserMessageItem(value) {
 		};
 	}
 	if (type === "localImage") {
-		const path = asString$7(data.path ?? value.path).trim();
+		const path = asString$8(data.path ?? value.path).trim();
 		if (!path) return null;
 		return {
 			type: "localImage",
@@ -60030,13 +60076,13 @@ function normalizeSendUserMessageItem(value) {
 }
 function normalizeTurnInputParams(params) {
 	const normalized = { ...params };
-	const threadId = asString$7(params.threadId ?? params.thread_id ?? params.conversationId ?? params.conversation_id ?? "").trim();
-	if (threadId && !asString$7(params.threadId).trim()) normalized.threadId = threadId;
-	const expectedTurnId = asString$7(params.expectedTurnId ?? params.expected_turn_id ?? params.turnId ?? params.turn_id ?? "").trim();
-	if (expectedTurnId && !asString$7(params.expectedTurnId).trim()) normalized.expectedTurnId = expectedTurnId;
-	const turnId = asString$7(params.turnId ?? params.turn_id ?? expectedTurnId).trim();
-	if (turnId && !asString$7(params.turnId).trim()) normalized.turnId = turnId;
-	const providedInput = Array.isArray(params.input) ? params.input.filter((entry) => isRecord$5(entry)) : [];
+	const threadId = asString$8(params.threadId ?? params.thread_id ?? params.conversationId ?? params.conversation_id ?? "").trim();
+	if (threadId && !asString$8(params.threadId).trim()) normalized.threadId = threadId;
+	const expectedTurnId = asString$8(params.expectedTurnId ?? params.expected_turn_id ?? params.turnId ?? params.turn_id ?? "").trim();
+	if (expectedTurnId && !asString$8(params.expectedTurnId).trim()) normalized.expectedTurnId = expectedTurnId;
+	const turnId = asString$8(params.turnId ?? params.turn_id ?? expectedTurnId).trim();
+	if (turnId && !asString$8(params.turnId).trim()) normalized.turnId = turnId;
+	const providedInput = Array.isArray(params.input) ? params.input.filter((entry) => isRecord$6(entry)) : [];
 	if (providedInput.length > 0) {
 		normalized.input = providedInput;
 		return normalized;
@@ -60044,17 +60090,17 @@ function normalizeTurnInputParams(params) {
 	const providedItems = Array.isArray(params.items) ? params.items.map((item) => normalizeSendUserMessageItem(item)).filter((item) => item !== null) : [];
 	if (providedItems.length > 0) {
 		const input = providedItems.flatMap((item) => {
-			const type = asString$7(item.type).trim();
-			const data = isRecord$5(item.data) ? item.data : item;
+			const type = asString$8(item.type).trim();
+			const data = isRecord$6(item.data) ? item.data : item;
 			if (type === "text") {
-				const text = asString$7(data.text).trim();
+				const text = asString$8(data.text).trim();
 				return text ? [{
 					type: "text",
 					text
 				}] : [];
 			}
 			if (type === "localImage") {
-				const path = asString$7(data.path).trim();
+				const path = asString$8(data.path).trim();
 				return path ? [{
 					type: "localImage",
 					path
@@ -60068,13 +60114,13 @@ function normalizeTurnInputParams(params) {
 		}
 	}
 	const input = [];
-	const text = asString$7(params.text);
+	const text = asString$8(params.text);
 	if (text.trim()) input.push({
 		type: "text",
 		text
 	});
 	if (Array.isArray(params.images)) for (const candidate of params.images) {
-		const image = asString$7(candidate).trim();
+		const image = asString$8(candidate).trim();
 		if (!image || isInlineImageValue(image)) continue;
 		input.push({
 			type: "localImage",
@@ -60088,7 +60134,7 @@ function pickMethodKind(method, params) {
 	const normalized = method.toLowerCase();
 	if (normalized.includes("requestapproval")) return "approval";
 	if (normalized.includes("requestuserinput")) return "user_input";
-	if (isRecord$5(params)) {
+	if (isRecord$6(params)) {
 		if ("file_changes" in params || "fileChanges" in params || "grant_root" in params || "grantRoot" in params) return "patch";
 		if ("command" in params || "parsed_cmd" in params || "parsedCmd" in params || "cwd" in params) return "exec";
 	}
@@ -60125,7 +60171,7 @@ function getRequestTimeoutMs(method) {
 	return DEFAULT_REQUEST_TIMEOUT_MS;
 }
 function normalizeThreadLiveWorkspaceId(value) {
-	return asString$7(value).trim() || DEFAULT_THREAD_LIVE_WORKSPACE_ID;
+	return asString$8(value).trim() || DEFAULT_THREAD_LIVE_WORKSPACE_ID;
 }
 function threadLiveKey(workspaceId, threadId) {
 	return `${workspaceId}:${threadId}`;
@@ -60290,7 +60336,7 @@ var CodexAppServer = class extends EventEmitter {
 		try {
 			const response = await this.request("addConversationListener", listenerParams);
 			this.addConversationListenerSupported = true;
-			return isRecord$5(response) ? response : null;
+			return isRecord$6(response) ? response : null;
 		} catch (error) {
 			if (isMethodUnavailableError(error, "addConversationListener")) {
 				this.addConversationListenerSupported = false;
@@ -60305,7 +60351,7 @@ var CodexAppServer = class extends EventEmitter {
 			try {
 				const response = await this.request("addConversationListener", listenerParams);
 				this.addConversationListenerSupported = true;
-				return isRecord$5(response) ? response : null;
+				return isRecord$6(response) ? response : null;
 			} catch (resumeError) {
 				if (isMethodUnavailableError(resumeError, "addConversationListener")) {
 					this.addConversationListenerSupported = false;
@@ -60329,8 +60375,8 @@ var CodexAppServer = class extends EventEmitter {
 	}
 	async addConversationListener(params) {
 		if (this.addConversationListenerSupported === false) return {};
-		const conversationId = asString$7(params.conversationId ?? params.threadId ?? params.thread_id ?? "").trim();
-		const workspaceId = asString$7(params.workspaceId ?? params.workspace_id ?? "").trim();
+		const conversationId = asString$8(params.conversationId ?? params.threadId ?? params.thread_id ?? "").trim();
+		const workspaceId = asString$8(params.workspaceId ?? params.workspace_id ?? "").trim();
 		if (!conversationId) try {
 			const response = await this.request("addConversationListener", params);
 			this.addConversationListenerSupported = true;
@@ -60358,7 +60404,7 @@ var CodexAppServer = class extends EventEmitter {
 	}
 	async threadLiveSubscribe(params) {
 		const workspaceId = normalizeThreadLiveWorkspaceId(params.workspaceId ?? params.workspace_id);
-		const threadId = asString$7(params.threadId ?? params.thread_id ?? params.conversationId).trim();
+		const threadId = asString$8(params.threadId ?? params.thread_id ?? params.conversationId).trim();
 		if (!threadId) return {};
 		const key = threadLiveKey(workspaceId, threadId);
 		this.threadLiveModeByKey.set(key, "listener");
@@ -60367,7 +60413,7 @@ var CodexAppServer = class extends EventEmitter {
 	}
 	async threadLiveUnsubscribe(params) {
 		const workspaceId = normalizeThreadLiveWorkspaceId(params.workspaceId ?? params.workspace_id);
-		const threadId = asString$7(params.threadId ?? params.thread_id ?? params.conversationId).trim();
+		const threadId = asString$8(params.threadId ?? params.thread_id ?? params.conversationId).trim();
 		if (!threadId) return {};
 		const key = threadLiveKey(workspaceId, threadId);
 		this.threadLiveModeByKey.delete(key);
@@ -60515,7 +60561,7 @@ var CodexAppServer = class extends EventEmitter {
 	listPendingUserInputRequests() {
 		return [...this.pendingServerRequests.values()].filter((request) => request.kind === "user_input").map((request) => {
 			const workspaceId = asTrimmedString$2(request.params.workspace_id ?? request.params.workspaceId);
-			const params = isRecord$5(request.params.params) ? request.params.params : request.params;
+			const params = isRecord$6(request.params.params) ? request.params.params : request.params;
 			if (!workspaceId) return null;
 			return {
 				workspace_id: workspaceId,
@@ -60628,7 +60674,7 @@ var CodexAppServer = class extends EventEmitter {
 			this.logParseFailure(line, parseError);
 			return true;
 		}
-		if (!isRecord$5(parsed)) {
+		if (!isRecord$6(parsed)) {
 			logWarn("[app-server] unexpected JSON message", parsed);
 			return true;
 		}
@@ -60717,9 +60763,9 @@ var CodexAppServer = class extends EventEmitter {
 			id: request.id,
 			kind,
 			method: request.method,
-			params: isRecord$5(request.params) ? request.params : {}
+			params: isRecord$6(request.params) ? request.params : {}
 		});
-		const params = isRecord$5(request.params) ? request.params : {};
+		const params = isRecord$6(request.params) ? request.params : {};
 		if (kind === "exec") this.emit("codex:exec-command-request", {
 			requestToken: token,
 			params
@@ -61480,11 +61526,11 @@ function startExternalCodexThreadSyncWatcher(homePath) {
 function resolveStateDbPath(stateDir) {
 	return nodePath.join(stateDir, "state.sqlite");
 }
-function asString$6(value) {
+function asString$7(value) {
 	return typeof value === "string" ? value : value == null ? "" : String(value);
 }
 function asTrimmedString$1(value) {
-	return asString$6(value).trim();
+	return asString$7(value).trim();
 }
 function asFiniteNumber(value) {
 	if (typeof value === "number" && Number.isFinite(value)) return value;
@@ -63168,7 +63214,7 @@ function proposedPlanIdFromEvent(event, threadId) {
 	if (event.itemId) return `plan:${threadId}:item:${event.itemId}`;
 	return `plan:${threadId}:event:${event.eventId}`;
 }
-function asString$5(value) {
+function asString$6(value) {
 	return typeof value === "string" ? value : void 0;
 }
 function runtimePayloadRecord(event) {
@@ -63186,13 +63232,13 @@ function normalizeRuntimeTurnState(value) {
 	}
 }
 function runtimeTurnState(event) {
-	return normalizeRuntimeTurnState(asString$5(runtimePayloadRecord(event)?.state));
+	return normalizeRuntimeTurnState(asString$6(runtimePayloadRecord(event)?.state));
 }
 function runtimeTurnErrorMessage(event) {
-	return asString$5(runtimePayloadRecord(event)?.errorMessage);
+	return asString$6(runtimePayloadRecord(event)?.errorMessage);
 }
 function runtimeErrorMessageFromEvent(event) {
-	return asString$5(runtimePayloadRecord(event)?.message);
+	return asString$6(runtimePayloadRecord(event)?.message);
 }
 function shouldTriggerPassiveImportedThreadRecovery(event) {
 	switch (event.type) {
@@ -63930,13 +63976,13 @@ function asObject$1(value) {
 	if (!value || typeof value !== "object") return;
 	return value;
 }
-function asString$4(value) {
+function asString$5(value) {
 	return typeof value === "string" ? value : void 0;
 }
 function readCodexAccountSnapshot(response) {
 	const record = asObject$1(response);
 	const account = asObject$1(record?.account) ?? record;
-	const accountType = asString$4(account?.type);
+	const accountType = asString$5(account?.type);
 	if (accountType === "apiKey") return {
 		type: "apiKey",
 		planType: null,
@@ -65480,7 +65526,7 @@ function asObject(value) {
 	if (!value || typeof value !== "object") return;
 	return value;
 }
-function asString$3(value) {
+function asString$4(value) {
 	return typeof value === "string" ? value : void 0;
 }
 function asArray(value) {
@@ -65499,7 +65545,7 @@ function toTurnStatus(value) {
 	}
 }
 function normalizeItemType(raw) {
-	const type = asString$3(raw);
+	const type = asString$4(raw);
 	if (!type) return "item";
 	return type.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[._/-]/g, " ").replace(/\s+/g, " ").trim().toLowerCase();
 }
@@ -65541,16 +65587,16 @@ function itemTitle(itemType) {
 function itemDetail(item, payload) {
 	const nestedResult = asObject(item.result);
 	const candidates = [
-		asString$3(item.command),
-		asString$3(item.title),
-		asString$3(item.summary),
-		asString$3(item.text),
-		asString$3(item.path),
-		asString$3(item.prompt),
-		asString$3(nestedResult?.command),
-		asString$3(payload.command),
-		asString$3(payload.message),
-		asString$3(payload.prompt)
+		asString$4(item.command),
+		asString$4(item.title),
+		asString$4(item.summary),
+		asString$4(item.text),
+		asString$4(item.path),
+		asString$4(item.prompt),
+		asString$4(nestedResult?.command),
+		asString$4(payload.command),
+		asString$4(payload.message),
+		asString$4(payload.prompt)
 	];
 	for (const candidate of candidates) {
 		if (!candidate) continue;
@@ -65582,9 +65628,9 @@ function toRequestTypeFromKind(kind) {
 }
 function toRequestTypeFromResolvedPayload(payload) {
 	const request = asObject(payload?.request);
-	const method = asString$3(request?.method) ?? asString$3(payload?.method);
+	const method = asString$4(request?.method) ?? asString$4(payload?.method);
 	if (method) return toRequestTypeFromMethod(method);
-	const requestKind = asString$3(request?.kind) ?? asString$3(payload?.requestKind);
+	const requestKind = asString$4(request?.kind) ?? asString$4(payload?.requestKind);
 	if (requestKind) return toRequestTypeFromKind(requestKind);
 	return "unknown";
 }
@@ -65610,17 +65656,17 @@ function toUserInputQuestions(payload) {
 		const options = asArray(question.options)?.map((option) => {
 			const optionRecord = asObject(option);
 			if (!optionRecord) return void 0;
-			const label = asString$3(optionRecord.label)?.trim();
-			const description = asString$3(optionRecord.description)?.trim();
+			const label = asString$4(optionRecord.label)?.trim();
+			const description = asString$4(optionRecord.description)?.trim();
 			if (!label || !description) return;
 			return {
 				label,
 				description
 			};
 		}).filter((option) => option !== void 0);
-		const id = asString$3(question.id)?.trim();
-		const header = asString$3(question.header)?.trim();
-		const prompt = asString$3(question.question)?.trim();
+		const id = asString$4(question.id)?.trim();
+		const header = asString$4(question.header)?.trim();
+		const prompt = asString$4(question.question)?.trim();
 		const multiSelect = question.multiSelect === true || question.multi_select === true;
 		if (!id || !header || !prompt || !options || options.length === 0) return;
 		return {
@@ -65673,9 +65719,9 @@ function codexEventMessage(payload) {
 }
 function codexEventBase(event, canonicalThreadId) {
 	const msg = codexEventMessage(asObject(event.payload));
-	const turnId = asString$3(msg?.turn_id) ?? asString$3(msg?.turnId);
-	const itemId = asString$3(msg?.item_id) ?? asString$3(msg?.itemId);
-	const requestId = asString$3(msg?.request_id) ?? asString$3(msg?.requestId);
+	const turnId = asString$4(msg?.turn_id) ?? asString$4(msg?.turnId);
+	const itemId = asString$4(msg?.item_id) ?? asString$4(msg?.itemId);
+	const requestId = asString$4(msg?.request_id) ?? asString$4(msg?.requestId);
 	const base = runtimeEventBase(event, canonicalThreadId);
 	const providerRefs = base.providerRefs ? {
 		...base.providerRefs,
@@ -65768,7 +65814,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 				payload: { questions }
 			}];
 		}
-		const detail = asString$3(payload?.command) ?? asString$3(payload?.reason) ?? asString$3(payload?.prompt);
+		const detail = asString$4(payload?.command) ?? asString$4(payload?.reason) ?? asString$4(payload?.prompt);
 		return [{
 			...runtimeEventBase(event, canonicalThreadId),
 			type: "request.opened",
@@ -65825,7 +65871,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		}
 	}];
 	if (event.method === "thread/started") {
-		const providerThreadId = asString$3(asObject(payload?.thread)?.id) ?? asString$3(payload?.threadId);
+		const providerThreadId = asString$4(asObject(payload?.thread)?.id) ?? asString$4(payload?.threadId);
 		if (!providerThreadId) return [];
 		return [{
 			...runtimeEventBase(event, canonicalThreadId),
@@ -65841,7 +65887,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 			type: "thread.state.changed",
 			...runtimeEventBase(event, canonicalThreadId),
 			payload: {
-				state: event.method === "thread/archived" ? "archived" : event.method === "thread/closed" ? "closed" : event.method === "thread/compacted" ? "compacted" : toThreadState(asString$3(statusRecord?.type) ?? asString$3(threadStatusRecord?.type) ?? asString$3(threadRecord?.state) ?? payload?.state),
+				state: event.method === "thread/archived" ? "archived" : event.method === "thread/closed" ? "closed" : event.method === "thread/compacted" ? "compacted" : toThreadState(asString$4(statusRecord?.type) ?? asString$4(threadStatusRecord?.type) ?? asString$4(threadRecord?.state) ?? payload?.state),
 				...event.payload !== void 0 ? { detail: event.payload } : {}
 			}
 		}];
@@ -65850,7 +65896,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		type: "thread.metadata.updated",
 		...runtimeEventBase(event, canonicalThreadId),
 		payload: {
-			...asString$3(payload?.threadName) ? { name: asString$3(payload?.threadName) } : {},
+			...asString$4(payload?.threadName) ? { name: asString$4(payload?.threadName) } : {},
 			...event.payload !== void 0 ? { metadata: asObject(event.payload) } : {}
 		}
 	}];
@@ -65867,19 +65913,19 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 			turnId,
 			type: "turn.started",
 			payload: {
-				...asString$3(turn?.model) ? { model: asString$3(turn?.model) } : {},
-				...asString$3(turn?.effort) ? { effort: asString$3(turn?.effort) } : {}
+				...asString$4(turn?.model) ? { model: asString$4(turn?.model) } : {},
+				...asString$4(turn?.effort) ? { effort: asString$4(turn?.effort) } : {}
 			}
 		}];
 	}
 	if (event.method === "turn/completed") {
-		const errorMessage = asString$3(asObject(turn?.error)?.message);
+		const errorMessage = asString$4(asObject(turn?.error)?.message);
 		return [{
 			...runtimeEventBase(event, canonicalThreadId),
 			type: "turn.completed",
 			payload: {
 				state: toTurnStatus(turn?.status),
-				...asString$3(turn?.stopReason) ? { stopReason: asString$3(turn?.stopReason) } : {},
+				...asString$4(turn?.stopReason) ? { stopReason: asString$4(turn?.stopReason) } : {},
 				...turn?.usage !== void 0 ? { usage: turn.usage } : {},
 				...asObject(turn?.modelUsage) ? { modelUsage: asObject(turn?.modelUsage) } : {},
 				...asNumber$2(turn?.totalCostUsd) !== void 0 ? { totalCostUsd: asNumber$2(turn?.totalCostUsd) } : {},
@@ -65898,9 +65944,9 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 			...runtimeEventBase(event, canonicalThreadId),
 			type: "turn.plan.updated",
 			payload: {
-				...asString$3(payload?.explanation) ? { explanation: asString$3(payload?.explanation) } : {},
+				...asString$4(payload?.explanation) ? { explanation: asString$4(payload?.explanation) } : {},
 				plan: steps.map((entry) => asObject(entry)).filter((entry) => entry !== void 0).map((entry) => ({
-					step: asString$3(entry.step) ?? "step",
+					step: asString$4(entry.step) ?? "step",
 					status: entry.status === "completed" || entry.status === "inProgress" ? entry.status : "pending"
 				}))
 			}
@@ -65909,7 +65955,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 	if (event.method === "turn/diff/updated") return [{
 		...runtimeEventBase(event, canonicalThreadId),
 		type: "turn.diff.updated",
-		payload: { unifiedDiff: asString$3(payload?.unifiedDiff) ?? asString$3(payload?.diff) ?? asString$3(payload?.patch) ?? "" }
+		payload: { unifiedDiff: asString$4(payload?.unifiedDiff) ?? asString$4(payload?.diff) ?? asString$4(payload?.patch) ?? "" }
 	}];
 	if (event.method === "item/started") {
 		const started = mapItemLifecycle(event, canonicalThreadId, "item.started");
@@ -65936,7 +65982,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		return updated ? [updated] : [];
 	}
 	if (event.method === "item/plan/delta") {
-		const delta = event.textDelta ?? asString$3(payload?.delta) ?? asString$3(payload?.text) ?? asString$3(asObject(payload?.content)?.text);
+		const delta = event.textDelta ?? asString$4(payload?.delta) ?? asString$4(payload?.text) ?? asString$4(asObject(payload?.content)?.text);
 		if (!delta || delta.length === 0) return [];
 		return [{
 			...runtimeEventBase(event, canonicalThreadId),
@@ -65945,7 +65991,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		}];
 	}
 	if (event.method === "item/agentMessage/delta" || event.method === "item/commandExecution/outputDelta" || event.method === "item/fileChange/outputDelta" || event.method === "item/reasoning/summaryTextDelta" || event.method === "item/reasoning/textDelta") {
-		const delta = event.textDelta ?? asString$3(payload?.delta) ?? asString$3(payload?.text) ?? asString$3(asObject(payload?.content)?.text);
+		const delta = event.textDelta ?? asString$4(payload?.delta) ?? asString$4(payload?.text) ?? asString$4(asObject(payload?.content)?.text);
 		if (!delta || delta.length === 0) return [];
 		return [{
 			...runtimeEventBase(event, canonicalThreadId),
@@ -65962,9 +66008,9 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		...runtimeEventBase(event, canonicalThreadId),
 		type: "tool.progress",
 		payload: {
-			...asString$3(payload?.toolUseId) ? { toolUseId: asString$3(payload?.toolUseId) } : {},
-			...asString$3(payload?.toolName) ? { toolName: asString$3(payload?.toolName) } : {},
-			...asString$3(payload?.summary) ? { summary: asString$3(payload?.summary) } : {},
+			...asString$4(payload?.toolUseId) ? { toolUseId: asString$4(payload?.toolUseId) } : {},
+			...asString$4(payload?.toolName) ? { toolName: asString$4(payload?.toolName) } : {},
+			...asString$4(payload?.summary) ? { summary: asString$4(payload?.summary) } : {},
 			...asNumber$2(payload?.elapsedSeconds) !== void 0 ? { elapsedSeconds: asNumber$2(payload?.elapsedSeconds) } : {}
 		}
 	}];
@@ -65986,21 +66032,21 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 	}];
 	if (event.method === "codex/event/task_started") {
 		const msg = codexEventMessage(payload);
-		const taskId = asString$3(payload?.id) ?? asString$3(msg?.turn_id);
+		const taskId = asString$4(payload?.id) ?? asString$4(msg?.turn_id);
 		if (!taskId) return [];
 		return [{
 			...codexEventBase(event, canonicalThreadId),
 			type: "task.started",
 			payload: {
 				taskId: asRuntimeTaskId(taskId),
-				...asString$3(msg?.collaboration_mode_kind) ? { taskType: asString$3(msg?.collaboration_mode_kind) } : {}
+				...asString$4(msg?.collaboration_mode_kind) ? { taskType: asString$4(msg?.collaboration_mode_kind) } : {}
 			}
 		}];
 	}
 	if (event.method === "codex/event/task_complete") {
 		const msg = codexEventMessage(payload);
-		const taskId = asString$3(payload?.id) ?? asString$3(msg?.turn_id);
-		const proposedPlanMarkdown = extractProposedPlanMarkdown(asString$3(msg?.last_agent_message));
+		const taskId = asString$4(payload?.id) ?? asString$4(msg?.turn_id);
+		const proposedPlanMarkdown = extractProposedPlanMarkdown(asString$4(msg?.last_agent_message));
 		if (!taskId) {
 			if (!proposedPlanMarkdown) return [];
 			return [{
@@ -66015,7 +66061,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 			payload: {
 				taskId: asRuntimeTaskId(taskId),
 				status: "completed",
-				...asString$3(msg?.last_agent_message) ? { summary: asString$3(msg?.last_agent_message) } : {}
+				...asString$4(msg?.last_agent_message) ? { summary: asString$4(msg?.last_agent_message) } : {}
 			}
 		}];
 		if (proposedPlanMarkdown) events.push({
@@ -66027,8 +66073,8 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 	}
 	if (event.method === "codex/event/agent_reasoning") {
 		const msg = codexEventMessage(payload);
-		const taskId = asString$3(payload?.id);
-		const description = asString$3(msg?.text);
+		const taskId = asString$4(payload?.id);
+		const description = asString$4(msg?.text);
 		if (!taskId || !description) return [];
 		return [{
 			...codexEventBase(event, canonicalThreadId),
@@ -66041,7 +66087,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 	}
 	if (event.method === "codex/event/reasoning_content_delta") {
 		const msg = codexEventMessage(payload);
-		const delta = asString$3(msg?.delta);
+		const delta = asString$4(msg?.delta);
 		if (!delta) return [];
 		return [{
 			...codexEventBase(event, canonicalThreadId),
@@ -66057,26 +66103,26 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		type: "model.rerouted",
 		...runtimeEventBase(event, canonicalThreadId),
 		payload: {
-			fromModel: asString$3(payload?.fromModel) ?? "unknown",
-			toModel: asString$3(payload?.toModel) ?? "unknown",
-			reason: asString$3(payload?.reason) ?? "unknown"
+			fromModel: asString$4(payload?.fromModel) ?? "unknown",
+			toModel: asString$4(payload?.toModel) ?? "unknown",
+			reason: asString$4(payload?.reason) ?? "unknown"
 		}
 	}];
 	if (event.method === "deprecationNotice") return [{
 		type: "deprecation.notice",
 		...runtimeEventBase(event, canonicalThreadId),
 		payload: {
-			summary: asString$3(payload?.summary) ?? "Deprecation notice",
-			...asString$3(payload?.details) ? { details: asString$3(payload?.details) } : {}
+			summary: asString$4(payload?.summary) ?? "Deprecation notice",
+			...asString$4(payload?.details) ? { details: asString$4(payload?.details) } : {}
 		}
 	}];
 	if (event.method === "configWarning") return [{
 		type: "config.warning",
 		...runtimeEventBase(event, canonicalThreadId),
 		payload: {
-			summary: asString$3(payload?.summary) ?? "Configuration warning",
-			...asString$3(payload?.details) ? { details: asString$3(payload?.details) } : {},
-			...asString$3(payload?.path) ? { path: asString$3(payload?.path) } : {},
+			summary: asString$4(payload?.summary) ?? "Configuration warning",
+			...asString$4(payload?.details) ? { details: asString$4(payload?.details) } : {},
+			...asString$4(payload?.path) ? { path: asString$4(payload?.path) } : {},
 			...payload?.range !== void 0 ? { range: payload.range } : {}
 		}
 	}];
@@ -66095,12 +66141,12 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		...runtimeEventBase(event, canonicalThreadId),
 		payload: {
 			success: payload?.success === true,
-			...asString$3(payload?.name) ? { name: asString$3(payload?.name) } : {},
-			...asString$3(payload?.error) ? { error: asString$3(payload?.error) } : {}
+			...asString$4(payload?.name) ? { name: asString$4(payload?.name) } : {},
+			...asString$4(payload?.error) ? { error: asString$4(payload?.error) } : {}
 		}
 	}];
 	if (event.method === "thread/realtime/started") {
-		const realtimeSessionId = asString$3(payload?.realtimeSessionId);
+		const realtimeSessionId = asString$4(payload?.realtimeSessionId);
 		return [{
 			type: "thread.realtime.started",
 			...runtimeEventBase(event, canonicalThreadId),
@@ -66118,7 +66164,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		payload: { audio: event.payload ?? {} }
 	}];
 	if (event.method === "thread/realtime/error") {
-		const message = asString$3(payload?.message) ?? event.message ?? "Realtime error";
+		const message = asString$4(payload?.message) ?? event.message ?? "Realtime error";
 		return [{
 			type: "thread.realtime.error",
 			...runtimeEventBase(event, canonicalThreadId),
@@ -66131,7 +66177,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 		payload: { reason: event.message }
 	}];
 	if (event.method === "error") {
-		const message = asString$3(asObject(payload?.error)?.message) ?? event.message ?? "Provider runtime error";
+		const message = asString$4(asObject(payload?.error)?.message) ?? event.message ?? "Provider runtime error";
 		const willRetry = payload?.willRetry === true;
 		return [{
 			type: willRetry ? "runtime.warning" : "runtime.error",
@@ -66738,12 +66784,12 @@ function decodeProviderKind(providerName, operation) {
 		detail: `Unknown persisted provider '${providerName}'.`
 	}));
 }
-function isRecord$4(value) {
+function isRecord$5(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function mergeRuntimePayload(existing, next) {
 	if (next === void 0) return existing ?? null;
-	if (isRecord$4(existing) && isRecord$4(next)) return {
+	if (isRecord$5(existing) && isRecord$5(next)) return {
 		...existing,
 		...next
 	};
@@ -72761,7 +72807,7 @@ const FALLBACK_FEATURE_KEYS = [
 ];
 let metadataCache = null;
 let metadataCacheAt = 0;
-function isRecord$3(value) {
+function isRecord$4(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function uniqueSorted(values) {
@@ -72832,14 +72878,14 @@ function parseFeatureCatalog(output) {
 }
 function parseSchemaKeys(schemaRaw) {
 	const parsed = JSON.parse(schemaRaw);
-	if (!isRecord$3(parsed)) return {
+	if (!isRecord$4(parsed)) return {
 		topLevelKeys: FALLBACK_SCHEMA_TOP_LEVEL_KEYS,
 		featureKeys: FALLBACK_FEATURE_KEYS
 	};
-	const properties = isRecord$3(parsed.properties) ? parsed.properties : {};
+	const properties = isRecord$4(parsed.properties) ? parsed.properties : {};
 	const topLevelKeys = uniqueSorted(Object.keys(properties));
-	const features = isRecord$3(properties.features) ? properties.features : {};
-	const featureProperties = isRecord$3(features.properties) ? features.properties : {};
+	const features = isRecord$4(properties.features) ? properties.features : {};
+	const featureProperties = isRecord$4(features.properties) ? features.properties : {};
 	const featureKeys = uniqueSorted(Object.keys(featureProperties));
 	return {
 		topLevelKeys: topLevelKeys.length > 0 ? topLevelKeys : FALLBACK_SCHEMA_TOP_LEVEL_KEYS,
@@ -73585,8 +73631,116 @@ function resolveProfileIdentityKeyFromProfile(profile) {
 //#endregion
 //#region ../../packages/runtime-codex/src/codex/rpc.ts
 const RPC_TIMEOUT_MS = 1e4;
+const ACTIVATION_TURN_TIMEOUT_MS = 9e4;
+const ACTIVATION_PROMPT = "Reply with exactly: ok.";
+const ACTIVATION_MODEL = "gpt-5.1-codex-mini";
 const MAX_STDERR_CAPTURE_CHARS = 32768;
 const REFRESH_TOKEN_REDEEMED_SNIPPET$1 = "refresh token was already used";
+function isRecord$3(value) {
+	return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function asString$3(value) {
+	return typeof value === "string" ? value : value != null ? String(value) : "";
+}
+function createRpcMessageReader(rl) {
+	const queue = [];
+	const waiters = [];
+	let closedError = null;
+	const rejectAll = (error) => {
+		closedError = error;
+		while (waiters.length > 0) {
+			const waiter = waiters.shift();
+			clearTimeout(waiter.timer);
+			waiter.reject(error);
+		}
+	};
+	const onLine = (line) => {
+		let parsed;
+		try {
+			parsed = JSON.parse(line);
+		} catch {
+			rejectAll(/* @__PURE__ */ new Error("codex RPC returned malformed JSON"));
+			return;
+		}
+		const waiterIndex = waiters.findIndex((waiter) => waiter.predicate(parsed));
+		if (waiterIndex >= 0) {
+			const [waiter] = waiters.splice(waiterIndex, 1);
+			clearTimeout(waiter.timer);
+			waiter.resolve(parsed);
+			return;
+		}
+		queue.push(parsed);
+	};
+	const onClose = () => {
+		rejectAll(/* @__PURE__ */ new Error("codex RPC stream closed before response"));
+	};
+	rl.on("line", onLine);
+	rl.on("close", onClose);
+	return {
+		read(predicate, timeoutMs) {
+			const queuedIndex = queue.findIndex(predicate);
+			if (queuedIndex >= 0) {
+				const [message] = queue.splice(queuedIndex, 1);
+				return Promise.resolve(message);
+			}
+			if (closedError) return Promise.reject(closedError);
+			return new Promise((resolve, reject) => {
+				const waiter = {
+					predicate,
+					resolve,
+					reject,
+					timer: setTimeout(() => {
+						const index = waiters.indexOf(waiter);
+						if (index >= 0) waiters.splice(index, 1);
+						reject(/* @__PURE__ */ new Error("codex RPC timed out"));
+					}, Math.max(1, timeoutMs))
+				};
+				waiters.push(waiter);
+			});
+		},
+		dispose() {
+			rl.off("line", onLine);
+			rl.off("close", onClose);
+			while (waiters.length > 0) {
+				const waiter = waiters.shift();
+				clearTimeout(waiter.timer);
+			}
+		}
+	};
+}
+function readThreadIdFromResult(result) {
+	if (!isRecord$3(result)) return null;
+	const value = asString$3((isRecord$3(result.thread) ? result.thread : {}).id ?? result.threadId).trim();
+	return value.length > 0 ? value : null;
+}
+function readTurnIdFromResult(result) {
+	if (!isRecord$3(result)) return null;
+	const value = asString$3((isRecord$3(result.turn) ? result.turn : {}).id ?? result.turnId).trim();
+	return value.length > 0 ? value : null;
+}
+function readTurnIdFromNotification(message) {
+	if (!isRecord$3(message.params)) return null;
+	const value = asString$3((isRecord$3(message.params.turn) ? message.params.turn : {}).id ?? message.params.turnId).trim();
+	return value.length > 0 ? value : null;
+}
+function readTurnStatusFromNotification(message) {
+	if (!isRecord$3(message.params)) return {
+		status: null,
+		reason: null
+	};
+	const turn = isRecord$3(message.params.turn) ? message.params.turn : {};
+	const error = isRecord$3(turn.error) ? turn.error : null;
+	return {
+		status: asString$3(turn.status).trim() || null,
+		reason: error ? asString$3(error.message).trim() || null : null
+	};
+}
+function readLegacyEventTurnId(message) {
+	if (!isRecord$3(message.params)) return null;
+	const msg = isRecord$3(message.params.msg) ? message.params.msg : {};
+	const value = asString$3(message.params.id ?? msg.turn_id ?? msg.turnId).trim();
+	return value.length > 0 ? value : null;
+}
 function parseTimestamp$1(value) {
 	if (typeof value !== "string" || value.trim().length === 0) return null;
 	const parsed = Date.parse(value);
@@ -73825,6 +73979,160 @@ async function fetchRateLimitsViaRpc(envOverride, options = {}) {
 		}).catch(() => {});
 	}
 }
+async function activateResetWindowViaRpc(envOverride, options = {}) {
+	const binaryPath = options.codexPath ?? await requireCodexCli();
+	const tempHome = await promises.mkdtemp(nodePath.join(nodeOs.tmpdir(), "codex-activation-"));
+	const tempAuthPath = nodePath.join(tempHome, "auth.json");
+	let initialSourceAuth = null;
+	const sourceAuthPath = options.authPath ?? (envOverride?.CODEX_HOME ? nodePath.join(envOverride.CODEX_HOME, "auth.json") : nodePath.join(envOverride?.HOME ?? process.env.HOME ?? process.env.USERPROFILE ?? nodeOs.homedir(), ".codex", "auth.json"));
+	try {
+		initialSourceAuth = await promises.readFile(sourceAuthPath, "utf8").catch(() => null);
+		if (!initialSourceAuth) {
+			await promises.rm(tempHome, {
+				recursive: true,
+				force: true
+			}).catch(() => {});
+			return {
+				status: "skipped",
+				reason: "auth-missing"
+			};
+		}
+		await promises.writeFile(tempAuthPath, initialSourceAuth, "utf8");
+	} catch {
+		await promises.rm(tempHome, {
+			recursive: true,
+			force: true
+		}).catch(() => {});
+		return {
+			status: "skipped",
+			reason: "auth-missing"
+		};
+	}
+	const childEnv = {
+		...process.env,
+		...envOverride ?? {},
+		HOME: tempHome,
+		USERPROFILE: tempHome,
+		CODEX_HOME: tempHome,
+		CODEX_TELEMETRY_LABEL: "codex-reset-activation",
+		ELECTRON_RUN_AS_NODE: "1"
+	};
+	const command = buildCodexCommand$1(binaryPath, [
+		"-s",
+		"read-only",
+		"-a",
+		"untrusted",
+		"app-server"
+	], childEnv);
+	const child = spawn(command.command, command.args, {
+		stdio: [
+			"pipe",
+			"pipe",
+			"pipe"
+		],
+		env: childEnv,
+		shell: command.shell
+	});
+	const rl = readline.createInterface({
+		input: child.stdout,
+		crlfDelay: Infinity
+	});
+	const reader = createRpcMessageReader(rl);
+	let stderrOutput = "";
+	child.stderr?.on("data", (chunk) => {
+		if (stderrOutput.length >= MAX_STDERR_CAPTURE_CHARS) return;
+		const text = chunk.toString("utf8");
+		const remaining = MAX_STDERR_CAPTURE_CHARS - stderrOutput.length;
+		stderrOutput += text.slice(0, Math.max(0, remaining));
+	});
+	try {
+		await sendPayload(child, {
+			id: 1,
+			method: "initialize",
+			params: { clientInfo: {
+				name: "codexuse",
+				version: "0.0.0"
+			} }
+		});
+		const initializeResponse = await reader.read((message) => isRpcResponseForRequest(message, 1), RPC_TIMEOUT_MS);
+		if (initializeResponse.error) throw new Error(formatRpcError("initialize", initializeResponse.error));
+		await sendPayload(child, {
+			method: "initialized",
+			params: {}
+		});
+		await sendPayload(child, {
+			id: 2,
+			method: "thread/start",
+			params: {
+				cwd: tempHome,
+				model: ACTIVATION_MODEL,
+				approvalPolicy: "untrusted",
+				sandbox: "read-only",
+				experimentalRawEvents: false
+			}
+		});
+		const threadResponse = await reader.read((message) => isRpcResponseForRequest(message, 2), RPC_TIMEOUT_MS);
+		if (threadResponse.error) throw new Error(formatRpcError("thread/start", threadResponse.error));
+		const threadId = readThreadIdFromResult(threadResponse.result);
+		if (!threadId) throw new Error("thread/start response did not include a thread id.");
+		await sendPayload(child, {
+			id: 3,
+			method: "turn/start",
+			params: {
+				threadId,
+				model: ACTIVATION_MODEL,
+				effort: "low",
+				input: [{
+					type: "text",
+					text: ACTIVATION_PROMPT,
+					text_elements: []
+				}]
+			}
+		});
+		const turnResponse = await reader.read((message) => isRpcResponseForRequest(message, 3), RPC_TIMEOUT_MS);
+		if (turnResponse.error) {
+			const base = formatRpcError("turn/start", turnResponse.error);
+			const hint = inferRefreshFailureHint(stderrOutput);
+			if (hint && !base.toLowerCase().includes(hint)) throw new Error(`${base}; ${hint}`);
+			throw new Error(base);
+		}
+		const turnId = readTurnIdFromResult(turnResponse.result);
+		if (!turnId) throw new Error("turn/start response did not include a turn id.");
+		const turnStatus = readTurnStatusFromNotification(await reader.read((message) => message.method === "turn/completed" && readTurnIdFromNotification(message) === turnId || message.method === "codex/event/task_complete" && readLegacyEventTurnId(message) === turnId, ACTIVATION_TURN_TIMEOUT_MS));
+		if (turnStatus.status === "failed") return {
+			status: "failed",
+			reason: turnStatus.reason ?? "turn-failed",
+			threadId,
+			turnId
+		};
+		return {
+			status: "completed",
+			reason: null,
+			threadId,
+			turnId
+		};
+	} finally {
+		child.kill();
+		reader.dispose();
+		rl.close();
+		try {
+			const updatedAuth = await promises.readFile(tempAuthPath, "utf8");
+			if (updatedAuth.trim().length > 0) {
+				const currentSourceAuth = await promises.readFile(sourceAuthPath, "utf8").catch(() => null);
+				if (shouldWriteBackAuth(initialSourceAuth, currentSourceAuth, updatedAuth)) await promises.writeFile(sourceAuthPath, updatedAuth, "utf8");
+				else if (currentSourceAuth && currentSourceAuth !== updatedAuth && currentSourceAuth !== initialSourceAuth) logWarn("Skipped stale auth sync-back after reset-window activation; source auth changed in flight.", {
+					sourceAuthPath,
+					currentRecencyMs: extractAuthRecencyMs(currentSourceAuth),
+					updatedRecencyMs: extractAuthRecencyMs(updatedAuth)
+				});
+			}
+		} catch {}
+		await promises.rm(tempHome, {
+			recursive: true,
+			force: true
+		}).catch(() => {});
+	}
+}
 //#endregion
 //#region ../../packages/runtime-profiles/src/profiles/profile-manager.ts
 const TOKEN_EXPIRING_SOON_WINDOW_MS = 900 * 1e3;
@@ -74725,11 +75033,11 @@ var ProfileManager = class {
 		const existingIdentity = this.resolveProfileIdentityFromData(profileName, existing, existingMetadata);
 		const nextIdentity = this.resolveProfileIdentityFromData(profileName, normalized, metadata);
 		if (existingIdentity && nextIdentity && existingIdentity !== nextIdentity) {
-			logWarn(`Skipped syncing tokens for profile '${profileName}' because Codex auth switched to a different OpenAI identity.`);
+			logInfo(`Skipped syncing tokens for profile '${profileName}' because Codex auth switched to a different OpenAI identity.`);
 			return;
 		}
 		if (this.normalizeWorkspaceId(existing.workspace_id) !== this.normalizeWorkspaceId(normalized.workspace_id)) {
-			logWarn(`Skipped syncing tokens for profile '${profileName}' because Codex auth switched to a different workspace.`);
+			logInfo(`Skipped syncing tokens for profile '${profileName}' because Codex auth switched to a different workspace.`);
 			return;
 		}
 		if (!this.hasTokenChanges(existing, normalized)) return;
@@ -75058,6 +75366,18 @@ var ProfileManager = class {
 			});
 		}
 	}
+	async activateResetWindow(name, options = {}) {
+		const profileName = this.normalizeProfileName(name);
+		try {
+			return await this.enqueueProfileOperation(profileName, () => this.runWithPreparedProfileHome(profileName, (env) => activateResetWindowViaRpc(env, { codexPath: options.codexPath }), { syncFromActiveAuthBeforeAction: false }));
+		} finally {
+			await this.enqueueAuthSwap(async () => {
+				await this.syncActiveAuthFromProfileIfCurrent(profileName);
+			}).catch((error) => {
+				logWarn(`Failed to sync active auth after reset-window activation for '${profileName}':`, error);
+			});
+		}
+	}
 	/**
 	* Rename a profile
 	*/
@@ -82274,15 +82594,13 @@ function createTelegramBridge(options) {
 }
 //#endregion
 //#region ../../packages/runtime-codex/src/codex/officialAppRestart.ts
-const RESTART_COOLDOWN_MS = 6e4;
 const COMMAND_TIMEOUT_MS = 3e3;
 const EXIT_WAIT_MS = 1e4;
 const LAUNCH_WAIT_MS = 15e3;
 const POLL_INTERVAL_MS = 250;
 const APP_DISCOVERY_CACHE_TTL_MS = 6e4;
 const APP_DISCOVERY_MISS_CACHE_TTL_MS = 5e3;
-let restartPromise = null;
-let lastRestartStartedAt = 0;
+const OFFICIAL_CODEX_ACTIVITY_LIMIT = 50;
 let profileActionLock = Promise.resolve();
 let appDiscoveryCache = null;
 function logOfficialCodexRestart(level, message, context) {
@@ -82293,6 +82611,47 @@ function logOfficialCodexRestart(level, message, context) {
 	}
 	logger(`[official-codex-restart] ${message}`);
 }
+function hashProfileKey(profileKey) {
+	if (!profileKey) return null;
+	return createHash("sha256").update(profileKey).digest("hex").slice(0, 12);
+}
+async function recordOfficialCodexActivity(input) {
+	const now = /* @__PURE__ */ new Date();
+	const entry = {
+		id: `${now.getTime().toString(36)}-${Math.random().toString(36).slice(2, 8)}`,
+		at: now.toISOString(),
+		kind: input.kind,
+		status: input.status,
+		reason: input.reason ?? null,
+		decisionId: input.decisionId ?? null,
+		profileName: input.profileName ?? null,
+		sourceProfileName: input.sourceProfileName ?? null,
+		targetProfileName: input.targetProfileName ?? null,
+		remainingPercent: input.remainingPercent ?? null,
+		threshold: input.threshold ?? null,
+		snapshotAgeMs: input.snapshotAgeMs ?? null,
+		snapshotSource: input.snapshotSource ?? null,
+		phase: input.phase ?? null,
+		pid: input.pid ?? null,
+		profileKeyHash: input.profileKeyHash ?? hashProfileKey(input.profileKey),
+		switchVerified: input.switchVerified ?? null,
+		restartRequested: input.restartRequested ?? null,
+		restartResult: input.restartResult ?? null,
+		observedProfileName: input.observedProfileName ?? null,
+		observedProfileKeyHash: input.observedProfileKeyHash ?? hashProfileKey(input.observedProfileKey),
+		observedProfileMatchSource: input.observedProfileMatchSource ?? null
+	};
+	try {
+		await updateAppState((state) => ({ officialCodex: { activity: [...state.officialCodex.activity, entry].slice(-OFFICIAL_CODEX_ACTIVITY_LIMIT) } }));
+	} catch (error) {
+		logOfficialCodexRestart("warn", "Failed to record official Codex activity.", {
+			kind: entry.kind,
+			status: entry.status,
+			profileKeyHash: entry.profileKeyHash,
+			error: error instanceof Error ? error.message : String(error)
+		});
+	}
+}
 function runCommand(command, args, timeoutMs = COMMAND_TIMEOUT_MS) {
 	return new Promise((resolve) => {
 		const child = spawn(command, args, { stdio: [
@@ -82670,14 +83029,6 @@ async function resolveCodexAppTarget() {
 		mainPids
 	};
 }
-async function waitForCodexExit(candidate, timeoutMs) {
-	const deadline = Date.now() + timeoutMs;
-	while (Date.now() < deadline) {
-		if ((await getRunningCodexPids(candidate)).length === 0) return true;
-		await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-	}
-	return false;
-}
 async function signalPids(pids, signal) {
 	const signaled = [];
 	for (const pid of pids) try {
@@ -82686,19 +83037,6 @@ async function signalPids(pids, signal) {
 	} catch {}
 	return signaled;
 }
-async function openCodex(candidate) {
-	if ((await runCommand("/usr/bin/open", ["-b", candidate.bundleId])).code === 0) return true;
-	return (await runCommand("/usr/bin/open", [candidate.appPath])).code === 0;
-}
-async function waitForCodexLaunch(candidate) {
-	const deadline = Date.now() + LAUNCH_WAIT_MS;
-	while (Date.now() < deadline) {
-		const pid = (await getRunningCodexMainPids(candidate))[0] ?? null;
-		if (pid !== null) return pid;
-		await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-	}
-	return null;
-}
 function toIso(value) {
 	return typeof value === "number" && Number.isFinite(value) ? new Date(value).toISOString() : null;
 }
@@ -82719,152 +83057,15 @@ async function rememberRestartResult(args) {
 		lastRestartReason: args.reason ?? null
 	} });
 }
-async function restartOfficialCodexAppOnce(options) {
-	if (process.platform !== "darwin") {
-		await rememberRestartResult({
-			status: "skipped",
-			reason: "unsupported-platform"
-		});
-		return {
-			status: "skipped",
-			reason: "unsupported-platform"
-		};
-	}
-	const now = Date.now();
-	if (options.source !== "manual" && lastRestartStartedAt > 0 && now - lastRestartStartedAt < RESTART_COOLDOWN_MS) {
-		await rememberRestartResult({
-			status: "skipped",
-			reason: "cooldown",
-			profileKey: options.currentProfileKey
-		});
-		return {
-			status: "skipped",
-			reason: "cooldown"
-		};
-	}
-	const { candidate, runningPids, mainPids } = await resolveCodexAppTarget();
-	if (!candidate) {
-		await rememberRestartResult({
-			status: "skipped",
-			reason: "official-codex-app-not-found",
-			profileKey: options.currentProfileKey
-		});
-		return {
-			status: "skipped",
-			reason: "official-codex-app-not-found"
-		};
-	}
-	const appIsRunning = mainPids.length > 0;
-	if (!appIsRunning && !options.launchIfNotRunning) {
-		await rememberRestartResult({
-			status: "skipped",
-			reason: "official-codex-app-not-running",
-			profileKey: options.currentProfileKey
-		});
-		return {
-			status: "skipped",
-			reason: "official-codex-app-not-running"
-		};
-	}
-	if (options.source !== "manual") lastRestartStartedAt = Date.now();
-	if (appIsRunning) {
-		logOfficialCodexRestart("warn", "Force killing official Codex before relaunch.", {
-			appPath: candidate.appPath,
-			bundleId: candidate.bundleId,
-			source: options.source,
-			runningPids,
-			mainPids
-		});
-		const killedPids = await signalPids(runningPids, "SIGKILL");
-		logOfficialCodexRestart("warn", "Sent SIGKILL to official Codex pids.", {
-			appPath: candidate.appPath,
-			bundleId: candidate.bundleId,
-			source: options.source,
-			killedPids
-		});
-		if (!await waitForCodexExit(candidate, EXIT_WAIT_MS)) {
-			const remainingPids = await getRunningCodexPids(candidate);
-			logOfficialCodexRestart("error", "Official Codex pids remained after force kill.", {
-				appPath: candidate.appPath,
-				bundleId: candidate.bundleId,
-				source: options.source,
-				remainingPids
-			});
-			const failed = {
-				status: "failed",
-				appPath: candidate.appPath,
-				bundleId: candidate.bundleId,
-				reason: "force-quit-timeout",
-				phase: "quit"
-			};
-			await rememberRestartResult({
-				status: failed.status,
-				reason: failed.reason,
-				profileKey: options.currentProfileKey
-			});
-			return failed;
-		}
-		logOfficialCodexRestart("info", "Official Codex exited after force kill.", {
-			appPath: candidate.appPath,
-			bundleId: candidate.bundleId,
-			source: options.source
-		});
-	}
-	if (!await openCodex(candidate)) {
-		const failed = {
-			status: "failed",
-			appPath: candidate.appPath,
-			bundleId: candidate.bundleId,
-			reason: "open-failed",
-			phase: "launch"
-		};
-		await rememberRestartResult({
-			status: failed.status,
-			reason: failed.reason,
-			profileKey: options.currentProfileKey
-		});
-		return failed;
-	}
-	const launchedPid = await waitForCodexLaunch(candidate);
-	if (launchedPid === null) {
-		logOfficialCodexRestart("error", "Official Codex launch was not verified.", {
-			appPath: candidate.appPath,
-			bundleId: candidate.bundleId,
-			source: options.source
-		});
-		const failed = {
-			status: "failed",
-			appPath: candidate.appPath,
-			bundleId: candidate.bundleId,
-			reason: "launch-timeout",
-			phase: "launch"
-		};
-		await rememberRestartResult({
-			status: failed.status,
-			reason: failed.reason,
-			profileKey: options.currentProfileKey
-		});
-		return failed;
-	}
-	const status = appIsRunning ? "restarted" : "started";
-	logOfficialCodexRestart("info", "Official Codex launch verified.", {
-		appPath: candidate.appPath,
-		bundleId: candidate.bundleId,
-		source: options.source,
-		status,
-		pid: launchedPid
-	});
-	await rememberRestartResult({
-		status,
-		profileKey: options.currentProfileKey,
-		pid: launchedPid
-	});
-	return {
-		status,
-		appPath: candidate.appPath,
-		bundleId: candidate.bundleId,
-		pid: launchedPid
-	};
+async function recordOfficialCodexProfileObservation(profileKey, pid) {
+	if (!profileKey || !pid) return;
+	await patchAppState({ officialCodex: {
+		lastVerifiedLaunchProfileKey: profileKey,
+		lastObservedPid: pid
+	} });
+}
+function recordOfficialCodexRestartResult(args) {
+	return rememberRestartResult(args);
 }
 async function getOfficialCodexSyncStatus(currentProfileKey) {
 	const stored = (await getAppState()).officialCodex;
@@ -82873,7 +83074,8 @@ async function getOfficialCodexSyncStatus(currentProfileKey) {
 		lastProfileSwitchAt: toIso(stored.lastProfileSwitchAt),
 		lastVerifiedLaunchAt: toIso(stored.lastVerifiedLaunchAt),
 		lastRestartStatus: stored.lastRestartStatus,
-		lastRestartReason: stored.lastRestartReason
+		lastRestartReason: stored.lastRestartReason,
+		activity: stored.activity
 	};
 	if (process.platform !== "darwin") return {
 		...base,
@@ -82894,10 +83096,12 @@ async function getOfficialCodexSyncStatus(currentProfileKey) {
 	const lastSwitchAt = stored.lastProfileSwitchAt;
 	const lastLaunchAt = stored.lastVerifiedLaunchAt;
 	const lastLaunchProfileKey = stored.lastVerifiedLaunchProfileKey;
-	const stale = Boolean(currentProfileKey && lastSwitchAt && (!lastLaunchAt || lastLaunchAt < lastSwitchAt || lastLaunchProfileKey !== currentProfileKey));
+	const lastObservedPid = stored.lastObservedPid;
+	const observedSynced = Boolean(currentProfileKey && lastLaunchProfileKey === currentProfileKey && lastObservedPid && mainPids.includes(lastObservedPid));
+	const stale = Boolean(!observedSynced && currentProfileKey && lastSwitchAt && (!lastLaunchAt || lastLaunchAt < lastSwitchAt || lastLaunchProfileKey !== currentProfileKey));
 	return {
 		...base,
-		state: stale ? "stale" : currentProfileKey && lastLaunchProfileKey === currentProfileKey ? "synced" : "unknown",
+		state: observedSynced ? "synced" : stale ? "stale" : "unknown",
 		appPath: candidate.appPath,
 		bundleId: candidate.bundleId,
 		runningPids: mainPids
@@ -82958,210 +83162,212 @@ async function getOfficialCodexProfileInstances() {
 	};
 }
 function launchOfficialCodexProfileInstance(options) {
-	return enqueueProfileAction(async () => {
-		if (process.platform !== "darwin") return {
-			status: "skipped",
-			profileName: options.profileName,
-			instance: null,
-			reason: "unsupported-platform"
-		};
-		const { candidate, mainPids } = await resolveCodexAppTarget();
-		if (!candidate) return {
-			status: "skipped",
-			profileName: options.profileName,
-			instance: null,
-			reason: "official-codex-app-not-found"
-		};
-		const existing = await readManagedInstance(options.profileName);
-		if (existing) {
-			const runtime = await resolveInstanceRuntimeState({
-				instance: existing,
-				candidate,
-				rows: await readProcessRows()
-			});
-			if (runtime.running) {
-				const verified = {
-					...existing,
-					profileHome: existing.profileHome ?? options.profileHome,
-					appServerPid: runtime.appServerPid,
-					lastVerifiedAt: Date.now(),
-					lastStatus: "already-running",
-					lastError: null
-				};
-				await patchManagedInstance(verified);
-				return {
-					status: "already-running",
-					profileName: options.profileName,
-					instance: managedInstanceToPayload(verified, true, runtime.appServerPid, runtime.startedAt),
-					reason: null
-				};
-			}
-		}
-		const launch = await openCodexWithProfileHome(candidate, options.profileHome, options.profileName, new Set(mainPids));
-		if (!launch.opened) {
-			const failed = {
-				profileName: options.profileName,
-				profileKey: options.profileKey,
-				profileHome: options.profileHome,
-				appPath: candidate.appPath,
-				bundleId: candidate.bundleId,
-				pid: null,
-				appServerPid: null,
-				launchedAt: null,
-				lastVerifiedAt: null,
-				lastStatus: "failed",
-				lastError: "open-failed"
-			};
-			await patchManagedInstance(failed);
-			return {
-				status: "failed",
-				profileName: options.profileName,
-				instance: managedInstanceToPayload(failed, false),
-				reason: "open-failed"
-			};
-		}
-		const launchedPid = launch.pid;
-		if (launchedPid === null) {
-			const failed = {
-				profileName: options.profileName,
-				profileKey: options.profileKey,
-				profileHome: options.profileHome,
-				appPath: candidate.appPath,
-				bundleId: candidate.bundleId,
-				pid: null,
-				appServerPid: null,
-				launchedAt: null,
-				lastVerifiedAt: null,
-				lastStatus: "failed",
-				lastError: "launch-timeout"
-			};
-			await patchManagedInstance(failed);
-			return {
-				status: "failed",
-				profileName: options.profileName,
-				instance: managedInstanceToPayload(failed, false),
-				reason: "launch-timeout"
-			};
-		}
-		const appServerPid = await waitForAppServerPid(launchedPid, options.profileHome);
-		if (appServerPid === null) {
-			const failed = {
-				profileName: options.profileName,
-				profileKey: options.profileKey,
-				profileHome: options.profileHome,
-				appPath: candidate.appPath,
-				bundleId: candidate.bundleId,
-				pid: null,
-				appServerPid: null,
-				launchedAt: null,
+	return enqueueProfileAction(() => launchOfficialCodexProfileInstanceOnce(options));
+}
+async function launchOfficialCodexProfileInstanceOnce(options) {
+	if (process.platform !== "darwin") return {
+		status: "skipped",
+		profileName: options.profileName,
+		instance: null,
+		reason: "unsupported-platform"
+	};
+	const { candidate, mainPids } = await resolveCodexAppTarget();
+	if (!candidate) return {
+		status: "skipped",
+		profileName: options.profileName,
+		instance: null,
+		reason: "official-codex-app-not-found"
+	};
+	const existing = await readManagedInstance(options.profileName);
+	if (existing) {
+		const runtime = await resolveInstanceRuntimeState({
+			instance: existing,
+			candidate,
+			rows: await readProcessRows()
+		});
+		if (runtime.running) {
+			const verified = {
+				...existing,
+				profileHome: existing.profileHome ?? options.profileHome,
+				appServerPid: runtime.appServerPid,
 				lastVerifiedAt: Date.now(),
-				lastStatus: "failed",
-				lastError: "app-server-not-verified"
+				lastStatus: "already-running",
+				lastError: null
 			};
-			await patchManagedInstance(failed);
+			await patchManagedInstance(verified);
 			return {
-				status: "failed",
+				status: "already-running",
 				profileName: options.profileName,
-				instance: managedInstanceToPayload(failed, false),
-				reason: "app-server-not-verified"
+				instance: managedInstanceToPayload(verified, true, runtime.appServerPid, runtime.startedAt),
+				reason: null
 			};
 		}
-		const now = Date.now();
-		const instance = {
+	}
+	const launch = await openCodexWithProfileHome(candidate, options.profileHome, options.profileName, new Set(mainPids));
+	if (!launch.opened) {
+		const failed = {
 			profileName: options.profileName,
 			profileKey: options.profileKey,
 			profileHome: options.profileHome,
 			appPath: candidate.appPath,
 			bundleId: candidate.bundleId,
-			pid: launchedPid,
-			appServerPid,
-			launchedAt: now,
-			lastVerifiedAt: now,
-			lastStatus: "started",
-			lastError: null
+			pid: null,
+			appServerPid: null,
+			launchedAt: null,
+			lastVerifiedAt: null,
+			lastStatus: "failed",
+			lastError: "open-failed"
 		};
-		await patchManagedInstance(instance);
+		await patchManagedInstance(failed);
 		return {
-			status: "started",
+			status: "failed",
 			profileName: options.profileName,
-			instance: managedInstanceToPayload(instance, true, appServerPid),
-			reason: null
+			instance: managedInstanceToPayload(failed, false),
+			reason: "open-failed"
 		};
-	});
+	}
+	const launchedPid = launch.pid;
+	if (launchedPid === null) {
+		const failed = {
+			profileName: options.profileName,
+			profileKey: options.profileKey,
+			profileHome: options.profileHome,
+			appPath: candidate.appPath,
+			bundleId: candidate.bundleId,
+			pid: null,
+			appServerPid: null,
+			launchedAt: null,
+			lastVerifiedAt: null,
+			lastStatus: "failed",
+			lastError: "launch-timeout"
+		};
+		await patchManagedInstance(failed);
+		return {
+			status: "failed",
+			profileName: options.profileName,
+			instance: managedInstanceToPayload(failed, false),
+			reason: "launch-timeout"
+		};
+	}
+	const appServerPid = await waitForAppServerPid(launchedPid, options.profileHome);
+	if (appServerPid === null) {
+		const failed = {
+			profileName: options.profileName,
+			profileKey: options.profileKey,
+			profileHome: options.profileHome,
+			appPath: candidate.appPath,
+			bundleId: candidate.bundleId,
+			pid: null,
+			appServerPid: null,
+			launchedAt: null,
+			lastVerifiedAt: Date.now(),
+			lastStatus: "failed",
+			lastError: "app-server-not-verified"
+		};
+		await patchManagedInstance(failed);
+		return {
+			status: "failed",
+			profileName: options.profileName,
+			instance: managedInstanceToPayload(failed, false),
+			reason: "app-server-not-verified"
+		};
+	}
+	const now = Date.now();
+	const instance = {
+		profileName: options.profileName,
+		profileKey: options.profileKey,
+		profileHome: options.profileHome,
+		appPath: candidate.appPath,
+		bundleId: candidate.bundleId,
+		pid: launchedPid,
+		appServerPid,
+		launchedAt: now,
+		lastVerifiedAt: now,
+		lastStatus: "started",
+		lastError: null
+	};
+	await patchManagedInstance(instance);
+	return {
+		status: "started",
+		profileName: options.profileName,
+		instance: managedInstanceToPayload(instance, true, appServerPid),
+		reason: null
+	};
 }
 function stopOfficialCodexProfileInstance(profileName) {
-	return enqueueProfileAction(async () => {
-		const existing = await readManagedInstance(profileName);
-		if (!existing) return {
+	return enqueueProfileAction(() => stopOfficialCodexProfileInstanceOnce(profileName));
+}
+async function stopOfficialCodexProfileInstanceOnce(profileName) {
+	const existing = await readManagedInstance(profileName);
+	if (!existing) return {
+		status: "not-running",
+		profileName,
+		instance: null,
+		reason: "not-managed"
+	};
+	const { candidate } = await resolveCodexAppTarget();
+	if (!candidate) {
+		const stopped = {
+			...existing,
+			pid: null,
+			appServerPid: null,
+			lastVerifiedAt: Date.now(),
+			lastStatus: "not-running",
+			lastError: "official-codex-app-not-found"
+		};
+		await patchManagedInstance(stopped);
+		return {
 			status: "not-running",
 			profileName,
-			instance: null,
-			reason: "not-managed"
+			instance: managedInstanceToPayload(stopped, false),
+			reason: "official-codex-app-not-found"
 		};
-		const { candidate } = await resolveCodexAppTarget();
-		if (!candidate) {
-			const stopped = {
-				...existing,
-				pid: null,
-				appServerPid: null,
-				lastVerifiedAt: Date.now(),
-				lastStatus: "not-running",
-				lastError: "official-codex-app-not-found"
-			};
-			await patchManagedInstance(stopped);
-			return {
-				status: "not-running",
-				profileName,
-				instance: managedInstanceToPayload(stopped, false),
-				reason: "official-codex-app-not-found"
-			};
-		}
-		const rows = await readProcessRows();
-		const runtime = await resolveInstanceRuntimeState({
-			instance: existing,
-			candidate,
-			rows
-		});
-		if (!runtime.running || !existing.pid) {
-			const stopped = {
-				...existing,
-				pid: null,
-				appServerPid: null,
-				lastVerifiedAt: Date.now(),
-				lastStatus: "not-running",
-				lastError: null
-			};
-			await patchManagedInstance(stopped);
-			return {
-				status: "not-running",
-				profileName,
-				instance: managedInstanceToPayload(stopped, false),
-				reason: null
-			};
-		}
-		const tree = [existing.pid, ...getDescendantPids(existing.pid, rows)].filter((pid, index, all) => all.indexOf(pid) === index).sort((a, b) => b - a);
-		await signalPids(tree, "SIGTERM");
-		if (!await waitForMainPidExit(existing.pid, 5e3)) {
-			await signalPids(tree, "SIGKILL");
-			await waitForMainPidExit(existing.pid, EXIT_WAIT_MS);
-		}
-		const stillRunning = (await readProcessRows()).some((row) => row.pid === existing.pid);
+	}
+	const rows = await readProcessRows();
+	const runtime = await resolveInstanceRuntimeState({
+		instance: existing,
+		candidate,
+		rows
+	});
+	if (!runtime.running || !existing.pid) {
 		const stopped = {
 			...existing,
-			pid: stillRunning ? existing.pid : null,
-			appServerPid: stillRunning ? runtime.appServerPid : null,
+			pid: null,
+			appServerPid: null,
 			lastVerifiedAt: Date.now(),
-			lastStatus: stillRunning ? "failed" : "stopped",
-			lastError: stillRunning ? "stop-timeout" : null
+			lastStatus: "not-running",
+			lastError: null
 		};
 		await patchManagedInstance(stopped);
 		return {
-			status: stillRunning ? "failed" : "stopped",
+			status: "not-running",
 			profileName,
-			instance: managedInstanceToPayload(stopped, stillRunning, stopped.appServerPid, runtime.startedAt),
-			reason: stillRunning ? "stop-timeout" : null
+			instance: managedInstanceToPayload(stopped, false),
+			reason: null
 		};
-	});
+	}
+	const tree = [existing.pid, ...getDescendantPids(existing.pid, rows)].filter((pid, index, all) => all.indexOf(pid) === index).sort((a, b) => b - a);
+	await signalPids(tree, "SIGTERM");
+	if (!await waitForMainPidExit(existing.pid, 5e3)) {
+		await signalPids(tree, "SIGKILL");
+		await waitForMainPidExit(existing.pid, EXIT_WAIT_MS);
+	}
+	const stillRunning = (await readProcessRows()).some((row) => row.pid === existing.pid);
+	const stopped = {
+		...existing,
+		pid: stillRunning ? existing.pid : null,
+		appServerPid: stillRunning ? runtime.appServerPid : null,
+		lastVerifiedAt: Date.now(),
+		lastStatus: stillRunning ? "failed" : "stopped",
+		lastError: stillRunning ? "stop-timeout" : null
+	};
+	await patchManagedInstance(stopped);
+	return {
+		status: stillRunning ? "failed" : "stopped",
+		profileName,
+		instance: managedInstanceToPayload(stopped, stillRunning, stopped.appServerPid, runtime.startedAt),
+		reason: stillRunning ? "stop-timeout" : null
+	};
 }
 function focusOfficialCodexProfileInstance(profileName) {
 	return enqueueProfileAction(async () => {
@@ -83298,24 +83504,15 @@ function stopOfficialCodexObservedProfileInstance(profileName, pid, appServerPid
 	});
 }
 async function restartOfficialCodexProfileInstance(options) {
-	const stopped = await stopOfficialCodexProfileInstance(options.profileName);
-	if (stopped.status === "failed") return stopped;
-	const launched = await launchOfficialCodexProfileInstance(options);
-	return {
-		...launched,
-		status: launched.status === "started" ? "restarted" : launched.status
-	};
-}
-function restartOfficialCodexApp(options = {}) {
-	if (restartPromise) return restartPromise;
-	restartPromise = restartOfficialCodexAppOnce({
-		source: options.source ?? "manual",
-		currentProfileKey: options.currentProfileKey ?? null,
-		launchIfNotRunning: options.launchIfNotRunning ?? (options.source ?? "manual") === "manual"
-	}).finally(() => {
-		restartPromise = null;
+	return enqueueProfileAction(async () => {
+		const stopped = await stopOfficialCodexProfileInstanceOnce(options.profileName);
+		if (stopped.status === "failed") return stopped;
+		const launched = await launchOfficialCodexProfileInstanceOnce(options);
+		return {
+			...launched,
+			status: launched.status === "started" ? "restarted" : launched.status
+		};
 	});
-	return restartPromise;
 }
 //#endregion
 //#region src/wsServer.ts
@@ -84170,6 +84367,57 @@ const createServer = fn(function* () {
 	};
 	const lowRemainingNotifications = /* @__PURE__ */ new Map();
 	const finitePercent = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.min(100, value)) : null;
+	const AUTO_ROLL_SNAPSHOT_MAX_AGE_MS = 3 * 6e4;
+	const AUTO_ROLL_WATCHDOG_INTERVAL_MS = 6e4;
+	const AUTO_ROLL_WATCHDOG_ACTIVITY_TTL_MS = 10 * 6e4;
+	const parseRateLimitTimestamp = (value) => {
+		if (!value) return null;
+		const parsed = Date.parse(value);
+		return Number.isFinite(parsed) ? parsed : null;
+	};
+	const createAutoRollDecisionId = () => `ar-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+	const buildSnapshotDiagnostic = (cached, profileSnapshot, fallbackSource = "none") => {
+		const candidates = [{
+			snapshot: cached ?? null,
+			source: "cache",
+			updatedAt: parseRateLimitTimestamp(cached?.lastUpdated)
+		}, {
+			snapshot: profileSnapshot ?? null,
+			source: "profile",
+			updatedAt: parseRateLimitTimestamp(profileSnapshot?.lastUpdated)
+		}].filter((entry) => Boolean(entry.snapshot));
+		candidates.sort((a, b) => (b.updatedAt ?? -Infinity) - (a.updatedAt ?? -Infinity));
+		const selected = candidates[0] ?? null;
+		const snapshot = selected?.snapshot ?? null;
+		const source = selected?.source ?? fallbackSource;
+		const updatedAt = parseRateLimitTimestamp(snapshot?.lastUpdated);
+		return {
+			snapshot,
+			source,
+			ageMs: updatedAt === null ? null : Math.max(0, Date.now() - updatedAt)
+		};
+	};
+	const freshAutoRollSnapshot = (snapshot) => {
+		if (!snapshot) return null;
+		const updatedAt = parseRateLimitTimestamp(snapshot.lastUpdated);
+		if (updatedAt === null || Date.now() - updatedAt >= AUTO_ROLL_SNAPSHOT_MAX_AGE_MS) return null;
+		const now = Date.now();
+		const keepWindow = (window) => {
+			if (!window || finitePercent(window.usedPercent) === null) return window;
+			const resetsAt = parseRateLimitTimestamp(window.resetsAt);
+			if (resetsAt !== null && resetsAt <= now) return;
+			return window;
+		};
+		return {
+			...snapshot,
+			primary: keepWindow(snapshot.primary),
+			secondary: keepWindow(snapshot.secondary)
+		};
+	};
+	const isSnapshotStaleForAutoRollWatchdog = (snapshot) => {
+		const updatedAt = parseRateLimitTimestamp(snapshot?.lastUpdated);
+		return updatedAt === null || Date.now() - updatedAt >= AUTO_ROLL_SNAPSHOT_MAX_AGE_MS;
+	};
 	const formatLowRemainingPercent = (value) => {
 		const rounded = Math.round(value * 10) / 10;
 		return (Number.isInteger(rounded) ? rounded.toFixed(0) : rounded.toFixed(1)).replace(/\.0$/, "");
@@ -84221,6 +84469,17 @@ const createServer = fn(function* () {
 				remainingPercent,
 				threshold: settings.lowRemainingNotificationThreshold
 			});
+			const snapshotUpdatedAt = parseRateLimitTimestamp(payload.snapshot.lastUpdated);
+			recordAutoRollActivitySafe({
+				kind: "low-remaining-alert",
+				status: "sent",
+				profileName: payload.profileName,
+				remainingPercent,
+				threshold: settings.lowRemainingNotificationThreshold,
+				snapshotAgeMs: snapshotUpdatedAt === null ? null : Math.max(0, Date.now() - snapshotUpdatedAt),
+				snapshotSource: "event",
+				profileKey: payload.accountId
+			});
 		}
 	};
 	const publishProfileSwitched = (payload) => {
@@ -84231,6 +84490,7 @@ const createServer = fn(function* () {
 	let backgroundAutoRollInFlight = false;
 	let lastAutoRollAttempt = null;
 	const autoRollRearmBlockedProfiles = /* @__PURE__ */ new Set();
+	const lastAutoRollWatchdogActivityAt = /* @__PURE__ */ new Map();
 	const rememberAutoRollAttempt = (source, target) => {
 		if (!source || !target) return;
 		lastAutoRollAttempt = {
@@ -84270,6 +84530,19 @@ const createServer = fn(function* () {
 		const profile = (await profileManager.listProfiles()).find((entry) => entry.name === profileName);
 		return profile ? resolveProfileIdentityKeyFromProfile(profile) : null;
 	};
+	const hashIdentityKey = (key) => key ? createHash("sha256").update(key).digest("hex").slice(0, 12) : null;
+	const observedOfficialCodexProfileMatches = (instance, targetProfileName, targetProfileKey) => {
+		if (targetProfileKey && instance.profileKey) return instance.profileKey === targetProfileKey;
+		if (instance.profileKey) return false;
+		return Boolean(targetProfileName && instance.profileName === targetProfileName);
+	};
+	const recordAutoRollActivitySafe = async (input) => {
+		try {
+			await recordOfficialCodexActivity(input);
+		} catch (error) {
+			logger.warn("Failed to record auto-roll activity", { error });
+		}
+	};
 	const prepareOfficialCodexProfileLaunch = async (profileName) => {
 		const profile = (await profileManager.listProfiles()).find((entry) => entry.name === profileName);
 		if (!profile) throw new Error(`Profile '${profileName}' was not found.`);
@@ -84332,17 +84605,68 @@ const createServer = fn(function* () {
 		}
 		return null;
 	};
+	const mapOfficialCodexAppAccountToProfile = async () => {
+		const scopePath = nodePath.join(nodeOs.homedir(), "Library", "Application Support", "Codex", "sentry", "scope_v3.json");
+		let parsed;
+		try {
+			parsed = JSON.parse(await promises.readFile(scopePath, "utf8"));
+		} catch {
+			return null;
+		}
+		const scope = parsed && typeof parsed === "object" ? parsed.scope : null;
+		const user = scope && typeof scope === "object" ? scope.user : null;
+		if (!user || typeof user !== "object") return null;
+		const userRecord = user;
+		const ids = new Set([userRecord.account_id, userRecord.id].filter((value) => typeof value === "string").map((value) => value.trim()).filter(Boolean));
+		if (ids.size === 0) return null;
+		const profiles = await profileManager.listProfiles();
+		for (const profile of profiles) if ([
+			profile.accountId,
+			profile.metadata?.chatgptAccountUserId,
+			profile.metadata?.chatgptUserId,
+			profile.metadata?.userId,
+			resolveProfileIdentityKeyFromProfile(profile)
+		].filter((value) => typeof value === "string" && value.length > 0).some((value) => ids.has(value))) return {
+			name: profile.name,
+			key: resolveProfileIdentityKeyFromProfile(profile)
+		};
+		return null;
+	};
 	const enrichOfficialCodexInstances = async (payload) => {
 		if (payload.unmanaged.length === 0) return payload;
-		const defaultProfile = await mapDefaultCodexAuthToProfile();
-		if (!defaultProfile) return payload;
+		const hasManagedRunning = payload.instances.some((instance) => instance.running);
+		const [defaultProfile, appAccountProfile, appState] = await Promise.all([
+			mapDefaultCodexAuthToProfile(),
+			!hasManagedRunning && payload.unmanaged.length === 1 && payload.unmanaged[0]?.appServerPid ? mapOfficialCodexAppAccountToProfile() : Promise.resolve(null),
+			getAppState()
+		]);
+		const lastProfileSwitchAt = appState.officialCodex.lastProfileSwitchAt;
+		const lastObservedPid = appState.officialCodex.lastObservedPid;
+		const lastVerifiedLaunchProfileKey = appState.officialCodex.lastVerifiedLaunchProfileKey;
+		const isFreshDefaultAuthObservation = (instance) => {
+			if (!defaultProfile) return false;
+			if (lastObservedPid && instance.pid === lastObservedPid && lastVerifiedLaunchProfileKey === defaultProfile.key) return true;
+			if (!lastProfileSwitchAt) return true;
+			const startedAt = parseRateLimitTimestamp(instance.startedAt);
+			return startedAt !== null && startedAt >= lastProfileSwitchAt - 1e3;
+		};
 		return {
 			...payload,
-			unmanaged: payload.unmanaged.map((instance) => instance.profileName || !instance.appServerPid ? instance : {
-				...instance,
-				profileName: defaultProfile.name,
-				profileKey: defaultProfile.key,
-				profileMatchSource: "default-auth"
+			unmanaged: payload.unmanaged.map((instance) => {
+				if (instance.profileName || !instance.appServerPid) return instance;
+				if (appAccountProfile) return {
+					...instance,
+					profileName: appAccountProfile.name,
+					profileKey: appAccountProfile.key,
+					profileMatchSource: "app-account"
+				};
+				if (defaultProfile && isFreshDefaultAuthObservation(instance)) return {
+					...instance,
+					profileName: defaultProfile.name,
+					profileKey: defaultProfile.key,
+					profileMatchSource: "default-auth"
+				};
+				return instance;
 			})
 		};
 	};
@@ -84356,6 +84680,62 @@ const createServer = fn(function* () {
 			bundleId: instances.bundleId
 		} : null;
 	};
+	const resolveOfficialCodexStatus = async (currentProfile) => {
+		const currentProfileKey = currentProfile ? resolveProfileIdentityKeyFromProfile(currentProfile) : null;
+		const base = await getOfficialCodexSyncStatus(currentProfileKey);
+		if (base.state === "unsupported" || base.state === "not-found" || base.state === "not-running") return base;
+		try {
+			const instances = await enrichOfficialCodexInstances(await getOfficialCodexProfileInstances());
+			const managed = instances.instances.filter((instance) => instance.running).map((instance) => ({
+				profileName: instance.profileName,
+				profileKey: instance.profileKey,
+				pid: instance.pid,
+				source: "managed"
+			}));
+			const unmanaged = instances.unmanaged.map((instance) => ({
+				profileName: instance.profileName ?? null,
+				profileKey: instance.profileKey ?? null,
+				pid: instance.pid,
+				source: instance.profileMatchSource ?? null
+			}));
+			const observedCandidates = unmanaged;
+			const observed = observedCandidates.find((instance) => observedOfficialCodexProfileMatches(instance, currentProfile?.name ?? null, currentProfileKey)) ?? observedCandidates.find((instance) => instance.profileName || instance.profileKey) ?? null;
+			if (!observed) {
+				if (managed.length > 0 && unmanaged.length === 0) return {
+					...base,
+					state: "not-running",
+					runningPids: [],
+					observedProfileName: null,
+					observedProfileKeyHash: null,
+					observedProfileMatchSource: null
+				};
+				if (base.state === "stale") return {
+					...base,
+					observedProfileName: null,
+					observedProfileKeyHash: null,
+					observedProfileMatchSource: null
+				};
+				return base;
+			}
+			const matched = Boolean(observedOfficialCodexProfileMatches(observed, currentProfile?.name ?? null, currentProfileKey));
+			if (matched && currentProfileKey && observed.pid) try {
+				const stored = (await getAppState()).officialCodex;
+				if (stored.lastVerifiedLaunchProfileKey !== currentProfileKey || stored.lastObservedPid !== observed.pid) await recordOfficialCodexProfileObservation(currentProfileKey, observed.pid);
+			} catch (error) {
+				logger.warn("Failed to record observed Official Codex profile", { error });
+			}
+			return {
+				...base,
+				state: currentProfile ? matched ? "synced" : "stale" : base.state,
+				observedProfileName: observed.profileName,
+				observedProfileKeyHash: hashIdentityKey(observed.profileKey),
+				observedProfileMatchSource: observed.source
+			};
+		} catch (error) {
+			logger.warn("Failed to resolve observed Official Codex profile", { error });
+			return base;
+		}
+	};
 	const resolveAutoRollRearmActionAfterManualSwitch = async (profileName) => {
 		const settings = normalizeAutoRollSettings(await getStoredAutoRollSettings());
 		if (!settings.enabled) return "none";
@@ -84366,30 +84746,471 @@ const createServer = fn(function* () {
 		if (!summary.hasUsage) return "unblock";
 		return summary.remainingPercent <= settings.switchRemainingThreshold ? "block" : "unblock";
 	};
-	const maybeRestartOfficialCodexAfterAutoRoll = async (targetProfileName, targetProfileKey) => {
+	const OFFICIAL_CODEX_RESTART_DEBT_MAX_ATTEMPTS = 5;
+	const OFFICIAL_CODEX_RESTART_RETRY_DELAY_MS = 61e3;
+	const OFFICIAL_CODEX_POST_RESTART_VERIFY_TIMEOUT_MS = 15e3;
+	const OFFICIAL_CODEX_POST_RESTART_VERIFY_INTERVAL_MS = 750;
+	let officialCodexRestartRetryTimer = null;
+	let officialCodexRestartDebt = null;
+	const persistOfficialCodexRestartDebt = async (debt) => {
+		await patchAppState({ officialCodex: { pendingRestartDebt: debt } });
+	};
+	const clearOfficialCodexRestartDebtLocal = () => {
+		officialCodexRestartDebt = null;
+		if (officialCodexRestartRetryTimer) {
+			clearTimeout(officialCodexRestartRetryTimer);
+			officialCodexRestartRetryTimer = null;
+		}
+	};
+	const clearOfficialCodexRestartDebt = async () => {
+		clearOfficialCodexRestartDebtLocal();
+		await persistOfficialCodexRestartDebt(null);
+	};
+	const rememberOfficialCodexRestartDebt = async (targetProfileName, targetProfileKey, reason, decisionId = null, sourceProfileName, sourceProfileKey) => {
+		const previous = officialCodexRestartDebt?.targetProfileName === targetProfileName ? officialCodexRestartDebt : null;
+		officialCodexRestartDebt = {
+			targetProfileName,
+			targetProfileKey,
+			sourceProfileName: sourceProfileName !== void 0 ? sourceProfileName : previous?.sourceProfileName ?? null,
+			sourceProfileKey: sourceProfileKey !== void 0 ? sourceProfileKey : previous?.sourceProfileKey ?? null,
+			decisionId: decisionId ?? previous?.decisionId ?? null,
+			attempts: previous?.attempts ?? 0,
+			lastReason: reason
+		};
+		await persistOfficialCodexRestartDebt(officialCodexRestartDebt);
+	};
+	const getOfficialCodexRestartDebt = async () => {
+		if (officialCodexRestartDebt) return officialCodexRestartDebt;
+		const stored = (await getAppState()).officialCodex.pendingRestartDebt;
+		if (!stored) return null;
+		officialCodexRestartDebt = {
+			...stored,
+			attempts: Math.max(0, stored.attempts)
+		};
+		return officialCodexRestartDebt;
+	};
+	const resolveObservedOfficialCodexProfileMatch = async (targetProfileName, targetProfileKey) => {
+		const instances = await enrichOfficialCodexInstances(await getOfficialCodexProfileInstances());
+		const observed = [...instances.instances.filter((instance) => instance.running).map((instance) => ({
+			profileName: instance.profileName,
+			profileKey: instance.profileKey,
+			pid: instance.pid,
+			appServerPid: instance.appServerPid,
+			source: "managed"
+		})), ...instances.unmanaged.map((instance) => ({
+			profileName: instance.profileName ?? null,
+			profileKey: instance.profileKey ?? null,
+			pid: instance.pid,
+			appServerPid: instance.appServerPid,
+			source: instance.profileMatchSource ?? null
+		}))].filter((instance) => instance.profileName || instance.profileKey || instance.pid);
+		const matchedObserved = observed.find((instance) => observedOfficialCodexProfileMatches(instance, targetProfileName, targetProfileKey)) ?? null;
+		const restartableObserved = observed.filter((instance) => instance.source !== "managed" && instance.pid);
+		const singletonRestartableObserved = restartableObserved.length === 1 ? restartableObserved[0] : null;
+		const firstObserved = matchedObserved ?? singletonRestartableObserved ?? observed[0] ?? null;
+		return {
+			matched: Boolean(matchedObserved),
+			canStopObservedWindow: Boolean(firstObserved?.pid && firstObserved.source !== "managed" && (matchedObserved || singletonRestartableObserved === firstObserved)),
+			ambiguousRestartableWindow: !matchedObserved && restartableObserved.length > 1,
+			state: instances.state,
+			observedProfileName: firstObserved?.profileName ?? null,
+			observedProfileKey: firstObserved?.profileKey ?? null,
+			observedProfileMatchSource: firstObserved?.source ?? null,
+			pid: firstObserved?.pid ?? null,
+			appServerPid: firstObserved?.appServerPid ?? null
+		};
+	};
+	const recordTargetedOfficialCodexRestartResult = async (payload, targetProfileName, targetProfileKey, decisionId) => {
+		const pid = payload.status === "started" || payload.status === "restarted" ? payload.pid : null;
+		const reason = payload.status === "skipped" || payload.status === "failed" ? payload.reason : null;
+		await recordOfficialCodexRestartResult({
+			status: payload.status,
+			reason,
+			profileKey: targetProfileKey,
+			pid
+		});
+		await recordAutoRollActivitySafe({
+			kind: "official-codex-restart",
+			status: payload.status,
+			reason,
+			decisionId,
+			targetProfileName,
+			profileKey: targetProfileKey,
+			phase: payload.status === "failed" ? payload.phase ?? null : "profile",
+			pid,
+			restartRequested: true,
+			restartResult: payload.status
+		});
+	};
+	const profileActionToRestartPayload = (action, runningStatus, failedPhase) => {
+		if (action.status === "failed") return {
+			status: "failed",
+			appPath: action.instance?.appPath ?? void 0,
+			bundleId: action.instance?.bundleId ?? void 0,
+			reason: action.reason ?? "official-codex-profile-action-failed",
+			phase: failedPhase
+		};
+		if (action.status === "started" || action.status === "restarted") return {
+			status: runningStatus,
+			appPath: action.instance?.appPath ?? "",
+			bundleId: action.instance?.bundleId ?? "",
+			pid: action.instance?.pid ?? null
+		};
+		if (action.status === "already-running") return {
+			status: "skipped",
+			reason: "already-running"
+		};
+		if (action.status === "skipped" || action.status === "not-running") return {
+			status: "skipped",
+			reason: action.reason ?? "official-codex-app-not-running"
+		};
+		return {
+			status: "skipped",
+			reason: action.status
+		};
+	};
+	let officialCodexRestartTargetLock = Promise.resolve();
+	let officialCodexRestartTargetIntent = 0;
+	const enqueueOfficialCodexRestartTarget = (work) => {
+		const run = officialCodexRestartTargetLock.then(work, work);
+		officialCodexRestartTargetLock = run.then(() => void 0, () => void 0);
+		return run;
+	};
+	const restartOfficialCodexProfileTarget = async (args) => {
+		const intent = ++officialCodexRestartTargetIntent;
+		return enqueueOfficialCodexRestartTarget(() => restartOfficialCodexProfileTargetOnce(args, intent));
+	};
+	const restartOfficialCodexProfileTargetOnce = async (args, intent) => {
+		const isCurrentIntent = () => intent === officialCodexRestartTargetIntent;
+		const skipSuperseded = async (phase) => {
+			const skipped = {
+				status: "skipped",
+				reason: "superseded-by-newer-profile-target"
+			};
+			await recordAutoRollActivitySafe({
+				kind: "official-codex-restart",
+				status: skipped.status,
+				reason: skipped.reason,
+				decisionId: args.decisionId,
+				targetProfileName: args.targetProfileName,
+				profileKey: args.targetProfileKey,
+				phase,
+				restartRequested: false,
+				restartResult: skipped.status
+			});
+			return skipped;
+		};
+		if (!isCurrentIntent()) return skipSuperseded("queued");
+		await recordAutoRollActivitySafe({
+			kind: "official-codex-restart",
+			status: "started",
+			reason: null,
+			decisionId: args.decisionId,
+			targetProfileName: args.targetProfileName,
+			profileKey: args.targetProfileKey,
+			phase: "profile",
+			restartRequested: true
+		});
+		if (!isCurrentIntent()) return skipSuperseded("start");
+		const observed = await resolveObservedOfficialCodexProfileMatch(args.targetProfileName, args.targetProfileKey);
+		if (!isCurrentIntent()) return skipSuperseded("observe");
+		const canRestartManagedWindow = Boolean(observed.pid !== null && observed.observedProfileMatchSource === "managed" && observed.matched);
+		const canStopMatchedObservedWindow = Boolean(observed.pid !== null && observed.matched && observed.observedProfileMatchSource !== "managed" && observed.canStopObservedWindow);
+		const observedMatchesSource = !observed.matched && Boolean(args.sourceProfileName || args.sourceProfileKey) && observedOfficialCodexProfileMatches({
+			profileName: observed.observedProfileName,
+			profileKey: observed.observedProfileKey
+		}, args.sourceProfileName ?? null, args.sourceProfileKey ?? null);
+		const canStopSourceManagedWindow = Boolean(observed.pid !== null && observedMatchesSource && observed.observedProfileMatchSource === "managed" && args.sourceProfileName);
+		const canStopSourceObservedWindow = Boolean(observed.pid !== null && observedMatchesSource && observed.observedProfileMatchSource !== "managed" && observed.canStopObservedWindow);
+		const hasRestartableWindow = canRestartManagedWindow || canStopMatchedObservedWindow || canStopSourceManagedWindow || canStopSourceObservedWindow;
+		if (!hasRestartableWindow && observed.ambiguousRestartableWindow) {
+			const skipped = {
+				status: "skipped",
+				reason: "ambiguous-official-codex-windows"
+			};
+			await recordTargetedOfficialCodexRestartResult(skipped, args.targetProfileName, args.targetProfileKey, args.decisionId);
+			return skipped;
+		}
+		if (!hasRestartableWindow && !args.launchIfNotRunning) {
+			const skipped = {
+				status: "skipped",
+				reason: observed.state === "unsupported" ? "unsupported-platform" : observed.state === "not-found" ? "official-codex-app-not-found" : observed.pid !== null ? "unverified-official-codex-window" : "official-codex-app-not-running"
+			};
+			await recordTargetedOfficialCodexRestartResult(skipped, args.targetProfileName, args.targetProfileKey, args.decisionId);
+			return skipped;
+		}
+		const options = await prepareOfficialCodexProfileLaunch(args.targetProfileName);
+		if (!isCurrentIntent()) return skipSuperseded("prepare");
+		if (observed.observedProfileMatchSource === "managed" && observed.matched) {
+			const action = await restartOfficialCodexProfileInstance(options);
+			if (!isCurrentIntent()) {
+				if (action.status === "started" || action.status === "restarted") await stopOfficialCodexProfileInstance(args.targetProfileName).catch((error) => {
+					logger.warn("Failed to stop superseded Official Codex profile", {
+						error,
+						profileName: args.targetProfileName
+					});
+				});
+				return skipSuperseded("profile");
+			}
+			const payload = profileActionToRestartPayload(action, "restarted", "profile");
+			await recordTargetedOfficialCodexRestartResult(payload, args.targetProfileName, args.targetProfileKey, args.decisionId);
+			return payload;
+		}
+		let stoppedRunningWindow = false;
+		if (canStopMatchedObservedWindow && observed.pid !== null) {
+			const stopped = await stopOfficialCodexObservedProfileInstance(observed.observedProfileName ?? args.targetProfileName, observed.pid, observed.appServerPid);
+			if (stopped.status === "failed") {
+				const failed = profileActionToRestartPayload(stopped, "restarted", "quit");
+				await recordTargetedOfficialCodexRestartResult(failed, args.targetProfileName, args.targetProfileKey, args.decisionId);
+				return failed;
+			}
+			stoppedRunningWindow = stopped.status === "stopped";
+		} else if (canStopSourceManagedWindow && args.sourceProfileName) {
+			const stopped = await stopOfficialCodexProfileInstance(args.sourceProfileName);
+			if (stopped.status === "failed") {
+				const failed = profileActionToRestartPayload(stopped, "restarted", "quit");
+				await recordTargetedOfficialCodexRestartResult(failed, args.targetProfileName, args.targetProfileKey, args.decisionId);
+				return failed;
+			}
+			stoppedRunningWindow = stopped.status === "stopped";
+		} else if (canStopSourceObservedWindow && observed.pid !== null) {
+			const stopped = await stopOfficialCodexObservedProfileInstance(observed.observedProfileName ?? args.sourceProfileName ?? args.targetProfileName, observed.pid, observed.appServerPid);
+			if (stopped.status === "failed") {
+				const failed = profileActionToRestartPayload(stopped, "restarted", "quit");
+				await recordTargetedOfficialCodexRestartResult(failed, args.targetProfileName, args.targetProfileKey, args.decisionId);
+				return failed;
+			}
+			stoppedRunningWindow = stopped.status === "stopped";
+		}
+		if (!isCurrentIntent()) return skipSuperseded("quit");
+		const launched = await launchOfficialCodexProfileInstance(options);
+		if (!isCurrentIntent()) {
+			if (launched.status === "started" || launched.status === "restarted") await stopOfficialCodexProfileInstance(args.targetProfileName).catch((error) => {
+				logger.warn("Failed to stop superseded Official Codex profile", {
+					error,
+					profileName: args.targetProfileName
+				});
+			});
+			return skipSuperseded("launch");
+		}
+		const payload = profileActionToRestartPayload(launched, stoppedRunningWindow ? "restarted" : "started", "launch");
+		await recordTargetedOfficialCodexRestartResult(payload, args.targetProfileName, args.targetProfileKey, args.decisionId);
+		return payload;
+	};
+	const waitForOfficialCodexProfileMatch = async (targetProfileName, targetProfileKey) => {
+		const deadline = Date.now() + OFFICIAL_CODEX_POST_RESTART_VERIFY_TIMEOUT_MS;
+		let latest = await resolveObservedOfficialCodexProfileMatch(targetProfileName, targetProfileKey);
+		while (!latest.matched && Date.now() < deadline) {
+			await new Promise((resolve) => setTimeout(resolve, OFFICIAL_CODEX_POST_RESTART_VERIFY_INTERVAL_MS));
+			latest = await resolveObservedOfficialCodexProfileMatch(targetProfileName, targetProfileKey);
+		}
+		return latest;
+	};
+	const scheduleOfficialCodexRestartRetry = () => {
+		const debt = officialCodexRestartDebt;
+		if (!debt || officialCodexRestartRetryTimer) return;
+		if (debt.attempts >= OFFICIAL_CODEX_RESTART_DEBT_MAX_ATTEMPTS) {
+			clearOfficialCodexRestartDebt().catch((error) => {
+				logger.warn("Failed to clear Official Codex restart debt", { error });
+			});
+			recordAutoRollActivitySafe({
+				kind: "official-codex-restart",
+				status: "skipped",
+				reason: "restart-retry-exhausted",
+				decisionId: debt.decisionId,
+				targetProfileName: debt.targetProfileName,
+				profileKey: debt.targetProfileKey,
+				restartRequested: false,
+				restartResult: "skipped"
+			});
+			return;
+		}
+		const delayMs = Math.min(5 * 6e4, OFFICIAL_CODEX_RESTART_RETRY_DELAY_MS * Math.max(1, debt.attempts + 1));
+		officialCodexRestartRetryTimer = setTimeout(() => {
+			officialCodexRestartRetryTimer = null;
+			(async () => {
+				const debt = officialCodexRestartDebt;
+				if (!debt) return;
+				if ((await resolveObservedOfficialCodexProfileMatch(debt.targetProfileName, debt.targetProfileKey)).matched) {
+					await clearOfficialCodexRestartDebt();
+					return;
+				}
+				if (officialCodexRestartDebt) {
+					officialCodexRestartDebt = {
+						...officialCodexRestartDebt,
+						attempts: officialCodexRestartDebt.attempts + 1
+					};
+					await persistOfficialCodexRestartDebt(officialCodexRestartDebt);
+					await maybeRestartOfficialCodexAfterAutoRoll(officialCodexRestartDebt.targetProfileName, officialCodexRestartDebt.targetProfileKey, officialCodexRestartDebt.decisionId, officialCodexRestartDebt.sourceProfileName, officialCodexRestartDebt.sourceProfileKey);
+				}
+			})().catch((error) => {
+				logger.warn("Official Codex restart retry failed", { error });
+			});
+		}, delayMs);
+		officialCodexRestartRetryTimer.unref?.();
+	};
+	const reconcileOfficialCodexRestartDebt = async () => {
+		const debt = await getOfficialCodexRestartDebt();
+		if (!debt) return;
+		const settings = normalizeAutoRollSettings(await getStoredAutoRollSettings());
+		if (!settings.restartOfficialCodexOnAutoRoll) {
+			await clearOfficialCodexRestartDebt();
+			return;
+		}
+		const targetProfile = (await profileManager.listProfiles()).find((profile) => profile.name === debt.targetProfileName) ?? null;
+		if ((await resolveObservedOfficialCodexProfileMatch(debt.targetProfileName, debt.targetProfileKey)).matched) {
+			await clearOfficialCodexRestartDebt();
+			return;
+		}
+		const status = targetProfile ? await resolveOfficialCodexStatus(targetProfile) : await getOfficialCodexSyncStatus(debt.targetProfileKey);
+		if (status.state === "synced") {
+			await rememberOfficialCodexRestartDebt(debt.targetProfileName, debt.targetProfileKey, "launched-auth-unverified", debt.decisionId);
+			scheduleOfficialCodexRestartRetry();
+			return;
+		}
+		if (status.state === "not-running" && !settings.launchOfficialCodexWhenClosedOnAutoRoll) {
+			await clearOfficialCodexRestartDebt();
+			return;
+		}
+		if (status.state === "stale" || status.state === "unknown" || status.state === "not-running" && settings.launchOfficialCodexWhenClosedOnAutoRoll) scheduleOfficialCodexRestartRetry();
+	};
+	const maybeRestartOfficialCodexAfterAutoRoll = async (targetProfileName, targetProfileKey, decisionId, sourceProfileName = null, sourceProfileKey = null) => {
 		try {
 			const settings = normalizeAutoRollSettings(await getStoredAutoRollSettings());
-			if (!settings.restartOfficialCodexOnAutoRoll) return;
-			const result = await restartOfficialCodexApp({
-				source: "auto-roll",
-				currentProfileKey: targetProfileKey,
-				launchIfNotRunning: settings.launchOfficialCodexWhenClosedOnAutoRoll
+			if (!settings.restartOfficialCodexOnAutoRoll) {
+				await clearOfficialCodexRestartDebt();
+				return;
+			}
+			const alreadyMatched = await resolveObservedOfficialCodexProfileMatch(targetProfileName, targetProfileKey);
+			if (alreadyMatched.matched) {
+				await clearOfficialCodexRestartDebt();
+				await recordAutoRollActivitySafe({
+					kind: "official-codex-restart",
+					status: "skipped",
+					reason: "already-synced",
+					decisionId,
+					targetProfileName,
+					profileKey: targetProfileKey,
+					restartRequested: false,
+					restartResult: "skipped",
+					observedProfileName: alreadyMatched.observedProfileName,
+					observedProfileKey: alreadyMatched.observedProfileKey,
+					observedProfileMatchSource: alreadyMatched.observedProfileMatchSource
+				});
+				return;
+			}
+			await rememberOfficialCodexRestartDebt(targetProfileName, targetProfileKey, null, decisionId, sourceProfileName, sourceProfileKey);
+			const result = await restartOfficialCodexProfileTarget({
+				targetProfileName,
+				targetProfileKey,
+				sourceProfileName,
+				sourceProfileKey,
+				launchIfNotRunning: settings.launchOfficialCodexWhenClosedOnAutoRoll,
+				decisionId
 			});
 			trackAnalyticsEvent("official_codex_restart_after_auto_roll", {
 				status: result.status,
-				reason: result.status === "skipped" || result.status === "failed" ? result.reason : void 0,
-				targetProfileName
+				reason: result.status === "skipped" || result.status === "failed" ? result.reason : void 0
 			});
+			if (result.status === "skipped" && result.reason === "cooldown") {
+				await rememberOfficialCodexRestartDebt(targetProfileName, targetProfileKey, "cooldown", decisionId);
+				await reconcileOfficialCodexRestartDebt();
+			} else if (result.status === "skipped" && result.reason === "official-codex-app-not-running" && !settings.launchOfficialCodexWhenClosedOnAutoRoll) await clearOfficialCodexRestartDebt();
+			else if (result.status === "skipped" && result.reason === "superseded-by-newer-profile-target") {
+				if ((await getOfficialCodexRestartDebt())?.targetProfileName === targetProfileName) await clearOfficialCodexRestartDebt();
+			} else if (result.status === "skipped" || result.status === "failed") {
+				await rememberOfficialCodexRestartDebt(targetProfileName, targetProfileKey, result.reason, decisionId);
+				await reconcileOfficialCodexRestartDebt();
+			} else {
+				const verified = await waitForOfficialCodexProfileMatch(targetProfileName, targetProfileKey);
+				if (verified.matched) {
+					await recordAutoRollActivitySafe({
+						kind: "official-codex-restart",
+						status: "auth-verified",
+						reason: null,
+						decisionId,
+						targetProfileName,
+						profileKey: targetProfileKey,
+						restartRequested: true,
+						restartResult: result.status,
+						observedProfileName: verified.observedProfileName,
+						observedProfileKey: verified.observedProfileKey,
+						observedProfileMatchSource: verified.observedProfileMatchSource
+					});
+					await clearOfficialCodexRestartDebt();
+				} else {
+					await rememberOfficialCodexRestartDebt(targetProfileName, targetProfileKey, "launched-auth-unverified", decisionId);
+					await recordAutoRollActivitySafe({
+						kind: "official-codex-restart",
+						status: "waiting",
+						reason: "launched-auth-unverified",
+						decisionId,
+						targetProfileName,
+						profileKey: targetProfileKey,
+						restartRequested: true,
+						restartResult: result.status,
+						observedProfileName: verified.observedProfileName,
+						observedProfileKey: verified.observedProfileKey,
+						observedProfileMatchSource: verified.observedProfileMatchSource
+					});
+					await reconcileOfficialCodexRestartDebt();
+				}
+			}
 			if (result.status === "failed") logger.warn("Official Codex restart after auto-roll failed", result);
 			else if (result.status === "restarted" || result.status === "started") logger.info("Official Codex restarted after auto-roll", result);
 		} catch (error) {
+			await rememberOfficialCodexRestartDebt(targetProfileName, targetProfileKey, error instanceof Error ? error.message : "restart-threw", decisionId);
+			await recordAutoRollActivitySafe({
+				kind: "official-codex-restart",
+				status: "failed",
+				reason: error instanceof Error ? error.message : "restart-threw",
+				decisionId,
+				targetProfileName,
+				profileKey: targetProfileKey,
+				restartRequested: true,
+				restartResult: "failed"
+			});
+			scheduleOfficialCodexRestartRetry();
 			logger.warn("Official Codex restart after auto-roll threw", { error });
 		}
 	};
-	const handleProfileSwitch = async (name, source = "app") => {
+	const handleProfileSwitch = async (name, source = "app", decisionContext = {}) => {
 		if (!name) throw new Error("Profile name is required");
 		const previousProfile = source === "auto-roll" ? (await profileManager.getCurrentProfile()).name ?? null : null;
+		const previousProfileKey = source === "auto-roll" ? await resolveProfileIdentityKeyByName(previousProfile) : null;
 		await profileManager.switchToProfile(name);
+		if (source === "auto-roll") {
+			const verified = await profileManager.getCurrentProfile();
+			if (verified.name !== name || !verified.trusted) {
+				await recordAutoRollActivitySafe({
+					kind: "auth-verified",
+					status: "failed",
+					reason: "active-auth-mismatch-after-switch",
+					decisionId: decisionContext.decisionId,
+					sourceProfileName: previousProfile,
+					targetProfileName: name,
+					remainingPercent: decisionContext.remainingPercent,
+					threshold: decisionContext.threshold,
+					snapshotAgeMs: decisionContext.snapshotAgeMs,
+					snapshotSource: decisionContext.snapshotSource,
+					switchVerified: false
+				});
+				throw new Error("Auto-roll profile switch did not verify active Codex auth.");
+			}
+			await recordAutoRollActivitySafe({
+				kind: "auth-verified",
+				status: "ok",
+				reason: null,
+				decisionId: decisionContext.decisionId,
+				sourceProfileName: previousProfile,
+				targetProfileName: name,
+				remainingPercent: decisionContext.remainingPercent,
+				threshold: decisionContext.threshold,
+				snapshotAgeMs: decisionContext.snapshotAgeMs,
+				snapshotSource: decisionContext.snapshotSource,
+				switchVerified: true
+			});
+		}
 		let targetProfileKey = null;
 		try {
 			targetProfileKey = await resolveProfileIdentityKeyByName(name);
@@ -84400,23 +85221,60 @@ const createServer = fn(function* () {
 				profileName: name
 			});
 		}
-		if (source === "auto-roll") rememberAutoRollAttempt(previousProfile, name);
-		else try {
-			const rearmAction = await resolveAutoRollRearmActionAfterManualSwitch(name);
-			if (rearmAction === "block") blockAutoRollUntilRearm(name);
-			else if (rearmAction === "unblock") unblockAutoRollRearm(name);
-		} catch (error) {
-			logger.warn("Failed to evaluate auto-roll rearm block after manual switch", {
-				error,
-				profileName: name
+		if (source === "auto-roll") {
+			rememberAutoRollAttempt(previousProfile, name);
+			await recordAutoRollActivitySafe({
+				kind: "profile-switch",
+				status: "completed",
+				reason: null,
+				decisionId: decisionContext.decisionId,
+				sourceProfileName: previousProfile,
+				targetProfileName: name,
+				remainingPercent: decisionContext.remainingPercent,
+				threshold: decisionContext.threshold,
+				snapshotAgeMs: decisionContext.snapshotAgeMs,
+				snapshotSource: decisionContext.snapshotSource,
+				profileKey: targetProfileKey,
+				switchVerified: true,
+				restartRequested: decisionContext.restartRequested ?? null
 			});
+		} else {
+			officialCodexRestartTargetIntent += 1;
+			const pendingRestart = await getOfficialCodexRestartDebt();
+			if (pendingRestart && pendingRestart.targetProfileName !== name) {
+				await clearOfficialCodexRestartDebt();
+				await recordAutoRollActivitySafe({
+					kind: "official-codex-restart",
+					status: "skipped",
+					reason: "manual-profile-switch-superseded-restart",
+					decisionId: pendingRestart.decisionId,
+					sourceProfileName: pendingRestart.sourceProfileName,
+					targetProfileName: pendingRestart.targetProfileName,
+					profileKey: pendingRestart.targetProfileKey,
+					restartRequested: false,
+					restartResult: "skipped"
+				});
+			}
+			try {
+				const rearmAction = await resolveAutoRollRearmActionAfterManualSwitch(name);
+				if (rearmAction === "block") blockAutoRollUntilRearm(name);
+				else if (rearmAction === "unblock") unblockAutoRollRearm(name);
+			} catch (error) {
+				logger.warn("Failed to evaluate auto-roll rearm block after manual switch", {
+					error,
+					profileName: name
+				});
+			}
 		}
 		await publishProfileSwitched({ name });
 		trackAnalyticsEvent("profile_switched", { source });
-		if (source === "auto-roll") await maybeRestartOfficialCodexAfterAutoRoll(name, targetProfileKey);
+		if (source === "auto-roll") await maybeRestartOfficialCodexAfterAutoRoll(name, targetProfileKey, decisionContext.decisionId ?? null, previousProfile, previousProfileKey);
+		else maybeRunBackgroundAutoRoll();
 	};
 	const maybeRunBackgroundAutoRoll = async () => {
 		if (backgroundAutoRollInFlight) return;
+		const decisionId = createAutoRollDecisionId();
+		let lastDecisionContext = { decisionId };
 		backgroundAutoRollInFlight = true;
 		try {
 			const settings = normalizeAutoRollSettings(await getStoredAutoRollSettings());
@@ -84428,9 +85286,12 @@ const createServer = fn(function* () {
 			const profiles = await profileManager.listProfiles();
 			const snapshots = await loadCachedRateLimitSnapshots(profiles.map((profile) => resolveProfileIdentityKeyFromProfile(profile)));
 			const usageSummaries = /* @__PURE__ */ new Map();
+			const snapshotDiagnostics = /* @__PURE__ */ new Map();
 			const profilesWithSnapshots = profiles.map((profile) => {
 				const accountId = resolveProfileIdentityKeyFromProfile(profile);
-				const snapshot = snapshots.get(accountId) ?? profile.rateLimit ?? null;
+				const diagnostic = buildSnapshotDiagnostic(snapshots.get(accountId) ?? null, profile.rateLimit ?? null);
+				snapshotDiagnostics.set(profile.name, diagnostic);
+				const snapshot = freshAutoRollSnapshot(diagnostic.snapshot);
 				usageSummaries.set(profile.name, summarizeRateLimitSnapshot(snapshot));
 				return {
 					...profile,
@@ -84441,19 +85302,125 @@ const createServer = fn(function* () {
 			const currentProfile = profilesWithSnapshots.find((profile) => profile.name === currentProfileName);
 			if (!currentProfile) return;
 			const currentSummary = usageSummaries.get(currentProfileName) ?? summarizeRateLimitSnapshot(currentProfile.rateLimit ?? null);
+			const currentSnapshotDiagnostic = snapshotDiagnostics.get(currentProfileName) ?? buildSnapshotDiagnostic(null, currentProfile.rateLimit ?? null);
+			const decisionContext = {
+				decisionId,
+				remainingPercent: currentSummary.hasUsage ? currentSummary.remainingPercent : null,
+				threshold: settings.switchRemainingThreshold,
+				snapshotAgeMs: currentSnapshotDiagnostic.ageMs,
+				snapshotSource: currentSnapshotDiagnostic.source,
+				restartRequested: settings.restartOfficialCodexOnAutoRoll
+			};
+			lastDecisionContext = decisionContext;
 			if (!currentSummary.hasUsage) return;
-			if (isAutoRollBlockedUntilRearm(currentProfileName, currentSummary, settings.rearmRemainingThreshold)) return;
+			if (isAutoRollBlockedUntilRearm(currentProfileName, currentSummary, settings.rearmRemainingThreshold)) {
+				await recordAutoRollActivitySafe({
+					kind: "auto-roll-eval",
+					status: "blocked",
+					reason: "waiting-for-rearm",
+					decisionId,
+					profileName: currentProfileName,
+					remainingPercent: currentSummary.remainingPercent,
+					threshold: settings.rearmRemainingThreshold,
+					snapshotAgeMs: currentSnapshotDiagnostic.ageMs,
+					snapshotSource: currentSnapshotDiagnostic.source
+				});
+				return;
+			}
 			if (currentSummary.remainingPercent > settings.switchRemainingThreshold) return;
+			await recordAutoRollActivitySafe({
+				kind: "auto-roll-eval",
+				status: "threshold-hit",
+				reason: null,
+				decisionId,
+				profileName: currentProfileName,
+				remainingPercent: currentSummary.remainingPercent,
+				threshold: settings.switchRemainingThreshold,
+				snapshotAgeMs: currentSnapshotDiagnostic.ageMs,
+				snapshotSource: currentSnapshotDiagnostic.source
+			});
 			const candidate = computeAutoRollCandidate(profilesWithSnapshots, usageSummaries, currentProfileName, currentSummary, settings.switchRemainingThreshold, settings.priorityOrder, autoRollRearmBlockedProfiles);
-			if (!candidate || isRecentAutoRollAttempt(currentProfileName, candidate.profile.name)) return;
-			await handleProfileSwitch(candidate.profile.name, "auto-roll");
+			if (!candidate) {
+				await recordAutoRollActivitySafe({
+					kind: "auto-roll-eval",
+					status: "skipped",
+					reason: "no-candidate",
+					decisionId,
+					profileName: currentProfileName,
+					remainingPercent: currentSummary.remainingPercent,
+					threshold: settings.switchRemainingThreshold,
+					snapshotAgeMs: currentSnapshotDiagnostic.ageMs,
+					snapshotSource: currentSnapshotDiagnostic.source
+				});
+				return;
+			}
+			if (isRecentAutoRollAttempt(currentProfileName, candidate.profile.name)) {
+				await recordAutoRollActivitySafe({
+					kind: "auto-roll-eval",
+					status: "skipped",
+					reason: "recent-duplicate-attempt",
+					decisionId,
+					sourceProfileName: currentProfileName,
+					targetProfileName: candidate.profile.name,
+					remainingPercent: currentSummary.remainingPercent,
+					threshold: settings.switchRemainingThreshold,
+					snapshotAgeMs: currentSnapshotDiagnostic.ageMs,
+					snapshotSource: currentSnapshotDiagnostic.source
+				});
+				return;
+			}
+			await handleProfileSwitch(candidate.profile.name, "auto-roll", decisionContext);
 			blockAutoRollUntilRearm(currentProfileName);
 		} catch (error) {
+			await recordAutoRollActivitySafe({
+				kind: "auto-roll-eval",
+				status: "failed",
+				reason: error instanceof Error ? error.message : "unknown-error",
+				decisionId,
+				remainingPercent: lastDecisionContext.remainingPercent,
+				threshold: lastDecisionContext.threshold,
+				snapshotAgeMs: lastDecisionContext.snapshotAgeMs,
+				snapshotSource: lastDecisionContext.snapshotSource
+			});
 			logger.warn("Background auto-roll failed", { error });
 		} finally {
 			backgroundAutoRollInFlight = false;
 		}
 	};
+	const runAutoRollWatchdog = async () => {
+		const decisionId = createAutoRollDecisionId();
+		const settings = normalizeAutoRollSettings(await getStoredAutoRollSettings());
+		if (!settings.enabled) return;
+		if (!(await licenseService.getCachedStatus()).isPro) return;
+		const current = await profileManager.getCurrentProfile();
+		const currentProfileName = typeof current.name === "string" && current.name.length > 0 ? current.name : null;
+		if (!currentProfileName) return;
+		const currentProfile = (await profileManager.listProfiles()).find((profile) => profile.name === currentProfileName) ?? null;
+		if (!currentProfile) return;
+		const accountId = resolveProfileIdentityKeyFromProfile(currentProfile);
+		const diagnostic = buildSnapshotDiagnostic((await loadCachedRateLimitSnapshots([accountId])).get(accountId) ?? null, currentProfile.rateLimit ?? null);
+		const snapshot = diagnostic.snapshot;
+		if (isSnapshotStaleForAutoRollWatchdog(snapshot)) {
+			const queued = await enqueueAccountsRefreshNow([currentProfileName]);
+			const lastRecordedAt = lastAutoRollWatchdogActivityAt.get(accountId) ?? 0;
+			if (queued.enqueuedAccountIds.includes(accountId) && Date.now() - lastRecordedAt >= AUTO_ROLL_WATCHDOG_ACTIVITY_TTL_MS) {
+				lastAutoRollWatchdogActivityAt.set(accountId, Date.now());
+				await recordAutoRollActivitySafe({
+					kind: "auto-roll-eval",
+					status: "refresh-queued",
+					reason: "watchdog-stale-snapshot",
+					decisionId,
+					profileName: currentProfileName,
+					threshold: settings.switchRemainingThreshold,
+					snapshotAgeMs: diagnostic.ageMs,
+					snapshotSource: diagnostic.source,
+					profileKey: accountId
+				});
+			}
+			return;
+		}
+		await maybeRunBackgroundAutoRoll();
+	};
 	const handleDesktopMessage = (message) => {
 		if (!isDesktopChildCommand(message)) return;
 		if (message.type === "t3-server:switch-profile") {
@@ -84484,6 +85451,7 @@ const createServer = fn(function* () {
 			logger.warn("Low remaining notification failed", { error });
 		});
 		maybeRunBackgroundAutoRoll();
+		reconcileOfficialCodexRestartDebt();
 	};
 	const handleRateLimitStateChanged = (payload) => {
 		refreshTray();
@@ -84491,9 +85459,16 @@ const createServer = fn(function* () {
 	};
 	rateLimitEvents.on("snapshot-updated", handleRateLimitSnapshotUpdated);
 	rateLimitEvents.on("refresh-state-changed", handleRateLimitStateChanged);
+	const autoRollWatchdogInterval = setInterval(() => {
+		runAutoRollWatchdog().catch((error) => {
+			logger.warn("Auto-roll watchdog failed", { error });
+		});
+	}, AUTO_ROLL_WATCHDOG_INTERVAL_MS);
+	autoRollWatchdogInterval.unref?.();
 	yield* addFinalizer(() => sync(() => {
 		rateLimitEvents.off("snapshot-updated", handleRateLimitSnapshotUpdated);
 		rateLimitEvents.off("refresh-state-changed", handleRateLimitStateChanged);
+		clearInterval(autoRollWatchdogInterval);
 	}));
 	const unsubscribeTerminalEvents = yield* terminalManager.subscribe((event) => void runPromise(pushBus.publishAll(WS_CHANNELS.terminalEvent, event)));
 	yield* addFinalizer(() => sync(() => unsubscribeTerminalEvents()));
@@ -84513,6 +85488,8 @@ const createServer = fn(function* () {
 		});
 	});
 	yield* readiness.markHttpListening;
+	maybeRunBackgroundAutoRoll();
+	reconcileOfficialCodexRestartDebt();
 	readResolvedTelegramRuntimeSettings().then((settings) => queueTelegramRuntimeSettingsApply(settings)).catch((error) => {
 		logger.warn("Failed to apply Telegram runtime settings during startup", { error: error instanceof Error ? error.message : String(error) });
 	});
@@ -84891,10 +85868,15 @@ const createServer = fn(function* () {
 				return yield* promise(() => telegramBridge.testToken(body.token));
 			}
 			case WS_METHODS.profilesFetch: {
-				const data = yield* promise(() => loadProfilesViewData({ autoImportActiveAuth: true }));
+				const body = request.body && typeof request.body === "object" ? stripRequestTag(request.body) : {};
+				const data = yield* promise(() => loadProfilesViewData({
+					autoImportActiveAuth: true,
+					backgroundRefresh: body.backgroundRefresh !== false
+				}));
 				const currentProfile = data.currentProfile ? data.profiles.find((profile) => profile.name === data.currentProfile) ?? null : null;
-				const currentProfileKey = currentProfile ? resolveProfileIdentityKeyFromProfile(currentProfile) : null;
-				const officialCodexStatus = yield* promise(() => getOfficialCodexSyncStatus(currentProfileKey));
+				const officialCodexStatus = yield* promise(() => resolveOfficialCodexStatus(currentProfile));
+				maybeRunBackgroundAutoRoll();
+				reconcileOfficialCodexRestartDebt();
 				refreshTray();
 				return {
 					...data,
@@ -85171,6 +86153,7 @@ const createServer = fn(function* () {
 				const normalized = normalizeAutoRollSettings(stripRequestTag(request.body).settings);
 				yield* promise(() => persistAutoRollSettings(normalized));
 				maybeRunBackgroundAutoRoll();
+				reconcileOfficialCodexRestartDebt();
 				trackAnalyticsEvent("auto_roll_settings_saved", {
 					enabled: normalized.enabled,
 					rearmRemainingThreshold: normalized.rearmRemainingThreshold,
@@ -85184,12 +86167,30 @@ const createServer = fn(function* () {
 				return normalized;
 			}
 			case WS_METHODS.officialCodexRestart: return yield* promise(async () => {
-				return restartOfficialCodexApp({
-					source: "manual",
-					currentProfileKey: await resolveProfileIdentityKeyByName((await profileManager.getCurrentProfile()).name ?? null)
+				const current = await profileManager.getCurrentProfile();
+				const currentProfileKey = await resolveProfileIdentityKeyByName(current.name ?? null);
+				if (!current.name) return {
+					status: "skipped",
+					reason: "profile-not-selected"
+				};
+				return restartOfficialCodexProfileTarget({
+					targetProfileName: current.name,
+					targetProfileKey: currentProfileKey,
+					sourceProfileName: null,
+					sourceProfileKey: null,
+					launchIfNotRunning: true,
+					decisionId: null
 				});
 			});
-			case WS_METHODS.officialCodexInstances: return yield* promise(async () => enrichOfficialCodexInstances(await getOfficialCodexProfileInstances()));
+			case WS_METHODS.officialCodexInstances: return yield* promise(async () => {
+				const [instances, current] = await Promise.all([enrichOfficialCodexInstances(await getOfficialCodexProfileInstances()), profileManager.getCurrentProfile()]);
+				const currentProfile = current.name ? (await profileManager.listProfiles()).find((profile) => profile.name === current.name) ?? null : null;
+				const syncStatus = await getOfficialCodexSyncStatus(currentProfile ? resolveProfileIdentityKeyFromProfile(currentProfile) : null);
+				return {
+					...instances,
+					syncStatus
+				};
+			});
 			case WS_METHODS.officialCodexLaunchProfile: {
 				const name = stripRequestTag(request.body).name?.trim() ?? "";
 				const access = yield* tryPromise({
@@ -85289,6 +86290,50 @@ const createServer = fn(function* () {
 					return restartOfficialCodexProfileInstance(options);
 				});
 			}
+			case WS_METHODS.officialCodexUseProfile: {
+				const name = stripRequestTag(request.body).name?.trim() ?? "";
+				const access = yield* tryPromise({
+					try: () => resolveOfficialCodexProfileAccess(),
+					catch: toOfficialCodexProfileAccessRouteError
+				});
+				yield* try_({
+					try: () => assertOfficialCodexProfileAccess(name, access),
+					catch: toOfficialCodexProfileAccessRouteError
+				});
+				return yield* promise(async () => {
+					const previousName = (await profileManager.getCurrentProfile()).name ?? null;
+					const previousKey = await resolveProfileIdentityKeyByName(previousName);
+					await handleProfileSwitch(name, "app");
+					const verified = await profileManager.getCurrentProfile();
+					if (verified.name !== name || !verified.trusted) {
+						await recordAutoRollActivitySafe({
+							kind: "auth-verified",
+							status: "failed",
+							reason: "active-auth-mismatch-after-switch",
+							sourceProfileName: previousName,
+							targetProfileName: name,
+							switchVerified: false
+						});
+						throw new Error("Profile switch did not verify active Codex auth.");
+					}
+					await recordAutoRollActivitySafe({
+						kind: "auth-verified",
+						status: "ok",
+						reason: null,
+						sourceProfileName: previousName,
+						targetProfileName: name,
+						switchVerified: true
+					});
+					return restartOfficialCodexProfileTarget({
+						targetProfileName: name,
+						targetProfileKey: await resolveProfileIdentityKeyByName(name),
+						sourceProfileName: previousName,
+						sourceProfileKey: previousKey,
+						launchIfNotRunning: true,
+						decisionId: null
+					});
+				});
+			}
 			case WS_METHODS.officialCodexLaunchProfiles: {
 				const body = stripRequestTag(request.body);
 				const rawNames = Array.isArray(body.names) ? body.names : [];
@@ -85361,6 +86406,78 @@ const createServer = fn(function* () {
 				trackAnalyticsEvent("official_codex_profiles_stop_requested", { count: results.length });
 				return { results };
 			}
+			case WS_METHODS.officialCodexActivateProfiles: {
+				const body = stripRequestTag(request.body);
+				const rawNames = Array.isArray(body.names) ? body.names : [];
+				const names = Array.from(new Set(rawNames.map((name) => typeof name === "string" ? name.trim() : "").filter(Boolean)));
+				const access = yield* tryPromise({
+					try: () => resolveOfficialCodexProfileAccess(),
+					catch: toOfficialCodexProfileAccessRouteError
+				});
+				yield* try_({
+					try: () => {
+						for (const name of names) assertOfficialCodexProfileAccess(name, access);
+					},
+					catch: toOfficialCodexProfileAccessRouteError
+				});
+				const results = [];
+				for (const name of names) {
+					const result = yield* promise(async () => {
+						try {
+							const activation = await profileManager.activateResetWindow(name);
+							const entry = {
+								profileName: name,
+								status: activation.status,
+								reason: activation.reason,
+								threadId: activation.threadId ?? null,
+								turnId: activation.turnId ?? null
+							};
+							await recordAutoRollActivitySafe({
+								kind: "reset-window-activation",
+								status: entry.status,
+								reason: entry.reason,
+								profileName: name
+							});
+							return entry;
+						} catch (error) {
+							const entry = {
+								profileName: name,
+								status: "failed",
+								reason: formatUserFacingError(error, { fallback: "Could not activate reset window." }),
+								threadId: null,
+								turnId: null
+							};
+							await recordAutoRollActivitySafe({
+								kind: "reset-window-activation",
+								status: entry.status,
+								reason: entry.reason,
+								profileName: name
+							});
+							return entry;
+						}
+					});
+					results.push(result);
+				}
+				const completed = results.filter((result) => result.status === "completed").length;
+				const failed = results.filter((result) => result.status === "failed").length;
+				const skipped = results.filter((result) => result.status === "skipped").length;
+				if (completed > 0) enqueueAccountsRefreshNow(results.filter((result) => result.status === "completed").map((result) => result.profileName)).catch((error) => {
+					logger.warn("Failed to refresh rate limits after reset-window activation", { error });
+				});
+				trackAnalyticsEvent("official_codex_profiles_activation_requested", {
+					count: results.length,
+					completed,
+					failed,
+					skipped
+				});
+				return {
+					total: results.length,
+					completed,
+					failed,
+					skipped,
+					results
+				};
+			}
 			case WS_METHODS.cliInfo: return yield* promise(() => getCodexCliInfo());
 			case WS_METHODS.cliStatus: return yield* promise(() => getCliInstallStatusWithFreshness());
 			case WS_METHODS.cliCheckFreshness: {