@bolloon/bolloon-agent 0.2.11 → 0.2.13

package/bin/bolloon-cli.cjs

@@ -1,183 +1,183 @@
-#!/usr/bin/env node
-const path = require("path");
-const { spawn } = require("child_process");
-const fs = require("fs");
-
-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() {
-  // bin is in: node_modules/.bin/bolloon
-  // package is in: node_modules/@bolloon/bolloon-agent/
-  // dist is in: node_modules/@bolloon/bolloon-agent/dist/
-  const binPath = require.main.filename; // /tmp/node_modules/.bin/bolloon
-  const binDir = path.dirname(binPath); // /tmp/node_modules/.bin
-  const packageDir = path.dirname(binDir); // /tmp/node_modules/@bolloon/bolloon-agent
-  // 优先用 package.json 'main' 字段 (v0.2.3+ 指向 dist/cli-entry.js).
-  // 真实 npm 安装用户拿到的是编译后的 dist, 不该再依赖 tsx.
-  const pkgJsonPath = path.join(packageDir, "package.json");
-  if (fs.existsSync(pkgJsonPath)) {
-    try {
-      const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
-      if (pkg.main) {
-        const mainPath = path.join(packageDir, pkg.main);
-        if (fs.existsSync(mainPath)) return mainPath;
-      }
-    } catch {}
-  }
-  // fallback: 兼容老版本 (dist/index.js 是之前默认)
-  const distIndex = path.join(packageDir, "dist", "index.js");
-  if (fs.existsSync(distIndex)) return distIndex;
-  // 最后才 fallback 到 src (开发环境)
-  return path.join(packageDir, "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 binPath = require.main.filename;
-    const binDir = path.dirname(binPath);
-    const packageDir = path.dirname(binDir);
-    let mainPath = path.join(packageDir, "dist", "electron.js");
-    if (!fs.existsSync(mainPath)) {
-      mainPath = path.join(packageDir, "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));
-}
-
-async function main() {
-  // Get version from package.json
-  const binPath = require.main.filename;
-  const binDir = path.dirname(binPath);
-  const packageDir = path.dirname(binDir);
-  const packageJson = JSON.parse(fs.readFileSync(path.join(packageDir, "package.json"), "utf-8"));
-  const version = packageJson.version;
-
-  const { mode, args } = parseArgs();
-  switch (mode) {
-    case "version":
-      console.log("Bolloon Agent v" + version);
-      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);
-  }
-}
-
-main().catch((err) => {
-  console.error("Fatal error:", err);
-  process.exit(1);
-});
+#!/usr/bin/env node
+const path = require("path");
+const { spawn } = require("child_process");
+const fs = require("fs");
+
+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() {
+  // bin is in: node_modules/.bin/bolloon
+  // package is in: node_modules/@bolloon/bolloon-agent/
+  // dist is in: node_modules/@bolloon/bolloon-agent/dist/
+  const binPath = require.main.filename; // /tmp/node_modules/.bin/bolloon
+  const binDir = path.dirname(binPath); // /tmp/node_modules/.bin
+  const packageDir = path.dirname(binDir); // /tmp/node_modules/@bolloon/bolloon-agent
+  // 优先用 package.json 'main' 字段 (v0.2.3+ 指向 dist/cli-entry.js).
+  // 真实 npm 安装用户拿到的是编译后的 dist, 不该再依赖 tsx.
+  const pkgJsonPath = path.join(packageDir, "package.json");
+  if (fs.existsSync(pkgJsonPath)) {
+    try {
+      const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+      if (pkg.main) {
+        const mainPath = path.join(packageDir, pkg.main);
+        if (fs.existsSync(mainPath)) return mainPath;
+      }
+    } catch {}
+  }
+  // fallback: 兼容老版本 (dist/index.js 是之前默认)
+  const distIndex = path.join(packageDir, "dist", "index.js");
+  if (fs.existsSync(distIndex)) return distIndex;
+  // 最后才 fallback 到 src (开发环境)
+  return path.join(packageDir, "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 binPath = require.main.filename;
+    const binDir = path.dirname(binPath);
+    const packageDir = path.dirname(binDir);
+    let mainPath = path.join(packageDir, "dist", "electron.js");
+    if (!fs.existsSync(mainPath)) {
+      mainPath = path.join(packageDir, "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));
+}
+
+async function main() {
+  // Get version from package.json
+  const binPath = require.main.filename;
+  const binDir = path.dirname(binPath);
+  const packageDir = path.dirname(binDir);
+  const packageJson = JSON.parse(fs.readFileSync(path.join(packageDir, "package.json"), "utf-8"));
+  const version = packageJson.version;
+
+  const { mode, args } = parseArgs();
+  switch (mode) {
+    case "version":
+      console.log("Bolloon Agent v" + version);
+      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);
+  }
+}
+
+main().catch((err) => {
+  console.error("Fatal error:", err);
+  process.exit(1);
+});

package/bin/bolloon-daemon.sh

@@ -0,0 +1,207 @@
+#!/bin/bash
+# Bolloon Daemon - 守护进程启动脚本
+# 支持自动重启、日志轮转、PID 管理
+
+set -e
+
+APP_NAME="bolloon"
+APP_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+PID_FILE="$HOME/.bolloon/daemon.pid"
+LOG_FILE="$HOME/.bolloon/daemon.log"
+MAX_RESTARTS=5
+RESTART_DELAY=5
+
+# 颜色输出
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+log() {
+    echo -e "${GREEN}[$(date '+%Y-%m-%d %H:%M:%S')]${NC} $1"
+}
+
+warn() {
+    echo -e "${YELLOW}[$(date '+%Y-%m-%d %H:%M:%S')] WARN:${NC} $1"
+}
+
+error() {
+    echo -e "${RED}[$(date '+%Y-%m-%d %H:%M:%S')] ERROR:${NC} $1"
+}
+
+# 获取 PID
+get_pid() {
+    if [ -f "$PID_FILE" ]; then
+        cat "$PID_FILE"
+    fi
+}
+
+# 检查进程是否运行
+is_running() {
+    local pid=$(get_pid)
+    if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
+        return 0
+    fi
+    return 1
+}
+
+# 启动守护进程
+start() {
+    if is_running; then
+        log "Bolloon 已在运行 (PID: $(get_pid))"
+        return 0
+    fi
+
+    log "启动 Bolloon 守护进程..."
+
+    # 确保日志目录存在
+    mkdir -p "$(dirname "$LOG_FILE")"
+
+    # 启动进程
+    cd "$APP_DIR"
+    nohup npx tsx src/index.ts >> "$LOG_FILE" 2>&1 &
+    local pid=$!
+
+    # 保存 PID
+    echo "$pid" > "$PID_FILE"
+    log "Bolloon 已启动 (PID: $pid)"
+    log "日志文件: $LOG_FILE"
+}
+
+# 停止守护进程
+stop() {
+    local pid=$(get_pid)
+
+    if [ -z "$pid" ]; then
+        warn "Bolloon 未运行"
+        return 0
+    fi
+
+    log "停止 Bolloon (PID: $pid)..."
+
+    # 发送 SIGTERM
+    kill -TERM "$pid" 2>/dev/null || true
+
+    # 等待进程退出
+    local count=0
+    while kill -0 "$pid" 2>/dev/null && [ $count -lt 10 ]; do
+        sleep 1
+        count=$((count + 1))
+    done
+
+    # 如果还在运行，强制终止
+    if kill -0 "$pid" 2>/dev/null; then
+        warn "进程未响应，发送 SIGKILL..."
+        kill -KILL "$pid" 2>/dev/null || true
+    fi
+
+    # 清理 PID 文件
+    rm -f "$PID_FILE"
+    log "Bolloon 已停止"
+}
+
+# 重启守护进程
+restart() {
+    log "重启 Bolloon..."
+    stop
+    sleep 2
+    start
+}
+
+# 查看状态
+status() {
+    if is_running; then
+        log "Bolloon 运行中 (PID: $(get_pid))"
+        # 显示资源使用
+        local pid=$(get_pid)
+        if [ -n "$pid" ]; then
+            ps -p "$pid" -o %cpu,%mem,etime 2>/dev/null | tail -1 || true
+        fi
+    else
+        warn "Bolloon 未运行"
+    fi
+}
+
+# 查看日志
+logs() {
+    if [ -f "$LOG_FILE" ]; then
+        tail -100 "$LOG_FILE"
+    else
+        warn "日志文件不存在: $LOG_FILE"
+    fi
+}
+
+# 健康检查
+health() {
+    local port=${PORT:-54188}
+    local response=$(curl -s -o /dev/null -w "%{http_code}" "http://localhost:$port/api/health" 2>/dev/null || echo "000")
+
+    if [ "$response" = "200" ]; then
+        log "健康检查通过"
+        curl -s "http://localhost:$port/api/health" 2>/dev/null | head -5
+    else
+        error "健康检查失败 (HTTP $response)"
+        return 1
+    fi
+}
+
+# 清理日志
+clean_logs() {
+    if [ -f "$LOG_FILE" ]; then
+        local size=$(du -h "$LOG_FILE" | cut -f1)
+        log "当前日志大小: $size"
+        > "$LOG_FILE"
+        log "日志已清空"
+    fi
+}
+
+# 显示帮助
+show_help() {
+    echo "Bolloon Daemon 守护进程管理脚本"
+    echo ""
+    echo "用法: $0 [命令]"
+    echo ""
+    echo "命令:"
+    echo "  start    启动 Bolloon 守护进程"
+    echo "  stop     停止 Bolloon 守护进程"
+    echo "  restart  重启 Bolloon 守护进程"
+    echo "  status   查看运行状态"
+    echo "  logs     查看最近日志"
+    echo "  health   健康检查"
+    echo "  clean    清空日志"
+    echo "  help     显示帮助"
+    echo ""
+}
+
+# 主逻辑
+case "${1:-help}" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    restart)
+        restart
+        ;;
+    status)
+        status
+        ;;
+    logs)
+        logs
+        ;;
+    health)
+        health
+        ;;
+    clean)
+        clean_logs
+        ;;
+    help|--help|-h)
+        show_help
+        ;;
+    *)
+        error "未知命令: $1"
+        show_help
+        exit 1
+        ;;
+esac

