Skip to content

Commit c2faa52

Browse files
authored
Merge pull request #22 from JustAGhosT/copilot/discuss-codeflow-repositories-integration
docs: accept ADR-0021 — monorepo consolidation decision with ecosystem and extraction analysis
2 parents c8cfc87 + 7d9f775 commit c2faa52

3 files changed

Lines changed: 212 additions & 260 deletions

File tree

MIGRATION_PLAN.md

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,62 @@
11
# CodeFlow Monorepo Migration Plan
22

3-
This document tracks the migration of all CodeFlow-related repositories into a unified monorepo structure.
3+
This document tracks the migration of all CodeFlow-related repositories into a unified
4+
monorepo structure. The decision to consolidate is recorded in
5+
[docs/adr/0021-repository-structure.md](docs/adr/0021-repository-structure.md).
46

57
## Structure
68

7-
- engine/ # Python core engine project
8-
- desktop/ # Electron/Tauri app
9-
- vscode-extension/ # VS Code extension
10-
- website/ # Docs/marketing
11-
- orchestration/ # Infra, bootstrap, and shared orchestration assets
12-
- templates/ # Workflow templates
13-
- tools/ # Dev tools/scripts
14-
- tests/ # Unified test suite for engine
15-
- docs/ # Shared documentation
9+
```
10+
engine/ # Python core engine project
11+
desktop/ # Tauri + React desktop application
12+
vscode-extension/ # VS Code extension
13+
website/ # Next.js marketing and documentation site
14+
orchestration/ # Azure IaC, bootstrap scripts, and shared utility packages
15+
docs/ # Shared project documentation
16+
tools/ # Shared development tooling and helper scripts
17+
```
1618

1719
## Current Status
1820

19-
Completed:
21+
### Phase 1 — Code Consolidation ✅ Complete
2022

2123
1. Added monorepo migration scaffolding and shared documentation.
2224
2. Imported `codeflow-desktop` into `desktop/`.
2325
3. Imported `codeflow-website` into `website/`.
2426
4. Imported `codeflow-orchestration` into `orchestration/`.
2527
5. Imported `codeflow-vscode-extension` into `vscode-extension/`.
28+
6. Added path-aware CI workflow (`.github/workflows/monorepo-ci.yml`).
29+
7. Added archive and redirect guidance (`docs/LEGACY_REPO_REDIRECTS.md`).
30+
8. Finalised repository structure decision (ADR-0021 accepted).
2631

27-
Pending:
32+
### Phase 2 — Tooling Standardisation ⏳ In Progress
2833

29-
1. Normalize dependency management across Python and Node-based projects.
30-
2. Add path-aware CI and release automation.
31-
3. Consolidate duplicate docs, licenses, and contribution guidance.
32-
4. Complete archive and redirect steps for the former split repositories.
34+
1. Normalise dependency management across Python and Node.js projects.
35+
2. Add path-aware release automation for each component.
36+
3. Consolidate duplicate `README`, `LICENSE`, and `CONTRIBUTING` files.
37+
4. Archive legacy split repositories and update their READMEs to redirect here.
3338

34-
## Migration Steps
39+
## Future Extraction Candidates
3540

36-
1. Import code from each repo, preserving git history.
41+
The following components *could* be extracted to separate repositories in future if
42+
specific conditions are met (see ADR-0021 for full rationale):
43+
44+
| Component | Condition for extraction |
45+
|---|---|
46+
| `website/` | Content team needs write access without engine write access |
47+
| `orchestration/bootstrap/` | A shared `justaghost/*` or `phoenixvc/*` infra repo is created |
48+
49+
No extraction is recommended at this stage.
50+
51+
## Migration Steps (Reference)
52+
53+
1. Import code from each repo, preserving git history (`git subtree`).
3754
2. Resolve conflicts and update imports.
38-
3. Centralize CI/CD workflows.
55+
3. Centralise CI/CD workflows with path-aware filtering.
3956
4. Update documentation and onboarding.
40-
5. Deprecate old repositories.
57+
5. Archive legacy split repositories.
4158
6. Announce migration and monitor feedback.
4259

4360
---
4461

45-
For detailed instructions, see MIGRATION_GUIDE.md.
62+
For detailed instructions, see [MIGRATION_GUIDE.md](MIGRATION_GUIDE.md).

0 commit comments

Comments
 (0)