pi-openai-toolkit 0.15.1 → 0.17.0

package/src/auto-mode/transcript.ts

@@ -1,133 +1,135 @@
-import type { SessionEntry } from "@earendil-works/pi-coding-agent";
-import {
-	boundReviewText,
-	MAX_TRANSCRIPT_CHARS,
-	MAX_TRANSCRIPT_ENTRY_CHARS,
-	MAX_TRANSCRIPT_RECENT_ENTRIES,
-	MAX_TRANSCRIPT_TOOL_CHARS,
-	TRUNCATION_MARKER,
-} from "./types";
-
-/**
- * A transcript line already reduced to text, with the role kept so the reviewer can
- * tell whose words these are. `[user]` is the only role that carries authorization.
- */
-export type TranscriptLine = {
-	role: "user" | "assistant" | "tool";
-	text: string;
-};
-
-function textOfContent(content: unknown): string {
-	if (typeof content === "string") return content;
-	if (!Array.isArray(content)) return "";
-	return content
-		.map((block) => {
-			if (!block || typeof block !== "object") return "";
-			const record = block as Record<string, unknown>;
-			if (record.type === "text" && typeof record.text === "string") return record.text;
-			if (record.type === "image") return "[image omitted]";
-			if (record.type === "toolCall" && typeof record.name === "string") {
-				const args = record.arguments;
-				return `${record.name} ${typeof args === "object" && args ? JSON.stringify(args) : ""}`.trim();
-			}
-			return "";
-		})
-		.filter(Boolean)
-		.join("\n")
-		.trim();
-}
-
-/**
- * Flatten session entries into reviewer lines. Non-message entries are skipped,
- * except a compaction summary, which is kept as a `[user]`-adjacent context marker
- * because it is the only surviving view of the older conversation.
- */
-export function sessionEntriesToLines(entries: readonly SessionEntry[]): TranscriptLine[] {
-	const lines: TranscriptLine[] = [];
-	for (const entry of entries) {
-		if (entry.type === "compaction" && typeof entry.summary === "string") {
-			const summary = boundReviewText(entry.summary, MAX_TRANSCRIPT_ENTRY_CHARS);
-			if (summary) lines.push({ role: "assistant", text: `[earlier conversation summary] ${summary}` });
-			continue;
-		}
-		if (entry.type !== "message") continue;
-		const message = entry.message as { role?: unknown; content?: unknown };
-		const text = textOfContent(message.content);
-		if (!text) continue;
-		if (message.role === "user") lines.push({ role: "user", text });
-		else if (message.role === "assistant") lines.push({ role: "assistant", text });
-		else if (message.role === "toolResult") lines.push({ role: "tool", text });
-	}
-	return lines;
-}
-
-function renderLine(index: number, line: TranscriptLine): string {
-	const body = boundReviewText(line.text, MAX_TRANSCRIPT_ENTRY_CHARS);
-	return `[${index}] [${line.role}]: ${body}`;
-}
-
-/**
- * Build a bounded transcript the way Codex's guardian does: user turns are the
- * anchors and are protected, tool and assistant evidence gets its own smaller
- * budget so verbose command output cannot crowd out the human conversation that
- * actually establishes authorization.
- *
- * Selection order is newest-first, then rendered in chronological order.
- */
-export function buildReviewTranscript(
-	lines: readonly TranscriptLine[],
-	budgets: {
-		maxTotalChars?: number;
-		maxToolChars?: number;
-		maxRecentEntries?: number;
-	} = {},
-): { text: string; omitted: boolean } {
-	const maxTotalChars = budgets.maxTotalChars ?? MAX_TRANSCRIPT_CHARS;
-	const maxToolChars = budgets.maxToolChars ?? MAX_TRANSCRIPT_TOOL_CHARS;
-	const maxRecentEntries = budgets.maxRecentEntries ?? MAX_TRANSCRIPT_RECENT_ENTRIES;
-
-	const recent = lines.slice(-Math.max(1, maxRecentEntries));
-	const omitted = recent.length < lines.length;
-
-	const userLines: number[] = [];
-	const otherLines: number[] = [];
-	recent.forEach((line, index) => {
-		if (line.role === "user") userLines.push(index);
-		else otherLines.push(index);
-	});
-
-	const selected = new Set<number>();
-	let userChars = 0;
-	// The first user turn carries the task; the latest carries the immediate ask.
-	for (const index of [userLines[0]!, userLines[userLines.length - 1]!, ...userLines.slice(1, -1).reverse()]) {
-		if (index === undefined || selected.has(index)) continue;
-		const cost = recent[index]!.text.length;
-		if (userChars + cost > maxTotalChars) break;
-		selected.add(index);
-		userChars += cost;
-	}
-
-	let toolChars = 0;
-	for (const index of [...otherLines].reverse()) {
-		const cost = recent[index]!.text.length;
-		if (toolChars + cost > maxToolChars) continue;
-		if (userChars + toolChars + cost > maxTotalChars) continue;
-		selected.add(index);
-		toolChars += cost;
-	}
-
-	const ordered = [...selected].sort((a, b) => a - b);
-	const rendered = ordered.map((index) => renderLine(index + 1, recent[index]!));
-	if (omitted) rendered.unshift(`${TRUNCATION_MARKER} earlier conversation entries were omitted.`);
-	return { text: rendered.join("\n"), omitted };
-}
-
-/**
- * Build the reviewer transcript straight from session entries.
- */
-export function transcriptFromEntries(
-	entries: readonly SessionEntry[],
-	budgets?: Parameters<typeof buildReviewTranscript>[1],
-): { text: string; omitted: boolean } {
-	return buildReviewTranscript(sessionEntriesToLines(entries), budgets);
-}
+import type { SessionEntry } from "@earendil-works/pi-coding-agent";
+import {
+	boundReviewText,
+	MAX_TRANSCRIPT_CHARS,
+	MAX_TRANSCRIPT_ENTRY_CHARS,
+	MAX_TRANSCRIPT_RECENT_ENTRIES,
+	MAX_TRANSCRIPT_TOOL_CHARS,
+	TRUNCATION_MARKER,
+} from "./types";
+
+/**
+ * A transcript line already reduced to text, with the role kept so the reviewer can
+ * tell whose words these are. `[user]` is the only role that carries authorization.
+ */
+export type TranscriptLine = {
+	role: "user" | "assistant" | "tool";
+	text: string;
+};
+
+function textOfContent(content: unknown): string {
+	if (typeof content === "string") return content;
+	if (!Array.isArray(content)) return "";
+	return content
+		.map((block) => {
+			if (!block || typeof block !== "object") return "";
+			const record = block as Record<string, unknown>;
+			if (record.type === "text" && typeof record.text === "string") return record.text;
+			if (record.type === "image") return "[image omitted]";
+			if (record.type === "toolCall" && typeof record.name === "string") {
+				const args = record.arguments;
+				return `${record.name} ${typeof args === "object" && args ? JSON.stringify(args) : ""}`.trim();
+			}
+			return "";
+		})
+		.filter(Boolean)
+		.join("\n")
+		.trim();
+}
+
+/**
+ * Flatten session entries into reviewer lines. Non-message entries are skipped,
+ * except a compaction summary, which is kept as a `[user]`-adjacent context marker
+ * because it is the only surviving view of the older conversation.
+ */
+export function sessionEntriesToLines(entries: readonly SessionEntry[]): TranscriptLine[] {
+	const lines: TranscriptLine[] = [];
+	for (const entry of entries) {
+		if (entry.type === "compaction" && typeof entry.summary === "string") {
+			// Defer bounding until selection so the transcript reports truncation.
+			if (entry.summary) lines.push({ role: "assistant", text: `[earlier conversation summary] ${entry.summary}` });
+			continue;
+		}
+		if (entry.type !== "message") continue;
+		const message = entry.message as { role?: unknown; content?: unknown };
+		const text = textOfContent(message.content);
+		if (!text) continue;
+		if (message.role === "user") lines.push({ role: "user", text });
+		else if (message.role === "assistant") lines.push({ role: "assistant", text });
+		else if (message.role === "toolResult") lines.push({ role: "tool", text });
+	}
+	return lines;
+}
+
+function renderLine(index: number, line: TranscriptLine, maxChars = MAX_TRANSCRIPT_ENTRY_CHARS): string {
+	const body = boundReviewText(line.text, maxChars);
+	return `[${index}] [${line.role}]: ${body}`;
+}
+
+/**
+ * Build a bounded transcript the way Codex's guardian does: user turns are the
+ * anchors and are protected, tool and assistant evidence gets its own smaller
+ * budget so verbose command output cannot crowd out the human conversation that
+ * actually establishes authorization.
+ *
+ * Selection order is newest-first, then rendered in chronological order.
+ */
+export function buildReviewTranscript(
+	lines: readonly TranscriptLine[],
+	budgets: {
+		maxTotalChars?: number;
+		maxToolChars?: number;
+		maxRecentEntries?: number;
+	} = {},
+): { text: string; omitted: boolean } {
+	const maxTotalChars = Math.max(0, budgets.maxTotalChars ?? MAX_TRANSCRIPT_CHARS);
+	const maxToolChars = Math.max(0, budgets.maxToolChars ?? MAX_TRANSCRIPT_TOOL_CHARS);
+	const maxRecentEntries = budgets.maxRecentEntries ?? MAX_TRANSCRIPT_RECENT_ENTRIES;
+	const recent = lines.slice(-Math.max(1, maxRecentEntries));
+	const notice = `${TRUNCATION_MARKER} conversation content was omitted or truncated.`;
+
+	function select(budget: number): { text: string; omitted: boolean } {
+		const selected = new Map<number, string>();
+		let totalChars = 0;
+		let toolChars = 0;
+		let omitted = recent.length < lines.length;
+		// Authorization gets the first claim on space, newest instructions first.
+		const indices = recent.map((_, index) => index).reverse();
+		for (const index of [...indices.filter((i) => recent[i]!.role === "user"), ...indices.filter((i) => recent[i]!.role !== "user")]) {
+			const line = recent[index]!;
+			const separator = selected.size > 0 ? 1 : 0;
+			const available = Math.min(budget - totalChars, line.role === "user" ? Infinity : maxToolChars - toolChars) - separator;
+			const prefix = `[${index + 1}] [${line.role}]: `;
+			if (available <= prefix.length + 3) {
+				omitted = true;
+				continue;
+			}
+			const rendered = renderLine(index + 1, line, Math.min(MAX_TRANSCRIPT_ENTRY_CHARS, available - prefix.length));
+			if (rendered.slice(prefix.length) !== line.text) omitted = true;
+			selected.set(index, rendered);
+			const cost = rendered.length + separator;
+			totalChars += cost;
+			if (line.role !== "user") toolChars += cost;
+		}
+		return {
+			text: [...selected].sort(([a], [b]) => a - b).map(([, text]) => text).join("\n"),
+			omitted,
+		};
+	}
+
+	const initial = select(maxTotalChars);
+	if (!initial.omitted) return initial;
+	if (maxTotalChars <= notice.length) return { text: notice.slice(0, maxTotalChars), omitted: true };
+	const bounded = select(maxTotalChars - notice.length - 1);
+	return { text: bounded.text ? `${notice}\n${bounded.text}` : notice, omitted: true };
+}
+
+/**
+ * Build the reviewer transcript straight from session entries.
+ */
+export function transcriptFromEntries(
+	entries: readonly SessionEntry[],
+	budgets?: Parameters<typeof buildReviewTranscript>[1],
+): { text: string; omitted: boolean } {
+	return buildReviewTranscript(sessionEntriesToLines(entries), budgets);
+}

