weaver-e10-builder 1.6.10 → 1.6.11

package/dist/commands/report-validate.js

@@ -1,10 +1,20 @@
 import { readFileSync } from 'node:fs';
 import { withReport } from './report.js';
-import { getBaseInfo, getReportDevInfo, saveReportDevInfo } from '../services/report/reports.js';
+import { getBaseInfo, getReportDevInfo, listReports, saveReportDevInfo } from '../services/report/reports.js';
+import { applyFieldBindings, scanFieldBindings } from '../services/report/field-binding.js';
+import { foreignRefs, planDatasetIdRemap } from '../services/report/dataset-ids.js';
+import { fixEmptyDatasets, inspectEmptyDatasets } from '../services/report/empty-dataset.js';
+import { assertAllowedDatasetIds, buildBlueprint, verifyBlueprintReadback, } from '../services/report/blueprint.js';
 import { listDatasets, fieldsKeyOf } from '../services/report/dataset.js';
 import { checkCellLimit, validateScrollPage, validateShowLocation, validateSnapshotPatch, validateWorkbookGridline, validateSheetPropGridLine, } from '../services/report/guard.js';
-import { mergeWorkbookSafe, fieldToCell, fieldStyle } from '../services/report/safe-save.js';
-import { checkCrossFilters, checkTableNameContract, readCrossFilters, verifyAll, verifyFieldBind, } from '../services/report/verify.js';
+import { buildWorkbookFromFields, fieldStyle, fieldToCell, mergeWorkbookSafe, } from '../services/report/safe-save.js';
+import { constCell } from '../services/report/workbook.js';
+import { checkFormulaParents } from '../services/report/formula-parent.js';
+import { checkScene, detectScenes, jumpHref, rulesText } from '../services/report/scene.js';
+import { checkPreaggregate } from '../services/report/analyze.js';
+import { renameDataset } from '../services/report/dataset.js';
+import { saveReportWithCacheConfig } from '../services/report/reports.js';
+import { cellMeta, checkAggregateAnchors, checkCrossFilters, checkTableNameContract, readCrossFilters, verifyAll, verifyFieldBind, } from '../services/report/verify.js';
 import { hrefCatalog, mapNaturalPhrase, normalizeFont, normalizeGroupType, normalizeHref, normalizeNumberFormat, normalizeTransform, styleCatalog, validateBaseMeta, validateCellPatch, validateConditionRule, FORMAT_CATALOG, GROUP_TYPE_ALIAS, } from '../services/report/validate.js';
 function readInput(raw) {
     if (raw.inline)
@@ -26,6 +36,15 @@ function printValidation(r, json, payload) {
     if (!r.ok)
         process.exitCode = 1;
 }
+/** Field 绑定补丁的可读描述（dry-run 与结果共用）。 */
+function patchText(p) {
+    const seg = [];
+    if (p.text)
+        seg.push(`text ${JSON.stringify(p.text.from)}→${JSON.stringify(p.text.to)}`);
+    if (p.tableName)
+        seg.push(`tableName ${JSON.stringify(p.tableName.from)}→${JSON.stringify(p.tableName.to)}`);
+    return seg.join('  |  ');
+}
 /** 取报表的字段记录 + 应用 id。 */
 async function loadDev(http, reportId, appIdArg) {
     const base = await getBaseInfo(http, reportId);
@@ -377,6 +396,32 @@ export function registerReportValidateCommands(report, program) {
                 process.exitCode = 1;
         });
     });
+    verify
+        .command('anchors')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .description('汇总格锚点体检：三件套（纵向/汇总/分组 none）与左父格是否直指行维度入口格')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { fields } = await loadDev(http, reportId, raw.appId);
+            const items = checkAggregateAnchors(fields);
+            const aggs = fields.filter((f) => {
+                const m = cellMeta(f);
+                return ['sum', 'avg', 'max', 'min'].includes(m.countType.toLowerCase()) || m.displayType.toLowerCase() === 'count';
+            }).length;
+            if (json) {
+                console.log(JSON.stringify({ aggregateCells: aggs, items }, null, 2));
+            }
+            else {
+                console.log(`汇总格 ${aggs} 个`);
+                items.forEach((e) => console.log(`[FAIL] ${e.message}`));
+                if (!items.length)
+                    console.log('PASS — 汇总格三件套与锚点均合规');
+            }
+            if (items.length)
+                process.exitCode = 1;
+        });
+    });
     verify
         .command('meta')
         .argument('<reportId>', '报表 ID')
@@ -622,6 +667,332 @@ export function registerReportValidateCommands(report, program) {
                 process.exitCode = 2;
         });
     });
