@stalfh233/omc-cli 0.6.7 → 0.6.11

package/dist/lanes/folder.js

@@ -38,6 +38,23 @@ import { FOLDER_LANE_CONTRACT } from "./folder-contract.js";
  */
 const LANE = LANES.folder;
 const T = FOLDER_LANE_CONTRACT.tools;
+/**
+ * Live 1.1.25 (r28d F2): platform `apppackage/create` seeds one top-level Folder
+ * whose `name_i18n.en` is the stable token `defaultGroup` (zh display is「默认分组」).
+ * Name alone is brittle — agents rename / locales differ — so mark by that en key.
+ */
+export function isDefaultFolderNode(node) {
+    const raw = node.name_i18n;
+    if (typeof raw !== "string" || raw.length === 0)
+        return false;
+    try {
+        const parsed = JSON.parse(raw);
+        return String(parsed.en ?? "") === "defaultGroup";
+    }
+    catch {
+        return false;
+    }
+}
 /** Flatten the nested app tree, keeping the path so a caller can tell WHICH "合同" it means. */
 /**
  * Flatten the nested app tree. Live 1.1.25 readback: `apppackage/trees?appCode=`
@@ -45,35 +62,76 @@ const T = FOLDER_LANE_CONTRACT.tools;
  * carrying its children — so a top-level folder is depth 0 and a child is
  * "父 / 子" at depth 1. Reading only the top array makes a freshly created child
  * folder look absent (the customer's first failure).
+ *
+ * Sibling order: Folder before other types, then by name (stable for tree
+ * presentation). Preorder walk is preserved across depths. BizModel nodes also
+ * get `displayPath` (`path + " [model]"`) so a same-named folder/model pair is
+ * distinguishable without changing the existing `path` contract (r28d F5).
  */
