@vima_tech/flywheel 1.1.1 → 1.2.1

package/bin/flywheel.js

@@ -2,9 +2,8 @@
 const { spawn, execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
-const readline = require('readline');
+const os = require('os');
 
-const REPO_DIR = process.env.FLYWHEEL_DIR || path.dirname(path.dirname(__dirname));
 const NPM_PKG = '@vima_tech/flywheel';
 
 function resolveScript(name) {
@@ -15,12 +14,15 @@ function resolveKernelFile(name) {
   return path.join(__dirname, '../' + name);
 }
 
-function runScript(scriptPath, args) {
+function runScript(scriptPath, args, extraEnv = {}) {
+  const env = { ...process.env, FLYWHEEL_DIR: process.cwd(), ...extraEnv };
+  if (proxy) env.FLYWHEEL_PROXY = proxy;
+
   return new Promise((resolve, reject) => {
     const child = spawn('bash', [scriptPath, ...args], {
       cwd: process.cwd(),
       stdio: 'inherit',
-      env: { ...process.env, FLYWHEEL_DIR: process.cwd() },
+      env,
     });
     child.on('exit', (code) => {
       if (code === 0) resolve(0);
@@ -32,7 +34,9 @@ function runScript(scriptPath, args) {
 function downloadFile(url, destPath) {
   return new Promise((resolve, reject) => {
     const file = fs.createWriteStream(destPath);
-    spawn('curl', ['-fsSL', url, '-o', destPath], { stdio: 'ignore' })
+    const args = ['-fsSL', url, '-o', destPath];
+    if (proxy) args.splice(1, 0, '--proxy', proxy);
+    spawn('curl', args, { stdio: 'ignore' })
       .on('exit', (code) => {
         if (code === 0) resolve(0);
         else reject(new Error('curl failed'));
@@ -41,6 +45,8 @@ function downloadFile(url, destPath) {
 }
 
 async function initKernel(dir, skill) {
+  const baseUrl = 'https://raw.githubusercontent.com/renmengkai/flywheel/main';
+
   const kernelFiles = [
     'CLAUDE.md', '.gitignore',
     '.claude/commands/flywheel.md', '.claude/commands/skill.md',
@@ -52,17 +58,6 @@ async function initKernel(dir, skill) {
     'skills/_template/feedback-questions.sh',
   ];
 
-  const optionalFiles = [
-    'skills/_template/artifacts.md',
-  ];
-
-  const baseUrl = 'https://raw.githubusercontent.com/renmengkai/flywheel/main';
-  const skillFiles = skill ? [
-    'skills/' + skill + '/skill.yaml',
-    'skills/' + skill + '/domain.md',
-    'skills/' + skill + '/feedback-questions.sh',
-  ] : [];
-
   for (const f of kernelFiles) {
     const dest = path.join(dir, f);
     fs.mkdirSync(path.dirname(dest), { recursive: true });
@@ -74,13 +69,12 @@ async function initKernel(dir, skill) {
     }
   }
 
-  for (const f of optionalFiles) {
-    const dest = path.join(dir, f);
-    const srcPath = resolveKernelFile(f);
-    if (fs.existsSync(srcPath)) fs.copyFileSync(srcPath, dest);
-  }
-
   if (skill) {
+    const skillFiles = [
+      'skills/' + skill + '/skill.yaml',
+      'skills/' + skill + '/domain.md',
+      'skills/' + skill + '/feedback-questions.sh',
+    ];
     for (const f of skillFiles) {
       const dest = path.join(dir, f);
       fs.mkdirSync(path.dirname(dest), { recursive: true });
@@ -106,6 +100,12 @@ async function initKernel(dir, skill) {
     fs.writeFileSync(path.join(dir, '.gitignore'), `# flywheel-managed\nprojects/*/\nepisodic-logs/\n.distill-needed/*\n!.distill-needed/.gitkeep\nmemory/.gitkeep\n*.log\n`);
   }
 
+  fs.writeFileSync(path.join(dir, '.flywheel'), JSON.stringify({
+    version: '1.0.0',
+    created: new Date().toISOString(),
+    skill: skill || 'none'
+  }));
+
   try {
     execSync('chmod +x ' + path.join(dir, 'scripts/*.sh'), { stdio: 'ignore', shell: true });
   } catch (e) {}
@@ -118,8 +118,7 @@ async function cmdNew(args) {
   }
 
   const projectName = args[0];
-  const dirName = projectName;
-  const targetDir = path.join(process.cwd(), dirName);
+  const targetDir = path.join(process.cwd(), projectName);
 
   if (fs.existsSync(targetDir)) {
     console.error('❌ 目录已存在: ' + targetDir);
@@ -127,7 +126,7 @@ async function cmdNew(args) {
   }
 
   let agent = 'claude';
-  let skill = 'req-mining';
+  let skill = '';
 
   for (let i = 1; i < args.length; i++) {
     if (args[i] === '--agent' && args[i + 1]) {
@@ -146,7 +145,7 @@ async function cmdNew(args) {
   console.log(' 项目: ' + projectName);
   console.log(' 目录: ' + targetDir);
   console.log(' Agent: ' + agent);
-  console.log(' Skill: ' + skill);
+  console.log(' Skill: ' + (skill || '无（后续手动添加）'));
   console.log('');
 
   console.log('📦 初始化内核文件...');
@@ -154,19 +153,26 @@ async function cmdNew(args) {
   await initKernel(targetDir, skill);
   console.log('  ✓ 内核安装完成');
 
+  if (!skill) {
+    console.log('');
+    console.log('  ℹ 未指定 skill，可后续安装：');
+    console.log('    flywheel install req-mining');
+    console.log('    flywheel available  # 查看可用 skill');
+  }
+
   console.log('');
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
   console.log('  ✅ 项目创建完成！');
   console.log('');
   console.log(' 进入目录并启动 ' + agent + '：');
-  console.log('   cd ' + dirName + ' && flywheel start');
+  console.log('   cd ' + projectName + ' && flywheel start');
   console.log('');
-  console.log('  或手动启动：cd ' + dirName + ' && claude');
+  console.log('  或手动启动：cd ' + projectName + ' && claude');
   console.log('  然后输入 /sfw 开始飞轮工作');
   console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
 }
 
-async function cmdStart() {
+function cmdStart() {
   const agent = detectAgent();
   if (!agent) {
     console.error('❌ 未检测到 Claude Code 或 OpenCode');
@@ -194,7 +200,130 @@ function detectAgent() {
   return null;
 }
 
-const [, , command, ...args] = process.argv;
+function findFlywheelProjects(startPath, maxDepth = 3) {
+  const projects = [];
+  const homeDir = os.homedir();
+  const maxDepthParam = maxDepth || 3;
+
+  function scan(dir, depth) {
+    if (depth > maxDepthParam) return;
+    try {
+      const entries = fs.readdirSync(dir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue;
+        if (entry.name === '.' || entry.name === '..') continue;
+        if (entry.name === 'node_modules') continue;
+
+        const fullPath = path.join(dir, entry.name);
+        const flywheelMarker = path.join(fullPath, '.flywheel');
+
+        if (fs.existsSync(flywheelMarker)) {
+          projects.push(fullPath);
+        } else if (fullPath.startsWith(homeDir)) {
+          scan(fullPath, depth + 1);
+        }
+      }
+    } catch (e) {}
+  }
+
+  scan(startPath, 0);
+  return projects;
+}
+
+async function updateProjectFramework(projectPath) {
+  const baseUrl = 'https://raw.githubusercontent.com/renmengkai/flywheel/main';
+
+  const kernelFiles = [
+    'CLAUDE.md',
+    '.claude/commands/flywheel.md', '.claude/commands/skill.md',
+    'scripts/auto-distill.sh', 'scripts/feedback-hook.sh',
+    'scripts/bridge-to-coder.sh', 'scripts/flywheel-install.sh',
+    'skills/_kernel/distillation.md',
+    'skills/_template/skill.yaml', 'skills/_template/domain.md',
+    'skills/_template/feedback-questions.sh',
+  ];
+
+  console.log(' 更新框架文件...');
+  for (const f of kernelFiles) {
+    const dest = path.join(projectPath, f);
+    try {
+      fs.mkdirSync(path.dirname(dest), { recursive: true });
+      await downloadFile(baseUrl + '/' + f, dest);
+      console.log('  ✓ ' + f);
+    } catch (e) {
+      console.log('  ✗ ' + f + ' (失败)');
+    }
+  }
+}
+
+async function cmdUpgrade(args) {
+  console.log('');
+  console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+  console.log('   Flywheel 升级');
+  console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+
+  console.log('');
+  console.log('📦 升级 flywheel CLI...');
+  const npmArgs = ['install', '-g', NPM_PKG];
+  if (proxy) npmArgs.push('--proxy', proxy);
+  const npmSpawn = spawn('npm', npmArgs, { stdio: 'inherit' });
+  await new Promise((resolve) => npmSpawn.on('exit', resolve));
+
+  if (args.length > 0) {
+    const targetPath = path.resolve(args[0]);
+    if (fs.existsSync(path.join(targetPath, '.flywheel'))) {
+      console.log('');
+      console.log('📦 更新项目框架: ' + targetPath);
+      await updateProjectFramework(targetPath);
+    } else {
+      console.error('❌ 不是有效的 flywheel 项目: ' + targetPath);
+    }
+  } else {
+    console.log('');
+    console.log('🔍 扫描 flywheel 项目...');
+    const projects = findFlywheelProjects(os.homedir());
+
+    if (projects.length === 0) {
+      console.log(' 未找到 flywheel 项目');
+    } else {
+      console.log(' 找到 ' + projects.length + ' 个项目：');
+      projects.forEach((p, i) => console.log('  ' + (i + 1) + '. ' + p));
+
+      console.log('');
+      console.log(' 是否更新所有项目框架？(y/N)');
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      const answer = await new Promise((resolve) => rl.question('', resolve));
+      rl.close();
+
+      if (answer.toLowerCase() === 'y') {
+        for (const proj of projects) {
+          console.log('');
+          console.log('📦 更新: ' + proj);
+          await updateProjectFramework(proj);
+        }
+      }
+    }
+  }
+
+  console.log('');
+  console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+  console.log('  ✅ 升级完成');
+  console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+}
+
+let proxy = '';
+const rawArgs = process.argv.slice(2);
+const filteredArgs = [];
+for (let i = 0; i < rawArgs.length; i++) {
+  if (rawArgs[i] === '-x' || rawArgs[i] === '--proxy') {
+    proxy = rawArgs[i + 1];
+    i++;
+  } else {
+    filteredArgs.push(rawArgs[i]);
+  }
+}
+
+const [command, ...restArgs] = filteredArgs;
 
 if (!command) {
   console.log(`
@@ -208,15 +337,21 @@ Flywheel CLI — 自成长 AI Agent 飞轮框架
   -v|--version          显示版本号
   install|add|i         安装 skill 包
   list|ls               列出已安装的 skill
-  update|upgrade        更新 flywheel 或 skill
+  update [skill]        更新 skill 包
   distill|dist          手动触发蒸馏
-  -h|--help|h           显示帮助
+  upgrade [path]        升级 flywheel 工具，并更新项目框架
+  -h|--help             显示帮助
+
+选项:
+  -x, --proxy <url>    使用代理
 
 示例:
   flywheel new my-project
-  cd my-project && flywheel start
-  flywheel install req-mining
-  flywheel update flywheel    # 更新 flywheel 本身
+  flywheel update              # 更新所有 skill
+  flywheel update req-mining   # 更新指定 skill
+  flywheel upgrade             # 升级工具 + 交互更新项目框架
+  flywheel upgrade ./my-project # 更新指定项目框架
+  flywheel update -x http://127.0.0.1:7890
 `);
   process.exit(0);
 }
@@ -226,12 +361,12 @@ switch (command) {
   case '--version':
   case '-V':
   case 'version':
-    console.log('@vima_tech/flywheel v1.1.0');
+    console.log('@vima_tech/flywheel v1.2.1');
     break;
   case 'new':
   case 'create':
   case 'init':
-    cmdNew(args).catch((e) => { console.error(e); process.exit(1); });
+    cmdNew(restArgs).catch((e) => { console.error(e); process.exit(1); });
     break;
   case 'start':
   case 'run':
@@ -249,45 +384,52 @@ Flywheel CLI — 自成长 AI Agent 飞轮框架
 用法: flywheel <command> [args]
 
 可用命令:
-  new <name>           创建新项目 (new|create|init)
-  start                启动 Claude Code 或 OpenCode (start|run|launch)
-  version             显示版本号 (-v|--version)
-  update              更新 flywheel 到最新版本
-  install <skill>      安装 skill 包 (install|add|i)
-  list                 列出已安装的 skill (list|ls)
-  update skill        更新 skill 包 (update|upgrade)
-  distill [project]    手动触发蒸馏 (distill|dist)
-  help                 显示帮助 (-h|--help)
+  new|create|init       创建新项目
+  start|run|launch      启动 Claude Code 或 OpenCode
+  -v|--version          显示版本号
+  install|add|i         安装 skill 包
+  list|ls               列出已安装的 skill
+  update [skill]        更新 skill 包
+  distill|dist          手动触发蒸馏
+  upgrade [path]        升级 flywheel 工具，并更新项目框架
+  -h|--help             显示帮助
+
+选项:
+  -x, --proxy <url>    使用代理
 
 示例:
   flywheel new my-project
-  cd my-project && flywheel start
-  flywheel install req-mining
+  flywheel update              # 更新所有 skill
+  flywheel update req-mining   # 更新指定 skill
+  flywheel upgrade             # 升级工具 + 交互更新项目框架
+  flywheel upgrade ./my-project # 更新指定项目框架
+  flywheel update -x http://127.0.0.1:7890
+  flywheel available           # 查看可安装的 skill
 `);
     break;
   case 'install':
   case 'add':
   case 'i':
-    runScript(resolveScript('flywheel-install'), ['add', ...args]).catch((e) => process.exit(1));
+    runScript(resolveScript('flywheel-install'), ['add', ...restArgs]).catch((e) => process.exit(1));
+    break;
+  case 'available':
+  case 'avail':
+  case 'search':
+    runScript(resolveScript('flywheel-install'), ['available']).catch((e) => process.exit(1));
     break;
   case 'list':
   case 'ls':
     runScript(resolveScript('flywheel-install'), ['list']).catch((e) => process.exit(1));
     break;
   case 'update':
-  case 'upgrade':
-    if (args[0] === 'flywheel' || args[0] === 'self') {
-      spawn('npm', ['install', '-g', '@vima_tech/flywheel'], {
-        cwd: process.cwd(),
-        stdio: 'inherit',
-      }).on('exit', (code) => process.exit(code));
-    } else {
-      runScript(resolveScript('flywheel-install'), ['update', ...args]).catch((e) => process.exit(1));
-    }
+    runScript(resolveScript('flywheel-install'), ['update', ...restArgs]).catch((e) => process.exit(1));
     break;
   case 'distill':
   case 'dist':
-    runScript(resolveScript('auto-distill'), args).catch((e) => process.exit(1));
+    runScript(resolveScript('auto-distill'), restArgs).catch((e) => process.exit(1));
+    break;
+  case 'upgrade':
+    cmdUpgrade(restArgs).catch((e) => { console.error(e); process.exit(1); });
     break;
   default:
     console.error('未知命令: ' + command);

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@vima_tech/flywheel",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "自成长 AI Agent 飞轮框架 — 让任何需要积累迭代的 AI 工作流都能自我进化",
   "main": "bin/flywheel.js",
   "bin": {
-    "flywheel": "./bin/flywheel.js"
+    "flywheel": "./bin/flywheel.js",
+    "fw": "./bin/flywheel.js",
+    "fly": "./bin/flywheel.js"
   },
   "files": [
     "bin/",

package/scripts/flywheel-install.sh

@@ -17,6 +17,14 @@ BRANCH="main"
 BASE_URL="https://raw.githubusercontent.com/$REPO/$BRANCH"
 CMD="${1:-list}"
 TARGET="${2:-}"
+PROXY="${FLYWHEEL_PROXY:-}"
+
+[ -n "$PROXY" ] && CURL_PROXY="--proxy $PROXY" || CURL_PROXY=""
+
+# ── curl helper ─────────────────────────────────────────────────
+do_curl() {
+  curl -fsSL $CURL_PROXY "$@"
+}
 
 # ── list ───────────────────────────────────────────────────────
 cmd_list() {
@@ -45,16 +53,15 @@ cmd_available() {
   echo "━━━ 可安装 Skill 包 ━━━"
   local available_file="$SCRIPT_DIR/available.json"
   if [ -f "$available_file" ]; then
-    python3 - << 'PYEOF'
-import json, sys
-with open(sys.argv[1]) as f:
+    python3 -c "
+import json
+with open('$available_file') as f:
     data = json.load(f)
 for s in data.get('skills', []):
-    print(f"  - {s['name']}  v{s['version']}  -  {s['description']}")
-PYEOF
-    "$available_file"
+    print(f\"  - {s['name']}  v{s['version']}  -  {s['description']}\")
+"
   else
-    echo "  （无可用 skill，请检查网络后重试）"
+    echo "  （无可用 skill）"
   fi
   echo ""
   echo "安装 skill：flywheel install <skill-name>"
@@ -67,15 +74,13 @@ cmd_add() {
 
   echo "安装 skill：$skill"
 
-  # 检查 skill 是否存在
-  if ! curl -fsSL "$BASE_URL/skills/$skill/skill.yaml" -o /dev/null 2>/dev/null; then
+  if ! do_curl "$BASE_URL/skills/$skill/skill.yaml" -o /dev/null 2>/dev/null; then
     echo "❌ skill '$skill' 不存在"
     echo "   运行 list 查看可用 skill"
     exit 1
   fi
 
-  # 使用主安装器的 install_skill 逻辑
-  curl -fsSL "$BASE_URL/install.sh" | bash -s -- "$skill"
+  curl -fsSL $CURL_PROXY "$BASE_URL/install.sh" | bash -s -- "$skill"
 }
 
 # ── update ─────────────────────────────────────────────────────
@@ -87,37 +92,52 @@ cmd_update() {
   else
     for yaml in "$REPO_DIR/skills"/*/skill.yaml; do
       [ -f "$yaml" ] || continue
-      skills+=("$(basename "$(dirname "$yaml")")")
+      local name=$(basename "$(dirname "$yaml")")
+      [ "$name" = "_kernel" ] && continue
+      [ "$name" = "_template" ] && continue
+      skills+=("$name")
     done
   fi
 
   [ ${#skills[@]} -eq 0 ] && { echo "没有已安装的 skill"; exit 0; }
 
   echo "━━━ 更新 Skill 包 ━━━"
+
+  local update_cmds=()
   for skill in "${skills[@]}"; do
-    echo ""
-    echo "更新 $skill..."
     local yaml_url="$BASE_URL/skills/$skill/skill.yaml"
-    local remote_ver
-    remote_ver=$(curl -fsSL "$yaml_url" 2>/dev/null | grep '^version:' | awk '{print $2}' || echo "?")
     local local_ver
     local_ver=$(grep '^version:' "$REPO_DIR/skills/$skill/skill.yaml" 2>/dev/null | awk '{print $2}' || echo "0")
 
+    local remote_ver
+    remote_ver=$(do_curl "$yaml_url" 2>/dev/null | grep '^version:' | awk '{print $2}' || echo "?")
+
     if [ "$remote_ver" = "$local_ver" ]; then
       echo "  ✓ $skill 已是最新版 v$local_ver"
     else
-      echo "  $local_ver → $remote_ver，更新中..."
-      cmd_add "$skill"
+      echo "  → $skill v$local_ver → v$remote_ver"
+      update_cmds+=("$skill")
     fi
   done
+
+  if [ ${#update_cmds[@]} -gt 0 ]; then
+    echo ""
+    echo "开始更新 ${#update_cmds[@]} 个 skill..."
+    for skill in "${update_cmds[@]}"; do
+      echo ""
+      echo "更新 $skill..."
+      cmd_add "$skill"
+    done
+  fi
 }
 
 case "$CMD" in
-  list)   cmd_list ;;
-  add)    cmd_add "$TARGET" ;;
-  update) cmd_update ;;
+  list)      cmd_list ;;
+  add)       cmd_add "$TARGET" ;;
+  update)    cmd_update ;;
+  available) cmd_available ;;
   *)
-    echo "用法：$0 list | add <skill> | update [skill]"
+    echo "用法：$0 list | add <skill> | update [skill] | available"
     exit 1
     ;;
 esac