jettypod 4.4.48 → 4.4.50

package/lib/merge-lock.js

@@ -36,21 +36,30 @@ async function acquireMergeLock(db, workItemId, instanceId = null, options = {})
 
   const maxWait = options.maxWait || 60000; // 1 minute default
   const pollInterval = options.pollInterval || 1500; // 1.5 seconds
-  const staleThreshold = options.staleThreshold || 120000; // 2 minutes (reduced from 5 minutes)
+  const staleThreshold = options.staleThreshold || 90000; // 90 seconds - locks auto-expire
   const startTime = Date.now();
 
   // Generate instance identifier
   const lockedBy = instanceId || `${os.hostname()}-${process.pid}`;
 
-  // Proactive cleanup of stale locks before attempting acquisition
-  try {
-    await cleanupStaleLocks(db, staleThreshold);
-  } catch (cleanupErr) {
-    // Log but don't fail - cleanup is best-effort
-    console.warn(`Warning: Failed to cleanup stale locks: ${cleanupErr.message}`);
-  }
+  let pollCount = 0;
 
   while (Date.now() - startTime < maxWait) {
+    // Cleanup stale locks every 5 polls (every ~10 seconds with 2s poll interval)
+    // This ensures orphaned locks get cleaned up during the wait
+    if (pollCount % 5 === 0) {
+      try {
+        const cleaned = await cleanupStaleLocks(db, staleThreshold);
+        if (cleaned > 0) {
+          console.log(`🧹 Cleaned ${cleaned} stale merge lock(s)`);
+        }
+      } catch (cleanupErr) {
+        // Log but don't fail - cleanup is best-effort
+        console.warn(`Warning: Failed to cleanup stale locks: ${cleanupErr.message}`);
+      }
+    }
+    pollCount++;
+
     // Check if lock exists
     const existingLock = await checkExistingLock(db);
 
@@ -118,7 +127,7 @@ function insertLock(db, workItemId, lockedBy) {
  * @param {number|Object} staleThresholdOrOptions - Age threshold in milliseconds (default: 120000), or options object with staleThreshold
  * @returns {Promise<number>} Count of locks removed
  */
-function cleanupStaleLocks(db, staleThresholdOrOptions = 120000) {
+function cleanupStaleLocks(db, staleThresholdOrOptions = 90000) {
   if (!db) {
     return Promise.reject(new Error('Database connection required'));
   }
@@ -126,7 +135,7 @@ function cleanupStaleLocks(db, staleThresholdOrOptions = 120000) {
   // Support both number (old API) and options object (new API)
   let staleThresholdMs;
   if (typeof staleThresholdOrOptions === 'object') {
-    staleThresholdMs = staleThresholdOrOptions.staleThreshold || 120000;
+    staleThresholdMs = staleThresholdOrOptions.staleThreshold || 90000;
   } else {
     staleThresholdMs = staleThresholdOrOptions;
   }

package/package.json

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

package/skills-templates/speed-mode/SKILL.md

@@ -692,7 +692,7 @@ Added error handling and edge case scenarios for stable mode.
 
 # Return to main repo and merge
 cd <main-repo-path>
-jettypod work merge <feature-id>
+jettypod work tests merge <feature-id>
 ```
 
 **7. Present proposal to user:**
@@ -848,8 +848,8 @@ jettypod work start <chore-id>   # Create worktree and start chore
 
 **Create test worktree (for writing BDD scenarios):**
 ```bash
-jettypod work tests <feature-id>  # Create worktree for writing tests
-jettypod work merge <feature-id>  # Merge tests back to main
+jettypod work tests <feature-id>        # Create worktree for writing tests
+jettypod work tests merge <feature-id>  # Merge tests back to main
 ```
 
 **Set feature mode (BEFORE creating chores):**