pi-openai-toolkit 0.23.2 → 0.24.0

package/src/config/legacy.ts

@@ -12,8 +12,6 @@ import {
 	THINKING_LEVELS,
 	TOOLKIT_ID,
 	type CompactionConfig,
-	type ContextManagementMode,
-	type LeaveManagedModePolicy,
 	type ImageGenerationConfig,
 	type RemoteV2ContextSource,
 	type LoadedToolkitConfig,
@@ -22,7 +20,7 @@ import {
 	type WebSearchConfig,
 	type WebSearchRoute,
 } from "../types";
-import { RETIRED_AUTO_MODE_MESSAGE } from "./policy";
+import { RETIRED_AUTO_MODE_MESSAGE, RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE, RETIRED_REMOTE_WINDOWS_MODE_MESSAGE } from "./policy";
 import { MAX_IMAGE_MODEL_ID_CHARS } from "../image-generation/types";
 
 export const CONFIG_DIR = path.join(os.homedir(), ".pi", "agent", "extensions", TOOLKIT_ID);
@@ -85,34 +83,6 @@ function toBoolean(value: unknown, fieldPath: string, warnings: string[]): boole
 	return undefined;
 }
 
-function toLeaveManagedMode(
-	value: unknown,
-	fieldPath: string,
-	warnings: string[],
-): LeaveManagedModePolicy | undefined {
-	if (value === undefined) return undefined;
-	if (typeof value === "string") {
-		const normalized = value.trim();
-		if (normalized === "warn" || normalized === "compact") return normalized;
-	}
-	warnings.push(`Ignoring ${fieldPath}: expected one of warn, compact.`);
-	return undefined;
-}
-
-function toContextManagementMode(
-	value: unknown,
-	fieldPath: string,
-	warnings: string[],
-): ContextManagementMode | undefined {
-	if (value === undefined) return undefined;
-	if (typeof value === "string") {
-		const normalized = value.trim();
-		if (normalized === "off" || normalized === "remote") return normalized;
-	}
-	warnings.push(`Ignoring ${fieldPath}: expected one of off, remote.`);
-	return undefined;
-}
-
 function toRemoteV2ContextSource(
 	value: unknown,
 	fieldPath: string,
@@ -146,21 +116,6 @@ function toThinkingLevel(value: unknown, fieldPath: string, warnings: string[]):
 	return undefined;
 }
 
