@share-crm/sharedev-cli 0.0.4-rc.21 → 0.0.4-rc.22

package/dist/sharedev.js

@@ -10582,15 +10582,18 @@ Examples:
   $ sharedev object-dev scene pull --objectApiName AccountObj --sceneApiName demo_scene
   $ sharedev object-dev scene push --objectApiName AccountObj --sceneApiNames demo_scene,test_scene
   $ sharedev object-dev scene update --objectApiName AccountObj --data "{}"
-  $ sharedev object-dev object-mapping pull --objectApiNames AccountObj,LeadsObj
-  $ sharedev object-dev object-mapping create --objectApiName AccountObj --data "{}"
-  $ sharedev object-dev object-mapping update --objectApiName AccountObj --data "{}"
-  $ sharedev object-dev object-mapping push --objectApiName AccountObj --ruleApiNames rule_xsh2__c,rule_xxa1__c
-  $ sharedev object-dev convert-rule list --objectApiName AccountObj
-  $ sharedev object-dev convert-rule pull --objectApiNames AccountObj,LeadsObj
-  $ sharedev object-dev convert-rule create --objectApiName AccountObj --data "{}"
-  $ sharedev object-dev convert-rule update --objectApiName AccountObj --data "{}"
-  $ sharedev object-dev convert-rule push --objectApiName AccountObj --ruleApiNames rule_xsh2__c,rule_xxa1__c
+  $ sharedev object-dev object-mapping pull
+  $ sharedev object-dev object-mapping create --data "{}"
+  $ sharedev object-dev object-mapping update --data "{}"
+  $ sharedev object-dev object-mapping push --ruleApiNames rule_xsh2__c,rule_xxa1__c
+  $ sharedev object-dev object-mapping push
+  $ sharedev object-dev convert-rule list
+  $ sharedev object-dev convert-rule pull
+  $ sharedev object-dev convert-rule create --data "{}"
+  $ sharedev object-dev convert-rule update --data "{}"
+  $ sharedev object-dev convert-rule push --ruleApiNames rule_xsh2__c,rule_xxa1__c
+  $ sharedev object-dev email-template list
+  $ sharedev object-dev email-template list --objDescApiName AccountObj
 `);
     const objectCommand = objectDev.command('object').description('Object describe operations');
     objectCommand
@@ -11032,7 +11035,8 @@ Examples:
     objectMappingCommand
         .command('pull')
         .description('Pull object-mapping rules from remote and save locally')
-        .requiredOption('--objectApiNames <apiNames>', 'Object apiNames, comma separated')
+        .option('--status <number>', 'Filter by status (1=enabled, 0=disabled)')
+        .option('--ruleName <name>', 'Filter by rule name')
         .option('--force', 'Force overwrite local metadata files regardless of local status')
         .option('--yes', 'Skip the force confirmation prompt')
         .option('--skipOverwriteConfirm', 'Skip overwrite confirm for local metadata not in unchanged status and keep local file')
@@ -11043,7 +11047,7 @@ Examples:
     objectMappingCommand
         .command('create')
         .description('Create local object-mapping rule draft without remote API call')
-        .requiredOption('--objectApiName <apiName>', 'Target object apiName')
+        .option('--objectApiName <apiName>', 'Target object apiName (can also be set via data.describe_api_name)')
         .requiredOption('--data <json>', 'Object-mapping rule data (JSON string)')
         .option('--force', 'Force overwrite local metadata file if it already exists')
         .action((0, command_ts_1.createCommandAction)('object-dev', 'object-mapping.create', runtimeContext, async ({ options, context }) => {
@@ -11053,7 +11057,6 @@ Examples:
     objectMappingCommand
         .command('update')
         .description('Update local object-mapping rule draft without remote API call')
-        .requiredOption('--objectApiName <apiName>', 'Target object apiName')
         .requiredOption('--data <json>', 'Object-mapping rule data (JSON string)')
         .action((0, command_ts_1.createCommandAction)('object-dev', 'object-mapping.update', runtimeContext, async ({ options, context }) => {
         void context;
@@ -11062,8 +11065,7 @@ Examples:
     objectMappingCommand
         .command('push')
         .description('Push object-mapping rules to remote via shareCli execute (auto create or update)')
-        .requiredOption('--objectApiName <apiName>', 'Target object apiName')
-        .requiredOption('--ruleApiNames <ruleApiNames>', 'Target rule apiNames, comma separated')
+        .option('--ruleApiNames <ruleApiNames>', 'Target rule apiNames, comma separated (push all if omitted)')
         .option('--skipOverwriteConfirm', 'Skip overwrite confirm when pre/post pull encounters local metadata not in unchanged status')
         .action((0, command_ts_1.createCommandAction)('object-dev', 'object-mapping.push', runtimeContext, async ({ options, context }) => {
         void context;
@@ -11073,7 +11075,7 @@ Examples:
     convertRuleCommand
         .command('list')
         .description('List convert rules via shareCli execute')
-        .requiredOption('--objectApiName <apiName>', 'Target object apiName')
+        .option('--ruleName <name>', 'Filter by rule name')
         .action((0, command_ts_1.createCommandAction)('object-dev', 'convert-rule.list', runtimeContext, async ({ options, context }) => {
         void context;
         await (0, index_ts_1.objectDevConvertRuleListCommand)(options);
@@ -11081,7 +11083,7 @@ Examples:
     convertRuleCommand
         .command('pull')
         .description('Pull convert rules from remote and save locally')
-        .requiredOption('--objectApiNames <apiNames>', 'Object apiNames, comma separated')
+        .option('--ruleName <name>', 'Filter by rule name')
         .option('--force', 'Force overwrite local metadata files regardless of local status')
         .option('--yes', 'Skip the force confirmation prompt')
         .option('--skipOverwriteConfirm', 'Skip overwrite confirm for local metadata not in unchanged status and keep local file')
@@ -11092,7 +11094,6 @@ Examples:
     convertRuleCommand
         .command('create')
         .description('Create local convert-rule draft without remote API call')
-        .requiredOption('--objectApiName <apiName>', 'Target object apiName')
         .requiredOption('--data <json>', 'Convert-rule data (JSON string)')
         .option('--force', 'Force overwrite local metadata file if it already exists')
         .action((0, command_ts_1.createCommandAction)('object-dev', 'convert-rule.create', runtimeContext, async ({ options, context }) => {
@@ -11102,7 +11103,6 @@ Examples:
     convertRuleCommand
         .command('update')
         .description('Update local convert-rule draft without remote API call')
-        .requiredOption('--objectApiName <apiName>', 'Target object apiName')
         .requiredOption('--data <json>', 'Convert-rule data (JSON string)')
         .action((0, command_ts_1.createCommandAction)('object-dev', 'convert-rule.update', runtimeContext, async ({ options, context }) => {
         void context;
@@ -11111,13 +11111,23 @@ Examples:
     convertRuleCommand
         .command('push')
         .description('Push convert rules to remote via shareCli execute (auto create or update)')
-        .requiredOption('--objectApiName <apiName>', 'Target object apiName')
         .requiredOption('--ruleApiNames <ruleApiNames>', 'Target rule apiNames, comma separated')
         .option('--skipOverwriteConfirm', 'Skip overwrite confirm when pre/post pull encounters local metadata not in unchanged status')
         .action((0, command_ts_1.createCommandAction)('object-dev', 'convert-rule.push', runtimeContext, async ({ options, context }) => {
         void context;
         await (0, index_ts_1.objectDevConvertRulePushCommand)(options);
     }));
+    const emailTemplateCommand = objectDev.command('email-template').description('Email template operations');
+    emailTemplateCommand
+        .command('list')
+        .description('List email templates via shareCli execute')
+        .option('--objDescApiName <apiName>', 'Filter by object describe api name')
+        .option('--pageNumber <number>', 'Page number (default: 1)')
+        .option('--pageSize <number>', 'Page size (default: 2000)')
+        .action((0, command_ts_1.createCommandAction)('object-dev', 'email-template.list', runtimeContext, async ({ options, context }) => {
+        void context;
+        await (0, index_ts_1.objectDevEmailTemplateListCommand)(options);
+    }));
 }
 
 
@@ -12763,6 +12773,9 @@ const SHARE_CLI_COMMAND_PATH_MAP = {
         'create-rule': ['object-dev', 'convert-rule', 'create-rule'],
         'update-rule': ['object-dev', 'convert-rule', 'update-rule'],
     },
+    emailTemplate: {
+        'template-page': ['object-dev', 'email-template', 'template-page'],
+    },
     dataAuth: {
         getCommonPrivilegeList: ['access', 'data-auth', 'get-common-privilege-list'],
         batchUpdateCommonPrivilege: ['access', 'data-auth', 'batch-update-common-privilege'],
@@ -13757,13 +13770,13 @@ exports.XML_METADATA_RULES = {
         defaultOpenTag: '<CommonPrivilege xmlns="http://sharecrm.com/metadata">',
     },
     ObjectMapping: {
-        dirPathTemplate: 'tenant-config/objects/{objectApiName}/object-mappings',
+        dirPathTemplate: 'tenant-config/object-mappings',
         fileNameTemplate: '{apiName}.object-mapping-meta.xml',
         apiNameVariable: 'apiName',
         defaultOpenTag: '<ObjectMapping xmlns="http://sharecrm.com/metadata">',
     },
     ConvertRule: {
-        dirPathTemplate: 'tenant-config/objects/{objectApiName}/convert-rules',
+        dirPathTemplate: 'tenant-config/convert-rules',
         fileNameTemplate: '{apiName}.convert-rule-meta.xml',
         apiNameVariable: 'apiName',
         defaultOpenTag: '<ConvertRule xmlns="http://sharecrm.com/metadata">',
@@ -19792,23 +19805,28 @@ function printErrorMessages(errorMessages) {
     return true;
 }
 async function objectDevConvertRuleListCommand(options) {
-    const checkedObjectApiName = normalize_ts_1.default.normalizeString(options.objectApiName);
-    if (!checkedObjectApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(checkedObjectApiName)) {
-        throw new Error('Invalid arguments: objectApiName is required.');
-    }
-    const rules = await (0, index_ts_1.fetchConvertRuleList)(checkedObjectApiName, null);
-    logger_ts_1.loggerService.printTable(['apiName', 'label', 'ruleType', 'isActive'], rules.map((item) => [
-        normalize_ts_1.default.normalizeString(item.api_name)
-            ?? normalize_ts_1.default.normalizeString(item.apiName) ?? '',
-        normalize_ts_1.default.normalizeText(item.label),
-        normalize_ts_1.default.normalizeText(item.rule_type)
-            ?? normalize_ts_1.default.normalizeText(item.ruleType)
-            ?? '',
-        normalize_ts_1.default.normalizeText(item.is_active)
-            ?? normalize_ts_1.default.normalizeText(item.isActive)
-            ?? '',
+    const items = await (0, index_ts_1.fetchConvertRuleList)({
+        ruleName: options.ruleName,
+    });
+    // 展开 items[].ruleList[] 为扁平规则列表
+    const rules = [];
+    for (const item of items) {
+        const ruleList = item.ruleList;
+        if (ruleList) {
+            rules.push(...ruleList);
+        }
+    }
+    logger_ts_1.loggerService.printTable(['apiName', 'ruleName', 'sourceApiName', 'targetApiName', 'defineType'], rules.map((item) => [
+        normalize_ts_1.default.normalizeString(item.rule_api_name) ?? '',
+        normalize_ts_1.default.normalizeText(item.rule_name),
+        normalize_ts_1.default.normalizeText(item.source_api_name)
+            ?? normalize_ts_1.default.normalizeText(item.sourceApiName) ?? '',
+        normalize_ts_1.default.normalizeText(item.target_api_name)
+            ?? normalize_ts_1.default.normalizeText(item.targetApiName) ?? '',
+        normalize_ts_1.default.normalizeText(item.define_type)
+            ?? normalize_ts_1.default.normalizeText(item.defineType) ?? '',
     ]));
-    logger_ts_1.loggerService.success(`Convert-rule list completed: object=${checkedObjectApiName}, found=${rules.length}`);
+    logger_ts_1.loggerService.success(`Convert-rule list completed: found=${rules.length}`);
 }
 async function objectDevConvertRulePullCommand(options) {
     if (options.force && options.skipOverwriteConfirm) {
@@ -19823,13 +19841,17 @@ async function objectDevConvertRulePullCommand(options) {
             throw new Error('Command cancelled.');
         }
     }
-    const { objectApiNames, found, written, skipped, errorMessages } = await (0, index_ts_1.convertRulePullService)(options.objectApiNames, options.force === true, options.skipOverwriteConfirm === true);
+    const { found, written, skipped, errorMessages } = await (0, index_ts_1.convertRulePullService)({
+        ruleName: options.ruleName,
+        force: options.force === true,
+        skipOverwriteConfirm: options.skipOverwriteConfirm === true,
+    });
     if (printErrorMessages(errorMessages))
         return;
-    logger_ts_1.loggerService.success(`Convert-rule pull completed: objects=${objectApiNames.length}, found=${found}, written=${written}, skipped=${skipped}`);
+    logger_ts_1.loggerService.success(`Convert-rule pull completed: found=${found}, written=${written}, skipped=${skipped}`);
 }
 async function objectDevConvertRuleCreateCommand(options) {
-    const result = await (0, index_ts_1.convertRuleCreateService)(options.objectApiName, options.data, options.force === true);
+    const result = await (0, index_ts_1.convertRuleCreateService)(options.data, options.force === true);
     if (printErrorMessages(result.errorMessages))
         return;
     if (!result.filePath) {
@@ -19839,7 +19861,7 @@ async function objectDevConvertRuleCreateCommand(options) {
     logger_ts_1.loggerService.info(`Convert-rule metadata created: ${result.filePath}`);
 }
 async function objectDevConvertRuleUpdateCommand(options) {
-    const result = await (0, index_ts_1.convertRuleUpdateService)(options.objectApiName, options.data);
+    const result = await (0, index_ts_1.convertRuleUpdateService)(options.data);
     if (!result.filePath) {
         throw new Error('Convert-rule metadata not updated.');
     }
@@ -19849,10 +19871,41 @@ async function objectDevConvertRuleUpdateCommand(options) {
     logger_ts_1.loggerService.info(`Convert-rule metadata updated: ${result.filePath}`);
 }
 async function objectDevConvertRulePushCommand(options) {
-    const pushed = await (0, index_ts_1.convertRulePushService)(options.objectApiName, options.ruleApiNames, options.skipOverwriteConfirm === true);
+    const pushed = await (0, index_ts_1.convertRulePushService)(options.ruleApiNames, options.skipOverwriteConfirm === true);
     if (printErrorMessages(pushed.errorMessages))
         return;
-    logger_ts_1.loggerService.success(`Push completed successfully: convert-rule (${pushed.objectApiName}.${pushed.apiName})`);
+    logger_ts_1.loggerService.success(`Push completed successfully: convert-rule (${pushed.apiName})`);
+}
+
+
+/***/ },
+
+/***/ 1026
+(__unused_webpack_module, exports, __webpack_require__) {
+
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.objectDevEmailTemplateListCommand = objectDevEmailTemplateListCommand;
+const index_ts_1 = __webpack_require__(285);
+const logger_ts_1 = __webpack_require__(3333);
+const normalize_ts_1 = __importDefault(__webpack_require__(9268));
+async function objectDevEmailTemplateListCommand(options) {
+    const items = await (0, index_ts_1.fetchEmailTemplateList)({
+        objDescApiName: options.objDescApiName,
+        pageNumber: options.pageNumber ? Number(options.pageNumber) : undefined,
+        pageSize: options.pageSize ? Number(options.pageSize) : undefined,
+    });
+    logger_ts_1.loggerService.printTable(['apiName', 'name', 'subject', 'objDescApiName', 'bindApl'], items.map((item) => [
+        normalize_ts_1.default.normalizeString(item.apiName) ?? '',
+        normalize_ts_1.default.normalizeText(item.name),
+        normalize_ts_1.default.normalizeText(item.subject),
+        normalize_ts_1.default.normalizeText(item.objDescApiName) ?? '',
+        normalize_ts_1.default.normalizeText(item.bindAplApiname) ?? '',
+    ]));
+    logger_ts_1.loggerService.success(`Email-template list completed: found=${items.length}`);
 }
 
 
@@ -19928,7 +19981,7 @@ async function objectDevFieldPushCommand(options) {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.objectDevConvertRuleListCommand = exports.objectDevObjectMappingPushCommand = exports.objectDevObjectMappingUpdateCommand = exports.objectDevObjectMappingCreateCommand = exports.objectDevObjectMappingPullCommand = exports.objectDevButtonPushCommand = exports.objectDevButtonUpdateCommand = exports.objectDevButtonCreateCommand = exports.objectDevButtonPullCommand = exports.objectDevButtonListCommand = exports.objectDevValidateRuleUpdateCommand = exports.objectDevValidateRulePushCommand = exports.objectDevValidateRulePullCommand = exports.objectDevValidateRuleListCommand = exports.objectDevValidateRuleCreateCommand = exports.objectDevLayoutRuleUpdateCommand = exports.objectDevLayoutRulePushCommand = exports.objectDevLayoutRulePullCommand = exports.objectDevLayoutRuleListCommand = exports.objectDevLayoutRuleCreateCommand = exports.objectDevLayoutUpdateCommand = exports.objectDevLayoutPushCommand = exports.objectDevLayoutPullCommand = exports.objectDevLayoutListCommand = exports.objectDevLayoutEnableEditCommand = exports.objectDevLayoutEditStatusCommand = exports.objectDevLayoutCreateCommand = exports.objectDevFieldPushCommand = exports.objectDevFieldUpdateCommand = exports.objectDevFieldCreateCommand = exports.objectDevFieldListCommand = exports.objectDevObjectPushCommand = exports.objectDevObjectUpdateCommand = exports.objectDevObjectCreateCommand = exports.objectDevSceneUpdateCommand = exports.objectDevScenePushCommand = exports.objectDevScenePullCommand = exports.objectDevSceneListCommand = exports.objectDevSceneCreateCommand = exports.objectDevOptionSetUpdateCommand = exports.objectDevOptionSetPushCommand = exports.objectDevOptionSetPullCommand = exports.objectDevOptionSetListCommand = exports.objectDevOptionSetDeleteCommand = exports.objectDevOptionSetCreateCommand = exports.objectDevObjectRelatedPullCommand = exports.ObjectDevObjectPullOptions = exports.ObjectDevObjectListOptions = exports.objectDevObjectPullCommand = exports.objectDevObjectListCommand = void 0;
-exports.objectDevConvertRulePushCommand = exports.objectDevConvertRuleUpdateCommand = exports.objectDevConvertRuleCreateCommand = exports.objectDevConvertRulePullCommand = void 0;
+exports.objectDevEmailTemplateListCommand = exports.objectDevConvertRulePushCommand = exports.objectDevConvertRuleUpdateCommand = exports.objectDevConvertRuleCreateCommand = exports.objectDevConvertRulePullCommand = void 0;
 var object_ts_1 = __webpack_require__(1268);
 Object.defineProperty(exports, "objectDevObjectListCommand", ({ enumerable: true, get: function () { return object_ts_1.objectDevObjectListCommand; } }));
 Object.defineProperty(exports, "objectDevObjectPullCommand", ({ enumerable: true, get: function () { return object_ts_1.objectDevObjectPullCommand; } }));
@@ -19995,6 +20048,8 @@ Object.defineProperty(exports, "objectDevConvertRulePullCommand", ({ enumerable:
 Object.defineProperty(exports, "objectDevConvertRuleCreateCommand", ({ enumerable: true, get: function () { return convert_rule_ts_1.objectDevConvertRuleCreateCommand; } }));
 Object.defineProperty(exports, "objectDevConvertRuleUpdateCommand", ({ enumerable: true, get: function () { return convert_rule_ts_1.objectDevConvertRuleUpdateCommand; } }));
 Object.defineProperty(exports, "objectDevConvertRulePushCommand", ({ enumerable: true, get: function () { return convert_rule_ts_1.objectDevConvertRulePushCommand; } }));
+var email_template_ts_1 = __webpack_require__(1026);
+Object.defineProperty(exports, "objectDevEmailTemplateListCommand", ({ enumerable: true, get: function () { return email_template_ts_1.objectDevEmailTemplateListCommand; } }));
 
 
 /***/ },
@@ -20259,10 +20314,15 @@ async function objectDevObjectMappingPullCommand(options) {
             throw new Error('Command cancelled.');
         }
     }
-    const { objectApiNames, found, written, skipped, errorMessages } = await (0, index_ts_1.objectMappingPullService)(options.objectApiNames, options.force === true, options.skipOverwriteConfirm === true);
+    const { found, written, skipped, errorMessages } = await (0, index_ts_1.objectMappingPullService)({
+        status: options.status ? Number(options.status) : undefined,
+        ruleName: options.ruleName,
+        force: options.force === true,
+        skipOverwriteConfirm: options.skipOverwriteConfirm === true,
+    });
     if (printErrorMessages(errorMessages))
         return;
-    logger_ts_1.loggerService.success(`Object-mapping pull completed: objects=${objectApiNames.length}, found=${found}, written=${written}, skipped=${skipped}`);
+    logger_ts_1.loggerService.success(`Object-mapping pull completed: found=${found}, written=${written}, skipped=${skipped}`);
 }
 async function objectDevObjectMappingCreateCommand(options) {
     const result = await (0, index_ts_1.objectMappingCreateService)(options.objectApiName, options.data, options.force === true);
@@ -20275,7 +20335,7 @@ async function objectDevObjectMappingCreateCommand(options) {
     logger_ts_1.loggerService.info(`Object-mapping metadata created: ${result.filePath}`);
 }
 async function objectDevObjectMappingUpdateCommand(options) {
-    const result = await (0, index_ts_1.objectMappingUpdateService)(options.objectApiName, options.data);
+    const result = await (0, index_ts_1.objectMappingUpdateService)(options.data);
     if (!result.filePath) {
         throw new Error('Object-mapping metadata not updated.');
     }
@@ -20285,10 +20345,10 @@ async function objectDevObjectMappingUpdateCommand(options) {
     logger_ts_1.loggerService.info(`Object-mapping metadata updated: ${result.filePath}`);
 }
 async function objectDevObjectMappingPushCommand(options) {
-    const pushed = await (0, index_ts_1.objectMappingPushService)(options.objectApiName, options.ruleApiNames, options.skipOverwriteConfirm === true);
+    const pushed = await (0, index_ts_1.objectMappingPushService)(options.ruleApiNames, options.skipOverwriteConfirm === true);
     if (printErrorMessages(pushed.errorMessages))
         return;
-    logger_ts_1.loggerService.success(`Push completed successfully: object-mapping (${pushed.objectApiName}.${pushed.apiName})`);
+    logger_ts_1.loggerService.success(`Push completed successfully: object-mapping (${pushed.apiName})`);
 }
 
 
@@ -21355,11 +21415,7 @@ const normalize_ts_1 = __importDefault(__webpack_require__(9268));
 const index_ts_1 = __webpack_require__(9985);
 const convert_rule_list_ts_1 = __webpack_require__(8031);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
-const convertRuleCreateService = async (objectApiName, data, force) => {
-    const checkedObjectApiName = normalize_ts_1.default.normalizeString(objectApiName);
-    if (!checkedObjectApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(checkedObjectApiName)) {
-        throw new Error('Invalid arguments: objectApiName is required.');
-    }
+const convertRuleCreateService = async (data, force) => {
     const raw = normalize_ts_1.default.normalizeString(data);
     if (!raw) {
         throw new Error('Invalid arguments: data is required.');
@@ -21368,35 +21424,52 @@ const convertRuleCreateService = async (objectApiName, data, force) => {
     if (!ruleData || typeof ruleData !== 'object' || Array.isArray(ruleData)) {
         throw new Error('data must be a JSON object.');
     }
-    const ruleApiName = normalize_ts_1.default.normalizeString(ruleData.api_name) ?? normalize_ts_1.default.normalizeString(ruleData.apiName);
+    // 提取 ruleList
+    const ruleList = ruleData.ruleList;
+    if (!ruleList?.length) {
+        throw new Error('data.ruleList is required and must be a non-empty array.');
+    }
+    // 从 ruleList 中找主规则 (master_rule_api_name 为空) 的 rule_api_name 作为文件名
+    const mainRule = ruleList.find((r) => {
+        const master = r.master_rule_api_name;
+        return !master || master === '';
+    }) ?? ruleList[0];
+    const ruleApiName = normalize_ts_1.default.normalizeString(mainRule.rule_api_name)
+        ?? normalize_ts_1.default.normalizeString(mainRule.ruleApiName);
     if (!ruleApiName) {
-        throw new Error('data.api_name or data.apiName is required.');
+        throw new Error('Cannot determine rule_api_name from data.ruleList.');
+    }
+    // 远端查重
+    const remoteItems = await (0, convert_rule_list_ts_1.fetchConvertRuleList)();
+    const remoteNameSet = new Set();
+    for (const item of remoteItems) {
+        const ruleList = item.ruleList;
+        if (ruleList) {
+            for (const rule of ruleList) {
+                const name = normalize_ts_1.default.normalizeString(rule.rule_api_name);
+                if (name)
+                    remoteNameSet.add(name);
+            }
+        }
     }
-    const remoteRules = await (0, convert_rule_list_ts_1.fetchConvertRuleList)(checkedObjectApiName, null);
-    if (remoteRules.some((item) => {
-        const remoteName = normalize_ts_1.default.normalizeString(item.api_name)
-            ?? normalize_ts_1.default.normalizeString(item.apiName);
-        return remoteName === ruleApiName;
-    })) {
-        throw new Error('Convert-rule already exists remotely: ' + checkedObjectApiName + '.' + ruleApiName);
+    if (remoteNameSet.has(ruleApiName)) {
+        throw new Error('Convert-rule already exists remotely: ' + ruleApiName);
     }
+    // 本地查重
     const existing = await xmlMetadataManager.readXml('ConvertRule', ruleApiName, {
-        objectApiName: checkedObjectApiName,
         fields: ['content'],
     });
     if (existing.content !== null && existing.content !== undefined) {
         if (!force) {
-            throw new Error('Convert-rule already exists locally: ' + checkedObjectApiName + '.' + ruleApiName + '. Use --force to overwrite.');
+            throw new Error('Convert-rule already exists locally: ' + ruleApiName + '. Use --force to overwrite.');
         }
     }
-    const filePath = await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, ruleData, {
-        objectApiName: checkedObjectApiName,
-        status: 'new',
-    });
-    return {
-        filePath,
-        errorMessages: [],
+    // 组装内容（对齐 create-rule API 格式）
+    const fullContent = {
+        ruleList: ruleList,
     };
+    const filePath = await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, fullContent, { status: 'new' });
+    return { filePath, errorMessages: [] };
 };
 exports.convertRuleCreateService = convertRuleCreateService;
 
@@ -21412,61 +21485,52 @@ exports.fetchConvertRuleDetailList = exports.fetchConvertRuleList = void 0;
 const request_execute_command_paths_ts_1 = __webpack_require__(2351);
 const request_ts_1 = __webpack_require__(3176);
 const types_ts_1 = __webpack_require__(7480);
+const SEARCH_QUERY_INFO = JSON.stringify({ offset: 0, limit: 2000 });
 /**
  * 调 list 接口获取转换规则轻量列表
+ * 实际返回结构: { data: { items: [{ ...rule fields... }, ...] } } 或 { data: { ruleList: [...] } }
  */
-const fetchConvertRuleList = async (objectApiName, ruleApiNames) => {
+const fetchConvertRuleList = async (options = {}) => {
     const response = await (0, request_ts_1.requestObjectDevExecute)((0, request_execute_command_paths_ts_1.getShareCliCommandPath)('convertRule', 'rule-list'), {
-        describeApiName: objectApiName,
-        ruleApiNames,
-    });
-    const result = await (0, request_ts_1.extractObjectDevServiceResult)(response, (res) => {
-        const data = (0, types_ts_1.narrowObjectDevResponse)(res.data);
-        if (!data)
-            throw new Error(`Invalid response data for object ${objectApiName}`);
-        const list = (0, types_ts_1.narrowObjectDevResponse)(data.convertRuleList)
-            ?? (0, types_ts_1.narrowObjectDevResponse)(data.ruleInfoList)
-            ?? (0, types_ts_1.narrowObjectDevResponse)(data.list);
-        return list ?? [];
+        ruleName: options.ruleName ?? '',
+        searchQueryInfo: SEARCH_QUERY_INFO,
     });
+    const result = await (0, request_ts_1.extractObjectDevServiceResult)(response, (res) => parseContentToArray(res));
     if (!result.success) {
         throw new Error(result.errorMessage);
     }
-    return (result.data ?? []).filter((item) => Boolean(item) && typeof item === 'object').map((item) => {
-        const record = item;
-        const rule = record.rule;
-        return (rule && typeof rule === 'object' ? rule : record);
-    });
+    return (result.data ?? []);
 };
 exports.fetchConvertRuleList = fetchConvertRuleList;
 /**
  * 调详情列表接口获取转换规则完整详情
  */
-const fetchConvertRuleDetailList = async (objectApiName, ruleApiNames) => {
+const fetchConvertRuleDetailList = async (options = {}) => {
     const response = await (0, request_ts_1.requestObjectDevExecute)((0, request_execute_command_paths_ts_1.getShareCliCommandPath)('convertRule', 'rule-detail-list'), {
-        describeApiName: objectApiName,
-        ruleApiNames,
-    });
-    const result = await (0, request_ts_1.extractObjectDevServiceResult)(response, (res) => {
-        const data = (0, types_ts_1.narrowObjectDevResponse)(res.data);
-        if (!data)
-            throw new Error(`Invalid response data for object ${objectApiName}`);
-        const list = (0, types_ts_1.narrowObjectDevResponse)(data.convertRuleList)
-            ?? (0, types_ts_1.narrowObjectDevResponse)(data.ruleInfoList)
-            ?? (0, types_ts_1.narrowObjectDevResponse)(data.ruleDetailList)
-            ?? (0, types_ts_1.narrowObjectDevResponse)(data.list);
-        return list ?? [];
+        ruleName: options.ruleName ?? '',
+        searchQueryInfo: SEARCH_QUERY_INFO,
     });
+    const result = await (0, request_ts_1.extractObjectDevServiceResult)(response, (res) => parseContentToArray(res));
     if (!result.success) {
         throw new Error(result.errorMessage);
     }
-    return (result.data ?? []).filter((item) => Boolean(item) && typeof item === 'object').map((item) => {
-        const record = item;
-        const rule = record.rule;
-        return (rule && typeof rule === 'object' ? rule : record);
-    });
+    return (result.data ?? []);
 };
 exports.fetchConvertRuleDetailList = fetchConvertRuleDetailList;
+function parseContentToArray(res) {
+    const data = (0, types_ts_1.narrowObjectDevResponse)(res.data);
+    if (!data)
+        throw new Error('Invalid response data');
+    const items = data.items;
+    if (Array.isArray(items)) {
+        return items;
+    }
+    const ruleList = data.ruleList;
+    if (Array.isArray(ruleList)) {
+        return ruleList;
+    }
+    return [];
+}
 
 
 /***/ },
@@ -21480,74 +21544,77 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.convertRulePullService = void 0;
+const normalize_ts_1 = __importDefault(__webpack_require__(9268));
 const logger_ts_1 = __webpack_require__(3333);
 const index_ts_1 = __webpack_require__(9985);
 const convert_rule_list_ts_1 = __webpack_require__(8031);
-const normalize_ts_1 = __importDefault(__webpack_require__(9268));
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
-const convertRulePullService = async (objectApiNamesRaw, force = false, skipOverwriteConfirm = false) => {
-    const errorMessages = [];
-    const objectApiNames = (normalize_ts_1.default.normalizeString(objectApiNamesRaw) ?? '')
-        .split(',')
-        .map((item) => item.trim())
-        .filter(Boolean);
-    if (!objectApiNames.length) {
-        throw new Error('Invalid arguments: objectApiNames is required.');
+/**
+ * 从 item.ruleList 中找到主规则的 rule_api_name 作为文件名
+ * 主规则: master_rule_api_name 为空字符串或 null/undefined
+ */
+function resolveItemApiName(item) {
+    const ruleList = item.ruleList;
+    if (ruleList?.length) {
+        const mainRule = ruleList.find((r) => {
+            const master = r.master_rule_api_name;
+            return !master || master === '';
+        });
+        if (mainRule) {
+            return normalize_ts_1.default.normalizeString(mainRule.rule_api_name);
+        }
+        return normalize_ts_1.default.normalizeString(ruleList[0].rule_api_name);
     }
+    return undefined;
+}
+const convertRulePullService = async (options = {}) => {
+    const errorMessages = [];
+    const force = options.force === true;
+    const skipOverwriteConfirm = options.skipOverwriteConfirm === true;
+    const items = await (0, convert_rule_list_ts_1.fetchConvertRuleDetailList)({
+        ruleName: options.ruleName,
+    });
     let written = 0;
     let skipped = 0;
-    let found = 0;
-    for (const objectApiName of objectApiNames) {
+    const found = items.length;
+    for (const item of items) {
+        const ruleApiName = resolveItemApiName(item);
+        if (!ruleApiName) {
+            skipped += 1;
+            continue;
+        }
         try {
-            const rules = await (0, convert_rule_list_ts_1.fetchConvertRuleDetailList)(objectApiName, null);
-            found += rules.length;
-            for (const ruleRecord of rules) {
-                const ruleApiName = normalize_ts_1.default.normalizeString(ruleRecord.api_name)
-                    ?? normalize_ts_1.default.normalizeString(ruleRecord.apiName);
-                if (!ruleApiName) {
-                    skipped += 1;
-                    continue;
-                }
-                try {
-                    if (force) {
-                        await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, ruleRecord, {
-                            objectApiName,
-                            status: 'unchanged',
-                        });
-                        written += 1;
-                        continue;
-                    }
-                    const localStatus = await xmlMetadataManager.readXml('ConvertRule', ruleApiName, {
-                        objectApiName,
-                        fields: ['status'],
-                    });
-                    if (localStatus.status !== 'unchanged') {
-                        if (skipOverwriteConfirm) {
-                            logger_ts_1.loggerService.info(`Skipped ${objectApiName}.${ruleApiName}: local status is ${localStatus.status}. Use --force to overwrite local metadata.`);
-                        }
-                        else {
-                            logger_ts_1.loggerService.info(`Convert-rule local status ${localStatus.status}, skip overwrite: ${objectApiName}.${ruleApiName}. Use --force to overwrite local metadata.`);
-                        }
-                        skipped += 1;
-                        continue;
-                    }
-                    await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, ruleRecord, {
-                        objectApiName,
-                        status: 'unchanged',
-                    });
-                    written += 1;
+            if (force) {
+                await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, item, {
+                    status: 'unchanged',
+                });
+                written += 1;
+                continue;
+            }
+            const localStatus = await xmlMetadataManager.readXml('ConvertRule', ruleApiName, {
+                fields: ['status'],
+            });
+            if (localStatus.status !== 'unchanged') {
+                if (skipOverwriteConfirm) {
+                    logger_ts_1.loggerService.info(`Skipped ${ruleApiName}: local status is ${localStatus.status}. Use --force to overwrite local metadata.`);
                 }
-                catch (error) {
-                    errorMessages.push(objectApiName + ' convert-rule ' + ruleApiName + ': ' + (error instanceof Error ? error.message : String(error)));
+                else {
+                    logger_ts_1.loggerService.info(`Convert-rule local status ${localStatus.status}, skip overwrite: ${ruleApiName}. Use --force to overwrite local metadata.`);
                 }
+                skipped += 1;
+                continue;
             }
+            await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, item, {
+                status: 'unchanged',
+            });
+            written += 1;
         }
         catch (error) {
-            errorMessages.push(objectApiName + ': ' + (error instanceof Error ? error.message : String(error)));
+            errorMessages.push('convert-rule ' + ruleApiName + ': ' + (error instanceof Error ? error.message : String(error)));
         }
     }
     return {
-        objectApiNames,
+        objectApiNames: [],
         found,
         written,
         skipped,
@@ -21577,12 +21644,8 @@ const request_ts_1 = __webpack_require__(3176);
 const logger_ts_1 = __webpack_require__(3333);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
 const isRecord = normalize_ts_1.default.isRecord;
-const convertRulePushService = async (objectApiName, ruleApiNames, skipOverwriteConfirm = false) => {
+const convertRulePushService = async (ruleApiNames, skipOverwriteConfirm = false) => {
     const errorMessages = [];
-    const checkedObjectApiName = normalize_ts_1.default.normalizeString(objectApiName);
-    if (!checkedObjectApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(checkedObjectApiName)) {
-        throw new Error('Invalid arguments: objectApiName is required.');
-    }
     const targetRuleApiNames = (ruleApiNames ?? '')
         .split(',')
         .map((item) => normalize_ts_1.default.normalizeString(item))
@@ -21592,109 +21655,99 @@ const convertRulePushService = async (objectApiName, ruleApiNames, skipOverwrite
     }
     for (const ruleApiName of targetRuleApiNames) {
         try {
-            let ruleMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName, {
-                objectApiName: checkedObjectApiName,
-            });
+            let ruleMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName);
             if (!ruleMeta.content || !isRecord(ruleMeta.content)) {
-                throw new Error(`Invalid convert-rule content: ${checkedObjectApiName}.${ruleApiName}`);
+                throw new Error(`Invalid convert-rule content: ${ruleApiName}`);
             }
+            const content = ruleMeta.content;
             // pre-pull for non-new rules
             if (ruleMeta.status !== 'new') {
-                logger_ts_1.loggerService.startLoading('convert-rule push pre-pull: ' + checkedObjectApiName + '.' + ruleApiName);
+                logger_ts_1.loggerService.startLoading('convert-rule push pre-pull: ' + ruleApiName);
                 try {
-                    const prePullResult = await (0, convert_rule_pull_ts_1.convertRulePullService)(checkedObjectApiName, false, skipOverwriteConfirm);
+                    const prePullResult = await (0, convert_rule_pull_ts_1.convertRulePullService)({
+                        skipOverwriteConfirm,
+                    });
                     errorMessages.push(...prePullResult.errorMessages);
                 }
                 finally {
                     logger_ts_1.loggerService.stopLoading();
                 }
             }
-            // Check remote existence via rule-detail-list
-            logger_ts_1.loggerService.startLoading('convert-rule push check remote: ' + checkedObjectApiName + '.' + ruleApiName);
+            // 远端存在性检查
+            logger_ts_1.loggerService.startLoading('convert-rule push check remote: ' + ruleApiName);
             let existsRemotely = false;
             try {
-                const remoteRules = await (0, convert_rule_list_ts_1.fetchConvertRuleDetailList)(checkedObjectApiName, null);
+                const remoteRules = await (0, convert_rule_list_ts_1.fetchConvertRuleDetailList)();
                 existsRemotely = remoteRules.some((item) => {
-                    const remoteName = normalize_ts_1.default.normalizeString(item.api_name)
-                        ?? normalize_ts_1.default.normalizeString(item.apiName);
-                    return remoteName === ruleApiName;
+                    const ruleList = item.ruleList;
+                    return ruleList?.some((rule) => {
+                        const remoteName = normalize_ts_1.default.normalizeString(rule.rule_api_name);
+                        return remoteName === ruleApiName;
+                    }) ?? false;
                 });
             }
             finally {
                 logger_ts_1.loggerService.stopLoading();
             }
-            // Fix local status based on remote
+            // 状态修正
             if (ruleMeta.status === 'new' && existsRemotely) {
-                await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, ruleMeta.content, {
-                    objectApiName: checkedObjectApiName,
+                await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, content, {
                     status: 'modified',
                     features: ruleMeta.features,
                     extra: ruleMeta.extra,
                 });
-                logger_ts_1.loggerService.warn('Convert-rule exists remotely, local status changed from new to modified: ' + checkedObjectApiName + '.' + ruleApiName);
-                ruleMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName, {
-                    objectApiName: checkedObjectApiName,
-                });
+                logger_ts_1.loggerService.warn('Convert-rule exists remotely, local status changed from new to modified: ' + ruleApiName);
+                ruleMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName);
             }
             if (ruleMeta.status !== 'new' && !existsRemotely) {
-                await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, ruleMeta.content, {
-                    objectApiName: checkedObjectApiName,
+                await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, content, {
                     status: 'new',
                     features: ruleMeta.features,
                     extra: ruleMeta.extra,
                 });
-                logger_ts_1.loggerService.warn('Convert-rule does not exist remotely, local status changed from ' + ruleMeta.status + ' to new: ' + checkedObjectApiName + '.' + ruleApiName);
-                ruleMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName, {
-                    objectApiName: checkedObjectApiName,
-                });
+                logger_ts_1.loggerService.warn('Convert-rule does not exist remotely, local status changed from ' + ruleMeta.status + ' to new: ' + ruleApiName);
+                ruleMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName);
             }
             const isCreate = ruleMeta.status === 'new';
-            const ruleContent = { ...(ruleMeta.content && isRecord(ruleMeta.content)
+            const updatedContent = { ...(ruleMeta.content && isRecord(ruleMeta.content)
                     ? ruleMeta.content
-                    : {}) };
-            if (!ruleContent.describe_api_name) {
-                ruleContent.describe_api_name = checkedObjectApiName;
-            }
-            if (!ruleContent.api_name) {
-                ruleContent.api_name = ruleApiName;
-            }
-            logger_ts_1.loggerService.startLoading('convert-rule push request: ' + checkedObjectApiName + '.' + ruleApiName + ' (' + (isCreate ? 'create' : 'update') + ')');
+                    : content) };
+            logger_ts_1.loggerService.startLoading('convert-rule push request: ' + ruleApiName + ' (' + (isCreate ? 'create' : 'update') + ')');
             const raw = await (0, request_ts_1.requestObjectDevExecute)(isCreate
                 ? (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('convertRule', 'create-rule')
-                : (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('convertRule', 'update-rule'), ruleContent);
+                : (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('convertRule', 'update-rule'), updatedContent);
             const response = raw;
             if (response.success !== true || normalize_ts_1.default.normalizeString(normalize_ts_1.default.asString(response.code)) !== 'OK') {
                 logger_ts_1.loggerService.stopLoading();
                 throw new Error('convert-rule push failed: ' + (normalize_ts_1.default.normalizeText(response.message) || 'Unknown error'));
             }
             logger_ts_1.loggerService.stopLoading();
-            // Write back status
-            const latestMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName, {
-                objectApiName: checkedObjectApiName,
-            });
+            // 回写状态
+            const latestMeta = await xmlMetadataManager.readXml('ConvertRule', ruleApiName);
             await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, latestMeta.content, {
-                objectApiName: checkedObjectApiName,
                 status: 'unchanged',
                 features: latestMeta.features,
                 extra: latestMeta.extra,
             });
             // post-pull
-            logger_ts_1.loggerService.startLoading('convert-rule push post-pull: ' + checkedObjectApiName);
+            logger_ts_1.loggerService.startLoading('convert-rule push post-pull');
             try {
-                const postPullResult = await (0, convert_rule_pull_ts_1.convertRulePullService)(checkedObjectApiName, false, skipOverwriteConfirm);
+                const postPullResult = await (0, convert_rule_pull_ts_1.convertRulePullService)({
+                    skipOverwriteConfirm,
+                });
                 errorMessages.push(...postPullResult.errorMessages);
             }
             finally {
                 logger_ts_1.loggerService.stopLoading();
             }
-            logger_ts_1.loggerService.info(`Convert-rule pushed: ${checkedObjectApiName}.${ruleApiName}`);
+            logger_ts_1.loggerService.info(`Convert-rule pushed: ${ruleApiName}`);
         }
         catch (error) {
-            errorMessages.push(`Convert-rule push failed: ${checkedObjectApiName}.${ruleApiName}: ${error}`);
+            errorMessages.push(`Convert-rule push failed: ${ruleApiName}: ${error}`);
         }
     }
     return {
-        objectApiName: checkedObjectApiName,
+        objectApiName: '',
         apiName: targetRuleApiNames.join(','),
         errorMessages,
     };
@@ -21716,11 +21769,7 @@ exports.convertRuleUpdateService = void 0;
 const normalize_ts_1 = __importDefault(__webpack_require__(9268));
 const index_ts_1 = __webpack_require__(9985);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
-const convertRuleUpdateService = async (objectApiName, data) => {
-    const checkedObjectApiName = normalize_ts_1.default.normalizeString(objectApiName);
-    if (!checkedObjectApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(checkedObjectApiName)) {
-        throw new Error('Invalid arguments: objectApiName is required.');
-    }
+const convertRuleUpdateService = async (data) => {
     const raw = normalize_ts_1.default.normalizeString(data);
     if (!raw) {
         throw new Error('Invalid arguments: data is required.');
@@ -21729,30 +21778,76 @@ const convertRuleUpdateService = async (objectApiName, data) => {
     if (!ruleData || typeof ruleData !== 'object' || Array.isArray(ruleData)) {
         throw new Error('data must be a JSON object.');
     }
-    const ruleApiName = normalize_ts_1.default.normalizeString(normalize_ts_1.default.asString(ruleData.api_name))
-        ?? normalize_ts_1.default.normalizeString(normalize_ts_1.default.asString(ruleData.apiName));
+    // 从 ruleList 中找主规则的 rule_api_name 定位文件
+    const ruleList = ruleData.ruleList;
+    if (!ruleList?.length) {
+        throw new Error('data.ruleList is required and must be a non-empty array.');
+    }
+    const mainRule = ruleList.find((r) => {
+        const master = r.master_rule_api_name;
+        return !master || master === '';
+    }) ?? ruleList[0];
+    const ruleApiName = normalize_ts_1.default.normalizeString(mainRule.rule_api_name)
+        ?? normalize_ts_1.default.normalizeString(mainRule.ruleApiName)
+        ?? '';
     if (!ruleApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(ruleApiName)) {
-        throw new Error('Invalid arguments: api_name or apiName is required in data.');
+        throw new Error('Invalid arguments: cannot determine rule_api_name from data.ruleList.');
     }
     const current = await xmlMetadataManager.readXml('ConvertRule', ruleApiName, {
-        objectApiName: checkedObjectApiName,
         fields: ['content', 'status']
     });
     if (current.content === null || current.content === undefined) {
-        throw new Error(`Convert-rule metadata not found: ${checkedObjectApiName}.${ruleApiName}`);
+        throw new Error(`Convert-rule metadata not found: ${ruleApiName}`);
     }
     const filePath = await xmlMetadataManager.writeXml('ConvertRule', ruleApiName, ruleData, {
-        objectApiName: checkedObjectApiName,
         status: current.status === 'new' ? 'new' : 'modified'
     });
-    return {
-        filePath,
-        errorMessages: []
-    };
+    return { filePath, errorMessages: [] };
 };
 exports.convertRuleUpdateService = convertRuleUpdateService;
 
 
+/***/ },
+
+/***/ 236
+(__unused_webpack_module, exports, __webpack_require__) {
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.fetchEmailTemplateList = void 0;
+const request_execute_command_paths_ts_1 = __webpack_require__(2351);
+const request_ts_1 = __webpack_require__(3176);
+const types_ts_1 = __webpack_require__(7480);
+/**
+ * 查询邮件模板列表
+ */
+const fetchEmailTemplateList = async (options = {}) => {
+    const response = await (0, request_ts_1.requestObjectDevExecute)((0, request_execute_command_paths_ts_1.getShareCliCommandPath)('emailTemplate', 'template-page'), {
+        objDescApiName: options.objDescApiName ?? '',
+        pageNumber: options.pageNumber ?? 1,
+        pageSize: options.pageSize ?? 2000,
+        SortField: options.sortField ?? '',
+        SortType: options.sortType ?? '',
+        QueryInfo: {},
+    });
+    const result = await (0, request_ts_1.extractObjectDevServiceResult)(response, (res) => {
+        const data = (0, types_ts_1.narrowObjectDevResponse)(res.data);
+        if (!data)
+            throw new Error('Invalid response data');
+        const list = data.list ?? data.items ?? data.records;
+        if (Array.isArray(list)) {
+            return list;
+        }
+        return [];
+    });
+    if (!result.success) {
+        throw new Error(result.errorMessage);
+    }
+    return (result.data ?? []);
+};
+exports.fetchEmailTemplateList = fetchEmailTemplateList;
+
+
 /***/ },
 
 /***/ 3163
@@ -22103,7 +22198,7 @@ exports.fieldUpdateService = fieldUpdateService;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.fetchConvertRuleList = exports.objectMappingPushService = exports.objectMappingUpdateService = exports.objectMappingCreateService = exports.objectMappingListService = exports.fetchObjectMappingList = exports.objectMappingPullService = exports.buttonPushService = exports.buttonUpdateService = exports.buttonCreateService = exports.buttonListService = exports.buttonPullService = exports.validateRulePushService = exports.validateRuleUpdateService = exports.validateRuleCreateService = exports.validateRulePullService = exports.validateRuleListService = exports.layoutRulePushService = exports.layoutRulePullService = exports.layoutRuleUpdateService = exports.layoutRuleListService = exports.layoutRuleCreateService = exports.layoutPushService = exports.layoutPullService = exports.layoutUpdateService = exports.layoutListService = exports.layoutEnableEditService = exports.layoutEditStatusService = exports.layoutCreateService = exports.sceneUpdateService = exports.scenePushService = exports.scenePullService = exports.sceneListService = exports.sceneCreateService = exports.optionSetUpdateService = exports.optionSetPushService = exports.optionSetPullService = exports.optionSetListService = exports.optionSetDeleteService = exports.optionSetCreateService = exports.fieldPushService = exports.fieldUpdateService = exports.fieldListService = exports.fieldCreateService = exports.objectPushService = exports.objectUpdateService = exports.objectCreateService = exports.objectListService = exports.objectRelatedPullService = exports.objectPullService = void 0;
-exports.extractObjectDevServiceResult = exports.requestObjectDevExecute = exports.convertRulePushService = exports.convertRuleUpdateService = exports.convertRuleCreateService = exports.convertRulePullService = exports.convertRuleListService = void 0;
+exports.extractObjectDevServiceResult = exports.requestObjectDevExecute = exports.emailTemplateListService = exports.fetchEmailTemplateList = exports.convertRulePushService = exports.convertRuleUpdateService = exports.convertRuleCreateService = exports.convertRulePullService = exports.convertRuleListService = void 0;
 var object_pull_ts_1 = __webpack_require__(9365);
 Object.defineProperty(exports, "objectPullService", ({ enumerable: true, get: function () { return object_pull_ts_1.objectPullService; } }));
 var object_related_pull_ts_1 = __webpack_require__(9711);
@@ -22212,6 +22307,9 @@ var convert_rule_update_ts_1 = __webpack_require__(8346);
 Object.defineProperty(exports, "convertRuleUpdateService", ({ enumerable: true, get: function () { return convert_rule_update_ts_1.convertRuleUpdateService; } }));
 var convert_rule_push_ts_1 = __webpack_require__(2771);
 Object.defineProperty(exports, "convertRulePushService", ({ enumerable: true, get: function () { return convert_rule_push_ts_1.convertRulePushService; } }));
+var email_template_list_ts_1 = __webpack_require__(236);
+Object.defineProperty(exports, "fetchEmailTemplateList", ({ enumerable: true, get: function () { return email_template_list_ts_1.fetchEmailTemplateList; } }));
+Object.defineProperty(exports, "emailTemplateListService", ({ enumerable: true, get: function () { return email_template_list_ts_1.fetchEmailTemplateList; } }));
 var request_ts_1 = __webpack_require__(3176);
 Object.defineProperty(exports, "requestObjectDevExecute", ({ enumerable: true, get: function () { return request_ts_1.requestObjectDevExecute; } }));
 Object.defineProperty(exports, "extractObjectDevServiceResult", ({ enumerable: true, get: function () { return request_ts_1.extractObjectDevServiceResult; } }));
@@ -23184,10 +23282,6 @@ const index_ts_1 = __webpack_require__(9985);
 const object_mapping_list_ts_1 = __webpack_require__(7244);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
 const objectMappingCreateService = async (objectApiName, data, force) => {
-    const checkedObjectApiName = normalize_ts_1.default.normalizeString(objectApiName);
-    if (!checkedObjectApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(checkedObjectApiName)) {
-        throw new Error('Invalid arguments: objectApiName is required.');
-    }
     const raw = normalize_ts_1.default.normalizeString(data);
     if (!raw) {
         throw new Error('Invalid arguments: data is required.');
@@ -23196,35 +23290,54 @@ const objectMappingCreateService = async (objectApiName, data, force) => {
     if (!mappingData || typeof mappingData !== 'object' || Array.isArray(mappingData)) {
         throw new Error('data must be a JSON object.');
     }
-    const mappingApiName = normalize_ts_1.default.normalizeString(mappingData.api_name) ?? normalize_ts_1.default.normalizeString(mappingData.apiName);
-    if (!mappingApiName) {
-        throw new Error('data.api_name or data.apiName is required.');
+    // describe_api_name: 优先从 data 取，其次 --objectApiName
+    const checkedObjectApiName = normalize_ts_1.default.normalizeString(mappingData.describe_api_name) ?? normalize_ts_1.default.normalizeString(objectApiName);
+    if (!checkedObjectApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(checkedObjectApiName)) {
+        throw new Error('Invalid arguments: describe_api_name is required (via --objectApiName or data.describe_api_name).');
+    }
+    // 从 rule_list 中提取主规则的 rule_api_name 作为文件名
+    const ruleList = mappingData.rule_list;
+    const mainRule = ruleList?.find((r) => {
+        const master = r.master_rule_api_name;
+        return !master || master === '';
+    });
+    const mappingApiName = mainRule
+        ? (normalize_ts_1.default.normalizeString(mainRule.rule_api_name) ?? checkedObjectApiName)
+        : checkedObjectApiName;
+    // 远端查重
+    const remoteItems = await (0, object_mapping_list_ts_1.fetchObjectMappingList)();
+    const remoteNameSet = new Set();
+    for (const item of remoteItems) {
+        const ruleList = item.ruleList;
+        if (ruleList) {
+            for (const rule of ruleList) {
+                const name = normalize_ts_1.default.normalizeString(rule.rule_api_name);
+                if (name)
+                    remoteNameSet.add(name);
+            }
+        }
     }
-    const remoteMappings = await (0, object_mapping_list_ts_1.fetchObjectMappingList)(checkedObjectApiName, null);
-    if (remoteMappings.some((item) => {
-        const remoteName = normalize_ts_1.default.normalizeString(item.api_name)
-            ?? normalize_ts_1.default.normalizeString(item.apiName);
-        return remoteName === mappingApiName;
-    })) {
-        throw new Error('Object-mapping already exists remotely: ' + checkedObjectApiName + '.' + mappingApiName);
+    if (remoteNameSet.has(mappingApiName)) {
+        throw new Error('Object-mapping already exists remotely: ' + mappingApiName);
     }
+    // 本地查重
     const existing = await xmlMetadataManager.readXml('ObjectMapping', mappingApiName, {
-        objectApiName: checkedObjectApiName,
         fields: ['content'],
     });
     if (existing.content !== null && existing.content !== undefined) {
         if (!force) {
-            throw new Error('Object-mapping already exists locally: ' + checkedObjectApiName + '.' + mappingApiName + '. Use --force to overwrite.');
+            throw new Error('Object-mapping already exists locally: ' + mappingApiName + '. Use --force to overwrite.');
         }
     }
-    const filePath = await xmlMetadataManager.writeXml('ObjectMapping', mappingApiName, mappingData, {
-        objectApiName: checkedObjectApiName,
-        status: 'new',
-    });
-    return {
-        filePath,
-        errorMessages: [],
+    // 组装完整内容（匹配 create-rule API 格式）
+    const fullContent = {
+        rule_list: ruleList ?? [],
+        button: mappingData.button ?? {},
+        describe_api_name: checkedObjectApiName,
+        roles: mappingData.roles ?? [],
     };
+    const filePath = await xmlMetadataManager.writeXml('ObjectMapping', mappingApiName, fullContent, { status: 'new' });
+    return { filePath, errorMessages: [] };
 };
 exports.objectMappingCreateService = objectMappingCreateService;
 
@@ -23241,30 +23354,29 @@ const request_execute_command_paths_ts_1 = __webpack_require__(2351);
 const request_ts_1 = __webpack_require__(3176);
 const types_ts_1 = __webpack_require__(7480);
 /**
- * 调 list 接口获取指定对象下的对象映射规则列表
+ * 调详情列表接口获取对象映射规则列表
+ * 实际返回结构: { data: { items: [{ button, ruleList, roles }, ...] } }
  */
-const fetchObjectMappingList = async (objectApiName, ruleApiNames) => {
-    const response = await (0, request_ts_1.requestObjectDevExecute)((0, request_execute_command_paths_ts_1.getShareCliCommandPath)('objectMapping', 'rule-detail-list'), {
-        describeApiName: objectApiName,
-        ruleApiNames,
-    });
+const fetchObjectMappingList = async (options = {}) => {
+    const data = {
+        status: options.status ?? 0,
+        rule_name: options.ruleName ?? '',
+    };
+    const response = await (0, request_ts_1.requestObjectDevExecute)((0, request_execute_command_paths_ts_1.getShareCliCommandPath)('objectMapping', 'rule-detail-list'), data);
     const result = await (0, request_ts_1.extractObjectDevServiceResult)(response, (res) => {
         const data = (0, types_ts_1.narrowObjectDevResponse)(res.data);
         if (!data)
-            throw new Error(`Invalid response data for object ${objectApiName}`);
-        const list = (0, types_ts_1.narrowObjectDevResponse)(data.ruleInfoList)
-            ?? (0, types_ts_1.narrowObjectDevResponse)(data.objectMappingList)
-            ?? (0, types_ts_1.narrowObjectDevResponse)(data.list);
-        return list ?? [];
+            throw new Error('Invalid response data');
+        const items = data.items;
+        if (Array.isArray(items)) {
+            return items;
+        }
+        return [];
     });
     if (!result.success) {
         throw new Error(result.errorMessage);
     }
-    return (result.data ?? []).filter((item) => Boolean(item) && typeof item === 'object').map((item) => {
-        const record = item;
-        const rule = record.rule;
-        return (rule && typeof rule === 'object' ? rule : record);
-    });
+    return (result.data ?? []);
 };
 exports.fetchObjectMappingList = fetchObjectMappingList;
 
@@ -23285,69 +23397,77 @@ const logger_ts_1 = __webpack_require__(3333);
 const index_ts_1 = __webpack_require__(9985);
 const object_mapping_list_ts_1 = __webpack_require__(7244);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
-const objectMappingPullService = async (objectApiNamesRaw, force = false, skipOverwriteConfirm = false) => {
-    const errorMessages = [];
-    const objectApiNames = (normalize_ts_1.default.normalizeString(objectApiNamesRaw) ?? '')
-        .split(',')
-        .map((item) => item.trim())
-        .filter(Boolean);
-    if (!objectApiNames.length) {
-        throw new Error('Invalid arguments: objectApiNames is required.');
+/**
+ * 从 item.ruleList 中找到主规则的 rule_api_name 作为文件名
+ * 主规则: master_rule_api_name 为空字符串或 null/undefined
+ * 没有主规则时回退到 button.api_name
+ */
+function resolveItemApiName(item) {
+    const ruleList = item.ruleList;
+    if (ruleList?.length) {
+        const mainRule = ruleList.find((r) => {
+            const master = r.master_rule_api_name;
+            return !master || master === '';
+        });
+        if (mainRule) {
+            return normalize_ts_1.default.normalizeString(mainRule.rule_api_name);
+        }
+        // 没有主规则时用第一条的 rule_api_name
+        return normalize_ts_1.default.normalizeString(ruleList[0].rule_api_name);
     }
-    let found = 0;
+    // 回退到 button.api_name
+    const button = item.button;
+    return normalize_ts_1.default.normalizeString(button?.api_name);
+}
+const objectMappingPullService = async (options = {}) => {
+    const errorMessages = [];
+    const force = options.force === true;
+    const skipOverwriteConfirm = options.skipOverwriteConfirm === true;
+    const items = await (0, object_mapping_list_ts_1.fetchObjectMappingList)({
+        status: options.status,
+        ruleName: options.ruleName,
+    });
     let written = 0;
     let skipped = 0;
-    for (const objectApiName of objectApiNames) {
+    const found = items.length;
+    for (const item of items) {
+        const mappingApiName = resolveItemApiName(item);
+        if (!mappingApiName) {
+            skipped += 1;
+            continue;
+        }
         try {
-            const mappings = await (0, object_mapping_list_ts_1.fetchObjectMappingList)(objectApiName, null);
-            found += mappings.length;
-            for (const mappingRecord of mappings) {
-                const mappingApiName = normalize_ts_1.default.normalizeString(mappingRecord.api_name)
-                    ?? normalize_ts_1.default.normalizeString(mappingRecord.apiName);
-                if (!mappingApiName) {
-                    skipped += 1;
-                    continue;
-                }
-                try {
-                    if (force) {
-                        await xmlMetadataManager.writeXml('ObjectMapping', mappingApiName, mappingRecord, {
-                            objectApiName,
-                            status: 'unchanged',
-                        });
-                        written += 1;
-                        continue;
-                    }
-                    const localStatus = await xmlMetadataManager.readXml('ObjectMapping', mappingApiName, {
-                        objectApiName,
-                        fields: ['status'],
-                    });
-                    if (localStatus.status !== 'unchanged') {
-                        if (skipOverwriteConfirm) {
-                            logger_ts_1.loggerService.info(`Skipped ${objectApiName}.${mappingApiName}: local status is ${localStatus.status}. Use --force to overwrite local metadata.`);
-                        }
-                        else {
-                            logger_ts_1.loggerService.info(`Object-mapping local status ${localStatus.status}, skip overwrite: ${objectApiName}.${mappingApiName}. Use --force to overwrite local metadata.`);
-                        }
-                        skipped += 1;
-                        continue;
-                    }
-                    await xmlMetadataManager.writeXml('ObjectMapping', mappingApiName, mappingRecord, {
-                        objectApiName,
-                        status: 'unchanged',
-                    });
-                    written += 1;
+            if (force) {
+                await xmlMetadataManager.writeXml('ObjectMapping', mappingApiName, item, {
+                    status: 'unchanged',
+                });
+                written += 1;
+                continue;
+            }
+            const localStatus = await xmlMetadataManager.readXml('ObjectMapping', mappingApiName, {
+                fields: ['status'],
+            });
+            if (localStatus.status !== 'unchanged') {
+                if (skipOverwriteConfirm) {
+                    logger_ts_1.loggerService.info(`Skipped ${mappingApiName}: local status is ${localStatus.status}. Use --force to overwrite local metadata.`);
                 }
-                catch (error) {
-                    errorMessages.push(objectApiName + ' object-mapping ' + mappingApiName + ': ' + (error instanceof Error ? error.message : String(error)));
+                else {
+                    logger_ts_1.loggerService.info(`Object-mapping local status ${localStatus.status}, skip overwrite: ${mappingApiName}. Use --force to overwrite local metadata.`);
                 }
+                skipped += 1;
+                continue;
             }
+            await xmlMetadataManager.writeXml('ObjectMapping', mappingApiName, item, {
+                status: 'unchanged',
+            });
+            written += 1;
         }
         catch (error) {
-            errorMessages.push(objectApiName + ': ' + (error instanceof Error ? error.message : String(error)));
+            errorMessages.push('object-mapping ' + mappingApiName + ': ' + (error instanceof Error ? error.message : String(error)));
         }
     }
     return {
-        objectApiNames,
+        objectApiNames: [],
         found,
         written,
         skipped,
@@ -23377,124 +23497,135 @@ const request_ts_1 = __webpack_require__(3176);
 const logger_ts_1 = __webpack_require__(3333);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
 const isRecord = normalize_ts_1.default.isRecord;
-const objectMappingPushService = async (objectApiName, ruleApiNames, skipOverwriteConfirm = false) => {
+const objectMappingPushService = async (ruleApiNames, skipOverwriteConfirm = false) => {
     const errorMessages = [];
-    const checkedObjectApiName = normalize_ts_1.default.normalizeString(objectApiName);
-    if (!checkedObjectApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(checkedObjectApiName)) {
-        throw new Error('Invalid arguments: objectApiName is required.');
+    const targetRuleApiNames = [];
+    if (ruleApiNames) {
+        targetRuleApiNames.push(...(ruleApiNames
+            .split(',')
+            .map((item) => normalize_ts_1.default.normalizeString(item))
+            .filter((item) => Boolean(item))));
     }
-    const targetRuleApiNames = (ruleApiNames ?? '')
-        .split(',')
-        .map((item) => normalize_ts_1.default.normalizeString(item))
-        .filter((item) => Boolean(item));
     if (!targetRuleApiNames.length) {
-        throw new Error('Invalid arguments: ruleApiNames is required.');
+        // 未指定 ruleApiNames → 扫描本地所有 object-mapping 文件
+        const localIndex = await xmlMetadataManager.listLocalXmlApiName(undefined, ['ObjectMapping']);
+        const mappingIndex = localIndex[''];
+        if (mappingIndex?.ObjectMapping?.length) {
+            targetRuleApiNames.push(...mappingIndex.ObjectMapping);
+        }
+    }
+    if (!targetRuleApiNames.length) {
+        throw new Error('No object-mapping metadata found. Use --ruleApiNames <apiNames> or create local object-mapping metadata first.');
     }
     for (const ruleApiName of targetRuleApiNames) {
         try {
-            let mappingMeta = await xmlMetadataManager.readXml('ObjectMapping', ruleApiName, {
-                objectApiName: checkedObjectApiName,
-            });
+            let mappingMeta = await xmlMetadataManager.readXml('ObjectMapping', ruleApiName);
             if (!mappingMeta.content || !isRecord(mappingMeta.content)) {
-                throw new Error(`Invalid object-mapping content: ${checkedObjectApiName}.${ruleApiName}`);
+                throw new Error(`Invalid object-mapping content: ${ruleApiName}`);
             }
+            const content = mappingMeta.content;
+            const button = content.button;
+            const describeApiName = normalize_ts_1.default.normalizeString(content.describe_api_name)
+                ?? normalize_ts_1.default.normalizeString(content.describeApiName)
+                ?? normalize_ts_1.default.normalizeString(button?.describe_api_name)
+                ?? '';
             // pre-pull for non-new rules
             if (mappingMeta.status !== 'new') {
-                logger_ts_1.loggerService.startLoading('object-mapping push pre-pull: ' + checkedObjectApiName + '.' + ruleApiName);
+                logger_ts_1.loggerService.startLoading('object-mapping push pre-pull: ' + ruleApiName);
                 try {
-                    const prePullResult = await (0, object_mapping_pull_ts_1.objectMappingPullService)(checkedObjectApiName, false, skipOverwriteConfirm);
+                    const prePullResult = await (0, object_mapping_pull_ts_1.objectMappingPullService)({
+                        skipOverwriteConfirm,
+                    });
                     errorMessages.push(...prePullResult.errorMessages);
                 }
                 finally {
                     logger_ts_1.loggerService.stopLoading();
                 }
             }
-            // Check remote existence
-            logger_ts_1.loggerService.startLoading('object-mapping push check remote: ' + checkedObjectApiName + '.' + ruleApiName);
+            // 远端存在性检查
+            logger_ts_1.loggerService.startLoading('object-mapping push check remote: ' + ruleApiName);
             let existsRemotely = false;
             try {
-                const remoteMappings = await (0, object_mapping_list_ts_1.fetchObjectMappingList)(checkedObjectApiName, null);
-                existsRemotely = remoteMappings.some((item) => {
-                    const remoteName = normalize_ts_1.default.normalizeString(item.api_name)
-                        ?? normalize_ts_1.default.normalizeString(item.apiName);
-                    return remoteName === ruleApiName;
+                const remoteItems = await (0, object_mapping_list_ts_1.fetchObjectMappingList)();
+                existsRemotely = remoteItems.some((item) => {
+                    const ruleList = item.ruleList;
+                    return ruleList?.some((rule) => {
+                        const remoteName = normalize_ts_1.default.normalizeString(rule.rule_api_name);
+                        return remoteName === ruleApiName;
+                    }) ?? false;
                 });
             }
             finally {
                 logger_ts_1.loggerService.stopLoading();
             }
-            // Fix local status based on remote
+            // 状态修正
             if (mappingMeta.status === 'new' && existsRemotely) {
-                await xmlMetadataManager.writeXml('ObjectMapping', ruleApiName, mappingMeta.content, {
-                    objectApiName: checkedObjectApiName,
+                await xmlMetadataManager.writeXml('ObjectMapping', ruleApiName, content, {
                     status: 'modified',
                     features: mappingMeta.features,
                     extra: mappingMeta.extra,
                 });
-                logger_ts_1.loggerService.warn('Object-mapping exists remotely, local status changed from new to modified: ' + checkedObjectApiName + '.' + ruleApiName);
-                mappingMeta = await xmlMetadataManager.readXml('ObjectMapping', ruleApiName, {
-                    objectApiName: checkedObjectApiName,
-                });
+                logger_ts_1.loggerService.warn('Object-mapping exists remotely, local status changed from new to modified: ' + ruleApiName);
+                mappingMeta = await xmlMetadataManager.readXml('ObjectMapping', ruleApiName);
             }
             if (mappingMeta.status !== 'new' && !existsRemotely) {
-                await xmlMetadataManager.writeXml('ObjectMapping', ruleApiName, mappingMeta.content, {
-                    objectApiName: checkedObjectApiName,
+                await xmlMetadataManager.writeXml('ObjectMapping', ruleApiName, content, {
                     status: 'new',
                     features: mappingMeta.features,
                     extra: mappingMeta.extra,
                 });
-                logger_ts_1.loggerService.warn('Object-mapping does not exist remotely, local status changed from ' + mappingMeta.status + ' to new: ' + checkedObjectApiName + '.' + ruleApiName);
-                mappingMeta = await xmlMetadataManager.readXml('ObjectMapping', ruleApiName, {
-                    objectApiName: checkedObjectApiName,
-                });
+                logger_ts_1.loggerService.warn('Object-mapping does not exist remotely, local status changed from ' + mappingMeta.status + ' to new: ' + ruleApiName);
+                mappingMeta = await xmlMetadataManager.readXml('ObjectMapping', ruleApiName);
             }
             const isCreate = mappingMeta.status === 'new';
-            const mappingContent = { ...(mappingMeta.content && isRecord(mappingMeta.content)
+            // 组装 push payload（对齐 create-rule/update-rule API 格式）
+            const updatedContent = { ...(mappingMeta.content && isRecord(mappingMeta.content)
                     ? mappingMeta.content
-                    : {}) };
-            if (!mappingContent.describe_api_name) {
-                mappingContent.describe_api_name = checkedObjectApiName;
+                    : content) };
+            if (!updatedContent.describe_api_name) {
+                updatedContent.describe_api_name = describeApiName;
             }
-            if (!mappingContent.api_name) {
-                mappingContent.api_name = ruleApiName;
+            // ruleList（camelCase，pull 返回）→ rule_list（snake_case，create-rule/update-rule API 要求）
+            if (updatedContent.ruleList && !updatedContent.rule_list) {
+                updatedContent.rule_list = updatedContent.ruleList;
+                delete updatedContent.ruleList;
             }
-            logger_ts_1.loggerService.startLoading('object-mapping push request: ' + checkedObjectApiName + '.' + ruleApiName + ' (' + (isCreate ? 'create' : 'update') + ')');
+            logger_ts_1.loggerService.startLoading('object-mapping push request: ' + ruleApiName + ' (' + (isCreate ? 'create' : 'update') + ')');
             const raw = await (0, request_ts_1.requestObjectDevExecute)(isCreate
                 ? (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('objectMapping', 'create-rule')
-                : (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('objectMapping', 'update-rule'), mappingContent);
+                : (0, request_execute_command_paths_ts_1.getShareCliCommandPath)('objectMapping', 'update-rule'), updatedContent);
             const response = raw;
             if (response.success !== true || normalize_ts_1.default.normalizeString(normalize_ts_1.default.asString(response.code)) !== 'OK') {
                 logger_ts_1.loggerService.stopLoading();
                 throw new Error('object-mapping push failed: ' + (normalize_ts_1.default.normalizeText(response.message) || 'Unknown error'));
             }
             logger_ts_1.loggerService.stopLoading();
-            // Write back status
-            const latestMeta = await xmlMetadataManager.readXml('ObjectMapping', ruleApiName, {
-                objectApiName: checkedObjectApiName,
-            });
+            // 回写状态
+            const latestMeta = await xmlMetadataManager.readXml('ObjectMapping', ruleApiName);
             await xmlMetadataManager.writeXml('ObjectMapping', ruleApiName, latestMeta.content, {
-                objectApiName: checkedObjectApiName,
                 status: 'unchanged',
                 features: latestMeta.features,
                 extra: latestMeta.extra,
             });
             // post-pull
-            logger_ts_1.loggerService.startLoading('object-mapping push post-pull: ' + checkedObjectApiName);
+            logger_ts_1.loggerService.startLoading('object-mapping push post-pull');
             try {
-                const postPullResult = await (0, object_mapping_pull_ts_1.objectMappingPullService)(checkedObjectApiName, false, skipOverwriteConfirm);
+                const postPullResult = await (0, object_mapping_pull_ts_1.objectMappingPullService)({
+                    skipOverwriteConfirm,
+                });
                 errorMessages.push(...postPullResult.errorMessages);
             }
             finally {
                 logger_ts_1.loggerService.stopLoading();
             }
-            logger_ts_1.loggerService.info(`Object-mapping pushed: ${checkedObjectApiName}.${ruleApiName}`);
+            logger_ts_1.loggerService.info(`Object-mapping pushed: ${ruleApiName}`);
         }
         catch (error) {
-            errorMessages.push(`Object-mapping push failed: ${checkedObjectApiName}.${ruleApiName}: ${error}`);
+            errorMessages.push(`Object-mapping push failed: ${ruleApiName}: ${error}`);
         }
     }
     return {
-        objectApiName: checkedObjectApiName,
+        objectApiName: '',
         apiName: targetRuleApiNames.join(','),
         errorMessages,
     };
@@ -23516,11 +23647,7 @@ exports.objectMappingUpdateService = void 0;
 const normalize_ts_1 = __importDefault(__webpack_require__(9268));
 const index_ts_1 = __webpack_require__(9985);
 const xmlMetadataManager = new index_ts_1.XmlMetadataManager();
-const objectMappingUpdateService = async (objectApiName, data) => {
-    const checkedObjectApiName = normalize_ts_1.default.normalizeString(objectApiName);
-    if (!checkedObjectApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(checkedObjectApiName)) {
-        throw new Error('Invalid arguments: objectApiName is required.');
-    }
+const objectMappingUpdateService = async (data) => {
     const raw = normalize_ts_1.default.normalizeString(data);
     if (!raw) {
         throw new Error('Invalid arguments: data is required.');
@@ -23529,26 +23656,30 @@ const objectMappingUpdateService = async (objectApiName, data) => {
     if (!mappingData || typeof mappingData !== 'object' || Array.isArray(mappingData)) {
         throw new Error('data must be a JSON object.');
     }
-    const mappingApiName = normalize_ts_1.default.normalizeString(normalize_ts_1.default.asString(mappingData.api_name))
-        ?? normalize_ts_1.default.normalizeString(normalize_ts_1.default.asString(mappingData.apiName));
+    // 从 rule_list 中提取主规则的 rule_api_name 作为文件名
+    const ruleList = mappingData.rule_list;
+    const mainRule = ruleList?.find((r) => {
+        const master = r.master_rule_api_name;
+        return !master || master === '';
+    });
+    const mappingApiName = mainRule
+        ? (normalize_ts_1.default.normalizeString(mainRule.rule_api_name) ?? '')
+        : normalize_ts_1.default.normalizeString(mappingData.api_name)
+            ?? normalize_ts_1.default.normalizeString(mappingData.apiName)
+            ?? '';
     if (!mappingApiName || !/^[A-Za-z][A-Za-z0-9_]*$/.test(mappingApiName)) {
-        throw new Error('Invalid arguments: api_name or apiName is required in data.');
+        throw new Error('Invalid arguments: cannot determine apiName from data (need rule_list with main rule or api_name/apiName).');
     }
     const current = await xmlMetadataManager.readXml('ObjectMapping', mappingApiName, {
-        objectApiName: checkedObjectApiName,
         fields: ['content', 'status']
     });
     if (current.content === null || current.content === undefined) {
-        throw new Error(`Object-mapping metadata not found: ${checkedObjectApiName}.${mappingApiName}`);
+        throw new Error(`Object-mapping metadata not found: ${mappingApiName}`);
     }
     const filePath = await xmlMetadataManager.writeXml('ObjectMapping', mappingApiName, mappingData, {
-        objectApiName: checkedObjectApiName,
         status: current.status === 'new' ? 'new' : 'modified'
     });
-    return {
-        filePath,
-        errorMessages: []
-    };
+    return { filePath, errorMessages: [] };
 };
 exports.objectMappingUpdateService = objectMappingUpdateService;
 
@@ -42991,7 +43122,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"application/1d-interleaved-parityfec
 /***/ 8330
 (module) {
 
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@share-crm/sharedev-cli","version":"0.0.4-rc.21","private":false,"description":"sharedev command line tool","type":"module","main":"dist/sharedev.js","bin":{"sharedev":"./bin/cli.mjs"},"author":{"name":"sharecrm-npm"},"files":["dist","bin","README.md"],"scripts":{"build":"tsc --noEmit && webpack --config build/webpack/webpack.prod.cjs","build:debug":"tsc --noEmit && webpack --config build/webpack/webpack.debug.cjs","build:bin":"bun build --compile --target=bun-darwin-x64 src/cli.ts --outfile scripts/sharedev-darwin-x64 && bun build --compile --target=bun-darwin-arm64 src/cli.ts --outfile scripts/sharedev-darwin-arm64 && bun build --compile --target=bun-windows-x64 src/cli.ts --outfile scripts/sharedev-windows-x64.exe","build:all":"npm run build && npm run build:bin","dev":"tsc --noEmit --watch & webpack --config build/webpack/webpack.dev.cjs --watch","dev2":"node src/cli.ts","typecheck":"tsc --noEmit","prettier":"prettier --write ./src/**/*.ts","test":"vitest run","test:watch":"vitest","test:coverage":"vitest run --coverage"},"dependencies":{"@clack/prompts":"^1.1.0","@mariozechner/pi-coding-agent":"^0.62.0","axios":"~1.13.0","chalk":"^5.6.2","commander":"^14.0.1","extract-zip":"^2.0.1","fast-xml-parser":"^5.2.5","fs-extra":"^11.3.2","lodash-es":"^4.18.1","ora":"^9.3.0"},"devDependencies":{"@types/extract-zip":"^2.0.3","@types/fs-extra":"^11.0.4","@types/lodash-es":"^4.17.12","@types/node":"^24.3.0","@vitest/coverage-v8":"^4.1.8","ts-loader":"^9.5.4","typescript":"^5.9.2","vitest":"^3.2.6","webpack":"^5.101.3","webpack-cli":"^6.0.1","webpack-merge":"^6.0.1"},"packageManager":"pnpm@10.17.0"}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@share-crm/sharedev-cli","version":"0.0.4-rc.22","private":false,"description":"sharedev command line tool","type":"module","main":"dist/sharedev.js","bin":{"sharedev":"./bin/cli.mjs"},"author":{"name":"sharecrm-npm"},"files":["dist","bin","README.md"],"scripts":{"build":"tsc --noEmit && webpack --config build/webpack/webpack.prod.cjs","build:debug":"tsc --noEmit && webpack --config build/webpack/webpack.debug.cjs","build:bin":"bun build --compile --target=bun-darwin-x64 src/cli.ts --outfile scripts/sharedev-darwin-x64 && bun build --compile --target=bun-darwin-arm64 src/cli.ts --outfile scripts/sharedev-darwin-arm64 && bun build --compile --target=bun-windows-x64 src/cli.ts --outfile scripts/sharedev-windows-x64.exe","build:all":"npm run build && npm run build:bin","dev":"tsc --noEmit --watch & webpack --config build/webpack/webpack.dev.cjs --watch","dev2":"node src/cli.ts","typecheck":"tsc --noEmit","prettier":"prettier --write ./src/**/*.ts","test":"vitest run","test:watch":"vitest","test:coverage":"vitest run --coverage"},"dependencies":{"@clack/prompts":"^1.1.0","@mariozechner/pi-coding-agent":"^0.62.0","axios":"~1.13.0","chalk":"^5.6.2","commander":"^14.0.1","extract-zip":"^2.0.1","fast-xml-parser":"^5.2.5","fs-extra":"^11.3.2","lodash-es":"^4.18.1","ora":"^9.3.0"},"devDependencies":{"@types/extract-zip":"^2.0.3","@types/fs-extra":"^11.0.4","@types/lodash-es":"^4.17.12","@types/node":"^24.3.0","@vitest/coverage-v8":"^4.1.8","ts-loader":"^9.5.4","typescript":"^5.9.2","vitest":"^3.2.6","webpack":"^5.101.3","webpack-cli":"^6.0.1","webpack-merge":"^6.0.1"},"packageManager":"pnpm@10.17.0"}');
 
 /***/ }