@lark-apaas/miaoda-cli 0.1.0-alpha.41ce8f5 → 0.1.0-alpha.465bdb8

package/dist/api/db/api.js

@@ -5,8 +5,6 @@ exports.getSchema = getSchema;
 exports.importData = importData;
 exports.exportData = exportData;
 const http_1 = require("../../utils/http");
-// TODO(REMOVE-BEFORE-RELEASE): debug-only HTTP trace（详见 _debug_trace.ts）
-const _debug_trace_1 = require("./_debug_trace");
 const error_1 = require("../../utils/error");
 const client_1 = require("./client");
 // CLI 不再为 dbBranch 设默认值：
@@ -26,16 +24,7 @@ async function execSql(opts) {
     const url = (0, client_1.buildInnerUrl)(opts.appId, "/db/sql", {
         dbBranch: opts.dbBranch,
     });
-    let response;
-    try {
-        (0, _debug_trace_1.traceRequest)("POST", url, client);
-        response = await client.post(url, { sql: opts.sql });
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers, client);
-    }
-    catch (err) {
-        (0, _debug_trace_1.traceError)("POST", url, err, client);
-        throw err;
-    }
+    const response = await client.post(url, { sql: opts.sql });
     if (!response.ok) {
         // 4xx / 5xx：尝试解析 body 取 status_code 映射业务错误
         let body = null;
@@ -68,16 +57,7 @@ async function getSchema(opts) {
         includeStats: opts.includeStats ? "true" : undefined,
         dbBranch: opts.dbBranch,
     });
