rafcode 1.3.2 → 2.0.0

package/README.md

@@ -51,6 +51,7 @@ That's it! RAF will guide you through breaking down your task and then execute i
 - **Resume Support**: Continue from where you left off after interruption
 - **Git Integration**: Automatic commits after each completed task
 - **Task Dependencies**: Tasks can depend on other tasks, with automatic blocking on failure
+- **Worktree Mode**: Isolate planning and execution in a git worktree branch with `--worktree`
 
 ## Commands
 
@@ -61,7 +62,8 @@ Opens your `$EDITOR` to write a project description, then Claude will interview
 ```bash
 raf plan              # Create a new project
 raf plan my-feature   # Create with a specific name
-raf plan --amend 3    # Add tasks to existing project #3
+raf plan --amend abcdef  # Add tasks to existing project
+raf plan --worktree   # Plan in an isolated git worktree
 ```
 
 ### `raf do`
@@ -70,20 +72,31 @@ Execute project tasks. Without arguments, shows a picker to select a pending pro
 
 ```bash
 raf do                # Interactive picker
-raf do 3              # Execute project #3
+raf do abcdef         # Execute by project ID
 raf do my-project     # Execute by name
-raf do 3 4 5          # Execute multiple projects
+raf do --worktree     # Pick and execute a worktree project
+raf do my-feature -w --merge  # Execute in worktree, merge on success
 ```
 
 Note: In non-verbose mode, the completion summary reflects the tasks executed in that run (the remaining tasks at start), so the elapsed time maps to those tasks.
 
 ### `raf status`
 
-Check project status.
+Check project status. Worktree projects are discovered automatically when inside a git repo — no flag needed.
 
 ```bash
-raf status            # List all projects
-raf status 3          # Show details for project #3
+raf status            # List all projects (includes worktree projects that differ)
+raf status abcdef     # Show details for a project (shows both main and worktree if they differ)
+```
+
+### `raf migrate-project-ids-base26`
+
+Rename legacy project folders (3-char base36 or 6-char base36 with digits) to the current 6-char base26 format.
+
+```bash
+raf migrate-project-ids-base26             # Migrate project folders in ./RAF/
+raf migrate-project-ids-base26 --dry-run   # Preview renames without executing
+raf migrate-project-ids-base26 --worktree  # Migrate worktree project folders
 ```
 
 ## Status Symbols
@@ -98,20 +111,43 @@ raf status 3          # Show details for project #3
 
 ## Project Structure
 
-RAF creates a `./RAF/` folder with numbered project directories:
+RAF creates a `./RAF/` folder with project directories identified by epoch-based base26 IDs (a-z only):
 
 ```
 ./RAF/
-├── 001-auth-system/
+├── abcdef-auth-system/
 │   ├── input.md           # Your original intent (raw prompt)
 │   ├── decisions.md       # Design decisions from planning
 │   ├── plans/             # Generated task plans
 │   ├── outcomes/          # Execution results
 │   └── logs/              # Debug logs (on failure)
-└── 002-dashboard/
+└── abaaba-dashboard/
     └── ...
 ```
 
+## Worktree Mode
+
+Worktree mode runs planning and execution in an isolated git worktree, keeping your main branch clean while RAF works on a separate branch.
+
+### Basic workflow
+
+```bash
+# Plan in a worktree (creates branch and worktree directory)
+raf plan my-feature --worktree
+
+# Execute tasks in the worktree, merge back on success
+raf do my-feature --worktree --merge
+```
+
+### How it works
+
+- `--worktree` creates a git worktree at `~/.raf/worktrees/<repo>/<project>/` with a new branch named after the project folder (e.g., `abcdef-my-feature`)
+- All planning artifacts, code changes, and commits happen in the worktree branch
+- `--merge` on `raf do` merges the branch back after all tasks succeed (fast-forward preferred, merge commit as fallback)
+- On merge conflicts, the merge is aborted and you get instructions for manual resolution
+- If tasks fail, the worktree branch is preserved for inspection
+- Worktrees persist after completion — clean them up manually with `git worktree remove` when done
+
 ## Command Reference
 
 ### `raf plan [projectName]`
@@ -120,8 +156,9 @@ RAF creates a `./RAF/` folder with numbered project directories:
 |--------|-------------|
 | `--amend <id>` | Add tasks to existing project |
 | `-y, --auto` | Skip permission prompts (runs in dangerous mode) |
+| `-w, --worktree` | Create a git worktree for isolated planning |
 
-### `raf do [projects...]`
+### `raf do [project]`
 
 | Option | Description |
 |--------|-------------|
@@ -130,9 +167,18 @@ RAF creates a `./RAF/` folder with numbered project directories:
 | `-d, --debug` | Save all logs and show debug output |
 | `-m, --model <name>` | Claude model (sonnet, haiku, opus) |
 | `--sonnet` | Shorthand for `--model sonnet` |
+| `-w, --worktree` | Execute tasks in a git worktree |
+| `--merge` | Merge worktree branch after successful completion (requires `--worktree`) |
 
 Alias: `raf act`
 
+### `raf migrate-project-ids-base26`
+
+| Option | Description |
+|--------|-------------|
+| `--dry-run` | Preview renames without executing |
+| `-w, --worktree` | Migrate worktree project folders |
+
 > **Note:** `raf do` and `raf plan -y` run Claude with `--dangerously-skip-permissions` for fully automated execution without interactive prompts.
 
 ### `raf status [identifier]`

package/dist/commands/do.d.ts

@@ -1,4 +1,11 @@
 import { Command } from 'commander';
+/**
+ * Post-execution action chosen by the user before task execution begins.
+ * - 'merge': merge the worktree branch into the original branch
+ * - 'pr': push the branch and create a GitHub PR
+ * - 'leave': do nothing, keep the branch as-is
+ */
+export type PostExecutionAction = 'merge' | 'pr' | 'leave';
 /**
  * Format failure history for console output.
  * Shows attempts that failed before eventual success or final failure.
@@ -9,4 +16,12 @@ export declare function formatRetryHistoryForConsole(taskId: string, taskName: s
     reason: string;
 }>, finalAttempt: number, success: boolean): string;
 export declare function createDoCommand(): Command;
+/**
+ * Show an interactive picker for the post-execution action in worktree mode.
+ * Presented before task execution so the user declares intent upfront.
+ *
+ * If "Create PR" is chosen, runs preflight checks immediately. If preflight fails,
+ * warns the user and falls back to re-prompting.
+ */
+export declare function pickPostExecutionAction(worktreeRoot: string): Promise<PostExecutionAction>;
 //# sourceMappingURL=do.d.ts.map

package/dist/commands/do.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"do.d.ts","sourceRoot":"","sources":["../../src/commands/do.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkCpC;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,EAC1D,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,GACf,MAAM,CAkBR;AA0BD,wBAAgB,eAAe,IAAI,OAAO,CAgBzC"}
+{"version":3,"file":"do.d.ts","sourceRoot":"","sources":["../../src/commands/do.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgDpC;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC;AAE3D;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,EAC1D,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,GACf,MAAM,CAkBR;AA0BD,wBAAgB,eAAe,IAAI,OAAO,CAiBzC;AA0QD;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAuBhG"}