@bolloon/bolloon-agent 0.4.27 → 0.4.29

package/scripts/build-cli.js

@@ -18,14 +18,18 @@ if (!fs.existsSync(binDir)) {
 }
 
 // Windows 批处理入口
+// Windows 入口: 同样只指向真入口 (cli-entry.js), 不再指向 dist/index.js
 const winContent = `@echo off
 set "BOLLOON_ROOT=%~dp0"
 set "BOLLOON_ROOT=%BOLLOON_ROOT:~0,-1%"
 
-REM 确定入口文件
-set "ENTRY=%BOLLOON_ROOT%\\dist\\index.js"
+set "ENTRY=%BOLLOON_ROOT%\\dist\\cli-entry.js"
 if not exist "%ENTRY%" (
-    set "ENTRY=%BOLLOON_ROOT%\\src\\index.ts"
+    set "ENTRY=%BOLLOON_ROOT%\\dist\\index.js"
+)
+if not exist "%ENTRY%" (
+    echo 找不到 dist 入口, 请先构建: npm run build:main
+    exit /b 1
 )
 
 node "%ENTRY%" %*
@@ -34,163 +38,40 @@ node "%ENTRY%" %*
 fs.writeFileSync(path.join(binDir, 'bolloon.cmd'), winContent);
 
 // Unix/Linux/Mac 入口脚本
+//
+// 2026-09-19 修正: 这里以前生成的是**一整套重复实现** —— 第二套命令解析 + 第二份版本号
+// (硬编码 `v0.1.1`, 而当时真实版本已是 0.4.x) + 自己的 banner/启动分支。同一个包在两个入口上
+// 会给出两个答案 ("我是什么版本" 有 4 个来源就是这个原因之一)。
+// 现在生成的只是一个**转发器**: 一律转发到真入口 `dist/cli-entry.js`
+// (package.json 的 bin 字段也是它) —— 版本、命令、子命令只有一份实现。
+// 见 docs/wiki/update-protocol.md §1。
 const unixContent = `#!/usr/bin/env node
+/**
+ * 遗留 CJS 入口 (兼容老脚本/老文档里的 \`node bin/bolloon.cjs\`)。
+ * 真入口是 dist/cli-entry.js; 这里只转发, 不重复实现任何命令。
+ * NOTE: 本文件由 scripts/build-cli.js 生成 —— 改行为请改生成器, 别只改这里。
+ */
 const path = require("path");
-const { spawn } = require("child_process");
 const fs = require("fs");
+const { spawn } = require("child_process");
 
