@bolloon/bolloon-agent 0.4.27 → 0.4.29

package/bin/bolloon.cjs

@@ -1,157 +1,27 @@
 #!/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));

package/bin/bolloon.cmd

@@ -2,10 +2,13 @@
 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%" %*

package/dist/agents/execution-supervisor.js

@@ -308,6 +308,27 @@ export class ExecutionSupervisor {
             this.emit({ kind: 'retry_woke', goalId: goal.goalId, message: `到点唤醒, 第 ${(goal.continuation?.attempts || 0) + 1} 次自动继续` });
             this.log(`[supervisor] goal=${goal.goalId} retry_wait 到点 → 唤醒并清 wakeAt`);
         }
+        // ★ 2026-09-18 (M2 收口): `bolloon task` 建的目标走**同一个恢复决策函数**
+        //   (`decideTaskRecovery`) —— CLI `task --resume` 与 Supervisor 不再各判一次。
+        //   决策说"不能动钱/已经执行过"就跳过 (不重复付款、不重复执行非幂等操作)。
+        if (goal.createdBy === 'cli:task' && process.env.BOLLOON_SUPERVISOR_TASK_RESUME !== '0') {
+            try {
+                const { decideTaskRecovery, resumeTask } = await import('./task/task-runner.js');
+                const decision = await decideTaskRecovery({ goalId: goal.goalId });
+                const actionable = ['retry_payment', 'deliver', 'verify'].includes(decision.action);
+                if (!actionable) {
+                    report.skipped.push({ goalId: goal.goalId, reason: `任务恢复决策=${decision.action} (${decision.reason}) → 本周期不动` });
+                    return { goalId: goal.goalId, status: 'task_no_action' };
+                }
+                const res = await resumeTask({ goalId: goal.goalId });
+                this.log(`[supervisor] task 目标接回: goal=${goal.goalId} decision=${decision.action} → 状态 ${res.card.status}`);
+                this.emit({ kind: res.ok ? 'goal_done' : 'needs_human', goalId: goal.goalId, message: `任务接回: ${decision.action} → ${res.card.status}` });
+                return { goalId: goal.goalId, runId: res.runId, status: res.card.status, error: res.ok ? undefined : res.reason };
+            }
+            catch (err) {
+                return { goalId: goal.goalId, status: 'task_resume_failed', error: String(err?.message || err).slice(0, 160) };
+            }
+        }
         const prevRunId = goal.currentRunId;
         const prevRun = prevRunId ? await readRun(prevRunId) : null;
         const plan = prevRunId ? await buildContinuationPlan(prevRunId).catch(() => null) : null;

package/dist/agents/pi-sdk-tools.js

@@ -1,6 +1,7 @@
 import * as fs from 'fs/promises';
 import * as fsSync from 'fs';
 import * as path from 'path';
+import { currentPackageRoot } from '../utils/version-info.js';
 import { documentReader } from '../documents/reader.js';
 import { p2pNetwork } from '../network/p2p.js';
 import { shellExec } from './shell-tool.js';
