jettypod 4.2.5 → 4.2.7

package/lib/database.js

@@ -1,19 +1,37 @@
 const sqlite3 = require('sqlite3').verbose();
 const path = require('path');
 const fs = require('fs');
+const { getGitRoot } = require('./git-root');
 
 // Singleton database connection
 let db = null;
 let cachedJettypodDir = null;
 let cachedDbPath = null;
+let cachedGitRoot = null;
 let isClosing = false;
 let migrationPromise = null;
 
-// Dynamic getters for paths (recompute on directory change)
+/**
+ * Get the root directory for jettypod operations
+ * Always returns the main repo, even when called from a worktree
+ */
+function getRepoRoot() {
+  if (!cachedGitRoot) {
+    try {
+      cachedGitRoot = getGitRoot();
+    } catch (err) {
+      // Fall back to cwd if not in a git repo (e.g., during init)
+      cachedGitRoot = process.cwd();
+    }
+  }
+  return cachedGitRoot;
+}
+
+// Dynamic getters for paths (always use main repo, not worktree)
 function getJettypodDir() {
-  const cwd = process.cwd();
-  if (!cachedJettypodDir || !cachedJettypodDir.startsWith(cwd)) {
-    cachedJettypodDir = path.join(cwd, '.jettypod');
+  const root = getRepoRoot();
+  if (!cachedJettypodDir || cachedJettypodDir !== path.join(root, '.jettypod')) {
+    cachedJettypodDir = path.join(root, '.jettypod');
     // Use separate database for tests
     const dbFileName = process.env.NODE_ENV === 'test' ? 'test-work.db' : 'work.db';
     cachedDbPath = path.join(cachedJettypodDir, dbFileName);
@@ -59,7 +77,7 @@ function ensureJettyPodDir() {
 function getDb() {
   // Check if directory changed - if so, reset connection
   const dbFileName = process.env.NODE_ENV === 'test' ? 'test-work.db' : 'work.db';
-  const currentPath = path.join(process.cwd(), '.jettypod', dbFileName);
+  const currentPath = path.join(getRepoRoot(), '.jettypod', dbFileName);
   if (db && cachedDbPath && cachedDbPath !== currentPath) {
     // Directory changed - abandon old connection without closing
     // Attempting to close with active prepared statements causes FATAL errors
@@ -252,6 +270,7 @@ function resetDb() {
   db = null;
   cachedJettypodDir = null;
   cachedDbPath = null;
+  cachedGitRoot = null;
   isClosing = false;
   migrationPromise = null;
 }

package/lib/worktree-manager.js

@@ -177,7 +177,25 @@ async function createWorktree(workItem, options = {}) {
       throw new Error(`Failed to create .jettypod symlink: ${symlinkErr.message}`);
     }
 
-    // Step 5: Return the created worktree record
+    // Step 5: Symlink .env files from main repo
+    // Environment files are typically gitignored, so worktrees don't get them
+    try {
+      const envFiles = fs.readdirSync(gitRoot).filter(f => f.startsWith('.env'));
+      for (const envFile of envFiles) {
+        const envSource = path.join(gitRoot, envFile);
+        const envTarget = path.join(worktreePath, envFile);
+
+        // Only symlink if source is a file and target doesn't exist
+        if (fs.statSync(envSource).isFile() && !fs.existsSync(envTarget)) {
+          fs.symlinkSync(envSource, envTarget);
+        }
+      }
+    } catch (envErr) {
+      // Non-fatal - log warning but continue
+      console.warn(`Warning: Could not symlink .env files: ${envErr.message}`);
+    }
+
+    // Step 6: Return the created worktree record
     const worktree = await new Promise((resolve, reject) => {
       db.get('SELECT * FROM worktrees WHERE id = ?', [worktreeId], (err, row) => {
         if (err) reject(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jettypod",
-  "version": "4.2.5",
+  "version": "4.2.7",
   "description": "AI-powered development workflow manager with TDD, BDD, and automatic test generation",
   "main": "jettypod.js",
   "bin": {