Skip to content

Commit ea77861

Browse files
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

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,11 @@ htmlcov/
129129
*.bak
130130
# asdf version manager
131131
.tool-versions
132+
target/
133+
node_modules/
134+
_build/
135+
deps/
136+
.elixir_ls/
137+
.cache/
138+
build/
139+
dist/

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ gitbot-fleet/
4242
├── README.adoc
4343
├── SECURITY.md
4444
├── flake.nix # Nix flake (Perimeter 1)
45-
└── justfile # Task runner (Perimeter 1)
45+
└── Justfile # Task runner (Perimeter 1)
4646
```
4747
4848
---

0 commit comments

Comments
 (0)