package/dist/agents/agent-manifest-protocol.js

@@ -44,6 +44,16 @@ const localManifest = {
 };
 export function setLocalManifest(m) {
     Object.assign(localManifest, m, { publishedAt: Date.now() });
+    // 2026-07-05: 显式重置 v2 数组字段 — Partial merge 不会清空未提供的 key,
+    // 但调用者通常期望"整片替换", 所以这里强制对齐 (避免测试间泄漏).
+    if (!('groups' in m))
+        localManifest.groups = [];
+    if (!('functions' in m))
+        localManifest.functions = [];
+    if (!('exportments' in m))
+        localManifest.exportments = [];
+    if (!('sciences' in m))
+        localManifest.sciences = [];
     return localManifest;
 }
 export function getLocalManifest() {
@@ -58,6 +68,48 @@ export function addLocalAgent(agent) {
     localManifest.publishedAt = Date.now();
     return localManifest;
 }
+// ============== 2026-07-05: 4 类资源 setter (groups/function/exportment/science) ==============
+// 默认 localManifest 不带这些字段; 一旦调用就 patch 进去. 不强制覆盖旧值.
+export function addLocalGroup(g) {
+    localManifest.groups = localManifest.groups || [];
+    const idx = localManifest.groups.findIndex((x) => x.id === g.id);
+    if (idx >= 0)
+        localManifest.groups[idx] = { ...localManifest.groups[idx], ...g };
+    else
+        localManifest.groups.push(g);
+    localManifest.publishedAt = Date.now();
+    return localManifest;
+}
+export function addLocalFunction(f) {
+    localManifest.functions = localManifest.functions || [];
+    const idx = localManifest.functions.findIndex((x) => x.capability === f.capability);
+    if (idx >= 0)
+        localManifest.functions[idx] = { ...localManifest.functions[idx], ...f };
+    else
+        localManifest.functions.push(f);
+    localManifest.publishedAt = Date.now();
+    return localManifest;
+}
+export function addLocalExportment(e) {
+    localManifest.exportments = localManifest.exportments || [];
+    const idx = localManifest.exportments.findIndex((x) => x.name === e.name);
+    if (idx >= 0)
+        localManifest.exportments[idx] = { ...localManifest.exportments[idx], ...e };
+    else
+        localManifest.exportments.push(e);
+    localManifest.publishedAt = Date.now();
+    return localManifest;
+}
+export function addLocalScience(s) {
+    localManifest.sciences = localManifest.sciences || [];
+    const idx = localManifest.sciences.findIndex((x) => x.id === s.id);
+    if (idx >= 0)
+        localManifest.sciences[idx] = { ...localManifest.sciences[idx], ...s };
+    else
+        localManifest.sciences.push(s);
+    localManifest.publishedAt = Date.now();
+    return localManifest;
+}
 // ============== 远端 manifest 缓存 ==============
 const remoteManifests = new Map(); // key = ownerPublicKey
 export function cacheRemoteManifest(m) {