skillfree 0.1.69 → 0.1.71

package/install.sh

@@ -149,15 +149,27 @@ fi
 echo ""
 success "SkillFree CLI 安装完成"
 
-# 刷新 PATH
+# 刷新 PATH（尝试多种方式）
 hash -r 2>/dev/null || true
-export PATH="$(npm root -g)/../bin:$PATH"
+NPM_BIN="$(npm bin -g 2>/dev/null || npm root -g | sed 's|/node_modules||')/.bin"
+export PATH="$(npm root -g)/../bin:$NPM_BIN:$PATH"
 
-if ! command -v skillfree &>/dev/null; then
-  warn "CLI 已安装，但当前终端 PATH 未更新"
-  warn "请新开一个终端窗口，然后运行：skillfree auth login"
-  echo ""
-  exit 0
+# 找到 skillfree 可执行路径（用于后续调用）
+SKILLFREE_BIN=""
+if command -v skillfree &>/dev/null; then
+  SKILLFREE_BIN="skillfree"
+else
+  # 尝试从 npm 全局 bin 目录找
+  _SF_PATH="$(npm root -g 2>/dev/null)/../bin/skillfree"
+  if [ -x "$_SF_PATH" ]; then
+    SKILLFREE_BIN="$_SF_PATH"
+  fi
+fi
+
+if [ -z "$SKILLFREE_BIN" ]; then
+  warn "CLI 已安装，但当前终端 PATH 未更新，继续完成配置..."
+  # 用 node 直接执行 CLI
+  SKILLFREE_BIN="node $(npm root -g 2>/dev/null)/skillfree/bin/skillfree.js"
 fi
 
 # ── Step 4: 登录（从 /dev/tty 读取，兼容 curl | bash）────────────────────────
@@ -189,7 +201,22 @@ while true; do
 done
 
 if [ -n "$API_KEY" ]; then
-  SKILLFREE_API_KEY="$API_KEY" SKILLFREE_PLATFORMS="$SKILLFREE_PLATFORMS" skillfree auth save "$API_KEY"
+  SKILLFREE_API_KEY="$API_KEY" SKILLFREE_PLATFORMS="$SKILLFREE_PLATFORMS" $SKILLFREE_BIN auth save "$API_KEY"
+fi
+
+# ── 安装完成提示：PATH 问题 ────────────────────────────────────────────────────
+if [ "$SKILLFREE_BIN" != "skillfree" ]; then
+  echo ""
+  warn "当前终端 PATH 未包含 npm 全局 bin，请运行以下命令之一让 skillfree 全局生效："
+  echo ""
+  echo -e "  ${CYAN}  方式一（推荐，重启终端永久生效）：${NC}"
+  echo -e "  ${DIM}    将以下内容加入 ~/.zshrc 或 ~/.bash_profile：${NC}"
+  NPM_PREFIX=$(npm config get prefix 2>/dev/null)
+  echo -e "  ${DIM}    export PATH=\"$NPM_PREFIX/bin:\$PATH\"${NC}"
+  echo ""
+  echo -e "  ${CYAN}  方式二（仅当前终端临时生效）：${NC}"
+  echo -e "  ${DIM}    export PATH=\"$NPM_PREFIX/bin:\$PATH\"${NC}"
+  echo ""
 fi
 
 # ── 完成 ──────────────────────────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillfree",
