opencode-clm 0.2.0 → 0.3.0

package/src/clm.ts

@@ -54,17 +54,20 @@ import {
 	AnnotationStore,
 	ContinuitySizeTracker,
 	continuitySizeNoticeText,
+	forkAnnotations,
 	formatContinuityMessage,
 	type ContinuityBlockSource,
 	type LiveContextAnnotation,
 } from "./continuity.ts";
 import { classifyMirrorToolCall } from "./mirror-guard.ts";
-import { MirrorStore } from "./mirror-store.ts";
+import { MirrorDirectoryError, MirrorStore } from "./mirror-store.ts";
 import { capObservations } from "./observation.ts";
 import { flatten, noteMessage, unflatten, withoutReasoning, type OcInfo, type OcMessage } from "./opencode.ts";
+import { sizeTrailer } from "./compaction.ts";
 import { applyOverflowGuard, overflowGuardLimit, overflowNoticeText } from "./overflow.ts";
 import type { ClmStatus } from "./presentation.ts";
-import { applyProjection, createProjectionCheckpoint, type ProjectionCheckpoint } from "./projection.ts";
+import { applyProjection, createProjectionCheckpoint, digestSourceContent, type ProjectionCheckpoint } from "./projection.ts";
+import { clearHistory, loadHistory, remapProjection, saveHistoryEntry, type HistoryEntry } from "./history.ts";
 import type { ClmSettings } from "./settings.ts";
 import {
 	keptFields,
@@ -86,6 +89,8 @@ export interface ModelLimits {
 	context?: number;
 	/** Model output limit, tokens; subtracted from the window by `resolveBudget`. */
 	output?: number;
+	/** Model input limit, tokens, when the provider sets one; only OpenCode's threshold reads it (src/compaction.ts). */
+	input?: number;
 }
 
 /** Sizes of the request parts the plugin does not see in the messages hook. */
@@ -96,6 +101,11 @@ export interface RequestScope {
 	toolTokens?: number;
 }
 
+/** Toast when edits keep being dropped (pi `compositionWarningText`, reworded for OpenCode). */
+export const COMPOSITION_WARNING = "CLM edits keep being dropped: OpenCode's history changed between consecutive requests. " +
+	"Another plugin that rewrites already-sent messages (experimental.chat.messages.transform) is the usual cause; " +
+	"load opencode-clm before it (earlier in the `plugin` list), or turn CLM off for this session with /clm off.";
+
 export interface TransformResult {
 	/** The messages to send; the caller writes them into OpenCode's array in place. */
 	messages: OcMessage[];
@@ -104,8 +114,10 @@ export interface TransformResult {
 	/** Calibrated estimate of this request, tokens (system prompt and tool schemas included when known); undefined when CLM did not run. */
 	estimated?: number;
 	reading?: BudgetReading;
-	/** User-facing warning for a toast (the budget-too-small check); set on one request only. */
+	/** User-facing warning for a toast (budget too small, composition warning, ignored saved settings); set on one request only. */
 	alert?: string;
+	/** User-facing errors for toasts: the mirror could not be read or refreshed, a revision could not be saved. */
+	errors?: string[];
 }
 
 export interface MirrorCheck {
@@ -196,6 +208,23 @@ export class ClmSession {
 	 * `experimental.compaction.autocontinue` hook); the next transform rebases onto the summary.
 	 */
 	compacted = false;
+	/**
+	 * Set by the plugin when OpenCode's session metadata names another session as the origin
+	 * (a fork, `Session.fork` copies metadata). The first transform restores the newest of the
+	 * origin's checkpoints whose source the forked history still contains, then clears it.
+	 */
+	forkOrigin?: { sessionID: string; directory: string; /** The fork's creation time (ms), when OpenCode reported it. */ created?: number };
+	/** The origin's annotations from cloned session metadata (a fork without a mirror); used when the origin's store yields none. */
+	forkPersisted?: LiveContextAnnotation[];
+	/** Set when a fork's first request copied annotations in; the plugin then persists them (no mirror). */
+	annotationsImported = false;
+	/**
+	 * Why no mirror directory could be used, set by the plugin (M1). The store then sits in a
+	 * private temporary directory the model is never told about; requests carry the raw
+	 * history plus the continuity annotations and their size notice, as pi-clm does when its
+	 * mirror store fails to initialize.
+	 */
+	mirrorUnavailable?: string;
 	/** What the last transform rendered; the next transform commits the mirror against it. */
 	baseline?: Baseline;
 	/** The snapshot now in the mirror file; continuity tools resolve block ids against it. */
@@ -205,9 +234,21 @@ export class ClmSession {
 	requests = 0;
 
 	private pendingNotices: string[] = [];
+	/** Errors for the user (toasts), returned with the next transform result. */
+	private pendingErrors: string[] = [];
+	/** The mirror could not be written last time; its error toast is not repeated until a write succeeds. */
+	private refreshFailing = false;
+	/** Why the steering document in the settings did not load, for snapshot.json (the panel). */
+	steeringError?: string;
 	/** Raw length and conversation estimate (calibrated, tokens) of the last request, for the overhead measurement. */
 	private previousRequest?: { rawCount: number; conversation: number };
 	private invalidationStreak = 0;
+	/** The composition warning toast is shown once per session (pi: `compositionWarned`). */
+	private compositionWarned = false;
+	/** User-facing warnings for the next transform result (`alert`). */
+	private pendingAlerts: string[] = [];
+	/** The settings warning last shown to the user, so a new or changed one toasts once. */
+	private shownSettingsWarning?: string;
 	/**
 	 * Per-process seed of the stable document id. Fresh on every open, so a document id never
 	 * repeats even when a corrupt state file resets the revision counter to 0.
@@ -244,11 +285,14 @@ export class ClmSession {
 
 	/**
 	 * Open (or resume) the session directory `<mirrorDir>/clm-<sessionID>/`. `steering` is the
-	 * document the base settings name, already loaded (the plugin loads it strictly at start).
+	 * document the base settings name, already loaded; undefined when it failed to load at start
+	 * (each session then retries the path and records the error in `settingsWarning`).
 	 */
 	static async open(sessionID: string, settings: ClmSettings, options: { steering?: SteeringDocument } = {}): Promise<ClmSession> {
 		if (!SESSION_ID_RE.test(sessionID)) throw new Error(`Invalid session id for CLM: ${JSON.stringify(sessionID)}`);
-		const store = await MirrorStore.create(sessionID, settings.mirrorDir);
+		const store = await MirrorStore.create(sessionID, settings.mirrorDir).catch((error: unknown) => {
+			throw new MirrorDirectoryError(settings.mirrorDir, error);
+		});
 		const loaded = await loadLiveContextState(store.directory);
 		const session = new ClmSession(sessionID, store, settings, loaded, options.steering);
 		if (loaded.warning) await session.log({ event: "state-warning", warning: loaded.warning });
@@ -309,11 +353,25 @@ export class ClmSession {
 		} catch (error) {
 			warnings.push(`ignored saved settings: ${describe(error)}`);
 			overrides = {};
-			staged = { settings: this.baseSettings, ...(this.baseSteering ? { steering: this.baseSteering } : {}) };
+			// The base settings resolved at load; staging them again keeps a base steering error.
+			staged = stageSettings(this.baseSettings, {}, { strict: false, loaded: this.baseSteering });
 		}
-		if (staged.steeringError) warnings.push(`steering document not loaded: ${staged.steeringError}`);
+		// Only warnings about saved settings toast here. The base steering document failing
+		// again (no override names another path) already toasted once at load (index.ts).
+		const alerting = [...warnings];
+		if (staged.steeringError) {
+			const warning = `steering document not loaded: ${staged.steeringError}`;
+			warnings.push(warning);
+			if (staged.settings.steeringPath !== this.baseSettings.steeringPath) alerting.push(warning);
+		}
+		this.steeringError = staged.steeringError;
 		await this.activateSettings(staged, overrides);
 		this.settingsWarning = warnings.length > 0 ? warnings.join("; ") : undefined;
+		const alert = alerting.length > 0 ? alerting.join("; ") : undefined;
+		if (alert && alert !== this.shownSettingsWarning) {
+			this.pendingAlerts.push(`saved settings partly ignored: ${alert}`);
+		}
+		this.shownSettingsWarning = alert;
 	}
 
 	private async activateSettings(staged: StagedSettings, overrides: ClmOverrides): Promise<void> {
@@ -341,6 +399,34 @@ export class ClmSession {
 
 	// ---- measurement -------------------------------------------------------------------
 
+	/**
+	 * System prompt and tool schemas, when the hooks reported them (one request late).
+	 * A provider-measured overhead replaces them: it is in real tokens, so it is not
+	 * calibrated, and it includes the built-in tool schemas the hooks cannot size. The
+	 * hook sizes stay a floor, since they count text that is certainly sent.
+	 */
+	private scopeSize(): { measuredOverhead?: number; scopeTokens: number } {
+		const { systemTokens, toolTokens } = this.scope;
+		const measuredOverhead = this.state.budgetCheck?.source === "provider"
+			? Math.max(this.state.budgetCheck.overhead, (systemTokens ?? 0) + (toolTokens ?? 0))
+			: undefined;
+		return { ...(measuredOverhead !== undefined ? { measuredOverhead } : {}), scopeTokens: measuredOverhead ?? this.calibrator.apply((systemTokens ?? 0) + (toolTokens ?? 0)) };
+	}
+
+	/**
+	 * `/clm-compact`: about how large the next request would be, from the stored history
+	 * (as OpenCode sends it, see `filterCompacted`) through the accepted revision (continuity and notices not
+	 * counted). Undefined when the history holds no message to compact.
+	 */
+	idleEstimate(raw: OcMessage[]): number | undefined {
+		const pinned = pinnedCount(raw);
+		const source = flatten(raw.slice(pinned));
+		if (source.length === 0) return undefined;
+		const projection = applyProjection(source, this.state.checkpoint);
+		const effective = projection.valid ? projection.messages : source;
+		return this.scopeSize().scopeTokens + this.estimate(flatten(raw.slice(0, pinned))) + this.estimate(effective);
+	}
+
 	/** Uncalibrated tokens of a text: chars/4 × estimateFactor. */
 	textTokens(text: string): number {
 		return Math.ceil((text.length / CHARS_PER_TOKEN) * this.settings.estimateFactor);
@@ -520,6 +606,9 @@ export class ClmSession {
 		this.baseline = undefined;
 		this.tracker.reset();
 		this.continuitySize.reset();
+		// The user dropped the edits on purpose: a later revert must not bring one back. Queued
+		// behind any history write in flight; writes queued later see no checkpoint and skip.
+		await this.historyTask(() => clearHistory(this.store.directory));
 		await this.log({ event: "reset", revision: next.revision, reason });
 	}
 
@@ -570,6 +659,34 @@ export class ClmSession {
 			: `[CLM] Mirror edit would be refused: ${check.message} Correct the file before this step ends, or the context stays as it is.`;
 	}
 
+	/**
+	 * `setting trailer`: the size trailer for one tool result (the last reading plus the
+	 * result's calibrated estimate, against the budget in force); undefined when off.
+	 */
+	sizeTrailer(output: string): string | undefined {
+		if (!this.settings.enabled || !this.enabled || !this.settings.trailer || this.mirrorUnavailable !== undefined) return undefined;
+		const budget = this.resolvedBudget()?.budget;
+		if (!budget) return undefined;
+		return sizeTrailer(this.lastReading?.estimated ?? 0, this.calibrator.apply(this.textTokens(output)), budget);
+	}
+
+	/**
+	 * Before an OpenCode compaction (`experimental.session.compacting`): commit the edit the
+	 * model made in its final step. No request followed that step (e.g. the user typed
+	 * /compact next), so the commit at the start of a transform has not run; without this the
+	 * compaction would summarize the pre-edit context and the edit would be lost.
+	 */
+	async commitBeforeCompaction(): Promise<void> {
+		await this.refreshSettings();
+		if (!this.settings.enabled || !this.enabled) return;
+		await this.commit();
+	}
+
+	/** Adds a notice to the next request (e.g. from a bus event). */
+	queueNotice(text: string): void {
+		this.pendingNotices.push(text);
+	}
+
 	/** The mirror block the model last saw, for continuity annotations. */
 	blockSource(blockId: string): ContinuityBlockSource | undefined {
 		const snapshot = this.lastSnapshot;
@@ -587,6 +704,7 @@ export class ClmSession {
 			text = await this.store.read();
 		} catch (error) {
 			this.pendingNotices.push(`[CLM] Could not read the mirror: ${describe(error)}`);
+			this.pendingErrors.push(`could not read the mirror, the edit was not applied: ${describe(error)}`);
 			return;
 		}
 		if (text === undefined || text.trim() === baseline.snapshot.text.trim()) return;
@@ -639,9 +757,11 @@ export class ClmSession {
 		} catch (error) {
 			// Persist before activate: an unsaved revision would vanish on restart.
 			this.pendingNotices.push(`[CLM] Revision ${revision} was not applied: it could not be saved (${describe(error)}); the previous context stays in effect.`);
+			this.pendingErrors.push(`revision ${revision} could not be saved, the previous context stays in effect: ${describe(error)}`);
 			return;
 		}
 		this.accepted += 1;
+		await this.remember({ version: 1, checkpoint, contentDigest: digestSourceContent(baseline.rawMessages) });
 		const revisions = join(this.store.directory, "revisions");
 		await mkdir(revisions, { recursive: true, mode: 0o700 }).catch(() => undefined);
 		await writeFile(join(revisions, `r${revision}.md`), text, { mode: 0o600 }).catch(() => undefined);
@@ -746,6 +866,7 @@ export class ClmSession {
 			budget: { budget: base.budget, reserve: base.reserve, limit: overflowGuardLimit(resolved.budget, resolved.reserve), source: base.source },
 			calibration: { factor: this.calibrator.factor, samples: this.calibrator.sampleCount },
 			...(steering ? { steering: { name: steering.name, hash: steering.hash, path: steering.path } } : {}),
+			...(this.steeringError ? { steeringError: this.steeringError } : {}),
 			sizes: { estimated: input.estimated, ...(input.observed !== undefined ? { observedPrevious: input.observed } : {}) },
 			input: {
 				raw: input.raw,
@@ -812,6 +933,172 @@ export class ClmSession {
 		await this.log({ event: "compacted", revision: next.revision, previous, summary: summaryId, written });
 	}
 
+	// ---- checkpoint history (revert and fork) ------------------------------------------
+
+	/** History writes and clears run one at a time (`/clm reset` runs outside the transform queue). */
+	private historyQueue: Promise<void> = Promise.resolve();
+
+	private historyTask(task: () => Promise<void>): Promise<void> {
+		const run = this.historyQueue.then(task).catch(() => undefined);
+		this.historyQueue = run;
+		return run;
+	}
+
+	/**
+	 * Add an accepted checkpoint to `checkpoints/`. Best effort: the revision is already saved.
+	 * Skipped when the checkpoint is no longer the active one by the time the write runs (a
+	 * `/clm reset` came in between), so a reset edit never lands in the history.
+	 */
+	private remember(entry: HistoryEntry): Promise<void> {
+		return this.historyTask(async () => {
+			if (this.state.checkpoint?.revision !== entry.checkpoint.revision) return;
+			await saveHistoryEntry(this.store.directory, entry)
+				.catch((error: unknown) => this.log({ event: "history-error", revision: entry.checkpoint.revision, error: describe(error) }));
+		});
+	}
+
+	/**
+	 * Make `entry`'s projection, with `projected` standing for `source`, the next revision.
+	 * Persisted before it takes effect, like an accepted edit.
+	 */
+	private async activateRestored(
+		entry: HistoryEntry,
+		source: readonly LiveContextMessage[],
+		projected: readonly LiveContextMessage[],
+		describeRestore: (revision: number) => string,
+	): Promise<boolean> {
+		const at = new Date().toISOString();
+		const old = entry.checkpoint;
+		const revision = this.state.revision + 1;
+		let checkpoint: ProjectionCheckpoint;
+		try {
+			checkpoint = createProjectionCheckpoint({
+				revision,
+				sourceMessages: source,
+				projectedMessages: projected,
+				beforeEstimate: old.beforeEstimate,
+				afterEstimate: old.afterEstimate,
+				estimateUnit: old.estimateUnit,
+				createdAt: at,
+				...(old.editTrace ? { editTrace: old.editTrace } : {}),
+			});
+		} catch {
+			return false;
+		}
+		const message = describeRestore(revision);
+		try {
+			await this.updateState((state) => {
+				if (state.revision + 1 !== revision) throw new Error("the session state changed while the revision was restored");
+				return {
+					version: 1,
+					enabled: state.enabled,
+					revision,
+					checkpoint,
+					lastOutcome: { kind: "applied", message, beforeEstimate: old.beforeEstimate, afterEstimate: old.afterEstimate, estimateUnit: old.estimateUnit, at },
+					...keptFields(state),
+				};
+			});
+		} catch {
+			return false;
+		}
+		this.tracker.reset();
+		await this.remember({ version: 1, checkpoint, contentDigest: entry.contentDigest });
+		this.pendingNotices.push(`[CLM] ${message} The mirror shows it.`);
+		return true;
+	}
+
+	/**
+	 * The active revision no longer fits the history (a revert cut into its prefix): restore
+	 * the newest older checkpoint that still fits, as pi-clm restores the checkpoint of the
+	 * branch `/tree` selects. False when none fits; the caller then resets.
+	 */
+	private async restoreAfterMismatch(source: readonly LiveContextMessage[], reason: string): Promise<boolean> {
+		const dropped = this.state.checkpoint?.revision;
+		const { entries, ignored } = await loadHistory(this.store.directory);
+		if (ignored.length > 0) await this.log({ event: "history-ignored", files: ignored });
+		for (const entry of entries) {
+			if (entry.checkpoint.revision === dropped) continue;
+			const candidate = applyProjection(source, entry.checkpoint);
+			if (!candidate.valid) continue;
+			const from = entry.checkpoint.revision;
+			const prefix = source.slice(0, entry.checkpoint.sourceMessageCount);
+			const restored = await this.activateRestored(entry, prefix, entry.checkpoint.projectedMessages, (revision) =>
+				`Revision ${dropped} no longer matches OpenCode's history: ${reason.replace(/\.\s*$/, "")}; restored revision ${from}, which still does, as revision ${revision}.`);
+			if (!restored) return false;
+			await this.log({ event: "restored", revision: this.state.revision, from, dropped, reason });
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * First request of a forked session: find the newest origin checkpoint whose source the
+	 * fork's history starts with (compared without message ids, which the fork renews) and
+	 * restore it with the ids mapped to the fork's.
+	 */
+	private async restoreFromFork(origin: { sessionID: string; directory: string }, source: readonly LiveContextMessage[]): Promise<boolean> {
+		const { entries, ignored } = await loadHistory(origin.directory);
+		if (ignored.length > 0) await this.log({ event: "history-ignored", origin: origin.sessionID, files: ignored });
+		for (const entry of entries) {
+			const count = entry.checkpoint.sourceMessageCount;
+			if (count > source.length) continue;
+			const prefix = source.slice(0, count);
+			if (digestSourceContent(prefix) !== entry.contentDigest) continue;
+			const from = entry.checkpoint.revision;
+			const restored = await this.activateRestored(entry, prefix, remapProjection(entry.checkpoint, prefix), (revision) =>
+				`This session is a fork of ${origin.sessionID}; restored its revision ${from} as revision ${revision}.`);
+			if (!restored) return false;
+			await this.log({ event: "restored", revision: this.state.revision, from, origin: origin.sessionID });
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * First request of a forked session: copy the origin's annotations made up to the fork
+	 * point, their sources re-pointed at the fork's messages (`forkAnnotations`). The fork
+	 * point is the newest completion among the messages created before the fork itself
+	 * (OpenCode keeps message times in a fork); newer messages are the fork's own.
+	 */
+	private async copyForkAnnotations(origin: { sessionID: string; directory: string; created?: number }, raw: readonly OcMessage[], effective: readonly LiveContextMessage[]): Promise<void> {
+		let annotations: LiveContextAnnotation[] = [];
+		try {
+			annotations = await new AnnotationStore(origin.directory).list();
+		} catch (error) {
+			await this.log({ event: "annotations-unreadable", origin: origin.sessionID, error: describe(error) });
+		}
+		// Without a mirror the origin's directory is usually out of reach too: fall back to the
+		// set the origin kept in OpenCode's metadata, which the fork cloned (index.ts).
+		if (annotations.length === 0) annotations = this.forkPersisted ?? [];
+		this.forkPersisted = undefined;
+		if (annotations.length === 0) return;
+		let cutoff: number | undefined;
+		for (const { info } of raw) {
+			const created = Number(info.time?.created ?? 0);
+			if (origin.created !== undefined && created >= origin.created) continue;
+			const end = Number(info.time?.completed ?? 0) || created;
+			if (cutoff === undefined || end > cutoff) cutoff = end;
+		}
+		const copied = forkAnnotations(annotations, effective, { sessionId: this.sessionID, ...(cutoff !== undefined ? { cutoff } : {}) });
+		try {
+			const written = await this.annotations.importAll(copied);
+			// Without the fork's creation time the fork's own new messages count too, so origin
+			// annotations made between the fork and its first request are carried as well.
+			if (written > 0) {
+				this.annotationsImported = true;
+				await this.log({
+					event: "annotations-forked",
+					origin: origin.sessionID,
+					count: written,
+					mapped: copied.filter((annotation) => annotation.source.sessionId === this.sessionID).length,
+					cutoff: origin.created === undefined ? "unbounded" : cutoff ?? null,
+				});
+			}
+		} catch (error) {
+			await this.log({ event: "annotations-fork-error", origin: origin.sessionID, error: describe(error) });
+		}
+	}
+
 	private async loadAnnotations(): Promise<LiveContextAnnotation[]> {
 		try {
 			return await this.annotations.list();
@@ -821,13 +1108,46 @@ export class ClmSession {
 		}
 	}
 
+	/**
+	 * Without a mirror (`mirrorUnavailable`): the raw history, then the continuity message and
+	 * its size notice. Nothing is projected, rendered or measured; queued notices name the
+	 * mirror, so they are dropped. pi-clm src/index.ts `context` handler, `!store` branch.
+	 */
+	private async transformWithoutMirror(raw: OcMessage[]): Promise<TransformResult> {
+		this.baseline = undefined;
+		this.compacted = false;
+		this.pendingNotices = [];
+		if (this.compacting) {
+			this.compacting = false;
+			return { messages: raw, notices: [] };
+		}
+		this.requests += 1;
+		const origin = this.forkOrigin;
+		this.forkOrigin = undefined;
+		if (origin) await this.copyForkAnnotations(origin, raw, flatten(raw));
+		const continuity = formatContinuityMessage({ annotations: await this.loadAnnotations(), effectiveMessages: flatten(raw) });
+		const tokens = continuity ? this.textTokens(continuity) : 0;
+		const notices = this.continuitySize.observe(tokens) ? [continuitySizeNoticeText(tokens)] : [];
+		const context = this.context(raw);
+		const messages = [
+			...raw,
+			...(continuity ? [noteMessage(continuity, "continuity", context)] : []),
+			...(notices.length > 0 ? [noteMessage(notices.join("\n\n"), `notice:${this.requests}`, context)] : []),
+		];
+		this.lastRequest = { rawMessages: raw.length, sentMessages: messages.length, mirrorBlocks: 0 };
+		const errors = this.pendingErrors;
+		this.pendingErrors = [];
+		return { messages, notices, ...(errors.length > 0 ? { errors } : {}) };
+	}
+
 	private async transformNow(raw: OcMessage[]): Promise<TransformResult> {
 		await this.refreshSettings();
 		if (!this.settings.enabled || !this.enabled) {
 			this.baseline = undefined;
 			this.compacting = false;
-			return { messages: raw, notices: [] };
+			return { messages: raw, notices: [], ...this.drainAlerts() };
 		}
+		if (this.mirrorUnavailable !== undefined) return await this.transformWithoutMirror(raw);
 		const pinned = pinnedCount(raw);
 		const pinnedMessages = raw.slice(0, pinned);
 		const context = this.context(raw);
@@ -835,11 +1155,12 @@ export class ClmSession {
 		// OpenCode's compaction passes a head slice of the history through this hook. Apply
 		// the accepted revision when it still covers that slice; never commit, render,
 		// notify or reset (the slice is shorter than the history the checkpoint covers).
+		// A pending edit was committed by `commitBeforeCompaction` just before.
 		if (this.compacting) {
 			this.compacting = false;
 			const projection = applyProjection(flatten(raw.slice(pinned)), this.state.checkpoint);
-			if (!projection.valid || !this.state.checkpoint) return { messages: raw, notices: [] };
-			return { messages: [...pinnedMessages, ...unflatten(projection.messages, context)], notices: [] };
+			if (!projection.valid || !this.state.checkpoint) return { messages: raw, notices: [], ...this.drainAlerts() };
+			return { messages: [...pinnedMessages, ...unflatten(projection.messages, context)], notices: [], ...this.drainAlerts() };
 		}
 
 		await this.commit();
@@ -867,6 +1188,10 @@ export class ClmSession {
 		if (rebase) {
 			await this.rebaseAfterCompaction(summaryId);
 			projection = applyProjection(source, undefined);
+		} else if (!projection.valid && (await this.restoreAfterMismatch(source, projection.reason))) {
+			// A revert cut into the active revision's prefix; an older revision still fits.
+			this.invalidationStreak = 0;
+			projection = applyProjection(source, this.state.checkpoint);
 		} else if (!projection.valid) {
 			const dropped = this.state.checkpoint?.revision;
 			this.invalidationStreak += 1;
@@ -875,6 +1200,10 @@ export class ClmSession {
 			let notice = `[CLM] Revision ${dropped} was dropped because OpenCode's history changed under it: ${projection.reason} The mirror now shows the stored history.`;
 			if (this.invalidationStreak >= 2) {
 				notice += " This happened on consecutive requests; edits keep being dropped until the start of the history stops changing.";
+				if (!this.compositionWarned) {
+					this.compositionWarned = true;
+					this.pendingAlerts.push(COMPOSITION_WARNING);
+				}
 			}
 			this.pendingNotices.push(notice);
 			await this.log({ event: "projection-reset", revision: dropped, reason: projection.reason });
@@ -882,6 +1211,11 @@ export class ClmSession {
 		} else if (this.state.checkpoint) {
 			this.invalidationStreak = 0;
 		}
+		const origin = this.forkOrigin;
+		this.forkOrigin = undefined;
+		if (origin && !this.state.checkpoint && this.state.revision === 0 && (await this.restoreFromFork(origin, source))) {
+			projection = applyProjection(source, this.state.checkpoint);
+		}
 		const checkpoint = this.state.checkpoint;
 		const suffixLength = projection.valid ? projection.suffix.length : 0;
 
@@ -889,21 +1223,15 @@ export class ClmSession {
 		if (!this.settings.reasoning) effective = withoutReasoning(effective);
 		effective = capObservations(effective, this.settings.observationCap);
 
+		if (origin) await this.copyForkAnnotations(origin, raw, effective);
 		const annotations = await this.loadAnnotations();
 		const continuityText = (messages: LiveContextMessage[]) =>
 			formatContinuityMessage({ annotations, effectiveMessages: messages });
 		const pinnedTokens = this.estimate(flatten(pinnedMessages));
 		const resolved = this.resolvedBudget();
 		const limit = resolved ? overflowGuardLimit(resolved.budget, resolved.reserve) : undefined;
-		// System prompt and tool schemas, when the hooks reported them (one request late).
-		// A provider-measured overhead replaces them: it is in real tokens, so it is not
-		// calibrated, and it includes the built-in tool schemas the hooks cannot size. The
-		// hook sizes stay a floor, since they count text that is certainly sent.
 		const { systemTokens, toolTokens } = this.scope;
-		const measuredOverhead = this.state.budgetCheck?.source === "provider"
-			? Math.max(this.state.budgetCheck.overhead, (systemTokens ?? 0) + (toolTokens ?? 0))
-			: undefined;
-		const scopeTokens = measuredOverhead ?? this.calibrator.apply((systemTokens ?? 0) + (toolTokens ?? 0));
+		const { measuredOverhead, scopeTokens } = this.scopeSize();
 		const excluded = measuredOverhead !== undefined ? [] : [
 			...(systemTokens === undefined ? ["the system prompt"] : []),
 			...(toolTokens === undefined ? ["tool schemas"] : []),
@@ -949,6 +1277,7 @@ export class ClmSession {
 		});
 		try {
 			await this.store.write(snapshot.text);
+			this.refreshFailing = false;
 			this.lastSnapshot = snapshot;
 			this.baseline = {
 				rawMessages: source,
@@ -961,6 +1290,8 @@ export class ClmSession {
 		} catch (error) {
 			this.baseline = undefined;
 			this.pendingNotices.push(`[CLM] Could not refresh the mirror: ${describe(error)}`);
+			if (!this.refreshFailing) this.pendingErrors.push(`could not refresh the mirror, edits are off until it can be written: ${describe(error)}`);
+			this.refreshFailing = true;
 		}
 
 		const conversationTokens = pinnedTokens + this.estimate(effective) + continuityTokens;
@@ -1043,7 +1374,25 @@ export class ClmSession {
 			calibration: this.calibrator.factor,
 			notices: notices.map((notice) => notice.slice(0, 80)),
 		});
-		return { messages, notices, estimated: reading?.estimated ?? requestTokens, reading, ...(alert ? { alert } : {}) };
+		return {
+			messages,
+			notices,
+			estimated: reading?.estimated ?? requestTokens,
+			reading,
+			...this.drainAlerts(alert),
+		};
+	}
+
+	/** The queued toasts (`alert`, `errors`) for a transform result, cleared once taken. */
+	private drainAlerts(alert?: string): Pick<TransformResult, "alert" | "errors"> {
+		const alerts = [...(alert ? [alert] : []), ...this.pendingAlerts];
+		this.pendingAlerts = [];
+		const errors = this.pendingErrors;
+		this.pendingErrors = [];
+		return {
+			...(alerts.length > 0 ? { alert: alerts.join("\n") } : {}),
+			...(errors.length > 0 ? { errors } : {}),
+		};
 	}
 
 	/** Inputs for presentation.ts `statusText` / `statusLine`. */
@@ -1055,7 +1404,7 @@ export class ClmSession {
 			...(changed ? { changed } : {}),
 			...(this.settingsWarning ? { settingsWarning: this.settingsWarning } : {}),
 			sessionID: this.sessionID,
-			mirrorPath: this.mirrorPath,
+			mirrorPath: this.mirrorUnavailable === undefined ? this.mirrorPath : `unavailable, requests carry the raw history (${this.mirrorUnavailable})`,
 			revision: this.state.revision,
 			accepted: this.accepted,
 			rejected: this.rejected,