pi-lsp-lite 0.3.2 → 0.4.0

package/index.ts

@@ -4,9 +4,10 @@ import { languageForFile, checkExtensionOverlaps, builtinLanguages, type Languag
 import { formatDiagnostics } from "./src/format.js";
 import { DiagnosticSeverity } from "vscode-languageserver-protocol";
 import { loadConfig, writeGlobalConfig, readGlobalConfig } from "./src/config.js";
-import { fileUri, which } from "./src/util.js";
+import { fileUri, which, isInsideCwd } from "./src/util.js";
 import { installRegistry } from "./src/install-registry.js";
-import { resolve, relative, isAbsolute } from "node:path";
+import { resolve } from "node:path";
+import { realpath } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 
 export default function (pi: ExtensionAPI) {
@@ -38,16 +39,21 @@ export default function (pi: ExtensionAPI) {
     const rawPath = event.input?.path;
     const filePath = typeof rawPath === "string" ? rawPath : undefined;
     if (!filePath) return;
+    if (event.isError) return;
 
-    const absolutePath = resolve(ctx.cwd, filePath);
-    const rel = relative(ctx.cwd, absolutePath);
-    if (!rel || rel.startsWith("..") || isAbsolute(rel)) return;
+    let absolutePath: string;
+    try {
+      absolutePath = await realpath(resolve(ctx.cwd, filePath));
+    } catch {
+      return;
+    }
+    if (!isInsideCwd(absolutePath, ctx.cwd)) return;
     const langConfig = languageForFile(absolutePath, servers);
     if (!langConfig) return;
 
     try {
       const result = await manager.handleEdit(absolutePath, langConfig, ctx.cwd);
-      const formatted = formatDiagnostics(filePath, result);
+      const formatted = formatDiagnostics(filePath, result, ctx.cwd);
       if (!formatted) return;
 
       ctx.ui.notify(formatted.trim(), "warning");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-lsp-lite",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "LSP diagnostics for pi — errors and warnings on every edit, same turn. Go, Rust, TypeScript, Python, C/C++.",
   "type": "module",
   "private": false,

package/src/client.ts

@@ -21,6 +21,7 @@ export interface OtherFileDiagnostics {
   uri: string;
   errorCount: number;
   warningCount: number;
+  firstDiagnostic?: { severity: number; line: number; col: number; message: string; source?: string };
 }
 
 export interface DiagnosticResult {
@@ -53,6 +54,28 @@ function countDiagnostics(diags: Diagnostic[]): { errors: number; warnings: numb
   return { errors, warnings };
 }
 
+function diagnosticFingerprint(d: Diagnostic): string {
+  return `${d.severity}:${d.range.start.line}:${d.range.start.character}:${d.message}`;
+}
+
+function fingerprintSet(diags: Diagnostic[]): Set<string> {
+  const set = new Set<string>();
+  for (const d of diags) {
+    if (d.severity === DiagnosticSeverity.Error || d.severity === DiagnosticSeverity.Warning) {
+      set.add(diagnosticFingerprint(d));
+    }
+  }
+  return set;
+}
+
+function setsEqual(a: Set<string>, b: Set<string>): boolean {
+  if (a.size !== b.size) return false;
+  for (const v of a) {
+    if (!b.has(v)) return false;
+  }
+  return true;
+}
+
 export function createLspClient(child: ChildProcess): LspClient {
   if (!child.stdout || !child.stdin) {
     throw new Error("LSP child process must be spawned with stdio: pipe");
@@ -152,10 +175,10 @@ export function createLspClient(child: ChildProcess): LspClient {
     async waitForDiagnostics(uri: string, timeoutMs: number): Promise<DiagnosticResult> {
       const targetGen = uriGeneration.get(uri) ?? 0;
 
-      const preSnapshot = new Map<string, { errors: number; warnings: number }>();
+      const preSnapshot = new Map<string, Set<string>>();
       for (const [trackedUri, entry] of diagnosticsMap) {
         if (trackedUri !== uri) {
-          preSnapshot.set(trackedUri, countDiagnostics(entry.diagnostics));
+          preSnapshot.set(trackedUri, fingerprintSet(entry.diagnostics));
         }
       }
 
@@ -163,13 +186,27 @@ export function createLspClient(child: ChildProcess): LspClient {
         const result: OtherFileDiagnostics[] = [];
         for (const [trackedUri, entry] of diagnosticsMap) {
           if (trackedUri === uri) continue;
+          const postFp = fingerprintSet(entry.diagnostics);
+          const preFp = preSnapshot.get(trackedUri) ?? new Set();
+          if (setsEqual(postFp, preFp)) continue;
           const post = countDiagnostics(entry.diagnostics);
-          const pre = preSnapshot.get(trackedUri) ?? { errors: 0, warnings: 0 };
-          const newErrors = post.errors - pre.errors;
-          const newWarnings = post.warnings - pre.warnings;
-          if (newErrors > 0 || newWarnings > 0) {
-            result.push({ uri: trackedUri, errorCount: newErrors, warningCount: newWarnings });
-          }
+          const first =
+            entry.diagnostics.find((d) => d.severity === DiagnosticSeverity.Error) ??
+            entry.diagnostics.find((d) => d.severity === DiagnosticSeverity.Warning);
+          result.push({
+            uri: trackedUri,
+            errorCount: post.errors,
+            warningCount: post.warnings,
+            ...(first && {
+              firstDiagnostic: {
+                severity: first.severity ?? DiagnosticSeverity.Error,
+                line: first.range.start.line,
+                col: first.range.start.character,
+                message: first.message,
+                ...(first.source && { source: first.source }),
+              },
+            }),
+          });
         }
         return result;
       };
@@ -214,9 +251,9 @@ export function createLspClient(child: ChildProcess): LspClient {
         // edited file is valid but dependents break
         crossFileCallback = (changedUri: string) => {
           if (settled || changedUri === uri) return;
-          const pre = preSnapshot.get(changedUri) ?? { errors: 0, warnings: 0 };
-          const post = countDiagnostics(diagnosticsMap.get(changedUri)?.diagnostics ?? []);
-          if (post.errors !== pre.errors || post.warnings !== pre.warnings) {
+          const preFp = preSnapshot.get(changedUri) ?? new Set<string>();
+          const postFp = fingerprintSet(diagnosticsMap.get(changedUri)?.diagnostics ?? []);
+          if (!setsEqual(preFp, postFp)) {
             clearTimeout(timeout);
             resetQuiescence();
           }

package/src/config.ts

@@ -66,7 +66,7 @@ function validateOverride(id: string, raw: unknown): ServerConfigOverride | null
       console.error(`[pi-lsp-lite] config "${id}": extensions must be a non-empty string array, skipping`);
       return null;
     }
-    override.extensions = (raw.extensions as string[]).map((e) => e.toLowerCase());
+    override.extensions = raw.extensions.map((e) => e.toLowerCase());
   }
 
   if (raw.command !== undefined) {
@@ -74,7 +74,7 @@ function validateOverride(id: string, raw: unknown): ServerConfigOverride | null
       console.error(`[pi-lsp-lite] config "${id}": command must be a non-empty string, skipping`);
       return null;
     }
-    override.command = raw.command as string;
+    override.command = raw.command;
   }
 
   if (raw.args !== undefined) {
@@ -82,7 +82,7 @@ function validateOverride(id: string, raw: unknown): ServerConfigOverride | null
       console.error(`[pi-lsp-lite] config "${id}": args must be a string array, skipping`);
       return null;
     }
-    override.args = raw.args as string[];
+    override.args = raw.args;
   }
 
   if (raw.rootPatterns !== undefined) {
@@ -90,7 +90,7 @@ function validateOverride(id: string, raw: unknown): ServerConfigOverride | null
       console.error(`[pi-lsp-lite] config "${id}": rootPatterns must be a string array, skipping`);
       return null;
     }
-    override.rootPatterns = raw.rootPatterns as string[];
+    override.rootPatterns = raw.rootPatterns;
   }
 
   if (raw.diagnosticTimeout !== undefined) {
@@ -150,12 +150,18 @@ async function findProjectConfig(cwd: string): Promise<UserConfig | null> {
 
 type ConfigSource = "global" | "project";
 
+interface MergeResult {
+  servers: LanguageServerConfig[];
+  perServerTimeouts: Map<string, number>;
+}
+
 function mergeConfigs(
   base: LanguageServerConfig[],
   overrides: Record<string, ServerConfigOverride>,
   source: ConfigSource,
-): LanguageServerConfig[] {
+): MergeResult {
   const result = new Map<string, LanguageServerConfig>();
+  const perServerTimeouts = new Map<string, number>();
 
   for (const server of base) {
     result.set(server.id, { ...server });
@@ -170,9 +176,17 @@ function mergeConfigs(
       continue;
     }
 
+    if (override.diagnosticTimeout !== undefined) {
+      perServerTimeouts.set(id, override.diagnosticTimeout);
+    }
+
     const existing = result.get(id);
     if (existing) {
       const { disabled: _, diagnosticTimeout: __, ...lspFields } = override;
+      if (source === "project" && lspFields.command !== undefined) {
+        console.error(`[pi-lsp-lite] project config cannot override "command" for server "${id}" — ignoring (use global config instead)`);
+        delete lspFields.command;
+      }
       const defined = Object.fromEntries(
         Object.entries(lspFields).filter(([, v]) => v !== undefined),
       );
@@ -197,7 +211,7 @@ function mergeConfigs(
     }
   }
 
-  return Array.from(result.values());
+  return { servers: Array.from(result.values()), perServerTimeouts };
 }
 
 export function globalConfigFilePath(globalConfigPath?: string): string {
@@ -275,12 +289,10 @@ export async function loadConfig(cwd: string, globalConfigPath?: string): Promis
   for (const [layer, source] of layers) {
     if (!layer) continue;
     if (layer.servers && isPlainObject(layer.servers)) {
-      servers = mergeConfigs(servers, layer.servers as Record<string, ServerConfigOverride>, source);
-      for (const [id, rawOverride] of Object.entries(layer.servers)) {
-        const override = validateOverride(id, rawOverride);
-        if (override?.diagnosticTimeout !== undefined) {
-          perServerTimeout.set(id, override.diagnosticTimeout);
-        }
+      const merged = mergeConfigs(servers, layer.servers as Record<string, ServerConfigOverride>, source);
+      servers = merged.servers;
+      for (const [id, timeout] of merged.perServerTimeouts) {
+        perServerTimeout.set(id, timeout);
       }
     }
     if (layer.diagnosticTimeout !== undefined) {

package/src/format.ts

@@ -1,20 +1,30 @@
 import { DiagnosticSeverity } from "vscode-languageserver-protocol";
+import { fileURLToPath } from "node:url";
+import { relative } from "node:path";
 import type { DiagnosticResult } from "./client.js";
 
-export function formatDiagnostics(filePath: string, result: DiagnosticResult): string {
-  const relevant = result.diagnostics.filter(
+const MAX_DIAGNOSTICS_PER_FILE = 50;
+
+export function formatDiagnostics(filePath: string, result: DiagnosticResult, cwd?: string): string {
+  const allRelevant = result.diagnostics.filter(
     (d) => d.severity === DiagnosticSeverity.Error || d.severity === DiagnosticSeverity.Warning,
   );
 
-  if (relevant.length === 0 && result.status === "ok" && result.otherFiles.length === 0) return "";
-  if (result.status === "unavailable") return "";
+  if (allRelevant.length === 0 && result.status === "ok" && result.otherFiles.length === 0) return "";
+
+  if (result.status === "unavailable") {
+    return `\n⚠ LSP diagnostics unavailable for ${filePath} (server missing or failed to start)`;
+  }
+
+  const truncated = allRelevant.length > MAX_DIAGNOSTICS_PER_FILE;
+  const relevant = truncated ? allRelevant.slice(0, MAX_DIAGNOSTICS_PER_FILE) : allRelevant;
 
   const retryNote = result.status === "timeout" && result.retryAttempts > 0
     ? ` after ${result.retryAttempts} ${result.retryAttempts === 1 ? "retry" : "retries"}`
     : "";
 
   if (relevant.length === 0 && result.status === "ok" && result.otherFiles.length > 0) {
-    return `\n⚠ LSP diagnostics for ${filePath}: no issues${otherFilesFooter(result)}`;
+    return `\n⚠ LSP diagnostics for ${filePath}: no issues${otherFilesFooter(result, cwd)}`;
   }
 
   const lines = relevant.map((d) => {
@@ -25,8 +35,11 @@ export function formatDiagnostics(filePath: string, result: DiagnosticResult): s
     return `  ${severity} ${line}:${col} ${source}${d.message}`;
   });
 
-  const errorCount = relevant.filter((d) => d.severity === DiagnosticSeverity.Error).length;
-  const warnCount = relevant.length - errorCount;
+  let errorCount = 0;
+  for (const d of allRelevant) {
+    if (d.severity === DiagnosticSeverity.Error) errorCount++;
+  }
+  const warnCount = allRelevant.length - errorCount;
 
   const summary = [
     errorCount > 0 ? `${errorCount} error${errorCount > 1 ? "s" : ""}` : "",
@@ -36,12 +49,30 @@ export function formatDiagnostics(filePath: string, result: DiagnosticResult): s
     .filter(Boolean)
     .join(", ");
 
-  return `\n⚠ LSP diagnostics for ${filePath} (${summary}):\n${lines.join("\n")}${otherFilesFooter(result)}`;
+  const truncatedNote = truncated ? `\n  ... and ${allRelevant.length - MAX_DIAGNOSTICS_PER_FILE} more` : "";
+
+  return `\n⚠ LSP diagnostics for ${filePath} (${summary}):\n${lines.join("\n")}${truncatedNote}${otherFilesFooter(result, cwd)}`;
 }
 
-function otherFilesFooter(result: DiagnosticResult): string {
+function otherFilesFooter(result: DiagnosticResult, cwd?: string): string {
   if (result.otherFiles.length === 0) return "";
-  const totalDiags = result.otherFiles.reduce((sum, f) => sum + f.errorCount + f.warningCount, 0);
-  const fileCount = result.otherFiles.length;
-  return `\n  + ${totalDiags} diagnostic${totalDiags !== 1 ? "s" : ""} in ${fileCount} other file${fileCount !== 1 ? "s" : ""}`;
+  const lines = result.otherFiles.map((f) => {
+    let path: string;
+    try {
+      const abs = fileURLToPath(f.uri);
+      path = cwd ? relative(cwd, abs) : abs;
+    } catch {
+      path = f.uri;
+    }
+    const counts = [
+      f.errorCount > 0 ? `${f.errorCount} error${f.errorCount > 1 ? "s" : ""}` : "",
+      f.warningCount > 0 ? `${f.warningCount} warning${f.warningCount > 1 ? "s" : ""}` : "",
+    ].filter(Boolean).join(", ");
+    if (!f.firstDiagnostic) return `  ${path} (${counts})`;
+    const d = f.firstDiagnostic;
+    const sev = d.severity === DiagnosticSeverity.Error ? "error" : "warning";
+    const src = d.source ? `[${d.source}] ` : "";
+    return `  ${path} (${counts}): ${sev} ${d.line + 1}:${d.col + 1} ${src}${d.message}`;
+  });
+  return `\n${lines.join("\n")}`;
 }

package/src/languages.ts

@@ -6,6 +6,7 @@ export interface LanguageServerConfig {
   rootPatterns: string[];
   diagnosticTimeout?: number;
   maxRetries?: number;
+  languageIds?: Record<string, string>;
 }
 
 export const builtinLanguages: LanguageServerConfig[] = [
@@ -32,6 +33,7 @@ export const builtinLanguages: LanguageServerConfig[] = [
     args: ["--stdio"],
     rootPatterns: ["tsconfig.json", "package.json"],
     diagnosticTimeout: 30_000,
+    languageIds: { ".tsx": "typescriptreact", ".js": "javascript", ".jsx": "javascriptreact" },
   },
   {
     id: "python",
@@ -48,6 +50,7 @@ export const builtinLanguages: LanguageServerConfig[] = [
     args: [],
     rootPatterns: ["compile_commands.json", "CMakeLists.txt", ".clangd"],
     diagnosticTimeout: 15_000,
+    languageIds: { ".c": "c", ".h": "c", ".cc": "cpp", ".cxx": "cpp", ".hpp": "cpp", ".hxx": "cpp" },
   },
 ];
 
@@ -56,6 +59,14 @@ export function languageForFile(path: string, configs: LanguageServerConfig[]):
   return configs.find((lang) => lang.extensions.some((ext) => lower.endsWith(ext)));
 }
 
+export function languageIdForFile(filePath: string, config: LanguageServerConfig): string {
+  if (config.languageIds) {
+    const ext = filePath.toLowerCase().match(/\.[^.]+$/)?.[0];
+    if (ext && config.languageIds[ext]) return config.languageIds[ext];
+  }
+  return config.id;
+}
+
 export function checkExtensionOverlaps(configs: LanguageServerConfig[]): string[] {
   const warnings: string[] = [];
   const seen = new Map<string, string>();

package/src/server-manager.ts

@@ -1,7 +1,7 @@
 import { spawn, type ChildProcess } from "node:child_process";
 import { which, fileUri, findWorkspaceRoot } from "./util.js";
 import { createLspClient, type LspClient, type DiagnosticResult } from "./client.js";
-import type { LanguageServerConfig } from "./languages.js";
+import { type LanguageServerConfig, languageIdForFile } from "./languages.js";
 import type { Diagnostic } from "vscode-languageserver-protocol";
 import { DEFAULT_DIAGNOSTIC_TIMEOUT, DEFAULT_DOCUMENT_IDLE_TIMEOUT, DEFAULT_MAX_RETRIES } from "./config.js";
 import { readFile } from "node:fs/promises";
@@ -221,7 +221,7 @@ export function createServerManager(options: ServerManagerOptions = {}): ServerM
     if (server.openDocuments.has(uri)) {
       server.client.didChange(uri, content);
     } else {
-      server.client.didOpen(uri, server.config.id, content);
+      server.client.didOpen(uri, languageIdForFile(filePath, server.config), content);
     }
     server.openDocuments.set(uri, Date.now());
 

package/src/util.ts

@@ -1,5 +1,5 @@
 import { access, constants } from "node:fs/promises";
-import { join, dirname } from "node:path";
+import { join, dirname, relative, isAbsolute } from "node:path";
 import { pathToFileURL } from "node:url";
 
 export function fileUri(absolutePath: string): string {
@@ -42,3 +42,8 @@ export async function findWorkspaceRoot(filePath: string, rootPatterns: string[]
   }
   return cwd;
 }
+
+export function isInsideCwd(absolutePath: string, cwd: string): boolean {
+  const rel = relative(cwd, absolutePath);
+  return !!rel && !rel.startsWith("..") && !isAbsolute(rel);
+}

package/.github/workflows/ci.yml

@@ -1,30 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-permissions:
-  contents: read
-
-jobs:
-  check:
-    name: typecheck + unit tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 20
-          cache: npm
-
-      - run: npm ci
-
-      - name: typecheck
-        run: npm run check
-
-      - name: unit tests
-        run: npm test

package/.github/workflows/integration.yml

@@ -1,79 +0,0 @@
-name: Integration Tests
-
-on:
-  pull_request:
-    branches: [main]
-
-permissions:
-  contents: read
-
-jobs:
-  gopls:
-    name: gopls
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 20
-          cache: npm
-      - uses: actions/setup-go@v6
-        with:
-          go-version: stable
-      - run: go install golang.org/x/tools/gopls@latest
-      - run: npm ci
-      - run: INTEGRATION=1 npx tsx --test test/*.test.ts test/integration/gopls.test.ts
-
-  rust-analyzer:
-    name: rust-analyzer
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 20
-          cache: npm
-      - run: |
-          rustup update stable
-          rustup component add rust-analyzer
-      - run: npm ci
-      - run: INTEGRATION=1 npx tsx --test test/*.test.ts test/integration/rust-analyzer.test.ts
-
-  typescript:
-    name: typescript-language-server
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 20
-          cache: npm
-      - run: npm install -g typescript-language-server typescript
-      - run: npm ci
-      - run: INTEGRATION=1 npx tsx --test test/*.test.ts test/integration/typescript.test.ts
-
-  pylsp:
-    name: pylsp
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 20
-          cache: npm
-      - run: pip install 'python-lsp-server[all]'
-      - run: npm ci
-      - run: INTEGRATION=1 npx tsx --test test/*.test.ts test/integration/pylsp.test.ts
-
-  clangd:
-    name: clangd
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 20
-          cache: npm
-      - run: sudo apt-get update -qq && sudo apt-get install -y -qq clangd
-      - run: npm ci
-      - run: INTEGRATION=1 npx tsx --test test/*.test.ts test/integration/clangd.test.ts

package/.github/workflows/release.yml

@@ -1,34 +0,0 @@
-name: Publish to npm
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-  id-token: write
-
-jobs:
-  publish:
-    name: publish to npm
-    runs-on: ubuntu-latest
-    environment: public
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-node@v6
-        with:
-          node-version: 24
-          registry-url: https://registry.npmjs.org
-          cache: npm
-
-      - run: npm ci
-
-      - name: typecheck
-        run: npm run check
-
-      - name: unit tests
-        run: npm test
-
-      - name: publish
-        run: npm publish --access public