@stalfh233/omc-cli 0.4.23 → 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 {

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/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

@@ -548,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 });
@@ -630,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 规则。无流程模型直提形状：data.submit {schemaCode, bizObjectId: 本读回的 bizObjectId, formData}（免流程身份，submit 自持久化）",
-            },
+            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.23",
+  "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.23",
+    "omc-core": "0.4.24",
     "proper-lockfile": "4.1.2",
     "write-file-atomic": "6.0.0",
     "zod": "^3.23.8",