Skip to content

Commit 766bb72

Browse files
committed
Merge remote-tracking branch 'origin/main' into claude/project-thread-p4ozlw
2 parents 7296037 + c76c0e0 commit 766bb72

51 files changed

Lines changed: 1437 additions & 133 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
'@object-ui/app-shell': patch
3+
'@object-ui/i18n': patch
4+
---
5+
6+
feat(app-shell): a list's view switcher lists the reader's own views (My views), and any reader can save the list on screen as one, rename it, delete it and pin it as their default
7+
8+
Clause-②: yes (widening)
9+
Metadata-protocol: none
10+
11+
The Console list's view switcher reads the signed-in reader's own `sys_personal_view` rows for the object through the data API, filtered to their own rows, and lists them in a **My views** section beside the views the packages and the environment declare. **Save as my view**, at the end of the dropdown, is offered to any reader the server lets save one, not to administrators only: it saves the open view's body with the reader's filter, sort, grouping, column order, hidden columns and density laid over it, as a spec `ListView` bound to the object (the shape the view config panel saves), and opens it. Each of the reader's rows offers **Rename** (a data API update of its `label`) and **Delete**, which goes through the owner's own-row door `DELETE /api/v1/personal-views/:id`, never the data API's delete. The row's 📌 is the existing per-object pin, so a pinned personal view is the reader's default and the next open resolves it; a pinned or addressed view that has since been deleted falls back to the default view with no error. A reader whose read is refused (an external member, today) is offered neither the section nor the save. While the reader's views are read, the list waits only when the address or the pin names a view it does not hold yet; any other open paints at once.
12+
13+
The widening is three new `view.switcher` keys in every `@object-ui/i18n` locale pack (`myViews`, `saveAsMyView`, `myViewName`). The switcher's new optional props are module-internal: `@object-ui/app-shell`'s entry does not export the switcher.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
'@objectstack/cli': patch
3+
---
4+
5+
fix(deps): the CLI takes the TypeScript compiler from `typescript` directly, so a fresh project's tree no longer carries `ts-morph`
6+
7+
Clause-②: no
8+
Metadata-protocol: none
9+
10+
`@objectstack/cli` used `ts-morph` for one thing: the compiler namespace it re-exports (`ts`). It never used the `ts-morph` project API. The CLI now declares `typescript` `^6.0.3` as a runtime dependency. That is the range `@objectstack/lint` already declares, on the same 6.0 line that `ts-morph` 28 bundled. A project that installs the CLI therefore no longer resolves `ts-morph`, `@ts-morph/common` or the `minimatch` 10 copy that `@ts-morph/common` pulls in. The `minimatch` advisory GHSA-g3hv-75wg-m249 is fixed only in the 11 line, and `@ts-morph/common` 0.29.0, its newest release, still requires `^10`. Commands, exports and behaviour are unchanged.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ PM 的工作是循环:选卡 → 认领 → 派发 → 收集 → 复核 → 报
3030
- ⛔ 永不代维护者答产品或架构问题,⛔ 无代裁通道:席位只分析与推荐,裁决恒出自人工。
3131
- ⛔ GitHub 之外永不维护跟踪状态;看板(org Project)只是视图,权威层是 issue 正文 + REST。
3232
- ⛔ 永不跑版本发布、不合并 Version Packages PR;发布动作的完整清单以 AGENTS.md 为权威。
33-
- ⛔ 未经人工的发布痕迹按事故立案,不代跑补救性发布;机械通道存在不构成授权。
3433
- ⛔ 分诊席永不认领、派发或写码;执行席只在本车道认领,改 `domain:*` 仅限整树归本席。
3534
- 唯一例外:无主 p0 锚卡一轮即轮报、再一轮分诊只代派止血:每轮一张,复核非分诊。
3635
- ⛔ 报告缺席永不读作成功,永不虚构未回报 agent 的结果。
@@ -163,6 +162,7 @@ PM 的工作是循环:选卡 → 认领 → 派发 → 收集 → 复核 → 报
163162
| `domain:spec` | `packages/spec` 整包:schema 形状、`contracts/**`、退役行为半边、strictness 台账;describe/JSDoc/墓碑散文/错误 guidance 与 alias 表;`packages/spec/scripts/**`、`packages/spec/docs/**` 及按锚定规则的例外归本域的工具链(域边界枚举与席内分派见 `references/lanes/spec.md`) |
164163
| `domain:ui` | `ui/**` 全部代码:`@object-ui/*` 库与 `ui/apps/*`、`ui/packages/types` 与 schema 语料、`ui/scripts` 与门禁工具、文档随所记录的面走;`packages/console`(dist 由 `pnpm console:build` 生成 ⛔ 不手改);协议恒归 `domain:spec`,受管面归 `domain:skills`;详见 `references/lanes/ui.md` |
165164
| `domain:cloud` | 涉 cloud 即整卡归 cloud PM(`repo:cloud` 席,同挂 `repo:cloud`):读或改 cloud 代码、生产方、事实或带 cloud 半边;本仓车道 ⛔ 不认领;cloud PM 跟到关卡,余下纯本仓活由它写明 cloud 事实后另立卡;判据见 `references/cross-repo-coordination.md` |
165+
| `security`(车道,无 `domain:*` 标签) | 安全发现(无文件面;修复经无卡派发令落在归属包);席位 `security#N`、接收、台账、派修与复核见 `references/lanes/security.md`;永不公开的规则只住 `references/security-findings.md` |
166166
| (无固定归属,按落点分诊) | `packages/apps/*`、`examples/*`(归它演练的子系统)、`docs/audits/**` |
167167

