bukesiyi-cli 0.3.0 → 0.3.1

package/README.md

@@ -26,7 +26,7 @@ npm install -g bukesiyi-cli
 
 ```console
 $ buke --version
-bukesiyi-cli/0.3.0
+bukesiyi-cli/0.3.1
 ```
 
 不想全局安装时，可以用 npx 临时运行，写法是 `npx bukesiyi-cli <命令>`，例如 `npx bukesiyi-cli whoami`。下面的例子都直接写 `buke`。
@@ -107,6 +107,8 @@ $ buke login bk_test_0123456789abcdef_……
 
 短剧的确认开拍（`buke drama confirm`）要先取一次当前报价摆出来给人看：不加 `--yes` 只看，退出码 2；加了 `--yes` 才提交这笔布支出，并且用服务端认可的报价哈希核对，报价变过就不会扣费。`buke drama status --wait` 会在终态或停靠时停下：拿到成片退出 0；失败、取消退出 9；停在「要人处理」或「有镜没拍成、可补拍」时退出 0，输出里带原因、缺口与下一步。
 
+等待失败、超时或轮询断网时，先查询原任务。`--json` 错误文档的 `recovery` 保留任务编号、最后状态及查询命令；`shorts order` 还保留本次幂等键。自定义服务的查询命令会带回原来的 `--base-url`。若提交结果还无法确认，`recovery.acceptance` 为 `unknown`，只保留请求的键和服务地址，不虚构已受理或任务编号。先在 Studio 核对原请求，不要换键重新下单；CLI 不会自动重试。
+
 通用选项：
 
 | 选项 | 作用 |
@@ -213,8 +215,8 @@ export NO_PROXY='localhost,127.0.0.1,[::1]'
 | `CLI_TIMEOUT` | 5 | 等了 15 秒，服务端没有回完。稍后重试；总是超时就检查网络，或者中间有没有代理、防火墙拦着 |
 | `CLI_REDIRECT` | 5 | 服务器要求跳转到别处；为了不把密钥带过去，没有跟随。核对服务地址（报错的括号里是跳转指向的地方），用正确的地址重新登录 |
 | `CLI_BAD_RESPONSE` | 5 | 收到的回应不是约定的格式，多半是中间的网关或别的网站回的，括号里是 HTTP 状态码。状态码是 429 或 5xx 时稍后重试；其余的先核对服务地址，重试多半没有用 |
-| `CLI_WAIT_TIMEOUT` | 8 | `--wait` 等到时限任务还在跑，任务本身没有失败。话里带当前状态；用 `status` 再查，或加 `--timeout` 延长等待 |
-| `CLI_TASK_FAILED` | 9 | 等的那张单或那个任务到了失败的终态，话里是服务端记的原因。改好原因后重新下单（新订单、新幂等键） |
+| `CLI_WAIT_TIMEOUT` | 8 | `--wait` 等到时限任务还在跑，任务本身没有失败。按恢复信息查询原任务，给查询加 `--wait --timeout <秒数>` 继续等待，不要重新下单 |
+| `CLI_TASK_FAILED` | 9 | 原任务到了失败的终态，话里是服务端记的原因。先按恢复信息查询原任务并核对原因、已完成内容和账目；新制作需要另行报价与授权 |
 | `CLI_INTERRUPTED` | 130 | 命令被打断了：按了 Ctrl-C，或者收到了 SIGTERM、SIGHUP（这两种的退出码是 143、129）。需要时重新运行 |
 | `CLI_INTERNAL` | 5 | 工具自己出了没有料到的错，正常使用不应该遇到。把完整的报错和运行的命令（不要带密钥）发给客服，联系方式见文末「联系我们」 |
 

package/dist/main.js

