Repository navigation
devx(sdui): one manifest record per ui registry package, so ui PRs on different packages stop conflicting - #26120
Merged
Merged
Conversation
…rator) Co-authored-by: Claude <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SMJGPXxFBpbgAgXdnsXKVS
…esh date reds it Co-authored-by: Claude <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SMJGPXxFBpbgAgXdnsXKVS
…ord's readers Co-authored-by: Claude <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SMJGPXxFBpbgAgXdnsXKVS
…-7tu0bz # Conflicts: # scripts/sdui-manifest.record.json
…lugin-grid, plugin-list) Co-authored-by: Claude <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SMJGPXxFBpbgAgXdnsXKVS
…-7tu0bz # Conflicts: # scripts/sdui-manifest.record.json
Co-authored-by: Claude <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SMJGPXxFBpbgAgXdnsXKVS
Contributor
Author
席位核对 — ACCEPT at
|
This was referenced Oct 26, 2026
fix(plugin-detail): record page read mode wraps text values; highlighted dates keep their day
#25998
Merged
os-project-manager
pushed a commit
that referenced
this pull request
Oct 26, 2026
The locale packs auto-merged with both sides' keys kept. #26120 split the sdui record into one file per registry package, so scripts/sdui-manifest.record.json takes main's version and `node scripts/gen-sdui-manifest-node.mjs` re-records only scripts/sdui-manifest.sources/i18n.json for the new locale keys (sdui.manifest.json unchanged). Claude-Session: https://claude.ai/code/session_01NndsH9Qm7k6AS2i2fWbjNA Co-authored-by: Claude <noreply@anthropic.com>
This was referenced Oct 26, 2026
This was referenced Oct 26, 2026
This was referenced Oct 26, 2026
Merged
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.
Requested by Elon · project thread
Fixes #26051
Clause-②: no
Metadata-protocol: none
Part of the p1 merge-queue backlog work (#26074). Dispatched by seat
domain:devx#1(#6023), claim 6415558140, card-thread sessionsession_01SMJGPXxFBpbgAgXdnsXKVS.What changes
scripts/sdui-manifest.record.jsoncarried ONEinTree.registrySourcesSha256over thesrc/of all 27 ui registry packages, so any two ui PRs that touched any registry package conflicted on that line. Now:scripts/sdui-manifest.sources/PACKAGE.json={"package","sources","sha256","manifestSha256"}(the package's ownsrc/digest, its file count, and the sha256 of the artefact it was verified against). 27 files.scripts/sdui-manifest.record.json, same path) keeps only what describes the artefact:sha256,components,generatedAt, andinTree=modulesRoot,objectuiWorkspaceVersion,registryRecords(the directory). The retiredregistryPackages/registrySources/registrySourcesSha256are refused if they reappear.sdui.manifest.jsonis byte-identical (sha2561f6e1ccb925a…, 106 components).lint.yml's command line (node scripts/check-sdui-manifest.mjs --self-test && node scripts/check-sdui-manifest.mjs) is unchanged and keeps working. No.github/**orui/.github/**edit.Measured first (Ask 1): own
src/per package, not dependency-inclusiveTree: objectstack
0a6948210c(base), 27 reached packages, 922 non-test sources.Detection is the same as one digest over the set. Any edit under any reached package's
src/moves exactly that package's digest, so a single PR's edit is caught exactly as before; a dependency's edit is caught through the dependency's own record. Dependency-inclusive digests add no single-PR detection. They would only add conflicts, and at this cost (records asrc/edit would touch):src/(this PR)typescoredata-objectstack,i18nreact,react-runtime,sdui-parsercomponentsfieldsplugin-detailplugin-form,plugin-gridMerge experiment, real tree,
git merge-tree --write-tree(no merge driver routes these paths;git check-attr merge= unspecified, so this is GitHub's answer): each branch appends a comment to onesrc/file and runs the generator.0a6948210c)a8114011)plugin-grid/src/FormulaBar.tsx×plugin-form/src/DrawerForm.tsxscripts/sdui-manifest.record.jsoncheck-sdui-manifest(exit 0)plugin-grid/src/FormulaBar.tsx×plugin-grid/src/ObjectGrid.tsxscripts/sdui-manifest.sources/plugin-grid.jsononly, by designThe open ui PRs today (registry packages each changes, non-test
src/only; none changessdui.manifest.json): #25987 i18n, plugin-grid, plugin-list · #25998 plugin-detail · #26040 components, i18n · #26045 i18n · #26027 plugin-dashboard · #26030 plugin-grid · #26033 core, plugin-form, plugin-grid · #26042 plugin-form · #26044 i18n · #26048 i18n, plugin-map · #26050 fields, plugin-grid · #26062 fields. Under the single digest all 12 conflict pairwise (12 serial landings). Under this layout they conflict only within a shared package; the largest group isi18n(5 PRs), so they can land in 5 rounds, e.g. {#25987, #25998, #26027, #26042, #26062} → {#26040, #26030} → {#26045, #26033} → {#26044, #26050} → {#26048}, assuming no source-level conflicts between them.The check (Ask 2)
checkTreeWithoutPincompares each reached package's digest with its own record and names every stale package (ui/packages/plugin-grid: now 38 file(s) sha256 …, recorded …), every unrecorded package, every record the registry no longer reaches, every record verified against another artefact, and every malformed record, then prints the one command:node scripts/gen-sdui-manifest-node.mjs. The pin mode (.objectui-shapresent) is untouched.Why
manifestSha256is in every package record, and why one line: a PR that changes the artefact re-records every package against the new sha256, so it still conflicts with every in-flight registry PR, which must regenerate on the merged tree (that is today's behaviour, kept for the case where it matters). Two PRs on the same package touch the same line and conflict. One line per file guarantees git cannot merge a digest from one side with an artefact sha256 from the other; a record that is not in the producer's one-line form is RED.What this does not force, stated rather than implied: two PRs on different packages that each leave the artefact unchanged, where only their combination would change it, land without any run seeing the combination. Under the single digest their textual conflict forced that run. Here the next regeneration of any registry package sees the combination. Dependency-inclusive digests would close this only along import edges (not between siblings that interact through
ComponentRegistry), at the fan-out above. No stale or missing registry source passes: every source edit still reds until regenerated, and every package added to or removed from the reached set still reds.Self-test (Ask 3)
29 rows (was 22), roster and floor updated. New or changed in-tree rows: a staged edit to one package is RED naming that package and NOT naming
plugin-formorcore; a new package the registry reaches; a new workspace edge (now namesui/packages/unrelated); a removed package (namesscripts/sdui-manifest.sources/types.json); a deleted package record; a record verified against another artefact; a record out of its one-line form; a record from the single-digest layout; and the producer re-recording only the moved package (it back-dates the shared record first, so a producer that stamps today's date reds the row).Ablations, one at a time through
scripts/ablation-replace.mjs, each restored withgit diff HEADempty:generatedAtcarry (producer)The generator (Ask 4)
It re-records only the packages whose line changed and leaves the others byte-identical; it removes a record the registry no longer reaches; it prints which packages it re-recorded. The shared record moves only with the artefact:
generatedAtand the provenance version are carried while the artefact's sha256 is unchanged (the same rule the pin-keyed fields already follow), so a regeneration on another day no longer moves a shared line.It still builds, and why: the build plus the enumeration is the only oracle that says whether
sdui.manifest.jsonmoved. A record written without it would stamp a current digest on a manifest no run checked, which is the narrowing this card forbids. The 8 minutes is a cold turbo cache, not the build of one package. Measured on0a6948210c, one container, no remote cache (TURBO_TOKENunset):plugin-grid/srccore/srcReaders moved (Ask 5)
docs/releases-maintenance.md: the regenerate section describes the per-package records, the re-record rule and which PRs still conflict.scripts/check-changeset-no-major.mjs: the "measured out" comment, the real-build assertion (neither record is shipped) and the records-only control now coverscripts/sdui-manifest.sources/. Its--self-testpasses (456 assertions).scripts/ui-import/README.mdis not edited: line 140 records what the cutover's step 4 wrote at the time, and that file still exists at that path.git grep -n "sdui-manifest.record"outside CHANGELOGs: only the two scripts, the docs page,check-changeset-no-major.mjsand that historical README line.git grep registrySourcesSha256: only the retired-field list and its self-test row.After this lands: what an in-flight ui PR does (once)
A ui PR whose branch re-recorded the old single digest conflicts once on
scripts/sdui-manifest.record.json:After that, PRs on different registry packages no longer conflict with each other on the record.
Gates
Local, on
a8114011(derived withnode scripts/pm/dispatch-gates.mjs --commands): 39 of the 40 derived families exit 0, includingnode scripts/check-sdui-manifest.mjs --self-test(29 cases) andnode scripts/check-sdui-manifest.mjs,node scripts/check-changeset-no-major.mjs --self-testand--base origin/main,pnpm check:nul-bytes,pnpm check:watch-hint-literal,pnpm check:required-contexts,pnpm check:doc-authoringandpnpm --filter @objectstack/lint run check:doc-formula-expressions(after the lint closure build).pnpm check:pm-dispatch-gateswas still running when this PR opened; its reading goes into the report comment on #26051, and CI runs it in Lint & Repo Gates.CI on the PR's check-runs: pending at the time of writing; the seat reads them.
Changeset: none,
skip-changeset. The diff touches only rootscripts/(private),docs/and the records;sdui.manifest.jsonis byte-identical and neither record is copied intopackages/console/dist/(thecheck-changeset-no-majorreal-build assertion above).Not Tier H: no governed path (
git diff --name-onlyhas no.github/,.claude/,docs/adr/,skills/,AGENTS.md,CLAUDE.md).Acceptance notes
i18nis the hot package: 5 of the 12 open ui PRs touch itssrc/, so they still serialize onscripts/sdui-manifest.sources/i18n.json. Whether locale data belongs in the digest at all is a narrowing question (it would let a source change pass unregenerated), not something this PR decides.Generated by Claude Code