@mrclrchtr/supi-lsp 2.2.0 → 2.2.1

package/node_modules/@mrclrchtr/supi-code-runtime/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {

package/node_modules/@mrclrchtr/supi-code-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-code-runtime",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "SuPi code-runtime — shared workspace context, capability contracts, and canonical types for the code-understanding stack",
   "license": "MIT",
   "repository": {
@@ -29,7 +29,7 @@
     "!__tests__"
   ],
   "dependencies": {
-    "@mrclrchtr/supi-core": "2.2.0"
+    "@mrclrchtr/supi-core": "2.2.1"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-core"

package/node_modules/@mrclrchtr/supi-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "SuPi core — shared infrastructure for SuPi extensions (XML context tags, config system)",
   "license": "MIT",
   "repository": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-lsp",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "SuPi LSP extension — Language Server Protocol integration for pi",
   "license": "MIT",
   "repository": {
@@ -38,8 +38,8 @@
     "vscode-jsonrpc": "^9.0.0",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-languageserver-types": "^3.17.5",
-    "@mrclrchtr/supi-code-runtime": "2.2.0",
-    "@mrclrchtr/supi-core": "2.2.0"
+    "@mrclrchtr/supi-code-runtime": "2.2.1",
+    "@mrclrchtr/supi-core": "2.2.1"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/src/client/client.ts

@@ -2,7 +2,7 @@
 // Handles initialize handshake, document sync, shutdown, and crash recovery.
 
 // biome-ignore lint/style/noExcessiveLinesPerFile: LspClient remains a cohesive stateful wrapper; refresh logic is already split out.
-import { type ChildProcess, spawn } from "node:child_process";
+import { type ChildProcess, execSync, spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import * as path from "node:path";
 import { recordDebugEvent } from "@mrclrchtr/supi-core/debug";
@@ -37,6 +37,31 @@ import { JsonRpcClient, JsonRpcRequestError } from "./transport.ts";
 const SHUTDOWN_TIMEOUT_MS = 5_000;
 const DIAGNOSTIC_WAIT_MS = 3_000;
 
+// ── Process-tree cleanup ──────────────────────────────────────────────
+
+/**
+ * Kill a process and all its descendants.
+ *
+ * On Unix, sends SIGTERM to the process group (negative PID).
+ * This requires the child to be spawned with `detached: true`.
+ * On Windows, uses `taskkill /T /F` to force-kill the entire tree.
+ */
+function killProcessTree(pid: number): void {
+  if (process.platform === "win32") {
+    try {
+      execSync(`taskkill /PID ${pid} /T /F`, { stdio: "ignore" });
+    } catch {
+      // Process may have already exited — ignore.
+    }
+    return;
+  }
+  try {
+    process.kill(-pid, "SIGTERM");
+  } catch {
+    // Process group may already be dead — ignore.
+  }
+}
+
 // ── Types ─────────────────────────────────────────────────────────────
 export type ClientStatus = "initializing" | "running" | "error" | "shutdown";
 
@@ -116,6 +141,10 @@ export class LspClient {
         cwd: this.root,
         stdio: ["pipe", "pipe", "pipe"],
         env: { ...process.env },
+        // Run the server in its own process group so we can atomically
+        // kill the entire tree (server + subprocesses like tsserver)
+        // with `process.kill(-pid, signal)` on Unix or `taskkill /T` on Windows.
+        detached: true,
       });
     } catch (err) {
       this._status = "error";
@@ -209,18 +238,26 @@ export class LspClient {
 
     this.rpc.dispose();
 
-    // Wait briefly for clean exit, then force kill
-    if (this.process.exitCode === null) {
-      await new Promise<void>((resolve) => {
-        const timer = setTimeout(() => {
-          this.process?.kill("SIGTERM");
-          resolve();
-        }, 1_000);
-        this.process?.on("exit", () => {
-          clearTimeout(timer);
-          resolve();
+    // Kill the entire process tree (server + subprocesses like tsserver).
+    // The LSP shutdown/exit protocol above should trigger a graceful exit,
+    // but the process-group kill ensures no orphans survive.
+    const pid = this.process.pid;
+    if (this.process.exitCode === null && pid) {
+      killProcessTree(pid);
+      if (process.platform !== "win32") {
+        // Escalate to SIGKILL after a brief grace period on Unix.
+        // Windows taskkill /F is already forceful.
+        await new Promise<void>((resolve) => {
+          setTimeout(() => {
+            try {
+              process.kill(-pid, "SIGKILL");
+            } catch {
+              // Already dead — ignore.
+            }
+            resolve();
+          }, 500);
         });
-      });
+      }
     }
 
     this.openDocs.clear();