@@ -89,6 +89,7 @@ var CliError = class _CliError extends Error {
   retryAfterSeconds;
   httpStatus;
   hints;
+  recovery;
   constructor(init) {
     super(redactKeys(init.message));
     this.name = "CliError";
@@ -99,6 +100,7 @@ var CliError = class _CliError extends Error {
     if (init.retryAfterSeconds !== void 0) this.retryAfterSeconds = init.retryAfterSeconds;
     if (init.httpStatus !== void 0) this.httpStatus = init.httpStatus;
     this.hints = init.hints ?? [];
+    if (init.recovery !== void 0) this.recovery = init.recovery;
   }
   withHint(hint) {
     return new _CliError({
@@ -109,7 +111,21 @@ var CliError = class _CliError extends Error {
       traceId: this.traceId,
       retryAfterSeconds: this.retryAfterSeconds,
       httpStatus: this.httpStatus,
-      hints: [...this.hints, hint]
+      hints: [...this.hints, hint],
+      recovery: this.recovery
+    });
+  }
+  withRecovery(recovery) {
+    return new _CliError({
+      code: this.code,
+      message: this.message,
+      exitCode: this.exitCode,
+      retryable: this.retryable,
+      traceId: this.traceId,
+      retryAfterSeconds: this.retryAfterSeconds,
+      httpStatus: this.httpStatus,
+      hints: this.hints,
+      recovery
     });
   }
 };
@@ -396,12 +412,58 @@ async function readNewKey(io) {
 
 // package.json
 var name = "bukesiyi-cli";
-var version = "0.3.0";
+var version = "0.3.1";
 
 // src/version.ts
 var PACKAGE_NAME = name;
 var VERSION = version;
 
+// src/task-recovery.ts
+function shellArgument(value) {
+  return /^[A-Za-z0-9_][A-Za-z0-9_.:-]*$/.test(value) ? value : `'${value.replace(/'/g, `'"'"'`)}'`;
+}
+function taskRecovery(taskType, taskId, status4, baseUrl, failureCode) {
+  const customOrigin = baseUrl !== DEFAULT_BASE_URL;
+  return {
+    taskType,
+    acceptance: "confirmed",
+    taskId,
+    status: status4,
+    ...customOrigin ? { baseUrl } : {},
+    ...failureCode === void 0 || failureCode === "" ? {} : { failureCode },
+    nextAction: "query",
+    statusCommand: `buke ${taskType} status ${shellArgument(taskId)}` + (customOrigin ? ` --base-url ${shellArgument(baseUrl)}` : "")
+  };
+}
+async function retainTaskOnError(recovery, operation) {
+  try {
+    return await operation();
+  } catch (error) {
+    const failure = toCliError(error);
+    throw failure.withRecovery({ ...recovery(), ...failure.recovery });
+  }
+}
+async function retainSubmissionOnError(taskType, idempotencyKey, baseUrl, operation) {
+  try {
+    return await operation();
+  } catch (error) {
+    const failure = toCliError(error);
+    const rejectedResponse = failure.httpStatus !== void 0 && failure.httpStatus >= 400 && failure.httpStatus < 500 && failure.httpStatus !== 408;
+    const uncertainResponse = failure.httpStatus === 408 || failure.httpStatus !== void 0 && failure.httpStatus >= 500 && failure.httpStatus < 600;
+    const uncertainTransport = ["CLI_NETWORK", "CLI_TIMEOUT", "CLI_BAD_RESPONSE", "CLI_INTERRUPTED"].includes(failure.code);
+    if (!rejectedResponse && (uncertainResponse || uncertainTransport)) {
+      throw failure.withRecovery({
+        taskType,
+        acceptance: "unknown",
+        idempotencyKey,
+        nextAction: "query",
+        ...baseUrl !== DEFAULT_BASE_URL ? { baseUrl } : {}
+      });
+    }
+    throw failure;
+  }
+}
+
 // src/client.ts
 var DEFAULT_REQUEST_TIMEOUT_MS = 15e3;
 var DEFAULT_DOWNLOAD_TIMEOUT_MS = 12e4;
@@ -441,6 +503,7 @@ function unreadableResponse(status4) {
     code: "CLI_BAD_RESPONSE",
     exitCode: EXIT.SERVER,
     retryable,
+    httpStatus: status4,
     message: `\u670D\u52A1\u5668\u56DE\u4E86\u4E00\u4E2A\u770B\u4E0D\u61C2\u7684\u56DE\u5E94\uFF08HTTP ${status4}\uFF09\uFF0C${advice}`,
     hints: status4 === 404 ? [NOT_FOUND_HINT] : []
   });
@@ -1215,9 +1278,11 @@ async function awaitTemplateShortOrder(baseUrl, apiKey, start, deps, wait) {
   for (; ; ) {
     const remaining = deadline - wait.now().getTime();
     if (remaining <= 0) return { value: current, timedOut: true };
-    await wait.sleep(Math.max(Math.min(interval, remaining), 1));
-    interval = Math.min(Math.ceil(interval * 1.5), MAX_POLL_INTERVAL_MS);
-    current = await getTemplateShortOrder(baseUrl, apiKey, current.view.id, deps);
+    current = await retainTaskOnError(() => taskRecovery("shorts", current.view.id, current.view.status, baseUrl), async () => {
+      await wait.sleep(Math.max(Math.min(interval, remaining), 1));
+      interval = Math.min(Math.ceil(interval * 1.5), MAX_POLL_INTERVAL_MS);
+      return getTemplateShortOrder(baseUrl, apiKey, current.view.id, deps);
+    });
     if (current.view.status !== said) {
       wait.note?.(`\u72B6\u6001\u53D8\u6210 ${current.view.status}`);
       said = current.view.status;
@@ -1235,9 +1300,11 @@ async function awaitVideoRun(baseUrl, apiKey, start, deps, wait) {
     const remaining = deadline - wait.now().getTime();
     if (remaining <= 0) return { value: current, timedOut: true };
     const preferred = current.view.pollAfterMs !== null && current.view.pollAfterMs > 0 ? current.view.pollAfterMs : interval;
-    await wait.sleep(Math.max(Math.min(preferred, remaining), 1));
-    interval = Math.min(Math.ceil(interval * 1.5), MAX_POLL_INTERVAL_MS);
-    current = await getVideoRun(baseUrl, apiKey, current.view.rootRunId, deps);
+    current = await retainTaskOnError(() => taskRecovery("videos", current.view.rootRunId, current.view.status, baseUrl, current.view.failure?.code), async () => {
+      await wait.sleep(Math.max(Math.min(preferred, remaining), 1));
+      interval = Math.min(Math.ceil(interval * 1.5), MAX_POLL_INTERVAL_MS);
+      return getVideoRun(baseUrl, apiKey, current.view.rootRunId, deps);
+    });
     if (current.view.status !== said) {
       wait.note?.(`\u72B6\u6001\u53D8\u6210 ${current.view.status}`);
       said = current.view.status;
@@ -1257,9 +1324,11 @@ async function awaitDramaOrder(baseUrl, apiKey, start, deps, wait) {
   for (; ; ) {
     const remaining = deadline - wait.now().getTime();
     if (remaining <= 0) return { value: current, timedOut: true };
-    await wait.sleep(Math.max(Math.min(interval, remaining), 1));
-    interval = Math.min(Math.ceil(interval * 1.5), MAX_POLL_INTERVAL_MS);
-    current = await getDramaOrder(baseUrl, apiKey, current.view.id, deps);
+    current = await retainTaskOnError(() => taskRecovery("drama", current.view.id, current.view.status, baseUrl), async () => {
+      await wait.sleep(Math.max(Math.min(interval, remaining), 1));
+      interval = Math.min(Math.ceil(interval * 1.5), MAX_POLL_INTERVAL_MS);
+      return getDramaOrder(baseUrl, apiKey, current.view.id, deps);
+    });
     if (current.view.status !== said) {
       wait.note?.(`\u72B6\u6001\u53D8\u6210 ${current.view.status}`);
       said = current.view.status;
@@ -1732,20 +1801,23 @@ function waitControls(io, values, note) {
     note
   };
 }
-function settleOrder(outcome) {
+function settleOrder(outcome, baseUrl) {
   const order2 = outcome.value.view;
+  const recovery = taskRecovery("shorts", order2.id, order2.status, baseUrl);
   if (outcome.timedOut) {
     throw new CliError({
       code: "CLI_WAIT_TIMEOUT",
       exitCode: EXIT.WAIT_TIMEOUT,
-      message: `\u7B49\u4E86\u8FD9\u4E48\u4E45\u8FD8\u5728 ${order2.status}\uFF1A\u518D\u67E5\u7528 buke shorts status ${order2.id}\uFF0C\u6216\u52A0 --timeout \u5EF6\u957F\u7B49\u5F85`
+      message: `\u7B49\u4E86\u8FD9\u4E48\u4E45\u8FD8\u5728 ${order2.status}\uFF1A\u518D\u67E5\u7528 ${recovery.statusCommand}\uFF0C\u7ED9\u8BE5\u67E5\u8BE2\u52A0 --wait --timeout <\u79D2\u6570> \u53EF\u7EE7\u7EED\u7B49\u5F85`,
+      recovery
     });
   }
   if (order2.status === "failed" || order2.status === "canceled") {
     throw new CliError({
       code: "CLI_TASK_FAILED",
       exitCode: EXIT.TASK_FAILED,
-      message: order2.error === void 0 ? `\u8FD9\u6761\u77ED\u7247${order2.status === "canceled" ? "\u5DF2\u53D6\u6D88" : "\u6CA1\u6709\u6E32\u67D3\u6210\u529F"}` : singleLine(order2.error)
+      message: order2.error === void 0 ? `\u8FD9\u6761\u77ED\u7247${order2.status === "canceled" ? "\u5DF2\u53D6\u6D88" : "\u6CA1\u6709\u6E32\u67D3\u6210\u529F"}` : singleLine(order2.error),
+      recovery
     });
   }
   return outcome.value;
@@ -1822,8 +1894,16 @@ async function order(context) {
   const shouldWait = values.wait === true;
   const controls = shouldWait ? waitControls(io, values, (line) => out.notice(line)) : void 0;
   const { apiKey, baseUrl } = await resolveApiKey(context);
-  const accepted = await createTemplateShortOrder(baseUrl, apiKey, templateId, props, quoteHash, idempotencyKey, io);
-  const final = shouldWait ? settleOrder(await awaitTemplateShortOrder(baseUrl, apiKey, accepted, io, controls)) : accepted;
+  const accepted = await retainSubmissionOnError(
+    "shorts",
+    idempotencyKey,
+    baseUrl,
+    () => createTemplateShortOrder(baseUrl, apiKey, templateId, props, quoteHash, idempotencyKey, io)
+  );
+  const final = shouldWait ? await retainTaskOnError(
+    () => ({ ...taskRecovery("shorts", accepted.view.id, accepted.view.status, baseUrl), idempotencyKey }),
+    async () => settleOrder(await awaitTemplateShortOrder(baseUrl, apiKey, accepted, io, controls), baseUrl)
+  ) : accepted;
   out.result([...orderLines(final.view), `\u5E42\u7B49\u952E\uFF1A${idempotencyKey}`], {
     order: final.raw.order,
     idempotencyKey,
@@ -1837,7 +1917,7 @@ async function status(context, rawId) {
   const controls = shouldWait ? waitControls(io, values, (line) => out.notice(line)) : void 0;
   const { apiKey, baseUrl } = await resolveApiKey(context);
   const current = await getTemplateShortOrder(baseUrl, apiKey, orderId, io);
-  const final = shouldWait ? settleOrder(await awaitTemplateShortOrder(baseUrl, apiKey, current, io, controls)) : current;
+  const final = shouldWait ? settleOrder(await awaitTemplateShortOrder(baseUrl, apiKey, current, io, controls), baseUrl) : current;
   out.result(orderLines(final.view), { order: final.raw.order, ...shouldWait ? { waited: true } : {} });
 }
 async function cancel(context, rawId) {
@@ -1905,27 +1985,31 @@ function waitControls2(io, values, note) {
     note
   };
 }
-function settleOrder2(outcome) {
+function settleOrder2(outcome, baseUrl) {
   const order2 = outcome.value.view;
+  const recovery = taskRecovery("drama", order2.id, order2.status, baseUrl);
   if (outcome.timedOut) {
     throw new CliError({
       code: "CLI_WAIT_TIMEOUT",
       exitCode: EXIT.WAIT_TIMEOUT,
-      message: `\u7B49\u4E86\u8FD9\u4E48\u4E45\u8FD8\u5728 ${order2.status}\uFF1A\u518D\u67E5\u7528 buke drama status ${order2.id}\uFF0C\u6216\u52A0 --timeout \u5EF6\u957F\u7B49\u5F85`
+      message: `\u7B49\u4E86\u8FD9\u4E48\u4E45\u8FD8\u5728 ${order2.status}\uFF1A\u518D\u67E5\u7528 ${recovery.statusCommand}\uFF0C\u7ED9\u8BE5\u67E5\u8BE2\u52A0 --wait --timeout <\u79D2\u6570> \u53EF\u7EE7\u7EED\u7B49\u5F85`,
+      recovery
     });
   }
   if (order2.status === "failed") {
     throw new CliError({
       code: "CLI_TASK_FAILED",
       exitCode: EXIT.TASK_FAILED,
-      message: order2.reason === void 0 || order2.reason.trim() === "" ? "\u8FD9\u5355\u77ED\u5267\u6CA1\u6709\u62CD\u6210" : singleLine(order2.reason)
+      message: order2.reason === void 0 || order2.reason.trim() === "" ? "\u8FD9\u5355\u77ED\u5267\u6CA1\u6709\u62CD\u6210" : singleLine(order2.reason),
+      recovery
     });
   }
   if (order2.status === "canceled") {
     throw new CliError({
       code: "CLI_TASK_FAILED",
       exitCode: EXIT.TASK_FAILED,
-      message: "\u8FD9\u5355\u77ED\u5267\u5DF2\u53D6\u6D88\uFF1A\u6CA1\u62CD\u7684\u955C\u5934\u9000\u56DE\u51BB\u7ED3\u989D\u5EA6\uFF0C\u5DF2\u7ECF\u62CD\u6210\u7684\u4FDD\u7559\u7167\u6263"
+      message: "\u8FD9\u5355\u77ED\u5267\u5DF2\u53D6\u6D88\uFF1A\u6CA1\u62CD\u7684\u955C\u5934\u9000\u56DE\u51BB\u7ED3\u989D\u5EA6\uFF0C\u5DF2\u7ECF\u62CD\u6210\u7684\u4FDD\u7559\u7167\u6263",
+      recovery
     });
   }
   return outcome.value;
@@ -2033,7 +2117,7 @@ async function status2(context, rawId) {
   const controls = shouldWait ? waitControls2(io, values, (line) => out.notice(line)) : void 0;
   const { apiKey, baseUrl } = await resolveApiKey(context);
   const current = await getDramaOrder(baseUrl, apiKey, orderId, io);
-  const final = shouldWait ? settleOrder2(await awaitDramaOrder(baseUrl, apiKey, current, io, controls)) : current;
+  const final = shouldWait ? settleOrder2(await awaitDramaOrder(baseUrl, apiKey, current, io, controls), baseUrl) : current;
   out.result([...orderLines2(final.view), ...guidanceLines(final.view)], {
     order: final.raw.order,
     ...shouldWait ? { waited: true } : {}
@@ -2124,13 +2208,27 @@ function errorDocument(error) {
   };
   if (error.retryAfterSeconds !== void 0) document.error.retryAfterSeconds = error.retryAfterSeconds;
   if (error.httpStatus !== void 0) document.error.httpStatus = error.httpStatus;
+  if (error.recovery !== void 0) document.recovery = error.recovery;
   return document;
 }
 function errorLines(error) {
   const details = [`\u9519\u8BEF\u7801 ${singleLine(error.code)}`];
   if (error.traceId) details.push(`\u8BF7\u6C42\u7F16\u53F7 ${singleLine(error.traceId)}`);
   if (error.retryAfterSeconds !== void 0) details.push(`${error.retryAfterSeconds} \u79D2\u540E\u53EF\u4EE5\u91CD\u8BD5`);
-  return [`\u9519\u8BEF\uFF1A${singleLine(error.message)}`, `\uFF08${details.join("\uFF1B")}\uFF09`, ...error.hints];
+  const recovery = error.recovery;
+  return [
+    `\u9519\u8BEF\uFF1A${singleLine(error.message)}`,
+    `\uFF08${details.join("\uFF1B")}\uFF09`,
+    ...error.hints,
+    ...recovery === void 0 ? [] : [
+      recovery.acceptance === "confirmed" ? `\u5DF2\u53D7\u7406\u4EFB\u52A1\uFF1A${singleLine(recovery.taskId ?? "")}` : "\u63D0\u4EA4\u7ED3\u679C\u5C1A\u672A\u786E\u8BA4\uFF0C\u8BF7\u5148\u5728 Studio \u6838\u5BF9\u539F\u8BF7\u6C42\uFF1B\u4E0D\u8981\u91CD\u65B0\u4E0B\u5355",
+      ...recovery.baseUrl === void 0 ? [] : [`\u670D\u52A1\u5730\u5740\uFF1A${singleLine(recovery.baseUrl)}`],
+      ...recovery.status === void 0 ? [] : [`\u6700\u540E\u72B6\u6001\uFF1A${singleLine(recovery.status)}`],
+      ...recovery.failureCode === void 0 ? [] : [`\u4EFB\u52A1\u5931\u8D25\u7801\uFF1A${singleLine(recovery.failureCode)}`],
+      ...recovery.idempotencyKey === void 0 ? [] : [`\u5E42\u7B49\u952E\uFF1A${singleLine(recovery.idempotencyKey)}`],
+      ...recovery.statusCommand === void 0 ? [] : [`\u53EA\u67E5\u8BE2\u539F\u4EFB\u52A1\uFF1A${singleLine(recovery.statusCommand)}`]
+    ]
+  ];
 }
 function createOutput(streams, json) {
   const secrets = [];
@@ -2393,20 +2491,23 @@ function waitControls3(io, values) {
     sleep: io.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)))
   };
 }
-function settleRun(outcome) {
+function settleRun(outcome, baseUrl) {
   const run2 = outcome.value.view;
+  const recovery = taskRecovery("videos", run2.rootRunId, run2.status, baseUrl, run2.failure?.code);
   if (outcome.timedOut) {
     throw new CliError({
       code: "CLI_WAIT_TIMEOUT",
       exitCode: EXIT.WAIT_TIMEOUT,
-      message: `\u7B49\u4E86\u8FD9\u4E48\u4E45\u8FD8\u5728 ${run2.status}\uFF08${run2.stage}\uFF09\uFF1A\u518D\u67E5\u7528 buke videos status ${run2.rootRunId}\uFF0C\u6216\u52A0 --timeout \u5EF6\u957F\u7B49\u5F85`
+      message: `\u7B49\u4E86\u8FD9\u4E48\u4E45\u8FD8\u5728 ${run2.status}\uFF08${run2.stage}\uFF09\uFF1A\u518D\u67E5\u7528 ${recovery.statusCommand}\uFF0C\u7ED9\u8BE5\u67E5\u8BE2\u52A0 --wait --timeout <\u79D2\u6570> \u53EF\u7EE7\u7EED\u7B49\u5F85`,
+      recovery
     });
   }
   if (run2.status === "failed" || run2.status === "canceled") {
     throw new CliError({
       code: "CLI_TASK_FAILED",
       exitCode: EXIT.TASK_FAILED,
-      message: run2.failure === null ? `\u8FD9\u6761\u89C6\u9891${run2.status === "canceled" ? "\u5DF2\u53D6\u6D88" : "\u6CA1\u6709\u505A\u6210"}` : singleLine(run2.failure.title) + (run2.failure.detail === "" ? "" : `\uFF1A${singleLine(run2.failure.detail)}`)
+      message: run2.failure === null ? `\u8FD9\u6761\u89C6\u9891${run2.status === "canceled" ? "\u5DF2\u53D6\u6D88" : "\u6CA1\u6709\u505A\u6210"}` : singleLine(run2.failure.title) + (run2.failure.detail === "" ? "" : `\uFF1A${singleLine(run2.failure.detail)}`),
+      recovery
     });
   }
   return outcome.value;
@@ -2483,7 +2584,7 @@ async function status3(context, rawId) {
   const controls = shouldWait ? waitControls3(io, values) : void 0;
   const { apiKey, baseUrl } = await resolveApiKey(context);
   const current = await getVideoRun(baseUrl, apiKey, runId, io);
-  const final = shouldWait ? settleRun(await awaitVideoRun(baseUrl, apiKey, current, io, controls)) : current;
+  const final = shouldWait ? settleRun(await awaitVideoRun(baseUrl, apiKey, current, io, controls), baseUrl) : current;
   const lastDirectorLine = [...final.view.messages].reverse().find((message2) => message2.role === "assistant" && message2.text.trim() !== "");
   out.result(
     [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bukesiyi-cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "《不可思议》的命令行工具：用 API 密钥调用（命令名 buke）",
   "type": "module",
   "bin": {