@deepstorm/cli 0.2.3 → 0.3.0

package/dist/cli.js

@@ -6757,6 +6757,10 @@ function cleanInstalled(targetDir) {
       }
     }
   }
+  const hooksJson = path2.join(targetDir, ".claude", "hooks.json");
+  if (fs6.existsSync(hooksJson)) {
+    fs6.rmSync(hooksJson, { force: true });
+  }
   const hooksDir = path2.join(targetDir, ".claude", "hooks");
   if (fs6.existsSync(hooksDir)) {
     fs6.rmSync(hooksDir, { recursive: true, force: true });
@@ -6996,19 +7000,18 @@ 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);
   }
   if (shouldInstallGlobalHooks(tools, reader)) {
     const hooksSrcDir = path6.join(cliDir2, "hooks");
-    const targetHooksDir = path6.join(targetDir, ".claude", "hooks");
-    const destHooksJson = path6.join(targetHooksDir, "hooks.json");
+    const destHooksJson = path6.join(targetDir, ".claude", "hooks.json");
     for (const tool of tools) {
       const toolHooksJsonPath = path6.join(hooksSrcDir, `${tool}-hooks.json`);
       if (fs10.existsSync(toolHooksJsonPath)) {
-        ensureDir(targetHooksDir);
+        ensureDir(path6.join(targetDir, ".claude"));
         const incoming = JSON.parse(fs10.readFileSync(toolHooksJsonPath, "utf-8"));
         mergeHooks(destHooksJson, incoming);
       }
@@ -7092,7 +7095,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 +7103,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 +7184,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);
     }
   }
@@ -8330,12 +8341,11 @@ function loadRegistryFromCliDir(cliDir2) {
 }
 function mergeToolHooksJson(toolNames, cliDir2, targetDir) {
   const hooksSrcDir = path18.join(cliDir2, "hooks");
-  const targetHooksDir = path18.join(targetDir, ".claude", "hooks");
-  const destHooksJson = path18.join(targetHooksDir, "hooks.json");
+  const destHooksJson = path18.join(targetDir, ".claude", "hooks.json");
   for (const tool of toolNames) {
     const toolHooksJsonPath = path18.join(hooksSrcDir, `${tool}-hooks.json`);
     if (fs20.existsSync(toolHooksJsonPath)) {
-      ensureDir(targetHooksDir);
+      ensureDir(path18.join(targetDir, ".claude"));
       const incoming = JSON.parse(fs20.readFileSync(toolHooksJsonPath, "utf-8"));
       mergeHooks(destHooksJson, incoming);
     }
@@ -8355,7 +8365,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 +8418,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 +8453,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 +8487,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 +8542,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 +8557,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/dist/hooks/reef-hooks.json

@@ -5,7 +5,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash ./reef-intent-detect.sh"
+            "command": "bash .claude/hooks/reef-intent-detect.sh"
           }
         ]
       }
@@ -16,7 +16,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash ./reef-block-dangerous.sh"
+            "command": "bash .claude/hooks/reef-block-dangerous.sh"
           }
         ]
       },
@@ -25,7 +25,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash ./reef-protect-files.sh"
+            "command": "bash .claude/hooks/reef-protect-files.sh"
           },
           {
             "type": "prompt",
@@ -41,7 +41,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash ./reef-auto-format.sh"
+            "command": "bash .claude/hooks/reef-auto-format.sh"
           }
         ]
       },
@@ -50,7 +50,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash ./reef-run-tests.sh",
+            "command": "bash .claude/hooks/reef-run-tests.sh",
             "if": "Edit(*.ts)|Write(*.ts)",
             "async": true,
             "statusMessage": "Running tests..."
@@ -63,7 +63,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash ./reef-run-tests.sh"
+            "command": "bash .claude/hooks/reef-run-tests.sh"
           }
         ]
       }

package/dist/hooks/sweep-hooks.json

@@ -5,7 +5,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash ./sweep-mcp-hook.sh"
+            "command": "bash .claude/hooks/sweep-mcp-hook.sh"
           }
         ]
       }

package/dist/hooks/tide-hooks.json

@@ -5,7 +5,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "bash ./tide-session-preload.sh"
+            "command": "bash .claude/hooks/tide-session-preload.sh"
           }
         ]
       }

package/dist/skills/reef-commit/SKILL.md

@@ -39,7 +39,82 @@ git status --short
 
 若无任何变更则提示用户并退出。
 
