Merge remote-tracking branch 'origin/main' into claude/project-thread-6djfn0

Author: claude

.changeset/25711-console-built-in-workspace.md

@@ -0,0 +1,15 @@
+---
+'@objectstack/console': patch
+'@objectstack/cli': patch
+---
+
+build(console): `@objectstack/console` is built in this workspace from `ui/apps/console`, and the Console no longer arrives through a pinned objectui commit
+
+Clause-②: no
+Metadata-protocol: none
+
+- **The package.** `@objectstack/console` ships the same `dist/` it shipped at 18.1.0: the built Console (`index.html`, `assets/`, the manifests it served). Two files leave the tarball: `dist/.objectui-sha`, which named the objectui commit the Console was built from, and `dist/.objectstack-injection.json`, which recorded the spec and client dists injected into that build. Both described a pin that no longer exists: the Console is built from the `ui/` tree of the same commit as the framework, so its version is the framework's version.
+- **The CLI.** When a framework checkout has no built Console, `objectstack serve` / `objectstack dev` and the 503 at `/_console/` now name `pnpm console:build`, which builds `ui/apps/console` and copies its dist into `packages/console`. The remedy used to be `pnpm objectui:build`, which cloned objectui at the pinned commit.
+- **One version.** The `@object-ui/*` packages and the private VS Code extension join the `@objectstack/*` fixed group, so every public package of both scopes publishes at one version and the extension ships at it.
+
+What to do: nothing as a consumer; install `@objectstack/console` as before. In a framework checkout, run `pnpm console:build` where you ran `pnpm objectui:build`.

.changeset/25786-grouping-order-by.md

@@ -0,0 +1,16 @@
+---
+'@objectstack/spec': minor
+'@objectstack/lint': minor
+---
+
+feat(spec,lint): a list-view grouping level can order its groups by another field (`grouping.fields[].orderBy`)
+
+Clause-②: yes
+Metadata-protocol: added
+
+- **Before.** A grouping level ordered its groups only by its own key. A period label grouped as text (`Nov 2026`, `Oct 2026`, `Q1 2027`, `Q4 2025`), so putting periods in time order took a second, outer grouping level on the period start, which showed two header rows for every group.
+- **Now.** `GroupingFieldSchema` gains `orderBy`, the name of a field on the same object whose value orders this level's groups: `{ field: 'period_label', orderBy: 'period_start', order: 'desc' }`. When it is absent, or names the grouping field itself, the groups order by their own key as before. Nothing is defaulted in.
+- **What the header query carries.** The consumer still sorts the header rows. `compileListViewGroupQuery` now adds the value to sort by: one `min` node over `orderBy` for `order: 'asc'`, or one `max` node for `'desc'`, under `min_<field>` / `max_<field>`. Each group sits where its first row would sit if the rows were sorted by `orderBy` in `order`. The grouping key stays the only `groupBy` column, so there is one header per label. A column summary that already declares the same `min` is the same node and the same column. In a multi-level grouping the outer level's value folds exactly from the leaf rows (the `min` of mins, the `max` of maxes).
+- **`listViewGroupOrderColumn(grouping, level)`** (`@objectstack/spec/ui`) names the header-row column a level sorts by: the grouping field itself, or the order node's alias. A consumer reads this instead of rebuilding the alias. A group whose order value is `null` sorts last in both directions, and equal values fall back to the group key in the same direction.
+- **Refused, at compile and at authoring.** An empty `orderBy` is refused by the schema (`too_small`), and a padded one, whitespace-only included, by name, as a padded `field` is, because the name is compiled verbatim. The compiler refuses a blank one in-process (`grouping_order_by_blank`, `INVALID_QUERY` / 400). An order alias that lands on a grouped field's own column is `alias_collision`. `os validate`, `os build` and the runtime save door judge `orderBy` the way the server doors do. An unknown name is `list-view-field-unknown`. A dotted path is `list-view-field-dotted`, because the header query compiles no join. A field whose type `min` / `max` cannot order on every backend is the new `list-view-group-order-unorderable` (`error`). That covers the string classes, whose order depends on the collation, the virtual `formula`, and every other type outside the numeric, temporal and boolean classes. Each of these is refused `400 INVALID_FIELD` on the server, so the grouped view would render no group: an unknown or dotted name by the data door's ingress (`findData`), and an unorderable type by `engine.aggregate`'s type door.
+- **Unchanged.** `order` and `collapsed` keep their meaning and defaults. The row page query (`compileListViewGroupRowsQuery`) does not change. `EngineAggregateOptions` gains no `orderBy`, because the group sort stays the consumer's. That sort is right only over the whole header set, which is what the compiler asks for: a `limit` on the header query is sliced by `findData` before any sort, so a paged header set honours neither `order` nor `orderBy`, the limit already recorded on `GroupingConfigSchema`. The new key is purely additive, so a grouping declared today compiles to exactly the same query.

.changeset/config.json

@@ -80,13 +80,52 @@
       "@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",