-function toBoundedInteger(
-	value: unknown,
-	fieldPath: string,
-	warnings: string[],
-	min: number,
-	max: number,
-): number | undefined {
-	if (value === undefined) return undefined;
-	if (typeof value === "number" && Number.isInteger(value) && Number.isFinite(value) && value >= min && value <= max) {
-		return value;
-	}
-	warnings.push(`Ignoring ${fieldPath}: expected an integer between ${min} and ${max}.`);
-	return undefined;
-}
-
 function toSupportedApis(
 	value: unknown,
 	fieldPath: string,
@@ -309,12 +264,17 @@ function applyCompactionConfig(
 	warnUnknownFields(raw, COMPACTION_FIELDS, "compaction", warnings);
 
 	resolved.enabled = toBoolean(raw.enabled, "compaction.enabled", warnings) ?? resolved.enabled;
-	resolved.contextManagement =
-		toContextManagementMode(raw.contextManagement, "compaction.contextManagement", warnings) ??
-		resolved.contextManagement;
-	resolved.leaveManagedMode =
-		toLeaveManagedMode(raw.leaveManagedMode, "compaction.leaveManagedMode", warnings) ??
-		resolved.leaveManagedMode;
+	for (const key of ["leaveManagedMode", "contextReminderThresholdPercent"]) {
+		if (Object.hasOwn(raw, key)) warnings.push(`Ignoring compaction.${key}: ${RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE}`);
+	}
+	if (Object.hasOwn(raw, "contextManagement")) {
+		const mode = typeof raw.contextManagement === "string" ? raw.contextManagement.trim() : undefined;
+		warnings.push(mode === "remote"
+			? `Ignoring compaction.contextManagement: ${RETIRED_REMOTE_WINDOWS_MODE_MESSAGE}`
+			: mode === "off"
+				? `Ignoring compaction.contextManagement: ${RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE}`
+				: "Ignoring compaction.contextManagement: expected off; remote has been removed.");
+	}
 	resolved.allowCompactionContinuityBreak =
 		toBoolean(
 			raw.allowCompactionContinuityBreak,
@@ -323,16 +283,6 @@ function applyCompactionConfig(
 		) ?? resolved.allowCompactionContinuityBreak;
 	resolved.notifyOnLoad =
 		toBoolean(raw.notifyOnLoad, "compaction.notifyOnLoad", warnings) ?? resolved.notifyOnLoad;
-	const reminderPercent = toBoundedInteger(
-		raw.contextReminderThresholdPercent,
-		"compaction.contextReminderThresholdPercent",
-		warnings,
-		0,
-		100,
-	);
-	if (reminderPercent !== undefined) {
-		resolved.contextReminderThresholdPercent = reminderPercent;
-	}
 	resolved.debug = toBoolean(raw.debug, "compaction.debug", warnings) ?? resolved.debug;
 	resolved.logProviderPayloads =
 		toBoolean(raw.logProviderPayloads, "compaction.logProviderPayloads", warnings) ??

package/src/config/migration.ts

@@ -1,6 +1,11 @@
 import { resolveToolkitConfig } from "../config";
 import type { LoadedToolkitConfig } from "../types";
-import { RETIRED_AUTO_MODE_ISSUE, RETIRED_AUTO_MODE_MESSAGE, type ConfigOrigin } from "./policy";
+import {
+	RETIRED_AUTO_MODE_ISSUE, RETIRED_AUTO_MODE_MESSAGE,
+	RETIRED_REMOTE_WINDOWS_ISSUE, RETIRED_REMOTE_WINDOWS_MODE_ISSUE,
+	RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE, RETIRED_REMOTE_WINDOWS_MODE_MESSAGE,
+	type ConfigOrigin,
+} from "./policy";
 import { resolveV2Config } from "./v2";
 
 export type MigrationPreview = {
@@ -22,9 +27,13 @@ function modelRef(key: string): { provider: string; id: string; api: string } {
 /** Read-only analysis: never edits a source file or claims a lossy candidate is equivalent. */
 export function previewToolkitMigration(loaded: LoadedToolkitConfig): MigrationPreview {
 	if (loaded.document?.format === "v2") {
-		const retired = resolveToolkitConfig(loaded).issues.filter((issue) => issue.code === RETIRED_AUTO_MODE_ISSUE);
-		return { status: "already-v2", reasons: ["The document already uses schemaVersion 2.",
-			...(retired.length ? [RETIRED_AUTO_MODE_MESSAGE] : [])], unmappedPaths: retired.map((issue) => issue.path) };
+		const retired = resolveToolkitConfig(loaded).issues.filter((issue) =>
+			[RETIRED_AUTO_MODE_ISSUE, RETIRED_REMOTE_WINDOWS_ISSUE, RETIRED_REMOTE_WINDOWS_MODE_ISSUE].some((code) => code === issue.code));
+		const removedMode = retired.some((issue) => issue.code === RETIRED_REMOTE_WINDOWS_MODE_ISSUE);
+		return { status: removedMode ? "needs-review" : "already-v2", reasons: ["The document already uses schemaVersion 2.",
+			...(retired.some((issue) => issue.code === RETIRED_AUTO_MODE_ISSUE) ? [RETIRED_AUTO_MODE_MESSAGE] : []),
+			...(retired.some((issue) => issue.code === RETIRED_REMOTE_WINDOWS_ISSUE) ? [RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE] : []),
+			...(removedMode ? [RETIRED_REMOTE_WINDOWS_MODE_MESSAGE] : [])], unmappedPaths: retired.map((issue) => issue.path) };
 	}
 	if (loaded.document?.format === "invalid" || loaded.document?.format === "missing") {
 		return { status: "unavailable", reasons: ["A readable legacy document is required; no candidate was produced."], unmappedPaths: [] };
@@ -83,11 +92,14 @@ export function previewToolkitMigration(loaded: LoadedToolkitConfig): MigrationP
 		legacy.webSearch.models.some((key) => Object.hasOwn(legacy.webSearch.routes ?? {}, key)))) {
 		unmappedPaths.add("webSearch.models");
 	}
-	if (!legacy.compaction.enabled && legacy.compaction.contextManagement === "remote") {
-		reasons.push("Disabled legacy context management retains a dormant remote mode; the candidate selects Pi ownership.");
+	if (baseline.issues.some((issue) => issue.code === RETIRED_REMOTE_WINDOWS_MODE_ISSUE)) {
+		reasons.push(`${RETIRED_REMOTE_WINDOWS_MODE_MESSAGE} The preview uses Pi ownership only as a safe review placeholder; it is not behavior-equivalent. Choose a supported mode explicitly before any manual apply.`);
 		unmappedPaths.add("compaction.contextManagement");
 	}
-	// Gateway affinity was previously context-mode gated for compaction, and not used by image.
+	if (baseline.issues.some((issue) => issue.code === RETIRED_REMOTE_WINDOWS_ISSUE)) {
+		reasons.push(`${RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE} No retired ancillary settings were migrated; review their removal.`);
+	}
+	// Gateway affinity is shared across retained compaction and image features.
 	if (legacy.compaction.gatewayContextModels.length) {
 		reasons.push("Gateway compatibility is now shared across features; review synthetic compaction/image affinity before using this candidate.");
 	}

package/src/config/notifications.ts

@@ -1,15 +1,21 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { ResolvedToolkitConfig } from "../config";
-import { RETIRED_AUTO_MODE_ISSUE, RETIRED_AUTO_MODE_MESSAGE, type ConfigIssue } from "./policy";
+import {
+	RETIRED_AUTO_MODE_ISSUE, RETIRED_AUTO_MODE_MESSAGE,
+	RETIRED_REMOTE_WINDOWS_ISSUE, RETIRED_REMOTE_WINDOWS_MODE_ISSUE,
+	RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE, RETIRED_REMOTE_WINDOWS_MODE_MESSAGE,
+	type ConfigIssue,
+} from "./policy";
 import { redactValue } from "../debug";
 
 const lastNotice = new WeakMap<object, string>();
 
 /** Controlled human text for a known code; never built from user-supplied configuration values. */
 function issueExplanation(issue: ConfigIssue): string {
-	return issue.code === RETIRED_AUTO_MODE_ISSUE
-		? RETIRED_AUTO_MODE_MESSAGE
-		: issue.code;
+	if (issue.code === RETIRED_AUTO_MODE_ISSUE) return RETIRED_AUTO_MODE_MESSAGE;
+	if (issue.code === RETIRED_REMOTE_WINDOWS_ISSUE) return RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE;
+	if (issue.code === RETIRED_REMOTE_WINDOWS_MODE_ISSUE) return RETIRED_REMOTE_WINDOWS_MODE_MESSAGE;
+	return issue.code;
 }
 
 export function formatConfigIssues(issues: readonly ConfigIssue[], limit = 12): string {

package/src/config/policy.ts

@@ -1,7 +1,6 @@
 import {
 	DEFAULT_COMPACTION_CONFIG,
 	DEFAULT_IMAGE_GENERATION_MODEL,
-	type LeaveManagedModePolicy,
 	type NativeFallbackConfig,
 	type RemoteV2ContextSource,
 } from "../types";
@@ -18,7 +17,7 @@ export type DiagnosticsConfig = {
 	artifactRoot: string;
 };
 export type ContextPolicy = {
-	mode: "pi" | "remote-compaction" | "remote-windows";
+	mode: "pi" | "remote-compaction";
 	remoteCompaction: {
 		model: string | null;
 		inputSource: RemoteV2ContextSource;
@@ -26,10 +25,6 @@ export type ContextPolicy = {
 		apis: string[];
 	};
 	nativeFallback: Omit<NativeFallbackConfig, "model"> & { model: string | null };
-	remoteWindows: {
-		leaveManagedMode: LeaveManagedModePolicy;
-		reminderThresholdPercent: number;
-	};
 };
 export type EffectiveToolkitPolicy = {
 	context: ContextPolicy;
@@ -61,6 +56,14 @@ export const RETIRED_AUTO_MODE_ISSUE = "retired.autoMode" as const;
 /** Controlled explanation of the retirement; never contains user-supplied values. */
 export const RETIRED_AUTO_MODE_MESSAGE =
 	"Auto Mode has been removed; these settings are ignored and tool calls are no longer reviewed by it.";
+/** Opaque ancillary settings are warning-only; explicitly selected retired modes block context. */
+export const RETIRED_REMOTE_WINDOWS_ISSUE = "retired.remoteWindows" as const;
+export const RETIRED_REMOTE_WINDOWS_MODE_ISSUE = "retired.remoteWindows.mode" as const;
+export const RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE =
+	"Remote Windows has been removed; these settings are ignored. No window behavior or automatic migration is available.";
+export const RETIRED_REMOTE_WINDOWS_MODE_MESSAGE =
+	"Remote Windows has been removed. Context operations are blocked until you explicitly select pi or remote-compaction. No replacement mode was activated.";
+
 export type ResolvedToolkitPolicy = {
 	policy: EffectiveToolkitPolicy;
 	origins: Record<string, ConfigOrigin>;
@@ -91,10 +94,6 @@ export function createPolicyDefaults(): EffectiveToolkitPolicy {
 				apis: [...context.responsesApis],
 			},
 			nativeFallback: { ...context.nativeFallback, model: null },
-			remoteWindows: {
-				leaveManagedMode: context.leaveManagedMode,
-				reminderThresholdPercent: context.contextReminderThresholdPercent,
-			},
 		},
 		webSearch: { route: "unmanaged" },
 		imageGeneration: {

package/src/config/v2.ts

@@ -60,6 +60,8 @@ import {
 import {
 	CONFIG_FEATURES,
 	RETIRED_AUTO_MODE_ISSUE,
+	RETIRED_REMOTE_WINDOWS_ISSUE,
+	RETIRED_REMOTE_WINDOWS_MODE_ISSUE,
 	createPolicyDefaults,
 	type ConfigFeature,
 	type ConfigIssue,
@@ -100,9 +102,8 @@ export const V2_ISSUE = {
 	imageDefaultNotAllowed: "imageGeneration.defaultModel.notAllowed",
 } as const;
 
-const CONTEXT_MODES = ["pi", "remote-compaction", "remote-windows"] as const;
+const CONTEXT_MODES = ["pi", "remote-compaction"] as const;
 const INPUT_SOURCES = ["legacy", "pi-context-hook"] as const;
-const LEAVE_MANAGED_MODES = ["warn", "compact"] as const;
 const SEARCH_ROUTES = ["unmanaged", "local", "hosted", "standalone-alpha"] as const;
 const TRANSPORTS = ["standard", "codex-gateway"] as const;
 const DIAGNOSTIC_LEVELS = ["error", "warn", "info", "debug"] as const;
@@ -116,7 +117,6 @@ const MODEL_OVERRIDE_KEYS = new Set(["context", "webSearch", "autoMode", "compat
 const CONTEXT_KEYS = new Set(["mode", "remoteCompaction", "nativeFallback", "remoteWindows"]);
 const REMOTE_COMPACTION_KEYS = new Set(["model", "inputSource", "allowContinuityBreak", "apis"]);
 const NATIVE_FALLBACK_KEYS = new Set(["enabled", "model", "thinkingLevel"]);
-const REMOTE_WINDOWS_KEYS = new Set(["leaveManagedMode", "reminderThresholdPercent"]);
 const WEB_SEARCH_KEYS = new Set(["route"]);
 const IMAGE_GENERATION_KEYS = new Set(["enabled", "defaultModel", "allowedModels"]);
 const RESPONSES_WEBSOCKET_KEYS = new Set(["enabled"]);
@@ -165,8 +165,6 @@ const POLICY_LEAVES: readonly { leaf: string; feature: ConfigFeature }[] = [
 	{ leaf: "context.nativeFallback.enabled", feature: "context" },
 	{ leaf: "context.nativeFallback.model", feature: "context" },
 	{ leaf: "context.nativeFallback.thinkingLevel", feature: "context" },
-	{ leaf: "context.remoteWindows.leaveManagedMode", feature: "context" },
-	{ leaf: "context.remoteWindows.reminderThresholdPercent", feature: "context" },
 	{ leaf: "webSearch.route", feature: "webSearch" },
 	{ leaf: "imageGeneration.enabled", feature: "imageGeneration" },
 	{ leaf: "imageGeneration.defaultModel", feature: "imageGeneration" },
@@ -410,16 +408,6 @@ function readEnum<T extends string>(allowed: readonly T[], value: unknown): Read
 	return { ok: false, code: V2_ISSUE.expectedEnum };
 }
 
-function readInteger(value: unknown, min: number, max: number): ReadResult<number> {
-	if (typeof value !== "number") {
-		return { ok: false, code: typeCode(value, V2_ISSUE.expectedInteger) };
-	}
-	if (!Number.isInteger(value) || value < min || value > max) {
-		return { ok: false, code: V2_ISSUE.range };
-	}
-	return { ok: true, value };
-}
-
 function readThinkingLevel(value: unknown): ReadResult<ThinkingLevel> {
 	return readEnum(THINKING_LEVELS, value);
 }
@@ -548,7 +536,9 @@ function applyContextSettings(
 		{ key: "mode", leaf: "context.mode", feature: "context" },
 		scope,
 		state,
-		(value) => readEnum(CONTEXT_MODES, value),
+		(value) => typeof value === "string" && value.trim() === "remote-windows"
+			? { ok: false, code: RETIRED_REMOTE_WINDOWS_MODE_ISSUE }
+			: readEnum(CONTEXT_MODES, value),
 		(value) => {
 			state.policy.context.mode = value;
 		},
@@ -560,8 +550,12 @@ function applyContextSettings(
 	const nativeFallback = openGroup(raw, "nativeFallback", scope, state, "context");
 	if (nativeFallback) applyNativeFallbackSettings(nativeFallback.raw, nativeFallback.scope, state);
 
-	const remoteWindows = openGroup(raw, "remoteWindows", scope, state, "context");
-	if (remoteWindows) applyRemoteWindowsSettings(remoteWindows.raw, remoteWindows.scope, state);
+	// Retired ancillary data is opaque, even when malformed. Never validate
+	// children, create origins or invalidate otherwise valid context policy.
+	if (Object.hasOwn(raw, "remoteWindows")) state.issues.push(withModel(scope, {
+		severity: "warning", code: RETIRED_REMOTE_WINDOWS_ISSUE,
+		path: joinPath(scope.input, "remoteWindows"), feature: "context",
+	}));
 }
 
 function applyRemoteCompactionSettings(
@@ -692,39 +686,6 @@ function applyNativeFallbackSettings(
 	);
 }
 
-function applyRemoteWindowsSettings(
-	raw: Record<string, unknown>,
-	scope: Scope,
-	state: ResolutionState,
-): void {
-	reportUnknownKeys(raw, REMOTE_WINDOWS_KEYS, scope, state, "context");
-
-	applyField(
-		raw,
-		{ key: "leaveManagedMode", leaf: "context.remoteWindows.leaveManagedMode", feature: "context" },
-		scope,
-		state,
-		(value) => readEnum(LEAVE_MANAGED_MODES, value),
-		(value) => {
-			state.policy.context.remoteWindows.leaveManagedMode = value;
-		},
-	);
-	applyField(
-		raw,
-		{
-			key: "reminderThresholdPercent",
-			leaf: "context.remoteWindows.reminderThresholdPercent",
-			feature: "context",
-		},
-		scope,
-		state,
-		(value) => readInteger(value, 0, 100),
-		(value) => {
-			state.policy.context.remoteWindows.reminderThresholdPercent = value;
-		},
-	);
-}
-
 function applyWebSearchSettings(
 	raw: Record<string, unknown>,
 	scope: Scope,

package/src/config.ts

@@ -8,6 +8,10 @@ import { resolveV2Config } from "./config/v2";
 import {
 	CONFIG_FEATURES,
 	RETIRED_AUTO_MODE_ISSUE,
+	RETIRED_REMOTE_WINDOWS_ISSUE,
+	RETIRED_REMOTE_WINDOWS_MODE_ISSUE,
+	RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE,
+	RETIRED_REMOTE_WINDOWS_MODE_MESSAGE,
 	createPolicyDefaults,
 	type ConfigDocumentSnapshot,
 	type ConfigFeature,
@@ -103,7 +107,7 @@ function leafPaths(value: unknown, prefix = ""): string[] {
 }
 
 const LEGACY_PATHS: Record<string, string> = {
-	"context.mode": "compaction.contextManagement",
+	"context.mode": "compaction.enabled",
 	"context.remoteCompaction.model": "compaction.remoteCompactModel",
 	"context.remoteCompaction.inputSource": "compaction.remoteV2ContextSource",
 	"context.remoteCompaction.allowContinuityBreak": "compaction.allowCompactionContinuityBreak",
@@ -111,8 +115,6 @@ const LEGACY_PATHS: Record<string, string> = {
 	"context.nativeFallback.enabled": "compaction.nativeFallback.enabled",
 	"context.nativeFallback.model": "compaction.nativeFallback.model",
 	"context.nativeFallback.thinkingLevel": "compaction.nativeFallback.thinkingLevel",
-	"context.remoteWindows.leaveManagedMode": "compaction.leaveManagedMode",
-	"context.remoteWindows.reminderThresholdPercent": "compaction.contextReminderThresholdPercent",
 	"webSearch.route": "webSearch.models",
 	"imageGeneration.enabled": "imageGeneration.enabled",
 	"imageGeneration.defaultModel": "imageGeneration.models",
@@ -159,6 +161,13 @@ function legacyIssues(loaded: LoadedToolkitConfig, modelKey: string | undefined)
 		if (warning.startsWith("Ignoring autoMode:")) {
 			return { severity: "warning", code: RETIRED_AUTO_MODE_ISSUE, path: "autoMode", feature: "document" };
 		}
+		const retiredField = /^Ignoring (compaction\.(?:contextManagement|leaveManagedMode|contextReminderThresholdPercent)):/.exec(warning)?.[1];
+		if (retiredField && (warning.endsWith(RETIRED_REMOTE_WINDOWS_CONFIG_MESSAGE) || warning.endsWith(RETIRED_REMOTE_WINDOWS_MODE_MESSAGE))) {
+			const selectedMode = warning.endsWith(RETIRED_REMOTE_WINDOWS_MODE_MESSAGE);
+			return { severity: selectedMode ? "error" : "warning",
+				code: selectedMode ? RETIRED_REMOTE_WINDOWS_MODE_ISSUE : RETIRED_REMOTE_WINDOWS_ISSUE,
+				path: retiredField, feature: "context" };
+		}
 		const match = /^Ignoring ([^:]+):/.exec(warning);
 		const field = warning.startsWith("Ignoring compaction.responsesApis entry ") ? "compaction.responsesApis" : match?.[1] ?? "$";
 		const root = field.split(".")[0];
@@ -195,8 +204,10 @@ function fromLegacy(loaded: LoadedToolkitConfig, model: WebSearchModel | undefin
 	const modelKey = getExactModelKey(model);
 	const route = resolveWebSearchRoute({ model, config: config.webSearch });
 	const policy = createPolicyDefaults();
+	const issues = [...(loaded.document?.issues ?? []), ...legacyIssues(loaded, modelKey)];
+	const retiredMode = issues.some((issue) => issue.code === RETIRED_REMOTE_WINDOWS_MODE_ISSUE);
 	policy.context = {
-		mode: !compaction.enabled ? "pi" : compaction.contextManagement === "remote" ? "remote-windows" : "remote-compaction",
+		mode: !compaction.enabled || retiredMode ? "pi" : "remote-compaction",
 		remoteCompaction: {
 			model: compaction.remoteCompactModel ?? null,
 			inputSource: compaction.remoteV2ContextSource,
@@ -204,7 +215,6 @@ function fromLegacy(loaded: LoadedToolkitConfig, model: WebSearchModel | undefin
 			apis: [...compaction.responsesApis],
 		},
 		nativeFallback: { ...compaction.nativeFallback, model: compaction.nativeFallback.model ?? null },
-		remoteWindows: { leaveManagedMode: compaction.leaveManagedMode, reminderThresholdPercent: compaction.contextReminderThresholdPercent },
 	};
 	policy.webSearch.route = route.route === "none" ? "unmanaged" : route.route;
 	policy.imageGeneration = {
@@ -225,8 +235,12 @@ function fromLegacy(loaded: LoadedToolkitConfig, model: WebSearchModel | undefin
 	const origins: Record<string, ConfigOrigin> = Object.create(null);
 	const raw = loaded.document?.raw;
 	for (const leaf of leafPaths(policy)) {
+		if (leaf === "context.mode" && retiredMode) {
+			// A blocked old selection owns no supported effective-mode origin.
+			origins[leaf] = { kind: "builtin" };
+			continue;
+		}
 		let input = LEGACY_PATHS[leaf] ?? leaf;
-		if (leaf === "context.mode" && !compaction.enabled) input = "compaction.enabled";
 		if (leaf === "webSearch.route") {
 			if (!config.webSearch.enabled) input = "webSearch.enabled";
 			else if (route.source === "exact") {
@@ -242,7 +256,6 @@ function fromLegacy(loaded: LoadedToolkitConfig, model: WebSearchModel | undefin
 		origins[leaf] = !ignored && ((raw && containsPath(raw, input)) || (!loaded.document && loaded.source))
 			? { kind: "legacy", path: input, source: loaded.source } : { kind: "builtin" };
 	}
-	const issues = [...(loaded.document?.issues ?? []), ...legacyIssues(loaded, modelKey)];
 	return { policy, origins, issues, invalidFeatures: selectedInvalidFeatures(issues, modelKey) };
 }
 
@@ -252,15 +265,12 @@ function engineConfig(policy: EffectiveToolkitPolicy, gatewayKeys: string[]): To
 	return {
 		compaction: {
 			enabled: context.mode !== "pi",
-			contextManagement: context.mode === "remote-windows" ? "remote" : "off",
 			remoteCompactModel: context.remoteCompaction.model ?? undefined,
 			remoteV2ContextSource: context.remoteCompaction.inputSource,
 			allowCompactionContinuityBreak: context.remoteCompaction.allowContinuityBreak,
 			responsesApis: [...context.remoteCompaction.apis],
 			gatewayContextModels: [...gatewayKeys],
 			nativeFallback: { ...context.nativeFallback, model: context.nativeFallback.model ?? undefined },
-			leaveManagedMode: context.remoteWindows.leaveManagedMode,
-			contextReminderThresholdPercent: context.remoteWindows.reminderThresholdPercent,
 			debug: diagnostics.level === "debug",
 			notifyOnLoad: diagnostics.notifyOnLoad,
 			logProviderPayloads: diagnostics.captureRequests,