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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.150",
+  "version": "2.0.0-alpha.151",
   "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.77",
-    "openxiangda-devkit-core": "2.0.0-alpha.97",
-    "openxiangda-mcp": "2.0.0-alpha.97",
-    "openxiangda-skill-kit": "2.0.0-alpha.119"
+    "openxiangda-contracts": "2.0.0-alpha.78",
+    "openxiangda-devkit-core": "2.0.0-alpha.98",
+    "openxiangda-mcp": "2.0.0-alpha.98",
+    "openxiangda-skill-kit": "2.0.0-alpha.120"
   },
   "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.69",
+    "openxiangda": "2.0.0-alpha.70",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.2"
   },

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

@@ -62,7 +62,7 @@ function surface(completed = false, customDetail = false) {
   return {
     schemaVersion: 'openxiangda.workflow-surface/v2',
     protocolVersion: 'workflow_surface_v2',
-    surfaceRevision: completed ? 'revision-2' : 'revision-1',
+    surfaceRevision: (completed ? 'b' : 'a').repeat(64),
     engineVersion: '2.0',
     commandToken: 'A'.repeat(43),
     commandTokenExpiresAt: '2099-08-29T09:05:00.000Z',
@@ -196,7 +196,7 @@ function surface(completed = false, customDetail = false) {
             },
             execute: {
               method: 'POST',
-              href: '/workflow/approve',
+              href: `/openxiangda-api/v2/applications/${appCode}/workflow/tasks/${taskId}/commands/approve`,
               idempotencyRequired: true,
             },
             refresh: ['surface', 'timeline', 'work_center'],
@@ -226,7 +226,7 @@ function surface(completed = false, customDetail = false) {
             uiSchema: { confirmText: `确认${key}` },
             execute: {
               method: 'POST',
-              href: `/workflow/${key}`,
+              href: `/openxiangda-api/v2/applications/${appCode}/workflow/tasks/${taskId}/commands/${key}`,
               idempotencyRequired: true,
             },
             refresh: ['surface', 'timeline', 'work_center'],
@@ -237,67 +237,173 @@ function surface(completed = false, customDetail = false) {
 }
 
 function timeline(completed = false) {
-  return {
-    engineVersion: '2.0',
-    instanceId,
-    flow: [
+  const flow = [
+    {
+      key: 'start',
+      nodeId: null,
+      kind: 'start',
+      title: '张三',
+      status: 'completed',
+      startedAt: '2026-08-25T01:00:00.000Z',
+      completedAt: '2026-08-25T01:00:00.000Z',
+      assignees: [],
+      operations: [],
+    },
+    {
+      key: 'manager',
+      nodeId: 'manager-review',
+      kind: 'approval',
+      title: '部门负责人',
+      status: completed ? 'completed' : 'active',
+      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',
+      nodeId: 'finance-review',
+      kind: 'approval',
+      title: '财务负责人',
+      status: completed ? 'completed' : 'waiting',
+      startedAt: null,
+      completedAt: null,
+      assignees: [{ userId: 'finance-user', displayName: '财务负责人' }],
+      operations: [],
+    },
+  ];
+  const items = [{
+    id: 'operation-transfer',
+    operation: 'transfer',
+    operationLabel: '转交',
+    actorUserId: 'acceptance-user',
+    actorDisplayName: '李明',
+    actingForUserId: null,
+    reason: '由值班负责人继续处理',
+    detail: {},
+    severity: 'normal',
+    createdAt: '2026-08-25T01:08:00.000Z',
+  }];
+  const display = {
+    entries: [
       {
         key: 'start',
+        kind: 'submission',
         nodeId: null,
-        kind: 'start',
-        title: '张三',
+        nodeKind: 'start',
+        title: '提交申请',
         status: 'completed',
-        startedAt: '2026-08-25T01:00:00.000Z',
-        completedAt: '2026-08-25T01:00:00.000Z',
-        assignees: [],
+        enteredAt: '2026-08-25T01:00:00.000Z',
+        leftAt: '2026-08-25T01:00:00.000Z',
+        primaryDisplayTime: '2026-08-25T01:00:00.000Z',
+        people: [{
+          userId: 'applicant-user',
+          displayName: '张三',
+          avatarUrl: null,
+          departmentDisplayName: '理学院',
+        }],
         operations: [],
+        result: {},
+        terminalReason: null,
       },
       {
         key: 'manager',
+        kind: 'node',
         nodeId: 'manager-review',
-        kind: 'approval',
+        nodeKind: 'approval',
         title: '部门负责人',
         status: completed ? 'completed' : 'active',
-        startedAt: '2026-08-25T01:01:00.000Z',
-        completedAt: completed ? '2026-08-25T01:12:00.000Z' : null,
-        assignees: [{ userId: 'acceptance-user', displayName: '李明' }],
+        enteredAt: '2026-08-25T01:01:00.000Z',
+        leftAt: completed ? '2026-08-25T01:12:00.000Z' : null,
+        primaryDisplayTime: '2026-08-25T01:08:00.000Z',
+        people: [],
         operations: [{
           id: 'operation-transfer',
           operation: 'transfer',
           operationLabel: '转交',
-          actorUserId: 'acceptance-user',
-          actorDisplayName: '李明',
+          actor: {
+            userId: 'acceptance-user',
+            displayName: '李明',
+            avatarUrl: null,
+            departmentDisplayName: null,
+          },
           actingForUserId: null,
           reason: '由值班负责人继续处理',
-          detail: {},
           severity: 'normal',
-          createdAt: '2026-08-25T01:08:00.000Z',
+          occurredAt: '2026-08-25T01:08:00.000Z',
         }],
+        result: {},
+        terminalReason: null,
       },
       {
         key: 'finance',
+        kind: completed ? 'node' : 'planned_node',
         nodeId: 'finance-review',
-        kind: 'approval',
+        nodeKind: 'approval',
         title: '财务负责人',
         status: completed ? 'completed' : 'waiting',
-        startedAt: null,
-        completedAt: null,
-        assignees: [{ userId: 'finance-user', displayName: '财务负责人' }],
+        enteredAt: null,
+        leftAt: null,
+        primaryDisplayTime: null,
+        people: [{
+          userId: 'finance-user',
+          displayName: '财务负责人',
+          avatarUrl: null,
+          departmentDisplayName: null,
+        }],
         operations: [],
+        result: {},
+        terminalReason: null,
       },
     ],
-    items: [{
-      id: 'operation-transfer',
-      operation: 'transfer',
-      operationLabel: '转交',
-      actorUserId: 'acceptance-user',
-      actorDisplayName: '李明',
-      actingForUserId: null,
-      reason: '由值班负责人继续处理',
-      detail: {},
-      severity: 'normal',
-      createdAt: '2026-08-25T01:08:00.000Z',
-    }],
+  };
+  return {
+    engineVersion: '2.0',
+    instanceId,
+    instanceSequence: completed ? 4 : 3,
+    timelineRevision: (completed ? 'f' : 'e').repeat(64),
+    flow,
+    items,
+    display,
+  };
+}
+
+function detail(completed = false, customDetail = false) {
+  const currentSurface = surface(completed, customDetail);
+  const currentTimeline = timeline(completed);
+  return {
+    schemaVersion: 'openxiangda.workflow-detail-surface/v2',
+    protocolVersion: 'workflow_detail_surface_v2',
+    detailRevision: (completed ? '2' : '1').repeat(64),
+    instanceSequence: currentSurface.instanceSequence,
+    timelineRevision: currentTimeline.timelineRevision,
+    surface: currentSurface,
+    timeline: currentTimeline,
+    currentStatus: {
+      code: completed ? 'approved' : 'assigned',
+      label: completed ? '已同意' : '待审批',
+      tone: completed ? 'success' : 'warning',
+    },
+    nodes: currentTimeline.display.entries,
+    handlingRecords: currentTimeline.display.entries.flatMap(
+      entry => entry.operations
+    ),
+    operations: currentSurface.operations,
+    navigationContext: {
+      desktopReturnPath: '/admin/work-center',
+      mobileReturnPath: '/m/work-center',
+    },
   };
 }
 
@@ -610,6 +716,20 @@ async function mockWorkflow(
         ),
       });
     }
+    if (
+      path.endsWith(`/workflow/tasks/${taskId}/detail`) ||
+      path.endsWith(`/workflow/instances/${instanceId}/detail`)
+    ) {
+      expect(route.request().headers()['x-openxiangda-csrf-token']).toBe(
+        'workflow-csrf-1'
+      );
+      return route.fulfill({
+        contentType: 'application/json',
+        body: JSON.stringify(
+          envelope(detail(completed, options.customDetail))
+        ),
+      });
+    }
     if (path.endsWith(`/workflow/instances/${instanceId}/surface`)) {
       return route.fulfill({
         contentType: 'application/json',

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.69",
+    "openxiangda": "2.0.0-alpha.70",
     "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.69",
+    "openxiangda": "2.0.0-alpha.70",
     "typescript": "5.9.3"
   }
 }