@quandev104/pi-style 0.2.1 → 0.2.2

package/extension-src/pi-style/app/runtime.ts

@@ -18,6 +18,9 @@ import { CachedGitProvider, InMemoryContextProvider, InMemoryUsageProvider } fro
 import { RenderScheduler } from "./render-scheduler.js";
 import { createSnapshot, replaceSnapshot, type UiSnapshot } from "./snapshot.js";
 
+/** Debounce window for coalescing git refresh spawns after invalidateGit(). */
+const GIT_INVALIDATE_DEBOUNCE_MS = 250;
+
 export interface RuntimeInstallationState {
 	readonly status: "installed" | "disabled" | "failed";
 	readonly editor: "installed" | "preserved" | "disabled" | "failed";
@@ -94,6 +97,11 @@ export function createPiStyleRuntime(
 	const disposables = new DisposableStore();
 	const scheduler = new RenderScheduler({ requestRender }, generation, () => !disposed);
 	const git = new CachedGitProvider(host.gitRunner);
+	// Debounced git refresh (invalidateGit): tool-result bursts fire one
+	// invalidateGit per write/edit/bash, each of which would otherwise spawn a
+	// `git status` process. Only one refresh may be pending at a time; the
+	// handle is unreffed so it can never keep the process alive.
+	let pendingGitRefresh: ReturnType<typeof setTimeout> | undefined;
 	const contextProvider = new InMemoryContextProvider();
 	const usageProvider = new InMemoryUsageProvider();
 	const initialContext = contextSnapshot();
@@ -345,11 +353,24 @@ export function createPiStyleRuntime(
 		},
 		invalidateGit() {
 			if (disposed || !host.cwd || !currentConfig.enabled || !currentConfig.statusLine.enabled) return;
-			git.invalidate(host.cwd);
-			void git.get(host.cwd).then((value) => {
+			const cwd = host.cwd;
+			// Mark the cache stale immediately (cheap, no spawn); the actual
+			// `git status` process spawn is coalesced behind a short debounce so
+			// bursts of tool results trigger ONE refresh, not one per event.
+			// CachedGitProvider serializes concurrent gets via entry.promise and
+			// honors invalidate-during-flight (needsRefresh re-runs the fetch),
+			// so this debounce only reduces spawn count and never loses a signal.
+			git.invalidate(cwd);
+			if (pendingGitRefresh !== undefined) return;
+			pendingGitRefresh = setTimeout(() => {
+				pendingGitRefresh = undefined;
 				if (disposed) return;
-				if (updateSnapshot(withSnapshotPatch({ git: value }))) requestRender();
-			});
+				void git.get(cwd).then((value) => {
+					if (disposed) return;
+					if (updateSnapshot(withSnapshotPatch({ git: value }))) requestRender();
+				});
+			}, GIT_INVALIDATE_DEBOUNCE_MS);
+			pendingGitRefresh.unref?.();
 		},
 		get disposed() {
 			return disposed;
@@ -357,6 +378,10 @@ export function createPiStyleRuntime(
 		dispose() {
 			if (disposed) return;
 			disposed = true;
+			if (pendingGitRefresh !== undefined) {
+				clearTimeout(pendingGitRefresh);
+				pendingGitRefresh = undefined;
+			}
 			scheduler.cancel();
 			// UI surfaces are restored synchronously so teardown is deterministic;
 			// the store then disposes the (already disposed) feature instances idempotently.

package/extension-src/pi-style/domain/status-renderer.ts

@@ -25,6 +25,8 @@ interface Candidate {
 	readonly segment: StatusSegment;
 	readonly result: SegmentRenderResult;
 	content: string;
+	/** Visible width of `content`; updated when the compact form is swapped in. */
+	contentWidth: number;
 	compact: boolean;
 	moved: boolean;
 }
@@ -47,10 +49,6 @@ function renderGroup(items: readonly Candidate[], separator: string, padding: st
 		.join(`${padding}${separator}${padding}`);
 }
 
-function widthOf(items: readonly Candidate[], separator: string, padding: string): number {
-	return visibleWidth(renderGroup(items, separator, padding));
-}
-
 export function renderStatus(
 	layout: StatusLayout,
 	snapshot: StatusSnapshot,
@@ -70,7 +68,15 @@ export function renderStatus(
 		try {
 			const result = segment.render(context);
 			if (!result.visible || !result.content) continue;
-			candidates.set(id, { id, segment, result, content: result.content, compact: false, moved: false });
+			candidates.set(id, {
+				id,
+				segment,
+				result,
+				content: result.content,
+				contentWidth: visibleWidth(result.content),
+				compact: false,
+				moved: false,
+			});
 		} catch {
 			// A broken optional segment must not break the status row.
 		}
@@ -88,13 +94,34 @@ export function renderStatus(
 		.filter((candidate): candidate is Candidate => candidate !== undefined);
 	const visible: Candidate[] = [];
 	const overflow: Candidate[] = [];
+	// Incremental fit tracking: the rendered width of a group is the sum of the
+	// member content widths plus one separator gap between consecutive members
+	// (every join boundary is broken by the separator string, so visible widths
+	// add up). This replaces re-joining and re-measuring the whole group after
+	// every push, which made the overflow loop quadratic in segment count.
+	const gapWidth = visibleWidth(`${padding}${separator}${padding}`);
+	let groupWidth = 0;
+	let groupCount = 0;
+	const widthAfter = (baseWidth: number, count: number, candidate: Candidate): number =>
+		count === 0 ? candidate.contentWidth : baseWidth + gapWidth + candidate.contentWidth;
 	for (const candidate of primary) {
 		visible.push(candidate);
-		if (widthOf(visible, separator, padding) <= width) continue;
+		const pushedWidth = widthAfter(groupWidth, groupCount, candidate);
+		if (pushedWidth <= width) {
+			groupWidth = pushedWidth;
+			groupCount++;
+			continue;
+		}
 		if (candidate.result.compactContent && !candidate.compact) {
 			candidate.content = candidate.result.compactContent;
 			candidate.compact = true;
-			if (widthOf(visible, separator, padding) <= width) continue;
+			candidate.contentWidth = visibleWidth(candidate.content);
+			const compactedWidth = widthAfter(groupWidth, groupCount, candidate);
+			if (compactedWidth <= width) {
+				groupWidth = compactedWidth;
+				groupCount++;
+				continue;
+			}
 		}
 		visible.pop();
 		if (candidate.segment.overflow !== "drop" && candidate.segment.overflow !== "primary") {
@@ -127,9 +154,14 @@ export function renderStatus(
 	}
 	if (visibleWidth(primaryText) > width) primaryText = truncateAnsi(primaryText, width);
 	const secondaryVisible: Candidate[] = [];
+	let secondaryWidth = 0;
+	let secondaryCount = 0;
 	for (const candidate of [...secondary].sort((a, b) => b.segment.defaultPriority - a.segment.defaultPriority)) {
+		const pushedWidth = widthAfter(secondaryWidth, secondaryCount, candidate);
+		if (pushedWidth > width) continue;
 		secondaryVisible.push(candidate);
-		if (widthOf(secondaryVisible, separator, padding) > width) secondaryVisible.pop();
+		secondaryWidth = pushedWidth;
+		secondaryCount++;
 	}
 	const secondaryText = renderGroup(secondaryVisible, separator, padding);
 	const lines = secondaryText ? [primaryText, secondaryText] : primaryText ? [primaryText] : [];

package/extension-src/pi-style/domain/status.ts

@@ -308,11 +308,10 @@ export function createBuiltinSegments(): ReadonlyMap<StatusSegmentId, StatusSegm
 					? ""
 					: theme.apply("time", formatElapsed(Date.now() - snapshot.sessionStartedAt)),
 		})),
-		segment("time", 20, ({ theme }) => ({
-			visible: true,
-			content: theme.apply("time", new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })),
-			compactContent: theme.apply("time", new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })),
-		})),
+		segment("time", 20, ({ theme }) => {
+			const text = theme.apply("time", clockTime());
+			return { visible: true, content: text, compactContent: text };
+		}),
 		segment("hostname", 20, ({ snapshot, theme }) => ({
 			visible: Boolean(snapshot.hostname),
 			content: theme.apply("muted", snapshot.hostname ?? ""),
@@ -337,6 +336,17 @@ export function createBuiltinSegments(): ReadonlyMap<StatusSegmentId, StatusSegm
 	return new Map(segments.map((item) => [item.id, item]));
 }
 
+/** Cached clock text: the minute-precision string only changes once per minute. */
+let clockCache: { minuteKey: number; value: string } | undefined;
+function clockTime(): string {
+	const now = new Date();
+	const minuteKey = now.getHours() * 60 + now.getMinutes();
+	if (clockCache?.minuteKey !== minuteKey) {
+		clockCache = { minuteKey, value: now.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) };
+	}
+	return clockCache.value;
+}
+
 const CONTEXT_BAR_WIDTH = 10;
 
 function contextBar(percent: number, width = CONTEXT_BAR_WIDTH): string {

package/extension-src/pi-style/domain/theme.ts

@@ -200,10 +200,32 @@ function colorPrefixFor(
 	return "";
 }
 
+function envKeyFor(env: Record<string, string | undefined>): string {
+	return `${env.PI_STYLE_NERD_FONTS ?? ""}\u0000${env.GHOSTTY_RESOURCES_DIR ? "1" : "0"}\u0000${env.TERM_PROGRAM ?? ""}`;
+}
+
+const glyphModeCache = new WeakMap<object, Map<string, GlyphMode>>();
+
 export function detectGlyphMode(
 	config: NormalizedPiStyleConfig,
 	env: Record<string, string | undefined> = {},
 ): GlyphMode {
+	// Memoized per config object; the env-derived key keeps the result correct
+	// when the same config is resolved against different environments.
+	let byEnv = glyphModeCache.get(config);
+	if (!byEnv) {
+		byEnv = new Map();
+		glyphModeCache.set(config, byEnv);
+	}
+	const envKey = envKeyFor(env);
+	const cached = byEnv.get(envKey);
+	if (cached !== undefined) return cached;
+	const mode = computeGlyphMode(config, env);
+	byEnv.set(envKey, mode);
+	return mode;
+}
+
+function computeGlyphMode(config: NormalizedPiStyleConfig, env: Record<string, string | undefined>): GlyphMode {
 	if (env.PI_STYLE_NERD_FONTS === "1") return "nerd";
 	if (env.PI_STYLE_NERD_FONTS === "0") return "unicode";
 	if (config.theme.nerdFonts === "on") return "nerd";
@@ -224,7 +246,16 @@ export function resolveTheme(
 ): ResolvedTheme {
 	const noColor = Object.hasOwn(env, "NO_COLOR") && env.NO_COLOR !== "" && config.theme.colors.colorOverride !== "on";
 	const mode = config.preset === "ascii" ? "ascii" : detectGlyphMode(config, env);
-	const color = (token: SemanticToken) => colorPrefixFor(active, config, noColor, token);
+	// Lazy per-instance prefix memo: repeated apply(token, ...) calls stop
+	// re-running colorPrefixFor (and Pi's active.fg()) for the same token.
+	const prefixes = new Map<SemanticToken, string>();
+	const color = (token: SemanticToken): string => {
+		const cached = prefixes.get(token);
+		if (cached !== undefined) return cached;
+		const prefix = colorPrefixFor(active, config, noColor, token);
+		prefixes.set(token, prefix);
+		return prefix;
+	};
 	return {
 		mode,
 		noColor,

package/extension-src/pi-style/features/editor/index.ts

@@ -56,9 +56,13 @@ const widthOf = visibleWidth;
 
 function widthSafe(value: string, width: number): string {
 	if (width <= 0) return "";
-	const fitted = widthOf(value) > width ? truncateAnsi(value, width, "") : value;
-	const current = widthOf(fitted);
-	return current < width ? fitted + " ".repeat(width - current) : fitted;
+	const measured = widthOf(value);
+	if (measured > width) {
+		const fitted = truncateAnsi(value, width, "");
+		const current = widthOf(fitted);
+		return current < width ? fitted + " ".repeat(width - current) : fitted;
+	}
+	return measured < width ? value + " ".repeat(width - measured) : value;
 }
 
 function isNativeBorderLine(line: string): boolean {
@@ -142,6 +146,8 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 	private readonly fullTheme: EditorOptions["fullTheme"];
 	private readonly onSnapshot: (snapshot: StatusSnapshot) => void;
 	private semantic: ResolvedTheme;
+	/** Set when config changes; invalidate() then rebuilds the (otherwise stable) semantic theme. */
+	private semanticDirty = false;
 	private disposed = false;
 	private renderPlanCache: { key: string; plan: RenderPlan } | undefined;
 
@@ -165,7 +171,7 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 	configure(config: NormalizedPiStyleConfig): void {
 		if (this.disposed) return;
 		this.config = config;
-		this.semantic = semanticTheme(this.piTheme, config);
+		this.semanticDirty = true;
 		this.invalidate();
 	}
 
@@ -177,7 +183,13 @@ export class StyledEditor extends CustomEditor implements EditorComponent {
 
 	override invalidate(): void {
 		super.invalidate();
-		this.semantic = semanticTheme(this.piTheme, this.config);
+		// The semantic theme is derived from (piTheme, config); piTheme is fixed per
+		// instance and config changes go through configure(), so keystroke-driven
+		// invalidations reuse the cached instance instead of rebuilding it.
+		if (this.semanticDirty) {
+			this.semantic = semanticTheme(this.piTheme, this.config);
+			this.semanticDirty = false;
+		}
 		this.renderPlanCache = undefined;
 		this.tui.requestRender();
 	}