@lark-apaas/miaoda-cli 0.1.3-alpha.4bf312e → 0.1.3-alpha.7d9ebe6

package/dist/api/file/parsers.js

@@ -41,8 +41,9 @@ function parseAttachment(att) {
     const downloadUrl = str(att.downloadURL);
     if (downloadUrl)
         info.download_url = downloadUrl;
-    // uploaded_by 从 createdBy.name 映射（后端返 {userID, name, email, ...}，空代表匿名）
-    const uploader = str(att.createdBy?.name);
+    // uploaded_by 输出 {id, name} 对象：后端 createdBy: {userID, name, email, ...}，
+    // 任一非空都建对象；JSON 用对象、pretty 渲染只取 name。
+    const uploader = toUploaderRef(att.createdBy);
     if (uploader)
         info.uploaded_by = uploader;
     return info;
@@ -61,8 +62,18 @@ function parseHead(data, filePath) {
     const downloadUrl = str(outer.downloadURL);
     if (downloadUrl)
         info.download_url = downloadUrl;
-    const uploader = str(outer.createdBy?.name);
+    const uploader = toUploaderRef(outer.createdBy);
     if (uploader)
         info.uploaded_by = uploader;
     return info;
 }
+/** 把后端 UserRef 归一成 CLI 暴露的 {id, name}；id / name 全空时返 undefined 略过字段。 */
+function toUploaderRef(user) {
+    if (!user)
+        return undefined;
+    const id = str(user.userID);
+    const name = str(user.name);
+    if (id === "" && name === "")
+        return undefined;
+    return { id, name };
+}

package/dist/cli/commands/db/index.js

@@ -246,7 +246,7 @@ Examples:
   $ miaoda db changelog --table users --since 2026-04-01
   $ miaoda db changelog --limit 5
 
-  # JSON 输出包含完整 statement
+  # --json 输出包含完整 statement
   $ miaoda db changelog --limit 1 --json
   {
     "data": [{
@@ -296,9 +296,26 @@ Examples:
   Enabled at:  2026-04-01 08:00:00
    Retention:  30d
 
-  # JSON
+  # --json（全部表）
   $ miaoda db audit status --json
+  {
+    "data": [
+      {"table": "users", "enabled": true, "enabled_at": "2026-04-01T08:00:00Z", "retention": "30d"},
+      {"table": "orders", "enabled": false, "enabled_at": null, "retention": null},
+      {"table": "products", "enabled": true, "enabled_at": "2026-03-15T10:30:00Z", "retention": "forever"}
+    ]
+  }
+
+  # --json（单表）
   $ miaoda db audit status users --json
+  {
+    "data": {
+      "table": "users",
+      "enabled": true,
+      "enabled_at": "2026-04-01T08:00:00Z",
+      "retention": "30d"
+    }
+  }
 `);
     auditCmd
         .command("enable")
@@ -324,8 +341,19 @@ Examples:
   $ miaoda db audit enable orders --retention 180d
   $ miaoda db audit enable orders --retention forever
 
-  # JSON
+  # non-TTY
+  $ miaoda db audit enable orders | cat
+  OK Audit enabled for table 'orders' (retention: 7d)
+
+  # --json
   $ miaoda db audit enable orders --retention 180d --json
+  {
+    "data": {
+      "table": "orders",
+      "enabled": true,
+      "retention": "180d"
+    }
+  }
 
   # 报错：已经开启
   $ miaoda db audit enable orders
@@ -352,8 +380,18 @@ Examples:
   $ miaoda db audit disable orders
   ✓ Audit disabled for table 'orders'
 
-  # JSON
+  # non-TTY
+  $ miaoda db audit disable orders | cat
+  OK Audit disabled for table 'orders'
+
+  # --json
   $ miaoda db audit disable orders --json
+  {
+    "data": {
+      "table": "orders",
+      "enabled": false
+    }
+  }
 
   # 报错：未开启
   $ miaoda db audit disable orders
@@ -390,8 +428,23 @@ Examples:
   # 按时间范围
   $ miaoda db audit list users --since 2026-04-14 --limit 10
 
-  # JSON（含完整 details / before / after）
+  # --json（含完整 details / before / after）
   $ miaoda db audit list users --limit 1 --json
+  {
+    "data": [{
+      "event_id": "01525416B44F87001509F20CD000000002",
+      "event_time": "2026-04-15T10:30:00Z",
+      "target_table": "users",
+      "type": "UPDATE",
+      "operator": "alice",
+      "details": {
+        "before": {"id": "ef4db805-...", "age": 28},
+        "after":  {"id": "ef4db805-...", "age": 29}
+      }
+    }],
+    "next_cursor": null,
+    "has_more": false
+  }
 
   # 报错：单表未开启
   $ miaoda db audit list orders
@@ -437,9 +490,19 @@ Examples:
   $ miaoda db migration init --sync-data --yes
   ✓ Multi-env initialized, data synced to dev
 
-  # JSON
+  # non-TTY
+  $ miaoda db migration init --yes | cat
+  OK Multi-env initialized (dev / online)
+
+  # --json
   $ miaoda db migration init --yes --json
-  {"data": {"status": "initialized", "environments": ["dev", "online"], "data_synced": false}}
+  {
+    "data": {
+      "status": "initialized",
+      "environments": ["dev", "online"],
+      "data_synced": false
+    }
+  }
 
   # 报错：已经初始化过
   $ miaoda db migration init
@@ -462,8 +525,18 @@ Examples:
     ALTER TABLE users ADD COLUMN avatar_url text;
     CREATE INDEX idx_users_avatar ON users(avatar_url);
 
-  # JSON
+  # --json
   $ miaoda db migration diff --json
+  {
+    "data": {
+      "from": "dev",
+      "to": "online",
+      "changes": [
+        {"type": "ALTER_TABLE",  "table": "users", "statement": "ALTER TABLE users ADD COLUMN avatar_url text;"},
+        {"type": "CREATE_INDEX", "table": "users", "statement": "CREATE INDEX idx_users_avatar ON users(avatar_url);"}
+      ]
+    }
+  }
 
   # 报错：无待发布变更
   $ miaoda db migration diff
@@ -500,9 +573,20 @@ Examples:
   $ miaoda db migration apply --yes
   ✓ Applied dev → online (2 changes)
 
-  # JSON
+  # non-TTY
+  $ miaoda db migration apply --yes | cat
+  OK Applied dev -> online (2 changes)
+
+  # --json
   $ miaoda db migration apply --yes --json
-  {"data": {"status": "applied", "from": "dev", "to": "online", "changes_applied": 2}}
+  {
+    "data": {
+      "status": "applied",
+      "from": "dev",
+      "to": "online",
+      "changes_applied": 2
+    }
+  }
 
   # 报错：无待发布变更
   $ miaoda db migration apply
@@ -555,8 +639,19 @@ Examples:
   orders	table will be restored (was dropped at 10:25:00)
   estimated_time	30
 
-  # JSON
+  # --json
   $ miaoda db recovery diff 2026-04-15T10:00:00Z --json
+  {
+    "data": {
+      "target": "2026-04-15T10:00:00Z",
+      "tables_affected": 2,
+      "changes": [
+        {"table": "users",  "inserted": 3, "deleted": 1, "modified": 5},
+        {"table": "orders", "action": "restore_table", "dropped_at": "2026-04-15T10:25:00Z"}
+      ],
+      "estimated_seconds": 30
+    }
+  }
 
   # 无变更（目标时间点与当前状态一致）
   $ miaoda db recovery diff 2026-04-15T14:00:00Z
@@ -568,6 +663,7 @@ Examples:
   $ miaoda db recovery diff 2026-04-05T10:00:00Z
   Error: Timestamp is outside the recoverable window
     hint: Current recoverable window: 2026-04-09T12:00:00Z ~ 2026-04-16T12:00:00Z
+          (limited by last migration apply at 2026-04-09T12:00:00Z)
 
   # 时间格式错误
   $ miaoda db recovery diff 2026/04/15
@@ -598,9 +694,22 @@ Examples:
 
   # --yes 跳过确认
   $ miaoda db recovery apply 2026-04-15T10:00:00Z --yes
+  ✓ Database restored to 2026-04-15T10:00:00Z (2 tables affected, 30s elapsed)
+
+  # non-TTY
+  $ miaoda db recovery apply 2026-04-15T10:00:00Z --yes | cat
+  OK Database restored to 2026-04-15T10:00:00Z (2 tables affected, 30s elapsed)
 
-  # JSON
+  # --json
   $ miaoda db recovery apply 2026-04-15T10:00:00Z --yes --json
+  {
+    "data": {
+      "status": "restored",
+      "target": "2026-04-15T10:00:00Z",
+      "tables_affected": 2,
+      "elapsed_seconds": 30
+    }
+  }
 
   # 超出可恢复窗口
   $ miaoda db recovery apply 2026-04-05T10:00:00Z
@@ -611,7 +720,7 @@ Examples:
   # 并发冲突（已有恢复任务在执行）
   $ miaoda db recovery apply 2026-04-15T10:00:00Z
   Error: Another recovery is already in progress
-    hint: Wait for the current recovery to finish.
+    hint: Wait for the current recovery to finish. Started at 2026-04-16T12:30:00Z.
 `);
     // ── quota ──
     dbCmd
@@ -629,7 +738,7 @@ Examples:
        Tables:  3
         Views:  10
 
-  # JSON
+  # --json
   $ miaoda db quota --json
   {
     "data": {

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

@@ -143,10 +143,10 @@ async function handleDbAuditEnable(table, opts) {
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
-    const prefix = tty ? "✓" : "OK";
     // c.highlight 内部按 TTY/NO_COLOR/FORCE_COLOR 自动决定是否染色，无需再判 tty
     const tableLabel = colors_1.c.highlight(`'${status.table}'`);
-    (0, output_1.emit)(`${prefix} Audit enabled for table ${tableLabel} (retention: ${status.retention ?? retention})`);
+    const body = `Audit enabled for table ${tableLabel} (retention: ${status.retention ?? retention})`;
+    (0, output_1.emit)(tty ? colors_1.c.success(`✓ ${body}`) : `OK ${body}`);
 }
 async function handleDbAuditDisable(table, opts) {
     if (!table) {
@@ -181,8 +181,8 @@ async function handleDbAuditDisable(table, opts) {
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
-    const prefix = tty ? "✓" : "OK";
-    (0, output_1.emit)(`${prefix} Audit disabled for table ${colors_1.c.highlight(`'${status.table}'`)}`);
+    const body = `Audit disabled for table ${colors_1.c.highlight(`'${status.table}'`)}`;
+    (0, output_1.emit)(tty ? colors_1.c.success(`✓ ${body}`) : `OK ${body}`);
 }
 async function handleDbAuditList(tables, opts) {
     if (tables.length === 0) {

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

@@ -38,6 +38,7 @@ exports.handleDbDataExport = handleDbDataExport;
 const fs = __importStar(require("node:fs/promises"));
 const path = __importStar(require("node:path"));
 const api = __importStar(require("../../../api/index"));
+const colors_1 = require("../../../utils/colors");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 const render_1 = require("../../../utils/render");
@@ -90,7 +91,7 @@ async function handleDbDataImport(file, opts) {
     }
     const tty = (0, render_1.isStdoutTty)();
     (0, output_1.emit)(tty
-        ? `✓ Imported ${file} → table '${result.tableName}' (${String(result.recordCount)} rows)`
+        ? colors_1.c.success(`✓ Imported ${file} → table '${result.tableName}' (${String(result.recordCount)} rows)`)
         : `OK Imported ${file} -> table '${result.tableName}' (${String(result.recordCount)} rows)`);
 }
 async function handleDbDataExport(table, opts) {
@@ -144,7 +145,7 @@ async function handleDbDataExport(table, opts) {
     }
     const tty = (0, render_1.isStdoutTty)();
     (0, output_1.emit)(tty
-        ? `✓ Exported ${table} → ${outputPath} (${String(rows)} rows)`
+        ? colors_1.c.success(`✓ Exported ${table} → ${outputPath} (${String(rows)} rows)`)
         : `OK Exported ${table} -> ${outputPath} (${String(rows)} rows)`);
 }
 // ── 共用辅助 ──

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

@@ -42,6 +42,7 @@ 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");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 const poll_1 = require("../../../utils/poll");
@@ -79,11 +80,10 @@ async function handleDbMigrationInit(opts) {
     //   默认 ✓ / OK：     "Multi-env initialized (dev / online)"
     //   --sync-data：      "Multi-env initialized, data synced to dev"
     const tty = (0, render_1.isStdoutTty)();
-    const prefix = tty ? "✓" : "OK";
     const body = result.dataSynced
         ? "Multi-env initialized, data synced to dev"
         : `Multi-env initialized (${result.environments.join(" / ")})`;
-    (0, output_1.emit)(`${prefix} ${body}`);
+    (0, output_1.emit)(tty ? colors_1.c.success(`✓ ${body}`) : `OK ${body}`);
 }
 async function handleDbMigrationDiff(opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
@@ -170,9 +170,9 @@ async function handleDbMigrationApply(opts) {
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
-    const prefix = tty ? "✓" : "OK";
     const arrow = tty ? "→" : "->";
-    (0, output_1.emit)(`${prefix} Applied ${result.from} ${arrow} ${result.to} (${String(appliedCount)} changes)`);
+    const body = `Applied ${result.from} ${arrow} ${result.to} (${String(appliedCount)} changes)`;
+    (0, output_1.emit)(tty ? colors_1.c.success(`✓ ${body}`) : `OK ${body}`);
 }
 // ── helpers ──
 // PRD diff 输出：

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

@@ -41,6 +41,7 @@ exports.handleDbRecoveryApply = handleDbRecoveryApply;
 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");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 const poll_1 = require("../../../utils/poll");
@@ -59,9 +60,16 @@ async function handleDbRecoveryDiff(target, opts) {
 async function handleDbRecoveryApply(target, opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
     const ts = normalizeTimestamp(target);
-    // PITR 高危：TTY 下先 diff 给用户审；--yes 直接执行
+    // PRD 要求 apply 输出包含 N tables affected / Ms elapsed，dataloom apply 路径不
+    // 回带这俩信息（pgsvc.BranchRestore 是异步触发、不等终态）。所以 CLI 这里始终
+    // 先跑一次 preview——它本来就是 PITR 推荐流程，--yes 时静默跑、TTY 时同时给用户审。
+    const preview = await runRecoveryPreview(appId, ts);
+    const tablesAffected = preview.tablesAffected ?? preview.changes?.length ?? 0;
+    // dataloom 端 apply 是异步触发，elapsed_seconds 返 0。这里改用 preview 给出的
+    // estimated_seconds 当 "预计耗时"，更贴近 PRD 示例的 30s elapsed 含义；
+    // 都没填时按 PRD 默认值 30 兜底。
+    const elapsedFromPreview = preview.estimatedSeconds ?? 30;
     if (!opts.yes && !(0, output_1.isJsonMode)()) {
-        const preview = await runRecoveryPreview(appId, ts);
         renderDiff(ts, preview);
         const ok = await confirm(`? Restore database to ${ts}? This will overwrite current data. (y/N) `);
         if (!ok) {
@@ -76,20 +84,21 @@ async function handleDbRecoveryApply(target, opts) {
     catch (err) {
         throw decorateRecoveryError(err);
     }
+    const elapsed = result.elapsedSeconds && result.elapsedSeconds > 0 ? result.elapsedSeconds : elapsedFromPreview;
     if ((0, output_1.isJsonMode)()) {
-        // PRD：{"status": "restored", "target": "...", "elapsed_seconds": 30}
-        // tables_affected 来源于 preview，apply 路径不再回带，由 CLI 不强求字段。
+        // PRD：{"status": "restored", "target": "...", "tables_affected": N, "elapsed_seconds": M}
         (0, output_1.emitOk)((0, output_1.snakeCaseKeys)({
-            status: result.status ?? "restored",
+            status: "restored",
             target: result.target,
-            elapsedSeconds: result.elapsedSeconds ?? 0,
+            tablesAffected,
+            elapsedSeconds: elapsed,
         }));
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
-    const prefix = tty ? "✓" : "OK";
-    (0, output_1.emit)(`${prefix} Database restore triggered for ${result.target} ` +
-        `(${String(result.elapsedSeconds ?? 0)}s elapsed)`);
+    const body = `Database restored to ${result.target} ` +
+        `(${String(tablesAffected)} tables affected, ${String(elapsed)}s elapsed)`;
+    (0, output_1.emit)(tty ? colors_1.c.success(`✓ ${body}`) : `OK ${body}`);
 }
 /**
  * 触发 PITR 预览任务并轮询到终态：
@@ -215,7 +224,7 @@ function renderDiff(target, preview) {
                 action: c.action,
                 droppedAt: c.droppedAt,
             })),
-            estimatedSeconds: estimated ?? 0,
+            estimatedSeconds: estimated ?? 30,
         }));
         return;
     }
@@ -240,9 +249,9 @@ function renderDiffTty(target, changes, tablesAffected, estimated) {
         lines.push(`  ${c.table}:${pad}${describeChange(c)}`);
     }
     // PRD 要求 estimated time 块固定出现（即便 dataloom 当前没填 EstimatedSeconds，
-    // CLI 也用 0 兜底，保证输出结构稳定不漂）。
+    // CLI 也用 30s 兜底——PRD 示例展示的就是 30s，统一一个不至于误导的常量）。
     lines.push("");
-    lines.push(`  estimated time: ~${String(estimated ?? 0)}s`);
+    lines.push(`  estimated time: ~${String(estimated ?? 30)}s`);
     return lines.join("\n");
 }
 function renderDiffPipe(target, changes, tablesAffected, estimated) {
@@ -256,8 +265,8 @@ function renderDiffPipe(target, changes, tablesAffected, estimated) {
     for (const c of changes) {
         lines.push(`${c.table}\t${describeChange(c)}`);
     }
-    // 与 TTY 一致，始终输出 estimated_time（默认 0），让 awk 解析时不用兜底。
-    lines.push(`estimated_time\t${String(estimated ?? 0)}`);
+    // 与 TTY 一致，始终输出 estimated_time（默认 30），让 awk 解析时不用兜底。
+    lines.push(`estimated_time\t${String(estimated ?? 30)}`);
     return lines.join("\n");
 }
 function describeChange(c) {
@@ -276,9 +285,22 @@ function describeChange(c) {
         return `table will be created${ts}`;
     }
     if (c.action?.startsWith("schema_") === true) {
-        // schema diff 子类不细化，统一显示 "schema changed (<diffType>)"
+        // dataloom 透出的 schema diffType 来自 schema_handler/common/constants：
+        //   - create: 当前没这表 / 目标时间点有 → 恢复后表会被建出来（PRD 用 restored 表达）
+        //   - drop:   当前有 / 目标时间点没 → 恢复后会被删掉
+        //   - alter:  两侧都在但结构有差异 → 列 / 索引 / 关系等会被改回
         const diffType = c.action.slice("schema_".length);
-        return `schema changed${diffType !== "" ? ` (${diffType})` : ""}`;
+        const ts = c.droppedAt ? ` (was dropped at ${c.droppedAt})` : "";
+        switch (diffType) {
+            case "create":
+                return `table will be restored${ts}`;
+            case "drop":
+                return `table will be dropped${ts}`;
+            case "alter":
+                return `schema will be altered${ts}`;
+            default:
+                return `schema changed${diffType !== "" ? ` (${diffType})` : ""}${ts}`;
+        }
     }
     if (c.action === "unavailable") {
         // dataloom 端 count 失败的表，复用 droppedAt 透传 message

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

@@ -86,7 +86,7 @@ async function handleDbSql(query, opts) {
             (0, output_1.emit)({ data: [] });
             return;
         }
-        (0, output_1.emit)("✓ No results");
+        (0, output_1.emit)((0, render_1.isStdoutTty)() ? colors_1.c.success("✓ No results") : "OK No results");
         return;
     }
     if (results.length === 1) {

package/dist/cli/handlers/file/stat.js

@@ -86,8 +86,9 @@ async function handleFileStat(file, opts) {
         ["uploaded_at", (0, render_1.formatTime)(info.uploaded_at, tty)],
     ];
     if (info.uploaded_by) {
+        // pretty 模式只展示 name；id 仅在 --json 下保留（避免 TTY 输出冒出一长串 userID）。
         // uploaded_by 紧跟 uploaded_at 前插入（index = "uploaded_at" 之前）
-        pairs.splice(pairs.length - 1, 0, ["uploaded_by", info.uploaded_by]);
+        pairs.splice(pairs.length - 1, 0, ["uploaded_by", info.uploaded_by.name]);
     }
     if (info.download_url) {
         pairs.push(["download_url", info.download_url]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.3-alpha.4bf312e",
+  "version": "0.1.3-alpha.7d9ebe6",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {