@mrclrchtr/supi-lsp 11.0.1 → 11.2.0

package/node_modules/vscode-jsonrpc/package.json

@@ -1,9 +1,10 @@
 {
 	"name": "vscode-jsonrpc",
 	"description": "A json rpc implementation over streams",
-	"version": "9.0.3",
+	"version": "10.0.0",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
+	"homepage": "https://github.com/microsoft/vscode-languageserver-node/tree/main/jsonrpc",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/Microsoft/vscode-languageserver-node.git",
@@ -13,7 +14,7 @@
 		"url": "https://github.com/Microsoft/vscode-languageserver-node/issues"
 	},
 	"engines": {
-		"node": ">=14.0.0"
+		"node": ">=14.17.0"
 	},
 	"exports": {
 		".": {
@@ -31,6 +32,7 @@
 	},
 	"devDependencies": {
 		"@types/msgpack-lite": "^0.1.12",
+		"@types/node": "22.13.14",
 		"msgpack-lite": "^0.1.26"
 	},
 	"scripts": {

package/node_modules/vscode-languageserver-protocol/package.json

@@ -1,9 +1,10 @@
 {
 	"name": "vscode-languageserver-protocol",
 	"description": "VSCode Language Server Protocol implementation",
-	"version": "3.18.4",
+	"version": "3.18.5",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
+	"homepage": "https://github.com/microsoft/vscode-languageserver-node/tree/main/protocol",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/Microsoft/vscode-languageserver-node.git",
@@ -27,8 +28,8 @@
 		}
 	},
 	"dependencies": {
-		"vscode-jsonrpc": "9.0.3",
-		"vscode-languageserver-types": "3.18.4"
+		"vscode-jsonrpc": "10.0.0",
+		"vscode-languageserver-types": "3.18.5"
 	},
 	"scripts": {
 		"prepublishOnly": "npm run all:publish",

package/node_modules/vscode-languageserver-types/lib/esm/main.js

@@ -222,7 +222,7 @@ export var ColorPresentation;
     function is(value) {
         const candidate = value;
         return Is.objectLiteral(candidate) && Is.string(candidate.label)
-            && (Is.undefined(candidate.textEdit) || TextEdit.is(candidate))
+            && (Is.undefined(candidate.textEdit) || TextEdit.is(candidate.textEdit))
             && (Is.undefined(candidate.additionalTextEdits) || Is.typedArray(candidate.additionalTextEdits, TextEdit.is));
     }
     ColorPresentation.is = is;
@@ -279,7 +279,7 @@ export var FoldingRange;
      */
     function is(value) {
         const candidate = value;
-        return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.startLine)
+        return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.endLine)
             && (Is.undefined(candidate.startCharacter) || Is.uinteger(candidate.startCharacter))
             && (Is.undefined(candidate.endCharacter) || Is.uinteger(candidate.endCharacter))
             && (Is.undefined(candidate.kind) || Is.string(candidate.kind));

package/node_modules/vscode-languageserver-types/lib/umd/main.js

@@ -233,7 +233,7 @@
         function is(value) {
             var candidate = value;
             return Is.objectLiteral(candidate) && Is.string(candidate.label)
-                && (Is.undefined(candidate.textEdit) || TextEdit.is(candidate))
+                && (Is.undefined(candidate.textEdit) || TextEdit.is(candidate.textEdit))
                 && (Is.undefined(candidate.additionalTextEdits) || Is.typedArray(candidate.additionalTextEdits, TextEdit.is));
         }
         ColorPresentation.is = is;
@@ -290,7 +290,7 @@
          */
         function is(value) {
             var candidate = value;
-            return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.startLine)
+            return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.endLine)
                 && (Is.undefined(candidate.startCharacter) || Is.uinteger(candidate.startCharacter))
                 && (Is.undefined(candidate.endCharacter) || Is.uinteger(candidate.endCharacter))
                 && (Is.undefined(candidate.kind) || Is.string(candidate.kind));

package/node_modules/vscode-languageserver-types/package.json

