skillfree 0.1.20 → 0.1.22

package/bin/skillfree.js

@@ -18,6 +18,13 @@ auth
     const { authLogin } = require('../scripts/commands/auth')
     await authLogin()
   })
+auth
+  .command('save <apiKey>')
+  .description('直接保存 API Key（供安装脚本调用）')
+  .action(async (apiKey) => {
+    const { authSave } = require('../scripts/commands/auth')
+    await authSave(apiKey)
+  })
 auth
   .command('status')
   .description('查看当前登录状态和积分')

package/install.sh

@@ -1,136 +1,155 @@
 #!/usr/bin/env bash
-# install.sh — SkillFree 一键安装脚本
-# curl -fsSL https://skillfree.tech/install.sh | bash
-
-set -e
-
-CYAN='\033[0;36m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; RED='\033[0;31m'; NC='\033[0m'
-info()    { echo -e "${CYAN}[SkillFree]${NC} $*"; }
-success() { echo -e "${GREEN}[SkillFree]${NC} ✓ $*"; }
-warn()    { echo -e "${YELLOW}[SkillFree]${NC} ⚠ $*"; }
-err()     { echo -e "${RED}[SkillFree]${NC} ✗ $*"; exit 1; }
-
+# SkillFree 一键安装脚本
+# curl -fsSL https://cdn.jsdelivr.net/gh/ChongC1990/install@main/install.sh | bash
+
+# ── 颜色定义 ─────────────────────────────────────────────────────────────────
+CYAN='\033[0;36m'
+BOLD_CYAN='\033[1;36m'
+GREEN='\033[0;32m'
+BOLD_GREEN='\033[1;32m'
+YELLOW='\033[1;33m'
+RED='\033[0;31m'
+BOLD='\033[1m'
+DIM='\033[2m'
+NC='\033[0m'
+
+info()    { echo -e "${CYAN}  →${NC} $*"; }
+success() { echo -e "${BOLD_GREEN}  ✓${NC} $*"; }
+warn()    { echo -e "${YELLOW}  ⚠${NC}  $*"; }
+err()     { echo -e "${RED}  ✗${NC} $*"; exit 1; }
+step()    { echo -e "\n${BOLD}$*${NC}"; }
+
+# ── ASCII Banner ──────────────────────────────────────────────────────────────
+clear
+echo ""
+echo -e "${BOLD_CYAN}"
+cat << 'EOF'
+  ███████╗██╗  ██╗██╗██╗     ██╗     ███████╗██████╗ ███████╗███████╗
+  ██╔════╝██║ ██╔╝██║██║     ██║     ██╔════╝██╔══██╗██╔════╝██╔════╝
+  ███████╗█████╔╝ ██║██║     ██║     █████╗  ██████╔╝█████╗  █████╗
+  ╚════██║██╔═██╗ ██║██║     ██║     ██╔══╝  ██╔══██╗██╔══╝  ██╔══╝
+  ███████║██║  ██╗██║███████╗███████╗██║     ██║  ██║███████╗███████╗
+  ╚══════╝╚═╝  ╚═╝╚═╝╚══════╝╚══════╝╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝
+EOF
+echo -e "${NC}"
+echo -e "  ${DIM}🦞  一个 Key，调用 53+ 顶级 AI 模型${NC}"
+echo -e "  ${DIM}    Chat · Image · Video · TTS · Music · OCR · Search${NC}"
 echo ""
-echo -e "${CYAN}🦞 SkillFree 安装程序${NC}"
-echo -e "   一个 API，满足所有龙虾技能需求"
+echo -e "  ${DIM}────────────────────────────────────────────────────${NC}"
 echo ""
 
-# ── 1. 检查 Node.js ──────────────────────────────────────────────────────────
+# ── Step 1: 检查环境 ──────────────────────────────────────────────────────────
+step "[ 1 / 3 ]  检查环境"
+
 if ! command -v node &>/dev/null; then
-  err "需要 Node.js 18+，请先安装：https://nodejs.org"
+  err "未检测到 Node.js，请先安装：https://nodejs.org（需要 18+）"
 fi
 NODE_VER=$(node -e "process.stdout.write(process.versions.node.split('.')[0])")
-[ "$NODE_VER" -lt 18 ] && err "Node.js 版本过低（当前 v$NODE_VER），需要 18+"
+if [ "$NODE_VER" -lt 18 ]; then
+  err "Node.js 版本过低（当前 v$(node -v)），需要 18+"
+fi
+success "Node.js $(node -v)"
 
-# ── 2. 安装 CLI 包 ────────────────────────────────────────────────────────────
-info "安装 skillfree CLI..."
-npm install -g skillfree --quiet 2>/dev/null \
-  || npx --yes skillfree --version &>/dev/null \
-  || warn "全局安装需要权限，尝试 sudo npm install -g skillfree"
-success "CLI 安装完成"
+if ! command -v npm &>/dev/null; then
+  err "未检测到 npm，请检查 Node.js 安装"
+fi
+success "npm $(npm -v)"
 
-# ── 3. 输入 API Key ───────────────────────────────────────────────────────────
+# ── Step 2: 安装 CLI ──────────────────────────────────────────────────────────
+step "[ 2 / 3 ]  安装 SkillFree CLI"
+echo ""
+echo -e "  ${DIM}正在从 npm 安装 skillfree...${NC}"
 echo ""
-echo -e "  请前往 ${CYAN}https://skillfree.tech/app${NC} 获取 API Key"
-read -rp "  输入你的 API Key (sk-sf-...): " API_KEY
 
-if [[ -z "$API_KEY" || "$API_KEY" != sk-sf-* ]]; then
-  warn "未输入有效 Key，跳过配置（稍后可运行 skillfree auth login）"
+INSTALL_OK=false
+if npm install -g skillfree 2>&1 | sed 's/^/    /'; then
+  INSTALL_OK=true
 else
-  # ── 4. 写入环境变量 ─────────────────────────────────────────────────────────
-  SHELL_RC="$HOME/.zshrc"
-  [[ "$SHELL" == *bash* ]] && SHELL_RC="$HOME/.bashrc"
-  if ! grep -q "SKILLFREE_API_KEY" "$SHELL_RC" 2>/dev/null; then
-    echo "" >> "$SHELL_RC"
-    echo "# SkillFree" >> "$SHELL_RC"
-    echo "export SKILLFREE_API_KEY=\"$API_KEY\"" >> "$SHELL_RC"
-  else
-    sed -i.bak "s/export SKILLFREE_API_KEY=.*/export SKILLFREE_API_KEY=\"$API_KEY\"/" "$SHELL_RC"
+  echo ""
+  warn "权限不足，尝试 sudo..."
+  echo ""
+  if sudo npm install -g skillfree 2>&1 | sed 's/^/    /'; then
+    INSTALL_OK=true
   fi
-  export SKILLFREE_API_KEY="$API_KEY"
-  success "API Key 已写入 $SHELL_RC"
+fi
 
-  # ── 5. 自动配置各 AI 工具 ────────────────────────────────────────────────────
-  SKILL_SRC_DIR="$HOME/.skillfree/skill"
-  mkdir -p "$SKILL_SRC_DIR"
+if [ "$INSTALL_OK" = false ]; then
+  err "安装失败，请手动运行：sudo npm install -g skillfree"
+fi
 
-  # 获取已安装包里的 SKILL.md（优先用本地，否则下载）
-  NPM_SKILL_MD="$(npm root -g 2>/dev/null)/skillfree/SKILL.md"
-  if [ -f "$NPM_SKILL_MD" ]; then
-    cp "$NPM_SKILL_MD" "$SKILL_SRC_DIR/SKILL.md"
-  else
-    curl -fsSL "https://skillfree.tech/skill/SKILL.md" -o "$SKILL_SRC_DIR/SKILL.md" 2>/dev/null \
-      || echo "# SkillFree\nUse skillfree CLI for AI tasks." > "$SKILL_SRC_DIR/SKILL.md"
-  fi
+echo ""
+success "SkillFree CLI 安装完成"
 
-  # ── OpenClaw：写入 ~/.openclaw/skills/ 并注入 openclaw.json ────────────────
-  OPENCLAW_SKILLS_DIR="$HOME/.openclaw/skills/skillfree"
-  OPENCLAW_CFG="$HOME/.openclaw/openclaw.json"
-  mkdir -p "$OPENCLAW_SKILLS_DIR"
-  cp "$SKILL_SRC_DIR/SKILL.md" "$OPENCLAW_SKILLS_DIR/SKILL.md"
-  success "OpenClaw skill 已安装 → $OPENCLAW_SKILLS_DIR/"
-
-  # 写入 openclaw.json（注入 API Key，让 skill 自动生效）
-  if command -v node &>/dev/null; then
-    node - <<NODEJS
-const fs = require('fs'), path = require('path')
-const cfgPath = '$OPENCLAW_CFG'
-let cfg = {}
-try { cfg = JSON.parse(fs.readFileSync(cfgPath, 'utf8')) } catch {}
-cfg.skills = cfg.skills || {}
-cfg.skills.entries = cfg.skills.entries || {}
-cfg.skills.entries['skillfree'] = {
-  enabled: true,
-  apiKey: '$API_KEY'
-}
-// 确保 ~/.openclaw/skills 在扫描路径里（通常已内置，但加上无妨）
-cfg.skills.load = cfg.skills.load || {}
-fs.mkdirSync(path.dirname(cfgPath), { recursive: true })
-fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2))
-console.log('openclaw.json 已更新')
-NODEJS
-    success "openclaw.json 已注入 API Key（skill 下次启动自动生效）"
-  fi
+# 刷新 PATH
+hash -r 2>/dev/null || true
+export PATH="$(npm root -g)/../bin:$PATH"
+
+if ! command -v skillfree &>/dev/null; then
+  warn "CLI 已安装，但当前终端 PATH 未更新"
+  warn "请新开一个终端窗口，然后运行：skillfree auth login"
+  echo ""
+  exit 0
+fi
+
+# ── Step 3: 登录（从 /dev/tty 读取，兼容 curl | bash）────────────────────────
+step "[ 3 / 3 ]  登录账号"
+echo ""
+echo -e "  还没有账号？${CYAN}https://skillfree.tech/app${NC} 免费注册"
+echo -e "  注册后进入控制台 → ${BOLD}API Keys${NC} → 创建一个 Key，粘贴到下方"
+echo ""
 
