@mrclrchtr/supi-code-intelligence 6.3.0 → 6.4.0

package/node_modules/@mrclrchtr/supi-tree-sitter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-tree-sitter",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "description": "Structural AST analysis for SuPi code intelligence",
   "license": "MIT",
   "repository": {
@@ -36,8 +36,8 @@
   "dependencies": {
     "jiti": "^2.7.0",
     "web-tree-sitter": "^0.27.0",
-    "@mrclrchtr/supi-code-runtime": "6.3.0",
-    "@mrclrchtr/supi-core": "6.3.0"
+    "@mrclrchtr/supi-code-runtime": "6.4.0",
+    "@mrclrchtr/supi-core": "6.4.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-code-intelligence",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "description": "LSP and AST navigation, search, diagnostics, and refactoring",
   "license": "MIT",
   "repository": {
@@ -35,10 +35,10 @@
   ],
   "dependencies": {
     "yaml": "^2.9.0",
-    "@mrclrchtr/supi-code-runtime": "6.3.0",
-    "@mrclrchtr/supi-core": "6.3.0",
-    "@mrclrchtr/supi-tree-sitter": "6.3.0",
-    "@mrclrchtr/supi-lsp": "6.3.0"
+    "@mrclrchtr/supi-lsp": "6.4.0",
+    "@mrclrchtr/supi-tree-sitter": "6.4.0",
+    "@mrclrchtr/supi-code-runtime": "6.4.0",
+    "@mrclrchtr/supi-core": "6.4.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/src/session/health-refresh.ts

@@ -10,6 +10,7 @@ import {
 import { recoverDiagnosticRuntime } from "../analysis/health/recovery.ts";
 import { mergeDiagnosticEvidence } from "../diagnostics/evidence.ts";
 import { refreshFileLspMaintenance, refreshLspMaintenance } from "../substrate/lsp/maintenance.ts";
+import type { LspMaintenanceState } from "../substrate/lsp/source-tracking.ts";
 import type {
   HealthDiagnosticScope,
   HealthFileReadiness,
@@ -21,13 +22,15 @@ interface HealthRefreshAttemptOptions {
   readonly diagnosticsScope: HealthDiagnosticScope;
   readonly attemptedAt: number;
   readonly cwd: string;
-  readonly sentinelSnapshot: Map<string, number>;
+  readonly maintenanceState: LspMaintenanceState;
   readonly control?: CodeRequestControl;
   readonly reportRecoveryProgress?: () => void;
 }
 
 export interface HealthRefreshCollection {
   readonly attempt: HealthRefreshAttempt;
+  /** Next typed maintenance state, committed only after the attempt returns. */
+  readonly maintenanceState: LspMaintenanceState;
   /** Final report from the runtime, retained only for the current workflow. */
   readonly diagnosticReport?: WorkspaceDiagnosticReport;
 }
@@ -49,11 +52,10 @@ async function collectFileRefreshAttempt(
   const maintenance = await refreshFileLspMaintenance({
     runtime: options.runtime,
     cwd: options.cwd,
-    sentinelSnapshot: options.sentinelSnapshot,
+    maintenanceState: options.maintenanceState,
     filePath: scope.path,
     control: options.control,
   });
-  updateSentinelSnapshot(options.sentinelSnapshot, maintenance.snapshot);
   const readiness = await options.runtime.waitUntilReadyForFile(
     scope.path,
     undefined,
@@ -62,6 +64,7 @@ async function collectFileRefreshAttempt(
   const fileReadiness: HealthFileReadiness =
     readiness.kind === "ready" ? "ready" : readiness.kind === "timeout" ? "pending" : "unavailable";
   return {
+    maintenanceState: maintenance.maintenanceState,
     attempt: {
       kind: "completed",
       attemptedAt: options.attemptedAt,
@@ -90,16 +93,16 @@ async function collectWorkspaceRefreshAttempt(
   const maintenance = await refreshLspMaintenance(
     options.runtime,
     options.cwd,
-    options.sentinelSnapshot,
+    options.maintenanceState,
     {
       control: options.control,
       scope: workspaceScope?.filter ?? null,
       trackSources: workspaceScope !== null,
     },
   );
-  updateSentinelSnapshot(options.sentinelSnapshot, maintenance.snapshot);
   if (maintenance.failureReason) {
     return {
+      maintenanceState: maintenance.maintenanceState,
       attempt: {
         kind: "failed",
         attemptedAt: options.attemptedAt,
@@ -108,6 +111,7 @@ async function collectWorkspaceRefreshAttempt(
         operationScope: "workspace-runtime",
         diagnosticEvidence: maintenance.diagnosticEvidence,
         processCrashRecovery: emptyProcessCrashRecoveryReport(),
+        ...(maintenance.sourceTracking ? { sourceTracking: maintenance.sourceTracking } : {}),
         reason: maintenance.failureReason,
       },
     };
@@ -133,6 +137,7 @@ async function collectWorkspaceRefreshAttempt(
     );
     if (recovery.refreshFailureReason) {
       return {
+        maintenanceState: maintenance.maintenanceState,
         attempt: {
           kind: "failed",
           attemptedAt: options.attemptedAt,
@@ -149,12 +154,14 @@ async function collectWorkspaceRefreshAttempt(
           },
           diagnosticEvidence,
           processCrashRecovery: recovery.processCrashRecovery,
+          ...(maintenance.sourceTracking ? { sourceTracking: maintenance.sourceTracking } : {}),
           reason: recovery.refreshFailureReason,
         },
         diagnosticReport: recovery.diagnosticReport,
       };
     }
     return {
+      maintenanceState: maintenance.maintenanceState,
       attempt: {
         kind: "completed",
         attemptedAt: options.attemptedAt,
@@ -165,6 +172,7 @@ async function collectWorkspaceRefreshAttempt(
         restartedClients: recovery.restartedClients,
         processCrashRecovery: recovery.processCrashRecovery,
         diagnosticEvidence,
+        ...(maintenance.sourceTracking ? { sourceTracking: maintenance.sourceTracking } : {}),
         staleAssessment: {
           scope: "workspace",
           suspected: recovery.staleAssessment.suspected,
@@ -179,6 +187,7 @@ async function collectWorkspaceRefreshAttempt(
     // recorded failed attempt.
     if (isCodeRequestInterruption(error, options.control)) throw error;
     return {
+      maintenanceState: maintenance.maintenanceState,
       attempt: {
         kind: "failed",
         attemptedAt: options.attemptedAt,
@@ -187,17 +196,13 @@ async function collectWorkspaceRefreshAttempt(
         operationScope: "workspace-runtime",
         diagnosticEvidence: maintenance.diagnosticEvidence,
         processCrashRecovery: emptyProcessCrashRecoveryReport(),
+        ...(maintenance.sourceTracking ? { sourceTracking: maintenance.sourceTracking } : {}),
         reason: errorMessage(error),
       },
     };
   }
 }
 
-function updateSentinelSnapshot(target: Map<string, number>, next: Map<string, number>): void {
-  target.clear();
-  for (const [key, value] of next) target.set(key, value);
-}
-
 function errorMessage(error: unknown): string {
   return error instanceof Error && error.message ? error.message : "Diagnostic refresh failed.";
 }

package/src/session/health-types.ts

@@ -6,6 +6,7 @@ import type {
   ProjectServerStatusReason,
 } from "@mrclrchtr/supi-lsp/api";
 import type { CapabilityWarningReport } from "../analysis/capability/capability-warnings.ts";
+import type { SourceTrackingReport } from "../substrate/lsp/source-tracking.ts";
 
 export type HealthSection = "diagnostics" | "servers";
 
@@ -114,6 +115,8 @@ interface CompletedHealthRefreshAttempt {
   /** Separate outcome for process-crash route recovery. */
   readonly processCrashRecovery: ProcessCrashRecoveryReport;
   readonly staleAssessment: HealthStaleAssessment;
+  /** Source discovery and bounded tracking facts for broad refreshes. */
+  readonly sourceTracking?: SourceTrackingReport;
 }
 
 /** A diagnostic refresh attempt against an explicit LSP runtime scope. */
@@ -144,6 +147,8 @@ export type HealthRefreshAttempt =
       readonly diagnosticEvidence?: DiagnosticEvidenceSummary;
       /** Process-crash outcome, when the recovery pass returned one. */
       readonly processCrashRecovery?: ProcessCrashRecoveryReport;
+      /** Source discovery and bounded tracking facts for broad refreshes. */
+      readonly sourceTracking?: SourceTrackingReport;
       /** File readiness outcome, when a file-scoped attempt failed. */
       readonly fileReadiness?: HealthFileReadiness;
       readonly reason: string;

package/src/session/health-workflow.ts

@@ -21,6 +21,7 @@ import { describeStructuralState } from "../analysis/health/recovery.ts";
 import { collectServers } from "../analysis/health/signals.ts";
 import { SEMANTIC_READINESS_TIMEOUT_REASON } from "../analysis/readiness.ts";
 import { resolveScope } from "../analysis/search/paths.ts";
+import type { LspMaintenanceState } from "../substrate/lsp/source-tracking.ts";
 import type { CapabilityAdapter } from "./capability-adapter.ts";
 import { collectHealthRefreshAttempt } from "./health-refresh.ts";
 import type {
@@ -45,8 +46,10 @@ export interface HealthWorkflowDeps {
   readonly lspController: LspRuntimeController | null;
   readonly lastRefreshAttempt: HealthRefreshAttempt | null;
   readonly trackRefreshAttempt: (attempt: HealthRefreshAttempt) => void;
-  /** Workspace sentinel snapshot for change detection. */
-  readonly sentinelSnapshot: Map<string, number>;
+  /** Typed sentinel, source-baseline, and created-source queue state. */
+  readonly maintenanceState: LspMaintenanceState;
+  /** Commit maintenance state only after a health attempt completes. */
+  readonly updateMaintenanceState: (state: LspMaintenanceState) => void;
 }
 
 /** Collect health facts without rendering a public result. */
@@ -282,7 +285,7 @@ async function collectRefreshState(
       diagnosticsScope,
       attemptedAt,
       cwd: options.deps.cwd,
-      sentinelSnapshot: options.deps.sentinelSnapshot,
+      maintenanceState: options.deps.maintenanceState,
       control: options.control,
       reportRecoveryProgress: () =>
         reportProgress(options.control, {
@@ -291,6 +294,7 @@ async function collectRefreshState(
           message: "Refreshing diagnostics and recovery state",
         }),
     });
+    deps.updateMaintenanceState(attempt.maintenanceState);
     deps.trackRefreshAttempt(attempt.attempt);
     return attempt;
   } catch (error) {

package/src/session/session.ts

@@ -20,6 +20,10 @@ import { realpathSync } from "node:fs";
 import * as path from "node:path";
 import type { SessionEntry } from "@earendil-works/pi-coding-agent";
 import type { LspRuntimeController } from "@mrclrchtr/supi-lsp/api";
+import {
+  createLspMaintenanceState,
+  type LspMaintenanceState,
+} from "../substrate/lsp/source-tracking.ts";
 import { type CapabilityAdapter, WorkspaceCapabilityAdapter } from "./capability-adapter.ts";
 import type { FindWorkflowInput, FindWorkflowOutcome } from "./find-types.ts";
 import { runFindWorkflow } from "./find-workflow.ts";
@@ -162,8 +166,8 @@ export class WorkspaceCodeIntelligenceSession {
    */
   #lspController: LspRuntimeController | null = null;
 
-  /** Workspace sentinel snapshot for change detection across explicit queries. */
-  #sentinelSnapshot: Map<string, number> = new Map();
+  /** Typed sentinel, source-baseline, and created-source queue state. */
+  #maintenanceState: LspMaintenanceState = createLspMaintenanceState();
 
   /** Whether the project owning this session is trusted for config loading. */
   #projectTrusted = false;
@@ -196,7 +200,7 @@ export class WorkspaceCodeIntelligenceSession {
    * Called by the extension entry point after LSP initialization.
    */
   seedSentinelSnapshot(snapshot: Map<string, number>): void {
-    this.#sentinelSnapshot = snapshot;
+    this.#maintenanceState = createLspMaintenanceState(snapshot);
   }
 
   /** Restore overview state from the active session branch. */
@@ -283,7 +287,10 @@ export class WorkspaceCodeIntelligenceSession {
         trackRefreshAttempt: (attempt) => {
           this.#lastHealthRefreshAttempt = attempt;
         },
-        sentinelSnapshot: this.#sentinelSnapshot,
+        maintenanceState: this.#maintenanceState,
+        updateMaintenanceState: (state) => {
+          this.#maintenanceState = state;
+        },
       },
       control,
     );
@@ -429,7 +436,7 @@ export class WorkspaceCodeIntelligenceSession {
     this.#workflowTargets.clear();
     this.#surfacedInstructionDirs.clear();
     this.#nativeInstructionPaths.clear();
-    this.#sentinelSnapshot.clear();
+    this.#maintenanceState = createLspMaintenanceState();
     this.#lspController = null;
     this.#projectTrusted = false;
   }

package/src/substrate/lsp/maintenance.ts

@@ -13,7 +13,6 @@ import {
   isCodeRequestInterruption,
   throwIfCodeRequestInterrupted,
 } from "@mrclrchtr/supi-code-runtime/api";
-import { isWithinOrEqual } from "@mrclrchtr/supi-core/api";
 import { uriToFile } from "@mrclrchtr/supi-core/path";
 import type { DiagnosticEvidenceSummary } from "@mrclrchtr/supi-lsp/api";
 import {
@@ -27,6 +26,12 @@ import {
   type WorkspaceLspRuntime,
 } from "@mrclrchtr/supi-lsp/api";
 import { mergeDiagnosticEvidence } from "../../diagnostics/evidence.ts";
+import {
+  type LspMaintenanceState,
+  type SourceTrackingReport,
+  trackCreatedSources,
+  withSentinelSnapshot,
+} from "./source-tracking.ts";
 
 /** Options shared by the workspace and file-scoped maintenance passes. */
 export interface LspMaintenanceOptions {
@@ -36,11 +41,7 @@ export interface LspMaintenanceOptions {
    * tracks created files inside this prefix; null disables the scope bound.
    */
   scope?: string | null;
-  /**
-   * Track files created since the last refresh so the following refresh pull
-   * includes them. Only the workspace-runtime path sets this; the snapshot is
-   * still widened on file-scoped passes so later diffs stay correct.
-   */
+  /** Track source additions only for a broad tracked-file refresh. */
   trackSources?: boolean;
 }
 
@@ -52,10 +53,11 @@ export interface LspMaintenanceOptions {
 export async function refreshLspMaintenance(
   runtime: WorkspaceLspRuntime,
   cwd: string,
-  sentinelSnapshot: Map<string, number>,
+  maintenanceState: LspMaintenanceState,
   options: LspMaintenanceOptions = {},
 ): Promise<WorkspaceLspMaintenanceResult> {
-  const { snapshot } = await synchronizeSentinels(runtime, sentinelSnapshot, options);
+  const synchronized = await synchronizeSentinels(runtime, cwd, maintenanceState, options);
+  const { snapshot, nextState, sourceTracking } = synchronized;
   let diagnosticEvidence = emptyEvidence();
   let failureReason: string | undefined;
 
@@ -80,15 +82,21 @@ export async function refreshLspMaintenance(
 
   return {
     snapshot,
+    maintenanceState: nextState,
     diagnosticEvidence,
+    ...(sourceTracking ? { sourceTracking } : {}),
     ...(failureReason ? { failureReason } : {}),
   };
 }
 
 /** Sentinel state and diagnostic evidence retained from one workspace pass. */
 export interface WorkspaceLspMaintenanceResult {
+  /** The next typed maintenance state for the session. */
+  maintenanceState: LspMaintenanceState;
   /** The next sentinel snapshot for the session-owned maintenance state. */
   snapshot: Map<string, number>;
+  /** Source discovery and bounded tracking facts for broad refreshes. */
+  sourceTracking?: SourceTrackingReport;
   /** Evidence from every diagnostic refresh performed by this pass. */
   diagnosticEvidence: DiagnosticEvidenceSummary;
   /** Failure from the first workspace refresh, when no fresh pass completed. */
@@ -97,6 +105,8 @@ export interface WorkspaceLspMaintenanceResult {
 
 /** Sentinel state and stale-file facts from one file-scoped pass. */
 export interface FileLspMaintenanceResult {
+  /** The next typed maintenance state for the session. */
+  maintenanceState: LspMaintenanceState;
   /** The next sentinel snapshot for the session-owned maintenance state. */
   snapshot: Map<string, number>;
   /** Number of stale files that matched the requested file. */
@@ -107,14 +117,14 @@ export interface FileLspMaintenanceResult {
 export async function refreshFileLspMaintenance(options: {
   runtime: WorkspaceLspRuntime;
   cwd: string;
-  sentinelSnapshot: Map<string, number>;
+  maintenanceState: LspMaintenanceState;
   filePath: string;
   control?: CodeRequestControl;
 }): Promise<FileLspMaintenanceResult> {
-  const { runtime, cwd, sentinelSnapshot, filePath, control } = options;
+  const { runtime, cwd, maintenanceState, filePath, control } = options;
   // A cancelled caller stops before any maintenance work starts.
   throwIfCodeRequestInterrupted(control);
-  const { snapshot } = await synchronizeSentinels(runtime, sentinelSnapshot);
+  const { snapshot, nextState } = await synchronizeSentinels(runtime, cwd, maintenanceState);
   const target = nodePath.resolve(filePath);
   const stale = confirmedOutstandingDiagnostics(runtime, cwd).some(
     (entry) =>
@@ -132,38 +142,51 @@ export async function refreshFileLspMaintenance(options: {
   runtime.pruneMissingFiles();
   throwIfCodeRequestInterrupted(control);
 
-  return { snapshot, matchedStaleFileCount: stale ? 1 : 0 };
+  return {
+    snapshot,
+    maintenanceState: nextState,
+    matchedStaleFileCount: stale ? 1 : 0,
+  };
 }
 
 /**
- * Sync the widened workspace snapshot, forward sentinel changes, and track
- * source files newly created since the last pass.
+ * Sync sentinel state and, only for broad refreshes, process source additions.
  *
- * The snapshot is widened to every regular file on every pass so later diffs
- * see genuine creations. Only sentinel-file events are forwarded as workspace
- * changes (config semantics unchanged); created source files are tracked only
- * on the workspace-runtime path and only once the snapshot was primed by an
- * earlier pass — the first pass establishes the baseline and cannot tell a
- * just-created file from a long-existing one.
+ * Sentinel state and source state use separate baselines. A complete source
+ * inventory establishes the first baseline without treating existing files as
+ * created. Limited inventories leave the previous source state unchanged.
  */
 async function synchronizeSentinels(
   runtime: WorkspaceLspRuntime,
-  sentinelSnapshot: Map<string, number>,
+  cwd: string,
+  maintenanceState: LspMaintenanceState,
   options: LspMaintenanceOptions = {},
-) {
-  const primed = sentinelSnapshot.size > 0;
-  const state = runtime.syncWorkspaceSentinelSnapshot(sentinelSnapshot, {
-    includeSourceFiles: true,
-  });
-
+): Promise<{
+  snapshot: Map<string, number>;
+  nextState: LspMaintenanceState;
+  sourceTracking?: SourceTrackingReport;
+}> {
+  const state = runtime.syncWorkspaceSentinelSnapshot(maintenanceState.sentinelSnapshot);
   invalidateChangedProjectConfigs(state.changes);
   if (state.changes.length > 0) runtime.noteWorkspaceChanges(state.changes);
 
-  if (options.trackSources && primed) {
-    await trackCreatedSourceFiles(runtime, state.sourceChanges, options.scope);
+  const nextSentinelState = withSentinelSnapshot(maintenanceState, state.snapshot);
+  if (!options.trackSources) {
+    return { snapshot: state.snapshot, nextState: nextSentinelState };
   }
 
-  return state;
+  const sourceResult = await trackCreatedSources({
+    runtime,
+    cwd,
+    state: nextSentinelState,
+    scope: options.scope,
+    control: options.control,
+  });
+  return {
+    snapshot: state.snapshot,
+    nextState: sourceResult.state,
+    sourceTracking: sourceResult.report,
+  };
 }
 
 /** Invalidate cached tsconfig scope parses only for config files that changed. */
@@ -181,23 +204,6 @@ function invalidateChangedProjectConfigs(changes: readonly FileEvent[]): void {
   }
 }
 
-/** Track source files newly created since the last pass, within the scope bound. */
-async function trackCreatedSourceFiles(
-  runtime: WorkspaceLspRuntime,
-  sourceChanges: readonly FileEvent[],
-  scope: string | null | undefined,
-): Promise<void> {
-  for (const change of sourceChanges) {
-    if (change.type !== FileChangeType.Created) continue;
-    const filePath = uriToFile(change.uri);
-    if (scope && !isWithinOrEqual(scope, filePath)) continue;
-    if (!runtime.isSupportedSourceFile(filePath)) continue;
-    // Best-effort: a file no client can serve stays untracked and is
-    // simply absent from evidence until a later explicit request.
-    await runtime.trackFile(filePath);
-  }
-}
-
 /** Return only diagnostics whose document evidence is confirmed. */
 function confirmedOutstandingDiagnostics(runtime: WorkspaceLspRuntime, cwd: string) {
   const outstanding = runtime.getOutstandingDiagnostics(1);