jettypod 4.4.58 → 4.4.60

package/claude-hooks/global-guardrails.js

@@ -137,12 +137,13 @@ function evaluateBashCommand(command, currentBranch, cwd) {
   }
 
   // BLOCKED: Merge from inside worktree (causes CWD corruption)
-  if (/jettypod\s+(work|tests)\s+merge/.test(command)) {
+  // Matches: jettypod work merge, jettypod work tests merge
+  if (/jettypod\s+work\s+(tests\s+)?merge/.test(command)) {
     if (cwd && /\.jettypod-work\//.test(cwd)) {
       return {
         allowed: false,
-        message: 'Cannot merge from inside a worktree. CWD would be deleted.',
-        hint: 'Run: cd /Users/erikspangenberg/jettypod-source && jettypod work merge <id>'
+        message: 'Cannot merge from inside a worktree - your shell CWD would be deleted, corrupting the session.',
+        hint: 'First run: cd <main-repo-path>\nThen retry the merge command.'
       };
     }
   }

package/lib/work-commands/index.js

@@ -1885,10 +1885,10 @@ async function testsMerge(featureId) {
     console.log('⚠️  Failed to delete branch (non-fatal):', err.message);
   }
 
-  // Update worktree status in database
+  // Delete worktree record from database (cleanup complete)
   await new Promise((resolve, reject) => {
     db.run(
-      `UPDATE worktrees SET status = 'merged' WHERE id = ?`,
+      `DELETE FROM worktrees WHERE id = ?`,
       [worktree.id],
       (err) => {
         if (err) return reject(err);

package/package.json

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