@bolloon/bolloon-agent 0.1.11 → 0.1.13

package/src/documents/store.ts

@@ -205,11 +205,11 @@ export class DocumentStore {
   async readDocument(docId: string): Promise<{ content: string; metadata: ReceivedDocument } | null> {
     const docDir = path.join(this.baseDir, docId);
     const manifestPath = path.join(docDir, 'manifest.json');
-    const filePath = path.join(docDir);
 
     try {
       const manifestData = await fs.readFile(manifestPath, 'utf-8');
       const manifest = JSON.parse(manifestData);
+      const filePath = path.join(docDir, manifest.fileName);
       const fileContent = await fs.readFile(filePath, 'utf-8');
 
       return {

package/src/llm/pi-ai.ts

@@ -143,13 +143,14 @@ export class PiAIModel {
       return this.config.baseUrl;
     }
 
+    // 允许通过 OPENAI_BASE_URL 等环境变量覆盖默认 base URL
     const baseUrls: Record<ModelProvider, string> = {
-      openai: 'https://api.openai.com/v1',
+      openai: process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1',
       anthropic: 'https://api.anthropic.com/v1',
       ollama: process.env.OLLAMA_BASE_URL || 'http://localhost:11434',
-      openrouter: 'https://openrouter.ai/api/v1',
+      openrouter: process.env.OPENROUTER_BASE_URL || 'https://openrouter.ai/api/v1',
       gemini: 'https://generativelanguage.googleapis.com/v1beta',
-      minimax: 'https://api.minimaxi.com/v1',
+      minimax: process.env.MINIMAX_BASE_URL || 'https://api.minimaxi.com/v1',
       local: 'http://localhost:11434'
     };
 
@@ -158,12 +159,12 @@ export class PiAIModel {
 
   private mapModel(): string {
     const modelMap: Record<ModelProvider, string> = {
-      openai: this.config.model || 'gpt-4',
+      openai: this.config.model || process.env.OPENAI_MODEL || 'gpt-4',
       anthropic: this.config.model || 'claude-3-5-sonnet-20241022',
       ollama: this.config.model || 'llama3.2',
       openrouter: this.config.model || 'anthropic/claude-3.5-sonnet',
       gemini: this.config.model || 'gemini-2.0-flash',
-      minimax: this.config.model || 'MiniMax-M2.7',
+      minimax: this.config.model || process.env.MINIMAX_MODEL || 'MiniMax-M2.7',
       local: this.config.model || 'llama3.2'
     };
     return modelMap[this.provider];

package/src/network/iroh-discovery.ts

@@ -89,9 +89,10 @@ export class IrohDiscoveryService {
   }
 
   private startDiscoveryLoop(): void {
+    const interval = this.config.discoveryIntervalMs ?? 30000;
     this.discoveryTimer = setInterval(async () => {
       await this.discoverPeers();
-    }, this.discoveryIntervalMs!);
+    }, interval);
 
     setTimeout(() => this.discoverPeers(), 2000);
   }

package/src/network/iroh-transport.ts

@@ -56,6 +56,7 @@ interface MessageStore {
   dequeueOfflineMessage(id: string): Promise<void>;
   incrementOfflineRetry(id: string): Promise<void>;
   getPendingOfflineCount(): Promise<number>;
+  getAllOfflineTargets(): Promise<string[]>;
   savePendingResponse(req: Omit<PendingResponse, 'id'>): Promise<PendingResponse>;
   getPendingResponse(requestId: string): Promise<PendingResponse | null>;
   removePendingResponse(requestId: string): Promise<void>;
@@ -172,6 +173,9 @@ export class IrohTransport {
         for (const queue of offlineQueues.values()) count += queue.length;
         return count;
       },
+      async getAllOfflineTargets() {
+        return Array.from(offlineQueues.keys());
+      },
       async savePendingResponse(req) {
         const id = crypto.randomUUID();
         const pending = { ...req, id };
@@ -196,9 +200,14 @@ export class IrohTransport {
     if (!this.messageStore) return;
 
     this.offlineDeliveryInterval = setInterval(async () => {
+      // 遍历所有有离线消息的目标节点（不仅是"已连接"的）
+      // 这样目标节点一旦在线（accept 连接）就能拿到离线消息
+      const allTargets = await this.messageStore!.getAllOfflineTargets();
       const connectedPeers = this.getConnectedPeers();
+      // 合并：已连接 + 有离线消息但未连接（也会去尝试 connect）
+      const targets = new Set<string>([...connectedPeers, ...allTargets]);
 
-      for (const peerId of connectedPeers) {
+      for (const peerId of targets) {
         const offlineMsgs = await this.messageStore!.getOfflineMessages(peerId);
 
         for (const msg of offlineMsgs) {
@@ -216,6 +225,8 @@ export class IrohTransport {
             if (success) {
               await this.messageStore!.dequeueOfflineMessage(msg.id);
               console.log(`[IrohTransport] Delivered offline message to ${peerId.substring(0, 12)}...`);
+            } else {
+              await this.messageStore!.incrementOfflineRetry(msg.id);
             }
           } catch {
             await this.messageStore!.incrementOfflineRetry(msg.id);
@@ -461,8 +472,10 @@ export class IrohTransport {
         await send.finish();
 
         // 等待响应，带超时
+        // 注意: server sendResponse 后会关闭连接，导致 readToEnd 以 "connection lost" 错误 reject
+        // 这里我们把 readToEnd 的错误吞掉（视为流结束），只有超时才视为失败
         const response = await Promise.race([
-          recv.readToEnd(64 * 1024),
+          recv.readToEnd(64 * 1024).catch(() => new Uint8Array(0)),
           new Promise<null>((_, rejectTimeout) =>
             setTimeout(() => rejectTimeout(new Error('timeout')), timeout)
           ),

package/src/network/p2p.ts

@@ -546,8 +546,8 @@ export class P2PNetwork {
         const colonIdx = messageStr.indexOf(':');
         const didMarker = 'DID:';
         let did: string | undefined;
-        let type: string;
-        let payload: string;
+        let type = 'message';
+        let payload = '';
         let requestId: string | undefined = undefined;
 
         if (messageStr.startsWith(didMarker)) {
@@ -770,7 +770,11 @@ export class P2PNetwork {
    * Register a handler for responses (used by the receiving side)
    */
   onResponse(type: string, handler: (payload: string, from: string, did?: string, requestId?: string) => void): void {
-    this.messageHandlers.set(type, handler);
+    // Store as pendingResponseHandlers-shaped wrapper. Extra args (did, requestId) are not
+    // available in pendingResponseHandlers signature, so ignore them when invoked.
+    this.pendingResponseHandlers.set(type, (responseData: string, from: string) => {
+      handler(responseData, from, undefined, undefined);
+    });
   }
 
   /**
@@ -797,11 +801,8 @@ export class P2PNetwork {
   private handleRequest(type: string, payload: string, requestId: string, fromPeerId: string, did?: string): void {
     const handler = this.messageHandlers.get(type);
     if (handler) {
-      // Create a wrapper that sends the response
-      const originalHandler = handler;
-      handler = (msg: Uint8Array, from: string, didParam?: string) => {
-        originalHandler(msg, from, didParam);
-      };
+      // Forward raw payload; callers register with onMessage() and adapt as needed.
+      handler(new TextEncoder().encode(payload), fromPeerId, did);
     }
 
     // Check if there's a response handler registered

package/src/network/storage/adapters/json-adapter.ts

@@ -16,7 +16,7 @@ import type {
   MessageQueryOptions,
   StorageConfig,
   MessageStatus,
-} from './types.js';
+} from '../types';
 
 const DEFAULT_CONFIG: Required<StorageConfig> = {
   baseDir: '',
@@ -69,7 +69,7 @@ export class JsonMessageStore implements MessageStore {
     const filePath = this.getMessageFilePath(new Date(msg.timestamp));
 
     await this.withLock(filePath, async () => {
-      const messages = await this.readJsonFile<StoredMessage[]>(filePath) || [];
+      let messages = await this.readJsonFile<StoredMessage[]>(filePath) || [];
       messages.push(stored);
 
       // 如果文件过大，拆分
@@ -238,6 +238,21 @@ export class JsonMessageStore implements MessageStore {
     return count;
   }
 
+  async getAllOfflineTargets(): Promise<string[]> {
+    // 重新从磁盘加载最新状态（避免内存 vs 磁盘不一致）
+    const baseDir = path.join(this.config.baseDir, 'offline');
+    let files: string[] = [];
+    try {
+      files = await fs.readdir(baseDir);
+    } catch {
+      return Array.from(this.offlineMessages.keys());
+    }
+    return files
+      .filter((f) => f.endsWith('.json'))
+      .map((f) => f.replace(/\.json$/, ''))
+      .filter((id) => id.length > 0);
+  }
+
   // ============================================================================
   // 待响应请求
   // ============================================================================

package/src/network/storage/index.ts

@@ -3,7 +3,7 @@
  * 导出消息存储工厂函数和类型
  */
 
-export type {
+import type {
   MessageStore,
   StoredMessage,
   OfflineMessage,
@@ -18,11 +18,27 @@ export type {
   IrohMessage,
   IrohMessageHandler,
 } from './types.js';
+import { DEFAULT_STORAGE_CONFIG } from './types.js';
+
+export type {
+  MessageStore,
+  StoredMessage,
+  OfflineMessage,
+  PendingResponse,
+  LocalPendingRequest,
+  MessageQueryOptions,
+  StorageConfig,
+  MessageDirection,
+  MessageStatus,
+  TransportType,
+  IrohPeer,
+  IrohMessage,
+  IrohMessageHandler,
+};
 
-export { DEFAULT_STORAGE_CONFIG } from './types.js';
+export { DEFAULT_STORAGE_CONFIG };
 
 import { JsonMessageStore } from './adapters/json-adapter.js';
-import type { MessageStore, StorageConfig } from './types.js';
 import * as path from 'path';
 
 // 默认存储配置

package/src/social/channels/channel-heartbeat-agent.ts

@@ -388,7 +388,7 @@ export class ChannelHeartbeatAgent {
         senderName: peer.name
       };
 
-      const decision = this.judgmentEngine.decide(context);
+      const decision = await this.judgmentEngine.decide(context);
 
       if (decision.shouldCall) {
         console.log(`[HeartbeatAgent] Auto-triggering Harness: Gate ${decision.gate} for ${peer.name}`);

package/src/utils/auto-update.ts

@@ -86,14 +86,20 @@ function getGlobalBolloonDir(): string | null {
  * 优先使用全局安装的版本（更准确反映实际运行的版本）
  */
 function getInstalledVersion(packageName: string): string | null {
+  // 调试：打印 cwd
+  console.error(`[DEBUG] getInstalledVersion called, cwd=${process.cwd()}, package=${packageName}`);
+
   // 对于 @bolloon/bolloon-agent，始终优先从全局安装位置读取版本
   // 这样可以准确检测实际安装的版本，而不受 cwd 影响
   if (packageName === '@bolloon/bolloon-agent') {
     const globalDir = getGlobalBolloonDir();
+    console.error(`[DEBUG] globalDir=${globalDir}`);
     if (globalDir) {
       const pkgPath = path.join(globalDir, 'package.json');
+      console.error(`[DEBUG] pkgPath=${pkgPath}, exists=${fs.existsSync(pkgPath)}`);
       try {
         const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+        console.error(`[DEBUG] pkg.version=${pkg.version}`);
         return pkg.version || null;
       } catch (e) {
         // 忽略
@@ -102,9 +108,11 @@ function getInstalledVersion(packageName: string): string | null {
 
     // 回退到本地 package.json
     const localPkgPath = path.join(process.cwd(), 'package.json');
+    console.error(`[DEBUG] localPkgPath=${localPkgPath}, exists=${fs.existsSync(localPkgPath)}`);
     if (fs.existsSync(localPkgPath)) {
       try {
         const pkg = JSON.parse(fs.readFileSync(localPkgPath, 'utf-8'));
+        console.error(`[DEBUG] local pkg.version=${pkg.version}`);
         return pkg.version || null;
       } catch (e) {
         // 忽略
@@ -114,9 +122,11 @@ function getInstalledVersion(packageName: string): string | null {
 
   // 检查本地 node_modules
   const packageJsonPath = findPackageJson(packageName);
+  console.error(`[DEBUG] findPackageJson=${packageJsonPath}`);
   if (packageJsonPath) {
     try {
       const pkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+      console.error(`[DEBUG] node_modules pkg.version=${pkg.version}`);
       return pkg.version || null;
     } catch (e) {
       // 忽略错误
@@ -188,10 +198,16 @@ async function checkBolloonUpdates(): Promise<PackageInfo | null> {
 
   for (const pkg of packagesToCheck) {
     const installed = getInstalledVersion(pkg);
+    console.error(`[DEBUG] getInstalledVersion(${pkg}) = ${installed}`);
     if (!installed) continue;
 
-    currentVersion = installed;
+    // 只记录 @bolloon/bolloon-agent 的版本作为当前版本
+    if (pkg === '@bolloon/bolloon-agent') {
+      currentVersion = installed;
+    }
+
     const latest = await getLatestVersion(pkg);
+    console.error(`[DEBUG] getLatestVersion(${pkg}) = ${latest}`);
 
     if (latest && compareVersions(installed, latest) < 0) {
       hasUpdate = true;

package/src/web/server.ts

@@ -1263,6 +1263,79 @@ app.get('/channels', async (_req, res) => {
     }
   });
 
+  // 统一 AI 解析入口：CLI / 接收方节点 调这里完成 LLM + judgment + harness
+  // 入参: { text, mimeType, fileName, fromNodeId, source }
+  // 出参: { summary, qualityScore, judgmentId?, gateArtifact? }
+  app.post('/api/ai-parse', async (req, res) => {
+    try {
+      const { text, mimeType, fileName, fromNodeId, source } = req.body || {};
+      if (!text || !fileName) {
+        return res.status(400).json({ error: 'text and fileName required' });
+      }
+
+      const truncated = text.length > 6000 ? text.substring(0, 6000) + '...[截断]' : text;
+      const prompt = `请分析以下 ${mimeType || 'text'} 文档，并给出 (1) 一句话中文摘要 (2) 三个关键要点 (3) 质量评分(0-1)。\n\n文件名: ${fileName}\n\n内容:\n${truncated}`;
+
+      // 1. LLM 解析
+      const llm = getMinimax();
+      const t0 = Date.now();
+      const llmResult = await llm.summarize(prompt);
+      const dt = Date.now() - t0;
+
+      const out: any = {
+        ok: true,
+        summary: llmResult.summary,
+        qualityScore: llmResult.qualityScore,
+        latencyMs: dt,
+        mimeType: mimeType || 'text/plain',
+        fileName,
+      };
+
+      // 2. 蒸馏为 judgment (异步,失败不影响主返回)
+      try {
+        const judgmentMod = await import('../pi-ecosystem-judgment/index.js');
+        await judgmentMod.initializeJudgmentStore();
+        const j = await judgmentMod.createJudgment({
+          type: 'trajectory',
+          content: `AI 解析 ${fileName}: ${llmResult.summary.slice(0, 200)}`,
+          source: 'agent',
+          confidence: Math.min(1, llmResult.qualityScore),
+          context: `ai-parse:${mimeType || 'text'}:${source || 'p2p'}`,
+          evidence: {
+            trajectory: [{
+              timestamp: new Date().toISOString(),
+              action: `parse:${fileName}`,
+              outcome: `score=${llmResult.qualityScore.toFixed(2)}`,
+              approved: true,
+            }],
+          },
+        });
+        out.judgmentId = j.id;
+      } catch (e) {
+        out.judgmentError = (e as Error).message;
+      }
+
+      // 3. 在 harness 落产物 (异步,失败不影响)
+      try {
+        const harnessMod = await import('../bollharness-integration/index.js');
+        const gate = new harnessMod.GateStateMachine();
+        gate.submitArtifact(`ai-parse:${fileName}`, {
+          summary: llmResult.summary,
+          score: llmResult.qualityScore,
+          fromNodeId: fromNodeId || null,
+          parsedAt: Date.now(),
+        });
+        out.gateArtifact = `ai-parse:${fileName}`;
+      } catch (e) {
+        out.gateError = (e as Error).message;
+      }
+
+      res.json(out);
+    } catch (err: any) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   // ==================== P2P Network API ====================
 
   // 获取当前身份
@@ -1734,6 +1807,61 @@ app.get('/channels', async (_req, res) => {
     }
   });
 
+  // Chat inbox: 列出所有 peer 的 inbox + outbox
+  app.get('/api/chat/inbox', async (_req, res) => {
+    try {
+      const { getInbox } = await import('../agents/p2p-chat-tools.js');
+      const entries = await getInbox();
+      // 按 status 分组, 时间倒序
+      const grouped = {
+        received: entries.filter((e: any) => e.status === 'received'),
+        drafted:  entries.filter((e: any) => e.status === 'drafted'),
+        sent:     entries.filter((e: any) => e.status === 'sent'),
+        dismissed: entries.filter((e: any) => e.status === 'dismissed'),
+      };
+      res.json({ total: entries.length, grouped, all: entries });
+    } catch (err: any) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  // 触发 processPendingInbox (手动 wake-up)
+  app.post('/api/chat/process-pending', async (_req, res) => {
+    try {
+      const { processPendingInbox } = await import('../agents/p2p-chat-tools.js');
+      const r = await processPendingInbox();
+      res.json({ ok: true, ...r });
+    } catch (err: any) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  // 主人审阅: 批准 draft
+  app.post('/api/chat/approve', async (req, res) => {
+    try {
+      const { messageId, peerDID, finalText } = req.body || {};
+      if (!messageId || !peerDID) return res.status(400).json({ error: 'messageId and peerDID required' });
+      const { approveAndSend } = await import('../agents/p2p-chat-tools.js');
+      const ok = await approveAndSend(messageId, peerDID, finalText);
+      res.json({ ok, messageId });
+    } catch (err: any) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  // 主人审阅: 丢弃 draft
+  app.post('/api/chat/dismiss', async (req, res) => {
+    try {
+      const { messageId, peerDID } = req.body || {};
+      if (!messageId || !peerDID) return res.status(400).json({ error: 'messageId and peerDID required' });
+      const { dismissDraft } = await import('../agents/p2p-chat-tools.js');
+      const ok = await dismissDraft(messageId, peerDID);
+      res.json({ ok, messageId });
+    } catch (err: any) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   // 标记消息已读
   app.post('/api/peer-messages/:messageId/read', async (req, res) => {
     try {
@@ -2095,6 +2223,8 @@ app.get('/channels', async (_req, res) => {
     server.listen(port, () => {
       console.log(`Web 服务器启动完成: http://localhost:${port}`);
       console.log('服务器已监听');
+      // 安装 chat bus -> SSE 桥 (供前端 inbox UI 实时刷新)
+      void installChatBusHook();
       setInterval(() => {
         for (const client of sseClients) {
           client.res.write(': ping\n\n');
@@ -2120,6 +2250,25 @@ function broadcast(data: { type: string; [key: string]: unknown }, channelId?: s
   }
 }
 
+// ============================================================================
+// Chat 事件总线 -> SSE 桥 (供前端 inbox UI 用)
+// ============================================================================
+let chatBusHookInstalled = false;
+async function installChatBusHook(): Promise<void> {
+  if (chatBusHookInstalled) return;
+  chatBusHookInstalled = true;
+  try {
+    const { chatEventBus } = await import('../agents/p2p-chat-tools.js');
+    chatEventBus.on('chat', (ev: any) => {
+      // 推送给所有 SSE 客户端 (channelId 留空 = 广播)
+      broadcast({ type: 'chat_event', chatKind: ev.kind, payload: ev }, undefined);
+    });
+    console.log('[chat-bus] SSE bridge installed');
+  } catch (e) {
+    console.warn('[chat-bus] install failed:', (e as Error).message);
+  }
+}
+
 function getUserName(): string {
   const home = process.env.HOME || process.env.USERPROFILE || '';
   const match = home.match(/\/Users\/(\w+)/);

package/tsconfig.electron.json

@@ -7,7 +7,7 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "skipLibCheck": true,
-    "ignoreDeprecations": "6.0",
+    "ignoreDeprecations": "5.0",
     "outDir": "dist",
     "rootDir": "src",
     "declaration": false,

package/tsconfig.json

@@ -14,5 +14,5 @@
     "jsxImportSource": "react"
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "src/bollharness/node_modules"]
+  "exclude": ["node_modules", "src/bollharness/node_modules", "src/test", "src/**/__tests__", "src/constraint-runtime"]
 }