@gajae-code/coding-agent 0.11.11 → 0.12.0

package/src/modes/components/read-tool-group.ts

@@ -3,7 +3,7 @@ import { Container, Text } from "@gajae-code/tui";
 import { InternalUrlRouter } from "../../internal-urls";
 import { getLanguageFromPath, theme } from "../../modes/theme/theme";
 import { splitPathAndSel } from "../../tools/path-utils";
-import { PREVIEW_LIMITS, shortenPath } from "../../tools/render-utils";
+import { PREVIEW_LIMITS, replaceTabs, shortenPath } from "../../tools/render-utils";
 import { renderCodeCell } from "../../tui";
 import type { ToolExecutionHandle } from "./tool-execution";
 
@@ -53,9 +53,16 @@ type ReadToolResultDetails = {
 	conflictCount?: number;
 };
 
-type ReadToolGroupOptions = {
-	showContentPreview?: boolean;
-};
+type ReadToolVisibleProjection = ReadonlyArray<{
+	path: string;
+	status: ReadEntry["status"];
+	correctedFrom?: string;
+	conflictCount?: number;
+	preview?: {
+		lines: readonly string[];
+		hiddenLineCount: number;
+	};
+}>;
 
 function getSuffixResolution(details: ReadToolResultDetails | undefined): ReadToolSuffixResolution | undefined {
 	if (typeof details?.suffixResolution?.from !== "string" || typeof details.suffixResolution.to !== "string") {
@@ -82,13 +89,16 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 	#expanded = false;
 	#manuallyExpanded: boolean | undefined;
 	#showContentPreview: boolean;
+	#visibleTranscriptChanged = false;
+	#lastVisibleProjection: ReadToolVisibleProjection = [];
 
-	constructor(options: ReadToolGroupOptions = {}) {
+	constructor(options: { showContentPreview?: boolean } = {}) {
 		super();
 		this.#showContentPreview = options.showContentPreview ?? false;
 		this.#text = new Text("", 0, 0);
 		this.addChild(this.#text);
 		this.#updateDisplay();
+		this.#lastVisibleProjection = this.#visibleProjection();
 	}
 
 	updateArgs(args: ReadRenderArgs, toolCallId?: string): void {
@@ -102,7 +112,7 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 		};
 		entry.path = rawPath;
 		this.#entries.set(toolCallId, entry);
-		this.#updateDisplay();
+		this.#updateDisplayAndNotify();
 	}
 
 	updateResult(
@@ -126,23 +136,20 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 			typeof details?.conflictCount === "number" && details.conflictCount > 0 ? details.conflictCount : undefined;
 		entry.conflictCount = conflictCount;
 		entry.status = result.isError ? "error" : suffixResolution ? "warning" : "success";
-		// Store the text content for preview/expanded display
 		const textContent = result.content?.find(c => c.type === "text")?.text;
-		if (textContent !== undefined) {
-			entry.contentText = textContent;
-		}
-		this.#updateDisplay();
+		entry.contentText = textContent;
+		this.#updateDisplayAndNotify();
 	}
 
 	setArgsComplete(_toolCallId?: string): void {
-		this.#updateDisplay();
+		this.#updateDisplayAndNotify();
 	}
 
 	/** Applies automatic expansion unless this renderer instance has an explicit fold choice. */
 	setExpanded(expanded: boolean): void {
 		if (this.#manuallyExpanded !== undefined) return;
 		this.#expanded = expanded;
-		this.#updateDisplay();
+		this.#updateDisplayAndNotify();
 	}
 
 	/**
@@ -152,13 +159,74 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 	setManuallyExpanded(expanded: boolean): void {
 		this.#manuallyExpanded = expanded;
 		this.#expanded = expanded;
-		this.#updateDisplay();
+		this.#updateDisplayAndNotify();
 	}
 
 	getComponent(): Component {
 		return this;
 	}
 
+	consumeVisibleTranscriptChange(): boolean {
+		const changed = this.#visibleTranscriptChanged;
+		this.#visibleTranscriptChanged = false;
+		return changed;
+	}
+
+	#visibleProjection(): ReadToolVisibleProjection {
+		return [...this.#entries.values()].map(entry => {
+			if (!this.#shouldRenderPreview(entry)) {
+				return {
+					path: entry.path,
+					status: entry.status,
+					correctedFrom: entry.correctedFrom,
+					conflictCount: entry.conflictCount,
+				};
+			}
+			const lines = replaceTabs(entry.contentText ?? "")
+				.split(/\r?\n/)
+				.map(line => line.slice(line.lastIndexOf("\r") + 1));
+			const visibleLineCount = this.#expanded ? lines.length : Math.min(lines.length, COLLAPSED_PREVIEW_LINES);
+			return {
+				path: entry.path,
+				status: entry.status,
+				correctedFrom: entry.correctedFrom,
+				preview: {
+					lines: lines.slice(0, visibleLineCount),
+					hiddenLineCount: lines.length - visibleLineCount,
+				},
+			};
+		});
+	}
+
+	#sameVisibleProjection(left: ReadToolVisibleProjection, right: ReadToolVisibleProjection): boolean {
+		if (left.length !== right.length) return false;
+		return left.every((entry, index) => {
+			const other = right[index];
+			if (
+				!other ||
+				entry.path !== other.path ||
+				entry.status !== other.status ||
+				entry.correctedFrom !== other.correctedFrom ||
+				(!entry.preview && entry.conflictCount !== other.conflictCount)
+			)
+				return false;
+			if (!entry.preview || !other.preview) return entry.preview === other.preview;
+			return (
+				entry.preview.hiddenLineCount === other.preview.hiddenLineCount &&
+				entry.preview.lines.length === other.preview.lines.length &&
+				entry.preview.lines.every((line, lineIndex) => line === other.preview!.lines[lineIndex])
+			);
+		});
+	}
+
+	#updateDisplayAndNotify(): void {
+		this.#updateDisplay();
+		const after = this.#visibleProjection();
+		if (this.#sameVisibleProjection(after, this.#lastVisibleProjection)) return;
+		this.#lastVisibleProjection = after;
+		this.#visibleTranscriptChanged = true;
+	}
+
 	#updateDisplay(): void {
 		const entries = [...this.#entries.values()];
 

package/src/modes/components/session-observer-overlay.ts

@@ -1,10 +1,11 @@
+import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import type { ToolResultMessage } from "@gajae-code/ai";
 import { matchesKey } from "@gajae-code/tui";
 import { formatDuration, formatNumber } from "@gajae-code/utils";
 import type { KeyId } from "../../config/keybindings";
 import { isSilentAbort } from "../../session/messages";
-import type { SessionMessageEntry } from "../../session/session-manager";
+import type { FileEntry, SessionMessageEntry } from "../../session/session-manager";
 import { parseSessionEntries } from "../../session/session-manager";
 import type { ObservableSession, SessionObserverRegistry } from "../session-observer-registry";
 import { theme } from "../theme/theme";
@@ -15,13 +16,26 @@ import {
 } from "./tool-transcript-format";
 import { type TranscriptViewerEntry, TranscriptViewerOverlay } from "./transcript-viewer-overlay";
 
+const FATAL_UTF8_DECODER = new TextDecoder("utf-8", { fatal: true });
+
+type FileIdentity = { dev: bigint; ino: bigint };
+type StableSnapshot = { identity: FileIdentity; size: number; prefix: Buffer; tail: Buffer };
+type ObserverCache = {
+	path: string;
+	identity: FileIdentity;
+	completeOffset: number;
+	prefixDigest: string;
+	entries: SessionMessageEntry[];
+	model?: string;
+};
+
 /** Session-observer adapter. The shared viewer owns navigation and fold state. */
 export class SessionObserverOverlayComponent extends TranscriptViewerOverlay {
 	#registry: SessionObserverRegistry;
 	#onDone: () => void;
 	#observeKeys: readonly KeyId[];
 	#selectedSessionId?: string;
-	#cache?: { path: string; bytesRead: number; entries: SessionMessageEntry[]; model?: string };
+	#cache?: ObserverCache;
 
 	constructor(registry: SessionObserverRegistry, onDone: () => void, observeKeys: KeyId[]) {
 		// The option closures run during the base constructor's initial refresh,
@@ -126,32 +140,81 @@ export class SessionObserverOverlayComponent extends TranscriptViewerOverlay {
 		return stats.length ? [theme.fg("dim", stats.join(theme.sep.dot))] : [];
 	}
 	#load(filePath: string): SessionMessageEntry[] {
-		if (this.#cache?.path !== filePath) this.#cache = undefined;
-		const fromByte = this.#cache?.bytesRead ?? 0;
-		const result = readFileIncremental(filePath, fromByte);
-		if (!result) return this.#cache?.entries ?? [];
-		if (result.newSize < fromByte) {
+		if (this.#cache && this.#cache.path !== filePath) {
 			this.#cache = undefined;
-			return this.#load(filePath);
+			this.resetSourceState();
 		}
-		if (!this.#cache) this.#cache = { path: filePath, bytesRead: 0, entries: [] };
-		if (result.text) {
-			const lastNewline = result.text.lastIndexOf("\n");
-			if (lastNewline >= 0) {
-				const complete = result.text.slice(0, lastNewline + 1);
-				for (const entry of parseSessionEntries(complete)) {
-					if (entry.type === "message") {
-						this.#cache.entries.push(entry);
-						if (!this.#cache.model && entry.message.role === "assistant") this.#cache.model = entry.message.model;
-					} else if (entry.type === "model_change") this.#cache.model = entry.model;
-				}
-				this.#cache.bytesRead = fromByte + Buffer.byteLength(complete, "utf-8");
+
+		const cache = this.#cache;
+		const snapshot = readStableSnapshot(filePath, cache?.completeOffset ?? 0);
+		if (!snapshot) {
+			// An unreadable source is never allowed to keep presenting a prior file as current.
+			if (cache) this.#clearSource();
+			return [];
+		}
+
+		const canAppend =
+			cache &&
+			sameIdentity(cache.identity, snapshot.identity) &&
+			snapshot.size >= cache.completeOffset &&
+			digest(snapshot.prefix) === cache.prefixDigest;
+		if (canAppend) return this.#appendStable(cache, snapshot);
+
+		// A changed fd identity, changed committed bytes, or a shrink is a replacement.
+		// Validate the entire candidate before it replaces the visible transcript.
+		const replacement = readStableSnapshot(filePath, 0);
+		if (!replacement) {
+			this.#clearSource();
+			return [];
+		}
+		const candidate = cacheEntries(filePath, replacement);
+		if (!candidate) {
+			this.#clearSource();
+			return [];
+		}
+		this.#cache = candidate;
+		if (cache) this.resetSourceState();
+		return candidate.entries;
+	}
+	#appendStable(cache: ObserverCache, snapshot: StableSnapshot): SessionMessageEntry[] {
+		const complete = completePrefix(snapshot.tail);
+		if (!complete) {
+			if (!isValidUtf8Prefix(snapshot.tail)) {
+				this.#clearSource();
+				return [];
 			}
+			return cache.entries;
+		}
+		const remainder = snapshot.tail.subarray(complete.bytes.length);
+		if (!isValidUtf8Prefix(remainder)) {
+			this.#clearSource();
+			return [];
 		}
-		return this.#cache.entries;
+		const parsed = parseCompleteEntries(complete.bytes);
+		if (!parsed) {
+			this.#clearSource();
+			return [];
+		}
+		const entries = [...cache.entries, ...parsed.entries];
+		this.#cache = {
+			...cache,
+			completeOffset: cache.completeOffset + complete.bytes.length,
+			prefixDigest: digest(Buffer.concat([snapshot.prefix, complete.bytes])),
+			entries,
+			model: parsed.model ?? cache.model,
+		};
+		return entries;
+	}
+	#clearSource(): void {
+		if (this.#cache) this.resetSourceState();
+		this.#cache = undefined;
 	}
 }
 
+/**
+ * This deliberately remains the eager full-history projection. PR2 owns projection
+ * virtualization/incrementalization; source acquisition above only controls snapshot safety.
+ */
 export function entriesFromMessages(entries: readonly SessionMessageEntry[]): TranscriptViewerEntry[] {
 	const results = new Map<string, ToolResultMessage>();
 	for (const entry of entries)
@@ -259,19 +322,111 @@ function truncateThinking(text: string, expanded: boolean): string {
 	return text.length > limit ? `${text.slice(0, limit)}...` : text;
 }
 
-function readFileIncremental(filePath: string, fromByte: number): { text: string; newSize: number } | null {
+function readStableSnapshot(filePath: string, completeOffset: number): StableSnapshot | null {
+	let fd: number | undefined;
 	try {
-		const stat = fs.statSync(filePath);
-		if (stat.size <= fromByte) return { text: "", newSize: stat.size };
-		const buffer = Buffer.alloc(stat.size - fromByte);
-		const fd = fs.openSync(filePath, "r");
-		try {
-			fs.readSync(fd, buffer, 0, buffer.length, fromByte);
-		} finally {
-			fs.closeSync(fd);
-		}
-		return { text: buffer.toString("utf-8"), newSize: stat.size };
+		fd = fs.openSync(filePath, "r");
+		const before = fs.fstatSync(fd, { bigint: true });
+		if (before.size > BigInt(Number.MAX_SAFE_INTEGER) || completeOffset > Number(before.size)) return null;
+		const size = Number(before.size);
+		const prefix = readExactly(fd, 0, completeOffset);
+		const tail = readExactly(fd, completeOffset, size - completeOffset);
+		const after = fs.fstatSync(fd, { bigint: true });
+		if (
+			before.dev !== after.dev ||
+			before.ino !== after.ino ||
+			before.size !== after.size ||
+			before.mtimeNs !== after.mtimeNs ||
+			before.ctimeNs !== after.ctimeNs
+		)
+			return null;
+		return { identity: { dev: before.dev, ino: before.ino }, size, prefix, tail };
+	} catch {
+		return null;
+	} finally {
+		if (fd !== undefined) fs.closeSync(fd);
+	}
+}
+
+function readExactly(fd: number, position: number, length: number): Buffer {
+	const buffer = Buffer.alloc(length);
+	let offset = 0;
+	while (offset < length) {
+		const bytesRead = fs.readSync(fd, buffer, offset, length - offset, position + offset);
+		if (bytesRead === 0) throw new Error("Short session file read");
+		offset += bytesRead;
+	}
+	return buffer;
+}
+
+function sameIdentity(left: FileIdentity, right: FileIdentity): boolean {
+	return left.dev === right.dev && left.ino === right.ino;
+}
+
+function digest(bytes: Buffer): string {
+	return crypto.createHash("sha256").update(bytes).digest("hex");
+}
+
+function completePrefix(bytes: Buffer): { bytes: Buffer } | undefined {
+	const newline = bytes.lastIndexOf(0x0a);
+	return newline < 0 ? undefined : { bytes: bytes.subarray(0, newline + 1) };
+}
+
+function parseCompleteEntries(bytes: Buffer): { entries: SessionMessageEntry[]; model?: string } | null {
+	try {
+		const text = FATAL_UTF8_DECODER.decode(bytes);
+		for (const line of text.split("\n")) if (line.trim()) JSON.parse(line);
+		const parsed = parseSessionEntries(text);
+		return {
+			entries: parsed.filter((entry): entry is SessionMessageEntry => entry.type === "message"),
+			model: modelFromEntries(parsed),
+		};
 	} catch {
 		return null;
 	}
 }
+
+function modelFromEntries(entries: readonly FileEntry[]): string | undefined {
+	let model: string | undefined;
+	for (const entry of entries) {
+		if (entry.type === "model_change") model = entry.model;
+		else if (entry.type === "message" && entry.message.role === "assistant" && entry.message.model)
+			model = entry.message.model;
+	}
+	return model;
+}
+
+function isValidUtf8Prefix(bytes: Buffer): boolean {
+	try {
+		new TextDecoder("utf-8", { fatal: true }).decode(bytes, { stream: true });
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+function cacheEntries(filePath: string, snapshot: StableSnapshot): ObserverCache | null {
+	const complete = completePrefix(snapshot.tail);
+	if (!complete) {
+		if (!isValidUtf8Prefix(snapshot.tail)) return null;
+		return {
+			path: filePath,
+			identity: snapshot.identity,
+			completeOffset: 0,
+			prefixDigest: digest(Buffer.alloc(0)),
+			entries: [],
+		};
+	}
+	const remainder = snapshot.tail.subarray(complete.bytes.length);
+	if (!isValidUtf8Prefix(remainder)) return null;
+	const parsed = parseCompleteEntries(complete.bytes);
+	if (!parsed) return null;
+	return {
+		path: filePath,
+		identity: snapshot.identity,
+		completeOffset: complete.bytes.length,
+		prefixDigest: digest(complete.bytes),
+		entries: parsed.entries,
+		model: parsed.model,
+	};
+}

package/src/modes/components/settings-selector.ts

@@ -235,18 +235,16 @@ function getSavedUsageMode(): UsageMode {
 	return segmentOptions.usage?.mode === "remaining" ? "remaining" : "used";
 }
 
-function setSavedUsageMode(mode: string): StatusLineSegmentOptions {
+function getUsageModeSettings(mode: string): StatusLineSegmentOptions {
 	const normalizedMode: UsageMode = mode === "remaining" ? "remaining" : "used";
 	const segmentOptions = settings.get("statusLine.segmentOptions") as StatusLineSegmentOptions;
-	const nextOptions: StatusLineSegmentOptions = {
+	return {
 		...segmentOptions,
 		usage: {
 			...(segmentOptions.usage ?? {}),
 			mode: normalizedMode,
 		},
 	};
-	settings.set("statusLine.segmentOptions", nextOptions as Record<string, unknown>);
-	return nextOptions;
 }
 
 function statusSegmentLabel(id: StatusLineSegmentId): string {
@@ -613,14 +611,17 @@ class StatusLineCustomEditor extends Container {
 	}
 
 	#save(): void {
-		settings.set("statusLine.preset", "custom");
-		settings.set("statusLine.leftSegments", [...this.#draft.leftSegments]);
-		settings.set("statusLine.rightSegments", [...this.#draft.rightSegments]);
-		settings.set("statusLine.separator", this.#draft.separator);
-		settings.set(
-			"statusLine.segmentOptions",
-			cloneSegmentOptions(this.#draft.segmentOptions) as Record<string, unknown>,
-		);
+		const saved = commitInteractiveSettings(this.callbacks, () => {
+			settings.set("statusLine.preset", "custom");
+			settings.set("statusLine.leftSegments", [...this.#draft.leftSegments]);
+			settings.set("statusLine.rightSegments", [...this.#draft.rightSegments]);
+			settings.set("statusLine.separator", this.#draft.separator);
+			settings.set(
+				"statusLine.segmentOptions",
+				cloneSegmentOptions(this.#draft.segmentOptions) as Record<string, unknown>,
+			);
+		});
+		if (!saved) return;
 		this.callbacks.onChange("statusLine.preset", "custom");
 		this.callbacks.onChange("statusLine.leftSegments", [...this.#draft.leftSegments]);
 		this.callbacks.onChange("statusLine.rightSegments", [...this.#draft.rightSegments]);
@@ -707,9 +708,29 @@ export interface SettingsCallbacks {
 	getStatusLinePreview?: (width?: number) => string;
 	/** Called when plugins change */
 	onPluginsChanged?: () => void;
+	/** Called when an interactive setting cannot be committed. */
+	onError?: (message: string) => void;
 	/** Called when settings panel is closed */
 	onCancel: () => void;
 }
+function commitInteractiveSettings(callbacks: SettingsCallbacks, commit: () => void): boolean {
+	if (!settings.canWriteDurableConfig()) {
+		callbacks.onError?.(
+			"Cannot change settings while config.yml has invalid YAML syntax. Repair config.yml and reload settings.",
+		);
+		return false;
+	}
+	try {
+		commit();
+		return true;
+	} catch (error) {
+		if (!settings.canWriteDurableConfig()) {
+			callbacks.onError?.(error instanceof Error ? error.message : String(error));
+			return false;
+		}
+		throw error;
+	}
+}
 
 /**
  * Main tabbed settings selector component.
@@ -994,11 +1015,18 @@ export class SettingsSelectorComponent extends Container {
 					// The shared pet commit policy rechecks capability immediately
 					// before mutation and persists only on acceptance; the settings
 					// surface must not persist ahead of that result.
-					const accepted = this.callbacks.onPetCommit?.(value) ?? false;
+					let accepted = false;
+					if (
+						!commitInteractiveSettings(this.callbacks, () => {
+							accepted = this.callbacks.onPetCommit?.(value) ?? false;
+						})
+					) {
+						return;
+					}
 					done(accepted ? value : undefined);
 					return;
 				}
-				this.#setSettingValue(def.path, value);
+				if (!commitInteractiveSettings(this.callbacks, () => this.#setSettingValue(def.path, value))) return;
 				this.callbacks.onChange(def.path, value);
 				done(value);
 			},
@@ -1031,7 +1059,7 @@ export class SettingsSelectorComponent extends Container {
 			value => {
 				// Empty string clears the setting; undefined-typed string settings
 				// store "" which the browser.ts expandPath ignores (no-op fallback).
-				this.#setSettingValue(def.path, value);
+				if (!commitInteractiveSettings(this.callbacks, () => this.#setSettingValue(def.path, value))) return;
 				this.callbacks.onChange(def.path, value);
 				wrappedDone(value);
 			},
@@ -1089,7 +1117,15 @@ export class SettingsSelectorComponent extends Container {
 			getSettingsListTheme(),
 			(id, newValue) => {
 				if (id === STATUS_LINE_USAGE_MODE_ID) {
-					const segmentOptions = setSavedUsageMode(newValue);
+					const segmentOptions = getUsageModeSettings(newValue);
+					if (
+						!commitInteractiveSettings(this.callbacks, () => {
+							settings.set("statusLine.segmentOptions", segmentOptions as Record<string, unknown>);
+						})
+					) {
+						this.#refreshCurrentTabItems(defs);
+						return;
+					}
 					this.callbacks.onChange("statusLine.segmentOptions", segmentOptions);
 					if (tabId === "appearance") {
 						this.#triggerStatusLinePreview();
@@ -1105,14 +1141,20 @@ export class SettingsSelectorComponent extends Container {
 
 				if (def.type === "boolean") {
 					const boolValue = newValue === "true";
-					settings.set(path, boolValue as never);
+					if (!commitInteractiveSettings(this.callbacks, () => settings.set(path, boolValue as never))) {
+						this.#refreshCurrentTabItems(defs);
+						return;
+					}
 					this.callbacks.onChange(path, boolValue);
 
 					if (tabId === "appearance") {
 						this.#triggerStatusLinePreview();
 					}
 				} else if (def.type === "enum") {
-					settings.set(path, newValue as never);
+					if (!commitInteractiveSettings(this.callbacks, () => settings.set(path, newValue as never))) {
+						this.#refreshCurrentTabItems(defs);
+						return;
+					}
 					this.callbacks.onChange(path, newValue);
 				}
 				// Submenu/text types already persisted the value inside their own