@stalfh233/omc-cli 0.6.7 → 0.6.11

package/dist/goal-routes.js

@@ -159,6 +159,28 @@ function bestRecipe(registry, capabilityId, lane, goal, minScore = 3) {
     }
     return best;
 }
+/**
+ * r28c F2: an authored recipe alias must beat the generic composer/capability
+ * ladder. `omc next "按比例赋值"` used to fall through to requirement-analysis
+ * (no capability cue) or to `rule-when` (composer groups match "条件…赋值"),
+ * even though `rule-condition-formula-action` already owns those phrases.
+ * Exact alias hits (≥2 chars) are decisive and return a ready describe action.
+ */
+function bestAliasRecipe(registry, goal) {
+    let best;
+    for (const tool of registry) {
+        for (const recipe of tool.executionMetadata?.recipes ?? []) {
+            for (const alias of recipe.aliases ?? []) {
+                if (alias.length < 2 || !goal.includes(alias))
+                    continue;
+                const score = alias.length;
+                if (best === undefined || score > best.score)
+                    best = { tool: tool.name, recipe: recipe.id, title: recipe.title, alias, score };
+            }
+        }
+    }
+    return best;
+}
 /**
  * The write tools a capability step will actually call, as a compact
  * `{ toolName: [requiredArg] }` map. `omc next` inlines this so an agent stops
@@ -396,7 +418,8 @@ const COMPOSER_ROUTES = Object.freeze([
         id: "approval-flow",
         command: "omc approval-flow --schema <模型code> --steps '<节点名>@role:<角色code>' --apply",
         usage: "omc approval-flow --help",
-        summary: "线性审批流一条命令：建流程 → 模板+字段只读权限 → 发布（多级用重复 --steps）",
+        // F1（r27）：边界前置——非发起人审批无法在单会话 CLI 内推进，别等 submit 失败才说。
+        summary: "线性审批流一条命令：建流程 → 模板+字段只读权限 → 发布（多级用重复 --steps）。边界：非发起人身份的审批无法在单会话 CLI 内推进（单 token）；若要验跨账号审批，用第二账号另建环境，或把参与人设为 {Originator}",
         groups: [["审批", "流程"], ["建", "创建", "新建", "配置", "加", "搭"]],
         // Branching / countersign shapes are NOT this composer's business.
         avoid: ["条件分支", "分支", "会签", "并行", "或签", "网关", "子流程", "动态审批人", "清理", "删除", "移除", "purge", "teardown"],
@@ -420,11 +443,12 @@ const COMPOSER_ROUTES = Object.freeze([
     },
     {
         id: "rule-when",
-        // `--on` is the trigger (Create/Update/…), not `--rule`: r14's template
+        // `--on` is the trigger (Create/Update only — no Submit): r14's template
         // invented a flag, and the new template-vs---help test caught it offline.
+        // r28c F1: "提交时" is NOT a third trigger; callers must pick create|update.
         command: "omc rule-when --schema <模型code> --on Create --when '<条件>' --then 'set:<字段code>=<值>'",
         usage: "omc rule-when --help",
-        summary: "条件→动作规则一条命令（BRANCH + 赋值节点拼装），替代手拼 nodeGraph",
+        summary: "条件→动作规则一条命令（--on 仅 create|update，**没有 submit**；BRANCH + 赋值节点拼装），替代手拼 nodeGraph",
         groups: [["规则", "条件"], ["如果", "当", "满足", "时"], ["更新", "赋值", "改为", "设为", "动作"]],
         avoid: [],
         topics: ["omc-business-configuration"],
@@ -442,8 +466,6 @@ const COMPOSER_ROUTES = Object.freeze([
         topics: ["omc-business-configuration"],
     },
 ]);
-/** Test seam: the composer registry, so a template typo can be caught offline. */
-export const COMPOSER_ROUTES_FOR_TEST = COMPOSER_ROUTES;
 /**
  * r19 ticket 04 — the ONE question that unlocks each composer. A composer
  * skeleton always carries placeholders, so a composer match is a `needs-input`
@@ -453,11 +475,15 @@ const COMPOSER_QUESTIONS = Object.freeze({
     "model-purge": "要清理哪个模型？给我 schemaCode（不确定就先跑下面的只读判别动作拿清单）",
     "model-scaffold": "给我模型 code、显示名和字段清单（每字段 code/名称/类型；子表放 subFields），我一条命令建完",
     "field-add": "目标存量模型 schemaCode 和字段清单（每字段 code/名称/类型；choices 给字符串数组、字典 dictCode 简写）是什么？需求还带列表固定过滤或演示行的话**一并整句给我——全折进本命令（--conditions/--demo-rows），不要拆成字段/过滤/数据三段串行做**；建完自动发布、重建表单、列表加列",
-    "approval-flow": "目标模型 schemaCode 和每级审批节点（节点名@角色code，多级用重复 --steps）是什么？",
+    "approval-flow": "目标模型 schemaCode 和每级审批节点（节点名@角色code，多级用重复 --steps）是什么？注意：非发起人身份的审批无法在单会话 CLI 内推进（单 token）；若要验跨账号审批，用第二账号另建环境，或把参与人设为 {Originator}",
     compute: "目标模型 schemaCode、结果字段 code、公式是什么？（子表条件聚合再加 --where \"子列 = 值\"）",
-    "rule-when": "目标模型 schemaCode、触发时机（Create/Update…）、条件（--when）和动作（--then）各是什么？",
+    "rule-when": "目标模型 schemaCode、触发时机（仅 Create 或 Update，没有 Submit）、条件（--when）和动作（--then）各是什么？",
     "form-default": "目标模型 schemaCode、字段 code 和默认值是什么？",
 });
+/** Test seam: the composer registry, so a template typo can be caught offline. */
+export const COMPOSER_ROUTES_FOR_TEST = COMPOSER_ROUTES;
+/** Test seam: the clarifying question each composer asks (must mention trigger limits). */
+export const COMPOSER_QUESTIONS_FOR_TEST = COMPOSER_QUESTIONS;
 /** The read-only discriminator that supplies a missing schema code. */
 const LIST_MODELS_ACTION = "omc call model.list --args '{}'";
 function matchComposer(goal, mode) {
@@ -637,6 +663,71 @@ export function goalRoute(registry, goal) {
             },
         };
     }
