pi-zentui 0.2.1 → 0.2.2

package/extensions/zentui/git.ts

@@ -2,6 +2,7 @@ import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 
 const execFileAsync = promisify(execFile);
+const GIT_COMMAND_TIMEOUT_MS = 2_000;
 
 export type GitStatusSummary = {
 	branch?: string;
@@ -88,10 +89,14 @@ export function parseGitStatusPorcelain(stdoutText: string, hasStash: boolean):
 export async function readGitStatus(cwd: string): Promise<GitStatusSummary> {
 	try {
 		const [{ stdout: statusStdout }, stashResult] = await Promise.all([
-			execFileAsync("git", ["status", "--porcelain=2", "--branch"], { cwd }),
-			execFileAsync("git", ["rev-parse", "--verify", "--quiet", "refs/stash"], { cwd }).catch(
-				() => ({ stdout: "" }),
-			),
+			execFileAsync("git", ["status", "--porcelain=2", "--branch"], {
+				cwd,
+				timeout: GIT_COMMAND_TIMEOUT_MS,
+			}),
+			execFileAsync("git", ["rev-parse", "--verify", "--quiet", "refs/stash"], {
+				cwd,
+				timeout: GIT_COMMAND_TIMEOUT_MS,
+			}).catch(() => ({ stdout: "" })),
 		]);
 		const stdoutText = typeof statusStdout === "string" ? statusStdout : String(statusStdout);
 		const stashStdout =

package/extensions/zentui/index.ts

@@ -18,7 +18,12 @@ import {
 } from "./config";
 import { installFooter } from "./footer";
 import { emptyGitStatus, readGitStatus } from "./git";
-import { type StopProjectRefreshInterval, startProjectRefreshInterval } from "./project-refresh";
+import {
+	type ScheduleProjectRefreshOptions,
+	type StopProjectRefreshInterval,
+	createProjectRefreshScheduler,
+	startProjectRefreshInterval,
+} from "./project-refresh";
 import { readRuntimeInfo } from "./runtime";
 import { installSelectorBorderStyle } from "./selector-border";
 import { registerZentuiSettingsCommand } from "./settings-command";
@@ -58,8 +63,6 @@ export default function (pi: ExtensionAPI) {
 	let editorInstallMode: EditorInstallMode = "none";
 	let wrappedEditorFactory: EditorFactory | undefined;
 	let prototypePatchesInstalled = false;
-	let projectRefreshInFlight = false;
-	let projectRefreshPending = false;
 
 	const refresh = () => requestFooterRender?.();
 	const getActiveTheme = () => activeTheme;
@@ -77,22 +80,9 @@ export default function (pi: ExtensionAPI) {
 		state.runtime = runtime;
 	};
 
-	const scheduleProjectRefresh = (ctx: ExtensionContext) => {
-		if (projectRefreshInFlight) {
-			projectRefreshPending = true;
-			return;
-		}
-
-		projectRefreshInFlight = true;
-		void refreshProjectState(ctx).finally(() => {
-			projectRefreshInFlight = false;
-			refresh();
-			if (projectRefreshPending) {
-				projectRefreshPending = false;
-				scheduleProjectRefresh(ctx);
-			}
-		});
-	};
+	const projectRefreshScheduler = createProjectRefreshScheduler(refreshProjectState, refresh);
+	const scheduleProjectRefresh = (ctx: ExtensionContext, options?: ScheduleProjectRefreshOptions) =>
+		projectRefreshScheduler.schedule(ctx, options);
 
 	const refreshInteractiveState = (ctx: ExtensionContext, project = false) => {
 		if (!ctx.hasUI) return;
@@ -104,8 +94,7 @@ export default function (pi: ExtensionAPI) {
 	const stopProjectRefresh = () => {
 		stopRefreshInterval();
 		stopRefreshInterval = () => {};
-		projectRefreshInFlight = false;
-		projectRefreshPending = false;
+		projectRefreshScheduler.stop();
 	};
 
 	const installPrototypePatches = () => {
@@ -213,7 +202,7 @@ export default function (pi: ExtensionAPI) {
 		stopRefreshInterval = startProjectRefreshInterval(currentConfig.projectRefreshIntervalMs, () =>
 			scheduleProjectRefresh(ctx),
 		);
-		scheduleProjectRefresh(ctx);
+		scheduleProjectRefresh(ctx, { force: true });
 		refresh();
 	};
 

package/extensions/zentui/project-refresh.ts

@@ -1,5 +1,16 @@
 export type StopProjectRefreshInterval = () => void;
 
+export type ScheduleProjectRefreshOptions = {
+	force?: boolean;
+};
+
+export type ProjectRefreshScheduler<T> = {
+	schedule: (target: T, options?: ScheduleProjectRefreshOptions) => void;
+	stop: () => void;
+};
+
+export const PROJECT_REFRESH_THROTTLE_MS = 5_000;
+
 export function startProjectRefreshInterval(
 	intervalMs: number,
 	refresh: () => void,
@@ -11,3 +22,83 @@ export function startProjectRefreshInterval(
 
 	return () => clearInterval(timer);
 }
+
+export function createProjectRefreshScheduler<T>(
+	refresh: (target: T) => Promise<void>,
+	afterRefresh: () => void,
+	throttleMs = PROJECT_REFRESH_THROTTLE_MS,
+): ProjectRefreshScheduler<T> {
+	let refreshInFlight = false;
+	let refreshPending = false;
+	let pendingTarget: T | undefined;
+	let delayedRefresh: ReturnType<typeof setTimeout> | undefined;
+	let lastRefreshStartedAt: number | undefined;
+	let generation = 0;
+
+	const clearDelayedRefresh = () => {
+		if (!delayedRefresh) return;
+		clearTimeout(delayedRefresh);
+		delayedRefresh = undefined;
+	};
+
+	const runRefresh = (target: T) => {
+		clearDelayedRefresh();
+		if (refreshInFlight) {
+			refreshPending = true;
+			pendingTarget = target;
+			return;
+		}
+
+		const currentGeneration = generation;
+		refreshInFlight = true;
+		lastRefreshStartedAt = Date.now();
+		void refresh(target)
+			.catch(() => undefined)
+			.finally(() => {
+				if (currentGeneration !== generation) return;
+				refreshInFlight = false;
+				afterRefresh();
+				if (refreshPending) {
+					refreshPending = false;
+					const nextTarget = pendingTarget ?? target;
+					pendingTarget = undefined;
+					schedule(nextTarget);
+				}
+			});
+	};
+
+	const schedule = (target: T, options: ScheduleProjectRefreshOptions = {}) => {
+		if (options.force || throttleMs <= 0 || lastRefreshStartedAt === undefined) {
+			runRefresh(target);
+			return;
+		}
+
+		const delayMs = Math.max(0, throttleMs - (Date.now() - lastRefreshStartedAt));
+		if (delayMs === 0) {
+			runRefresh(target);
+			return;
+		}
+
+		pendingTarget = target;
+		if (delayedRefresh) return;
+		delayedRefresh = setTimeout(() => {
+			delayedRefresh = undefined;
+			const nextTarget = pendingTarget ?? target;
+			pendingTarget = undefined;
+			runRefresh(nextTarget);
+		}, delayMs);
+		delayedRefresh.unref?.();
+	};
+
+	return {
+		schedule,
+		stop() {
+			generation += 1;
+			clearDelayedRefresh();
+			refreshInFlight = false;
+			refreshPending = false;
+			pendingTarget = undefined;
+			lastRefreshStartedAt = undefined;
+		},
+	};
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-zentui",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"description": "A Starship-inspired statusline and Opencode-style TUI for Pi.",
 	"type": "module",
 	"license": "MIT",