Skip to content

fix(plugin-grid): fill a bulk confirmText's {{ count }} hole with the run's record count - #26030

Merged
objectstack-fleet[bot] merged 12 commits into
mainfrom
claude/project-thread-0ml7qr
Oct 26, 2026
Merged

objectstack-fleet[bot] merged 12 commits into
mainfrom
claude/project-thread-0ml7qr

Conversation

@objectstack-fleet

Copy link
Copy Markdown
Contributor

Requested by Steve · project thread
Part of #25942
Clause-②: no
Metadata-protocol: none

What

Step 1 of ruling B on #24798 (the renderer half): a bulk action's confirmText fills its {{ count }} hole with the number of records the run covers.

  • ui/packages/plugin-grid/src/components/bulkConfirmText.ts gains bulkConfirmText(confirmText, { count }). It reads the slot through the existing bulkConfirmTextSource (string or { dialect: 'template', source }), and when the sentence carries a {{ }} hole it fills it through @object-ui/core's fillTemplateHoles, the template engine the flow notifications and the single-record confirmText already render with. The root is the protocol's own constant, BULK_CONFIRM_COUNT_ROOT from @objectstack/spec/ui, bound to rows.length (the selection after the def's visible narrowed it, the same number the default sentence states).
  • BulkActionDialog.tsx renders the confirm description through it. The default sentence, the place of the confirm step and everything else in the dialog are untouched.
  • bulkConfirmTextEnvelope-13183.test.tsx: the dialog test that pinned an envelope's {{ count }} printed as written now expects it filled (Archive 2 account(s)?); the reader tests there are unchanged, since the reader still returns the source as written.
  • scripts/sdui-manifest.record.json re-recorded (node scripts/gen-sdui-manifest-node.mjs), because the registry source hash moved.
  • Changeset: .changeset/25942-bulk-confirm-holes.md, @object-ui/plugin-grid patch.

The ruling, verbatim: "Nothing else moves: no CEL inside holes, no change to the default text, no change to where the confirm step sits." A hole holding logic, an unbalanced delimiter or an unknown formatter is refused by the engine, and the dialog then shows the sentence as written (the server-side doors refuse such a sentence by name already).

What stays for step 2 (the Fixes #25942 PR)

The param roots. At this step only count is bound, so a hole naming one of the def's params prints empty, as an unbound path does in every template. Step 2 binds each param to its display value under the spec's rule (option label, lookup/user display name, the raw value otherwise so formatters apply), and #25942 remains open for it.

Verification (head b8e5134c)

  • Targeted: cd ui && pnpm exec vitest run --maxWorkers=2 packages/plugin-grid/src/__tests__/bulkConfirmCount-25942.test.tsx packages/plugin-grid/src/__tests__/bulkConfirmTextEnvelope-13183.test.tsx → Test Files 2 passed, Tests 20 passed.
  • New file bulkConfirmCount-25942.test.tsx, 9 tests: the protocol root name; a bare string and an envelope; {{ count | number }} → 1,234; a hole-less sentence and a dollar-brace token shown as written; blank, source-less and absent slots return undefined; an unbalanced and a logic-bearing source returned as written; the dialog shows Archive 3 account(s)? / Archive 1 account(s)? for the rows it was handed and keeps the default sentence when no confirmText is authored.
  • Ablation (after commit 812c71ec): the render site set back to bulkConfirmTextSource(def.confirmText) through scripts/ablation-replace.mjs (anchor 1 → 0, blob c1b43e1f66ea → 2e7497c942ea) → Tests 3 failed | 17 passed (the three dialog fill tests); restored to blob c1b43e1f66ea, git status --porcelain empty. No build leg: the tests import the dialog by relative path.
  • Whole package: cd ui && pnpm exec vitest run --maxWorkers=2 packages/plugin-grid/ under the lock → Test Files 248 passed (248), Tests 2213 passed (2213), VERDICT command-exit 0.
  • pnpm --filter @object-ui/plugin-grid run type-check (both tsc --noEmit and tsconfig.test.json) → exit 0, after pnpm --filter '@object-ui/plugin-grid^...' run build.
  • node scripts/check-sdui-manifest.mjs → exit 0 after the re-record.
  • Derived gates: node scripts/pm/dispatch-gates.mjs --commands --repo objectstack-ai/objectstack at b8e5134c → 46 commands, all exit 0; --ran with exit codes → 46 derived, 46 run, 0 NOT-MEASURED, 0 UNRUN. CI owns the type-check lanes, Test Core and the repo-wide scans.

Acceptance notes

  • The number / currency / date formatters render in the engine's default locale (en-US), as the single-record confirmText fill does today; fillTemplateHoles takes no locale. Step 2 looks at this together with the param roots, since the engine reads its formatter locale from the same scope the roots are passed in.
  • ObjectGrid.tsx, ui/.github/** and the root ci.yml are not touched.

Generated by Claude Code

… run's record count

The bulk dialog printed an authored confirmText as written, so a template
slot's {{ count }} reached the person as braces. bulkConfirmText now fills
the slot over the protocol's bulk-confirm count root through core's
fillTemplateHoles (the shared template engine, whitelisted formatters, no
logic), keeping a hole-less sentence, the default sentence and a refused
source as they were. Param roots stay unbound at this step.

Claude-Session: https://claude.ai/code/session_016zsTRTJ3SP3dpjEkyLrzWS
Co-authored-by: Claude <noreply@anthropic.com>
@objectstack-fleet

Copy link
Copy Markdown
Contributor Author

席位核对

ACCEPT (step 1) · domain:ui seat 2 · session_01SMps7wq7rBTk53e8KTSEup · 2026-10-26T09:48Z · head b8e5134c

  1. 形态: draft → main, assigned to os-steve. The first content line is Part of #25942, which is correct because step 2 (the param roots) is still owed on this branch. The only other mention, the `Fixes #25942` PR, sits inside a code span, so it does not arm a close. Clause-②: no and Metadata-protocol: none lead their lines in both the body and the changeset.
  2. 前提实测: I read the diff at this head. bulkConfirmText returns bulkConfirmTextSource(...) unchanged when there is no source or no hole. Otherwise it fills through @object-ui/core fillTemplateHoles over { [BULK_CONFIRM_COUNT_ROOT]: rows.length }, where the root name is the spec's own constant (@objectstack/spec/ui; plugin-grid already depends on @objectstack/spec and @object-ui/core). The dialog keeps the default sentence whenever the helper returns undefined. The ruling's "nothing else moves" holds: there is no default-text change, no confirm-step move, and no CEL.
  3. 门禁 check-runs: none at this head. GitHub reports the PR as mergeable=false / dirty, so no pull_request run has started. Landing waits on a conflict-free head whose Lint & Repo Gates and TypeScript Type Check are success, with all other checks green. The dev's local union (plugin-grid 248/248 files, 46 derived families exit 0) covers only the local subset.
  4. 接受的偏差: bulkConfirmTextEnvelope-13183.test.tsx flips one dialog expectation from the braces printed as written to the filled count. That is the pin this card exists to flip, and it is inside the claimed surface ("their tests").
  5. 范围外去向: the formatter-locale question (the engine reads its locale from the same scope the roots ride in, so a param named locale would hijack it) belongs to step 2. The seat will rule on it when step 2 is dispatched. Step 1 binds only count, so it cannot hit that collision.
  6. 落地条款: no governed path, +167/−6, scripts/sdui-manifest.record.json re-recorded, root .changeset/ patch for @object-ui/plugin-grid. A merge of main that changes only the conflict resolution and the re-recorded manifest keeps this ACCEPT. The seat then lands via relay pr_ready + automerge_enable once the checks at the new head are green.

@github-actions github-actions Bot added size/m documentation Improvements or additions to documentation tooling labels Oct 26, 2026
@objectstack-fleet
objectstack-fleet Bot marked this pull request as ready for review October 26, 2026 10:21
@objectstack-fleet
objectstack-fleet Bot added this pull request to the merge queue Oct 26, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Oct 26, 2026
…-0ml7qr

# Conflicts:
#	scripts/sdui-manifest.record.json
@objectstack-fleet
objectstack-fleet Bot added this pull request to the merge queue Oct 26, 2026
os-zhuang pushed a commit that referenced this pull request Oct 26, 2026
… different packages stop conflicting (#26120)

<!-- claude-projects-attribution: {"github_login":"os-elon-musk"} -->
_Requested by **Elon** · [project
thread](https://claude.ai/code/project/chan_01WedDzV26nniwxv7jC88B9D?thread=cmsg_01WedDzV26nniwxv7jC88B9DPXV532seCFDcrkAJybGzsf)_

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 session
`session_01SMJGPXxFBpbgAgXdnsXKVS`.

## What changes

`scripts/sdui-manifest.record.json` carried ONE
`inTree.registrySourcesSha256` over the `src/` of all 27 ui registry
packages, so any two ui PRs that touched any registry package conflicted
on that line. Now:

- **One record per registry package**, one file each, one line each:
`scripts/sdui-manifest.sources/PACKAGE.json` =
`{"package","sources","sha256","manifestSha256"}` (the package's own
`src/` digest, its file count, and the sha256 of the artefact it was
verified against). 27 files.
- **The shared record** (`scripts/sdui-manifest.record.json`, same path)
keeps only what describes the artefact: `sha256`, `components`,
`generatedAt`, and `inTree` = `modulesRoot`, `objectuiWorkspaceVersion`,
`registryRecords` (the directory). The retired `registryPackages` /
`registrySources` / `registrySourcesSha256` are refused if they
reappear.
- **The reached package set** is the set of record files: a reached
package with no record (new package, new dependency edge into the
registry, deleted record) is RED; a record the registry no longer
reaches (removed package, dropped edge) is RED.
- `sdui.manifest.json` is byte-identical (sha256 `1f6e1ccb925a…`, 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/**` or `ui/.github/**` edit.

## Measured first (Ask 1): own `src/` per package, not
dependency-inclusive

Tree: 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 a `src/` edit would touch):

| package edited | own `src/` (this PR) | dependency-inclusive |
|:--|:-:|:-:|
| `types` | 1 | 25 |
| `core` | 1 | 21 |
| `data-objectstack`, `i18n` | 1 | 19 |
| `react`, `react-runtime`, `sdui-parser` | 1 | 18 |
| `components` | 1 | 17 |
| `fields` | 1 | 14 |
| `plugin-detail` | 1 | 10 |
| `plugin-form`, `plugin-grid` | 1 | 2 |
| the other 11 plugins | 1 | 1 |

**Merge 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 one `src/` file
and runs the generator.

| pair | before (single digest, on `0a6948210c`) | after (this PR, on
`a8114011`) |
|:--|:--|:--|
| `plugin-grid/src/FormulaBar.tsx` × `plugin-form/src/DrawerForm.tsx` |
exit 1, CONFLICT in `scripts/sdui-manifest.record.json` | exit 0, clean;
the merged tree passes `check-sdui-manifest` (exit 0) |
| `plugin-grid/src/FormulaBar.tsx` × `plugin-grid/src/ObjectGrid.tsx` |
(conflicts) | exit 1, CONFLICT in
`scripts/sdui-manifest.sources/plugin-grid.json` only, by design |

**The open ui PRs today** (registry packages each changes, non-test
`src/` only; none changes `sdui.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 is `i18n` (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)

`checkTreeWithoutPin` compares 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-sha` present) is untouched.

**Why `manifestSha256` is 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-form` or `core`; a new package the registry reaches; a new
workspace edge (now names `ui/packages/unrelated`); a removed package
(names `scripts/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 with `git diff HEAD` empty:

| guard removed | self-test |
|:--|:--|
| the other-artefact comparison (gate) | exit 1, row "a package record
verified against another artefact is RED" expected RED got GREEN |
| the one-line form comparison (gate) | exit 1, row "a package record
out of its one-line form is RED" |
| the unreached-record list (gate) | exit 1, row "a removed registry
package is RED naming its record" |
| the `generatedAt` carry (producer) | exit 1, row "the producer
re-records only the package whose sources moved": the second run changed
the shared record too |
| the per-package record write (producer) | exit 1, the two producer
rows |

## 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: `generatedAt` and 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.json` moved. 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 on `0a6948210c`, one
container, no remote cache (`TURBO_TOKEN` unset):

| run | wall | turbo |
|:--|:-:|:--|
| cold | 8m49s | 0 of 63 cached, 8m43s |
| nothing moved | 6s | 63 of 63 cached |
| one edit under `plugin-grid/src` | 33s | 61 of 63 cached, 27s |
| one edit under `core/src` | 2m50s | 41 of 63 cached, 2m44s |

## Readers 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 cover `scripts/sdui-manifest.sources/`. Its
`--self-test` passes (456 assertions).
- `scripts/ui-import/README.md` is 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.mjs` and 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`:

```sh
git merge origin/main                                   # conflict in scripts/sdui-manifest.record.json
git checkout --theirs scripts/sdui-manifest.record.json  # take main's layout
node scripts/gen-sdui-manifest-node.mjs                  # re-records only this PR's package(s)
git add scripts/sdui-manifest.record.json scripts/sdui-manifest.sources sdui.manifest.json
git commit
```

After that, PRs on different registry packages no longer conflict with
each other on the record.

## Gates

Local, on `a8114011` (derived with `node scripts/pm/dispatch-gates.mjs
--commands`): 39 of the 40 derived families exit 0, including `node
scripts/check-sdui-manifest.mjs --self-test` (29 cases) and `node
scripts/check-sdui-manifest.mjs`, `node
scripts/check-changeset-no-major.mjs --self-test` and `--base
origin/main`, `pnpm check:nul-bytes`, `pnpm check:watch-hint-literal`,
`pnpm check:required-contexts`, `pnpm check:doc-authoring` and `pnpm
--filter @objectstack/lint run check:doc-formula-expressions` (after the
lint closure build). `pnpm check:pm-dispatch-gates` was 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 root `scripts/`
(private), `docs/` and the records; `sdui.manifest.json` is
byte-identical and neither record is copied into
`packages/console/dist/` (the `check-changeset-no-major` real-build
assertion above).

Not Tier H: no governed path (`git diff --name-only` has no `.github/`,
`.claude/`, `docs/adr/`, `skills/`, `AGENTS.md`, `CLAUDE.md`).

## Acceptance notes

- `i18n` is the hot package: 5 of the 12 open ui PRs touch its `src/`,
so they still serialize on `scripts/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.
- The cold-cache cost of a regeneration (8m43s here) is a
fresh-container property; card threads run with no turbo remote cache.

---
_Generated by [Claude
Code](https://claude.ai/code/session_01SMJGPXxFBpbgAgXdnsXKVS)_

---------

Co-authored-by: Claude <noreply@anthropic.com>
…-0ml7qr

# Conflicts:
#	scripts/sdui-manifest.record.json
@objectstack-fleet
objectstack-fleet Bot marked this pull request as draft October 26, 2026 13:58
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Oct 26, 2026
@objectstack-fleet
objectstack-fleet Bot marked this pull request as ready for review October 26, 2026 14:41
@objectstack-fleet
objectstack-fleet Bot enabled auto-merge October 26, 2026 14:41
@objectstack-fleet
objectstack-fleet Bot added this pull request to the merge queue Oct 26, 2026
Merged via the queue into main with commit 6676991 Oct 26, 2026
62 checks passed
@objectstack-fleet
objectstack-fleet Bot deleted the claude/project-thread-0ml7qr branch October 26, 2026 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation size/m tooling

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants