pi-openai-toolkit 0.14.6 → 0.14.8

package/src/extension-runtime.ts

@@ -1,3 +1,4 @@
+import type { AgentMessage } from "@earendil-works/pi-agent-core";
 import type {
 	BeforeProviderRequestEvent,
 	ContextEvent,
@@ -18,8 +19,22 @@ import { loadHistoryNotesThreadHint } from "./context-management/history-notes";
 import { CodexContextWindowManager } from "./context-management/window-manager";
 import { registerContextManagementTools } from "./context-management/tools";
 import { writeDebugArtifact, writeReplayFailureArtifact } from "./debug";
+import {
+	COMPACTION_CHECKPOINT_PROVENANCE_UNAVAILABLE,
+	COMPACTION_PROJECTION_UNAVAILABLE,
+	COMPACTION_SESSION_CONTEXT_UNAVAILABLE,
+	COMPACTION_PROJECTED_CONTEXT_UNAVAILABLE,
+	hasVerifiedCompactionInputProvenance,
+	type UnprojectedCompactionReason,
+} from "./compaction-projection";
 import { CODEX_GATEWAY_FORWARD_HEADERS } from "./responses-headers";
 import { resolveLatestNativeCompactionEntry } from "./details-store";
+import {
+	getPiContextHookProjector,
+	installPiContextHookPatch,
+	reportPiContextHookFailure,
+	type PiContextHookPatchResult,
+} from "./pi-context-hook";
 import { runNativeFallbackCompaction } from "./native-fallback";
 import {
 	rewriteResponsesPayloadWithNativeReplay,
@@ -27,29 +42,44 @@ import {
 	serializeLiveTailToResponsesInput,
 } from "./payload-rewrite";
 import { getCompactionRequestExtras, rememberRequestContext } from "./request-context-cache";
+import { resolveWebSearchRoute } from "./web-search/types";
 import { executeRemoteV2Compaction } from "./remote-v2-client";
 import {
 	resolveNativeCompactionEnvironment,
 	resolveRemoteCompactionExecution,
 	type RemoteCompactionExecution,
 } from "./runtime";
-import { serializeMessagesToCompactRequest, type NativeCompactionRequestBody, type ResponsesInputItem } from "./serializer";
+import {
+	serializeMessagesToCompactRequest,
+	serializeMessagesToResponsesInput,
+	type NativeCompactionRequestBody,
+	type ResponsesInputItem,
+} from "./serializer";
 import {
 	createNativeCompactionDetails,
 	createNativeCompactionResult,
 	COMPACTION_EXTENSION_ID,
 	getLatestDeferredToolCarryover,
+	getRemoteV2InputProvenance,
 	isNativeCompactionDetails,
 	type CompactionConfig,
 	type NativeCompactionDetails,
 	type NativeCompactionRequestMeta,
 } from "./types";
 
+type CompactionContextProjection = (
+	messages: readonly AgentMessage[],
+	ctx: ExtensionContext,
+) => readonly AgentMessage[] | undefined | Promise<readonly AgentMessage[] | undefined>;
+
 type CompactionDependencies = {
 	loadConfig: typeof loadToolkitConfig;
 	remoteCompact: typeof executeRemoteV2Compaction;
 	nativeFallback: typeof runNativeFallbackCompaction;
 	contextWindows: CodexContextWindowManager;
+	/** Test seam for the same ordered projection exposed by the Pi host patch. */
+	projectCompactionContext?: CompactionContextProjection;
+	piContextHookPatch: PiContextHookPatchResult;
 };
 
 type RemoteContextActive = (
@@ -61,7 +91,11 @@ type RemoteContextActive = (
 type ResponsesCompactOutcome =
 	| { outcome: "success"; compaction: CompactionResult<NativeCompactionDetails> }
 	| { outcome: "aborted" }
-	| { outcome: "failed" };
+	| { outcome: "failed" }
+	| {
+			outcome: "unprojected-input";
+			reason: UnprojectedCompactionReason;
+	  };
 
 function buildCompactionRequestMeta(event: SessionBeforeCompactEvent): NativeCompactionRequestMeta {
 	return {
@@ -142,12 +176,86 @@ function buildCompactionInstructions(systemPrompt: string, customInstructions?:
 	return `${systemPrompt}\n\nAdditional user guidance for this manual /compact request:\n${guidance}`;
 }
 
+function findLatestProjectedCompactionSummaryIndex(
+	messages: readonly AgentMessage[],
+	summary: string,
+): number {
+	for (let index = messages.length - 1; index >= 0; index -= 1) {
+		const message = messages[index];
+		if (message?.role === "compactionSummary" && message.summary === summary) {
+			return index;
+		}
+	}
+
+	return -1;
+}
+
+type SessionManagerWithOptionalContext = ExtensionContext["sessionManager"] & {
+	buildSessionContext?: () => { messages?: readonly AgentMessage[] };
+};
+
+function readSessionContextMessages(ctx: ExtensionContext): AgentMessage[] | undefined {
+	const sessionManager = ctx.sessionManager as SessionManagerWithOptionalContext;
+	if (typeof sessionManager.buildSessionContext !== "function") {
+		return undefined;
+	}
+
+	try {
+		const sessionContext = sessionManager.buildSessionContext();
+		if (!sessionContext || !Array.isArray(sessionContext.messages)) {
+			return undefined;
+		}
+		return structuredClone([...sessionContext.messages]);
+	} catch {
+		return undefined;
+	}
+}
+
+type CompactionProjectionResult =
+	| { ok: true; messages: readonly AgentMessage[] }
+	| { ok: false; reason: typeof COMPACTION_PROJECTION_UNAVAILABLE | typeof COMPACTION_SESSION_CONTEXT_UNAVAILABLE };
+
+async function projectSessionContextForCompaction(
+	ctx: ExtensionContext,
+	projectCompactionContext: CompactionContextProjection | undefined,
+): Promise<CompactionProjectionResult> {
+	const messages = readSessionContextMessages(ctx);
+	if (!messages) {
+		return { ok: false, reason: COMPACTION_SESSION_CONTEXT_UNAVAILABLE };
+	}
+
+	const projector = projectCompactionContext ?? getPiContextHookProjector(ctx);
+	if (!projector) {
+		return { ok: false, reason: COMPACTION_PROJECTION_UNAVAILABLE };
+	}
+
+	try {
+		const projected = await projector(messages, ctx);
+		return Array.isArray(projected)
+			? { ok: true, messages: projected }
+			: { ok: false, reason: COMPACTION_PROJECTION_UNAVAILABLE };
+	} catch {
+		return { ok: false, reason: COMPACTION_PROJECTION_UNAVAILABLE };
+	}
+}
+
+function getLegacySessionContextMessages(
+	event: SessionBeforeCompactEvent,
+	ctx: ExtensionContext,
+): AgentMessage[] {
+	return readSessionContextMessages(ctx) ?? [
+		...event.preparation.messagesToSummarize,
+		...event.preparation.turnPrefixMessages,
+	];
+}
+
 async function runResponsesNativeCompact(
 	event: SessionBeforeCompactEvent,
 	ctx: ExtensionContext,
 	config: CompactionConfig,
 	execution: RemoteCompactionExecution,
 	remoteCompact: typeof executeRemoteV2Compaction,
+	projectCompactionContext: CompactionContextProjection | undefined,
 ): Promise<ResponsesCompactOutcome> {
 	const { consumer, compactor } = execution;
 	const instructions = buildCompactionInstructions(ctx.getSystemPrompt(), event.customInstructions);
@@ -157,24 +265,61 @@ async function runResponsesNativeCompact(
 		baseUrl: consumer.baseUrl,
 	});
 
+	const inputProvenance = getRemoteV2InputProvenance(config.remoteV2ContextSource);
 	let requestSource: "session-context" | "non-native-session-context" | "latest-native-replay";
 	let request: NativeCompactionRequestBody;
 	if (latestNativeCompaction.ok) {
-		const liveTailEntries = branchEntries.slice(latestNativeCompaction.index + 1);
 		const details = latestNativeCompaction.entry.details;
 		if (!details) {
 			return { outcome: "failed" };
 		}
+		if (!hasVerifiedCompactionInputProvenance(details, inputProvenance)) {
+			return {
+				outcome: "unprojected-input",
+				reason: COMPACTION_CHECKPOINT_PROVENANCE_UNAVAILABLE,
+			};
+		}
 		requestSource = "latest-native-replay";
-		const input: ResponsesInputItem[] = [
-			...(cloneOpaqueWindow(details.compactedWindow) as ResponsesInputItem[]),
-			...serializeLiveTailToResponsesInput({ model: compactor.currentModel, entries: liveTailEntries }),
-		];
-		request = {
-			model: compactor.model,
-			input,
-			instructions,
-		};
+
+		if (config.remoteV2ContextSource === "pi-context-hook") {
+			const projection = await projectSessionContextForCompaction(ctx, projectCompactionContext);
+			if (!projection.ok) {
+				return { outcome: "unprojected-input", reason: projection.reason };
+			}
+			const summaryIndex = findLatestProjectedCompactionSummaryIndex(
+				projection.messages,
+				latestNativeCompaction.entry.summary,
+			);
+			if (summaryIndex < 0) {
+				return {
+					outcome: "unprojected-input",
+					reason: COMPACTION_PROJECTED_CONTEXT_UNAVAILABLE,
+				};
+			}
+			const input: ResponsesInputItem[] = [
+				...(cloneOpaqueWindow(details.compactedWindow) as ResponsesInputItem[]),
+				...serializeMessagesToResponsesInput(
+					compactor.currentModel,
+					[...projection.messages.slice(summaryIndex + 1)],
+				),
+			];
+			request = {
+				model: compactor.model,
+				input,
+				instructions,
+			};
+		} else {
+			const liveTailEntries = branchEntries.slice(latestNativeCompaction.index + 1);
+			const input: ResponsesInputItem[] = [
+				...(cloneOpaqueWindow(details.compactedWindow) as ResponsesInputItem[]),
+				...serializeLiveTailToResponsesInput({ model: compactor.currentModel, entries: liveTailEntries }),
+			];
+			request = {
+				model: compactor.model,
+				input,
+				instructions,
+			};
+		}
 	} else if (
 		latestNativeCompaction.reason === "no-compaction" ||
 		(latestNativeCompaction.reason === "latest-compaction-not-native" &&
@@ -182,18 +327,23 @@ async function runResponsesNativeCompact(
 	) {
 		requestSource =
 			latestNativeCompaction.reason === "no-compaction" ? "session-context" : "non-native-session-context";
-		const sessionManagerWithContext = ctx.sessionManager as typeof ctx.sessionManager & {
-			buildSessionContext?: () => { messages: Parameters<typeof serializeMessagesToCompactRequest>[0]["messages"] };
-		};
-		const messages = sessionManagerWithContext.buildSessionContext?.().messages ?? [
-			...event.preparation.messagesToSummarize,
-			...event.preparation.turnPrefixMessages,
-		];
-		request = serializeMessagesToCompactRequest({
-			model: compactor.currentModel,
-			messages,
-			instructions,
-		});
+		if (config.remoteV2ContextSource === "pi-context-hook") {
+			const projection = await projectSessionContextForCompaction(ctx, projectCompactionContext);
+			if (!projection.ok) {
+				return { outcome: "unprojected-input", reason: projection.reason };
+			}
+			request = serializeMessagesToCompactRequest({
+				model: compactor.currentModel,
+				messages: [...projection.messages],
+				instructions,
+			});
+		} else {
+			request = serializeMessagesToCompactRequest({
+				model: compactor.currentModel,
+				messages: getLegacySessionContextMessages(event, ctx),
+				instructions,
+			});
+		}
 	} else {
 		writeDebugArtifact(
 			"compaction-event",
@@ -275,6 +425,7 @@ async function runResponsesNativeCompact(
 			compactResponseId: compactResult.compactResponseId,
 			createdAt: compactResult.createdAt,
 			requestMeta: buildCompactionRequestMeta(event),
+			inputProvenance,
 		});
 	} catch (error) {
 		writeDebugArtifact(
@@ -324,6 +475,8 @@ async function runResponsesNativeCompact(
 				baseUrl: compactor.baseUrl,
 			},
 			requestSource,
+			remoteV2ContextSource: config.remoteV2ContextSource,
+			inputProvenance,
 			requestInputItems: request.input.length,
 			requestExtras: extras ? Object.keys(extras) : [],
 			compactResponseId: compactResult.compactResponseId,
@@ -405,13 +558,47 @@ async function handleSessionBeforeCompact(
 	);
 	if (resolution.ok) {
 		remoteAttempted = true;
-		const responsesOutcome = await runResponsesNativeCompact(event, ctx, config, resolution.execution, dependencies.remoteCompact);
+		const responsesOutcome = await runResponsesNativeCompact(
+			event,
+			ctx,
+			config,
+			resolution.execution,
+			dependencies.remoteCompact,
+			dependencies.projectCompactionContext,
+		);
 		if (responsesOutcome.outcome === "success") {
 			return { compaction: responsesOutcome.compaction };
 		}
 		if (responsesOutcome.outcome === "aborted") {
 			return { cancel: true };
 		}
+		if (responsesOutcome.outcome === "unprojected-input") {
+			const message = responsesOutcome.reason === COMPACTION_PROJECTION_UNAVAILABLE
+				? "Pi's ordered context-hook projection is unavailable; Remote V2 was not sent raw session history."
+				: responsesOutcome.reason === COMPACTION_SESSION_CONTEXT_UNAVAILABLE
+					? "Pi did not provide the current session context required by its context-hook projection."
+					: responsesOutcome.reason === COMPACTION_PROJECTED_CONTEXT_UNAVAILABLE
+						? "Pi's projected context did not include the current compaction summary anchor."
+						: "The latest opaque checkpoint has no marker for the configured Remote V2 context source, or was created in the other mode.";
+			writeDebugArtifact(
+				"compaction-event",
+				{
+					event: "session_before_compact.remote-v2-unprojected-input",
+					reason: responsesOutcome.reason,
+					contextSource: config.remoteV2ContextSource,
+					inputProvenance: getRemoteV2InputProvenance(config.remoteV2ContextSource),
+					piContextHookPatch: dependencies.piContextHookPatch,
+					message,
+				},
+				config,
+				ctx,
+			);
+			notifyWarning(
+				ctx,
+				`Remote V2 compaction cancelled (${responsesOutcome.reason}); ${message} Keep the context-source setting aligned with the checkpoint or choose legacy mode explicitly.`,
+			);
+			return { cancel: true };
+		}
 		// failed: fall through to the configured-model fallback below.
 	} else {
 		writeDebugArtifact(
@@ -492,7 +679,7 @@ async function handleSessionBeforeCompact(
 	return undefined;
 }
 
-async function handleContext(
+async function handleContextInternal(
 	event: ContextEvent,
 	ctx: ExtensionContext,
 	pi: ExtensionAPI,
@@ -513,6 +700,7 @@ async function handleContext(
 			contextWindows.synchronize(ctx);
 		} catch {
 			notifyRemoteContextFailure(ctx, "malformed-window-state");
+			reportPiContextHookFailure(ctx, "malformed-window-state");
 			ctx.abort();
 			return undefined;
 		}
@@ -532,6 +720,7 @@ async function handleContext(
 					: { messages: projected };
 			} catch (error) {
 				notifyRemoteContextFailure(ctx, "malformed-window-state");
+				reportPiContextHookFailure(ctx, "malformed-window-state");
 				ctx.abort();
 				return undefined;
 			}
@@ -544,6 +733,7 @@ async function handleContext(
 		if (isCodexContextModel(ctx.model, config)) {
 			if (isCodexGatewayModel(ctx.model, config.gatewayContextModels)) {
 				notifyRemoteContextFailure(ctx, "codex-context-unavailable");
+				reportPiContextHookFailure(ctx, "codex-context-unavailable");
 				ctx.abort();
 				return undefined;
 			}
@@ -568,16 +758,43 @@ async function handleContext(
 	const branchEntries = ctx.sessionManager.getBranch();
 	const latest = resolveLatestNativeCompactionEntry(branchEntries, { baseUrl: resolution.runtime.baseUrl });
 	if (!latest.ok) return undefined;
-	const result = removeNativeCompactionRetainedMessages({ messages: replayEvent.messages, branchEntries, compactionEntry: latest.entry });
+	const result = removeNativeCompactionRetainedMessages({
+		messages: replayEvent.messages,
+		branchEntries,
+		compactionEntry: latest.entry,
+		expectedInputProvenance: getRemoteV2InputProvenance(config.remoteV2ContextSource),
+	});
 	if (!result.ok) {
 		writeReplayFailureArtifact({ reason: result.reason, compactionEntryId: latest.entry.id }, config, ctx);
 		if (ctx.hasUI) ctx.ui.notify(`${COMPACTION_EXTENSION_ID}: replay failed (${result.reason}); request aborted`, "error");
+		reportPiContextHookFailure(ctx, `replay-failed:${result.reason}`);
 		ctx.abort();
 		return undefined;
 	}
 	return result.messages === replayEvent.messages ? undefined : { messages: result.messages };
 }
 
+/**
+ * Pi's emitContext() catches handler exceptions. Re-throw as usual for Pi, but
+ * also report the failure so the compaction projector cannot mistake the
+ * caught exception for a successful projection.
+ */
+async function handleContext(
+	event: ContextEvent,
+	ctx: ExtensionContext,
+	pi: ExtensionAPI,
+	loadConfig: typeof loadToolkitConfig,
+	contextWindows: CodexContextWindowManager,
+	remoteContextActive: RemoteContextActive,
+) {
+	try {
+		return await handleContextInternal(event, ctx, pi, loadConfig, contextWindows, remoteContextActive);
+	} catch (error) {
+		reportPiContextHookFailure(ctx, error instanceof Error ? error.message : String(error));
+		throw error;
+	}
+}
+
 async function handleBeforeProviderRequest(
 	event: BeforeProviderRequestEvent,
 	ctx: ExtensionContext,
@@ -660,13 +877,20 @@ async function handleBeforeProviderRequest(
 	// synthetic compact request using the active consumer's effective runtime identity.
 	// This hook runs before the separate Web Search transform, so injected native search
 	// tools are not copied into remote_compaction_v2.
-	rememberRequestContext(payload, {
-		provider: runtime.provider,
-		api: runtime.api,
-		model: runtime.model,
-		baseUrl: runtime.baseUrl,
-		sessionId: getSessionId(ctx),
-	});
+	const webSearchRoute = resolveWebSearchRoute({ model: ctx.model, config: toolkitConfig.webSearch });
+	rememberRequestContext(
+		payload,
+		{
+			provider: runtime.provider,
+			api: runtime.api,
+			model: runtime.model,
+			baseUrl: runtime.baseUrl,
+			sessionId: getSessionId(ctx),
+		},
+		{
+			excludeWebSearchTools: webSearchRoute.route === "standalone-alpha",
+		},
+	);
 
 	const branchEntries = ctx.sessionManager.getBranch();
 	const latestNativeCompaction = resolveLatestNativeCompactionEntry(branchEntries, {
@@ -699,6 +923,7 @@ async function handleBeforeProviderRequest(
 		payload,
 		branchEntries,
 		compactionEntry: latestNativeCompactionEntry,
+		expectedInputProvenance: getRemoteV2InputProvenance(config.remoteV2ContextSource),
 	});
 	if (!rewrite.ok) {
 		writeDebugArtifact(
@@ -776,6 +1001,7 @@ export default function registerCompactionExtension(
 	overrides: Partial<CompactionDependencies> = {},
 ) {
 	const loadConfig = overrides.loadConfig ?? loadToolkitConfig;
+	const piContextHookPatch = installPiContextHookPatch();
 	const contextWindows = overrides.contextWindows ?? new CodexContextWindowManager((ctx, signal) =>
 		loadHistoryNotesThreadHint(ctx, signal, loadConfig().config.compaction.gatewayContextModels)
 	);
@@ -785,6 +1011,7 @@ export default function registerCompactionExtension(
 		nativeFallback: runNativeFallbackCompaction,
 		contextWindows,
 		...overrides,
+		piContextHookPatch: overrides.piContextHookPatch ?? piContextHookPatch,
 	};
 	let tools!: ReturnType<typeof registerContextManagementTools>;
 	tools = registerContextManagementTools(
@@ -847,9 +1074,11 @@ export default function registerCompactionExtension(
 				activation: {
 					active,
 					contextManagement: config.contextManagement,
+					remoteV2ContextSource: config.remoteV2ContextSource,
 					model: ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined,
 					...(activationReason ? { reason: activationReason } : {}),
 				},
+				piContextHookPatch: dependencies.piContextHookPatch,
 			},
 			config,
 			ctx,

package/src/payload-rewrite.ts

@@ -8,8 +8,12 @@ import type {
 	SessionMessageEntry,
 } from "@earendil-works/pi-coding-agent";
 import type { ResponsesCompatibleRequestPayload } from "./runtime";
+import { hasVerifiedCompactionInputProvenance } from "./compaction-projection";
 import { rewritePayloadWithDeferredToolCarryover } from "./deferred-tool-carryover";
-import type { NativeCompactionEntry } from "./types";
+import type {
+	NativeCompactionEntry,
+	NativeCompactionInputProvenance,
+} from "./types";
 import { serializeMessagesToResponsesInput, type ResponsesInputContentItem, type ResponsesInputItem, type ResponsesInputMessageItem } from "./serializer";
 
 export type NativeReplaySegments = {
@@ -35,7 +39,8 @@ export type NativeReplayPayloadRewriteFailureReason =
 	| "invalid-compacted-window"
 	| "unexpected-compaction-after-boundary"
 	| "compaction-summary-not-found"
-	| "retained-context-mismatch";
+	| "retained-context-mismatch"
+	| "unverified-compaction-input";
 
 export type NativeReplayPayloadRewriteFailure = {
 	ok: false;
@@ -323,29 +328,60 @@ export function removeNativeCompactionRetainedMessages(args: {
 	messages: AgentMessage[];
 	branchEntries: readonly SessionEntry[];
 	compactionEntry: NativeCompactionEntry;
+	expectedInputProvenance: NativeCompactionInputProvenance;
 }): { ok: true; messages: AgentMessage[] } | NativeReplayPayloadRewriteFailure {
 	const boundary = findCompactionBoundaryIndex(args.branchEntries, args.compactionEntry.id);
 	if (boundary === undefined) return { ok: false, reason: "compaction-boundary-not-found" };
+	if (!hasVerifiedCompactionInputProvenance(args.compactionEntry.details, args.expectedInputProvenance)) {
+		return { ok: false, reason: "unverified-compaction-input" };
+	}
 	const firstKept = findEntryIndexByIdBeforeBoundary(args.branchEntries, args.compactionEntry.firstKeptEntryId, boundary);
 	if (firstKept === undefined) return { ok: false, reason: "first-kept-entry-not-found" };
-	const summary = sessionEntryToContextMessages(args.compactionEntry)[0];
+	const summary = structuredClone(sessionEntryToContextMessages(args.compactionEntry)[0]);
 	const summaryIndex = args.messages.findIndex((message) => areEquivalentValues(message, summary));
 	if (summaryIndex < 0) return { ok: false, reason: "compaction-summary-not-found" };
-	const retained = args.branchEntries.slice(firstKept, boundary).flatMap(sessionEntryToContextMessages);
+	const retained = args.branchEntries
+		.slice(firstKept, boundary)
+		.flatMap(sessionEntryToContextMessages)
+		.map((message) => structuredClone(message));
+	// Custom messages are optional context-hook entries: a hook may filter or
+	// rewrite them before provider serialization. An exact custom copy is still
+	// removed when present, while a missing or rewritten copy is left alone.
+	// Required user/assistant/tool messages keep the ordered, fail-closed
+	// matching contract.
+	const requiredRetained = retained.filter((message) => message.role !== "custom");
+	const optionalRetained = retained.filter((message) => message.role === "custom");
 	const removed = new Set<number>();
 	let cursor = summaryIndex + 1;
-	for (const expected of retained) {
+	for (const expected of requiredRetained) {
 		const index = args.messages.findIndex((message, index) => index >= cursor && areEquivalentValues(message, expected));
 		if (index >= 0) {
 			removed.add(index);
 			cursor = index + 1;
 		}
 	}
-	// Already removed by another context handler: leave it alone. Partial
-	// matches are ambiguous; never remove half a call/result batch.
-	if (removed.size === 0) return { ok: true, messages: args.messages };
-	if (removed.size !== retained.length) return { ok: false, reason: "retained-context-mismatch" };
-	return { ok: true, messages: args.messages.filter((_, index) => !removed.has(index)) };
+	// An empty required span is valid. For a non-empty span, zero matches is
+	// ambiguous with the entire required history having been removed or changed;
+	// fail closed instead of treating it as an already-filtered no-op. Partial
+	// matches are equally unsafe because they can remove half a call/result batch.
+	if (requiredRetained.length > 0 && removed.size !== requiredRetained.length) {
+		return { ok: false, reason: "retained-context-mismatch" };
+	}
+
+	// Optional entries do not affect the strict parity decision. Search for each
+	// exact copy independently so a reordered custom entry can still be removed,
+	// but a provider-visible metadata/content rewrite remains untouched.
+	for (const expected of optionalRetained) {
+		const index = args.messages.findIndex(
+			(message, candidateIndex) =>
+				candidateIndex > summaryIndex && !removed.has(candidateIndex) && areEquivalentValues(message, expected),
+		);
+		if (index >= 0) removed.add(index);
+	}
+
+	return removed.size === 0
+		? { ok: true, messages: args.messages }
+		: { ok: true, messages: args.messages.filter((_, index) => !removed.has(index)) };
 }
 
 export function serializeLiveTailToResponsesInput<TApi extends Api>(args: {
@@ -360,6 +396,7 @@ function buildNativeReplaySegmentsInternal<TApi extends Api>(args: {
 	payload: ResponsesCompatibleRequestPayload;
 	branchEntries: readonly SessionEntry[];
 	compactionEntry: NativeCompactionEntry;
+	expectedInputProvenance: NativeCompactionInputProvenance;
 }): NativeReplayPayloadRewriteResult {
 	const boundaryIndex = findCompactionBoundaryIndex(args.branchEntries, args.compactionEntry.id);
 	if (boundaryIndex === undefined) {
@@ -398,6 +435,12 @@ function buildNativeReplaySegmentsInternal<TApi extends Api>(args: {
 			reason: "invalid-compacted-window",
 		};
 	}
+	if (!hasVerifiedCompactionInputProvenance(details, args.expectedInputProvenance)) {
+		return {
+			ok: false,
+			reason: "unverified-compaction-input",
+		};
+	}
 
 	const compactedWindow = cloneOpaqueCompactedWindow(details.compactedWindow);
 	if (!compactedWindow) {
@@ -462,6 +505,7 @@ export function buildNativeReplaySegments<TApi extends Api>(args: {
 	payload: ResponsesCompatibleRequestPayload;
 	branchEntries: readonly SessionEntry[];
 	compactionEntry: NativeCompactionEntry;
+	expectedInputProvenance: NativeCompactionInputProvenance;
 }): NativeReplayPayloadRewriteResult {
 	return buildNativeReplaySegmentsInternal(args);
 }
@@ -471,6 +515,7 @@ export function rewriteResponsesPayloadWithNativeReplay<TApi extends Api>(args:
 	payload: ResponsesCompatibleRequestPayload;
 	branchEntries: readonly SessionEntry[];
 	compactionEntry: NativeCompactionEntry;
+	expectedInputProvenance: NativeCompactionInputProvenance;
 }): NativeReplayPayloadRewriteResult {
 	return buildNativeReplaySegmentsInternal(args);
 }