@lark-apaas/miaoda-cli 0.1.0 → 0.1.1-alpha.07b4fd5

package/dist/utils/http.js

@@ -1,30 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHttpClient = getHttpClient;
+exports.getRuntimeHttpClient = getRuntimeHttpClient;
 exports.resetHttpClient = resetHttpClient;
 exports.setHttpClient = setHttpClient;
+exports.setRuntimeHttpClient = setRuntimeHttpClient;
 exports.applyCanaryHeader = applyCanaryHeader;
 const http_client_1 = require("@lark-apaas/http-client");
-let client;
-/** 获取单例 HttpClient，首次调用时初始化 */
+let adminClient;
+let runtimeClient;
+/**
+ * 获取单例 HttpClient（默认：管理端 innerapi）。
+ *
+ * 管理端链路仅适用于妙搭开发态——baseURL 从 `MIAODA_DEV_INNER_DOMAIN_WITH_PREFIX` 读取，
+ * 每次请求自动从 `MIAODA_AUTHN_CODE` 读取用户凭证并注入 `X-Miaoda-Client-Token`。
+ * AK/SK 的 `Authorization` / `x-api-key` 照旧叠加。
+ *
+ * 访问运行端 innerapi（`/api/v1/studio/innerapi/...`）请使用 {@link getRuntimeHttpClient}。
+ */
 function getHttpClient() {
-    client ??= createClient();
-    return client;
+    adminClient ??= createClient({ adminInnerApi: true });
+    return adminClient;
 }
-/** 重建客户端 */
+/** 运行端 innerapi 单例。baseURL 来自 `FORCE_AUTHN_INNERAPI_DOMAIN`。 */
+function getRuntimeHttpClient() {
+    runtimeClient ??= createClient({ adminInnerApi: false });
+    return runtimeClient;
+}
+/** 重建管理端与运行端客户端（测试/配置变更后调用）。 */
 function resetHttpClient() {
-    client = undefined;
+    adminClient = undefined;
+    runtimeClient = undefined;
 }
-/** 替换为自定义 HttpClient 实例（用于测试 mock） */
+/** 替换管理端 HttpClient 实例（用于测试 mock）。 */
 function setHttpClient(custom) {
-    client = custom;
+    adminClient = custom;
+}
+/** 替换运行端 HttpClient 实例（用于测试 mock）。 */
+function setRuntimeHttpClient(custom) {
+    runtimeClient = custom;
 }
