Handbook
Charge — F2 / Cursor rule and Git action scaffolding
Pack: branching · Preamble: Cursor preamble for the ForgeSDLC branching charges · Prior: Charge 04
Implement the Branch Steward behavior in Cursor and add the minimum helper commands needed for day-to-day Git choreography.
Branch context
- Primary integration lane:
iter/F2-PS-BRANCH-01 - Use dedicated Spark branches for the implementation Sparks in this Charge
- Merge each completed Spark branch back into
iter/F2-PS-BRANCH-01before starting the next risky implementation item
Active Sparks
| # | Spark ID | Phase | Intent | Git lane | Status |
|---|---|---|---|---|---|
| 1 | M2E2S2T1 | build: |
Create the Cursor rule or prompt template that combines forge-daily behavior with Branch Steward Git decisions. | spark/M2E2S2T1-branch-steward-rule |
planned |
| 2 | M2E2S2T2 | build: |
Create helper scripts or tasklets for open-product-spark, open-iteration, start-spark, bank-spark, close-spark, and sync-parent. |
spark/M2E2S2T2-branch-helper-actions |
planned |
| 3 | M2E2S2T3 | build: |
Add example forge/charge.md annotations and any archive or helper notes needed so the rule can keep state without inventing a second tracker. |
spark/M2E2S2T3-charge-annotations |
planned |
| 4 | M2E2S2T4 | verify: |
Dry-run the normal flow on a clean repo: open iteration, start Spark, close Spark, bank Spark, and resume Spark. | spark/M2E2S2T4-dry-run-flow |
planned |
Branch Steward in-time actions
- Create each dedicated Spark branch from
iter/F2-PS-BRANCH-01, not frommain. - Merge the Spark branches back into the iteration branch as each unit stabilizes; do not let them drift unnecessarily.
- Keep script behavior idempotent where possible so Cursor can re-run safe operations without damage.
- Prompt for an Ember Log entry if the dry run exposes a rule gap or a surprising manual step.
Expected outputs
.cursor/rules/branch-steward.mdcor equivalentscripts/ortasklets/for the core Branch Steward verbs- an example annotated Charge that Cursor can follow reliably
Exit criteria
- Cursor can execute the core lane-management verbs
- the core implementation branches merge cleanly back into the iteration lane
- at least one dry run proves the contract is executable
Blockers
| Spark | Blocker | Action |
|---|---|---|
Banking decisions
| Spark | Reason banked | Restart context |
|---|---|---|
Notes
- If the project is solo and low-risk, you may collapse T2 and T3 onto the iteration branch, but keep T1 and T4 isolated if the rule is still unstable.