@@ -1,9 +1,10 @@
 {
 	"name": "vscode-languageserver-types",
 	"description": "Types used by the Language server for node",
-	"version": "3.18.4",
+	"version": "3.18.5",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
+	"homepage": "https://github.com/microsoft/vscode-languageserver-node/tree/main/types",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/Microsoft/vscode-languageserver-node.git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-lsp",
-  "version": "11.0.1",
+  "version": "11.2.0",
   "description": "Language Server Protocol runtime for SuPi code intelligence",
   "license": "MIT",
   "repository": {
@@ -33,17 +33,19 @@
   ],
   "dependencies": {
     "ignore": "^7.0.5",
+    "semver": "^7.8.5",
     "typescript": "6.0.3",
-    "vscode-jsonrpc": "^9.0.0",
-    "vscode-languageserver-protocol": "^3.18.0",
-    "vscode-languageserver-types": "^3.18.0",
-    "@mrclrchtr/supi-core": "11.0.1",
-    "@mrclrchtr/supi-code-runtime": "11.0.1"
+    "vscode-jsonrpc": "^10.0.0",
+    "vscode-languageserver-protocol": "^3.18.5",
+    "vscode-languageserver-types": "^3.18.5",
+    "@mrclrchtr/supi-core": "11.2.0",
+    "@mrclrchtr/supi-code-runtime": "11.2.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",
     "@mrclrchtr/supi-core",
     "ignore",
+    "semver",
     "typescript",
     "vscode-jsonrpc",
     "vscode-languageserver-protocol",

package/src/client/client.ts

@@ -51,6 +51,7 @@ import type {
   WorkspaceEdit,
   WorkspaceSymbol,
 } from "../config/types.ts";
+import { resolveTypeScriptLaunch, type TypeScriptLaunch } from "../config/typescript-launch.ts";
 import { boundCwd } from "../debug-telemetry.ts";
 import type { DiagnosticEvidenceSummary } from "../diagnostics/evidence.ts";
 import { raceRequestControl } from "../session/readiness.ts";
@@ -82,6 +83,9 @@ import { SemanticInputSynchronizationError } from "./client-semantic-input-error
 import { JsonRpcClient, JsonRpcRequestError } from "./transport.ts";
 
 const SHUTDOWN_TIMEOUT_MS = 5_000;
+// ContentModified can outlive the server's progress notifications. Yield before
+// spending the single retry instead of immediately racing the same analysis.
+const CONTENT_MODIFIED_RETRY_DELAY_MS = 100;
 
 /** Bounded stderr tail kept for startup-failure error messages. */
 const STDERR_TAIL_MAX_CHARS = 4_000;
@@ -588,6 +592,13 @@ export class LspClient {
     });
   }
 
+  private launchSelection: TypeScriptLaunch | undefined;
+
+  /** Compiler used by this generation, never re-probed while it is healthy. */
+  get typescriptSelection() {
+    return this.launchSelection?.typescript;
+  }
+
   get status(): ClientStatus {
     return this._status;
   }
@@ -667,8 +678,14 @@ export class LspClient {
   // ── Lifecycle ───────────────────────────────────────────────────────
   /** Spawn the server process and perform the initialize handshake. */
   async start(): Promise<void> {
-    const cmd = this.config.command;
-    const args = this.config.args ?? [];
+    try {
+      this.launchSelection = resolveTypeScriptLaunch(this.name, this.config, this.root);
+    } catch (error) {
+      this.handleProcessFailure(error instanceof Error ? error : new Error(String(error)));
+      throw error;
+    }
+    const { command: cmd = this.config.command, args = this.config.args ?? [] } =
+      this.launchSelection;
     this.startedAt = Date.now();
 
     try {
@@ -738,7 +755,7 @@ export class LspClient {
           },
         ],
         capabilities: CLIENT_CAPABILITIES,
-        initializationOptions: this.config.initializationOptions,
+        initializationOptions: this.launchSelection.initializationOptions,
       })) as InitializeResult;
 
       const positionEncoding = result.capabilities.positionEncoding ?? "utf-16";
