@lark-apaas/miaoda-cli 0.1.2-alpha.4e370b6 → 0.1.2-alpha.514221e

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

@@ -48,7 +48,13 @@ const render_1 = require("../../../utils/render");
 async function handleDbRecoveryDiff(target, opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
     const ts = normalizeTimestamp(target);
-    const result = await api.db.recover({ appId, target: ts, dryRun: true });
+    let result;
+    try {
+        result = await api.db.recover({ appId, target: ts, dryRun: true });
+    }
+    catch (err) {
+        throw decorateRecoveryError(err);
+    }
     renderDiff(result);
 }
 async function handleDbRecoveryApply(target, opts) {
@@ -56,7 +62,13 @@ async function handleDbRecoveryApply(target, opts) {
     const ts = normalizeTimestamp(target);
     // PITR 高危：TTY 下先 diff 给用户审；--yes 直接执行
     if (!opts.yes && !(0, output_1.isJsonMode)()) {
-        const preview = await api.db.recover({ appId, target: ts, dryRun: true });
+        let preview;
+        try {
+            preview = await api.db.recover({ appId, target: ts, dryRun: true });
+        }
+        catch (err) {
+            throw decorateRecoveryError(err);
+        }
         renderDiff(preview);
         const ok = await confirm(`? Restore database to ${preview.target}? This will overwrite current data. (y/N) `);
         if (!ok) {
@@ -64,7 +76,13 @@ async function handleDbRecoveryApply(target, opts) {
             return;
         }
     }
-    const result = await api.db.recover({ appId, target: ts, dryRun: false });
+    let result;
+    try {
+        result = await api.db.recover({ appId, target: ts, dryRun: false });
+    }
+    catch (err) {
+        throw decorateRecoveryError(err);
+    }
     if ((0, output_1.isJsonMode)()) {
         // PRD：{"status": "restored", "target": "...", "tables_affected": 2, "elapsed_seconds": 30}
         (0, output_1.emitOk)((0, output_1.snakeCaseKeys)({
@@ -82,21 +100,25 @@ async function handleDbRecoveryApply(target, opts) {
 }
 // ── helpers ──
 /**
- * 把用户传入的时间统一成 ISO 8601 UTC。
- * 接受：`YYYY-MM-DD` / `YYYY-MM-DD HH:MM:SS` / 完整 ISO 8601。
+ * 把用户传入的时间统一成 ISO 8601 UTC。PRD 只接受两种格式：
+ *   - `YYYY-MM-DD`（按 UTC 0 点解释）
+ *   - 完整 ISO 8601 `YYYY-MM-DDTHH:MM:SS[Z|±HH:MM]`
+ *
+ * 严格 regex 匹配 + 不用 new Date(input) 兜底——Node Date 解析 `2026/04/15` 这种
+ * 非 ISO 字符串居然成功（落到本地时区），绕过格式校验把脏值送到后端，导致用户拿到
+ * 「窗口超限」错误而不是「格式错误」。PRD 明确这两种格式以外的都应该报 INVALID_TIMESTAMP。
  */
 function normalizeTimestamp(input) {
-    const FORMAT_HINT = "Use ISO 8601 / yyyy-mm-dd / yyyy-mm-dd HH:MM:SS.";
+    // PRD hint 文案对齐 PRD 截图（同时是 dataloom 端 ErrInvalidTimestamp 的 hint）
+    const FORMAT_HINT = "Use ISO 8601 format, e.g. 2026-04-15 or 2026-04-15T10:00:00Z";
     if (input === "") {
         throw new error_1.AppError("ARGS_INVALID", "target timestamp is required", {
             next_actions: ["Usage: miaoda db recovery diff|apply <timestamp>"],
         });
     }
+    // 仅日期：YYYY-MM-DD → 按 UTC 0 点
     if (/^\d{4}-\d{2}-\d{2}$/.test(input)) {
-        return new Date(`${input}T00:00:00Z`).toISOString();
-    }
-    if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2})?$/.test(input)) {
-        const d = new Date(input.replace(" ", "T"));
+        const d = new Date(`${input}T00:00:00Z`);
         if (Number.isNaN(d.getTime())) {
             throw new error_1.AppError("INVALID_TIMESTAMP", `Invalid timestamp format '${input}'`, {
                 next_actions: [FORMAT_HINT],
@@ -104,13 +126,20 @@ function normalizeTimestamp(input) {
         }
         return d.toISOString();
     }
-    const d = new Date(input);
-    if (Number.isNaN(d.getTime())) {
-        throw new error_1.AppError("INVALID_TIMESTAMP", `Invalid timestamp format '${input}'`, {
-            next_actions: [FORMAT_HINT],
-        });
+    // 完整 ISO 8601 datetime：T 分隔，秒可选 ms，Z 或 ±HH:MM 时区
+    if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})$/.test(input)) {
+        const d = new Date(input);
+        if (Number.isNaN(d.getTime())) {
+            throw new error_1.AppError("INVALID_TIMESTAMP", `Invalid timestamp format '${input}'`, {
+                next_actions: [FORMAT_HINT],
+            });
+        }
+        return d.toISOString();
     }
-    return d.toISOString();
+    // 其它一律按格式错误拒绝（`2026/04/15` / `2026.04.15` / `2026年4月15日` 等都走这里）
+    throw new error_1.AppError("INVALID_TIMESTAMP", `Invalid timestamp format '${input}'`, {
+        next_actions: [FORMAT_HINT],
+    });
 }
 // PRD diff 输出（结构化 prose）：
 //   Recovery preview (→ 2026-04-15T10:00:00Z):
@@ -177,6 +206,28 @@ function describeChange(c) {
         parts.push(`~${String(c.modified)} rows modified`);
     return parts.length === 0 ? "no changes" : parts.join(", ");
 }
+// decorateRecoveryError 给 recovery 路径上的几个错误码补 PRD 规定的 hint。
+// dataloom 后端只返 message + code，hint 由 CLI 端按错误码映射；其它错误码原样透传。
+function decorateRecoveryError(err) {
+    if (!(err instanceof error_1.AppError))
+        return err;
+    switch (err.code) {
+        case "DB_API_k_dl_1300036":
+            // 窗口超限：引导用户检查 last migration apply 时间
+            return new error_1.AppError(err.code, err.message, {
+                next_actions: [
+                    "PITR window is up to 7 days back, limited by your last `db migration apply` time.",
+                ],
+            });
+        case "DB_API_k_dl_1300038":
+            // 时间格式错误：引导 ISO 8601
+            return new error_1.AppError(err.code, err.message, {
+                next_actions: ["Use ISO 8601 format, e.g. 2026-04-15 or 2026-04-15T10:00:00Z"],
+            });
+        default:
+            return err;
+    }
+}
 async function confirm(prompt) {
     const rl = node_readline_1.default.createInterface({ input: process.stdin, output: process.stderr });
     return new Promise((resolve) => {

package/package.json

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