jettypod 4.4.118 → 4.4.121

package/lib/database.js

@@ -1,7 +1,7 @@
 const sqlite3 = require('sqlite3').verbose();
 const path = require('path');
 const fs = require('fs');
-const { getGitRoot } = require('./git-root');
+const { getGitRoot, resetCache: resetGitRootCache } = require('./git-root');
 const { runMigrations } = require('./migrations');
 const { getSchemaSQL } = require('./schema');
 
@@ -12,6 +12,7 @@ let cachedDbPath = null;
 let cachedGitRoot = null;
 let isClosing = false;
 let migrationPromise = null;
+let schemaGeneration = 0;
 
 /**
  * Get the root directory for jettypod operations
@@ -29,14 +30,19 @@ function getRepoRoot() {
   return cachedGitRoot;
 }
 
+// Track which NODE_ENV was used to compute the cached path
+let cachedNodeEnv = undefined;
+
 // Dynamic getters for paths (always use main repo, not worktree)
 function getJettypodDir() {
   const root = getRepoRoot();
-  if (!cachedJettypodDir || cachedJettypodDir !== path.join(root, '.jettypod')) {
+  const currentNodeEnv = process.env.NODE_ENV;
+  if (!cachedJettypodDir || cachedJettypodDir !== path.join(root, '.jettypod') || cachedNodeEnv !== currentNodeEnv) {
     cachedJettypodDir = path.join(root, '.jettypod');
     // Use separate database for tests
-    const dbFileName = process.env.NODE_ENV === 'test' ? 'test-work.db' : 'work.db';
+    const dbFileName = currentNodeEnv === 'test' ? 'test-work.db' : 'work.db';
     cachedDbPath = path.join(cachedJettypodDir, dbFileName);
+    cachedNodeEnv = currentNodeEnv;
   }
   return cachedJettypodDir;
 }
@@ -131,11 +137,18 @@ function getDb() {
  * @throws {Error} If schema creation fails
  */
 function initSchema() {
+  // Capture db reference and generation to prevent race conditions.
+  // Module-level getDb() calls (e.g. in work-tracking/index.js) start initSchema() async.
+  // If tests call resetDb() + getDb() before the old callback fires, the old callback
+  // would read the reassigned module-level `db` and run migrations on the wrong connection.
+  const localDb = db;
+  const myGeneration = ++schemaGeneration;
+
   // Create a promise that resolves when migrations complete
   migrationPromise = new Promise((resolve, reject) => {
-    db.serialize(() => {
+    localDb.serialize(() => {
       // Create core tables using the shared schema module (single source of truth)
-      db.exec(getSchemaSQL(), (err) => {
+      localDb.exec(getSchemaSQL(), (err) => {
         if (err) {
           throw new Error(`Failed to create core tables: ${err.message}`);
         }
@@ -147,20 +160,25 @@ function initSchema() {
           console.warn(`ALTER TABLE ADD COLUMN ${columnName} failed:`, err.message);
         }
       };
-      db.run(`ALTER TABLE work_items ADD COLUMN branch_name TEXT`, handleAlterError('branch_name'));
-      db.run(`ALTER TABLE work_items ADD COLUMN file_paths TEXT`, handleAlterError('file_paths'));
-      db.run(`ALTER TABLE work_items ADD COLUMN commit_sha TEXT`, handleAlterError('commit_sha'));
-      db.run(`ALTER TABLE work_items ADD COLUMN mode TEXT`, handleAlterError('mode'));
-      db.run(`ALTER TABLE work_items ADD COLUMN current INTEGER DEFAULT 0`, handleAlterError('current'));
-      db.run(`ALTER TABLE work_items ADD COLUMN needs_discovery INTEGER DEFAULT 0`, handleAlterError('needs_discovery'));
-      db.run(`ALTER TABLE work_items ADD COLUMN worktree_path TEXT`, handleAlterError('worktree_path'));
-      db.run(`ALTER TABLE work_items ADD COLUMN discovery_rationale TEXT`, handleAlterError('discovery_rationale'));
-      db.run(`ALTER TABLE work_items ADD COLUMN display_order INTEGER`, handleAlterError('display_order'));
-      db.run(`ALTER TABLE work_items ADD COLUMN architectural_decision TEXT`, async (err) => {
+      localDb.run(`ALTER TABLE work_items ADD COLUMN branch_name TEXT`, handleAlterError('branch_name'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN file_paths TEXT`, handleAlterError('file_paths'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN commit_sha TEXT`, handleAlterError('commit_sha'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN mode TEXT`, handleAlterError('mode'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN current INTEGER DEFAULT 0`, handleAlterError('current'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN needs_discovery INTEGER DEFAULT 0`, handleAlterError('needs_discovery'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN worktree_path TEXT`, handleAlterError('worktree_path'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN discovery_rationale TEXT`, handleAlterError('discovery_rationale'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN display_order INTEGER`, handleAlterError('display_order'));
+      localDb.run(`ALTER TABLE work_items ADD COLUMN architectural_decision TEXT`, async (err) => {
         handleAlterError('architectural_decision')(err);
+        // If the singleton was reset since we started, abort — a new initSchema() owns migrations now
+        if (myGeneration !== schemaGeneration) {
+          resolve();
+          return;
+        }
         // Run data migrations after all schema operations complete
         try {
-          await runMigrations(db);
+          await runMigrations(localDb);
           resolve();
         } catch (err) {
           console.error('Migration failed:', err.message);
@@ -303,12 +321,14 @@ async function closeDb() {
  * Forces the singleton to be recreated on next getDb() call
  */
 function resetDb() {
+  schemaGeneration++; // Invalidate any in-flight initSchema callbacks
   db = null;
   cachedJettypodDir = null;
   cachedDbPath = null;
   cachedGitRoot = null;
   isClosing = false;
   migrationPromise = null;
+  resetGitRootCache();
 }
 
 /**

package/lib/db-watcher.js

@@ -21,7 +21,7 @@ let onChange = null;
 let watchedPath = null;
 
 // Polling interval in milliseconds
-const POLL_MS = 50;
+const POLL_MS = 500;
 
 /**
  * Start watching the database file for changes

package/lib/git-hooks/pre-commit

@@ -88,7 +88,7 @@ async function exportSnapshots() {
     const paths = await exportAll();
 
     // Stage the snapshot files
-    execSync(`git add "${paths.work}" "${paths.database}"`, {
+    execSync(`git add -f "${paths.work}" "${paths.database}"`, {
       stdio: ['pipe', 'pipe', 'pipe']
     });
 

package/lib/jettypod-backup.js

@@ -75,10 +75,33 @@ async function createBackup(gitRoot, reason = 'unknown', options = {}) {
   const backupPath = path.join(backupBaseDir, backupName);
 
   try {
-    // Copy entire .jettypod directory
-    execSync(`cp -R "${jettypodPath}" "${backupPath}"`, {
-      stdio: 'pipe'
-    });
+    // Copy .jettypod directory structure
+    fs.mkdirSync(backupPath, { recursive: true });
+
+    // Copy all files, using sqlite3 .backup for .db files (WAL-safe)
+    // CRITICAL: fs.copyFileSync/cp does NOT work with SQLite WAL mode -
+    // it only copies the base .db file, missing data in the -wal file.
+    const entries = fs.readdirSync(jettypodPath);
+    for (const entry of entries) {
+      const srcFile = path.join(jettypodPath, entry);
+      const destFile = path.join(backupPath, entry);
+      const stat = fs.statSync(srcFile);
+
+      if (stat.isDirectory()) {
+        execSync(`cp -R "${srcFile}" "${destFile}"`, { stdio: 'pipe' });
+      } else if (entry.endsWith('.db') && !entry.endsWith('-shm') && !entry.endsWith('-wal')) {
+        // Use sqlite3 .backup for database files (handles WAL mode correctly)
+        try {
+          execSync(`sqlite3 "${srcFile}" ".backup '${destFile}'"`, { stdio: 'pipe' });
+        } catch (dbErr) {
+          // Fall back to file copy if sqlite3 fails (e.g., empty db)
+          fs.copyFileSync(srcFile, destFile);
+        }
+      } else if (!entry.endsWith('-shm') && !entry.endsWith('-wal')) {
+        // Copy non-WAL files normally (skip -shm/-wal as .backup handles them)
+        fs.copyFileSync(srcFile, destFile);
+      }
+    }
 
     // Verify backup was created
     if (!fs.existsSync(backupPath)) {