@manturhub/cli 0.9.3 → 0.9.5

package/lib/archive.js

@@ -21,8 +21,8 @@ export function validateSlug(slug, label = "ID") {
   return slug;
 }
 
-function listArchive(zipPath) {
-  const commands = [
+function archiveTools(zipPath) {
+  return [
     {
       command: "unzip",
       list: ["-Z1", zipPath],
@@ -37,25 +37,16 @@ function listArchive(zipPath) {
       extract: (dest) => ["-xf", zipPath, "-C", dest],
     },
   ];
-  let foundExtractor = false;
-  for (const tool of commands) {
-    try {
-      const execOptions = { encoding: "utf8", maxBuffer: ARCHIVE_LIST_MAX_BUFFER };
-      const output = execFileSync(tool.command, tool.list, execOptions);
-      const verbose = execFileSync(tool.command, tool.verbose, execOptions);
-      const summary = tool.summary
-        ? execFileSync(tool.command, tool.summary, execOptions)
-        : "";
-      return { tool, entries: output.split(/\r?\n/).filter(Boolean), verbose, summary };
-    } catch (error) {
-      if (error?.code !== "ENOENT") foundExtractor = true;
-      // Missing tool or an extractor-specific parse failure: try the next one.
-    }
-  }
-  if (foundExtractor) {
-    throw new Error("解压失败：安装包格式无效、已损坏或文件清单过大");
-  }
-  throw new Error("解压失败（需系统 tar 或 unzip 命令）");
+}
+
+function inspectArchive(tool) {
+  const execOptions = { encoding: "utf8", maxBuffer: ARCHIVE_LIST_MAX_BUFFER };
+  const output = execFileSync(tool.command, tool.list, execOptions);
+  const verbose = execFileSync(tool.command, tool.verbose, execOptions);
+  const summary = tool.summary
+    ? execFileSync(tool.command, tool.summary, execOptions)
+    : "";
+  return { entries: output.split(/\r?\n/).filter(Boolean), verbose, summary };
 }
 
 function declaredUnpackedBytes(tool, verbose, summary) {
@@ -136,18 +127,44 @@ function rejectDestinationLinks(dir) {
 }
 
 export function extractZipSafely(zipPath, dest) {
-  const { tool, entries, verbose, summary } = listArchive(zipPath);
-  validateArchiveEntries(entries, verbose, declaredUnpackedBytes(tool, verbose, summary));
-  const staging = mkdtempSync(join(tmpdir(), "manturhub-extract-"));
-  try {
-    execFileSync(tool.command, tool.extract(staging), { stdio: ["ignore", "ignore", "ignore"] });
-    inspectExtracted(staging);
-    mkdirSync(dest, { recursive: true });
-    rejectDestinationLinks(dest);
-    for (const entry of readdirSync(staging)) {
-      cpSync(join(staging, entry), join(dest, basename(entry)), { recursive: true, force: true });
+  let foundExtractor = false;
+  for (const tool of archiveTools(zipPath)) {
+    let archive;
+    try {
+      archive = inspectArchive(tool);
+      foundExtractor = true;
+    } catch (error) {
+      if (error?.code !== "ENOENT") foundExtractor = true;
+      continue;
+    }
+    validateArchiveEntries(
+      archive.entries,
+      archive.verbose,
+      declaredUnpackedBytes(tool, archive.verbose, archive.summary)
+    );
+
+    const staging = mkdtempSync(join(tmpdir(), "manturhub-extract-"));
+    try {
+      try {
+        execFileSync(tool.command, tool.extract(staging), { stdio: ["ignore", "ignore", "ignore"] });
+      } catch {
+        // Some macOS unzip builds can list legacy-encoded Chinese filenames but fail
+        // while creating them. Let the next validated extractor (bsdtar via `tar`) try.
+        continue;
+      }
+      inspectExtracted(staging);
+      mkdirSync(dest, { recursive: true });
+      rejectDestinationLinks(dest);
+      for (const entry of readdirSync(staging)) {
+        cpSync(join(staging, entry), join(dest, basename(entry)), { recursive: true, force: true });
+      }
+      return;
+    } finally {
+      rmSync(staging, { recursive: true, force: true });
     }
-  } finally {
-    rmSync(staging, { recursive: true, force: true });
   }
+  if (foundExtractor) {
+    throw new Error("解压失败：安装包格式无效、已损坏或文件清单过大");
+  }
+  throw new Error("解压失败（需系统 tar 或 unzip 命令）");
 }

package/lib/params.js

@@ -4,7 +4,7 @@ function typeName(value) {
   return typeof value;
 }
 
-function normalizeType(type) {
+function normalizeTypeToken(type) {
   const t = String(type || "").toLowerCase();
   if (t.endsWith("[]") || t.startsWith("array")) return "array";
   if (t.includes("integer") || t === "int") return "integer";
@@ -15,8 +15,17 @@ function normalizeType(type) {
   return null;
 }
 
-function coerceValue(value, expected, name) {
-  if (typeof value !== "string" || !expected || expected === "string") return value;
+function normalizeTypes(type) {
+  const declared = Array.isArray(type)
+    ? type
+    : String(type || "").split(/\s*\|\s*/);
+  return [...new Set(declared.map(normalizeTypeToken).filter(Boolean))];
+}
+
+function coerceValue(value, expectedTypes, name) {
+  if (typeof value !== "string" || !expectedTypes.length) return value;
+  if (expectedTypes.some((expected) => matchesType(value, expected))) return value;
+  const expected = expectedTypes[0];
   if (expected === "boolean") {
     if (value === "true") return true;
     if (value === "false") return false;
@@ -67,10 +76,12 @@ export function validateParams(body, schema, { coerceStrings = false } = {}) {
   const result = { ...body };
   for (const [name, value] of Object.entries(result)) {
     const field = byName.get(name);
-    const expected = normalizeType(field.type);
-    const checked = coerceStrings ? coerceValue(value, expected, name) : value;
-    if (!matchesType(checked, expected)) {
-      throw new Error(`参数 ${name} 类型错误：需要 ${expected}，收到 ${typeName(checked)}`);
+    const expectedTypes = normalizeTypes(field.type);
+    const checked = coerceStrings ? coerceValue(value, expectedTypes, name) : value;
+    if (expectedTypes.length && !expectedTypes.some((expected) => matchesType(checked, expected))) {
+      throw new Error(
+        `参数 ${name} 类型错误：需要 ${expectedTypes.join(" 或 ")}，收到 ${typeName(checked)}`
+      );
     }
     if (Array.isArray(field.enum) && !field.enum.includes(checked)) {
       throw new Error(`参数 ${name} 只能是: ${field.enum.join(" | ")}`);

package/lib/skill.js

@@ -67,7 +67,7 @@ description: 调用 ManturHub 算子广场的 AI 能力与行业数据(文生图
 - \`manturhub describe <算子ID>\` → 某算子的精确入参字段
 
 > 能力大类参考(具体算子 ID 以 \`ls\` 实时为准):图像生成、花字渲染、视频生成 / 合成 / 理解 / 超分 / 擦字幕 / 配字幕、**剧本/分镜/参考图 → 动态提示词 → 无字黑白线稿 → 视频成片**、语音合成 / 克隆 / 音色设计 / 语音转写、电商文案、**Seedance2.0提示词润色(把需求或粗糙提示词+参考图润色成专业视频生成提示词,生成前先用它省重roll的钱)**、短剧拉片 / 改编 / 剧本评估、漫剧·短剧市场洞察(热榜 / 爆量 / 出海投放数据,\`ls --cat data\` 可见)。
-> 例:\`manturhub run image2 --json '{"prompt":"a red fox in snow","n":1}'\`(异步,run 自动等到出图)。字段拼不准就 \`manturhub describe <算子ID>\`,别凭记忆猜。
+> 例:\`manturhub run op.image.generate --json '{"prompt":"a red fox in snow","n":1}'\`(异步,run 自动等到出图)。字段拼不准就 \`manturhub describe <算子ID>\`,别凭记忆猜。
 `;
 
 // 默认同时安装 Claude Code 和 Codex 用户级 Skill。

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@manturhub/cli",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "ManturHub 算子广场 CLI：通过 REST 发现和调用 AI 算子、浏览配方，并安装 Skill 与 Agent 套件",
   "type": "module",
   "bin": {
-    "manturhub": "./bin/cli.js"
+    "manturhub": "bin/cli.js"
   },
   "engines": {
     "node": ">=18"