diff --git a/docs/career-workspace-branch-assessment.md b/docs/career-workspace-branch-assessment.md index 7a6c1b8..1a1d575 100644 --- a/docs/career-workspace-branch-assessment.md +++ b/docs/career-workspace-branch-assessment.md @@ -2,7 +2,13 @@ Date: 2026-07-17 Trigger: your Phase 3 decision on the "orphan tables". The investigation you asked for changed the answer entirely. -Status: **decision required before Phase 3 or Phase 4 can be planned honestly.** + +> **STATUS UPDATE (2026-07-17): Foundation integrated.** The F1 Career Profile foundation plus +> the interview-prep / candidate-fit / focus-plan persistence were squashed onto `main` as +> commit `992f89e` ("integrate Career Workspace foundation"). Decisions: **foundation only** +> (CV-builder commits deferred per "do not build CV Builder yet") and **squash** (one commit). +> The four recovered documents landed earlier as `aedd6e3`. 264 backend tests pass; frontend +> typechecks. What remains on the branch is Phase 3/4 work — see §8. --- @@ -156,3 +162,30 @@ The branch provisions tables through the **raw-SQL reconciler** (both SQLite and 1. **Why was it never merged?** No revert exists, and it is pushed to `origin`. If it was parked for a reason I cannot see, that reason should be recorded before anyone picks it up. 2. **Is production also empty** on those 7 tables? I can only see the dev database. 3. **Does the branch's `a4c8e4a fix: unlock CV builder for Google/Microsoft-authenticated users` overlap your current uncommitted work** on `ProfilePage.tsx` / `CareerWorkspacePage.tsx` (the inert `careerView` tab)? Both touch the same file. Worth checking before either is finished. + +--- + +## 8. What remains on the branch (for Phase 3/4) + +The foundation was integrated by **squash-cherry-pick**, so `main` has the *content* of `235e291`, +`5916f09`, `00a035e` (as `992f89e`) but not those commits as ancestors. `git log main..feature/career-workspace` +therefore still lists all ten. The commits still needed later, all CV-Builder (Phase 3/4): + +| Commit | What | Recover in | +|---|---|---| +| `a4c8e4a` | unlock CV builder for Google/Microsoft-auth users | Phase 4 (with the builder UI) | +| `66384bd` | CV template renderer regression tests | Phase 4 | +| `cbd045a` | AI CV-rewrite diff view (`TextDiff`) | Phase 4 | +| `00c7e0b` | ATS-safety badge (the `LayoutFamily`/`AtsRating` fields I trimmed) | Phase 4 | +| `47d05ba` | CvVariant / CvVersion / TailoredApplication (F2) | Phase 3 | + +**These will not cherry-pick cleanly.** They sit on top of the foundation commits, whose shape on +`main` now differs (DTO relocation, 7-arg `CvTemplateDescriptor`, EF-migration schema). Expect the +same class of semantic conflicts resolved here. When Phase 3/4 starts, treat them as a fresh +foundation-style integration against the then-current `main`, not a replay. + +The two doc commits (`102938c`, `597191f`) are already on `main` (landed as `aedd6e3`); do not +re-integrate them. + +**Do not delete `feature/career-workspace`** until F2 (CvVariant) is recovered — it is the only +source of that code.