-  # 同时放一份到 workspace skills（兼容旧路径）
-  for dir in "$HOME/.agents/skills" "$HOME/.openclaw/workspace/skills"; do
-    if [ -d "$dir" ]; then
-      mkdir -p "$dir/skillfree"
-      cp "$SKILL_SRC_DIR/SKILL.md" "$dir/skillfree/SKILL.md"
-      success "已同步到 $dir/skillfree/"
-    fi
-  done
-
-  # ── Claude Code ────────────────────────────────────────────────────────────
-  if [ -d "$HOME/.claude" ]; then
-    mkdir -p "$HOME/.claude/skills/skillfree"
-    cp "$SKILL_SRC_DIR/SKILL.md" "$HOME/.claude/skills/skillfree/SKILL.md"
-    success "Claude Code 配置完成 → ~/.claude/skills/skillfree/"
+API_KEY=""
+while true; do
+  # 强制从 /dev/tty 读取，避免 curl | bash 时 stdin 被占用
+  printf "  请粘贴 API Key (sk-sf-...)，输入 q 跳过: "
+  read -r API_KEY </dev/tty
+
+  if [ "$API_KEY" = "q" ] || [ -z "$API_KEY" ]; then
+    echo ""
+    warn "已跳过登录，稍后可运行 ${CYAN}skillfree auth login${NC} 完成配置"
+    API_KEY=""
+    break
   fi
 
