@manturhub/cli 0.8.1 → 0.9.0

package/README.md

@@ -15,6 +15,8 @@ manturhub login
 printf '%s' "$YOUR_MANTURHUB_KEY" | manturhub login --key-stdin
 ```
 
+CLI 默认连接生产站 `https://hub.mantur.ai`，Key 也必须在该生产站创建。`hub.mantur.cn` 是独立测试环境，其 Key 不能用于生产站。
+
 需要 Node.js ≥ 18。也可免安装运行：`npx -y @manturhub/cli <命令>`。
 
 ## 快速开始
@@ -29,7 +31,9 @@ manturhub quote op.text.commerce-copy
 manturhub run op.text.commerce-copy --json '{"product_info":"便携榨汁杯，USB 充电，300ml","scene":"product_title","tone":"lively"}'
 ```
 
-CLI 会在付费调用前按算子实时 schema 校验未知字段、必填项、类型和枚举，校验失败不会发起 invoke。
+CLI 会在付费调用前按算子实时 schema 校验未知字段、必填项、类型和枚举，校验失败不会发起 invoke。校验通过后会显示本次预计消耗和计费依据，获得确认才调用；完成后显示实际消耗和退款。批量参数也按整批请求试算。
+
+在 Agent 或脚本等非交互环境中，第一次运行只返回报价和 `quote_id`，不会调用或扣费；Agent 向用户确认后，使用提示中的 `--confirm <quote_id>` 执行。报价 5 分钟内有效且只能使用一次。
 
 ## 主要命令
 
@@ -43,7 +47,7 @@ CLI 会在付费调用前按算子实时 schema 校验未知字段、必填项
 | `manturhub upload <本地文件>` | 流式上传图片、音频或视频并输出公网 URL |
 | `manturhub status <poll_url>` | 查询 `run --no-wait` 返回的异步任务 |
 | `manturhub balance [--json]` | 查询余额及美元等值（1 馒头 = $0.01 USD） |
-| `manturhub skill ls [--json]` / `skill add <slug> --client codex` | 浏览和安装业务 Skill |
+| `manturhub skill ls [--json]` / `skill add <slug> [--client codex]` | 浏览和安装业务 Skill；默认自动识别 Agent |
 | `manturhub recipe [关键词]` / `recipe get <ID>` | 搜索并查看已验证配方 |
 | `manturhub suite ls [--json]` / `suite install <slug>` | 安装多角色 Agent 套件，不复制 API Key |
 | `manturhub init` | 给当前项目写入 Agent 使用引导 |

package/bin/cli.js

@@ -10,6 +10,7 @@ import { createReadStream, readFileSync, statSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { dirname, join, basename, extname } from "node:path";
 import { parseDynamicParams, validateParams } from "../lib/params.js";
+import { confirmCharge, formatMantou, printBillingResult } from "../lib/billing-confirm.js";
 
 // 本地文件 → MIME(presign 只接受 image/audio/video)
 const MIME_BY_EXT = {
@@ -67,8 +68,8 @@ function assertFlags(tokens, { value = [], boolean = [] } = {}) {
 function assertRunControlFlags(tokens) {
   for (let i = 0; i < tokens.length; i++) {
     const token = tokens[i];
-    if (token === "--no-wait" || token.startsWith("--json=") || token.startsWith("--json-file=")) continue;
-    if (token === "--json" || token === "--json-file") {
+    if (token === "--no-wait" || token.startsWith("--json=") || token.startsWith("--json-file=") || token.startsWith("--confirm=")) continue;
+    if (token === "--json" || token === "--json-file" || token === "--confirm") {
       const value = tokens[i + 1];
       if (value === undefined || value.startsWith("--")) throw new Error(`参数 ${token} 缺少值`);
       i++;
@@ -92,7 +93,7 @@ const HELP = `manturhub — ManturHub 算子广场 CLI  v${VERSION}
   manturhub ls [--cat <分类>] [--json]  列出上线算子（无需登录）
   manturhub describe <算子ID> [--json]  查看算子入参字段（无需登录）
   manturhub quote <算子ID>            查询实时计费公式（不要使用 Skill 内的历史价格）
-  manturhub run <算子ID> --json '{}'  调用算子（异步算子自动轮询到出结果；--no-wait 只拿 job_id）
+  manturhub run <算子ID> --json '{}'  试算并确认费用后调用（异步算子自动轮询到出结果）
   manturhub run <算子ID> --json-file x.json  从文件读参数（prompt 来自配方/用户时更安全）
   manturhub upload <本地文件>         上传图片/音频/视频 → 公网 URL（喂算子前先转换本地文件）
   manturhub status <poll_url>         查异步任务状态（配合 run --no-wait）
@@ -100,7 +101,7 @@ const HELP = `manturhub — ManturHub 算子广场 CLI  v${VERSION}
   manturhub init                      装「ManturHub 使用 skill」+ 写 agent 引导（推荐：让 agent 会用算子）
   manturhub skill ls                  列出平台 Skill（业务成品流程，如爆款复刻）
   manturhub skill add <slug> [--client claude-code|codex|all]
-                                      安装 Skill 到指定 Agent
+                                      自动识别 Agent 并安装 Skill（可显式指定）
   manturhub suite ls                  列出 Agent 套件（多角色团队工作区，给 Agent 配一整个团队）
   manturhub suite install <slug>      安装套件为工作目录 ./<slug>/（不复制 API Key）
   manturhub recipe [关键词] [--cat x] 搜配方（已验证创作的效果+可复现参数；分类 video/image/script）
@@ -161,7 +162,14 @@ async function main() {
           `✓ Key 已验证并保存。账号: ${r.json.email || "-"}   余额: ${usdFor(r.json.balance)}（${r.json.balance ?? "-"} 馒头）`
         );
       } else {
-        console.error(`Key 验证失败（HTTP ${r.status}），未修改本地配置。请确认 key 是否正确、是否已激活。`);
+        const base = getBaseUrl();
+        const productionHint = new URL(base).hostname === "hub.mantur.ai"
+          ? " 对外用户请在 https://hub.mantur.ai 创建生产 Key；hub.mantur.cn 的测试 Key 不能用于生产。"
+          : "";
+        console.error(
+          `Key 验证失败（HTTP ${r.status}），未修改本地配置。当前连接：${base}。` +
+          `Key 必须由这个站点创建，请确认 Key 是否正确、是否已激活。${productionHint}`
+        );
         process.exit(1);
       }
       break;
@@ -338,9 +346,46 @@ async function main() {
         console.error(`参数校验失败: ${error.message}`);
         process.exit(1);
       }
+      let quoteId = getFlag("confirm");
+      if (!quoteId) {
+        const quote = await apiFetch(`/api/v1/operators/${encodeURIComponent(op)}/quote`, {
+          method: "POST",
+          body,
+        });
+        if (!quote.ok) {
+          console.error(`本次费用试算失败（HTTP ${quote.status}）: ${JSON.stringify(quote.json)}`);
+          process.exit(1);
+        }
+        const estimated = Number(quote.json?.estimated_dumplings);
+        quoteId = quote.json?.quote_id;
+        if (Number.isFinite(estimated) && estimated > 0) {
+          if (process.stdin.isTTY && process.stderr.isTTY) {
+            if (!(await confirmCharge(quote.json))) {
+              console.error("已取消，未调用算子、未扣费。");
+              process.exit(2);
+            }
+          } else {
+            console.error(JSON.stringify({
+              error: "CONFIRMATION_REQUIRED",
+              message: `本次预计消耗 ${formatMantou(estimated)}，请先取得用户确认`,
+              estimated_dumplings: estimated,
+              balance: quote.json?.balance,
+              formula: quote.json?.formula,
+              quote_id: quoteId,
+              retry_with: `--confirm ${quoteId}`,
+            }, null, 2));
+            process.exit(3);
+          }
+        }
+      }
       const r = await apiFetch(
         `/api/v1/operators/${encodeURIComponent(op)}/invoke`,
-        { method: "POST", body, timeoutMs: 120000 }
+        {
+          method: "POST",
+          body,
+          timeoutMs: 120000,
+          headers: quoteId ? { "X-Mantur-Quote-Id": quoteId } : {},
+        }
       );
       // 异步算子(返回 poll_url)默认自动轮询到出结果;--no-wait 只拿 job_id。
       const pollUrl = r.ok && r.json && r.json.poll_url;
@@ -355,10 +400,12 @@ async function main() {
             ),
         });
         console.log(JSON.stringify(final, null, 2));
+        printBillingResult(final);
         const st = final && final.status;
         if (st === "failed" || st === "error" || (final && final._timeout)) process.exit(1);
       } else {
         console.log(JSON.stringify(r.json, null, 2));
+        printBillingResult(r.json);
         if (!r.ok) process.exit(1);
       }
       break;
@@ -469,7 +516,7 @@ async function main() {
           console.error(error.message);
           process.exit(1);
         }
-        await skillAdd(args[2], getFlag("client", "claude-code"));
+        await skillAdd(args[2], getFlag("client"));
       }
       else {
         console.error("用法: manturhub skill ls   |   manturhub skill add <slug> [--client claude-code|codex|all]");

package/lib/agent-target.js

@@ -0,0 +1,88 @@
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { createInterface } from "node:readline/promises";
+import { determineAgent } from "@vercel/detect-agent";
+
+const SUPPORTED_CLIENTS = new Set(["claude", "claude-code", "codex", "all"]);
+
+export function normalizeClient(client) {
+  if (client === undefined || client === null || client === "") return null;
+  if (!SUPPORTED_CLIENTS.has(client)) {
+    throw new Error("不支持的 client。可用值: claude-code | codex | all");
+  }
+  return client === "claude" ? "claude-code" : client;
+}
+
+export function clientForAgentName(name) {
+  if (name === "claude" || name === "cowork") return "claude-code";
+  if (name === "codex") return "codex";
+  return null;
+}
+
+export function detectInstalledClients({ home = homedir(), exists = existsSync } = {}) {
+  const clients = [];
+  if (exists(join(home, ".claude"))) clients.push("claude-code");
+  if (exists(join(home, ".codex")) || exists("/etc/codex")) clients.push("codex");
+  return clients;
+}
+
+function displayClient(client) {
+  if (client === "all") return "Claude Code、Codex";
+  return client === "codex" ? "Codex" : "Claude Code";
+}
+
+async function promptForClient(input, output, installedClients) {
+  const detected = installedClients.length
+    ? `\n检测到: ${installedClients.map(displayClient).join("、")}`
+    : "";
+  output.write(`${detected}\n请选择 Skill 安装目标:\n  1) Codex\n  2) Claude Code\n  3) 两者\n`);
+  const rl = createInterface({ input, output });
+  try {
+    const answer = (await rl.question("请输入 1 / 2 / 3: ")).trim();
+    if (answer === "1") return "codex";
+    if (answer === "2") return "claude-code";
+    if (answer === "3") return "all";
+    throw new Error("已取消：请输入 1、2 或 3，或使用 --client 明确指定。");
+  } finally {
+    rl.close();
+  }
+}
+
+export async function resolveSkillClient(
+  client,
+  {
+    detectAgent = determineAgent,
+    installedClients,
+    input = process.stdin,
+    output = process.stdout,
+  } = {}
+) {
+  const explicit = normalizeClient(client);
+  if (explicit) return { client: explicit, detected: false };
+
+  const agent = await detectAgent();
+  const runtimeClient = agent.isAgent ? clientForAgentName(agent.agent?.name) : null;
+  if (runtimeClient) return { client: runtimeClient, detected: true };
+
+  const installed = installedClients ?? detectInstalledClients();
+  if (installed.length === 1) return { client: installed[0], detected: true };
+
+  if (input.isTTY && output.isTTY) {
+    return {
+      client: await promptForClient(input, output, installed),
+      detected: false,
+    };
+  }
+
+  if (installed.length > 1) {
+    throw new Error(
+      "检测到 Claude Code 和 Codex，但当前无法交互选择。请加 --client codex、--client claude-code 或 --client all。"
+    );
+  }
+  throw new Error(
+    "未识别到 Codex 或 Claude Code。请在 Agent 内重试，或加 --client codex|claude-code|all。"
+  );
+}
+
+export { displayClient };

package/lib/api.js

@@ -3,7 +3,7 @@ import { getKey, getBaseUrl } from "./config.js";
 // Thin REST client against the ManturHub gateway. Public discovery calls may omit auth.
 export async function apiFetch(
   path,
-  { method = "GET", body, key, auth = "required", timeoutMs = 30000 } = {}
+  { method = "GET", body, key, auth = "required", timeoutMs = 30000, headers = {} } = {}
 ) {
   const apiKey = key === undefined ? getKey() : key;
   if (auth === "required" && !apiKey) {
@@ -22,6 +22,7 @@ export async function apiFetch(
       headers: {
         ...(includeKey && apiKey ? { "x-api-key": apiKey } : {}),
         ...(body ? { "Content-Type": "application/json" } : {}),
+        ...headers,
       },
       body: body ? JSON.stringify(body) : undefined,
       signal: AbortSignal.timeout(timeoutMs),

package/lib/billing-confirm.js

@@ -0,0 +1,34 @@
+import { createInterface } from "node:readline/promises";
+
+export function formatMantou(value) {
+  const number = Number(value);
+  return Number.isFinite(number) ? `${number} 馒头（$${(number * 0.01).toFixed(2)} USD）` : "未知";
+}
+
+export async function confirmCharge(quote, { input = process.stdin, output = process.stderr } = {}) {
+  output.write(`\n⚠️  本次预计消耗：${formatMantou(quote.estimated_dumplings)}\n`);
+  if (quote.formula) output.write(`计费依据：${quote.formula}\n`);
+  if (Number.isFinite(Number(quote.balance))) output.write(`当前余额：${quote.balance} 馒头\n`);
+  const rl = createInterface({ input, output });
+  try {
+    const answer = (await rl.question("是否继续？[y/N] ")).trim().toLowerCase();
+    return answer === "y" || answer === "yes";
+  } finally {
+    rl.close();
+  }
+}
+
+export function printBillingResult(result, output = process.stderr) {
+  const billing = result?._billing;
+  if (!billing) return;
+  const estimated = Number(billing.estimated_dumplings);
+  const charged = Number(billing.charged_dumplings);
+  const refunded = Number(billing.refunded_dumplings);
+  if (billing.final) {
+    output.write(`\n✓ 本次实际消耗：${formatMantou(charged)}\n`);
+    if (Number.isFinite(refunded) && refunded > 0) output.write(`  已退款：${formatMantou(refunded)}\n`);
+    if (Number.isFinite(estimated) && estimated !== charged) output.write(`  调用前预计：${formatMantou(estimated)}\n`);
+  } else {
+    output.write(`\n⏳ 已预扣：${formatMantou(charged)}，任务完成后以最终结算为准\n`);
+  }
+}

package/lib/params.js

@@ -85,6 +85,14 @@ export function parseDynamicParams(tokens) {
   for (let i = 0; i < tokens.length; i++) {
     const token = tokens[i];
     if (token === "--no-wait") continue;
+    if (token === "--confirm") {
+      if (tokens[i + 1] === undefined || tokens[i + 1].startsWith("--")) {
+        throw new Error("参数 --confirm 缺少值");
+      }
+      i++;
+      continue;
+    }
+    if (token?.startsWith("--confirm=")) continue;
     if (!token?.startsWith("--")) throw new Error(`无法识别的参数: ${token}`);
     const equals = token.indexOf("=");
     if (equals > 2) {

package/lib/skill-install.js

@@ -5,6 +5,7 @@ import { getKey, getBaseUrl } from "./config.js";
 import { extractZipSafely, validateSlug } from "./archive.js";
 import { apiFetch } from "./api.js";
 import { assertSecureDownloadUrl, downloadResponseToFile } from "./download.js";
+import { displayClient, resolveSkillClient } from "./agent-target.js";
 
 // `manturhub skill ls` — 列出平台上线 Skill（公开元数据，无需 key；
 // 配了 key 则带上——管理员租户的 key 能看到 admin 专属 Skill）。
@@ -34,11 +35,11 @@ export async function skillLs({ json = false } = {}) {
     const ver = s.version ? `v${s.version}` : "";
     console.log(`  ${slug} ${s.name || ""}   ${cat} ${ver}`.trimEnd());
   }
-  console.log(`\n用 \`manturhub skill add <slug> --client claude-code|codex|all\` 安装到指定 Agent。`);
+  console.log(`\n用 \`manturhub skill add <slug>\` 自动识别 Agent；也可用 \`--client\` 明确指定。`);
 }
 
