@stalfh233/omc-cli 0.4.50 → 0.4.52

package/dist/approval-flow.js

@@ -0,0 +1,129 @@
+/**
+ * `omc approval-flow` — 审批流拼装器（v1：线性多级审批）。
+ *
+ * r75-T2a/r68 实测：一条两级审批流要整轮对话手拼——participant 解析陷阱、
+ * 审批节点字段权限默认 editable:true 是错的（r75 agent 自纠过）、驳回路由。
+ * 本命令把线性审批链压成一条命令：
+ *
+ *   omc approval-flow --schema s --steps "采购经理@role:crm_mgr,总监@role:crm_dir" \
+ *     [--originator-node] [--reject-to-start] [--apply]
+ *
+ * 步骤 DSL：`名称@role:<角色code>`（FindUserByRole 按发起人部门找人）或
+ * `名称@user:<用户id>`（参与者对象）。编译为 recipe 验证形状（workflow-approval-
+ * template-update）：START → [填写申请单{Originator}] → 审批链 → END；审批节点
+ * 全字段 visible:true/editable:false（r75 规范修正）；工具自动补设计器默认
+ * （sheetCode 回填/链路接入/permittedAction/rejectToStart）。
+ * --apply 执行链：workflow.create（模型无流程时）→ field.list（取权限字段）→
+ * workflow.update(模板) → workflow.publish；默认 dry-run 只编译模板预览。
+ */
+import { runToolCall } from "./call.js";
+import { envelope, requestId, classifyResult, CLI_EXIT_CODES } from "./cli-contract.js";
+import { writeEnvelope } from "./cli-output.js";
+/** 解析步骤 DSL 为 {name, participant}（导出供测试）。 */
+export function parseStep(raw) {
+    const match = /^(.+?)@(role|user):([A-Za-z0-9_.:-]+)$/.exec(raw.trim());
+    if (!match)
+        throw new Error(`--steps "${raw}" 解析失败：形如 名称@role:<角色code> 或 名称@user:<用户id>（自由文本角色名能发布但解析不到人、不生成待办）`);
+    const [, name, kind, code] = match;
+    if (kind === "role")
+        return { name: name.trim(), participant: `FindUserByRole({Originator.OU},"${code}","random")` };
+    return { name: name.trim(), participant: JSON.stringify([{ code, corpId: "other", id: code, name: name.trim(), type: 3 }]) };
+}
+/** 编译完整模板（recipe 验证形状）。 */
+export function composeApprovalTemplate(options) {
+    if (options.steps.length === 0)
+        throw new Error("至少一个 --steps 审批步骤");
+    const activities = [
+        { activityCode: "Activity1", activityType: "START", activityName: "开始", i18nMessage: "开始" },
+    ];
+    let n = 2;
+    if (options.originatorNode) {
+        activities.push({ activityCode: `Activity${n}`, activityType: "PARTICIPANT", activityName: "填写申请单", i18nMessage: "填写申请单", participant: "{Originator}" });
+        n += 1;
+    }
+    for (const raw of options.steps) {
+        const { name, participant } = parseStep(raw);
+        activities.push({
+            activityCode: `Activity${n}`, activityType: "PARTICIPANT", activityName: name, i18nMessage: name,
+            participant,
+            ...(options.rejectToStart ? { permittedAction: { rejectToStart: true } } : {}),
+        });
+        n += 1;
+    }
+    activities.push({ activityCode: `Activity${n}`, activityType: "END", activityName: "结束", i18nMessage: "结束" });
+    return { workflowCode: `${options.schema}_wf`, activities };
+}
+export async function cmdApprovalFlow(args) {
+    const request = requestId();
+    const flag = (name) => {
+        const index = args.indexOf(name);
+        return index >= 0 ? args[index + 1] : undefined;
+    };
+    const multi = (name) => {
+        const values = [];
+        for (let i = 0; i < args.length; i++) {
+            if (args[i] === name && args[i + 1] !== undefined)
+                values.push(args[i + 1]);
+        }
+        return values;
+    };
+    const schema = flag("--schema") ?? flag("--schema-code");
+    const steps = multi("--steps");
+    const environment = flag("--env") ?? flag("--environment");
+    const apply = args.includes("--apply");
+    const originatorNode = !args.includes("--no-originator-node");
+    const rejectToStart = !args.includes("--no-reject-to-start");
+    const usage = '用法：omc approval-flow --schema <模型> --steps "节点名@role:<角色code>" [--steps ...多级] [--no-originator-node] [--no-reject-to-start] [--apply]\n步骤也可用 名称@user:<用户id> 绑定具体审批人。默认 dry-run（编译模板预览）；--apply 建/改流程+字段权限+发布。';
+    const invalid = (message) => {
+        writeEnvelope(envelope("error", {}, request, { code: "invalid-input", message: `${message}\n${usage}`, retryable: false }));
+        return CLI_EXIT_CODES.invalidInput;
+    };
+    if (!schema)
+        return invalid("--schema 必填");
+    let compiled;
+    try {
+        compiled = composeApprovalTemplate({ schema, steps, originatorNode, rejectToStart, environment, apply });
+    }
+    catch (error) {
+        return invalid(error instanceof Error ? error.message : String(error));
+    }
+    if (!apply) {
+        writeEnvelope(envelope("ok", { schemaCode: schema, ...compiled, dryRun: true, note: "dry-run 仅编译预览；--apply 执行 workflow.create(无流程时)→update(模板+字段权限)→publish" }, request));
+        return 0;
+    }
+    // 1) 确保流程存在（一个模型只能有一个：已存在则直接 update）
+    const createOutcome = await runToolCall("workflow.create", { args: { schemaCode: schema, code: compiled.workflowCode, name: `${schema} 审批流`, ...(environment ? { environment } : {}) }, requestId: request, environment });
+    if (createOutcome.exitCode !== 0) {
+        const result = createOutcome.result;
+        const blocker = String(result.blocker ?? "");
+        if (!blocker.includes("workflow-exists") && !String(result.message ?? "").includes("已存在") && !String(result.message ?? "").includes("only one")) {
+            writeEnvelope(envelope(classifyResult(result).status, result, request, classifyResult(result).error));
+            return createOutcome.exitCode;
+        }
+    }
+    // 2) 取字段清单构建审批节点只读权限（r75 修正：审批节点 editable:false）
+    const fieldList = await runToolCall("field.list", { args: { schemaCode: schema, published: true, ...(environment ? { environment } : {}) }, requestId: request, environment });
+    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}");
+    const activitiesWithPermissions = compiled.activities.map((a) => approvalNodes.includes(a) && propertyCodes.length > 0
+        ? { ...a, propertyPermissions: propertyCodes.map((propertyCode) => ({ propertyCode, visible: true, editable: false, required: false })) }
+        : a);
+    // 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,
+    });
+    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 classified = classifyResult(publishOutcome.result);
+    writeEnvelope(envelope(classified.status, { schemaCode: schema, workflowCode: compiled.workflowCode, steps: steps.length, 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;
+}
+//# sourceMappingURL=approval-flow.js.map

package/dist/cli.js

@@ -21,6 +21,8 @@ import { buildToolRegistry } from "./tools.js";
 import { acquireWriteLock } from "./write-lock.js";
 import { cmdCompute } from "./compute.js";
 import { cmdRuleWhen } from "./rule-when.js";
+import { cmdApprovalFlow } from "./approval-flow.js";
+import { cmdFormDefault } from "./form-default.js";
 // --utf8：单次调用明文输出（等效 OMC_ASCII_STDOUT=0）。在 asciiStdout 缓存读取前生效。
 if (process.argv.includes("--utf8"))
     process.env.OMC_ASCII_STDOUT = "0";
@@ -952,6 +954,14 @@ async function main() {
         const rest = ["rule-when", ...(options.schema ? ["--schema", options.schema] : []), ...(options.schemaCode ? ["--schema-code", options.schemaCode] : []), ...(options.on ? ["--on", options.on] : []), ...(Array.isArray(options.when) ? options.when.flatMap((w) => ["--when", w]) : []), ...(Array.isArray(options.then) ? options.then.flatMap((a) => ["--then", a]) : []), ...(options.name ? ["--name", options.name] : []), ...(options.env ? ["--env", options.env] : []), ...(options.environment ? ["--environment", options.environment] : []), ...(options.apply ? ["--apply"] : [])];
         commandExitCode = await cmdRuleWhen(rest);
     });
+    command.command("approval-flow").option("--schema <schemaCode>").option("--schema-code <schemaCode>").option("--steps <step>", undefined, { variadic: true }).option("--env <environment>").option("--environment <environment>").option("--apply").option("--no-originator-node").option("--no-reject-to-start").addHelpText("after", "\n审批流拼装器：--steps 名称@role:<角色code>（多级给多个）。编译为验证模板（START→填写→审批链→END，审批节点字段只读），--apply 建流+权限+发布。\n").action(async (options) => {
+        const rest = ["approval-flow", ...(options.schema ? ["--schema", options.schema] : []), ...(options.schemaCode ? ["--schema-code", options.schemaCode] : []), ...(Array.isArray(options.steps) ? options.steps.flatMap((s) => ["--steps", s]) : []), ...(options.env ? ["--env", options.env] : []), ...(options.environment ? ["--environment", options.environment] : []), ...(options.apply ? ["--apply"] : []), ...(options.originatorNode === false ? ["--no-originator-node"] : []), ...(options.rejectToStart === false ? ["--no-reject-to-start"] : [])];
+        commandExitCode = await cmdApprovalFlow(rest);
+    });
+    command.command("form-default").option("--schema <schemaCode>").option("--schema-code <schemaCode>").option("--field <field>").option("--default <value>").option("--env <environment>").option("--environment <environment>").option("--apply").addHelpText("after", "\n表单默认值拼装器：字段默认值在表单控件层（control.options.defaultValue），本命令一条命令完成 draft→publish→权威回读。\n").action(async (options) => {
+        const rest = ["form-default", ...(options.schema ? ["--schema", options.schema] : []), ...(options.schemaCode ? ["--schema-code", options.schemaCode] : []), ...(options.field ? ["--field", options.field] : []), ...(options.default !== undefined ? ["--default", options.default] : []), ...(options.env ? ["--env", options.env] : []), ...(options.environment ? ["--environment", options.environment] : []), ...(options.apply ? ["--apply"] : [])];
+        commandExitCode = await cmdFormDefault(rest);
+    });
     command.command("script [file]").option("--env <environment>", "行内无 env 时的默认环境").option("--continue", "某行失败后继续执行剩余行（默认停在首个失败）").description("NDJSON 多调脚本：每行 {\"tool\":\"<名称>\",\"args\":{...},\"env\":\"<环境>\",\"dryRun\":true}（# 注释/空行忽略；file 为 - 读 stdin）；一个进程一次会话跑完全部，逐行输出 {index,tool,exitCode,result}").action(async (file, options) => {
         const { runScript, parseScript, readScriptInput } = await import("./script.js");
         let lines;

package/dist/form-default.js

@@ -0,0 +1,116 @@
+/**
+ * `omc form-default` — 表单控件默认值拼装器。
+ *
+ * r68-t3 与 r75-a1 两次实测：「字段默认值」不在 field.create/update（字段级无此
+ * 参数），而在**表单控件层**（control.options.defaultValue）——agent 每次都要
+ * form.get → 手改 draftAttributesJson → form.draft → form.publish 全链。
+ * 本命令一条命令完成：
+ *
+ *   omc form-default --schema s --field status --default 履行中 [--apply]
+ *
+ * 执行链（--apply）：form.get（controls:[field] 取控件全对象）→ 修改
+ * options.defaultValue → form.draft（draftAttributesJson 全量回写，保布局）→
+ * form.publish → form.get 权威回读确认 defaultValue 落库。默认 dry-run 只回显
+ * 将要做的修改。
+ */
+import { runToolCall } from "./call.js";
+import { envelope, requestId, classifyResult, CLI_EXIT_CODES } from "./cli-contract.js";
+import { writeEnvelope } from "./cli-output.js";
+/** 从 form.get 结果提取控件数组（draft 优先，published 兜底）。 */
+function toControlList(value) {
+    if (Array.isArray(value))
+        return value;
+    // form.get controls:<选择> 返回按字段码为键的对象（实测：{"status":{...}}）
+    if (value && typeof value === "object")
+        return Object.values(value);
+    return [];
+}
+function extractControls(formGet) {
+    const draft = toControlList(formGet.draftControls);
+    if (draft.length > 0)
+        return { controls: draft, face: "draft" };
+    const published = toControlList(formGet.publishedControls);
+    if (published.length > 0)
+        return { controls: published, face: "published" };
+    return undefined;
+}
+export async function cmdFormDefault(args) {
+    const request = requestId();
+    const flag = (name) => {
+        const index = args.indexOf(name);
+        return index >= 0 ? args[index + 1] : undefined;
+    };
+    const schema = flag("--schema") ?? flag("--schema-code");
+    const field = flag("--field");
+    const value = flag("--default");
+    const environment = flag("--env") ?? flag("--environment");
+    const apply = args.includes("--apply");
+    const usage = '用法：omc form-default --schema <模型> --field <字段code> --default <默认值> [--apply]\n默认 dry-run（回显将要做的修改）；--apply 执行 form.draft→publish 并权威回读。';
+    const invalid = (message) => {
+        writeEnvelope(envelope("error", {}, request, { code: "invalid-input", message: `${message}\n${usage}`, retryable: false }));
+        return CLI_EXIT_CODES.invalidInput;
+    };
+    if (!schema || !field || value === undefined)
+        return invalid("--schema/--field/--default 均必填");
+    // 1) 读控件（单控件投影，拿全对象含 options）
+    const getOutcome = await runToolCall("form.get", { args: { schemaCode: schema, controls: [field], ...(environment ? { environment } : {}) }, requestId: request, environment });
+    if (getOutcome.exitCode !== 0) {
+        const classified = classifyResult(getOutcome.result);
+        writeEnvelope(envelope(classified.status, getOutcome.result, request, classified.error));
+        return getOutcome.exitCode;
+    }
+    const extracted = extractControls(getOutcome.result ?? {});
+    const control = extracted?.controls.find((c) => String(c.key ?? c.dataItemName ?? "") === field || String(c.code ?? "") === field);
+    if (!control)
+        return invalid(`form.get 未取到字段 "${field}" 的控件——先确认字段已发布且已进表单（新字段先 form.draft rebuild:true）`);
+    const nextControl = JSON.parse(JSON.stringify(control));
+    const options = (nextControl.options ?? {});
+    // 单选/多选类默认值是数组（form-support:136 证据），文本类是字符串；按现值类型对齐
+    if (Array.isArray(options.defaultValue))
+        options.defaultValue = [value];
+    else
+        options.defaultValue = value;
+    nextControl.options = options;
+    if (!apply) {
+        writeEnvelope(envelope("ok", { schemaCode: schema, field, from: options.defaultValue === value ? undefined : control, to: nextControl, dryRun: true, note: "--apply 执行 form.draft→form.publish" }, request));
+        return 0;
+    }
+    // 2) form.draft：需要完整 draftAttributesJson——单控件投影不够，取全量控件面
+    const getAll = await runToolCall("form.get", { args: { schemaCode: schema, controls: true, ...(environment ? { environment } : {}) }, requestId: request, environment });
+    if (getAll.exitCode !== 0) {
+        const classified = classifyResult(getAll.result);
+        writeEnvelope(envelope(classified.status, getAll.result, request, classified.error));
+        return getAll.exitCode;
+    }
+    const fullExtracted = extractControls(getAll.result ?? {});
+    if (!fullExtracted)
+        return invalid("form.get 未取到任何控件（表单为空？先发布默认表单）");
+    const fullControls = fullExtracted.controls.map((c) => (String(c.key ?? c.dataItemName ?? "") === field ? nextControl : c));
+    const draftOutcome = await runToolCall("form.draft", {
+        args: { schemaCode: schema, draftAttributesJson: JSON.stringify(fullControls), ...(environment ? { environment } : {}) },
+        requestId: request, environment,
+    });
+    if (draftOutcome.exitCode !== 0) {
+        const classified = classifyResult(draftOutcome.result);
+        writeEnvelope(envelope(classified.status, draftOutcome.result, request, classified.error));
+        return draftOutcome.exitCode;
+    }
+    const publishOutcome = await runToolCall("form.publish", { args: { schemaCode: schema, ...(environment ? { environment } : {}) }, requestId: request, environment });
+    if (publishOutcome.exitCode !== 0) {
+        const classified = classifyResult(publishOutcome.result);
+        writeEnvelope(envelope(classified.status, publishOutcome.result, request, classified.error));
+        return publishOutcome.exitCode;
+    }
+    // 3) 权威回读
+    const verify = await runToolCall("form.get", { args: { schemaCode: schema, controls: [field], ...(environment ? { environment } : {}) }, requestId: request, environment });
+    const verifyResult = verify.result ?? {};
+    const verifyControls = extractControls(verifyResult)?.controls ?? [];
+    const verifyControl = verifyControls.find((c) => String(c.key ?? c.dataItemName ?? "") === field);
+    const appliedDefault = verifyControl ? (verifyControl.options?.defaultValue ?? null) : null;
+    const ok = JSON.stringify(appliedDefault) === JSON.stringify(Array.isArray(options.defaultValue) ? [value] : value);
+    writeEnvelope(envelope(ok ? "ok" : "uncertain", { schemaCode: schema, field, default: value, published: ok, readback: { defaultValue: appliedDefault }, ...(ok ? {} : { nextAction: "回读默认值与目标不一致，设计器人工核对" }) }, request));
+    if (ok)
+        process.stderr.write("[omc] 前台生效验证清单：门户新建该模型记录，确认控件预填默认值；改默认值同理重跑本命令。\n");
+    return ok ? 0 : 1;
+}
+//# sourceMappingURL=form-default.js.map

package/dist/lanes/runtime-data.js

@@ -352,6 +352,7 @@ export function registerRuntimeDataLane(tools) {
             showTotal: z.boolean().default(true),
             page: z.number().int().min(0).default(0),
             size: z.number().int().min(1).max(200).default(10),
+            all: z.boolean().optional().describe("true 时自动翻页聚合全部结果（内部按 size=200 逐页拉取，安全上限 1000 行，超出截断并标记 capped）——存量盘点/数据核对用，替代手动循环翻页"),
             full: z.boolean().optional().describe("内联完整列表结果；默认大结果只返回计数与 detailFile"),
             capability: capabilityArg,
         },
@@ -426,6 +427,36 @@ export function registerRuntimeDataLane(tools) {
                 };
                 // An empty model answers with a business error (301005) on this face;
                 // that is "no data yet", not a query failure.
+                if (args.all === true) {
+                    const CAP = 1000;
+                    const pageSize = 200;
+                    const firstBody = { ...body, page: 0, size: pageSize };
+                    const first = await wireCall(session, { path: ENDPOINTS.runtimeQueryList, method: "POST", body: firstBody });
+                    const firstPage = extractBizObjectPage(first.data);
+                    const total = Number(firstPage.total ?? 0);
+                    if (total === 0 || firstPage.content.length === 0)
+                        return { schemaCode: args.schemaCode, total: 0, page: "all", size: 0, pagesFetched: 0, items: [] };
+                    const rows = [...firstPage.content];
+                    const target = Math.min(total, CAP);
+                    let pageIndex = 1;
+                    while (rows.length < target) {
+                        const next = await wireCall(session, { path: ENDPOINTS.runtimeQueryList, method: "POST", body: { ...body, page: pageIndex, size: pageSize } });
+                        const nextPage = extractBizObjectPage(next.data);
+                        if (nextPage.content.length === 0)
+                            break;
+                        rows.push(...nextPage.content);
+                        pageIndex += 1;
+                    }
+                    const capped = rows.length > CAP;
+                    const items = (capped ? rows.slice(0, CAP) : rows).map((row0) => {
+                        const row = row0;
+                        const rawData = row.data && typeof row.data === "object" ? row.data : {};
+                        const data = args.full === true ? rawData : compactRuntimeRecord(rawData);
+                        const selected = fields ?? Object.keys(data).filter((field) => !["id", "bizObjectId", "schemaCode", "sequenceStatus", "createdTime", "updatedTime", "creator", "updater"].includes(field));
+                        return { id: row.bizObjectId ?? row.id ?? data.id, fields: Object.fromEntries(selected.map((field) => [field, data[field] ?? null])) };
+                    });
+                    return { schemaCode: args.schemaCode, total, page: "all", size: rows.length, pagesFetched: pageIndex, ...(capped ? { capped: true, capNotice: `结果超过安全上限 ${CAP}，已截断；请加 filters 分批` } : {}), items };
+                }
                 let result;
                 try {
                     result = await wireCall(session, { path: ENDPOINTS.runtimeQueryList, method: "POST", body });

package/dist/write.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { randomUUID } from "node:crypto";
 import { existsSync, readdirSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { basename, join } from "node:path";
 /** Parse a JSON string for the dry-lint; unparseable input returns undefined so the shape validators report it. */
 function parseJsonOrUndefined(text) {
     try {
@@ -151,7 +151,7 @@ async function governedWrite(ctx, tool, args, execute, dryRunPayload) {
                 rollbackable: rollbackBefore !== undefined && !rollbackCaptureError,
                 ...(rollbackCaptureError ? { note: `before-capture failed: ${rollbackCaptureError}` } : {}),
                 artifactFile: artifactRef.detailFile,
-                artifactId: artifactRef.detailFile.split("/").pop()?.replace(/\.json$/, "") ?? "",
+                artifactId: basename(artifactRef.detailFile).replace(/\.artifact$/, "") || basename(artifactRef.detailFile),
                 artifactSha: artifactRef.detailSha256,
             });
             rollbackRef = { seq: entry.seq, hint: `omc rollback plan ${entry.seq}（--env ${entry.environment}）` };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stalfh233/omc-cli",
-  "version": "0.4.50",
+  "version": "0.4.52",
   "description": "CloudPivot 8.6 configuration capability CLI — governed, fail-closed, coverage-manifest bounded.",
   "type": "module",
   "bin": {