@stalfh233/omc-cli 0.4.92 → 0.4.93

package/dist/approval-flow.js

@@ -93,7 +93,7 @@ export async function cmdApprovalFlow(args) {
         return 0;
     }
     // 1) 确保流程存在（一个模型只能有一个：已存在则直接 update）
-    const createOutcome = await runToolCall("workflow.create", { args: { schemaCode: schema, code: compiled.workflowCode, name: `${schema} 审批流`, ...(environment ? { environment } : {}) }, requestId: request, environment });
+    const createOutcome = await runToolCall("workflow.create", { args: { schemaCode: schema, code: compiled.workflowCode, name: `${schema} 审批流`, ...(environment ? { environment } : {}) }, requestId: request, environment, print: () => undefined });
     if (createOutcome.exitCode !== 0) {
         const result = createOutcome.result;
         const blocker = String(result.blocker ?? "");
@@ -102,8 +102,24 @@ export async function cmdApprovalFlow(args) {
             return createOutcome.exitCode;
         }
     }
+    // r14 U1: `<schema>_wf` is THIS composer's own naming convention (not the
+    // platform's), and `workflow.create` is idempotent — when that code already
+    // exists it answers alreadyPresent and writes nothing, so the following
+    // update() merges into whatever template was left behind. A residual from an
+    // earlier round then silently inherits the new nodes (r14 chased exactly this:
+    // a leftover inspHazardFlow made the next run's behaviour inexplicable).
+    const createReadback = createOutcome.result?.readback;
+    const preexistingTemplate = createReadback?.alreadyPresent === true;
+    const preexistingSection = preexistingTemplate
+        ? {
+            preexistingTemplate: true,
+            preexistingWarning: `流程 code ${compiled.workflowCode} 在本轮之前就已存在（workflow.create 幂等跳过，未新建）。` +
+                `本次 update 是**合并**进这条既有模板，旧节点/旧连线会保留——它们可能属于上一次运行或另一个模型。` +
+                `如果不是有意复用，先 workflow.delete（有实例会 402508，用 model-purge）或换一个 workflowCode 再跑。`,
+        }
+        : {};
     // 2) 取字段清单构建审批节点只读权限（r75 修正：审批节点 editable:false）
-    const fieldList = await runToolCall("field.list", { args: { schemaCode: schema, published: true, ...(environment ? { environment } : {}) }, requestId: request, environment });
+    const fieldList = await runToolCall("field.list", { args: { schemaCode: schema, published: true, ...(environment ? { environment } : {}) }, requestId: request, environment, print: () => undefined });
     const fieldRows = (fieldList.result?.fields ?? fieldList.result?.items ?? []);
     const propertyCodes = fieldRows.map((row) => String(row.code ?? row.propertyCode ?? "")).filter(Boolean);
     const approvalNodes = compiled.activities.filter((a) => a.activityType === "PARTICIPANT" && a.participant !== "{Originator}");
@@ -113,16 +129,16 @@ export async function cmdApprovalFlow(args) {
     // 3) update 模板（merge 语义；工具自动补 sheetCode/链路/设计器默认）
     const updateOutcome = await runToolCall("workflow.update", {
         args: { schemaCode: schema, code: compiled.workflowCode, template: { workflowCode: compiled.workflowCode, activities: activitiesWithPermissions }, ...(environment ? { environment } : {}) },
-        requestId: request, environment,
+        requestId: request, environment, print: () => undefined,
     });
     if (updateOutcome.exitCode !== 0) {
         writeEnvelope(envelope(classifyResult(updateOutcome.result).status, updateOutcome.result, request, classifyResult(updateOutcome.result).error));
         return updateOutcome.exitCode;
     }
     // 4) publish
-    const publishOutcome = await runToolCall("workflow.publish", { args: { schemaCode: schema, code: compiled.workflowCode, ...(environment ? { environment } : {}) }, requestId: request, environment });
+    const publishOutcome = await runToolCall("workflow.publish", { args: { schemaCode: schema, code: compiled.workflowCode, ...(environment ? { environment } : {}) }, requestId: request, environment, print: () => undefined });
     const classified = classifyResult(publishOutcome.result);
-    writeEnvelope(envelope(classified.status, { schemaCode: schema, workflowCode: compiled.workflowCode, steps: steps.length, publish: publishOutcome.result }, request, classified.error));
+    writeEnvelope(envelope(classified.status, { schemaCode: schema, workflowCode: compiled.workflowCode, steps: steps.length, ...preexistingSection, publish: publishOutcome.result }, request, classified.error));
     if (publishOutcome.exitCode === 0)
         process.stderr.write("[omc] 前台生效验证清单：1) 造一条数据提交走流程；2) 每级审批人在门户有待办（角色用 FindUserByRole 需审批人挂在发起人同部门，否则 PENDING 不来）；3) 审批节点字段只读（不可改单）；4) 驳回退发起人核对；5) 设计器打开流程确认节点链显示正常。\n");
     return publishOutcome.exitCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stalfh233/omc-cli",
-  "version": "0.4.92",
+  "version": "0.4.93",
   "description": "CloudPivot 8.6 configuration capability CLI — governed, fail-closed, coverage-manifest bounded.",
   "type": "module",
   "bin": {
@@ -50,9 +50,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@stalfh233/omc-fake-platform": "0.4.92",
+    "@stalfh233/omc-fake-platform": "0.4.93",
     "commander": "14.0.3",
-    "omc-core": "0.4.92",
+    "omc-core": "0.4.93",
     "proper-lockfile": "4.1.2",
     "write-file-atomic": "6.0.0",
     "zod": "^3.23.8",