@manturhub/cli 0.9.10-dev.20260810.6 → 0.9.10-dev.20260810.8

package/lib/config.js

@@ -1,84 +1,84 @@
-import { homedir } from "node:os";
-import { join } from "node:path";
+import { homedir } from "node:os"
+import { join } from "node:path"
 import {
   readFileSync,
   writeFileSync,
   mkdirSync,
   existsSync,
   chmodSync,
-} from "node:fs";
+} from "node:fs"
 
 // Local config lives at ~/.manturhub/config.json (chmod 600). Env vars win over it.
-const DIR = join(homedir(), ".manturhub");
-const FILE = join(DIR, "config.json");
-const DEVELOPMENT_HTTP_ORIGIN = "http://gateway-dev.guiyi.cn";
-const PRODUCTION_ORIGIN = "https://hub.mantur.ai";
+const DIR = join(homedir(), ".manturhub")
+const FILE = join(DIR, "config.json")
+const DEVELOPMENT_ORIGIN = "https://gateway-dev.guiyi.cn"
+const PRODUCTION_ORIGIN = "https://hub.mantur.ai"
 const PACKAGE_VERSION = JSON.parse(
   readFileSync(new URL("../package.json", import.meta.url), "utf8")
-).version;
+).version
 
 export function defaultBaseForVersion(version) {
-  return /-dev(?:\.|$)/.test(String(version)) ? DEVELOPMENT_HTTP_ORIGIN : PRODUCTION_ORIGIN;
+  return /-dev(?:\.|$)/.test(String(version)) ? DEVELOPMENT_ORIGIN : PRODUCTION_ORIGIN
 }
 
 // dev 预发布包默认连接开发网关，稳定包默认连接生产网关。MANTURHUB_BASE
 // 仍可显式覆盖；历史配置中保存过的官方默认地址不应覆盖当前发布通道。
-const DEFAULT_BASE = defaultBaseForVersion(PACKAGE_VERSION);
+const DEFAULT_BASE = defaultBaseForVersion(PACKAGE_VERSION)
 const KNOWN_DEFAULT_BASES = new Set([
-  DEVELOPMENT_HTTP_ORIGIN,
+  DEVELOPMENT_ORIGIN,
   PRODUCTION_ORIGIN,
   "https://hub.mantur.cn",
   "https://manturhub.leisurecat.cloud",
   "https://api.ophub.com",
-]);
+])
 
 export function isAllowedHttpUrl(url) {
   const loopback =
-    url.hostname === "localhost" || url.hostname === "127.0.0.1" || url.hostname === "[::1]";
-  return url.protocol === "http:" && (loopback || url.origin === DEVELOPMENT_HTTP_ORIGIN);
+    url.hostname === "localhost" || url.hostname === "127.0.0.1" || url.hostname === "[::1]"
+  return url.protocol === "http:" && loopback
 }
 
 export function loadConfig() {
   try {
-    return JSON.parse(readFileSync(FILE, "utf8"));
+    return JSON.parse(readFileSync(FILE, "utf8"))
   } catch {
-    return {};
+    return {}
   }
 }
 
 export function saveConfig(cfg) {
-  if (!existsSync(DIR)) mkdirSync(DIR, { recursive: true });
-  writeFileSync(FILE, JSON.stringify(cfg, null, 2), { mode: 0o600 });
+  if (!existsSync(DIR)) mkdirSync(DIR, { recursive: true })
+  writeFileSync(FILE, JSON.stringify(cfg, null, 2), { mode: 0o600 })
   try {
-    chmodSync(FILE, 0o600);
+    chmodSync(FILE, 0o600)
   } catch {
     /* best-effort on platforms without chmod */
   }
 }
 
 export function getKey() {
-  return process.env.MANTURHUB_KEY || loadConfig().key || null;
+  return process.env.MANTURHUB_KEY || loadConfig().key || null
 }
 
 function validateBaseUrl(value) {
-  let url;
+  let url
   try {
-    url = new URL(value);
+    url = new URL(value)
   } catch {
-    throw new Error(`ManturHub 网关地址不合法: ${value}`);
+    throw new Error(`ManturHub 网关地址不合法: ${value}`)
   }
   if (url.protocol !== "https:" && !isAllowedHttpUrl(url)) {
     throw new Error(
-      "MANTURHUB_BASE 必须使用 HTTPS（仅本机地址和 http://gateway-dev.guiyi.cn 可使用 HTTP）"
-    );
+      "MANTURHUB_BASE 必须使用 HTTPS（仅本机地址可使用 HTTP）"
+    )
   }
