openxiangda-cli 2.0.0-alpha.149 → 2.0.0-alpha.150

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.149",
+  "version": "2.0.0-alpha.150",
   "description": "Thin application-level CLI for OpenXiangda 2.0.",
   "type": "module",
   "main": "./dist/index.js",
@@ -21,10 +21,10 @@
   ],
   "dependencies": {
     "@oclif/core": "4.13.3",
-    "openxiangda-contracts": "2.0.0-alpha.76",
-    "openxiangda-devkit-core": "2.0.0-alpha.96",
-    "openxiangda-mcp": "2.0.0-alpha.96",
-    "openxiangda-skill-kit": "2.0.0-alpha.118"
+    "openxiangda-contracts": "2.0.0-alpha.77",
+    "openxiangda-devkit-core": "2.0.0-alpha.97",
+    "openxiangda-mcp": "2.0.0-alpha.97",
+    "openxiangda-skill-kit": "2.0.0-alpha.119"
   },
   "devDependencies": {
     "tsx": "4.23.12",

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

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

@@ -116,14 +116,14 @@ const adminPages = [
   {
     code: 'workflow:task',
     kind: 'workflow-task',
-    path: '/admin/tasks/:taskId',
+    path: '/tasks/:taskId',
     label: '审批任务',
     navigationEligible: false,
   },
   {
     code: 'workflow:instance',
     kind: 'workflow-instance',
-    path: '/admin/workflows/:instanceId',
+    path: '/workflows/:instanceId',
     label: '流程详情',
     navigationEligible: false,
   },
@@ -184,7 +184,7 @@ const routeManifest = {
       kind: 'workflow-task',
       desktop: {
         routeCode: 'workflow.task.desktop',
-        path: '/admin/tasks/:taskId',
+        path: '/tasks/:taskId',
         surface: 'admin',
         pathParams: ['taskId'],
         requiresAuthentication: true,
@@ -202,7 +202,7 @@ const routeManifest = {
       kind: 'workflow-instance',
       desktop: {
         routeCode: 'workflow.instance.desktop',
-        path: '/admin/workflows/:instanceId',
+        path: '/workflows/:instanceId',
         surface: 'admin',
         pathParams: ['instanceId'],
         requiresAuthentication: true,

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

@@ -17,7 +17,7 @@ function detailNavigation(custom = false) {
       }
     : {
         custom: false,
-        desktopPath: `/admin/tasks/${taskId}`,
+        desktopPath: `/tasks/${taskId}`,
         mobilePath: `/m/tasks/${taskId}`,
       };
 }
@@ -115,12 +115,12 @@ function surface(completed = false, customDetail = false) {
         projectionDigest: 'c'.repeat(64),
       },
       businessDetail: {
-        status: 'ready',
+        status: 'stale',
         resourceCode: 'purchase-orders',
         resourceName: '采购申请',
         recordId: 'purchase-1',
         requestedRevision: 8,
-        sourceRevision: 8,
+        sourceRevision: 9,
         surface: {
           mutationOwner: 'workflow',
           fields: {
@@ -133,10 +133,26 @@ function surface(completed = false, customDetail = false) {
               createCapabilities: [],
               updateCapabilities: [],
             },
+            internalVenue: {
+              label: '技术场地引用',
+              type: 'reference',
+              widget: 'reference',
+              section: '系统信息',
+              system: true,
+              readCapabilities: [],
+              createCapabilities: [],
+              updateCapabilities: [],
+            },
+          },
+          detail: {
+            layout: 'sections',
+            fieldOrder: ['amount', 'internalVenue'],
           },
-          detail: { layout: 'sections', fieldOrder: ['amount'] },
         },
-        record: { amount: 28600 },
+        record: {
+          amount: 30000,
+          internalVenue: '77777777-7777-4777-8777-777777777777',
+        },
         subtables: {},
         projectionDigest: 'd'.repeat(64),
       },
@@ -234,6 +250,7 @@ function timeline(completed = false) {
         startedAt: '2026-08-25T01:00:00.000Z',
         completedAt: '2026-08-25T01:00:00.000Z',
         assignees: [],
+        operations: [],
       },
       {
         key: 'manager',
@@ -244,6 +261,18 @@ function timeline(completed = false) {
         startedAt: '2026-08-25T01:01:00.000Z',
         completedAt: completed ? '2026-08-25T01:12:00.000Z' : null,
         assignees: [{ userId: 'acceptance-user', displayName: '李明' }],
+        operations: [{
+          id: 'operation-transfer',
+          operation: 'transfer',
+          operationLabel: '转交',
+          actorUserId: 'acceptance-user',
+          actorDisplayName: '李明',
+          actingForUserId: null,
+          reason: '由值班负责人继续处理',
+          detail: {},
+          severity: 'normal',
+          createdAt: '2026-08-25T01:08:00.000Z',
+        }],
       },
       {
         key: 'finance',
@@ -254,9 +283,21 @@ function timeline(completed = false) {
         startedAt: null,
         completedAt: null,
         assignees: [{ userId: 'finance-user', displayName: '财务负责人' }],
+        operations: [],
       },
     ],
-    items: [],
+    items: [{
+      id: 'operation-transfer',
+      operation: 'transfer',
+      operationLabel: '转交',
+      actorUserId: 'acceptance-user',
+      actorDisplayName: '李明',
+      actingForUserId: null,
+      reason: '由值班负责人继续处理',
+      detail: {},
+      severity: 'normal',
+      createdAt: '2026-08-25T01:08:00.000Z',
+    }],
   };
 }
 
@@ -410,7 +451,11 @@ function todoPage() {
 
 async function mockWorkflow(
   page: Page,
-  options: { forbidden?: boolean; customDetail?: boolean } = {}
+  options: {
+    commandConflict?: boolean;
+    forbidden?: boolean;
+    customDetail?: boolean;
+  } = {}
 ) {
   let completed = false;
   await page.route('**/service/**', async route => {
@@ -593,6 +638,15 @@ async function mockWorkflow(
       expect(route.request().postDataJSON()).not.toHaveProperty(
         'expectedInstanceVersion'
       );
+      if (options.commandConflict) {
+        return route.fulfill({
+          status: 409,
+          contentType: 'application/json',
+          body: JSON.stringify(
+            envelope({ freshSurface: surface(false, options.customDetail) }, 409)
+          ),
+        });
+      }
       completed = true;
       return route.fulfill({
         contentType: 'application/json',
@@ -704,13 +758,48 @@ test('redirects a direct standard task URL to the declared custom detail page',
 }) => {
   await mockWorkflow(page, { customDetail: true });
   await page.goto(
-    `/workflow-experience.e2e.html?initial=/admin/tasks/${taskId}`
+    `/workflow-experience.e2e.html?initial=/tasks/${taskId}`
   );
   await expect(page.getByTestId('custom-workflow-detail')).toContainText(
     `${instanceId} / ${taskId}`
   );
 });
 
+test('renders a standalone desktop detail and redirects the legacy admin URL', async ({
+  page,
+}) => {
+  await mockWorkflow(page);
+  await page.goto(
+    workflowFixtureUrl(`/admin/tasks/${taskId}?from=legacy#approval`),
+  );
+  await expect(page.locator('.oxa-workflow-desktop-standalone-page')).toBeVisible();
+  await expect(page).toHaveURL(
+    new RegExp(`/tasks/${taskId}\\?from=legacy#approval$`),
+  );
+  await expect(page.locator('.oxa-app-layout')).toHaveCount(0);
+  await expect(page.locator('.oxa-topbar')).toHaveCount(0);
+  await expect(page.getByText('¥30,000')).toBeVisible();
+  await expect(page.getByText('技术场地引用')).toHaveCount(0);
+  await expect(page.getByText('业务数据已变化')).toHaveCount(0);
+  await expect(page.getByText('流程信息')).toHaveCount(0);
+  await expect(page.getByText('操作记录')).toHaveCount(0);
+  await expect(page.getByText('由值班负责人继续处理')).toHaveCount(1);
+  await expect(page.getByRole('button', { name: /同\s*意/ })).toBeVisible();
+  await expect(page.getByRole('button', { name: /拒\s*绝/ })).toBeVisible();
+});
+
+test('shows a friendly refresh prompt only after a real command conflict', async ({
+  page,
+}) => {
+  await mockWorkflow(page, { commandConflict: true });
+  await page.goto(workflowFixtureUrl(`/tasks/${taskId}`));
+  await expect(page.getByText('业务数据已变化')).toHaveCount(0);
+  await page.getByRole('button', { name: /同\s*意/ }).click();
+  await page.getByLabel('审批意见').fill('同意采购');
+  await page.getByRole('button', { name: '确认同意' }).click();
+  await expect(page.getByText('内容已更新，请刷新后重试')).toBeVisible();
+});
+
 test('renders the independent mobile task and executes only a Surface operation', async ({
   page,
 }) => {
@@ -718,7 +807,7 @@ test('renders the independent mobile task and executes only a Surface operation'
   await page.setViewportSize({ width: 390, height: 844 });
   await page.goto(`/workflow-experience.e2e.html?initial=/m/tasks/${taskId}`);
   await expect(page.locator('.oxa-workflow-mobile-page')).toBeVisible();
-  await expect(page.getByText('¥28,600')).toBeVisible();
+  await expect(page.getByText('¥30,000')).toBeVisible();
   await expect(page.getByText('财务负责人').first()).toBeVisible();
   await expect(page.getByRole('button', { name: /同\s*意/ })).toBeVisible();
   await page.getByRole('button', { name: /同\s*意/ }).click();
@@ -785,7 +874,7 @@ test('negotiates direct standard routes after BrowserRouter listener setup', asy
   // context to the independent mobile renderer at the narrow width.
   await page.setViewportSize({ width: 360, height: 844 });
   await page.goto(
-    workflowFixtureUrl(`/admin/tasks/${taskId}?from=todo#approval`),
+    workflowFixtureUrl(`/tasks/${taskId}?from=todo#approval`),
   );
   await expect(page.locator('.oxa-workflow-detail-mobile-native')).toBeVisible();
   await expect(page).toHaveURL(
@@ -793,7 +882,7 @@ test('negotiates direct standard routes after BrowserRouter listener setup', asy
   );
 
   await page.goto(
-    workflowFixtureUrl(`/admin/workflows/${instanceId}?from=todo#timeline`),
+    workflowFixtureUrl(`/workflows/${instanceId}?from=todo#timeline`),
   );
   await expect(page.locator('.oxa-workflow-detail-mobile-native')).toBeVisible();
   await expect(page).toHaveURL(

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.68",
+    "openxiangda": "2.0.0-alpha.69",
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-router-dom": "7.8.2"

package/template/package.json

@@ -23,7 +23,7 @@
     "build": "pnpm --recursive build"
   },
   "devDependencies": {
-    "openxiangda": "2.0.0-alpha.68",
+    "openxiangda": "2.0.0-alpha.69",
     "typescript": "5.9.3"
   }
 }