openxiangda-cli 2.0.0-alpha.119 → 2.0.0-alpha.120

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.119",
+  "version": "2.0.0-alpha.120",
   "description": "Thin application-level CLI for OpenXiangda 2.0.",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,9 +22,9 @@
   "dependencies": {
     "@oclif/core": "4.13.3",
     "openxiangda-contracts": "2.0.0-alpha.58",
-    "openxiangda-devkit-core": "2.0.0-alpha.75",
-    "openxiangda-mcp": "2.0.0-alpha.75",
-    "openxiangda-skill-kit": "2.0.0-alpha.94"
+    "openxiangda-devkit-core": "2.0.0-alpha.76",
+    "openxiangda-mcp": "2.0.0-alpha.76",
+    "openxiangda-skill-kit": "2.0.0-alpha.95"
   },
   "devDependencies": {
     "tsx": "4.23.12",

package/template/AGENTS.md

@@ -3,7 +3,7 @@
 - Use only the workspace-pinned CLI: `pnpm openxiangda <command>`. Never invoke a bare global `openxiangda` inside a 2.0 task.
 - `appspec/` is the optional OpenXiangda 2.0 business-intent layer. Before changing observable behavior, read the bounded index with `pnpm openxiangda spec context --json`, then select only the relevant stable ID; use no ChangeSpec for L0 work, one short ChangeSpec for L1, and add permission/rollback/concurrency detail only for L2/L3. Before close, the user—not AI—confirms `currentSpec=merged` or `not-applicable`. AppSpec is advisory and never a release gate. Never read, import or migrate 1.x `openspec/` or SDD.
 - Use Vite, React Router, Refine Core and Ant Design. Do not add Umi, ProComponents or another admin shell.
-- Bind every generated `appRoutes` entry to its local page with `defineApplicationContributions`; desktop `admin` routes stay inside the platform Shell, while `user` routes render without an admin Shell for independent mobile/user experiences. Use only its typed `toolbar`, `row` and `detail` resource slots for generated resource actions. Declare the complete editable admin menu with `defineAdminNavigation` and its page/group helpers; the Shell renders only generated `adminNavigation` references and permissions only filter them. Do not create another router, menu store, layout, identity provider, permission store or copied CRUD page; route/action access uses capability or `allOf`/`anyOf`, while Data/App API and Workflow authorization remain server-owned.
+- Bind every generated `appRoutes` entry to its local page with `defineApplicationContributions`; desktop `admin` routes stay inside the platform Shell, while `user` routes render without an admin Shell for independent mobile/user experiences. Generated resource CRUD routes are compiler-owned under `/admin/resources/<resourceCode>...` and `/m/admin/resources/<resourceCode>...`; never recreate root resource paths, aliases or redirects. Explicit routes that have the same canonical shape as another explicit or generated route fail compilation, even when dynamic parameter names differ. Use only the typed `toolbar`, `row` and `detail` resource slots for generated resource actions. Declare the complete editable admin menu with `defineAdminNavigation` and its page/group helpers; the Shell renders only generated `adminNavigation` references and permissions only filter them. Do not create another router, menu store, layout, identity provider, permission store or copied CRUD page; route/action access uses capability or `allOf`/`anyOf`, while Data/App API and Workflow authorization remain server-owned.
 - Declare each resource once in `openxiangda.config.ts` with only `code`, `name`, `fields` and optional `mutationOwner`, generated/list/layout/data-policy settings. Each field owns type, label, required state, Surface flags, reference/file metadata and access. Resource codes are lower kebab-case. Use `native` for direct Data API mutations, `action`, `readonly` or `workflow` for non-Native ownership; never grant or generate Native mutation for a non-Native owner.
 - Never write resource-level `schemaVersion`, `appCode`, `schema`, `surface`, `capabilities`, `fieldPolicies` or `platform/data` modules. The compiler derives the strict DataResource, CRUD capabilities, Surface and AI Schema. The application manifest still starts with its one top-level `schemaVersion: 3`.
 - 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.

package/template/README.md

@@ -26,6 +26,11 @@ BrowserRouter、RuntimeBoundary、Refine、generated routes 和后台 Shell
 在显式后台导航组中加入 `adminApplicationTodoCenterPage()`；平台生成
 `/admin/todos` 与 `/m/todos`，只读取当前用户的消息/待办投影并统一解析目标页面。
 
+生成式资源后台路径固定为 `/admin/resources/<resourceCode>...`，移动后台面为
+`/m/admin/resources/<resourceCode>...`；普通根路径和 `/m/...` 产品路径可由显式
+`user` route 使用。生成页内部跳转来自编译后的 `adminPages`，不要手写旧根路径、别名或
+重定向。显式 route 与任一生成 route 的动态路径形状重复时，配置编译会直接失败。
+
 前端一次读取当前登录用户在当前环境的完整应用角色并集和 capability。应用可在 `perspectives` 中声明工作视角；视角只投影页面、行和字段的读取范围，不改变真实身份，也不收窄新增、编辑、删除、流程与自定义动作权限。标准 Data API 自动识别视角；只有绕过标准 Data API 的自定义 Nest 查询才需要通过 `@CurrentPerspective()` 显式实现同等读取投影。字段默认继承资源 read/create/update；`access` 数组为 all-of，`false` 为明确拒绝，无权字段在提交前从 payload 删除。
 
 ```bash

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": "2.0.0-alpha.33",
+    "openxiangda": "2.0.0-alpha.34",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.2"
   },

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

@@ -99,14 +99,23 @@ export const liveDefinition: GeneratedResourceDefinition = {
 
 const definitions = { [code]: liveDefinition };
 const provider = createApplicationProvider(definitions);
+const routeBase = `/admin/resources/${code}`;
+const routePaths = {
+  fallback: '/admin',
+  list: routeBase,
+  create: `${routeBase}/new`,
+  detail: `${routeBase}/:id`,
+  edit: `${routeBase}/:id/edit`,
+};
 const initialPath =
-  new URLSearchParams(window.location.search).get('initial') || `/${code}`;
+  new URLSearchParams(window.location.search).get('initial') || routeBase;
 
 function resourcePage(mode: 'list' | 'create' | 'edit' | 'detail') {
   return (
     <GeneratedResourcePage
       definition={liveDefinition}
       mode={mode}
+      paths={routePaths}
       resourceCode={code}
     />
   );
@@ -124,22 +133,22 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
               resources={[
                 {
                   name: code,
-                  list: `/${code}`,
-                  create: `/${code}/new`,
-                  edit: `/${code}/:id/edit`,
-                  show: `/${code}/:id`,
+                  list: routePaths.list,
+                  create: routePaths.create,
+                  edit: routePaths.edit,
+                  show: routePaths.detail,
                 },
               ]}
             >
               <Routes>
-                <Route path={`/${code}`} element={resourcePage('list')} />
-                <Route path={`/${code}/new`} element={resourcePage('create')} />
+                <Route path={routePaths.list} element={resourcePage('list')} />
+                <Route path={routePaths.create} element={resourcePage('create')} />
                 <Route
-                  path={`/${code}/:id`}
+                  path={routePaths.detail}
                   element={resourcePage('detail')}
                 />
                 <Route
-                  path={`/${code}/:id/edit`}
+                  path={routePaths.edit}
                   element={resourcePage('edit')}
                 />
               </Routes>

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

@@ -31,7 +31,9 @@ test.describe('@live-data-api standard resource UI', () => {
       latitude: 30.234567,
       accuracy: 4,
     });
-    await page.goto('/data-api-live.e2e.html?initial=/field-records');
+    await page.goto(
+      '/data-api-live.e2e.html?initial=/admin/resources/field-records',
+    );
     await expect(page.locator('.oxa-list-surface')).toBeVisible();
 
     await page.getByRole('button', { name: '新增字段协议记录' }).click();
@@ -102,7 +104,9 @@ test.describe('@live-data-api standard resource UI', () => {
         path: '/',
       },
     ]);
-    await page.goto('/data-api-live.e2e.html?initial=/field-records');
+    await page.goto(
+      '/data-api-live.e2e.html?initial=/admin/resources/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();
@@ -129,7 +133,9 @@ test.describe('@live-data-api standard resource UI', () => {
         path: '/',
       },
     ]);
-    await page.goto('/data-api-live.e2e.html?initial=/field-records');
+    await page.goto(
+      '/data-api-live.e2e.html?initial=/admin/resources/field-records',
+    );
     await expect(
       page.getByText('当前平台用户无字段协议记录页面权限', { exact: true })
     ).toBeVisible();

package/template/apps/web/e2e/resource-experience-fixture.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { Button, Typography } from 'antd';
 import {
-  defineAdminContributions,
+  defineApplicationContributions,
   OpenXiangdaApplication,
 } from 'openxiangda/react';
 import type { DataFieldSurface, DataResourceSurface } from 'openxiangda/core';
@@ -145,7 +145,11 @@ function ContentOperationsPage() {
   return <Typography.Title level={2}>内容业务操作</Typography.Title>;
 }
 
-const adminContributions = defineAdminContributions(
+function ResourcePortalPage() {
+  return <Typography.Title level={2}>用户端内容门户</Typography.Title>;
+}
+
+const applicationContributions = defineApplicationContributions(
   {
     contentOperations: {
       code: 'content-operations',
@@ -156,9 +160,20 @@ const adminContributions = defineAdminContributions(
       tabPersistence: 'session',
       keepAlive: 'none',
     },
+    resourcePortal: {
+      code: 'resource-portal',
+      path: '/resource-01',
+      label: '用户端内容门户',
+      surface: 'user',
+      tabPersistence: 'session',
+      keepAlive: 'none',
+    },
   } as const,
   {
-    pages: { contentOperations: ContentOperationsPage },
+    pages: {
+      contentOperations: ContentOperationsPage,
+      resourcePortal: ResourcePortalPage,
+    },
     resources: {
       'resource-01': {
         toolbar: [
@@ -177,7 +192,7 @@ const adminContributions = defineAdminContributions(
 );
 
 if (location.pathname.endsWith('/resource-experience.e2e.html')) {
-  history.replaceState({}, '', '/resource-01');
+  history.replaceState({}, '', '/admin/resources/resource-01');
 }
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
@@ -216,7 +231,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-01:list',
           kind: 'resource-list',
-          path: '/resource-01',
+          path: '/admin/resources/resource-01',
           label: '资源 01',
           navigationEligible: true,
           capability: resourceDefinitions['resource-01'].capabilities.read,
@@ -225,7 +240,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-01:detail',
           kind: 'resource-detail',
-          path: '/resource-01/:id',
+          path: '/admin/resources/resource-01/:id',
           label: '资源 01 详情',
           navigationEligible: false,
           capability: resourceDefinitions['resource-01'].capabilities.read,
@@ -234,7 +249,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-01:create',
           kind: 'resource-create',
-          path: '/resource-01/new',
+          path: '/admin/resources/resource-01/new',
           label: '新增资源 01',
           navigationEligible: false,
           capability: resourceDefinitions['resource-01'].capabilities.create,
@@ -243,7 +258,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-01:update',
           kind: 'resource-update',
-          path: '/resource-01/:id/edit',
+          path: '/admin/resources/resource-01/:id/edit',
           label: '编辑资源 01',
           navigationEligible: false,
           capability: resourceDefinitions['resource-01'].capabilities.update,
@@ -252,7 +267,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-02:list',
           kind: 'resource-list',
-          path: '/resource-02',
+          path: '/admin/resources/resource-02',
           label: '内容文章',
           navigationEligible: true,
           capability: resourceDefinitions['resource-02'].capabilities.read,
@@ -261,7 +276,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-03:list',
           kind: 'resource-list',
-          path: '/resource-03',
+          path: '/admin/resources/resource-03',
           label: '内容专题',
           navigationEligible: true,
           capability: resourceDefinitions['resource-03'].capabilities.read,
@@ -270,7 +285,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-04:list',
           kind: 'resource-list',
-          path: '/resource-04',
+          path: '/admin/resources/resource-04',
           label: '会员档案',
           navigationEligible: true,
           capability: resourceDefinitions['resource-04'].capabilities.read,
@@ -279,7 +294,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-05:list',
           kind: 'resource-list',
-          path: '/resource-05',
+          path: '/admin/resources/resource-05',
           label: '门户轮播',
           navigationEligible: true,
           capability: resourceDefinitions['resource-05'].capabilities.read,
@@ -288,7 +303,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-06:list',
           kind: 'resource-list',
-          path: '/resource-06',
+          path: '/admin/resources/resource-06',
           label: '工会小组',
           navigationEligible: true,
           capability: resourceDefinitions['resource-06'].capabilities.read,
@@ -297,7 +312,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-07:list',
           kind: 'resource-list',
-          path: '/resource-07',
+          path: '/admin/resources/resource-07',
           label: '场地预约',
           navigationEligible: true,
           capability: resourceDefinitions['resource-07'].capabilities.read,
@@ -306,7 +321,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-08:list',
           kind: 'resource-list',
-          path: '/resource-08',
+          path: '/admin/resources/resource-08',
           label: '场地不可用时段',
           navigationEligible: true,
           capability: resourceDefinitions['resource-08'].capabilities.read,
@@ -315,7 +330,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-09:list',
           kind: 'resource-list',
-          path: '/resource-09',
+          path: '/admin/resources/resource-09',
           label: '场地档案',
           navigationEligible: true,
           capability: resourceDefinitions['resource-09'].capabilities.read,
@@ -324,7 +339,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-10:list',
           kind: 'resource-list',
-          path: '/resource-10',
+          path: '/admin/resources/resource-10',
           label: '通知公告',
           navigationEligible: true,
           capability: resourceDefinitions['resource-10'].capabilities.read,
@@ -333,7 +348,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-11:list',
           kind: 'resource-list',
-          path: '/resource-11',
+          path: '/admin/resources/resource-11',
           label: '活动报名',
           navigationEligible: true,
           capability: resourceDefinitions['resource-11'].capabilities.read,
@@ -342,7 +357,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
         {
           code: 'resource:resource-12:list',
           kind: 'resource-list',
-          path: '/resource-12',
+          path: '/admin/resources/resource-12',
           label: '资料下载',
           navigationEligible: true,
           capability: resourceDefinitions['resource-12'].capabilities.read,
@@ -358,7 +373,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
           routeCode: 'content-operations',
         },
       ]}
-      contributions={adminContributions}
+      contributions={applicationContributions}
       resourceDefinitions={resourceDefinitions}
     />
   </React.StrictMode>

package/template/apps/web/e2e/resources.spec.ts

@@ -221,7 +221,7 @@ test('renders the compiled desktop resource contract and shared workbench', asyn
     const definition = definitions[code];
     await page.goto(`${runtimeBase}/admin`);
     await expect(page.locator('.oxa-list-surface')).toBeVisible();
-    await expect(page).toHaveURL(`${runtimeBase}/${code}`);
+    await expect(page).toHaveURL(`${runtimeBase}/admin/resources/${code}`);
     await expect(page.locator('.oxa-sider').getByText(definition.name, { exact: true })).toBeVisible();
     await expect(page.getByRole('button', { name: /导出$/ })).toBeVisible();
     await expect(page.getByRole('button', { name: /列设置$/ })).toBeVisible();
@@ -263,7 +263,9 @@ test('opens the stable admin entry under the preproduction gateway mount', async
   await mockPlatform(page, true, devRuntimeBase);
   await page.goto(`${devRuntimeBase}/admin`);
   await expect(page.locator('.oxa-list-surface')).toBeVisible();
-  await expect(page).toHaveURL(`${devRuntimeBase}/${codes[0]}`);
+  await expect(page).toHaveURL(
+    `${devRuntimeBase}/admin/resources/${codes[0]}`,
+  );
 });
 
 test('uses the complete current-user role union when no Perspective is selected', async ({ page }) => {
@@ -339,7 +341,7 @@ test('preserves the left menu scroll position when switching resource pages', as
     .locator('.oxa-sider')
     .getByText('资料下载', { exact: true })
     .evaluate(node => (node as HTMLElement).click());
-  await expect(page).toHaveURL('/resource-12');
+  await expect(page).toHaveURL('/admin/resources/resource-12');
   await expect.poll(() => scroller.evaluate(node => node.scrollTop)).toBe(240);
 });
 
@@ -357,6 +359,26 @@ test('mounts generated operation routes and typed actions in the unified Shell',
   await expect(page.locator('.oxa-sider')).toBeVisible();
 });
 
+test('keeps the user portal and namespaced generated admin resource in one router', async ({ page }) => {
+  await mockPlatform(page, true, runtimeBase, true);
+  await page.goto('/resource-experience.e2e.html');
+  await page.evaluate(() => {
+    history.pushState({}, '', '/resource-01');
+    window.dispatchEvent(new PopStateEvent('popstate'));
+  });
+  await expect(
+    page.getByRole('heading', { name: '用户端内容门户' }),
+  ).toBeVisible();
+  await expect(page.locator('.oxa-sider')).toHaveCount(0);
+
+  await page.evaluate(() => {
+    history.pushState({}, '', '/admin/resources/resource-01');
+    window.dispatchEvent(new PopStateEvent('popstate'));
+  });
+  await expect(page.locator('.oxa-list-surface')).toBeVisible();
+  await expect(page.locator('.oxa-sider')).toHaveCount(1);
+});
+
 test('fails closed on a direct operation route without its capability', async ({ page }) => {
   await mockPlatform(page, false, runtimeBase, false);
   await page.goto('/resource-experience.e2e.html');
@@ -374,7 +396,7 @@ test('keeps platform implementation guidance out of generated forms', async ({ p
   await mockPlatform(page, true, runtimeBase, true);
   await page.goto('/resource-experience.e2e.html');
   await page.getByRole('button', { name: '新增内容栏目' }).click();
-  await expect(page).toHaveURL('/resource-01/new');
+  await expect(page).toHaveURL('/admin/resources/resource-01/new');
   const formLabels = page.locator('.ant-form-item-label label');
   await expect(formLabels.first()).toBeVisible();
   const labels = await formLabels.allTextContents();
@@ -419,7 +441,9 @@ test('renders platform mobile controls from declared field widgets', async ({ pa
   test.skip(!candidate, 'No mobile platform field is declared.');
   await mockPlatform(page);
   await page.setViewportSize({ width: 390, height: 844 });
-  await page.goto(`${runtimeBase}/m/${candidate!.code}/new`);
+  await page.goto(
+    `${runtimeBase}/m/admin/resources/${candidate!.code}/new`,
+  );
   await expect(page.locator('.oxa-mobile-form')).toBeVisible();
 
   const widgets = new Set(Object.values(candidate!.definition.surface.fields).map(field => field.widget));
@@ -448,7 +472,7 @@ test('fails closed when the current user lacks the declared read capability', as
   test.skip(!codes.length, 'No resource permission exists in an empty application.');
   await mockPlatform(page, false);
   const code = codes[0];
-  await page.goto(`${runtimeBase}/${code}`);
+  await page.goto(`${runtimeBase}/admin/resources/${code}`);
   await expect(page.getByText(new RegExp(`当前平台用户无${definitions[code].name}页面权限`))).toBeVisible();
   await expect(page.locator('.oxa-list-surface')).toHaveCount(0);
 });

package/template/apps/web/package.json

@@ -14,7 +14,7 @@
     "@ant-design/icons": "6.2.3",
     "@refinedev/core": "5.0.12",
     "antd": "6.4.3",
-    "openxiangda": "2.0.0-alpha.33",
+    "openxiangda": "2.0.0-alpha.34",
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-router-dom": "7.8.2"

package/template/package.json

@@ -22,7 +22,7 @@
     "build": "pnpm --recursive build"
   },
   "devDependencies": {
-    "openxiangda": "2.0.0-alpha.33",
+    "openxiangda": "2.0.0-alpha.34",
     "typescript": "5.9.3"
   }
 }