100 lines
3.9 KiB
Markdown
100 lines
3.9 KiB
Markdown
# Ouroboros Dual-Track Workflow Design (Revised)
|
|
|
|
**Date:** 2026-03-02
|
|
**Scope:** `docs/ouroboros/86_peak_probability_model_plan.md` and `docs/ouroboros/80_implementation_audit.md`
|
|
|
|
---
|
|
|
|
## 1. Goal
|
|
|
|
Prevent work loss and history contamination while running two parallel tracks, while correcting an invalid starting condition (design commits created on a disposable temporary branch):
|
|
|
|
- Track A: open and iterate the `86` plan as a dedicated PR.
|
|
- Track B: finalize `80` only after real-operation behavior is confirmed, then reflect completion and close related Gitea open issues.
|
|
|
|
---
|
|
|
|
## 2. Constraints and Current Context
|
|
|
|
- Current temporary branch is disposable and must not remain the authoritative base.
|
|
- Canonical base line for current work is `feature/v3-session-policy-stream`.
|
|
- Final integration strategy is to merge the full `feature/v3-session-policy-stream` line into `main` after operation-level validation is complete.
|
|
|
|
---
|
|
|
|
## 3. Approaches Considered
|
|
|
|
1. Keep using temporary branch and continue from existing design commits.
|
|
2. Create a clean base from `feature/v3-session-policy-stream` and move only plan artifacts as one commit (recommended).
|
|
3. Split into two fresh bases (`86` and `80` separately) immediately.
|
|
|
|
Recommendation rationale:
|
|
|
|
- Approach 2 removes temporary-branch contamination risk.
|
|
- It preserves clean lineage with a single "official starting point" commit.
|
|
- It keeps downstream split for `86` and `80` straightforward.
|
|
|
|
---
|
|
|
|
## 4. Approved Branch and PR Topology
|
|
|
|
- Long-lived source baseline: `feature/v3-session-policy-stream`
|
|
- New official base: `base/ouroboros-workflow-20260302` (from `feature/v3-session-policy-stream`)
|
|
- Official base contains only two workflow plan docs squashed into one commit.
|
|
- Track A branch: `task/86-peak-probability-plan` (from official base)
|
|
- Track B branch: `task/80-implementation-audit-closeout` (from official base)
|
|
|
|
PR direction:
|
|
|
|
- PR-A (`86`): `task/86-peak-probability-plan -> base/ouroboros-workflow-20260302`
|
|
- PR-B (`80`): `task/80-implementation-audit-closeout -> base/ouroboros-workflow-20260302`
|
|
- Final integration: `feature/v3-session-policy-stream` line merged into `main`
|
|
|
|
---
|
|
|
|
## 5. Completion Criteria per Track
|
|
|
|
### Track A (`86`)
|
|
|
|
- Open initial PR early with the planning document.
|
|
- Continue iterative concretization in follow-up commits on the same branch.
|
|
|
|
### Track B (`80`)
|
|
|
|
- Do not close based on test-command artifacts alone.
|
|
- Close only when modified behavior is confirmed in real operation.
|
|
- Update `80_implementation_audit.md` with:
|
|
- observed behavior changes,
|
|
- confirmation timing,
|
|
- operation-side evidence summary.
|
|
- After `80` real-operation confirmation and doc update, close related Gitea open issues immediately (same phase).
|
|
- Parent issues close only when all child issues are confirmed closed.
|
|
|
|
---
|
|
|
|
## 6. Loss-Prevention Rules
|
|
|
|
- Preserve temporary-branch unmerged changes first (stash or archival commit).
|
|
- Exclude `workflow/session-handover.md` and `docs/ouroboros/86_peak_probability_model_plan.md` from official base-seeding commit.
|
|
- Enforce file-scope separation:
|
|
- PR-A should avoid `80` edits.
|
|
- PR-B should avoid `86` edits.
|
|
- Keep commit messages scoped to one track per commit.
|
|
|
|
---
|
|
|
|
## 7. Merge Strategy Decision
|
|
|
|
- For this workflow, prefer merge-based lineage preservation.
|
|
- Because the final promotion unit is the full `feature/v3-session-policy-stream` stream, avoid unnecessary cherry-pick/rebase-surgery unless a contamination incident occurs.
|
|
|
|
---
|
|
|
|
## 8. Immediate Next Actions
|
|
|
|
1. Seed `base/ouroboros-workflow-20260302` from `feature/v3-session-policy-stream` with one squashed workflow-doc commit.
|
|
2. Verify seed commit file scope contains only two plan docs.
|
|
3. Create and open PR-A for `86`.
|
|
4. Complete real-operation confirmation for `80`, update audit doc, then close related Gitea issues (children first, then parent).
|
|
5. Merge validated `feature/v3-session-policy-stream` line into `main`.
|