@@ -2453,7 +2454,8 @@ export function registerBuiltinTools(ctx) {
             try {
                 // fs 读 manifests/mcp-catalog.json — 构建后 dist/agents/../../manifests = 仓库根/manifests
                 const { readFileSync } = await import('fs');
-                const raw = readFileSync(new URL('../../manifests/mcp-catalog.json', import.meta.url), 'utf-8');
+                // 2026-09-19: 原为 new URL('../../manifests/...', import.meta.url) —— electron 构建(CommonJS)下 TS1343。
+                const raw = readFileSync(path.join(currentPackageRoot(), 'manifests', 'mcp-catalog.json'), 'utf-8');
                 const catalog = JSON.parse(raw);
                 const entries = (catalog?.entries ?? []);
                 if (entries.length === 0) {

package/dist/agents/pi-sdk.js

@@ -14,9 +14,12 @@ import * as os from 'os';
 import * as path from 'path';
 import { getContextManager } from '../bootstrap/context-manager.js';
 import { createRequire } from 'module';
+import { currentPackageRoot } from '../utils/version-info.js';
 // 2026-08-07: ESM 下裸 require 抛错被 catch 吞掉 → estimateHistoryTokens/maxContextTokens 静默失效
 //   (状态栏恒 0 的第二层根因). 统一用 createRequire 加载 CJS 模块.
-const _piRequire = createRequire(import.meta.url);
+// 2026-09-19: 原为 createRequire(import.meta.url) —— electron 构建(CommonJS)下 TS1343。
+//   createRequire 只用来解析裸模块名, 给包内任意文件路径即可, 用包根 package.json 最稳。
+const _piRequire = createRequire(path.join(currentPackageRoot(), 'package.json'));
 import { documentReader } from '../documents/reader.js';
 import { getMinimax } from '../constraints/index.js';
 import { p2pNetwork } from '../network/p2p.js';

package/dist/agents/task/local-seller.js

@@ -0,0 +1,149 @@
+/**
+ * local-seller.ts — M1 的"卖方" (本地 Registry 节点)
+ *
+ * M1 只做**本地 Registry**: 卖方就是你自己本机的报价端点。
+ * 这里**不重新实现协议** —— 直接把项目真实的卖方路由
+ * (`src/web/routes-x402-info.ts: registerX402InfoRoutes`) 挂到一个极小的
+ * express 风格适配器上, 用真 HTTP 跑真 402 → 付款校验 → 签名信封。
+ *
+ * 注意: 卖方路由内部用 `os.homedir()` 找 `~/.bolloon/{identity.json, x402-info/}`,
+ *       所以调用方若做隔离测试, 需要在启动前设好 `process.env.HOME`。
+ */
+import * as http from 'http';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+function matchPath(pattern, actual) {
+    const p = pattern.split('/').filter(Boolean);
+    const a = actual.split('/').filter(Boolean);
+    if (pattern.endsWith('/') && p.length !== a.length)
+        return { hit: false, params: {} };
+    if (p.length !== a.length)
+        return { hit: false, params: {} };
+    const params = {};
+    for (let i = 0; i < p.length; i++) {
+        if (p[i].startsWith(':'))
+            params[p[i].slice(1)] = decodeURIComponent(a[i]);
+        else if (p[i] !== a[i])
+            return { hit: false, params: {} };
+    }
+    return { hit: true, params };
+}
+function makeRes() {
+    let settle;
+    const done = new Promise((r) => { settle = r; });
+    const headers = {};
+    const res = {
+        _status: 200,
+        status(n) { res._status = n; return res; },
+        set(k, v) { headers[k] = String(v); return res; },
+        json(obj) {
+            headers['content-type'] = 'application/json';
+            settle({ status: res._status, headers, body: JSON.stringify(obj ?? null) });
+            return res;
+        },
+        send(text) {
+            settle({ status: res._status, headers, body: String(text ?? '') });
+            return res;
+        },
+    };
+    return { res, done };
+}
+/** 极小的 express 风格 app (只实现卖方路由用到的 get/post/delete + res.json/status/set) */
+export function createMiniApp() {
+    const routes = [];
+    const add = (method) => (p, h) => { routes.push({ method, path: p, handler: h }); };
+    const app = { get: add('GET'), post: add('POST'), delete: add('DELETE') };
+    const dispatch = async (method, url, headers, body) => {
+        const u = new URL(url, 'http://127.0.0.1');
+        for (const r of routes) {
+            if (r.method !== method)
+                continue;
+            const m = matchPath(r.path, u.pathname);
+            if (!m.hit)
+                continue;
+            const { res, done } = makeRes();
+            let parsed = undefined;
+            if (body) {
+                try {
+                    parsed = JSON.parse(body);
+                }
+                catch {
+                    parsed = undefined;
+                }
+            }
+            const req = {
+                method,
+                url,
+                headers,
+                params: m.params,
+                query: Object.fromEntries(u.searchParams.entries()),
+                body: parsed,
+                protocol: 'http',
+            };
+            try {
+                await r.handler(req, res);
+            }
+            catch (e) {
+                return { status: 500, headers: { 'content-type': 'application/json' }, body: JSON.stringify({ error: String(e?.message || e) }) };
+            }
+            return await done;
+        }
+        return null;
+    };
+    return { app, dispatch };
+}
+/** 卖方的 DIAP 身份 (签发信封用) — 缺失就生成一个本机身份, 不静默跳过 */
+export async function ensureSellerIdentity(home = os.homedir()) {
+    const dir = path.join(home, '.bolloon');
+    const file = path.join(dir, 'identity.json');
+    if (fs.existsSync(file)) {
+        try {
+            const raw = JSON.parse(fs.readFileSync(file, 'utf8'));
+            return { created: false, did: raw?.did };
+        }
+        catch {
+            return { created: false };
+        }
+    }
+    try {
+        const { KeyManager } = await import('@diap/sdk');
+        const kp = KeyManager.generate();
+        fs.mkdirSync(dir, { recursive: true });
+        await KeyManager.saveToFile(kp, file);
+        return { created: true, did: kp?.did };
+    }
+    catch (e) {
+        return { created: false };
+    }
+}
+/** 启动本地卖方节点: 真 HTTP + 项目真实卖方路由 */
+export async function startLocalSeller(opts = {}) {
+    const { registerX402InfoRoutes } = await import('../../web/routes-x402-info.js');
+    const { app, dispatch } = createMiniApp();
+    registerX402InfoRoutes(app);
+    const { listInfo } = await import('../x402/paid-info-store.js');
+    const server = http.createServer((req, res) => {
+        const chunks = [];
+        req.on('data', (c) => chunks.push(c));
+        req.on('end', async () => {
+            const body = Buffer.concat(chunks).toString('utf8');
+            const out = await dispatch(req.method || 'GET', req.url || '/', req.headers, body);
+            if (!out) {
+                res.writeHead(404, { 'content-type': 'application/json' });
+                res.end(JSON.stringify({ error: 'not found' }));
+                return;
+            }
+            res.writeHead(out.status, out.headers);
+            res.end(out.body);
+        });
+    });
+    await new Promise((resolve) => server.listen(opts.port ?? 0, '127.0.0.1', () => resolve()));
+    const port = server.address()?.port;
+    return {
+        url: `http://127.0.0.1:${port}`,
+        port,
+        itemCount: async () => (await listInfo()).length,
+        close: async () => { await new Promise((resolve) => server.close(() => resolve())); },
+    };
+}

package/dist/agents/task/report-card.js

@@ -0,0 +1,146 @@
+/**
+ * report-card.ts — M1 薄层 ③: 报告卡
+ *
+ * M1 **唯一面向人的主出口**。用户只看到这里的东西:
+ *   任务 / 结论 / 本次使用(Skill·版本·花费·来源) / 三项校验 / 状态(4 态) / 证据指针 / 卡在哪。
+ *
+ * 两条硬门 (leo 定, 任一不满足 → M1 失败):
+ *   买到 Skill 但没有执行        → 卡片必须"需要你处理", 不许变绿
+ *   执行成功但没有报告/证据      → 卡片必须"需要你处理", 不许变绿
+ *
+ * 内部 10 态生命周期 / 8 态结算事实**只在这里被映射成 4 个人类状态**, 不外泄术语。
+ */
+/** 内部生命周期 → 人类 4 态 (术语不外泄) */
+export function humanStatusFrom(opts) {
+    if (opts.verdict === 'blocked')
+        return '需要你处理';
+    const lc = String(opts.lifecycle || '');
+    switch (lc) {
+        case 'verified':
+            return '已完成';
+        case 'settled':
+        case 'delivered':
+            return '正在执行';
+        case 'discovered':
+        case 'quoted':
+        case 'payment_required':
+        case 'paying':
+            return '正在获取能力';
+        case 'policy_denied':
+        case 'delivery_failed':
+        case 'verification_failed':
+        case 'disputed':
+        case 'failed':
+            return '需要你处理';
+        default:
+            break;
+    }
+    switch (opts.stage) {
+        case 'prepare':
+            return '准备中';
+        case 'acquire':
+            return '正在获取能力';
+        case 'execute':
+            return '正在执行';
+        default:
+            return '已完成';
+    }
+}
+/**
+ * 组装报告卡。两条硬门在这里落地 (不是靠调用方记得检查):
+ * 只要"付了没执行"或"执行了没证据", 一律 `需要你处理` + 结论降级为"证据不足"。
+ */
+export function buildReportCard(input) {
+    const checks = {
+        outputContract: input.outputContract ?? '未执行',
+        resourceVerified: input.resourceVerified ?? '未执行',
+        taskEvidence: input.evidenceComplete ? '完整' : '不完整',
+    };
+    let status = humanStatusFrom({ stage: input.stage, lifecycle: input.lifecycle, verdict: input.blocker ? 'blocked' : 'ok' });
+    let hardGate;
+    let conclusion = input.conclusion ?? (status === '已完成' ? '证据不足' : '证据不足');
+    let blocker = input.blocker;
+    if (input.paid && !input.executed) {
+        hardGate = 'bought_not_executed';
+        status = '需要你处理';
+        conclusion = '证据不足';
+        blocker = blocker || '买到了 Skill 但没有执行 —— 这一次不算完成任务 (M1 硬门)';
+    }
+    else if (input.executed && !input.evidenceComplete) {
+        hardGate = 'executed_without_evidence';
+        status = '需要你处理';
+        conclusion = '证据不足';
+        blocker = blocker || '执行了但没有留下完整证据 —— 这一次不算完成任务 (M1 硬门)';
+    }
+    else if (input.outputContract === '未通过') {
+        status = '需要你处理';
+        conclusion = '证据不足';
+        blocker = blocker || '输出不符合资源契约 —— 不计成功 (M1 硬门)';
+    }
+    if (status === '已完成' && (checks.taskEvidence !== '完整' || checks.resourceVerified !== '通过' || checks.outputContract !== '通过')) {
+        // 三项校验没全过就不许显示"已完成" (防假绿)
+        status = '需要你处理';
+        hardGate = hardGate || 'executed_without_evidence';
+        conclusion = '证据不足';
+        blocker = blocker || `三项校验未全过 (输出契约=${checks.outputContract} · 资源验证=${checks.resourceVerified} · 证据=${checks.taskEvidence})`;
+    }
+    return {
+        task: input.task,
+        conclusion,
+        conclusionDetail: input.conclusionDetail,
+        skill: input.skill,
+        cost: input.cost,
+        payment: input.payment,
+        sources: input.sources,
+        checks,
+        status,
+        executed: input.executed,
+        paid: input.paid,
+        durationMs: input.durationMs,
+        evidenceRef: input.evidenceRef,
+        blocker,
+        hardGate,
+        budgetLines: input.budgetLines,
+    };
+}
+/** CLI 文本渲染 —— M1 的唯一主出口形状 */
+export function renderReportCard(card) {
+    const L = [];
+    L.push(`任务: ${card.task}`);
+    L.push('');
+    L.push(`结论: ${card.conclusion}${card.conclusionDetail ? ` (${card.conclusionDetail})` : ''}`);
+    L.push('');
+    L.push('本次使用:');
+    if (card.skill)
+        L.push(`- Skill: ${card.skill.name}${card.skill.version ? ` @ ${card.skill.version}` : ''}`);
+    if (card.cost)
+        L.push(`- 花费: ${card.cost.amount} ${card.cost.currency} (${card.cost.network})`);
+    if (card.payment) {
+        const modeZh = card.payment.mode === 'local-dev' ? '本机联调 (local-dev)' : card.payment.mode === 'facilitator' ? 'facilitator' : card.payment.mode;
+        L.push(`- 支付方式: ${modeZh}`);
+        L.push(`- 链上已验证: ${card.payment.chainSettled ? '是' : '否'}${card.payment.chainSettled ? '' : ' (本机联调不冒充链上结算)'}`);
+    }
+    if (card.sources)
+        L.push(`- 来源: ${card.sources.length} 个${card.sources.length ? ` (${card.sources.slice(0, 3).join(', ')}${card.sources.length > 3 ? ', …' : ''})` : ''}`);
+    L.push(`- 输出契约: ${card.checks.outputContract}`);
+    L.push(`- 资源验证: ${card.checks.resourceVerified}`);
+    L.push(`- 任务证据: ${card.checks.taskEvidence}`);
+    if (typeof card.durationMs === 'number')
+        L.push(`- 耗时: ${(card.durationMs / 1000).toFixed(1)} 秒`);
+    L.push(`- 状态: ${card.status}`);
+    if (card.blocker) {
+        L.push('');
+        L.push(`卡在哪: ${card.blocker}`);
+    }
+    if (card.budgetLines && card.budgetLines.length) {
+        L.push('');
+        L.push('预算:');
+        for (const b of card.budgetLines)
+            L.push(`- ${b}`);
+    }
+    L.push('');
+    const ref = card.evidenceRef;
+    const parts = [ref.goalId ? `Goal ${ref.goalId}` : null, ref.runId ? `Run ${ref.runId}` : null, ref.transactionId ? `交易 ${ref.transactionId}` : null].filter(Boolean);
+    L.push(parts.length ? `查看完整证据: ${parts.join(' · ')}` : '查看完整证据: (无)');
+    return L.join('\n');
+}