@stalfh233/omc-cli 0.4.22 → 0.4.23

package/dist/cli.js

@@ -1067,11 +1067,40 @@ async function cmdIntentApply(planPath, options, transport) {
         }
     }
     let parsed;
+    let autoPlanned = false;
     try {
         parsed = JSON.parse(planText);
     }
     catch (error) {
-        return invalid(undefined, `plan 文件不是合法 JSON：${error instanceof Error ? error.message : String(error)}`);
+        // r17 finding (two delegated agents, same wall): `intent apply <file>` read
+        // as "apply this intent file", but only a compiled plan JSON was accepted —
+        // each agent paid a help round-trip to discover plan --plan-out. Accept the
+        // SOURCE intent YAML directly: compile it in-process (same pipeline as
+        // `intent plan`) and apply the resulting plan.
+        const read = readIntentOrInvalid(planPath, transport);
+        if (read.kind !== "exit") {
+            try {
+                const context = makeToolContext({ sessions: new SessionManager(new ConfigStore(defaultPaths())) });
+                const session = await context.sessions.session(options.env);
+                const baseline = await readBaseline(session, read.intent);
+                const compiled = compileIntent(read.intent, baseline);
+                parsed = buildPlan({
+                    environment: session.environmentName,
+                    environmentFingerprint: session.environmentFingerprint(),
+                    compiler: INTENT_COMPILER_VERSION,
+                    baseline,
+                    intent: read.intent,
+                    compiled,
+                });
+                autoPlanned = true;
+            }
+            catch (planError) {
+                return invalid(undefined, `文件既不是合法 plan JSON，也不能编译为意图计划：${planError instanceof Error ? planError.message : String(planError)}（若想先看计划再应用：intent plan <yaml> --env <env> --plan-out <plan.json>）`);
+            }
+        }
+        else {
+            return invalid(undefined, `plan 文件不是合法 JSON：${error instanceof Error ? error.message : String(error)}；意图 YAML 请先 intent plan <yaml> --plan-out <plan.json>，或直接 intent apply <yaml> --env <env>（自动编译）`);
+        }
     }
     const verified = verifyPlan(parsed);
     if (!verified.ok)
