openxiangda-cli 2.0.0-alpha.85 → 2.0.0-alpha.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.85",
+  "version": "2.0.0-alpha.89",
   "description": "Thin application-level CLI for OpenXiangda 2.0.",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
   ],
   "dependencies": {
     "@oclif/core": "4.13.3",
-    "openxiangda-contracts": "2.0.0-alpha.39",
-    "openxiangda-devkit-core": "2.0.0-alpha.52",
-    "openxiangda-mcp": "2.0.0-alpha.52"
+    "openxiangda-contracts": "2.0.0-alpha.43",
+    "openxiangda-devkit-core": "2.0.0-alpha.56",
+    "openxiangda-mcp": "2.0.0-alpha.56"
   },
   "devDependencies": {
     "tsx": "4.23.12",

package/template/AGENTS.md

@@ -7,13 +7,13 @@
 - Ordinary list/get/create/update/delete, filters, export and batch operations use the platform Native Data API. Do not create Function CRUD or NestJS wrappers.
 - Add NestJS only for a named business action that needs a cross-resource transaction, an invariant or an external side effect.
 - A NestJS backend declares only `enabled`, `isolation: 'shared' | 'dedicated'` and `resourceProfile: 'light' | 'standard'`. Never put raw Kubernetes resources, replicas, ports or environment maps in application metadata; the platform owns capacity and scaling.
-- Use the current logged-in user and the union of application roles. Do not select RoleSession, persist platform Token or implement a second authorization path.
+- Use the current logged-in user and the union of that user's application roles. The generated shell automatically carries the platform's opaque authorization context for Data, Directory and App API requests. Business code must not read or persist that identifier, a platform Token, or authorization results, and must not implement a second identity path.
 - Fields inherit the resource read/create/update capabilities. Use field `access` only to tighten them; arrays are all-of and `false` is explicit deny. There is no `write` fallback.
-- Field storage types are exactly `string`, `text`, `integer`, `decimal`, `boolean`, `date`, `datetime`, `uuid`, `json` and `file`; there is no `number` type.
+- Field `type` is semantic, never a hand-authored database type. The supported catalog is exactly `text.short`, `text.long`, `text.rich`, `number.integer`, `number.decimal`, `boolean`, `date`, `time`, `datetime`, `date-range`, `datetime-range`, `option.single`, `option.multiple`, `cascade.single`, `cascade.multiple`, `user.single`, `user.multiple`, `department.single`, `department.multiple`, `resource-ref.single`, `resource-ref.multiple`, `file`, `image`, `signature`, `address`, `location`, `json`, `serial-number`, `uuid` and `subtable`. The compiler alone derives PostgreSQL columns, constraints and indexes.
 - Declare every custom operation capability in `authz.capabilities` with `kind: 'backend'`, then reference that same code from the operation and its allowed roles. Generated resource CRUD capabilities do not go in this catalog.
 - Visitor duplicate protection uses `createVisitorReservation({ duplicateMatch: { fieldCode: submittedValue }, ... })`. `duplicateMatch` is a non-empty value map, never a field-name array, and no mutable pre-read is allowed.
-- Desktop and mobile pages share values, validation and authorization, but use separate renderers. Members, departments, resources and attachments use platform-owned selectors and stable IDs.
-- A single directory user reference uses a `string` field; a single department or same-app resource reference uses `uuid`; every `multiple: true` reference uses `json`. Roles that consume directory-backed fields explicitly include `app:<app-code>:directory:read`.
+- Desktop and mobile pages share values, validation and authorization, but use separate renderers. Options, members, departments and resource references store their complete display snapshots; attachments, images and signatures use platform-managed file references.
+- `option.*`, `user.*`, `department.*` and `resource-ref.*` values never collapse to scalar IDs. Single values store one labeled snapshot and multiple values store snapshot arrays. `location` accepts only exact WGS84 coordinates captured by DingTalk or browser geolocation; it has no manual input or `manual` source. Roles that consume directory-backed fields explicitly include `app:<app-code>:directory:read`.
 - Derive role grants with `resourceCapabilityCodes(appCode, resourceCode)`. Declare current-user rows only with `currentUserDataPolicy(...)`; do not invent operators, values or alternate current-user spellings.
 - Do not add compatibility aliases, migration branches or silent fallbacks for an earlier 2.0 alpha contract. Replace an incorrect contract and regenerate the application.
 - Run `pnpm openxiangda check` after contract changes. Deploy with `pnpm openxiangda deploy`, inspect with `pnpm openxiangda status` and `pnpm openxiangda logs`, and use the platform rollback command rather than mutating K3s directly.

package/template/README.md

@@ -8,13 +8,13 @@ pnpm openxiangda dev
 
 当前应用已经把 CLI 和全部 2.0 包精确锁定在 `package.json` 与 lockfile 中。创建另一个应用时使用当前安装的 OpenXiangda 2.0 Skill 给出的精确 CLI 版本，不使用 `latest`、`alpha` 或全局命令。
 
-在 `openxiangda.config.ts` 的 `data.resources` 中只声明资源 `code`、`name`、`fields` 和可选列表/布局/数据策略。每个字段一次写完 type、label、required、列表/筛选标记、reference/file 与 access；不要再写 `schema`、`surface`、资源 capabilities、资源 fieldPolicies 或 `platform/data` 模块。编译器据此生成标准后台列表、筛选、表单、详情、审计、文件上传、独立移动端页面和 AI Schema。
+在 `openxiangda.config.ts` 的 `data.resources` 中只声明资源 `code`、`name`、`fields` 和可选列表/布局/数据策略。每个字段一次写完语义 `type`、`label`、`required`、列表/筛选标记、`options`/`source`/`file` 与 `access`；不要再写 `schema`、`surface`、PostgreSQL 类型、资源 capabilities、资源 fieldPolicies 或 `platform/data` 模块。编译器据此生成标准后台列表、筛选、表单、详情、审计、文件上传、独立移动端页面、Data API 查询计划和 AI Schema。
 
-成员、部门和资源关系分别使用 `reference: { kind: 'directory-user' }`、`directory-department`、`resource`，只保存稳定 ID，不复制目录数据。单选成员字段使用 `string`，单选部门和资源引用使用 `uuid`，多选引用统一使用 `json`。需要目录选择器的业务角色必须显式拥有 `app:<app-code>:directory:read` 能力。用 `resourceCapabilityCodes` 生成资源 CRUD 权限，用 `currentUserDataPolicy` 声明唯一的当前用户行规则。
+成员、部门分别声明 `user.single`/`user.multiple` 和 `department.single`/`department.multiple`；同应用动态资源声明 `resource-ref.single`/`resource-ref.multiple` 及编译期固定的 `source`。这些字段都保存完整 `{label,value,...}` 显示快照，资源引用还保存 `resourceCode` 和声明的 `snapshot` 字段；查询和权限以稳定 `value` 为比较键。需要目录选择器的业务角色必须显式拥有 `app:<app-code>:directory:read` 能力。用 `resourceCapabilityCodes` 生成资源 CRUD 权限，用 `currentUserDataPolicy` 声明唯一的当前用户行规则。
 
-所有 CRUD 位于 `apps/web/src/platform-client.ts` 的 Data API adapter；Nest 只在需要复杂事务或外部集成时增加 App API。选择器显式携带当前环境、使用同源 Cookie，浏览器不读取 Token，也不发送 RoleSession header。
+所有 CRUD 位于 `apps/web/src/platform-client.ts` 的 Data API adapter；Nest 只在需要复杂事务或外部集成时增加 App API。选择器显式携带当前环境、使用同源 Cookie。标准客户端在内存中恢复平台 RoleSession，并自动为 Data、Directory、文件和 App API 请求携带 header；业务代码不读取或持久化 Token、RoleSession 标识与授权结果。
 
-前端读取平台 current-user 的角色/能力并集进行展示保护，服务端始终权威。字段默认继承资源 read/create/update；`access` 数组为 all-of，`false` 为明确拒绝，无权字段在提交前从 payload 删除。
+前端读取当前单一应用角色和 capability 做展示保护；多角色用户从当前应用个人菜单切换，切换后页面、数据和操作上下文整体替换，不做权限并集。服务端始终权威。字段默认继承资源 read/create/update；`access` 数组为 all-of，`false` 为明确拒绝，无权字段在提交前从 payload 删除。
 
 ```bash
 pnpm openxiangda check

package/template/apps/server/package.json

@@ -15,7 +15,7 @@
     "@nestjs/common": "11.1.29",
     "@nestjs/core": "11.1.29",
     "@nestjs/platform-fastify": "11.1.29",
-    "openxiangda-nest": "2.0.0-alpha.48",
+    "openxiangda-nest": "2.0.0-alpha.52",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.2"
   },

package/template/apps/server/src/app.module.ts

@@ -1,5 +1,13 @@
 import { Module } from '@nestjs/common';
-import { OpenXiangdaModule } from 'openxiangda-nest';
+import {
+  eventHandlerManifest,
+  eventSchemas,
+  eventSubscriptionCodes,
+} from '@app/contracts';
+import {
+  OpenXiangdaModule,
+  eventSigningSecretsFromEnvironment,
+} from 'openxiangda-nest';
 
 @Module({
   imports: [
@@ -24,6 +32,11 @@ import { OpenXiangdaModule } from 'openxiangda-nest';
       version: process.env.OPENXIANGDA_APP_VERSION || '0.1.0-dev',
       connectedDevelopment:
         process.env.OPENXIANGDA_CONNECTED_DEV === 'true',
+      eventHandlerManifest,
+      eventSchemas,
+      eventSigningSecrets: eventSigningSecretsFromEnvironment(
+        eventSubscriptionCodes
+      ),
     }),
   ],
 })

package/template/apps/server/test/smoke.test.ts

@@ -6,9 +6,11 @@ test('the clean server template only owns platform bootstrap', () => {
   const source = readFileSync(new URL('../src/app.module.ts', import.meta.url), 'utf8');
   const main = readFileSync(new URL('../src/main.ts', import.meta.url), 'utf8');
   assert.match(source, /OpenXiangdaModule\.forRoot/);
+  assert.match(source, /eventHandlerManifest/);
+  assert.match(source, /eventSigningSecretsFromEnvironment/);
   assert.match(main, /bootstrapOpenXiangdaApplication\(AppModule\)/);
   assert.doesNotMatch(main, /NestFactory|FastifyAdapter/);
-  const legacyMarkers = ['oauth' + 'Client', 'event' + 'Signing', 'Workflow', 'instrument' + '-context'];
+  const legacyMarkers = ['oauth' + 'Client', 'Workflow', 'instrument' + '-context'];
   assert.doesNotMatch(source, new RegExp(legacyMarkers.join('|')));
   assert.doesNotMatch(source, /createData|updateData|deleteData|queryData/);
 });

package/template/apps/web/data-api-live.e2e.html

@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="openxiangda-runtime-base" content="/" />
+    <meta name="openxiangda-app-code" content="native-projection-app" />
+    <meta name="openxiangda-environment" content="production" />
+    <title>OpenXiangda Standard Data API Live Acceptance</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/e2e/data-api-live-fixture.tsx"></script>
+  </body>
+</html>

package/template/apps/web/e2e/data-api-live-fixture.tsx

@@ -0,0 +1,141 @@
+import { Refine } from '@refinedev/core';
+import { App as AntdApp } from 'antd';
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import { createApplicationProvider } from '../src/data-provider';
+import { GeneratedResourcePage } from '../src/components/resource/GeneratedResourceCrud';
+import type { GeneratedResourceDefinition } from '../src/components/resource/generated-resource-definition';
+import { AppearanceProvider } from '../src/appearance';
+import { RuntimeBoundary } from '../src/runtime';
+import '../src/styles.css';
+
+const code = 'field-records';
+const capabilityBase = `app:native-projection-app:data:${code}`;
+const capabilities = {
+  read: `${capabilityBase}:read`,
+  create: `${capabilityBase}:create`,
+  update: `${capabilityBase}:update`,
+  delete: `${capabilityBase}:delete`,
+};
+
+function fieldCapabilities() {
+  return {
+    readCapabilities: [capabilities.read],
+    createCapabilities: [capabilities.create],
+    updateCapabilities: [capabilities.update],
+  };
+}
+
+export const liveDefinition: GeneratedResourceDefinition = {
+  code,
+  name: '字段协议记录',
+  capabilities,
+  surface: {
+    generated: true,
+    fields: {
+      text_short: {
+        label: '标题',
+        type: 'text.short',
+        widget: 'text',
+        requiredHint: true,
+        maxLength: 120,
+        list: true,
+        searchable: true,
+        sortable: true,
+        ...fieldCapabilities(),
+      },
+      option_single: {
+        label: '单选快照',
+        type: 'option.single',
+        widget: 'radio',
+        options: [
+          { label: 'Open', value: 'open' },
+          { label: 'Closed', value: 'closed' },
+        ],
+        list: true,
+        ...fieldCapabilities(),
+      },
+      option_multiple: {
+        label: '多选快照',
+        type: 'option.multiple',
+        widget: 'checkbox',
+        options: [
+          { label: 'Open', value: 'open' },
+          { label: 'Urgent', value: 'urgent' },
+        ],
+        list: true,
+        ...fieldCapabilities(),
+      },
+      location_value: {
+        label: '精确定位',
+        type: 'location',
+        widget: 'location',
+        list: true,
+        ...fieldCapabilities(),
+      },
+    },
+    list: {
+      defaultPageSize: 20,
+      searchableFields: ['text_short'],
+      filterFields: ['option_single'],
+      defaultSort: { field: 'text_short', order: 'asc' },
+    },
+    form: { layout: 'sections' },
+    detail: { layout: 'sections' },
+    mobile: { enabled: true },
+  },
+};
+
+const definitions = { [code]: liveDefinition };
+const provider = createApplicationProvider(definitions);
+const initialPath =
+  new URLSearchParams(window.location.search).get('initial') || `/${code}`;
+
+function resourcePage(mode: 'list' | 'create' | 'edit' | 'detail') {
+  return (
+    <GeneratedResourcePage
+      definition={liveDefinition}
+      mode={mode}
+      resourceCode={code}
+    />
+  );
+}
+
+ReactDOM.createRoot(document.getElementById('root')!).render(
+  <React.StrictMode>
+    <AppearanceProvider>
+      <AntdApp>
+        <RuntimeBoundary>
+          <MemoryRouter initialEntries={[initialPath]}>
+            <Refine
+              dataProvider={provider}
+              resources={[
+                {
+                  name: code,
+                  list: `/${code}`,
+                  create: `/${code}/new`,
+                  edit: `/${code}/:id/edit`,
+                  show: `/${code}/:id`,
+                },
+              ]}
+            >
+              <Routes>
+                <Route path={`/${code}`} element={resourcePage('list')} />
+                <Route path={`/${code}/new`} element={resourcePage('create')} />
+                <Route
+                  path={`/${code}/:id`}
+                  element={resourcePage('detail')}
+                />
+                <Route
+                  path={`/${code}/:id/edit`}
+                  element={resourcePage('edit')}
+                />
+              </Routes>
+            </Refine>
+          </MemoryRouter>
+        </RuntimeBoundary>
+      </AntdApp>
+    </AppearanceProvider>
+  </React.StrictMode>
+);

package/template/apps/web/e2e/data-api-live.spec.ts

@@ -0,0 +1,138 @@
+import { expect, test } from '@playwright/test';
+
+const liveEnabled = process.env.OPENXIANGDA_LIVE_DATA_API === '1';
+const title = 'UI live field record';
+
+test.describe('@live-data-api standard resource UI', () => {
+  test.setTimeout(90_000);
+  test.skip(
+    !liveEnabled,
+    'Requires the disposable PostgreSQL Native Data API acceptance bridge.'
+  );
+
+  test.beforeEach(async ({ context }) => {
+    await context.addCookies([
+      {
+        name: 'openxiangda-field-ui-role',
+        value: 'super',
+        domain: '127.0.0.1',
+        path: '/',
+      },
+    ]);
+  });
+
+  test('runs create, list, query, get, update, audit and delete through the standard page', async ({
+    context,
+    page,
+  }) => {
+    await context.grantPermissions(['geolocation']);
+    await context.setGeolocation({
+      longitude: 120.123456,
+      latitude: 30.234567,
+      accuracy: 4,
+    });
+    await page.goto('/data-api-live.e2e.html?initial=/field-records');
+    await expect(page.locator('.oxa-list-surface')).toBeVisible();
+
+    await page.getByRole('button', { name: '新增字段协议记录' }).click();
+    await expect(page.getByRole('heading', { name: '新增字段协议记录' })).toBeVisible();
+    await page.getByLabel('标题').fill(title);
+    await page.getByRole('radio', { name: 'Open' }).check();
+    const openCheckbox = page.getByRole('checkbox', { name: 'Open' });
+    const urgentCheckbox = page.getByRole('checkbox', { name: 'Urgent' });
+    await openCheckbox.click();
+    await urgentCheckbox.click();
+    await expect(openCheckbox).toBeChecked();
+    await expect(urgentCheckbox).toBeChecked();
+    await page.getByRole('button', { name: '浏览器定位' }).click();
+    await expect(page.getByText('120.123456, 30.234567')).toBeVisible();
+    await page.getByRole('button', { name: /^保\s*存$/ }).click();
+
+    await expect(page.locator('.oxa-list-surface')).toBeVisible();
+    await page.locator('.oxa-search-panel .ant-select').first().click();
+    await page.getByText('标题', { exact: true }).last().click();
+    await page.getByPlaceholder('关键词').fill(title);
+    await page.getByRole('button', { name: /查询/ }).click();
+    const createdRow = page.getByRole('row').filter({ hasText: title });
+    await expect(createdRow).toHaveCount(1);
+    await expect(createdRow).toContainText('Open');
+    await expect(createdRow).toContainText('Urgent');
+    await expect(createdRow).toContainText('120.123456, 30.234567');
+
+    await createdRow.getByRole('button', { name: '查看' }).click();
+    await expect(page.getByRole('heading', { name: '字段协议记录详情' })).toBeVisible();
+    await expect(page.getByText(title, { exact: true })).toBeVisible();
+    await expect(page.getByText(/浏览器定位/)).toBeVisible();
+    await page.locator('.oxa-audit-collapse .ant-collapse-header').click();
+    await expect(page.getByText('创建', { exact: true })).toBeVisible();
+    await page.screenshot({
+      fullPage: true,
+      path: 'test-results/data-api-live-detail.png',
+    });
+
+    await page.getByRole('button', { name: /编辑/ }).click();
+    await page.getByLabel('标题').fill(`${title} updated`);
+    await page.getByRole('radio', { name: 'Closed' }).check();
+    await page.getByRole('checkbox', { name: 'Open' }).click();
+    await expect(page.getByRole('checkbox', { name: 'Open' })).not.toBeChecked();
+    await page.getByRole('button', { name: /^保存修改$/ }).click();
+    await expect(page.getByText(`${title} updated`, { exact: true })).toBeVisible();
+    await expect(page.getByText('Closed', { exact: true })).toBeVisible();
+
+    await page.getByRole('button', { name: '返回列表' }).click();
+    const updatedRow = page
+      .getByRole('row')
+      .filter({ hasText: `${title} updated` });
+    await expect(updatedRow).toHaveCount(1);
+    await updatedRow.getByRole('button', { name: '删除' }).click();
+    await page.getByRole('button', { name: /^确\s*定$/ }).click();
+    await expect(updatedRow).toHaveCount(0);
+  });
+
+  test('applies PostgreSQL row scope to the standard list and query UI', async ({
+    context,
+    page,
+  }) => {
+    await context.clearCookies();
+    await context.addCookies([
+      {
+        name: 'openxiangda-field-ui-role',
+        value: 'restricted',
+        domain: '127.0.0.1',
+        path: '/',
+      },
+    ]);
+    await page.goto('/data-api-live.e2e.html?initial=/field-records');
+    await expect(page.locator('.oxa-list-surface')).toBeVisible();
+    await page.locator('.oxa-search-panel .ant-select').first().click();
+    await page.getByText('标题', { exact: true }).last().click();
+    await page.getByPlaceholder('关键词').fill('UI RLS');
+    await page.getByRole('button', { name: /查询/ }).click();
+    await expect(page.getByText('UI RLS visible', { exact: true })).toBeVisible();
+    await expect(page.getByText('UI RLS hidden', { exact: true })).toHaveCount(0);
+    await page.screenshot({
+      fullPage: true,
+      path: 'test-results/data-api-live-rls.png',
+    });
+  });
+
+  test('fails closed in the standard page when the role has no read capability', async ({
+    context,
+    page,
+  }) => {
+    await context.clearCookies();
+    await context.addCookies([
+      {
+        name: 'openxiangda-field-ui-role',
+        value: 'denied',
+        domain: '127.0.0.1',
+        path: '/',
+      },
+    ]);
+    await page.goto('/data-api-live.e2e.html?initial=/field-records');
+    await expect(
+      page.getByText('当前平台用户无字段协议记录页面权限', { exact: true })
+    ).toBeVisible();
+    await expect(page.locator('.oxa-list-surface')).toHaveCount(0);
+  });
+});