@mrclrchtr/supi-lsp 9.1.1 → 9.1.2

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-code-runtime",
-  "version": "9.1.1",
+  "version": "9.1.2",
   "description": "Shared workspace context and capability contracts for code intelligence",
   "license": "MIT",
   "repository": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-core",
-  "version": "9.1.1",
+  "version": "9.1.2",
   "description": "Shared settings, configuration, reporting, and session infrastructure",
   "license": "MIT",
   "repository": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-lsp",
-  "version": "9.1.1",
+  "version": "9.1.2",
   "description": "Language Server Protocol runtime for SuPi code intelligence",
   "license": "MIT",
   "repository": {
@@ -37,8 +37,8 @@
     "vscode-jsonrpc": "^9.0.0",
     "vscode-languageserver-protocol": "^3.18.0",
     "vscode-languageserver-types": "^3.18.0",
-    "@mrclrchtr/supi-code-runtime": "9.1.1",
-    "@mrclrchtr/supi-core": "9.1.1"
+    "@mrclrchtr/supi-core": "9.1.2",
+    "@mrclrchtr/supi-code-runtime": "9.1.2"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/src/manager/manager-workspace-symbol.ts

@@ -1,3 +1,4 @@
+import { statSync } from "node:fs";
 import * as path from "node:path";
 import {
   type CodeQueryResult,
@@ -6,6 +7,7 @@ import {
   partialCodeQuery,
   unavailableCodeQuery,
 } from "@mrclrchtr/supi-code-runtime/api";
+import { isWithinOrEqual } from "@mrclrchtr/supi-core/project";
 import type { LspClient } from "../client/client.ts";
 import type {
   DocumentSymbol,
@@ -34,6 +36,8 @@ export interface WorkspaceSymbolWarmOptions {
   maxMarkerDepth?: number;
   /** Runtime-owned automatic path policy. */
   policy?: AutomaticLspPathPolicy;
+  /** Absolute request scopes. Search only their intersection with the route root. */
+  scopes?: readonly string[];
 }
 
 export function getWorkspaceSymbolWarmPosition(
@@ -144,6 +148,31 @@ export function findWorkspaceSymbolWarmTargets(
   const policy = options.policy ?? createDefaultAutomaticLspPathPolicy(resolvedRoot);
   if (allowed.size === 0) return [];
 
+  if (options.scopes?.length) {
+    const targets = options.scopes.flatMap((scope) => {
+      const searchRoot = isWithinOrEqual(resolvedRoot, scope)
+        ? scope
+        : isWithinOrEqual(scope, resolvedRoot)
+          ? resolvedRoot
+          : null;
+      return searchRoot
+        ? findWorkspaceSymbolWarmTargets(searchRoot, rootMarkers, fileTypes, {
+            ...options,
+            policy,
+            scopes: undefined,
+          })
+        : [];
+    });
+    return [...new Map(targets.map((target) => [target.file, target])).values()];
+  }
+
+  if (statSync(resolvedRoot, { throwIfNoEntry: false })?.isFile()) {
+    return allowed.has(path.extname(resolvedRoot).slice(1).toLowerCase()) &&
+      policy.isEligible(resolvedRoot, "file")
+      ? [{ projectRoot: path.dirname(resolvedRoot), file: resolvedRoot }]
+      : [];
+  }
+
   const markerRoots = collectMarkerRoots(resolvedRoot, rootMarkers, maxMarkerDepth, policy);
   const targets = markerRoots
     .map((entry) => {

package/src/manager/manager.ts

@@ -334,8 +334,8 @@ export class LspManager {
   private invalidationEpoch = 0;
   /** Invalidation generation in which each route last received a recovery restart. */
   private recoveryRestartEpochs = new Map<string, number>();
-  /** Project roots already warmed for workspace-symbol queries. */
-  private warmedWorkspaceSymbolProjects = new Set<string>();
+  /** Files already probed for workspace-symbol warm-up. */
+  private warmedWorkspaceSymbolFiles = new Set<string>();
   /** Project roots whose semantic state was warmed with a readiness probe. */
   private warmedSemanticProjects = new Set<string>();
   /** In-flight warm-up probes keyed by project key so concurrent callers share one probe. */
@@ -527,7 +527,7 @@ export class LspManager {
         root,
         failureMessage: "The LSP client is not running.",
       });
-      this.clearWarmedWorkspaceSymbolProjects(existing.name, existing.root);
+      this.clearWarmedWorkspaceSymbolFiles(existing.name, existing.root);
       this.clearWarmedSemanticProjects(existing.name, existing.root);
       this.clearPendingWarmProbes(existing.name, existing.root);
       if (!retryFailedStart) return null;
@@ -1246,7 +1246,7 @@ export class LspManager {
   ): LspClient {
     const key = route.key;
     if (this.clients.get(key) === recovery.failedClient) this.clients.delete(key);
-    this.clearWarmedWorkspaceSymbolProjects(route.serverName, route.root);
+    this.clearWarmedWorkspaceSymbolFiles(route.serverName, route.root);
     this.clearWarmedSemanticProjects(route.serverName, route.root);
     this.clearPendingWarmProbes(route.serverName, route.root);
 
@@ -1402,7 +1402,7 @@ export class LspManager {
 
     // Spawn new client
     const client = this.createClient(serverName, serverConfig, root, key);
-    this.clearWarmedWorkspaceSymbolProjects(serverName, root);
+    this.clearWarmedWorkspaceSymbolFiles(serverName, root);
     this.clearWarmedSemanticProjects(serverName, root);
     this.clearPendingWarmProbes(serverName, root);
     this.clients.set(key, client);
@@ -1532,7 +1532,7 @@ export class LspManager {
     if (this.clients.get(key) !== client) return { files, restarted: false };
     this.clients.delete(key);
     this.unavailable.delete(key);
-    this.clearWarmedWorkspaceSymbolProjects(client.name, client.root);
+    this.clearWarmedWorkspaceSymbolFiles(client.name, client.root);
     this.clearWarmedSemanticProjects(client.name, client.root);
     this.clearPendingWarmProbes(client.name, client.root);
 
@@ -2307,7 +2307,7 @@ export class LspManager {
     this.recoveryRestartEpochs.clear();
     this.unavailable.clear();
     this.knownRoots.clear();
-    this.warmedWorkspaceSymbolProjects.clear();
+    this.warmedWorkspaceSymbolFiles.clear();
     this.warmedSemanticProjects.clear();
     this.pendingWarmProbes.clear();
     this.pendingRestarts.clear();
@@ -2671,6 +2671,7 @@ export class LspManager {
       findWarmTargets: (root, rootMarkers, fileTypes) =>
         findWorkspaceSymbolWarmTargets(root, rootMarkers, fileTypes, {
           policy: this.automaticPathPolicy,
+          scopes: resolvedScopes,
         }),
       getWarmPosition: getWorkspaceSymbolWarmPosition,
       collect,
@@ -2696,22 +2697,21 @@ export class LspManager {
     collection: WorkspaceSymbolCollection,
     scopes: readonly string[] | undefined,
   ): WorkspaceSymbolCollection {
-    const excludedExamples: string[] = [];
+    const excludedExamples = new Set(collection.excludedExamples ?? []);
     let excludedCount = 0;
     const results = collection.results.filter((result) => {
       const file = uriToFile(result.location.uri);
       if (this.isWorkspaceSymbolResultAllowed(file, scopes)) return true;
       excludedCount++;
-      if (excludedExamples.length < 5) {
-        excludedExamples.push(displayRelativeFilePath(file, this.cwd));
-      }
+      const example = displayRelativeFilePath(file, this.cwd);
+      if (excludedExamples.size < 5) excludedExamples.add(example);
       return false;
     });
     return {
       ...collection,
       results,
       excludedCount: (collection.excludedCount ?? 0) + excludedCount,
-      excludedExamples: [...(collection.excludedExamples ?? []), ...excludedExamples].slice(0, 5),
+      excludedExamples: [...excludedExamples].slice(0, 5),
     };
   }
 
@@ -2803,6 +2803,7 @@ export class LspManager {
   }): Promise<{ warmedAny: boolean; collection: WorkspaceSymbolCollection | null }> {
     const { findWarmTargets, getWarmPosition, collect, routeMatches, query, control } = options;
     let warmedAny = false;
+    let latestCollection: WorkspaceSymbolCollection | null = null;
 
     for (const client of Array.from(this.clients.values())) {
       if (routeMatches && !routeMatches(client)) continue;
@@ -2819,8 +2820,9 @@ export class LspManager {
       ).slice(0, 24);
 
       for (const target of warmTargets) {
-        const projectKey = this.workspaceSymbolProjectKey(client.name, target.projectRoot);
-        if (this.warmedWorkspaceSymbolProjects.has(projectKey)) continue;
+        // A file probe does not load every program under the route root.
+        const fileKey = `${client.name}:${path.resolve(target.file)}`;
+        if (this.warmedWorkspaceSymbolFiles.has(fileKey)) continue;
 
         const openedClient = await this.ensureFileOpen(target.file);
         if (!openedClient) continue;
@@ -2834,18 +2836,19 @@ export class LspManager {
           control,
         );
         if (available) {
-          this.warmedWorkspaceSymbolProjects.add(projectKey);
+          this.warmedWorkspaceSymbolFiles.add(fileKey);
           warmedAny = true;
         }
 
-        const collected = await collect(this.clients.values(), query);
-        if (collected.hasSupport && collected.results.length > 0) {
-          return { warmedAny, collection: collected };
+        latestCollection = await collect(this.clients.values(), query);
+        if (latestCollection.hasSupport && latestCollection.results.length > 0) {
+          return { warmedAny, collection: latestCollection };
         }
       }
     }
 
-    return { warmedAny, collection: null };
+    // A completed-empty retry replaces an earlier failure too.
+    return { warmedAny, collection: latestCollection };
   }
 
   private async warmSemanticProject(
@@ -2936,11 +2939,11 @@ export class LspManager {
     return `${serverName}:${path.resolve(projectRoot)}`;
   }
 
-  private clearWarmedWorkspaceSymbolProjects(serverName: string, root: string): void {
+  private clearWarmedWorkspaceSymbolFiles(serverName: string, root: string): void {
     const prefix = `${serverName}:${path.resolve(root)}`;
-    for (const key of Array.from(this.warmedWorkspaceSymbolProjects)) {
+    for (const key of Array.from(this.warmedWorkspaceSymbolFiles)) {
       if (key === prefix || key.startsWith(`${prefix}${path.sep}`)) {
-        this.warmedWorkspaceSymbolProjects.delete(key);
+        this.warmedWorkspaceSymbolFiles.delete(key);
       }
     }
   }