fix(watcher): queue refresh during indexing

Author: PatrickSys

src/index.ts

@@ -252,6 +252,8 @@ const indexState: IndexState = {
   status: 'idle'
 };
 
+let autoRefreshQueued = false;
+
 const server: Server = new Server(
   {
     name: 'codebase-context',
@@ -512,7 +514,7 @@ async function extractGitMemories(): Promise<number> {
   return added;
 }
 
-async function performIndexing(incrementalOnly?: boolean): Promise<void> {
+async function performIndexingOnce(incrementalOnly?: boolean): Promise<void> {
   indexState.status = 'indexing';
   const mode = incrementalOnly ? 'incremental' : 'full';
   console.error(`Indexing (${mode}): ${ROOT_PATH}`);
@@ -566,6 +568,22 @@ async function performIndexing(incrementalOnly?: boolean): Promise<void> {
   }
 }
 
+async function performIndexing(incrementalOnly?: boolean): Promise<void> {
+  let nextMode = incrementalOnly;
+  for (;;) {
+    await performIndexingOnce(nextMode);
+
+    const shouldRunQueuedRefresh = autoRefreshQueued && indexState.status === 'ready';
+    autoRefreshQueued = false;
+    if (!shouldRunQueuedRefresh) return;
+
+    if (process.env.CODEBASE_CONTEXT_DEBUG) {
+      console.error('[file-watcher] Running queued auto-refresh');
+    }
+    nextMode = true;
+  }
+}
+
 async function shouldReindex(): Promise<boolean> {
   const indexPath = PATHS.keywordIndex;
   try {
@@ -735,13 +753,16 @@ async function main() {
     debounceMs,
     onChanged: () => {
       if (indexState.status === 'indexing') {
+        autoRefreshQueued = true;
         if (process.env.CODEBASE_CONTEXT_DEBUG) {
-          console.error('[file-watcher] Index in progress — skipping auto-refresh');
+          console.error('[file-watcher] Index in progress — queueing auto-refresh');
         }
         return;
       }
-      console.error('[file-watcher] Changes detected — incremental reindex starting');
-      performIndexing(true);
+      if (process.env.CODEBASE_CONTEXT_DEBUG) {
+        console.error('[file-watcher] Changes detected — incremental reindex starting');
+      }
+      void performIndexing(true);
     }
   });
 

tests/file-watcher.test.ts

@@ -49,6 +49,8 @@ describe('FileWatcher', () => {
     });
 
     try {
+      // Give chokidar a moment to finish initializing before the first write
+      await new Promise((resolve) => setTimeout(resolve, 100));
       // Write 5 files in quick succession — all within the debounce window
       for (let i = 0; i < 5; i++) {
         await fs.writeFile(path.join(tempDir, `file${i}.ts`), `export const x${i} = ${i};`);
@@ -72,6 +74,8 @@ describe('FileWatcher', () => {
       onChanged: () => { callCount++; },
     });
 
+    // Give chokidar a moment to finish initializing before the first write
+    await new Promise((resolve) => setTimeout(resolve, 100));
     await fs.writeFile(path.join(tempDir, 'cancel.ts'), 'export const y = 99;');
     // Let chokidar detect the event but stop before debounce fires
     await new Promise((resolve) => setTimeout(resolve, 150));