diff --git a/.console/log.md b/.console/log.md index 79e01b0..20f1293 100644 --- a/.console/log.md +++ b/.console/log.md @@ -335,3 +335,7 @@ top block flows behind them. ### ADR 0005 — Add executor repos to platform profile (2026-05-18) Added teamexecutor, dagexecutor, critiqueexecutor, protocolwarden to platform group. Created profile yamls for each with lazygit git pane and standard helpers. + +## 2026-05-23 — Genericize fleet-repo ref + standardize hook + +- Genericized SyncingSolution ref in .custodian/config.yaml comment (public repo; private fleet layer must not be named). Standardized .hooks/pre-push. diff --git a/.custodian/config.yaml b/.custodian/config.yaml index 96feb99..1527485 100644 --- a/.custodian/config.yaml +++ b/.custodian/config.yaml @@ -16,7 +16,7 @@ tests_root: tests # 3. Any new install or setup command must work on both distros. # # Cross-repo: co-owned by NetworkRuntime (VPN scripts) and -# SyncingSolution (tray, fleet setup). +# the fleet sync repo (tray, fleet setup). # Reference: NetworkRuntime/README.md § OS symmetry invariant. # OS-SYM1 / OS-SYM1S detectors enforce the package-manager symmetry invariant diff --git a/.hooks/pre-push b/.hooks/pre-push index 8022c2b..2d57984 100755 --- a/.hooks/pre-push +++ b/.hooks/pre-push @@ -3,10 +3,27 @@ set -e repo_root="$(git rev-parse --show-toplevel)" +workspace_root="$(cd "$repo_root/.." && pwd)" + +if [ -z "${REPOGRAPH_BOUNDARY_ARTIFACT_FILE:-}" ]; then + shopt -s nullglob + for candidate in \ + "$workspace_root"/PrivateManifest/dist/boundary_disclosure_artifact.json \ + "$workspace_root"/*/dist/boundary_disclosure_artifact.json \ + "$workspace_root"/*/policy/boundary_disclosure_artifact.json + do + if [ -f "$candidate" ]; then + export REPOGRAPH_BOUNDARY_ARTIFACT_FILE="$candidate" + break + fi + done + shopt -u nullglob +fi if [ -z "${REPOGRAPH_BOUNDARY_ARTIFACT_FILE:-}" ] || [ ! -f "$REPOGRAPH_BOUNDARY_ARTIFACT_FILE" ]; then echo "[custodian-pre-push] missing REPOGRAPH_BOUNDARY_ARTIFACT_FILE; failing closed" - echo " Generate artifact from PrivateManifest first and export REPOGRAPH_BOUNDARY_ARTIFACT_FILE" + echo " Generate artifact from PrivateManifest first:" + echo " python -m private_manifest.export_boundary_artifact --graph-root graph --out dist/boundary_disclosure_artifact.json" exit 1 fi @@ -17,7 +34,8 @@ fi for candidate in \ "$custodian_multi" \ "$repo_root/.venv/bin/custodian-multi" \ - "$repo_root/.warehouse-venv/bin/custodian-multi" + "$repo_root/.warehouse-venv/bin/custodian-multi" \ + "$workspace_root/Custodian/.venv/bin/custodian-multi" do if [ -x "$candidate" ]; then custodian_multi="$candidate"