@mrclrchtr/supi-code-intelligence 6.1.0 → 6.2.0

package/node_modules/@mrclrchtr/supi-lsp/src/diagnostics/workspace-sentinels.ts

@@ -1,9 +1,13 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { fileToUri, uriToFile } from "@mrclrchtr/supi-core/path";
 import { FileChangeType, type FileEvent } from "../config/types.ts";
-import { fileToUri, uriToFile } from "../utils.ts";
+import {
+  type AutomaticLspPathPolicy,
+  createDefaultAutomaticLspPathPolicy,
+  walkAutomaticLspTree,
+} from "../workspace-path-policy.ts";
 
-const IGNORED_DIRECTORIES = new Set(["node_modules", ".pnpm", ".git", "dist", "coverage"]);
 const ROOT_LOCKFILES = ["pnpm-lock.yaml", "package-lock.json", "yarn.lock", "bun.lockb"];
 
 export interface WorkspaceSentinelScanOptions {
@@ -13,6 +17,8 @@ export interface WorkspaceSentinelScanOptions {
    * the diff then reports them as `sourceChanges` so the caller can pull them.
    */
   includeSourceFiles?: boolean;
+  /** Runtime-owned automatic path policy. */
+  policy?: AutomaticLspPathPolicy;
 }
 
 /** Build a fresh snapshot of workspace sentinel files and their mtimes. */
@@ -25,11 +31,19 @@ export function scanWorkspaceSentinels(
 
   if (!fs.existsSync(resolvedCwd)) return snapshot;
 
-  try {
-    walkWorkspace(resolvedCwd, resolvedCwd, snapshot, options.includeSourceFiles ?? false);
-  } catch {
-    return snapshot;
-  }
+  const policy = options.policy ?? createDefaultAutomaticLspPathPolicy(resolvedCwd);
+  walkAutomaticLspTree(policy, resolvedCwd, Number.MAX_SAFE_INTEGER, (directory, entries) => {
+    for (const entry of entries) {
+      if (!entry.isFile() && !entry.isSymbolicLink()) continue;
+      const filePath = path.join(directory, entry.name);
+      if (!options.includeSourceFiles && !isWorkspaceSentinelPath(filePath, resolvedCwd)) continue;
+      try {
+        snapshot.set(filePath, fs.statSync(filePath).mtimeMs);
+      } catch {
+        // File deleted between readdir and stat — skip.
+      }
+    }
+  });
 
   return snapshot;
 }
@@ -60,6 +74,13 @@ export function diffWorkspaceSentinelSnapshot(
   return changes.sort((a, b) => a.uri.localeCompare(b.uri));
 }
 
+/** One policy-filtered workspace inventory refresh. */
+export interface WorkspaceSentinelSyncResult {
+  snapshot: Map<string, number>;
+  changes: FileEvent[];
+  sourceChanges: FileEvent[];
+}
+
 /**
  * Refresh a previous snapshot and return the new snapshot plus change events.
  *
@@ -72,7 +93,7 @@ export function syncWorkspaceSentinelSnapshot(
   cwd: string,
   previous: Map<string, number>,
   options: WorkspaceSentinelScanOptions = {},
-): { snapshot: Map<string, number>; changes: FileEvent[]; sourceChanges: FileEvent[] } {
+): WorkspaceSentinelSyncResult {
   const snapshot = scanWorkspaceSentinels(cwd, options);
   const changes = diffWorkspaceSentinelSnapshot(previous, snapshot);
   if (!options.includeSourceFiles) return { snapshot, changes, sourceChanges: [] };
@@ -91,47 +112,6 @@ export function syncWorkspaceSentinelSnapshot(
   };
 }
 
-/** Determine whether a file path should trigger workspace recovery. */
-export function isWorkspaceRecoveryTrigger(filePath: string, cwd: string): boolean {
-  const root = path.resolve(cwd);
-  return isWorkspaceSentinelPath(path.resolve(root, filePath), root);
-}
-
-function walkWorkspace(
-  root: string,
-  directory: string,
-  snapshot: Map<string, number>,
-  includeSourceFiles: boolean,
-): void {
-  let entries: fs.Dirent[];
-  try {
-    entries = fs.readdirSync(directory, { withFileTypes: true });
-  } catch {
-    // Permission error or deleted directory — skip it rather than
-    // failing the entire scan. A partial snapshot still detects
-    // changes in accessible subtrees.
-    return;
-  }
-
-  for (const entry of entries) {
-    if (entry.isDirectory()) {
-      if (IGNORED_DIRECTORIES.has(entry.name)) continue;
-      walkWorkspace(root, path.join(directory, entry.name), snapshot, includeSourceFiles);
-      continue;
-    }
-
-    if (!entry.isFile()) continue;
-
-    const filePath = path.join(directory, entry.name);
-    if (!includeSourceFiles && !isWorkspaceSentinelPath(filePath, root)) continue;
-    try {
-      snapshot.set(filePath, fs.statSync(filePath).mtimeMs);
-    } catch {
-      // File deleted between readdir and stat — skip.
-    }
-  }
-}
-
 function isWorkspaceSentinelPath(filePath: string, root: string): boolean {
   const name = path.basename(filePath);
 

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

@@ -3,6 +3,7 @@ import {
   type CodeRequestControl,
   isCodeRequestInterruption,
 } from "@mrclrchtr/supi-code-runtime/api";
+import { uriToFile } from "@mrclrchtr/supi-core/path";
 import type { LspClient } from "../client/client.ts";
 import { getDiagnosticFileState } from "../client/client-file-state.ts";
 import {
@@ -10,7 +11,6 @@ import {
   type DiagnosticEvidenceSummary,
   summarizeDiagnosticEvidence,
 } from "../diagnostics/evidence.ts";
-import { uriToFile } from "../utils.ts";
 
 export function closeFileAcrossClients(clients: Iterable<LspClient>, filePath: string): void {
   const resolvedPath = path.resolve(filePath);

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

@@ -7,9 +7,8 @@ import {
 import type { LspClient } from "../client/client.ts";
 import type { DiagnosticEntry } from "../client/client-document-state.ts";
 import type { Diagnostic } from "../config/types.ts";
+import { effectiveDiagnosticSeverity } from "../diagnostics/diagnostic-severity.ts";
 import { relativeFilePathFromUri } from "../diagnostics/diagnostic-summary.ts";
-import { shouldIgnoreLspPath } from "../summary.ts";
-import { isExcludedByPattern } from "./manager-helpers.ts";
 
 /** Sync one file and return diagnostics up to the supplied severity threshold. */
 export async function syncClientFileAndGetDiagnostics(
@@ -30,7 +29,7 @@ export async function syncClientFileAndGetDiagnostics(
 export function collectOutstandingDiagnosticsDetailed(
   clientEntries: Iterable<ReadonlyArray<DiagnosticEntry>>,
   cwd: string,
-  excludePatterns: string[],
+  includeFile: (file: string) => boolean,
   maxSeverity: number,
 ): Array<{ file: string; diagnostics: Diagnostic[] }> {
   const fileDiags = new Map<string, Diagnostic[]>();
@@ -38,8 +37,7 @@ export function collectOutstandingDiagnosticsDetailed(
   for (const entries of clientEntries) {
     for (const entry of entries) {
       const file = relativeFilePathFromUri(entry.uri, cwd);
-      if (shouldIgnoreLspPath(file, cwd)) continue;
-      if (isExcludedByPattern(file, excludePatterns)) continue;
+      if (!includeFile(file)) continue;
       const filtered = filterDiagnosticsBySeverity(entry.diagnostics, maxSeverity);
       if (filtered.length === 0) continue;
       const existing = fileDiags.get(file) ?? [];
@@ -53,7 +51,5 @@ export function collectOutstandingDiagnosticsDetailed(
 }
 
 function filterDiagnosticsBySeverity(diagnostics: Diagnostic[], maxSeverity: number): Diagnostic[] {
-  return diagnostics.filter(
-    (diagnostic) => diagnostic.severity !== undefined && diagnostic.severity <= maxSeverity,
-  );
+  return diagnostics.filter((diagnostic) => effectiveDiagnosticSeverity(diagnostic) <= maxSeverity);
 }

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

@@ -1,7 +1,6 @@
 import * as path from "node:path";
+import { resolveToolPath as resolveSessionPath } from "@mrclrchtr/supi-core/path";
 import * as projectRoots from "@mrclrchtr/supi-core/project";
-import { isGlobMatch } from "../pattern-matcher.ts";
-import { resolveSessionPath } from "../utils.ts";
 
 /** Unique key for a client identified by server name and root. */
 export function clientKey(serverName: string, root: string): string {
@@ -32,10 +31,3 @@ export function rememberKnownRoot(
   const roots = knownRoots.get(serverName) ?? [];
   knownRoots.set(serverName, projectRoots.mergeKnownRoots(roots, root));
 }
-
-/** Check if a file path matches any user-configured exclude pattern. */
-export function isExcludedByPattern(file: string, excludePatterns: string[]): boolean {
-  return (
-    excludePatterns.length > 0 && excludePatterns.some((pattern) => isGlobMatch(file, pattern))
-  );
-}

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

@@ -1,5 +1,4 @@
 import type { LspClient } from "../client/client.ts";
-import { getSupportedLspServerActions } from "../config/server-actions.ts";
 import type { ProjectServerInfo, ProjectServerStatusReason } from "../config/server-config.ts";
 import { displayRelativeFilePath } from "../summary.ts";
 
@@ -10,6 +9,8 @@ interface ProjectServerInfoInput {
   client: LspClient | undefined;
   unavailableReason?: "missing-command" | "start-failed" | "runtime-error";
   statusReason?: ProjectServerStatusReason;
+  /** Filter files from ambient project status without changing explicit routing. */
+  includeOpenFile?: (file: string) => boolean;
 }
 
 export function buildProjectServerInfo(
@@ -32,8 +33,10 @@ export function buildProjectServerInfo(
     fileTypes: input.fileTypes,
     status,
     ...(input.statusReason ? { statusReason: input.statusReason } : {}),
-    supportedActions: getSupportedLspServerActions(input.client?.serverCapabilities),
-    openFiles: input.client?.openFiles.map((file) => displayRelativeFilePath(file, cwd)) ?? [],
+    openFiles:
+      input.client?.openFiles
+        .filter((file) => input.includeOpenFile?.(file) ?? true)
+        .map((file) => displayRelativeFilePath(file, cwd)) ?? [],
     ready: input.client?.ready ?? false,
   };
 }

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

@@ -16,12 +16,19 @@ import {
   assessStaleDiagnostics,
   type StaleDiagnosticAssessment,
 } from "../diagnostics/stale-diagnostics.ts";
-import type { WorkspaceDiagnosticReport } from "../session/runtime-diagnostics.ts";
+import {
+  emptyProcessCrashRecoverySummary,
+  type ProcessCrashRecoverySummary,
+  type WorkspaceDiagnosticReport,
+} from "../session/runtime-diagnostics.ts";
 
 export interface WorkspaceRecoveryResult {
   /** Active clients targeted by the best-effort refresh, not confirmed successful refreshes. */
   attemptedClients: number;
+  /** Clients restarted by stale-diagnostic recovery, not process-crash recovery. */
   restartedClients: number;
+  /** No process-crash demand is handled by this generic recovery pass. */
+  processCrashRecovery: ProcessCrashRecoverySummary;
   /** Server names of the active clients targeted by this pass, for telemetry identity. */
   attemptedServers: string[];
   /** Server names of the clients restarted during this pass, for telemetry identity. */
@@ -157,6 +164,7 @@ export async function recoverWorkspaceDiagnostics(
     return {
       attemptedClients,
       restartedClients,
+      processCrashRecovery: emptyProcessCrashRecoverySummary(),
       attemptedServers,
       restartedServers: restartServerNames,
       ...(restartReason ? { restartReason } : {}),

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

@@ -1,4 +1,3 @@
-import * as fs from "node:fs";
 import * as path from "node:path";
 import {
   type CodeQueryResult,
@@ -7,7 +6,6 @@ import {
   partialCodeQuery,
   unavailableCodeQuery,
 } from "@mrclrchtr/supi-code-runtime/api";
-import { walkProject } from "@mrclrchtr/supi-core/project";
 import type { LspClient } from "../client/client.ts";
 import type {
   DocumentSymbol,
@@ -15,10 +13,14 @@ import type {
   SymbolInformation,
   WorkspaceSymbol,
 } from "../config/types.ts";
+import {
+  type AutomaticLspPathPolicy,
+  createDefaultAutomaticLspPathPolicy,
+  walkAutomaticLspTree,
+} from "../workspace-path-policy.ts";
 
 type WorkspaceSymbolLike = SymbolInformation | WorkspaceSymbol;
 
-const SKIP_DIRS = new Set(["node_modules", ".git", ".pnpm", "dist", "build", "coverage"]);
 const DEFAULT_WARM_FILE_DEPTH = 4;
 const DEFAULT_MARKER_SCAN_DEPTH = 6;
 
@@ -30,6 +32,8 @@ export interface WorkspaceSymbolWarmTarget {
 export interface WorkspaceSymbolWarmOptions {
   maxFileDepth?: number;
   maxMarkerDepth?: number;
+  /** Runtime-owned automatic path policy. */
+  policy?: AutomaticLspPathPolicy;
 }
 
 export function getWorkspaceSymbolWarmPosition(
@@ -98,14 +102,6 @@ export function workspaceSymbolCollectionResult(
   return completedCodeQuery(collection.results);
 }
 
-export async function managerWorkspaceSymbol(
-  clients: Iterable<LspClient>,
-  query: string,
-  control?: CodeRequestControl,
-): Promise<CodeQueryResult<WorkspaceSymbolLike[]>> {
-  return workspaceSymbolCollectionResult(await collectWorkspaceSymbols(clients, query, control));
-}
-
 export function findWorkspaceSymbolWarmTargets(
   root: string,
   rootMarkers: string[],
@@ -116,12 +112,13 @@ export function findWorkspaceSymbolWarmTargets(
   const allowed = new Set(fileTypes.map((fileType) => fileType.toLowerCase()));
   const maxFileDepth = options.maxFileDepth ?? DEFAULT_WARM_FILE_DEPTH;
   const maxMarkerDepth = options.maxMarkerDepth ?? DEFAULT_MARKER_SCAN_DEPTH;
+  const policy = options.policy ?? createDefaultAutomaticLspPathPolicy(resolvedRoot);
   if (allowed.size === 0) return [];
 
-  const markerRoots = collectMarkerRoots(resolvedRoot, rootMarkers, maxMarkerDepth);
+  const markerRoots = collectMarkerRoots(resolvedRoot, rootMarkers, maxMarkerDepth, policy);
   const targets = markerRoots
     .map((entry) => {
-      const file = findWarmFileRecursive(entry.root, allowed, maxFileDepth);
+      const file = findWarmFileRecursive(entry.root, allowed, maxFileDepth, policy);
       return file ? { projectRoot: entry.root, file, priority: entry.priority } : null;
     })
     .filter((entry): entry is { projectRoot: string; file: string; priority: number } =>
@@ -137,7 +134,7 @@ export function findWorkspaceSymbolWarmTargets(
 
   if (targets.length > 0) return targets;
 
-  const fallback = findWarmFileRecursive(resolvedRoot, allowed, maxFileDepth);
+  const fallback = findWarmFileRecursive(resolvedRoot, allowed, maxFileDepth, policy);
   return fallback ? [{ projectRoot: resolvedRoot, file: fallback }] : [];
 }
 
@@ -150,13 +147,15 @@ function collectMarkerRoots(
   root: string,
   rootMarkers: string[],
   maxDepth: number,
+  policy: AutomaticLspPathPolicy,
 ): MarkerRootEntry[] {
   if (rootMarkers.length === 0) return [];
 
   const markerIndex = new Map(rootMarkers.map((marker, index) => [marker, index]));
   const matches = new Map<string, number>();
 
-  walkProject(root, maxDepth, (directory, entryNames) => {
+  walkAutomaticLspTree(policy, root, maxDepth, (directory, entries) => {
+    const entryNames = new Set(entries.map((entry) => entry.name));
     const matchedPriority = rootMarkers.reduce<number | null>((best, marker) => {
       if (!entryNames.has(marker)) return best;
       const next = markerIndex.get(marker) ?? Number.MAX_SAFE_INTEGER;
@@ -181,31 +180,17 @@ function findWarmFileRecursive(
   directory: string,
   allowed: Set<string>,
   depth: number,
+  policy: AutomaticLspPathPolicy,
 ): string | null {
-  let entries: fs.Dirent[];
-  try {
-    entries = fs.readdirSync(directory, { withFileTypes: true });
-  } catch {
-    return null;
-  }
-
-  const sortedEntries = [...entries].sort((a, b) => a.name.localeCompare(b.name));
-
-  for (const entry of sortedEntries) {
-    if (!entry.isFile()) continue;
-    const ext = path.extname(entry.name).slice(1).toLowerCase();
-    if (!allowed.has(ext)) continue;
-    return path.join(directory, entry.name);
-  }
-
-  if (depth <= 0) return null;
-
-  for (const entry of sortedEntries) {
-    if (!entry.isDirectory()) continue;
-    if (SKIP_DIRS.has(entry.name)) continue;
-    const nested = findWarmFileRecursive(path.join(directory, entry.name), allowed, depth - 1);
-    if (nested) return nested;
-  }
-
-  return null;
+  let warmFile: string | null = null;
+  walkAutomaticLspTree(policy, directory, depth, (currentDirectory, entries) => {
+    for (const entry of entries) {
+      if (!entry.isFile() && !entry.isSymbolicLink()) continue;
+      if (!allowed.has(path.extname(entry.name).slice(1).toLowerCase())) continue;
+      warmFile = path.join(currentDirectory, entry.name);
+      return true;
+    }
+    return false;
+  });
+  return warmFile;
 }