@howaboua/pi-codex-conversion 1.5.12-dev.48.bf9d02e → 1.5.13-dev.50.32bb92f

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.5.13
+
+- Relaxed native compaction replay parity so the extension preserves the OpenAI compacted window using Pi's current provider payload when persisted session replay shape diverges.
+
 ## 1.5.12
 
 - Hardened native Responses compaction replay after Pi fallback or compacted-window shape changes, preserving the previous native compacted window without aborting normal requests.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/pi-codex-conversion",
-  "version": "1.5.12-dev.48.bf9d02e",
+  "version": "1.5.13-dev.50.32bb92f",
   "description": "Codex-oriented tool and prompt adapter for pi coding agent",
   "type": "module",
   "repository": {

package/src/adapter/payload-rewrite.ts

@@ -399,6 +399,37 @@ function clonePayloadConversationInput(args: {
 	return cloneResponsesInputSlice(args.payloadInput.slice(args.freshPreamble.leadingInput.length, tailEndIndex));
 }
 
+function stripLeadingCompactionSummaryPlaceholder(args: {
+	conversationInput: readonly ResponsesInputItem[];
+	compactionSummaryInput: readonly ResponsesInputItem[];
+}): ResponsesInputItem[] {
+	if (args.compactionSummaryInput.length === 0) return [...args.conversationInput];
+	if (!areEquivalentValues(args.conversationInput.slice(0, args.compactionSummaryInput.length), args.compactionSummaryInput)) {
+		return [...args.conversationInput];
+	}
+	return [...args.conversationInput.slice(args.compactionSummaryInput.length)];
+}
+
+function buildLenientNativeReplayPayload(args: {
+	payload: ResponsesCompatibleRequestPayload;
+	freshPreamble: FreshAuthoritativePreamble;
+	compactedWindow: readonly unknown[];
+	compactionSummaryInput: readonly ResponsesInputItem[];
+}): { input: unknown[]; conversationInput: ResponsesInputItem[] } | undefined {
+	const conversationInput = clonePayloadConversationInput({ payloadInput: args.payload.input, freshPreamble: args.freshPreamble });
+	if (!conversationInput) return undefined;
+	const replayConversationInput = stripLeadingCompactionSummaryPlaceholder({ conversationInput, compactionSummaryInput: args.compactionSummaryInput });
+	return {
+		conversationInput: replayConversationInput,
+		input: [
+			...args.freshPreamble.leadingInput,
+			...args.compactedWindow,
+			...replayConversationInput,
+			...args.freshPreamble.trailingInput,
+		],
+	};
+}
+
 function findReplayMatch<TApi extends Api>(args: {
 	model: Model<TApi>;
 	payloadInput: readonly unknown[];
@@ -530,9 +561,10 @@ function buildNativeReplaySegmentsInternal<TApi extends Api>(args: {
 		.slice(boundaryIndex + 1)
 		.some((entry) => entry.type === "compaction");
 	if (newerCompactionEntry) {
-		const conversationInput = clonePayloadConversationInput({ payloadInput: args.payload.input, freshPreamble });
+		const compactionSummaryInput = serializeMessagesToResponsesInput(args.model, [createCompactionSummaryAgentMessage(args.compactionEntry)]);
+		const lenientReplay = buildLenientNativeReplayPayload({ payload: args.payload, freshPreamble, compactedWindow, compactionSummaryInput });
 		const originalPiReplayInput = cloneResponsesInputSlice(args.payload.input);
-		if (!conversationInput || !originalPiReplayInput) {
+		if (!lenientReplay || !originalPiReplayInput) {
 			return {
 				ok: false,
 				reason: "unexpected-compaction-after-boundary",
@@ -550,24 +582,14 @@ function buildNativeReplaySegmentsInternal<TApi extends Api>(args: {
 				compactionSummary: [],
 				preCompactionKeptWindow: createReplaySlice([], [], []),
 				compactedWindow,
-				postCompactionTail: createReplaySlice(args.branchEntries.slice(boundaryIndex + 1), [], conversationInput),
+				postCompactionTail: createReplaySlice(args.branchEntries.slice(boundaryIndex + 1), [], lenientReplay.conversationInput),
 				originalPiReplayInput,
-				replayInput: [
-					...freshPreamble.leadingInput,
-					...compactedWindow,
-					...conversationInput,
-					...freshPreamble.trailingInput,
-				],
+				replayInput: lenientReplay.input,
 			},
 			rewrittenPayload: {
 				...args.payload,
 				...(freshPreamble.instructions !== undefined ? { instructions: freshPreamble.instructions } : {}),
-				input: [
-					...freshPreamble.leadingInput,
-					...compactedWindow,
-					...conversationInput,
-					...freshPreamble.trailingInput,
-				],
+				input: lenientReplay.input,
 			},
 		};
 	}
@@ -587,6 +609,30 @@ function buildNativeReplaySegmentsInternal<TApi extends Api>(args: {
 
 	if (!replayMatch) {
 		const compactionSummaryInput = serializeMessagesToResponsesInput(args.model, [compactionSummaryMessage]);
+		const lenientReplay = buildLenientNativeReplayPayload({ payload: args.payload, freshPreamble, compactedWindow, compactionSummaryInput });
+		if (lenientReplay) {
+			return {
+				ok: true,
+				segments: {
+					boundaryIndex,
+					firstKeptEntryIndex,
+					instructions: freshPreamble.instructions,
+					freshPreamble: freshPreamble.leadingInput,
+					trailingPreamble: freshPreamble.trailingInput,
+					compactionSummary: compactionSummaryInput,
+					preCompactionKeptWindow: createReplaySlice(preCompactionEntries, [], []),
+					compactedWindow,
+					postCompactionTail: createReplaySlice(postCompactionEntries, [], lenientReplay.conversationInput),
+					originalPiReplayInput: cloneResponsesInputSlice(args.payload.input) ?? [],
+					replayInput: lenientReplay.input,
+				},
+				rewrittenPayload: {
+					...args.payload,
+					...(freshPreamble.instructions !== undefined ? { instructions: freshPreamble.instructions } : {}),
+					input: lenientReplay.input,
+				},
+			};
+		}
 		const expectedInput = [
 			...freshPreamble.leadingInput,
 			...compactionSummaryInput,