-  # ── Codex CLI ──────────────────────────────────────────────────────────────
-  if [ -d "$HOME/.codex" ]; then
-    mkdir -p "$HOME/.codex/skills/skillfree"
-    cp "$SKILL_SRC_DIR/SKILL.md" "$HOME/.codex/skills/skillfree/SKILL.md"
-    success "Codex 配置完成 → ~/.codex/skills/skillfree/"
+  if [[ "$API_KEY" != sk-sf-* ]]; then
+    echo -e "  ${RED}✗${NC} 格式不对，Key 应以 sk-sf- 开头，请重试\n"
+    continue
   fi
 
-  # ── Continue.dev ───────────────────────────────────────────────────────────
-  if [ -d "$HOME/.continue" ]; then
-    mkdir -p "$HOME/.continue/skills/skillfree"
-    cp "$SKILL_SRC_DIR/SKILL.md" "$HOME/.continue/skills/skillfree/SKILL.md"
-    success "Continue.dev 配置完成 → ~/.continue/skills/skillfree/"
+  # 验证 Key
+  printf "  验证中..."
+  HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" \
+    -H "Authorization: Bearer $API_KEY" \
+    "https://skillfree.tech/v1/balance")
+
+  if [ "$HTTP_CODE" = "200" ]; then
+    echo -e " ${GREEN}✓${NC}"
+    break
+  else
+    echo -e " ${RED}✗${NC} (HTTP $HTTP_CODE)"
+    echo -e "  ${RED}✗${NC} Key 无效，请检查后重试\n"
+    API_KEY=""
   fi
