@psnext/lscg 0.1.4 → 0.1.6

package/dist/src/watch.js

@@ -1,30 +1,118 @@
+import { readdirSync, watch as watchFileSystem } from 'node:fs';
+import path from 'node:path';
 import { setTimeout as sleep } from 'node:timers/promises';
-import { repositoryForRoot, scanRepository } from './graph/repository.js';
+import { drainRepositoryEnrichment, repositoryForRoot, scanRepository } from './graph/repository.js';
 import { collectRepositoryFingerprint } from './scanner/fingerprint.js';
+import { discoverSourceFiles } from './scanner/discover.js';
+import { isSupportedSourceFile } from './parser/treeSitter.js';
 const DEFAULT_POLL_INTERVAL_MS = 1000;
+const DEFAULT_DEBOUNCE_MS = 100;
+const IGNORED_WATCH_DIRECTORIES = new Set(['.git', 'node_modules', 'dist', 'coverage', '.next', '.turbo', '.cache', '.sling']);
 export async function watchRepository(options = {}, dependencies = {}) {
     const scope = resolveWatchScope(options.scope);
     const repository = repositoryForRoot(options.root);
     const scanFn = dependencies.scanRepository ?? scanRepository;
+    const drainEnrichment = dependencies.drainEnrichment ?? drainRepositoryEnrichment;
     const fingerprintFn = dependencies.fingerprint ?? ((root) => collectRepositoryFingerprint(root));
+    const watcherFactory = dependencies.watcherFactory ?? defaultWatcherFactory;
     const emit = dependencies.emit ?? defaultEmit;
     const wait = dependencies.wait ?? defaultWait;
     const signal = dependencies.signal;
     const mode = dependencies.mode ?? 'watch';
+    const progress = dependencies.progress;
     const intervalMs = options.intervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+    const debounceMs = options.debounceMs ?? DEFAULT_DEBOUNCE_MS;
     let scans = 0;
     let stopped = false;
-    let currentFingerprint = await fingerprintFn(repository.root);
-    emit({
-        event: 'watching',
-        mode,
-        repository,
-        scope
-    });
+    let scanning = false;
+    let polling = false;
+    let currentFingerprint;
+    let followUpQueued = false;
+    let pendingEventPaths = new Set();
+    let failed = false;
+    let wakeWaiting;
+    const watchers = [];
+    const wake = () => {
+        const resolve = wakeWaiting;
+        wakeWaiting = undefined;
+        resolve?.();
+    };
+    const queueReconciliation = () => {
+        if (scanning) {
+            followUpQueued = true;
+        }
+        else {
+            pendingEventPaths.add('');
+        }
+        wake();
+    };
+    const usePollingFallback = () => {
+        if (polling)
+            return;
+        polling = true;
+        currentFingerprint = undefined;
+        closeWatchers(watchers);
+        reportWatchProgress(progress, { event: 'polling-fallback', mode, repository, scope, detail: 'filesystem watcher unavailable; polling fallback enabled' });
+        queueReconciliation();
+    };
+    const handleWatchEvent = (watchedDirectory, event, filename) => {
+        if (event === 'rename' || filename === null) {
+            usePollingFallback();
+            return;
+        }
+        const relativePath = relevantWatchPath(repository.root, watchedDirectory, filename);
+        if (!relativePath)
+            return;
+        pendingEventPaths.add(relativePath);
+        if (scanning)
+            followUpQueued = true;
+        wake();
+    };
+    const addWatcher = (directory, recursive) => {
+        const watcher = watcherFactory(directory, { recursive }, (event, filename) => handleWatchEvent(directory, event, filename));
+        watcher.on('error', () => usePollingFallback());
+        watchers.push(watcher);
+    };
     try {
+        try {
+            addWatcher(repository.root, true);
+        }
+        catch {
+            closeWatchers(watchers);
+            try {
+                for (const directory of watchDirectories(repository.root)) {
+                    addWatcher(directory, false);
+                }
+            }
+            catch {
+                closeWatchers(watchers);
+                polling = true;
+                reportWatchProgress(progress, { event: 'polling-fallback', mode, repository, scope, detail: 'filesystem watcher unavailable; polling fallback enabled' });
+            }
+        }
+        emit({
+            event: 'watching',
+            mode,
+            repository,
+            scope
+        });
+        reportWatchProgress(progress, { event: 'watching', mode, repository, scope, detail: 'watch session started' });
         while (!signal?.aborted) {
-            const scanStartFingerprint = currentFingerprint;
-            const summary = await scanFn({ root: repository.root, scope });
+            scanning = true;
+            const phase = scans === 0 ? 'initial-scan' : 'rescan';
+            reportWatchProgress(progress, { event: phase, mode, repository, scope, detail: scans === 0 ? 'starting initial scan' : 'starting rescan' });
+            const scanStartFingerprint = polling ? await fingerprintFn(repository.root) : undefined;
+            const structuralSummary = await scanFn({ root: repository.root, scope, attribution: options.attribution, plugins: options.plugins, progress });
+            // A watch owns in-process enrichment. Awaiting it while `scanning` is
+            // true serializes durable work with structural replacement; a filesystem
+            // event during either phase queues exactly one follow-up structural scan.
+            const shouldDrainEnrichment = options.attribution === true || dependencies.drainEnrichment !== undefined;
+            const enrichment = shouldDrainEnrichment
+                ? await drainEnrichment({ root: repository.root, scope, historyFingerprint: undefined })
+                : { state: 'disabled', pending: 0, complete: 0, failed: 0, unavailable: 0, notApplicable: 0, diagnostics: [] };
+            reportWatchProgress(progress, { event: 'enrichment', mode, repository, scope, detail: `state=${enrichment.state} pending=${enrichment.pending} complete=${enrichment.complete} failed=${enrichment.failed}` });
+            const summary = { ...structuralSummary, enrichment };
+            scanning = false;
             scans += 1;
             emit({
                 event: 'scan',
@@ -34,44 +122,60 @@ export async function watchRepository(options = {}, dependencies = {}) {
                 scope,
                 summary: summarizeScan(summary)
             });
-            const scanEndFingerprint = await fingerprintFn(repository.root);
-            currentFingerprint = scanEndFingerprint;
+            if (polling) {
+                const scanEndFingerprint = await fingerprintFn(repository.root);
+                const changedDuringScan = scanStartFingerprint !== undefined && scanEndFingerprint !== scanStartFingerprint;
+                currentFingerprint = scanEndFingerprint;
+                if (changedDuringScan)
+                    followUpQueued = true;
+            }
             if (signal?.aborted)
                 break;
-            if (scanEndFingerprint !== scanStartFingerprint) {
-                emit({
-                    event: 'rescan-triggered',
-                    mode,
-                    reason: 'follow-up',
-                    repository,
-                    scope
-                });
+            if (followUpQueued) {
+                followUpQueued = false;
+                pendingEventPaths = new Set();
+                emitRescanTriggered('follow-up', mode, repository, scope, emit, progress);
                 continue;
             }
-            emit({
-                event: 'waiting',
-                mode,
-                repository,
-                scope
-            });
-            while (!signal?.aborted) {
-                await wait(intervalMs, signal);
-                const nextFingerprint = await fingerprintFn(repository.root);
-                if (nextFingerprint !== currentFingerprint) {
+            emit({ event: 'waiting', mode, repository, scope });
+            reportWatchProgress(progress, { event: 'waiting', mode, repository, scope, detail: polling ? 'waiting for polling interval' : 'waiting for file changes' });
+            if (polling) {
+                while (!signal?.aborted) {
+                    await wait(intervalMs, signal);
+                    const nextFingerprint = await fingerprintFn(repository.root);
+                    if (nextFingerprint === currentFingerprint)
+                        continue;
                     currentFingerprint = nextFingerprint;
-                    emit({
-                        event: 'rescan-triggered',
-                        mode,
-                        reason: 'file-change',
-                        repository,
-                        scope
-                    });
+                    emitRescanTriggered('file-change', mode, repository, scope, emit, progress);
                     break;
                 }
+                continue;
+            }
+            if (pendingEventPaths.size === 0) {
+                await waitForWatchEvent(signal, (resolve) => {
+                    wakeWaiting = resolve;
+                });
             }
+            if (signal?.aborted)
+                break;
+            if (polling)
+                continue;
+            if (pendingEventPaths.size === 0)
+                continue;
+            await wait(debounceMs, signal);
+            if (signal?.aborted)
+                break;
+            pendingEventPaths = new Set();
+            emitRescanTriggered('file-change', mode, repository, scope, emit, progress);
         }
     }
+    catch (error) {
+        failed = true;
+        reportWatchProgress(progress, { event: 'failed', mode, repository, scope, detail: error instanceof Error ? error.message : String(error) });
+        throw error;
+    }
     finally {
+        closeWatchers(watchers);
         stopped = true;
         emit({
             event: 'stopped',
@@ -80,28 +184,90 @@ export async function watchRepository(options = {}, dependencies = {}) {
             scope,
             scans
         });
+        if (!failed)
+            reportWatchProgress(progress, { event: 'stopped', mode, repository, scope, detail: `watch session stopped after ${scans} scan(s)` });
     }
-    return {
-        repository,
-        scope,
-        scans,
-        stopped
-    };
+    return { repository, scope, scans, stopped };
 }
 function resolveWatchScope(scope) {
     if (scope === undefined || scope === 'repo')
         return 'repo';
     throw new Error('watch mode supports repo scope only');
 }
+function watchDirectories(root) {
+    const directories = new Set([root]);
+    for (const relativePath of discoverSourceFiles(root)) {
+        directories.add(path.dirname(path.join(root, relativePath)));
+    }
+    // Immediate module directories contain the supported Maven/Gradle manifests
+    // and must also be watched when a module has no source files yet.
+    try {
+        for (const entry of readdirSync(root, { withFileTypes: true })) {
+            if (entry.isDirectory() && !entry.isSymbolicLink() && !IGNORED_WATCH_DIRECTORIES.has(entry.name))
+                directories.add(path.join(root, entry.name));
+        }
+    }
+    catch { /* scan will report traversal degradation */ }
+    return [...directories].sort();
+}
+function relevantWatchPath(root, watchedDirectory, filename) {
+    const filenameText = Buffer.isBuffer(filename) ? filename.toString() : filename;
+    const absolutePath = path.resolve(watchedDirectory, filenameText);
+    const relativePath = path.relative(root, absolutePath);
+    if (!relativePath || path.isAbsolute(relativePath) || relativePath === '..' || relativePath.startsWith(`..${path.sep}`))
+        return undefined;
+    const pathSegments = relativePath.split(path.sep);
+    if (pathSegments.some((segment) => IGNORED_WATCH_DIRECTORIES.has(segment)))
+        return undefined;
+    const basename = path.basename(relativePath);
+    const depth = pathSegments.length;
+    const supportedManifest = depth <= 2 && (basename === 'pom.xml' || basename === 'build.gradle' || basename === 'build.gradle.kts');
+    if (basename !== 'package.json' && !isSupportedSourceFile(absolutePath) && !supportedManifest)
+        return undefined;
+    return relativePath;
+}
+function closeWatchers(watchers) {
+    while (watchers.length > 0) {
+        watchers.pop()?.close();
+    }
+}
+function waitForWatchEvent(signal, setWake) {
+    return new Promise((resolve) => {
+        const done = () => {
+            signal?.removeEventListener('abort', done);
+            resolve();
+        };
+        if (signal?.aborted) {
+            done();
+            return;
+        }
+        setWake(done);
+        signal?.addEventListener('abort', done, { once: true });
+    });
+}
+function emitRescanTriggered(reason, mode, repository, scope, emit, progress) {
+    emit({ event: 'rescan-triggered', mode, reason, repository, scope });
+    reportWatchProgress(progress, { event: reason === 'follow-up' ? 'follow-up' : 'coalesced-change', mode, repository, scope, detail: reason === 'follow-up' ? 'change queued during scan; running follow-up' : 'coalesced file changes; running one rescan' });
+}
 function summarizeScan(summary) {
     return {
         filesDiscovered: summary.filesDiscovered,
         filesScanned: summary.filesScanned,
         nodesWritten: summary.nodesWritten,
         edgesWritten: summary.edgesWritten,
-        skippedCount: summary.skipped.length
+        skippedCount: summary.skipped.length,
+        enrichment: summary.enrichment
     };
 }
+function reportWatchProgress(progress, event) {
+    try {
+        progress?.({ kind: 'watch', ...event });
+    }
+    catch { /* progress is observational */ }
+}
+function defaultWatcherFactory(directory, options, listener) {
+    return watchFileSystem(directory, options, (event, filename) => listener(event, filename));
+}
 function defaultEmit(event) {
     console.log(JSON.stringify(event));
 }
@@ -110,9 +276,8 @@ async function defaultWait(ms, signal) {
         await sleep(ms, undefined, signal ? { signal } : undefined);
     }
     catch (error) {
-        if (!signal?.aborted) {
+        if (!signal?.aborted)
             throw error;
-        }
     }
 }
 //# sourceMappingURL=watch.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@psnext/lscg",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Local source context graphs for repositories, exposed as a CLI and MCP server.",
   "type": "module",
   "bin": {
@@ -33,7 +33,9 @@
     "pretest": "npm run build",
     "test": "node --test ./dist/test/*.test.js",
     "prebenchmark:context": "npm run build",
-    "benchmark:context": "node ./dist/test/context-benchmark.js"
+    "benchmark:context": "node ./dist/test/context-benchmark.js",
+    "prebenchmark:scan-watch": "npm run build",
+    "benchmark:scan-watch": "node ./dist/test/scan-watch-benchmark.js"
   },
   "keywords": [
     "tree-sitter",
@@ -51,13 +53,17 @@
     "install-scripts": "^1.2.0",
     "tree-sitter": "^0.21.1",
     "tree-sitter-javascript": "^0.23.1",
+    "tree-sitter-python": "^0.21.0",
+    "tree-sitter-java": "0.21.0",
     "tree-sitter-typescript": "^0.23.2",
     "zod": "^3.25.76"
   },
   "allowScripts": {
     "tree-sitter@0.21.1": true,
     "tree-sitter-javascript@0.23.1": true,
-    "tree-sitter-typescript@0.23.2": true
+    "tree-sitter-typescript@0.23.2": true,
+    "tree-sitter-python@0.21.0": true,
+    "tree-sitter-java@0.21.0": true
   },
   "devDependencies": {
     "@types/node": "^26.1.2",