Repository navigation
sync-skill: audit ours.txt, and recognize a module-split release - #30
Merged
Merged
Conversation
zpyoung
pushed a commit
that referenced
this pull request
Oct 19, 2026
…nce off the deprecated owner resolver (stablyai#30484) The eight mirroring callers (#23-#30) read the owner through runtimeEnvironmentIdWithLegacyFallbackUnlessTwin, so a twin is still not mirrored. Sort-order persistence (#2) leaves out ids that two hosts publish, and ids whose only server proof is a repo row (isUnprovenServerSshRoute), instead of writing them to this desktop's or a guessed server's meta. Deprecated importers 40 -> 31.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Four lessons from the v1.4.190 sync (#29). Three are
rules, edited into the steps that own them; one is a situation to recognize, appended to
sync-lessons.md(which was empty before this).Nothing in
## Hard safety rulesor the fix policy's "Never, on either gate" list is touched.1.
ours.txtloses upstream work silently — Step 6 (rule)What happened. Nine of the 83 paths restored from
ours.txthad upstream changes in thev1.4.188→v1.4.190 range that the exception discarded outright. No conflict, no marker,
--verify-seamsand--verify-residualsboth clean,pnpm typecheckclean.The expensive one was
package.json. v1.4.190 adds an optional dependency:pnpm-lock.yamlis upstream-owned and had already resolved to the tag, so restoring the fork'spackage.jsonproduced a lockfile mismatch. Step 8'spnpm install --frozen-lockfilefails therewith an error naming nothing about ownership.
config/reliability-gates.jsoncwas the widest: 84 gates against the tag's 88, and structurally thefork copy held nothing fork-specific at all — identical
policyblock, no fork-only gate, everydifference upstream's newer evidence.
TerminalPane.tsxwould have dropped the wholeTerminalProcessExitOverlayfeature, which the tag'spty-connection-typesdeps already expect.The edit. Step 6 gains a loop over
ours.txtdiffing each path across the tag range, thegit merge-file --diff3recipe for replaying what the fork does not own, and thepackage.jsonfailure signature by name.
Evidence. Reproduce at
26d4bdafa5(this run's ownership commit) withgit diff --numstat v1.4.188 v1.4.190 -- <path>over each line ofours.txt. Fixed in8e1c5b50b0.2. A ratcheted chokepoint fires on fork-only code —
file-ownership.md(rule)What happened. v1.4.190 routes every
wsl.execall ontorunWslProcess(stablyai#15903, stablyai#15923) andevery child process onto
runProcess/spawnProcess(stablyai#15746), each pinned by a boundary test thatscans all sources and asserts the offender list is empty. One fork file that neither the merge nor
the resolution touched failed five checks from that one cause — including an upstream test far
from the fork, because the fork's direct
execFilebypassed that test'srunWslProcessmock, sothe scan consumed the queued metadata frames and the parser rejected record kind
F.The reference already covers upstream tightening
.oxlintrc.json, and explicitly scopes itself tothat file. This is the same shape arriving through tests, and the local Step 8 gate cannot see it
at all.
The edit. A new
## When upstream ratchets a chokepointsection: the tell (a boundary test whosereceived array is a single
fork-*path), read the detector before editing, migrate rather thanallowlist, take the idiom from the upstream sibling migrated in the same release, and the two
follow-on effects — upstream's mocks, and the fork's own.
Evidence. Job logs on run
33023192618; fixed in
b77bf17d2b, which turned all five green.3. Reading a failing job's log — Step 10 (rule)
What happened.
gh run view --log-failed --job <id>printed nothing and returnedA 16-way shard matrix across two Node versions is essentially never all-settled when the first
failure lands, so this is the normal case, not an edge one.
gh api repos/zpyoung/orca/actions/jobs/<id>/logsreturns the log immediately.Also recorded: same shard number failing on both Node versions is deterministic and one alone is
the flake shape — a free first read before spending a re-run. And
gh run rerun --failedrefuseswith
cannot be rerun; This workflow is already runninguntil every job settles.The edit. Step 10 gains the API command, the ANSI-stripping note, the shard-parity heuristic, and
the
reruntiming.4. A release that dissolves a monolith into modules —
sync-lessons.md(situation)What happened.
eb1792985f(stablyai#15172) replacedsrc/main/ipc/pty.ts— 8,030 lines — with a39-line barrel over 73 new modules.
-X ourskept the fork's 8,112-line monolith and took all 73siblings, so two complete implementations were live at once with separate module state. The merge
was conflict-free,
--verify-seamspassed 388/388 (the stale monolith still held every declaredline), and typecheck was clean.
The tell —
--verify-residualsis the only check that sees it:This is the third such release (v1.4.186, v1.4.187), which is why it is written as a situation rather
than left to be re-derived. The entry also distinguishes it from ordinary
-X ourshunk damage — aone- or two-line residual drift, repaired in place, which this same sync also hit twice
(
tab-types.tslost an import whose usage survived;web-session-tabs-sync.tslost a new argumentat both fork call sites).
The right move is recorded as four steps, plus two things the manifest checks will not tell you:
cross-boundary consumers may need no edit at all, and
config/max-lines-baseline.txtkeeps a staleinlineentry for the retired monolith.Evidence. Fixed in
6a79baa796; the manifest'sseamsandresidualsentries were repointed together in that commit.Per Step 15 this PR is left open for review and merges nothing. The sync is already on
main(
6e7ab8595d) andv1.4.191-rc.0.zy01is dispatched.