-function createClient() {
+function createClient(opts) {
     const config = {
         timeout: 30_000,
         platform: {
             enabled: true,
-            tokenProvider: { type: "file" },
+            adminInnerApi: opts.adminInnerApi,
         },
         security: {
             strictMode: true,

package/dist/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setHttpClient = exports.resetHttpClient = exports.getHttpClient = exports.log = exports.debug = exports.isJsonMode = exports.emitError = exports.emit = exports.getLogId = exports.generateLogId = exports.initConfigFromOpts = exports.resetConfig = exports.setConfig = exports.getConfig = exports.HttpError = exports.AppError = void 0;
+exports.setRuntimeHttpClient = exports.setHttpClient = exports.resetHttpClient = exports.getRuntimeHttpClient = exports.getHttpClient = exports.log = exports.debug = exports.isJsonMode = exports.emitError = exports.emit = exports.getLogId = exports.generateLogId = exports.initConfigFromOpts = exports.resetConfig = exports.setConfig = exports.getConfig = exports.HttpError = exports.AppError = void 0;
 var error_1 = require("./error");
 Object.defineProperty(exports, "AppError", { enumerable: true, get: function () { return error_1.AppError; } });
 Object.defineProperty(exports, "HttpError", { enumerable: true, get: function () { return error_1.HttpError; } });
@@ -21,5 +21,7 @@ Object.defineProperty(exports, "debug", { enumerable: true, get: function () { r
 Object.defineProperty(exports, "log", { enumerable: true, get: function () { return logger_1.log; } });
 var http_1 = require("./http");
 Object.defineProperty(exports, "getHttpClient", { enumerable: true, get: function () { return http_1.getHttpClient; } });
+Object.defineProperty(exports, "getRuntimeHttpClient", { enumerable: true, get: function () { return http_1.getRuntimeHttpClient; } });
 Object.defineProperty(exports, "resetHttpClient", { enumerable: true, get: function () { return http_1.resetHttpClient; } });
 Object.defineProperty(exports, "setHttpClient", { enumerable: true, get: function () { return http_1.setHttpClient; } });
+Object.defineProperty(exports, "setRuntimeHttpClient", { enumerable: true, get: function () { return http_1.setRuntimeHttpClient; } });

package/dist/utils/output.js

@@ -3,8 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isJsonMode = isJsonMode;
 exports.emit = emit;
 exports.emitError = emitError;
+exports.emitOk = emitOk;
+exports.emitPaged = emitPaged;
 const config_1 = require("./config");
 const error_1 = require("./error");
+const colors_1 = require("./colors");
+/**
+ * 服务端错误码 → CLI 兜底 hint 文案。
+ *
+ * 服务端错误协议只有 `{code, msg}` 两个字段（dataloom InnerExecuteSQL 等 IDL
+ * 没有 hint / next_actions 通道），所以服务端给的错误本身永远没有 hint。
+ * 这里是 CLI 展示层为常见错误码补一份 spec 一致的 actionable 引导，按错误码
+ * 落到 next_actions。
+ *
+ * 仅在 next_actions 已经为空时介入——保留 handler / enrichSqlError 自己塞过的
+ * 具体 hint（如 did-you-mean、shared.resolveAppId 等），它们优先级更高。
+ */
+const SERVER_ERROR_HINTS = {
+    // SELECT 结果集超过 1000 行硬拦：spec 多行引导。
+    // key 用 BIZ_ERR_MAP 映射后的语义 code（不是原始服务端 k_dl_xxx），保持
+    // 与 help / 文档里宣传的 RESULT_SET_TOO_LARGE 一致。
+    "RESULT_SET_TOO_LARGE": [
+        "Add `LIMIT <n>` to your SQL to narrow the result.",
+        "For counts, use `SELECT count(*) FROM ...`; for aggregation, use GROUP BY with filters.",
+    ],
+};
 function isJsonMode() {
     const cfg = (0, config_1.getConfig)();
     return cfg.output === "json" || Boolean(cfg.json);
@@ -30,27 +53,70 @@ 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);
+    // 没人给过 next_actions 才走错误码兜底；handler 已经塞过具体 hint 时不覆盖
+    const hints = info.next_actions && info.next_actions.length > 0
+        ? info.next_actions
+        : (SERVER_ERROR_HINTS[info.code] ?? []);
     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(" ");
+        if (hints.length > 0) {
+            // JSON 输出压平成单行，更便于机器消费（脚本 / agent 拼字符串）
+            errObj.hint = hints.join(" ");
+        }
+        if (typeof info.statement_index === "number") {
+            errObj.statement_index = info.statement_index;
+        }
+        // PRD 多语句失败 envelope 额外字段：completed / rolled_back
+        if (Array.isArray(info.completed)) {
+            errObj.completed = info.completed;
         }
-        process.stderr.write(JSON.stringify(jsonErr) + "\n");
+        if (typeof info.rolled_back === "boolean") {
+            errObj.rolled_back = info.rolled_back;
+        }
+        process.stderr.write(JSON.stringify({ error: errObj }) + "\n");
     }
     else {
-        process.stderr.write(`Error: ${info.message}\n`);
-        if (info.next_actions && info.next_actions.length > 0) {
-            process.stderr.write(`  hint: ${info.next_actions.join(" ")}\n`);
+        // stderr 染色：picocolors 默认按 stdout.isTTY 判断；stderr 通常也是 tty，
+        // 这里复用 stdout 探测保持简单（stderr only-pipe 的极端场景留作后续优化）
+        // 多语句失败时 Error 行末尾追加 "(at statement K of N)"，与 PRD spec 对齐
+        let errorLine = `${colors_1.c.fail("Error:")} ${info.message}`;
+        if (typeof info.statement_index === "number") {
+            const k = info.statement_index + 1;
+            const n = info.total_statements;
+            errorLine += typeof n === "number" && n > 0
+                ? ` (at statement ${String(k)} of ${String(n)})`
+                : ` (at statement ${String(k)})`;
+        }
+        process.stderr.write(errorLine + "\n");
+        // 多行 hint：第一行带 "hint:" 标签，后续行用 8 空格缩进对齐 "  hint: " 之后的列。
+        // 对应 spec 期望的格式：
+        //   Error: ...
+        //     hint: 第一条建议
+        //           第二条建议
+        if (hints.length > 0) {
+            const [first, ...rest] = hints;
+            process.stderr.write(`  ${colors_1.c.muted("hint:")} ${first}\n`);
+            for (const line of rest) {
+                process.stderr.write(`        ${line}\n`);
+            }
         }
     }
 }
+/** 发送成功 JSON envelope（非分页）：`{ data }`。 */
+function emitOk(data) {
+    emit({ data });
+}
+/** 发送成功 JSON envelope（分页信封：`{ data, next_cursor, has_more }`）。 */
+function emitPaged(items, nextCursor, hasMore) {
+    emit({ data: items, next_cursor: nextCursor, has_more: hasMore });
+}
 function toErrorInfo(err) {
     if (err instanceof error_1.AppError)
         return err.toJSON();

package/dist/utils/render.js

@@ -0,0 +1,192 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatSize = formatSize;
+exports.formatTime = formatTime;
+exports.visibleWidth = visibleWidth;
+exports.renderAlignedTable = renderAlignedTable;
+exports.renderTsv = renderTsv;
+exports.renderKeyValue = renderKeyValue;
+exports.isStdoutTty = isStdoutTty;
+exports.parseDuration = parseDuration;
+exports.parseSize = parseSize;
+/**
+ * CLI 渲染 / 解析工具：跨域共用的格式化、表格渲染、字符串解析。
+ *
+ * 按 AGENTS.md §2.2，跨域共享逻辑统一下沉到 `src/utils/*`。
+ * 这里聚合 db / file 域 handler 共用的纯函数：
+ *   - 格式化：formatSize / formatTime
+ *   - 表格渲染：renderAlignedTable / renderTsv / renderKeyValue
+ *   - 终端探测：isStdoutTty
+ *   - 字符串解析：parseDuration / parseSize
+ *
+ * 彩色高亮的语义层封装见 ./colors.ts。表头 / key 标签等结构性元素由本文件
+ * 主动调用 colors.c 染色；业务文案的染色（成功/失败 prefix 等）由 handler 自治。
+ *
+ * JSON envelope 输出（emit / emitOk / emitPaged / emitError）见 ./output.ts。
+ */
+const colors_1 = require("./colors");
+/** 将字节数格式化为人类可读（`24 KB` / `2.1 MB` / `1.5 GB`）。 */
+function formatSize(bytes) {
+    if (!Number.isFinite(bytes) || bytes < 0)
+        return "—";
+    if (bytes >= 1 << 30)
+        return `${(bytes / (1 << 30)).toFixed(1)} GB`;
+    if (bytes >= 1 << 20)
+        return `${(bytes / (1 << 20)).toFixed(1)} MB`;
+    if (bytes >= 1 << 10)
+        return `${(bytes / (1 << 10)).toFixed(0)} KB`;
+    return `${String(bytes)} bytes`;
+}
+/** 将 ISO 时间转为 TTY 下更友好的相对时间；non-TTY 保持 ISO 原值。 */
+function formatTime(iso, isTty) {
+    if (!iso)
+        return "—";
+    if (!isTty)
+        return iso;
+    const ts = Date.parse(iso);
+    if (Number.isNaN(ts))
+        return iso;
+    const diff = Date.now() - ts;
+    const minute = 60_000;
+    const hour = 60 * minute;
+    const day = 24 * hour;
+    if (diff < hour) {
+        const m = Math.max(1, Math.round(diff / minute));
+        return `${String(m)}m ago`;
+    }
+    if (diff < day) {
+        const h = Math.round(diff / hour);
+        return `${String(h)}h ago`;
+    }
+    if (diff < 7 * day) {
+        const d = Math.round(diff / day);
+        return `${String(d)}d ago`;
+    }
+    // 超过 7 天，用 YYYY-MM-DD
+    const date = new Date(ts);
+    const y = String(date.getFullYear());
+    const mo = String(date.getMonth() + 1).padStart(2, "0");
+    const da = String(date.getDate()).padStart(2, "0");
+    return `${y}-${mo}-${da}`;
+}
+/**
+ * SGR (Select Graphic Rendition) ANSI 转义匹配：`ESC[<digits;...>m`。
+ * 用于在列宽计算时剥离不显示的控制字符——否则带 ANSI 颜色的 cell 会按 .length
+ * 算进列宽（比如 dim "NULL" 实际占 4 字符但 .length=11），导致表格对齐错位。
+ */
+const ANSI_SGR_RE = /\[[0-9;]*m/g;
+/**
+ * 单字符的终端列宽：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) {
+    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);
+    return w >= targetWidth ? s : s + " ".repeat(targetWidth - w);
+}
+/** 渲染 TTY 对齐表格（多行，列宽按最长内容；ANSI 转义不计入列宽）。
+ *  表头按 spec 用 bold + cyan 染色；ANSI 序列由 visibleWidth 剥离不影响列宽。 */
+function renderAlignedTable(headers, rows) {
+    const colWidths = headers.map((h, i) => {
+        let w = visibleWidth(h);
+        for (const row of rows) {
+            const cw = visibleWidth(row[i] || "");
+            if (cw > w)
+                w = cw;
+        }
+        return w;
+    });
+    const lines = [];
+    lines.push(headers.map((h, i) => colors_1.c.header(padVisibleEnd(h, colWidths[i]))).join("  ").trimEnd());
+    for (const row of rows) {
+        lines.push(row.map((cell, i) => padVisibleEnd(cell || "", colWidths[i])).join("  ").trimEnd());
+    }
+    return lines.join("\n");
+}
+/** 渲染 non-TTY tab 分隔（字段原值，ISO 时间）。 */
+function renderTsv(headers, rows) {
+    const lines = [];
+    lines.push(headers.join("\t"));
+    for (const row of rows) {
+        lines.push(row.join("\t"));
+    }
+    return lines.join("\n");
+}
+/** 渲染 key-value 多行（用于 stat 等单条详情）。key 右对齐 + bold cyan 染色。 */
+function renderKeyValue(pairs, isTty) {
+    if (pairs.length === 0)
+        return "";
+    if (!isTty) {
+        return pairs.map(([k, v]) => `${k}\t${v}`).join("\n");
+    }
+    const keyWidth = Math.max(...pairs.map(([k]) => k.length));
+    return pairs
+        .map(([k, v]) => `${colors_1.c.header(k.padStart(keyWidth))}:  ${v}`)
+        .join("\n");
+}
+/** 通用 isTTY 判定（stdout 是否交互终端）。Node 运行时 isTTY 为 true 或 undefined；TS 类型上 tty.WriteStream 定义为固定 true，绕开做运行时判断。 */
+function isStdoutTty() {
+    const isTTY = process.stdout.isTTY;
+    return isTTY === true;
+}
+/** 解析时长字符串 `7d` / `24h` / `30m` → 秒。无后缀按秒。 */
+function parseDuration(input) {
+    const m = /^(\d+)([smhd]?)$/.exec(input.trim());
+    if (!m) {
+        throw new Error(`Invalid duration: ${input}`);
+    }
+    const n = Number(m[1]);
+    const unit = m[2] || "s";
+    switch (unit) {
+        case "s": return n;
+        case "m": return n * 60;
+        case "h": return n * 3600;
+        case "d": return n * 86400;
+        default: return n;
+    }
+}
+/** 解析 size 字符串 `1MB` / `500KB` / `1GB` → 字节。 */
+function parseSize(input) {
+    const m = /^(\d+(?:\.\d+)?)\s*(B|KB|MB|GB)?$/i.exec(input.trim());
+    if (!m) {
+        throw new Error(`Invalid size: ${input}`);
+    }
+    const n = Number(m[1]);
+    const unit = (m[2] || "B").toUpperCase();
+    switch (unit) {
+        case "B": return Math.round(n);
+        case "KB": return Math.round(n * 1024);
+        case "MB": return Math.round(n * 1024 * 1024);
+        case "GB": return Math.round(n * 1024 * 1024 * 1024);
+        default: return Math.round(n);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.0",
+  "version": "0.1.1-alpha.07b4fd5",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {
@@ -25,8 +25,9 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@lark-apaas/http-client": "^0.1.3",
-    "commander": "^13.1.0"
+    "@lark-apaas/http-client": "^0.1.5",
+    "commander": "^13.1.0",
+    "picocolors": "^1.1.1"
   },
   "devDependencies": {
     "@types/node": "^22.15.3",