package/src/compaction-projection.ts

@@ -1,31 +1,35 @@
-import type {
-	NativeCompactionDetails,
-	NativeCompactionInputProvenance,
-} from "./types";
-
-/** The configured Pi context-hook projector is unavailable or failed. */
-export const COMPACTION_PROJECTION_UNAVAILABLE = "no-supported-projection-seam" as const;
-/** The current session context could not be read before projection. */
-export const COMPACTION_SESSION_CONTEXT_UNAVAILABLE = "session-context-unavailable" as const;
-/** A projected recursive context did not contain the current compaction summary. */
-export const COMPACTION_PROJECTED_CONTEXT_UNAVAILABLE = "projected-compaction-context-unavailable" as const;
-/** The latest opaque checkpoint was created with no or a different input marker. */
-export const COMPACTION_CHECKPOINT_PROVENANCE_UNAVAILABLE = "unverified-compaction-checkpoint" as const;
-
-export type UnprojectedCompactionReason =
-	| typeof COMPACTION_PROJECTION_UNAVAILABLE
-	| typeof COMPACTION_SESSION_CONTEXT_UNAVAILABLE
-	| typeof COMPACTION_CHECKPOINT_PROVENANCE_UNAVAILABLE
-	| typeof COMPACTION_PROJECTED_CONTEXT_UNAVAILABLE;
-
-/**
- * A Remote V2 checkpoint is safe for the current replay chain only when its
- * marker matches the configured input source. Structural persistence validation
- * intentionally remains more permissive for old session files.
- */
-export function hasVerifiedCompactionInputProvenance(
-	details: Pick<NativeCompactionDetails, "inputProvenance"> | undefined,
-	expected: NativeCompactionInputProvenance,
-): boolean {
-	return details?.inputProvenance === expected;
-}
+import type {
+	NativeCompactionDetails,
+	NativeCompactionInputProvenance,
+} from "./types";
+
+/** The configured Pi context-hook projector is unavailable or failed. */
+export const COMPACTION_PROJECTION_UNAVAILABLE = "no-supported-projection-seam" as const;
+/** The current session context could not be read before projection. */
+export const COMPACTION_SESSION_CONTEXT_UNAVAILABLE = "session-context-unavailable" as const;
+/** A projected recursive context did not contain the current compaction summary. */
+export const COMPACTION_PROJECTED_CONTEXT_UNAVAILABLE = "projected-compaction-context-unavailable" as const;
+/** The latest opaque checkpoint was created with no or a different input marker. */
+export const COMPACTION_CHECKPOINT_PROVENANCE_UNAVAILABLE = "unverified-compaction-checkpoint" as const;
+
+/** Persisted edits changed input already sealed inside an opaque checkpoint. */
+export const COMPACTION_CHECKPOINT_CONTEXT_EDITED = "checkpoint-context-edited" as const;
+
+export type UnprojectedCompactionReason =
+	| typeof COMPACTION_CHECKPOINT_CONTEXT_EDITED
+	| typeof COMPACTION_PROJECTION_UNAVAILABLE
+	| typeof COMPACTION_SESSION_CONTEXT_UNAVAILABLE
+	| typeof COMPACTION_CHECKPOINT_PROVENANCE_UNAVAILABLE
+	| typeof COMPACTION_PROJECTED_CONTEXT_UNAVAILABLE;
+
+/**
+ * A Remote V2 checkpoint is safe for the current replay chain only when its
+ * marker matches the configured input source. Structural persistence validation
+ * intentionally remains more permissive for old session files.
+ */
+export function hasVerifiedCompactionInputProvenance(
+	details: Pick<NativeCompactionDetails, "inputProvenance"> | undefined,
+	expected: NativeCompactionInputProvenance,
+): boolean {
+	return details?.inputProvenance === expected;
+}