@lark-apaas/miaoda-cli 0.1.3-alpha.67da0bb → 0.1.3-alpha.70f9b2d

package/dist/cli/handlers/db/audit.js

@@ -44,6 +44,8 @@ const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 const render_1 = require("../../../utils/render");
 const time_1 = require("../../../utils/time");
+const _operator_1 = require("../../../cli/handlers/db/_operator");
+const index_1 = require("../../../api/db/index");
 const VALID_RETENTION = new Set(['7d', '30d', '180d', '360d', 'forever']);
 async function handleDbAuditStatus(table, opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
@@ -198,25 +200,57 @@ async function handleDbAuditList(tables, opts) {
     // 后端管理（本质也是 ISO 时间），CLI 不再混用 cursor/since。
     const since = normalizeTime(opts.since, '--since');
     const until = normalizeTime(opts.until, '--until');
-    const result = await api.db.listAuditLog({
-        appId,
-        tables,
-        since,
-        until,
-        limit,
-        cursor: opts.cursor,
-        dbBranch: opts.env,
-    });
+    // 多表场景：dataloom 对"任一表不存在"是 fail-fast（typo 应立即可见，符合 PRD 单表语义），
+    // 但 PRD 多表语义是"其他表继续返回，底部汇总跳过情况"。CLI 在这里前置校验：用 getSchema
+    // 的 tableNames 过滤模式（dataloom 端内存过滤，不存在的表静默忽略，不报错）拿到存在的
+    // 表集合，本地 diff 出缺失表，再用过滤后的表去查 listAuditLog。单表场景跳过预校验。
+    const isMulti = tables.length > 1;
+    let queryTables = tables;
+    const localMissing = [];
+    if (isMulti) {
+        const schemaResp = await api.db.getSchema({
+            appId,
+            tableNames: tables.join(','),
+            dbBranch: opts.env,
+        });
+        const existing = new Set((0, index_1.flattenSchemaList)(schemaResp.schema).map((t) => t.name));
+        for (const t of tables) {
+            if (!existing.has(t))
+                localMissing.push(t);
+        }
+        queryTables = tables.filter((t) => existing.has(t));
+        if (queryTables.length === 0) {
+            throw new error_1.AppError('TABLE_NOT_FOUND', `None of the requested tables exist: ${localMissing.join(', ')}`, { next_actions: ['Run `miaoda db schema list` to see all tables.'] });
+        }
+    }
+    let result;
+    try {
+        result = await api.db.listAuditLog({
+            appId,
+            tables: queryTables,
+            since,
+            until,
+            limit,
+            cursor: opts.cursor,
+            dbBranch: opts.env,
+        });
+    }
+    catch (err) {
+        throw decorateAuditListError(err, tables);
+    }
     const visible = result.items;
-    const skipped = result.skipped;
+    // 服务端 skipped（audit 未启用，bare 名）+ CLI 本地探测 missing 合并；
+    // localMissing 自带 `(table not found)` 后缀，formatSkippedHint 透传渲染
+    const skipped = [...result.skipped, ...localMissing.map((t) => `${t} (table not found)`)];
     // PRD JSON：data 是数组，元素是事件对象（snake_case），分页信封 next_cursor / has_more
+    // operator 后端用 JSON 字符串内嵌 {id, name}，--json 输出还原成对象供下游消费
     if ((0, output_1.isJsonMode)()) {
         const items = visible.map((it) => ({
             event_id: it.eventId,
             event_time: it.eventTime,
             target_table: it.targetTable,
             type: it.type,
-            operator: it.operator,
+            operator: (0, _operator_1.parseOperator)(it.operator),
             summary: it.summary,
             // before/after 服务端是 JSON 字符串，反序列化回结构化对象供下游消费
             ...(it.before !== undefined ? { before: safeParseJson(it.before) } : {}),
@@ -224,7 +258,7 @@ async function handleDbAuditList(tables, opts) {
         }));
         (0, output_1.emitPaged)(items, result.nextCursor, result.hasMore);
         if (skipped.length > 0) {
-            process.stderr.write(`(${String(skipped.length)} table(s) skipped: ${skipped.join(', ')})\n`);
+            process.stderr.write(formatSkippedHint(skipped, tables.length) + '\n');
         }
         if (visible.length === 0)
             process.exitCode = 1;
@@ -233,7 +267,7 @@ async function handleDbAuditList(tables, opts) {
     if (visible.length === 0) {
         (0, output_1.emit)('No audit log entries found.');
         if (skipped.length > 0) {
-            process.stderr.write(`(${String(skipped.length)} table(s) skipped: ${skipped.join(', ')})\n`);
+            process.stderr.write(formatSkippedHint(skipped, tables.length) + '\n');
         }
         process.exitCode = 1;
         return;
@@ -247,12 +281,19 @@ async function handleDbAuditList(tables, opts) {
     const rows = visible.map((it) => {
         const eventTime = (0, render_1.formatTime)(it.eventTime, tty);
         // event_id 完整透传——PRD 截图里的 "..." 只是文档省略写法，不是 CLI 行为
-        const cells = [eventTime, it.type, it.eventId, it.operator || '—', it.summary];
+        // operator pretty 只展示 name；--json 上面已经走 parseOperator 输出 {id, name}
+        const cells = [
+            eventTime,
+            it.type,
+            it.eventId,
+            (0, _operator_1.parseOperator)(it.operator).name || '—',
+            it.summary,
+        ];
         return isMultiTable ? [it.targetTable, ...cells] : cells;
     });
     (0, output_1.emit)(tty ? (0, render_1.renderAlignedTable)(headers, rows) : (0, render_1.renderTsv)(headers, rows));
     if (skipped.length > 0) {
-        process.stderr.write(`(${String(skipped.length)} table(s) skipped: ${skipped.join(', ')})\n`);
+        process.stderr.write(formatSkippedHint(skipped, tables.length) + '\n');
     }
     if (result.hasMore && result.nextCursor) {
         process.stderr.write(`(more results; use --cursor '${result.nextCursor}')\n`);
@@ -278,6 +319,54 @@ function normalizeTime(input, flagName) {
         throw err;
     }
 }
+// PRD 41-48 行格式：`— Skipped 1 of 3 tables: orders (audit not enabled)`
+// 服务端 skipped 数组是 audit 未启用的表（bare 名）；上面 peel 循环拼出来的
+// "<name> (table not found)" 已经自带 reason，t.includes('(') 走原样透传，bare 名
+// 默认拼 "(audit not enabled)"。也兼容未来后端直接给带 reason 字符串的可能。
+function formatSkippedHint(skipped, totalRequested) {
+    const items = skipped.map((t) => (t.includes('(') ? t : `${t} (audit not enabled)`)).join(', ');
+    return `— Skipped ${String(skipped.length)} of ${String(totalRequested)} tables: ${items}`;
+}
+// audit list 后端错误码加 hint：
+//   - k_dl_000005  表不存在 → 文案与 hint 对齐 `db schema get` 的统一格式
+//   - k_dl_1300040 单表 audit 未启用 → 指引 enable
+//   - k_dl_1300041 多表全部未启用 → 指引 status
+function decorateAuditListError(err, tables) {
+    if (!(err instanceof error_1.AppError))
+        return err;
+    if (err.code === 'DB_API_k_dl_000005') {
+        // 不复用 dataloom 透传的 message（旧版/新版文案不一致：`table [x] not exist` /
+        // `table x not found`），统一改写成跟 schema get 一样的 `Table '<name>' does not exist`，
+        // 单表传 tables[0]，多表场景兜底用解析到的 raw message 里第一个表名。
+        const t = tables.length > 0 ? tables[0] : (extractMissingTable(err.message) ?? '<table>');
+        return new error_1.AppError('TABLE_NOT_FOUND', `Table '${t}' does not exist`, {
+            next_actions: [`Did you mean another table? Run "miaoda db schema list" to see all tables.`],
+        });
+    }
+    if (err.code === 'DB_API_k_dl_1300040') {
+        const t = tables[0] ?? '<table>';
+        return new error_1.AppError(err.code, err.message, {
+            next_actions: [`Enable with: miaoda db audit enable ${t}`],
+        });
+    }
+    if (err.code === 'DB_API_k_dl_1300041') {
+        return new error_1.AppError(err.code, err.message, {
+            next_actions: ['Check audit status with: miaoda db audit status'],
+        });
+    }
+    return err;
+}
+// extractMissingTable 从 dataloom 原始文案里抠表名兜底。dataloom 端有两种格式：
+//   - 旧版：`Table [foo] doesn't exist` / `table [foo] not exist`
+//   - 新版（本次 commits）：`table foo not found`
+// 都失配时返 null，调用方走 `<table>` 占位。
+function extractMissingTable(msg) {
+    const bracket = /\[([^\]]+)\]/.exec(msg);
+    if (bracket)
+        return bracket[1];
+    const m = /table\s+([\w.]+)\s+not (?:exist|found)/i.exec(msg);
+    return m ? m[1] : null;
+}
 // 服务端 before/after 是 JSON 字符串透传，CLI JSON 输出再反序列化回对象，
 // 给下游 jq 等工具消费。失败时透传原始字符串避免数据丢失。
 function safeParseJson(s) {

package/dist/cli/handlers/db/changelog.js

@@ -40,11 +40,12 @@ const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 const render_1 = require("../../../utils/render");
 const time_1 = require("../../../utils/time");
+const _operator_1 = require("../../../cli/handlers/db/_operator");
 function toRow(it) {
     return {
         change_id: it.changeId,
         changed_at: it.changedAt,
-        operator: it.operator,
+        operator: (0, _operator_1.parseOperator)(it.operator),
         target_table: it.targetTable,
         change_type: it.changeType,
         summary: it.summary,
@@ -74,10 +75,17 @@ async function handleDbChangelog(opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
     const since = normalizeTime(opts.since, '--since');
     const until = normalizeTime(opts.until, '--until');
+    // --change-id 是精确单条查询，CLI 透传给后端；后端若暂未支持过滤，CLI 端
+    // 兜底翻页找命中项，保证 PRD 「最多返回一条」的语义稳定。
+    const trimmed = opts.changeId?.trim();
+    const changeId = trimmed !== undefined && trimmed !== '' ? trimmed : undefined;
     const allItems = [];
     let cursor = opts.cursor;
     let lastCursor = null;
     let lastHasMore = false;
+    // 指定 --change-id 时强制开 --all，确保即使后端不识别 changeId 过滤参数，
+    // CLI 也能翻完所有页找到目标记录（changelog 默认按时间倒序，一般在前几页）。
+    const allMode = opts.all === true || changeId !== undefined;
     // --all：循环到 hasMore=false；否则只拉一页
     // 没传 --all 时翻页由调用方自己用 --cursor 串
     for (;;) {
@@ -86,6 +94,7 @@ async function handleDbChangelog(opts) {
             table: opts.table,
             since,
             until,
+            changeId,
             limit: opts.limit,
             cursor,
             dbBranch: opts.env,
@@ -93,14 +102,28 @@ async function handleDbChangelog(opts) {
         allItems.push(...page.items);
         lastCursor = page.nextCursor;
         lastHasMore = page.hasMore;
-        if (!opts.all || !page.hasMore || !page.nextCursor)
+        if (!allMode || !page.hasMore || !page.nextCursor)
             break;
         cursor = page.nextCursor;
+        // 后端命中过滤返单条时提前退出，免得继续无意义翻页
+        if (changeId !== undefined && allItems.some((it) => it.changeId === changeId))
+            break;
+    }
+    // CLI 端兜底过滤：把 changeId 匹配的项筛出来。后端如果已支持，列表本身就只有
+    // 0 或 1 条，filter 是恒等运算；后端未支持时通过翻页 + 此过滤拿到精确单条。
+    if (changeId !== undefined) {
+        const matched = allItems.filter((it) => it.changeId === changeId);
+        allItems.length = 0;
+        allItems.push(...matched);
+        // 精确查询语义：永远当作"已取完"，不再透出分页 cursor / has_more
+        lastCursor = null;
+        lastHasMore = false;
     }
     if ((0, output_1.isJsonMode)()) {
         const rows = allItems.map(toRow);
-        // --all 时已经把所有页合一起返，has_more=false / next_cursor=null
-        if (opts.all) {
+        // --all 或 --change-id 时已经把所有页合一起返，has_more=false / next_cursor=null。
+        // PRD: --change-id 即使没命中（rows 长度 0）也保持 data 为数组。
+        if (allMode) {
             (0, output_1.emitPaged)((0, output_1.snakeCaseKeys)(rows), null, false);
         }
         else {
@@ -109,22 +132,29 @@ async function handleDbChangelog(opts) {
         return;
     }
     if (allItems.length === 0) {
-        (0, output_1.emit)('No DDL changes found.');
+        // --change-id 没命中时单独报错，便于 agent 区分"无变更"和"ID 不存在"
+        if (changeId !== undefined) {
+            (0, output_1.emit)(`No DDL change with id=${changeId} found.`);
+        }
+        else {
+            (0, output_1.emit)('No DDL changes found.');
+        }
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
     // PRD: change_id / changed_at / operator / target_table / change_type / summary
     const headers = ['change_id', 'changed_at', 'operator', 'target_table', 'change_type', 'summary'];
+    // pretty 渲染只展示 operator.name（兼容 PRD 原 string 形态）；--json 走 toRow 输出完整对象
     const rows = allItems.map((it) => [
         it.changeId,
         (0, render_1.formatTime)(it.changedAt, tty),
-        it.operator || '—',
+        (0, _operator_1.parseOperator)(it.operator).name || '—',
         it.targetTable || '—',
         it.changeType,
         it.summary || '—',
     ]);
     (0, output_1.emit)(tty ? (0, render_1.renderAlignedTable)(headers, rows) : (0, render_1.renderTsv)(headers, rows));
-    if (!opts.all && lastHasMore && lastCursor) {
+    if (!allMode && lastHasMore && lastCursor) {
         process.stderr.write(`(more results; use --cursor ${lastCursor} or --all)\n`);
     }
 }

package/dist/cli/handlers/db/migration.js

@@ -32,14 +32,10 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleDbMigrationInit = handleDbMigrationInit;
 exports.handleDbMigrationDiff = handleDbMigrationDiff;
 exports.handleDbMigrationApply = handleDbMigrationApply;
-const node_readline_1 = __importDefault(require("node:readline"));
 const api = __importStar(require("../../../api/index"));
 const shared_1 = require("../../../cli/commands/shared");
 const colors_1 = require("../../../utils/colors");
@@ -47,17 +43,17 @@ const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 const poll_1 = require("../../../utils/poll");
 const render_1 = require("../../../utils/render");
+const spinner_1 = require("../../../utils/spinner");
+const _destructive_1 = require("../../../cli/handlers/db/_destructive");
 async function handleDbMigrationInit(opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
-    // 不可逆操作，TTY 默认要求 y/N；--yes 跳过
-    if (!opts.yes && !(0, output_1.isJsonMode)()) {
-        // 文案对齐 PRD：先讲不可逆，再问是否初始化；syncData 时追加一句而不是塞进同一句话
-        const suffix = opts.syncData ? ' (existing data will be copied to dev)' : '';
-        const ok = await confirm(`? This action is irreversible. Initialize multi-env (dev / online)${suffix}? (y/N) `);
-        if (!ok) {
-            (0, output_1.emit)('Aborted.');
-            return;
-        }
+    // 不可逆操作：--yes 直接放行；非 TTY 抛 DESTRUCTIVE_REQUIRES_CONFIRM；TTY 交互确认。
+    // 不再用 isJsonMode() 做门 —— 见 _destructive.ts 注释。
+    const suffix = opts.syncData ? ' (existing data will be copied to dev)' : '';
+    const ok = await (0, _destructive_1.confirmDestructive)(`? This action is irreversible. Initialize multi-env (dev / online)${suffix}? (y/N) `, opts.yes);
+    if (!ok) {
+        (0, output_1.emit)('Aborted.');
+        return;
     }
     let result;
     try {
@@ -88,12 +84,16 @@ async function handleDbMigrationInit(opts) {
 async function handleDbMigrationDiff(opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
     let result;
+    const stopSpinner = (0, spinner_1.startSpinner)('Previewing migration diff (dev → online)');
     try {
         result = await api.db.migrate({ appId, dryRun: true });
     }
     catch (err) {
         throw decorateMigrationError(err);
     }
+    finally {
+        stopSpinner();
+    }
     // PRD: diff 在无待发布变更时报错带 hint，而不是渲染空列表
     if (result.changes.length === 0) {
         throw new error_1.AppError('DB_API_k_dl_1300035', `No pending changes between ${result.from} and ${result.to}`, {
@@ -106,15 +106,20 @@ async function handleDbMigrationDiff(opts) {
 }
 async function handleDbMigrationApply(opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
-    // TTY 下先 diff 给用户审；--yes 直接打到 online
-    if (!opts.yes && !(0, output_1.isJsonMode)()) {
+    // --yes 跳过预览 + 确认；否则 TTY 拉 diff 给用户审，非 TTY 直接拒（避免无意义 dry-run RPC）
+    if (opts.yes !== true) {
+        (0, _destructive_1.assertDestructiveAllowedInTty)(opts.yes);
         let preview;
+        const stopSpinner = (0, spinner_1.startSpinner)('Previewing migration diff (dev → online)');
         try {
             preview = await api.db.migrate({ appId, dryRun: true });
         }
         catch (err) {
             throw decorateMigrationError(err);
         }
+        finally {
+            stopSpinner();
+        }
         if (preview.changes.length === 0) {
             // PRD 文案 + hint
             throw new error_1.AppError('DB_API_k_dl_1300035', `No pending changes between ${preview.from} and ${preview.to}`, {
@@ -123,8 +128,10 @@ async function handleDbMigrationApply(opts) {
                 ],
             });
         }
-        renderDiff(preview);
-        const ok = await confirm(`? Apply ${String(preview.changes.length)} change(s) to ${preview.to}? (y/N) `);
+        // --json 模式跳过 pretty diff 渲染（污染 stdout envelope），但仍要求 confirm
+        if (!(0, output_1.isJsonMode)())
+            renderDiff(preview);
+        const ok = await (0, _destructive_1.askYesNo)(`? Apply ${String(preview.changes.length)} change(s) to ${preview.to}? (y/N) `);
         if (!ok) {
             (0, output_1.emit)('Aborted.');
             return;
@@ -145,6 +152,7 @@ async function handleDbMigrationApply(opts) {
     const taskId = result.taskId;
     const final = await (0, poll_1.pollUntilDone)({
         label: 'migration apply',
+        spinnerLabel: 'Applying migration (dev → online)',
         intervalMs: 1000,
         fetch: () => api.db.getMigrationStatus({ appId, taskId }),
         isDone: (cur) => {
@@ -224,12 +232,3 @@ function decorateMigrationError(err) {
             return err;
     }
 }
-async function confirm(prompt) {
-    const rl = node_readline_1.default.createInterface({ input: process.stdin, output: process.stderr });
-    return new Promise((resolve) => {
-        rl.question(prompt, (answer) => {
-            rl.close();
-            resolve(answer.trim().toLowerCase() === 'y');
-        });
-    });
-}