@lark-apaas/miaoda-cli 0.1.39-alpha.7cb46f9 → 0.1.39-alpha.9cc8d31

package/dist/api/deploy/api.js

@@ -50,9 +50,11 @@ async function getErrorLog(req) {
  * GET /v1/pipeline/app/:appID/instance/:instanceID/detail — 轮询发布状态
  *
  * 走 lark.apaas.devops_platform PSM；URL 前缀不同但共用同一管理端 gateway。
+ * 显式带 withTransformApprovalData=true 取审批展示视图（job 上挂 approval）；IDL 默认 false，
+ * 不带时拿不到审批链接与拒绝原因。该参数只改返回投影，无副作用。
  */
 async function queryPipelineInstance(req) {
-    const url = `/v1/pipeline/app/${encodeURIComponent(req.appID)}/instance/${encodeURIComponent(req.instanceID)}/detail`;
+    const url = `/v1/pipeline/app/${encodeURIComponent(req.appID)}/instance/${encodeURIComponent(req.instanceID)}/detail?withTransformApprovalData=true`;
     return (0, http_1.getInnerApi)(url, {
         errPrefix: 'Failed to query pipeline',
         defaultErrCode: DEFAULT_ERR_CODE,

package/dist/api/deploy/approval.js

@@ -49,7 +49,7 @@ function* jobsOf(stages) {
     }
 }
 /**
- * 从 CliQueryPipelineInstance 的 PipelineInstance（接口默认返回审批展示视图）中摘出需要输出的卡点：
+ * 从 CliQueryPipelineInstance 的 PipelineInstance（请求带 withTransformApprovalData=true，返回审批展示视图）中摘出需要输出的卡点：
  * 第一个 status 为 PENDING / REJECTED / FAILED 的 Job.approval。一次发布可以被拦多次
  * （build / db_check / deploy），已通过的卡点可能排在前面，不能取它；流水线串行，需要输出的至多一个。
  * 与妙搭发布面板 findApprovalJob 同一口径。

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

@@ -95,6 +95,7 @@ JSON 输出
   {"data": {"ID": ..., "status": ..., "creator": "...", "createdAt": ..., "updatedAt": ..., ...}, "next_cursor": null, "has_more": false}
   ID 即 deploy-id（== pipelineTaskID）
   data.status 为可读字符串；data.status_code 为 BAM 原始数字枚举。
+  status 为 pending / rejected / failed 且存在审批单时，额外包含 approval（如 status、approvalURL、被拒时的 message）。
 
 示例
   $ miaoda deploy get 12345

package/dist/cli/handlers/deploy/deploy.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleDeploy = handleDeploy;
+exports.writeApprovalNotice = writeApprovalNotice;
 const api = __importStar(require("../../../api/index"));
 const output_1 = require("../../../utils/output");
 const index_1 = require("../../../api/deploy/index");
@@ -72,23 +73,14 @@ async function handleDeploy(opts) {
         timeoutSec: opts.timeout ?? 300,
     });
     const approval = (0, index_1.findApproval)(detail);
-    if (!(0, output_1.isJsonMode)()) {
-        if (detail.status === index_1.NodeStatus.PENDING) {
-            writeApprovalHint(approval, pipelineTaskID);
-        }
-        else if (detail.status === index_1.NodeStatus.SUCCESS) {
+    if (!(0, output_1.isJsonMode)() && !writeApprovalNotice(detail.status, approval, pipelineTaskID)) {
+        if (detail.status === index_1.NodeStatus.SUCCESS) {
             process.stdout.write('✓ 发布成功\n');
         }
-        else if (detail.status === index_1.NodeStatus.FAILED && approval?.status === 'failed') {
-            writeApprovalGateFailed(approval);
-        }
         else if (detail.status === index_1.NodeStatus.FAILED) {
             process.stdout.write('✗ 发布失败\n');
             process.stdout.write(`  hint: Run \`miaoda deploy error-log ${pipelineTaskID}\` to view error logs\n`);
         }
-        else if (detail.status === index_1.NodeStatus.REJECTED) {
-            writeRejected(approval);
-        }
         else {
             process.stdout.write('• 发布已取消\n');
         }
@@ -118,6 +110,25 @@ function writeRejected(approval) {
     process.stdout.write('✗ 发布审批未通过，本次未上线\n');
     writeReason(approval);
 }
+/**
+ * 审批相关状态的 pretty 提示：审批中 / 审批被拒 / 卡点异常。
+ * 不属于这三类时不输出并返回 false，由调用方按普通状态处理。
+ */
+function writeApprovalNotice(status, approval, pipelineTaskID) {
+    if (status === index_1.NodeStatus.PENDING) {
+        writeApprovalHint(approval, pipelineTaskID);
+    }
+    else if (status === index_1.NodeStatus.REJECTED) {
+        writeRejected(approval);
+    }
+    else if (status === index_1.NodeStatus.FAILED && approval?.status === 'failed') {
+        writeApprovalGateFailed(approval);
+    }
+    else {
+        return false;
+    }
+    return true;
+}
 function writeApprovalHint(approval, pipelineTaskID) {
     const url = (0, index_1.approvalURL)(approval);
     process.stdout.write('⏸ 发布已进入人工审批，等待审批负责人处理\n');

package/dist/cli/handlers/deploy/get.js

@@ -41,16 +41,28 @@ const error_1 = require("../../../utils/error");
 const index_1 = require("../../../api/deploy/index");
 const helpers_1 = require("./helpers");
 const format_1 = require("./format");
+const polling_1 = require("./polling");
+const deploy_1 = require("./deploy");
 /**
  * 单页拉取上限：BAM listPipelineInstances 限制 1~500，取 500 让 deploy get
  * 在最近 500 条记录里按 ID 命中。
  */
 const DEPLOY_GET_LOOKUP_LIMIT = 500;
+/**
+ * 可能挂着审批单的状态：审批中、审批被拒，以及卡点异常（平台没能发起审批，顶层表现为 FAILED）。
+ * 只有这些状态才额外查详情取审批单，其余状态保持单次列表请求。
+ */
+const APPROVAL_LOOKUP_STATUSES = [
+    index_1.NodeStatus.PENDING,
+    index_1.NodeStatus.REJECTED,
+    index_1.NodeStatus.FAILED,
+];
 /**
  * miaoda deploy get <deploy-id>
  *
  * BAM 没有 by-ID 的查询接口，复用 listPipelineInstances 在最近窗口里按 ID 筛一条。
  * 命中失败时抛 DEPLOY_NOT_FOUND，提示用户用 history 查窗口。
+ * status 为 pending / rejected / failed 时额外查详情，有审批单则输出 approval（审批链接、拒绝原因等）。
  */
 async function handleDeployGet(opts) {
     if (!opts.deployId)
@@ -67,5 +79,33 @@ async function handleDeployGet(opts) {
             next_actions: ['运行 `miaoda deploy history` 确认 deploy-id 是否在最近窗口内'],
         });
     }
-    (0, output_1.emit)({ data: (0, format_1.formatSimpleInstance)(instance), next_cursor: null, has_more: false }, index_1.deployGetSchema);
+    const approval = APPROVAL_LOOKUP_STATUSES.includes(instance.status)
+        ? await lookupApproval(appID, opts.deployId, instance.status)
+        : undefined;
+    (0, output_1.emit)({
+        data: { ...(0, format_1.formatSimpleInstance)(instance), ...(approval && { approval }) },
+        next_cursor: null,
+        has_more: false,
+    }, index_1.deployGetSchema);
+    if (!(0, output_1.isJsonMode)())
+        (0, deploy_1.writeApprovalNotice)(instance.status, approval, opts.deployId);
+}
+/**
+ * 列表项不含审批信息：按同一个 ID 查详情接口（审批展示视图）取审批单。
+ *
+ * pending / rejected 时详情失败直接抛错：丢掉审批链接 / 拒绝原因却无人察觉，比报错更糟。
+ * failed 时降级为只输出列表数据并在 stderr 提示：普通构建失败远多于卡点异常，不能因为详情接口
+ * 出错就让调用方连 status 都拿不到，卡住失败排查。
+ */
+async function lookupApproval(appID, deployId, status) {
+    try {
+        return (0, index_1.findApproval)((0, polling_1.normalizePipelineInstance)(await api.deploy.queryPipelineInstance({ appID, instanceID: deployId })));
+    }
+    catch (err) {
+        if (status !== index_1.NodeStatus.FAILED)
+            throw err;
+        const reason = err instanceof Error ? err.message : String(err);
+        process.stderr.write(`warning: 查询审批单失败，输出不含 approval：${reason}\n`);
+        return undefined;
+    }
 }

package/dist/cli/handlers/deploy/helpers.js

@@ -43,18 +43,12 @@ function parseDeployId(text) {
 /** 发布理由上限，按 Unicode code point 计，对齐 lark-cli `apps +release-create` */
 const MAX_APPLY_REASON_CODE_POINTS = 1000;
 /** C0 / C1 控制字符（含换行、制表符） */
-function isControlCodePoint(cp) {
-    return cp <= 0x1f || (cp >= 0x7f && cp <= 0x9f);
-}
-/** 零宽、BOM、双向嵌入/覆盖/隔离、行/段分隔符：肉眼不可见，却会改变审批单里的展示 */
-function isDangerousCodePoint(cp) {
-    return ((cp >= 0x200b && cp <= 0x200d) ||
-        cp === 0xfeff ||
-        (cp >= 0x202a && cp <= 0x202e) ||
-        (cp >= 0x2066 && cp <= 0x2069) ||
-        cp === 0x2028 ||
-        cp === 0x2029);
-}
+const CONTROL_CHARS = /\p{Cc}/u;
+/**
+ * 不可见格式字符（零宽、BOM、双向控制、词连接符等）与行/段分隔符：肉眼不可见，却会改变审批单里的展示。
+ * 与 deploy 输出服务端文本时的过滤口径一致。
+ */
+const INVISIBLE_CHARS = /[\p{Cf}\u2028\u2029]/u;
 /**
  * 校验 --apply-reason 的格式；通过后调用方原样透传，不 trim。
  * 是否必填由服务端按应用类型判定，这里不管。
@@ -62,14 +56,13 @@ function isDangerousCodePoint(cp) {
 function validateApplyReason(value) {
     if (value.trim() === '')
         (0, args_1.failArgs)('--apply-reason 不能为空');
-    const codePoints = Array.from(value, (ch) => ch.codePointAt(0) ?? 0);
-    if (codePoints.some(isControlCodePoint)) {
+    if (CONTROL_CHARS.test(value)) {
         (0, args_1.failArgs)('--apply-reason 不能包含换行、制表符等控制字符，需为单行文本');
     }
-    if (codePoints.some(isDangerousCodePoint)) {
+    if (INVISIBLE_CHARS.test(value)) {
         (0, args_1.failArgs)('--apply-reason 不能包含零宽字符、双向控制字符或行/段分隔符');
     }
-    if (codePoints.length > MAX_APPLY_REASON_CODE_POINTS) {
+    if (Array.from(value).length > MAX_APPLY_REASON_CODE_POINTS) {
         (0, args_1.failArgs)(`--apply-reason 最多 ${String(MAX_APPLY_REASON_CODE_POINTS)} 个字符`);
     }
 }

package/dist/cli/handlers/deploy/polling.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_POLL_INTERVAL_MS = void 0;
 exports.waitForPipeline = waitForPipeline;
+exports.normalizePipelineInstance = normalizePipelineInstance;
 const ora_1 = __importDefault(require("ora"));
 const api = __importStar(require("../../../api/index"));
 const error_1 = require("../../../utils/error");

package/package.json

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