merge(ui): objectui becomes the ui/ workspace of this repository — subtree import at the frozen tip 9e1fe03286 plus the adaptation series (objectstack#25752)

.changeset/config.json

@@ -80,13 +80,51 @@
       "@objectstack/account",
       "create-objectstack",
       "@objectstack/connector-openapi",
-      "@objectstack/verify"
+      "@objectstack/verify",
+      "@object-ui/app-shell",
+      "@object-ui/auth",
+      "@object-ui/cli",
+      "@object-ui/collaboration",
+      "@object-ui/components",
+      "@object-ui/console",
+      "@object-ui/core",
+      "@object-ui/create-plugin",
+      "@object-ui/data-objectstack",
+      "@object-ui/fields",
+      "@object-ui/i18n",
+      "@object-ui/layout",
+      "@object-ui/mobile",
+      "@object-ui/permissions",
+      "@object-ui/plugin-ai",
+      "@object-ui/plugin-calendar",
+      "@object-ui/plugin-charts",
+      "@object-ui/plugin-chatbot",
+      "@object-ui/plugin-dashboard",
+      "@object-ui/plugin-designer",
+      "@object-ui/plugin-detail",
+      "@object-ui/plugin-editor",
+      "@object-ui/plugin-form",
+      "@object-ui/plugin-gantt",
+      "@object-ui/plugin-grid",
+      "@object-ui/plugin-kanban",
+      "@object-ui/plugin-list",
+      "@object-ui/plugin-map",
+      "@object-ui/plugin-markdown",
+      "@object-ui/plugin-report",
+      "@object-ui/plugin-timeline",
+      "@object-ui/plugin-tree",
+      "@object-ui/plugin-view",
+      "@object-ui/providers",
+      "@object-ui/react",
+      "@object-ui/react-runtime",
+      "@object-ui/sdui-parser",
+      "@object-ui/types"
     ]
   ],
   "linked": [],
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": [],
+  "ignore": ["@object-ui/example-*", "@object-ui/site", "@object-ui/runner", "@object-ui/test-support"],
   "privatePackages": { "version": true, "tag": false }
 }

content/docs/protocol/backward-compatibility.mdx

@@ -116,7 +116,7 @@ Read the **Breaking?** column, not the version number: in the 17.x minors every
 1. **RFC (Request for Comments)** — Breaking changes are proposed as GitHub issues with the `protocol:breaking` label.
 2. **Deprecation** — The old behavior is deprecated in a MINOR release (see timeline above).
 3. **Migration Guide** — A detailed migration guide is published before the removal lands, in the release notes for the version that carries it.