+      "object-ui"
     ]
   ],
   "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 }
 }

.claude/skills/pm-dispatch/SKILL.md

@@ -135,9 +135,8 @@ PM 的工作是循环:选卡 → 认领 → 派发 → 收集 → 复核 → 报
 - `Blocked-by:` 行是机器可 grep 的反向索引,一遍读喂三个职责,⛔ 只做第一件。
 - 三职责:上游关单放回解锁卡;按解锁扇出排序;在合并后的 ref 上重验回队卡文件面。
 - 一个标签存在当且仅当有具名读者;`pm:blocking` 即其推导缓存,读者以词表脚本注为权威。
-- 跨仓解锁判据是消费方可安装,⛔ 不是上游已合并。
+- 跨仓解锁判据是消费方可安装,⛔ 不是上游已合并;探针:装上的包是否接受新键/新行为。
 - 以发布包消费上游的仓,解锁放回前先验修复已进可安装的发行版。
-- 安装面探针:装上的包是否接受新键/新行为。
 - 未发版 ⇒ 转 `pm:on-hold` + `Restart-when:` 加消费方安装面判据,⛔ 不回 `pm:queue`。
 - 该 hold 评论预写唤醒后的派发形状;pin 消费的仓不适用:pin 移动即可安装,走 pin 滞后读数。
 - 状态变更不过夜:标签无评论、assignee 无认领评论、结论只在 chat,都是半状态。
@@ -183,6 +182,7 @@ PM 的工作是循环:选卡 → 认领 → 派发 → 收集 → 复核 → 报
 - 路径面用 `get_files` 取,⛔ 不看报告自述;动手之前先分,不是事后对照。
 - governed 面统一定义:`docs/adr/**`+`.claude/**`(全量)+`skills/**`+`docs/NORTH-STAR.md`+`.github/workflows/**`。
 - governed 面同含 `AGENTS.md`+`CLAUDE.md`;`GOVERNED_REPOS` 同治理、行可限仓,执行席恒随落地仓车道。
+- 另含 `ui/docs/adr/**`+`ui/.claude/**`+`ui/skills/**`+`ui/AGENTS.md`+`ui/CLAUDE.md`+`ui/.github/workflows/**`。
 - 路径面命中 Tier H ⇒ ACCEPT 换终局四件套,混合 diff ⛔ 不按比例判;要拆让 dev 单独开 PR。
 - 改动 >3000 行(含生成物)同换终局四件套,⛔ 无 Tier S 例外;读数 = PR additions+deletions。
 - ① 席位记录一条落 PR,两层同欠:Tier H 置顶速读五段,其下 `## 席位核对`;卡只留指针行。

.claude/skills/pm-dispatch/references/platform-readings.md

@@ -387,9 +387,9 @@
 - 本车道强制多是过宽的回忆:`dispatch-gates.mjs --tier PATH` 逐路径现推,路径线是下限非放行。
 - 该脚本只答自己那棵树:姊妹仓路径回 absent from this tree,姊妹仓的档位与条款②只能手推。
 - `os-verify-lock.sh` 只住 objectstack:objectui 无它,跑本仓副本读的是容器级锁,非该仓深度。
-- required checks 的名单是每仓事实,objectstack 五个:
-  `TypeScript Type Check` · `Lint & Repo Gates` · `Test Core` ·
-  `Build Core` · `Governed Surface Queue Guard`。
+- required checks 的名单是每仓事实,objectstack 七个:
+  `TypeScript Type Check` · `Lint & Repo Gates` · `Test Core` · `Build Core` ·
+  `Governed Surface Queue Guard` · `Lint UI` · `Build & E2E UI`。
 - ⭐ 本表的 `mustName` 声明 `statesTheSet` ⇒ 必须逐字等于注册表,加注册行不跟改本表即红。
 - ⇒ 门绿即名单逐字齐全的读数;⛔ 但数量词未钉:实测 七→六 照绿,只能手跟改。
 - ⛔ 聚合命令同样不作判定:`check:type-check-debt` 可在包级 typecheck 绿时红。

.github/CODEOWNERS

@@ -46,6 +46,15 @@
 /docs/NORTH-STAR.md @os-zhuang @hotlong
 /.github/workflows/ @os-zhuang @hotlong
 
+# Tier H governed surfaces of the nested `ui/` workspace (#25712) — the same
+# register rows, under `ui/`; `ui/.claude/` is Tier H, unlike the root tree
+/ui/docs/adr/ @os-zhuang @hotlong
+/ui/.claude/ @os-zhuang @hotlong
+/ui/skills/ @os-zhuang @hotlong
+/ui/AGENTS.md @os-zhuang @hotlong
+/ui/CLAUDE.md @os-zhuang @hotlong
+/ui/.github/workflows/ @os-zhuang @hotlong
+
 # The enforcement chain
 /.github/CODEOWNERS @os-zhuang @hotlong
 /scripts/pm/check-governed-merges.mjs @os-zhuang @hotlong