+done
+
+# 有效 Key → 交给 CLI 写入配置
+if [ -n "$API_KEY" ]; then
+  SKILLFREE_API_KEY="$API_KEY" skillfree auth save "$API_KEY"
 fi
 
-# ── 6. 完成 ───────────────────────────────────────────────────────────────────
+# ── 完成 ──────────────────────────────────────────────────────────────────────
+echo ""
+echo -e "  ${DIM}────────────────────────────────────────────────────${NC}"
+echo ""
+echo -e "${BOLD_GREEN}  🎉 全部搞定！开始召唤龙虾吧${NC}"
 echo ""
-echo -e "${GREEN}🎉 安装完成！${NC}"
+echo -e "  ${BOLD}快速体验：${NC}"
+echo -e "  ${CYAN}  $ skillfree pilot --type chat --prompt \"你好\"${NC}"
+echo -e "  ${CYAN}  $ skillfree pilot --type image --prompt \"赛博朋克的上海\" --output ./img.png${NC}"
+echo -e "  ${CYAN}  $ skillfree pilot --type search --prompt \"今天的 AI 新闻\"${NC}"
 echo ""
-echo -e "  ${CYAN}快速开始：${NC}"
-echo -e "  $ skillfree pilot --type chat --prompt \"你好龙虾\""
-echo -e "  $ skillfree pilot --type image --prompt \"赛博朋克的上海\" --output ./img.png"
+echo -e "  ${DIM}  skillfree models     # 查看所有模型${NC}"
+echo -e "  ${DIM}  skillfree credits    # 查看积分余额${NC}"
 echo ""
-echo -e "  ${CYAN}充值积分：${NC} https://skillfree.tech/app/topup"
-echo -e "  ${CYAN}查看文档：${NC} https://skillfree.tech/app/docs"
+echo -e "  ${DIM}充值积分：${NC}${CYAN}https://skillfree.tech/app/topup${NC}"
 echo ""

package/package.json

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

package/scripts/commands/auth.js

