@stalfh233/omc-cli 0.4.15 → 0.4.16

package/dist/lanes/apply-changes.js

@@ -162,7 +162,20 @@ export function registerApplyChangesLane(tools) {
                     }
                     try {
                         const outcome = await target.writeExecute(session, change.args);
-                        steps.push({ step: change.tool, index, status: "ok", performed: outcome.performed, readback: outcome.readback });
+                        // A step-chain write (field.update cascadeRepublish) may RETURN a
+                        // mid-chain stop instead of throwing: surface it as this batch's
+                        // stop with the inner chain preserved for audit.
+                        if ("status" in outcome) {
+                            const progressFile = recordProgress("STOPPED", steps.length);
+                            const cascadeStop = {
+                                status: outcome.status,
+                                steps,
+                                failedStep: { index, tool: change.tool },
+                                envelope: { ...outcome.envelope, message: `${String(outcome.envelope.message ?? "步骤失败")}（第 ${index + 1} 步 ${change.tool} 的内部级联中途停止）`, progressFile },
+                            };
+                            return cascadeStop;
+                        }
+                        steps.push({ step: change.tool, index, status: "ok", performed: outcome.performed, readback: outcome.readback, ...(outcome.steps !== undefined ? { chainSteps: outcome.steps } : {}) });
                         recordProgress("RUNNING", index + 1);
                     }
                     catch (error) {

package/dist/lanes/b2-registration-contract.js

@@ -111,6 +111,10 @@ export const B2_LANE_CONTRACT = Object.freeze({
             scope: "readback",
             description: "B2 业务集成服务读回：get_by_code + 方法列表（filterFlag=false 原样；方法行解码 configJson/inputParametersJson/outputParametersJson，方法 configJson 读回为明文、枚举双表示解码为名字形——8.6.26 写侧 'Post'/8.6.39 读侧 0 都解码；方法列表失败不阻断服务读回）。读面覆盖二开扩展包发布的方法（同表存储；adapterCode=INTERNAL 是本地扩展适配器）。",
         }),
+        "service.list": Object.freeze({
+            scope: "readback",
+            description: "列出业务集成服务（/bizservice/service/list_by_category_id；categoryId 省略或空串=全部；keyword 走 list_by_category_id_find 仅匹配 name/code 大小写无关包含）。响应是字段白名单投影（id/code/name/adapterCode/serviceCategoryId/description/shared）——平台行携带完整 configJson（授权配置，可能带凭据），工具层永不回显 configJson。",
+        }),
         "service.register": Object.freeze({
             scope: B2_SCOPE,
             description: "注册业务集成服务（`/bizservice/service/create`，body `{code,name,adapterCode,description,configJson?}`；adapterCode 空 → 500005）+ 可选方法（`/bizservice/method/create`，可带 `configJson`/`inputParametersJson`/`outputParametersJson`），并回读。serviceConfig 明文序列化（RESTFUL/INTERNAL/SOAP 需 auth+commonlist.url；DATA_SQL/DATA_TABLE 需 commonlist.databaseConnectionPoolCode；SAP 需 commonlist.sapConnectionPoolCode；KAFKA 需 commonlist.kafkaConnectionPoolCode），methodConfig 由工具 AES-128-ECB+Base64 加密（SOAP 方法由 WSDL 动态发现，无固定方法 configJson）。参数面结构化序列化；RESTFUL 每参数需 configJson.position，URL_VARIABLE 拒绝；required 三态透传。设计器同款必填：name（≤50）、adapterCode、serviceCategoryId；除 SOAP 动态方法外，各原生适配器带 methodName 时必带 methodConfig；INTERNAL 方法创建走二开扩展包导入，不在本写面；仅名字/参数面的注册壳不可绑定。",
@@ -225,6 +229,7 @@ export function assertB2Contract() {
         throw new Error("b2 contract must pin the update metadata passthrough");
     if (!B2_WIRE.requiredFields.includes("serviceCategoryId"))
         throw new Error("b2 contract must pin the designer-parity requireds");
+    assertDescriptionCarries(B2_LANE_CONTRACT, "service.list", ["list_by_category_id", "categoryId", "keyword", "configJson", "白名单"]);
     assertDescriptionCarries(B2_LANE_CONTRACT, "service.category.list", ["category/list", "所属目录"]);
     assertDescriptionCarries(B2_LANE_CONTRACT, "service.category.create", ["category/create", "name"]);
     assertDescriptionCarries(B2_LANE_CONTRACT, "service.category.update", ["category/update", "501052", "501004"]);

package/dist/lanes/b2-registration-coverage.js

@@ -7,6 +7,7 @@ export const B2_COVERAGE = declareLaneCoverage(B2_LANE_CONTRACT.lane, [
         evidence: [".scratch/omc-route-wayfinder/leg2-closeout.md", "packages/omc-cli/src/lanes/b2-registration.ts", "packages/omc-cli/src/bizservice-config.ts", ".scratch/omc-app-management/research/bizservice-integration-backend-face.md", ".scratch/omc-app-management/evidence/bizservice-rule-binding-fwb-20260914.md"],
         tools: [
             claim("service.get", T["service.get"].scope),
+            claim("service.list", T["service.list"].scope),
             claim("service.register", T["service.register"].scope),
             claim("service.update", T["service.update"].scope),
             claim("method.get", T["method.get"].scope),

package/dist/lanes/b2-registration.js

@@ -12,7 +12,7 @@ import { wireCall, wireRows, wireDownloadBuffer, wireUploadFile, WireError } fro
 import { ZipFormatError, readZipEntries, zipEntryByBasename } from "../zip.js";
 import { B2_LANE_CONTRACT } from "./b2-registration-contract.js";
 import { BIZSERVICE_WRITE_ADAPTERS, assertBizServiceAdapterWhitelisted, assertStructuredConfig, compileMethodConfigPlain, compileParameterFace, compileServiceConfig, maskServiceConfigSecrets, normalizeMethodConfigReadback, normalizeParameterFaceReadback, parseIeManifest, iePackageSummary, } from "../bizservice-config.js";
-import { encryptBizServiceMethodConfigJson, encryptBizDbPoolPassword } from "omc-core";
+import { omcCore } from "../omc-core-lazy.js";
 const B2_LANE = B2_LANE_CONTRACT.lane;
 const B2_TOOLS = B2_LANE_CONTRACT.tools;
 /** Decode a JSON-string column (configJson/inputParametersJson/…); policy: non-strings null-coalesce, unparseable passes through. */
@@ -76,6 +76,25 @@ function parseDeclaredParameterCodes(inputParametersJson) {
     }
     return { all, required };
 }
+/**
+ * Ticket T08 — readback face for a service LIST row: an explicit field
+ * whitelist WITHOUT `configJson`. The platform's list_by_category_id rows
+ * carry the full BizServiceModel including the authorization config (which
+ * may contain credentials), so the projection lives at the tool boundary —
+ * the list face is for inventory/disambiguation; the structured (masked)
+ * config is service.get's job.
+ */
+function serviceReadbackFace(row) {
+    return {
+        id: row.id,
+        code: row.code,
+        name: row.name,
+        ...(row.adapterCode !== undefined && row.adapterCode !== null ? { adapterCode: row.adapterCode } : {}),
+        ...(row.serviceCategoryId !== undefined && row.serviceCategoryId !== null ? { serviceCategoryId: row.serviceCategoryId } : {}),
+        ...(row.description !== undefined && row.description !== null ? { description: row.description } : {}),
+        ...(typeof row.shared === "boolean" ? { shared: row.shared } : {}),
+    };
+}
 /**
  * Ticket 104 — readback face for a connection-pool row: an explicit field
  * whitelist WITHOUT `password`. The platform's raw list does not mask the
@@ -180,6 +199,36 @@ export function registerB2Lane(tools) {
             };
         }),
     }));
+    tools.push(defineTool({
+        name: "service.list",
+        layer: "low",
+        kind: "read",
+        lane: B2_LANE,
+        scope: B2_TOOLS["service.list"].scope,
+        description: B2_TOOLS["service.list"].description,
+        inputSchema: {
+            environment: environmentArg,
+            categoryId: z.string().optional().describe("所属分类 id（service.category.list 取；省略或空串=全部，与设计器一致）"),
+            keyword: z.string().optional().describe("按名称/编码过滤（大小写无关包含；传了走 list_by_category_id_find）"),
+            capability: capabilityArg,
+        },
+        handler: async (ctx, args, self) => governedRead(ctx, self, args, async (session) => {
+            // 8.6.26 evidence (BizServiceController.java): list_by_category_id with
+            // categoryId="" lists ALL services (the designer's「全部」row); the
+            // _find variant filters name/code case-insensitively. Both return the
+            // FULL BizServiceModel — configJson included (authorization config,
+            // possibly carrying credentials). The tool projects a field whitelist
+            // at the boundary: configJson (and any non-whitelist column) NEVER
+            // echoes. Read a single service's structured (masked) config via
+            // service.get.
+            const rows = wireRows((await wireCall(session, {
+                path: args.keyword !== undefined ? ENDPOINTS.bizServiceListByCategoryIdFind : ENDPOINTS.bizServiceListByCategoryId,
+                query: { categoryId: args.categoryId ?? "", ...(args.keyword !== undefined ? { keyword: args.keyword } : {}) },
+            })).data);
+            const services = rows.map((row) => serviceReadbackFace(row));
+            return { services, codes: services.map((row) => row.code) };
+        }),
+    }));
     tools.push(defineTool({
         name: "method.get",
         layer: "low",
@@ -253,7 +302,7 @@ export function registerB2Lane(tools) {
                 serviceCode: args.serviceCode,
                 code: args.methodCode,
                 name: args.name ?? (typeof currentRecord.name === "string" ? currentRecord.name : args.methodCode),
-                ...(methodConfigPlain !== undefined ? { configJson: encryptBizServiceMethodConfigJson(methodConfigPlain) } : currentConfigPlain !== undefined ? { configJson: encryptBizServiceMethodConfigJson(currentConfigPlain) } : {}),
+                ...(methodConfigPlain !== undefined ? { configJson: (await omcCore()).encryptBizServiceMethodConfigJson(methodConfigPlain) } : currentConfigPlain !== undefined ? { configJson: (await omcCore()).encryptBizServiceMethodConfigJson(currentConfigPlain) } : {}),
                 ...(inputJson !== undefined && inputJson !== null ? { inputParametersJson: inputJson } : {}),
                 ...(outputJson !== undefined && outputJson !== null ? { outputParametersJson: outputJson } : {}),
             },
@@ -300,7 +349,7 @@ export function registerB2Lane(tools) {
                 serviceCode: args.serviceCode,
                 code: args.methodCode,
                 name: args.name,
-                ...(methodConfigPlain !== undefined ? { configJson: encryptBizServiceMethodConfigJson(methodConfigPlain) } : {}),
+                ...(methodConfigPlain !== undefined ? { configJson: (await omcCore()).encryptBizServiceMethodConfigJson(methodConfigPlain) } : {}),
                 ...(inputJson !== undefined && inputJson !== null ? { inputParametersJson: inputJson } : {}),
                 ...(outputJson !== undefined && outputJson !== null ? { outputParametersJson: outputJson } : {}),
             },
@@ -458,7 +507,7 @@ export function registerB2Lane(tools) {
                 databaseType: args.databaseType,
                 jdbcUrl: args.jdbcUrl,
                 ...(args.username !== undefined ? { username: args.username } : {}),
-                ...(args.password !== undefined ? { password: encryptBizDbPoolPassword(args.password) } : {}),
+                ...(args.password !== undefined ? { password: (await omcCore()).encryptBizDbPoolPassword(args.password) } : {}),
                 ...(args.description !== undefined ? { description: args.description } : {}),
                 ...(args.datasourceType !== undefined ? { datasourceType: args.datasourceType } : {}),
                 ...(args.externInfo !== undefined ? { externInfo: args.externInfo } : {}),
@@ -511,7 +560,7 @@ export function registerB2Lane(tools) {
                 // New passwords ride the RSA boundary; the echoed stored value is
                 // already ciphertext (designer parity — the overwrite keeps the
                 // credential column intact when the caller does not rotate it).
-                password: args.password !== undefined ? encryptBizDbPoolPassword(args.password) : currentRecord.password ?? "",
+                password: args.password !== undefined ? (await omcCore()).encryptBizDbPoolPassword(args.password) : currentRecord.password ?? "",
                 description: args.description !== undefined ? args.description : currentRecord.description ?? "",
                 datasourceType: args.datasourceType ?? currentRecord.datasourceType ?? "DATABASE",
                 externInfo: args.externInfo !== undefined ? args.externInfo : currentRecord.externInfo ?? "",
@@ -683,7 +732,7 @@ export function registerB2Lane(tools) {
                 method: "POST",
                 body: {
                     serviceCode: args.serviceCode, code: args.methodName, name: args.methodName,
-                    ...(methodConfigPlain !== undefined ? { configJson: encryptBizServiceMethodConfigJson(methodConfigPlain) } : {}),
+                    ...(methodConfigPlain !== undefined ? { configJson: (await omcCore()).encryptBizServiceMethodConfigJson(methodConfigPlain) } : {}),
                     ...(inputJson !== undefined ? { inputParametersJson: inputJson } : {}),
                     ...(outputJson !== undefined ? { outputParametersJson: outputJson } : {}),
                 },

package/dist/lanes/field-contract.js

@@ -183,7 +183,8 @@ export const FIELD_LANE_CONTRACT = Object.freeze({
                 "Use it to add relation `mappings` (source/target carry-through) or change field options.",
                 "A relation's display field is the field-row top-level `relativePropertyCode` (options.displayField is mirrored but not what the runtime reads); the tool rewrites it when you pass a new displayField.",
                 "表单条件（`options.requiredFormula`（必填）/`readonlyCondition`（只读）/`displayFormula`（显示））会**自动配对**一条 `bizdatarule` type3/4/5 行：门户**运行时**读字段 options，表单设计器**设计态** Set/Unset 读 `bizdatarule/list`——只写 options 会让设计器显示 Unset。readback.formConditionSync 报 created/updated/deleted/skipped；清空条件传空串（如 requiredFormula:\"\"）会同时删规则行；字段未发布时只写 options 并在 skipped 说明原因。",
-                "Re-publish with field.publish for the change to take effect.",
+                "Re-publish with field.publish for the change to take effect — or pass `cascadeRepublish:true` for the one-call chain: field.update → field.publish → form.draft(rebuild) → form.publish(force). The cascade re-scaffolds the default form from the published fields (non-structural control options are preserved); there is no cross-endpoint transaction, so a mid-chain failure is reported honestly as partial (status:partial) with steps/failedStep/envelope (the completed prefix stays).",
+                "form.publish(rebuild:true) is the same form-side refresh without re-touching the field: it discards the existing draft, re-scaffolds from the published face, and force-promotes.",
             ]),
         }),
         "field.publish": Object.freeze({
@@ -216,7 +217,7 @@ export function assertFieldContract() {
     if (FIELD_LANE_CONTRACT.wire.publishScope !== "model")
         throw new Error("field contract pins the publish scope to model");
     assertDescriptionCarries(FIELD_LANE_CONTRACT, "field.create", ["bizproperty/create", "OCR/ELECTRONIC_SIGN", "`choices`", "options.optionsSet", "`relativeCode`", "searchFormula", "`options.formulaConfig`", "`options.relevanceField`", "code_reserved", "WORK_SHEET"]);
-    assertDescriptionCarries(FIELD_LANE_CONTRACT, "field.update", ["bizproperty/update", "`options`", "field.publish"]);
+    assertDescriptionCarries(FIELD_LANE_CONTRACT, "field.update", ["bizproperty/update", "`options`", "field.publish", "cascadeRepublish", "form.draft(rebuild)", "form.publish(force)", "published fields", "non-structural", "partial"]);
     assertDescriptionCarries(FIELD_LANE_CONTRACT, "field.publish", ["bizproperty/publish", "published", "Model-scoped", "publishedCodes"]);
     assertDescriptionCarries(FIELD_LANE_CONTRACT, "field.delete", ["bizproperty/force_delete", "absence"]);
 }