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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -32,13 +32,10 @@ var __importStar = (this && this.__importStar) || (function () {
32
32
  return result;
33
33
  };
34
34
  })();
35
- var __importDefault = (this && this.__importDefault) || function (mod) {
36
- return (mod && mod.__esModule) ? mod : { "default": mod };
37
- };
38
35
  Object.defineProperty(exports, "__esModule", { value: true });
39
36
  exports.handleDbRecoveryDiff = handleDbRecoveryDiff;
40
37
  exports.handleDbRecoveryApply = handleDbRecoveryApply;
41
- const node_readline_1 = __importDefault(require("node:readline"));
38
+ exports.formatRecoveryTargetForDisplay = formatRecoveryTargetForDisplay;
42
39
  const api = __importStar(require("../../../api/index"));
43
40
  const shared_1 = require("../../../cli/commands/shared");
44
41
  const colors_1 = require("../../../utils/colors");
@@ -47,6 +44,7 @@ const output_1 = require("../../../utils/output");
47
44
  const poll_1 = require("../../../utils/poll");
48
45
  const render_1 = require("../../../utils/render");
49
46
  const time_1 = require("../../../utils/time");
47
+ const _destructive_1 = require("../../../cli/handlers/db/_destructive");
50
48
  // ── recovery diff ──
51
49
  //
52
50
  // PITR preview 是异步任务:dataloom 立即返 previewRequestId,CLI 自己 poll 直到 success/failed。
@@ -55,24 +53,42 @@ const time_1 = require("../../../utils/time");
55
53
  async function handleDbRecoveryDiff(target, opts) {
56
54
  const appId = (0, shared_1.resolveAppId)(opts);
57
55
  const ts = normalizeTimestamp(target);
58
- const preview = await runRecoveryPreview(appId, ts);
56
+ const preview = await runRecoveryPreview(appId, ts, target);
59
57
  renderDiff(ts, preview);
60
58
  }
