Takes the port branch up to77320d5e-- the state the human play-tested on 2026-09-02 -- for SOURCE paths only. Not a branch merge: `auto/port-p6-audio` is 366 commits and 938 files, and most of that must not land. WHAT COMES IN (76 files, all human-confirmed working): * the logo splash animation.08ed3dd1found it: `pose_at` ASSIGNED the settle instant instead of clamping to it, so the splash never animated at all -- and the same bug manufactured a passing harness result, because the harness photographed t past the settle. Confirmed by play-test: "cannot notice any obvious difference from the actual game." * gamepad input -- (A)/(B) bound additively (`ui_accept` ships with NO joypad binding), stick latched with hysteresis at the game's own 61% digitise threshold. This is what made (A), video-skip and Extras work at all. * menu navigation and flow, menu audio, the exporter, the authored declarations, and 23 verification tools under tools/port/. WHAT IS DELIBERATELY LEFT ON THE BRANCH: * everything afterc0ae460a-- the F5/F6 title-timing investigation, whose own tip commit calls itself a "hand-off for one-minute human checks". Unchecked by definition; it goes through the new review gate like anything else. * the OPTIONS menu work of 2026-09-03. Real, probably good, NOT play-tested. * the F1 repeat mechanism, which its own commit calls "deliberately inert". WHAT MUST NOT LAND, AND WHY THE .gitignore CHANGED: 545 MB of extracted game content was committed on that branch -- 850 sprite, audio and transcoded video files under `export-probe/` and `export-probe2/`, plus 246 MB of loose .wav and .tsv at the repo root. This repository's own rule, in this file, is "never game content". The rule was not missing. It was written, and it was tightened on that very branch, with a careful comment explaining why BOTH `export/` and `data/base/` had to be listed -- while the exporter was writing to a third name that nobody had thought to list. Enumerating names is the thing that failed. So the ignore rules now describe the SHAPE: any top-level `export*/`, game media by extension, and loose capture output at the root. Verified both ways -- it catches all four offenders and ignores nothing currently tracked. Verified: `cargo check --workspace` clean; all nine GDScript files parse in project context, with a positive control (an injected syntax error is detected, 3 lines) so the clean result means something. `tools/port/check-all` was NOT run -- it needs the container, the export tree and a display.
86 lines
3.9 KiB
Python
Executable File
86 lines
3.9 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Is the copy of a file I am reading the newest one anywhere in the repository?
|
|
|
|
🔴 THE RULE THIS REPLACES IS A MEMORY. Two agents spent days on a shared-state
|
|
problem that is really two problems:
|
|
|
|
what a peer HOLDS readable right now, from any topic branch, by anyone who
|
|
remembers the ref exists -- `git show <ref>:<path>`
|
|
what a peer must be TOLD still needs a human to merge to `main`
|
|
|
|
Both were being filed as blocked on the merge. Half never was. The Decoder read
|
|
this port's `BLOCKED.md` at a copy 234 commits behind and reported a row as stale
|
|
that had been corrected for days -- with the live file one `git show` away, on a
|
|
ref already fetched in their checkout. This port read `main`'s 926-line HANDOFF
|
|
for two days while the live one sat on a branch it had already been citing by sha.
|
|
|
|
Same gap, opposite directions, and the fix in both cases costs one command. So
|
|
the command exists rather than the intention.
|
|
|
|
Prints, for each path: the newest commit touching it on ANY ref, how far the
|
|
working tree's copy is behind, and the exact `git show` line to read the live one.
|
|
"""
|
|
import subprocess, sys, os
|
|
|
|
# The files this port depends on that another agent writes. Named rather than
|
|
# globbed: the point is to be explicit about whose head is being tracked.
|
|
DEFAULT = [
|
|
"docs/port/HANDOFF.md",
|
|
"docs/game/navigation.md",
|
|
"docs/agents/PROTOCOL.md",
|
|
"docs/port/MISSION.md",
|
|
"docs/port/PORT-MISSION.md",
|
|
]
|
|
|
|
|
|
def git(*a):
|
|
return subprocess.run(["git", *a], capture_output=True, text=True).stdout
|
|
|
|
|
|
def main():
|
|
paths = sys.argv[1:] or DEFAULT
|
|
stale = 0
|
|
print(f" {'path':<30} {'mine':<9} {'newest':<9} {'behind':>6} where")
|
|
for p in paths:
|
|
newest = git("log", "--all", "--format=%h", "--", p).split()
|
|
mine = git("log", "-1", "--format=%h", "--", p).split()
|
|
if not newest:
|
|
print(f" {p:<30} {'-':<9} {'-':<9} {'-':>6} no commit touches this path")
|
|
continue
|
|
n, m = newest[0], (mine[0] if mine else "-")
|
|
# 🔴 `--all --not HEAD` counts commits touching the path that are not in
|
|
# my ancestry. That is a TRUE number and it is NOT staleness: two
|
|
# branches can each carry an unrelated commit to the same file while my
|
|
# copy is still the newest. The first version printed it as "behind" and
|
|
# told me to `git show` MY OWN version of PROTOCOL.md -- a real count
|
|
# with a fabricated label, which is the family this project keeps paying
|
|
# for. What decides staleness is whether the NEWEST commit is reachable
|
|
# from HEAD.
|
|
reachable = subprocess.run(["git", "merge-base", "--is-ancestor", n, "HEAD"],
|
|
capture_output=True).returncode == 0
|
|
diverged = len(git("log", "--all", "--not", "HEAD", "--format=%h", "--", p).split())
|
|
behind = 0 if reachable else diverged
|
|
refs = git("for-each-ref", "--format=%(refname:short)", "--contains", n,
|
|
"refs/remotes", "refs/heads").split()
|
|
where = refs[0] if refs else "?"
|
|
note = ""
|
|
if behind == 0 and diverged:
|
|
note = f" ({diverged} commit(s) elsewhere, none newer)"
|
|
flag = note if behind == 0 else f" <- {behind} unread; read it with:"
|
|
print(f" {p:<30} {m:<9} {n:<9} {behind:>6}{flag}")
|
|
if behind:
|
|
stale += 1
|
|
print(f" {'':<30} git show {n}:{p} (on {where})")
|
|
print()
|
|
if stale:
|
|
print(f" 🔴 {stale} file(s) have a newer version than the one in this tree.")
|
|
print(" Reading it needs no merge and no human. Being TOLD about it does.")
|
|
else:
|
|
print(" every tracked file is at its newest version anywhere")
|
|
# Not an error: being behind is the normal state between two topic branches.
|
|
# This reports; the caller decides. Exit 0 unless a path is unknown.
|
|
return 0
|
|
|
|
|
|
sys.exit(main())
|