@mrclrchtr/supi-code-intelligence 6.0.1 → 6.2.0

package/node_modules/@mrclrchtr/supi-lsp/src/manager/manager.ts

@@ -21,18 +21,31 @@ import type { ClientDiagnosticSnapshot } from "../client/client-document-state.t
 
 export { RECOVERY_CLIENT_STARTUP_BOUND_MS } from "../client/client.ts";
 
+import {
+  recordDebugEvent,
+  truncateDebugIdentity as truncateIdentity,
+} from "@mrclrchtr/supi-core/debug";
+import { resolveToolPath as resolveSessionPath, uriToFile } from "@mrclrchtr/supi-core/path";
 import { getServerForFile } from "../config/config.ts";
-import { getFileScopeDecision } from "../config/tsconfig-scope.ts";
+import {
+  getFileScopeDecision,
+  invalidateTsconfigCacheForConfig,
+  invalidateTsconfigCacheForConfigDir,
+  isProjectConfigFileName,
+} from "../config/tsconfig-scope.ts";
 import type {
   DetectedProjectServer,
   Diagnostic,
   FileEvent,
   LspConfig,
   ProjectServerInfo,
+  ProjectServerStatusReason,
   ServerConfig,
   SymbolInformation,
   WorkspaceSymbol,
 } from "../config/types.ts";