61
59
  async function handleDbRecoveryApply(target, opts) {
62
60
  const appId = (0, shared_1.resolveAppId)(opts);
63
61
  const ts = normalizeTimestamp(target);
64
- // PRD 要求 apply 输出包含 N tables affected / Ms elapsed,dataloom apply 路径不
65
- // 回带这俩信息(pgsvc.BranchRestore 是异步触发、不等终态)。所以 CLI 这里始终
66
- // 先跑一次 preview——它本来就是 PITR 推荐流程,--yes 时静默跑、TTY 时同时给用户审。
67
- const preview = await runRecoveryPreview(appId, ts);
62
+ // PRD 要求 apply 输出包含 N tables affected / Ms elapsed。
63
+ // tables_affected 从 preview 拿;elapsed 用 CLI 端墙钟(dataloom apply 是异步
64
+ // 触发,server-side elapsed=0;下面 poll 真终态后用本地计时器算 elapsed)。
65
+ const preview = await runRecoveryPreview(appId, ts, target);
68
66
  const tablesAffected = preview.tablesAffected ?? preview.changes?.length ?? 0;
69
- // dataloom 端 apply 是异步触发,elapsed_seconds 返 0。这里改用 preview 给出的
70
- // estimated_seconds 当 "预计耗时",更贴近 PRD 示例的 30s elapsed 含义;
71
- // 都没填时按 PRD 默认值 30 兜底。
72
- const elapsedFromPreview = preview.estimatedSeconds ?? 30;
73
- if (!opts.yes && !(0, output_1.isJsonMode)()) {
74
- renderDiff(ts, preview);
75
- const ok = await confirm(`? Restore database to ${ts}? This will overwrite current data. (y/N) `);
67
+ // 0 changes 短路:目标时间点与当前一致,apply 没意义。pretty 模式渲染 preview
68
+ // 的 "No changes — database is already at this state." 后直接退;--json 模式
69
+ // 返 status="no_changes" envelope 让下游识别。不进 confirm 也不下发 apply。
70
+ if ((preview.changes?.length ?? 0) === 0) {
71
+ if ((0, output_1.isJsonMode)()) {
72
+ (0, output_1.emitOk)((0, output_1.snakeCaseKeys)({
73
+ status: 'no_changes',
74
+ target: ts,
75
+ tablesAffected: 0,
76
+ elapsedSeconds: 0,
77
+ }));
78
+ }
79
+ else {
80
+ renderDiff(ts, preview);
81
+ }
82
+ return;
83
+ }
84
+ // --yes 跳过;非 TTY 抛 DESTRUCTIVE_REQUIRES_CONFIRM;TTY 渲染 diff(pretty)+ 交互确认。
85
+ // 不再用 isJsonMode() 做门 —— 见 _destructive.ts 注释。
86
+ if (opts.yes !== true) {
87
+ (0, _destructive_1.assertDestructiveAllowedInTty)(opts.yes);
88
+ // --json 模式跳过 pretty diff 渲染避免污染 stdout envelope;TTY pretty 模式渲染
89
+ if (!(0, output_1.isJsonMode)())
90
+ renderDiff(ts, preview);
91
+ const ok = await (0, _destructive_1.askYesNo)(`? Restore database to ${ts}? This will overwrite current data. (y/N) `);
76
92
  if (!ok) {
77
93
  (0, output_1.emit)('Aborted.');
78
94
  return;
@@ -85,7 +101,12 @@ async function handleDbRecoveryApply(target, opts) {
85
101
  catch (err) {
86
102
  throw decorateRecoveryError(err);
87
103
  }
88
- const elapsed = result.elapsedSeconds && result.elapsedSeconds > 0 ? result.elapsedSeconds : elapsedFromPreview;
104
+ // 关键:墙钟从 apply 触发瞬间开始,poll 真完成时停。dataloom restore 是异步触发,
105
+ // 立即返 status="restore_triggered",CLI 必须 poll GET /db/recovery/status 拿
106
+ // Redis 缓存的 Resetting/Ready/Failed,否则用户会被误导以为已恢复完。
107
+ const startedAt = Date.now();
108
+ await waitRecoveryDone(appId, ts, target);
109
+ const elapsed = Math.max(1, Math.round((Date.now() - startedAt) / 1000));
89
110
  if ((0, output_1.isJsonMode)()) {
90
111
  // PRD:{"status": "restored", "target": "...", "tables_affected": N, "elapsed_seconds": M}
91
112
  (0, output_1.emitOk)((0, output_1.snakeCaseKeys)({
@@ -101,6 +122,38 @@ async function handleDbRecoveryApply(target, opts) {
101
122
  `(${String(tablesAffected)} tables affected, ${String(elapsed)}s elapsed)`;
102
123
  (0, output_1.emit)(tty ? colors_1.c.success(`✓ ${body}`) : `OK ${body}`);
103
124
  }
125
+ /**
126
+ * 触发 BranchRestore 后 poll 直到任务终态。dataloom 端 Redis 缓存 workspace 级
127
+ * status,归一成 running / success / failed:
128
+ * - running → 继续 poll
129
+ * - success → 退出,CLI 渲染 ✓
130
+ * - failed → 抛 DB_API_k_dl_1300036 + errorMessage
131
+ *
132
+ * 不设固定超时:BranchRestore 实际时长依库大小变化(前端文案示例 1 分钟,大库可能
133
+ * 几分钟),由 pollUntilDone 内置 60 分钟上限兜底,远超正常场景。
134
+ */
135
+ async function waitRecoveryDone(appId, target, rawTarget) {
136
+ try {
137
+ return await (0, poll_1.pollUntilDone)({
138
+ label: 'recovery apply',
139
+ spinnerLabel: `Restoring database (target: ${formatRecoveryTargetForDisplay(rawTarget)})`,
140
+ intervalMs: 2000,
141
+ fetch: () => api.db.getRecoveryStatus({ appId }),
142
+ isDone: (cur) => {
143
+ const status = (cur.status || '').toLowerCase();
144
+ if (status === 'success')
145
+ return { done: true, value: cur };
146
+ if (status === 'failed') {
147
+ throw new error_1.AppError('DB_API_k_dl_1300036', cur.errorMessage ?? `recovery to ${target} failed`);
148
+ }
149
+ return { done: false };
150
+ },
151
+ });
152
+ }
153
+ catch (err) {
154
+ throw decorateRecoveryError(err);
155
+ }
156
+ }
104
157
  /**
105
158
  * 触发 PITR 预览任务并轮询到终态:
106
159
  * 1. POST /db/recovery dryRun=true → previewRequestId
@@ -110,7 +163,7 @@ async function handleDbRecoveryApply(target, opts) {
110
163
  * 补 hint。failed 状态下 dataloom 已把 errorMessage 翻好,CLI 包成 k_dl_1300036
111
164
  * 让 decorateRecoveryError 命中窗口超限 hint。
112
165
  */
113
- async function runRecoveryPreview(appId, ts) {
166
+ async function runRecoveryPreview(appId, ts, rawTarget) {
114
167
  let triggered;
115
168
  try {
116
169
  triggered = await api.db.recover({ appId, target: ts, dryRun: true });
@@ -125,6 +178,7 @@ async function runRecoveryPreview(appId, ts) {
125
178
  try {
126
179
  return await (0, poll_1.pollUntilDone)({
127
180
  label: 'recovery preview',
181
+ spinnerLabel: `Previewing recovery impact (target: ${formatRecoveryTargetForDisplay(rawTarget)})`,
128
182
  intervalMs: 1000,
129
183
  fetch: () => api.db.getRecoveryPreview({ appId, previewRequestId }),
130
184
  isDone: (cur) => {
@@ -148,6 +202,41 @@ async function runRecoveryPreview(appId, ts) {
148
202
  }
149
203
  }
150
204
  // ── helpers ──
205
+ /**
206
+ * 把用户传入的 recovery target 格式化成 spinner / 日志展示用的紧凑字符串:
207
+ * - 相对值(30s / 5m / 2h / 3d / 1w)→ 原样 + " ago",如 "20m ago"
208
+ * - 绝对值 → 解析后用本地时区重新格式化成 ISO 8601 with offset,如
209
+ * "2026-05-20T22:32:00+08:00"
210
+ * - 解析失败 → 原样返回兜底
211
+ *
212
+ * 不直接用 normalizeTimestamp 的 UTC 字符串:UTC 'Z' 后缀对用户读时间不直观,
213
+ * 本地时区带 offset 让用户一眼看清楚"目标恢复点是我本地几点"。
214
+ */
215
+ function formatRecoveryTargetForDisplay(rawInput) {
216
+ const trimmed = rawInput.trim();
217
+ if (/^\d+[smhdw]$/i.test(trimmed)) {
218
+ return `${trimmed} ago`;
219
+ }
220
+ let ms;
221
+ try {
222
+ ms = (0, time_1.parseTimeToMs)(trimmed);
223
+ }
224
+ catch {
225
+ return trimmed;
226
+ }
227
+ return formatIsoWithLocalOffset(ms);
228
+ }
229
+ function formatIsoWithLocalOffset(ms) {
230
+ const d = new Date(ms);
231
+ const pad = (n) => String(n).padStart(2, '0');
232
+ // getTimezoneOffset 返回本地相对 UTC 的差值(分钟)— UTC 在东八区是 -480
233
+ const offsetMinutes = -d.getTimezoneOffset();
234
+ const sign = offsetMinutes >= 0 ? '+' : '-';
235
+ const absOffset = Math.abs(offsetMinutes);
236
+ const tz = `${sign}${pad(Math.floor(absOffset / 60))}:${pad(absOffset % 60)}`;
237
+ return (`${String(d.getFullYear())}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}` +
238
+ `T${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}${tz}`);
239
+ }
151
240
  /**
152
241
  * 把用户传入的时间统一成 ISO 8601 UTC 字符串发给 dataloom。
153
242
  *
@@ -171,20 +260,20 @@ function normalizeTimestamp(input) {
171
260
  }
172
261
  // PRD diff 输出,三套:
173
262
  //
174
- // TTY pretty(缩进 prose、带 Unicode 箭头 / 波浪号、表名按列对齐):
263
+ // TTY pretty(缩进 prose、带 Unicode 箭头、表名按列对齐):
175
264
  // Recovery preview (→ 2026-04-15T10:00:00Z):
176
265
  //
177
266
  // tables affected: 2
178
- // users: +3 rows, -1 row, ~5 rows modified
179
- // orders: table will be restored (was dropped at 10:25:00)
267
+ // users: +3 rows, -1 row
268
+ // orders: table will be restored
180
269
  //
181
270
  // estimated time: ~30s
182
271
  //
183
272
  // non-TTY pretty(管道友好,扁平 TSV、ASCII 箭头、snake_case key、estimated_time 不带 ~/s):
184
273
  // Recovery preview (-> 2026-04-15T10:00:00Z):
185
274
  // tables_affected\t2
186
- // users\t+3 rows, -1 row, ~5 rows modified
187
- // orders\ttable will be restored (was dropped at 10:25:00)
275
+ // users\t+3 rows, -1 row
276
+ // orders\ttable will be restored
188
277
  // estimated_time\t30
189
278
  //
190
279
  // --json:标准 envelope,字段名固定 snake_case。
@@ -200,7 +289,6 @@ function renderDiff(target, preview) {
200
289
  table: c.table,
201
290
  inserted: c.inserted,
202
291
  deleted: c.deleted,
203
- modified: c.modified,
204
292
  action: c.action,
205
293
  droppedAt: c.droppedAt,
206
294
  })),
@@ -250,51 +338,31 @@ function renderDiffPipe(target, changes, tablesAffected, estimated) {
250
338
  return lines.join('\n');
251
339
  }
252
340
  function describeChange(c) {
253
- // 表级操作:dataloom 现在把 schema diff 透出为 action="schema_<diffType>",
254
- // 老协议的 restore_table / drop / create 一并保留兼容。
341
+ // dataloom 端 action 是 PRD 三态 + unavailable 边界:
342
+ // restore_table — schema diff 显示该表在目标时间点存在但当前没有
343
+ // drop_table — 该表当前有但目标时间点没有
344
+ // alter_table — 两侧都在但结构有差异(列 / 索引 / 关系等)
345
+ // unavailable — PITR diff 算不出来,droppedAt 字段复用透传 message
346
+ // 没 action 时是数据行数变化,走下面的 +N / -N 渲染。
255
347
  if (c.action === 'restore_table') {
256
- const ts = c.droppedAt ? ` (was dropped at ${c.droppedAt})` : '';
257
- return `table will be restored${ts}`;
348
+ return 'table will be restored';
258
349
  }
259
- if (c.action === 'drop') {
260
- const ts = c.droppedAt ? ` (was dropped at ${c.droppedAt})` : '';
261
- return `table will be dropped${ts}`;
350
+ if (c.action === 'drop_table') {
351
+ return 'table will be dropped';
262
352
  }
263
- if (c.action === 'create') {
264
- const ts = c.droppedAt ? ` (was dropped at ${c.droppedAt})` : '';
265
- return `table will be created${ts}`;
266
- }
267
- if (c.action?.startsWith('schema_') === true) {
268
- // dataloom 透出的 schema diffType 来自 schema_handler/common/constants:
269
- // - create: 当前没这表 / 目标时间点有 → 恢复后表会被建出来(PRD 用 restored 表达)
270
- // - drop: 当前有 / 目标时间点没 → 恢复后会被删掉
271
- // - alter: 两侧都在但结构有差异 → 列 / 索引 / 关系等会被改回
272
- const diffType = c.action.slice('schema_'.length);
273
- const ts = c.droppedAt ? ` (was dropped at ${c.droppedAt})` : '';
274
- switch (diffType) {
275
- case 'create':
276
- return `table will be restored${ts}`;
277
- case 'drop':
278
- return `table will be dropped${ts}`;
279
- case 'alter':
280
- return `schema will be altered${ts}`;
281
- default:
282
- return `schema changed${diffType !== '' ? ` (${diffType})` : ''}${ts}`;
283
- }
353
+ if (c.action === 'alter_table') {
354
+ return 'table will be altered';
284
355
  }
285
356
  if (c.action === 'unavailable') {
286
- // dataloom 端 count 失败的表,复用 droppedAt 透传 message
287
357
  return `diff unavailable${c.droppedAt !== undefined && c.droppedAt !== '' ? `: ${c.droppedAt}` : ''}`;
288
358
  }
289
- // 数据变更:+N rows / -N rows / ~N rows modified
359
+ // 数据变更:+N rows / -N rows
290
360
  const parts = [];
291
361
  if (c.inserted !== undefined && c.inserted !== 0)
292
362
  parts.push(`+${String(c.inserted)} rows`);
293
363
  if (c.deleted !== undefined && c.deleted !== 0) {
294
364
  parts.push(`-${String(c.deleted)} ${c.deleted === 1 ? 'row' : 'rows'}`);
295
365
  }
296
- if (c.modified !== undefined && c.modified !== 0)
297
- parts.push(`~${String(c.modified)} rows modified`);
298
366
  return parts.length === 0 ? 'no changes' : parts.join(', ');
299
367
  }
300
368
  /**
@@ -346,12 +414,3 @@ function decorateRecoveryError(err) {
346
414
  return err;
347
415
  }
348
416
  }
349
- async function confirm(prompt) {
350
- const rl = node_readline_1.default.createInterface({ input: process.stdin, output: process.stderr });
351
- return new Promise((resolve) => {
352
- rl.question(prompt, (answer) => {
353
- rl.close();
354
- resolve(answer.trim().toLowerCase() === 'y');
355
- });
356
- });
357
- }
@@ -104,11 +104,11 @@ async function resolveDeleteInputs(appId, paths, names) {
104
104
  return { resolved, errors };
105
105
  }
106
106
  /**
107
- * 删除前 TTY 二次确认。
108
- * PRD 单文件场景下提示带具体路径:`? Delete '/path'? (y/N)`,
109
- * 多文件场景汇总条数:`? Delete N files? (y/N)`。
110
- * `firstInput` 是用户传入的第一个值(可能是 path 或 file_name),
111
- * 单文件时直接展示给用户,方便核对目标。
107
+ * 删除前 TTY 二次确认。文案强调"permanently"(删除不可撤销,无回收站):
108
+ * - 单文件:`? Are you sure you want to permanently delete '<input>'? (y/N)`
109
+ * - 多文件:`? Are you sure you want to permanently delete N files? (y/N)`
110
+ * `firstInput` 是用户传入的第一个值(path 或 file_name),单文件时直接展示给
111
+ * 用户核对目标。
112
112
  */
113
113
  async function confirm(count, firstInput) {
114
114
  const rl = node_readline_1.default.createInterface({
@@ -116,7 +116,9 @@ async function confirm(count, firstInput) {
116
116
  output: process.stderr,
117
117
  });
118
118
  return new Promise((resolve) => {
119
- const prompt = count === 1 ? `? Delete '${firstInput}'? (y/N) ` : `? Delete ${String(count)} files? (y/N) `;
119
+ const prompt = count === 1
120
+ ? `? Are you sure you want to permanently delete '${firstInput}'? (y/N) `
121
+ : `? Are you sure you want to permanently delete ${String(count)} files? (y/N) `;
120
122
  rl.question(prompt, (answer) => {
121
123
  rl.close();
122
124
  resolve(answer.trim().toLowerCase() === 'y');
@@ -2,24 +2,32 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.pollUntilDone = pollUntilDone;
4
4
  const error_1 = require("../utils/error");
5
+ const spinner_1 = require("../utils/spinner");
5
6
  async function pollUntilDone(opts) {
6
7
  const interval = opts.intervalMs ?? 1000;
7
8
  const timeout = opts.timeoutMs ?? 300_000;
8
9
  const deadline = Date.now() + timeout;
9
- // 立即拉一次(绝大多数轻量任务在 dataloom 端已是同步语义,第一次 fetch 就能拿到 success)
10
- for (;;) {
11
- const cur = await opts.fetch();
12
- const verdict = opts.isDone(cur);
13
- if (verdict.done)
14
- return verdict.value;
15
- if (Date.now() + interval > deadline) {
16
- throw new error_1.AppError('TASK_TIMEOUT', `${opts.label} did not complete within ${String(Math.round(timeout / 1000))}s`, {
17
- next_actions: [
18
- 'The task may still be running server-side. Retry the command, or check `miaoda db migration diff` to verify final state.',
19
- ],
20
- });
10
+ // 仅当传 spinnerLabel 时启动 spinner;非 TTY / JSON 模式内部自动 noop
11
+ const stopSpinner = opts.spinnerLabel ? (0, spinner_1.startSpinner)(opts.spinnerLabel) : () => undefined;
12
+ try {
13
+ // 立即拉一次(绝大多数轻量任务在 dataloom 端已是同步语义,第一次 fetch 就能拿到 success)
14
+ for (;;) {
15
+ const cur = await opts.fetch();
16
+ const verdict = opts.isDone(cur);
17
+ if (verdict.done)
18
+ return verdict.value;
19
+ if (Date.now() + interval > deadline) {
20
+ throw new error_1.AppError('TASK_TIMEOUT', `${opts.label} did not complete within ${String(Math.round(timeout / 1000))}s`, {
21
+ next_actions: [
22
+ 'The task may still be running server-side. Retry the command, or check `miaoda db migration diff` to verify final state.',
23
+ ],
24
+ });
25
+ }
26
+ await sleep(interval);
21
27
  }
22
- await sleep(interval);
28
+ }
29
+ finally {
30
+ stopSpinner();
23
31
  }
24
32
  }
25
33
  function sleep(ms) {
@@ -0,0 +1,46 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.startSpinner = startSpinner;
4
+ const config_1 = require("./config");
5
+ /**
6
+ * TTY 友好的 loading 指示器,写到 stderr 上避免污染 stdout(保证 --json 输出干净)。
7
+ *
8
+ * 设计:
9
+ * - 仅 stderr.isTTY 且非 --json 模式启用;其他情况静默(CI / 管道 / JSON 输出场景)
10
+ * - 80ms 一帧 braille 旋转字符 + 累计 elapsed 秒数
11
+ * - 返回 stop() 函数;调用方 finally 里调用,无论成功失败都清掉 spinner 行
12
+ *
13
+ * 用法:
14
+ * const stop = startSpinner('Applying migration to online');
15
+ * try { await someLongTask(); } finally { stop(); }
16
+ */
17
+ const FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
18
+ const HIDE_CURSOR = '[?25l';
19
+ const SHOW_CURSOR = '[?25h';
20
+ const CLEAR_LINE = '\r';
21
+ function startSpinner(label) {
22
+ // 非 TTY / JSON 模式:静默 noop,避免污染管道与结构化输出
23
+ if (!process.stderr.isTTY || (0, config_1.getConfig)().json) {
24
+ return () => {
25
+ /* noop */
26
+ };
27
+ }
28
+ let frame = 0;
29
+ const start = Date.now();
30
+ process.stderr.write(HIDE_CURSOR);
31
+ const render = () => {
32
+ const elapsedSec = Math.round((Date.now() - start) / 1000);
33
+ process.stderr.write(`${CLEAR_LINE}${FRAMES[frame]} ${label}... ${String(elapsedSec)}s`);
34
+ frame = (frame + 1) % FRAMES.length;
35
+ };
36
+ render();
37
+ const timer = setInterval(render, 80);
38
+ let stopped = false;
39
+ return () => {
40
+ if (stopped)
41
+ return;
42
+ stopped = true;
43
+ clearInterval(timer);
44
+ process.stderr.write(`${CLEAR_LINE}${SHOW_CURSOR}`);
45
+ };
46
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lark-apaas/miaoda-cli",
3
- "version": "0.1.3-alpha.67da0bb",
3
+ "version": "0.1.3-alpha.70f9b2d",
4
4
  "description": "Miaoda 平台命令行工具,面向 Agent 调用",
5
5
  "type": "commonjs",
6
6
  "bin": {