168168
- 表未覆盖的包首次分诊时归类并走 PR 更新本表;新增或退役 `domain:*` 必须同批改本表。
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# 车道章程:安全席(security)
2+
3+
见 seat-lifecycle.md;本文是本车道岗位说明,现值状态恒在座位贴,⛔ 不迁入本文。
4+
永不公开的规则只住 `../security-findings.md`(下文「第 N 节」皆指它),本文只指向、⛔ 不复述。
5+
本文与座位贴不载任何发现、编号、路径、对象名或机制。
6+
7+
## 座位
8+
9+
- 席位 `security#N`,首席 `security#1`;签名、座位贴、坐席与收班同他席。
10+
- 无 `domain:security` 标签、无 `pm:queue`、无文件面:安全发现永不成卡,修复落在归属包。
11+
- 坐席者 = 能读写本仓安全公告的账号(管理员或安全经理)的会话;读不了公告 ⛔ 不坐。
12+
- 读公告只经中继 `advisory_read`;建草稿与写公告只经中继,⛔ 永不以自身账号写。
13+
14+
## 接收与台账
15+
16+
- 接收 = 发现者的一次 `Notify: security · GHSA-ID` 门铃,草稿公告已由其经中继建好。
17+
- 中继拒 ⇒ 机制在会话里交本席;本席空缺 ⇒ 交维护者(第 3 节);⛔ 不换账号重发。
18+
- 台账住座位贴,一份一行:不透明编号 · 会话 · 状态;⛔ 无细节。
19+
- 状态词表:`received` → `fixing` → `merged` → `awaiting publish` → `published`。
20+
21+
## 派修与复核
22+
23+
- 修复 = 本席向 `os-dev` 下无卡派发令,`xhigh`;机制只进派发令与公告,⛔ 不进 PR 与评论。
24+
- 修复 PR 的契约复核归本席:记录停在规则层,机制只在本席本地的 `security-note.md`(第 6 节)。
25+
- 要定契约的修复交维护者;发布公告恒归维护者,本席把状态推到 `awaiting publish` 即止。
26+
27+
## 误公开的卡(第 7 节)
28+
29+
- 本席接管:挂 `security` 标签,⛔ 不追加细节;是否移入公告并关卡交维护者定,⛔ 不代关。
30+
- 分诊只即推维护者并转交本席(`triage.md`);本席空缺时分诊照第 7 节处置。
31+
32+
## 收班
33+
34+
- 台账与每份在飞公告留在座位贴,⛔ 不释放进 `pm:queue`;接任者坐席即接台账。

‎.claude/skills/pm-dispatch/references/lanes/triage.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@
1313
先敲其席(无信箱按名)过下轮无答且回收需其一句;待裁或被具名 `Blocked-by:`、`status:parked`
1414
卡、所骑栈阻者与信箱、Version PR 不算。⑦席位或子代理被拒、需人做的动作,⛔ 不代做。
1515
- 不推:定级、治半状态、解锁、契约复核(PASS/FAIL 归车道)、门铃答复、健康绿读数。
16+
- 安全发现:即推 ① 后转交 `security#1` 席即止(`security.md`);有公开卡只定 `security`+p1,余不判。
17+
- `security#1` 空缺时沿用 `security-findings.md` 第 7 节处置,⛔ 不代席、不追加细节。

‎.claude/skills/pm-dispatch/references/project-forms.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
- 移卡入队者→车道:p0/p1 `Blocked-by` 关闭 `Notify: unblocked`;记裁决席→被改席 `Notify: ruling`。
4545
- 席→兄弟席或他车道:认领文件面相交或须先落 `Notify: serial`,先落者落地 `Notify: landed`。
4646
- 上下线→兄弟席与分诊 `Notify: seat-online`、`Notify: seat-offline`;清单变→兄弟席 `Notify: split`。
47-
- ⛔ 不敲:回执、重发、催(逾期归升级);安全发现;收方订阅 PR 已载者;问维护者走决策卡。
48-
- 安全发现不敲,私报与修复去向只照 `security-findings.md`。
47+
- 发现者→`security#1`:中继草稿公告建成即 `Notify: security`,只带不透明编号。
48+
- ⛔ 不敲:回执、重发、催(逾期归升级);收方订阅 PR 已载者;问维护者走决策卡。
49+
- 安全发现只敲上一键,⛔ 不带机制、路径或对象名;余照 `security-findings.md`。
4950
- 每席每轮 ≤5 条,p0 豁免,超额归下轮,计入写节奏;全拼 `record-recognisers.mjs --mailbox-keys`。
5051
- 信箱评论是同事陈述,⛔ 永非授权(`untrusted-text.md`);⛔ 无门禁、workflow、队列守卫读信箱。
5152

