@lark-apaas/miaoda-cli 0.1.0-alpha.8825a76 → 0.1.0-alpha.bc5586f

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,9 +24,7 @@ async function execSql(opts) {
     const url = (0, client_1.buildInnerUrl)(opts.appId, "/db/sql", {
         dbBranch: opts.dbBranch,
     });
-    (0, _debug_trace_1.traceRequest)("POST", url);
     const response = await client.post(url, { sql: opts.sql });
-    (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers);
     if (!response.ok) {
         // 4xx / 5xx：尝试解析 body 取 status_code 映射业务错误
         let body = null;
@@ -61,9 +57,7 @@ async function getSchema(opts) {
         includeStats: opts.includeStats ? "true" : undefined,
         dbBranch: opts.dbBranch,
     });
-    (0, _debug_trace_1.traceRequest)("GET", url);
     const response = await client.get(url);
-    (0, _debug_trace_1.traceResponse)("GET", url, response.status, response.headers);
     if (!response.ok) {
         let body = null;
         try {
@@ -95,14 +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);
-    (0, _debug_trace_1.traceRequest)("POST", url);
     const response = await client.request({
         method: "POST",
         url,
         headers: { "Content-Type": contentType },
         body: ab,
     });
-    (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers);
     if (!response.ok) {
         let body = null;
         try {
@@ -139,9 +131,7 @@ async function exportData(opts) {
         dbBranch: opts.dbBranch,
     });
     const reqBody = { limit: opts.limit ?? 5000 };
-    (0, _debug_trace_1.traceRequest)("POST", url);
     const response = await client.post(url, reqBody);
-    (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers);
     if (!response.ok) {
         // 错误路径：body 是 JSON envelope
         let body = null;

package/dist/api/db/parsers.js

@@ -27,11 +27,10 @@ function parseSqlResult(r) {
             recordCount: r.recordCount ?? rows.length,
         };
     }
-    if (r.sqlType === "INSERT" || r.sqlType === "UPDATE" || r.sqlType === "DELETE") {
+    if (r.sqlType === "DML") {
         const affected = r.affectedRows ?? extractRowCount(r.data);
         return {
             kind: "dml",
-            sqlType: r.sqlType,
             affectedRows: affected,
         };
     }

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,15 +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);
         const response = await client.get(url);
-        (0, _debug_trace_1.traceResponse)("GET", url, response.status, response.headers);
         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);
-        }
         await mapHttpError(err, opts);
         throw err; // 不可达，mapHttpError 必定 throw
     }
@@ -149,15 +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);
         const response = await client.post(url, body);
-        (0, _debug_trace_1.traceResponse)("POST", url, response.status, response.headers);
         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);
-        }
         await mapHttpError(err, opts);
         throw err;
     }
@@ -165,15 +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);
         const response = await client.request(cfg);
-        (0, _debug_trace_1.traceResponse)(cfg.method, cfg.url, response.status, response.headers);
         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);
-        }
         await mapHttpError(err, opts);
         throw err;
     }

package/dist/cli/commands/shared.js

@@ -7,7 +7,9 @@ exports.withHelp = withHelp;
 exports.failArgs = failArgs;
 const commander_1 = require("commander");
 const error_1 = require("../../utils/error");
-/** --app-id option，需要应用上下文的命令自行 .addOption(appIdOption()) */
+/** --app-id option，需要应用上下文的命令自行 .addOption(appIdOption())。
+ * Commander 的 .env() 只接受单个变量名，第二个兜底 `app_id` 在 resolveAppId 里手动检查。
+ */
 function appIdOption() {
     return new commander_1.Option("--app-id <id>", "指定目标应用").env("MIAODA_APP_ID");
 }