-4. **Release** — In the 17.x minors the breaking change shipped in the next **MINOR** version, carrying a changeset entry marked `**BREAKING**`, and `scripts/check-changeset-no-major.mjs` failed a pull request that declared a `major` bump, because under lockstep one `major` would promote all 73 published packages. During the v18 prerelease it shipped in the next `18.0.0-next.N`, because the guard stood aside in pre mode and a pull request could declare a major bump. Changesets has exited pre mode, so the guard fails a `major` bump again. See [how a breaking stage lands on the v18 line](/docs/releases/v18#how-a-breaking-stage-lands-on-this-line).
+4. **Release** — In the 17.x minors the breaking change shipped in the next **MINOR** version, carrying a changeset entry marked `**BREAKING**`, and `scripts/check-changeset-no-major.mjs` failed a pull request that declared a `major` bump, because under lockstep one `major` would promote all 111 published packages. During the v18 prerelease it shipped in the next `18.0.0-next.N`, because the guard stood aside in pre mode and a pull request could declare a major bump. Changesets has exited pre mode, so the guard fails a `major` bump again. See [how a breaking stage lands on the v18 line](/docs/releases/v18#how-a-breaking-stage-lands-on-this-line).
 
 ---
 
@@ -196,7 +196,7 @@ The `@objectstack/spec` package provides additional stability guarantees:
 
 ### Which surfaces this covers
 
-**All of them.** It was not scoped to an experimental corner or a pre-release channel: all **73** packages published from this repository belong to a single Changesets `fixed` group, so they share one version number and one policy. No published surface was exempt.
+**All of them.** It was not scoped to an experimental corner or a pre-release channel: all **111** packages published from this repository belong to a single Changesets `fixed` group, so they share one version number and one policy. No published surface was exempt.
 
 The convention was enforced rather than informal — `scripts/check-changeset-no-major.mjs` failed a pull request that introduced a `major` bump, because under lockstep a single `major` on one package would promote the entire stack. During the v18 prerelease Changesets was in pre mode with the tag `next` and the guard stood aside, so a pull request on the v18 line could declare a major bump. Changesets has exited pre mode, and the guard fails a `major` bump again.
 

eslint.config.mjs

@@ -912,6 +912,30 @@ const NEVER_LINTED = Object.freeze([
   '**/.turbo/**',
 ]);
 
+// ───────────────────────────────────────────────────────────────────────────
+// Source trees linted by THEIR OWN flat config, not by this one. Global-only:
+// unlike NEVER_LINTED this is authored source, so it is not spread into the
+// per-object `ignores` below — the one global object removes it from this
+// config's population, and nothing here may ever start matching it by accident
+// of a `files` glob.
+//
+// `ui/**` is the objectui tree imported at the cutover (decision G1 on #25752,
+// verbatim 「17e · 17f · 17g · 同意」): `ui/eslint.config.js` lints it, the
+// `Lint UI` CI job runs that config, and the two configs converge in the
+// aftercare card #25753. Census of what this one line stops, measured over the
+// merged tree on the verify branch (9e37acd126, `pnpm lint` exactly as
+// package.json spells it): 121 errors and 16,511 warnings, every one of them
+// under `ui/**` (dominant rule `react-hooks/static-components`, then
+// `react-hooks/purity`, `no-restricted-imports`,
+// `@typescript-eslint/no-empty-object-type`, `no-console`). Outside `ui/` the
+// population this config lints is byte-for-byte the pre-import one, so its
+// verdict there does not move. Delete the entry in the PR that adopts this
+// config across `ui/` — never by widening a per-object `ignores` instead.
+// ───────────────────────────────────────────────────────────────────────────
+const LINTED_BY_OWN_CONFIG = Object.freeze([
+  'ui/**',
+]);
+
 export default [
   // ───────────────────────────────────────────────────────────────────────────
   // GLOBAL ignore. This is the ONLY object in this array with no `files` key,
@@ -965,7 +989,7 @@ export default [
   // either of them becoming the next `.next`. See #12334 / #12304.
   // ───────────────────────────────────────────────────────────────────────────
   {
-    ignores: [...NEVER_LINTED],
+    ignores: [...NEVER_LINTED, ...LINTED_BY_OWN_CONFIG],
   },
   {
     files: ['**/*.{ts,tsx,mts,cts,js,jsx,mjs,cjs}'],

packages/client/src/envelope-caller-census.test.ts

@@ -105,8 +105,13 @@
  *    ships to consumers no repo sweep can see; the changeset carries their
  *    migration. This census bounds the first-party population only.
  *  - **`objectui` is a RECORDED constant, not a live scan.** A test in this
- *    repo cannot read that checkout. `OBJECTUI_CENSUS` carries the revision it
- *    was measured at and the command that reproduces it.
+ *    repo could not read that checkout. Since objectui was imported under `ui/`
+ *    (objectstack#25803) it can, but the walk still skips the top-level `ui/`:
+ *    reading it would make `ui/**` an input of `@objectstack/client#test`,
+ *    and ci.yml's `crosspkg` filter does not cover that path yet
+ *    (`check-ci-filter-parity`). `OBJECTUI_CENSUS` is re-recorded at the
+ *    imported revision, and the live scan returns with the card that adds the
+ *    path to that filter.
  *  - **The ratchet in section 3 is only as live as turbo's cache — for the
  *    trees still undeclared.** This suite walks the whole workspace, while
  *    `@objectstack/client#test` declares as inputs its own package plus the
@@ -199,9 +204,18 @@ interface Site {
     index: number;
 }
 
+/**
+ * [#25803] Top-level directories of THIS repository the walk does not enter:
+ * the imported objectui tree, recorded as `OBJECTUI_CENSUS` instead (see the
+ * header). Matched at the repository root only, never as a name at any depth
+ * the way `SKIP_DIRS` is: `packages/spec/src/ui` is this census's own ground.
+ */
+const SKIP_TOP_LEVEL = new Set(['ui']);
+
 function walk(dir: string, acc: string[] = []): string[] {
     for (const entry of readdirSync(dir)) {
         if (SKIP_DIRS.has(entry)) continue;
+        if (dir === REPO_ROOT && SKIP_TOP_LEVEL.has(entry)) continue;
         const p = join(dir, entry);
         let st;
         try { st = statSync(p); } catch { continue; }
@@ -566,41 +580,31 @@ const LEDGER: readonly LedgerRow[] = [
 ];
 
 /**
- * `objectui` @ b84dc1854922c266850d6e573daf3ad59cbd0623 (origin/main,
- * 2026-08-31). Recorded, not live-scanned — a test here cannot read that
- * checkout. Reproduce with `OBJECTUI_CENSUS_COMMAND`.
- *
- * ⭐ The single production call site in either reachable repo, and it SURVIVES
- * the convergence untouched. `aggregate()` feeds the resolved value through a
- * tolerant chain that accepts both spellings:
- *
- *     const rawRows = Array.isArray(data) ? data
- *       : data?.rows        && Array.isArray(data.rows)        ? data.rows        // post-#13079: this branch
- *       : data?.data        && Array.isArray(data.data)        ? data.data
- *       : data?.data?.rows  && Array.isArray(data.data.rows)   ? data.data.rows   // pre-#13079: this branch
- *       : data?.results     && Array.isArray(data.results)     ? data.results
- *       : [];
+ * `objectui` @ 9e1fe032866965c7cb0460cff2b6af09350236b7, the revision imported
+ * under `ui/` (objectstack#25803; first recorded at b84dc18549, 2026-08-31).
+ * Recorded, not live-scanned: the walk skips `ui/` (see the header). Reproduce
+ * with `OBJECTUI_CENSUS_COMMAND`; the file count is the walk's own rule applied
+ * to the tracked `ui/` tree.
  *
- * Before #13079 branch 4 matched; after it branch 2 matches. ⚠️ It survives
- * by DEFENSIVE CODING, not by a designed migration path — the adapter was
- * written tolerant because the producer was ambiguous, which is the shape a
- * contract-first fix removes rather than relies on. Ruling item 3: objectui#7028
- * tightens the chain to the single post-unwrap spelling, time-gated behind
- * this convergence landing and objectui taking the SDK version — the chain is
- * load-bearing until then, so it is deliberately NOT part of this change.
+ * ⭐ The single production call site in either tree. `aggregate()` used to feed
+ * the resolved value through a tolerant chain that accepted both the
+ * pre-#13079 envelope and the post-unwrap `AnalyticsResult`. objectui#7028, the
+ * tightening this record named as owed, has landed: the adapter reads `rows`
+ * off the post-unwrap result and throws `AnalyticsResultShapeError` on any
+ * other shape, so it is payload-dependent and reads no envelope.
  */
 const OBJECTUI_CENSUS = {
-    revision: 'b84dc1854922c266850d6e573daf3ad59cbd0623',
-    filesScanned: 4024,
+    revision: '9e1fe032866965c7cb0460cff2b6af09350236b7',
+    filesScanned: 7954,
     sdkCallSites: 1,
     productionCallSites: 1,
     wouldBreak: 0,
-    site: 'packages/data-objectstack/src/index.ts:4846 (analytics.query, via this.client)',
+    site: 'ui/packages/data-objectstack/src/index.ts:6625 (analytics.query, via this.client)',
     tighteningOwner: 'objectui#7028',
 } as const;
 
 const OBJECTUI_CENSUS_COMMAND =
-    "git -C <objectui> grep -nE 'analytics\\s*\\.\\s*(query|meta|explain)\\s*\\(|automation\\s*\\.\\s*trigger\\s*\\(' origin/main -- '*.ts' '*.tsx' '*.js'";
+    "git grep -nE 'analytics\\s*\\.\\s*(query|meta|explain)\\s*\\(|automation\\s*\\.\\s*trigger\\s*\\(' HEAD -- 'ui/*.ts' 'ui/*.tsx' 'ui/*.js'";
 
 /**
  * ⛔ `objectstack-ai/cloud` is NOT MEASURED — see the header. Post-#13079
@@ -819,6 +823,9 @@ describe('#13079 §3 — every call site is classified', () => {
         // The three above are LEDGER sums and cannot move on a census reading;
         // this one is census-derived, so it carries the note. [#13874]
         expect(sdkSites.length, literalNote()).toBe(28);
+        // [#25803] 28 -> 29 first-party SDK sites since the objectui import: the
+        // walk's 28 plus the recorded objectui one, which it does not enter.
+        expect(sdkSites.length + OBJECTUI_CENSUS.sdkCallSites, literalNote()).toBe(29);
     });
 });
 
@@ -859,7 +866,11 @@ describe('#13079 §5 — what was NOT measured', () => {
         expect(OBJECTUI_CENSUS.wouldBreak).toBe(0);
         expect(OBJECTUI_CENSUS.revision).toMatch(/^[0-9a-f]{40}$/);
         expect(OBJECTUI_CENSUS.tighteningOwner).toBe('objectui#7028');
-        expect(OBJECTUI_CENSUS_COMMAND).toContain('origin/main');
+        expect(OBJECTUI_CENSUS.site.startsWith('ui/')).toBe(true);
+        expect(OBJECTUI_CENSUS_COMMAND).toContain("'ui/*.ts'");
+        // [#25803] And the walk really does not enter it, so the record is the
+        // only reading of that tree here.
+        expect(CENSUS.sites.some((s) => s.file.startsWith('ui/'))).toBe(false);
     });
 
     it('⛔ cloud is NOT MEASURED, ruled so, and must not be read as clean', () => {

patches/@radix-ui__react-focus-scope.patch

@@ -0,0 +1,50 @@
+diff --git a/dist/index.js b/dist/index.js
+index e8906db3b1e87bfc568b75d72b7ed3d8d1d3c09a..7a05e0e4cffba466301ba1fb67067c0861af0a4d 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -110,6 +110,10 @@ var FocusScope = /* @__PURE__ */ React.forwardRef(
+     }, [trapped, container, focusScope.paused]);
+     React.useEffect(() => {
+       if (container) {
++        if (focusScope.__pendingStackRemove !== void 0) {
++          clearTimeout(focusScope.__pendingStackRemove);
++          focusScope.__pendingStackRemove = void 0;
++        }
+         focusScopesStack.add(focusScope);
+         const previouslyFocusedElement = document.activeElement;
+         const hasFocusedCandidate = container.contains(previouslyFocusedElement);
+@@ -126,7 +130,8 @@ var FocusScope = /* @__PURE__ */ React.forwardRef(
+         }
+         return () => {
+           container.removeEventListener(AUTOFOCUS_ON_MOUNT, onMountAutoFocus);
+-          setTimeout(() => {
++          focusScope.__pendingStackRemove = setTimeout(() => {
++            focusScope.__pendingStackRemove = void 0;
+             const unmountEvent = new CustomEvent(AUTOFOCUS_ON_UNMOUNT, EVENT_OPTIONS);
+             container.addEventListener(AUTOFOCUS_ON_UNMOUNT, onUnmountAutoFocus);
+             container.dispatchEvent(unmountEvent);
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 030ff1a4d2383c9a0a1ba850aa4591890f028784..3dd39a90db9886bc495014a6e4136773e3548448 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -75,6 +75,10 @@ var FocusScope = /* @__PURE__ */ React.forwardRef(
+     }, [trapped, container, focusScope.paused]);
+     React.useEffect(() => {
+       if (container) {
++        if (focusScope.__pendingStackRemove !== void 0) {
++          clearTimeout(focusScope.__pendingStackRemove);
++          focusScope.__pendingStackRemove = void 0;
++        }
+         focusScopesStack.add(focusScope);
+         const previouslyFocusedElement = document.activeElement;
+         const hasFocusedCandidate = container.contains(previouslyFocusedElement);
+@@ -91,7 +95,8 @@ var FocusScope = /* @__PURE__ */ React.forwardRef(
+         }
+         return () => {
+           container.removeEventListener(AUTOFOCUS_ON_MOUNT, onMountAutoFocus);
+-          setTimeout(() => {
++          focusScope.__pendingStackRemove = setTimeout(() => {
++            focusScope.__pendingStackRemove = void 0;
+             const unmountEvent = new CustomEvent(AUTOFOCUS_ON_UNMOUNT, EVENT_OPTIONS);
+             container.addEventListener(AUTOFOCUS_ON_UNMOUNT, onUnmountAutoFocus);
+             container.dispatchEvent(unmountEvent);