Merge remote-tracking branch 'origin/master' into worktree/preset-plane-fallout-p1
Only `docs/module-graph.*` conflicted; generated, so taken from master and regenerated. `api-proxy.ts` auto-merged — this branch's history read (`historySourceFor` / `presenterScopeFor` / `historyCutOf`, in that order) is intact. Hook bypassed as before: the staged-pairing check hands an archived note path to `verify-translation-pairing`. The full-corpus gate passes.
This commit is contained in:
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write docs/config-catalog.md
|
||||
config-catalog.md: a00005d0c9e802b4973a0046d9e0ceed2b58d07f
|
||||
config-catalog.md: fbd88a9137e61f97209f2f136f46a95806da399d
|
||||
config-catalog.zh.md: 8794093955984c7c12dabeed742a4717c16741a5
|
||||
|
||||
Reference in New Issue
Block a user