@linxiraos/pi-tui 1.1.26 → 1.2.0

package/src/prompt/composer-attachments.ts

@@ -165,6 +165,9 @@ export const COMPOSER_TOKEN_REGEX = new RegExp(
 	"gu",
 );
 
+/** Last compiled {@link referencedAttachments} scanner, keyed by its source (labels and glyphs rarely change). */
+let cachedScanner: { source: string; scanner: RegExp } | undefined;
+
 /**
  * Attachment indices referenced by a composer buffer, per kind. Image/video count compact chips
  * and expanded markers; paste counts compact chips only, since `[Paste #N]` markers number the
@@ -182,10 +185,9 @@ export function referencedAttachments(
 	const icons = [...kindByIcon.keys()].sort((a, b) => b.length - a.length).map(glyphSource);
 	const labels = [...recorded.keys()].sort((a, b) => b.length - a.length).map(label => RegExp.escape(label));
 	const recordedSource = labels.length > 0 ? labels.join("|") : "(?!)";
-	const scanner = new RegExp(
-		`${PLACEHOLDER_REGEX.source}|(${recordedSource})(?!\\d)|(${icons.join("|")}) #([1-9]\\d*)`,
-		"gu",
-	);
+	const source = `${PLACEHOLDER_REGEX.source}|(${recordedSource})(?!\\d)|(${icons.join("|")}) #([1-9]\\d*)`;
+	if (cachedScanner?.source !== source) cachedScanner = { source, scanner: new RegExp(source, "gu") };
+	const { scanner } = cachedScanner;
 
 	const refs: Record<ChipKind, Set<number>> = { image: new Set(), video: new Set(), paste: new Set() };
 	for (const match of text.matchAll(scanner)) {

package/src/prompt/composer-cache.ts

@@ -35,7 +35,6 @@ import { isWordCompletionMethod } from "./word-completion";
 const FORMAT_VERSION = 1;
 /** Project key of rows that serve every project lacking its own. */
 const ANY_PROJECT = "";
-const RECENT_SESSION_LIMIT = 4;
 
 const SCHEMA = `
 PRAGMA journal_mode=WAL;
@@ -48,9 +47,8 @@ CREATE TABLE IF NOT EXISTS entries (
 ) WITHOUT ROWID;
 `;
 
-type EntryKind = "ui" | "welcome" | "recent-sessions" | "lsp-servers" | "status";
-/** Kinds mirrored under {@link ANY_PROJECT} as the fallback for projects without their own row. */
-type SharedEntryKind = "ui" | "welcome" | "status";
+/** Every kind is mirrored under {@link ANY_PROJECT} as the fallback for projects without their own row. */
+type EntryKind = "ui" | "status";
 
 /** Theme inputs cached from the last resolved settings load for stable prepaint colors. */
 export interface ComposerThemePreferences {
@@ -60,20 +58,10 @@ export interface ComposerThemePreferences {
 	readonly lightTheme?: string;
 }
 
-/** Last authoritative model labels shown in the welcome component. */
-export interface ComposerWelcomeCache {
-	readonly modelName: string;
-	readonly providerName: string;
-}
-
 /** Speculative composer state read before the settings/session graph is available. */
 export interface ComposerStartupCache {
 	readonly preferences?: ComposerPreferences;
 	readonly theme?: ComposerThemePreferences;
-	readonly welcome?: ComposerWelcomeCache;
-	readonly recentSessions: RecentSession[];
-	/** `null` when the last run had LSP disabled. */
-	readonly lspServers: LspServerInfo[] | null;
 	readonly status?: ComposerStatusCache;
 }
 
@@ -86,44 +74,6 @@ function parseJson(value: string | undefined): unknown {
 	}
 }
 