-const RESET = "\\x1b[0m";
-const BOLD = "\\x1b[1m";
-const CYAN = "\\x1b[36m";
-const GREEN = "\\x1b[32m";
-const MAGENTA = "\\x1b[35m";
-
-function log(msg, color) {
-  console.log((color || RESET) + msg + RESET);
-}
-
-function printBanner() {
-  console.log("\\n" + CYAN + BOLD + [
-    "   ╔═══════════════════════════════════════════╗",
-    "   ║      🤖 Bolloon Agent                     ║",
-    "   ║      P2P AI Document Processor            ║",
-    "   ╚═══════════════════════════════════════════╝"
-  ].join("\\n") + RESET + "\\n");
-}
-
-function getMainEntry() {
-  const distDir = path.dirname(require.main.filename);
-  const distIndex = path.join(distDir, "index.js");
-  if (fs.existsSync(distIndex)) {
-    return distIndex;
-  }
-  return path.join(process.cwd(), "src", "index.ts");
-}
-
-function parseArgs() {
-  const args = process.argv.slice(2);
-  if (args.length === 0) {
-    return { mode: "gui", args: [] };
-  }
-  const first = args[0];
-  switch (first) {
-    case "-v":
-    case "--version":
-      return { mode: "version", args: [] };
-    case "-h":
-    case "--help":
-      return { mode: "help", args: [] };
-    case "-g":
-    case "--gui":
-      return { mode: "gui", args: args.slice(1) };
-    case "-w":
-    case "--web":
-      return { mode: "web", args: args.slice(1) };
-    case "-c":
-    case "--cli":
-      return { mode: "cli", args: args.slice(1) };
-    default:
-      return { mode: "passthrough", args };
-  }
-}
-
-async function startElectron(additionalArgs) {
-  try {
-    const electron = require("electron");
-    const distDir = path.dirname(require.main.filename);
-    let mainPath = path.join(distDir, "electron.js");
-    if (!fs.existsSync(mainPath)) {
-      mainPath = path.join(process.cwd(), "src", "electron.ts");
-    }
-    log("启动 Electron...", CYAN);
-    const child = spawn(electron, [mainPath, ...additionalArgs], {
-      stdio: "inherit",
-      env: { ...process.env, NODE_ENV: "development" }
-    });
-    child.on("error", (err) => {
-      log("Electron 启动失败: " + err.message, MAGENTA);
-      process.exit(1);
-    });
-    child.on("exit", (code) => process.exit(code || 0));
-  } catch (err) {
-    log("Electron 不可用，切换到 Web 模式...", CYAN);
-    await startWebServer(additionalArgs);
-  }
-}
-
-async function startWebServer(additionalArgs) {
-  const mainPath = getMainEntry();
-  const webArgs = ["--web", ...additionalArgs];
-  log("启动 Web 服务...", CYAN);
-  const child = spawn(process.execPath, [mainPath, ...webArgs], { stdio: "inherit" });
-  child.on("error", (err) => {
-    log("Web 服务启动失败: " + err.message, MAGENTA);
-    process.exit(1);
-  });
-  child.on("exit", (code) => process.exit(code || 0));
-}
-
-async function startCLI(additionalArgs) {
-  const mainPath = getMainEntry();
-  log("启动命令行界面...", CYAN);
-  const child = spawn(process.execPath, [mainPath, ...additionalArgs], { stdio: "inherit" });
-  child.on("error", (err) => {
-    log("CLI 启动失败: " + err.message, MAGENTA);
-    process.exit(1);
-  });
-  child.on("exit", (code) => process.exit(code || 0));
-}
+const candidates = [
+  path.join(__dirname, "..", "dist", "cli-entry.js"),
+  path.join(__dirname, "..", "dist", "cli-entry.cjs"),
+];
+const entry = candidates.find((p) => fs.existsSync(p));
 