+    // r28c F2: authored recipe aliases beat composers. A short goal like
+    // "按比例赋值" has no capability cue and would otherwise fall through;
+    // "条件成立时按公式赋值" would be stolen by the rule-when composer.
+    if (!readish) {
+        const aliasHit = bestAliasRecipe(registry, goal);
+        if (aliasHit) {
+            const action = `omc describe ${aliasHit.tool} --example ${aliasHit.recipe}`;
+            return {
+                status: "ok",
+                goal,
+                confident: true,
+                mode,
+                write: true,
+                match: { kind: "recipe", ref: aliasHit.recipe, title: firstSentence(aliasHit.title), tool: aliasHit.tool, recipe: aliasHit.recipe, alias: aliasHit.alias },
+                route: {
+                    recipe: { tool: aliasHit.tool, id: aliasHit.recipe, command: action },
+                    readiness: DISCOVERY_AUTHORITY.readiness,
+                    firstCommands: [action],
+                    write: true,
+                    readback: true,
+                },
+                firstAnswer: {
+                    state: "ready",
+                    action,
+                    why: `命中配方别名「${aliasHit.alias}」→ ${aliasHit.recipe}：describe 首答自带 firstCall 形状，代入你的 schemaCode/字段 code 即可执行`,
+                },
+            };
+        }
+    }
+    // r28h F1/F7: org.* lives under workflow. A goal that names organisation
+    // nouns (部门/角色/角色组/权限范围/组织架构) and does NOT name model/field/
+    // form atoms must not fall into the field→workflow ladder (which then asks
+    // for a schemaCode the org faces do not have). Narrow cue-only shortcut —
+    // does not change the ladder structure for any other ask.
+    {
+        const orgCues = ["组织架构", "组织管理", "管理组织", "角色组", "权限范围", "管理范围", "部门树", "员工账号"];
+        const orgHit = orgCues.some((cue) => goal.includes(cue)) || (/组织/.test(goal) && /(部门|角色|用户|权限)/.test(goal));
+        const atomHit = /(模型|字段|子表|表单|列表|视图|业务规则|流程模板|审批流|在线js|字典)/i.test(goal);
+        if (orgHit && !atomHit) {
+            const action = "omc call org.department.list --args '{}'";
+            return {
+                status: "ok",
+                goal,
+                confident: true,
+                mode: readish ? mode : "read",
+                write: false,
+                match: { kind: "capability", ref: "workflow", title: "组织/部门/角色/权限范围（org.*）", capabilities: ["workflow"] },
+                route: {
+                    capability: "workflow",
+                    lane: "W7-S29-greenfield",
+                    note: "组织读写（org.*）挂在 workflow 能力下：部门树 org.department.list、角色/组 org.role.list、用户 org.user.search、成员/范围 org.role.users / org.role.userScope / org.role.setUserScope。先只读盘点，再按需写。",
+                    readTools: ["org.department.list", "org.role.list", "org.user.search", "org.role.users", "org.role.userScope"],
+                    readiness: DISCOVERY_AUTHORITY.readiness,
+                    firstCommands: [action, "omc call org.role.list --args '{}'", "omc call org.user.search --args '{}'"],
+                    write: false,
+                    readback: true,
+                },
+                firstAnswer: {
+                    state: "ready",
+                    action,
+                    why: "命中组织/部门/角色/权限范围线索：先只读部门树，再用 org.role.list / org.user.search 盘点角色与用户（无 schemaCode）",
+                },
+            };
+        }
+    }
     const composer = matchComposer(goal, mode);
     if (composer) {
         const topics = (composer.topics ?? []).filter((topic) => availableTopics.has(topic));
@@ -669,7 +760,8 @@ export function goalRoute(registry, goal) {
             },
         };
     }
