fix: repaired rebuild from filesystem

src/main/engine/MetaEngine.ts

@@ -397,16 +397,21 @@ export class MetaEngine extends EventEmitter {
     if (projectMetadataFileExists) {
       await this.loadProjectMetadata();
 
-      // If project.json has a dataPath, sync it back to the database
-      if (this.projectMetadata?.dataPath !== undefined) {
-        const projectData = await this.fetchProjectFromDatabase();
-        if (projectData && projectData.dataPath !== this.projectMetadata.dataPath) {
-          const db = getDatabase().getLocal();
-          await db.update(projects)
-            .set({ dataPath: this.projectMetadata.dataPath || null })
-            .where(eq(projects.id, this.currentProjectId));
-          console.log(`[MetaEngine] Synced dataPath from project.json to database: ${this.projectMetadata.dataPath || '(default)'}`);
-        }
+      // Keep dataPath authoritative in database (selected folder path on create/open).
+      // If project.json has a stale dataPath, update project.json from database.
+      const projectData = await this.fetchProjectFromDatabase();
+      if (!projectData) {
+        throw new Error(`Project not found in database: ${this.currentProjectId}`);
+      }
+
+      const databaseDataPath = projectData.dataPath || undefined;
+      if (this.projectMetadata && this.projectMetadata.dataPath !== databaseDataPath) {
+        this.projectMetadata = {
+          ...this.projectMetadata,
+          dataPath: databaseDataPath,
+        };
+        await this.saveProjectMetadata();
+        console.log(`[MetaEngine] Synced dataPath from database to project.json: ${databaseDataPath || '(default)'}`);
       }
     } else {
       // No file exists, fetch project data from database and create file

src/main/ipc/handlers.ts

@@ -236,10 +236,7 @@ export function registerIpcHandlers(): void {
       const dataDir = projectEngine.getDataDir(project.id, project.dataPath);
       engine.setProjectContext(project.id, dataDir);
     }
-    // Fire and forget - don't await, let it run in background
-    engine.rebuildDatabaseFromFiles().catch(err => {
-      console.error('Post rebuild failed:', err);
-    });
+    return engine.rebuildDatabaseFromFiles();
   });
 
   safeHandle('posts:search', async (_, query: string) => {
@@ -305,10 +302,7 @@ export function registerIpcHandlers(): void {
       const dataDir = projectEngine.getDataDir(project.id, project.dataPath);
       engine.setProjectContext(project.id, dataDir);
     }
-    // Fire and forget - let it run as a background task
-    engine.reindexText().catch(err => {
-      console.error('Text reindex failed:', err);
-    });
+    return engine.reindexText();
   });
 
   // ============ Media Handlers ============
@@ -481,18 +475,12 @@ export function registerIpcHandlers(): void {
       // This ensures all project data lives in the same location for backup
       engine.setProjectContext(project.id, dataDir, dataDir);
     }
-    // Fire and forget - don't await, let it run in background
-    engine.rebuildDatabaseFromFiles().catch(err => {
-      console.error('Media rebuild failed:', err);
-    });
+    return engine.rebuildDatabaseFromFiles();
   });
 
   safeHandle('media:reindexText', async () => {
     const engine = getMediaEngine();
-    // Fire and forget - don't await, let it run in background
-    engine.reindexText().catch(err => {
-      console.error('Media text reindex failed:', err);
-    });
+    return engine.reindexText();
   });
 
   safeHandle('media:getThumbnail', async (_, id: string, size?: 'small' | 'medium' | 'large') => {

src/renderer/App.tsx

@@ -242,20 +242,31 @@ const App: React.FC = () => {
     );
 
     unsubscribers.push(
-      window.electronAPI?.on('menu:rebuildDatabase', () => {
-        // Fire and forget - the handlers return immediately now
-        window.electronAPI?.posts.rebuildFromFiles();
-        window.electronAPI?.media.rebuildFromFiles();
-        // Also regenerate missing thumbnails after media rebuild
-        window.electronAPI?.media.regenerateMissingThumbnails();
+      window.electronAPI?.on('menu:rebuildDatabase', async () => {
+        try {
+          await Promise.all([
+            window.electronAPI?.posts.rebuildFromFiles(),
+            window.electronAPI?.media.rebuildFromFiles(),
+          ]);
+          await window.electronAPI?.media.regenerateMissingThumbnails();
+        } catch (error) {
+          console.error('Database rebuild failed:', error);
+          showToast.error('Database rebuild failed');
+        }
       }) || (() => {})
     );
 
     unsubscribers.push(
-      window.electronAPI?.on('menu:reindexText', () => {
-        // Fire and forget - runs as background tasks
-        window.electronAPI?.posts.reindexText();
-        window.electronAPI?.media.reindexText();
+      window.electronAPI?.on('menu:reindexText', async () => {
+        try {
+          await Promise.all([
+            window.electronAPI?.posts.reindexText(),
+            window.electronAPI?.media.reindexText(),
+          ]);
+        } catch (error) {
+          console.error('Text reindex failed:', error);
+          showToast.error('Text reindex failed');
+        }
       }) || (() => {})
     );