-    let response;
-    try {
-        (0, _debug_trace_1.traceRequest)("GET", url, client);
-        response = await client.get(url);
-        (0, _debug_trace_1.traceResponse)("GET", url, response.status, response.headers, client);
-    }
-    catch (err) {
-        (0, _debug_trace_1.traceError)("GET", url, err, client);
-        throw err;
-    }
+    const response = await client.get(url);
     if (!response.ok) {
         let body = null;
         try {
@@ -109,21 +89,12 @@ async function importData(opts) {
     });
     const contentType = opts.format === "csv" ? "text/csv" : "application/json";
     const ab = opts.body.buffer.slice(opts.body.byteOffset, opts.body.byteOffset + opts.body.byteLength);
-    let response;
-    try {
-        (0, _debug_trace_1.traceRequest)("POST", url, client);
-        response = await client.request({
-            method: "POST",
-            url,
-            headers: { "Content-Type": contentType },
-            body: ab,
-        });
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers, client);
-    }
-    catch (err) {
-        (0, _debug_trace_1.traceError)("POST", url, err, client);
-        throw err;
-    }
+    const response = await client.request({
+        method: "POST",
+        url,
+        headers: { "Content-Type": contentType },
+        body: ab,
+    });
     if (!response.ok) {
         let body = null;
         try {
@@ -160,16 +131,7 @@ async function exportData(opts) {
         dbBranch: opts.dbBranch,
     });
     const reqBody = { limit: opts.limit ?? 5000 };
-    let response;
-    try {
-        (0, _debug_trace_1.traceRequest)("POST", url, client);
-        response = await client.post(url, reqBody);
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers, client);
-    }
-    catch (err) {
-        (0, _debug_trace_1.traceError)("POST", url, err, client);
-        throw err;
-    }
+    const response = await client.post(url, reqBody);
     if (!response.ok) {
         // 错误路径：body 是 JSON envelope
         let body = null;

package/dist/api/db/client.js

@@ -19,12 +19,16 @@ function ensureInnerSuccess(body) {
     const code = body.status_code ?? body.ErrorCode ?? "0";
     if (code === "0" || code === "")
         return;
-    const message = body.error_msg ?? body.ErrorMessage ?? `dataloom API error [${code}]`;
+    const message = stripPgPrefix(body.error_msg ?? body.ErrorMessage ?? `dataloom API error [${code}]`);
+    // PRD 多语句失败：后端在 envelope 顶层透出 errorStatementIndex（从 0 起计），
+    // 单语句 / 单元执行不会带这个字段。下面的 AppError 都把它带上，让最终
+    // CLI JSON envelope 写到 error.statement_index。
+    const stmtIdx = typeof body.errorStatementIndex === "number" ? body.errorStatementIndex : undefined;
     // k_dl_1300002 是 PG 执行透传错误；error_msg 里常带 SQLSTATE，优先按 SQLSTATE 映射
     if (code === "k_dl_1300002") {
         const sqlstate = extractSqlstate(message);
         if (sqlstate && exports.SQLSTATE_MAP[sqlstate]) {
-            throw new error_1.AppError(exports.SQLSTATE_MAP[sqlstate], message);
+            throw new error_1.AppError(exports.SQLSTATE_MAP[sqlstate], message, { statement_index: stmtIdx });
         }
     }
     // k_dl_1600000 是 dataloom 通用参数错误，不能整体映射；
@@ -35,7 +39,7 @@ function ensureInnerSuccess(body) {
     if (code === "k_dl_1600000" && message.startsWith("Invalid DB Branch")) {
         throw new error_1.AppError("MULTI_ENV_NOT_INITIALIZED", "--env is not available (multi-env not initialized)", {
             next_actions: [
-                "Verify the --env value matches an existing dbBranch, or run `miaoda db migration init` to set up multi-env for this app.",
+                "Verify the --env value matches an existing dbBranch.",
             ],
         });
     }
@@ -44,10 +48,19 @@ function ensureInnerSuccess(body) {
     if (mapped) {
         throw new error_1.AppError(mapped.code, mapped.message ?? message, {
             next_actions: mapped.hint ? [mapped.hint] : undefined,
+            statement_index: stmtIdx,
         });
     }
     // 兜底：dataloom 未映射的 code 原样透传
-    throw new error_1.AppError(`DB_API_${code}`, message);
+    throw new error_1.AppError(`DB_API_${code}`, message, { statement_index: stmtIdx });
+}
+/**
+ * 剥掉 PG 透传错误的 "ERROR:" 前缀：CLI 输出本身就会前缀 "Error:"，
+ * 不去掉就会变成 `Error: ERROR: relation ...` 双重前缀，PRD 不要这种冗余。
+ * 大小写敏感，只匹配 PG 标准格式。
+ */
+function stripPgPrefix(msg) {
+    return msg.replace(/^ERROR:\s*/, "");
 }
 /** 从 PG 执行错误消息里提取 "(SQLSTATE XXXXX)"。 */
 function extractSqlstate(msg) {

package/dist/api/db/parsers.js

@@ -27,16 +27,23 @@ function parseSqlResult(r) {
             recordCount: r.recordCount ?? rows.length,
         };
     }
-    if (r.sqlType === "INSERT" || r.sqlType === "UPDATE" || r.sqlType === "DELETE") {
+    if (r.sqlType === "INSERT" ||
+        r.sqlType === "UPDATE" ||
+        r.sqlType === "DELETE" ||
+        r.sqlType === "MERGE" ||
+        r.sqlType === "DML") {
         const affected = r.affectedRows ?? extractRowCount(r.data);
         return {
             kind: "dml",
+            // 上面已 narrow，这里 cast 是为了 SqlType 联合里的 (string & {}) 让 TS 无法
+            // 自动收窄到字面量集合，不影响运行时安全
             sqlType: r.sqlType,
             affectedRows: affected,
         };
     }
-    // DDL or unknown
-    return { kind: "ddl" };
+    // DDL or unknown — sqlType 透传后端给的细粒度（CREATE_TABLE / DROP_TABLE / ...
+    //  / 笼统 "DDL"），CLI JSON 输出直接当 command 用
+    return { kind: "ddl", sqlType: r.sqlType };
 }
 /** DML 的 data 通常是 `[{"rowCount": N}]`；兜底从这里读影响行数。 */
 function extractRowCount(data) {
@@ -82,7 +89,6 @@ function toSummary(t, stats) {
         columns: (t.fields ?? []).length,
         estimated_row_count: typeof stats?.estimatedRowCount === "number" ? stats.estimatedRowCount : null,
         size_bytes: typeof stats?.sizeBytes === "number" ? stats.sizeBytes : null,
-        updated_at: t.updatedAt,
     };
 }
 /**
@@ -118,8 +124,6 @@ function toDetail(t, stats) {
         indexes: rawIndexes.map(toIndex),
         estimated_row_count: typeof stats?.estimatedRowCount === "number" ? stats.estimatedRowCount : null,
         size_bytes: typeof stats?.sizeBytes === "number" ? stats.sizeBytes : null,
-        created_at: t.createdAt,
-        updated_at: t.updatedAt,
     };
 }
 function toColumn(f) {

package/dist/api/file/api.js

@@ -214,7 +214,7 @@ async function resolveByName(appId, input) {
             error: {
                 code: "FILE_NOT_FOUND",
                 message: `File '${input}' does not exist`,
-                hint: "Run `miaoda file ls` to verify file_name.",
+                hint: "Run `miaoda file ls` to see available files.",
             },
         };
     }
@@ -225,7 +225,7 @@ async function resolveByName(appId, input) {
             error: {
                 code: "AMBIGUOUS_FILE_NAME",
                 message: `Multiple files match name '${input}' (${String(matches.length)} found)`,
-                hint: `Use absolute /path instead. Run \`miaoda file ls --name ${input}\` to see candidates.`,
+                hint: `Use path instead. Run \`miaoda file ls --name ${input}\` to see candidates.`,
             },
         };
     }

package/dist/api/file/client.js

@@ -8,8 +8,6 @@ exports.doPost = doPost;
 exports.doRequest = doRequest;
 const http_1 = require("../../utils/http");
 const error_1 = require("../../utils/error");
-// TODO(REMOVE-BEFORE-RELEASE): debug-only HTTP trace（详见 _debug_trace.ts）
-const _debug_trace_1 = require("./_debug_trace");
 const http_client_1 = require("@lark-apaas/http-client");
 /** 进程内 bucket 缓存：{appId: bucketId}。不跨进程。 */
 const bucketCache = new Map();
@@ -133,18 +131,10 @@ async function mapHttpError(err, opts) {
  */
 async function doGet(url, opts = {}, client = (0, http_1.getHttpClient)()) {
     try {
-        (0, _debug_trace_1.traceRequest)("GET", url, client);
         const response = await client.get(url);
-        (0, _debug_trace_1.traceResponse)("GET", url, response.status, response.headers, client);
         return (await response.json());
     }
     catch (err) {
-        if (err instanceof http_client_1.HttpError && err.response) {
-            (0, _debug_trace_1.traceResponse)("GET", url, err.response.status, err.response.headers, client);
-        }
-        else {
-            (0, _debug_trace_1.traceError)("GET", url, err, client);
-        }
         await mapHttpError(err, opts);
         throw err; // 不可达，mapHttpError 必定 throw
     }
@@ -152,18 +142,10 @@ async function doGet(url, opts = {}, client = (0, http_1.getHttpClient)()) {
 /** 包一层 client.post + HttpError 统一映射。默认 admin innerapi，可显式切 runtime。 */
 async function doPost(url, body, opts = {}, client = (0, http_1.getHttpClient)()) {
     try {
-        (0, _debug_trace_1.traceRequest)("POST", url, client);
         const response = await client.post(url, body);
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers, client);
         return (await response.json());
     }
     catch (err) {
-        if (err instanceof http_client_1.HttpError && err.response) {
-            (0, _debug_trace_1.traceResponse)("POST", url, err.response.status, err.response.headers, client);
-        }
-        else {
-            (0, _debug_trace_1.traceError)("POST", url, err, client);
-        }
         await mapHttpError(err, opts);
         throw err;
     }
@@ -171,18 +153,10 @@ async function doPost(url, body, opts = {}, client = (0, http_1.getHttpClient)()
 /** 包一层 client.request + HttpError 统一映射（DELETE 带 body 的场景）。 */
 async function doRequest(cfg, opts = {}, client = (0, http_1.getHttpClient)()) {
     try {
-        (0, _debug_trace_1.traceRequest)(cfg.method, cfg.url, client);
         const response = await client.request(cfg);
-        (0, _debug_trace_1.traceResponse)(cfg.method, cfg.url, response.status, response.headers, client);
         return (await response.json());
     }
     catch (err) {
-        if (err instanceof http_client_1.HttpError && err.response) {
-            (0, _debug_trace_1.traceResponse)(cfg.method, cfg.url, err.response.status, err.response.headers, client);
-        }
-        else {
-            (0, _debug_trace_1.traceError)(cfg.method, cfg.url, err, client);
-        }
         await mapHttpError(err, opts);
         throw err;
     }

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

@@ -55,14 +55,14 @@ async function handleDbSchemaList(opts) {
         return;
     }
     const tty = (0, render_1.isStdoutTty)();
-    // PRD 对齐：TTY 表头用 `size`（友好格式），non-TTY 用 `size_bytes`（原始整数）
+    // PRD 对齐：TTY 表头用 `size`（友好格式），non-TTY 用 `size_bytes`（原始整数）。
+    // updated_at 暂时不展示——PG pg_catalog 不存真实表时间，详见 renderDetail 注释。
     const headers = [
         "name",
         "description",
         "estimated_row_count",
         tty ? "size" : "size_bytes",
         "columns",
-        "updated_at",
     ];
     const rows = tables.map((t) => [
         t.name,
@@ -70,7 +70,6 @@ async function handleDbSchemaList(opts) {
         t.estimated_row_count === null ? "—" : String(t.estimated_row_count),
         t.size_bytes === null ? "—" : (tty ? (0, render_1.formatSize)(t.size_bytes) : String(t.size_bytes)),
         String(t.columns),
-        (0, render_1.formatTime)(t.updated_at, tty),
     ]);
     (0, output_1.emit)(tty ? (0, render_1.renderAlignedTable)(headers, rows) : (0, render_1.renderTsv)(headers, rows));
 }
@@ -123,7 +122,10 @@ async function handleDbSchemaGet(table, opts) {
 function renderDetail(d, tty) {
     const systemFields = d.columns.filter((c) => c.name.startsWith("_"));
     const userFields = d.columns.filter((c) => !c.name.startsWith("_"));
-    // PRD 的 header 布局：Name / Description / Columns(含"+ N system") / Estimated Rows / Size / Created / Updated
+    // header 布局：Name / Description / Columns(含"+ N system") / Estimated Rows / Size。
+    // 不展示 Created / Updated：PG pg_catalog 不存表创建时间，dataloom 用 OID
+    // 构造的伪时间戳（baseTime=2020-01-01 + OID 秒偏移），仅保排序意义、绝对值
+    // 误导性强，先去掉。后续如果接 ddl_change_log 取真实时间再加回。
     const header = [
         ["Name", d.name],
         ["Description", d.description ?? "—"],
@@ -135,8 +137,6 @@ function renderDetail(d, tty) {
         ],
         ["Estimated Rows", d.estimated_row_count === null ? "—" : String(d.estimated_row_count)],
         ["Size", d.size_bytes === null ? "—" : (0, render_1.formatSize)(d.size_bytes)],
-        ["Created", (0, render_1.formatTime)(d.created_at, tty)],
-        ["Updated", (0, render_1.formatTime)(d.updated_at, tty)],
     ];
     const colHeaders = ["column", "type", "nullable", "default", "comment"];
     const colRows = userFields.map((c) => [

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

@@ -47,7 +47,8 @@ const index_1 = require("../../../api/db/index");
  * - --env 透传给后端 admin-inner（dbBranch 参数），不传时由后端按 workspace
  *   多环境状态兜底（多环境 → dev / 单环境 → main）；后端检测到环境不存在
  *   会返 k_dl_1600000 + "Invalid DB Branch:..."，CLI 侧映射为 MULTI_ENV_NOT_INITIALIZED
- * - 多条语句时只展示最后一条的结果（与 PRD 对齐）；所有为 DDL 时展示批量摘要
+ * - 多语句行为对齐 PRD：每条 statement 一个独立结果元素，pretty 逐条 +
+ *   末尾汇总，--json 输出 data 数组。
  */
 async function handleDbSql(query, opts) {
     const appId = (0, shared_1.resolveAppId)(opts);
@@ -65,22 +66,16 @@ async function handleDbSql(query, opts) {
         (0, output_1.emit)("✓ No results");
         return;
     }
-    // 全部 DDL 的批量场景：展示统计摘要（对齐 PRD `✓ 3 statements executed`）
-    const allDdl = results.every((r) => r.sqlType === "DDL");
-    if (allDdl && results.length > 1) {
-        if ((0, output_1.isJsonMode)()) {
-            (0, output_1.emit)({ data: { statements: results.length } });
-            return;
-        }
-        const tty = (0, render_1.isStdoutTty)();
-        (0, output_1.emit)(tty
-            ? `✓ ${String(results.length)} statements executed`
-            : `OK ${String(results.length)} statements executed`);
+    if (results.length === 1) {
+        renderSingle(results[0]);
+        return;
+    }
+    // 多语句：每条 statement 独立结果
+    if ((0, output_1.isJsonMode)()) {
+        (0, output_1.emit)({ data: results.map((r) => toMultiElement((0, index_1.parseSqlResult)(r))) });
         return;
     }
-    // 其他场景：展示最后一条
-    const last = results[results.length - 1];
-    renderSingle(last);
+    renderMultiPretty(results);
 }
 /** 读取 stdin 并返回完整 SQL 文本（stdin 不是 TTY 即认为被 pipe）。 */
 async function readSql(inline) {
@@ -130,23 +125,78 @@ function renderSingle(raw) {
 }
 function toJson(parsed) {
     if (parsed.kind === "select") {
+        // PRD 单 SELECT：data 直接是行数组
         return { data: parsed.rows };
     }
     if (parsed.kind === "dml") {
+        // PRD 单 DML：data = {command, rows_affected}
         return {
             data: {
-                sql_type: parsed.sqlType.toLowerCase(),
-                affected_rows: parsed.affectedRows,
+                command: parsed.sqlType,
+                rows_affected: parsed.affectedRows,
             },
         };
     }
-    return { data: { sql_type: "ddl" } };
+    // PRD 单 DDL：data = {command, target?}。command 直接用后端给的细粒度
+    // （CREATE_TABLE / DROP_TABLE / ...），target 待后端给对象名后再加。
+    return { data: { command: parsed.sqlType } };
+}
+/**
+ * 多语句 --json 元素：与单 DDL/DML 形状一致，但 SELECT 包成
+ * {command:"SELECT", rows:[...]}（PRD 约定，避免数组里嵌套数组造成歧义）。
+ */
+function toMultiElement(parsed) {
+    if (parsed.kind === "select") {
+        return { command: "SELECT", rows: parsed.rows };
+    }
+    if (parsed.kind === "dml") {
+        return { command: parsed.sqlType, rows_affected: parsed.affectedRows };
+    }
+    // DDL：用后端给的细粒度 command
+    return { command: parsed.sqlType };
+}
+/** 多语句 pretty：逐条 `Statement N: ...` + 末尾 `✓ N statements executed`。 */
+function renderMultiPretty(results) {
+    const tty = (0, render_1.isStdoutTty)();
+    const lines = [];
+    for (let i = 0; i < results.length; i++) {
+        const parsed = (0, index_1.parseSqlResult)(results[i]);
+        const idx = i + 1;
+        if (parsed.kind === "select") {
+            const n = parsed.rows.length;
+            lines.push(`Statement ${String(idx)}: SELECT (${String(n)} row${n === 1 ? "" : "s"})`);
+            if (n > 0) {
+                const cols = collectColumns(parsed.rows);
+                const tbl = parsed.rows.map((r) => cols.map((c) => formatCell(r[c], tty)));
+                lines.push(tty ? (0, render_1.renderAlignedTable)(cols, tbl) : (0, render_1.renderTsv)(cols, tbl));
+            }
+            // 块间空行（最后一条不留）
+            if (i < results.length - 1)
+                lines.push("");
+            continue;
+        }
+        if (parsed.kind === "dml") {
+            const verb = dmlVerb(parsed.sqlType);
+            const n = parsed.affectedRows;
+            lines.push(`Statement ${String(idx)}: ${tty ? "✓ " : ""}${String(n)} row${n === 1 ? "" : "s"} ${verb}`);
+            continue;
+        }
+        // DDL
+        lines.push(`Statement ${String(idx)}: ${tty ? "✓ " : ""}DDL executed`);
+    }
+    // 汇总行：所有 statement 都跑完了
+    lines.push(tty
+        ? `✓ ${String(results.length)} statements executed`
+        : `OK ${String(results.length)} statements executed`);
+    (0, output_1.emit)(lines.join("\n"));
 }
 function dmlVerb(type) {
     switch (type) {
         case "INSERT": return "inserted";
         case "UPDATE": return "updated";
         case "DELETE": return "deleted";
+        case "MERGE": return "merged";
+        case "DML": return "affected"; // 未识别子类的兜底
     }
 }
 /** 从第一行收集列顺序；缺失列保留空白（兼容稀疏行）。 */

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

@@ -103,13 +103,20 @@ async function resolveDeleteInputs(appId, paths, names) {
     }
     return { resolved, errors };
 }
-async function confirm(count) {
+/**
+ * 删除前 TTY 二次确认。
+ * PRD 单文件场景下提示带具体路径：`? Delete '/path'? (y/N)`，
+ * 多文件场景汇总条数：`? Delete N files? (y/N)`。
+ * `firstInput` 是用户传入的第一个值（可能是 path 或 file_name），
+ * 单文件时直接展示给用户，方便核对目标。
+ */
+async function confirm(count, firstInput) {
     const rl = node_readline_1.default.createInterface({
         input: process.stdin,
         output: process.stderr,
     });
     return new Promise((resolve) => {
-        const prompt = count === 1 ? `? Delete 1 file? (y/N) ` : `? Delete ${String(count)} files? (y/N) `;
+        const prompt = count === 1 ? `? Delete '${firstInput}'? (y/N) ` : `? Delete ${String(count)} files? (y/N) `;
         rl.question(prompt, (answer) => {
             rl.close();
             resolve(answer.trim().toLowerCase() === "y");
@@ -129,7 +136,10 @@ async function handleFileRm(paths, opts) {
     // destructive guardrail
     const tty = (0, render_1.isStdoutTty)();
     if (tty && !opts.yes) {
-        const ok = await confirm(totalCount);
+        // 单文件提示带具体目标方便用户核对；多文件传第一个 input 占位（实际只显示 N files）
+        // 上面已校验 totalCount > 0，paths/names 至少有一个非空
+        const firstInput = paths.length > 0 ? paths[0] : names[0];
+        const ok = await confirm(totalCount, firstInput);
         if (!ok) {
             throw new error_1.AppError("DESTRUCTIVE_CANCELLED", "Cancelled by user");
         }
@@ -173,6 +183,7 @@ async function handleFileRm(paths, opts) {
                     input,
                     code: "INTERNAL_ERROR",
                     message: "Delete request returned success but file still exists (server-side issue)",
+                    hint: undefined,
                 };
             }
             catch (err) {
@@ -181,12 +192,14 @@ async function handleFileRm(paths, opts) {
                         input,
                         code: "FILE_NOT_FOUND",
                         message: `File '${input}' does not exist at delete time`,
+                        hint: "Run `miaoda file ls` to see available files.",
                     };
                 }
                 return {
                     input,
                     code: "INTERNAL_ERROR",
                     message: err instanceof Error ? err.message : "verification failed",
+                    hint: undefined,
                 };
             }
         }));
@@ -194,7 +207,9 @@ async function handleFileRm(paths, opts) {
             results.push({
                 status: "error",
                 input: c.input,
-                error: { code: c.code, message: c.message },
+                error: c.hint
+                    ? { code: c.code, message: c.message, hint: c.hint }
+                    : { code: c.code, message: c.message },
             });
         }
     }
@@ -233,7 +248,12 @@ async function handleFileRm(paths, opts) {
             else
                 lines.push(`FAIL\t${r.input}\t${r.error.message}`);
         }
-        lines.push(`Deleted ${String(okCount)} of ${String(totalCount)} files`);
+        if (failCount === 0) {
+            lines.push(`Deleted ${String(okCount)} of ${String(totalCount)} files`);
+        }
+        else {
+            lines.push(`Deleted ${String(okCount)} of ${String(totalCount)} files (${String(failCount)} failed)`);
+        }
         (0, output_1.emit)(lines.join("\n"));
     }
     // 退出码：任一失败 → 1；全成功 → 0

package/dist/utils/error.js

@@ -5,12 +5,14 @@ class AppError extends Error {
     code;
     retryable;
     next_actions;
+    statement_index;
     constructor(code, message, opts) {
         super(message);
         this.name = "AppError";
         this.code = code;
         this.retryable = opts?.retryable ?? false;
         this.next_actions = opts?.next_actions ?? [];
+        this.statement_index = opts?.statement_index;
     }
     toJSON() {
         return {
@@ -18,6 +20,7 @@ class AppError extends Error {
             message: this.message,
             retryable: this.retryable,
             next_actions: this.next_actions,
+            statement_index: this.statement_index,
         };
     }
 }

package/dist/utils/output.js

@@ -32,19 +32,22 @@ function emit(data) {
 /**
  * 输出错误（写入 stderr）
  * - pretty 模式：Error: message\n  hint: ...
- * - json 模式：{"error_code": "...", "message": "...", "hint": "..."}
+ * - json 模式：PRD 约定 envelope 为 `{error: {code, message, hint?}}`
  */
 function emitError(err) {
     const info = toErrorInfo(err);
     if (isJsonMode()) {
-        const jsonErr = {
-            error_code: info.code,
+        const errObj = {
+            code: info.code,
             message: info.message,
         };
         if (info.next_actions && info.next_actions.length > 0) {
-            jsonErr.hint = info.next_actions.join(" ");
+            errObj.hint = info.next_actions.join(" ");
         }
-        process.stderr.write(JSON.stringify(jsonErr) + "\n");
+        if (typeof info.statement_index === "number") {
+            errObj.statement_index = info.statement_index;
+        }
+        process.stderr.write(JSON.stringify({ error: errObj }) + "\n");
     }
     else {
         process.stderr.write(`Error: ${info.message}\n`);

package/dist/utils/render.js

@@ -71,9 +71,39 @@ function formatTime(iso, isTty) {
  * 算进列宽（比如 dim "NULL" 实际占 4 字符但 .length=11），导致表格对齐错位。
  */
 const ANSI_SGR_RE = /\[[0-9;]*m/g;
-/** cell 可见字符宽度：剥离 ANSI 转义后再算长度。 */
+/**
+ * 单字符的终端列宽：CJK 全角字符（汉字/假名/全角符号等）占 2 列，其它占 1 列。
+ * 对齐 Unicode East Asian Width 的 W/F 类，等价于 wcwidth 简化版。
+ * 不实现合字 / 零宽字符（ZWJ / 变体选择符）等极端情况，CLI 表格场景够用。
+ */
+function charWidth(cp) {
+    if ((cp >= 0x1100 && cp <= 0x115F) || // Hangul Jamo
+        cp === 0x2329 || cp === 0x232A ||
+        (cp >= 0x2E80 && cp <= 0x303E) || // CJK Radicals / Punctuation
+        (cp >= 0x3041 && cp <= 0x33FF) || // Hiragana / Katakana / CJK Symbols
+        (cp >= 0x3400 && cp <= 0x4DBF) || // CJK Ext A
+        (cp >= 0x4E00 && cp <= 0x9FFF) || // CJK Unified
+        (cp >= 0xA000 && cp <= 0xA4CF) || // Yi
+        (cp >= 0xAC00 && cp <= 0xD7A3) || // Hangul Syllables
+        (cp >= 0xF900 && cp <= 0xFAFF) || // CJK Compat Ideographs
+        (cp >= 0xFE30 && cp <= 0xFE4F) || // CJK Compat Forms
+        (cp >= 0xFF00 && cp <= 0xFF60) || // Fullwidth Forms
+        (cp >= 0xFFE0 && cp <= 0xFFE6) ||
+        (cp >= 0x20000 && cp <= 0x2FFFD) || // CJK Ext B-F
+        (cp >= 0x30000 && cp <= 0x3FFFD) // CJK Ext G-H
+    ) {
+        return 2;
+    }
+    return 1;
+}
+/** cell 可见字符宽度：剥离 ANSI 转义后按终端列宽逐字符累加（CJK 算 2 列）。 */
 function visibleWidth(s) {
-    return s.replace(ANSI_SGR_RE, "").length;
+    const stripped = s.replace(ANSI_SGR_RE, "");
+    let w = 0;
+    for (const c of stripped) {
+        w += charWidth(c.codePointAt(0) ?? 0);
+    }
+    return w;
 }
 function padVisibleEnd(s, targetWidth) {
     const w = visibleWidth(s);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.0-alpha.41ce8f5",
+  "version": "0.1.0-alpha.465bdb8",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {

package/dist/api/db/_debug_trace.js

@@ -1,83 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.traceRequest = traceRequest;
-exports.traceResponse = traceResponse;
-exports.traceError = traceError;
-const config_1 = require("../../utils/config");
-const logger_1 = require("../../utils/logger");
-/**
- * 从 HttpClient 实例抠出 baseURL，用于把相对 path 拼成完整 URL 输出。
- * defaultConfig.baseURL 在 http-client 0.1.4 d.ts 里没声明但运行时可访问；
- * 找不到时返回空串（trace 仍能输出 path，只是不完整）。
- */
-function clientBaseURL(client) {
-    return client?.defaultConfig?.baseURL ?? "";
-}
-/**
- * 给 client 注册一个最后的 request interceptor：等 platform plugin / canary
- * 等其它拦截器把 JWT / AK/SK / X-Miaoda-Client-Token / x-tt-env 注入 cfg.headers
- * 之后，用注入完毕的 cfg 拼一行可直接复制运行的 curl 命令打到 stderr。
- *
- * 拦截器只装一次（用 client 实例的 Symbol 标记），verbose 关闭时拦截器内
- * 直接 return（零开销）。
- */
-function installCurlTrace(client) {
-    const c = client;
-    if (c.__miaoda_curl_trace_installed__)
-        return;
-    // 单测里的 mock client 没有 interceptors，直接 noop 避免炸测试。
-    const interceptors = client.interceptors;
-    if (!interceptors)
-        return;
-    c.__miaoda_curl_trace_installed__ = true;
-    interceptors.request.use((cfg) => {
-        if (!(0, config_1.getConfig)().verbose)
-            return cfg;
-        const method = (cfg.method ?? "GET").toUpperCase();
-        const url = `${cfg.baseURL ?? ""}${cfg.url ?? ""}`;
-        const parts = [`curl -i -X ${method} '${url}'`];
-        const headers = cfg.headers instanceof Headers
-            ? cfg.headers
-            : new Headers(cfg.headers ?? {});
-        headers.forEach((v, k) => parts.push(`  -H '${k}: ${v}'`));
-        if (cfg.body !== undefined && cfg.body !== null) {
-            let body;
-            if (typeof cfg.body === "string")
-                body = cfg.body;
-            else if (cfg.body instanceof ArrayBuffer || cfg.body instanceof Uint8Array)
-                body = "<binary>";
-            else
-                body = JSON.stringify(cfg.body);
-            const escaped = body.replace(/'/g, "'\\''");
-            parts.push(`  -d '${escaped}'`);
-        }
-        (0, logger_1.debug)(`curl:\n${parts.join(" \\\n")}`);
-        return cfg;
-    });
-}
-/** 请求前打 method + 完整 URL；同时懒装 curl-trace 拦截器（idempotent）。 */
-function traceRequest(method, url, client) {
-    if (client)
-        installCurlTrace(client);
-    (0, logger_1.debug)(`http → ${method} ${clientBaseURL(client)}${url}`);
-}
-/** 响应后打 status + x-tt-logid。 */
-function traceResponse(method, url, status, headers, client) {
-    const logId = headers?.get("x-tt-logid") ?? headers?.get("X-Tt-Logid") ?? "(none)";
-    (0, logger_1.debug)(`http ← ${method} ${clientBaseURL(client)}${url} status=${String(status)} x-tt-logid=${logId}`);
-}
-/**
- * 网络层错误（fetch failed / DNS / TLS / 连接拒绝）兜底：response 没回来，
- * 没有 logid，但要把错误原因记到 trace，避免用户只看到 "Error: fetch failed"。
- */
-function traceError(method, url, err, client) {
-    const msg = err instanceof Error ? err.message : String(err);
-    // undici 的 "fetch failed" 真实原因在 err.cause（DNS/TLS/proxy/ECONNREFUSED 各种），
-    // 单看 message 全是 "fetch failed"，把 cause 也打出来才能定位。
-    const cause = err?.cause;
-    const causeMsg = cause instanceof Error
-        ? `${cause.name}: ${cause.message}${cause.code ? ` [${cause.code ?? ""}]` : ""}`
-        : cause !== undefined ? JSON.stringify(cause) : "";
-    const tail = causeMsg ? `, cause=${causeMsg}` : "";
-    (0, logger_1.debug)(`http ✗ ${method} ${clientBaseURL(client)}${url} (no response, network-level error: ${msg}${tail})`);
-}

package/dist/api/file/_debug_trace.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.traceRequest = traceRequest;
-exports.traceResponse = traceResponse;
-exports.traceError = traceError;
-const config_1 = require("../../utils/config");
-const logger_1 = require("../../utils/logger");
-function clientBaseURL(client) {
-    return client?.defaultConfig?.baseURL ?? "";
-}
-function installCurlTrace(client) {
-    const c = client;
-    if (c.__miaoda_curl_trace_installed__)
-        return;
-    // 单测里的 mock client 没有 interceptors，直接 noop 避免炸测试。
-    const interceptors = client.interceptors;
-    if (!interceptors)
-        return;
-    c.__miaoda_curl_trace_installed__ = true;
-    interceptors.request.use((cfg) => {
-        if (!(0, config_1.getConfig)().verbose)
-            return cfg;
-        const method = (cfg.method ?? "GET").toUpperCase();
-        const url = `${cfg.baseURL ?? ""}${cfg.url ?? ""}`;
-        const parts = [`curl -i -X ${method} '${url}'`];
-        const headers = cfg.headers instanceof Headers
-            ? cfg.headers
-            : new Headers(cfg.headers ?? {});
-        headers.forEach((v, k) => parts.push(`  -H '${k}: ${v}'`));
-        if (cfg.body !== undefined && cfg.body !== null) {
-            let body;
-            if (typeof cfg.body === "string")
-                body = cfg.body;
-            else if (cfg.body instanceof ArrayBuffer || cfg.body instanceof Uint8Array)
-                body = "<binary>";
-            else
-                body = JSON.stringify(cfg.body);
-            const escaped = body.replace(/'/g, "'\\''");
-            parts.push(`  -d '${escaped}'`);
-        }
-        (0, logger_1.debug)(`curl:\n${parts.join(" \\\n")}`);
-        return cfg;
-    });
-}
-/** 请求前打 method + 完整 URL；同时懒装 curl-trace 拦截器（idempotent）。 */
-function traceRequest(method, url, client) {
-    if (client)
-        installCurlTrace(client);
-    (0, logger_1.debug)(`http → ${method} ${clientBaseURL(client)}${url}`);
-}
-/** 响应后打 status + x-tt-logid。 */
-function traceResponse(method, url, status, headers, client) {
-    const logId = headers?.get("x-tt-logid") ?? headers?.get("X-Tt-Logid") ?? "(none)";
-    (0, logger_1.debug)(`http ← ${method} ${clientBaseURL(client)}${url} status=${String(status)} x-tt-logid=${logId}`);
-}
-/**
- * 网络层错误（fetch failed / DNS / TLS / 连接拒绝）兜底：response 没回来，
- * 没有 logid，但要把错误原因记到 trace，避免用户只看到 "Error: fetch failed"。
- */
-function traceError(method, url, err, client) {
-    const msg = err instanceof Error ? err.message : String(err);
-    // undici 的 "fetch failed" 真实原因在 err.cause（DNS/TLS/proxy/ECONNREFUSED 各种），
-    // 单看 message 全是 "fetch failed"，把 cause 也打出来才能定位。
-    const cause = err?.cause;
-    const causeMsg = cause instanceof Error
-        ? `${cause.name}: ${cause.message}${cause.code ? ` [${cause.code ?? ""}]` : ""}`
-        : cause !== undefined ? JSON.stringify(cause) : "";
-    const tail = causeMsg ? `, cause=${causeMsg}` : "";
-    (0, logger_1.debug)(`http ✗ ${method} ${clientBaseURL(client)}${url} (no response, network-level error: ${msg}${tail})`);
-}