pi-posthorse 0.10.2 → 0.10.4

package/src/recovery-records.ts

@@ -0,0 +1,90 @@
+import { isReminderType, type EntryLike } from "./contracts.ts";
+import { boundedBlock, imageSummary, imagesOf, textOf } from "./message-text.ts";
+
+export 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;
+}
+export 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,
+	};
+}
+export function formatRecord(record: RecoveryRecord, limit: number): string {
+	return boundedBlock(
+		`[${record.label} | ${record.timestamp} | entry ${record.id}]`,
+		record.text,
+		limit,
+	);
+}
+export 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}`;
+}

package/src/recovery-results.ts

@@ -10,9 +10,13 @@ import {
 } from "./message-text.ts";
 
 export type RecoveryEntry = EntryLike & { readonly retained: boolean };
+const INCOMPLETE_STOPS = new Set(["error", "aborted", "length"]);
 type LinkedCall = { readonly entry: EntryLike; readonly block: ToolCallLike };
 export type RecoveryBlock = { readonly header: string; readonly text: string };
-export type RecoveryBatch = { readonly callId?: string; readonly blocks: readonly RecoveryBlock[] };
+export type RecoveryBatch = {
+	readonly callId?: string | undefined;
+	readonly blocks: readonly RecoveryBlock[];
+};
 function callsById(entries: readonly EntryLike[]): Map<string, LinkedCall> {
 	const calls = new Map<string, LinkedCall>();
 	for (const entry of entries) {
@@ -30,14 +34,11 @@ function callsById(entries: readonly EntryLike[]): Map<string, LinkedCall> {
 function trailingStart(entries: readonly EntryLike[]): number {
 	let hasTrailingResult = false;
 	for (let i = entries.length - 1; i >= 0; i--) {
-		const message = entries[i].message;
+		const message = entries[i]?.message;
 		if (message?.role === "toolResult") {
 			hasTrailingResult = true;
 		} else if (message?.role === "assistant") {
-			const invalid =
-				message.stopReason === "error" ||
-				message.stopReason === "aborted" ||
-				message.stopReason === "length";
+			const invalid = INCOMPLETE_STOPS.has(message.stopReason ?? "");
 			if (!invalid || hasTrailingResult) {
 				return i;
 			}

package/src/recovery.ts

@@ -1,19 +1,13 @@
-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 type { NotesRecovery } from "./note-evidence.ts";
 import { renderSessionNotes, type RetainedSpan } from "./recovery-notes.ts";
 import {
 	recoverableToolResults,
@@ -66,90 +60,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 +175,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 +206,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 +247,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 +271,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 +329,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;
 		}
@@ -469,6 +381,7 @@ function rolloverPreambleWithNotes(
 	options: {
 		readonly retained: ReadonlySet<string>;
 		readonly reserveParts: readonly (string | undefined)[];
+		readonly notes?: NotesRecovery | undefined;
 		readonly maxChars: number;
 	},
 ): string {
@@ -483,6 +396,7 @@ function rolloverPreambleWithNotes(
 		{
 			retained,
 			span,
+			notes: options.notes,
 			maxChars: Math.min(
 				MAX_NOTES_SECTION_CHARS,
 				Math.max(0, maxChars - reserveLen - HANDOFF_OVERHEAD_RESERVE),
@@ -499,6 +413,7 @@ export function buildAutoHandoff(
 	options: {
 		readonly ownerQuestionRegistered: boolean;
 		readonly retainedEntryIds?: ReadonlySet<string>;
+		readonly notes?: NotesRecovery | undefined;
 	},
 ): string {
 	const { ownerQuestionRegistered, retainedEntryIds: retained = new Set<string>() } = options;
@@ -530,6 +445,7 @@ export function buildAutoHandoff(
 		retained,
 		reserveParts,
 		maxChars,
+		notes: options.notes,
 	});
 	const minimum = [preamble, ...reserveParts];
 	const plan = planBatch(

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

@@ -14,16 +14,18 @@ import {
 	type MessageLike,
 	type PolicyContext,
 } from "./contracts.ts";
+import type { NotesRecovery } from "./note-evidence.ts";
 import { buildAutoHandoff } from "./recovery.ts";
 
 type RecoveryCapacity = {
 	readonly host: PolicyContext;
 	readonly toolTokens: number;
 	readonly pendingMessages?: readonly MessageLike[];
-	readonly firstKeptEntryId?: string;
+	readonly firstKeptEntryId?: string | undefined;
+	readonly notes?: NotesRecovery | 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 +130,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 +186,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,
@@ -196,6 +201,7 @@ export function automaticRecovery(
 	const handoff = buildAutoHandoff(entries, projected, limit, {
 		ownerQuestionRegistered,
 		retainedEntryIds: retained.ids,
+		notes: capacity.notes,
 	});
 	return handoff.length > limit
 		? undefined

package/src/rollover.ts

@@ -1,29 +1,30 @@
 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";
+import type { NotesRecovery } from "./note-evidence.ts";
+type RolloverResources = {
+	readonly resetPages: () => void;
+	readonly notes: (ctx: ExtensionContext) => NotesRecovery | undefined;
+};
 import {
 	countRetainedMessages,
 	createReminderLookup,
@@ -33,48 +34,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 +110,7 @@ function sendReminder(
 		readonly tokens: number;
 		readonly pendingMessages: readonly {
 			readonly role: string;
-			readonly customType?: string;
+			readonly customType?: string | undefined;
 			readonly details?: unknown;
 		}[];
 	},
@@ -188,7 +148,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 +185,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 +229,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 +243,7 @@ function automaticDraft(
 		readonly handoff: string;
 		readonly tokensBefore: number;
 		readonly reason: string;
-		readonly firstKeptEntryId?: string;
+		readonly firstKeptEntryId?: string | undefined;
 	},
 ) {
 	let firstKeptEntryId = recovery.firstKeptEntryId;
@@ -352,7 +318,11 @@ function thresholdFallback(
 	pi: ExtensionAPI,
 	event: TurnEndEvent,
 	ctx: ExtensionContext,
-	capacity: { readonly host: PolicyContext; readonly toolTokens: () => number },
+	capacity: {
+		readonly host: PolicyContext;
+		readonly toolTokens: () => number;
+		readonly notes: RolloverResources["notes"];
+	},
 ): BoundaryResult | undefined {
 	if (!fallbackTurnEligible(event, ctx)) {
 		return undefined;
@@ -371,7 +341,12 @@ function thresholdFallback(
 	const recovery = automaticRecovery(
 		ctx.sessionManager.getBranch(),
 		projected,
-		{ host, toolTokens: toolTokens(), pendingMessages: event.context.pendingMessages },
+		{
+			host,
+			toolTokens: toolTokens(),
+			pendingMessages: event.context.pendingMessages,
+			notes: capacity.notes(ctx),
+		},
 		ownerQuestionRegistered,
 	);
 	if (recovery === undefined) {
@@ -396,6 +371,7 @@ function registerAutomaticRollover(
 	pi: ExtensionAPI,
 	policy: SnapshotReader,
 	activeToolTokens: () => number,
+	notes: RolloverResources["notes"],
 ): void {
 	pi.on("session_before_compact", (event, ctx) => {
 		if (event.reason === "manual") {
@@ -420,6 +396,7 @@ function registerAutomaticRollover(
 					host,
 					toolTokens: activeToolTokens(),
 					firstKeptEntryId: event.preparation.firstKeptEntryId,
+					notes: notes(ctx),
 				},
 				ownerQuestionRegistered,
 			);
@@ -450,13 +427,13 @@ export function registerRollover(
 	pi: ExtensionAPI,
 	policy: SnapshotReader,
 	activeToolTokens: () => number,
-	resetPages: () => void,
+	resources: RolloverResources,
 ): void {
 	const resetRequests = new Map<string, string>();
 	const reminders = createReminderLookup();
 	const resetTurn = () => {
 		resetRequests.clear();
-		resetPages();
+		resources.resetPages();
 	};
 	pi.on("turn_start", resetTurn);
 	pi.on("session_start", () => {
@@ -468,7 +445,7 @@ export function registerRollover(
 	});
 	registerGuidance(pi, policy);
 	registerReminderFilter(pi, policy, reminders);
-	registerAutomaticRollover(pi, policy, activeToolTokens);
+	registerAutomaticRollover(pi, policy, activeToolTokens, resources.notes);
 	pi.on("turn_end", (event, ctx) => {
 		const requested = event.toolResults.find(
 			(result) => result.toolName === "new_context" && resetRequests.has(result.toolCallId),
@@ -491,6 +468,7 @@ export function registerRollover(
 		const fallback = thresholdFallback(pi, event, ctx, {
 			host,
 			toolTokens: activeToolTokens,
+			notes: resources.notes,
 		});
 		if (fallback !== undefined) {
 			return fallback;