@@ -61,40 +61,68 @@ function injectToOpenclaw(apiKey) {
 
 async function authLogin() {
   console.log(`\n🦞 SkillFree 登录`)
-  console.log(`   控制台：${BASE_URL}/app\n`)
+  console.log(`   还没有账号？前往注册：${BASE_URL}/app`)
+  console.log(`   注册后在控制台 → API Keys → 创建 Key\n`)
 
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
   const ask = (q) => new Promise(resolve => rl.question(q, resolve))
 
-  console.log('请前往控制台 → API Keys → 创建 Key，然后粘贴到此处。')
-  const key = (await ask('API Key (sk-sf-...): ')).trim()
-  rl.close()
+  let success = false
+  while (!success) {
+    const key = (await ask('请粘贴 API Key (sk-sf-...)，输入 q 跳过: ')).trim()
 
-  if (!key.startsWith('sk-sf-')) {
-    console.error('❌ 格式不正确，Key 应以 sk-sf- 开头')
-    process.exit(1)
+    if (key === 'q' || key === '') {
+      console.log('\n⏭  已跳过登录，稍后可运行 skillfree auth login 完成配置')
+      rl.close()
+      return
+    }
+
+    if (!key.startsWith('sk-sf-')) {
+      console.log('❌ 格式不对，Key 应以 sk-sf- 开头，请重新输入\n')
+      continue
+    }
+
+    // 验证 key 是否有效
+    process.stdout.write('验证中...')
+    try {
+      const res = await fetch(`${BASE_URL}/v1/balance`, {
+        headers: { 'Authorization': `Bearer ${key}` }
+      })
+      if (!res.ok) {
+        console.log(` ❌  (HTTP ${res.status})`)
+        console.log('API Key 无效，请检查后重新输入\n')
+        continue
+      }
+      const data = await res.json()
+      saveConfig({ apiKey: key })
+      injectToOpenclaw(key)
+      console.log(` ✅\n`)
+      console.log(`🎉 登录成功！当前积分：${data.credits}`)
+      console.log(`\n快速开始：`)
+      console.log(`  skillfree pilot --type chat --model DeepSeek-V3.2-Fast --prompt "你好"`)
+      console.log(`  skillfree pilot --type chat --model claude-sonnet-4-6 --prompt "你好"`)
+      console.log(`  skillfree models   # 查看所有可用模型`)
+      success = true
+    } catch (e) {
+      console.log(` ❌`)
+      console.log(`网络错误（${e.message}），请检查网络后重试\n`)
+    }
   }
 
-  // 验证 key 是否有效
-  process.stdout.write('验证中...')
-  try {
-    const res = await fetch(`${BASE_URL}/v1/balance`, {
-      headers: { 'Authorization': `Bearer ${key}` }
-    })
-    if (!res.ok) throw new Error(res.status)
-    const data = await res.json()
-    saveConfig({ apiKey: key })
-    injectToOpenclaw(key)
-    console.log(` ✅\n`)
-    console.log(`🎉 登录成功！当前积分：${data.credits}`)
-    console.log(`\n快速开始：`)
-    console.log(`  skillfree pilot --type chat --model DeepSeek-V3.2-Fast --prompt "你好"`)
-    console.log(`  skillfree pilot --type chat --model claude-sonnet-4-6 --prompt "你好"`)
-    console.log(`  skillfree models   # 查看所有可用模型`)
-  } catch (e) {
-    console.log(` ❌\nAPI Key 无效，请重新检查`)
+  rl.close()
+}
+
+async function authSave(apiKey) {
+  if (!apiKey || !apiKey.startsWith('sk-sf-')) {
+    console.error('❌ Key 格式不正确')
     process.exit(1)
   }
+  saveConfig({ apiKey })
+  injectToOpenclaw(apiKey)
+  console.log(`\n🎉 登录成功！`)
+  console.log(`\n快速开始：`)
+  console.log(`  skillfree pilot --type chat --prompt "你好"`)
+  console.log(`  skillfree models   # 查看所有可用模型`)
 }
 
 async function authStatus() {
@@ -117,4 +145,5 @@ async function authStatus() {
   console.log(`   Key：${key.slice(0, 10)}****${key.slice(-4)}`)
 }
 
-module.exports = { authLogin, authStatus }
+module.exports = { authLogin, authSave, authStatus }
+