You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: conductor/workflow.md
+23-29Lines changed: 23 additions & 29 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -44,21 +44,14 @@ All tasks follow a strict lifecycle:
44
44
- Add dated note explaining the change
45
45
- Resume implementation
46
46
47
-
8.**Commit Code Changes:**
47
+
8.**Stage Code Changes:**
48
48
- Stage all code changes related to the task.
49
-
- Propose a clear, concise commit message e.g, `feat(ui): Create basic HTML structure for calculator`.
50
-
- Perform the commit.
49
+
- Do NOT commit yet; changes will be committed at the end of the phase.
51
50
52
-
9.**Include Task Summary in Commit Message:**
53
-
- Ensure the commit message body (from Step 8) contains a detailed summary for the completed task. This should include the task name, a summary of changes, a list of all created/modified files, and the core "why" for the change.
54
-
55
-
10.**Get and Record Task Commit SHA:**
56
-
-**Step 10.1: Update Plan:** Read `plan.md`, find the line for the completed task, update its status from `[~]` to `[x]`, and append the first 7 characters of the *just-completed commit's* commit hash.
57
-
-**Step 10.2: Write Plan:** Write the updated content back to `plan.md`.
58
-
59
-
11.**Commit Plan Update:**
60
-
-**Action:** Stage the modified `plan.md` file.
61
-
-**Action:** Commit this change with a descriptive message (e.g., `conductor(plan): Mark task 'Create user model' as complete`).
51
+
9.**Record Task Progress:**
52
+
- Read `plan.md`, find the line for the completed task, and update its status from `[~]` to `[x]`.
53
+
- Write the updated content back to `plan.md`.
54
+
- Stage the modified `plan.md` file.
62
55
63
56
### Phase Completion Verification and Checkpointing Protocol
64
57
@@ -98,22 +91,23 @@ All tasks follow a strict lifecycle:
98
91
- After presenting the detailed plan, ask the user for confirmation: "**Does this meet your expectations? Please confirm with yes or provide feedback on what needs to be changed.**"
99
92
- **PAUSE** and await the user's response. Do not proceed without an explicit yes or confirmation.
100
93
101
-
6. **Create Checkpoint Commit:**
102
-
- Stage all changes. If no changes occurred in this step, proceed with an empty commit.
103
-
- Perform the commit with a clear and concise message (e.g., `conductor(checkpoint): Checkpoint end of Phase X`).
104
-
105
-
7. **Attach Auditable Verification Report using Git Notes:**
106
-
- **Step 7.1: Draft Note Content:** Create a detailed verification report including the automated test command, the manual verification steps, and the user's confirmation.
107
-
- **Step 7.2: Attach Note:** Use the `git notes` command and the full commit hash from the previous step to attach the full report to the checkpoint commit.
108
-
109
-
8. **Get and Record Phase Checkpoint SHA:**
110
-
- **Step 8.1: Get Commit Hash:** Obtain the hash of the *just-created checkpoint commit* (`git log -1 --format="%H"`).
111
-
- **Step 8.2: Update Plan:** Read `plan.md`, find the heading for the completed phase, and append the first 7 characters of the commit hash in the format `[checkpoint: <sha>]`.
112
-
- **Step 8.3: Write Plan:** Write the updated content back to `plan.md`.
113
-
114
-
9. **Commit Plan Update:**
115
-
- **Action:** Stage the modified `plan.md` file.
116
-
- **Action:** Commit this change with a descriptive message following the format `conductor(plan): Mark phase '<PHASE NAME>' as complete`.
94
+
6. **Create Phase Commit:**
95
+
- Stage all remaining changes.
96
+
- Perform a single commit for the entire phase.
97
+
- The commit message MUST include a detailed summary of all tasks completed in this phase, following the format:
98
+
```
99
+
feat/fix(<scope>): Checkpoint end of Phase <Phase Name>
100
+
101
+
Tasks completed:
102
+
- Task 1: Summary of changes...
103
+
- Task 2: Summary of changes...
104
+
```
105
+
106
+
7. **Record Phase Checkpoint SHA:**
107
+
- **Step 7.1: Get Commit Hash:** Obtain the hash of the *just-created phase commit* (`git log -1 --format="%H"`).
108
+
- **Step 7.2: Update Plan:** Read `plan.md`, find the heading for the completed phase, and append the first 7 characters of the commit hash in the format `[checkpoint: <sha>]`.
109
+
- **Step 7.3: Write Plan:** Write the updated content back to `plan.md`.
110
+
- **Step 7.4: Commit Plan Update:** Stage and commit the updated `plan.md` with the message `conductor(plan): Mark phase '<PHASE NAME>' as complete`.
117
111
118
112
10. **Announce Completion:** Inform the user that the phase is complete and the checkpoint has been created, with the detailed verification report attached as a git note.
0 commit comments