@stalfh233/omc-cli 0.4.25 → 0.4.26

package/dist/lanes/runtime-data.js

@@ -551,6 +551,15 @@ export function registerRuntimeDataLane(tools) {
         submit: z.boolean().optional().describe("r18 retro：true=一调完成态——保存后立即直提（无流程模型 DRAFT→COMPLETED，触发 Create 业务规则）；与 workflowCode 互斥（流程草稿须走 data.submit 两段式）。默认 false 仅存草稿"),
         ...readbackProjectionArgs,
     }, async (session, args) => {
+        // F-A (self-audit): the combo used to be silently ignored (the workflow
+        // draft branch returns without honoring submit). Refuse before any wire.
+        if (args.submit === true && typeof args.workflowCode === "string" && args.workflowCode.trim())
+            throw new ToolRefusalError({
+                status: "refused",
+                blocker: "submit-workflow-code-conflict",
+                schemaCode: args.schemaCode,
+                message: "submit:true 与 workflowCode 互斥——workflowCode 是流程草稿两段式的第一段（返回 workItemId 后用 data.submit 提交）；无流程模型的一调完成态用 submit:true 且不带 workflowCode",
+            });
         const { sheetCode, resolvedFrom } = await resolveFormSheetCode(session, { schemaCode: args.schemaCode, sheetCode: args.sheetCode });
         const formData = await stampChildRowStatuses(session, args.schemaCode, args.formData);
         if (typeof args.workflowCode === "string" && args.workflowCode.trim()) {
@@ -645,6 +654,24 @@ export function registerRuntimeDataLane(tools) {
         // "record AND rule effect", not "a draft". Chain the no-flow submit in
         // the same governed write (the same sibling execute apply_changes uses).
         if (args.submit === true) {
+            // F-B (self-audit): data.submit AUTO-STARTS a published workflow
+            // (resolvePublishedWorkflowCode → formType 1 → PROCESSING, not
+            // COMPLETED) — the one-call chain's ruleHint would lie. Workflow-
+            // backed models keep the two-phase chain.
+            const publishedWorkflow = await resolvePublishedWorkflowCode(session, args.schemaCode);
+            if (publishedWorkflow) {
+                return {
+                    performed: { errcode: performed.errcode, bizObjectId, sheetCode, resolvedFrom, submitted: false },
+                    readback: {
+                        ...plainReadback,
+                        submitRefused: {
+                            blocker: "submit-model-has-workflow",
+                            workflowCode: publishedWorkflow,
+                            message: `本模型有已发布流程 ${publishedWorkflow}：submit:true 的直提只适用无流程模型（流程模型会自动起流程得到 PROCESSING 而非完成态，Create 规则语义也不同）。草稿已保存；正确链路 = data.save {workflowCode} 建流程草稿（返回 workItemId）→ data.submit {bizObjectId, workflowInstanceId, workItemId}（见 describe data.submit --example workflow-backed-data-submit）`,
+                        },
+                    },
+                };
+            }
             const submitTool = tools.find((entry) => entry.name === "data.submit");
             const submitOutcome = submitTool?.writeExecute
                 ? await submitTool.writeExecute(session, { schemaCode: args.schemaCode, bizObjectId, formData: args.formData })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stalfh233/omc-cli",
-  "version": "0.4.25",
+  "version": "0.4.26",
   "description": "CloudPivot 8.6 configuration capability CLI — governed, fail-closed, coverage-manifest bounded.",
   "type": "module",
   "bin": {
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "commander": "14.0.3",
-    "omc-core": "0.4.25",
+    "omc-core": "0.4.26",
     "proper-lockfile": "4.1.2",
     "write-file-atomic": "6.0.0",
     "zod": "^3.23.8",

package/skills/omc-capabilities.md

@@ -171,7 +171,10 @@ only the section for the capability you need —
 - **recipe**：
   - `omc describe data.save --example workflow-backed-data-save`
   - `omc describe data.submit --example workflow-backed-data-submit`（有流程）
-  - 无流程模型的规则验证路径：`data.save`（DRAFT，不触发规则）→ `data.submit {schemaCode, bizObjectId, formData}` 直提（COMPLETED，触发 Create 规则）——示例 `omc describe data.submit --example plain-data-submit`
+  - 无流程模型的规则验证路径（两选）：
+    - 一调：`data.save {schemaCode, formData, submit:true}` ——保存+直提 COMPLETED，触发 Create 规则（模型有已发布流程时会拒绝并指路两段式）
+    - 两步：`data.save`（DRAFT）→ `data.submit {schemaCode, bizObjectId, formData}` ——示例 `omc describe data.submit --example plain-data-submit`
+    - 流程模型：`data.save {workflowCode}`（返回 workItemId）→ `data.submit {bizObjectId, workflowInstanceId, workItemId}`（workflow-backed-data-submit）
 - **边界 / 陷阱**：读实际业务记录是 OMC 独有能力。**计算字段（FORMULA/子表计算）不由 API 回填**——写测试数据带预算值，公式正确性人工前台确认；带子表计算字段的模型 API 写可能 50000（服务端重算 NPE），前台正常。
 
 ---