@@ -17,9 +19,12 @@ function appIdOption() {
 function softRequiredOption(name, desc) {
     return new commander_1.Option(name, desc);
 }
-/** 解析 appId，CLI flag > env > 抛错 */
+/**
+ * 解析 appId，优先级：CLI flag > MIAODA_APP_ID > app_id > 抛错。
+ * app_id 是部分外部沙箱环境注入应用 ID 的别名，作为兜底兼容（小写下划线形态）。
+ */
 function resolveAppId(opts) {
-    const id = opts.appId ?? process.env.MIAODA_APP_ID;
+    const id = opts.appId ?? process.env.MIAODA_APP_ID ?? process.env.app_id;
     if (!id) {
         throw new error_1.AppError("APP_ID_MISSING", "未指定应用", {
             next_actions: [

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

@@ -80,7 +80,7 @@ async function handleDbSql(query, opts) {
     }
     // 其他场景：展示最后一条
     const last = results[results.length - 1];
-    renderSingle(last);
+    renderSingle(last, sql);
 }
 /** 读取 stdin 并返回完整 SQL 文本（stdin 不是 TTY 即认为被 pipe）。 */
 async function readSql(inline) {
@@ -101,11 +101,11 @@ async function readSql(inline) {
         process.stdin.on("error", reject);
     });
 }
-function renderSingle(raw) {
+function renderSingle(raw, originalSql) {
     const parsed = (0, index_1.parseSqlResult)(raw);
     const tty = (0, render_1.isStdoutTty)();
     if ((0, output_1.isJsonMode)()) {
-        (0, output_1.emit)(toJson(parsed));
+        (0, output_1.emit)(toJson(parsed, originalSql));
         return;
     }
     if (parsed.kind === "select") {
@@ -119,7 +119,7 @@ function renderSingle(raw) {
         return;
     }
     if (parsed.kind === "dml") {
-        const verb = dmlVerb(parsed.sqlType);
+        const verb = dmlVerb(originalSql);
         (0, output_1.emit)(tty
             ? `✓ ${String(parsed.affectedRows)} row${parsed.affectedRows === 1 ? "" : "s"} ${verb}`
             : `OK ${String(parsed.affectedRows)} rows ${verb}`);
@@ -128,26 +128,46 @@ function renderSingle(raw) {
     // DDL
     (0, output_1.emit)(tty ? "✓ DDL executed" : "OK DDL executed");
 }
-function toJson(parsed) {
+function toJson(parsed, originalSql) {
     if (parsed.kind === "select") {
         return { data: parsed.rows };
     }
     if (parsed.kind === "dml") {
+        const op = dmlOp(originalSql);
         return {
             data: {
-                sql_type: parsed.sqlType.toLowerCase(),
+                sql_type: op ?? "dml",
                 affected_rows: parsed.affectedRows,
             },
         };
     }
     return { data: { sql_type: "ddl" } };
 }
-function dmlVerb(type) {
-    switch (type) {
-        case "INSERT": return "inserted";
-        case "UPDATE": return "updated";
-        case "DELETE": return "deleted";
-    }
+/**
+ * 从原始 SQL 推断 DML 动词。后端只回 "DML" 笼统类型，要给用户展示具体
+ * "inserted/updated/deleted" 必须 CLI 侧解析。多语句时取最后一条非空
+ * statement（与 PRD "只展示最后一条结果" 对齐）。
+ */
+function dmlOp(originalSql) {
+    const stmts = originalSql.split(";").map((s) => s.trim()).filter((s) => s.length > 0);
+    const head = (stmts[stmts.length - 1] ?? "").toUpperCase();
+    if (head.startsWith("INSERT"))
+        return "insert";
+    if (head.startsWith("UPDATE"))
+        return "update";
+    if (head.startsWith("DELETE"))
+        return "delete";
+    return null;
+}
+function dmlVerb(originalSql) {
+    const op = dmlOp(originalSql);
+    if (op === "insert")
+        return "inserted";
+    if (op === "update")
+        return "updated";
+    if (op === "delete")
+        return "deleted";
+    return "affected";
 }
 /** 从第一行收集列顺序；缺失列保留空白（兼容稀疏行）。 */
 function collectColumns(rows) {

package/package.json

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

package/dist/api/db/_debug_trace.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.traceRequest = traceRequest;
-exports.traceResponse = traceResponse;
-/**
- * ⚠️ TODO(REMOVE-BEFORE-RELEASE): 调试用 HTTP trace。
- *
- * 仅在 `--verbose` 下把 db 域 admin-inner 请求的 URL 与后端 logid 打到 stderr，
- * 方便联调时把 logid 贴给后端查链路。正式版本前请整文件删除，并把
- * `src/api/db/{api,client}.ts` 里的 `traceRequest()` / `traceResponse()` 调用一并移除。
- */
-const logger_1 = require("../../utils/logger");
-/** 请求前打 method + 完整 URL（不含敏感 header）。 */
-function traceRequest(method, url) {
-    (0, logger_1.debug)(`http → ${method} ${url}`);
-}
-/** 响应后打 status + x-tt-logid（后端追踪 ID）。 */
-function traceResponse(method, url, status, headers) {
-    const logId = headers?.get("x-tt-logid") ?? headers?.get("X-Tt-Logid") ?? "(none)";
-    (0, logger_1.debug)(`http ← ${method} ${url} status=${String(status)} x-tt-logid=${logId}`);
-}

package/dist/api/file/_debug_trace.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.traceRequest = traceRequest;
-exports.traceResponse = traceResponse;
-/**
- * ⚠️ TODO(REMOVE-BEFORE-RELEASE): 调试用 HTTP trace。
- *
- * 仅在 `--verbose` 下把 file 域请求的 URL 与后端 logid 打到 stderr，
- * 方便联调时把 logid 贴给后端查链路。正式版本前请整文件删除，并把
- * `src/api/file/client.ts` 里的 `traceRequest()` / `traceResponse()` 调用一并移除。
- */
-const logger_1 = require("../../utils/logger");
-/** 请求前打 method + 完整 URL（不含敏感 header）。 */
-function traceRequest(method, url) {
-    (0, logger_1.debug)(`http → ${method} ${url}`);
-}
-/** 响应后打 status + x-tt-logid（后端追踪 ID）。 */
-function traceResponse(method, url, status, headers) {
-    const logId = headers?.get("x-tt-logid") ?? headers?.get("X-Tt-Logid") ?? "(none)";
-    (0, logger_1.debug)(`http ← ${method} ${url} status=${String(status)} x-tt-logid=${logId}`);
-}