weaver-e10-builder 1.5.12 → 1.5.14

package/dist/commands/workflow-condition.js

@@ -1,73 +1,38 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
+import { compileWorkflowCondition, persistWorkflowCondition } from '../services/workflow-condition-core.js';
+import { readFileSync } from 'node:fs';
 /**
  * workflow condition — 工作流条件（add / list / get / delete）。
  * 从 workflow.ts 拆分出来的增强版：操作符矩阵、系统字段、替换语义、明细字段。
  */
 export function registerWorkflowConditionCommands(wf, program) {
     const condCmd = wf.command('condition').description('工作流条件管理（add / list / get）');
-    // ======== Operator Matrix (from operator-matrix.md) ========
-    const SYSTEM_FIELDS = {
-        '流程标题': { id: '-1', family: 'String' },
-        '发起人': { id: '-2', family: 'Browser' },
-        '发起时间': { id: '-3', family: 'Date' },
-        '发起人部门': { id: '-4', family: 'Browser' },
-        '发起人分部': { id: '-5', family: 'Browser' },
-        '发起人岗位': { id: '-6', family: 'Browser' },
-        '发起人职级': { id: '-7', family: 'Browser' },
-        '当前操作人': { id: '-8', family: 'Browser' },
-        '流程超时(时)': { id: '-9', family: 'Number' },
-        '节点通过时间(时)': { id: '-10', family: 'Number' },
-        '紧急程度': { id: '-12', family: 'Browser' },
-        '发起人直接上级': { id: '-13', family: 'Browser' },
-        '当前操作人直接上级': { id: '-14', family: 'Browser' },
-        '密级': { id: '-30', family: 'Browser' },
-    };
-    // Operator code → Chinese name
-    const OP_MAP = {
-        '大于': { code: '1', single: true, right: true },
-        '大于等于': { code: '2', single: true, right: true },
-        '小于': { code: '3', single: true, right: true },
-        '小于等于': { code: '4', single: true, right: true },
-        '等于': { code: '5', single: true, right: true },
-        '不等于': { code: '6', single: true, right: true },
-        '包含': { code: '9', single: true, right: false },
-        '属于': { code: '9', single: true, right: false },
-        '不包含': { code: '10', single: true, right: false },
-        '不属于': { code: '10', single: true, right: false },
-        '为空': { code: '13', single: true, right: false },
-        '不为空': { code: '14', single: true, right: false },
-        '包含子部门': { code: '15', single: true, right: false },
-        '不包含子部门': { code: '16', single: true, right: false },
-        '是': { code: '23', single: true, right: false },
-        '否': { code: '24', single: true, right: false },
-        '范围': { code: '', single: false, right: true }, // special: two-value range
-    };
-    // Family → allowed operators
-    const FAMILY_OPS = {
-        'String': ['等于', '不等于', '包含', '不包含', '为空', '不为空'],
-        'Number': ['大于', '大于等于', '小于', '小于等于', '等于', '不等于', '为空', '不为空', '范围'],
-        'Date': ['大于', '大于等于', '小于', '小于等于', '等于', '不等于', '为空', '不为空', '范围'],
-        'Browser': ['等于', '不等于', '包含', '属于', '不包含', '不属于', '为空', '不为空', '包含子部门', '不包含子部门'],
-        'Bool': ['是', '否'],
-    };
-    // Family → param key prefix (for API payload)
-    const FAMILY_PREFIX = {
-        'String': 'String',
-        'Number': 'Number',
-        'Date': 'Date',
-        'Browser': 'Browser',
-        'Bool': 'Bool',
-    };
+    condCmd.command('schema').description('读取平台条件设计器契约（字段类型、操作符及浏览配置）')
+        .argument('<workflowId>').argument('<sourceId>').option('--source <n>', '条件场景编码', '2')
+        .action(async (workflowId, sourceId, o) => {
+        if (!/^\d+$/.test(o.source))
+            throw Error('source 必须为整数');
+        const auth = await AuthSession.fromOptions(program.opts());
+        if (!auth)
+            throw Error('无法加载认证');
+        const client = new ApiClient(auth);
+        const res = await client.post(auth.getBaseUrl() + '/api/workflow/pathdef/rule/condition/getRuleDesignCondition', { workflowId, sourceId, source: Number(o.source), needFormfield: true, readOnly: true });
+        if (res?.code !== 200 || res.status === false)
+            throw Error('读取条件契约失败');
+        console.log(JSON.stringify(res.data, null, 2));
+    });
     condCmd.command('add')
         .description('用中文简化语法添加条件（基于 operator-matrix 校验字段类型）')
         .argument('<workflowId>', '流程 ID')
         .argument('<sourceId>', '上下文出口 ID（用于解析表单）')
         .argument('<nodeId>', '来源节点 ID（用于绑定）')
         .argument('<name>', '条件名称（唯一）')
-        .requiredOption('--rule <rules...>', '条件规则，格式: "来源:字段:操作:值[:值2]"\n'
+        .option('--rule <rules...>', '条件规则，格式: "来源:字段:操作:值[:值2]"\n'
         + '  来源=system 用系统字段中文名；来源=form 可用字段ID、字段名或 dataKey（三者均可匹配）\n'
-        + '  例: --rule "system:流程标题:包含:测试" --rule "form:合同金额:大于:1000:小于:5000"')
+        + '  例: --rule "system:流程标题:包含:测试" --rule "form:合同金额:范围:1000:5000"')
+        .option('--rules-json <jsonOrFile>', '结构化条件树 JSON 或 @文件')
+        .option('--preview', '只编译并展示条件树，不保存')
         .option('--relation <rel>', '多条规则间的关系: AND(默认) / OR', 'AND')
         .action(async (workflowId, sourceId, nodeId, name, cmdOpts) => {
         const opts = program.opts();
@@ -76,373 +41,37 @@ export function registerWorkflowConditionCommands(wf, program) {
             process.exit(1);
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
-        const relation = cmdOpts.relation === 'OR' ? 2 : 1;
-        // 1. Fetch form fields (for form-type rules)
-        let formFields = [];
-        try {
-            const fbRes = await client.post(`${baseUrl}/api/workflow/pathdef/common/browser/complete/conditionFieldBrowser`, { browserMultiple: false, sourceId, tab: 'formField', source: 2, workflowId, newly: 1, pageSize: 100, searchValue: '' });
-            formFields = fbRes?.data?.data || [];
-        }
-        catch { /* best effort */ }
-        // 2. Parse rules, validate, build childrens
-        const childrens = [];
-        const parseErrors = [];
-        // 单条规则 → 一个叶子（或 null，出错时）。用 | 分隔的组在调用侧拆成 OR 组。
-        async function buildLeaf(ruleStr) {
-            let parts = ruleStr.split(':');
-            // 明细量词：末尾 :任一 / :所有（detailOption 1=任一行 2=所有行，明细字段必填）
-            let detailOption = '';
-            const last = parts[parts.length - 1];
-            if (last === '任一' || last === '所有') {
-                detailOption = last === '所有' ? '2' : '1';
-                parts = parts.slice(0, -1);
-            }
-            const source = parts[0]; // system or form
-            const fieldRef = parts[1]; // system field name or form field ID
-            const opName = parts[2];
-            let family = '';
-            let selectType = '';
-            let systemVariable = '';
-            let formFieldObj = null;
-            let fieldOptions = []; // for Browser/Select/CheckBox option-value resolution
-            if (source === 'system') {
-                const sf = SYSTEM_FIELDS[fieldRef];
-                if (!sf) {
-                    parseErrors.push(`未知系统字段: ${fieldRef}，可选: ${Object.keys(SYSTEM_FIELDS).join(', ')}`);
-                    return null;
-                }
-                selectType = '3';
-                systemVariable = sf.id;
-                family = sf.family;
-            }
-            else if (source === 'form') {
-                selectType = '4';
-                // layoutDetail is a JSON string carrying dataKey/columnName/componentKey —
-                // native workflow forms regenerate fieldIds on creation, so matching by id
-                // alone fails; fall back to name / dataKey / columnName.
-                const parseLayout = (f) => {
-                    try {
-                        return typeof f.layoutDetail === 'string' ? JSON.parse(f.layoutDetail) : (f.layoutDetail || {});
-                    }
-                    catch {
-                        return {};
-                    }
-                };
-                let ff = formFields.find((f) => {
-                    if (String(f.id) === fieldRef || f.name === fieldRef)
-                        return true;
-                    const ld = parseLayout(f);
-                    return ld.dataKey === fieldRef || ld.columnName === fieldRef || ld.componentKey === fieldRef;
-                });
-                // Select/CheckBox/RadioBox 等选项字段是懒加载：空 searchValue 不返回，
-                // 需用字段名再搜一次才能拿到（含完整 options，供带值条件解析选项）。
-                if (!ff) {
-                    try {
-                        const sRes = await client.post(`${baseUrl}/api/workflow/pathdef/common/browser/complete/conditionFieldBrowser`, { browserMultiple: false, sourceId, tab: 'formField', source: 2, workflowId, newly: 1, pageSize: 100, searchValue: fieldRef });
-                        const searched = sRes?.data?.data || [];
-                        ff = searched.find((f) => {
-                            if (String(f.id) === fieldRef || f.name === fieldRef)
-                                return true;
-                            const ld = parseLayout(f);
-                            return ld.dataKey === fieldRef || ld.columnName === fieldRef;
-                        }) || null;
-                        if (ff)
-                            formFields.push(ff);
-                    }
-                    catch { /* 二次搜索失败则走下面报错 */ }
-                }
-                if (!ff) {
-                    const avail = formFields.map((f) => {
-                        const ld = parseLayout(f);
-                        return `  ${f.id}  ${f.name}  [${f.fieldType}]${ld.dataKey ? `  dataKey=${ld.dataKey}` : ''}`;
-                    }).join('\n');
-                    parseErrors.push(`未找到表单字段: ${fieldRef}（在 sourceId=${sourceId} 上下文中）\n可用字段:\n${avail || '  (无)'}`);
-                    return null;
-                }
-                const ld = parseLayout(ff);
-                // Send the full field object as formField[0] (matches browser payload;
-                // layoutDetail carries options the server needs for option-value validation).
-                formFieldObj = ff;
-                fieldOptions = ld.options || [];
-                // Map fieldType → family using real conditionFieldBrowser type names.
-                // componentKey (from layoutDetail) is the authoritative type marker.
-                // Note: CheckBox/RadioBox/Select are option-based → Browser (属于/包含某选项),
-                // NOT Bool. Bool (是/否) only applies to a single-value Switch toggle.
-                const ft = ff.fieldType || ld.componentKey || '';
-                if (['DateComponent', 'DatePicker', 'DateTimePicker', 'Date'].includes(ft))
-                    family = 'Date';
-                else if (['NumberComponent', 'Money', 'Float', 'Integer', 'Number'].includes(ft))
-                    family = 'Number';
-                else if (['Switch', 'Bool'].includes(ft))
-                    family = 'Bool';
-                else if (['Employee', 'Department', 'Role', 'Browser', 'BrowserButton', 'Select', 'RadioBox', 'CheckBox', 'Checkbox', 'PositionComponent', 'Location', 'Ebuilder', 'Eb', 'Flow'].includes(ft))
-                    family = 'Browser';
-                else
-                    family = 'String';
-            }
-            else {
-                parseErrors.push(`来源必须是 system 或 form: ${source}`);
-                return null;
-            }
-            // Validate operator
-            const allowed = FAMILY_OPS[family] || [];
-            if (!allowed.includes(opName)) {
-                parseErrors.push(`字段 "${fieldRef}" (类型=${family}) 不支持操作 "${opName}"，可选: ${allowed.join(', ')}`);
-                return null;
-            }
-            // Build leaf node
-            const opInfo = OP_MAP[opName];
-            // 系统 Browser 字段（紧急程度/密级等，selectType=3）用 SysBrowser 前缀（抓包实测）
-            const prefix = (selectType === '3' && family === 'Browser') ? 'SysBrowser' : FAMILY_PREFIX[family];
-            const leaf = {
-                selectType,
-                elementValue1Id: '', elementValue2Id: '', expressionBaseId: '', dataValueId: '',
-            };
-            if (selectType === '3')
-                leaf.systemVariable = systemVariable;
-            if (selectType === '4') {
-                leaf.formField = [formFieldObj];
-                // 明细字段必填 detailOption（1=任一行 默认 / 2=所有行）
-                const isDetail = formFieldObj?.detail || (formFieldObj?.detailName && formFieldObj.detailName !== '主表');
-                if (isDetail)
-                    leaf.detailOption = detailOption || '1';
-            }
-            // Single-value operators (empty/null use special codes, no value needed)
-            if (opName === '为空' || opName === '不为空') {
-                leaf[`${prefix}CompareOptionLeft`] = opInfo.code;
-            }
-            else if (opName === '范围') {
-                // 变量模式（字段 vs 字段）：来源:字段:范围:field:左字段:右字段
-                const isVarRange = parts[3] === 'field';
-                if (isVarRange) {
-                    const vfL = formFields.find((f) => String(f.id) === (parts[4] || '') || f.name === (parts[4] || ''));
-                    const vfR = formFields.find((f) => String(f.id) === (parts[5] || '') || f.name === (parts[5] || ''));
-                    if (!vfL || !vfR) {
-                        parseErrors.push(`范围字段未找到: 左="${parts[4]}" 右="${parts[5]}"（可用: ${formFields.map((f) => f.name).join(', ')}）`);
-                        return null;
-                    }
-                    leaf[`${prefix}CompareOptionLeft`] = '1';
-                    leaf[`${prefix}ValueOptionLeft`] = '2';
-                    leaf[`${prefix}TextValueLeft2`] = [vfL];
-                    leaf[`${prefix}CompareOptionRight`] = '3';
-                    leaf[`${prefix}ValueOptionRight`] = '2';
-                    leaf[`${prefix}TextValueRight2`] = [vfR];
-                    if (family === 'Date')
-                        leaf.typeHrm = '11';
-                }
-                else {
-                    // Range: value and value2 are left/right boundaries（字面值）
-                    const v1 = parts[3] || '';
-                    const v2 = parts[4] || '';
-                    if (!v1 || !v2) {
-                        parseErrors.push(`范围操作需要两个值: ${ruleStr}（格式: 来源:字段:范围:左值:右值 或 来源:字段:范围:field:左字段:右字段）`);
-                        return null;
-                    }
-                    if (family === 'Number') {
-                        leaf.NumberCompareOptionLeft = '1'; // 大于
-                        leaf.NumberValueOptionLeft = '1';
-                        leaf.NumberTextValueLeft1 = Number(v1);
-                        leaf.NumberCompareOptionRight = '3'; // 小于
-                        leaf.NumberValueOptionRight = '1';
-                        leaf.NumberTextValueRight1 = Number(v2);
-                    }
-                    else if (family === 'Date') {
-                        leaf.DateCompareOptionLeft = '1';
-                        leaf.DateValueOptionLeft = '1';
-                        leaf.DateTextValueLeft1 = v1;
-                        leaf.DateCompareOptionRight = '3';
-                        leaf.DateValueOptionRight = '1';
-                        leaf.DateTextValueRight1 = v2;
-                    }
-                }
-            }
-            else {
-                // Single-bound operator
-                const isVarSingle = parts[3] === 'field';
-                if (isVarSingle) {
-                    // 字段 vs 字段：来源:字段:操作:field:值字段
-                    const vf = formFields.find((f) => String(f.id) === (parts[4] || '') || f.name === (parts[4] || ''));
-                    if (!vf) {
-                        parseErrors.push(`值字段未找到: "${parts[4]}"（可用: ${formFields.map((f) => f.name).join(', ')}）`);
-                        return null;
-                    }
-                    leaf[`${prefix}CompareOptionLeft`] = opInfo.code;
-                    leaf[`${prefix}ValueOptionLeft`] = '2';
-                    leaf[`${prefix}TextValueLeft2`] = [vf];
-                    if (family === 'Date')
-                        leaf.typeHrm = '11';
-                }
-                else {
-                    const value = parts[3] || '';
-                    leaf[`${prefix}CompareOptionLeft`] = opInfo.code;
-                    if (value) {
-                        if (family === 'Browser') {
-                            // 区分：系统 Browser 字段（紧急程度等，SysBrowser 前缀 + 系统选项）、
-                            //       人员/部门字段（走 person/dept 浏览器解析成完整对象）、
-                            //       Select/CheckBox/RadioBox（走 fieldOptions 选项解析）。
-                            const ft = String(formFieldObj?.fieldType || formFieldObj?.groupKey || '');
-                            const isEmployee = /employee|user/i.test(ft);
-                            const isDept = /department|dept/i.test(ft);
-                            const vals = value.split(',').map((s) => s.trim()).filter(Boolean);
-                            const resolved = [];
-                            if (selectType === '3') {
-                                // 系统 Browser 字段（紧急程度/密级等）：值走系统选项 {id, content}（抓包 SysBrowserTextValueLeft1=[{id:"2",content:"紧急"}]）
-                                const SYS_OPTS = {
-                                    '紧急程度': { '普通': '1', '紧急': '2' },
-                                };
-                                const sysOpts = SYS_OPTS[fieldRef] || {};
-                                for (const v of vals) {
-                                    const id = sysOpts[v];
-                                    if (id)
-                                        resolved.push({ id, content: v });
-                                    else
-                                        parseErrors.push(`系统字段 "${fieldRef}" 的值 "${v}" 无映射（已映射: ${Object.keys(sysOpts).join(',') || '无'}）`);
-                                }
-                                if (resolved.length > 0) {
-                                    leaf[`${prefix}ValueOptionLeft`] = '1';
-                                    leaf[`${prefix}TextValueLeft1`] = resolved;
-                                    leaf.containType = '1';
-                                }
-                            }
-                            else if (isEmployee || isDept) {
-                                // 人员/部门：值走浏览器解析成完整对象（抓包 BrowserTextValueLeft1 = 完整人员对象数组，typeHrm=1）
-                                for (const v of vals) {
-                                    if (isEmployee) {
-                                        const ud = await client.post(`${baseUrl}/api/hrm/common/getEmployeeByKeyWords`, {
-                                            keyword: v, searchType: 1, searchCount: 1, appDetachModule: 'EM', disableAppDetach: 0, pageNo: 1, pageSize: 1,
-                                        });
-                                        const e = ud?.data?.userList?.[0];
-                                        if (e) {
-                                            resolved.push({
-                                                id: e.id || '', cid: e.cid || e.companyId || '', userid: e.userid || e.userId || e.id || '',
-                                                name: e.name || '', statusCode: e.statusCode || 'normal', content: e.name || '',
-                                                title: `${e.name || ''}|${e.department || ''}`, contentDesc: e.name || '', department: e.department || '',
-                                                avatar: e.avatar || { previewPath: '', appPreviewPath: '', name: e.name || '', userId: e.id || '' },
-                                                indexType: 'R', isLeaf: true, mobile: e.mobile || e.officePhone || '', officePhone: e.officePhone || e.mobile || '',
-                                                templateType: 'default', originTargetType: 'user', pid: '', richContent: e.name || '',
-                                                departmentId: e.departmentId || e.departmentid || '', mainId: e.mainId || e.id || '',
-                                                leaf: true, stopDepartment: false,
-                                            });
-                                        }
-                                        else
-                                            parseErrors.push(`未找到人员: ${v}`);
-                                    }
-                                    else {
-                                        // D07: 部门解析多匹配禁止取首条（重名会选错）——精确/歧义规则在 resolveDepartment
-                                        const { resolveDepartment } = await import('../services/workflow-operator.js');
-                                        try {
-                                            const dh = await resolveDepartment(client, baseUrl, v);
-                                            resolved.push({ id: dh.id, name: dh.name, content: dh.name, title: dh.name, isLeaf: true, icon: 'Icon-department03', leaf: true, stopDepartment: false });
-                                        }
-                                        catch (e) {
-                                            parseErrors.push(`部门解析失败: ${v}（${e.message}）`);
-                                        }
-                                    }
-                                }
-                                if (resolved.length > 0) {
-                                    leaf[`${prefix}ValueOptionLeft`] = '1';
-                                    leaf[`${prefix}TextValueLeft1`] = resolved;
-                                    leaf.containType = '1';
-                                    if (isEmployee)
-                                        leaf.typeHrm = '1';
-                                }
-                            }
-                            else {
-                                // Select/CheckBox/RadioBox: value is option label(s) or option id(s),
-                                // resolved against the field's options into [{id, content}] arrays.
-                                for (const v of vals) {
-                                    const opt = fieldOptions.find((o) => o.name === v || o.selectionId === v || o.valueKey === v || o.id === v);
-                                    if (opt) {
-                                        // 选项对象 {id: valueKey, content: name}（抓包 BrowserTextValueLeft1 实测：id 用 valueKey，
-                                        // 不是 selectionId——用雪花 selectionId 引擎查不到选项会标"(已删除)"）
-                                        resolved.push({ id: opt.valueKey || opt.selectionId || opt.id, content: opt.name });
-                                    }
-                                    else {
-                                        parseErrors.push(`选项 "${v}" 不在字段 "${fieldRef}" 的选项中，可选: ${fieldOptions.map((o) => `${o.name}(${o.selectionId || o.valueKey || o.id})`).join(', ')}`);
-                                    }
-                                }
-                                if (resolved.length > 0) {
-                                    leaf[`${prefix}ValueOptionLeft`] = '1';
-                                    leaf[`${prefix}TextValueLeft1`] = resolved;
-                                    leaf.containType = '1'; // 1=任一值 2=所有值（多选场景）
-                                }
-                            }
-                        }
-                        else if (family === 'Number') {
-                            leaf[`${prefix}ValueOptionLeft`] = '1';
-                            leaf[`${prefix}TextValueLeft1`] = Number(value);
-                        }
-                        else {
-                            leaf[`${prefix}ValueOptionLeft`] = '1';
-                            leaf[`${prefix}TextValueLeft1`] = value;
-                        }
-                    }
-                }
-            }
-            return leaf;
-        }
-        // 顶层循环：| 分隔 → OR 子组；无 | 直接叶子。子组节点 = {relation:2, childrens:[...]}（抓包实测）
-        for (const ruleStr of cmdOpts.rule) {
-            const subRules = ruleStr.split('|').map((s) => s.trim()).filter(Boolean);
-            const subLeaves = [];
-            for (const sub of subRules) {
-                const lf = await buildLeaf(sub);
-                if (lf)
-                    subLeaves.push(lf);
-            }
-            if (subLeaves.length === 1)
-                childrens.push(subLeaves[0]);
-            else if (subLeaves.length > 1)
-                childrens.push({ relation: 2, childrens: subLeaves });
-        }
-        if (parseErrors.length > 0) {
-            console.error('规则解析错误:');
-            for (const e of parseErrors)
-                console.error(`  ❌ ${e}`);
-            process.exit(1);
-        }
-        if (childrens.length === 0) {
-            console.error('至少需要一条有效的 --rule');
-            process.exit(1);
-        }
-        // 3. replace 语义：连线已绑条件时先删旧条件，避免 saveCondition 把新规则合并进旧条件
-        await replaceExistingLinkCondition(client, baseUrl, workflowId, sourceId, nodeId);
-        // 4. getConditionSet → saveCondition → bind
-        console.error(`解析 ${childrens.length} 条规则, 关系=${cmdOpts.relation}`);
-        let mapBaseId = '';
-        try {
-            const csRes = await client.post(`${baseUrl}/api/workflow/pathdef/rule/condition/getConditionSet`, { source: 2, sourceId, workflowId, conditionName: name, needFormfield: true, readOnly: false, templateTokenId: String(Date.now()) });
-            if (csRes?.code === 200 && csRes?.data?.mapBaseId) {
-                mapBaseId = csRes.data.mapBaseId;
-            }
-        }
-        catch { /* best effort */ }
-        if (!mapBaseId) {
-            console.error('无法获取 mapBaseId');
-            process.exit(1);
+        if (!!cmdOpts.rule?.length === !!cmdOpts.rulesJson)
+            throw Error('--rule 与 --rules-json 必须且只能指定一种');
+        const input = cmdOpts.rulesJson ? JSON.parse(cmdOpts.rulesJson.startsWith('@') ? readFileSync(cmdOpts.rulesJson.slice(1), 'utf8') : cmdOpts.rulesJson) : cmdOpts.rule;
+        const { relation, childrens } = await compileWorkflowCondition(client, baseUrl, { workflowId, source: 2, sourceId }, input, cmdOpts.relation);
+        if (cmdOpts.preview) {
+            console.log(JSON.stringify({ source: 2, sourceId, relation, childrens }, null, 2));
+            return;
         }
-        const payload = {
-            source: 2, sourceId, workflowId, conditionName: name,
-            needFormfield: true, readOnly: false,
-            mapBaseId, isEdit: false, isFromRuleListPage: true,
-            relation,
-            childrens,
-            allRuleIsEmpty: false,
+        const readTarget = async () => {
+            const res = await client.get(`${baseUrl}/api/bs/workflow/pathdef/nodeLink/getWfpNodeLinkTable?workflowId=${encodeURIComponent(workflowId)}`);
+            if (res?.code !== 200 || res.status === false || !Array.isArray(res.data?.data))
+                throw Error('读取出口列表失败');
+            const link = res.data.data.find((r) => String(r.id) === sourceId);
+            if (!link || String(link.srcNodeId) !== nodeId)
+                throw Error('出口不属于指定流程/来源节点');
+            return String(link.conditionKey?.conditionKey || '');
         };
-        const data = await client.post(`${baseUrl}/api/workflow/pathdef/rule/condition/saveCondition`, payload);
-        if (data?.code !== 200 || !data?.status || !data?.data?.result) {
-            console.error(`保存条件失败: ${data?.data?.msg || data?.msg || '未知错误'}`);
-            process.exit(1);
-        }
-        const conditionKey = data.data.conditionKey;
-        const conditionCn = data.data.conditionCn || '';
+        const previousKey = await readTarget();
+        const saved = await persistWorkflowCondition(client, baseUrl, { workflowId, source: 2, conditionName: name }, { relation, childrens });
+        const { conditionKey, conditionCn } = saved;
+        if (await readTarget() !== previousKey)
+            throw Error(`出口条件已被其他操作修改，停止绑定；新条件 ${conditionKey} 已保存`);
         // Bind to link — 必须校验结果：失败不能吞掉，否则"已保存并绑定"会误导
         let bindOk = false;
         try {
             const bindRes = await client.post(`${baseUrl}/api/bs/workflow/pathdef/nodeLink/saveLinkConditionKey`, {
                 workflowId, linkId: sourceId, conditionKey, nodeId,
             });
-            bindOk = bindRes?.code === 200 && bindRes?.status;
+            bindOk = bindRes?.code === 200 && bindRes?.status && bindRes?.data !== false;
+            if (bindOk)
+                bindOk = await readTarget() === conditionKey;
         }
         catch { /* 网络异常 → bindOk=false */ }
         if (!bindOk) {
@@ -450,7 +79,7 @@ export function registerWorkflowConditionCommands(wf, program) {
             console.error(`    请手动补绑: e10-cli workflow set-link-condition-key ${workflowId} ${sourceId} ${conditionKey} ${nodeId}`);
         }
         if (opts.json) {
-            console.log(JSON.stringify({ conditionKey, conditionCn, conditionId: data.data.conditionId, mapId: data.data.mapId, bound: bindOk }, null, 2));
+            console.log(JSON.stringify({ conditionKey, conditionCn, conditionId: saved.conditionId, mapId: saved.mapId, bound: bindOk }, null, 2));
         }
         else if (bindOk) {
             console.log(`条件已保存并绑定: key=${conditionKey}  (${conditionCn})`);
@@ -458,6 +87,8 @@ export function registerWorkflowConditionCommands(wf, program) {
         else {
             console.log(`条件已保存(未绑定): key=${conditionKey}  (${conditionCn})`);
         }
+        if (!bindOk)
+            process.exitCode = 1;
     });
     /**
      * 读取一条连线（link）上绑定的条件。
@@ -495,40 +126,6 @@ export function registerWorkflowConditionCommands(wf, program) {
         const links = linkRes?.data?.data || [];
         return links.filter((l) => l.hasCondition || l?.conditionKey?.conditionKey);
     }
-    /**
-     * condition add 的 replace 前置：若连线（linkId）已绑条件，先删除旧条件并解绑。
-     * 必须先删——saveCondition 在 isEdit=false 且该 conditionKey 下已有数据时，会把新
-     * childrens 合并进旧条件（累积 bug）；删到该 key 无数据后才会真正新建。无旧条件则静默返回。
-     */
-    async function replaceExistingLinkCondition(client, baseUrl, workflowId, linkId, nodeId) {
-        try {
-            const params = new URLSearchParams();
-            params.set('workflowId', workflowId);
-            const linkRes = await client.get(`${baseUrl}/api/bs/workflow/pathdef/nodeLink/getWfpNodeLinkTable?${params.toString()}`);
-            const linkObj = (linkRes?.data?.data || []).find((l) => String(l.id) === String(linkId));
-            if (!linkObj)
-                return;
-            const { context, records } = await loadLinkConditions(client, baseUrl, workflowId, linkObj);
-            if (!records.length)
-                return;
-            const mapId = String(records[0].mapId || '');
-            const conditionKey = String(context.conditionKey || '');
-            if (!mapId || !conditionKey)
-                return;
-            await client.post(`${baseUrl}/api/workflow/pathdef/rule/condition/deleteConditions`, {
-                source: 2, sourceId: linkId, workflowId,
-                conditionName: linkObj?.conditionKey?.sourceName || '',
-                linkName: linkObj?.linkName || '',
-                needFormfield: true, readOnly: false,
-                mapIds: mapId, conditionKey,
-            });
-            await client.post(`${baseUrl}/api/bs/workflow/pathdef/nodeLink/saveLinkConditionKey`, {
-                workflowId, linkId, conditionKey: '', nodeId,
-            }).catch(() => { });
-            console.error(`  连线已绑条件「${records[0].conditionName || conditionKey}」，已删除旧条件后重建`);
-        }
-        catch { /* 前置失败不阻断主流程 */ }
-    }
     condCmd.command('list')
         .description('列出工作流下所有连线绑定的条件规则')
         .argument('<workflowId>', '流程 ID')
@@ -579,7 +176,8 @@ export function registerWorkflowConditionCommands(wf, program) {
         .description('查看单个条件详情（含中文表达式 conditionCn）')
         .argument('<workflowId>', '流程 ID')
         .argument('<id>', '条件 ID（conditionKey / mapId / conditionId）')
-        .action(async (workflowId, id) => {
+        .option('--tree', '同时回读平台保存的完整条件树')
+        .action(async (workflowId, id, options) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
@@ -601,6 +199,14 @@ export function registerWorkflowConditionCommands(wf, program) {
             process.exit(1);
         }
         const { link, context, record } = found;
+        let expression;
+        if (options.tree) {
+            const query = new URLSearchParams({ workflowId, source: '2', sourceId: String(link.id), conditionKey: String(context.conditionKey), mapBaseId: String(context.mapBaseId), mapId: String(record.mapId), conditionId: String(record.conditionId) });
+            const response = await client.get(`${baseUrl}/api/workflow/pathdef/rule/condition/getExpressionBean?${query}`);
+            if (response?.code !== 200 || response.status === false || !response.data)
+                throw Error('读取条件树失败');
+            expression = response.data;
+        }
         if (opts.json) {
             console.log(JSON.stringify({
                 linkId: link.id, linkName: link.linkName,
@@ -609,6 +215,7 @@ export function registerWorkflowConditionCommands(wf, program) {
                 conditionKey: context.conditionKey,
                 mapId: record.mapId, conditionId: record.conditionId,
                 conditionName: record.conditionName, conditionCn: record.conditionCn,
+                ...(options.tree ? { expression } : {}),
             }, null, 2));
         }
         else {
@@ -618,6 +225,8 @@ export function registerWorkflowConditionCommands(wf, program) {
             console.log(`mapId: ${record.mapId}`);
             console.log(`conditionId: ${record.conditionId}`);
             console.log(`中文表达式: ${record.conditionCn || '(空)'}`);
+            if (options.tree)
+                console.log(JSON.stringify(expression, null, 2));
         }
     });
     condCmd.command('delete')