2.2 KiB
2.2 KiB
name, description, metadata
| name | description | metadata | ||
|---|---|---|---|---|
| project_ad2_dataforth_fork | AD2 is the Dataforth-operations fork (branch ad2); how it relates to main and how to sync it cleanly |
|
AD2 (192.168.0.6, Dataforth domain controller) runs the ad2 branch — a fork dedicated to Dataforth operations. Its /sync model is: git rebase origin/main then git push origin ad2, so ad2 = main + a thin layer of Dataforth-specific commits.
Keep the fork layer ADDITIVE — never edit shared fleet files (especially .claude/CLAUDE.md) on ad2, or every sync re-conflicts. On 2026-06-17 the old fork edit of .claude/CLAUDE.md was relocated: .claude/CLAUDE.md now tracks the lean fleet doc (from main), and Dataforth operational context (network, credentials, pipeline, batch-file versions) lives in clients/dataforth/CLAUDE.dataforth.md. Read that file for Dataforth context.
Sync gotchas on AD2:
sync.shis NOT fork-aware on the PUSH step: it pushesmain(error: src refspec main does not match any), so/syncand/saveauto-sync ALWAYS fail at Phase 4 on this fork. It DOES rebase + commit fine. After running it, push manually:git push --force-with-lease origin ad2(force needed because the rebase rewrote history). The documented fork flow (fetch → rebase origin/main → push origin ad2) is the reliable path.sync.shcannot overwrite itself while it is the executing script (Windows file lock) → the rebase step fails mid-run with "unable to create file .claude/scripts/sync.sh: Permission denied" the FIRST time main has a new sync.sh. When that happens:git reset --hard HEAD,git clean -fd(removes the partial origin/main checkout debris), then rungit rebase origin/maindirectly (not via sync.sh), and force-push with--force-with-lease.- Submodule
projects/msp-tools/guru-connectfails to clone from 172.16.3.20 (ACG-internal, unreachable from Dataforth LAN) — non-fatal sync warning. - Python was absent until 2026-06-17 (installed 3.12.8,
pylauncher); identity.json was created then too (user=mike,machine=AD2). - Missing tooling:
jq,sops,age. No vault cloned (D:/vaultabsent) → vault sync is N/A here. coord_api (172.16.3.30) is unreachable from the Dataforth LAN.
Related: project_ad2_context.md