@narumitw/pi-lsp 0.14.1 → 0.15.0

package/README.md

@@ -41,12 +41,14 @@ If no config is provided, pi-lsp ships compatible defaults for Biome, ty, and Ru
 Custom config can be supplied in one of these locations:
 
 1. `PI_LSP_CONFIG` as inline JSON or a path to a JSON file
-2. `<workspace>/.pi/lsp.json`
-3. `~/.pi/agent/lsp.json`
+2. `<workspace>/.pi/pi-lsp.json`
+3. `~/.pi/agent/pi-lsp.json`
 
 `PI_LSP_CONFIG` only accepts JSON or a JSON file path; JavaScript and TypeScript config files are not evaluated.
 
-`lsp.json` can be a plain object keyed by server name:
+Compatibility: a user-scoped legacy `lsp.json` is migrated automatically. A project-scoped legacy `.pi/lsp.json` remains readable with a warning but is not renamed automatically, so the extension never modifies a repository working tree. New paths take precedence when both names exist.
+
+`pi-lsp.json` can be a plain object keyed by server name:
 
 ```json
 {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-lsp",
-	"version": "0.14.1",
+	"version": "0.15.0",
 	"description": "Pi extension that exposes configurable, language-agnostic LSP tools through a shared runner.",
 	"type": "module",
 	"license": "MIT",

package/src/adapters.ts

@@ -1,4 +1,14 @@
-import { existsSync, readFileSync } from "node:fs";
+import { randomUUID } from "node:crypto";
+import {
+	chmodSync,
+	existsSync,
+	linkSync,
+	lstatSync,
+	readFileSync,
+	rmSync,
+	statSync,
+	writeFileSync,
+} from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import process from "node:process";
@@ -75,23 +85,132 @@ export function loadConfig(cwd = process.cwd()): LspConfig {
 	return configured ?? { servers: DEFAULT_SERVER_CONFIGS };
 }
 
+let pendingConfigNotice: string | undefined;
+
 function loadConfiguredConfig(cwd: string): LspConfig | undefined {
+	pendingConfigNotice = undefined;
 	const rawConfig = process.env.PI_LSP_CONFIG?.trim();
 	if (rawConfig) return parseConfigSource(rawConfig, cwd, "PI_LSP_CONFIG");
 
-	const projectConfig = path.join(cwd, ".pi", "lsp.json");
-	if (existsSync(projectConfig)) return parseConfigFile(projectConfig);
+	const projectConfig = path.join(cwd, ".pi", "pi-lsp.json");
+	const legacyProjectConfig = path.join(cwd, ".pi", "lsp.json");
+	if (existsSync(projectConfig)) {
+		if (existsSync(legacyProjectConfig)) {
+			pendingConfigNotice = ".pi/lsp.json ignored because .pi/pi-lsp.json takes precedence.";
+		}
+		return parseConfigFile(projectConfig);
+	}
+	if (existsSync(legacyProjectConfig)) {
+		pendingConfigNotice =
+			"Using legacy .pi/lsp.json. Rename it to .pi/pi-lsp.json; the repository file was not modified automatically.";
+		return parseConfigFile(legacyProjectConfig);
+	}
+
+	const userConfig = path.join(getAgentDir(), "pi-lsp.json");
+	const legacyUserConfig = path.join(getAgentDir(), "lsp.json");
+	if (existsSync(userConfig)) {
+		if (existsSync(legacyUserConfig)) {
+			pendingConfigNotice = "lsp.json ignored because pi-lsp.json takes precedence.";
+		}
+		return parseConfigFile(userConfig);
+	}
+	if (!existsSync(legacyUserConfig)) return undefined;
+
+	const legacyContents = readFileSync(legacyUserConfig, "utf8");
+	const legacy = normalizeConfig(JSON.parse(legacyContents), legacyUserConfig);
+	let installedIdentity: FileIdentity;
+	try {
+		installedIdentity = installFileExclusively(
+			userConfig,
+			legacyContents,
+			statSync(legacyUserConfig).mode & 0o777,
+		);
+	} catch (error) {
+		if (existsSync(userConfig)) {
+			pendingConfigNotice = "lsp.json ignored because pi-lsp.json was created concurrently.";
+			return parseConfigFile(userConfig);
+		}
+		pendingConfigNotice = `LSP config migration failed: ${formatError(error)}. The legacy file was used for this session.`;
+		return legacy;
+	}
+	if (!fileContentsEqual(legacyUserConfig, legacyContents)) {
+		if (removeFileIfIdentityMatches(userConfig, installedIdentity, legacyContents)) {
+			pendingConfigNotice =
+				"lsp.json changed during migration; the stale pi-lsp.json snapshot was removed and the legacy file was used for this session.";
+		} else {
+			pendingConfigNotice =
+				"lsp.json changed during migration, but pi-lsp.json was replaced concurrently and takes precedence on the next load.";
+		}
+		return legacy;
+	}
+	try {
+		rmSync(legacyUserConfig);
+		pendingConfigNotice = "LSP config migrated from lsp.json to pi-lsp.json.";
+	} catch (error) {
+		pendingConfigNotice = `LSP config migrated to pi-lsp.json, but lsp.json could not be removed: ${formatError(error)}.`;
+	}
+	return legacy;
+}
+
+type FileIdentity = { dev: number; ino: number };
 
-	const userConfig = path.join(getAgentDir(), "lsp.json");
-	if (existsSync(userConfig)) return parseConfigFile(userConfig);
+function installFileExclusively(filePath: string, contents: string, mode: number): FileIdentity {
+	const tempFile = path.join(path.dirname(filePath), `.pi-lsp.json.${randomUUID()}.tmp`);
+	try {
+		writeFileSync(tempFile, contents, { encoding: "utf8", flag: "wx", mode });
+		chmodSync(tempFile, mode);
+		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 {
+		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 false;
+	}
+}
 
-	return undefined;
+function fileContentsEqual(filePath: string, expected: string) {
+	try {
+		return readFileSync(filePath, "utf8") === expected;
+	} catch {
+		return false;
+	}
+}
+
+export function consumeLspConfigNotice() {
+	const notice = pendingConfigNotice;
+	pendingConfigNotice = undefined;
+	return notice;
+}
+
+function formatError(error: unknown) {
+	return error instanceof Error ? error.message : String(error);
 }
 
 function parseConfigSource(source: string, cwd: string, label: string): LspConfig {
 	if (source.startsWith("{")) return normalizeConfig(JSON.parse(source), label);
 	const expandedSource = expandHome(source);
-	const filePath = path.isAbsolute(expandedSource) ? expandedSource : path.resolve(cwd, expandedSource);
+	const filePath = path.isAbsolute(expandedSource)
+		? expandedSource
+		: path.resolve(cwd, expandedSource);
 	return parseConfigFile(filePath);
 }
 
@@ -115,7 +234,9 @@ function normalizeConfig(value: unknown, label: string): LspConfig {
 		const timeout = normalizeTimeout(value.timeout, label);
 		const servers = value.servers;
 		if (!isRecord(servers) || Array.isArray(servers)) {
-			throw new Error(`${label}.servers must be a JSON object mapping server names to LSP server config.`);
+			throw new Error(
+				`${label}.servers must be a JSON object mapping server names to LSP server config.`,
+			);
 		}
 		return { timeout, servers: normalizeServerMap(servers, `${label}.servers`) };
 	}
@@ -128,14 +249,13 @@ function normalizeConfig(value: unknown, label: string): LspConfig {
 }
 
 function normalizeServerMap(value: Record<string, unknown>, label: string) {
-	return Object.entries(value).map(([name, server]) => normalizeServer(name, server, `${label}.${name}`));
+	return Object.entries(value).map(([name, server]) =>
+		normalizeServer(name, server, `${label}.${name}`),
+	);
 }
 
 function isServerEntry(value: unknown) {
-	return (
-		isRecord(value) &&
-		(Array.isArray(value.command) || Array.isArray(value.extensions))
-	);
+	return isRecord(value) && (Array.isArray(value.command) || Array.isArray(value.extensions));
 }
 
 function normalizeServer(name: string, value: unknown, label: string): InternalLspServer {
@@ -198,7 +318,10 @@ const LANGUAGE_IDS: Record<string, string> = {
 };
 
 function commandFromEnvName(name: string): string {
-	return name.replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
+	return name
+		.replace(/[^a-zA-Z0-9]+/g, "_")
+		.replace(/^_+|_+$/g, "")
+		.toUpperCase();
 }
 
 function envName(name: string, suffix: "COMMAND") {

package/src/pi-lsp.ts

@@ -1,6 +1,6 @@
 import { defineTool, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { loadRuntime } from "./adapters.js";
+import { consumeLspConfigNotice, loadRuntime } from "./adapters.js";
 import { commandExists, commandFromEnv } from "./command.js";
 import { resolveRoot } from "./files.js";
 import { selectDiagnosticRoutes, selectFixRoute } from "./routes.js";
@@ -133,13 +133,26 @@ export default function lsp(pi: ExtensionAPI) {
 	pi.registerCommand("lsp", {
 		description: "Show shared LSP extension configuration",
 		handler: async (_args, ctx) => {
-			const { adapters } = loadRuntime(ctx.cwd);
-			ctx.ui.notify(buildStatusMessage(adapters, ctx.cwd), statusLevel(adapters, ctx.cwd));
+			try {
+				const { adapters } = loadRuntime(ctx.cwd);
+				const notice = consumeLspConfigNotice();
+				if (notice) ctx.ui.notify(notice, "warning");
+				ctx.ui.notify(buildStatusMessage(adapters, ctx.cwd), statusLevel(adapters, ctx.cwd));
+			} catch (error) {
+				ctx.ui.notify(`LSP config ignored: ${formatError(error)}`, "warning");
+			}
 		},
 	});
 
 	pi.on("session_start", (_event, ctx) => {
 		ctx.ui.setStatus(STATUS_KEY, undefined);
+		try {
+			loadRuntime(ctx.cwd);
+			const notice = consumeLspConfigNotice();
+			if (notice) ctx.ui.notify(notice, "warning");
+		} catch (error) {
+			ctx.ui.notify(`LSP config ignored: ${formatError(error)}`, "warning");
+		}
 	});
 
 	pi.on("session_shutdown", (_event, ctx) => {
@@ -147,6 +160,10 @@ export default function lsp(pi: ExtensionAPI) {
 	});
 }
 
+function formatError(error: unknown) {
+	return error instanceof Error ? error.message : String(error);
+}
+
 function textFromResult(result: { content?: Array<{ type?: string; text?: string }> }) {
 	return result.content?.find((item) => item.type === "text")?.text ?? "";
 }