-### 2. 审查待提交文件
+### 2. 分支名与任务相关性检查
+
+在审查待提交文件之前，先检查当前分支是否与待提交的任务相关。如果当前在 `main`/`master` 分支上则**必须**创建新分支；如果分支名与任务内容明显不匹配（如命名随意、与 OpenSpec 任务不符），建议创建新分支。
+
+```bash
+BRANCH=$(git branch --show-current)
+echo "当前分支: $BRANCH"
+
+# 检测是否需要创建新分支
+MUST_NEW_BRANCH=false
+
+# 条件一：在 main 或 master 上必须创建新分支
+if [ "$BRANCH" = "main" ] || [ "$BRANCH" = "master" ]; then
+  echo "⚠️ 当前在 $BRANCH 分支上，不允许直接提交，必须创建新分支"
+  MUST_NEW_BRANCH=true
+fi
+
+# 条件二：检查分支名是否包含 temp、wip、test、tmp、dev 等临时名称
+TEMP_PATTERN='^(temp|wip|test|tmp|dev)(/.*)?$'
+if echo "$BRANCH" | grep -qE "$TEMP_PATTERN"; then
+  echo "⚠️ 当前分支名 ($BRANCH) 看起来是临时分支，建议创建有意义的新分支"
+fi
+
+# 收集 OpenSpec 任务上下文
+for dir in openspec/changes/*/; do
+  if [ -f "$dir/proposal.md" ]; then
+    TASK_NAME=$(basename "$dir")
+    echo "发现 OpenSpec 任务: $TASK_NAME"
+  fi
+done
+```
+
+**判断规则（LLM 自行推理执行）：**
+
+1. **如果 MUST_NEW_BRANCH=true**（当前在 main/master）：
+   - 直接进入步骤 3「创建新分支」，无需询问用户
+2. **如果分支名明显不相关**（如 `temp-xxx`、`test-foo`、或随意命名与当前变更毫无关联）：
+   - 向用户说明：「当前分支 $BRANCH 与待提交的变更内容似乎不匹配，是否创建一个新分支？」
+   - 用户同意 → 进入步骤 3「创建新分支」
+   - 用户不同意 → 继续当前分支
+3. **如果分支名合理**（如与 OpenSpec 任务同名，或包含功能描述的 kebab-case）：
+   - 直接继续
+
+### 3. 创建新分支
+
+当需要创建新分支时，按以下逻辑确定分支名：
+
+**分支名生成规则（优先级从高到低）：**
+1. **OpenSpec 任务名**：如果检测到 `openspec/changes/<task>/proposal.md`，使用 `<task>` 作为分支名
+2. **用户输入**：询问用户想要的分支名
+3. **AI 推导**：根据变更内容总结生成 kebab-case 分支名（例如 `feat/add-user-auth`、`fix/login-timeout`）
+
+```bash
+# 暂存当前未提交变更
+STASHED=false
+if [ -n "$(git status --porcelain)" ]; then
+  git stash push -m "reef-commit-auto-stash"
+  STASHED=true
+fi
+
+# 创建并切换到新分支（基于 main）
+git checkout main
+git pull origin main 2>/dev/null || true
+git checkout -b <new-branch-name>
+
+# 恢复暂存的变更
+if [ "$STASHED" = true ]; then
+  git stash pop
+fi
+
+echo "✅ 已切换到新分支: <new-branch-name>"
+```
+
+> **注意**：创建新分支后，后续步骤（审查文件、范围检查、测试等）在新分支上继续执行。
+
+### 4. 审查待提交文件
 
 展示变更清单，检查敏感文件：
 
@@ -49,7 +124,7 @@ git diff --stat
 
 如包含 `.env`、凭据、证书或大型二进制文件，让用户确认或排除后再继续。
 
-### 2.4 分支范围检查
+### 5. 分支范围检查
 
 检查当前分支是否涉及多个业务领域。如果跨领域，给出拆分建议并中止提交。
 
@@ -68,7 +143,7 @@ if [ -f "$SCOPE_HOOK" ]; then
 fi
 ```
 
-### 2.5 运行单元测试
+### 6. 运行单元测试
 
 ```bash
 git status --short
@@ -84,7 +159,7 @@ git status --short
 - 测试全部通过 → 继续
 - 任一测试失败 → 提示用户修复后再提交
 
-### 3. 收集上下文
+### 7. 收集上下文
 
 ```bash
 BRANCH=$(git branch --show-current)
@@ -97,24 +172,24 @@ grep -iE '(issue|jira|lc-|proj-)' "openspec/changes/$BRANCH/proposal.md" 2>/dev/
 git log "$FORK_POINT"..HEAD --format="%B" 2>/dev/null | grep -ioP '[A-Z]+-\d+' | head -1
 ```
 
-### 4. 生成提交信息
+### 8. 生成提交信息
 
 **标题：** 优先 OpenSpec proposal 标题 → 分支名（kebab-case 转中文）→ 变更总结。依赖更新用 `更新 {依赖} 至 {版本}`，问题修复用 `解决{问题描述}的问题`。
 
 **正文：** 中/复杂变更用 `本次提交改动如下：` + 3-6 条要点。尾部隔空行加 `JIRA: {完整 URL}`（优先从 proposal.md/jira-start 元数据中获取 JIRA 链接），如有 PRD 链接加 `Ref: {URL}`。
 
-### 5. 展示并确认
+### 9. 展示并确认
 
 展示完整提交信息，用户确认即可提交；支持 `--amend` 合并；用户可要求修改后重新生成。
 
-### 6. 执行提交
+### 10. 执行提交
 
 ```bash
 git add -A && git commit -m "<完整提交信息>"
 # 用户要求 amend 时: git commit --amend -m "<完整提交信息>"
 ```
 
-### 7. 推送（仅在用户要求时）
+### 11. 推送（仅在用户要求时）
 
 ```bash
 # 新提交（有远程跟踪）：git push

package/package.json

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