-    const scores = [...capabilityScores(registry, goal).entries()].sort((left, right) => right[1] - left[1]);
+    const scoreMap = capabilityScores(registry, goal);
+    const scores = [...scoreMap.entries()].sort((left, right) => right[1] - left[1]);
     const fallback = {
         status: "ok",
         goal,
@@ -722,7 +814,11 @@ export function goalRoute(registry, goal) {
                     : { firstCommand: `omc commands --json --compact --lane ${capability.lane}` }),
             };
         });
-        const readSections = sectionPointersFor(ordered);
+        // r28e F2：方法论节按「目标里点到哪几个能力」排序，而不是死按 ladder 顺序。
+        // 否则「建表单布局 + 在线JS」这类目标会先挂上 model 的通用「标准顺序」，
+        // 把真正相关的「表单与视图 / 按钮与在线 JS」挤到后面。
+        const sectionOrder = [...ordered].sort((a, b) => (scoreMap.get(b) ?? 0) - (scoreMap.get(a) ?? 0));
+        const readSections = sectionPointersFor(sectionOrder);
         const write = readish ? false : ordered.some((id) => routeById.get(id)?.tools.some((name) => registryTools.get(name)?.kind === "write"));
         const whole = isWholePackageWrite(mode, goal, ordered.length);
         // r19 ticket 04: the ladder's first RECIPE command is the first answer
