@manturhub/cli 0.8.1 → 0.8.2

package/README.md

@@ -43,7 +43,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

@@ -100,7 +100,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）
@@ -469,7 +469,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/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.8.2",
   "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"