-// `manturhub skill add <slug>` — 下载并安全解压到指定 Agent 的用户级 skills 目录。
-export async function skillAdd(slug, client = "claude-code") {
+// `manturhub skill add <slug>` — 自动识别 Agent，下载并安全解压到用户级 skills 目录。
+export async function skillAdd(slug, client) {
   if (!slug) {
     console.error("用法: manturhub skill add <slug>   （先 `manturhub skill ls` 看可用 Skill）");
     process.exit(1);
@@ -49,6 +50,16 @@ export async function skillAdd(slug, client = "claude-code") {
     console.error(error.message);
     process.exit(1);
   }
+  let target;
+  try {
+    target = await resolveSkillClient(client);
+  } catch (error) {
+    console.error(error.message);
+    process.exit(1);
+  }
+  client = target.client;
+  if (target.detected) console.log(`✓ 已识别 Agent：${displayClient(client)}`);
+
   const key = getKey();
   if (!key) {
     console.error("下载 Skill 需 API Key。运行 `manturhub login`，或设置环境变量 MANTURHUB_KEY。");
@@ -96,13 +107,8 @@ export async function skillAdd(slug, client = "claude-code") {
     console.error(`下载失败（HTTP ${res.status}）`);
     process.exit(1);
   }
-  const supported = new Set(["claude", "claude-code", "codex", "all"]);
-  if (!supported.has(client)) {
-    console.error("不支持的 client。可用值: claude-code | codex | all");
-    process.exit(1);
-  }
   const destinations = [];
-  if (client === "claude" || client === "claude-code" || client === "all") {
+  if (client === "claude-code" || client === "all") {
     destinations.push(join(homedir(), ".claude", "skills", slug));
   }
   if (client === "codex" || client === "all") {
@@ -122,5 +128,5 @@ export async function skillAdd(slug, client = "claude-code") {
   }
   rmSync(tempDir, { recursive: true, force: true });
   for (const dest of destinations) console.log(`✓ 已安装 Skill「${slug}」→ ${dest}`);
-  console.log("  重启对应 Agent 后，用自然语言描述任务；Claude Code 也可用 /<slug> 触发。");
+  console.log("  重启对应 Agent 后，用自然语言描述任务即可使用。");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manturhub/cli",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "ManturHub 算子广场 CLI：通过 REST 发现和调用 AI 算子、浏览配方，并安装 Skill 与 Agent 套件",
   "type": "module",
   "bin": {
@@ -9,6 +9,9 @@
   "engines": {
     "node": ">=18"
   },
+  "dependencies": {
+    "@vercel/detect-agent": "^1.2.1"
+  },
   "scripts": {
     "test": "node --test",
     "prepack": "npm test"