@bolloon/bolloon-agent 0.4.25 → 0.4.27

package/dist/index.js

@@ -1449,6 +1449,149 @@ async function processInputInner(input, comm) {
         }
         return;
     }
+    // 2026-09-18 (Phase 4): /tx [transactionId] —— 交易审计 (里程碑/争议/责任/结算事实)
+    if (cmd === '/tx' || cmd.startsWith('/tx ')) {
+        const id = trimmed.slice('/tx'.length).trim().split(/\s+/).filter(Boolean)[0];
+        try {
+            const { listTransactions, readTransaction, replayTransaction } = await import('./agents/x402/transaction-store.js');
+            const MILE = await import('./agents/x402/milestone-settlement.js');
+            if (!id) {
+                const txs = await listTransactions();
+                if (!txs.length) {
+                    appendLine(`${C_DIM}还没有交易记录 (~/.bolloon/transactions/)${RESET}`);
+                    return;
+                }
+                appendLine(`${C_DIM}最近 ${txs.length} 笔交易 (生命周期 + 结算事实 两层):${RESET}`);
+                for (const t of txs.slice(-12)) {
+                    const agg = t.milestones?.length ? MILE.aggregateMilestones(t.milestones) : null;
+                    appendLine(`  ${C_DIM}${t.transactionId} ${RESET}${String(t.status).padEnd(18)} 结算=${String(t.settlementFact || '?').padEnd(18)} ${t.amount || '?'} ${t.currency || ''}${agg ? ` · 里程碑 ${agg.verified}/${agg.total}` : ''}${t.dispute ? ' · ⚠争议' : ''}`);
+                }
+                appendLine(`${C_DIM}/tx <transactionId> 看完整审计 (含证据链回放)${RESET}`);
+                return;
+            }
+            const rec = await readTransaction(id);
+            if (!rec) {
+                appendLine(`${C_ERROR}没有这笔交易: ${id}${RESET}`);
+                return;
+            }
+            appendLine(`  ${C_DIM}交易 ${rec.transactionId} · ${rec.status} · 结算 ${rec.settlementFact} · 链上=${rec.chainSettled === true} txHash=${rec.txHash || '(无)'}${RESET}`);
+            appendLine(`  ${C_DIM}资源 ${rec.itemId} · ${rec.amount} ${rec.currency} · ${rec.network} · 付款方式 ${rec.paymentMode}${RESET}`);
+            if (rec.milestones?.length) {
+                const agg = MILE.aggregateMilestones(rec.milestones);
+                appendLine(`  ${C_DIM}里程碑 ${agg.verified}/${agg.total} 完成 → ${agg.settlementFact}: ${agg.reason}${RESET}`);
+                for (const m of rec.milestones)
+                    appendLine(`    ${C_DIM}${m.milestoneId} ${m.title} ${m.amount} [付:${m.paymentStatus} 交:${m.deliveryStatus} 验:${m.verificationStatus}]${RESET}`);
+            }
+            if (rec.dispute)
+                appendLine(`  ${C_ERROR}争议: ${rec.dispute.reason} (缺证据 ${rec.dispute.missingEvidence.length} 项, ${rec.dispute.resolution ? `已收尾: ${rec.dispute.resolution.decision}` : '未收尾'})${RESET}`);
+            if (rec.responsibility)
+                appendLine(`  ${C_DIM}责任候选: ${rec.responsibility.type} — ${rec.responsibility.reason}${RESET}`);
+            const elig = MILE.milestoneGoalEligibility(rec, { executionOk: rec.execution?.ok === true, goalCriteriaHit: rec.goalCriteriaMet === true });
+            appendLine(`  ${C_DIM}Goal 成功证据资格: ${elig.eligible ? '✓' : '✗'} ${elig.reason}${RESET}`);
+            const lines = await replayTransaction(id);
+            appendLine(`  ${C_DIM}证据链 (${lines.length} 条):${RESET}`);
+            for (const l of lines)
+                appendLine(`    ${C_DIM}${l}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/tx 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    // 2026-09-18: /trace [runId] [--json] —— 智能体工具执行轨迹 (真跑过什么工具/结果/耗时), 可复制交换
+    if (cmd === '/trace' || cmd.startsWith('/trace ')) {
+        const rest = trimmed.slice('/trace'.length).trim();
+        try {
+            const { listRuns, readRun } = await import('./agents/run-store.js');
+            const { runToTraceText, runToTraceJson, summarizeTrace } = await import('./agents/trace-export.js');
+            const wantJson = rest.includes('--json');
+            const runId = rest.split(/\s+/).find((a) => a && !a.startsWith('--'));
+            if (!runId) {
+                const runs = await listRuns({ limit: 12 });
+                if (!runs.length) {
+                    appendLine(`${C_DIM}还没有运行记录 (每次智能体运行都落盘 ~/.bolloon/runs/)${RESET}`);
+                    return;
+                }
+                appendLine(`${C_DIM}最近 ${runs.length} 次运行的工具执行轨迹:${RESET}`);
+                for (const r of runs)
+                    appendLine(`  ${C_DIM}${r.runId} [${r.status}] ${RESET}${summarizeTrace(r)}`);
+                appendLine(`${C_DIM}/trace <runId> 看完整轨迹 (文本可复制交换) · /trace <runId> --json 机器可读${RESET}`);
+                return;
+            }
+            const run = await readRun(runId);
+            if (!run) {
+                appendLine(`${C_ERROR}没有这个运行: ${runId}${RESET}`);
+                return;
+            }
+            if (wantJson) {
+                appendLine(JSON.stringify(runToTraceJson(run), null, 2));
+                return;
+            }
+            for (const line of runToTraceText(run).split('\n'))
+                appendLine(`  ${C_DIM}${line}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/trace 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    // 2026-09-18: /p2p [--json] —— 本机 P2P 连接信息 (peerId + 可拨入地址), 抄进名片/小工具递给对方
+    if (cmd === '/p2p' || cmd.startsWith('/p2p ')) {
+        try {
+            const { getLocalP2pInfo, formatP2pInfoText, formatP2pInfoJson } = await import('./agents/p2p-info.js');
+            const info = await getLocalP2pInfo();
+            if (trimmed.includes('--json')) {
+                appendLine(formatP2pInfoJson(info));
+                return;
+            }
+            for (const line of formatP2pInfoText(info).split('\n'))
+                appendLine(`  ${C_DIM}${line}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/p2p 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    // 2026-09-16 (2-F): /criteria <goalId> [confirm|propose <text...>] —— 判据：看/确认/改/让 agent 提候选
+    if (cmd === '/criteria' || cmd.startsWith('/criteria ')) {
+        const rest = trimmed.slice('/criteria'.length).trim();
+        try {
+            const { longTermStatus, confirmCriteria, proposeForGoal } = await import('./agents/goal-criteria.js');
+            const { readGoal } = await import('./agents/goal-store.js');
+            const [goalId, action, ...words] = rest.split(/\s+/).filter(Boolean);
+            if (!goalId) {
+                appendLine(`${C_DIM}用法: /criteria <goalId> [confirm | propose | set <判据用;分>]${RESET}`);
+                return;
+            }
+            const g = await readGoal(goalId);
+            if (!g) {
+                appendLine(`${C_ERROR}没有这个目标: ${goalId}${RESET}`);
+                return;
+            }
+            if (action === 'propose') {
+                const p = await proposeForGoal(goalId);
+                appendLine(p.ok ? `${C_DIM}候选判据 (待确认):\n${p.criteria.map((c, i) => `  [${i}] ${c}`).join('\n')}${RESET}` : `${C_ERROR}无法生成判据: ${p.reason}${RESET}`);
+                return;
+            }
+            const list = action === 'set' && words.length ? words.join(' ').split(';').map((x) => x.trim()).filter(Boolean) : undefined;
+            if (action === 'confirm' || list) {
+                const r = await confirmCriteria(goalId, { criteria: list, by: 'cli' });
+                appendLine(r.ok ? `${C_DIM}判据已确认 (v${r.goal?.criteriaVersion}): ${(r.goal?.successCriteria || []).join(' | ')}${RESET}` : `${C_ERROR}${r.reason}${RESET}`);
+                return;
+            }
+            const st = await longTermStatus(goalId);
+            appendLine(`${C_DIM}goal ${g.goalId} [${g.status}] 判据来源=${g.criteriaSource || 'unknown'} 已确认=${g.criteriaConfirmed === true} v${g.criteriaVersion || 1}${RESET}`);
+            g.successCriteria.forEach((c, i) => appendLine(`  ${g.completedCriteria.includes(i) ? '✓' : '·'} [${i}] ${c}`));
+            if (g.proposedCriteria?.length)
+                appendLine(`  ${C_DIM}候选 (未确认): ${g.proposedCriteria.join(' | ')}${RESET}`);
+            appendLine(`  长期完成: ${st.canComplete ? '✅ 可判完成' : `❌ ${st.reason}`}`);
+            appendLine(`  ${C_DIM}检查: ${Object.entries(st.checks).map(([k, v]) => `${k}=${v ? '✓' : '✗'}`).join(' ')}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/criteria 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
     // 2026-09-16 (M2-B): /supervise — 长期执行层 (状态/唤醒原因/手动推进一个周期) · /wake <goalId> — 外部事件唤醒
     if (cmd === '/supervise' || cmd.startsWith('/supervise ')) {
         const arg = trimmed.slice('/supervise'.length).trim();
@@ -3901,6 +4044,21 @@ function parseArgs() {
             case '--supervise':
                 result.supervise = true;
                 break;
+            case '--setup-status':
+                result.setupStatus = true;
+                break;
+            case '--setup-resume':
+                result.setupResume = true;
+                break;
+            case '--setup-repair':
+                result.setupRepair = true;
+                break;
+            case '--setup-reconfigure':
+                result.setupReconfigure = true;
+                break;
+            case '--setup-test':
+                result.setupTest = true;
+                break;
             case '--supervise-once':
                 result.supervise = true;
                 result.superviseOnce = true;
@@ -4333,6 +4491,45 @@ async function main() {
         const mode = args.web ? 'web' : 'cli';
         // 2026-09-16 (2-C.1): 独立 Supervisor 宿主 —— `bolloon --supervise [--supervise-once|--supervise-dry-run]`
         //   长期执行不再依附 web 进程 (页面关掉/CLI 没开也能继续推进 Goal)。
+        // 2026-09-16 (Phase 4): Onboard 统一入口 —— CLI / Web 共用同一条执行器 (src/setup/onboard.ts)
+        //   --setup-status 只读; --setup-resume 从失败阶段继续; --setup-repair 迁移/备份坏文件后就地修;
+        //   --setup-reconfigure 只改选中项 (新配置测通才切 active); --setup-test 重跑连通性 + 运行时。
+        if (args.setupStatus || args.setupResume || args.setupRepair || args.setupReconfigure || args.setupTest) {
+            const mode = args.setupStatus ? 'status' : args.setupRepair ? 'repair' : args.setupReconfigure ? 'reconfigure' : args.setupTest ? 'test' : 'resume';
+            if (mode === 'status') {
+                const { evaluateSetup, describeSetup } = await import('./setup/setup-store.js');
+                const ev = await evaluateSetup();
+                process.stdout.write(describeSetup(ev) + '\n');
+                process.exit(ev.gate === 'ready' ? 0 : 1);
+            }
+            const { defaultWizardIO } = await import('./cli/setup-wizard.js');
+            const { runOnboard } = await import('./setup/onboard.js');
+            const wizIO = defaultWizardIO();
+            const res = await runOnboard({
+                mode: mode,
+                io: {
+                    print: (m) => process.stdout.write(m + '\n'),
+                    ask: async (q, o) => wizIO.ask(q, o?.defaultValue ? { default: o.defaultValue } : undefined),
+                    askHidden: async (q) => wizIO.ask(q, { hidden: true }),
+                    confirm: async (q, d = true) => {
+                        const a = String(await wizIO.ask(`${q} (y/n)`, { default: d ? 'y' : 'n' })).trim().toLowerCase();
+                        return a === '' ? d : /^(y|yes|1|true|是)$/.test(a);
+                    },
+                    select: async (q, choices) => {
+                        process.stdout.write(q + '\n');
+                        choices.forEach((c, i) => process.stdout.write(`  ${i + 1}) ${c.label}${c.hint ? ` — ${c.hint}` : ''}\n`));
+                        const a = String(await wizIO.ask('选择 (序号或名称)', { default: '1' })).trim();
+                        if (!a)
+                            return choices[0]?.value || '';
+                        if (/^\d+$/.test(a) && choices[Number(a) - 1])
+                            return choices[Number(a) - 1].value;
+                        const hit = choices.find((c) => c.value === a) || choices.find((c) => a && c.value.startsWith(a));
+                        return hit?.value || a;
+                    },
+                },
+            });
+            process.exit(res.ok ? 0 : 1);
+        }
         if (args.supervise) {
             const { runStandaloneSupervisorHost } = await import('./agents/supervisor-host.js');
             const res = await runStandaloneSupervisorHost({
@@ -4381,14 +4578,37 @@ async function main() {
         // 2026-09-13: 首次运行引导 — 没有可用模型供应商 / 还没有用户身份时, 先走初始化向导
         //   (放在 CLI 启动前: 用户先回答"你是谁 / 用哪个模型", 再进 TUI 面板)
         if (isCLIInteractive) {
+            // 2026-09-16 (M4 启动硬门禁): 先把初始化事实读出来 —— 未就绪就**先修**, 修不好就非零退出。
+            //   旧行为是"向导失败也只 warn, 照常进对话", 结果是半成品配置能进运行态 (看起来启动成功、实际不可执行)。
+            const w = (m) => process.stderr.write(m.endsWith('\n') ? m : m + '\n');
+            let gateEv = null;
             try {
-                const { isFirstRun, runSetupWizard } = await import('./cli/setup-wizard.js');
-                if (await isFirstRun()) {
-                    await runSetupWizard({ interactive: true });
+                const { refreshSetupState, describeSetup } = await import('./setup/setup-store.js');
+                gateEv = await refreshSetupState({ light: true });
+                if (gateEv.gate !== 'ready') {
+                    w(describeSetup(gateEv));
+                    if (process.env.BOLLOON_SKIP_SETUP === '1') {
+                        w('⚠ BOLLOON_SKIP_SETUP=1 → 诊断模式: 可以看状态/修配置, 但 agent 执行被门禁拦住 (不能绕过)');
+                    }
+                    else {
+                        const { runSetupWizard } = await import('./cli/setup-wizard.js');
+                        await runSetupWizard({ interactive: true });
+                        const after = await refreshSetupState({});
+                        if (after.gate !== 'ready') {
+                            w(describeSetup(after));
+                            w('⛔ 初始化未完成 → 退出 (不会以"看起来能跑"的状态进入对话)');
+                            process.exit(1);
+                        }
+                        w('✅ 初始化完成, 进入正常模式');
+                    }
                 }
             }
             catch (e) {
-                console.warn('[setup] 初始化向导失败 (不阻塞启动):', String(e?.message || e).slice(0, 200));
+                // 评估/向导自身异常: fail-closed —— 不假装就绪
+                w(`⛔ 初始化流程失败 (fail-closed): ${String(e?.message || e).slice(0, 200)}`);
+                w(`   当前状态评估: ${gateEv ? gateEv.gate : '未知 (评估都没跑通)'}`);
+                w('   排查: `bolloon setup --status` (或删掉 ~/.bolloon/setup-state.json 后重跑 setup)');
+                process.exit(1);
             }
         }
         if (isNonInteractive) {

package/dist/llm/config-store.js

@@ -4,11 +4,19 @@
  */
 import * as fs from 'fs/promises';
 import * as path from 'path';
-const CONFIG_DIR = path.join(process.env.HOME || '/tmp', '.bolloon');
+import * as os from 'os';
+import * as fsSync from 'fs';
+/** 2026-09-16 (M1): 不再在模块加载时固定 HOME —— 独立宿主/测试注入/长驻进程都走同一个解析 */
+function configDir() {
+    const env = process.env.BOLLOON_HOME?.trim();
+    if (env)
+        return env;
+    return path.join(process.env.HOME || os.homedir() || '/tmp', '.bolloon');
+}
 // 2026-08-07: llm-config.json → bolloon-config.json (统一配置文件名, Bolloon 自己有写权限)
 //   initialize() 会做一次迁移: 旧文件存在且新文件不存在 → 复制旧内容, 之后统一读写新文件
-const CONFIG_PATH = path.join(CONFIG_DIR, 'bolloon-config.json');
-const LEGACY_CONFIG_PATH = path.join(CONFIG_DIR, 'llm-config.json');
+const CONFIG_PATH = path.join(configDir(), 'bolloon-config.json');
+const LEGACY_CONFIG_PATH = path.join(configDir(), 'llm-config.json');
 export const DEFAULT_PROVIDER_CONFIGS = {
     openai: {
         enabled: false,
@@ -231,6 +239,10 @@ function getDefaultConfig() {
 class LLMConfigStore {
     config = null;
     initialized = false;
+    /** 2026-09-16: 记住加载时用的配置目录 —— 目录变了必须丢弃缓存, 否则会把 A 目录的配置写到 B 目录 */
+    loadedDir = null;
+    /** 2026-09-16: 记住加载时的文件签名 —— 外部改了配置 (repair/agent 工具/用户手改) 必须重新读, 不能一直用旧值 */
+    loadedSig = null;
     // v0.2.15: single-flight lock around read-modify-write of `~/.bolloon/llm-config.json`.
     // Prevents concurrent save() calls from clobbering each other when the user
     // configures two providers back-to-back (e.g. saving gemini, then anthropic, in
@@ -244,10 +256,19 @@ class LLMConfigStore {
         return next;
     }
     async initialize() {
+        // 目录变了 (换 HOME / 独立宿主 / 测试注入): 内存缓存作废, 重新读盘
+        const dir = configDir();
+        const sig = this.fileSignature();
+        if (this.initialized && (this.loadedDir !== dir || this.loadedSig !== sig)) {
+            this.initialized = false;
+            this.config = null;
+        }
         if (this.initialized)
             return;
+        this.loadedDir = dir;
+        this.loadedSig = sig;
         try {
-            await fs.mkdir(CONFIG_DIR, { recursive: true });
+            await fs.mkdir(configDir(), { recursive: true });
             // 2026-08-07: 迁移 — 旧 llm-config.json 存在且新 bolloon-config.json 不存在时复制旧内容
             try {
                 await fs.access(CONFIG_PATH);
@@ -289,6 +310,16 @@ class LLMConfigStore {
         // 2026-08-07: mode 0o600 — 仅当前用户可读写 (含 API key 的敏感配置); Bolloon 自身进程可写
         await fs.writeFile(CONFIG_PATH, JSON.stringify(this.config, null, 2), { mode: 0o600 });
     }
+    /** 配置文件签名 (mtime+size); 不存在时返回 'missing' */
+    fileSignature() {
+        try {
+            const st = fsSync.statSync(configDir() + '/bolloon-config.json');
+            return `${st.mtimeMs}:${st.size}`;
+        }
+        catch {
+            return 'missing';
+        }
+    }
     async getConfig() {
         await this.initialize();
         return { ...this.config };

package/dist/network/agent-network.js

@@ -619,6 +619,16 @@ export class AgentMessaging {
                 console.warn(`[Messaging] Signature verification failed for ${signedMsg.from.substring(0, 20)}`);
                 return false;
             }
+            // 2026-09-16 (2-C.4): 目标关联的真实外部事件 —— 签名已通过校验, 这里再按
+            //   来源 / correlation / 过期 / eventId 去重做一次严格匹配, 只唤醒"正在等这个事件"的 Goal。
+            //   **不在这里启动 agent**: 只写事实 + 唤醒, 由 Supervisor 下一轮继续。
+            try {
+                const { tryDeliverGoalEvent } = await import('./goal-event-bridge.js');
+                await tryDeliverGoalEvent(signedMsg, fromPeerId);
+            }
+            catch (e) {
+                console.warn(`[Messaging] goal event bridge 失败 (不影响普通消息):`, e?.message);
+            }
             const handler = this.messageHandlers.get(signedMsg.type);
             if (handler) {
                 handler(data, fromPeerId, signedMsg.from);

package/dist/network/goal-event-bridge.js

@@ -0,0 +1,57 @@
+/**
+ * goal-event-bridge.ts — 把"真实入站的签名消息"翻译成 Goal 外部事件 (批次 2-C.4)
+ *
+ * 只有签名已通过校验的消息才进到这里 (来源 = 对端 DID)。这里只做解析 + 投递,
+ * 启动执行由 Supervisor 决定 —— 事件处理器不碰 agent。
+ *
+ * 识别的两种真实来源:
+ *   · delegate 回包: type 含 `delegate` 或 payload 里有 delegateId/resultCid → source='delegate'
+ *   · P2P 协作回复: 其它带 goalId/requestId/continuationId 的消息 → source='p2p'
+ */
+import { deliverExternalEvent } from '../agents/external-events.js';
+function parsePayload(raw) {
+    if (!raw)
+        return null;
+    if (typeof raw === 'object')
+        return raw;
+    try {
+        return JSON.parse(String(raw));
+    }
+    catch {
+        return null;
+    }
+}
+/** 从 payload 里提取目标关联字段 (支持 goalEvent 包裹或平铺两种写法) */
+export function extractGoalEvent(signed, fromDid) {
+    const body = parsePayload(signed.payload);
+    if (!body || typeof body !== 'object')
+        return null;
+    const env = (body.goalEvent && typeof body.goalEvent === 'object') ? body.goalEvent : body;
+    const goalId = env.goalId || env.goal_id;
+    const requestId = env.requestId || env.request_id || env.correlationId;
+    const continuationId = env.continuationId || env.continuation_id;
+    const eventId = env.eventId || env.event_id;
+    if (!goalId && !requestId && !continuationId)
+        return null; // 与 Goal 无关 → 普通消息
+    if (!eventId)
+        return null; // 没有 eventId 无法去重 → 不当事件处理
+    const isDelegate = /delegate/i.test(String(signed.type)) || !!(env.delegateId || env.resultCid);
+    return {
+        source: isDelegate ? 'delegate' : 'p2p',
+        eventId: String(eventId),
+        requestId: requestId ? String(requestId) : undefined,
+        continuationId: continuationId ? String(continuationId) : undefined,
+        goalId: goalId ? String(goalId) : undefined,
+        fromDid: fromDid || signed.from,
+        eventName: env.event || env.eventName || env.kind,
+        payload: env.result ?? env.payload ?? body,
+    };
+}
+/** 投递 (未匹配/不合法 → 返回 matched:false, 调用方继续走普通消息处理) */
+export async function tryDeliverGoalEvent(signed, fromDid) {
+    const event = extractGoalEvent(signed, fromDid);
+    if (!event)
+        return { matched: false };
+    const res = await deliverExternalEvent(event);
+    return { matched: res.ok, reason: res.reason, goalId: res.goalId };
+}