Repository navigation
[superseded by #153 landing] CI: landed-ancestor Path C tip gate (stop requiring live == BASE_TIP) - #154
[superseded by #153 landing] CI: landed-ancestor Path C tip gate (stop requiring live == BASE_TIP)#154d6g8k5htny-coder wants to merge 7 commits into
Conversation
…==BASE_TIP Path C is landed (VERIFY.path_c_landed=true; 0019 merge 542e6ec in hardening history) and the wake loop keeps BASE_TIP immutable while the hardening branch moves, so the byte-equality tip-drift gate has been red since 2026-09-26 without saying anything about Path C. Add scripts/path_c_tip_gate.py (TIP_MATCH | LANDED_ANCESTOR | TIP_DRIFT | UNKNOWN; git merge-base with progressive deepen on shallow clones, GitHub compare API fallback, blobless temp clone last) and wire it into the CI tip gates, refresh_path_c_bundle.sh --dry-run, assert_path_c_ready.sh, owner_land_path_c.sh, owner_open_path_c_pr.sh, path_c_dry_run.py, when_writable_land.py, write_path_c_status.py and alignment_status.py. tip_matches_base stays literal equality; tip_ok / tip_state carry the gate decision. Real drift (BASE_TIP or the 0019 merge not in live history) still fails with the refresh fix path. Scientific effect: NONE. Co-authored-by: Dylan Roy <d6g8k5htny@privaterelay.appleid.com>
… history clone - tests: _assert_tip_ok(data) replaces 21 literal tip_matches_base is True asserts on path_c_dry_run output; _living_tip() consults the tip gate for hardening SHAs not in the static allowlist (no more per-batch allowlist churn); refresh --dry-run asserts accept the landed-ancestor OK line; from-bundle asserts accept tip_ok=true. - path_c_tip_gate: prefer a reusable blobless shallow clone (PATH_C_TIP_GATE_CACHE, default $TMPDIR/path-c-tip-gate-cache) for ancestry before the compare API, so anonymous 60/h REST quota on shared runners is not burned by repeated gate calls. - owner_open_path_c_pr / owner_land_path_c: call the gate from $ROOT/scripts (TRIAL_ROOT may be a bare portable tree without scripts/). - write_path_c_status: git ls-remote fallback when the anonymous REST tip fetch is rate-limited, so PATH_C_STATUS.tip is never nulled by quota. Scientific effect: NONE. Co-authored-by: Dylan Roy <d6g8k5htny@privaterelay.appleid.com>
… API retry, offline tests The GITHUB_TOKEN injected in these pods can be stale (gh auth status → 'token in GITHUB_TOKEN is invalid'); a tokenized clone/ls-remote/compare then 401s although the research repo is public. Try the anonymous URL first and fall back to the token; retry the compare API anonymously on 401. tests/test_path_c_tip_gate.py: 16 offline tests (ancestry stubbed) covering TIP_MATCH / LANDED_ANCESTOR / TIP_DRIFT (base missing, merge missing, not landed) / UNKNOWN, CLI --sh/--json and exit codes 0/1/2. Own module so wake-loop appends to tests/test_intent.py never conflict. Scientific effect: NONE. Co-authored-by: Dylan Roy <d6g8k5htny@privaterelay.appleid.com>
Co-authored-by: Dylan Roy <d6g8k5htny@privaterelay.appleid.com>
…landed tip_drift_class gate) #153 landed scripts/tip_drift_class.py (DESCENDANT_OK) as trial main's single tip gate. Resolve every conflict toward origin/main: - ci.yml, assert_path_c_ready.sh, owner_land_path_c.sh, owner_open_path_c_pr.sh, path_c_dry_run.py, refresh_path_c_bundle.sh: main's version wholesale (this branch's edits there were only the parallel path_c_tip_gate wiring; keeping the auto-merged remainder would leave TIP_LANDED_ANCESTOR unset). - write_path_c_status.py: main's tip_match/tip_exact_match/tip_drift_class fields; keep this branch's git ls-remote live-tip fallback. - tests/test_intent.py: main's _descends_from_base_tip/_living_tip and its descendant_ok dry-run strings; _assert_tip_ok helper kept (compatible). Not resolved here (auto-merged, reported separately): when_writable_land.py and alignment_status.py still stack path_c_tip_gate after tip_drift_class. Scientific effect: NONE. Co-authored-by: Dylan Roy <d6g8k5htny@privaterelay.appleid.com>
|
Merged Merge commit Simple (resolved toward
Residual diff vs Complicated (auto-merged cleanly, intentionally left for a decision):
Targeted checks after resolution: |
Co-authored-by: Dylan Roy <d6g8k5htny@privaterelay.appleid.com>
Co-authored-by: Dylan Roy <d6g8k5htny@privaterelay.appleid.com>
|
Release-queue disposition — OpenAI/ChatGPT, acting under Dylan's explicit PR-management delegation. I re-read this PR at |
Scientific effect: NONE. No claim, premise, prize or lemma changes;
lemma_closedstays false. Engineering truthfulness fix only.Why
Trial CI has been red on
mainsince 2026-09-26 13:16 (first failing run 36244598239) because every tip gate requires the livechatgpt/drive-github-hardening-20260919SHA to be byte-equal toportable/patches/BASE_TIP.txt(2f7a5a9). Two facts make that impossible now:VERIFY.jsonpath_c_landed=true, 0019 merge542e6ecis in hardening history.e7652a1→d4ad3bb→9458b90→9ce5c66→ee1e9c9→a01c72fduring this session; 166 commits ahead of BASE at 20:40Z).So the gate is permanently red without saying anything about Path C, and ~85 Intent tests plus the
portable-patches-on-main,path-c-applied-bundle-dry-applyandland-workflows-dry-runjobs fail on every push, including on unrelated PRs (#149, #150).What
New
scripts/path_c_tip_gate.pydecides one of:TIP_MATCHLANDED_ANCESTORpath_c_landedand BASE_TIP and the recorded 0019 merge are both ancestors of liveTIP_DRIFTUNKNOWNAncestry order:
git merge-base --is-ancestoron the given clone (progressive--deepenon shallow CI clones) → reusable 1 MB blobless clone ($TMPDIR/path-c-tip-gate-cache, 0.3 s warm) → GitHub compare API last. Anonymous URLs are tried before tokenized ones (public repo; stale pod token otherwise 401s everything).tip_matches_basestays literal equality everywhere;tip_ok/tip_statecarry the decision.Wired into:
ci.yml(both tip gates; step keeps itsTip-drift gatename for the Batch 147 contract),refresh_path_c_bundle.sh --dry-run,assert_path_c_ready.sh,owner_land_path_c.sh(dry-run + from-bundle dry-run),owner_open_path_c_pr.sh,path_c_dry_run.py(skips the meaningless historicalapply_all --checkon a landed ancestor — 0017 no longer forward/reverse-applies on the moved tree — mirroring the Batch 246 CI idle skip),when_writable_land.py,write_path_c_status.py(+git ls-remotefallback when anonymous REST is rate-limited),alignment_status.py.Tests:
tests/test_path_c_tip_gate.py(16 offline tests, ancestry stubbed, own module so wake-loop appends never conflict); intest_intent.py,_assert_tip_ok(data)replaces 21tip_matches_base is Trueasserts,_living_tip()consults the gate for SHAs outside the static allowlist (ends per-batch allowlist churn), refresh dry-run asserts accept the landed-ancestor OK line.Verification
GitHub Actions on this branch, latest run 36347560786 @
0bd79e1b:The 149 remaining
sanityfailures are the wake loop's own pin debt (STATUS (Batch NNN research-audit)headers overwritten by later batches,tip_sync_watch_keep_prior_parent_pinLIVE-sha allow-lists,test_batch538missingBATCH538_TIP_SYNC_IDLE.json,test_batch323inventory drift); none of the tip-gate PRs can turnsanitygreen while the loop keeps pinning live SHAs.Local, live tip:
refresh --dry-runexit 0;assert_path_c_ready.sh→IDLE_PATH_C_DONE;owner_land_path_c.sh --dry-run/--from-bundle --dry-run/owner_open_path_c_pr.sh --dry-run→ already-on-tip idle, exit 0; negative control--live 2cce7bf…(defaultmain) →TIP_DRIFT, exit 1; gate ona01c72f(live at 20:40Z) →LANDED_ANCESTORvia cache clone.Not touched:
LAND.md,OWNER_ACTIONS_MAIN.md,AUTONOMOUS_48H_LOG.md,BATCH*.json,BASE_TIP.txt(wake-loop-owned; avoids merge conflicts).