Needs to arhive

Author: ryaneggz

.claude/skills/feature-dev/SKILL.md

@@ -165,20 +165,24 @@ Check for existing work that overlaps with this feature:
 
 ---
 
-## Phase 3: Create Branch & Worktree
+## Phase 3: Archive, Create Branch & Worktree
 
-1. _DETERMINE_ naming:
+1. _ARCHIVE_ previous Ralph run before any new work begins:
+   - _SPAWN_ a subagent to run: `make -C $ORCHESTRA_PROJECT_ROOT archive`
+   - This archives `.ralph/prd.json` and `.ralph/progress.txt` from any previous feature
+   - **Must complete before the first push** to avoid polluting the new branch with stale artifacts
+2. _DETERMINE_ naming:
    - Branch: `feat/<issue#>-<feature-name>`
    - Worktree path: `$ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#>`
-2. _FETCH_ latest development:
+3. _FETCH_ latest development:
    - RUN `git fetch origin development`
-3. _CREATE_ worktree:
+4. _CREATE_ worktree:
    - RUN `git worktree add $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> -b feat/<issue#>-<feature-name> origin/development`
-4. _INITIALIZE_ worktree:
+5. _INITIALIZE_ worktree:
    - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && bash $ORCHESTRA_PROJECT_ROOT/backend/scripts/changelog.sh`
    - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && git add Changelog.md && git commit -s -m "init feat/<issue#>-<feature-name>"`
    - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && git push -u origin feat/<issue#>-<feature-name>`
-5. _UPDATE_ the GitHub issue with implementation metadata:
+6. _UPDATE_ the GitHub issue with implementation metadata:
    - RUN:
      ```bash
      gh issue comment <issue#> --body "$(cat <<'EOF'
@@ -190,7 +194,26 @@ Check for existing work that overlaps with this feature:
      EOF
      )"
      ```
-6. _REPORT_ "Worktree created at $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> on branch feat/<issue#>-<feature-name>"
+7. _CREATE_ draft PR so all subsequent pushes are visible:
+   - RUN:
+     ```bash
+     cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && gh pr create \
+       --draft \
+       --base development \
+       --title "FROM feat/<issue#>-<feature-name> TO development" \
+       --body "$(cat <<'EOF'
+     ## Summary
+     Resolves #<issue#>
+
+     ## Status
+     Pipeline in progress &mdash; this PR will be marked ready for review when Ralph completes.
+
+     Generated by `/feature-dev` skill.
+     EOF
+     )"
+     ```
+   - _CAPTURE_ the PR URL from output
+8. _REPORT_ "Previous run archived. Worktree created at $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> on branch feat/<issue#>-<feature-name>. Draft PR opened."
 
 ---
 
@@ -269,39 +292,40 @@ This phase produces two artifacts in sequence: the PRD markdown file (via `/prd`
 
 Feed `tasks/prd-<feature-name>.md` from Step 1 directly into the `/ralph` skill.
 
-1. _INVOKE_ `/ralph-archive` first to archive any existing prd.json from a different feature
-2. _INVOKE_ the `/ralph` skill with the PRD file as input:
+1. _INVOKE_ the `/ralph` skill with the PRD file as input (archiving already handled in Phase 4):
    ```
    Load the ralph skill and convert tasks/prd-<feature-name>.md to .ralph/prd.json
 
    CRITICAL: Set branchName to "feat/<issue#>-<feature-name>" (must match the worktree branch exactly). Do NOT use the "ralph/" prefix.
    ```
-3. _VERIFY_ `.ralph/prd.json` exists and contains valid JSON
-4. _VALIDATE_ branchName matches `feat/<issue#>-<feature-name>`:
+2. _VERIFY_ `.ralph/prd.json` exists and contains valid JSON
+3. _VALIDATE_ branchName matches `feat/<issue#>-<feature-name>`:
    - RUN `jq -r '.branchName' .ralph/prd.json`
    - _IF_ mismatch: manually fix branchName in prd.json
-5. _VALIDATE_ final story includes git status check:
+4. _VALIDATE_ final story includes git status check:
    - _READ_ the last user story in prd.json
    - _ENSURE_ its acceptance criteria include: "Verify if there are any remaining changes by running git status. If remaining changes exist, commit and push to branch."
    - _IF_ missing: add this criterion to the last story
-6. _COMMIT_ Ralph artifacts:
+5. _COMMIT_ Ralph artifacts:
    - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && git add .ralph/prd.json .ralph/progress.txt`
    - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && git commit -s -m "chore: add Ralph config for #<issue#>"`
    - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && git push`
 7. _REPORT_ "PRD generated and Ralph config committed with <N> user stories"
 
 ---
 
-## Phase 6: Verify Remote & Create PR
+## Phase 6: Final Push & Mark PR Ready
 
-All artifacts have been committed and pushed incrementally in previous phases. This phase ensures everything is synced.
+All artifacts have been committed and pushed incrementally in previous phases. This phase catches any stragglers and marks the draft PR as ready for review.
 
 1. _VERIFY_ remote is up to date:
    - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && git status`
    - _IF_ uncommitted changes remain: stage, commit, and push them
-2. _ENSURE_ branch is tracking remote:
-   - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && git push -u origin feat/<issue#>-<feature-name>`
-3. _REPORT_ "All artifacts pushed to feat/<issue#>-<feature-name>"
+2. _PUSH_ any final changes:
+   - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && git push`
+3. _MARK_ PR ready for review:
+   - RUN `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && gh pr ready`
+4. _REPORT_ "All artifacts pushed. PR marked ready for review."
 
 ---
 
@@ -329,6 +353,7 @@ All artifacts have been committed and pushed incrementally in previous phases. T
 **Issue**: #<issue#> - feat: <feature-name>
 **Branch**: feat/<issue#>-<feature-name>
 **Worktree**: $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#>
+**PR**: <PR URL> (draft &rarr; ready for review)
 **PRD**: tasks/prd-<feature-name>.md
 **Ralph config**: .ralph/prd.json (<N> user stories)
 **Tmux session**: feat-<issue#>
@@ -341,7 +366,6 @@ All artifacts have been committed and pushed incrementally in previous phases. T
 ### Next Steps
 - Monitor: `tmux attach -t feat-<issue#>`
 - Progress: `cat $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#>/.ralph/progress.txt`
-- When complete: `cd $ORCHESTRA_PROJECT_ROOT/.worktrees/feat-<issue#> && gh pr create --base development --title "FROM feat/<issue#>-<feature-name> TO development"`
 ```
 
 ---