+    fix
+        .command('field-binding')
+        .argument('[reportId]', '报表 ID；省略则扫描该应用内全部报表')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .option('--table-name <name>', '强制指定单元格 tableName（默认按数据集推导）')
+        .option('--apply', '真的落库')
+        .description('回补 Field 格的字段显示名(text)与数据集回显名(tableName)；换数据集 / heal 后必跑')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId, async (http, json) => {
+            const opts = { forceTableName: raw.tableName ? String(raw.tableName) : undefined };
+            // ── 应用级批量 ──
+            if (!reportId) {
+                const rows = await listReports(http, raw.appId);
+                const out = [];
+                for (const r of rows) {
+                    const rid = String(r.id || '');
+                    if (!rid)
+                        continue;
+                    try {
+                        const scan = await scanFieldBindings(http, rid, raw.appId, opts);
+                        out.push({
+                            reportId: rid,
+                            name: r.name || '',
+                            fieldCells: scan.fieldCells,
+                            patches: scan.patches,
+                            blankConst: scan.blankConst,
+                        });
+                    }
+                    catch (e) {
+                        out.push({ reportId: rid, name: r.name || '', error: e.message });
+                    }
+                }
+                const dirty = out.filter((x) => !x.error && x.patches.length);
+                const errors = out.filter((x) => x.error);
+                if (json && !raw.apply) {
+                    console.log(JSON.stringify({ total: out.length, damaged: dirty.length, rows: out }, null, 2));
+                    return;
+                }
+                console.log(`应用内共 ${out.length} 张报表，回显受损 ${dirty.length} 张。`);
+                for (const x of out) {
+                    if (x.error) {
+                        console.log(`  ✗ ${x.name || x.reportId} (${x.reportId}) —— 扫描失败：${x.error}`);
+                        continue;
+                    }
+                    if (!x.patches.length) {
+                        console.log(`  ✓ ${x.name || x.reportId} (${x.reportId}) —— Field ${x.fieldCells} 格回显正常`);
+                        continue;
+                    }
+                    console.log(`  ✗ ${x.name || x.reportId} (${x.reportId}) —— ${x.patches.length} 格待补`);
+                    x.patches.slice(0, 4).forEach((p) => console.log(`      [${p.at}] ${patchText(p)}`));
+                    if (x.patches.length > 4)
+                        console.log(`      … 另有 ${x.patches.length - 4} 格`);
+                }
+                if (!raw.apply) {
+                    console.log('（预演，未落库。加 --apply 执行）');
+                    return;
+                }
+                if (!dirty.length) {
+                    console.log('无需修复。');
+                    return;
+                }
+                let okN = 0;
+                for (const x of dirty) {
+                    try {
+                        const scan = await scanFieldBindings(http, x.reportId, raw.appId, opts);
+                        const res = await applyFieldBindings(http, scan);
+                        if (res.ok)
+                            okN += 1;
+                        console.log(`  ${res.ok ? '✓' : '✗'} ${x.name || x.reportId} —— ${scan.patches.length} 格回补；` +
+                            `fields ${res.cells}/${res.target}，Formula ${res.formula}，残留不合规 ${res.residual}`);
+                    }
+                    catch (e) {
+                        console.log(`  ✗ ${x.name || x.reportId} —— ${e.message}`);
+                    }
+                }
+                console.log(`完成：${okN}/${dirty.length} 张修复通过。`);
+                if (okN !== dirty.length || errors.length)
+                    process.exitCode = 2;
+                return;
+            }
+            // ── 单张 ──
+            const scan = await scanFieldBindings(http, reportId, raw.appId, opts);
+            if (json && !raw.apply) {
+                console.log(JSON.stringify({ reportId, fieldCells: scan.fieldCells, patches: scan.patches }, null, 2));
+                return;
+            }
+            if (!scan.patches.length) {
+                console.log(`Field 格 ${scan.fieldCells} 个，text/tableName 均已合规，无需修复。`);
+                if (scan.blankConst.length) {
+                    console.log(`（旁证：Const 格文字为空 ${scan.blankConst.length} 个：${scan.blankConst.slice(0, 8).join(', ')}）`);
+                }
+                return;
+            }
+            console.log(`报表 ${reportId}：Field 格 ${scan.fieldCells} 个，待补 ${scan.patches.length} 个：`);
+            scan.patches.forEach((p) => console.log(`  [${p.at}] ${patchText(p)}`));
+            if (scan.blankConst.length) {
+                console.log(`（旁证：Const 格文字为空 ${scan.blankConst.length} 个：${scan.blankConst.slice(0, 8).join(', ')}）`);
+            }
+            if (!raw.apply) {
+                console.log('（预演，未落库。加 --apply 执行）');
+                return;
+            }
+            const res = await applyFieldBindings(http, scan);
+            console.log(`回读：fields ${res.cells}/${res.target}  ${JSON.stringify(res.counts)}  ` +
+                `残留不合规 Field=${res.residual}  Formula=${res.formula}`);
+            if (res.ok) {
+                console.log(`已落库 —— ${scan.patches.length} 格回补完成。`);
+            }
+            else {
+                console.error('回读校验未通过：请检查该报表是否被其它操作同时改写。');
+                process.exitCode = 2;
+            }
+        });
+    });
+    fix
+        .command('dataset-id')
+        .argument('[reportId]', '报表 ID；省略则扫描该应用内全部报表')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .option('--apply', '真的落库')
+        .description('把外来数据集 id 换回本报表同 sourceId 的 id（设计器字段下拉空白时用）')
+        .action(async (reportId, raw) => {
+        const ownOf = async (http, rid) => {
+            const rows = await listDatasets(http, rid, raw.appId);
+            return rows.map((d) => ({
+                id: String(d.id),
+                sourceId: String(d.sourceId || ''),
+                name: d.name,
+                type: d.sourceType,
+            }));
+        };
+        const applyOne = async (http, rid) => {
+            const dev = await getReportDevInfo(http, rid);
+            const fields = dev.fields || [];
+            const own = await ownOf(http, rid);
+            const plan = planDatasetIdRemap(fields, own);
+            return { dev, fields, own, plan };
+        };
+        await withReport(program, raw.appId, async (http, json) => {
+            // ── 应用级批量 ──
+            if (!reportId) {
+                const rows = await listReports(http, raw.appId);
+                const out = [];
+                for (const r of rows) {
+                    const rid = String(r.id || '');
+                    if (!rid)
+                        continue;
+                    try {
+                        const { plan } = await applyOne(http, rid);
+                        out.push({
+                            reportId: rid,
+                            name: r.name || '',
+                            changes: plan.changes.length,
+                            unresolved: plan.unresolved,
+                            conflicts: plan.conflicts,
+                        });
+                    }
+                    catch (e) {
+                        out.push({ reportId: rid, name: r.name || '', error: e.message });
+                    }
+                }
+                const dirty = out.filter((x) => !x.error && x.changes);
+                if (json && !raw.apply) {
+                    console.log(JSON.stringify({ total: out.length, dirty: dirty.length, rows: out }, null, 2));
+                    return;
+                }
+                console.log(`应用内共 ${out.length} 张报表，含外来数据集 id 的 ${dirty.length} 张。`);
+                out.forEach((x) => {
+                    if (x.error)
+                        console.log(`  ✗ ${x.name || x.reportId} —— ${x.error}`);
+                    else if (!x.changes)
+                        console.log(`  ✓ ${x.name || x.reportId} —— 无外来 id`);
+                    else
+                        console.log(`  ✗ ${x.name || x.reportId} —— ${x.changes} 处引用待换` +
+                            (x.unresolved.length ? `，${x.unresolved.length} 处无法解析` : '') +
+                            (x.conflicts.length ? `，${x.conflicts.length} 处冲突` : ''));
+                });
+                if (!raw.apply) {
+                    console.log('（预演，未落库。加 --apply 执行）');
+                    return;
+                }
+                if (!dirty.length) {
+                    console.log('无需修复。');
+                    return;
+                }
+                let okN = 0;
+                for (const x of dirty) {
+                    try {
+                        const { dev, fields, plan } = await applyOne(http, x.reportId);
+                        if (plan.unresolved.length || plan.conflicts.length) {
+                            console.log(`  ✗ ${x.name || x.reportId} —— 有无法解析/冲突的引用，跳过`);
+                            continue;
+                        }
+                        const wb = buildWorkbookFromFields(plan.next, (dev.sheetProps || [])[0] || {});
+                        const base = await getBaseInfo(http, x.reportId);
+                        const fresh = await getReportDevInfo(http, x.reportId);
+                        await saveReportDevInfo(http, {
+                            appId: raw.appId,
+                            reportId: x.reportId,
+                            name: String(base.name || ''),
+                            workbook: wb,
+                            designKey: String(fresh.designKey || ''),
+                            groupId: String(base.groupId ?? '-1'),
+                            nameLabelId: String(base.nameLabelId ?? '-1'),
+                        });
+                        const after = await getReportDevInfo(http, x.reportId);
+                        const own = await ownOf(http, x.reportId);
+                        const left = foreignRefs(after.fields || [], own);
+                        if (left.length) {
+                            console.log(`  ✗ ${x.name || x.reportId} —— 回读仍有 ${left.length} 处外来 id`);
+                        }
+                        else {
+                            okN++;
+                            console.log(`  ✓ ${x.name || x.reportId} —— ${plan.changes.length} 处已换`);
+                        }
+                    }
+                    catch (e) {
+                        console.log(`  ✗ ${x.name || x.reportId} —— ${e.message}`);
+                    }
+                }
+                console.log(`完成：${okN}/${dirty.length} 张修复通过。`);
+                if (okN !== dirty.length)
+                    process.exitCode = 2;
+                return;
+            }
+            // ── 单张 ──
+            const { dev, fields, own, plan } = await applyOne(http, reportId);
+            if (json && !raw.apply) {
+                console.log(JSON.stringify({ reportId, ...plan, next: undefined }, null, 2));
+                return;
+            }
+            if (!plan.changes.length && !plan.unresolved.length) {
+                console.log(`PASS —— ${fields.length} 格里没有外来数据集 id。`);
+                return;
+            }
+            console.log(`报表 ${reportId}：${plan.refCount} 处数据集引用，外来 ${plan.changes.length} 处` +
+                (plan.unresolved.length ? `，无法解析 ${plan.unresolved.length} 处` : '') +
+                (plan.conflicts.length ? `，冲突 ${plan.conflicts.length} 处` : ''));
+            plan.changes.forEach((c) => console.log(`  [(${c.x},${c.y})${c.text ? ' ' + c.text : ''}] ${c.key}: ${c.from} → ${c.to}`));
+            plan.unresolved.forEach((u) => console.log(`  [?] (${u.x},${u.y}) ${u.key}=${u.id} —— ${u.reason}`));
+            plan.conflicts.forEach((c) => console.log(`  [!] ${c.foreignId} 同时映射到 ${c.a} 与 ${c.b}（(${c.x},${c.y})）`));
+            if (plan.unresolved.length || plan.conflicts.length) {
+                console.error('存在无法确定目标数据集的引用，已跳过落库。');
+                process.exitCode = 3;
+                return;
+            }
+            if (!raw.apply) {
+                console.log('（预演，未落库。加 --apply 执行）');
+                return;
+            }
+            const wb = buildWorkbookFromFields(plan.next, (dev.sheetProps || [])[0] || {});
+            const base = await getBaseInfo(http, reportId);
+            const fresh = await getReportDevInfo(http, reportId);
+            await saveReportDevInfo(http, {
+                appId: raw.appId,
+                reportId,
+                name: String(base.name || ''),
+                workbook: wb,
+                designKey: String(fresh.designKey || ''),
+                groupId: String(base.groupId ?? '-1'),
+                nameLabelId: String(base.nameLabelId ?? '-1'),
+            });
+            const after = await getReportDevInfo(http, reportId);
+            const left = foreignRefs(after.fields || [], own);
+            const af = after.fields || [];
+            const mismatch = af.filter((f) => f.cellType === 'Field' && String(f.fieldKey || '').split('.')[0] !== String(f.dataSetId)).length;
+            console.log(`回读：fields ${af.length}/${fields.length}  外来 id ${left.length} 处  fieldKey 首段≠dataSetId ${mismatch}`);
+            if (!left.length && !mismatch) {
+                console.log(`VERIFY OK —— ${plan.changes.length} 处引用已换回本报表数据集。`);
+            }
+            else {
+                console.error('VERIFY FAIL');
+                process.exitCode = 2;
+            }
+        });
+    });
+    fix
+        .command('empty-dataset')
+        .argument('<reportId>', '报表 ID')
+        .requiredOption('--app-id <id>', '应用 ID')
+        .option('--dataset-id <id>', '只处理指定数据集（默认全部空壳）')
+        .option('--source-type <type>', '重新挂载用的 sourceType', 'eteams')
+        .option('--source-group <g>', '重新挂载用的 sourceGroup', 'sql')
+        .option('--table-name <name>', '单元格 tableName（默认取数据集名）')
+        .option('--keep-old', '不删除旧空壳')
+        .option('--apply', '真的落库')
+        .description('治理「挂上了但字段为 0」的空壳数据集（SQL 视图被按业务模块挂载）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId, async (http, json) => {
+            const ins = await inspectEmptyDatasets(http, reportId, raw.appId);
+            if (json && !raw.apply) {
+                console.log(JSON.stringify(ins, null, 2));
+                return;
+            }
+            console.log(`数据集 ${ins.rows.length} 条：`);
+            ins.rows.forEach((d) => console.log(`  [${d.rawType}] ${d.name}  id=${d.id}  group=${d.sourceGroup || '-'}  字段=${d.fieldCount}  引用格=${d.refs}` +
+                (d.fieldCount === 0 ? '  ← 空壳' : '')));
+            const targets = raw.datasetId ? ins.empties.filter((d) => d.id === String(raw.datasetId)) : ins.empties;
+            if (!targets.length) {
+                console.log('\n无空壳数据集，无需修复。');
+                return;
+            }
+            console.log(`\n将处理 ${targets.length} 条空壳（按 sourceType=${raw.sourceType} / sourceGroup=${raw.sourceGroup} 重新挂载）`);
+            if (!raw.apply) {
+                console.log('[dry-run] 未落库。确认后加 --apply。');
+                return;
+            }
+            const res = await fixEmptyDatasets(http, reportId, raw.appId, {
+                datasetId: raw.datasetId,
+                sourceType: raw.sourceType,
+                sourceGroup: raw.sourceGroup,
+                tableName: raw.tableName,
+                keepOld: !!raw.keepOld,
+            });
+            res.targets.forEach((t) => console.log(`  ✓ ${t.oldId} → ${t.newId}：重映射 ${t.cells} 格，新数据集字段 ${t.fields}`));
+            res.removed.forEach((r) => console.log(`  ${r.ok ? '✓' : 'SKIP'} 删除旧空壳 ${r.datasetId}${r.reason ? `：${r.reason}` : ''}`));
+            const ok = res.cellsAfter === res.cellsBefore && res.staleLeft === 0 && res.mismatch === 0;
+            console.log(`回读：${res.cellsAfter} 格（落库前 ${res.cellsBefore}）；旧 id 残留 ${res.staleLeft}；fieldKey 不自洽 ${res.mismatch}`);
+            if (ok) {
+                console.log('结论：通过。');
+            }
+            else {
+                console.error('结论：未通过。');
+                process.exitCode = 3;
+            }
+        });
+    });
     fix
         .command('freeze')
         .argument('<reportId>', '报表 ID')