@@ -1270,8 +1287,10 @@ export class LspClient {
     context: CodeActionContext,
     control?: CodeRequestControl,
   ): Promise<CodeQueryResult<CodeAction[] | null>> {
+    const backend = this.typescriptSelection?.backend;
+    const server = `LSP server "${this.name}"${backend ? ` (${backend} backend)` : ""}`;
     if (!this.supportsCodeActions) {
-      return unavailableCodeQuery("The server does not advertise textDocument/codeAction.");
+      return unavailableCodeQuery(`${server} does not advertise textDocument/codeAction.`);
     }
     if (typeof filePath !== "string" || filePath.length === 0 || !isRange(range)) {
       return unavailableCodeQuery("Code actions require a valid file and range.");
@@ -1280,7 +1299,9 @@ export class LspClient {
       return unavailableCodeQuery("Code actions require a valid context.");
     }
     if (context.only && !this.supportsCodeActionKinds(context.only)) {
-      return unavailableCodeQuery("The server does not advertise the requested code-action kind.");
+      return unavailableCodeQuery(
+        `${server} does not advertise the requested code-action kind: ${context.only.join(", ")}.`,
+      );
     }
 
     const requestContext: CodeActionContext = {
@@ -1498,6 +1519,9 @@ export class LspClient {
     for (;;) {
       const attempt: SemanticRequestAttemptState = { inputRevision: undefined };
       try {
+        if (retryGuard.retryReason === "content-modified") {
+          await this.waitForContentModifiedRetry(control);
+        }
         const data = await this.runSemanticRequestAttempt<T>({
           method,
           params,
@@ -1515,6 +1539,21 @@ export class LspClient {
     }
   }
 
+  /** Pause only the protocol retry, without extending the caller's deadline. */
+  private async waitForContentModifiedRetry(control?: CodeRequestControl): Promise<void> {
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    try {
+      await raceRequestControl(
+        new Promise<void>((resolve) => {
+          timer = setTimeout(resolve, CONTENT_MODIFIED_RETRY_DELAY_MS);
+        }),
+        control,
+      );
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
+  }
+
   /** Return only when another attempt is permitted; retain the cause when retry stops. */
   private prepareSemanticRetry(options: {
     method: string;

package/src/config/config.ts

@@ -3,10 +3,16 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
-import { loadSupiConfigForScope, loadSupiConfigSectionForScope } from "@mrclrchtr/supi-core/config";
+import {
+  getSupiConfigPath,
+  loadSupiConfigForScope,
+  loadSupiConfigSectionForScope,
+} from "@mrclrchtr/supi-core/config";
 import { truncateDebugIdentity } from "@mrclrchtr/supi-core/debug";
 import type { JsonObject, JsonValue, LspConfig, ServerConfig } from "./types.ts";
 
+import { isManualTypeScriptLaunch, isTypeScriptPackageName } from "./typescript-launch.ts";
+
 const CONFIG_DIR = path.dirname(fileURLToPath(import.meta.url));
 
 // Load defaults at module level — resolve relative to this file.
@@ -65,11 +71,47 @@ export function loadConfig(cwd: string, options?: LoadConfigOptions): LspConfig
           { scope: "project" },
         );
 
+  const fields: NonNullable<ServerConfig["typescriptExplicitFields"]> = {};
+  for (const [scope, servers] of [
+    ["global", globalLsp.servers],
+    ["project", projectLsp.servers],
+  ] as const) {
+    captureTypeScriptOrigins(fields, servers?.typescript, getSupiConfigPath(scope, cwd, options));
+  }
   const merged = mergeServerConfigs(defaults.servers, globalLsp.servers, projectLsp.servers);
-
+  if (merged.typescript) {
+    merged.typescript = { ...merged.typescript, typescriptExplicitFields: fields };
+    isManualTypeScriptLaunch(merged.typescript, cwd);
+  }
   return { servers: merged };
 }
 
+/** Retain only effective explicit launch fields; initializationOptions replaces its inherited object. */
+function captureTypeScriptOrigins(
+  fields: NonNullable<ServerConfig["typescriptExplicitFields"]>,
+  value: unknown,
+  origin: string,
+): void {
+  if (!isRecord(value)) return;
+  if (
+    Object.hasOwn(value, "typescriptPackage") &&
+    !isTypeScriptPackageName(value.typescriptPackage)
+  ) {
+    throw new Error(
+      `Invalid lsp.servers.typescript.typescriptPackage in ${origin}: use an installed package name or alias, not a path.`,
+    );
+  }
+  const { override } = validateServerOverride(value);
+  for (const field of ["command", "args", "typescriptPackage"] as const) {
+    if (Object.hasOwn(override, field)) fields[field] = origin;
+  }
+  if (!Object.hasOwn(override, "initializationOptions")) return;
+  delete fields.tsserverPath;
+  const init = override.initializationOptions;
+  if (isRecord(init) && isRecord(init.tsserver) && Object.hasOwn(init.tsserver, "path"))
+    fields.tsserverPath = origin;
+}
+
 /**
  * Read effective explicit language disablement for the active LSP snapshot.
  * Project values override global values, including an explicit re-enable.
@@ -205,6 +247,10 @@ function mergeSingleServer(options: {
 }): ServerConfig | null {
   const { name, base, value, builtIn, reportWarning } = options;
   const { override, invalidFields } = validateServerOverride(value);
+  if (name !== "typescript" && override.typescriptPackage !== undefined) {
+    delete override.typescriptPackage;
+    invalidFields.push("typescriptPackage");
+  }
   const missingFields = base
     ? []
     : [
@@ -232,6 +278,11 @@ function mergeSingleServer(options: {
 type ServerOverrideSetter = (override: Partial<ServerConfig>, candidate: unknown) => boolean;
 
 const SERVER_OVERRIDE_SETTERS: Record<string, ServerOverrideSetter> = {
+  typescriptPackage(override, candidate) {
+    if (!isTypeScriptPackageName(candidate)) return false;
+    override.typescriptPackage = candidate;
+    return true;
+  },
   command(override, candidate) {
     if (typeof candidate !== "string" || candidate.trim().length === 0) return false;
     override.command = candidate;

package/src/config/operation-support.ts

@@ -26,12 +26,15 @@ export type ServerOperationSupportMap = Partial<
   Record<ServerOperationName, ServerOperationSupport>
 >;
 
+const REMOVE_UNUSED_KIND = "source.removeUnused";
+const REMOVE_UNUSED_IMPORTS_KIND = "source.removeUnusedImports";
+
 /** Code-action kinds requested by each operation-specific planner. */
 export const REFACTOR_CODE_ACTION_KINDS = {
   extract_function: ["refactor.extract.function"],
   extract_variable: ["refactor.extract.constant", "refactor.extract.variable"],
   update_imports: ["source.organizeImports"],
-  delete_dead_code: ["source.removeUnused"],
+  delete_dead_code: [REMOVE_UNUSED_KIND, REMOVE_UNUSED_IMPORTS_KIND],
 } as const satisfies Record<
   "extract_function" | "extract_variable" | "update_imports" | "delete_dead_code",
   readonly string[]
@@ -143,6 +146,20 @@ function supportedOperation(
   return { server, supi, ...(reason ? { reason } : {}) };
 }
 
+function deleteDeadCodeSupport(capabilities: ServerCapabilities | null): ServerOperationSupport {
+  const server = codeActionAdvertisement(capabilities, REFACTOR_CODE_ACTION_KINDS.delete_dead_code);
+  const importsOnly =
+    codeActionAdvertisement(capabilities, [REMOVE_UNUSED_KIND]) !== "advertised" &&
+    codeActionAdvertisement(capabilities, [REMOVE_UNUSED_IMPORTS_KIND]) === "advertised";
+  return importsOnly
+    ? supportedOperation(
+        server,
+        "limited",
+        "Only unused-import removal is supported by this mapping, not arbitrary unused declarations.",
+      )
+    : supportedOperation(server);
+}
+
 /** Build the honest operation-support projection for one negotiated server. */
 export function getServerOperationSupport(
   capabilities: ServerCapabilities | null,
@@ -181,9 +198,7 @@ export function getServerOperationSupport(
     update_imports: supportedOperation(
       codeActionAdvertisement(capabilities, REFACTOR_CODE_ACTION_KINDS.update_imports),
     ),
-    delete_dead_code: supportedOperation(
-      codeActionAdvertisement(capabilities, REFACTOR_CODE_ACTION_KINDS.delete_dead_code),
-    ),
+    delete_dead_code: deleteDeadCodeSupport(capabilities),
     code_action_resolve: supportedOperation(resolveServer),
   };
 }

package/src/config/server-config.ts

@@ -26,6 +26,20 @@ export interface ServerConfig {
   initializationOptions?: unknown;
   /** Maximum time to wait for a single $/progress cycle, in ms. Default: 10_000. */
   readinessTimeoutMs?: number;
+  /** TypeScript compiler package name or installed alias, resolved from the route root. */
+  typescriptPackage?: string;
+  /** @internal Effective explicit-field origins for TypeScript launch policy, not user configuration. */
+  typescriptExplicitFields?: Partial<
+    Record<"command" | "args" | "tsserverPath" | "typescriptPackage", string>
+  >;
+}
+
+/** Compiler selection facts; absent versions are unknown, not inferred from the wrapper. */
+export interface TypeScriptSelection {
+  backend: "tsserver" | "native";
+  packageName: string;
+  compilerVersion?: string;
+  wrapperVersion?: string;
 }
 
 /** LSP configuration keyed by language name (e.g. `typescript`, `python`). */
@@ -37,6 +51,10 @@ export interface DetectedProjectServer {
   name: string;
   root: string;
   fileTypes: string[];
+  /** Resolved automatic compiler selection, when available. */
+  typescript?: TypeScriptSelection;
+  /** Actionable launch-selection failure, including its root and package. */
+  failureMessage?: string;
 }
 
 /** Structured reason for a route-level process-crash recovery state. */
@@ -64,4 +82,8 @@ export interface MissingServer {
   command: string;
   /** File extensions found in the project (subset of server.fileTypes). */
   foundExtensions: string[];
+  /** Route root when a compiler-selection failure prevents launch. */
+  root?: string;
+  /** Compiler selection failure, distinct from a missing executable. */
+  failureMessage?: string;
 }