feat: update uuid package to version 14.0.0 and add types for uuid; enhance migration handling with schema snapshots

Author: Yashh56

bridge/package.json

@@ -33,7 +33,7 @@
     "pg-query-stream": "^4.10.3",
     "pino": "^9.14.0",
     "ssh2": "^1.17.0",
-    "uuid": "^8.3.2",
+    "uuid": "^14.0.0",
     "ws": "^8.19.0"
   },
   "bin": "./dist/index.cjs",
@@ -52,6 +52,7 @@
     "@types/jest": "^30.0.0",
     "@types/node": "^20.0.0",
     "@types/pg": "^8.15.6",
+    "@types/uuid": "^11.0.0",
     "@yao-pkg/pkg": "^5.12.0",
     "esbuild": "^0.27.0",
     "jest": "^30.2.0",

bridge/pnpm-lock.yaml

@@ -550,7 +550,7 @@ export function streamQueryCancelable(
             conn = await pool.getConnection();
 
             const [pidRows] = await conn.execute(GET_CONNECTION_ID);
-            backendPid = pidRows[0].pid;
+            backendPid = (pidRows as any[])[0].pid;
 
             const raw = (conn as any).connection;
             query = raw.query(sql);
@@ -1443,7 +1443,15 @@ export async function connectToDatabase(
     ensureDir(migrationsDir);
     // 1️⃣ Baseline (ONLY if not read-only)
     if (!options?.readOnly) {
-        baselineResult = await baselineIfNeeded(cfg, migrationsDir);
+        // Pass real schema snapshot so baseline contains actual DDL
+        let snapshot: any = undefined;
+        try {
+            const project = await projectStoreInstance.getProjectByDatabaseId(connectionId);
+            if (project) {
+                snapshot = await projectStoreInstance.getSchema(project.id) || undefined;
+            }
+        } catch { }
+        baselineResult = await baselineIfNeeded(cfg, migrationsDir, snapshot);
     }
 
     // 2️⃣ Load schema (read-only introspection)

bridge/src/connectors/mariadb.ts

@@ -525,7 +525,7 @@ export function streamQueryCancelable(
       conn = await pool.getConnection();
 
       const [pidRows] = await conn.execute(GET_CONNECTION_ID);
-      backendPid = pidRows[0].pid;
+      backendPid = (pidRows as any[])[0].pid;
 
       const raw = (conn as any).connection;
       query = raw.query(sql);
@@ -1110,7 +1110,7 @@ function groupMySQLIndexes(indexes: IndexInfo[]) {
   }
 
   return [...map.values()].map(group =>
-    group.sort((a, b) => a.seq_in_index - b.seq_in_index)
+    group.sort((a, b) => (a.seq_in_index ?? 0) - (b.seq_in_index ?? 0))
   );
 }
 
@@ -1418,7 +1418,15 @@ export async function connectToDatabase(
   ensureDir(migrationsDir);
   // 1️⃣ Baseline (ONLY if not read-only)
   if (!options?.readOnly) {
-    baselineResult = await baselineIfNeeded(cfg, migrationsDir);
+    // Pass real schema snapshot so baseline contains actual DDL
+    let snapshot: any = undefined;
+    try {
+      const project = await projectStoreInstance.getProjectByDatabaseId(connectionId);
+      if (project) {
+        snapshot = await projectStoreInstance.getSchema(project.id) || undefined;
+      }
+    } catch {}
+    baselineResult = await baselineIfNeeded(cfg, migrationsDir, snapshot);
   }
 
   // 2️⃣ Load schema (read-only introspection)

bridge/src/connectors/mysql.ts

@@ -1176,7 +1176,7 @@ function groupIndexes(indexes: IndexInfo[]) {
   }
 
   return [...map.values()].map(group =>
-    group.sort((a, b) => a.ordinal_position - b.ordinal_position)
+    group.sort((a, b) => (a.ordinal_position ?? 0) - (b.ordinal_position ?? 0))
   );
 }
 
@@ -1508,7 +1508,15 @@ export async function connectToDatabase(
   ensureDir(migrationsDir);
 
   if (!options?.readOnly) {
-    baselineResult = await baselineIfNeeded(cfg, migrationsDir);
+    // Pass real schema snapshot so baseline contains actual DDL
+    let snapshot: any = undefined;
+    try {
+      const project = await projectStoreInstance.getProjectByDatabaseId(connectionId);
+      if (project) {
+        snapshot = await projectStoreInstance.getSchema(project.id) || undefined;
+      }
+    } catch { }
+    baselineResult = await baselineIfNeeded(cfg, migrationsDir, snapshot);
   }
 
   // 2️⃣ Load schema (read-only)

bridge/src/connectors/postgres.ts

@@ -738,8 +738,8 @@ export async function getSchemaMetadataBatch(
           is_foreign_key: fkColumns.has(col.name),
           is_unique: false, // will be updated below if unique index exists
           is_serial: col.pk > 0 && (col.type || '').toLowerCase() === 'integer',
-          check_constraint: null,
-          comment: null,
+          check_constraint: undefined,
+          comment: undefined,
           ordinal_position: col.cid + 1,
         }));
 
@@ -1172,7 +1172,15 @@ export async function connectToDatabase(
   ensureDir(migrationsDir);
 
   if (!options?.readOnly) {
-    baselineResult = await baselineIfNeeded(cfg, migrationsDir);
+    // Pass real schema snapshot so baseline contains actual DDL
+    let snapshot: any = undefined;
+    try {
+      const project = await projectStoreInstance.getProjectByDatabaseId(connectionId);
+      if (project) {
+        snapshot = await projectStoreInstance.getSchema(project.id) || undefined;
+      }
+    } catch {}
+    baselineResult = await baselineIfNeeded(cfg, migrationsDir, snapshot);
   }
 
   const schema = await listSchemas(cfg);

bridge/src/connectors/sqlite.ts

@@ -314,7 +314,8 @@ export class MigrationHandlers {
             // For now, we write the SQL and apply it. 
 
             const migrationsDir = await projectStoreInstance.resolveMigrationsDir(dbId);
-            const tmpPath = path.join(migrationsDir, "tmp_snapshot_apply.sql");
+            const versionStr = Date.now().toString();
+            const tmpPath = path.join(migrationsDir, `${versionStr}_tmp_snapshot_apply.sql`);
             fs.writeFileSync(tmpPath, baselineSQL, "utf8");
 
             if (dbType === "mysql") await this.queryExecutor.mysql.applyMigration(conn, tmpPath);

bridge/src/handlers/migrationHandlers.ts

@@ -217,7 +217,7 @@ export class ProjectHandlers {
             await projectStoreInstance.saveSchema(projectId, liveSchemas, newHash, dbType);
 
             if (newHash !== oldHash) {
-                this.rpc.sendNotification("project.schema_changed", { projectId, newHash });
+                this.rpc?.sendNotification?.("project.schema_changed", { projectId, newHash });
 
                 // Commit to Git if tracking
                 try {
@@ -431,7 +431,10 @@ export class ProjectHandlers {
                 pendingMigrations.push({ file, version, isDestructive, destructiveOps });
             }
 
-            // 6. Compute drift status
+            // 6. Detect if all migration files are baseline-only (no real user migrations)
+            const isBaselineOnly = hasMigrations && migrationFiles.every(f => f.includes("baseline"));
+
+            // 7. Compute drift status
             let driftStatus: "synced" | "drifted" | "unknown" = "unknown";
             if (pendingMigrations.length === 0 && hasMigrations) {
                 // All migrations applied
@@ -449,10 +452,18 @@ export class ProjectHandlers {
                 driftStatus = "synced";
             }
 
-            // 7. Compute available modes
+            // 8. Compute available modes
             const availableModes: Array<"run_migrations" | "apply_snapshot" | "skip"> = ["skip"];
             let recommendedMode: "run_migrations" | "apply_snapshot" | "skip" = "skip";
-            if (hasMigrations && pendingMigrations.length > 0) {
+
+            if (isBaselineOnly && hasSchemaSnapshot && targetDatabaseEmpty) {
+                // Baseline-only + empty DB + schema.json exists:
+                // The baseline file has no real DDL — use schema.json to reconstruct the DB
+                availableModes.unshift("apply_snapshot");
+                recommendedMode = "apply_snapshot";
+                // Override: treat as "no real migrations" for the dialog
+                driftStatus = "drifted";
+            } else if (hasMigrations && pendingMigrations.length > 0 && !isBaselineOnly) {
                 availableModes.unshift("run_migrations");
                 recommendedMode = "run_migrations";
             }
@@ -461,17 +472,23 @@ export class ProjectHandlers {
                 recommendedMode = "apply_snapshot";
             }
 
+            // For the dialog: if baseline-only + empty DB, report as "no real migrations"
+            // so the frontend shows "Apply Schema Snapshot" (STATE 3) instead of
+            // "Pending Migrations" (STATE 2) which would try to run the empty baseline
+            const reportHasMigrations = isBaselineOnly && targetDatabaseEmpty ? false : hasMigrations;
+            const reportPendingMigrations = isBaselineOnly && targetDatabaseEmpty ? [] : pendingMigrations;
+
             const result = {
-                hasMigrations,
-                migrationCount: pendingMigrations.length,
+                hasMigrations: reportHasMigrations,
+                migrationCount: reportPendingMigrations.length,
                 hasSchemaSnapshot,
                 lockFileStatus,
                 tamperedFiles,
                 targetDatabaseEmpty,
                 targetTableCount,
                 driftStatus,
                 driftDetails: undefined,
-                pendingMigrations,
+                pendingMigrations: reportPendingMigrations,
                 availableModes,
                 recommendedMode,
             };

bridge/src/handlers/projectHandlers.ts

@@ -77,7 +77,7 @@ export type SchemaFile = {
     version: number; // bumped to 2
     projectId: string;
     databaseId: string;
-    dialect: "postgresql" | "mysql" | "sqlite";
+    dialect: "postgresql" | "mysql" | "sqlite" | "unknown";
     schemas: SchemaSnapshot[];
     cachedAt: string;
     relwaveVersion: string;
@@ -391,7 +391,7 @@ export class ProjectStore {
         // Resolve engine from the linked database
         let engine: string | undefined;
         try {
-            const db: DBMeta | null = await dbStoreInstance.getDB(params.databaseId);
+            const db: DBMeta | undefined = await dbStoreInstance.getDB(params.databaseId);
             engine = db?.type;
         } catch {
             // db may not exist yet — that's OK
@@ -564,7 +564,7 @@ export class ProjectStore {
         // Resolve engine from the linked database
         let engine: string | undefined;
         try {
-            const db: DBMeta | null = await dbStoreInstance.getDB(databaseId);
+            const db: DBMeta | undefined = await dbStoreInstance.getDB(databaseId);
             engine = db?.type;
         } catch {
             // db may not exist yet
@@ -1384,7 +1384,7 @@ export class ProjectStore {
         // ---- 3. Resolve engine from the linked database ----
         let engine: string | undefined;
         try {
-            const db: DBMeta | null = await dbStoreInstance.getDB(databaseId);
+            const db: DBMeta | undefined = await dbStoreInstance.getDB(databaseId);
             engine = db?.type;
         } catch {
             // db may not exist yet

bridge/src/services/projectStore.ts

@@ -41,8 +41,29 @@ export function generateBaselineSQL(snapshot: SchemaFile, version: string, name:
 
         // Tables
         for (const table of schema.tables) {
+            // Skip internal migration tracking tables
+            if (["schema_migrations", "__relwave_migrations", "relwave_migrations"].includes(table.name)) {
+                continue;
+            }
+
             const tableRef = dbType === "sqlite" ? quoteIdent(table.name, dbType) : `${quoteIdent(schema.name, dbType)}.${quoteIdent(table.name, dbType)}`;
 
+            // Check for sequences first (Postgres)
+            if (dbType === "postgresql") {
+                for (const col of table.columns) {
+                    if (col.defaultValue && col.defaultValue.includes("nextval(")) {
+                        // Extract 'windows_store_apps_id_seq' from nextval('windows_store_apps_id_seq'::regclass)
+                        const seqMatch = col.defaultValue.match(/nextval\('([^']+)'/i) || col.defaultValue.match(/nextval\("([^"]+)"/i);
+                        if (seqMatch && seqMatch[1]) {
+                            const seqName = seqMatch[1];
+                            const isSchemaQualified = seqName.includes(".");
+                            const seqRef = isSchemaQualified ? seqName : `${quoteIdent(schema.name, dbType)}.${quoteIdent(seqName, dbType)}`;
+                            upSQL += `CREATE SEQUENCE IF NOT EXISTS ${seqRef};\n`;
+                        }
+                    }
+                }
+            }
+
             const columnDefs = table.columns.map(col => {
                 let def = `  ${quoteIdent(col.name, dbType)} ${col.type}`;
                 if (!col.nullable) def += " NOT NULL";