-function flattenFolders(rows, parentPath = []) {
+export function flattenFolders(rows, parentPath = []) {
     const out = [];
-    for (const raw of rows) {
-        if (raw === null || typeof raw !== "object")
-            continue;
-        const node = raw;
+    const siblings = rows
+        .filter((raw) => raw !== null && typeof raw === "object")
+        .slice()
+        .sort((a, b) => {
+        const aFolder = String(a.type ?? "") === "Folder" ? 0 : 1;
+        const bFolder = String(b.type ?? "") === "Folder" ? 0 : 1;
+        if (aFolder !== bFolder)
+            return aFolder - bFolder;
+        return String(a.name ?? a.code ?? "").localeCompare(String(b.name ?? b.code ?? ""), "zh");
+    });
+    for (const node of siblings) {
         const name = String(node.name ?? node.code ?? "");
-        const path = [...parentPath, name];
+        const pathParts = [...parentPath, name];
+        const path = pathParts.join(" / ");
+        const type = node.type ?? null;
+        const isDefault = type === "Folder" && isDefaultFolderNode(node);
         out.push({
             id: node.id ?? null,
-            type: node.type ?? null,
+            type,
             code: node.code ?? null,
             name: node.name ?? null,
             parentId: node.parentId ?? null,
-            depth: path.length - 1,
-            path: path.join(" / "),
+            depth: pathParts.length - 1,
+            path,
+            ...(type === "BizModel" ? { displayPath: `${path} [model]` } : {}),
+            ...(isDefault ? { isDefault: true } : {}),
         });
         if (Array.isArray(node.children) && node.children.length > 0)
-            out.push(...flattenFolders(node.children, path));
+            out.push(...flattenFolders(node.children, pathParts));
     }
     return out;
 }
 async function readTree(session, appCode) {
     return flattenFolders(wireRows((await wireCall(session, { path: ENDPOINTS.applicationTree, query: { appCode } })).data));
 }
+/** Shared by app.delete (r28d F8) so the non-empty refusal can list children with path. */
+export async function readAppTree(session, appCode) {
+    return readTree(session, appCode);
+}
 function folderRefusal(schemaCode, message, extra = {}) {
     throw new ToolRefusalError({ status: "refused", blocker: "folder-not-found", ...(schemaCode ? { applicationCode: schemaCode } : {}), ...extra, message });
 }
+/**
+ * F6（r27）：folder.* 与 report.* 的应用范围参数名历史上不统一
+ * （folder 用 applicationCode，report 用 appCode）。两边都接受，但两者都给且
+ * 不一致时拒绝，避免猜错应用。
+ */
+function resolveFolderAppCode(args) {
+    const fromLong = typeof args.applicationCode === "string" ? args.applicationCode.trim() : "";
+    const fromShort = typeof args.appCode === "string" ? args.appCode.trim() : "";
+    if (fromLong && fromShort && fromLong !== fromShort) {
+        throw new ToolRefusalError({
+            status: "refused",
+            blocker: "app-code-conflict",
+            applicationCode: fromLong,
+            appCode: fromShort,
+            message: `applicationCode="${fromLong}" 与 appCode="${fromShort}" 不一致——本工具两个键是同一含义的别名，请只传一个，或传相同值`,
+        });
+    }
+    const chosen = fromLong || fromShort;
+    return chosen.length > 0 ? chosen : undefined;
+}
 /**
  * Resolve a folder by id, code, or by full path ("合同管理 / 归档"). A bare name
  * that matches several folders is ambiguous — name them with their paths instead
@@ -96,8 +154,13 @@ function resolveFolder(rows, ref) {
         return byName[0];
     if (byName.length > 1)
         folderRefusal(undefined, `目录名「${ref}」不唯一（${byName.length} 个）——用完整 path 指定：${byName.map((row) => String(row.path)).join("、")}`);
-    folderRefusal(undefined, `找不到目录「${ref}」——先 folder.tree 看 id/path；注意 create 省略 parentId 建的是顶层目录`, {
+    // r28i F9: report.create.objectId / custompage page id is NOT an AppFunction
+    // tree node id. When the id is absent from the tree, say so instead of only
+    // "folder-not-found" (which sends people back to folder.tree hunting).
+    folderRefusal(undefined, `找不到目录「${ref}」——先 folder.tree 看 id/path；注意 create 省略 parentId 建的是顶层目录。` +
+        `若此 id 来自 report.create 的 objectId/reportObjectId，那不是目录 id 也不是应用树节点 id（树节点 id≠报表对象 id）——删报表用 report.delete --args '{"code":"<code>"}'；删自定义页用 custompage.delete；应用树节点 id 请 folder.tree 按 code 查`, {
         available: rows.filter((row) => row.type === "Folder").map((row) => ({ id: row.id, path: row.path })).slice(0, 40),
+        typeHint: "id-not-in-app-tree — if from report.create.objectId use report.delete by code; if AppFunction Report/CustomPage node use the matching delete tool",
     });
 }
 function folderTools(tools) {
@@ -107,133 +170,201 @@ function folderTools(tools) {
         kind: "read",
         lane: LANE,
         scope: T["folder.tree"].scope,
-        description: "读取应用树（目录/分组 + 模型节点），**递归展平**并给出每个节点的 `path` 与 `depth`（平台 `apppackage/trees?appCode=` 返回的是嵌套 children，只看顶层会误判“目录没建成”——issue 2026-10-23 的真实失败）。`foldersOnly:true` 只回目录（type=Folder）。目录的 id 就是 folder.update/delete 与 model.move 的 `folderId/parentId`。",
+        description: "读取**应用树**（应用**内**目录/分组 + 模型节点；不是应用包本身——应用包用 app.*）。**递归展平**并给出每个节点的 `path`/`depth`（平台 `apppackage/trees?appCode=` 返回嵌套 children，只看顶层会误判“目录没建成”——issue 2026-10-23）。`foldersOnly:true` 只回目录（type=Folder）。目录 id 就是 folder.update/delete 与 model.move/model.create 的 `folderId/parentId`。不存在的应用回 `applicationExists:false` + 空树（仍 ok，不拒——与「存在但空」可区分）。平台自动建的默认分组节点带 `isDefault:true`（判据：name_i18n.en=defaultGroup）。",
         inputSchema: {
             environment: environmentArg,
-            applicationCode: z.string().optional().describe("应用 code；省略用配置默认应用"),
+            applicationCode: z.string().optional().describe("应用 code；省略用配置默认应用（别名：appCode）"),
+            appCode: z.string().optional().describe("applicationCode 的别名（与 report.* 对齐）；两者都给且不一致时报 app-code-conflict"),
             foldersOnly: z.boolean().optional().describe("只回目录节点（type=Folder）"),
             capability: capabilityArg,
         },
         handler: async (ctx, args, self) => governedRead(ctx, self, args, async (session) => {
-            const appCode = await resolveApplicationCode(session, args.applicationCode);
-            const rows = await readTree(session, appCode);
+            const requested = resolveFolderAppCode(args);
+            const appCode = await resolveApplicationCode(session, requested);
+            // r28d F7: apppackage/trees answers [] for a missing app AND for an
+            // empty app. Distinguish with apppackage/list so a post-delete check
+            // is not forced through app.list by hand. Keep status=ok + empty
+            // nodes so existing empty-tree callers stay intact.
+            const apps = wireRows((await wireCall(session, { path: ENDPOINTS.applicationList, query: {} })).data);
+            const applicationExists = apps.some((row) => String(row.appCode ?? row.code ?? "") === appCode);
+            const rows = applicationExists ? await readTree(session, appCode) : [];
             const nodes = args.foldersOnly === true ? rows.filter((row) => row.type === "Folder") : rows;
             return {
                 applicationCode: appCode,
+                applicationExists,
                 nodeCount: nodes.length,
                 folderCount: rows.filter((row) => row.type === "Folder").length,
                 modelCount: rows.filter((row) => row.type === "BizModel").length,
                 nodes,
-                note: "type=Folder 是目录/分组；parentId 指向父目录（顶层目录的 parentId = 应用包 id）。嵌套 children 已展平，path 用「 / 」连接。",
+                note: "type=Folder 是应用内目录/分组（不是应用包）；parentId 指向父目录（顶层目录的 parentId = 应用包 id）。嵌套 children 已展平，path 用「 / 」连接。" +
+                    (applicationExists
+                        ? " 平台自动建的默认分组带 isDefault:true（name_i18n.en=defaultGroup）；模型节点另有 displayPath。"
+                        : " applicationExists:false——应用不在 apppackage/list；空树不等于「空应用」。") +
+                    " nodeCount/folderCount/modelCount 是全应用聚合，共享环境含其它会话资源；核对自己的资源请按 code 前缀过滤 nodes[]，不要只比计数。",
             };
         }),
     }));
-    writeTool(tools, "folder.create", LANE, T["folder.create"].scope, "新建应用目录（分组）：`POST /api/app/folders/create`（AppFunctionController:105；`ApplicationFacadeImpl.createFolder:586` 强制 `type=Folder`，**省略 `parentId` 会挂到应用根**，即顶层目录）。给 `parentId` 才是子目录。写入后按 `path` 回读确认（树是嵌套的）。同名不等于重复：平台不校验重名，工具默认按「同父目录下同名」拒绝（`folder-duplicate`），要并列同名传 `allowDuplicate:true`。", {
-        applicationCode: z.string().optional().describe("应用 code；省略用配置默认应用"),
-        name: z.string().min(1).describe("目录显示名（平台校验非空、中文长度 ≤50）"),
-        parentId: z.string().optional().describe("父目录 id；**省略=应用根（顶层目录）**。子目录必须显式给，值来自 folder.tree 的 id"),
-        code: z.string().optional().describe("目录 code（可选；平台只校验 code 唯一，空则自动生成）"),
-        name_i18n: z.string().optional().describe("多语言名（JSON 字符串，如 {\"zh-CN\":\"合同\",\"en\":\"Contract\"}）"),
-        allowDuplicate: z.boolean().optional().describe("允许同父目录下同名（默认拒绝，避免建出两个同名目录后无法用 path 定位）"),
-    }, async (session, args) => {
-        const appCode = await resolveApplicationCode(session, args.applicationCode);
-        const before = await readTree(session, appCode);
-        if (args.allowDuplicate !== true) {
-            const siblings = before.filter((row) => String(row.parentId ?? "") === String(args.parentId ?? "") || (args.parentId === undefined && row.depth === 0));
-            if (siblings.some((row) => row.type === "Folder" && String(row.name ?? "") === args.name))
-                throw new ToolRefusalError({
-                    status: "refused",
-                    blocker: "folder-duplicate",
+    writeTool({
+        tools,
+        name: "folder.create",
+        lane: LANE,
+        scope: T["folder.create"].scope,
+        description: "新建应用目录（分组）：`POST /api/app/folders/create`（AppFunctionController:105；`ApplicationFacadeImpl.createFolder:586` 强制 `type=Folder`，**省略 `parentId` 会挂到应用根**，即顶层目录）。给 `parentId` 才是子目录。写入后按 `path` 回读确认（树是嵌套的）。同名不等于重复：平台不校验重名，工具默认按「同父目录下同名」拒绝（`folder-duplicate`），要并列同名传 `allowDuplicate:true`。",
+        inputSchema: {
+            applicationCode: z.string().optional().describe("应用 code；省略用配置默认应用（别名：appCode）"),
+            appCode: z.string().optional().describe("applicationCode 的别名（与 report.* 对齐）；两者都给且不一致时报 app-code-conflict"),
+            name: z.string().min(1).describe("目录显示名（平台校验非空、中文长度 ≤50）"),
+            parentId: z.string().optional().describe("父目录 id；**省略=应用根（顶层目录）**。子目录必须显式给，值来自 folder.tree 的 id"),
+            code: z.string().optional().describe("目录 code（可选；平台只校验 code 唯一，空则自动生成）"),
+            name_i18n: z.string().optional().describe("多语言名（JSON 字符串，如 {\"zh-CN\":\"合同\",\"en\":\"Contract\"}）"),
+            allowDuplicate: z.boolean().optional().describe("允许同父目录下同名（默认拒绝，避免建出两个同名目录后无法用 path 定位）"),
+        },
+        execute: async (session, args) => {
+            const appCode = await resolveApplicationCode(session, resolveFolderAppCode(args));
+            const before = await readTree(session, appCode);
+            if (args.allowDuplicate !== true) {
+                const siblings = before.filter((row) => String(row.parentId ?? "") === String(args.parentId ?? "") || (args.parentId === undefined && row.depth === 0));
+                if (siblings.some((row) => row.type === "Folder" && String(row.name ?? "") === args.name))
+                    throw new ToolRefusalError({
+                        status: "refused",
+                        blocker: "folder-duplicate",
+                        applicationCode: appCode,
+                        path: `${args.parentId ?? "(root)"} / ${args.name}`,
+                        message: `同一层级已有同名目录「${args.name}」——平台允许重名，但重名后 folder.tree 的 path 无法唯一定位；确认要并列同名再传 allowDuplicate:true`,
+                    });
+            }
+            const performed = await wireCall(session, {
+                path: ENDPOINTS.folderCreate,
+                method: "POST",
+                body: {
+                    appCode,
+                    name: args.name,
+                    ...(args.parentId !== undefined ? { parentId: args.parentId } : {}),
+                    ...(args.code !== undefined ? { code: args.code } : {}),
+                    ...(args.name_i18n !== undefined ? { name_i18n: args.name_i18n } : {}),
+                },
+            });
+            const after = await readTree(session, appCode);
+            const created = after.filter((row) => row.type === "Folder" && String(row.name ?? "") === args.name && !before.some((old) => old.id === row.id));
+            return {
+                performed: { errcode: performed.errcode },
+                readback: {
                     applicationCode: appCode,
-                    path: `${args.parentId ?? "(root)"} / ${args.name}`,
-                    message: `同一层级已有同名目录「${args.name}」——平台允许重名，但重名后 folder.tree 的 path 无法唯一定位；确认要并列同名再传 allowDuplicate:true`,
-                });
-        }
-        const performed = await wireCall(session, {
-            path: ENDPOINTS.folderCreate,
-            method: "POST",
-            body: {
-                appCode,
-                name: args.name,
-                ...(args.parentId !== undefined ? { parentId: args.parentId } : {}),
-                ...(args.code !== undefined ? { code: args.code } : {}),
-                ...(args.name_i18n !== undefined ? { name_i18n: args.name_i18n } : {}),
-            },
-        });
-        const after = await readTree(session, appCode);
-        const created = after.filter((row) => row.type === "Folder" && String(row.name ?? "") === args.name && !before.some((old) => old.id === row.id));
-        return {
-            performed: { errcode: performed.errcode },
-            readback: {
-                applicationCode: appCode,
-                present: created.length > 0,
-                created: created.map((row) => ({ id: row.id, path: row.path, parentId: row.parentId })),
-                folderCount: after.filter((row) => row.type === "Folder").length,
-                ...(after.filter((row) => row.type === "Folder" && String(row.name ?? "") === args.name && String(row.parentId ?? "") === String(created[0]?.parentId ?? ""))
-                    .length > 1
-                    ? { warning: "同层级出现了多个同名目录（allowDuplicate 生效或既有同名）；后续用 id 定位，不要用 path/name" }
-                    : {}),
-                hint: created.length > 0 ? "把模型放进该目录用 model.move（parentId = 这里的 id）" : "回读未见新目录：树是嵌套的，但 folder.tree 已递归展平；若确实没有，检查应用 code",
-            },
-        };
-    });
-    writeTool(tools, "folder.update", LANE, T["folder.update"].scope, "重命名目录或把目录挂到另一个目录下：`POST /api/app/folders/update`（AppFunctionController:219；`updateFolder:612` 拒绝 `parentId === id`，`parentId` 为空时保留原父级）。**只改目录节点本身，不会移动目录里的模型**——模型移动用 `model.move`。", {
-        applicationCode: z.string().optional(),
-        folderId: z.string().min(1).describe("目录 id（folder.tree 的 id）"),
-        name: z.string().min(1).optional().describe("新显示名"),
-        name_i18n: z.string().optional(),
-        parentId: z.string().min(1).optional().describe("新父目录 id（挂到根用应用包 id；不理解根 id 就省略此字段表示不改父级）"),
-    }, async (session, args) => {
-        const appCode = await resolveApplicationCode(session, args.applicationCode);
-        const before = await readTree(session, appCode);
-        const current = resolveFolder(before, args.folderId);
-        if (args.name === undefined && args.parentId === undefined)
-            throw new ToolRefusalError({ status: "refused", blocker: "folder-update-empty-patch", message: "没有可应用的补丁——至少给 name 或 parentId" });
-        if (args.parentId !== undefined && args.parentId === args.folderId)
-            throw new ToolRefusalError({ status: "refused", blocker: "folder-parent-self", message: "parentId 不能等于目录自身（平台 FOLDER_PARENTID_EQUALS_ID）" });
-        const performed = await wireCall(session, {
-            path: ENDPOINTS.folderUpdate,
-            method: "POST",
-            body: { id: args.folderId, name: args.name ?? current.name, ...(args.name_i18n !== undefined ? { name_i18n: args.name_i18n } : {}), ...(args.parentId !== undefined ? { parentId: args.parentId } : {}) },
-        });
-        const after = await readTree(session, appCode);
-        const now = after.find((row) => String(row.id ?? "") === args.folderId);
-        return {
-            performed: { errcode: performed.errcode },
-            readback: {
-                folderId: args.folderId,
-                present: now !== undefined,
-                before: { name: current.name, parentId: current.parentId, path: current.path },
-                after: now ? { name: now.name, parentId: now.parentId, path: now.path } : null,
-                note: "只改了目录节点；目录内的模型不随目录移动（模型要动请用 model.move）",
-            },
-        };
+                    present: created.length > 0,
+                    created: created.map((row) => ({ id: row.id, path: row.path, parentId: row.parentId })),
+                    folderCount: after.filter((row) => row.type === "Folder").length,
+                    ...(after.filter((row) => row.type === "Folder" && String(row.name ?? "") === args.name && String(row.parentId ?? "") === String(created[0]?.parentId ?? ""))
+                        .length > 1
+                        ? { warning: "同层级出现了多个同名目录（allowDuplicate 生效或既有同名）；后续用 id 定位，不要用 path/name" }
+                        : {}),
+                    hint: created.length > 0 ? "把模型放进该目录用 model.move（parentId = 这里的 id）" : "回读未见新目录：树是嵌套的，但 folder.tree 已递归展平；若确实没有，检查应用 code",
+                },
+            };
+        },
     });
-    writeTool(tools, "folder.delete", LANE, T["folder.delete"].scope, "删除空目录：`POST /api/app/folders/delete?folderId=`（AppFunctionController:246）。**非递归**——目录里还有子目录或模型时平台回 `DIRECTORY_NOT_EMPTY`，工具在写前先查子节点并拒绝（`folder-not-empty`），避免半删。要清空请先 `model.move` 移走模型、删子目录。", {
-        applicationCode: z.string().optional(),
-        folderId: z.string().min(1),
-    }, async (session, args) => {
-        const appCode = await resolveApplicationCode(session, args.applicationCode);
-        const before = await readTree(session, appCode);
-        const current = resolveFolder(before, args.folderId);
-        if (String(current.type ?? "") !== "Folder")
-            throw new ToolRefusalError({ status: "refused", blocker: "folder-target-not-folder", message: `${args.folderId} 不是目录节点（type=${String(current.type)}）；删模型用 model.delete` });
-        const children = before.filter((row) => String(row.parentId ?? "") === String(args.folderId));
-        if (children.length > 0)
-            throw new ToolRefusalError({
-                status: "refused",
-                blocker: "folder-not-empty",
-                folderId: args.folderId,
-                children: children.map((row) => ({ id: row.id, type: row.type, path: row.path })).slice(0, 40),
-                message: `目录「${current.path}」还有 ${children.length} 个子节点——平台非递归删除会回 DIRECTORY_NOT_EMPTY。先 model.move 移走模型 / 删子目录`,
+    writeTool({
+        tools,
+        name: "folder.update",
+        lane: LANE,
+        scope: T["folder.update"].scope,
+        description: "重命名目录或把目录挂到另一个目录下：`POST /api/app/folders/update`（AppFunctionController:219；`updateFolder:612` 拒绝 `parentId === id`，`parentId` 为空时保留原父级）。**只改目录节点本身，不会移动目录里的模型**——模型移动用 `model.move`。",
+        inputSchema: {
+            applicationCode: z.string().optional().describe("应用 code；省略用配置默认应用（别名：appCode）"),
+            appCode: z.string().optional().describe("applicationCode 的别名（与 report.* 对齐）；两者都给且不一致时报 app-code-conflict"),
+            folderId: z.string().min(1).describe("目录 id（folder.tree 的 id）"),
+            name: z.string().min(1).optional().describe("新显示名"),
+            name_i18n: z.string().optional(),
+            parentId: z.string().min(1).optional().describe("新父目录 id（挂到根用应用包 id；不理解根 id 就省略此字段表示不改父级）"),
+        },
+        execute: async (session, args) => {
+            const appCode = await resolveApplicationCode(session, resolveFolderAppCode(args));
+            const before = await readTree(session, appCode);
+            const current = resolveFolder(before, args.folderId);
+            if (args.name === undefined && args.parentId === undefined)
+                throw new ToolRefusalError({ status: "refused", blocker: "folder-update-empty-patch", message: "没有可应用的补丁——至少给 name 或 parentId" });
+            if (args.parentId !== undefined && args.parentId === args.folderId)
+                throw new ToolRefusalError({ status: "refused", blocker: "folder-parent-self", message: "parentId 不能等于目录自身（平台 FOLDER_PARENTID_EQUALS_ID）" });
+            const performed = await wireCall(session, {
+                path: ENDPOINTS.folderUpdate,
+                method: "POST",
+                body: { id: args.folderId, name: args.name ?? current.name, ...(args.name_i18n !== undefined ? { name_i18n: args.name_i18n } : {}), ...(args.parentId !== undefined ? { parentId: args.parentId } : {}) },
             });
-        const performed = await wireCall(session, { path: ENDPOINTS.folderDelete, method: "POST", query: { folderId: args.folderId } });
-        const after = await readTree(session, appCode);
-        return {
-            performed: { errcode: performed.errcode },
-            readback: { folderId: args.folderId, deleted: !after.some((row) => String(row.id ?? "") === args.folderId), path: current.path },
-        };
+            const after = await readTree(session, appCode);
+            const now = after.find((row) => String(row.id ?? "") === args.folderId);
+            return {
+                performed: { errcode: performed.errcode },
+                readback: {
+                    folderId: args.folderId,
+                    present: now !== undefined,
+                    before: { name: current.name, parentId: current.parentId, path: current.path },
+                    after: now ? { name: now.name, parentId: now.parentId, path: now.path } : null,
+                    note: "只改了目录节点；目录内的模型不随目录移动（模型要动请用 model.move）",
+                },
+            };
+        },
     });
+    writeTool({
+        tools,
+        name: "folder.delete",
+        lane: LANE,
+        scope: T["folder.delete"].scope,
+        description: "删除空目录：`POST /api/app/folders/delete?folderId=`（AppFunctionController:246）。**非递归**——目录里还有子目录或模型时平台回 `DIRECTORY_NOT_EMPTY`，工具在写前先查子节点并拒绝（`folder-not-empty`），避免半删。要清空请先 `model.move` 移走模型、删子目录。",
+        inputSchema: {
+            applicationCode: z.string().optional().describe("应用 code；省略用配置默认应用（别名：appCode）"),
+            appCode: z.string().optional().describe("applicationCode 的别名（与 report.* 对齐）；两者都给且不一致时报 app-code-conflict"),
+            folderId: z.string().min(1),
+        },
+        execute: async (session, args) => {
+            const appCode = await resolveApplicationCode(session, resolveFolderAppCode(args));
+            const before = await readTree(session, appCode);
+            const current = resolveFolder(before, args.folderId);
+            if (String(current.type ?? "") !== "Folder")
+                throw new ToolRefusalError({
+                    status: "refused",
+                    blocker: "folder-target-not-folder",
+                    message: `${args.folderId} 不是目录节点（type=${String(current.type)}）；${folderDeleteTargetHint(String(current.type ?? ""), current)}`,
+                });
+            const children = before.filter((row) => String(row.parentId ?? "") === String(args.folderId));
+            if (children.length > 0)
+                throw new ToolRefusalError({
+                    status: "refused",
+                    blocker: "folder-not-empty",
+                    folderId: args.folderId,
+                    children: children.map((row) => ({ id: row.id, type: row.type, path: row.path })).slice(0, 40),
+                    message: `目录「${current.path}」还有 ${children.length} 个子节点——平台非递归删除会回 DIRECTORY_NOT_EMPTY。先 model.move 移走模型 / 删子目录`,
+                });
+            const performed = await wireCall(session, { path: ENDPOINTS.folderDelete, method: "POST", query: { folderId: args.folderId } });
+            const after = await readTree(session, appCode);
+            return {
+                performed: { errcode: performed.errcode },
+                readback: { folderId: args.folderId, deleted: !after.some((row) => String(row.id ?? "") === args.folderId), path: current.path },
+            };
+        },
+    });
+}
+/**
+ * r27 F10: `folder.delete` must NOT send every non-Folder node to
+ * `model.delete` — a Report node then comes back `already-absent` and the
+ * app-tree residue stays. Dispatch by AppFunction type so the recovery
+ * points at the tool that actually owns that node.
+ */
+export function folderDeleteTargetHint(type, current = {}) {
+    const code = String(current.code ?? "").trim();
+    const codeArg = code ? `{"code":"${code}"}` : '{"code":"<code>"}';
+    switch (type) {
+        case "Report":
+            return (`删报表用 omc call report.delete --args '${codeArg}'` +
+                "（若 BI 端点不可达，report.delete 会说明环境缺失）");
+        case "BizModel":
+            return code
+                ? `删模型用 omc call model.delete --args '{"schemaCode":"${code}"}'`
+                : "删模型用 model.delete";
+        case "CustomPage":
+        case "Page":
+            return `删自定义页用 omc call custompage.delete --args '${codeArg}'`;
+        default:
+            return "按节点 type 选择对应删除工具（folder.delete 只删空目录）";
+    }
 }
 export function registerFolderLane(tools) {
     folderTools(tools);

package/dist/lanes/form-contract.js

@@ -20,7 +20,7 @@ export const FORM_WIRE = Object.freeze({
 });
 const FORM_GET_DESCRIPTION = '读取默认表单（bizsheet/get）的发布状态与控件清单（紧凑默认）。**发布态以返回的 `published` / `existDraft` 布尔为准**（`published:true`=已发布；`published:false,existDraft:true`=只有草稿，**未发布**）——不要用 `publishedControlCodes` 是否非空来推断（草稿字段会让它非空，误判为已发布）。**每个模型交付前其默认表单必须 `published:true`**：用 `configure_form` 或 `form.draft(rebuild:true)`+`form.publish` 发布，并逐模型 `form.get` 核对。`full:true` 还返回 `options` 与解析后的 `customButtonJson`（表单工具栏按钮）。传 `controls:["code",…]` 只取指定控件的 options（如关联控件的 mappings）；传 `full:true` 才返回 draft/published 的完整 view/attributes/html/actions JSON（actions 列为设计器保存/发布的表单级按钮动作）。体积大，仅在需要整体布局时用。';
 const FORM_DRAFT_DESCRIPTION = "Save the default-form DRAFT (bizsheet/update). Reads the current sheet, merges the caller's explicit draftViewJson/draftAttributesJson (or preserves the existing draft); when both are absent on a fresh default form, composes the designer-standard scaffold from the model's published fields. A redundant field (relation-mapping carry-through target) always stays bound; with no workflow it is hidden in the design (options.visible=false), with a workflow it stays visible for per-node propertyPermissions. Pass `draftHtmlJson` to thread custom online-script HTML through. Empty-layout guard: explicitly passing \"[]\"/\"{}\" view/attributes is refused (form-empty-layout) — the platform designer's Save is NOT lossless and clears drafts to exactly that shape; escape with allowEmptyLayout:true, and recover cleared drafts from the form version history (/api/api/app/bizsheet/history/list). **读回原样回写**：从 `form.get` 取回的 view/attributes 直接回传时加 `fromReadback:true`——工具会与已存草稿/发布面逐字比对，一致才放行（平台自身布局可能含子表列行/系统行默认宽度），被改动过的面照常按 validation 拒绝。**表单工具栏按钮**：`buttons`（数组）或 `customButtonJson`（原样字符串）写进 `biz_sheet.options.customButtonJson`；**要到 form.publish 才生成 h_biz_button(triggerType=FORM)**，且表单页是否显示还取决于流程节点 `buttonPermission.customBtns[].enabled`（设计器「表单操作」勾选）。`useLocation` 用 FORM/ROW/LIST，表单工具栏按钮用 FORM。 **表单控件属性（含关联填充 mappings）从字段行派生**：改关联映射的事实源在字段 options.mappings（field.update → field.publish），直接改这里的控件映射会被平台按字段重算覆盖（真机 2026-10-14 实证）；字段发布后如需刷新已发布表单的控件映射，用本工具 rebuild:false 重存（保留现有布局与在线JS）再 form.publish。";
-const FORM_PUBLISH_DESCRIPTION = "Publish the default form (bizsheet/publish, proven shape: draft*Json promoted to published*Json verbatim) with published-face readback. Degrade guard: refuses to promote a draft carrying FEWER controls than the published face (form-publish-degrade) — the designer's Save clears drafts non-losslessly; recover via the form version history (/api/api/app/bizsheet/history/list) and rewrite the draft first, or pass allowDegrade:true to force the reduction. rebuild:true is the one-call refresh: discard the existing draft, re-scaffold from the published fields (non-structural control options preserved), then force-promote — use it after a field shape change. **表单工具栏按钮**：传 `buttons`（或 `customButtonJson`）→ 写进 `options.customButtonJson` 并在本次 publish 生成 `h_biz_button(triggerType=FORM, triggerCode=<formCode>)`（平台 `publishBizForm:1022`）；`options.customButtonJson` 必须是**字符串化数组**（对象会 50000 syntax error）；表单页是否显示再由流程节点 `buttonPermission.customBtns[].enabled` 过滤。";
+const FORM_PUBLISH_DESCRIPTION = "Publish the default form (bizsheet/publish, proven shape: draft*Json promoted to published*Json verbatim) with published-face readback. **不影响在线 JS**：本工具只提拔布局草稿；改 JS 请用 onlinejs.compose（它自己会连同整张表单一起发布，不必再调本工具）。 Degrade guard: refuses to promote a draft carrying FEWER controls than the published face (form-publish-degrade) — the designer's Save clears drafts non-losslessly; recover via the form version history (/api/api/app/bizsheet/history/list) and rewrite the draft first, or pass allowDegrade:true to force the reduction. rebuild:true is the one-call refresh: discard the existing draft, re-scaffold from the published fields (non-structural control options preserved), then force-promote — use it after a field shape change. **表单工具栏按钮**：传 `buttons`（或 `customButtonJson`）→ 写进 `options.customButtonJson` 并在本次 publish 生成 `h_biz_button(triggerType=FORM, triggerCode=<formCode>)`（平台 `publishBizForm:1022`）；`options.customButtonJson` 必须是**字符串化数组**（对象会 50000 syntax error）；表单页是否显示再由流程节点 `buttonPermission.customBtns[].enabled` 过滤。";
 const FORM_RUN_BUTTON_DESCRIPTION = "执行表单工具栏按钮（平台同款面：`POST /api/api/runtime/form/executeCustomButton`，body `{bizButtonModel, bizObjectList:[<完整业务对象>], reacquireDataFromDb:true}`）。**与列表行按钮不同**：列表按钮发 `launcher/domain_service_runtime/<schema>/<rule>` + `ids[]`（用 `rule.run`），表单按钮带**整条记录**，不能互换。按钮来源 `GET /api/api/system/getCustomButtons`（只列 triggerType=FORM 的 h_biz_button）。前提：按钮已由 `form.publish` 的 `buttons`/`customButtonJson` 生成。返回是执行结果信封，规则副作用用 `data.load` 另读；被规则 UPDATE 的目标行须是 COMPLETED（引擎查不到 DRAFT）。`302045` = 数据被占用。**`10005` 执行失败时优先换等价面 `rule.run`（launcher/domain_service_runtime/<schema>/<rule> + ids[]）**——同一绑定规则在 rule.run 面已验证可用（r28b 实证），不要在 executeCustomButton 上反复重试。";
 const CONFIGURE_FORM_DESCRIPTION = "High-level: bind fields into the default form and publish it (form.draft → form.publish), subject to the write permission gate. Delegates to the proven form.draft scaffold + form.publish paths so the real empty-form layout (and any caller-supplied draftHtmlJson) is persisted and promoted — never bypasses with a shortcut body. `sheetCode` is optional: omitted means the model's default sheet (sheetCode = schemaCode).";
 export const FORM_LANE_CONTRACT = Object.freeze({