@manturhub/cli 0.9.10 → 0.9.11

package/bin/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { getBaseUrl, saveConfig, loadConfig } from "../lib/config.js";
-import { apiFetch, pollJob } from "../lib/api.js";
+import { apiFetch, classifyJobResponse, isFailedJobStatus, pollJob } from "../lib/api.js";
 import { runInit } from "../lib/setup.js";
 import { skillLs, skillAdd, skillOutdated, skillUpdate } from "../lib/skill-install.js";
 import { suiteLs, suiteInstall } from "../lib/suite-install.js";
@@ -456,17 +456,31 @@ async function main() {
         process.stderr.write(
           `⏳ 异步任务 ${r.json.job_id || ""} 已提交，轮询结果中（预计 ${r.json.estimated_seconds || "?"}s；加 --no-wait 可只拿 job_id）…\n`
         );
-        const final = await pollJob(pollUrl, {
-          initialBilling: r.json._billing,
-          onTick: (j) =>
-            process.stderr.write(
-              `   ${j.status || "?"}${j.elapsed_ms ? " " + Math.round(j.elapsed_ms / 1000) + "s" : ""}\n`
-            ),
-        });
+        let final;
+        try {
+          final = await pollJob(pollUrl, {
+            initialBilling: r.json._billing,
+            onTick: (j) =>
+              process.stderr.write(
+                `   ${j.status}${j.elapsed_ms ? " " + Math.round(j.elapsed_ms / 1000) + "s" : ""}\n`
+              ),
+          });
+        } catch (error) {
+          console.error(
+            `异步任务 ${r.json.job_id || ""} 已提交，但状态查询失败：${error.message}`
+          );
+          if (error.billing) {
+            printBillingResult({ _billing: error.billing }, process.stderr, operator.name);
+          }
+          console.error("请勿重新调用算子，以免重复生成和重复扣费。");
+          if (r.json.job_id) console.error(`任务 ID：${r.json.job_id}`);
+          console.error(`轮询地址：${pollUrl}`);
+          console.error("请稍后使用 `manturhub status <poll_url>` 继续查询。");
+          process.exit(1);
+        }
         console.log(JSON.stringify(final, null, 2));
         printBillingResult(final, process.stderr, operator.name);
-        const st = final && final.status;
-        if (st === "failed" || st === "error" || (final && final._timeout)) process.exit(1);
+        if (isFailedJobStatus(final.status) || final._timeout) process.exit(1);
       } else {
         console.log(JSON.stringify(r.json, null, 2));
         printBillingResult(r.json, process.stderr, operator.name);
@@ -538,9 +552,20 @@ async function main() {
         process.exit(1);
       }
       const r = await apiFetch(pu);
+      if (!r.ok) {
+        console.error(`查询失败（HTTP ${r.status}）`);
+        process.exit(1);
+      }
+      let state;
+      try {
+        state = classifyJobResponse(r.json);
+      } catch (error) {
+        console.error(`任务状态响应无效：${error.message}`);
+        process.exit(1);
+      }
       console.log(JSON.stringify(r.json, null, 2));
       printBillingResult(r.json);
-      if (!r.ok) process.exit(1);
+      if (state.failed) process.exit(1);
       break;
     }
 

package/lib/api.js

@@ -62,14 +62,40 @@ export async function apiFetch(
   return { ok: res.ok, status: res.status, json };
 }
 
-// 异步算子:轮询 invoke 返回的 poll_url 直到任务出终态(succeeded/failed/…),返回最终 json。
-// 未知 shape(无 status 字段)按终态处理,直接返回让上层打印。
-const ACTIVE = new Set(["queued", "running", "pending", "processing", "in_progress"]);
+// 异步算子只接受已知状态。HTTP 错误、非 JSON object、缺失 status 和未知状态
+// 都必须失败关闭，不能因为“不在活动状态集合里”就被误判为成功终态。
+const ACTIVE = new Set(["created", "queued", "running", "pending", "processing", "in_progress"]);
+const SUCCEEDED = new Set(["succeeded", "success", "completed", "done"]);
+const FAILED = new Set(["failed", "error", "cancelled", "canceled"]);
+
+export function classifyJobResponse(result) {
+  if (!result || typeof result !== "object" || Array.isArray(result)) {
+    throw new Error("异步任务状态响应必须是 JSON object");
+  }
+  if (typeof result.status !== "string" || !result.status.trim()) {
+    throw new Error("异步任务状态响应缺少合法的 status");
+  }
+  const status = result.status.trim().toLowerCase();
+  if (ACTIVE.has(status)) return { status, terminal: false, failed: false };
+  if (SUCCEEDED.has(status)) return { status, terminal: true, failed: false };
+  if (FAILED.has(status)) return { status, terminal: true, failed: true };
+  throw new Error(`异步任务返回未知状态: ${result.status}`);
+}
+
+export function isFailedJobStatus(status) {
+  return FAILED.has(String(status || "").trim().toLowerCase());
+}
+
 export function retainBilling(result, fallbackBilling) {
   if (!fallbackBilling || !result || typeof result !== "object" || Array.isArray(result)) return result;
   return result._billing ? result : { ...result, _billing: fallbackBilling };
 }
 
+function attachBilling(error, billing) {
+  if (billing && error && typeof error === "object" && !error.billing) error.billing = billing;
+  return error;
+}
+
 export async function pollJob(
   pollUrl,
   { intervalMs = 8000, maxMs = 1200000, onTick, initialBilling } = {}
@@ -78,14 +104,28 @@ export async function pollJob(
   let last = null;
   let lastBilling = initialBilling || null;
   while (Date.now() - start < maxMs) {
-    const r = await apiFetch(pollUrl, { timeoutMs: 30000 });
+    let r;
+    try {
+      r = await apiFetch(pollUrl, { timeoutMs: 30000 });
+    } catch (error) {
+      throw attachBilling(error, lastBilling);
+    }
+    if (!r.ok) {
+      throw attachBilling(
+        new Error(`异步任务状态查询失败（HTTP ${r.status}）`),
+        lastBilling
+      );
+    }
     last = r.json;
     if (r.json?._billing) lastBilling = r.json._billing;
-    const s = r.json && r.json.status;
-    if (onTick) onTick(r.json);
-    if (!r.ok || !s || !ACTIVE.has(s)) {
-      return retainBilling(r.json, lastBilling); // 终态(或报错/未知 shape)→ 返回
+    let state;
+    try {
+      state = classifyJobResponse(r.json);
+    } catch (error) {
+      throw attachBilling(error, lastBilling);
     }
+    if (onTick) onTick(r.json);
+    if (state.terminal) return retainBilling(r.json, lastBilling);
     await new Promise((res) => setTimeout(res, intervalMs));
   }
   return retainBilling(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manturhub/cli",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "description": "ManturHub 算子广场 CLI：通过 REST 发现和调用 AI 算子、浏览配方，并安装 Skill 与 Agent 套件",
   "type": "module",
   "bin": {