-  "version": "0.1.69",
+  "version": "0.1.71",
   "description": "🦞 一个 API，满足所有龙虾技能需求",
   "main": "bin/skillfree.js",
   "bin": {

package/scripts/commands/auth.js

@@ -4,36 +4,24 @@ const path = require('path')
 const os = require('os')
 const { saveConfig, BASE_URL } = require('../lib/client')
 
-// ── 平台 → 技能安装路径映射（与 postinstall.js 保持一致）─────────────────
-const PLATFORM_PATHS = {
-  openclaw: [
-    path.join(os.homedir(), '.openclaw', 'skills', 'skillfree'),
-    path.join(os.homedir(), '.agents',   'skills', 'skillfree'),
-  ],
-  claude: [
-    path.join(os.homedir(), '.claude', 'skills', 'skillfree'),
-  ],
-  codex: [
-    path.join(os.homedir(), '.codex', 'skills', 'skillfree'),
-  ],
-  continue: [
-    path.join(os.homedir(), '.continue', 'skills', 'skillfree'),
-  ],
-  cursor: [
-    path.join(os.homedir(), '.cursor', 'skills', 'skillfree'),
-  ],
-}
-
 /**
- * 将 apiKey 写入各平台配置 + shell 环境变量
+ * 将 apiKey 注入到各平台配置 + shell 环境变量
+ *
+ * 各平台注入方式：
+ *   openclaw → ~/.openclaw/openclaw.json (skills.entries.skillfree.apiKey)
+ *   hermes   → ~/.hermes/.env (SKILLFREE_API_KEY=xxx)
+ *   claude   → ~/.claude/settings.json (env.SKILLFREE_API_KEY)
+ *   codex    → 无专用配置，走 shell 环境变量即可
+ *   通用     → ~/.zshrc / ~/.bash_profile (export SKILLFREE_API_KEY=xxx)
  */
 function injectToOpenclaw(apiKey) {
-  // 1. OpenClaw: 写入 openclaw.json
-  const openclawDir = path.join(os.homedir(), '.openclaw')
-  const cfgPath = path.join(openclawDir, 'openclaw.json')
-  if (fs.existsSync(openclawDir) && fs.existsSync(cfgPath)) {
+  const HOME = os.homedir()
+
+  // ── 1. OpenClaw: 写入 openclaw.json ────────────────────────────────────────
+  const openclawCfgPath = path.join(HOME, '.openclaw', 'openclaw.json')
+  if (fs.existsSync(path.join(HOME, '.openclaw')) && fs.existsSync(openclawCfgPath)) {
     let cfg = {}
-    try { cfg = JSON.parse(fs.readFileSync(cfgPath, 'utf8')) } catch {}
+    try { cfg = JSON.parse(fs.readFileSync(openclawCfgPath, 'utf8')) } catch {}
     cfg.skills = cfg.skills || {}
     cfg.skills.entries = cfg.skills.entries || {}
     cfg.skills.entries['skillfree'] = {
@@ -42,38 +30,102 @@ function injectToOpenclaw(apiKey) {
       apiKey,
     }
     try {
-      fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2) + '\n')
-      console.log('✅ openclaw.json 已更新，OpenClaw 下次启动自动识别 skillfree skill')
+      fs.writeFileSync(openclawCfgPath, JSON.stringify(cfg, null, 2) + '\n')
+      console.log('✅ [OpenClaw] openclaw.json 已更新')
+    } catch (e) {
+      console.warn('⚠️  [OpenClaw] 无法写入 openclaw.json：', e.message)
+    }
+  }
+
+  // ── 2. Hermes: 写入 ~/.hermes/.env ─────────────────────────────────────────
+  const hermesDir = path.join(HOME, '.hermes')
+  if (fs.existsSync(hermesDir)) {
+    const hermesEnvPath = path.join(hermesDir, '.env')
+    _injectEnvFile(hermesEnvPath, 'SKILLFREE_API_KEY', apiKey)
+    console.log('✅ [Hermes] ~/.hermes/.env 已写入 SKILLFREE_API_KEY')
+  }
+
+  // ── 3. Claude Code: 写入 ~/.claude/settings.json ───────────────────────────
+  const claudeDir = path.join(HOME, '.claude')
+  if (fs.existsSync(claudeDir)) {
+    const claudeSettingsPath = path.join(claudeDir, 'settings.json')
+    let settings = {}
+    if (fs.existsSync(claudeSettingsPath)) {
+      try { settings = JSON.parse(fs.readFileSync(claudeSettingsPath, 'utf8')) } catch {}
+    }
+    settings.env = settings.env || {}
+    settings.env['SKILLFREE_API_KEY'] = apiKey
+    try {
+      fs.writeFileSync(claudeSettingsPath, JSON.stringify(settings, null, 2) + '\n')
+      console.log('✅ [Claude Code] ~/.claude/settings.json 已写入 SKILLFREE_API_KEY')
+    } catch (e) {
+      console.warn('⚠️  [Claude Code] 无法写入 settings.json：', e.message)
+    }
+  }
+
+  // ── 4. Codex: 写入 ~/.codex/config.json ────────────────────────────────────
+  const codexDir = path.join(HOME, '.codex')
+  if (fs.existsSync(codexDir)) {
+    const codexCfgPath = path.join(codexDir, 'config.json')
+    let cfg = {}
+    if (fs.existsSync(codexCfgPath)) {
+      try { cfg = JSON.parse(fs.readFileSync(codexCfgPath, 'utf8')) } catch {}
+    }
+    cfg.env = cfg.env || {}
+    cfg.env['SKILLFREE_API_KEY'] = apiKey
+    try {
+      fs.writeFileSync(codexCfgPath, JSON.stringify(cfg, null, 2) + '\n')
+      console.log('✅ [Codex] ~/.codex/config.json 已写入 SKILLFREE_API_KEY')
     } catch (e) {
-      console.warn('⚠️  无法写入 openclaw.json（权限问题？）：', e.message)
+      console.warn('⚠️  [Codex] 无法写入 config.json：', e.message)
     }
   }
 
-  // 2. 写入 shell 配置文件（~/.zshrc 或 ~/.bash_profile）
+  // ── 5. 通用：写入 shell 配置文件 ───────────────────────────────────────────
   const exportLine = `\nexport SKILLFREE_API_KEY="${apiKey}"\n`
   const shellFiles = [
-    path.join(os.homedir(), '.zshrc'),
-    path.join(os.homedir(), '.bash_profile'),
+    path.join(HOME, '.zshrc'),
+    path.join(HOME, '.bash_profile'),
   ]
   let wrote = false
   for (const f of shellFiles) {
     if (fs.existsSync(f)) {
       const content = fs.readFileSync(f, 'utf8')
       if (content.includes('SKILLFREE_API_KEY')) {
-        const updated = content.replace(/\nexport SKILLFREE_API_KEY=.*\n?/g, exportLine)
-        fs.writeFileSync(f, updated)
+        fs.writeFileSync(f, content.replace(/\nexport SKILLFREE_API_KEY=.*\n?/g, exportLine))
       } else {
         fs.appendFileSync(f, exportLine)
       }
-      console.log(`✅ ${path.basename(f)} 已写入 SKILLFREE_API_KEY`)
+      console.log(`✅ [Shell] ${path.basename(f)} 已写入 SKILLFREE_API_KEY`)
       wrote = true
       break
     }
   }
   if (!wrote) {
     fs.writeFileSync(shellFiles[0], `# SkillFree API Key${exportLine}`)
-    console.log('✅ ~/.zshrc 已创建并写入 SKILLFREE_API_KEY')
+    console.log('✅ [Shell] ~/.zshrc 已创建并写入 SKILLFREE_API_KEY')
+  }
+}
+
+/**
+ * 向 .env 文件注入或更新一个 KEY=value 行
+ */
+function _injectEnvFile(envPath, key, value) {
+  const line = `${key}="${value}"`
+  let content = ''
+  if (fs.existsSync(envPath)) {
+    content = fs.readFileSync(envPath, 'utf8')
+    if (content.includes(key + '=')) {
+      // 替换已有行
+      content = content.replace(new RegExp(`^${key}=.*$`, 'm'), line)
+    } else {
+      content = content.trimEnd() + '\n' + line + '\n'
+    }
+  } else {
+    content = line + '\n'
   }
+  fs.mkdirSync(path.dirname(envPath), { recursive: true })
+  fs.writeFileSync(envPath, content)
 }
 
 function printQuickExamples() {