jettypod 4.4.15 → 4.4.16

package/jettypod.js

@@ -1266,11 +1266,13 @@ switch (command) {
     } else if (subcommand === 'merge') {
       const workCommands = require('./features/work-commands/index.js');
       try {
-        // Parse merge flags from args
+        // Parse merge flags and optional work item ID from args
         const withTransition = args.includes('--with-transition');
         const releaseLock = args.includes('--release-lock');
+        // Find numeric arg that isn't a flag
+        const workItemId = args.find(a => /^\d+$/.test(a)) ? parseInt(args.find(a => /^\d+$/.test(a))) : null;
 
-        await workCommands.mergeWork({ withTransition, releaseLock });
+        await workCommands.mergeWork({ withTransition, releaseLock, workItemId });
       } catch (err) {
         console.error(`Error: ${err.message}`);
         process.exit(1);

package/package.json

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

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

@@ -305,10 +305,10 @@ git commit -m "chore: [brief description]"
 git push
 
 # Switch to main repo before merging (merge cannot run from inside worktree)
-cd $(git rev-parse --git-common-dir)/..
+cd $(git rev-parse --show-toplevel)/..
 
 # Merge to main (auto-marks chore done)
-jettypod work merge
+jettypod work merge [chore-id]
 ```
 
 **Display:**

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

@@ -535,8 +535,9 @@ More speed mode chores remain. Starting next chore:
 # Commit changes in the worktree
 git add . && git commit -m "feat: [brief description of what was implemented]"
 
-# Merge current chore (handles push, merge, cleanup)
-jettypod work merge
+# Return to main repo and merge (cannot merge from inside worktree)
+cd $(git rev-parse --show-toplevel)/..  # Exit worktree to main repo
+jettypod work merge [current-chore-id]
 
 # Start next speed chore
 jettypod work start [next-chore-id]
@@ -582,8 +583,9 @@ npx cucumber-js <scenario-file-path> --name "User can reach" --format progress
 # Commit changes in the worktree
 git add . && git commit -m "feat: [brief description of what was implemented]"
 
-# Merge with transition lock (prevents race conditions during BDD generation)
-jettypod work merge --with-transition
+# Return to main repo and merge (cannot merge from inside worktree)
+cd $(git rev-parse --show-toplevel)/..  # Exit worktree to main repo
+jettypod work merge [current-chore-id] --with-transition
 ```
 
 After merge, you are on main branch. Ready to generate stable mode scenarios.
@@ -739,9 +741,10 @@ Before ending speed-mode skill, ensure:
 
 ## Command Reference
 
-**Complete chores:**
+**Complete chores (run from main repo, not worktree):**
 ```bash
-jettypod work merge              # Merge current chore to main
+jettypod work merge <id>         # Merge chore by ID (recommended)
+jettypod work merge              # Merge current chore (requires being on feature branch)
 jettypod work merge --with-transition  # Hold lock for transition phase
 jettypod work merge --release-lock     # Release held lock
 ```

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

@@ -491,8 +491,9 @@ More stable mode chores remain. Starting next chore:
 # Commit changes in the worktree
 git add . && git commit -m "feat: [brief description of error handling added]"
 
-# Merge current chore (handles push, merge, cleanup)
-jettypod work merge
+# Return to main repo and merge (cannot merge from inside worktree)
+cd $(git rev-parse --show-toplevel)/..  # Exit worktree to main repo
+jettypod work merge [current-chore-id]
 
 # Start next stable chore
 jettypod work start [next-chore-id]
@@ -516,7 +517,8 @@ If the query returns no remaining chores, proceed to Step 7.
 
 ```bash
 git add . && git commit -m "feat: [brief description of error handling added]"
-jettypod work merge
+cd $(git rev-parse --show-toplevel)/..  # Exit worktree to main repo
+jettypod work merge [current-chore-id]
 ```
 
 **Then check project state:**
@@ -623,9 +625,10 @@ Before ending stable-mode skill, ensure:
 
 ## Command Reference
 
-**Complete chores:**
+**Complete chores (run from main repo, not worktree):**
 ```bash
-jettypod work merge              # Merge current chore to main
+jettypod work merge <id>         # Merge chore by ID (recommended)
+jettypod work merge              # Merge current chore (requires being on feature branch)
 ```
 
 **Start chores:**