docs(frontend): reorganize divergences into Modified/Added/Removed + procedure P2 fixes#564
Conversation
…procedure P2 fixes Reorg (verbatim entry moves, judge-panel-classified + adversarially verified): group every divergence under one top-level heading in order ## Modified -> ## Added (Ophis-only) -> ## Removed -> ## Conflict-recovery procedure. The stray dated h3 subsections that sat under the wrong h2 parent are regrouped; the two build-time env vars are consolidated under a ### Build-time env subsection of Modified; DUNE_API_KEY + the CoW affiliate subsystem are both under ## Removed. Every entry body is byte-identical (167 content lines preserved); the only reorg content change is the step-2 cross-ref pointer to the relocated affiliate subsection. Two Codex P2 procedure fixes folded in: - cwd consistency: the procedure opens with a repo-root `git subtree pull`, but `nx typecheck cowswap-frontend` resolves from apps/frontend. Stated the repo-root convention and wrapped the typecheck as `(cd apps/frontend && npx nx typecheck …)`. - modify/delete conflicts: a subtree pull where upstream MODIFIED a locally-deleted affiliate file yields a modify/delete conflict (upstream version left in tree), not a clean re-addition. Step 2 now covers both cases; resolution is the same (`git rm`). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
A subtree pull is a merge, so a re-added upstream file is staged as a tracked add (not untracked); `git rm <path>` only resolves tracked/conflicted paths. Reword so both the clean re-add and the modify/delete conflict are described as in-index, resolved by `git rm`. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b7645f289b
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| ways: a plain re-addition (an untracked file, if upstream left it unchanged) OR a | ||
| modify/delete conflict (if upstream MODIFIED a file we deleted, git keeps the upstream | ||
| version in the tree and flags the conflict, so it will NOT show up as a clean | ||
| addition). In BOTH cases the resolution is identical: re-delete the file | ||
| (`git rm <path>`, or `git rm` the conflicted path), never keep the upstream version. |
There was a problem hiding this comment.
In the plain re-addition case this now tells maintainers the file is untracked while also prescribing git rm as the resolution. git rm operates on tracked/index paths (checked via git rm -h) and will fail with a pathspec error for a truly untracked file; conversely, files added by a subtree merge are tracked entries that git rm can remove. This makes the recovery instructions misleading during the next subtree pull; either describe the case as a tracked addition or use rm/git clean for genuinely untracked leftovers.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Already fixed in this PR before the squash-merge (second commit). Merged main now reads: "a plain re-addition (the merge stages it as a tracked add …) OR a modify/delete conflict … the file is in the index, so git rm <path> is the resolution." No untracked wording remains.
1 participant
Reorg (the ask)
Groups every divergence under one top-level heading, in order:
## Modified→## Added (Ophis-only)→## Removed→## Conflict-recovery procedure. Fixes the stray dated###subsections that sat under the wrong##parent (e.g.### Removed …DUNE_API_KEYand### Modified …Explorerwere under## Added). The two build-time env vars are consolidated under a### Build-time envsubsection of Modified;DUNE_API_KEY+ the CoW affiliate subsystem are both###under## Removed.Done as a verbatim move + adversarial verification (judge-panel classify → verbatim synthesize → 4-lens verify): every entry body is byte-identical — 167 content lines preserved on both sides, zero lost/added entries, all file paths intact. The only reorg content change is the step-2 cross-ref now pointing at the relocated
### CoW affiliate subsystemsubsection.Two Codex P2 procedure fixes folded in
git subtree pull, butnx typecheck cowswap-frontendresolves fromapps/frontend. Added the repo-root convention note and wrapped the command as(cd apps/frontend && npx nx typecheck cowswap-frontend). (The grep path was already repo-root-correct from docs(frontend): make affiliate-removal procedure authoritative + fix grep path (Codex) #562.)git rmthe path, never keep the upstream version).Verified: backtick parity balanced, heading hierarchy sound (each target h2 once, in order), no em-dash. Docs-only.
🤖 Generated with Claude Code