@narumitw/pi-statusline 0.14.1 → 0.15.0

package/README.md

@@ -53,7 +53,7 @@ Unset or invalid values fall back to `tokyo-night`. Both presets keep the same e
 
 ## ⚙️ Extension status icons
 
-Extension statuses use built-in icons by status key. Override or suppress them in `${PI_CODING_AGENT_DIR:-~/.pi/agent}/pi-statusline-settings.json`:
+Extension statuses use built-in icons by status key. Override or suppress them in `${PI_CODING_AGENT_DIR:-~/.pi/agent}/pi-statusline.json`:
 
 ```json
 {
@@ -70,6 +70,8 @@ Extension statuses use built-in icons by status key. Override or suppress them i
 }
 ```
 
+Compatibility: a valid legacy `pi-statusline-settings.json` is migrated automatically to `pi-statusline.json`. If both files exist, the new filename takes precedence.
+
 - Exact status key: always wins, e.g. `"goal"` or `"foo:server"`.
 - Installed extension id: for installed packages, use the package name/source such as `"@vendor/pi-foo"`, `"npm:@vendor/pi-foo@1.2.3"`, `"pi-foo"`, or the derived key `"foo"`.
 - Namespaced status keys: package `@vendor/pi-foo` can match `foo`, `foo:server`, and `foo/server`, but not fuzzy matches like `foobar`.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-statusline",
-	"version": "0.14.1",
+	"version": "0.15.0",
 	"description": "Pi extension that replaces the footer with an information-rich statusline.",
 	"type": "module",
 	"license": "MIT",

package/src/settings.ts

