@optave/codegraph 2.0.0 → 2.1.1-dev.00f091c

package/src/resolve.js

@@ -31,7 +31,7 @@ function resolveViaAlias(importSource, aliases, _rootDir) {
     }
   }
 
-  for (const [pattern, targets] of Object.entries(aliases.paths)) {
+  for (const [pattern, targets] of Object.entries(aliases.paths || {})) {
     const prefix = pattern.replace(/\*$/, '');
     if (!importSource.startsWith(prefix)) continue;
     const rest = importSource.slice(prefix.length);
@@ -113,12 +113,13 @@ export function resolveImportPath(fromFile, importSource, rootDir, aliases) {
   const native = loadNative();
   if (native) {
     try {
-      return native.resolveImport(
+      const result = native.resolveImport(
         fromFile,
         importSource,
         rootDir,
         convertAliasesForNative(aliases),
       );
+      return normalizePath(path.normalize(result));
     } catch {
       // fall through to JS
     }
@@ -158,7 +159,7 @@ export function resolveImportsBatch(inputs, rootDir, aliases) {
     const results = native.resolveImports(nativeInputs, rootDir, convertAliasesForNative(aliases));
     const map = new Map();
     for (const r of results) {
-      map.set(`${r.fromFile}|${r.importSource}`, r.resolvedPath);
+      map.set(`${r.fromFile}|${r.importSource}`, normalizePath(path.normalize(r.resolvedPath)));
     }
     return map;
   } catch {

package/src/watcher.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { EXTENSIONS, IGNORE_DIRS, normalizePath } from './constants.js';
 import { initSchema, openDb } from './db.js';
+import { appendJournalEntries } from './journal.js';
 import { info, warn } from './logger.js';
 import { createParseTreeCache, getActiveEngine, parseFileIncremental } from './parser.js';
 import { resolveImportPath } from './resolve.js';
@@ -205,6 +206,19 @@ export async function watchProject(rootDir, opts = {}) {
     }
     const updates = results;
 
+    // Append processed files to journal for Tier 0 detection on next build
+    if (updates.length > 0) {
+      const entries = updates.map((r) => ({
+        file: r.file,
+        deleted: r.deleted || false,
+      }));
+      try {
+        appendJournalEntries(rootDir, entries);
+      } catch {
+        /* journal write failure is non-fatal */
+      }
+    }
+
     for (const r of updates) {
       const nodeDelta = r.nodesAdded - r.nodesRemoved;
       const nodeStr = nodeDelta >= 0 ? `+${nodeDelta}` : `${nodeDelta}`;
@@ -234,6 +248,17 @@ export async function watchProject(rootDir, opts = {}) {
   process.on('SIGINT', () => {
     console.log('\nStopping watcher...');
     watcher.close();
+    // Flush any pending file paths to journal before exit
+    if (pending.size > 0) {
+      const entries = [...pending].map((filePath) => ({
+        file: normalizePath(path.relative(rootDir, filePath)),
+      }));
+      try {
+        appendJournalEntries(rootDir, entries);
+      } catch {
+        /* best-effort */
+      }
+    }
     if (cache) cache.clear();
     db.close();
     process.exit(0);