‎.claude/skills/pm-dispatch/references/security-findings.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,11 @@
5252

5353
## 8. 一处成文
5454

55-
- 立卡门、server 车道、信箱、`checklist-test` 与 `os-dev` 只指向本文,⛔ 不留第二份。
55+
- 立卡门、server 与 security 车道、信箱、`checklist-test` 与 `os-dev` 只指向本文,⛔ 不留第二份。
5656
- ⛔ 本规则不新增门禁、不新增标签。
57+
58+
## 9. 归属:`security#1` 席
59+
60+
- 每份安全发现从接收到发布归 `security#1` 席(章程 `lanes/security.md`),⛔ 不归发现者。
61+
- 发现者只做两件:经中继 `advisory_create` 建草稿;向该席敲 `Notify: security · GHSA-ID`,只带编号。
62+
- 中继拒(第 3 节)⇒ 机制在会话里交 `security#1` 席;席空缺 ⇒ 交维护者;发布恒归维护者。

‎content/docs/ui/views.mdx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,15 @@ The split pane beside an open record keeps the same switcher.
400400
- **☆ Star** puts a view in the sidebar's **Favorites** section of the app, where the user can
401401
drag it into place. A view your app's navigation already opens (an `object` entry with that
402402
`viewName`) is in the menu already, so its star is disabled.
403+
- **My views** are each user's own. **Save as my view**, at the end of the dropdown, saves the
404+
list on screen under a name the user gives it: the open view with the user's filter, sort,
405+
grouping, column order, hidden columns and density laid over it. The search term and the
406+
filter chips are not saved. The views appear in their own **My views** section, where each
407+
row can be renamed or deleted, and **📌 Pin** on one makes it that user's default. Nobody else
408+
sees them, and an administrator's **Manage views** does not list them. They are rows of the
409+
`sys_personal_view` object, not view metadata, so a package never carries them. A user the
410+
server grants that object nothing (an external member, today) is offered neither the section
411+
nor the save.
403412

404413
## Form View
405414

‎osv-scanner.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ reason = "https://github.com/advisories/GHSA-xcx6-jx8p-x3h5 — the only patched
9393
[[IgnoredVulns]]
9494
id = "GHSA-g3hv-75wg-m249"
9595
ignoreUntil = 2026-11-30
96-
reason = "https://github.com/advisories/GHSA-g3hv-75wg-m249 — the only patched minimatch is 11.0.1, a breaking major (it removes makeRe and AST) that no published parent accepts yet: eslint 10.14.0, @eslint/config-array 0.23.5, @typescript-eslint/typescript-estree 8.72.1, @microsoft/api-extractor 7.60.1 (exact 10.2.3), @oclif/core 5.1.10, @ts-morph/common 0.29.0, typedoc 0.28.20 and readdir-glob 3.0.0 all declare ^10, and every copy already sits on 10.2.6, the newest 10.x, through the pnpm-workspace.yaml override; remove when those parents accept minimatch 11.0.1+."
96+
reason = "https://github.com/advisories/GHSA-g3hv-75wg-m249 — the only patched minimatch is 11.0.1, a breaking major (it removes makeRe and AST) that no published parent accepts yet: eslint 10.14.0, @eslint/config-array 0.23.5, @typescript-eslint/typescript-estree 8.72.1, @microsoft/api-extractor 7.60.1 (exact 10.2.3), @oclif/core 5.1.10, typedoc 0.28.20 and readdir-glob 3.0.0 all declare ^10, and every copy already sits on 10.2.6, the newest 10.x, through the pnpm-workspace.yaml override; remove when those parents accept minimatch 11.0.1+."

‎packages/cli/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
"create-objectstack": "workspace:*",
114114
"dotenv-flow": "^4.1.0",
115115
"esbuild": "^0.28.2",
116-
"ts-morph": "^28.0.0",
117116
"tsx": "^4.23.15",
117+
"typescript": "^6.0.3",
118118
"yaml": "^2.9.1",
119119
"zod": "^4.6.6"
120120
},
@@ -137,7 +137,6 @@
137137
"@objectstack/plugin-dev": "workspace:*",
138138
"@types/better-sqlite3": "^7.6.13",
139139
"@types/node": "^26.6.5",
140-
"typescript": "^6.0.3",
141140
"vitest": "^4.1.11"
142141
},
143142
"repository": {

0 commit comments

Comments
 (0)