@@ -742,7 +838,14 @@ export function goalRoute(registry, goal) {
             match: { kind: readish ? "read-ladder" : "ladder", ref: ordered.join("→"), capabilities: ordered },
             route: {
                 ...(whole ? { primary: "intent", atomicSupplement } : { ladder }),
-                ...routeReads(readSections, recipeCommands.length > 0, LADDER_INLINE_BUDGET_BYTES),
+                // r28e F2（真机复现 2026-11-05）：`next "建表单布局、在线JS、表单按钮"`
+                // 命中的是 model→form→listview→businessrule→onlinejs 的整包 ladder，
+                // 其中只有 businessrule 有配方 —— 于是 firstCommands 唯一一条变成了
+                // `rule.save --example business-rule-branch-conditional`（与目标毫无关系），
+                // 同时 recipeMatched 把**全部**方法论指针都压空了（readSections: []）。
+                // 规则修正：只有单能力路由才允许「命中配方 → 不给方法论节」；
+                // 多能力 ladder 里一条配方不能代表其余能力，节指针要留住。
+                ...routeReads(readSections, recipeCommands.length > 0 && ordered.length === 1, LADDER_INLINE_BUDGET_BYTES),
                 readiness: DISCOVERY_AUTHORITY.readiness,
                 // r18: when a step already carries a goal-matched recipe, the generic
                 // first section ("3. Draft template") is noise — the probe read it and
@@ -757,7 +860,11 @@ export function goalRoute(registry, goal) {
                 // graph instead. Surface them at the top level where `firstCommands` is
                 // the thing an agent actually reads.
                 firstCommands: [
-                    ...recipeCommands,
+                    // r28e F2：整包 ladder 的主路径是 intent，firstAnswer.action 也写的是
+                    // `omc intent schema`。此前这里只挑 ladder 里**任意一条**配方贴上来；
+                    // 当只有 businessrule 有配方时，表单/视图目标会收到 rule.save 的样例，
+                    // 与首答自相矛盾（且必然跑题）。整包就统一给 intent。
+                    ...(whole ? ["omc intent schema"] : recipeCommands),
                     // r13 #3: `capability workflow --executable` is 23 KB and still did not
                     // answer "how do I submit an approval" — the answer is a data.submit
                     // recipe, which lives in a DIFFERENT capability. When the goal is about

package/dist/human-summary.js

@@ -95,6 +95,17 @@ function noChange(outcome) {
  * 无变更 instead of pretending something changed.
  */
 export function writeSummary(tool, args, outcome, phase = "done") {
+    // r28b F11: data.delete already-absent must NOT read as「已删除…」— humans/CI
+    // that skim stderr treat the leading verb as the outcome. Say「未删除」first.
+    if (phase === "done" && tool === "data.delete" && outcome?.performed?.skipped === "already-absent") {
+        const id = (Array.isArray(args.bizObjectIds) && args.bizObjectIds.length > 0
+            ? String(args.bizObjectIds[0])
+            : undefined) ??
+            stringArg(args, "bizObjectId") ??
+            "?";
+        const schema = stringArg(args, "schemaCode");
+        return `未删除（id 不存在，already-absent）${schema ? `：${id}（${schema}）` : `：${id}`}`;
+    }
     const phrase = phraseOf(tool, args, outcome);
     // An explicitly requested cross-application target is named in BOTH the
     // plan and the result (same source, no divergence).

package/dist/lanes/app-contract.js

@@ -11,8 +11,9 @@ export const APP_WIRE = Object.freeze({
     defaultGroupResolution: "explicit groupId > configured app's groupId (auto-configured-app-group) > tenant first named non-fallback group (auto-first-group, warning:resolved-to-first-group); a fallback-group landing (code=all) warns resolved-to-fallback-group; portalHidden:true",
     publishBoundary: "app publish is out of boundary; the operator must publish in the designer and verify the group, otherwise the portal is invisible",
     updateBody: "apppackage/update submits the whole record by id; an explicit groupId takes effect, an omitted groupId is forced back to the default group, and enabled!==true clears workflow favorites — so app.update re-reads the record and only changes groupId while preserving the stored enabled value",
-    deleteBody: "apppackage/delete?appCode=; APP_PACKAGE_HAS_NODE refuses when the app still has non-folder nodes (delete models first)",
+    deleteBody: "apppackage/delete?appCode=; APP_PACKAGE_HAS_NODE / 600006 refuses when the app still has non-Folder nodes (models/reports/pages); tool pre-checks folder.tree and refuses app-not-empty with children[{id,type,path}] + nextCommand folder.tree (empty folders including isDefault default group do NOT block)",
     deletePoll: "apppackage/list polls to exact absence",
+    defaultFolderSeed: "apppackage/create seeds one top-level Folder with name_i18n.en=defaultGroup (display「默认分组」); app.create readback surfaces defaultFolder{id,path,isDefault:true}; folder.tree marks the same node isDefault:true",
 });
 export const APP_LANE_CONTRACT = Object.freeze({
     lane: LANES.app,
@@ -34,6 +35,7 @@ export const APP_LANE_CONTRACT = Object.freeze({
         updateBody: APP_WIRE.updateBody,
         deleteBody: APP_WIRE.deleteBody,
         deletePoll: APP_WIRE.deletePoll,
+        defaultFolderSeed: APP_WIRE.defaultFolderSeed,
     }),
     wireBindings: Object.freeze({
         createBody: Object.freeze([behaviorBinding("test/app-management.test.ts#app.create plans, executes under approval, and reads back presence", assertAppContract)]),
@@ -43,6 +45,7 @@ export const APP_LANE_CONTRACT = Object.freeze({
         updateBody: Object.freeze([behaviorBinding("test/app-management.test.ts#app.update preserves false enabled and does not invent i18n fields", assertAppContract)]),
         deleteBody: Object.freeze([behaviorBinding("test/app-management.test.ts#app.delete removes the app via the admin delete endpoint", assertAppContract)]),
         deletePoll: Object.freeze([behaviorBinding("test/app-management.test.ts#app.delete of an absent app is a no-op with proven absence", assertAppContract)]),
+        defaultFolderSeed: Object.freeze([behaviorBinding("test/app-folder-and-model-move.test.ts#r28d F2: app.create surfaces defaultFolder; folder.tree marks isDefault", assertAppContract)]),
     }),
     evidence: Object.freeze([
         "packages/omc-cli/test/app-management.test.ts",
@@ -57,7 +60,7 @@ export const APP_LANE_CONTRACT = Object.freeze({
         }),
         "app.create": Object.freeze({
             scope: "app package create",
-            description: "创建一个设计时应用（apppackage/create）。groupId 可选，缺省解析配置应用所在分组（操作者必然可见）；配置应用不存在时回退租户第一个具名非兜底分组（auto-first-group，warning:resolved-to-first-group）。落到兜底分组 code=all 时读回带 warning:resolved-to-fallback-group; portalHidden:true。创建后以 apppackage/list 读回存在性。应用发布属边界外：建成后需人工在设计器发布并核对该分组，否则门户不可见。",
+            description: "创建一个设计时应用包（apppackage/create，不是应用内目录）。groupId 可选，缺省解析配置应用所在分组（操作者必然可见）；配置应用不存在时回退租户第一个具名非兜底分组（auto-first-group，warning:resolved-to-first-group）。落到兜底分组 code=all 时读回带 warning:resolved-to-fallback-group; portalHidden:true。创建后以 apppackage/list 读回存在性；平台会自动生成默认分组（readback.defaultFolder，isDefault:true）。应用发布属边界外：建成后需人工在设计器发布并核对该分组，否则门户不可见。",
         }),
         "app.update": Object.freeze({
             scope: "app package update",
@@ -65,7 +68,7 @@ export const APP_LANE_CONTRACT = Object.freeze({
         }),
         "app.delete": Object.freeze({
             scope: "app package delete absence",
-            description: "删除一个应用（apppackage/delete?appCode=，管理员面：级联删除其下模型数据）。要求应用下无非目录节点，否则以 APP_PACKAGE_HAS_NODE 拒绝——先删模型再删应用。以 apppackage/list 轮询读回精确缺席。必须显式传 `code`，没有默认应用，避免误删。",
+            description: "删除一个应用包（apppackage/delete?appCode=，管理员面）。应用下还有模型/报表/自定义页等非目录节点时以 app-not-empty（平台 APP_PACKAGE_HAS_NODE / 600006）拒绝，回执列 children[{id,type,path}] 且 nextCommand 指向 folder.tree；空目录（含默认分组）不挡删除。以 apppackage/list 轮询读回精确缺席。必须显式传 `code`，没有默认应用，避免误删。",
         }),
     }),
 });
@@ -74,11 +77,11 @@ export function assertAppContract() {
     if (!APP_WIRE.defaultGroupResolution.includes("resolved-to-first-group"))
         throw new Error("app contract pins the first-group fallback warning token");
     assertDescriptionCarries(APP_LANE_CONTRACT, "app.list", ["apppackage/list", "跨应用"]);
-    assertDescriptionCarries(APP_LANE_CONTRACT, "app.create", ["apppackage/create", "resolved-to-first-group", "边界外"]);
+    assertDescriptionCarries(APP_LANE_CONTRACT, "app.create", ["apppackage/create", "resolved-to-first-group", "边界外", "defaultFolder"]);
     if (!APP_WIRE.createReadiness.includes("zero"))
         throw new Error("app contract must pin the zero-wire prerequisite refusal");
     assertDescriptionCarries(APP_LANE_CONTRACT, "app.update", ["apppackage/update", "groupId", "enabled", "原样保留", "AppPackageController.update"]);
-    assertDescriptionCarries(APP_LANE_CONTRACT, "app.delete", ["apppackage/delete", "APP_PACKAGE_HAS_NODE", "缺席"]);
+    assertDescriptionCarries(APP_LANE_CONTRACT, "app.delete", ["apppackage/delete", "APP_PACKAGE_HAS_NODE", "app-not-empty", "缺席"]);
     if (!APP_WIRE.createBody.includes("apppackage/create"))
         throw new Error("app contract must pin the create endpoint");
     if (!APP_WIRE.defaultGroupResolution.includes("auto-first-group"))
@@ -89,7 +92,11 @@ export function assertAppContract() {
         throw new Error("app contract must pin the whole-record update quirk");
     if (!APP_WIRE.deleteBody.includes("APP_PACKAGE_HAS_NODE"))
         throw new Error("app contract must pin the delete precondition");
+    if (!APP_WIRE.deleteBody.includes("app-not-empty"))
+        throw new Error("app contract must pin the app-not-empty refusal");
     if (!APP_WIRE.deletePoll.includes("exact absence"))
         throw new Error("app contract must pin the delete absence poll");
+    if (!APP_WIRE.defaultFolderSeed.includes("defaultGroup"))
+        throw new Error("app contract must pin the default-folder seed token");
 }
 //# sourceMappingURL=app-contract.js.map