@lark-apaas/miaoda-cli 0.1.2-alpha.b2b5ae5 → 0.1.2-alpha.b6d5335

package/dist/api/deploy/schemas.js

@@ -97,7 +97,7 @@ exports.errorJobSchema = {
     columns: [
         { key: "jobID", label: "job-id" },
         { key: "componentName", label: "component" },
-        { key: "errorMsg", label: "error", format: output_1.fmt.truncate(120) },
+        { key: "errorMsg", label: "error" },
     ],
     strict: true,
 };

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

@@ -20,6 +20,12 @@ function registerDeployCommands(program) {
         .option("--wait", "阻塞直到流水线终态", false)
         .option("--timeout <sec>", "--wait 最长等待秒数（默认 300）", parseTimeout, 300)
         .addHelpText("after", `
+部署前置检查（Agent 必须执行）
+  miaoda deploy 跑的是当前分支的远端 HEAD——本地未 commit / 未 push 的代码不会进发布产物。
+  调用前先 \`git status\` + \`git rev-list --count @{u}..HEAD\` 确认；有未提交 / 未推送时：
+    - 是本次任务的产物 → 先 commit + push 再 deploy
+    - 不能确定意图 → 用 AskUser 跟用户确认（不要默默继续）
+
 JSON 输出
   不带 --wait：{"data": {"pipelineTaskID": "..."}}（pipelineTaskID 即 deploy-id）
   带 --wait：data 额外包含 detail（pipeline 终态）
@@ -70,14 +76,9 @@ function registerDeployHistory(parent) {
         .command("history")
         .description("查询发布历史（按时间倒序，分页）")
         .addOption((0, shared_1.appIdOption)().hideHelp())
-        .addOption(new commander_1.Option("--status <status>", "状态过滤（pipeline 节点状态）").choices([
-        "todo",
-        "running",
-        "success",
-        "failed",
-        "canceled",
-        "hold_on",
-    ]))
+        .addOption(new commander_1.Option("--status <status>", "状态过滤（pipeline 节点状态，大小写不敏感）")
+        .choices(["todo", "running", "success", "failed", "canceled", "hold_on"])
+        .argParser((0, shared_1.caseInsensitiveChoice)(["todo", "running", "success", "failed", "canceled", "hold_on"])))
         .option("--since <time>", "起始时间")
         .option("--until <time>", "截止时间")
         .option("--limit <n>", "返回条数上限（1~100）", parseLimit, 50)

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

@@ -23,8 +23,7 @@ function registerObservabilityCommands(program) {
   应用上下文：--app-id <id> 或环境变量 MIAODA_APP_ID。
 
 应用环境
-  log/trace 命令需要 --env <dev|online>，默认 online，可设置 MIAODA_APP_ENV 覆盖。
-  metric/analytics 不需要 --env。
+  目前只支持线上环境。
 `);
     registerLog(obCmd);
     registerTrace(obCmd);
@@ -37,7 +36,9 @@ function registerLog(parent) {
         .command("log")
         .description("查询线上运行日志（按时间倒序，分页）")
         .addOption((0, shared_1.appIdOption)().hideHelp())
-        .addOption(new commander_1.Option("--level <level>", "日志级别").choices(["DEBUG", "INFO", "WARN", "ERROR"]))
+        .addOption(new commander_1.Option("--level <level>", "日志级别（大小写不敏感）")
+        .choices(["DEBUG", "INFO", "WARN", "ERROR"])
+        .argParser((0, shared_1.caseInsensitiveChoice)(["DEBUG", "INFO", "WARN", "ERROR"])))
         .option("--since <time>", "开始时间")
         .option("--until <time>", "截止时间")
         .option("--trace-id <id>", "按 trace ID 过滤")
@@ -156,9 +157,10 @@ function registerMetric(parent) {
         .option("--series <name>", "过滤图表中的某条线：latency 取 p50/p99；requests 取 total/error；缺省返回所有相关线")
         .option("--since <time>", "开始时间")
         .option("--until <time>", "截止时间")
-        .addOption(new commander_1.Option("--down-sample <duration>", "降采样粒度（1m=1分钟 / 1h=1小时 / 1d=1天）")
+        .addOption(new commander_1.Option("--down-sample <duration>", "降采样粒度（1m=1分钟 / 1h=1小时 / 1d=1天，大小写不敏感）")
         .choices(["1m", "1h", "1d"])
-        .default("1h"))
+        .argParser((0, shared_1.caseInsensitiveChoice)(["1m", "1h", "1d"]))
+        .default("1m"))
         .addHelpText("after", `${COMMON_TIME_HELP}
 JSON 输出
   {"data": [{"metricName": "...", "dimensions": {...}, "dataPoints": [...]}], "next_cursor": null, "has_more": false}

package/dist/cli/commands/shared.js

@@ -6,6 +6,7 @@ exports.softRequiredOption = softRequiredOption;
 exports.resolveAppId = resolveAppId;
 exports.withHelp = withHelp;
 exports.failArgs = failArgs;
+exports.caseInsensitiveChoice = caseInsensitiveChoice;
 exports.rejectCliOverride = rejectCliOverride;
 const commander_1 = require("commander");
 const error_1 = require("../../utils/error");
@@ -62,6 +63,29 @@ function withHelp(cmd, handler) {
 function failArgs(message) {
     throw new error_1.AppError("ARGS_INVALID", message);
 }
+/**
+ * 大小写不敏感的 choice argParser：把用户输入按 lowerCase 匹配回 canonical 数组里
+ * 的同名值（保留 canonical 大小写），未命中抛 Commander 的 InvalidArgumentError
+ * （exit code 1，自带友好错误）。
+ *
+ * 必须先 .choices(canonical)、再 .argParser()——Commander 内部 .choices() 会
+ * 重置 parseArg，反过来调会让 argParser 失效。.choices() 仅留给 help 渲染
+ * "choices: A, B, C"，实际白名单校验由 argParser 接管。
+ *
+ *   new Option("--level <level>", "日志级别（不区分大小写）")
+ *     .choices(["DEBUG", "INFO", "WARN", "ERROR"])
+ *     .argParser(caseInsensitiveChoice(["DEBUG", "INFO", "WARN", "ERROR"]));
+ */
+function caseInsensitiveChoice(canonical) {
+    const map = new Map(canonical.map((v) => [v.toLowerCase(), v]));
+    return (raw) => {
+        const hit = map.get(raw.toLowerCase());
+        if (hit === undefined) {
+            throw new commander_1.InvalidArgumentError(`Allowed choices are ${canonical.join(", ")} (case-insensitive).`);
+        }
+        return hit;
+    };
+}
 /**
  * 拒绝 CLI 显式覆盖：用于 hideHelp() + .env() 的"沙箱注入参数"（如 --app-id / --branch）。
  *

package/dist/cli/handlers/observability/analytics.js

@@ -42,6 +42,8 @@ const GRANULARITY_TO_UNIT = {
     day: "DAY",
     daily: "DAY",
     "1d": "DAY",
+    "1h": "HOUR",
+    hour: "HOUR",
     week: "WEEK",
     weekly: "WEEK",
     "1w": "WEEK",
@@ -72,9 +74,8 @@ async function handleObservabilityAnalytics(opts) {
     const timeAggregationUnit = opts.granularity
         ? (GRANULARITY_TO_UNIT[opts.granularity] ?? opts.granularity.toUpperCase())
         : "DAY";
-    // until 按 timeAggregationUnit 桶向上对齐，避免末桶数据丢失；since 保持原值。
     const nowMs = Date.now();
-    const sinceMs = (0, helpers_1.parseToMs)(opts.since) ?? nowMs - 7 * 86_400_000;
+    const sinceMs = (0, helpers_1.parseToMs)(opts.since) ?? nowMs - 30 * 86_400_000;
     const untilMs = (0, helpers_1.parseToMs)(opts.until) ?? nowMs;
     const bucket = timeAggregationUnit;
     const fieldFilters = (0, helpers_1.buildFieldFilters)([

package/dist/cli/handlers/observability/metric.js

@@ -71,7 +71,7 @@ async function handleObservabilityMetric(opts) {
     ]);
     // since/until 直接以秒透传到 BAM；当前未做桶对齐（如需开启把 until
     // 用 ceilMsToBucket(untilMs, downSample as GranularityBucket) 包一层即可）。
-    const downSample = opts.downSample ?? "1h";
+    const downSample = opts.downSample ?? "1m";
     const nowMs = Date.now();
     const sinceMs = (0, helpers_1.parseToMs)(opts.since) ?? nowMs - 30 * 86_400_000;
     const untilMs = (0, helpers_1.parseToMs)(opts.until) ?? nowMs;

package/dist/utils/http.js

@@ -10,6 +10,8 @@ exports.postInnerApi = postInnerApi;
 exports.getInnerApi = getInnerApi;
 const http_client_1 = require("@lark-apaas/http-client");
 const error_1 = require("./error");
+const config_1 = require("./config");
+const logger_1 = require("./logger");
 let adminClient;
 let runtimeClient;
 /**
@@ -70,11 +72,31 @@ function applyCanaryHeader(reqConfig) {
 }
 /** 走管理端 innerapi 的 POST + 信封解析 */
 async function postInnerApi(url, body, opts) {
-    return handleInnerEnvelope(await getHttpClient().post(url, body), url, opts);
+    const startMs = logRequestStart("POST", url, body);
+    let response;
+    try {
+        response = await getHttpClient().post(url, body);
+    }
+    catch (err) {
+        logResponseFailure("POST", url, err, startMs);
+        throw err;
+    }
+    logResponseEnd("POST", url, response, startMs);
+    return handleInnerEnvelope(response, url, opts);
 }
 /** 走管理端 innerapi 的 GET + 信封解析 */
 async function getInnerApi(url, opts) {
-    return handleInnerEnvelope(await getHttpClient().get(url), url, opts);
+    const startMs = logRequestStart("GET", url);
+    let response;
+    try {
+        response = await getHttpClient().get(url);
+    }
+    catch (err) {
+        logResponseFailure("GET", url, err, startMs);
+        throw err;
+    }
+    logResponseEnd("GET", url, response, startMs);
+    return handleInnerEnvelope(response, url, opts);
 }
 async function handleInnerEnvelope(response, url, opts) {
     if (!response.ok) {
@@ -85,6 +107,10 @@ async function handleInnerEnvelope(response, url, opts) {
         const env = result;
         if (env.status_code !== undefined && env.status_code !== "0") {
             const msg = env.message ?? env.error_msg ?? "unknown error";
+            // verbose: 把完整业务错误信封打到 stderr，便于追溯
+            if ((0, config_1.getConfig)().verbose) {
+                (0, logger_1.debug)(`  envelope: ${truncateForLog(safeStringify(env), 1000)}`);
+            }
             const mapped = opts.mapErr?.(env.status_code, msg);
             if (mapped)
                 throw mapped;
@@ -97,3 +123,63 @@ async function handleInnerEnvelope(response, url, opts) {
     }
     return result;
 }
+// ── verbose 调试日志 ────────────
+//
+// 仅作用于 inner-api 链路（postInnerApi / getInnerApi），即 app / deploy /
+// observability 三个域。--verbose 关闭时所有 helper 都直接退出，零开销。
+function logRequestStart(method, url, body) {
+    const startMs = Date.now();
+    if (!(0, config_1.getConfig)().verbose)
+        return startMs;
+    (0, logger_1.debug)(`→ ${method} ${url}`);
+    if (body !== undefined) {
+        (0, logger_1.debug)(`  body: ${truncateForLog(safeStringify(body), 1000)}`);
+    }
+    return startMs;
+}
+function logResponseEnd(method, url, response, startMs) {
+    if (!(0, config_1.getConfig)().verbose)
+        return;
+    const elapsedMs = Date.now() - startMs;
+    const logid = pickLogid(response.headers);
+    const tail = logid ? ` logid=${logid}` : "";
+    (0, logger_1.debug)(`← ${method} ${url} ${String(response.status)} ${String(elapsedMs)}ms${tail}`);
+}
+/**
+ * http-client 在 4xx/5xx / 网络错误时直接 reject（不返回 Response）；
+ * 这条路径下 logResponseEnd 不会跑——这里专门补一行，尽可能从 HttpError
+ * 上抠出 status / logid，让 verbose 仍能看到失败请求的关键信息。
+ */
+function logResponseFailure(method, url, err, startMs) {
+    if (!(0, config_1.getConfig)().verbose)
+        return;
+    const elapsedMs = Date.now() - startMs;
+    // @lark-apaas/http-client 的 HttpError.response: Response | undefined
+    const e = err;
+    const status = e.response?.status;
+    const logid = e.response?.headers ? pickLogid(e.response.headers) : null;
+    const statusPart = status !== undefined ? String(status) : "ERR";
+    const logidPart = logid ? ` logid=${logid}` : "";
+    const msgPart = e.message ? ` (${e.message})` : "";
+    (0, logger_1.debug)(`✗ ${method} ${url} ${statusPart} ${String(elapsedMs)}ms${logidPart}${msgPart}`);
+}
+/** BAM gateway 在不同 PSM/版本上 logid 落在不同 header；按命中顺序取第一个非空。 */
+function pickLogid(headers) {
+    return (headers.get("x-tt-logid") ??
+        headers.get("x-logid") ??
+        headers.get("logid") ??
+        headers.get("x-tt-trace-tag"));
+}
+function safeStringify(v) {
+    try {
+        return JSON.stringify(v);
+    }
+    catch {
+        return String(v);
+    }
+}
+function truncateForLog(s, n) {
+    if (s.length <= n)
+        return s;
+    return `${s.slice(0, n)}...(truncated, ${String(s.length)} chars)`;
+}

package/package.json

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