-function parseRecentSessions(value: unknown): RecentSession[] {
-	if (!Array.isArray(value)) return [];
-	const sessions: RecentSession[] = [];
-	for (const item of value) {
-		if (!isRecord(item)) continue;
-		const { name, timeAgo } = item;
-		if (typeof name === "string" && typeof timeAgo === "string") sessions.push({ name, timeAgo });
-		if (sessions.length === RECENT_SESSION_LIMIT) break;
-	}
-	return sessions;
-}
-
-function parseLspServers(value: unknown): LspServerInfo[] | null {
-	if (value === null) return null;
-	if (!Array.isArray(value)) return [];
-	const servers: LspServerInfo[] = [];
-	for (const item of value) {
-		if (!isRecord(item)) continue;
-		const { name, status, fileTypes } = item;
-		if (
-			typeof name !== "string" ||
-			(status !== "ready" && status !== "error" && status !== "connecting" && status !== "available") ||
-			!Array.isArray(fileTypes) ||
-			!fileTypes.every(fileType => typeof fileType === "string")
-		) {
-			continue;
-		}
-		servers.push({ name, status, fileTypes });
-	}
-	return servers;
-}
-
-function parseWelcome(value: unknown): ComposerWelcomeCache | undefined {
-	if (!isRecord(value)) return undefined;
-	const { modelName, providerName } = value;
-	return typeof modelName === "string" && typeof providerName === "string" ? { modelName, providerName } : undefined;
-}
-
 function parseStatus(value: unknown): ComposerStatusCache | undefined {
 	if (!isRecord(value)) return undefined;
 	const statusLine = readStatusLineStartupData(value.statusLine);
@@ -275,9 +225,6 @@ export class ComposerCache {
 		return {
 			preferences: ui?.preferences,
 			theme: ui?.theme,
-			welcome: parseWelcome(parseJson(own.welcome)) ?? parseWelcome(parseJson(anyProject.welcome)),
-			recentSessions: parseRecentSessions(parseJson(own["recent-sessions"])),
-			lspServers: own["lsp-servers"] === undefined ? [] : parseLspServers(parseJson(own["lsp-servers"])),
 			status: parseStatus(parseJson(own.status)) ?? parseStatus(parseJson(anyProject.status)),
 		};
 	}
@@ -287,21 +234,6 @@ export class ComposerCache {
 		this.#putShared(cwd, "ui", { preferences, theme });
 	}
 
-	/** Authoritative model/provider labels for the next welcome prepaint. */
-	writeWelcome(cwd: string, welcome: ComposerWelcomeCache): void {
-		this.#putShared(cwd, "welcome", welcome);
-	}
-
-	/** The latest recent-session rows (first four). */
-	writeRecentSessions(cwd: string, sessions: readonly RecentSession[]): void {
-		this.#put(cwd, "recent-sessions", sessions.slice(0, RECENT_SESSION_LIMIT));
-	}
-
-	/** The latest detected project LSP rows; `null` records that LSP is disabled. */
-	writeLspServers(cwd: string, servers: readonly LspServerInfo[] | null): void {
-		this.#put(cwd, "lsp-servers", servers);
-	}
-
 	/** Status-bar inputs for the next prepaint's startup status line. */
 	writeStatus(cwd: string, status: ComposerStatusCache): void {
 		this.#putShared(cwd, "status", status);
@@ -314,22 +246,11 @@ export class ComposerCache {
 		this.#db.close();
 	}
 
-	/** Best-effort upsert: a failed write only costs the next launch its speculation. */
-	#put(cwd: string, kind: EntryKind, value: unknown): void {
-		const project = path.resolve(cwd);
-		const json = JSON.stringify(value);
-		const key = `${project}\0${kind}`;
-		if (this.#known.get(key) === json) return;
-		try {
-			this.#upsert.run(project, kind, json);
-			this.#known.set(key, json);
-		} catch (error) {
-			logger.debug("composer cache write failed", { kind, error: String(error) });
-		}
-	}
-
-	/** {@link #put} for this project plus the any-project fallback row, atomically. */
-	#putShared(cwd: string, kind: SharedEntryKind, value: unknown): void {
+	/**
+	 * Best-effort upsert of this project's row plus the any-project fallback row,
+	 * atomically: a failed write only costs the next launch its speculation.
+	 */
+	#putShared(cwd: string, kind: EntryKind, value: unknown): void {
 		const project = path.resolve(cwd);
 		const json = JSON.stringify(value);
 		const ownKey = `${project}\0${kind}`;

package/src/prompt/composer.ts

@@ -15,14 +15,14 @@ import {
 	type TUIOptions,
 	type ViewportSize,
 } from "../tui";
-import { sliceWithWidth, visibleWidth } from "../utils";
+import { wrapLiteralLine } from "../utils";
 import type { NativeChild, NativeSurface, NativeSurfaceProvider } from "../native/node";
 import { sameItems } from "../native/memo";
 import { postmortem } from "@linxiraos/pi-utils";
 import { CustomEditor } from "./custom-editor";
 import type { WordCompletionMethod } from "./word-completion";
 import { type AnimationFrame, TranscriptContainer } from "../chrome/transcript-container";
-import { type LspServerInfo, type RecentSession, WelcomeComponent } from "./welcome";
+import { WelcomeComponent, type RecentSession, type LspServerInfo } from "./welcome";
 import { ensureThemeSync, getEditorTheme, theme } from "../theme/theme";
 
 const DOUBLE_INTERRUPT_MS = 500;
@@ -82,7 +82,7 @@ export interface ComposerStatusCache {
 /** Optional dependencies and initial state for a standalone composer. */
 export interface ComposerOptions {
 	readonly terminal?: Terminal;
-	/** Extra TUI construction options (render scheduler injection for tests and `zeta render`). */
+	/** Extra TUI construction options (render scheduler injection for tests and `zetacode render`). */
 	readonly tuiOptions?: TUIOptions;
 	readonly preferences?: Partial<ComposerPreferences>;
 	readonly welcome?: ComposerWelcomeUpdate;
@@ -279,6 +279,8 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 	#transientChrome: ReadonlySet<Component> = new Set();
 	#transientChromeFloor: number | undefined;
 	#anchorAfterInlineRetirement = false;
+	/** Rows the chrome below each below-transcript root took in the last frame (see {@link rowsBelow}). */
+	#rowsBelow = new Map<Component, number>();
 	#lastInterruptAt = 0;
 	/** Last described surface; its arrays are reused while their children are unchanged. */
 	#nativeSurface: NativeSurface = { main: [], dock: [] };
@@ -347,6 +349,27 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 		this.ui.addChild(this.#statusHost);
 		this.ui.setFocus(this.editor);
 	}
+	/**
+	 * Rows the below-transcript chrome under `root` (editor, status line, …)
+	 * took in the last frame, so a root that grows upward can cap itself to
+	 * the screen rows left above them; `undefined` before `root` was laid out.
+	 */
+	rowsBelow(root: Component): number | undefined {
+		return this.#rowsBelow.get(root);
+	}
+
+	/**
+	 * Keep the input on the bottom row while the live rows cannot fill the
+	 * screen, as after an inline decision panel closes. A tall block that just
+	 * left the chrome above the editor (a command report) may have scrolled
+	 * rows into native history that cannot be pulled back; without the pin the
+	 * editor would jump up to where the shorter frame now ends. The pin lifts
+	 * once live rows fill the screen again.
+	 */
+	pinInputToBottom(): void {
+		this.#anchorAfterInlineRetirement = true;
+	}
+
 	/** Compose the bounded mutable viewport and the next ordered history append. */
 	renderFrame(viewport: ViewportSize): TerminalFramePlan {
 		if (!this.#started || this.#stopped) return { viewport: [] };
@@ -373,10 +396,12 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 		let transientRows = 0;
 		let displacingRows = 0;
 		let decisionPanelOpen = false;
+		const ends: { root: Component; end: number }[] = [];
 		for (const root of afterRoots) {
 			const chrome: Component = root;
 			const start = after.length;
 			this.#renderBelowRoot(root, width, after, afterSpans);
+			ends.push({ root, end: after.length });
 			if (this.#transientChrome.has(root)) transientRows += after.length - start;
 			if (
 				chrome.retireDisplacedTranscript ||
@@ -386,6 +411,7 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 				decisionPanelOpen = true;
 			}
 		}
+		this.#rowsBelow = new Map(ends.map(({ root, end }) => [root, after.length - end]));
 		// Offer history under capacity pressure only: blocks stay live (and keep
 		// reflowing to the current width) while the screen has room. A batch
 		// leaves the mutable viewport in the same frame it is appended, so its
@@ -786,20 +812,8 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 		if (!lines) return [];
 		if (isInsideTerminalMultiplexer()) return lines.slice(start);
 		const reflowed: string[] = [];
-		const columns = Math.max(1, width);
 		for (let index = start; index < lines.length; index++) {
-			const line = lines[index]!;
-			const lineWidth = visibleWidth(line);
-			if (lineWidth === 0) {
-				reflowed.push("");
-				continue;
-			}
-			for (let column = 0; column < lineWidth;) {
-				let slice = sliceWithWidth(line, column, columns, true);
-				if (slice.width === 0) slice = sliceWithWidth(line, column, columns);
-				reflowed.push(slice.text);
-				column += Math.max(1, slice.width);
-			}
+			reflowed.push(...wrapLiteralLine(lines[index]!, width));
 		}
 		return reflowed;
 	}
@@ -871,7 +885,7 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 		this.ui.requestRender();
 	}
 
-	/** Patch welcome data in place as model, session, and project discovery complete. */
+	/** Patch welcome data in place as version, session, and project discovery complete. */
 	updateWelcome(update: ComposerWelcomeUpdate): void {
 		if (this.#stopped) return;
 		this.#applyWelcomeUpdate(update);
@@ -880,11 +894,7 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 		const welcome = this.#welcome;
 		if (!welcome) return;
 		if (update.version !== undefined) welcome.setVersion(this.#version);
-		if (update.modelName !== undefined || update.providerName !== undefined) {
-			welcome.setModel(this.#modelName, this.#providerName);
-		}
-		if (update.recentSessions !== undefined) welcome.setRecentSessions(this.#recentSessions);
-		if (update.lspServers !== undefined) welcome.setLspServers(this.#lspServers);
+		welcome.setModel(this.#modelName, this.#providerName);
 		this.ui.requestRender();
 	}
 
@@ -899,6 +909,7 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 
 	/** Update the canonical editor reference after InteractiveMode remounts a custom editor. */
 	setEditor(editor: CustomEditor): void {
+		this.ui.replaceHeldFocus(this.#editor, editor);
 		this.#editor = editor;
 	}
 
@@ -965,10 +976,10 @@ export class Composer implements TerminalFrameProvider, NativeSurfaceProvider {
 
 	#applyWelcomeUpdate(update: ComposerWelcomeUpdate): void {
 		if (update.version !== undefined) this.#version = update.version;
-		if (update.modelName !== undefined) this.#modelName = update.modelName;
-		if (update.providerName !== undefined) this.#providerName = update.providerName;
-		if (update.recentSessions !== undefined) this.#recentSessions = [...update.recentSessions];
-		if (update.lspServers !== undefined) this.#lspServers = update.lspServers && [...update.lspServers];
+		if (update.modelName !== undefined || update.providerName !== undefined) {
+			this.#modelName = update.modelName ?? this.#modelName;
+			this.#providerName = update.providerName ?? this.#providerName;
+		}
 	}
 
 	#ensureWelcome(): void {