pi-posthorse 0.10.2 → 0.10.3

package/src/recovery.ts

@@ -1,19 +1,12 @@
-import {
-	AUTO_HANDOFF_PREFIX,
-	isRecord,
-	isReminderType,
-	type EntryLike,
-	type ProjectedEntry,
-} from "./contracts.ts";
+import { AUTO_HANDOFF_PREFIX, isRecord, type EntryLike, type ProjectedEntry } from "./contracts.ts";
 import { contextEdits, contextStart, windowHandoff } from "./history-entries.ts";
+import { boundedBlock, excerpt, toolCalls } from "./message-text.ts";
 import {
-	boundedBlock,
-	excerpt,
-	imageSummary,
-	imagesOf,
-	textOf,
-	toolCalls,
-} from "./message-text.ts";
+	formatRecord,
+	indexLine,
+	recoveryRecord,
+	type RecoveryRecord,
+} from "./recovery-records.ts";
 import { renderSessionNotes, type RetainedSpan } from "./recovery-notes.ts";
 import {
 	recoverableToolResults,
@@ -66,90 +59,6 @@ function buildRolloverPreamble(span: RetainedSpan | undefined): string {
 			: `entries ${span.firstId} through ${span.lastId} above are the carried-over recent tail`;
 	return `${PREAMBLE}\n${RETAINED_MARKER_PREFIX}${span.lastId}. Earlier turns before entry ${span.firstId} were compacted into session history; ${range} from before this rollover. Recent messages follow separately; their inputs and tool evidence are not repeated in this record. Start the new context window from here.`;
 }
-type RecoveryRecord = {
-	readonly id: string;
-	readonly timestamp: string;
-	readonly kind: "owner" | "coordination";
-	readonly label: string;
-	readonly text: string;
-};
-type RecordSource = {
-	readonly kind: RecoveryRecord["kind"];
-	readonly label: string;
-	readonly content: unknown;
-};
-function ownerAnswer(entry: EntryLike, ownerQuestion: boolean): boolean {
-	const message = entry.message;
-	return (
-		ownerQuestion &&
-		entry.type === "message" &&
-		message?.role === "toolResult" &&
-		message.toolName === "ask_question" &&
-		message.namespace === undefined &&
-		message.isError !== true
-	);
-}
-function recordSource(entry: EntryLike, ownerQuestion: boolean): RecordSource | undefined {
-	if (entry.type === "message" && entry.message?.role === "user") {
-		return { kind: "owner", label: "owner input", content: entry.message.content };
-	}
-	if (ownerAnswer(entry, ownerQuestion)) {
-		return {
-			kind: "owner",
-			label: "owner answer via ask_question",
-			content: entry.message?.content,
-		};
-	}
-	if (
-		entry.type === "custom_message" &&
-		entry.display === true &&
-		!isReminderType(entry.customType)
-	) {
-		return {
-			kind: "coordination",
-			label: `visible ${(entry.customType ?? "custom").slice(0, 80)} coordination input (not direct owner input)`,
-			content: entry.content,
-		};
-	}
-	return;
-}
-function recoveryRecord(entry: EntryLike, ownerQuestion: boolean): RecoveryRecord | undefined {
-	const source = recordSource(entry, ownerQuestion);
-	if (source === undefined) {
-		return undefined;
-	}
-	const id = entry.id?.slice(0, 120) ?? "unknown";
-	const text = textOf({ content: source.content }).trim();
-	const summary =
-		source.label === "owner answer via ask_question"
-			? ""
-			: imageSummary(imagesOf(source.content));
-	const body = [text, summary === "" ? "" : `${summary} — recover with history read id ${id}`]
-		.filter((part) => part !== "")
-		.join("\n");
-	return {
-		id,
-		timestamp: entry.timestamp?.slice(0, 80) ?? "unknown time",
-		kind: source.kind,
-		label: source.label,
-		text: body === "" ? "(non-text content; recover the entry from history)" : body,
-	};
-}
-function formatRecord(record: RecoveryRecord, limit: number): string {
-	return boundedBlock(
-		`[${record.label} | ${record.timestamp} | entry ${record.id}]`,
-		record.text,
-		limit,
-	);
-}
-function indexLine(record: RecoveryRecord): string {
-	const header = formatRecord(record, 0);
-	if (record.kind !== "owner") {
-		return header;
-	}
-	const preview = record.text.replace(/\s+/g, " ").trim();
-	return `${header} ${preview.length > 120 ? `${preview.slice(0, 119)}…` : preview}`;
-}
 function priorCheckpoint(entry: EntryLike | undefined, limit: number): string | undefined {
 	const handoff = windowHandoff(entry)?.trim();
 	if (entry === undefined || handoff === undefined || handoff === "") {
@@ -265,7 +174,7 @@ function recoveryAncestry(
 	ownerQuestionRegistered: boolean,
 	retained: ReadonlySet<string>,
 ): {
-	readonly checkpoint?: EntryLike;
+	readonly checkpoint?: EntryLike | undefined;
 	readonly carried: readonly RecoveryRecord[];
 	readonly skipped: readonly string[];
 } {
@@ -296,13 +205,15 @@ function recoveryAncestry(
 	return { checkpoint: boundary, carried: [], skipped };
 }
 function skippedRecords(ids: readonly string[], limit: number): string | undefined {
-	if (ids.length === 0) {
+	const remaining = ids.values();
+	const first = remaining.next();
+	if (first.done === true) {
 		return undefined;
 	}
-	let names = ids[0];
+	let names = first.value;
 	let count = 1;
-	while (count < ids.length) {
-		const next = `, ${ids[count]}`;
+	for (const id of remaining) {
+		const next = `, ${id}`;
 		if (names.length + next.length > limit) {
 			break;
 		}
@@ -335,7 +246,7 @@ function joined(parts: readonly (string | undefined)[]): string {
 }
 type BatchPlan = {
 	readonly header?: string;
-	readonly omission?: string;
+	readonly omission?: string | undefined;
 	readonly blocks: readonly RecoveryBlock[];
 	readonly bare?: string;
 };
@@ -359,8 +270,8 @@ function planBatch(
 	}
 	let budget = available;
 	let first = batch.blocks.length;
-	while (first > 0) {
-		const length = batch.blocks[first - 1].header.length + 2;
+	for (const block of batch.blocks.toReversed()) {
+		const length = block.header.length + 2;
 		if (length > budget) {
 			break;
 		}
@@ -417,8 +328,8 @@ function renderIndex(records: readonly RecoveryRecord[], available: number): str
 	}
 	let budget = available;
 	const listed: string[] = [];
-	for (let i = records.length - 1; i >= 0; i--) {
-		const line = indexLine(records[i]);
+	for (const record of records.toReversed()) {
+		const line = indexLine(record);
 		if (line.length + 1 > budget) {
 			break;
 		}

package/src/reminders.ts

@@ -22,7 +22,7 @@ export type ReminderLookup = {
 };
 export type StaleReminderPredicate = (message: {
 	readonly role: string;
-	readonly customType?: string;
+	readonly customType?: string | undefined;
 	readonly details?: unknown;
 }) => boolean;
 
@@ -53,8 +53,8 @@ function onlyReminders(entries: readonly EntryLike[]): EntryLike[] {
 	);
 }
 type ScanProgress = {
-	readonly boundary?: EntryLike;
-	readonly window?: EntryLike;
+	readonly boundary?: EntryLike | undefined;
+	readonly window?: EntryLike | undefined;
 	readonly kept: boolean;
 };
 function advanceBoundary(entry: EntryLike, progress: ScanProgress): ScanProgress {

package/src/retention.ts

@@ -20,10 +20,10 @@ type RecoveryCapacity = {
 	readonly host: PolicyContext;
 	readonly toolTokens: number;
 	readonly pendingMessages?: readonly MessageLike[];
-	readonly firstKeptEntryId?: string;
+	readonly firstKeptEntryId?: string | undefined;
 };
 type RetainedTail = {
-	readonly firstKeptEntryId?: string;
+	readonly firstKeptEntryId?: string | undefined;
 	readonly ids: ReadonlySet<string>;
 };
 type Immutable<T> = T extends string | number | boolean | null | undefined
@@ -128,26 +128,29 @@ function boundedTail(
 	start: number,
 	maxTokens: number,
 ): RetainedTail {
-	const costs = entries.map((entry) =>
-		entry.sourceEntry.type === "compaction"
-			? 0
-			: visibleMessages(entry).reduce(
-					(sum, message) => sum + estimateTokens(nativeMessage(message)),
-					0,
-				),
-	);
-	let tokens = costs.slice(start).reduce((sum, cost) => sum + cost, 0);
-	for (let index = start; index < entries.length; index++) {
-		if (tokens > 0 && tokens <= maxTokens && safeStart(entries[index])) {
+	const costs = entries.slice(start).map((entry) => ({
+		entry,
+		cost:
+			entry.sourceEntry.type === "compaction"
+				? 0
+				: visibleMessages(entry).reduce(
+						(sum, message) => sum + estimateTokens(nativeMessage(message)),
+						0,
+					),
+	}));
+	let tokens = costs.reduce((sum, { cost }) => sum + cost, 0);
+	for (const [offset, { entry, cost }] of costs.entries()) {
+		const index = start + offset;
+		if (tokens > 0 && tokens <= maxTokens && safeStart(entry)) {
 			const tail = entries.slice(index);
 			if (pairedTail(tail)) {
 				return {
-					firstKeptEntryId: entries[index].sourceEntry.id,
-					ids: new Set(tail.map((entry) => entry.sourceEntry.id)),
+					firstKeptEntryId: entry.sourceEntry.id,
+					ids: new Set(tail.map((retained) => retained.sourceEntry.id)),
 				};
 			}
 		}
-		tokens -= costs[index];
+		tokens -= cost;
 	}
 	return { ids: new Set() };
 }
@@ -181,7 +184,7 @@ export function automaticRecovery(
 	projected: readonly ProjectionEntry[],
 	capacity: RecoveryCapacity,
 	ownerQuestionRegistered: boolean,
-): { readonly handoff: string; readonly firstKeptEntryId?: string } | undefined {
+): { readonly handoff: string; readonly firstKeptEntryId?: string | undefined } | undefined {
 	const payload = freshPayloadChars(
 		capacity.host,
 		capacity.toolTokens,

package/src/rollover.ts

@@ -1,26 +1,22 @@
 import type {
 	BoundaryResult,
+	ContextEvent,
 	ExtensionAPI,
 	ExtensionContext,
 	TurnEndEvent,
 } from "@earendil-works/pi-coding-agent";
-import {
-	budgetFor,
-	buildGuidance,
-	CHECKPOINT_STEPS,
-	freshPayloadChars,
-	type Budget,
-} from "./budget.ts";
+import { budgetFor, CHECKPOINT_STEPS, freshPayloadChars, type Budget } from "./budget.ts";
 import {
 	isRecord,
 	isReminderType,
 	REMINDER_TYPE,
-	type CompactionPolicy,
 	type PolicyContext,
 	type ProjectedEntry,
 	type ReminderFingerprint,
+	type SnapshotReader,
 } from "./contracts.ts";
 import { registerContextTools } from "./context-tools.ts";
+import { registerGuidance } from "./guidance.ts";
 import { safeJsonStringify } from "./message-text.ts";
 import { hasRetainedRolloverMarker } from "./recovery.ts";
 import { automaticRecovery } from "./retention.ts";
@@ -33,48 +29,7 @@ import {
 	type StaleReminderPredicate,
 } from "./reminders.ts";
 
-export type SnapshotReader = (
-	ctx: ExtensionContext,
-	livePolicy?: CompactionPolicy,
-) => PolicyContext;
 const REMINDER_BUFFER_TOKENS = 32_000;
-function registerGuidance(pi: ExtensionAPI, policy: SnapshotReader): void {
-	let promptOptions: { readonly forceSystemPrompt?: string } | undefined;
-	pi.on("before_agent_start", (event) => {
-		promptOptions = event.systemPromptOptions;
-	});
-	pi.on("agent_settled", () => {
-		// Prompt options belong to one run, never to later idle context evaluation.
-		promptOptions = undefined;
-	});
-	pi.on("context_with_system", (event, ctx) => {
-		const guidance = buildGuidance(policy(ctx));
-		const system =
-			event.messages.findLast(
-				(message) =>
-					message.role === "system" && typeof message.sections?.posthorse === "string",
-			) ?? event.messages.find((message) => message.role === "system");
-		if (system === undefined || system.role !== "system") {
-			return;
-		}
-		if (promptOptions?.forceSystemPrompt !== undefined) {
-			// ponytail: Pi applies forced prompts after this hook; keep request-local guidance
-			// until the host projects forced text before context_with_system.
-			event.messages.splice(1, 0, {
-				role: "custom",
-				customType: "posthorse-guidance",
-				content: guidance,
-				display: false,
-				timestamp: 0,
-			});
-		} else {
-			system.sections = {
-				...system.sections,
-				posthorse: `<posthorse>\n${guidance}\n</posthorse>`,
-			};
-		}
-	});
-}
 function explicitReset(
 	event: TurnEndEvent,
 	ctx: ExtensionContext,
@@ -150,7 +105,7 @@ function sendReminder(
 		readonly tokens: number;
 		readonly pendingMessages: readonly {
 			readonly role: string;
-			readonly customType?: string;
+			readonly customType?: string | undefined;
 			readonly details?: unknown;
 		}[];
 	},
@@ -188,7 +143,7 @@ const NO_STALE_REMINDER: StaleReminderPredicate = () => false;
 function staleReminderPredicate(
 	messages: readonly {
 		readonly role: string;
-		readonly customType?: string;
+		readonly customType?: string | undefined;
 		readonly details?: unknown;
 	}[],
 	ctx: ExtensionContext,
@@ -225,6 +180,40 @@ function staleReminderPredicate(
 		isReminderType(message.customType) &&
 		(!enabled || !reminderMatches(message.details, fingerprint));
 }
+function chronologicalRetainedTail(
+	messages: ContextEvent["messages"],
+	ctx: ExtensionContext,
+	stale: StaleReminderPredicate,
+): ContextEvent["messages"] {
+	const first = messages[0];
+	if (
+		messages.length >= 2 &&
+		first?.role === "compactionSummary" &&
+		hasRetainedRolloverMarker(first.summary)
+	) {
+		const count = countRetainedMessages(ctx, stale);
+		if (count > 0 && 1 + count <= messages.length) {
+			const retainedSlice = messages.slice(1, 1 + count);
+			const afterSlice = messages.slice(1 + count);
+			if (retainedSlice[0]?.role !== "assistant") {
+				return [...retainedSlice, first, ...afterSlice];
+			}
+			return [
+				{
+					role: "custom",
+					customType: "posthorse-retained-tail",
+					content: "[Retained pre-rollover tail]",
+					display: false,
+					timestamp: first.timestamp,
+				},
+				...retainedSlice,
+				first,
+				...afterSlice,
+			];
+		}
+	}
+	return messages;
+}
 function registerReminderFilter(
 	pi: ExtensionAPI,
 	policy: SnapshotReader,
@@ -235,37 +224,9 @@ function registerReminderFilter(
 		const filtered = event.messages.some(stale)
 			? event.messages.filter((message) => !stale(message))
 			: event.messages;
-		const first = filtered[0];
-		if (
-			filtered.length >= 2 &&
-			first.role === "compactionSummary" &&
-			hasRetainedRolloverMarker(first.summary)
-		) {
-			const count = countRetainedMessages(ctx, stale);
-			if (count > 0 && 1 + count <= filtered.length) {
-				const retainedSlice = filtered.slice(1, 1 + count);
-				const afterSlice = filtered.slice(1 + count);
-				if (retainedSlice[0].role !== "assistant") {
-					return { messages: [...retainedSlice, first, ...afterSlice] };
-				}
-				return {
-					messages: [
-						{
-							role: "custom",
-							customType: "posthorse-retained-tail",
-							content: "[Retained pre-rollover tail]",
-							display: false,
-							timestamp: first.timestamp,
-						},
-						...retainedSlice,
-						first,
-						...afterSlice,
-					],
-				};
-			}
-		}
-		if (filtered !== event.messages) {
-			return { messages: filtered };
+		const ordered = chronologicalRetainedTail(filtered, ctx, stale);
+		if (ordered !== event.messages) {
+			return { messages: ordered };
 		}
 		return;
 	});
@@ -277,7 +238,7 @@ function automaticDraft(
 		readonly handoff: string;
 		readonly tokensBefore: number;
 		readonly reason: string;
-		readonly firstKeptEntryId?: string;
+		readonly firstKeptEntryId?: string | undefined;
 	},
 ) {
 	let firstKeptEntryId = recovery.firstKeptEntryId;

package/src/session-files.ts

@@ -56,7 +56,7 @@ const LABEL_SOURCES: readonly (readonly [label: string, needles: readonly string
  */
 export function prefilterNeedles(query: string): string[] | undefined {
 	// A match contains every fragment between characters that JSON escapes or labels may add.
-	const [fragment] = query
+	const [fragment = ""] = query
 		.split(/["\\[\](){}:$\p{Cc}\p{Cs}]/u)
 		.map((part) => part.trim())
 		.sort((a, b) => b.length - a.length);
@@ -143,7 +143,6 @@ function ripgrepFilter(
 		for (const binary of binaries) {
 			try {
 				// Try the host-managed binary first; PATH is a fallback only when it is unavailable.
-				// oxlint-disable-next-line no-await-in-loop
 				return (await execFileText(binary, [...flags, ...paths], dir, signal)).split("\0");
 			} catch (error) {
 				const code = isRecord(error) ? error.code : undefined;
@@ -162,7 +161,7 @@ function ripgrepFilter(
 	return async (files) => {
 		const paths = files.map((file) => relative(dir, file));
 		const found = new Set((await Promise.all(commandGroups(paths).map(matching))).flat());
-		return files.filter((_file, index) => found.has(paths[index]));
+		return files.filter((file) => found.has(relative(dir, file)));
 	};
 }
 function messageFrom(value: unknown): MessageLike | undefined {
@@ -222,7 +221,7 @@ function entryHead(prefix: string): EntryLike | undefined {
 	return {
 		type: head[1],
 		id: head[2],
-		parentId: head[3] === "null" ? null : head[3].slice(1, -1),
+		parentId: head[3] === "null" ? null : head[3]?.slice(1, -1),
 	};
 }
 /** Whether a caller may need a line; other lines only advance window ancestry. */
@@ -271,7 +270,6 @@ async function sessionFiles(dir: string): Promise<string[]> {
 	let level = existsSync(dir) ? [dir] : [];
 	while (level.length > 0) {
 		// Each level lists the directories the previous level found.
-		// oxlint-disable-next-line no-await-in-loop
 		const listings = await Promise.all(
 			level.map((path) => readdir(path, { withFileTypes: true })),
 		);
@@ -293,16 +291,24 @@ async function sessionFiles(dir: string): Promise<string[]> {
 }
 type SessionFile = { readonly file: string; readonly size: number; readonly mtime: number };
 async function newestFirst(files: readonly string[]): Promise<SessionFile[]> {
-	const stats = await Promise.all(files.map((file) => stat(file)));
-	return files
-		.map((file, index) => ({ file, size: stats[index].size, mtime: stats[index].mtimeMs }))
-		.sort((a, b) => b.mtime - a.mtime);
+	const stats = await Promise.all(
+		files.map(async (file) => {
+			const info = await stat(file);
+			return { file, size: info.size, mtime: info.mtimeMs };
+		}),
+	);
+	return stats.sort((a, b) => b.mtime - a.mtime);
 }
 /** The newest files up to FIRST_SEARCH_BYTES, then the rest. */
 function searchPhases(files: readonly SessionFile[]): readonly (readonly string[])[] {
 	let count = 0;
-	for (let bytes = 0; count < files.length && bytes < FIRST_SEARCH_BYTES; count++) {
-		bytes += files[count].size;
+	let bytes = 0;
+	for (const file of files) {
+		if (bytes >= FIRST_SEARCH_BYTES) {
+			break;
+		}
+		bytes += file.size;
+		count++;
 	}
 	const paths = files.map(({ file }) => file);
 	return [paths.slice(0, count), paths.slice(count)];
@@ -310,7 +316,7 @@ function searchPhases(files: readonly SessionFile[]): readonly (readonly string[
 async function sessionHeader(
 	file: string,
 	signal?: AbortSignal,
-): Promise<{ readonly cwd?: string } | undefined> {
+): Promise<{ readonly cwd?: string | undefined } | undefined> {
 	for await (const line of lfLines(file, signal)) {
 		try {
 			const value: unknown = JSON.parse(line.toString("utf8"));
@@ -343,11 +349,11 @@ function parentSession(
 export type SessionScope = {
 	readonly dir: string;
 	readonly cwd: string;
-	readonly currentFile?: string;
-	readonly signal?: AbortSignal;
-	readonly fileKey?: string;
+	readonly currentFile?: string | undefined;
+	readonly signal?: AbortSignal | undefined;
+	readonly fileKey?: string | undefined;
 	/** Raw-text needles; files without any of them are skipped. */
-	readonly needles?: readonly string[];
+	readonly needles?: readonly string[] | undefined;
 };
 /** Scope memoization is owned by one enumeration; nested runs inherit their parent's project. */
 function membership(
@@ -393,10 +399,8 @@ export async function* scopedSessionFiles(scope: SessionScope): AsyncGenerator<s
 			: ripgrepFilter(scope.dir, scope.needles, scope.signal);
 	for (const phase of searchPhases(selected)) {
 		// Older files are searched only when the newest ones did not satisfy the caller.
-		// oxlint-disable-next-line no-await-in-loop
 		for (const file of prefilter === undefined ? phase : await prefilter(phase)) {
 			// Preserve newest-first traversal while closing each header stream before opening another.
-			// oxlint-disable-next-line no-await-in-loop
 			if (await belongs(file)) {
 				yield file;
 			}

package/src/session-lines.ts

@@ -18,7 +18,7 @@ type LineRange = {
 	readonly end: number;
 	readonly head: string;
 	readonly matches: boolean;
-	readonly bytes?: Readonly<Pick<Buffer, "toString">>;
+	readonly bytes?: Readonly<Pick<Buffer, "toString">> | undefined;
 };
 async function* lineRanges(
 	file: string,
@@ -73,7 +73,6 @@ async function rangeText(
 	while (offset < buffer.length) {
 		signal?.throwIfAborted();
 		// Positioned reads may be short; each continues the same selected record.
-		// oxlint-disable-next-line no-await-in-loop
 		const { bytesRead } = await handle.read(
 			buffer,
 			offset,

package/src/ui/cards.ts

@@ -61,11 +61,12 @@ function callDetails(name: ToolName, args: Readonly<Record<string, unknown>>): s
 		name === "history" && args.op === "search"
 			? `Scope: ${args.all === true ? "all project sessions" : "current branch"}`
 			: "";
-	const offsets = [
+	const labels: readonly (readonly [string, string])[] = [
 		["offset", "Offset"],
 		["imageOffset", "Image offset"],
 		["limit", "Limit"],
-	].map(([key, label]) => {
+	];
+	const offsets = labels.map(([key, label]) => {
 		const value = args[key];
 		return value === undefined
 			? ""

package/src/ui/display.ts

@@ -21,7 +21,7 @@ export type PosthorseDisplay =
 				readonly percent: number | null;
 			};
 			readonly rollover?: "enabled" | "disabled" | "unsupported";
-			readonly rolloverAt?: number;
+			readonly rolloverAt?: number | undefined;
 	  }
 	| {
 			readonly kind: "notes-list" | "notes-search";
@@ -241,7 +241,7 @@ function historyReadSummary(
 	) {
 		return pageSummary(display);
 	}
-	const summary = `${pageSummary(display).split("\n")[0]}\nImages ${n(display.imageOffset ?? 0)}–${n(display.imageEnd)} of ${n(display.imageTotal)}`;
+	const summary = `${pageSummary(display).split("\n", 1).join("")}\nImages ${n(display.imageOffset ?? 0)}–${n(display.imageEnd)} of ${n(display.imageTotal)}`;
 	return display.end < display.total || display.imageEnd < display.imageTotal
 		? `Next offset ${n(display.end)}\nimageOffset ${n(display.imageEnd)}\n${summary}`
 		: summary;

package/src/ui/text.ts

@@ -5,7 +5,6 @@ export type OutputColor = "toolOutput" | "muted" | "dim" | "error" | "warning";
 
 export function clean(value: string): string {
 	// Tool previews must not execute terminal controls or Unicode interlinear annotations.
-	// oxlint-disable-next-line no-control-regex
 	return stripTerminalSequences(value).replace(/[\x00-\x08\x0b-\x1f\x7f-\x9f\ufff9-\ufffb]/g, "");
 }