+import { FileChangeType } from "../config/types.ts";
+import { boundCwd } from "../debug-telemetry.ts";
 import {
   accumulateOutstandingDiagnostics,
   collectDiagnosticSummaryCounts,
@@ -44,11 +57,19 @@ import {
   type DiagnosticEvidenceSummary,
   summarizeDiagnosticEvidence,
 } from "../diagnostics/evidence.ts";
+import {
+  scanWorkspaceSentinels as scanAutomaticWorkspaceSentinels,
+  syncWorkspaceSentinelSnapshot as syncAutomaticWorkspaceSentinelSnapshot,
+  type WorkspaceSentinelScanOptions,
+  type WorkspaceSentinelSyncResult,
+} from "../diagnostics/workspace-sentinels.ts";
 import { raceRequestControl } from "../session/readiness.ts";
-import type {
-  ScopeDecisionEntry,
-  ScopeDecisionSummary,
-  WorkspaceDiagnosticReport,
+import {
+  emptyProcessCrashRecoverySummary,
+  type ProcessCrashRecoverySummary,
+  type ScopeDecisionEntry,
+  type ScopeDecisionSummary,
+  type WorkspaceDiagnosticReport,
 } from "../session/runtime-diagnostics.ts";
 import {
   displayRelativeFilePath,
@@ -58,7 +79,11 @@ import {
   normalizeRelevantPaths,
   shouldIgnoreLspPath,
 } from "../summary.ts";
-import { commandExists, resolveSessionPath, uriToFile } from "../utils.ts";
+import { commandExists } from "../utils.ts";
+import {
+  type AutomaticLspPathPolicy,
+  createDefaultAutomaticLspPathPolicy,
+} from "../workspace-path-policy.ts";
 import {
   closeFileAcrossClients,
   pruneMissingFilesFromClients,
@@ -68,12 +93,7 @@ import {
   collectOutstandingDiagnosticsDetailed,
   syncClientFileAndGetDiagnostics,
 } from "./manager-diagnostics.ts";
-import {
-  clientKey,
-  isExcludedByPattern,
-  rememberKnownRoot,
-  resolveRootForFile,
-} from "./manager-helpers.ts";
+import { clientKey, rememberKnownRoot, resolveRootForFile } from "./manager-helpers.ts";
 import { buildProjectServerInfo } from "./manager-project-info.ts";
 import type {
   ActiveCoverageSummaryEntry,
@@ -151,6 +171,66 @@ export interface ManagerLifecycleTransition {
 
 type ManagerLifecycleListener = (transition: ManagerLifecycleTransition) => void;
 
+type FileClientRequestOptions = {
+  /** Allow this request to start the route's one process-crash recovery. */
+  recoverProcessCrash?: boolean;
+  /** Control only this caller's wait for a shared replacement. */
+  control?: CodeRequestControl;
+};
+
+interface FileReadinessResult {
+  client: LspClient | null;
+  processCrashRecovery: ProcessCrashRecoverySummary;
+}
+
+interface ProcessCrashRecoveryState {
+  /** The one automatic attempt is consumed when a replacement starts. */
+  attemptConsumed: boolean;
+  /** Current user-facing reason, or undefined after successful recovery. */
+  statusReason: ProjectServerStatusReason | undefined;
+  /** The failed generation whose tracked files must be restored. */
+  failedClient: LspClient;
+  /** Files tracked by the failed route at the time of the crash. */
+  files: string[];
+  /** Shared replacement startup and document-restoration operation. */
+  pending: Promise<LspClient | null> | null;
+  /** Start time for the current replacement attempt, when one exists. */
+  attemptStartedAt?: number;
+}
+
+type ProcessCrashRecoveryOutcome = "attempt" | "success" | "failure" | "exhausted" | "cancelled";
+
+type ProcessCrashDemandResult = {
+  /** Whether at least one required crashed route supports the operation. */
+  hasSupport: boolean;
+  /** Separate route-level result for this explicit process-crash demand. */
+  processCrashRecovery: ProcessCrashRecoverySummary;
+  /** Required routes that remain unavailable after shared recovery settles. */
+  failures: string[];
+  /** In-scope tracked files from required routes that remain unavailable. */
+  failedFiles: string[];
+};
+
+type RequiredProcessCrashDemand = {
+  key: string;
+  recovery: ProcessCrashRecoveryState;
+  failedFiles: readonly string[];
+};
+
+type ProcessCrashRecoveryRouteOutcome = "pending" | "recovered" | "failed";
+
+function summarizeProcessCrashRecoveryRoutes(
+  outcomes: Iterable<ProcessCrashRecoveryRouteOutcome>,
+): ProcessCrashRecoverySummary {
+  const summary = emptyProcessCrashRecoverySummary();
+  for (const outcome of outcomes) {
+    summary.attemptedRoutes++;
+    if (outcome === "recovered") summary.recoveredRoutes++;
+    if (outcome === "failed") summary.failedRoutes++;
+  }
+  return summary;
+}
+
 // ── LspManager ────────────────────────────────────────────────────────
 export class LspManager {
   /** Active clients keyed by "serverName:root" */
@@ -159,14 +239,14 @@ export class LspManager {
   private unavailable = new Map<string, UnavailableReason>();
   /** Memoized per-command availability of LSP server binaries on PATH */
   private commandAvailability = new Map<string, boolean>();
-  /** Guards against concurrent client creation for the same server:root key */
+  /** Guards against concurrent client creation for the same server:root key. */
   private pendingStarts = new Map<string, Promise<LspClient | null>>();
+  /** Shared diagnostic-recovery restart for each replaceable client route. */
+  private pendingRestarts = new Map<string, Promise<{ files: string[]; restarted: boolean }>>();
   /** Monotonic ownership generation for each replaceable client route. */
   private clientGenerations = new Map<string, number>();
   /** Preferred project roots discovered by proactive scan or lazy startup */
   private knownRoots = new Map<string, string[]>();
-  /** User-configured gitignore-style exclude patterns */
-  private excludePatterns: string[] = [];
   /** Monotonic workspace invalidation generation advanced by each invalidation event. */
   private invalidationEpoch = 0;
   /** Invalidation generation in which each route last received a recovery restart. */
@@ -177,21 +257,31 @@ export class LspManager {
   private warmedSemanticProjects = new Set<string>();
   /** In-flight warm-up probes keyed by project key so concurrent callers share one probe. */
   private pendingWarmProbes = new Map<string, Promise<void>>();
+  /** One process-crash recovery budget and shared replacement per route. */
+  private processCrashRecoveries = new Map<string, ProcessCrashRecoveryState>();
+  /** Client generations that completed the initialize handshake. */
+  private initializedClientGenerations = new Map<string, number>();
+  /** Client generations whose process-failure fact was already handled. */
+  private handledCrashGenerations = new Map<string, number>();
+  /** Prevent late startup and lifecycle callbacks from republishing after shutdown. */
+  private shuttingDown = false;
   constructor(
     private readonly config: LspConfig,
     private readonly cwd: string,
     private readonly onLifecycleTransition?: ManagerLifecycleListener,
+    private readonly automaticPathPolicy: AutomaticLspPathPolicy = createDefaultAutomaticLspPathPolicy(
+      cwd,
+    ),
   ) {}
   getCwd(): string {
     return this.cwd;
   }
-  setExcludePatterns(patterns: string[]): void {
-    this.excludePatterns = patterns;
-  }
 
   // ── Public API ────────────────────────────────────────────────────
   registerDetectedServers(detected: DetectedProjectServer[]): void {
-    this.knownRoots = projectRoots.buildKnownRootsMap(detected);
+    this.knownRoots = projectRoots.buildKnownRootsMap(
+      detected.filter((entry) => this.automaticPathPolicy.isEligible(entry.root, "directory")),
+    );
   }
   /** Check whether a file path has an available LSP server for explicit semantic operations. */
   canServeFile(filePath: string): boolean {
@@ -202,18 +292,56 @@ export class LspManager {
   }
 
   /**
-   * Check whether a file should participate in runtime guidance and diagnostics.
-   * This is stricter than {@link canServeFile} and intentionally filters dependency
-   * and tsconfig-excluded paths from UI/context behavior.
+   * Return the consumed process-crash outcome for a file readiness result.
+   * The result supports unavailable and non-resolved waits; it is null before
+   * an attempt is consumed and after successful recovery, so old success is
+   * not reported as a new outcome. This is a passive read and never starts
+   * recovery.
+   */
+  getProcessCrashRecoverySummaryForFile(filePath: string): ProcessCrashRecoverySummary | null {
+    const route = this.resolveFileRoute(resolveSessionPath(this.cwd, filePath));
+    const recovery = route ? this.processCrashRecoveries.get(route.key) : undefined;
+    if (!recovery?.attemptConsumed || recovery.statusReason === undefined) return null;
+
+    const outcome: ProcessCrashRecoveryRouteOutcome =
+      recovery.statusReason === "process-crash-recovery-exhausted" ? "failed" : "pending";
+    return summarizeProcessCrashRecoveryRoutes([outcome]);
+  }
+
+  /**
+   * Check whether a file should participate in automatic LSP work.
+   * This is stricter than {@link canServeFile} and applies the workspace path
+   * policy plus tsconfig diagnostic suppression.
    */
   isSupportedSourceFile(filePath: string): boolean {
-    // Dependency directories are intentionally excluded from recent-path
-    // tracking and diagnostic summaries (shouldIgnoreLspPath). Keep runtime
-    // guidance activation consistent: reading or editing a file under
-    // node_modules / .pnpm must not arm LSP guidance for dependency sources.
-    if (shouldIgnoreLspPath(filePath, this.cwd)) return false;
+    if (!this.isAutomaticScopePath(filePath)) return false;
     return this.canServeFile(filePath);
   }
+
+  /** Inventory automatic workspace sentinel and source paths with the runtime policy. */
+  scanWorkspaceSentinels(options: WorkspaceSentinelScanOptions = {}): Map<string, number> {
+    return scanAutomaticWorkspaceSentinels(this.cwd, {
+      ...options,
+      policy: this.automaticPathPolicy,
+    });
+  }
+
+  /** Refresh the automatic workspace inventory with the runtime policy. */
+  syncWorkspaceSentinelSnapshot(
+    previous: Map<string, number>,
+    options: WorkspaceSentinelScanOptions = {},
+  ): WorkspaceSentinelSyncResult {
+    return syncAutomaticWorkspaceSentinelSnapshot(this.cwd, previous, {
+      ...options,
+      policy: this.automaticPathPolicy,
+    });
+  }
+
+  /** Apply automatic path exclusions plus diagnostic tsconfig suppression. */
+  private isAutomaticScopePath(filePath: string): boolean {
+    return !shouldIgnoreLspPath(filePath, this.cwd, this.automaticPathPolicy);
+  }
+
   private isServerCommandAvailable(command: string): boolean {
     // Only memoize positive lookups. A negative result may become stale if the
     // user installs the binary mid-session (e.g. `mise install`), and
@@ -247,11 +375,27 @@ export class LspManager {
   }
 
   /** Get or create an LSP client for the given file. */
-  async getClientForFile(filePath: string): Promise<LspClient | null> {
+  async getClientForFile(
+    filePath: string,
+    options: FileClientRequestOptions = {},
+  ): Promise<LspClient | null> {
+    throwIfCodeRequestInterrupted(options.control);
+    if (this.shuttingDown) return null;
     const route = this.resolveFileRoute(filePath);
-    return route ? this.startServerForRoot(route.serverName, route.root) : null;
+    if (!route) return null;
+
+    const recovery = this.processCrashRecoveries.get(route.key);
+    if (recovery && (recovery.pending || recovery.statusReason)) {
+      if (!options.recoverProcessCrash) return null;
+      return this.acquireProcessCrashReplacement(recovery, route, options.control);
+    }
+    // A recovered route keeps its consumed budget but has no active reason.
+    // Passive callers can use its running client normally.
+
+    return this.startServerForRoot(route.serverName, route.root);
   }
   async startServerForRoot(serverName: string, root: string): Promise<LspClient | null> {
+    if (this.shuttingDown) return null;
     const serverConfig = this.config.servers[serverName];
     if (!serverConfig) return null;
     const key = clientKey(serverName, root);
@@ -261,6 +405,12 @@ export class LspManager {
     const existing = this.clients.get(key);
     if (existing && existing.status === "running") return existing;
 
+    // A crashed route is retained until evidence demand starts its shared
+    // replacement. Proactive starts must not consume that budget.
+    if (existing && existing.status === "error" && this.processCrashRecoveries.has(key)) {
+      return null;
+    }
+
     // If existing client errored, remove it
     if (existing && existing.status === "error") {
       this.clients.delete(key);
@@ -315,13 +465,353 @@ export class LspManager {
     client: LspClient,
     kind: LspClientLifecycleTransitionKind,
   ): void {
+    if (this.shuttingDown) return;
     if (this.clientGenerations.get(key) !== generation) return;
     if (this.clients.get(key) !== client) return;
+
+    if (kind === "startup") {
+      this.initializedClientGenerations.set(key, generation);
+    }
+    if (kind === "crash") {
+      if (this.handledCrashGenerations.get(key) === generation) return;
+      this.handledCrashGenerations.set(key, generation);
+      if (this.initializedClientGenerations.get(key) === generation) {
+        this.handleInitializedClientCrash(key, client);
+      }
+    }
+
     const aggregateKind =
       kind === "readiness" && generation > 1 && client.ready ? "recovery" : kind;
     this.publishLifecycle(aggregateKind);
   }
 
+  private handleInitializedClientCrash(key: string, client: LspClient): void {
+    const existing = this.processCrashRecoveries.get(key);
+    if (existing?.attemptConsumed) {
+      existing.failedClient = client;
+      existing.files = this.trackedFilesForClient(client);
+      this.unavailable.set(key, "runtime-error");
+      if (existing.statusReason !== "process-crash-recovery-exhausted") {
+        existing.statusReason = "process-crash-recovery-exhausted";
+        this.recordProcessCrashRecoveryEvent(
+          client.name,
+          client.root,
+          "exhausted",
+          existing.pending ? existing.attemptStartedAt : Date.now(),
+        );
+      }
+      return;
+    }
+
+    this.processCrashRecoveries.set(key, {
+      attemptConsumed: false,
+      statusReason: "process-crashed",
+      failedClient: client,
+      files: this.trackedFilesForClient(client),
+      pending: null,
+    });
+  }
+
+  private trackedFilesForClient(client: LspClient): string[] {
+    const files = new Set(client.openFiles);
+    for (const document of client.getDiagnosticSnapshot().documents) {
+      files.add(uriToFile(document.uri));
+    }
+    return Array.from(files);
+  }
+
+  private waitForProcessCrashRecovery(
+    recovery: ProcessCrashRecoveryState,
+    control?: CodeRequestControl,
+  ): Promise<LspClient | null> {
+    if (!recovery.pending) return Promise.resolve(null);
+    return raceRequestControl(recovery.pending, control);
+  }
+
+  private acquireProcessCrashReplacement(
+    recovery: ProcessCrashRecoveryState,
+    route: FileRoute,
+    control?: CodeRequestControl,
+  ): Promise<LspClient | null> {
+    if (recovery.pending) return this.waitForProcessCrashRecovery(recovery, control);
+    if (
+      recovery.statusReason === "process-crashed" &&
+      !recovery.attemptConsumed &&
+      !this.shuttingDown
+    ) {
+      return this.startProcessCrashRecovery(recovery, route, control);
+    }
+    return Promise.resolve(null);
+  }
+
+  /**
+   * Recover all crashed routes selected by one evidence-producing operation.
+   * Each route keeps its independent attempt budget and shared replacement.
+   */
+  private async recoverProcessCrashDemand(
+    selectFiles: (recovery: ProcessCrashRecoveryState) => readonly string[] | null,
+    control?: CodeRequestControl,
+  ): Promise<ProcessCrashDemandResult> {
+    const required = Array.from(this.processCrashRecoveries.entries()).flatMap(
+      ([key, recovery]): RequiredProcessCrashDemand[] => {
+        if (recovery.statusReason === undefined) return [];
+        const failedFiles = selectFiles(recovery);
+        return failedFiles === null ? [] : [{ key, recovery, failedFiles }];
+      },
+    );
+    if (required.length === 0) {
+      return {
+        hasSupport: false,
+        processCrashRecovery: emptyProcessCrashRecoverySummary(),
+        failures: [],
+        failedFiles: [],
+      };
+    }
+
+    await Promise.all(
+      required.map(async ({ key, recovery }) => {
+        const serverConfig = this.config.servers[recovery.failedClient.name];
+        if (!serverConfig) return;
+        await this.acquireProcessCrashReplacement(
+          recovery,
+          {
+            serverName: recovery.failedClient.name,
+            serverConfig,
+            root: recovery.failedClient.root,
+            key,
+          },
+          control,
+        );
+      }),
+    );
+
+    const failedDemands = required.filter(({ recovery }) => recovery.statusReason !== undefined);
+    const outcomes = required.map(
+      ({ recovery }): ProcessCrashRecoveryRouteOutcome =>
+        recovery.statusReason === undefined ? "recovered" : "failed",
+    );
+    return {
+      hasSupport: true,
+      processCrashRecovery: summarizeProcessCrashRecoveryRoutes(outcomes),
+      failures: failedDemands.map(({ recovery }) => this.formatProcessCrashDemandFailure(recovery)),
+      failedFiles: Array.from(new Set(failedDemands.flatMap(({ failedFiles }) => failedFiles))),
+    };
+  }
+
+  private formatProcessCrashDemandFailure(recovery: ProcessCrashRecoveryState): string {
+    const root = (path.relative(this.cwd, recovery.failedClient.root) || ".").replaceAll("\\", "/");
+    const reason =
+      recovery.statusReason === "process-crash-recovery-exhausted"
+        ? "process recovery exhausted; reload required"
+        : recovery.statusReason === "process-crash-recovery-pending"
+          ? "process recovery in progress"
+          : "process crashed";
+    return `${recovery.failedClient.name} @ ${root} is unavailable — ${reason}.`;
+  }
+
+  private startProcessCrashRecovery(
+    recovery: ProcessCrashRecoveryState,
+    route: FileRoute,
+    control?: CodeRequestControl,
+  ): Promise<LspClient | null> {
+    throwIfCodeRequestInterrupted(control);
+    recovery.attemptConsumed = true;
+    recovery.statusReason = "process-crash-recovery-pending";
+    recovery.attemptStartedAt = Date.now();
+    const pending = this.performProcessCrashRecovery(recovery, route);
+    recovery.pending = pending;
+    // A cancelled caller may be the only current waiter. Keep the shared
+    // replacement promise observed until it settles without adopting that
+    // caller's cancellation or deadline.
+    pending.catch(() => {});
+    this.recordProcessCrashRecoveryEvent(
+      route.serverName,
+      route.root,
+      "attempt",
+      recovery.attemptStartedAt,
+    );
+    this.publishLifecycle("recovery");
+    return raceRequestControl(pending, control);
+  }
+
+  private async performProcessCrashRecovery(
+    recovery: ProcessCrashRecoveryState,
+    route: FileRoute,
+  ): Promise<LspClient | null> {
+    const key = route.key;
+    const attemptStartedAt = recovery.attemptStartedAt;
+
+    try {
+      // A process-error event can leave the child alive. Stop the old tree
+      // before installing its replacement, but retain its captured evidence.
+      await recovery.failedClient.forceKill().catch(() => {});
+      if (this.isProcessCrashRecoveryCancelled(recovery, key)) {
+        this.recordProcessCrashRecoveryEvent(
+          route.serverName,
+          route.root,
+          "cancelled",
+          attemptStartedAt,
+        );
+        return null;
+      }
+
+      const replacement = this.installProcessCrashReplacement(recovery, route);
+      const started = await this.startProcessCrashReplacement(recovery, route, replacement);
+      if (!started) return null;
+
+      // A replacement can crash after initialize and before this operation
+      // resumes. Its lifecycle callback has already exhausted the route.
+      if (
+        started.status !== "running" ||
+        recovery.statusReason === "process-crash-recovery-exhausted"
+      ) {
+        return null;
+      }
+
+      this.unavailable.delete(key);
+      recovery.statusReason = undefined;
+      this.publishLifecycle("recovery");
+      this.restoreTrackedDocuments(started, recovery.files);
+      this.recordProcessCrashRecoveryEvent(
+        route.serverName,
+        route.root,
+        "success",
+        attemptStartedAt,
+      );
+      return started;
+    } finally {
+      if (this.processCrashRecoveries.get(key) === recovery) recovery.pending = null;
+    }
+  }
+
+  private isProcessCrashRecoveryCancelled(
+    recovery: ProcessCrashRecoveryState,
+    key: string,
+  ): boolean {
+    return this.shuttingDown || this.processCrashRecoveries.get(key) !== recovery;
+  }
+
+  private installProcessCrashReplacement(
+    recovery: ProcessCrashRecoveryState,
+    route: FileRoute,
+  ): LspClient {
+    const key = route.key;
+    if (this.clients.get(key) === recovery.failedClient) this.clients.delete(key);
+    this.clearWarmedWorkspaceSymbolProjects(route.serverName, route.root);
+    this.clearWarmedSemanticProjects(route.serverName, route.root);
+    this.clearPendingWarmProbes(route.serverName, route.root);
+
+    const replacement = this.createClient(route.serverName, route.serverConfig, route.root, key);
+    this.clients.set(key, replacement);
+    rememberKnownRoot(this.knownRoots, route.serverName, route.root);
+    return replacement;
+  }
+
+  private async startProcessCrashReplacement(
+    recovery: ProcessCrashRecoveryState,
+    route: FileRoute,
+    replacement: LspClient,
+  ): Promise<LspClient | null> {
+    try {
+      // LspClient's initialize request already has the 30-second transport
+      // bound. Do not apply the 5-second diagnostic-restart bound here.
+      await replacement.start();
+    } catch {
+      if (this.isProcessCrashRecoveryCancelled(recovery, route.key)) {
+        await replacement.forceKill().catch(() => {});
+        this.recordProcessCrashRecoveryEvent(
+          route.serverName,
+          route.root,
+          "cancelled",
+          recovery.attemptStartedAt,
+        );
+        return null;
+      }
+      if (recovery.statusReason !== "process-crash-recovery-exhausted") {
+        this.markProcessCrashRecoveryFailed(recovery, route.key, replacement);
+        this.recordProcessCrashRecoveryEvent(
+          route.serverName,
+          route.root,
+          "failure",
+          recovery.attemptStartedAt,
+        );
+      }
+      return null;
+    }
+
+    if (
+      this.isProcessCrashRecoveryCancelled(recovery, route.key) ||
+      this.clients.get(route.key) !== replacement
+    ) {
+      await replacement.forceKill().catch(() => {});
+      this.recordProcessCrashRecoveryEvent(
+        route.serverName,
+        route.root,
+        "cancelled",
+        recovery.attemptStartedAt,
+      );
+      return null;
+    }
+    return replacement;
+  }
+
+  /** Restore route documents from disk and retain failed-document evidence. */
+  private restoreTrackedDocuments(client: LspClient, files: readonly string[]): void {
+    const failedFiles: string[] = [];
+    for (const filePath of files) {
+      if (!fs.existsSync(filePath)) {
+        failedFiles.push(filePath);
+        continue;
+      }
+      try {
+        client.didOpen(filePath, fs.readFileSync(filePath, "utf-8"));
+      } catch {
+        failedFiles.push(filePath);
+      }
+    }
+    for (const filePath of failedFiles) client.markFailedFile(filePath);
+  }
+
+  private markProcessCrashRecoveryFailed(
+    recovery: ProcessCrashRecoveryState,
+    key: string,
+    replacement: LspClient,
+  ): void {
+    recovery.statusReason = "process-crash-recovery-exhausted";
+    this.unavailable.set(key, "start-failed");
+    if (this.clients.get(key) === replacement) this.clients.delete(key);
+    // A failed initialize may still leave a child process alive. The
+    // replacement is no longer owned by the manager before it is terminated.
+    void replacement.forceKill().catch(() => {});
+    this.publishLifecycle("recovery");
+  }
+
+  private recordProcessCrashRecoveryEvent(
+    serverName: string,
+    root: string,
+    outcome: ProcessCrashRecoveryOutcome,
+    startedAt?: number,
+  ): void {
+    try {
+      recordDebugEvent({
+        source: "lsp",
+        level: outcome === "failure" || outcome === "exhausted" ? "warning" : "debug",
+        category: "runtime.recovery",
+        message: `LSP process-crash recovery ${outcome}`,
+        cwd: boundCwd(this.cwd),
+        data: {
+          reason: "process-crash",
+          outcome,
+          server: truncateIdentity(serverName),
+          root: truncateIdentity(root),
+          elapsedMs: startedAt === undefined ? 0 : Math.max(0, Date.now() - startedAt),
+        },
+      });
+    } catch {
+      // Recovery telemetry must never change route behavior.
+    }
+  }
+
   private publishLifecycle(kind: ManagerLifecycleTransitionKind): void {
     if (!this.onLifecycleTransition) return;
     const projectServers = this.getKnownProjectServers([]);
@@ -360,11 +850,16 @@ export class LspManager {
     rememberKnownRoot(this.knownRoots, serverName, root);
     try {
       await client.start();
+      if (this.shuttingDown) {
+        await client.forceKill().catch(() => {});
+        if (this.clients.get(key) === client) this.clients.delete(key);
+        return null;
+      }
       this.unavailable.delete(key);
       return client;
     } catch {
       this.unavailable.set(key, "start-failed");
-      this.clients.delete(key);
+      if (this.clients.get(key) === client) this.clients.delete(key);
       return null;
     }
   }
@@ -403,30 +898,60 @@ export class LspManager {
     const seen = new Set<string>();
 
     for (const filePath of filePaths) {
-      const client = this.getExistingClientForFile(filePath);
-      if (!client) continue;
-      if (options?.pushOnly && client.hasDiagnosticProvider) continue;
-
-      const key = clientKey(client.name, client.root);
-      if (seen.has(key)) continue;
-      seen.add(key);
-      if (this.recoveryRestartEpochs.get(key) === this.invalidationEpoch) continue;
+      const candidate = this.getRestartCandidate(filePath, options?.pushOnly === true, seen);
+      if (!candidate) continue;
+      const { client, key } = candidate;
 
       // Observe cancellation between route restarts so a cancelled pass does
       // not keep restarting further clients.
       throwIfCodeRequestInterrupted(options?.control);
-      const result = await this.restartClient(client);
-      this.recoveryRestartEpochs.set(key, this.invalidationEpoch);
+      const restartPromise = this.pendingRestarts.get(key) ?? this.startSharedRestart(client, key);
+      const result = await raceRequestControl(restartPromise, options?.control);
       restarted.push({ key, serverName: client.name, ...result });
     }
 
     return restarted;
   }
 
+  private startSharedRestart(
+    client: LspClient,
+    key: string,
+  ): Promise<{ files: string[]; restarted: boolean }> {
+    const restartEpoch = this.invalidationEpoch;
+    const restartPromise = this.restartClient(client).then((result) => {
+      this.recoveryRestartEpochs.set(key, restartEpoch);
+      return result;
+    });
+    this.pendingRestarts.set(key, restartPromise);
+    void restartPromise
+      .finally(() => {
+        if (this.pendingRestarts.get(key) === restartPromise) this.pendingRestarts.delete(key);
+      })
+      .catch(() => {});
+    return restartPromise;
+  }
+
+  private getRestartCandidate(
+    filePath: string,
+    pushOnly: boolean,
+    seen: Set<string>,
+  ): { client: LspClient; key: string } | null {
+    const client = this.getExistingClientForFile(filePath);
+    if (!client || (pushOnly && client.hasDiagnosticProvider)) return null;
+
+    const key = clientKey(client.name, client.root);
+    if (this.processCrashRecoveries.get(key)?.pending || seen.has(key)) return null;
+    seen.add(key);
+    if (this.recoveryRestartEpochs.get(key) === this.invalidationEpoch) return null;
+    return { client, key };
+  }
+
   private async restartClient(client: LspClient): Promise<{ files: string[]; restarted: boolean }> {
     const key = clientKey(client.name, client.root);
     const serverConfig = this.config.servers[client.name];
-    if (!serverConfig) return { files: [], restarted: false };
+    if (!serverConfig || this.clients.get(key) !== client) {
+      return { files: [], restarted: false };
+    }
 
     const openFiles = client.openFiles;
     const trackedDiagnosticFiles = client
@@ -439,6 +964,7 @@ export class LspManager {
       // Ignore shutdown failures when forcing a restart.
     }
 
+    if (this.clients.get(key) !== client) return { files, restarted: false };
     this.clients.delete(key);
     this.unavailable.delete(key);
     this.clearWarmedWorkspaceSymbolProjects(client.name, client.root);
@@ -455,23 +981,18 @@ export class LspManager {
         RECOVERY_CLIENT_STARTUP_BOUND_MS,
         "replacement client startup bound exceeded",
       );
-      const failedFiles: string[] = [];
-      for (const filePath of files) {
-        if (!fs.existsSync(filePath)) {
-          failedFiles.push(filePath);
-          continue;
-        }
-        try {
-          replacement.didOpen(filePath, fs.readFileSync(filePath, "utf-8"));
-        } catch {
-          failedFiles.push(filePath);
-        }
+      if (this.clients.get(key) !== replacement || this.shuttingDown) {
+        void replacement.forceKill().catch(() => {});
+        return { files, restarted: false };
       }
-      for (const filePath of failedFiles) replacement.markFailedFile(filePath);
+      this.restoreTrackedDocuments(replacement, files);
+      this.clearUnconsumedProcessCrashState(key, client);
       return { files, restarted: true };
     } catch {
-      this.clients.delete(key);
-      this.unavailable.set(key, "start-failed");
+      if (this.clients.get(key) === replacement) {
+        this.clients.delete(key);
+        this.unavailable.set(key, "start-failed");
+      }
       // A bound-exceeded start may have spawned a live process; terminate
       // the tree so the orphan cannot outlive the failed restart.
       void replacement.forceKill().catch(() => {});
@@ -479,6 +1000,13 @@ export class LspManager {
     }
   }
 
+  private clearUnconsumedProcessCrashState(key: string, failedClient: LspClient): void {
+    const recovery = this.processCrashRecoveries.get(key);
+    if (recovery?.failedClient !== failedClient || recovery.attemptConsumed) return;
+    this.processCrashRecoveries.delete(key);
+    this.publishLifecycle("recovery");
+  }
+
   getProjectServerInfo(serverName: string, root: string, fileTypes: string[]): ProjectServerInfo {
     const key = clientKey(serverName, root);
     return buildProjectServerInfo(
@@ -489,6 +1017,8 @@ export class LspManager {
         client: this.clients.get(key),
         unavailableReason:
           this.getUnavailableReason(key, this.config.servers[serverName]?.command) ?? undefined,
+        statusReason: this.processCrashRecoveries.get(key)?.statusReason,
+        includeOpenFile: (file) => this.isAutomaticScopePath(file),
       },
       this.cwd,
     );
@@ -496,6 +1026,7 @@ export class LspManager {
   getKnownProjectServers(detected: DetectedProjectServer[]): ProjectServerInfo[] {
     const known = new Map<string, DetectedProjectServer>();
     for (const entry of detected) {
+      if (!this.automaticPathPolicy.isEligible(entry.root, "directory")) continue;
       known.set(clientKey(entry.name, entry.root), entry);
     }
     for (const client of this.clients.values()) {
@@ -507,6 +1038,19 @@ export class LspManager {
         fileTypes: [...(this.config.servers[client.name]?.fileTypes ?? [])],
       });
     }
+    // Keep an exhausted recovery route visible after its failed replacement
+    // is removed from the active client pool.
+    for (const recovery of this.processCrashRecoveries.values()) {
+      const name = recovery.failedClient.name;
+      const root = recovery.failedClient.root;
+      const key = clientKey(name, root);
+      if (known.has(key)) continue;
+      known.set(key, {
+        name,
+        root,
+        fileTypes: [...(this.config.servers[name]?.fileTypes ?? [])],
+      });
+    }
     return Array.from(known.values())
       .map((entry) => this.getProjectServerInfo(entry.name, entry.root, entry.fileTypes))
       .sort(
@@ -521,17 +1065,31 @@ export class LspManager {
   async waitUntilFileReady(
     filePath: string,
     control?: CodeRequestControl,
-  ): Promise<LspClient | null> {
+    onProcessCrashRecovery?: (summary: ProcessCrashRecoverySummary) => void,
+  ): Promise<FileReadinessResult> {
     throwIfCodeRequestInterrupted(control);
     const resolvedPath = resolveSessionPath(this.cwd, filePath);
-    const client = await this.getClientForFile(resolvedPath);
-    if (!client) return null;
+    const route = this.resolveFileRoute(resolvedPath);
+    const recovery = route ? this.processCrashRecoveries.get(route.key) : undefined;
+    const processCrashRecoveryRequested =
+      recovery !== undefined && (recovery.pending !== null || recovery.statusReason !== undefined);
+    if (processCrashRecoveryRequested) {
+      onProcessCrashRecovery?.(summarizeProcessCrashRecoveryRoutes(["pending"]));
+    }
+    const client = await this.getClientForFile(resolvedPath, {
+      recoverProcessCrash: true,
+      control,
+    });
+    const processCrashRecovery = processCrashRecoveryRequested
+      ? summarizeProcessCrashRecoveryRoutes([client ? "recovered" : "failed"])
+      : emptyProcessCrashRecoverySummary();
+    if (!client) return { client: null, processCrashRecovery };
     // The caller's wait stops on cancellation even though the shared
     // readiness state keeps its own lifecycle.
     await client.getReady(control);
     await this.warmSemanticProject(client, resolvedPath, true, control);
     throwIfCodeRequestInterrupted(control);
-    return client;
+    return { client, processCrashRecovery };
   }
 
   /**
@@ -569,6 +1127,7 @@ export class LspManager {
         firstReady.root,
         serverConfig.rootMarkers,
         serverConfig.fileTypes,
+        { policy: this.automaticPathPolicy },
       )[0];
       if (target) await this.warmSemanticProject(firstReady, target.file, false, control);
     }
@@ -582,7 +1141,10 @@ export class LspManager {
     control?: CodeRequestControl,
   ): Promise<CodeQueryResult<Diagnostic[]>> {
     const resolvedPath = resolveSessionPath(this.cwd, filePath);
-    const client = await this.getClientForFile(resolvedPath);
+    const client = await this.getClientForFile(resolvedPath, {
+      recoverProcessCrash: true,
+      control,
+    });
     if (!client) {
       return unavailableCodeQuery(`No LSP client can collect diagnostics for ${resolvedPath}.`);
     }
@@ -637,6 +1199,7 @@ export class LspManager {
    */
   noteWorkspaceChanges(changes: FileEvent[]): void {
     if (changes.length > 0) this.invalidationEpoch++;
+    invalidateProjectConfigCaches(changes);
     this.notifyWorkspaceFileChanges(changes);
   }
 
@@ -678,26 +1241,98 @@ export class LspManager {
     quietMs?: number;
     /** Evidence from a refresh the caller already completed; skips this pass's own refresh when no watched-file changes apply. */
     initialEvidence?: DiagnosticEvidenceSummary;
+    /** Explicit demand to recover crashed routes with tracked files in scope. */
+    processCrashDemand?: { scopes?: readonly string[] };
     control?: CodeRequestControl;
   }): Promise<WorkspaceRecoveryResult> {
-    return recoverWorkspaceDiagnosticsImpl(this, options);
+    const demand = options?.processCrashDemand
+      ? await this.recoverProcessCrashDemand((recovery) => {
+          const files = this.processCrashDiagnosticFiles(recovery, options.processCrashDemand);
+          return files.length > 0 ? files : null;
+        }, options.control)
+      : {
+          hasSupport: false,
+          processCrashRecovery: emptyProcessCrashRecoverySummary(),
+          failures: [],
+          failedFiles: [],
+        };
+    const recoveryOptions = demand.hasSupport
+      ? { ...options, initialEvidence: undefined }
+      : options;
+    const result = await recoverWorkspaceDiagnosticsImpl(this, recoveryOptions);
+    return this.addProcessCrashDiagnosticEvidence(
+      { ...result, processCrashRecovery: demand.processCrashRecovery },
+      demand,
+    );
+  }
+
+  private processCrashDiagnosticFiles(
+    recovery: ProcessCrashRecoveryState,
+    demand: { scopes?: readonly string[] } | undefined,
+  ): string[] {
+    if (!demand) return [];
+    const scopes = demand.scopes?.map((scope) => resolveSessionPath(this.cwd, scope));
+    return recovery.files.filter(
+      (file) =>
+        this.isDiagnosticFile(file) &&
+        (!scopes ||
+          scopes.length === 0 ||
+          scopes.some((scope) => projectRoots.isWithinOrEqual(scope, file))),
+    );
+  }
+
+  private addProcessCrashDiagnosticEvidence(
+    result: WorkspaceRecoveryResult,
+    demand: ProcessCrashDemandResult,
+  ): WorkspaceRecoveryResult {
+    if (demand.failures.length === 0) return result;
+    const byFile = new Map(
+      result.diagnosticEvidence.documents.map((document) => [document.file, document] as const),
+    );
+    for (const file of demand.failedFiles) {
+      const relativeFile = path.relative(this.cwd, file);
+      byFile.set(relativeFile, { file: relativeFile, status: "failed" });
+    }
+    const diagnosticEvidence = summarizeDiagnosticEvidence(Array.from(byFile.values()));
+    const diagnosticReport = {
+      summary: { ...result.diagnosticReport.summary, current: false, evidence: diagnosticEvidence },
+      outstanding: {
+        ...result.diagnosticReport.outstanding,
+        current: false,
+        evidence: diagnosticEvidence,
+      },
+    };
+    return {
+      ...result,
+      diagnosticEvidence,
+      diagnosticReport,
+      refreshFailureReason: [result.refreshFailureReason, ...demand.failures]
+        .filter(Boolean)
+        .join("; "),
+    };
   }
 
   /** Shut down all running LSP servers. */
   async shutdownAll(): Promise<void> {
-    const shutdowns = Array.from(this.clients.values()).map((c) => c.shutdown().catch(() => {}));
+    this.shuttingDown = true;
+    const clients = Array.from(this.clients.values());
+    const shutdowns = clients.map((client) => client.shutdown().catch(() => {}));
     await Promise.all(shutdowns);
     // Dispose every client so pending or active progress tokens and
     // readiness promises cannot outlive the manager.
-    for (const client of this.clients.values()) client.dispose();
+    for (const client of clients) client.dispose();
     this.clients.clear();
     this.clientGenerations.clear();
+    this.initializedClientGenerations.clear();
+    this.handledCrashGenerations.clear();
+    this.processCrashRecoveries.clear();
     this.recoveryRestartEpochs.clear();
     this.unavailable.clear();
     this.knownRoots.clear();
     this.warmedWorkspaceSymbolProjects.clear();
     this.warmedSemanticProjects.clear();
     this.pendingWarmProbes.clear();
+    this.pendingRestarts.clear();
   }
   /** Get status of all servers. */
   getRunningClientCount(): number {
@@ -711,13 +1346,9 @@ export class LspManager {
       .map((client) => client.name);
   }
 
-  /** Check whether a path belongs to the configured diagnostic evidence scope. */
+  /** Check whether a path belongs to the automatic diagnostic evidence scope. */
   isDiagnosticFile(filePath: string): boolean {
-    const relative = path.relative(this.cwd, path.resolve(this.cwd, filePath));
-    return (
-      !shouldIgnoreLspPath(relative, this.cwd) &&
-      !isExcludedByPattern(relative, this.excludePatterns)
-    );
+    return this.isAutomaticScopePath(filePath);
   }
 
   getDiagnosticEvidence(): DiagnosticEvidenceSummary {
@@ -732,7 +1363,7 @@ export class LspManager {
         name: client.name,
         status: client.status === "running" ? "running" : "error",
         root: client.root,
-        openFiles: client.openFiles,
+        openFiles: client.openFiles.filter((file) => this.isAutomaticScopePath(file)),
       });
     }
     return { servers };
@@ -773,8 +1404,7 @@ export class LspManager {
       const openFiles = activeServers.get(server.name) ?? new Set<string>();
       for (const file of server.openFiles) {
         const relativeFile = displayRelativeFilePath(file, this.cwd);
-        if (shouldIgnoreLspPath(relativeFile, this.cwd)) continue;
-        if (isExcludedByPattern(relativeFile, this.excludePatterns)) continue;
+        if (!this.isAutomaticScopePath(relativeFile)) continue;
         openFiles.add(relativeFile);
       }
       activeServers.set(server.name, openFiles);
@@ -800,7 +1430,7 @@ export class LspManager {
       .map((entry) => ({
         ...entry,
         openFiles: entry.openFiles.filter((file) =>
-          isPathRelevant(file, normalizedPaths, this.cwd),
+          isPathRelevant(file, normalizedPaths, this.cwd, this.automaticPathPolicy),
         ),
       }))
       .filter((entry) => entry.openFiles.length > 0);
@@ -832,7 +1462,9 @@ export class LspManager {
     const fileDiags = new Map<string, { errors: number; warnings: number }>();
     for (const snapshot of snapshots) {
       for (const entry of snapshot.entries) {
-        collectDiagnosticSummaryCounts(fileDiags, entry, this.cwd, this.excludePatterns);
+        collectDiagnosticSummaryCounts(fileDiags, entry, this.cwd, (file) =>
+          this.isAutomaticScopePath(file),
+        );
       }
     }
 
@@ -846,7 +1478,7 @@ export class LspManager {
         entries: collectOutstandingDiagnosticsDetailed(
           snapshots.map((snapshot) => snapshot.entries),
           this.cwd,
-          this.excludePatterns,
+          (file) => this.isAutomaticScopePath(file),
           maxSeverity,
         ),
         current,
@@ -878,7 +1510,9 @@ export class LspManager {
         });
       }
       for (const entry of snapshot.entries) {
-        collectDiagnosticSummaryCounts(fileDiags, entry, this.cwd, this.excludePatterns);
+        collectDiagnosticSummaryCounts(fileDiags, entry, this.cwd, (file) =>
+          this.isAutomaticScopePath(file),
+        );
       }
     }
     const evidence = this.toWorkspaceDiagnosticEvidence(evidenceDocuments);
@@ -910,7 +1544,7 @@ export class LspManager {
       entries: collectOutstandingDiagnosticSummaryEntries(
         snapshots,
         this.cwd,
-        this.excludePatterns,
+        (file) => this.isAutomaticScopePath(file),
         maxSeverity,
       ),
       current:
@@ -927,7 +1561,7 @@ export class LspManager {
     if (normalizedPaths.length === 0) return null;
     return formatOutstandingDiagnosticsSummaryText(
       this.getOutstandingDiagnosticSummary(maxSeverity).filter((entry) =>
-        isPathRelevant(entry.file, normalizedPaths, this.cwd),
+        isPathRelevant(entry.file, normalizedPaths, this.cwd, this.automaticPathPolicy),
       ),
       maxFiles,
     );
@@ -957,7 +1591,7 @@ export class LspManager {
       entries: collectOutstandingDiagnosticsDetailed(
         snapshots.map((snapshot) => snapshot.entries),
         this.cwd,
-        this.excludePatterns,
+        (file) => this.isAutomaticScopePath(file),
         maxSeverity,
       ),
       current:
@@ -986,6 +1620,7 @@ export class LspManager {
     for (const client of this.clients.values()) {
       for (const document of client.getDiagnosticSnapshot().documents) {
         const file = relativeFilePathFromUri(document.uri, this.cwd);
+        if (!this.isAutomaticScopePath(file)) continue;
         totalFiles++;
         accumulateScopeDecision(accumulator, file, getFileScopeDecision(file, this.cwd));
       }
@@ -1005,8 +1640,7 @@ export class LspManager {
     const byFile = new Map<string, DiagnosticEvidenceDocument>();
     for (const document of documents) {
       const file = path.relative(this.cwd, path.resolve(this.cwd, document.file));
-      if (shouldIgnoreLspPath(file, this.cwd)) continue;
-      if (isExcludedByPattern(file, this.excludePatterns)) continue;
+      if (!this.isAutomaticScopePath(file)) continue;
       const existing = byFile.get(file);
       if (!existing || evidenceStatusRank(document.status) > evidenceStatusRank(existing.status)) {
         byFile.set(file, { file, status: document.status });
@@ -1020,24 +1654,95 @@ export class LspManager {
   async workspaceSymbol(
     query: string,
     control?: CodeRequestControl,
+    scopes?: readonly string[],
   ): Promise<CodeQueryResult<(SymbolInformation | WorkspaceSymbol)[]>> {
-    const initial = await collectWorkspaceSymbols(this.clients.values(), query, control);
+    const resolvedScopes = scopes?.map((scope) => resolveSessionPath(this.cwd, scope));
+    const routeMatches = (client: LspClient) =>
+      this.workspaceSymbolRouteMatchesScopes(client, resolvedScopes);
+    if (resolvedScopes && !this.hasWorkspaceSymbolRouteForScopes(resolvedScopes)) {
+      return unavailableCodeQuery(
+        "No known LSP route intersects the requested workspace-symbol scope.",
+      );
+    }
+    const demand = await this.recoverProcessCrashDemand(
+      (recovery) =>
+        recovery.failedClient.serverCapabilities?.workspaceSymbolProvider &&
+        routeMatches(recovery.failedClient)
+          ? []
+          : null,
+      control,
+    );
+    const collect = async (clients: Iterable<LspClient>, value: string) =>
+      this.addWorkspaceSymbolDemandEvidence(
+        await collectWorkspaceSymbols(
+          Array.from(clients).filter((client) => routeMatches(client)),
+          value,
+          control,
+        ),
+        demand,
+      );
+    const initial = await collect(this.clients.values(), query);
     if (!initial.hasSupport || initial.results.length > 0) {
       return workspaceSymbolCollectionResult(initial);
     }
 
     const warmed = await this.warmWorkspaceSymbolProjectsUntilResult({
-      findWarmTargets: findWorkspaceSymbolWarmTargets,
+      findWarmTargets: (root, rootMarkers, fileTypes) =>
+        findWorkspaceSymbolWarmTargets(root, rootMarkers, fileTypes, {
+          policy: this.automaticPathPolicy,
+        }),
       getWarmPosition: getWorkspaceSymbolWarmPosition,
-      collect: (clients, value) => collectWorkspaceSymbols(clients, value, control),
+      collect,
+      routeMatches,
       query,
       control,
     });
     return workspaceSymbolCollectionResult(warmed.collection ?? initial);
   }
-  async ensureFileOpen(filePath: string): Promise<LspClient | null> {
+
+  private addWorkspaceSymbolDemandEvidence(
+    collection: WorkspaceSymbolCollection,
+    demand: ProcessCrashDemandResult,
+  ): WorkspaceSymbolCollection {
+    return {
+      ...collection,
+      hasSupport: collection.hasSupport || demand.hasSupport,
+      failures: [...collection.failures, ...demand.failures],
+    };
+  }
+
+  private hasWorkspaceSymbolRouteForScopes(scopes: readonly string[]): boolean {
+    const clients = [
+      ...this.clients.values(),
+      ...Array.from(this.processCrashRecoveries.values(), (recovery) => recovery.failedClient),
+    ];
+    return clients.some((client) => this.workspaceSymbolRouteMatchesScopes(client, scopes));
+  }
+
+  private workspaceSymbolRouteMatchesScopes(
+    client: LspClient,
+    scopes: readonly string[] | undefined,
+  ): boolean {
+    if (!scopes || scopes.length === 0) return true;
+    const key = clientKey(client.name, client.root);
+    return scopes.some((scope) => {
+      try {
+        if (fs.statSync(scope).isFile()) return this.resolveFileRoute(scope)?.key === key;
+      } catch {
+        return false;
+      }
+      return (
+        projectRoots.isWithinOrEqual(client.root, scope) ||
+        projectRoots.isWithinOrEqual(scope, client.root)
+      );
+    });
+  }
+  async ensureFileOpen(
+    filePath: string,
+    options: FileClientRequestOptions = {},
+  ): Promise<LspClient | null> {
     const resolvedPath = resolveSessionPath(this.cwd, filePath);
-    const client = await this.getClientForFile(resolvedPath);
+    const client = await this.getClientForFile(resolvedPath, options);
     if (!client) return null;
     try {
       client.didOpen(resolvedPath, fs.readFileSync(resolvedPath, "utf-8"));
@@ -1059,13 +1764,15 @@ export class LspManager {
       symbols: import("../config/types.ts").DocumentSymbol[] | SymbolInformation[] | null,
     ) => import("../config/types.ts").Position | null;
     collect: (clients: Iterable<LspClient>, query: string) => Promise<WorkspaceSymbolCollection>;
+    routeMatches?: (client: LspClient) => boolean;
     query: string;
     control?: CodeRequestControl;
   }): Promise<{ warmedAny: boolean; collection: WorkspaceSymbolCollection | null }> {
-    const { findWarmTargets, getWarmPosition, collect, query, control } = options;
+    const { findWarmTargets, getWarmPosition, collect, routeMatches, query, control } = options;
     let warmedAny = false;
 
     for (const client of Array.from(this.clients.values())) {
+      if (routeMatches && !routeMatches(client)) continue;
       if (client.status !== "running") continue;
       if (!client.serverCapabilities?.workspaceSymbolProvider) continue;
 
@@ -1081,28 +1788,21 @@ export class LspManager {
       for (const target of warmTargets) {
         const projectKey = this.workspaceSymbolProjectKey(client.name, target.projectRoot);
         if (this.warmedWorkspaceSymbolProjects.has(projectKey)) continue;
-        if (this.hasOpenFileInProject(client, target.projectRoot)) {
-          this.warmedWorkspaceSymbolProjects.add(projectKey);
-          continue;
-        }
 
         const openedClient = await this.ensureFileOpen(target.file);
         if (!openedClient) continue;
 
         // A cancelled pass must not mark projects warmed on its way out.
         throwIfCodeRequestInterrupted(control);
-        this.warmedWorkspaceSymbolProjects.add(projectKey);
-        warmedAny = true;
-
-        const symbols = control
-          ? await openedClient.documentSymbols(target.file, control)
-          : await openedClient.documentSymbols(target.file);
-        if (symbols.kind !== "unavailable") {
-          const hoverPosition = getWarmPosition(symbols.data);
-          if (hoverPosition) {
-            if (control) await openedClient.hover(target.file, hoverPosition, control);
-            else await openedClient.hover(target.file, hoverPosition);
-          }
+        const available = await this.probeDocumentSymbols(
+          openedClient,
+          target.file,
+          getWarmPosition,
+          control,
+        );
+        if (available) {
+          this.warmedWorkspaceSymbolProjects.add(projectKey);
+          warmedAny = true;
         }
 
         const collected = await collect(this.clients.values(), query);
@@ -1147,35 +1847,56 @@ export class LspManager {
     try {
       await raceRequestControl(probe, control);
     } finally {
-      this.pendingWarmProbes.delete(projectKey);
+      if (this.pendingWarmProbes.get(projectKey) === probe) {
+        this.pendingWarmProbes.delete(projectKey);
+      }
     }
   }
 
   private async performWarmProbe(
-    _client: LspClient,
+    client: LspClient,
     resolvedFile: string,
     projectKey: string,
     control?: CodeRequestControl,
   ): Promise<void> {
+    const key = clientKey(client.name, client.root);
+    if (this.clients.get(key) !== client) return;
     const openedClient = await this.ensureFileOpen(resolvedFile);
-    if (!openedClient) return;
-
-    this.warmedSemanticProjects.add(projectKey);
+    if (!openedClient || openedClient !== client || this.clients.get(key) !== client) return;
 
     // The probe is shared state for concurrent callers. One caller's
     // cancellation must not cancel the shared in-flight queries, so only the
     // Debug Operation ID is forwarded; each caller races its own wait above.
     const sharedControl = { operationId: control?.operationId };
-    const symbols = await openedClient.documentSymbols(resolvedFile, sharedControl);
-    if (symbols.kind === "unavailable") return;
-    const hoverPosition = getWorkspaceSymbolWarmPosition(symbols.data);
-    if (hoverPosition) {
-      await openedClient.hover(resolvedFile, hoverPosition, sharedControl);
+    const available = await this.probeDocumentSymbols(
+      openedClient,
+      resolvedFile,
+      getWorkspaceSymbolWarmPosition,
+      sharedControl,
+    );
+    if (available && this.clients.get(key) === client) {
+      this.warmedSemanticProjects.add(projectKey);
     }
   }
 
-  private hasOpenFileInProject(client: LspClient, projectRoot: string): boolean {
-    return client.openFiles.some((openFile) => projectRoots.isWithinOrEqual(projectRoot, openFile));
+  private async probeDocumentSymbols(
+    client: LspClient,
+    file: string,
+    getWarmPosition: (
+      symbols: import("../config/types.ts").DocumentSymbol[] | SymbolInformation[] | null,
+    ) => import("../config/types.ts").Position | null,
+    control?: CodeRequestControl,
+  ): Promise<boolean> {
+    const symbols = control
+      ? await client.documentSymbols(file, control)
+      : await client.documentSymbols(file);
+    if (symbols.kind === "unavailable") return false;
+    const hoverPosition = getWarmPosition(symbols.data);
+    if (hoverPosition) {
+      if (control) await client.hover(file, hoverPosition, control);
+      else await client.hover(file, hoverPosition);
+    }
+    return true;
   }
 
   private workspaceSymbolProjectKey(serverName: string, projectRoot: string): string {
@@ -1210,6 +1931,17 @@ export class LspManager {
   }
 }
 
+function invalidateProjectConfigCaches(changes: readonly FileEvent[]): void {
+  for (const change of changes) {
+    const configPath = uriToFile(change.uri);
+    if (!isProjectConfigFileName(path.basename(configPath))) continue;
+    invalidateTsconfigCacheForConfig(configPath);
+    if (change.type === FileChangeType.Created) {
+      invalidateTsconfigCacheForConfigDir(path.dirname(configPath));
+    }
+  }
+}
+
 function collectClientDiagnosticEvidenceDocuments(
   snapshots: Iterable<ClientDiagnosticSnapshot>,
   cwd: string,
@@ -1225,14 +1957,14 @@ function collectClientDiagnosticEvidenceDocuments(
 function collectOutstandingDiagnosticSummaryEntries(
   snapshots: Iterable<ClientDiagnosticSnapshot>,
   cwd: string,
-  excludePatterns: string[],
+  includeFile: (file: string) => boolean,
   maxSeverity: number,
 ): OutstandingDiagnosticSummaryEntry[] {
   const fileDiags = new Map<string, OutstandingDiagnosticSummaryEntry>();
   for (const snapshot of snapshots) {
     for (const entry of snapshot.entries) {
       const file = relativeFilePathFromUri(entry.uri, cwd);
-      if (shouldIgnoreLspPath(file, cwd) || isExcludedByPattern(file, excludePatterns)) continue;
+      if (!includeFile(file)) continue;
       const existing = fileDiags.get(file) ?? createOutstandingDiagnosticSummary(file);
       const next = accumulateOutstandingDiagnostics(existing, entry.diagnostics, maxSeverity);
       if (next.total > 0) fileDiags.set(file, next);