rafcode 2.4.0 → 2.4.1-0

package/.claude/settings.local.json

@@ -31,7 +31,9 @@
       "WebFetch(domain:news.ycombinator.com)",
       "Bash(chmod:*)",
       "Bash(bash:*)",
-      "Bash(git add:*)"
+      "Bash(git add:*)",
+      "WebFetch(domain:support.claude.com)",
+      "WebFetch(domain:www.anthropic.com)"
     ]
   }
 }

package/CLAUDE.md

@@ -46,6 +46,7 @@ RAF/
 
 Each plan file MUST have Obsidian-style frontmatter at the top, before the `# Task:` heading:
 ```markdown
+---
 effort: medium
 ---
 # Task: [Task Name]
@@ -77,10 +78,11 @@ effort: medium
 ```
 
 **Frontmatter**:
-- Uses Obsidian-style format: `key: value` lines followed by `---` (no opening delimiter)
+- Uses standard Obsidian/YAML format: opening `---`, `key: value` lines, closing `---`
 - `effort` is REQUIRED: `low`, `medium`, or `high` — determines execution model via `effortMapping`
 - `model` is OPTIONAL: explicit model override (subject to ceiling)
 - Frontmatter is parsed by `src/utils/frontmatter.ts`
+- Parser also supports legacy format (no opening `---`) for backward compatibility
 
 **Dependencies Section**:
 - Optional - omit if task has no dependencies

package/RAF/ahwidh-quick-fix-gremlin/decisions.md

@@ -0,0 +1,37 @@
+# Project Decisions
+
+## For `raf config --get/--set`: Should `--get` with no key show the full merged config (defaults + overrides), or only user overrides from the config file?
+Full merged config — Shows the complete resolved config with all defaults filled in, so users see every active setting.
+
+## For `raf config --set`: Should setting a value to its default automatically remove it from the config file (keeping config minimal), or always write explicitly?
+Remove if default — If the value matches the default, remove the key from the config file to keep it clean.
+
+## For the diverged main branch fix: Should callers treat this as a hard error or a warning?
+Warning only — Show a visible warning (yellow) but continue execution. Stale base is better than blocking work.
+
+## For the name generation fix: Should the fix tighten the prompt, add response parsing, or both?
+Prompt only — Just improve the prompt instructions to be more explicit about output format.
+
+## For `raf config --get models.plan`: Should the output be plain value only or formatted?
+Plain value — Just print 'opus'. Easy to pipe into other commands.
+
+## For the token investigation task: Research only or plan fix now?
+Research now and create task if needed — investigated and found it's a display issue: `input_tokens` from Claude API only reports non-cached tokens. Fix plan created as task 07 to show total input in display.
+
+## Token investigation findings
+Root cause: Claude API separates `input_tokens` (non-cached, e.g. 3-22) from `cache_read_input_tokens` (e.g. 18,000+) and `cache_creation_input_tokens` (e.g. 6,000+). RAF displays only non-cached as "X in". Fix: sum all three for the display. Cost calculation is already correct.
+
+## For amend commit fix: Should plan files be removed from the commit or committed separately?
+Remove from commit — Only commit input.md and decisions.md during planning. Plan files get committed by Claude during execution.
+
+## For syncing worktree branch with main before execution: Rebase or merge?
+Rebase onto main — Cleaner history, replays worktree commits on top of latest main.
+
+## If the rebase has conflicts, should `raf do` abort or skip sync?
+Skip sync and warn — Skip the sync step, show a warning, and continue execution on the current branch state.
+
+## For removing token report from plan: Should `session-parser.ts` and its tests be deleted or kept?
+Delete session-parser entirely — Remove session-parser.ts and its test file since they have no other consumers.
+
+## Should the `sessionId` parameter be removed from `runInteractive()` in claude-runner.ts?
+Remove sessionId from runInteractive() too — Clean up the runner API as well since no other callers pass sessionId.

package/RAF/ahwidh-quick-fix-gremlin/input.md

