@stalfh233/omc-cli 0.6.7 → 0.6.10

package/dist/lanes/form.js

@@ -24,6 +24,25 @@ function resolveSheetCode(schemaCode, sheetCode) {
     return sheetCode ?? schemaCode;
 }
 /** Control codes present in a form attributes JSON face (sorted, stable). */
+/**
+ * 布局行分组：`viewJson` 是 `string[][]`（一行 N 个 code = N 列）。解析失败或形状
+ * 不是二维数组时返回 undefined（不要把它伪装成空布局）。
+ */
+function parseLayoutRows(face) {
+    if (typeof face !== "string")
+        return undefined;
+    try {
+        const parsed = JSON.parse(face);
+        if (!Array.isArray(parsed))
+            return undefined;
+        if (!parsed.every((row) => Array.isArray(row) && row.every((cell) => typeof cell === "string")))
+            return undefined;
+        return parsed;
+    }
+    catch {
+        return undefined;
+    }
+}
 function parseControlCodes(face) {
     if (typeof face !== "string")
         return [];
@@ -35,6 +54,29 @@ function parseControlCodes(face) {
         return [];
     }
 }
+/**
+ * `--full` 的小体量布局摘要（控件码 + 行分组）。只在**加起来很小**时才给：
+ * 目的本来是"省一次默认面往返"，一旦它自己变大就成了新的负担。
+ */
+function smallLayoutSummary(draftCodes, publishedCodes, sheet) {
+    const draftRows = parseLayoutRows(sheet.draftViewJson);
+    const publishedRows = parseLayoutRows(sheet.publishedViewJson);
+    const payload = { draftCodes, publishedCodes, draftRows, publishedRows };
+    const bytes = Buffer.byteLength(JSON.stringify(payload), "utf8");
+    if (bytes > 2048) {
+        return {
+            layoutSummaryOmitted: true,
+            layoutSummaryBytes: bytes,
+            layoutSummaryNote: `控件码/行分组 ${bytes}B 超过内联预算（2048B）未内联——用 artifact 里的 draftViewJson/publishedViewJson 解析，或读默认面的 draftControlCodes/draftRows`,
+        };
+    }
+    return {
+        draftControlCodes: draftCodes,
+        publishedControlCodes: publishedCodes,
+        ...(draftRows !== undefined ? { draftRows } : {}),
+        ...(publishedRows !== undefined ? { publishedRows } : {}),
+    };
+}
 export function registerFormLane(tools) {
     tools.push(defineTool({
         name: "form.get",
@@ -60,12 +102,39 @@ export function registerFormLane(tools) {
             const sheet = (await wireCall(session, { path: ENDPOINTS.sheetGet, query: { schemaCode: args.schemaCode, sheetCode } })).data;
             if (!sheet)
                 return { schemaCode: args.schemaCode, sheetCode, present: false };
+            // r28e F8（真机复现 2026-11-05，CloudPivot 1.1.25）：publish → form.draft
+            // 之后，平台 bizsheet/get 的 `published`/`existDraft` 两个布尔**都回 false**，
+            // 而 `draftViewJson`/`publishedViewJson`/`draftAttributesJson`/
+            // `publishedAttributesJson` 四份内容都在。只信布尔会让调用方得出
+            // 「既没草稿也没发布」的相反结论（探针原话）。
+            //
+            // 处置：布尔照原样回（契约与既有判据不变），另加**由实际内容推导**的
+            // `faces`，并在两者矛盾时给 `flagMismatch` + 一句可读说明——矛盾本身
+            // 就是最有用的信息，不要替调用方猜哪边对。
+            const draftCodes = parseControlCodes(sheet.draftAttributesJson);
+            const publishedCodes = parseControlCodes(sheet.publishedAttributesJson);
+            const draftPresent = draftCodes.length > 0 || (typeof sheet.draftViewJson === "string" && sheet.draftViewJson.trim() !== "" && sheet.draftViewJson.trim() !== "[]");
+            const publishedPresent = publishedCodes.length > 0 || (typeof sheet.publishedViewJson === "string" && sheet.publishedViewJson.trim() !== "" && sheet.publishedViewJson.trim() !== "[]");
+            const platformPublished = sheet.published === true;
+            const platformDraft = sheet.existDraft === true;
+            const flagMismatch = platformPublished !== publishedPresent || platformDraft !== draftPresent;
             const base = {
                 schemaCode: args.schemaCode,
                 sheetCode,
                 present: true,
-                published: sheet.published === true,
-                existDraft: sheet.existDraft === true,
+                published: platformPublished,
+                existDraft: platformDraft,
+                faces: {
+                    draft: { present: draftPresent, controlCount: draftCodes.length },
+                    published: { present: publishedPresent, controlCount: publishedCodes.length },
+                    inSync: draftPresent && publishedPresent ? sheet.draftViewJson === sheet.publishedViewJson : null,
+                },
+                ...(flagMismatch
+                    ? {
+                        flagMismatch: true,
+                        flagNote: "平台布尔与内容不一致：published/existDraft 来自 bizsheet/get 的标记位，faces 由 draft/published 两份布局内容推导。判「现在有几面」以 faces 为准；判「能否被运行时读到」以 published 为准（平台可能未刷新标记）。",
+                    }
+                    : {}),
             };
             if (args.full === true)
                 return {
@@ -100,9 +169,14 @@ export function registerFormLane(tools) {
                         draft: validateHtmlRender(sheet.draftHtmlJson),
                         published: validateHtmlRender(sheet.publishedHtmlJson),
                     },
+                    // r28e F13：full 面此前丢掉控件码清单——调用方要么再跑一次默认面，
+                    // 要么自己 JSON.parse 两段字符串才数得清每行几个控件。
+                    // 但**只在它们本身不构成负担时**补：900 控件的真实大表单，码表 +
+                    // 行分组就有 14KB，会把 --full 的"外置省字节"整个抵消（T1 实测）。
+                    ...smallLayoutSummary(draftCodes, publishedCodes, sheet),
                 };
-            const draftControls = parseControlCodes(sheet.draftAttributesJson);
-            const publishedControls = parseControlCodes(sheet.publishedAttributesJson);
+            const draftControls = draftCodes;
+            const publishedControls = publishedCodes;
             // `controls:true` (dogfood R2: the caller sent a boolean and got
             // `controls: Expected array`) means "all controls" — it is the natural
             // shorthand and maps to the full control-code list.
@@ -141,6 +215,10 @@ export function registerFormLane(tools) {
                     : {}),
                 draftControlCodes: draftControls,
                 publishedControlCodes: publishedControls,
+                // r28e F4：默认面只有控件码集合（字母序），证明不了「两列 / 末行整宽」。
+                // 行分组本身只有几十字节，直接给：`[[a,b],[c]]` = 第一行两列、第二行整宽。
+                ...(parseLayoutRows(sheet.draftViewJson) !== undefined ? { draftRows: parseLayoutRows(sheet.draftViewJson) } : {}),
+                ...(parseLayoutRows(sheet.publishedViewJson) !== undefined ? { publishedRows: parseLayoutRows(sheet.publishedViewJson) } : {}),
                 ...(wanted ? { draftControls: pick(sheet.draftAttributesJson), publishedControls: pick(sheet.publishedAttributesJson) } : {}),
             };
         }, {
@@ -156,10 +234,15 @@ export function registerFormLane(tools) {
             // 正文用 `artifact get <detailArtifactId> --jq draftViewJson` 定向取回。
             compact: (result) => {
                 const KEEP = new Set(["draftControls", "publishedControls", "customButtonJson", "options", "formButtons", "formButtonCodes"]);
+                // r28e F4 暴露的潜在 bug：handler 已经交过 `*Codes`/`*Count`/`*Omitted`
+                // 这类**已压缩**的键，若再走数组分支会被二次加后缀
+                // （`publishedControlCodes` → `publishedControlCodesCodes`），字段直接消失。
+                // 这些键原样透传。
+                const COMPACTED = /(?:Codes|Count|Omitted|Bytes|Note|Rows)$/;
                 const out = {};
                 const omitted = [];
                 for (const [key, value] of Object.entries(result)) {
-                    if (KEEP.has(key))
+                    if (KEEP.has(key) || COMPACTED.test(key))
                         out[key] = value;
                     else if (typeof value === "string" && Buffer.byteLength(value, "utf8") > 4096) {
                         out[`${key}Omitted`] = true;
@@ -170,6 +253,18 @@ export function registerFormLane(tools) {
                         out[`${key}Codes`] = value.map((entry) => (entry && typeof entry === "object" ? String(entry.code ?? entry.propertyCode ?? "") : String(entry))).filter((entry) => entry.length > 0), out[`${key}Count`] = value.length;
                     // 大**对象**也要降载：审查 2026-11-04 指出旧 else 分支把
                     // htmlRenderCompat 这类非 KEEP 对象整包内联，抵消了 T1 的省体积目标。
+                    //
+                    // r28e F13（真机 2026-11-05）：压成 `htmlRenderCompatCount: 2` 之后，
+                    // 「两个面都通过」和「两个面都炸」是同一个数——这个字段存在的唯一
+                    // 理由（"报 per-face 违规而不是不吭声的 data ok"）被降载抹掉了。
+                    // 渲染兼容是**判定**不是数据：只留 ok 与否 + 有违规时的面名。
+                    else if (key === "htmlRenderCompat" && value !== null && typeof value === "object") {
+                        const faces = value;
+                        const failing = Object.entries(faces).filter(([, face]) => face?.ok !== true).map(([name]) => name);
+                        out.htmlRenderCompatOk = failing.length === 0;
+                        if (failing.length > 0)
+                            out.htmlRenderCompatFailing = failing;
+                    }
                     else if (value !== null && typeof value === "object")
                         out[`${key}Count`] = Object.keys(value).length;
                     else
@@ -183,61 +278,82 @@ export function registerFormLane(tools) {
             },
         }),
     }));
-    writeTool(tools, "form.draft", FORM_LANE, FORM_TOOLS["form.draft"].scope, FORM_TOOLS["form.draft"].description, {
-        schemaCode: z.string().min(1),
-        sheetCode: z.string().min(1).optional().describe("表单槽位码；省略时默认 = schemaCode（模型码即默认表单槽位）"),
-        draftViewJson: z.string().optional().describe("行分组：一行 N 个 code=N 列；改列数须改行分组，非改 span"),
-        draftAttributesJson: z.string().optional(),
-        draftHtmlJson: z.string().optional(),
-        fieldCodes: z.array(z.string().min(1)).optional().describe("脚手架绑定的已发布字段（按此顺序）；由 configure_form/intent 显式传入"),
-        rebuild: z.boolean().optional().describe("true 时丢弃现有草稿布局，按已发布字段重新生成（新增字段/子表要用它；默认保留现有草稿）"),
-        fromReadback: z.boolean().optional().describe("true = 本次 draftViewJson/draftAttributesJson 来自 form.get 的原样读回（平台自身布局可能含子表列行/系统行超宽）；工具会与已存面逐字比对，只有确实一致才放行，被改动过的面照常拒绝"),
-        allowEmptyLayout: z.boolean().optional().describe("显式放行空布局（\"[]\"/\"{}\"）写入；默认拒绝（form-empty-layout），防设计器 Save 清空后照写丢控件"),
-        buttons: z
-            .array(z.record(z.unknown()))
-            .optional()
-            .describe("表单工具栏按钮（写进 biz_sheet.options.customButtonJson；publish 时才生成 h_biz_button(triggerType=FORM)）。每条至少 code/name/bindAction/operateType，useLocation 默认 FORM"),
-        customButtonJson: z.string().optional().describe("buttons 的原样 JSON 数组字符串（与 buttons 互斥；用于把 form.get 读回值直接回写）"),
-        buttonsMode: z.enum(["merge", "replace"]).optional().describe("默认 merge：按 code 增量 upsert（改一个按钮不必重发全表）；replace：整表替换"),
-        removeButtonCodes: z.array(z.string().min(1)).optional().describe("要删除的按钮 code（仅 merge 模式）"),
-        buttonScripts: z.array(z.object({ code: z.string().min(1), script: z.string() })).optional().describe("直接改已有表单按钮的脚本（actionConfig.scriptData），按 code 逐字替换；未知 code 拒绝。不必重发整表"),
-    }, async (session, args) => executeFormDraftWrite(session, { ...args, sheetCode: resolveSheetCode(args.schemaCode, args.sheetCode) }), (args) => {
-        // Zero-wire refusal (ticket 74): fires in semanticGate BEFORE the
-        // governed pipeline — including the rollback before-capture read.
-        refuseEmptyCallerLayout({ ...args, sheetCode: resolveSheetCode(args.schemaCode, args.sheetCode) });
-    }, undefined, {
-        target: (args) => `form:${String(args.schemaCode ?? "")}/${String(args.sheetCode ?? args.schemaCode ?? "")}`,
-        read: (session, args) => readFormOrNull(session, String(args.schemaCode), resolveSheetCode(String(args.schemaCode), args.sheetCode)),
-        inverse: ({ before, args }) => {
-            if (before == null)
-                return { kind: "irreversible", reason: "表单写入前不存在；平台没有删除表单端点，无法撤销创建" };
-            const row = before;
-            const restored = { schemaCode: String(args.schemaCode), sheetCode: resolveSheetCode(String(args.schemaCode), args.sheetCode) };
-            for (const key of ["draftViewJson", "draftAttributesJson", "draftHtmlJson"])
-                if (typeof row[key] === "string")
-                    restored[key] = row[key];
-            return { kind: "calls", calls: [{ tool: "form.draft", args: restored }] };
+    writeTool({
+        tools,
+        name: "form.draft",
+        lane: FORM_LANE,
+        scope: FORM_TOOLS["form.draft"].scope,
+        description: FORM_TOOLS["form.draft"].description,
+        inputSchema: {
+            schemaCode: z.string().min(1),
+            sheetCode: z.string().min(1).optional().describe("表单槽位码；省略时默认 = schemaCode（模型码即默认表单槽位）"),
+            draftViewJson: z.string().optional().describe("行分组：JSON 二维字符串数组 `[[\"codeA\",\"codeB\"],[\"codeC\"]]`——**一行几个 code 就是几列**（不是改 span 来改列数）；末行只放一个 code 即整宽。每个 code 必须同时出现在 draftAttributesJson 里。现成样例：`omc describe form.draft --example two-column-layout`"),
+            draftAttributesJson: z.string().optional().describe("控件表：JSON 对象 `{ \"codeA\": { key:\"codeA\", type: <控件类型号>, options:{ name:\"显示名\", span: 12 } } }`。`span` 是 24 栅格宽度：两列各 span:12、整宽 span:24（必须与 draftViewJson 的行分组一致，否则 layout_coverage_mismatch）。现成样例：`omc describe form.draft --example two-column-layout`"),
+            draftHtmlJson: z.string().optional(),
+            fieldCodes: z.array(z.string().min(1)).optional().describe("脚手架绑定的已发布字段（按此顺序）；由 configure_form/intent 显式传入"),
+            rebuild: z.boolean().optional().describe("true 时丢弃现有草稿布局，按已发布字段重新生成（新增字段/子表要用它；默认保留现有草稿）"),
+            fromReadback: z.boolean().optional().describe("true = 本次 draftViewJson/draftAttributesJson 来自 form.get 的原样读回（平台自身布局可能含子表列行/系统行超宽）；工具会与已存面逐字比对，只有确实一致才放行，被改动过的面照常拒绝"),
+            allowEmptyLayout: z.boolean().optional().describe("显式放行空布局（\"[]\"/\"{}\"）写入；默认拒绝（form-empty-layout），防设计器 Save 清空后照写丢控件"),
+            buttons: z
+                .array(z.record(z.unknown()))
+                .optional()
+                .describe("表单工具栏按钮（写进 biz_sheet.options.customButtonJson；publish 时才生成 h_biz_button(triggerType=FORM)）。每条至少 code/name/bindAction/operateType，useLocation 默认 FORM"),
+            customButtonJson: z.string().optional().describe("buttons 的原样 JSON 数组字符串（与 buttons 互斥；用于把 form.get 读回值直接回写）"),
+            buttonsMode: z.enum(["merge", "replace"]).optional().describe("默认 merge：按 code 增量 upsert（改一个按钮不必重发全表）；replace：整表替换"),
+            removeButtonCodes: z.array(z.string().min(1)).optional().describe("要删除的按钮 code（仅 merge 模式）"),
+            buttonScripts: z.array(z.object({ code: z.string().min(1), script: z.string() })).optional().describe("直接改已有表单按钮的脚本（actionConfig.scriptData），按 code 逐字替换；未知 code 拒绝。不必重发整表"),
+        },
+        execute: async (session, args) => executeFormDraftWrite(session, { ...args, sheetCode: resolveSheetCode(args.schemaCode, args.sheetCode) }),
+        preflight: (args) => {
+            // Zero-wire refusal (ticket 74): fires in semanticGate BEFORE the
+            // governed pipeline — including the rollback before-capture read.
+            refuseEmptyCallerLayout({ ...args, sheetCode: resolveSheetCode(args.schemaCode, args.sheetCode) });
+        },
+        rollback: {
+            target: (args) => `form:${String(args.schemaCode ?? "")}/${String(args.sheetCode ?? args.schemaCode ?? "")}`,
+            read: (session, args) => readFormOrNull(session, String(args.schemaCode), resolveSheetCode(String(args.schemaCode), args.sheetCode)),
+            inverse: ({ before, args }) => {
+                if (before == null)
+                    return { kind: "irreversible", reason: "表单写入前不存在；平台没有删除表单端点，无法撤销创建" };
+                const row = before;
+                const restored = { schemaCode: String(args.schemaCode), sheetCode: resolveSheetCode(String(args.schemaCode), args.sheetCode) };
+                for (const key of ["draftViewJson", "draftAttributesJson", "draftHtmlJson"])
+                    if (typeof row[key] === "string")
+                        restored[key] = row[key];
+                return { kind: "calls", calls: [{ tool: "form.draft", args: restored }] };
+            },
+        },
+    });
+    writeTool({
+        tools,
+        name: "form.publish",
+        lane: FORM_LANE,
+        scope: FORM_TOOLS["form.publish"].scope,
+        description: FORM_TOOLS["form.publish"].description,
+        inputSchema: {
+            schemaCode: z.string().min(1),
+            sheetCode: z.string().min(1).optional().describe("表单槽位码；省略时默认 = schemaCode（模型码即默认表单槽位）"),
+            publishRemarks: z.string().optional(),
+            // r28e F10（真机 2026-11-05）：旧文案说「重写草稿后的再发布需要它」，
+            // 实测 form.draft 改布局后直接 form.publish **不带 force 也正常提拔**
+            // （errcode 0 / published true）。误导会让人多传一个没必要的护栏。
+            force: z.boolean().optional().describe("仅在回执 already-published（同一份草稿重复发布被短路）且你确认要重推时使用；正常流程（改草稿→publish）不需要它"),
+            allowDegrade: z.boolean().optional().describe("显式放行降级提拔（草稿控件数 < 已发布面）；默认拒绝（form-publish-degrade），防把空/残草稿提拔成发布版"),
+            rebuild: z
+                .boolean()
+                .optional()
+                .describe("true 时一步刷新：先丢弃现有草稿、按已发布字段重建脚手架（保留非结构性控件 options），再强制提拔——改字段形状后刷新表单用一个调用；默认只发布现有草稿（无草稿时自动补默认）"),
+            buttons: z
+                .array(z.record(z.unknown()))
+                .optional()
+                .describe("表单工具栏按钮：本次发布写进 options.customButtonJson 并生成 h_biz_button(triggerType=FORM)。之后再按流程节点 buttonPermission.customBtns[].enabled 决定哪个节点可见"),
+            customButtonJson: z.string().optional().describe("buttons 的原样 JSON 数组字符串（与 buttons 互斥）"),
+            buttonsMode: z.enum(["merge", "replace"]).optional().describe("默认 merge：按 code 增量 upsert；replace：整表替换"),
+            removeButtonCodes: z.array(z.string().min(1)).optional().describe("要删除的按钮 code（仅 merge 模式）"),
+            buttonScripts: z.array(z.object({ code: z.string().min(1), script: z.string() })).optional().describe("直接改已有表单按钮的脚本（actionConfig.scriptData），按 code 逐字替换；未知 code 拒绝。不必重发整表"),
         },
+        execute: async (session, args) => executeFormPublishWrite(session, { ...args, sheetCode: resolveSheetCode(args.schemaCode, args.sheetCode) }),
     });
-    writeTool(tools, "form.publish", FORM_LANE, FORM_TOOLS["form.publish"].scope, FORM_TOOLS["form.publish"].description, {
-        schemaCode: z.string().min(1),
-        sheetCode: z.string().min(1).optional().describe("表单槽位码；省略时默认 = schemaCode（模型码即默认表单槽位）"),
-        publishRemarks: z.string().optional(),
-        force: z.boolean().optional().describe("强制重新提拔（跳过 already-published 短路）；重写草稿后的再发布需要它"),
-        allowDegrade: z.boolean().optional().describe("显式放行降级提拔（草稿控件数 < 已发布面）；默认拒绝（form-publish-degrade），防把空/残草稿提拔成发布版"),
-        rebuild: z
-            .boolean()
-            .optional()
-            .describe("true 时一步刷新：先丢弃现有草稿、按已发布字段重建脚手架（保留非结构性控件 options），再强制提拔——改字段形状后刷新表单用一个调用；默认只发布现有草稿（无草稿时自动补默认）"),
-        buttons: z
-            .array(z.record(z.unknown()))
-            .optional()
-            .describe("表单工具栏按钮：本次发布写进 options.customButtonJson 并生成 h_biz_button(triggerType=FORM)。之后再按流程节点 buttonPermission.customBtns[].enabled 决定哪个节点可见"),
-        customButtonJson: z.string().optional().describe("buttons 的原样 JSON 数组字符串（与 buttons 互斥）"),
-        buttonsMode: z.enum(["merge", "replace"]).optional().describe("默认 merge：按 code 增量 upsert；replace：整表替换"),
-        removeButtonCodes: z.array(z.string().min(1)).optional().describe("要删除的按钮 code（仅 merge 模式）"),
-        buttonScripts: z.array(z.object({ code: z.string().min(1), script: z.string() })).optional().describe("直接改已有表单按钮的脚本（actionConfig.scriptData），按 code 逐字替换；未知 code 拒绝。不必重发整表"),
-    }, async (session, args) => executeFormPublishWrite(session, { ...args, sheetCode: resolveSheetCode(args.schemaCode, args.sheetCode) }));
     registerPackageTool(tools, {
         name: "configure_form",
         lane: FORM_LANE,
@@ -300,11 +416,19 @@ export function registerFormLane(tools) {
         },
         summarize: (args, _outcome, phase) => writeSummary("configure_form", args, undefined, phase),
     });
-    writeTool(tools, "form.runButton", FORM_LANE, FORM_TOOLS["form.runButton"].scope, FORM_TOOLS["form.runButton"].description, {
-        schemaCode: z.string().min(1),
-        sheetCode: z.string().min(1).optional().describe("表单槽位码；省略时默认 = schemaCode"),
-        buttonCode: z.string().min(1).describe("表单按钮 code（form.get --full 的 customButtonJson / publish 读回的 formButtonCodes）"),
-        bizObjectId: z.string().min(1).describe("要执行按钮的业务记录 id（data.load/data.list 的 bizObjectId）"),
-    }, async (session, args) => executeFormRunButtonWrite(session, { schemaCode: args.schemaCode, sheetCode: resolveSheetCode(args.schemaCode, args.sheetCode), buttonCode: args.buttonCode, bizObjectId: args.bizObjectId }));
+    writeTool({
+        tools,
+        name: "form.runButton",
+        lane: FORM_LANE,
+        scope: FORM_TOOLS["form.runButton"].scope,
+        description: FORM_TOOLS["form.runButton"].description,
+        inputSchema: {
+            schemaCode: z.string().min(1),
+            sheetCode: z.string().min(1).optional().describe("表单槽位码；省略时默认 = schemaCode"),
+            buttonCode: z.string().min(1).describe("表单按钮 code（form.get --full 的 customButtonJson / publish 读回的 formButtonCodes）"),
+            bizObjectId: z.string().min(1).describe("要执行按钮的业务记录 id（data.load/data.list 的 bizObjectId）"),
+        },
+        execute: async (session, args) => executeFormRunButtonWrite(session, { schemaCode: args.schemaCode, sheetCode: resolveSheetCode(args.schemaCode, args.sheetCode), buttonCode: args.buttonCode, bizObjectId: args.bizObjectId }),
+    });
 }
 //# sourceMappingURL=form.js.map