chore: reconcile meta-repo absorbed content with GitHub main#58
Merged
Merged
Conversation
Two-way merge resolving the structural drift between hyperpolymath/gitbot-fleet
(this repo) and the content absorbed into /var/mnt/eclipse/repos (the meta-repo
repos-monorepo) at fleet-ecosystem/git-automation-ecosystem/gitbot-fleet/.
The two histories had diverged with no common ancestor. Meta-repo held real
feature work (exclusion registry, SCM->A2ML directive migration, sha2 0.11 +
hmac 0.13 compat fixes, contractile refactors, wave2c sweeps). This repo held
a small set of housekeeping commits (LICENSE update to PMPL-1.0-or-later,
panic-attacker docs, supervised-fleet-scan GITHUB_TOKEN/FLEET_SCAN_PAT fix,
M5 CI sweep, ~7 Dependabot dep bumps) plus an accidentally-committed
BuckleScript build artefact set under bots/sustainabot/bot-integration/lib/bs/
(120 files — .cmi/.cmj/.cmt/.ast/.res.js/bindings/).
Merge resolution:
- Meta-repo content adopted as base (823 tracked files, cleaner .gitignore
that correctly excludes the bs/ artefacts).
- 45 files modified: meta's versions adopted (newer bot feature work,
newer Cargo.toml/.lock with sha2/hmac bumps, newer directive parsers).
- 9 files added from meta: exclusion_registry.rs + registry_guard.rs in
shared-context/ and robot-repo-automaton/, plus 4 flake.lock / Justfile
files that meta had but this repo didn't.
- 120 files removed: the accidentally-committed bs/ build artefacts.
- LICENSE restored from origin/main (PMPL-1.0-or-later per estate rule;
meta's was an older MPL-2.0-labelled version).
- .github/workflows/supervised-fleet-scan.yml restored from origin/main
(meta's predated the GITHUB_TOKEN/FLEET_SCAN_PAT + HYPATIA_SEVERITY=low
fixes from cd67367). No meta-only content was lost in this file.
Other GitHub-unique commits verified already present in meta:
- 7ae485e (panic-attacker docs in finishingbot README) — already in meta.
- c692816 (M5 CI sweep, SCM bot_directives removal) — SCM files already
purged in meta per 2026-04-12 A2ML migration; Justfile already imports
contractile.just.
- Dependabot rand/tokio bumps (#48/#50/#51/#55/#56) — meta has rand 0.10
and tokio 1 at-or-above these versions.
After this commit merges, the meta-repo side will remove the absorbed
gitbot-fleet/ directory from its tree and re-add it as a submodule pointing
at the new origin/main HEAD, eliminating the dual-truth situation.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Summary
Resolves the structural drift between this repo and the content absorbed into the meta-repo at
/var/mnt/eclipse/repos/fleet-ecosystem/git-automation-ecosystem/gitbot-fleet/— two divergent histories with no common ancestor.Merge details
Meta-repo content adopted as base (cleaner, newer, with real feature work). GitHub-unique real changes preserved by surgical restoration. GitHub's 120 accidentally-committed BuckleScript build artefacts (under
bots/sustainabot/bot-integration/lib/bs/) removed — meta's.gitignorecorrectly excludes them.shared-context/src/exclusion_registry.rs,registry_guard.rs, and same inrobot-repo-automaton/src/)Restored from
origin/main(not meta)LICENSE— GitHub had PMPL-1.0-or-later (correct per estate rule); meta's was older MPL-2.0 labelling..github/workflows/supervised-fleet-scan.yml— GitHub has the GITHUB_TOKEN/FLEET_SCAN_PAT + HYPATIA_SEVERITY=low fixes fromcd67367. Meta had no unique content on this file.Verified already in meta (no restoration needed)
7ae485e3panic-attacker docs in finishingbot README — already present.c6928166M5 CI sweep + SCM→A2ML directive cleanup — SCM files already purged in meta per the 2026-04-12 A2ML migration;Justfilealready importscontractile.just.rand/tokiobumps (chore(deps): bump tokio from 1.51.0 to 1.51.1 in /bots/seambot #48/chore(deps): bump tokio from 1.51.0 to 1.51.1 in /bots/echidnabot #50/chore(deps): bump rand from 0.9.2 to 0.10.0 in /bots/echidnabot #51/chore(deps): bump rand from 0.10.0 to 0.10.1 in /bots/echidnabot in the cargo group across 1 directory #55/chore(deps): bump rand from 0.9.2 to 0.9.4 in /bots/finishingbot in the cargo group across 1 directory #56) — meta hasrand = "0.10"andtokio = "1"at-or-above these versions.Test plan
shared-context/src/exclusion_registry.rs+registry_guard.rsadditions (feature work that's been live in meta-repo for a while).origin/mainwas silently lost (we checkedsupervised-fleet-scan.yml— 0 meta-only lines dropped; LICENSE is policy-mandated so meta's version was wrong).git rm -rthe absorbed directory and re-add as a submodule pointing at newmainHEAD.🤖 Generated with Claude Code