Commit ea77861
chore: reconcile meta-repo absorbed content with GitHub main (#58)
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>1 parent cd67367 commit ea77861
174 files changed
Lines changed: 4823 additions & 5107 deletions
File tree
- bots
- cipherbot
- src
- echidnabot
- src
- adapters
- api
- dispatcher
- finishingbot
- src/analyzers
- gsbot
- panicbot
- src
- rhodibot
- src
- seambot
- src
- sustainabot
- bot-integration/lib
- bs
- bindings
- src
- tea
- ocaml
- crates/sustainabot-analysis
- src
- nix
- the-hotchocolabot
- campaigns
- robot-repo-automaton
- src
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
0 commit comments