@bolloon/bolloon-agent 0.1.33 → 0.1.35

package/dist/llm/pi-ai.js

@@ -7,7 +7,7 @@ export class PiAIModel {
         this.config = config;
         this.provider = config.provider;
     }
-    async chat(message, context) {
+    async chat(message, context, signal) {
         const systemPrompt = this.buildSystemPrompt(context);
         const messages = [
             { role: 'system', content: systemPrompt },
@@ -16,11 +16,16 @@ export class PiAIModel {
         try {
             const response = await this.generateText({
                 messages,
-                temperature: 0.8
+                temperature: 0.8,
+                signal,
             });
             return { reply: response };
         }
         catch (error) {
+            // abort 不当作错误, 透传一个 sentinel 让上层能识别
+            if (signal?.aborted || error?.name === 'AbortError') {
+                throw error; // 上层 try/catch 处理
+            }
             console.error('PiAI chat error:', error);
             return { reply: '抱歉，AI服务暂时不可用。' };
         }
@@ -64,7 +69,7 @@ export class PiAIModel {
         }
     }
     async generateText(options) {
-        const { messages, temperature = 0.7, maxTokens = 4096 } = options;
+        const { messages, temperature = 0.7, maxTokens = 4096, signal } = options;
         switch (this.provider) {
             case 'openai':
             case 'minimax':
@@ -72,17 +77,17 @@ export class PiAIModel {
             case 'kimi':
             case 'glm':
             case 'qwen':
-                return this.callOpenAI(messages, temperature, maxTokens);
+                return this.callOpenAI(messages, temperature, maxTokens, signal);
             case 'anthropic':
-                return this.callAnthropic(messages, temperature, maxTokens);
+                return this.callAnthropic(messages, temperature, maxTokens, signal);
             case 'ollama':
-                return this.callOllama(messages, temperature);
+                return this.callOllama(messages, temperature, signal);
             case 'openrouter':
-                return this.callOpenRouter(messages, temperature, maxTokens);
+                return this.callOpenRouter(messages, temperature, maxTokens, signal);
             case 'gemini':
-                return this.callGemini(messages, temperature, maxTokens);
+                return this.callGemini(messages, temperature, maxTokens, signal);
             case 'local':
-                return this.callLocal(messages, temperature);
+                return this.callLocal(messages, temperature, signal);
             default:
                 throw new Error(`Unsupported provider: ${this.provider}`);
         }
@@ -142,7 +147,7 @@ export class PiAIModel {
         };
         return modelMap[this.provider];
     }
-    async callOpenAI(messages, temperature, maxTokens) {
+    async callOpenAI(messages, temperature, maxTokens, signal) {
         const apiKey = this.getApiKey();
         if (!apiKey) {
             throw new Error('OPENAI_API_KEY not set');
@@ -158,7 +163,8 @@ export class PiAIModel {
                 messages,
                 temperature,
                 max_tokens: maxTokens
-            })
+            }),
+            signal,
         });
         if (!response.ok) {
             throw new Error(`OpenAI API error: ${response.status}`);
@@ -166,7 +172,7 @@ export class PiAIModel {
         const data = await response.json();
         return data.choices?.[0]?.message?.content || '';
     }
-    async callAnthropic(messages, temperature, maxTokens) {
+    async callAnthropic(messages, temperature, maxTokens, signal) {
         const apiKey = this.getApiKey();
         if (!apiKey) {
             throw new Error('ANTHROPIC_API_KEY not set');
@@ -187,7 +193,8 @@ export class PiAIModel {
                 system: systemMessage,
                 temperature,
                 max_tokens: maxTokens
-            })
+            }),
+            signal,
         });
         if (!response.ok) {
             throw new Error(`Anthropic API error: ${response.status}`);
@@ -195,7 +202,7 @@ export class PiAIModel {
         const data = await response.json();
         return data.content?.[0]?.text || '';
     }
-    async callOllama(messages, temperature) {
+    async callOllama(messages, temperature, signal) {
         const response = await fetch(`${this.getBaseUrl()}/api/chat`, {
             method: 'POST',
             headers: {
@@ -206,7 +213,8 @@ export class PiAIModel {
                 messages,
                 temperature,
                 stream: false
-            })
+            }),
+            signal,
         });
         if (!response.ok) {
             throw new Error(`Ollama API error: ${response.status}`);
@@ -214,7 +222,7 @@ export class PiAIModel {
         const data = await response.json();
         return data.message?.content || '';
     }
-    async callOpenRouter(messages, temperature, maxTokens) {
+    async callOpenRouter(messages, temperature, maxTokens, signal) {
         const apiKey = this.getApiKey();
         if (!apiKey) {
             throw new Error('OPENROUTER_API_KEY not set');
@@ -232,7 +240,8 @@ export class PiAIModel {
                 messages,
                 temperature,
                 max_tokens: maxTokens
-            })
+            }),
+            signal,
         });
         if (!response.ok) {
             throw new Error(`OpenRouter API error: ${response.status}`);
@@ -240,7 +249,7 @@ export class PiAIModel {
         const data = await response.json();
         return data.choices?.[0]?.message?.content || '';
     }
-    async callGemini(messages, temperature, maxTokens) {
+    async callGemini(messages, temperature, maxTokens, signal) {
         const apiKey = this.getApiKey();
         if (!apiKey) {
             throw new Error('GEMINI_API_KEY not set');
@@ -264,7 +273,8 @@ export class PiAIModel {
                     temperature,
                     maxOutputTokens: maxTokens
                 }
-            })
+            }),
+            signal,
         });
         if (!response.ok) {
             throw new Error(`Gemini API error: ${response.status}`);
@@ -272,8 +282,8 @@ export class PiAIModel {
         const data = await response.json();
         return data.candidates?.[0]?.content?.parts?.[0]?.text || '';
     }
-    async callLocal(messages, temperature) {
-        return this.callOllama(messages, temperature);
+    async callLocal(messages, temperature, signal) {
+        return this.callOllama(messages, temperature, signal);
     }
     buildSystemPrompt(context) {
         const envDetails = this.getEnvironmentDetails();

package/dist/network/p2p-direct.js

@@ -58,9 +58,9 @@ export class P2PDirect extends EventEmitter {
             console.log(`[P2PDirect:${this.name}] 新连接: ${remotePubKeyHex.substring(0, 12)}... (inbound=${info.inbound || false}, type=${typeof conn}, hasWrite=${typeof conn?.write})`);
             // 双向记录 (inbound + outbound 都能拿到)
             this.conns.set(remotePubKeyHex, conn);
-            // v3: 触发 'connection' 事件, 上层 (web server) 可以主动给新连接发消息
-            this.emit('connection', { remotePublicKey: remotePubKeyHex, conn });
             // 收到数据时 → 触发 'data' 事件
+            // 注意: data 监听器必须在 emit('connection') 之前注册,
+            // 否则 server 的 connection handler 发送消息后, 对端回复可能在 data 监听器就绪前到达
             conn.on('data', (chunk) => {
                 const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
                 console.log(`[P2PDirect:${this.name}] 收到数据 from ${remotePubKeyHex.substring(0, 12)}... (${buf.length} bytes)`);
@@ -75,6 +75,9 @@ export class P2PDirect extends EventEmitter {
             conn.on('close', () => {
                 this.conns.delete(remotePubKeyHex);
             });
+            // v3: 触发 'connection' 事件, 上层 (web server) 可以主动给新连接发消息
+            // 注意: 放在 data/error/close 监听器之后, 确保 server 的 connection handler 不会先于 data 就绪
+            this.emit('connection', { remotePublicKey: remotePubKeyHex, conn });
         });
         await this.swarm.listen(); // server 模式
         this.started = true;
@@ -127,6 +130,60 @@ export class P2PDirect extends EventEmitter {
             return false;
         }
     }
+    /**
+     * 2026-06-10: 真"主动发, 等握手完成"版本 — 修复好友申请 fire-and-forget bug.
+     *
+     * 之前的问题: server.ts:2914 `await swarm.joinPeer(...)` 只触发握手, conn 还没 push 进 this.conns,
+     * 立即调 sendTo 找不到 conn → 静默返回 false → 消息扔进虚空.
+     *
+     * 现在: sendToWithWait 监听 'connection' 事件, 等到 targetPublicKey 真正出现在 this.conns,
+     * 才 write; 超时返回 NO_CONN; 写失败返回 WRITE_FAIL; 成功返回 SENT.
+     *
+     * 上层调用: const r = await p2p.sendToWithWait(pk, rpc, 5000);
+     *           if (r !== 'SENT') return 502 给前端.
+     */
+    async sendToWithWait(publicKeyHex, data, timeoutMs = 5000) {
+        // 2026-06-11: 先主动触发 joinPeer, 否则 DHT 上对面可能没 push conn
+        if (this.swarm) {
+            try {
+                await this.swarm.joinPeer(Buffer.from(publicKeyHex, 'hex'));
+            }
+            catch { }
+        }
+        // 1) 已有 conn → 立即试
+        let conn = this.conns.get(publicKeyHex);
+        if (!conn || conn.destroyed) {
+            // 2) 等 'connection' 事件 (this.emit('connection', { remotePublicKey, conn }))
+            const waitResult = await new Promise((resolve) => {
+                const timer = setTimeout(() => {
+                    this.off('connection', onConn);
+                    resolve('TIMEOUT');
+                }, timeoutMs);
+                const onConn = (evt) => {
+                    if (evt.remotePublicKey === publicKeyHex) {
+                        clearTimeout(timer);
+                        this.off('connection', onConn);
+                        resolve('READY');
+                    }
+                };
+                this.on('connection', onConn);
+            });
+            if (waitResult === 'TIMEOUT')
+                return 'NO_CONN';
+            conn = this.conns.get(publicKeyHex);
+            if (!conn || conn.destroyed)
+                return 'NO_CONN'; // 双保险
+        }
+        const buf = typeof data === 'string' ? Buffer.from(data) : data;
+        try {
+            conn.write(buf);
+            return 'SENT';
+        }
+        catch (err) {
+            console.error(`[P2PDirect:${this.name}] sendToWithWait 写失败 (${publicKeyHex.substring(0, 12)}...):`, err.message);
+            return 'WRITE_FAIL';
+        }
+    }
     getPublicKey() {
         if (!this.swarm)
             return '';

package/dist/pi-ecosystem/index.js

@@ -28,7 +28,7 @@ import * as path from 'path';
 export { initializeMcpAdapter, discoverMcpServers, registerServer, registerTool, listTools, hasTool, getTool, executeTool, getToolCallLog, clearToolCallLog, startServer, stopServer, discoverTools, createTavilyTool, createAmapTool, getAdapterStatus, on as onMcpEvent, off as offMcpEvent, } from '../pi-ecosystem-mcp/index.js';
 export { createGoal, createGoalQueue, getCurrentGoal, startCurrentGoal, completeCurrentGoal, failCurrentGoal, cutoffCurrentGoal, pauseCurrentGoal, checkBudget, getGoalStats, getQueueSummary, loadGoals, clearGoals, compactQueue, loadTemplates, createFromTemplate, nudgeCurrentGoal, } from '../pi-ecosystem-goals/index.js';
 export { createSubagent, startSubagent, delegateTask, getSubagent, listSubagents, listRunningSubagents, terminateSubagent, getStats as getSubagentStats, parallelDelegate, splitTask, } from '../pi-ecosystem-subagents/index.js';
-export { registerAnt, antScouting, antWorking, antReviewing, antComplete, antFail, antAbort, antTick, createTask, dispatchTask, recordResult, getAnt, listAnts, listAntsByRole, listAntsBySignal, getActiveAnts, getTask, listTasks, getSignalHistory, getColonyStatus, getColonyDump, persistColony, loadColony, onColonyEvent, offColonyEvent, } from '../pi-ecosystem-colony/index.js';
+export { registerAnt, antScouting, antWorking, antReviewing, antComplete, antFail, antAbort, antTick, createTask, dispatchTask, recordResult, getAnt, listAnts, listAntsByRole, listAntsBySignal, getActiveAnts, getTask, listTasks, getSignalHistory, getColonyStatus, getColonyDump, persistColony, loadColony, onColonyEvent, offColonyEvent, } from '../pi-ecosystem-colony/index.js'; // 2026-06-11: 蚁群模块已被用户删除, 这行已经无效 (改用 stub)
 // Judgment exports
 export { createJudgment, updateJudgmentConfidence, getAllJudgments, getJudgmentsByType, getJudgmentsForContext, getCombinedJudgments, calculateConfidence, buildValueFunction, getValueFunction, getJudgmentStats, loadFragmentJudgments, clearCache, } from '../pi-ecosystem-judgment/index.js';
 // Distillation exports
@@ -198,17 +198,20 @@ export class PiEcosystem {
     }
     async registerAnt(name, role) {
         const colony = await import('../pi-ecosystem-colony/index.js');
-        const ant = colony.registerAnt(name, role);
-        return ant.id;
+        // 2026-06-11: colony 已退化为 stub, registerAnt 不接参数, 返回 void
+        colony.registerAnt();
+        return name;
     }
     async createColonyTask(description) {
         const colony = await import('../pi-ecosystem-colony/index.js');
-        const task = colony.createTask(description);
-        return task.id;
+        // 2026-06-11: createTask 不接参数, 返回空对象
+        const task = colony.createTask();
+        return task?.id ?? description;
     }
     async dispatchToColony(taskId, antIds) {
         const colony = await import('../pi-ecosystem-colony/index.js');
-        colony.dispatchTask(taskId, antIds);
+        // 2026-06-11: dispatchTask 已退化为 stub
+        colony.dispatchTask();
     }
     async persist() {
         const colony = await import('../pi-ecosystem-colony/index.js');

package/dist/pi-ecosystem-judgment/adaptive-scan.js

@@ -0,0 +1,231 @@
+/**
+ * Adaptive Scan — 类 B 自迭代入口
+ *
+ * 扫描 ~/.bolloon/human-values/usage.jsonl + judgments.json,
+ * 生成"自适应建议" (只读, 不改库). 用户在 UI 接受/拒绝后
+ * 才会真正生效, 写入 evolution.jsonl 留作审计.
+ *
+ * 设计原则 (类 B 边界):
+ * - 不自动改库 (避免 AI 越权)
+ * - 所有建议可逆 (接受/拒绝都行, 接受后写 evolution.jsonl 留痕)
+ * - 失败静默 (主对话不阻塞)
+ * - 单次扫描纯本地 + 内存计算, 无 LLM 调用 (避免 LLM 幻觉污染)
+ *
+ * 触发时机:
+ * - 用户主动: UI "📊 自适应" tab 点 "重新扫描"
+ * - 被动: 每天首次进入判断力 modal 时自动跑一次 (缓存 24h)
+ */
+import * as fs from 'fs/promises';
+import * as os from 'os';
+import * as path from 'path';
+import { loadAllJudgments } from './human-value-store.js';
+// 用 getter 函数而非模块顶层 const: process.env.HOME 在测试 beforeAll 才设,
+// 模块顶层求值时还是真 home. 运行时求值才能正确响应测试 fixture.
+function getUsageLogPath() {
+    return (os.homedir() || process.env.HOME || '/tmp') + '/.bolloon/human-values/usage.jsonl';
+}
+function getEvolutionLogPath() {
+    return (os.homedir() || process.env.HOME || '/tmp') + '/.bolloon/human-values/evolution.jsonl';
+}
+const DAY_MS = 24 * 60 * 60 * 1000;
+async function readUsageLog() {
+    try {
+        const content = await fs.readFile(getUsageLogPath(), 'utf-8');
+        const lines = content.trim().split('\n').filter(Boolean);
+        return lines
+            .map((l) => {
+            try {
+                return JSON.parse(l);
+            }
+            catch {
+                return null;
+            }
+        })
+            .filter((e) => Boolean(e) && Array.isArray(e?.usedIds));
+    }
+    catch {
+        return [];
+    }
+}
+function countByJudgment(entries) {
+    const now = Date.now();
+    const cutoff7d = now - 7 * DAY_MS;
+    const cutoff30d = now - 30 * DAY_MS;
+    const map = new Map();
+    for (const e of entries) {
+        const ts = new Date(e.ts).getTime();
+        for (const id of e.usedIds) {
+            const cur = map.get(id) || { total: 0, last7d: 0, last30d: 0, lastUseTs: null };
+            cur.total++;
+            if (ts >= cutoff7d)
+                cur.last7d++;
+            if (ts >= cutoff30d)
+                cur.last30d++;
+            if (cur.lastUseTs === null || ts > cur.lastUseTs)
+                cur.lastUseTs = ts;
+            map.set(id, cur);
+        }
+    }
+    return map;
+}
+/**
+ * 主扫描函数: 纯本地计算, 无 LLM
+ */
+export async function runAdaptiveScan() {
+    const now = new Date();
+    const nowTs = now.getTime();
+    const [judgments, entries] = await Promise.all([
+        loadAllJudgments(),
+        readUsageLog(),
+    ]);
+    const usage = countByJudgment(entries);
+    const suggestions = [];
+    for (const j of judgments) {
+        if ((j.status ?? 'active') !== 'active')
+            continue;
+        const id = j.id;
+        const u = usage.get(id) || { total: 0, last7d: 0, last30d: 0, lastUseTs: null };
+        const daysSinceLastUse = u.lastUseTs === null
+            ? Math.floor((nowTs - new Date(j.timestamp).getTime()) / DAY_MS)
+            : Math.floor((nowTs - u.lastUseTs) / DAY_MS);
+        const metrics = {
+            usage7d: u.last7d,
+            usage30d: u.last30d,
+            daysSinceLastUse,
+            totalUsage: u.total,
+        };
+        // rising: 7 天频率 > 30 天均值的 1.5 倍, 且至少用过 2 次 (避免噪声)
+        if (u.last30d > 0 && u.last7d >= 2) {
+            const dailyAvg30 = u.last30d / 30;
+            const dailyRate7 = u.last7d / 7;
+            if (dailyRate7 > dailyAvg30 * 1.5) {
+                suggestions.push({
+                    key: `rising:${id}`,
+                    kind: 'rising',
+                    judgmentId: id,
+                    decision: j.decision,
+                    reason: `7 天使用率 (${dailyRate7.toFixed(2)}/d) 是 30 天均值的 ${(dailyRate7 / dailyAvg30).toFixed(1)} 倍`,
+                    action: 'boost',
+                    metrics,
+                    scannedAt: now.toISOString(),
+                });
+                continue; // 不再归入 unused/stale
+            }
+        }
+        // stale: 90 天未使用 + 总使用 < 3 (低频 + 长期不用)
+        if (u.total < 3 && daysSinceLastUse >= 90) {
+            suggestions.push({
+                key: `stale:${id}`,
+                kind: 'stale',
+                judgmentId: id,
+                decision: j.decision,
+                reason: `已 ${daysSinceLastUse} 天未使用, 总使用仅 ${u.total} 次`,
+                action: 'deprecate',
+                metrics,
+                scannedAt: now.toISOString(),
+            });
+            continue;
+        }
+        // unused: 30 天未使用 + 总使用 < 5 (中频但近期没在用)
+        if (u.total < 5 && daysSinceLastUse >= 30) {
+            suggestions.push({
+                key: `unused:${id}`,
+                kind: 'unused',
+                judgmentId: id,
+                decision: j.decision,
+                reason: `已 ${daysSinceLastUse} 天未使用, 总使用 ${u.total} 次 (可能不再相关)`,
+                action: 'review',
+                metrics,
+                scannedAt: now.toISOString(),
+            });
+        }
+    }
+    // 按 action 重要性排序: rising > stale > unused
+    const order = { rising: 0, stale: 1, unused: 2, causal_conflict: 3, low_causal_power: 4 };
+    // 阶段 2: causal_conflict — judgment 库内自动检测冲突对
+    const { runConflictDetection } = await import('./causal-judge.js');
+    const conflictResult = await runConflictDetection();
+    for (const a of judgments) {
+        if ((a.status ?? 'active') !== 'active')
+            continue;
+        if (!Array.isArray(a.conflictWith) || a.conflictWith.length === 0)
+            continue;
+        // 列出每对冲突 (limit 每个 judgment 最多 3 对, 避免 UI 刷屏)
+        const conflicts = a.conflictWith.slice(0, 3);
+        for (const otherId of conflicts) {
+            const other = judgments.find((j) => j.id === otherId);
+            if (!other)
+                continue;
+            const c = await import('./causal-judge.js');
+            const det = c.detectConflict(a, other);
+            suggestions.push({
+                key: `causal_conflict:${a.id}:${other.id}`,
+                kind: 'causal_conflict',
+                judgmentId: a.id,
+                decision: `${a.decision} ↔ ${other.decision}`,
+                reason: det.isConflict ? det.reason : '库内已标冲突, 需 LLM 复核',
+                action: 'review',
+                metrics: { usage7d: 0, usage30d: 0, daysSinceLastUse: 0, totalUsage: 0 },
+                scannedAt: now.toISOString(),
+            });
+        }
+    }
+    // 静默 conflictResult.detected 计数 (已通过 import 触发了)
+    void conflictResult;
+    // 阶段 2: low_causal_power — 留空 (依赖 do-calculus 跑过后的低边际贡献记录)
+    // 当前不主动跑 (cost 高), 仅在 UI 手动触发后, 类 B 下次扫描时捡起来
+    // 此处不实现, 留作下个迭代
+    suggestions.sort((a, b) => order[a.kind] - order[b.kind]);
+    return {
+        scannedAt: now.toISOString(),
+        judgmentsTotal: judgments.length,
+        usageEntriesScanned: entries.length,
+        suggestions,
+    };
+}
+export async function logEvolution(entry) {
+    try {
+        await fs.mkdir(path.dirname(getEvolutionLogPath()), { recursive: true });
+        await fs.appendFile(getEvolutionLogPath(), JSON.stringify(entry) + '\n', 'utf-8');
+    }
+    catch (err) {
+        console.warn('[adaptive-scan] logEvolution failed:', err);
+    }
+}
+export async function readEvolutionLog(limit = 50) {
+    try {
+        const content = await fs.readFile(getEvolutionLogPath(), 'utf-8');
+        const lines = content.trim().split('\n').filter(Boolean);
+        return lines
+            .slice(-limit)
+            .reverse()
+            .map((l) => {
+            try {
+                return JSON.parse(l);
+            }
+            catch {
+                return null;
+            }
+        })
+            .filter((e) => Boolean(e));
+    }
+    catch {
+        return [];
+    }
+}
+// ============================================================
+// 缓存: 避免每次打开 modal 都扫一次
+// ============================================================
+let lastScan = null;
+const CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 24h
+export async function getCachedScan(force = false) {
+    if (!force && lastScan && Date.now() - lastScan.at < CACHE_TTL_MS) {
+        return lastScan.result;
+    }
+    const result = await runAdaptiveScan();
+    lastScan = { at: Date.now(), result };
+    return result;
+}
+export function clearAdaptiveScanCache() {
+    lastScan = null;
+}