@@ -1,10 +1,12 @@
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
+import { randomUUID } from "node:crypto";
+import { existsSync, linkSync, lstatSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
 import process from "node:process";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import type { SegmentName, StatuslineConfig, StatuslinePresetName } from "../presets/types.js";
 
-const SETTINGS_FILE = "pi-statusline-settings.json";
+const SETTINGS_FILE = "pi-statusline.json";
+const LEGACY_SETTINGS_FILE = "pi-statusline-settings.json";
 const DEFAULT_PRESET: StatuslinePresetName = "tokyo-night";
 const DEFAULT_SEGMENTS: SegmentName[] = [
 	"brand",
@@ -18,6 +20,7 @@ const DEFAULT_SEGMENTS: SegmentName[] = [
 	"cost",
 	"time",
 ];
+let pendingSettingsNotice: string | undefined;
 
 export interface StatuslineSettings {
 	extensionStatusIcons: Record<string, string>;
@@ -35,18 +38,134 @@ export function createDefaultConfig(): StatuslineConfig {
 	};
 }
 
-export function readStatuslineSettings(
-	settingsPath = join(getAgentDir(), SETTINGS_FILE),
-): StatuslineSettings {
+export function readStatuslineSettings(settingsPath?: string): StatuslineSettings {
+	if (settingsPath) return readSettingsFile(settingsPath);
+	pendingSettingsNotice = undefined;
+	const canonicalPath = join(getAgentDir(), SETTINGS_FILE);
+	const legacyPath = join(getAgentDir(), LEGACY_SETTINGS_FILE);
+	if (existsSync(canonicalPath)) {
+		const canonical = readSettingsFileResult(canonicalPath);
+		const notices: string[] = [];
+		if (!canonical.valid) notices.push(`${SETTINGS_FILE} is invalid and was ignored.`);
+		if (existsSync(legacyPath)) {
+			notices.push(`${LEGACY_SETTINGS_FILE} ignored because ${SETTINGS_FILE} takes precedence.`);
+		}
+		if (notices.length > 0) pendingSettingsNotice = notices.join("\n");
+		return canonical.settings;
+	}
+	if (!existsSync(legacyPath)) return { extensionStatusIcons: {} };
+	const legacy = readSettingsFileResult(legacyPath);
+	if (!legacy.valid) {
+		pendingSettingsNotice = `${LEGACY_SETTINGS_FILE} is invalid and was ignored.`;
+		return legacy.settings;
+	}
+	let installedIdentity: FileIdentity;
+	try {
+		installedIdentity = installFileExclusively(canonicalPath, legacy.contents ?? "");
+	} catch (error) {
+		if (existsSync(canonicalPath)) {
+			const canonical = readSettingsFileResult(canonicalPath);
+			pendingSettingsNotice = [
+				...(!canonical.valid ? [`${SETTINGS_FILE} is invalid and was ignored.`] : []),
+				`${LEGACY_SETTINGS_FILE} ignored because ${SETTINGS_FILE} was created concurrently.`,
+			].join("\n");
+			return canonical.settings;
+		}
+		pendingSettingsNotice = `Statusline settings migration failed: ${formatError(error)}. The legacy file was used for this session.`;
+		return legacy.settings;
+	}
+	if (!fileContentsEqual(legacyPath, legacy.contents ?? "")) {
+		pendingSettingsNotice = removeFileIfIdentityMatches(
+			canonicalPath,
+			installedIdentity,
+			legacy.contents ?? "",
+		)
+			? `${LEGACY_SETTINGS_FILE} changed during migration; the stale ${SETTINGS_FILE} snapshot was removed.`
+			: `${LEGACY_SETTINGS_FILE} changed during migration, but ${SETTINGS_FILE} was replaced concurrently and takes precedence on the next load.`;
+		return legacy.settings;
+	}
+	try {
+		rmSync(legacyPath);
+		pendingSettingsNotice = `Statusline settings migrated from ${LEGACY_SETTINGS_FILE} to ${SETTINGS_FILE}.`;
+	} catch (error) {
+		pendingSettingsNotice = `Statusline settings migrated to ${SETTINGS_FILE}, but ${LEGACY_SETTINGS_FILE} could not be removed: ${formatError(error)}.`;
+	}
+	return legacy.settings;
+}
+
+type FileIdentity = { dev: number; ino: number };
+
+function installFileExclusively(filePath: string, contents: string): FileIdentity {
+	const tempFile = join(dirname(filePath), `.${SETTINGS_FILE}.${randomUUID()}.tmp`);
+	try {
+		writeFileSync(tempFile, contents, { encoding: "utf8", flag: "wx" });
+		const identity = lstatSync(tempFile);
+		linkSync(tempFile, filePath);
+		return { dev: identity.dev, ino: identity.ino };
+	} finally {
+		try {
+			rmSync(tempFile, { force: true });
+		} catch {
+			// Preserve the migration result if best-effort temp cleanup fails.
+		}
+	}
+}
+
+function removeFileIfIdentityMatches(
+	filePath: string,
+	expected: FileIdentity,
+	expectedContents: string,
+) {
 	try {
-		return normalizeStatuslineSettings(JSON.parse(readFileSync(settingsPath, "utf8")));
+		const current = lstatSync(filePath);
+		if (current.dev !== expected.dev || current.ino !== expected.ino) return false;
+		if (readFileSync(filePath, "utf8") !== expectedContents) return false;
+		rmSync(filePath);
+		return true;
 	} catch {
-		return { extensionStatusIcons: {} };
+		return false;
+	}
+}
+
+function fileContentsEqual(path: string, expected: string) {
+	try {
+		return readFileSync(path, "utf8") === expected;
+	} catch {
+		return false;
+	}
+}
+
+export function consumeStatuslineSettingsNotice() {
+	const notice = pendingSettingsNotice;
+	pendingSettingsNotice = undefined;
+	return notice;
+}
+
+function readSettingsFile(settingsPath: string): StatuslineSettings {
+	return readSettingsFileResult(settingsPath).settings;
+}
+
+function readSettingsFileResult(settingsPath: string): {
+	settings: StatuslineSettings;
+	valid: boolean;
+	contents?: string;
+} {
+	let contents: string;
+	try {
+		contents = readFileSync(settingsPath, "utf8");
+		const parsed = JSON.parse(contents) as unknown;
+		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+			return { settings: { extensionStatusIcons: {} }, valid: false, contents };
+		}
+		return { settings: normalizeStatuslineSettings(parsed), valid: true, contents };
+	} catch {
+		return { settings: { extensionStatusIcons: {} }, valid: false };
 	}
 }
 
 export function normalizeStatuslineSettings(value: unknown): StatuslineSettings {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return { extensionStatusIcons: {} };
+	if (!value || typeof value !== "object" || Array.isArray(value))
+		return { extensionStatusIcons: {} };
 	const icons = (value as { extensionStatusIcons?: unknown }).extensionStatusIcons;
 	if (!icons || typeof icons !== "object" || Array.isArray(icons)) {
 		return { extensionStatusIcons: {} };
@@ -64,3 +183,7 @@ function readStatuslinePreset(): StatuslinePresetName {
 	const value = process.env.PI_STATUSLINE_PRESET?.trim().toLowerCase();
 	return value === "classic" || value === "tokyo-night" ? value : DEFAULT_PRESET;
 }
+
+function formatError(error: unknown) {
+	return error instanceof Error ? error.message : String(error);
+}

package/src/statusline.ts

@@ -15,7 +15,7 @@ import {
 	renderStatusline,
 	type RuntimeState,
 } from "./render.js";
-import { createDefaultConfig } from "./settings.js";
+import { consumeStatuslineSettingsNotice, createDefaultConfig } from "./settings.js";
 
 const STATUSLINE_KEY = "statusline";
 const GIT_STATUS_REFRESH_INTERVAL_MS = 30_000;
@@ -162,6 +162,8 @@ export default function statusline(pi: ExtensionAPI) {
 	};
 
 	pi.on("session_start", (_event, ctx) => {
+		const settingsNotice = consumeStatuslineSettingsNotice();
+		if (settingsNotice) ctx.ui.notify(settingsNotice, "warning");
 		runtime.thinkingLevel = pi.getThinkingLevel();
 		installFooter(ctx);
 	});