@@ -1137,7 +1166,7 @@ async function cmdIntentApply(planPath, options, transport) {
         // incomplete or drifted and the agent must re-plan, not retry blindly.
         const confirmReadback = async (base) => {
             if (options.verify === false)
-                return base;
+                return autoPlanned ? { ...base, plannedFrom: "intent-yaml" } : base;
             let verification;
             try {
                 const report = await verifyIntentLive(session, plan.intent);
@@ -1148,7 +1177,7 @@ async function cmdIntentApply(planPath, options, transport) {
             }
             if (verification.equivalent === true) {
                 console.error(`intent apply ${planId}：最终读回等价 ✓（意图 ${plan.intent.models.length} 个模型）`);
-                return { ...base, verification };
+                return { ...base, verification, ...(autoPlanned ? { plannedFrom: "intent-yaml" } : {}) };
             }
             console.error(`intent apply ${planId}：最终读回不等价——${Array.isArray(verification.differences) ? `${verification.differences.length} 项差异` : String(verification.error ?? "读回失败")}；不得当作成功`);
             return {

package/dist/execution-metadata.js

@@ -419,6 +419,26 @@ const workflowSave = Object.freeze({
     requiresEnvironmentDerivedIds: true,
     prerequisiteData: { source: "workflow.get_published; data.save authoritative readback", fields: ["workflow.code", "bizObjectId", "workflowInstanceId", "workItemId"] },
 });
+const plainSubmit = Object.freeze({
+    id: "plain-data-submit",
+    title: "无流程模型：草稿直提（DRAFT→COMPLETED，触发 Create 规则）",
+    status: "requires-prior-readback",
+    tool: "data.submit",
+    args: { environment, schemaCode: model, bizObjectId: "<data.save.performed.bizObjectId>", formData: { name: "recipe draft" } },
+    preconditions: ["模型无 workflowCode（有流程走 workflow-backed-data-submit）", "data.save 已成功并读回 DRAFT 草稿", "bizObjectId 取 data.save 读回，不要手造"],
+    conditionalRequirements: ["无需 workflowInstanceId/workItemId——无流程模型 submit 自持久化（runtime/form/submit 就地置 COMPLETED）"],
+    priorToolReferences: [
+        { tool: "data.save", args: { environment, schemaCode: model, formData: { name: "recipe draft" } }, purpose: "建 DRAFT 草稿并读回 bizObjectId（其 draftRuleHint 会指回本链）" },
+    ],
+    dryRun: { supported: true, command: `omc call data.submit --env ${environment} --dry-run --args '<recipe.args>'`, notes: "dry-run 验证参数关系，不推进状态" },
+    expectedReadback: { performed: { errcode: 0 }, readback: { sequenceStatus: "COMPLETED" } },
+    refusalRecovery: [
+        { code: "submit-biz-object-absent", action: "bizObjectId 在平台无行（304001）——回 data.save 重建草稿后再直提" },
+        { code: "invalid-input", action: "带了 workItemId/workflowInstanceId 时必须同时带 bizObjectId（fail-closed）" },
+    ],
+    notes: "规则验证路径：Create/Update 规则只在 COMPLETED 分发——plain save 是 DRAFT 不触发（DomainServiceImpl.java:240-248）；要验证规则效果就用本链提交后 data.load 核对",
+    requiresEnvironmentDerivedIds: true,
+});
 const workflowSubmit = Object.freeze({
     id: "workflow-backed-data-submit",
     title: "消费 data.save 读回身份并提交 workflow work item",
@@ -1080,7 +1100,7 @@ export const EXECUTION_METADATA = Object.freeze({
     "workflow.update": Object.freeze({ recipes: [workflowTemplateUpdate, workflowConditionalBranch], relatedTools: ["workflow.get_draft", "workflow.publish"] }),
     "workflow.bindRule": Object.freeze({ recipes: [workflowBinding], relatedTools: ["workflow.create", "workflow.get_draft", "workflow.get_published", "rule.list"] }),
     "data.save": Object.freeze({ recipes: [workflowSave], relatedTools: ["workflow.get_published", "data.submit", "workitem.list"] }),
-    "data.submit": Object.freeze({ recipes: [workflowSubmit], relatedTools: ["data.save", "workitem.list", "data.load"] }),
+    "data.submit": Object.freeze({ recipes: [plainSubmit, workflowSubmit], relatedTools: ["data.save", "workitem.list", "data.load"] }),
     "service.register": Object.freeze({ recipes: [restfulQueryService], relatedTools: ["service.category.list", "service.adapter_config", "service.get", "method.get"] }),
     "method.update": Object.freeze({ recipes: [bizserviceSelfCallCorp], relatedTools: ["method.get", "method.create", "service.get"] }),
     "listview.configure": Object.freeze({ recipes: [listViewConfigure], relatedTools: ["listview.list", "listview.get", "field.list", "field.publish"] }),

package/dist/lanes/runtime-data.js

@@ -11,6 +11,7 @@ import { wireCall, wireRows, WireError } from "../wire.js";
 import { CHILD_TABLE_PROPERTY_TYPE, runtimeWriteWithAppMapping } from "../runtime-support.js";
 import { getReplayToken, searchWorkItems, wireString } from "../workflow-support.js";
 import { ENGINE_OWNED_KEYS, RUNTIME_DATA_LANE_CONTRACT, RUNTIME_DATA_WIRE, runtimeFormDataArg, } from "./runtime-data-contract.js";
+import { SYSTEM_FIELD_CODES } from "../field-families.js";
 const RUNTIME_LANE = RUNTIME_DATA_LANE_CONTRACT.lane;
 const RUNTIME_TOOLS = RUNTIME_DATA_LANE_CONTRACT.tools;
 /**
@@ -462,6 +463,16 @@ export function registerRuntimeDataLane(tools) {
                 // for EVERY selected column, and the published metadata confirms those
                 // are real model fields, surface the recovery hint. `items` is never
                 // reshaped — the hint is a sibling readback field.
+                // Candidate keys first (pure — zero wires); metadata only when there is
+                // at least one all-null column to classify (preserves the rawCondition
+                // path's zero-extra-wire contract when there is nothing to hint).
+                const businessNullColumns = async () => {
+                    const candidates = Object.keys(items[0]?.fields ?? {}).filter((field) => !SYSTEM_FIELD_CODES.has(field) && items.every((item) => item.fields[field] === null));
+                    if (candidates.length === 0)
+                        return [];
+                    const typeByCode = await publishedTypeByCode();
+                    return candidates.filter((field) => typeByCode.has(field));
+                };
                 if (fields &&
                     fields.length > 0 &&
                     items.length > 0 &&
@@ -470,6 +481,15 @@ export function registerRuntimeDataLane(tools) {
                     if (fields.every((field) => typeByCode.has(field)))
                         readback.projectionHint = RUNTIME_DATA_WIRE.projectionHint;
                 }
+                else if (!fields && items.length > 0) {
+                    // r17 finding: BOTH delegated agents tripped on implicit projection —
+                    // business fields absent from the list view render as null in every
+                    // row with no explanation. Name the null'd business columns so the
+                    // agent reads data.load instead of misdiagnosing "data lost".
+                    const nullColumns = await businessNullColumns();
+                    if (nullColumns.length > 0)
+                        readback.projectionHint = `这些列在默认视图未配置（值可能存在但列表投影为 null）：${nullColumns.join("、")}；先用 listview.configure 配置列，或用 data.load 读单条权威值`;
+                }
                 return readback;
             }, { full: args.full === true, target: `data.list:${JSON.stringify({ schemaCode: args.schemaCode, queryCode: args.queryCode ?? args.schemaCode, filter: args.filter, filters: args.filters, filterGroup: args.filterGroup, rawCondition: args.rawCondition, displayFields: args.displayFields, columns: args.columns, page: args.page ?? 0, size: args.size ?? 10 })}` });
         },
@@ -620,7 +640,7 @@ export function registerRuntimeDataLane(tools) {
                 // branch) — business rules only run once data.submit advances the
                 // row. Saying so on every plain-save readback prevents the
                 // "rule didn't fire" misdiagnosis.
-                draftRuleHint: "草稿态（DRAFT）保存不触发业务规则——DRAFT 行跳过 Create/Update 分发（DomainServiceImpl.java:240-248）；data.submit 提交（DRAFT→COMPLETED）后才触发 Create 规则",
+                draftRuleHint: "草稿态（DRAFT）保存不触发业务规则——DRAFT 行跳过 Create/Update 分发（DomainServiceImpl.java:240-248）；data.submit 提交（DRAFT→COMPLETED）后才触发 Create 规则。无流程模型直提形状：data.submit {schemaCode, bizObjectId: 本读回的 bizObjectId, formData}（免流程身份，submit 自持久化）",
             },
         };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stalfh233/omc-cli",
-  "version": "0.4.22",
+  "version": "0.4.23",
   "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.22",
+    "omc-core": "0.4.23",
     "proper-lockfile": "4.1.2",
     "write-file-atomic": "6.0.0",
     "zod": "^3.23.8",

package/skills/omc-capabilities.md

@@ -170,7 +170,8 @@ only the section for the capability you need —
 - **工具**：`data.list`、`data.load`、`data.save`、`data.update`、`data.delete`、`data.submit`
 - **recipe**：
   - `omc describe data.save --example workflow-backed-data-save`
-  - `omc describe data.submit --example workflow-backed-data-submit`
+  - `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`
 - **边界 / 陷阱**：读实际业务记录是 OMC 独有能力。**计算字段（FORMULA/子表计算）不由 API 回填**——写测试数据带预算值，公式正确性人工前台确认；带子表计算字段的模型 API 写可能 50000（服务端重算 NPE），前台正常。
 
 ---