@@ -0,0 +1,35 @@
+
+- [ ] add a quick way to see and edit current configuration like 'raf config --get model.plan' (or just get to see whole config, merged with default) and 'raf config --set model.plan sonnet' (support only last level of nesting, can't save whole model object). if get and set flag are present - don't lanuch setting wizard with sonnet (like with --reset)
+- [ ] investigate why token calculation is so low? (example: Tokens: 22 in / 6,861 out). does't it include amend system prompt? my understanding that input tokens are roughly sum of amend system prompt and plan. but plans are usually bigger that 22 tokens. investigate and create task plan to fix if needed
+- [ ] raf commits new plans in "--amend" mode. it should only commit changes in input.md and decisions.md
+- [ ] fix pr comment (PR #5)[src/utils/terminal-symbols.ts](https://github.com/john-veresk/raf/pull/5/files/69f5fab1e125f871ce1356d366195ae34d195830#diff-796b8f7b8ea37125b855e9cb41581303ae65bc9e30693f8d9f91a8eb91554f15)
+
+		|   |
+		|---|
+		|cost: CostBreakdown,|
+		|options: TokenSummaryOptions = {}|
+		|): string {|
+		|const { showCacheTokens = true, showRateLimitEstimate = false, rateLimitPercentage } = options;|
+
+		 **[![P2 Badge](https://camo.githubusercontent.com/f2c1aacb361ddd3a0e9f9cacdb84fab050de434017f6747bb916e31e29bdf03d/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f50322d79656c6c6f773f7374796c653d666c6174)](https://camo.githubusercontent.com/f2c1aacb361ddd3a0e9f9cacdb84fab050de434017f6747bb916e31e29bdf03d/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f50322d79656c6c6f773f7374796c653d666c6174) Enable rate-limit estimate in default token summaries**
+		
+		The formatter now defaults `showRateLimitEstimate` to `false`, but `raf do` still calls `formatTaskTokenSummary(...)` and `formatTokenTotalSummary(...)`without passing `TokenSummaryOptions`, so the newly added 5h window estimate is never shown in execution summaries despite `display.showRateLimitEstimate`defaulting to `true`. This makes the new rate-limit display/config effectively inactive in the main execution path unless every caller is updated.
+- [ ] fix pr comment (https://github.com/john-veresk/raf/pull/5). use gh tool to fetch context if needed. [src/core/worktree.ts](https://github.com/john-veresk/raf/pull/5/files/69f5fab1e125f871ce1356d366195ae34d195830#diff-f5303b02aaa03b1fd86860fe0c47fe6aaa7e3e5ca598c7b581d54470d668670b)
+
+		Comment on lines +534 to +537
+		
+		|   |
+		|---|
+		|success: true,|
+		|mainBranch,|
+		|hadChanges: false,|
+		|error: `Local ${mainBranch} has diverged from origin, not updated`,|
+	
+		
+		 **[![P2 Badge](https://camo.githubusercontent.com/f2c1aacb361ddd3a0e9f9cacdb84fab050de434017f6747bb916e31e29bdf03d/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f50322d79656c6c6f773f7374796c653d666c6174)](https://camo.githubusercontent.com/f2c1aacb361ddd3a0e9f9cacdb84fab050de434017f6747bb916e31e29bdf03d/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f50322d79656c6c6f773f7374796c653d666c6174) Treat diverged main branch as sync failure**
+		
+		When `git fetch origin <main>:<main>` fails because local `<main>` has diverged, this branch returns `success: true` with an `error` message, which means the new callers in `runDoCommand`/`runPlanCommand` (they only warn on `success === false`) silently continue without actually updating the local main branch. In this state worktree/PR flows proceed on stale base refs without surfacing the sync problem, so this path should be reported as a failure (or callers must treat `error` as a warning condition).
+
+---
+
+- [ ] remove token report from plan (and all the code related)

package/RAF/ahwidh-quick-fix-gremlin/outcomes/01-fix-name-generation-prompt.md

@@ -0,0 +1,33 @@
+# Outcome: Fix project name generation prompt
+
+## Summary
+Successfully tightened the Claude prompts for project name generation to prevent Haiku from outputting preamble text that gets misinterpreted as a project name option.
+
+## Changes Made
+
+### 1. Updated `MULTI_NAME_GENERATION_PROMPT` (src/utils/name-generator.ts:22-30)
+- **Before**: Prompt started with "Generate 5 creative project names..." followed by detailed style descriptions
+- **After**: Prompt now starts with "Output EXACTLY 5 project names, one per line. Do NOT include any introduction, explanation, preamble, numbering, or quotes."
+- Removed numbered style descriptions (which encouraged narration) and replaced with concise bulleted rules
+- Output format constraint is now the first thing the model sees
+
+### 2. Updated `NAME_GENERATION_PROMPT` (src/utils/name-generator.ts:6-20)
+- **Before**: Output format instruction was buried after creative examples
+- **After**: Prompt now starts with "Output ONLY the kebab-case name. No introduction, no explanation, no quotes."
+- Consistent with the multi-name approach
+
+### 3. Updated test (tests/unit/name-generator.test.ts:173)
+- Changed assertion from `expect(promptArg).toContain('Generate 5 creative project names')` to `expect(promptArg).toContain('Output EXACTLY 5 project names')`
+- All 29 tests pass
+
+## Key Improvements
+- Output format constraints are now the **first** thing in both prompts
+- Explicit prohibition of preamble/introduction text
+- Simplified instructions reduce the urge for models (especially Haiku) to narrate
+- Maintains creative guidance while being more directive about format
+
+## Testing
+- All existing unit tests pass (29/29)
+- No changes to parsing logic as requested
+
+<promise>COMPLETE</promise>

package/RAF/ahwidh-quick-fix-gremlin/outcomes/02-fix-amend-commit-scope.md

@@ -0,0 +1,43 @@
+# Outcome: Fix amend mode commit to exclude plan files
+
+## Summary
+Successfully modified amend mode to only commit `input.md` and `decisions.md`, excluding new plan files. Plan files are now deferred to task execution commits, matching the behavior of initial planning.
+
+## Changes Made
+
+### 1. Updated `src/commands/plan.ts` (lines 650-656)
+- **Before**: Amend commit included `input.md`, `decisions.md`, and all new plan files via `additionalFiles` parameter
+- **After**: Amend commit only includes `input.md` and `decisions.md`
+- Removed the `newPlanPaths` variable (no longer needed)
+- Updated comment to clarify plan files are committed during execution
+
+### 2. Updated `tests/unit/commit-planning-artifacts.test.ts` (lines 255-291)
+- **Test name changed**: `'should stage additional files when provided'` → `'should not stage plan files in amend mode'`
+- **Before**: Test verified 4 files were staged (input, decisions, 2 plan files) with `isAmend: true`
+- **After**: Test verifies only 2 files are staged (input, decisions) with `isAmend: true`
+- Removed `additionalFiles` parameter from the test call
+
+### 3. Updated `tests/unit/commit-planning-artifacts-worktree.test.ts` (two tests)
+
+#### Test 1: `'should commit with amend mode in worktree'` (lines 165-183)
+- Removed `additionalFiles` array and parameter
+- Changed assertion from expecting plan file to be included to expecting it NOT to be included
+- Updated comment to clarify plan files are not included in amend commit
+
+#### Test 2: `'should commit after worktree recreation from branch'` (lines 237-255)
+- Removed `additionalFiles` array and parameter
+- Changed assertion from expecting plan file to be included to expecting it NOT to be included
+- Updated comment to clarify plan files are not included in amend commit
+
+## Testing
+All 21 tests pass:
+- `commit-planning-artifacts.test.ts`: 16 tests ✓
+- `commit-planning-artifacts-worktree.test.ts`: 5 tests ✓
+
+## Acceptance Criteria
+- ✅ Amend commit only stages `input.md` and `decisions.md`
+- ✅ `additionalFiles` is not passed in the amend code path
+- ✅ Initial planning commit behavior unchanged
+- ✅ Existing tests updated and passing
+
+<promise>COMPLETE</promise>

package/RAF/ahwidh-quick-fix-gremlin/outcomes/03-fix-diverged-main-branch-sync.md

@@ -0,0 +1,32 @@
+# Outcome: Fix diverged main branch sync to report failure
+
+## Summary
+Successfully changed `pullMainBranch()` to return `success: false` when the local main branch has diverged from remote, ensuring callers surface the issue as a warning instead of silently ignoring it.
+
+## Changes Made
+
+### 1. Updated `src/core/worktree.ts` (line 534)
+- **Before**: `success: true` when local main has diverged from remote
+- **After**: `success: false` when local main has diverged from remote
+- The plain `git fetch origin main` still runs successfully, updating the remote ref
+- The error message remains: `"Local ${mainBranch} has diverged from origin, not updated"`
+
+### 2. Updated `tests/unit/worktree.test.ts` (line 732)
+- **Test**: "should warn when local main has diverged"
+- **Before**: `expect(result.success).toBe(true)`
+- **After**: `expect(result.success).toBe(false)`
+- All 75 worktree tests pass
+
+## Key Improvements
+- Diverged branch scenarios are now properly surfaced to callers
+- Callers already had `if (!syncResult.success) { logger.warn(...) }` pattern in place (lines 243-250 in do.ts and similar in plan.ts)
+- Users will now see a warning when their local main has diverged, instead of proceeding silently on a stale base ref
+- Execution continues after the warning (soft failure), not a hard error
+
+## Acceptance Criteria
+- ✅ Diverged branch path returns `success: false`
+- ✅ Callers show a warning via `logger.warn()` (already handled)
+- ✅ Execution continues after the warning (callers don't abort)
+- ✅ Tests updated and passing (75/75 tests pass)
+
+<promise>COMPLETE</promise>

package/RAF/ahwidh-quick-fix-gremlin/outcomes/04-wire-rate-limit-to-do-command.md

@@ -0,0 +1,61 @@
+# Outcome: Wire rate-limit estimate display config to do command
+
+## Summary
+Successfully wired the `display.showRateLimitEstimate` and `display.showCacheTokens` config settings through to the token summary formatters in the `raf do` command. The rate limit percentage feature is now fully functional and respects user configuration.
+
+## Changes Made
+
+### 1. Updated `src/commands/do.ts`
+
+**Import config helpers** (line 16):
+- Added `getShowRateLimitEstimate` and `getShowCacheTokens` to imports from `../utils/config.js`
+
+**Per-task token display - success path** (lines 1217-1225):
+- Changed from calling `formatTaskTokenSummary(entry, calculateCost)` without options
+- To calling with full options object containing:
+  - `showCacheTokens: getShowCacheTokens()`
+  - `showRateLimitEstimate: getShowRateLimitEstimate()`
+  - `rateLimitPercentage: tokenTracker.getCumulativeRateLimitPercentage()`
+
+**Per-task token display - failure path** (lines 1245-1253):
+- Applied identical changes to the failed-task code path
+- Ensures rate limit percentage is shown even for failed tasks with partial usage data
+
+**Grand total summary** (lines 1356-1365):
+- Changed from calling `formatTokenTotalSummary(usage, cost)` without options
+- To calling with full options object containing the same config values
+- Uses `tokenTracker.getCumulativeRateLimitPercentage()` to get the final cumulative percentage
+
+### 2. Updated `src/utils/terminal-symbols.ts`
+
+**Function `formatTokenLine`** (line 180):
+- Changed default: `showRateLimitEstimate = false` → `showRateLimitEstimate = true`
+- Now matches the config default (`display.showRateLimitEstimate: true`)
+
+**Function `formatTokenTotalSummary`** (line 258):
+- Changed default: `showRateLimitEstimate = false` → `showRateLimitEstimate = true`
+- Ensures consistent default behavior across both formatter functions
+
+## Key Improvements
+
+1. **Feature is now live**: Previously dead code due to hardcoded `false` defaults
+2. **Config-driven**: Both `display.showRateLimitEstimate` and `display.showCacheTokens` are properly wired through
+3. **Cumulative tracking**: Each task shows the cumulative rate limit percentage up to that point
+4. **Grand total**: Final summary shows the total cumulative percentage across all tasks
+5. **User control**: Users can disable via `display.showRateLimitEstimate: false` in config
+
+## Testing
+
+- All 1273 tests pass (including 76 terminal-symbols tests)
+- TypeScript compilation successful with no errors
+- No test changes required (existing tests already covered the functionality)
+
+## Acceptance Criteria
+
+- ✅ Per-task token summaries show rate limit percentage when `display.showRateLimitEstimate` is `true`
+- ✅ Grand total summary shows rate limit percentage
+- ✅ Setting `display.showRateLimitEstimate: false` in config suppresses the display
+- ✅ `display.showCacheTokens` config is also wired through
+- ✅ Tests pass
+
+<promise>COMPLETE</promise>

package/RAF/ahwidh-quick-fix-gremlin/outcomes/05-add-config-get-set-flags.md

@@ -0,0 +1,125 @@
+# Outcome: Add --get and --set flags to raf config
+
+## Summary
+Successfully added `--get` and `--set` flags to `raf config` command for quick, non-interactive config viewing and editing without launching the Claude wizard.
+
+## Changes Made
+
+### 1. Updated `src/commands/config.ts`
+
+**Enhanced ConfigCommandOptions interface** (lines 19-23):
+- Added `get?: true | string` field (true when no key, string when specific key provided)
+- Added `set?: string[]` field to capture key-value pairs
+
+**Added helper functions** (lines 120-225):
+- `getNestedValue(obj, dotPath)` - traverse config by dot notation
+- `setNestedValue(obj, dotPath, value)` - set leaf values by dot notation
+- `deleteNestedValue(obj, dotPath)` - remove leaf values and clean up empty parents
+- `getDefaultValue(dotPath)` - get default value from DEFAULT_CONFIG
+- `parseValue(value)` - parse strings to numbers/booleans via JSON.parse fallback
+- `formatValue(value)` - format values for console output (plain strings, formatted objects)
+
+**Implemented handleGet function** (lines 229-246):
+- When `key === true`: prints full merged config as formatted JSON
+- When `key` is a string: retrieves and prints the specific value
+- Plain output for strings/numbers/booleans, formatted JSON for objects
+- Exits with error if key not found
+
+**Implemented handleSet function** (lines 248-296):
+- Reads current user config or starts with empty object
+- Parses value using JSON.parse (for numbers/booleans) with string fallback
+- Validates key exists in schema by checking default value
+- Compares with default value - if equal, removes key from config (keeps config minimal)
+- Cleans up empty parent objects after removal
+- Validates resulting config before saving
+- Deletes config file if it becomes completely empty
+- Provides clear success/info messages
+
+**Updated command definition** (lines 300-335):
+- Added `.option('--get [key]', '...')` for viewing config
+- Added `.option('--set <items...>', '...')` for setting values (variadic to capture key + value)
+- Added mutual exclusion check between `--get` and `--set`
+- `--reset` takes precedence over other flags
+- Routes to appropriate handler or falls back to interactive wizard
+
+### 2. Updated `tests/unit/config-command.test.ts`
+
+**Added option tests** (lines 53-59):
+- Tests verify `--get` and `--set` options exist on command
+
+**Added --get flag test suite** (lines 246-269):
+- Tests full config retrieval (no key)
+- Tests specific key retrieval (dot notation)
+- Tests nested keys (e.g., `display.showRateLimitEstimate`)
+- Tests deeply nested keys (e.g., `pricing.opus.inputPerMTok`)
+
+**Added --set flag test suite** (lines 271-343):
+- Tests setting string values
+- Tests setting number values (JSON.parse)
+- Tests setting boolean values (JSON.parse)
+- Tests default value removal (keeps config minimal)
+- Tests empty parent object cleanup
+- Tests validation after modification
+- Tests config file deletion when empty
+- Tests nested value updates
+
+## Key Features
+
+1. **Quick access**: No Claude wizard overhead for simple operations
+2. **Dot notation**: Supports all config paths (e.g., `models.plan`, `display.showRateLimitEstimate`)
+3. **Type parsing**: Automatically parses numbers and booleans via JSON.parse
+4. **Minimal config**: Removes keys that match defaults to keep config file clean
+5. **Parent cleanup**: Removes empty parent objects after leaf deletion
+6. **Validation**: Full schema validation before saving changes
+7. **Error handling**: Clear error messages for invalid keys, values, or operations
+8. **Mutual exclusion**: Prevents conflicting `--get`/`--set` flags
+
+## Usage Examples
+
+```bash
+# View full merged config
+raf config --get
+
+# View specific value (plain output)
+raf config --get models.plan
+# Output: opus
+
+# Set a model
+raf config --set models.plan sonnet
+# Output: Set models.plan = sonnet
+
+# Set a number
+raf config --set timeout 120
+# Output: Set timeout = 120
+
+# Set a boolean
+raf config --set autoCommit false
+# Output: Set autoCommit = false
+
+# Set back to default (removes from config)
+raf config --set models.plan opus
+# Output: Value matches default, removing models.plan from config
+
+# View nested value
+raf config --get display.showRateLimitEstimate
+# Output: true
+```
+
+## Testing
+- All 40 config-command tests pass
+- Full test suite: 1287 tests pass
+- Manual testing confirms all functionality works as expected
+- Error cases properly handled (invalid keys, invalid values, mutual exclusion)
+
+## Acceptance Criteria
+- ✅ `raf config --get` prints full merged config as formatted JSON
+- ✅ `raf config --get models.plan` prints plain value (e.g., `opus`)
+- ✅ `raf config --set models.plan sonnet` updates config file
+- ✅ Setting value to default removes it from config file
+- ✅ Empty sections cleaned up after removal
+- ✅ Value parsing handles strings, numbers, and booleans
+- ✅ Invalid keys/values show clear error messages
+- ✅ Interactive wizard NOT launched when --get or --set is present
+- ✅ Tests pass
+
+<promise>COMPLETE</promise>

package/RAF/ahwidh-quick-fix-gremlin/outcomes/06-sync-worktree-branch-before-execution.md

@@ -0,0 +1,96 @@
+# Outcome: Sync worktree branch with main before execution
+
+## Summary
+Successfully implemented automatic rebasing of worktree branches onto the latest main branch before task execution in `raf do`. This ensures worktree branches are up-to-date, reducing merge conflicts later.
+
+## Changes Made
+
+### 1. Added `RebaseResult` interface and `rebaseOntoMain` function to `src/core/worktree.ts`
+
+**New interface** (line 444-447):
+- `RebaseResult` with `success: boolean` and `error?: string`
+
+**New function `rebaseOntoMain`** (lines 668-695):
+- Takes `mainBranch` (branch name) and `cwd` (worktree directory) as parameters
+- Executes `git rebase ${mainBranch}` in the specified directory
+- On rebase failure (e.g., conflicts):
+  - Automatically runs `git rebase --abort` to restore clean state
+  - Returns `success: false` with error message
+  - Gracefully ignores abort errors if abort itself fails
+- Returns `success: true` on successful rebase
+
+### 2. Updated `src/commands/do.ts`
+
+**Added imports** (lines 55-56):
+- `detectMainBranch` and `rebaseOntoMain` from `../core/worktree.js`
+
+**Stored main branch name** (lines 228, 246):
+- Added `mainBranchName` variable to capture the main branch from `pullMainBranch()` sync result
+- Falls back to `detectMainBranch()` if sync was disabled or failed
+
+**Added rebase step** (lines 468-479):
+- After post-execution action picker but before task execution
+- Only runs when:
+  - In worktree mode (`worktreeMode && worktreeRoot`)
+  - `syncMainBranch` config setting is enabled
+  - Main branch can be detected
+- On success: logs `"Rebased onto ${mainBranch}"`
+- On failure: logs warning with error message and `"Continuing with current branch state."`
+- Execution continues regardless of rebase outcome (soft failure)
+
+### 3. Added tests to `tests/unit/worktree.test.ts`
+
+**Added `rebaseOntoMain` to imports** (line 49)
+
+**Added test suite for `rebaseOntoMain`** (lines 809-857):
+
+1. **"should successfully rebase onto main branch"**:
+   - Mocks successful `git rebase main` execution
+   - Verifies `success: true` and no error
+   - Confirms git command called with correct `cwd`
+
+2. **"should abort rebase and return failure on conflict"**:
+   - Mocks rebase failure with "CONFLICT" error
+   - Verifies `success: false` with error message
+   - Confirms both `git rebase main` and `git rebase --abort` are called
+   - Ensures abort is called with correct `cwd`
+
+3. **"should handle rebase abort failure gracefully"**:
+   - Mocks both rebase and abort failures
+   - Verifies function still returns `success: false` even when abort fails
+   - Ensures abort errors don't crash the function
+
+### 4. Updated test mock in `tests/unit/post-execution-picker.test.ts`
+
+**Added `rebaseOntoMain`** (line 68):
+- Added to the worktree module mock to prevent import errors
+
+## Key Features
+
+1. **Automatic sync**: Worktree branches are rebased onto main before each execution, keeping them current
+2. **Conflict handling**: On rebase conflicts, automatically aborts and continues with a warning
+3. **Config-driven**: Respects `syncMainBranch` config setting (skips when disabled)
+4. **Main branch detection**: Uses cached main branch from sync step, falls back to detection
+5. **Clean state**: On conflict, `git rebase --abort` ensures worktree is left in a usable state
+6. **Soft failure**: Rebase failures are warnings, not errors - execution continues
+7. **Worktree-only**: Rebase only happens in worktree mode, not in standard mode
+
+## Testing
+
+- All 1290 tests pass (78 worktree tests including 3 new rebase tests)
+- TypeScript compilation successful with no errors
+- Test coverage includes:
+  - Successful rebase scenario
+  - Conflict scenario with automatic abort
+  - Abort failure graceful handling
+
+## Acceptance Criteria
+
+- ✅ Worktree branch is rebased onto main before task execution
+- ✅ Conflicts cause rebase abort + warning, execution continues
+- ✅ Rebase only happens in worktree mode
+- ✅ Respects `syncMainBranch` config setting
+- ✅ Main branch name correctly determined from sync result or detection
+- ✅ Tests pass
+
+<promise>COMPLETE</promise>

package/RAF/ahwidh-quick-fix-gremlin/outcomes/07-update-frontmatter-format.md

@@ -0,0 +1,107 @@
+# Outcome: Update plan frontmatter to standard Obsidian format
+
+## Summary
+Successfully migrated plan file frontmatter from the non-standard closing-delimiter-only format to the standard Obsidian/YAML format with both opening and closing `---` delimiters. The parser maintains full backward compatibility with existing plan files.
+
+## Changes Made
+
+### 1. Updated `src/utils/frontmatter.ts`
+
+**Enhanced `parsePlanFrontmatter()` function** (lines 27-72):
+- **Before**: Only supported legacy format (closing `---` only)
+- **After**: Supports both standard format (`---`/`---`) and legacy format for backward compatibility
+
+**Standard format detection** (lines 50-62):
+- Checks if content starts with `---` (after trimming leading whitespace)
+- If present: extracts content between opening `---` and closing `---`
+- Handles `---` with trailing spaces/content on the same line
+- Returns empty if no closing delimiter found
+
+**Legacy format fallback** (lines 63-69):
+- If no opening `---` found: uses original logic
+- Finds first `---` and treats everything before it as frontmatter
+- Maintains 100% compatibility with existing plan files
+
+**Updated JSDoc** (lines 26-47):
+- Documents both supported formats with examples
+- Clarifies standard format is preferred
+
+### 2. Updated `tests/unit/frontmatter.test.ts`
+
+**Added comprehensive standard format tests** (lines 4-96):
+- Parse effort field in standard format
+- Parse model field in standard format
+- Parse both effort and model
+- Handle empty frontmatter block (`---\n---`)
+- Handle whitespace before opening delimiter
+- Handle empty lines in frontmatter
+- Handle opening delimiter with trailing spaces
+- Return empty for missing closing delimiter
+- Return empty for opening delimiter without newline
+
+**Renamed legacy tests section** (line 98):
+- Changed from `'valid frontmatter'` to `'legacy format (closing --- only)'`
+- All existing tests remain unchanged and passing
+
+**Test results**:
+- All 26 frontmatter tests pass (9 new standard format tests, 16 legacy format tests, 1 renamed)
+- Full test suite: 1299 tests pass (no regressions)
+
+### 3. Updated `src/prompts/planning.ts`
+
+**Updated frontmatter format instructions** (lines 83-88):
+- Changed example from closing-only to standard format with opening `---`
+- Updated description: "The frontmatter uses standard YAML format with opening and closing \`---\` delimiters"
+
+**Updated frontmatter optional model example** (lines 129-136):
+- Added opening `---` to the example showing model override
+
+### 4. Updated `src/prompts/amend.ts`
+
+**Updated frontmatter format instructions** (lines 138-143):
+- Changed example from closing-only to standard format with opening `---`
+- Updated description: "The frontmatter uses standard YAML format with opening and closing \`---\` delimiters"
+
+**Updated frontmatter optional model example** (lines 188-195):
+- Added opening `---` to the example showing model override
+
+### 5. Updated `CLAUDE.md`
+
+**Updated Plan File Structure section** (lines 47-84):
+- Changed frontmatter example from closing-only to standard format
+- Updated frontmatter description:
+  - Before: "Uses Obsidian-style format: \`key: value\` lines followed by \`---\` (no opening delimiter)"
+  - After: "Uses standard Obsidian/YAML format: opening \`---\`, \`key: value\` lines, closing \`---\`"
+- Added note: "Parser also supports legacy format (no opening \`---\`) for backward compatibility"
+
+### 6. Updated current project plan file
+
+**Updated task 07 plan file** (`RAF/ahwidh-quick-fix-gremlin/plans/07-update-frontmatter-format.md`):
+- Changed from `effort: medium\n---` to `---\neffort: medium\n---`
+- Demonstrates the new standard format in action
+
+## Key Features
+
+1. **Standard compliance**: Aligns with Obsidian, Jekyll, Hugo, and other markdown tools
+2. **Backward compatibility**: All existing plan files with legacy format continue to work
+3. **Robust parsing**: Handles whitespace variations, empty blocks, and edge cases
+4. **Future-proof**: New plan files generated by Claude will use the standard format
+5. **Comprehensive testing**: 9 new tests for standard format, all legacy tests preserved
+
+## Acceptance Criteria
+
+- ✅ Parser handles standard `---`/`---` format correctly
+- ✅ Parser still handles legacy closing-only format (backward compatibility)
+- ✅ Planning prompts generate the new standard format
+- ✅ CLAUDE.md documentation updated
+- ✅ Tests cover both old and new formats
+- ✅ All existing tests pass (1299/1299)
+
+## Notes
+
+- The parser uses `trimStart()` to handle optional leading whitespace before the opening `---`
+- The standard format requires a newline after the opening `---` (cannot be `---key: value`)
+- Legacy format is automatically detected when content doesn't start with `---`
+- All future plan files generated by Claude will use the standard format with opening delimiter
+
+<promise>COMPLETE</promise>