-async function main() {
-  const { mode, args } = parseArgs();
-  switch (mode) {
-    case "version":
-      console.log("Bolloon Agent v0.1.1");
-      break;
-    case "help":
-      printBanner();
-      console.log(BOLD + "用法:" + RESET + "  bolloon [选项] [命令] [参数]");
-      console.log(BOLD + "选项:" + RESET + "  --gui, -g           启动图形界面");
-      console.log("         --web, -w           启动 Web UI");
-      console.log("         --cli, -c           启动命令行界面");
-      console.log("         --version, -v       显示版本");
-      console.log("         --help, -h          显示帮助");
-      console.log(BOLD + "示例:" + RESET + "  bolloon              # 启动图形界面");
-      console.log("         bolloon --web        # 启动 Web UI");
-      console.log("         bolloon --read file  # 读取文档");
-      break;
-    case "gui":
-      printBanner();
-      await startElectron(args);
-      break;
-    case "web":
-      printBanner();
-      await startWebServer(args);
-      break;
-    case "cli":
-      await startCLI(args);
-      break;
-    case "passthrough":
-      const mainPath = getMainEntry();
-      const child = spawn(process.execPath, [mainPath, ...args], { stdio: "inherit" });
-      child.on("error", (err) => {
-        log("执行失败: " + err.message, MAGENTA);
-        process.exit(1);
-      });
-      child.on("exit", (code) => process.exit(code || 0));
-      break;
-    default:
-      log("未知模式: " + mode, MAGENTA);
-      printBanner();
-      console.log("输入 --help 查看帮助");
-      process.exit(1);
-  }
+if (!entry) {
+  console.error("❌ 找不到 dist/cli-entry.js —— 请先构建: npm run build:main");
+  process.exit(1);
 }
 
-main().catch((err) => {
-  console.error("Fatal error:", err);
+const child = spawn(process.execPath, [entry, ...process.argv.slice(2)], { stdio: "inherit" });
+child.on("error", (err) => {
+  console.error("启动失败:", err.message);
   process.exit(1);
 });
+child.on("exit", (code) => process.exit(code || 0));
 `;
 
 fs.writeFileSync(path.join(binDir, 'bolloon.cjs'), unixContent);

package/scripts/postinstall.js

@@ -1,15 +1,23 @@
 /**
- * Postinstall 脚本
- * npm 安装后自动执行
+ * Postinstall 脚本 (npm 安装后自动执行)
  *
- * 主要任务：
- * 1. 确保 bin 目录存在且可执行
- * 2. 初始化本地配置
- * 3. 检查依赖完整性
+ * 职责**只有**三件小事 (其余交给 CLI: `bolloon setup` / `bolloon doctor`):
+ *   1. 确保 `~/.bolloon` 与必要子目录存在
+ *   2. 首次安装才创建 `~/.bolloon/config.json`; 已存在时**只补缺失字段**, 不改用户值
+ *   3. 平台上的 bin 可执行位
+ *
+ * **修正的历史残留 (2026-09-19)**:
+ *   - 旧版把 `version: '0.1.12'` 写死进配置 (与当时实际版本 0.4.x 差 30+ 个版本) ——
+ *     现在 version 字段一律来自**本包的 package.json**, 且版本事实只认
+ *     `package.json` / `bolloon --version` (config.json 里的 version 只是元数据, 不当事实源)。
+ *   - 旧版 writeFileSync 直接覆盖写入 —— 现在走**原子写 (tmp + rename)**,
+ *     并且**绝不**覆盖已存在的配置 (用户配置优先级最高)。
+ *   - 新增的更新开关 (checkUpdates/autoInstall/autoRestart) 只"补缺", 不覆盖已有值。
  */
 
 import * as fs from 'fs';
 import * as path from 'path';
+import * as child_process from 'child_process';
 import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -25,96 +33,143 @@ function log(msg, color = RESET) {
   console.log(color + msg + RESET);
 }
 
+/** 本包真实版本 (唯一来源: package.json) —— 绝不再写死。 */
+function ownVersion() {
+  try {
+    const raw = JSON.parse(fs.readFileSync(path.join(rootDir, 'package.json'), 'utf-8'));
+    return raw.version || 'unknown';
+  } catch {
+    return 'unknown';
+  }
+}
+
+function atomicWriteJson(file, data) {
+  const tmp = `${file}.tmp-${process.pid}`;
+  fs.writeFileSync(tmp, JSON.stringify(data, null, 2));
+  fs.renameSync(tmp, file);
+}
+
 function initUserDirs() {
-  // 创建用户数据目录
   const home = process.env.HOME || process.env.USERPROFILE || '/tmp';
   const bolloonDir = path.join(home, '.bolloon');
 
-  const dirs = [
-    bolloonDir,
-    path.join(bolloonDir, 'sessions'),
-    path.join(bolloonDir, 'peer-store'),
-  ];
-
-  for (const dir of dirs) {
+  for (const dir of [bolloonDir, path.join(bolloonDir, 'sessions'), path.join(bolloonDir, 'peer-store')]) {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
       log(`  ✓ 创建目录: ${dir}`, GREEN);
     }
   }
 
-  // 初始化配置文件
+  const version = ownVersion();
   const configPath = path.join(bolloonDir, 'config.json');
+
   if (!fs.existsSync(configPath)) {
-    const defaultConfig = {
-      version: '0.1.12',
+    atomicWriteJson(configPath, {
+      version,
       initializedAt: new Date().toISOString(),
-      defaults: {
-        port: 54188,
-        theme: 'dark',
-        autoConnect: true,
-      },
-      providers: {
-        minimax: { enabled: false },
-        openai: { enabled: false },
-        anthropic: { enabled: false },
-      }
-    };
-    fs.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2));
-    log(`  ✓ 创建配置: ${configPath}`, GREEN);
+      updateChannel: 'stable',
+      // 2026-09-19 默认: 检查开 / 自动装关 / 自动重启关 (只通知, 不打断长期任务)
+      checkUpdates: true,
+      autoInstall: false,
+      autoRestart: false,
+      defaults: { port: 54188, theme: 'dark', autoConnect: true },
+      providers: { minimax: { enabled: false }, openai: { enabled: false }, anthropic: { enabled: false } },
+    });
+    log(`  ✓ 创建配置: ${configPath} (v${version})`, GREEN);
+  } else {
+    // 已存在: 绝不覆盖用户值, 只补缺失的更新开关 + 刷新 version 元数据
+    let cfg;
+    try {
+      cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+    } catch (err) {
+      log(`  ⚠ 配置存在但无法解析, 保持原样不动 (${err.message})`, YELLOW);
+      return bolloonDir;
+    }
+    let changed = [];
+    if (cfg.version !== version) { cfg.version = version; changed.push('version'); }
+    if (typeof cfg.checkUpdates !== 'boolean') { cfg.checkUpdates = true; changed.push('checkUpdates'); }
+    if (typeof cfg.autoInstall !== 'boolean') { cfg.autoInstall = false; changed.push('autoInstall'); }
+    if (typeof cfg.autoRestart !== 'boolean') { cfg.autoRestart = false; changed.push('autoRestart'); }
+    if (typeof cfg.updateChannel !== 'string') { cfg.updateChannel = 'stable'; changed.push('updateChannel'); }
+    if (changed.length) {
+      atomicWriteJson(configPath, cfg);
+      log(`  ✓ 配置补齐字段 (未改用户已有值): ${changed.join(', ')}`, GREEN);
+    } else {
+      log('  ✓ 配置已存在且完整, 未修改', GREEN);
+    }
   }
 
   return bolloonDir;
 }
 
-function checkNativeDeps() {
-  // 检查必要的原生依赖
-  const nativeDeps = [
-    'libp2p',
-    '@diap/sdk',
-  ];
+/**
+ * 运行时检测 (Phase 7): postinstall **不偷偷安装系统软件** (那需要管理员权限,
+ * 由 `bolloon runtime install yes` 在用户知情下做), 但**必须检测 Git/Python**,
+ * 不满足就明确把安装标成"未完成", 而不是打印一句"安装完成"。
+ */
+function detectRuntime(cmd, args = ['--version']) {
+  try {
+    const r = child_process.spawnSync(cmd, args, { encoding: 'utf-8', timeout: 8000, stdio: ['ignore', 'pipe', 'pipe'] });
+    if (r.status !== 0 || !r.stdout) return null;
+    const m = String(r.stdout).match(/[0-9]+\.[0-9]+(\.[0-9]+)?/);
+    return m ? m[0] : null;
+  } catch {
+    return null;
+  }
+}
 
-  let allOk = true;
+function inspectRuntimes() {
+  const python = detectRuntime('python3') || detectRuntime('python') || null;
+  return {
+    node: process.version.replace(/^v/, ''),
+    npm: detectRuntime('npm'),
+    git: detectRuntime('git'),
+    python,
+  };
+}
+
+function writeIncompleteMarker(bolloonDir, missing, runtimes) {
+  try {
+    const marker = path.join(bolloonDir, 'install-incomplete.json');
+    fs.writeFileSync(marker, JSON.stringify({
+      at: new Date().toISOString(),
+      missing,
+      runtimes,
+      howToFix: ['bolloon runtime             # 看四个运行时与能力矩阵',
+                 'bolloon runtime install yes # 补装 (不偷偷 sudo)'],
+      note: 'npm postinstall 不安装系统软件; 缺 Git/Python 时安装不算完成。修复后运行 bolloon runtime 会自动清掉这个文件。',
+    }, null, 2));
+    return marker;
+  } catch {
+    return null;
+  }
+}
 
+function checkNativeDeps() {
+  const nativeDeps = ['libp2p', '@diap/sdk'];
+  let allOk = true;
   for (const dep of nativeDeps) {
-    const depPath = path.join(rootDir, 'node_modules', dep);
-    if (!fs.existsSync(depPath)) {
+    if (!fs.existsSync(path.join(rootDir, 'node_modules', dep))) {
       log(`  ⚠ 缺少依赖: ${dep}`, YELLOW);
       allOk = false;
     }
   }
-
   return allOk;
 }
 
 function setupPlatform() {
-  const platform = process.platform;
-
-  log(`\n  平台: ${platform}`, CYAN);
-
-  if (platform === 'win32') {
-    // Windows: 确保 .cmd 文件存在
-    const binDir = path.join(rootDir, 'bin');
-    const cmdPath = path.join(binDir, 'bolloon.cmd');
-
-    if (fs.existsSync(binDir) && !fs.existsSync(cmdPath)) {
-      const cmdContent = `@echo off
-node "%~dp0..\\dist\\cli.js" %*
-`;
-      fs.writeFileSync(cmdPath, cmdContent);
-      log('  ✓ Windows 入口已创建', GREEN);
-    }
-  } else {
-    // Unix/Linux/Mac: 确保 bin 文件可执行
-    const binDir = path.join(rootDir, 'bin');
-    const binPath = path.join(binDir, 'bolloon.js');
-
-    if (fs.existsSync(binPath)) {
+  log(`\n  平台: ${process.platform}`, CYAN);
+  if (process.platform === 'win32') {
+    // 入口由 package.json 的 bin 字段生成 (npm 自己写 .cmd), 这里不再手造第二份
+    return;
+  }
+  for (const rel of ['bin/bolloon.js', 'bin/bolloon.cjs']) {
+    const p = path.join(rootDir, rel);
+    if (fs.existsSync(p)) {
       try {
-        fs.chmodSync(binPath, 0o755);
-        log('  ✓ bin/bolloon.js 已设为可执行', GREEN);
+        fs.chmodSync(p, 0o755);
       } catch (err) {
-        log(`  ⚠ 无法设置执行权限: ${err.message}`, YELLOW);
+        log(`  ⚠ 无法设置执行权限 (${rel}): ${err.message}`, YELLOW);
       }
     }
   }
@@ -122,27 +177,49 @@ node "%~dp0..\\dist\\cli.js" %*
 
 function main() {
   console.log('\n📦 Bolloon 安装后处理...\n');
-
   try {
-    // 1. 初始化用户目录
     const bolloonDir = initUserDirs();
     log(`  ✓ 用户数据目录: ${bolloonDir}`, GREEN);
 
-    // 2. 检查依赖
-    const depsOk = checkNativeDeps();
-    if (!depsOk) {
+    if (!checkNativeDeps()) {
       log('\n  ⚠ 部分依赖缺失，建议运行: npm install', YELLOW);
     }
 
-    // 3. 平台特定设置
     setupPlatform();
 
-    console.log('\n✅ 安装完成！\n');
+    // Phase 7: Node/npm/Git/Python 不全 → 安装**未完成** (不把半成品说成成功)
+    const rt = inspectRuntimes();
+    const missing = Object.entries(rt).filter(([, v]) => !v).map(([k]) => k);
+
+    if (missing.length === 0) {
+      try { fs.unlinkSync(path.join(bolloonDir, 'install-incomplete.json')); } catch { /* 本来就没有 */ }
+      console.log(`\n✅ 安装完成 (v${ownVersion()})！\n`);
+      console.log(`  Node.js  ✓  ${rt.node}`);
+      console.log(`  npm      ✓  ${rt.npm}`);
+      console.log(`  Git      ✓  ${rt.git}`);
+      console.log(`  Python   ✓  ${rt.python}\n`);
+    } else {
+      const marker = writeIncompleteMarker(bolloonDir, missing, rt);
+      console.log(`\n⚠️  安装**未完成** (v${ownVersion()}): 缺少 ${missing.join(', ')}\n`);
+      console.log(`  Node.js  ${rt.node ? '✓' : '✗'}  ${rt.node || '缺失'}`);
+      console.log(`  npm      ${rt.npm ? '✓' : '✗'}  ${rt.npm || '缺失'}`);
+      console.log(`  Git      ${rt.git ? '✓' : '✗'}  ${rt.git || '缺失'}`);
+      console.log(`  Python   ${rt.python ? '✓' : '✗'}  ${rt.python || '缺失'}\n`);
+      console.log('  npm 安装不会偷偷装系统软件 (需要管理员权限的动作必须由你同意)。');
+      console.log('  补齐办法:');
+      console.log('    bolloon runtime             # 看四个运行时与能力矩阵');
+      console.log('    bolloon runtime install yes # 补装 (会先给你看计划; 不偷偷 sudo)');
+      if (marker) console.log(`  (已记录: ${marker})`);
+      console.log('');
+    }
+
     console.log('  使用方式:');
-    console.log('    bolloon              # 启动 GUI');
+    console.log('    bolloon --version    # 版本 + 安装方式/目录/入口/运行时/是否最新');
+    console.log('    bolloon runtime      # 运行时 (Node/npm/Git/Python) 报告');
+    console.log('    bolloon doctor       # 安装是否自洽 (入口/版本/更新/运行时)');
+    console.log('    bolloon setup        # 初始化向导 (身份 + 模型 + 密钥)');
     console.log('    bolloon --web        # 启动 Web UI');
-    console.log('    bolloon --cli        # 命令行模式');
-    console.log('    bolloon --help       # 显示帮助\n');
+    console.log('    bolloon --cli        # 命令行模式\n');
     console.log(`  配置文件: ${path.join(bolloonDir, 'config.json')}\n`);
   } catch (err) {
     console.error('\n❌ 安装后处理失败:', err.message);
@@ -150,4 +227,4 @@ function main() {
   }
 }
 
-main();
+main();