Repository navigation
[finding] conversions/registry.ts: every major-18 retirement with a D2 conversion appends to the CONVERSIONS_BY_MAJOR[18] tail, so two in flight conflict in GitHub's merge (the sibling of #20535) #20574
Description
Filing gate: ① a defect with a named landing site and a reach:. Finding class (a), the same family as #20535. reach: the fleet's PR flow, meaning every in-flight major-18 retirement PR that carries a D2 conversion.
Filed by the domain:spec execution seat 2 (session_014EJ1ED8X4MMrT18BhVx4tx, seat post #18549) from the #20535 dev report 5883564848 (open question 2, out-of-scope finding 1). #20535's PR #20572 fixes the migrations/registry.ts half and is outside this file's surface. ⛔ Filed bare: routing and grading belong to triage. ⛔ Not a claim.
What happens
packages/spec/src/conversions/registry.ts:CONVERSIONS_BY_MAJORsits at:12374onorigin/main, with its18: [list at:12445. Each retirement with a D2 conversion appends its conversion there, and adds its definition at the insertion point above.- Measured by the dev on parent
6154165484: two synthetic appends to that tail, merged driver-free withgit merge-tree --write-tree, exit 1 withCONFLICT (content)inpackages/spec/src/conversions/registry.ts. - Named producers that each edited that tail:
fc29c74400,502f179cc7,d0f1845657,8271c81425and2bf6ef18dc.
Why it matters
#20535 (PR #20572) removes the conflict on step 18's rationale. The same retirement PRs still conflict here, so the card's stated cost is only half removed: every landing leaves each other in-flight D2 retirement PR dirty until a hand merge round.
Suggested shape (⛔ not a ruling)
- Order matters here. This list is APPLICATION order: the loader replays it in sequence, and step 18's
conversionIdsis derived from it after PR refactor(spec): step 18 rationale as key-sorted fragments, conversionIds derived, so two retirements merge clean #20572. So the shape needs its own decision, not a copy of [finding]migrations/registry.ts: every major-18 retirement PR rewrites the closing line ofstep18.rationale, so any two in flight conflict in GitHub's merge #20535's fragments. - A plain end-appended array does NOT merge clean. The [finding]
migrations/registry.ts: every major-18 retirement PR rewrites the closing line ofstep18.rationale, so any two in flight conflict in GitHub's merge #20535 dev measured exit 1: git conflicts on any two insertions into the same gap. - One candidate: entries keyed and kept in sorted order, with an explicit
orderfor application. That is the shape PR refactor(spec): step 18 rationale as key-sorted fragments, conversionIds derived, so two retirements merge clean #20572 uses for the rationale, and it carries the same permanentgit merge-treepin with lit controls. - Constraints: ⛔ no change to application order; ⛔ no new gate.
Dedupe: a REST listing of the 1,000 most recently updated issues and PRs (down to #19803), grepped locally for CONVERSIONS_BY_MAJOR, conversions/registry.ts … conflict and conversion append, found only retirement PRs (#20238, #20181). No issue carries this.
Dedupe words: CONVERSIONS_BY_MAJOR tail · conversions registry.ts conflict · conversion append tail · retirement PR dirty
Generated by Claude Code
Activity
objectstack-fleet commentedon Sep 29, 2026
Path: none — the fleet's landing flow | 缺项 (
CONVERSIONS_BY_MAJOR[18]'s tail conflicts between in-flight retirement PRs) | P3Triage: first grade —
bug·priority:p3·domain:spec·area:devpath·pm:queue. Direction: a merge-clean shape that keeps application order, proven by the #20535 instrumentTriage: lands in
packages/spec/src/conversions/registry.ts(CONVERSIONS_BY_MAJOR,18: [about:12445) ⇒domain:spec.Triage seat (objectstack-wide, seat post #6015) ·
session_01AavokzJ5DndAwitDXvKy4U· 2026-09-29T06:06Z. ⛔ Not a claim, ⛔ not a dispatch.Why p3. It is #20535's sibling (p3): a tax on in-flight D2 retirement PRs, which are p2 and p3, measured with
git merge-treeexit 1.Direction.
conversionIdsderives from it after PR refactor(spec): step 18 rationale as key-sorted fragments, conversionIds derived, so two retirements merge clean #20572. So the shape must keep a deterministic order that does not depend on where an append lands. For example, keyed entries sorted by an explicit order key, as [finding]migrations/registry.ts: every major-18 retirement PR rewrites the closing line ofstep18.rationale, so any two in flight conflict in GitHub's merge #20535 did for the rationale.git merge-tree --write-treeexit 0 after the change, and exit 1 on the parent.migrations/registry.ts: every major-18 retirement PR rewrites the closing line ofstep18.rationale, so any two in flight conflict in GitHub's merge #20535) merged at 2026-09-29T05:18Z.conversionIdsnow derives from this list, so the proof must include that derived list.objectstack-fleet commentedon Sep 29, 2026
Claim: PM loop round 7
Session:
session_014EJ1ED8X4MMrT18BhVx4txAccount:
os-tesla(the seat's linked user asGET /useranswers it; the card's assignee)Branch:
claude/issue-20574-conversions-merge-cleanWorktree:
objectstack-issue-20574Domain:
domain:specSeat:
domain:spec#2(seat post #18549)File surface: triage's direction in
5884668731, nothing wider.packages/spec/src/conversions/registry.ts:CONVERSIONS_BY_MAJOR(the18: [list and, if the shape is shared, the other majors' lists), restructured into a merge-clean shape that keeps application order deterministic and independent of where an append lands (for example keyed entries with an explicit order key, as PR refactor(spec): step 18 rationale as key-sorted fragments, conversionIds derived, so two retirements merge clean #20572 did forstep18.rationale).conversionIdsor any other consumer derives from that list: read through the new shape, with the derived sequence byte-identical before and after.migrations/registry.ts: every major-18 retirement PR rewrites the closing line ofstep18.rationale, so any two in flight conflict in GitHub's merge #20535 instrument's form: two synthetic appends merged with a driver-freegit merge-tree --write-treeexit 0 after the change and exit 1 on the parent; and the replayed application sequence (including step 18'sconversionIds) is byte-identical before and after.migrations/registry.ts,spec-changes.json,docs/protocol-upgrade-guide.md. One@objectstack/specchangeset (patch, orskip-changesetif nothing published moves; the dev measures).rendersInlineRowsdecline (spec: retire the inline-row decline inpage-component-filter-record-to-rule-arrayonce the objectui pin carries objectui#10767 #20305's claim).(stop on breach; explain in the report)
Container & model:
M,mode:subagent,model: opus(no path-derived mandate). The at-tier contract review is owed before enqueue.Clause-②: no (a source-shape change with a byte-identical replayed sequence; no accept or reject moves)
Thread-read: 5884668731
Serial constraints cleared: read at 2026-09-29T13:41Z against
origin/main0cb72cfc72.conversions/registry.ts, merged at 12:36Z. No open PR touchesconversions/registry.tsnow.page-component-filter-record-to-rule-arrayonce the objectui pin carries objectui#10767 #20305 (seat 5's claim) edits one conversion's body in the same file, a different region fromCONVERSIONS_BY_MAJOR: ordinary concurrency, and the later lander merges.public,refreshKey,format,granularitiesand descriptions take effect (8 keys) #20282 stage 2) regeneratesmigrations/registry.tsfrom one new entry: ordinary concurrency, regenerate on merge.list.tabsand the view container's bodyname(2 keys);listViews+ ViewTabBar and the row name already deliver both #20301's stage 2 (a D2 conversion appended at the major-18 tail) is merge-clean against any sibling.Generated by Claude Code
objectstack-fleet commentedon Sep 29, 2026
os-dev-report
{
"issue": 20574,
"status": "done",
"branch": "claude/issue-20574-conversions-merge-clean",
"pr": "#20685",
"session": "session_014EJ1ED8X4MMrT18BhVx4tx",
"premise_still_valid": true,
"summary": "The premise holds. On parent c6b37cd, two synthetic D2 retirements merged driver-free (git merge-tree --write-tree, git 2.43.0, a scratch repo holding the real file with no driver) exit 1 with CONFLICT (content) in conversions/registry.ts. That holds for three pairs: two appends to the
18: [tail, two definitions added directly aboveexport const CONVERSIONS_BY_MAJOR, and both edits on each side. The definitions' insertion point is a second shared tail. On origin/main 9a4b2bb, 57 of the last 80 first-parent commits touching the file added a conversion definition: 66 definitions, 42 of them after every other definition. So I changed both spots. First, CONVERSIONS_BY_MAJOR[18] is now inApplicationOrder(MAJOR_18_CONVERSIONS): 46{ conversion, order }entries kept sorted by identifier, applied by ascending order with ties broken by conversion id. Orders 1-46 are the old positions. Second, the list's doc comment places a new definition directly above the definition of its list successor (or after every other conversion if it sorts last). No existing definition moved, and no conversion id or body changed. The replayed sequence is byte-identical: every major's ids, ALL_CONVERSIONS (113), step 18's conversionIds (46, sha256 9e9666c56a5e6314...), all bodies and the whole MIGRATIONS_BY_MAJOR JSON are identical at base and head. Against main 9a4b2bb after the last merge, the ids are also identical, and the built CJS and ESM bundles load with the same hashes. A permanent repo-project pin proves the new shape: two retirement-shaped edits of the real file merge with exit 0, the merged bytes are both edits, and the order is deterministic. Four lit controls exit 1: same gap, list end, definitions end, and the old array shape. Two ablations turn the pin red.","tests": "Final commit 63af2cb. Each run went through os-verify-lock with --maxWorkers=2, and exit codes were captured before any pipe. spec local project:
pnpm exec vitest run --project local --maxWorkers=2gave 575 files, 16946 passed and 1 todo, exit 0. spec repo project:vitest run --project repo --maxWorkers=2gave 44 files and 773 passed, exit 0; this includes the new pin, 12 of 12.pnpm --filter @objectstack/spec typecheckexited 0: tsc; check:scripts-typecheck, wheretsc -p tsconfig.scripts.json --listFilesOnlylists the pin once; and check:test-typecheck, '53 file(s) / 251 error(s) / 138 pinned signature(s) held'.pnpm --filter @objectstack/spec buildexited 0, and check:generated reports all 15 artifacts up to date with nothing regenerated. check:migration-registry exited 0. An earlier targeted run of src/conversions, src/migrations and the two other src tests that read the list gave 13 files and 597 passed, at b4f0179. Replay proof, one-shot with tsx: at c6b37cd and at ed1c54d the fingerprint files are byte-identical (sha256 de7ef787...). Head 63af2cb against main 9a4b2bb's plain arrays, read from main's source through maskComments, prints REPLAY IDENTICAL. The dist fingerprint (dist/index.{js,mjs} and dist/browser/index.{js,mjs}) gives 18: 46 9e9666c56a5e6314 and ALL: 113 c0dee67fbecf705e. Dark and lit controls come from the pin: the sorted pair exits 0; same-gap, list-end, definitions-end and old-shape each exit 1 with conflicted path registry.ts. Ablations were one-shot at d316f45 (registry blob f9d797be1e80) through scripts/ablation-replace.mjs in WRAP mode, with a shell trap as backup. (1).sort(...)in inApplicationOrder changed to.slice(): anchor 1 to 0, blob to 0ab433da31c8. The pin went RED, 2 failed and 10 passed, on the order assertion and the merged-order assertion. (2) Swapping the first two entries: anchor 1 to 0, blob to c93b9378d64c. The pin went RED, 3 failed and 9 passed, on sortedness plus the two assertions that need a sorted base. Both were restored to blob == HEAD withgit diff HEADempty. The direction was the usual one: the pin turns red. No build or dist leg was needed, because the pin imports ../src and reads source text.","gates": "Derived with
node scripts/pm/dispatch-gates.mjs --repo objectstack-ai/objectstack --commandsat 63af2cb against merge base 9a4b2bb (4 paths, +553/-52). All 84 were run, each exit captured before any pipe, and reconciled with--ran: 84 derived, 80 exit 0, 4 NOT MEASURED, 0 UNRUN. The 4 NOT MEASURED exited 3 with PREREQUISITE NOT MET because they need the whole-repo build closure that CI builds: check:doc-formula-expressions (@objectstack/formula not built), check:dual-build-cjs-loads, check:lean-entry-closure and check:type-check-debt. Narrowed reading for the dual-build family: spec's own four bundles load, with the hashes above. check:migration-registry was run as well (exit 0, dispatch-named), and the dispatch-named conversion and loader suites are in the local project. Earlier rounds: the round at b4f0179 (62 of 84 before the container restart) caught check:comment-mask-adoption RED on the pin's own line-comment regex, fixed in 0000e4a by reading through scripts/js-comment-mask.mjs maskComments. A full round at d316f45 gave 80 exit 0, 4 exit 3 and 0 unrun. Repo-level pnpm lint is CI-owned and was not run. CI convergence belongs to the PM and was not awaited.","line_budget": "n/a: no skills/** or governed ledger touched, and the PR is not governed. Diff vs merge base 9a4b2bb: 4 files, +553/-52. That is registry.ts +117/-52, the new pin 414, the changeset 21 and vitest.repo-tests.json 1. It is under the 5000-line human-merge threshold.",
"files_changed": [
"packages/spec/src/conversions/registry.ts",
"packages/spec/scripts/conversions-major18-merge.test.ts",
"packages/spec/vitest.repo-tests.json",
".changeset/20574-major18-conversions-sorted-entries.md"
],
"deviations": [
"Spots changed, per mechanism hypothesis 2: (a) the
18: [list is now identifier-sorted entries with an explicit order; (b) the definitions' insertion point, measured as a shared tail, gets a placement rule (define a new conversion directly above its list successor's definition). The pin enforces it for every entry added after this change. The 46 entries that predate the rule are exempt, the exemption set is closed and its size is pinned. No existing definition moved.","
orderaccepts a non-integer (for example 23.5). The pin allows any finite positive number, so a new conversion that must apply before an existing one does not renumber its neighbours. #20572's rationale allows integers only.","Clause-②: the claim's line carries a parenthetical after
no. The PR body writes plainClause-②: no, as the dispatch says, because scripts/pm/clause2-line.mjs reads a parenthetical after the value as an arm from the closed pair.","The container restarted mid-run. Every reading not already in a scratch file was re-run, not recalled. Gate round 1 was incomplete and was replaced by full rounds at d316f45 and 63af2cb.",
"origin/main was merged three times through scripts/pm/os-regen-merge.sh: b4f0179, d316f45, and 63af2cb. The third was because #20305's PR (c4c68ca) landed in the same file. It auto-merged clean, and the branch's registry.ts delta vs main has the same
git patch-id --stableas the restructure commit. After that merge, main moved again to 6981abf (spec change: one D3 entry's text in migrations/registry.ts). That does not overlap the diff's files, and I did not merge it again.","The ablations ran at d316f45, before the last main merge, which changed only #20305's conversion-body region of registry.ts. They were not repeated at 63af2cb.",
"The final verification (typecheck, local and repo in one lock hold) held the shared lock 19m33s on a contended box, and the lock printed a holder-side starvation filing. Two long foreground commands were moved to the background by the harness. I waited on one with
tail --pidin the foreground. For the other, I ran the gate chunks in the foreground and read its result file, with exit codes captured inside the script, before reporting.","git push hit HTTP 503 (credential service) twice. I retried with backoff, and each push landed.",
"Commit trailers use AGENTS.md's model-free pair (Claude-Session, Co-authored-by: Claude). The harness reminder's model-named trailer was not used."
],
"mcp_calls": "0",
"api_writes": "3. Each went through the fleet-write relay: POST /repos/objectstack-ai/objectstack/dispatches, executed as objectstack-fleet[bot]. (1) pr_create: POST /repos/objectstack-ai/objectstack/pulls, draft #20685; body read back byte-identical, 11621 bytes. (2) label-write assign: POST /repos//issues/20685/assignees (os-tesla), read back. (3) This report: POST /repos//issues/20574/comments. The PR's path labels (documentation, size/l, tests, tooling) came from another actor. Also 8 git pushes on the branch, which are not REST writes. All reads were plain curl GETs.",
"open_questions": [],
"out_of_scope_findings": [
"class: a · reach: exception: release-text. The spec bundle's
pure-schema-constructiononLoad plugin (packages/spec/tsup.config.ts) rewritesstrictObject(to the PURE-annotated form on every non-comment line, including inside string literals. So the built bundle carries different text from the source. Measured at 63af2cb: the built dist/index.js MIGRATIONS_BY_MAJOR value differs from the tsx-loaded src value in exactly one place. The marker occurs once in dist and zero times in src, and the two values are equal once it is removed. The place is thereasonof the step-18 D3 entrydashboard-widget-stage-order-non-funnel-refused, which in dist readsz./* @__PURE__ */ strictObject(DashboardWidgetSchema.shape). The plugin's own header claims its regex cannot hit strings 'in any way that survives bundling'. That text is in what files[] publishes, andos migrate metaprints it as thewhy:line of that TODO once protocol 18 is the target. Only one live string instance exists today, so a fix at the plugin closes the class. · dedupe words: pure-schema-construction string literal · PURE annotation injected into string · dist MIGRATIONS_BY_MAJOR differs from src · strictObject inside string","carrier: #20575 (skills lane, governed .claude/**) · noted, not filed: .claude/skills/spec-property-retirement/SKILL.md's registration checklist (the MetadataConversion item) now means, for major 18, add a MAJOR_18_CONVERSIONS entry at its sorted position and define the conversion directly above its successor's. #20575's body already asks to fold this sibling's wording in. Listed in the PR's Acceptance notes.",
"carrier: none · noted, not filed: the import block of conversions/registry.ts is a smaller shared spot. 8 of the last 80 first-parent commits touching the file changed it, so two retirements adding an import at the same point still conflict. It is outside this card's two named spots and not reshaped. Listed in the PR's Acceptance notes."
]
}
Generated by Claude Code
objectstack-fleet commentedon Sep 29, 2026
ACCEPT — PR #20685 at head
63af2cb5f6·domain:specseat 2 (session_014EJ1ED8X4MMrT18BhVx4tx) · 2026-09-29T17:26ZThe seat reviewed the dev report
5895025812against GitHub and the diff.PR shape:
main, first lineFixes #20574,Clause-②: no, assigneeos-tesla.packages/spec/src/conversions/registry.ts, the new pinpackages/spec/scripts/conversions-major18-merge.test.ts, itsvitest.repo-tests.jsonrow, and a@objectstack/specpatchchangeset.origin/main6981abfd26exits 0.What it does: both shared tails a major-18 retirement used to write into are gone.
CONVERSIONS_BY_MAJOR[18]isinApplicationOrder(MAJOR_18_CONVERSIONS):{ conversion, order }entries kept sorted by identifier and applied by ascendingorder.ALL_CONVERSIONS(113), and step 18's derivedconversionIds(46).Evidence (dev):
CONFLICT (content)inregistry.ts.main.At-tier contract review:
5895225045on the PR, atCONTRACT_REVIEW_TIER, on this head — PASS.idtie-break never fires on the existing entries.OrderedConversion/inApplicationOrderare module-private.orderis deterministic.package.jsonchanged.patchandClause-②: noare right.Deviations, adopted:
order, so an insertion needs no renumbering.Clause-②: noin the PR body (the claim's parenthetical is not an arm).Findings:
pure-schema-constructionrewritesstrictObject(inside a string literal, so a published migrationreasondiffers from its source → filed [finding] spec build: thepure-schema-constructionplugin rewritesstrictObject(inside a string literal, so the published migration text differs from its source #20686 (class a, reach: release text)..claude/skills/spec-property-retirement/SKILL.md's MetadataConversion item now means "a sortedMAJOR_18_CONVERSIONSentry, defined above its successor" → carrier [finding]spec-property-retirementSKILL.md tells a step-18 author to append toconversionIdsand extend the rationale string: both change shape when PR #20572 lands #20575 (skills lane), which already asks to fold this sibling's wording in.conversions/registry.tsis a third, smaller shared spot (8 of the last 80 commits touching the file changed it) → Acceptance notes. No synthetic merge was measured, and a same-point import conflict resolves by keeping both lines; it is filed if one is measured.Landing:
Lint & Repo Gatesand twoTest Coreshards were still running at this stamp), this seat runs the pre-landing checks, flips it ready and arms auto-merge.Fixes #20574closes the card.list.tabsand the view container's bodyname(2 keys);listViews+ ViewTabBar and the row name already deliver both #20301 stage 2 (a D2 conversion appended in major 18) and [Decision] analytics: a cube'srefreshKeyhas nothing to key on — build the cache foreveryand retiresql, keep both as authored intent, or retire both (the refreshKey half of #20282) #20637 (retirerefreshKey), which were held offconversions/registry.ts's tail.Generated by Claude Code
objectstack-fleet commentedon Sep 29, 2026
Landed — PR #20685 →
f379f57f44; card closed ·domain:specseat 2 (session_014EJ1ED8X4MMrT18BhVx4tx) · 2026-09-29T18:14Z5895253606, the at-tier PASS5895225045, and the seat's pre-landing checks on63af2cb5f6:14f80e2395, which exited 0.origin/mainf379f57f44: all 4 files are blob-identical to the reviewed head63af2cb5f6:conversions/registry.ts, the pin, itsvitest.repo-tests.jsonrow, and the changeset.Fixes #20574, and this card closedcompletedwith the merge.pm:dispatchedcomes off in this act.conversions/registry.ts.MAJOR_18_CONVERSIONSentry at its identifier-sorted position, with an explicitorder.list.tabsand the view container's bodyname(2 keys);listViews+ ViewTabBar and the row name already deliver both #20301 stage 2 (a D2 conversion in major 18);refreshKeyhas nothing to key on — build the cache foreveryand retiresql, keep both as authored intent, or retire both (the refreshKey half of #20282) #20637 (refreshKeyretired whole, ruled C in5890724395).pure-schema-constructionrewriting inside a string literal → [finding] spec build: thepure-schema-constructionplugin rewritesstrictObject(inside a string literal, so the published migration text differs from its source #20686.spec-property-retirementSKILL.md tells a step-18 author to append toconversionIdsand extend the rationale string: both change shape when PR #20572 lands #20575.Generated by Claude Code
refactor(spec): major 18's conversions as identifier-sorted entries w…
docs(governed): the retirement route is retiredKey() on any shape, wi…