@stalfh233/omc-cli 0.4.22 → 0.4.24

package/dist/cli.js

@@ -738,7 +738,7 @@ function intentWarnings(intent) {
                 warnings.push({
                     resource: `rule:${model.code}.${rule.code}`,
                     code: "rule-preset-name-ignored",
-                    message: `规则 ${rule.code} 是平台预置触发规则，其名称由平台维护（如 Create=数据新增）；声明的 name "${rule.name}" 不会生效（只有自定义规则的名称与节点名可改）。要改的是节点名，请改 nodeGraph/actions 中节点的 nodeName。`,
+                    message: `规则 ${rule.code} 是平台预置触发规则，其名称由平台维护（如 Create=数据新增）；声明的 name "${rule.name}" 不会生效（只有自定义规则的名称与节点名可改）——预置行可直接省略 name 以消除本警告；要改显示名请改 nodeGraph/actions 中节点的 nodeName。`,
                 });
             let graph;
             try {
@@ -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/discovery.js

@@ -1,4 +1,7 @@
 import { zodToJsonSchema } from "zod-to-json-schema";
+import { closestMatch } from "./closest-match.js";
+import { RUNNABLE_EXAMPLES } from "./intent/schema.js";
+const INTENT_EXAMPLE_IDS = RUNNABLE_EXAMPLES.map((example) => example.id);
 import { z } from "zod";
 import { LANE_CONTRACTS } from "./contract-resources.js";
 import { intentCapabilityBlock } from "./intent/cli.js";
@@ -213,12 +216,31 @@ export function describeExample(registry, name, exampleId) {
         // No id (or an unknown one) lists the runnable ids instead of a dead end, so
         // an agent that guessed never burns a retry (sandbox26: `--example` with no
         // id was a hard commander error; an unknown id already listed `available`).
+        // r18 retro: two more layers — a did-you-mean (the id was GUESSED, e.g.
+        // `scalar-numeric-radio` on configure_model) and a cross-tool reverse
+        // lookup (that id exists under ANOTHER tool's recipes — point there
+        // instead of a bare miss). Machine-recoverable status, copy-paste next.
+        const ids = recipes.map((entry) => entry.id);
+        const closest = exampleId !== undefined ? closestMatch(exampleId, ids) : undefined;
+        const otherTool = exampleId === undefined
+            ? undefined
+            : registry.find((entry) => entry !== tool && (entry.executionMetadata?.recipes ?? []).some((recipe2) => recipe2.id === exampleId));
+        // The intent examples (scalar-numeric-radio, relation-work-sheet, …) live
+        // on the `intent` CLI face, not a registry tool — r18 asked lane tools for
+        // them repeatedly. Redirect to the face that owns them.
+        const intentExample = exampleId !== undefined && otherTool === undefined ? INTENT_EXAMPLE_IDS.find((id) => id === exampleId) : undefined;
         return {
             name: tool.name,
+            // NOTE: no `status` key — the envelope classifier would turn a non-"ok"
+            // status into a non-zero exit; a discovery miss is a successful query
+            // with a miss payload (`found:false` is the machine signal).
             ...(exampleId !== undefined ? { example: exampleId } : {}),
             found: false,
-            available: recipes.map((entry) => entry.id),
-            ...(recipes[0] ? { hint: `本工具的例子 id 是 ${recipes.map((entry) => entry.id).join("、")}；用 describe ${tool.name} --example ${recipes[0].id} 取可运行参数` } : {}),
+            available: ids,
+            ...(closest !== undefined ? { didYouMean: closest, next: `omc describe ${tool.name} --example ${closest}` } : recipes[0] ? { next: `omc describe ${tool.name} --example ${recipes[0].id}` } : {}),
+            ...(otherTool !== undefined ? { existsUnder: otherTool.name, crossToolNext: `omc describe ${otherTool.name} --example ${exampleId}` } : {}),
+            ...(intentExample !== undefined ? { existsUnder: "intent", crossToolNext: `omc intent schema --example ${exampleId}（整包任务用声明式形状）` } : {}),
+            ...(ids.length === 0 && !otherTool ? { hint: `本工具没有配方示例；整包任务用 omc intent schema --example <id> 取声明式形状` } : {}),
         };
     }
     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/goal-routes.js

@@ -44,7 +44,26 @@ function intentGuidance() {
     return {
         path: "declarative",
         why: "整包需求：用一份声明式意图文件描述 models/fields/form/listview/rules/workflow/onlinejs/services，由编译器合成平台原生结构并按依赖顺序执行；比逐能力拼装更省上下文、更不易漂移。",
+        starter: `intentVersion: 1
+models:
+  - code: <模型code>          # 如 omc_todo_task
+    name: <业务名>
+    fields:
+      - {code: title, name: 标题, type: SHORT_TEXT}
+      - {code: amount, name: 数量, type: NUMERICAL, options: {scale: 2}}   # NUMERICAL 必带 scale
+      - {code: level, name: 等级, type: RADIO, choices: [高, 中, 低]}        # 选择族用顶层 choices
+    form: {publish: true}
+    listview: {fieldCodes: [title, level]}
+    rules:
+      - code: Create            # 平台预置触发行（name 省略）
+        name: 新增规则           # 仅自定义规则需要 name；预置行可省
+        enabled: true
+        actions:
+          - when: [{field: amount, gt: 10}]
+            set: [{field: title, value: "超限"}]
+`,
         commands: [
+            "把上面的 starter 存成 <file>.yaml 按需求改字段后：omc intent validate <file>.yaml（离线）→ omc intent plan <file>.yaml --env <env> → omc intent apply <file>.yaml --env <env>（apply 也能直接吃 YAML）",
             "omc intent schema [--example <id>]：离线看 intent YAML 的键位/操作符/可运行示例（写 intent 前先看，省去猜键名与试错）",
             "omc intent plan <file> --env <env>：离线先校验（形体错在接触环境前返回，故 validate 可选）；大 plan 自动外置，回 planExternalized:true + planFile，直接 `omc intent apply <planFile>`；小 plan 才内联在 result.plan",
             "omc intent apply <planFile|plan.json>（默认最终读回等价校验；--no-verify 关闭）",

package/dist/intent/schema.js

@@ -22,7 +22,7 @@ export const INTENT_CONDITION_OPERATORS = Object.freeze({
 });
 /** A `when` gate leaf compares against a literal; `from` (field-to-field) is only for `filter`. */
 export const INTENT_WHEN_OPERATORS = Object.freeze(["equals", "notEquals", "gt", "gte", "lt", "lte"]);
-const RUNNABLE_EXAMPLES = Object.freeze([
+export const RUNNABLE_EXAMPLES = Object.freeze([
     {
         id: "scalar-numeric-radio",
         title: "标量/数值/RADIO（choices）——type 用族名，NUMERICAL 必带 options.scale，选择族用顶层 choices",
@@ -126,7 +126,7 @@ export function intentSchemaBlock() {
         listview: { required: [], optional: ["code", "name", "fieldCodes", "absent"], note: "intent 只声明列；业务筛选/排序/按钮 apply 后用 omc call listview.configure 补" },
         datarules: { required: ["propertyCode", "dataRuleType"], optional: ["options", "checkType", "childRule", "name", "sortKey", "absent"], note: "type3/4/5 不驱动门户；门户条件走 fields[].options" },
         rules: {
-            required: ["code", "name", "enabled"],
+            required: ["code", "name（预置触发行 Create/Update/Delete… 可省略，声明的 name 不会生效）", "enabled"],
             optional: ["bizRuleType", "customTrigger", "actions", "nodeGraph"],
             note: "actions（紧凑 UPDATE）与 nodeGraph 二选一；非 UPDATE 节点用 nodeGraph",
             actionLeaf: {

package/dist/lanes/list-view.js

@@ -241,7 +241,11 @@ export function registerListViewLane(tools) {
                 code,
                 present: true,
                 name: model.name ?? null,
-                published: model.published === true,
+                // r18 retro (G5): the placeholder flag misleads ("is my view
+                // inactive?"). Views are ALWAYS-LIVE on save; keep the legacy key
+                // null-ed for shape compatibility and name the lifecycle instead.
+                published: null,
+                lifecycle: "always-live",
                 presentationType: model.queryPresentationType ?? null,
                 columnCount: columns.length,
                 columns,

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 })}` });
         },
@@ -528,6 +548,7 @@ export function registerRuntimeDataLane(tools) {
         sheetCode: z.string().optional(),
         formData: runtimeFormDataArg,
         workflowCode: z.string().optional().describe("portal draft-save shape: create the row AND a DRAFT workflow instance + start workItem (finishStart=FALSE); submit later via data.submit with the returned workItemId. formData must NOT carry an id — in-place workflow start has no REST surface in 8.6.26"),
+        submit: z.boolean().optional().describe("r18 retro：true=一调完成态——保存后立即直提（无流程模型 DRAFT→COMPLETED，触发 Create 业务规则）；与 workflowCode 互斥（流程草稿须走 data.submit 两段式）。默认 false 仅存草稿"),
         ...readbackProjectionArgs,
     }, async (session, args) => {
         const { sheetCode, resolvedFrom } = await resolveFormSheetCode(session, { schemaCode: args.schemaCode, sheetCode: args.sheetCode });
@@ -610,18 +631,46 @@ export function registerRuntimeDataLane(tools) {
         if (typeof bizObjectId === "string" && bizObjectId) {
             readbackData = (await wireCall(session, { path: ENDPOINTS.runtimeFormLoad, query: { schemaCode: args.schemaCode, sheetCode, objectId: bizObjectId } })).data;
         }
+        // Ticket 111: a plain save lands as sequenceStatus DRAFT, and DRAFT
+        // rows SKIP the Create/Update rule dispatch entirely
+        // (DomainServiceImpl.java:240-248 buckets drafts before the rule
+        // 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.
+        const plainReadback = {
+            authoritative: projectReadbackRecord(normalizeLoadedRecord((readbackData ?? {})), args),
+            draftRuleHint: "草稿态（DRAFT）保存不触发业务规则——DRAFT 行跳过 Create/Update 分发（DomainServiceImpl.java:240-248）；要一调完成态本调用加 submit:true；已存草稿直提形状：data.submit {schemaCode, bizObjectId: 本读回的 bizObjectId, formData}（submit 自持久化）",
+        };
+        // r18 retro (G3): one-call COMPLETED creation — the agent goal is usually
+        // "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) {
+            const submitTool = tools.find((entry) => entry.name === "data.submit");
+            const submitOutcome = submitTool?.writeExecute
+                ? await submitTool.writeExecute(session, { schemaCode: args.schemaCode, bizObjectId, formData: args.formData })
+                : { status: "error", message: "data.submit 工具不可用" };
+            if ("status" in submitOutcome && typeof submitOutcome.status === "string" && submitOutcome.status !== "ok") {
+                // The save itself DELIVERED — report it honestly with the submit
+                // refusal attached, never as a plain refusal.
+                const envelope = "envelope" in submitOutcome ? submitOutcome.envelope : submitOutcome;
+                return {
+                    performed: { errcode: performed.errcode, bizObjectId, sheetCode, resolvedFrom, submitted: false },
+                    readback: { ...plainReadback, submitRefused: envelope },
+                };
+            }
+            const okOutcome = submitOutcome;
+            return {
+                performed: { errcode: performed.errcode, bizObjectId, sheetCode, resolvedFrom, submitted: true },
+                readback: {
+                    ...okOutcome.readback,
+                    submitted: true,
+                    ruleHint: "已直提 COMPLETED——Create 业务规则本次已分发；规则效果以本读回字段值为准",
+                },
+            };
+        }
         return {
             performed: { errcode: performed.errcode, bizObjectId, sheetCode, resolvedFrom },
-            readback: {
-                authoritative: projectReadbackRecord(normalizeLoadedRecord((readbackData ?? {})), args),
-                // Ticket 111: a plain save lands as sequenceStatus DRAFT, and DRAFT
-                // rows SKIP the Create/Update rule dispatch entirely
-                // (DomainServiceImpl.java:240-248 buckets drafts before the rule
-                // 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 规则",
-            },
+            readback: plainReadback,
         };
     });
     writeTool(tools, "data.update", RUNTIME_LANE, RUNTIME_TOOLS["data.update"].scope, RUNTIME_TOOLS["data.update"].description, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stalfh233/omc-cli",
-  "version": "0.4.22",
+  "version": "0.4.24",
   "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.24",
     "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），前台正常。
 
 ---