-  if (url.username || url.password) throw new Error("MANTURHUB_BASE 不得包含用户名或密码");
-  return url.href.replace(/\/$/, "");
+  if (url.username || url.password) throw new Error("MANTURHUB_BASE 不得包含用户名或密码")
+  return url.href.replace(/\/$/, "")
 }
 
 export function getBaseUrl() {
-  if (process.env.MANTURHUB_BASE) return validateBaseUrl(process.env.MANTURHUB_BASE);
-  const storedBase = loadConfig().baseUrl?.replace(/\/$/, "");
-  if (storedBase && !KNOWN_DEFAULT_BASES.has(storedBase)) return validateBaseUrl(storedBase);
-  return DEFAULT_BASE;
+  if (process.env.MANTURHUB_BASE) return validateBaseUrl(process.env.MANTURHUB_BASE)
+  const storedBase = loadConfig().baseUrl?.replace(/\/$/, "")
+  if (storedBase && !KNOWN_DEFAULT_BASES.has(storedBase)) return validateBaseUrl(storedBase)
+  return DEFAULT_BASE
 }

package/lib/skill-install.js

@@ -53,9 +53,6 @@ async function fetchSkillDetail(slug) {
   }
   if (!response.ok) throw new Error(`Skill 信息获取失败（HTTP ${response.status}）`);
   const detail = unwrapGatewayData(response.json) || {};
-  if (!detail?.version) {
-    throw new Error(`线上 Skill「${slug}」缺少 version，平台需先修正后才能安装`);
-  }
   return { ...detail, slug: detail.code };
 }
 
@@ -234,6 +231,7 @@ export async function skillAdd(
   const tempDir = mkdtempSync(join(tmpdir(), "manturhub-skill-"));
   const bundle = join(tempDir, `${slug}.zip`);
   const staged = join(tempDir, "staged");
+  let installedVersion;
   let installError = null;
   try {
     await downloadSkillBundle(slug, bundle);
@@ -244,11 +242,17 @@ export async function skillAdd(
         `安装包 name 与请求不一致（请求 ${slug}，安装包 ${bundleMetadata.name || "缺失"}）`
       );
     }
-    if (bundleMetadata.version !== detail.version) {
+    // 兼容公开详情未返回版本的旧网关，以实际安装包版本记录安装状态。
+    // 接口已返回版本时仍严格比对，避免安装过程中发布切换造成版本错配。
+    if (detail.version && bundleMetadata.version !== detail.version) {
       throw new Error(
         `安装包 version 与线上元数据不一致（线上 ${detail.version}，安装包 ${bundleMetadata.version || "缺失"}）`
       );
     }
+    if (!bundleMetadata.version) {
+      throw new Error(`Skill「${slug}」的接口和安装包均缺少 version，无法记录安装版本`);
+    }
+    installedVersion = bundleMetadata.version;
     const contentSha256 = hashSkillDirectory(staged);
     const bundleSha256 = createHash("sha256").update(readFileSync(bundle)).digest("hex");
     const installedAt = new Date().toISOString();
@@ -259,7 +263,7 @@ export async function skillAdd(
         setSkillRecord(state, {
           slug,
           client: destination.client,
-          version: detail.version,
+          version: installedVersion,
           base_url: baseUrl,
           bundle_sha256: bundleSha256,
           content_sha256: contentSha256,
@@ -283,7 +287,7 @@ export async function skillAdd(
   }
 
   for (const destination of destinations) {
-    console.log(`✓ 已${action === "update" ? "更新" : "安装"} Skill「${slug}」v${detail.version} → ${destination.path}`);
+    console.log(`✓ 已${action === "update" ? "更新" : "安装"} Skill「${slug}」v${installedVersion} → ${destination.path}`);
   }
   console.log("  重启对应 Agent 后，用自然语言描述任务即可使用。");
 }

package/package.json

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