{{ message }}
chore(submodules): reconcile .gitmodules to ground truth (prune stale declarations)#131
Merged
Merged
Conversation
… declarations) .gitmodules declared 5 submodules but only 2 are real gitlinks. The other three paths — rpa-elysium, total-upgrade, total-recall — were committed as ordinary trees, not gitlinks, so `git submodule update --init` tried to clone over existing content and failed. Prune the three stale declarations, keeping all tracked content: - rpa-elysium (171 files): forge exists and is reachable but has diverged from the vendored snapshot (141/155 common files differ; 16 vendored-only, 23 forge-only), so de-vendoring is a separate human-gated merge, not a wiring fix. - total-upgrade + total-recall (28-file RSR scaffolds, byte-identical, sharing tree 84d1361): GitLab repos unverifiable from this environment. .gitmodules now declares exactly the two consistent gitlinks (git-scripts, git-reticulator); git submodule status/update no longer choke. The orphan-gitlink half of this surgery (avatar-fabrication-facility, claim-forge) already shipped in 741a982 (PR #130). Deferred (outward-facing / divergent / product calls): rpa-elysium<->forge reconciliation; extracting the 5 local-only standalones to forge repos; de-duping total-upgrade/total-recall. Docs: STATE.a2ml + the 2026-06-02 verification doc record the reconciliation. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KhFfkfjKaB7Rg957u3uCT6
This was referenced Jun 21, 2026
hyperpolymath
pushed a commit
that referenced
this pull request
Jun 21, 2026
…al-recall dup Continues the #131 consolidation — the two reposystem-scoped follow-ups. rpa-elysium — de-vendor (forge canonical): The vendored 171-file tree had diverged from the live forge (141/155 common files differ; 16 vendored-only, 23 forge-only). Per decision the forge is canonical: replace the vendored tree with a real submodule gitlink at forge HEAD bda6720, declared in .gitmodules (git@ URL, matching git-scripts/git-reticulator). The full vendored state is preserved on branch archive/rpa-elysium-vendored-2026-06-21 (171 files) for recovery/diffing — nothing is lost. total-recall — drop the duplicate: total-recall and total-upgrade were byte-identical 28-file scaffolds (same tree 84d1361). Keep total-upgrade (an active feat/total-upgrade-scaffold branch targets it); remove the total-recall duplicate tree. .gitmodules now declares three consistent gitlinks (git-scripts, git-reticulator, rpa-elysium); total-upgrade remains a local scaffold tree. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KhFfkfjKaB7Rg957u3uCT6
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
The consolidation follow-up promised in #129 (
STATE.a2ml: "rpa-elysium path conflict … deferred to a follow-up PR")..gitmodulesdeclared 5 submodules but only 2 were real gitlinks — the other three paths (rpa-elysium,total-upgrade,total-recall) were committed as ordinary040000trees, not160000gitlinks, so the declaration and the committed object disagreed andgit submodule update --inittried to clone over existing content and failed.(The orphan-gitlink half of this surgery —
avatar-fabrication-facility,claim-forge— already shipped in #130.)What changed
Make
.gitmoduleshonest: prune the three stale declarations, keeping all tracked content (these paths hold real files, unlike the orphan gitlinks):rpa-elysiumbda6720)total-upgradetotal-recalltotal-upgrade(same tree84d1361)..gitmodulesnow declares exactly the two consistent gitlinks (git-scripts,git-reticulator);git submodule status/update --initare consistent again. No content removed — only the false claims.Verification
git config -f .gitmodules --get-regexp path→ exactlygit-scripts,git-reticulator.git ls-tree HEADstill shows therpa-elysium(171) /total-upgrade(28) /total-recall(28) trees intact — no content lost.git submodule statusreturns the two gitlinks with no error.config/tools.nclstill referencesrpa-elysiumby name (unaffected — not a submodule reference).STATE.a2mlrecords the change.Deferred (outward-facing / divergent / product decisions — not in this PR)
rpa-elysiumwith its forge (decide the canonical side; possibly de-vendor) — a 141-file merge.bitfuckit,contractiles,recon-silly-ation,scaffoldia,stateful-artefacts) by creating their forge repos (verified absent).total-upgrade/total-recall.git@→httpsURLs.🤖 Generated with Claude Code
https://claude.ai/code/session_01KhFfkfjKaB7Rg957u3uCT6
Generated by Claude Code