@@ -715,5 +1086,697 @@ export function registerReportValidateCommands(report, program) {
                 process.exitCode = 2;
         });
     });
+    // ── 公式格父格（锚点） ──────────────────────────────────
+    const formula = report
+        .command('formula')
+        .description('公式格父格：check 只读体检 / align 左父格对齐 / top 上父格定点修正');
+    const fparent = formula.command('parent').description('公式格左父格：check 只读 / align 对齐');
+    fparent
+        .command('check')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .description('检查公式格左父格是否等于被引用字段的区域根格（不一致 exit 3）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { fields } = await loadDev(http, reportId, raw.appId);
+            const rows = checkFormulaParents(fields);
+            const bad = rows.filter((r) => r.issues.length);
+            if (json) {
+                console.log(JSON.stringify({ formulas: rows.length, issues: bad }, null, 2));
+            }
+            else {
+                console.log(`公式格 ${rows.length} 个`);
+                bad.forEach((r) => {
+                    console.log(`[FAIL] (${r.cell[0]},${r.cell[1]})`);
+                    r.issues.forEach((m) => console.log(`   ${m}`));
+                });
+                if (!bad.length)
+                    console.log('PASS — 公式格父格与被引用字段一致');
+            }
+            if (bad.length)
+                process.exitCode = 3;
+        });
+    });
+    fparent
+        .command('align')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .option('--apply', '真的落库')
+        .description('把公式格左父格对齐到被引用字段的区域根格，并把 refX/refY 归 -1')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { base, appId, fields } = await loadDev(http, reportId, raw.appId);
+            const rows = checkFormulaParents(fields);
+            const targets = rows.filter((r) => r.expected && (r.current[0] !== r.expected[0] || r.current[1] !== r.expected[1] || r.refX !== -1 || r.refY !== -1));
+            const manual = rows.filter((r) => !r.expected && r.issues.length);
+            if (json) {
+                console.log(JSON.stringify({ toFix: targets, manual }, null, 2));
+            }
+            else {
+                targets.forEach((r) => console.log(`(${r.cell[0]},${r.cell[1]}) 左父格 (${r.current[0]},${r.current[1]}) → (${r.expected[0]},${r.expected[1]})`));
+                manual.forEach((r) => console.log(`[需人工] (${r.cell[0]},${r.cell[1]})：${r.issues.join('；')}`));
+                if (!targets.length)
+                    console.log('没有需要对齐的公式格。');
+            }
+            if (!raw.apply || !targets.length) {
+                if (!json && targets.length)
+                    console.log('（预演，未落库。加 --apply 执行）');
+                return;
+            }
+            const patch = new Map(targets.map((r) => [`${r.cell[0]},${r.cell[1]}`, r.expected]));
+            const wb = mergeWorkbookSafe({ fields }, {
+                patchFn: (w) => {
+                    for (const sheet of Object.values(w.sheets || {})) {
+                        const dt = sheet?.data?.dataTable || {};
+                        for (const [key, [ex, ey]] of patch) {
+                            const [x, y] = key.split(',').map(Number);
+                            const ct = dt[String(x)]?.[String(y)]?.style?.cellType;
+                            if (!ct)
+                                continue;
+                            ct.leftX = ex;
+                            ct.leftY = ey;
+                            ct.refX = -1;
+                            ct.refY = -1;
+                        }
+                    }
+                },
+            });
+            const fresh = await getReportDevInfo(http, reportId);
+            await saveReportDevInfo(http, {
+                appId,
+                reportId,
+                name: String(base.name || ''),
+                workbook: wb,
+                designKey: String(fresh.designKey || ''),
+                groupId: String(base.groupId ?? '0'),
+                nameLabelId: String(base.nameLabelId ?? '-1'),
+            });
+            const after = checkFormulaParents(((await getReportDevInfo(http, reportId)).fields || []));
+            const still = after.filter((r) => r.issues.length);
+            console.log(still.length ? `⚠️ 回读仍有 ${still.length} 个公式格不一致` : `已对齐 ${targets.length} 个公式格`);
+            if (still.length)
+                process.exitCode = 2;
+        });
+    });
+    formula
+        .command('top')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .option('--set-top-parent <pair...>', '定点修正上父格：x,y=topX,topY（可重复）')
+        .option('--apply', '真的落库')
+        .description('上父格定点修正（交叉表「合计列 → 列头格」场景）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const pairs = (raw.setTopParent || []);
+            const patch = new Map();
+            for (const p of pairs) {
+                const m = String(p).match(/^(-?\d+),(-?\d+)=(-?\d+),(-?\d+)$/);
+                if (!m)
+                    throw new Error(`--set-top-parent 需为 x,y=topX,topY，收到「${p}」`);
+                patch.set(`${Number(m[1])},${Number(m[2])}`, [Number(m[3]), Number(m[4])]);
+            }
+            if (!patch.size)
+                throw new Error('至少要给一个 --set-top-parent "x,y=topX,topY"');
+            const { base, appId, fields } = await loadDev(http, reportId, raw.appId);
+            const missing = [...patch.keys()].filter((k) => !fields.some((f) => `${Number(f.x)},${Number(f.y)}` === k));
+            if (missing.length) {
+                console.error(`这些坐标上没有单元格：${missing.join(' ')}`);
+                process.exitCode = 1;
+                return;
+            }
+            if (json)
+                console.log(JSON.stringify({ patch: Object.fromEntries(patch) }, null, 2));
+            else
+                patch.forEach(([tx, ty], k) => console.log(`${k} 上父格 → (${tx},${ty})`));
+            if (!raw.apply) {
+                if (!json)
+                    console.log('（预演，未落库。加 --apply 执行）');
+                return;
+            }
+            const wb = mergeWorkbookSafe({ fields }, {
+                patchFn: (w) => {
+                    for (const sheet of Object.values(w.sheets || {})) {
+                        const dt = sheet?.data?.dataTable || {};
+                        for (const [key, [tx, ty]] of patch) {
+                            const [x, y] = key.split(',').map(Number);
+                            const ct = dt[String(x)]?.[String(y)]?.style?.cellType;
+                            if (!ct)
+                                continue;
+                            ct.topX = tx;
+                            ct.topY = ty;
+                        }
+                    }
+                },
+            });
+            const fresh = await getReportDevInfo(http, reportId);
+            await saveReportDevInfo(http, {
+                appId,
+                reportId,
+                name: String(base.name || ''),
+                workbook: wb,
+                designKey: String(fresh.designKey || ''),
+                groupId: String(base.groupId ?? '0'),
+                nameLabelId: String(base.nameLabelId ?? '-1'),
+            });
+            console.log(`已落库 ${patch.size} 个上父格`);
+        });
+    });
+    // ── 左父格定点修正 ──────────────────────────────────────
+    fix
+        .command('parent')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .option('--set-parent <pair...>', '定点修正左父格：x,y=leftX,leftY（可重复）')
+        .option('--apply', '真的落库')
+        .description('左父格定点修正（默认只读预演）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const pairs = (raw.setParent || []);
+            const patch = new Map();
+            for (const p of pairs) {
+                const m = String(p).match(/^(-?\d+),(-?\d+)=(-?\d+),(-?\d+)$/);
+                if (!m)
+                    throw new Error(`--set-parent 需为 x,y=leftX,leftY，收到「${p}」`);
+                patch.set(`${Number(m[1])},${Number(m[2])}`, [Number(m[3]), Number(m[4])]);
+            }
+            if (!patch.size)
+                throw new Error('至少要给一个 --set-parent "x,y=leftX,leftY"');
+            const { base, appId, fields } = await loadDev(http, reportId, raw.appId);
+            const missing = [...patch.keys()].filter((k) => !fields.some((f) => `${Number(f.x)},${Number(f.y)}` === k));
+            if (missing.length) {
+                console.error(`这些坐标上没有单元格：${missing.join(' ')}`);
+                process.exitCode = 1;
+                return;
+            }
+            if (json)
+                console.log(JSON.stringify({ patch: Object.fromEntries(patch) }, null, 2));
+            else
+                patch.forEach(([lx, ly], k) => console.log(`${k} 左父格 → (${lx},${ly})`));
+            if (!raw.apply) {
+                if (!json)
+                    console.log('（预演，未落库。加 --apply 执行）');
+                return;
+            }
+            const wb = mergeWorkbookSafe({ fields }, {
+                patchFn: (w) => {
+                    for (const sheet of Object.values(w.sheets || {})) {
+                        const dt = sheet?.data?.dataTable || {};
+                        for (const [key, [lx, ly]] of patch) {
+                            const [x, y] = key.split(',').map(Number);
+                            const ct = dt[String(x)]?.[String(y)]?.style?.cellType;
+                            if (!ct)
+                                continue;
+                            ct.leftX = lx;
+                            ct.leftY = ly;
+                        }
+                    }
+                },
+            });
+            const fresh = await getReportDevInfo(http, reportId);
+            await saveReportDevInfo(http, {
+                appId,
+                reportId,
+                name: String(base.name || ''),
+                workbook: wb,
+                designKey: String(fresh.designKey || ''),
+                groupId: String(base.groupId ?? '0'),
+                nameLabelId: String(base.nameLabelId ?? '-1'),
+            });
+            console.log(`已落库 ${patch.size} 个左父格`);
+        });
+    });
+    // ── 数据集 id 归属体检（只读） ──────────────────────────
+    report
+        .command('check-ids')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .description('只读：单元格里的数据集 id 是否都来自本报表（外来 id 会让设计器字段下拉空白）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { appId, fields } = await loadDev(http, reportId, raw.appId);
+            const datasets = await listDatasets(http, reportId, appId);
+            const own = datasets.map((d) => ({
+                id: d.id,
+                sourceId: String(d.sourceId || ''),
+                name: d.name,
+                type: d.sourceType,
+            }));
+            const issues = [];
+            for (const r of foreignRefs(fields, own)) {
+                issues.push(`(${r.x},${r.y}) ${r.key} ${r.id} 不属于本报表`);
+            }
+            for (const f of fields) {
+                if (f.cellType !== 'Field')
+                    continue;
+                const dsId = String(f.dataSetId ?? '');
+                const first = String(f.fieldKey ?? '').split('.')[0];
+                if (dsId && first && first !== dsId) {
+                    issues.push(`(${f.x},${f.y}) fieldKey 首段 ${first} ≠ dataSetId ${dsId}`);
+                }
+            }
+            if (json) {
+                console.log(JSON.stringify({ datasets: datasets.map((d) => d.id), issues }, null, 2));
+            }
+            else {
+                console.log(`本报表数据集 ${datasets.length} 个：${datasets.map((d) => `${d.name}(${d.id})`).join('、')}`);
+                issues.forEach((m) => console.log(`[FAIL] ${m}`));
+                if (!issues.length)
+                    console.log('PASS — 所有单元格的数据集 id 都来自本报表');
+            }
+            if (issues.length)
+                process.exitCode = 3;
+        });
+    });
+    // ── 从蓝图整表重建 ──────────────────────────────────────
+    const rebuild = report.command('rebuild').description('整表重建（灾后救援）');
+    rebuild
+        .command('from-blueprint')
+        .requiredOption('--blueprint <file>', '蓝图 JSON 文件')
+        .option('--apply', '真的落库')
+        .option('--allow-ids <ids>', '额外允许的数据集 id（逗号分隔）')
+        .description('按蓝图重建整张报表；落库前跑克隆纪律与数据集 id 白名单门禁')
+        .action(async (raw) => {
+        const bp = JSON.parse(readFileSync(raw.blueprint, 'utf-8').replace(/^/, ''));
+        await withReport(program, String(bp.appId || ''), async (http, json) => {
+            const built = await buildBlueprint(http, bp);
+            const extra = String(raw['allowIds'] || '')
+                .split(',')
+                .map((s) => s.trim())
+                .filter(Boolean);
+            const allowedIds = built.allowedIds.concat(extra);
+            // 落库前硬门禁：任何白名单外的数据集 id 都拒绝
+            const bad = assertAllowedDatasetIds(built.fields, allowedIds);
+            if (bad.length) {
+                console.error(`数据集 id 门禁未通过（${bad.length} 处白名单外引用）：`);
+                bad.slice(0, 12).forEach((b) => console.error(`  ✗ ${b}`));
+                process.exitCode = 3;
+                return;
+            }
+            const summary = {
+                reportId: bp.reportId,
+                appId: bp.appId,
+                sheets: built.sheets.map((s) => ({ name: s.name, cells: s.fields.length })),
+                counts: built.counts,
+                datasets: built.datasets.map((d) => ({ key: d.key, id: d.id, name: d.tableName })),
+                allowedIds,
+                cells: built.fields.length,
+            };
+            if (json && !raw.apply) {
+                console.log(JSON.stringify(summary, null, 2));
+                return;
+            }
+            console.log(`蓝图重建 报表 ${bp.reportId}（appId=${bp.appId}）：${built.fields.length} 格 ${JSON.stringify(built.counts)}`);
+            console.log('克隆纪律自检：0 坐标冲突 / 0 META 残留 / 0 旧 id ✅');
+            console.log(`数据集白名单：${allowedIds.join(' / ')}`);
+            if (bp.styleSource)
+                console.log(`样式/键模板来源：${bp.styleSource.reportId}`);
+            for (const s of built.sheets) {
+                console.log(`  sheet「${s.name}」${s.fields.length} 格`);
+                s.fields.slice(0, 40).forEach((f) => {
+                    const extraTxt = f.cellType === 'Field'
+                        ? ` ← ${f.fieldKey}`
+                        : f.cellType === 'Formula'
+                            ? ` = ${f.cellText}`
+                            : ` "${f.cellText}"`;
+                    console.log(`    [${Number(f.x) + 1}行${String.fromCharCode(65 + Number(f.y))}列] ${f.cellType} left=(${f.leftX},${f.leftY})${extraTxt}`);
+                });
+                if (s.fields.length > 40)
+                    console.log(`    … 另有 ${s.fields.length - 40} 格`);
+            }
+            const dev = await getReportDevInfo(http, bp.reportId);
+            if (!raw.apply) {
+                console.log('\n[dry-run] 未落库。确认后加 --apply。');
+                console.log(`当前线上该表格数：${(dev.fields || []).length}（蓝图将替换为 ${built.fields.length}）`);
+                return;
+            }
+            // 逐 sheet 重建后合并（不同 sheet 同坐标互不覆盖）
+            const workbook = { version: '11.1.0', sheetCount: built.sheets.length, newTabVisible: false, tabEditable: false, sheets: {} };
+            built.sheets.forEach((s, i) => {
+                const sp = (dev.sheetProps || [])[s.index] || (dev.sheetProps || [])[0] || {};
+                const wb = buildWorkbookFromFields(s.fields, { ...sp, name: s.name });
+                const sheetObj = Object.values(wb.sheets)[0];
+                sheetObj.name = s.name;
+                sheetObj.index = i;
+                workbook.sheets[s.name] = sheetObj;
+            });
+            const base = await getBaseInfo(http, bp.reportId);
+            await saveReportDevInfo(http, {
+                appId: String(bp.appId),
+                reportId: String(bp.reportId),
+                name: String(bp.name || base.name || ''),
+                workbook,
+                designKey: String(dev.designKey || ''),
+                groupId: String(base.groupId ?? '-1'),
+                nameLabelId: String(base.nameLabelId ?? '-1'),
+            });
+            const after = await getReportDevInfo(http, bp.reportId);
+            const check = verifyBlueprintReadback(after.fields || [], built);
+            console.log(`\n回读：fields ${(after.fields || []).length}/${built.fields.length}  ${JSON.stringify(check.counts)}`);
+            if (check.ok) {
+                console.log(`VERIFY OK —— 蓝图 ${built.fields.length} 格已落库并回读一致。`);
+            }
+            else {
+                console.error('VERIFY FAIL');
+                check.issues.forEach((m) => console.error(`  ✗ ${m}`));
+                process.exitCode = 2;
+            }
+        });
+    });
+    // ── 数据预聚合 ──────────────────────────────────────────
+    const preagg = report.command('preagg').description('数据预聚合（解析优化）：check 只读 / disable 关闭');
+    preagg
+        .command('check')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .description('判定该报表是否应关闭预聚合（只读）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { fields } = await loadDev(http, reportId, raw.appId);
+            const r = checkPreaggregate([], fields);
+            if (json)
+                console.log(JSON.stringify(r, null, 2));
+            else {
+                console.log(`建议 dataPreAgg = ${r.dataPreAgg}`);
+                r.reasons.forEach((m) => console.log(`  · ${m}`));
+                if (r.dataPreAgg)
+                    console.log('未命中阻断条件，可保持开启。');
+            }
+            if (!r.dataPreAgg)
+                process.exitCode = 2;
+        });
+    });
+    preagg
+        .command('disable')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .option('--apply', '真的落库')
+        .description('关闭预聚合（写 sheetConfig dataPreAgg=false）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { base, appId, dev, fields } = await loadDev(http, reportId, raw.appId);
+            if (!raw.apply) {
+                console.log('将关闭预聚合：sheetConfig = {"dataPreAgg":false,"simpleList":false}');
+                console.log('（预演，未落库。加 --apply 执行）');
+                return;
+            }
+            const wb = mergeWorkbookSafe({ ...dev, fields });
+            const datasets = await listDatasets(http, reportId, appId);
+            await saveReportWithCacheConfig(http, {
+                appId,
+                reportId,
+                name: String(base.name || ''),
+                workbook: wb,
+                datasets,
+                sheetConfig: JSON.stringify({ dataPreAgg: false, simpleList: false }),
+            });
+            console.log('已关闭预聚合。');
+        });
+    });
+    // ── 数据集名去重后缀 ────────────────────────────────────
+    fix
+        .command('dataset-name')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .option('--apply', '真的落库')
+        .description('去掉数据集名里重复拼的类型后缀（X(业务模块)(业务模块) → X(业务模块)）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { appId } = await loadDev(http, reportId, raw.appId);
+            const datasets = await listDatasets(http, reportId, appId);
+            const plan = datasets
+                .map((d) => {
+                const fixed = String(d.name || '').replace(/(\([^()]+\))\1+$/, '$1');
+                return { id: d.id, before: d.name, after: fixed };
+            })
+                .filter((p) => p.before !== p.after);
+            if (json)
+                console.log(JSON.stringify({ plan, applied: !!raw.apply }, null, 2));
+            else {
+                plan.forEach((p) => console.log(`${p.id}  ${p.before} → ${p.after}`));
+                if (!plan.length)
+                    console.log('没有重复后缀的数据集名。');
+            }
+            if (!raw.apply) {
+                if (!json && plan.length)
+                    console.log('（预演，未落库。加 --apply 执行）');
+                return;
+            }
+            for (const p of plan)
+                await renameDataset(http, p.id, p.after);
+            console.log(`已改名 ${plan.length} 个数据集。`);
+        });
+    });
+    // ── 分支场景 A/B/C ──────────────────────────────────────
+    const scene = report.command('scene').description('分支场景：同 sheet 多报表 / 自增序号 / 单元格跳转 Sheet');
+    scene
+        .command('rules')
+        .description('打印三个场景的判定条件与强制配置')
+        .action(() => console.log(rulesText()));
+    scene
+        .command('detect')
+        .requiredOption('--req <file>', '需求文本文件（UTF-8）')
+        .description('从需求文本识别属于哪个场景（只读，不落库）')
+        .action((raw) => {
+        const text = readFileSync(String(raw.req), 'utf8');
+        const r = detectScenes(text);
+        if (!r.scenes.length) {
+            console.log('未识别到 A/B/C 场景。');
+            return;
+        }
+        r.scenes.forEach((s) => console.log(`场景 ${s}：${r.evidence[s].join('；')}`));
+    });
+    const parseSeqCells = (v) => String(v || '')
+        .split(';')
+        .map((p) => p.trim())
+        .filter(Boolean)
+        .map((p) => {
+        const [x, y] = p.split(',').map(Number);
+        if (!Number.isFinite(x) || !Number.isFinite(y))
+            throw new Error(`--seq-cells 需为 "x,y;x,y"，收到「${p}」`);
+        return [x, y];
+    });
+    const parseJumpCells = (v) => String(v || '')
+        .split(';')
+        .map((p) => p.trim())
+        .filter(Boolean)
+        .map((p) => {
+        const [xy, n] = p.split('=');
+        const [x, y] = String(xy).split(',').map(Number);
+        const sheetNo = Number(n);
+        if (!Number.isFinite(x) || !Number.isFinite(y) || !Number.isFinite(sheetNo)) {
+            throw new Error(`--jump-cells 需为 "x,y=N"（N 为 sheet 序号，从 1 起），收到「${p}」`);
+        }
+        return [x, y, sheetNo];
+    });
+    scene
+        .command('check')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .option('--scene <s>', '只查某一个场景（A/B/C）；缺省全查')
+        .option('--seq-cells <cells>', '序号格坐标 "x,y;x,y"（场景 B）')
+        .option('--jump-cells <cells>', '跳转格 "x,y=N"（场景 C，N 为 sheet 序号）')
+        .description('场景体检（只读）：公共父格 / 序号格 / 跳转链接')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { fields } = await loadDev(http, reportId, raw.appId);
+            const scenes = raw.scene ? [String(raw.scene).toUpperCase()] : ['A', 'B', 'C'];
+            const items = scenes.flatMap((s) => checkScene(fields, s, {
+                reportId,
+                seqCells: parseSeqCells(raw.seqCells),
+                jumpCells: parseJumpCells(raw.jumpCells),
+            }));
+            const errors = items.filter((i) => i.level === 'error');
+            if (json)
+                console.log(JSON.stringify({ scenes, items }, null, 2));
+            else {
+                items.forEach((i) => console.log(`[${i.level === 'error' ? 'FAIL' : 'WARN'}] ${i.message}`));
+                if (!errors.length)
+                    console.log('PASS — 已检查场景均无阻断问题');
+            }
+            if (errors.length)
+                process.exitCode = 1;
+        });
+    });
+    scene
+        .command('apply')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .requiredOption('--scene <s>', '场景 A/B/C')
+        .option('--at <x,y>', '场景 A 公共父格坐标（默认 0,0）')
+        .option('--anchor <cells>', '场景 A 需要挂到公共父格的块锚点 "x,y;x,y"')
+        .option('--seq-cells <cells>', '场景 B 序号格 "x,y;x,y"')
+        .option('--jump-cells <cells>', '场景 C 跳转格 "x,y=N"')
+        .option('--base <url>', '场景 C 基础地址（缺省走相对路径）')
+        .option('--open-type <t>', '场景 C 打开方式：blank（默认）/ self / jsscript')
+        .option('--apply', '真的落库')
+        .description('按场景写入配置（默认只读预演）')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const s = String(raw.scene).toUpperCase();
+            if (!['A', 'B', 'C'].includes(s))
+                throw new Error('--scene 只能是 A / B / C');
+            const { base, appId, fields } = await loadDev(http, reportId, raw.appId);
+            const at = raw.at
+                ? String(raw.at).split(',').map(Number)
+                : [0, 0];
+            const anchors = String(raw.anchor || '')
+                .split(';')
+                .map((p) => p.trim())
+                .filter(Boolean)
+                .map((p) => p.split(',').map(Number));
+            const seqCells = parseSeqCells(raw.seqCells);
+            const jumpCells = parseJumpCells(raw.jumpCells);
+            if (s === 'B' && !seqCells.length)
+                throw new Error('场景 B 需要 --seq-cells "x,y"');
+            if (s === 'C' && !jumpCells.length)
+                throw new Error('场景 C 需要 --jump-cells "x,y=N"');
+            if (json) {
+                console.log(JSON.stringify({ scene: s, at, anchors, seqCells, jumpCells, applied: !!raw.apply }, null, 2));
+            }
+            else {
+                if (s === 'A') {
+                    console.log(`公共父格 (${at[0]},${at[1]})；块锚点 ${anchors.length ? anchors.map((a) => `(${a[0]},${a[1]})`).join(' ') : '（未指定）'}`);
+                }
+                else if (s === 'B') {
+                    console.log(`序号格：${seqCells.map((c) => `(${c[0]},${c[1]})`).join(' ')}`);
+                }
+                else {
+                    jumpCells.forEach(([x, y, n]) => console.log(`(${x},${y}) → ${jumpHref(reportId, n, raw.base)}`));
+                }
+            }
+            if (!raw.apply) {
+                if (!json)
+                    console.log('（预演，未落库。加 --apply 执行）');
+                return;
+            }
+            const wb = mergeWorkbookSafe({ fields }, {
+                patchFn: (w) => {
+                    for (const sheet of Object.values(w.sheets || {})) {
+                        const dt = sheet?.data?.dataTable || {};
+                        if (s === 'A') {
+                            // 公共父格：坐标上没有就新建一个 Const
+                            if (!dt[String(at[0])])
+                                dt[String(at[0])] = {};
+                            const atCell = dt[String(at[0])][String(at[1])];
+                            if (atCell?.style?.cellType) {
+                                atCell.style.cellType.isActiveParent = true;
+                                atCell.style.cellType.leftX = -1;
+                                atCell.style.cellType.leftY = -1;
+                            }
+                            else {
+                                const created = constCell('统计区', undefined, { left: [-1, -1] });
+                                created.style.cellType.isActiveParent = true;
+                                dt[String(at[0])][String(at[1])] = created;
+                            }
+                            for (const [ax, ay] of anchors) {
+                                const ct = dt[String(ax)]?.[String(ay)]?.style?.cellType;
+                                if (!ct)
+                                    continue;
+                                ct.leftX = at[0];
+                                ct.leftY = at[1];
+                            }
+                        }
+                        if (s === 'B') {
+                            for (const [x, y] of seqCells) {
+                                const ct = dt[String(x)]?.[String(y)]?.style?.cellType;
+                                if (!ct)
+                                    continue;
+                                ct.typeName = 'SequenceNumberCellType';
+                                ct.cellType = 'SequenceNumber';
+                                ct.cellText = '{seq}';
+                                ct.expandType = 'Vertical';
+                                ct.displayType = 'Group';
+                                ct.groupType = null;
+                            }
+                        }
+                        if (s === 'C') {
+                            for (const [x, y, n] of jumpCells) {
+                                const ct = dt[String(x)]?.[String(y)]?.style?.cellType;
+                                if (!ct)
+                                    continue;
+                                const href = jumpHref(reportId, n, raw.base);
+                                ct.pcHreflink = href;
+                                ct.h5Hreflink = href;
+                                ct.openType = String(raw.openType || 'blank');
+                            }
+                        }
+                    }
+                },
+            });
+            const fresh = await getReportDevInfo(http, reportId);
+            await saveReportDevInfo(http, {
+                appId,
+                reportId,
+                name: String(base.name || ''),
+                workbook: wb,
+                designKey: String(fresh.designKey || ''),
+                groupId: String(base.groupId ?? '0'),
+                nameLabelId: String(base.nameLabelId ?? '-1'),
+            });
+            const after = ((await getReportDevInfo(http, reportId)).fields || []);
+            const items = checkScene(after, s, { reportId, seqCells, jumpCells });
+            const errors = items.filter((i) => i.level === 'error');
+            errors.forEach((e) => console.log(`[FAIL] ${e.message}`));
+            console.log(errors.length ? `⚠️ 回读仍有 ${errors.length} 处问题` : `场景 ${s} 已落库并通过回读校验`);
+            if (errors.length)
+                process.exitCode = 2;
+        });
+    });
+    // ── 网格原样打印（只读） ────────────────────────────────
+    const dump = report.command('dump').description('只读：原样打印单元格网格，看清坐标与空缺');
+    dump
+        .command('cells')
+        .argument('<reportId>', '报表 ID')
+        .option('--app-id <id>', '应用 ID')
+        .description('按行打印每个格子的类型与内容，并标出空缺')
+        .action(async (reportId, raw) => {
+        await withReport(program, raw.appId || '', async (http, json) => {
+            const { fields } = await loadDev(http, reportId, raw.appId);
+            if (!fields.length) {
+                console.log('报表没有任何单元格。');
+                return;
+            }
+            const cellText = (f) => {
+                const meta = cellMeta(f);
+                if (f.cellType === 'Formula')
+                    return `=${meta.cellText || ''}`;
+                return String(meta.cellText || f.text || '');
+            };
+            const maxX = Math.max(...fields.map((f) => Number(f.x)));
+            const maxY = Math.max(...fields.map((f) => Number(f.y)));
+            const at = new Map(fields.map((f) => [`${Number(f.x)},${Number(f.y)}`, f]));
+            if (json) {
+                console.log(JSON.stringify({
+                    rows: maxX + 1,
+                    cols: maxY + 1,
+                    cells: fields.map((f) => ({
+                        x: Number(f.x),
+                        y: Number(f.y),
+                        type: f.cellType,
+                        text: cellText(f),
+                    })),
+                }, null, 2));
+                return;
+            }
+            const gaps = [];
+            for (let x = 0; x <= maxX; x++) {
+                const parts = [];
+                for (let y = 0; y <= maxY; y++) {
+                    const f = at.get(`${x},${y}`);
+                    if (!f) {
+                        parts.push(`${y}:·`);
+                        gaps.push(`(${x},${y})`);
+                        continue;
+                    }
+                    const kind = String(f.cellType || '').slice(0, 3);
+                    parts.push(`${y}:${kind}|${cellText(f)}`);
+                }
+                console.log(`行 ${x}  ${parts.join('  ')}`);
+            }
+            console.log(`\n共 ${fields.length} 格，网格 ${maxX + 1} 行 × ${maxY + 1} 列`);
+            if (gaps.length)
+                console.log(`空缺 ${gaps.length} 处：${gaps.slice(0, 20).join(' ')}${gaps.length > 20 ? ' …' : ''}`);
+        });
+    });
 }
 //# sourceMappingURL=report-validate.js.map