feat: enhance plan.md command with numbered tasks and implementation status check

- Add implementation status check stage to avoid duplicate work
- Structure tasks with numbered main tasks and subtasks for better organization
- Update plan-iterator.sh to handle new numbered task format
- Improve task referencing and progress tracking

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: AlexVOiceover

.claude/commands/plan.md

@@ -11,21 +11,29 @@ Create a new plan from a Jira task: fetch details, transition to In Progress, cr
    - If it fails or times out, tell the user: "Jira connection failed. Please run `/mcp`, select `atlassian`, and choose `4. Reconnect`, then run `/plan $ARGUMENTS` again."
    - Extract: summary, description, issue type
 
-2. **Transition to In Progress**:
+2. **Check implementation status**:
+   - Analyze the codebase to determine if this feature/fix has already been implemented
+   - Search for relevant files, functions, components that relate to the ticket
+   - If fully implemented: comment on Jira and suggest moving to "Done"
+   - If partially implemented: note what's done and focus plan on remaining work
+   - If not implemented: proceed with full planning
+
+3. **Transition to In Progress**:
    - Use `mcp__atlassian__getTransitionsForJiraIssue` to get available transitions
    - Use `mcp__atlassian__transitionJiraIssue` to move to "In Progress" (skip if already in progress)
 
-3. **Create the feature branch**:
+4. **Create the feature branch**:
    - Generate branch name: `feature/{ticket-id-lowercase}-{slugified-summary}`
    - Example: `AP-23 Add Bulk Event Creation` → `feature/ap-23-add-bulk-event-creation`
    - Run: `git checkout main && git pull && git checkout -b {branch-name}`
 
-4. **Write the plan**:
+5. **Write the plan**:
    - Create/overwrite `docs/plan.md`
-   - Break down the Jira task into small, actionable checkbox tasks
+   - Break down the Jira task into numbered, actionable checkbox tasks
+   - Structure as main tasks with subtasks for better control
    - Each task should be one focused change
 
-5. **Activate the loop**:
+6. **Activate the loop**:
    - Create the marker file: `touch .claude/loop`
    - This tells the plan-iterator hook to auto-continue through tasks
 
@@ -38,10 +46,19 @@ Create a new plan from a Jira task: fetch details, transition to In Progress, cr
 
 ## Tasks
 
-- [ ] First small task
-- [ ] Second small task
-- [ ] Add tests for X
-- [ ] Handle edge case Y
+1. [ ] **Setup and Infrastructure**
+   - [ ] 1.1 First preparatory step
+   - [ ] 1.2 Second preparatory step
+
+2. [ ] **Core Implementation**
+   - [ ] 2.1 Main feature component
+   - [ ] 2.2 Supporting functionality
+   - [ ] 2.3 Integration points
+
+3. [ ] **Testing and Validation**
+   - [ ] 3.1 Add unit tests for X
+   - [ ] 3.2 Add integration tests for Y
+   - [ ] 3.3 Handle edge case Z
 
 ## Notes
 
@@ -51,6 +68,7 @@ Create a new plan from a Jira task: fetch details, transition to In Progress, cr
 ## Rules
 
 - **Checkbox format**: Must use `- [ ]` exactly (the plan-iterator hook reads this)
+- **Numbered structure**: Use numbered main tasks (1, 2, 3) with numbered subtasks (1.1, 1.2, etc)
 - **Small tasks**: Each task = one focused change, completable in one session
 - **Logical order**: Order by dependency
 - **Include tests**: Add test tasks where appropriate
@@ -71,13 +89,19 @@ Output `docs/plan.md`:
 
 ## Tasks
 
-- [ ] Add avatar field to user schema
-- [ ] Create file upload API endpoint
-- [ ] Add image validation (size, format)
-- [ ] Store avatars in cloud storage
-- [ ] Display avatar in profile page
-- [ ] Add fallback for users without avatar
-- [ ] Write tests for upload endpoint
+1. [ ] **Database and API Setup**
+   - [ ] 1.1 Add avatar field to user schema
+   - [ ] 1.2 Create file upload API endpoint
+   - [ ] 1.3 Add image validation (size, format)
+
+2. [ ] **Storage and Display**
+   - [ ] 2.1 Store avatars in cloud storage
+   - [ ] 2.2 Display avatar in profile page
+   - [ ] 2.3 Add fallback for users without avatar
+
+3. [ ] **Testing and Validation**
+   - [ ] 3.1 Write tests for upload endpoint
+   - [ ] 3.2 Test image validation edge cases
 
 ## Notes
 

.claude/hooks/plan-iterator.sh

@@ -23,7 +23,7 @@ if [[ ! -f "$PLAN_FILE" ]]; then
 fi
 
 # Count remaining tasks (unchecked boxes)
-REMAINING=$(grep -c '^\s*- \[ \]' "$PLAN_FILE" 2>/dev/null | head -1 || echo "0")
+REMAINING=$(grep -c '^\s*\([0-9]\+\.\s*\)\?\s*- \[ \]' "$PLAN_FILE" 2>/dev/null | head -1 || echo "0")
 REMAINING=${REMAINING:-0}
 
 # All tasks complete - cleanup and exit
@@ -33,7 +33,7 @@ if [[ "$REMAINING" -eq 0 ]]; then
 fi
 
 # Count completed tasks
-COMPLETED=$(grep -c '^\s*- \[x\]' "$PLAN_FILE" 2>/dev/null | head -1 || echo "0")
+COMPLETED=$(grep -c '^\s*\([0-9]\+\.\s*\)\?\s*- \[x\]' "$PLAN_FILE" 2>/dev/null | head -1 || echo "0")
 COMPLETED=${COMPLETED:-0}
 
 # Stage all changes FIRST
@@ -42,13 +42,13 @@ git add -A >/dev/null 2>&1 || true
 # Then commit if there are staged changes
 if ! git diff --cached --quiet 2>/dev/null; then
   if [[ "$COMPLETED" -gt 0 ]]; then
-    LAST_DONE=$(grep -E '^\s*- \[x\]' "$PLAN_FILE" | tail -1 | sed 's/.*\[x\] //')
+    LAST_DONE=$(grep -E '^\s*\([0-9]\+\.\s*\)?\s*- \[x\]' "$PLAN_FILE" | tail -1 | sed 's/.*\[x\] //')
     git commit -m "feat: $LAST_DONE" >/dev/null 2>&1 || true
   fi
 fi
 
 # Find next task
-NEXT_TASK=$(grep -m1 '^\s*- \[ \]' "$PLAN_FILE" | sed 's/.*\[ \] //' | sed 's/"/\\"/g')
+NEXT_TASK=$(grep -m1 '^\s*\([0-9]\+\.\s*\)\?\s*- \[ \]' "$PLAN_FILE" | sed 's/.*\[ \] //' | sed 's/"/\\"/g')
 
 # Build the reason message for Claude
 read -r -d '' REASON << MSGEOF