@deepstorm/cli 0.2.3 → 0.2.4

package/dist/cli.js

@@ -6996,7 +6996,7 @@ async function runSetup(reader, targetDir, cliDir2, options, registry2) {
     enabledMcpJsonServers = Object.keys(servers);
     console.log(`\u2714 \u5DF2\u5B89\u88C5 ${selectedMcpTools.length} \u4E2A MCP \u670D\u52A1`);
   }
-  installMcpSkills(tools, reader, cliDir2, targetDir, installedSkillIds);
+  installMcpSkills(tools, reader, cliDir2, targetDir, installedSkillIds, selectedMcpTools);
   for (const tool of tools) {
     const ids = renderToolAssets(tool, reader, cliDir2, targetDir, templateVariables, config, registry2, selectedMcpTools);
     installedSkillIds.push(...ids);
@@ -7092,7 +7092,7 @@ function shouldSkipAgent(agentFile, config) {
   const value = config[configKey];
   return !value || value === "none";
 }
-function renderToolAssets(tool, reader, cliDir2, targetDir, templateVariables, config, registry2, installedMcpTools = [], targetSubDir = ".claude") {
+function renderToolAssets(tool, reader, cliDir2, targetDir, templateVariables, config, registry2, installedMcpTools = [], targetSubDir = ".claude", skillIdFilter) {
   const installedSkillIds = [];
   const targetSkillsDir = targetSubDir ? path6.join(targetDir, targetSubDir, "skills") : path6.join(targetDir, "skills");
   const toolSkills = reader.getToolSkills(tool);
@@ -7100,6 +7100,7 @@ function renderToolAssets(tool, reader, cliDir2, targetDir, templateVariables, c
   for (const skill of toolSkills) {
     const skillId = getSkillId(skill, registry2);
     if (!skillId) continue;
+    if (skillIdFilter && !skillIdFilter.has(skillId)) continue;
     if (shouldSkipSkill(skill, config)) {
       console.log(`  \u23ED ${skillId}\uFF1A\u4F9D\u8D56 ${skill.configKey} \u672A\u914D\u7F6E\uFF0C\u8DF3\u8FC7`);
       continue;
@@ -7180,14 +7181,21 @@ function renderToolAssets(tool, reader, cliDir2, targetDir, templateVariables, c
   }
   return installedSkillIds;
 }
-function installMcpSkills(tools, reader, cliDir2, targetDir, installedSkillIds) {
+function installMcpSkills(tools, reader, cliDir2, targetDir, installedSkillIds, selectedMcpTools = []) {
   const mcpSkillsDir = path6.join(cliDir2, "mcp-skills");
   const targetSkillsDir = path6.join(targetDir, ".claude", "skills");
   if (!fs10.existsSync(mcpSkillsDir)) return;
+  if (selectedMcpTools.length === 0) {
+    console.log("\u23ED \u672A\u9009\u62E9 MCP \u670D\u52A1\uFF0C\u8DF3\u8FC7 MCP \u6280\u80FD\u5B89\u88C5");
+    return;
+  }
+  const selectedMcpSet = new Set(selectedMcpTools);
   const neededSkills = /* @__PURE__ */ new Set();
   for (const tool of tools) {
     const toolMcpSkills = reader.getToolMcpSkills(tool);
     for (const skillId of toolMcpSkills) {
+      const service = skillId.replace(/^deepstorm-mcp-/, "").replace(/-(read|write)$/, "");
+      if (!selectedMcpSet.has(service)) continue;
       neededSkills.add(skillId);
     }
   }
@@ -8355,7 +8363,19 @@ function syncToolAssets(cliDir2, targetDir, installedSkillIds) {
   }
   const { config, installedMcpTools } = readSettingsConfig(targetDir);
   const templateVariables = buildTemplateVariables(registry2, config, installedMcpTools);
-  const backedUpFiles = backupModifiedAssets(targetDir, installedSkillIds, toolNames, registry2);
+  const mcpSkillSet = /* @__PURE__ */ new Set();
+  if (installedMcpTools.length > 0) {
+    const selectedMcpSet = new Set(installedMcpTools);
+    for (const tool of toolNames) {
+      for (const skillId of reader.getToolMcpSkills(tool)) {
+        const service = skillId.replace(/^deepstorm-mcp-/, "").replace(/-(read|write)$/, "");
+        if (selectedMcpSet.has(service)) mcpSkillSet.add(skillId);
+      }
+    }
+  }
+  const mcpSkillIds = [...mcpSkillSet];
+  const allSkillIdsForBackup = [.../* @__PURE__ */ new Set([...installedSkillIds, ...mcpSkillIds])];
+  const backedUpFiles = backupModifiedAssets(targetDir, allSkillIdsForBackup, toolNames, registry2);
   if (backedUpFiles.length > 0) {
     console.log("\n\u26A0 \u68C0\u6D4B\u5230\u7528\u6237\u4FEE\u6539\u7684\u6587\u4EF6\uFF1A");
     for (const info of backedUpFiles) {
@@ -8396,15 +8416,20 @@ function syncToolAssets(cliDir2, targetDir, installedSkillIds) {
     }
   }
   const syncedSkills = actualSkillIds.length > 0 ? actualSkillIds : [...installedSkillIds];
+  const syncedMcpSkillIds = [];
+  if (installedMcpTools.length > 0) {
+    installMcpSkills(toolNames, reader, cliDir2, targetDir, syncedMcpSkillIds, installedMcpTools);
+  }
   mergeToolHooksJson(toolNames, cliDir2, targetDir);
-  storeNewChecksums(targetDir, installedSkillIds, toolNames, registry2);
+  const allSkillIds = [...installedSkillIds, ...syncedMcpSkillIds];
+  storeNewChecksums(targetDir, allSkillIds, toolNames, registry2);
   if (hasWarning) {
     console.log("\n\u26A0 \u90E8\u5206\u5DE5\u5177\u540C\u6B65\u51FA\u9519\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5");
   }
   const uniqueAgents = [...new Set(syncedAgents)];
   const uniqueHooks = [...new Set(syncedHooks)];
   return {
-    syncedSkills,
+    syncedSkills: [...syncedSkills, ...syncedMcpSkillIds],
     syncedAgents: uniqueAgents,
     syncedHooks: uniqueHooks,
     backedUpFiles
@@ -8426,12 +8451,33 @@ function upgradeTemplates(cliDir2, targetDir, skillIds) {
 
 // src/commands/update.ts
 var NPM_REGISTRY_URL = "https://registry.npmjs.org/@deepstorm/cli/latest";
+function getRegistryUrl() {
+  return process.env.DEEPSTORM_REGISTRY_URL || NPM_REGISTRY_URL;
+}
+function readLocalRegistryFile(url) {
+  let filePath = url;
+  if (filePath.startsWith("file://")) {
+    filePath = filePath.slice(7);
+  }
+  try {
+    if (fs21.existsSync(filePath)) {
+      return JSON.parse(fs21.readFileSync(filePath, "utf-8"));
+    }
+  } catch {
+  }
+  return null;
+}
 async function checkNpmVersion(fetchFn = globalThis.fetch) {
   const current = getCliVersion();
+  const url = getRegistryUrl();
   try {
+    const localData = readLocalRegistryFile(url);
+    if (localData) {
+      return parseVersionResponse(localData, current);
+    }
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), 5e3);
-    const response = await fetchFn(NPM_REGISTRY_URL, {
+    const response = await fetchFn(url, {
       signal: controller.signal
     });
     clearTimeout(timeout);
@@ -8439,47 +8485,52 @@ async function checkNpmVersion(fetchFn = globalThis.fetch) {
       return {
         current,
         latest: null,
-        error: `npm registry \u8FD4\u56DE\u72B6\u6001\u7801 ${response.status}`
+        error: `registry \u8FD4\u56DE\u72B6\u6001\u7801 ${response.status}`
       };
     }
     const data = await response.json();
-    const latest = data.version;
-    if (!latest) {
-      return {
-        current,
-        latest: null,
-        error: "\u65E0\u6CD5\u89E3\u6790 registry \u54CD\u5E94\u4E2D\u7684\u7248\u672C\u53F7"
-      };
-    }
-    const isUpToDate = current === latest;
-    const hasUpdate = !isUpToDate && latest !== null;
+    return parseVersionResponse(data, current);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    const hint = message.includes("abort") ? "\u8FDE\u63A5\u8D85\u65F6" : message.includes("fetch failed") || message.includes("ECONNREFUSED") || message.includes("ENOTFOUND") ? `\u65E0\u6CD5\u8FDE\u63A5 registry\uFF08${url}\uFF09\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC` : message;
     return {
       current,
-      latest,
-      isUpToDate,
-      hasUpdate
+      latest: null,
+      error: hint
     };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
+  }
+}
+function parseVersionResponse(data, current) {
+  const latest = data.version;
+  if (!latest) {
     return {
       current,
       latest: null,
-      error: message
+      error: "\u65E0\u6CD5\u89E3\u6790 registry \u54CD\u5E94\u4E2D\u7684\u7248\u672C\u53F7"
     };
   }
+  const isUpToDate = current === latest;
+  const hasUpdate = !isUpToDate && latest !== null;
+  return {
+    current,
+    latest,
+    isUpToDate,
+    hasUpdate
+  };
 }
 async function updateCLI(fetchFn) {
   const result = await checkNpmVersion(fetchFn);
   if (result.error) {
     console.log(`\u26A0 \u65E0\u6CD5\u68C0\u67E5\u66F4\u65B0\uFF1A${result.error}`);
-    return;
+    return result;
   }
   console.log(`\u2714 \u5F53\u524D\u7248\u672C: v${result.current}`);
   console.log(`\u2714 \u6700\u65B0\u7248\u672C: v${result.latest}`);
   if (result.hasUpdate) {
     console.log("\u2192 \u6B63\u5728\u81EA\u52A8\u66F4\u65B0...");
+    const updateCmd = process.env.DEEPSTORM_UPDATE_CMD || "npm install -g @deepstorm/cli@latest";
     try {
-      (0, import_node_child_process.execSync)("npm install -g @deepstorm/cli@latest", { stdio: "inherit" });
+      (0, import_node_child_process.execSync)(updateCmd, { stdio: "inherit" });
       console.log(`
 \u2714 \u5DF2\u66F4\u65B0\u81F3 v${result.latest}`);
     } catch {
@@ -8489,6 +8540,7 @@ async function updateCLI(fetchFn) {
   } else {
     console.log("\u2713 \u5DF2\u662F\u6700\u65B0\u7248\u672C");
   }
+  return result;
 }
 function getInstalledSkillIds(targetDir) {
   const settingsPath = path19.join(targetDir, ".claude", "settings.json");
@@ -8503,14 +8555,13 @@ function getInstalledSkillIds(targetDir) {
 function registerUpdateCommand(program2) {
   const cliDir2 = __dirname;
   program2.command("update").description("\u68C0\u67E5 CLI \u66F4\u65B0\u5E76\u540C\u6B65\u5DF2\u5B89\u88C5 skill \u7684\u5B98\u65B9\u6700\u65B0\u6A21\u677F").action(async () => {
-    await updateCLI();
-    console.log("");
     const installedIds = getInstalledSkillIds(process.cwd());
     if (installedIds.length === 0) {
       console.log("\u672A\u68C0\u6D4B\u5230\u5DF2\u5B89\u88C5\u7684 skill\uFF0C\u8DF3\u8FC7\u540C\u6B65");
     } else {
       upgradeTemplates(cliDir2, process.cwd(), installedIds);
     }
+    await updateCLI();
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepstorm/cli",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "DeepStorm CLI — 一键配置项目开发环境",
   "license": "MIT",
   "author": "billkang",