@bolloon/bolloon-agent 0.3.27 → 0.3.28

package/dist/pi-ecosystem-mcp/index.js

@@ -4,15 +4,16 @@
  * Bridges MCP (Model Context Protocol) servers with Bolloon's tool system.
  * Based on the pi-mcp-adapter philosophy: on-demand tool loading with minimal token overhead.
  *
- * Key differences from Claude Code MCP:
- * - White-box design: every schema, parameter, and return value is visible
- * - Minimal primitives: only read, write, edit, bash under the hood
- * - No schema validation black boxes - interfaces are simple by design
+ * 2026-08-03 (验证修复): sendMcpRequest 从 simulated 占位 → 真实 stdio JSON-RPC 通信.
+ *   - 协议: initialize → notifications/initialized → tools/list → tools/call
+ *   - 请求/响应按 id 配对, 30s 超时, server 崩溃时 pending 全部 reject
+ *   - discoverMcpServers 修复重复读 mcpServers 键 (同一个键被读两遍)
  */
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import { spawn } from 'child_process';
 import { EventEmitter } from 'events';
+import * as readline from 'readline';
 // MCP adapter state
 let tools = new Map();
 let servers = new Map();
@@ -22,6 +23,8 @@ let toolCallLog = [];
 class McpEventEmitter extends EventEmitter {
 }
 const mcpEvents = new McpEventEmitter();
+const MCP_REQUEST_TIMEOUT_MS = 30_000;
+let mcpRequestSeq = 1;
 /**
  * Discover MCP servers from standard config locations
  */
@@ -37,24 +40,17 @@ export async function discoverMcpServers() {
         try {
             const content = await fs.readFile(loc, 'utf-8');
             const mcpJson = JSON.parse(content);
-            if (mcpJson.mcpServers) {
-                for (const [name, config] of Object.entries(mcpJson.mcpServers)) {
+            // 2026-08-03 fix: mcpServers 只读一次 (之前 if + if['mcpServers'] 重复读同一键)
+            const serversConfig = (mcpJson.mcpServers ?? mcpJson['mcpServers']);
+            if (serversConfig && typeof serversConfig === 'object') {
+                for (const [name, config] of Object.entries(serversConfig)) {
                     const serverConfig = config;
+                    if (!serverConfig || typeof serverConfig.command !== 'string')
+                        continue;
                     configs.push({
                         name,
                         command: serverConfig.command,
-                        args: serverConfig.args,
-                        env: serverConfig.env,
-                    });
-                }
-            }
-            if (mcpJson['mcpServers']) {
-                for (const [name, config] of Object.entries(mcpJson['mcpServers'])) {
-                    const serverConfig = config;
-                    configs.push({
-                        name,
-                        command: serverConfig.command,
-                        args: serverConfig.args,
+                        args: Array.isArray(serverConfig.args) ? serverConfig.args : undefined,
                         env: serverConfig.env,
                     });
                 }
@@ -64,7 +60,15 @@ export async function discoverMcpServers() {
             // File doesn't exist, skip
         }
     }
-    return configs;
+    // 去重 (同 name 同 command)
+    const seen = new Set();
+    return configs.filter((c) => {
+        const key = `${c.name}::${c.command}`;
+        if (seen.has(key))
+            return false;
+        seen.add(key);
+        return true;
+    });
 }
 /**
  * Initialize the MCP adapter
@@ -76,15 +80,60 @@ export async function initializeMcpAdapter() {
     console.log(`[McpAdapter] Discovered ${discoveredServers.length} MCP servers`);
     for (const server of discoveredServers) {
         registerServer(server);
+        // 2026-08-03: 启动后立即握手 + 发现工具 (真实 stdio 协议)
+        await connectAndDiscover(server.name).catch((e) => {
+            console.warn(`[McpAdapter] connect ${server.name} 失败:`, e?.message?.slice(0, 120));
+        });
     }
     initialized = true;
     mcpEvents.emit('initialized');
 }
+/**
+ * 连接 MCP server + 握手 + 发现并注册工具 (2026-08-03)
+ * 协议序: startServer → initialize → notifications/initialized → tools/list
+ */
+export async function connectAndDiscover(serverName) {
+    const server = servers.get(serverName);
+    if (!server)
+        return [];
+    if (!server.running || !server.process) {
+        const started = await startServer(serverName);
+        if (!started)
+            return [];
+        // 等 server 就绪
+        await new Promise((r) => setTimeout(r, 400));
+    }
+    await sendMcpRequest(serverName, 'initialize', {
+        protocolVersion: '2024-11-05',
+        capabilities: {},
+        clientInfo: { name: 'bolloon', version: '0.3.27' },
+    });
+    await sendMcpRequest(serverName, 'notifications/initialized');
+    const result = await sendMcpRequest(serverName, 'tools/list');
+    const toolsList = Array.isArray(result?.tools) ? result.tools : [];
+    const discovered = [];
+    for (const t of toolsList) {
+        const tool = {
+            name: String(t.name || ''),
+            description: String(t.description || ''),
+            inputSchema: t.inputSchema || {},
+            serverName,
+        };
+        if (!tool.name)
+            continue;
+        discovered.push(tool);
+        registerTool(tool);
+    }
+    console.log(`[McpAdapter] ${serverName}: 发现 ${discovered.length} 个工具 (${discovered.map((t) => t.name).join(', ')})`);
+    return discovered;
+}
 /**
  * Register an MCP server configuration
  */
 export function registerServer(config) {
-    servers.set(config.name, { config, process: null, running: false });
+    if (servers.has(config.name))
+        return;
+    servers.set(config.name, { config, process: null, running: false, pending: new Map() });
     console.log(`[McpAdapter] Registered server: ${config.name}`);
 }
 /**
@@ -156,10 +205,12 @@ export async function executeTool(name, args) {
             toolCallLog = toolCallLog.slice(-50);
         }
         if (result && typeof result === 'object' && 'content' in result) {
-            return {
-                success: true,
-                content: result.content,
-            };
+            // 2026-08-03: 提取 content 数组里的文本 (agent 直接可用)
+            const content = result.content;
+            const text = Array.isArray(content)
+                ? content.map((c) => c?.text ?? '').filter(Boolean).join('\n')
+                : JSON.stringify(result);
+            return { success: true, content: [{ type: 'text', text }] };
         }
         return { success: true, content: [{ type: 'text', text: JSON.stringify(result) }] };
     }
@@ -170,25 +221,78 @@ export async function executeTool(name, args) {
     }
 }
 /**
- * Send MCP request to a server (simplified - uses stdin/stdout JSON-RPC)
+ * Send MCP request to a server via real stdio JSON-RPC (2026-08-03).
+ * - 写 JSON-RPC 行到 server stdin, 从 stdout 按 id 配对响应
+ * - 30s 超时; server 进程退出时挂起请求全部 reject
  */
 async function sendMcpRequest(serverName, method, params) {
     const server = servers.get(serverName);
     if (!server) {
         throw new Error(`Server not registered: ${serverName}`);
     }
-    // For now, return a placeholder - real implementation would use MCP protocol
-    // The actual protocol typically uses stdio or HTTP+streamableHTTP
-    console.log(`[McpAdapter] Would send ${method} to ${serverName}:`, params);
-    // Simulate successful response for development
-    return {
-        content: [
-            {
-                type: 'text',
-                text: `[Simulated] Tool ${method} executed with params: ${JSON.stringify(params)}`,
-            },
-        ],
-    };
+    // 确保 server 进程在跑
+    if (!server.running || !server.process || !server.process.stdin?.writable) {
+        const started = await startServer(serverName);
+        if (!started)
+            throw new Error(`无法启动 MCP server: ${serverName}`);
+        // 等 500ms 让 server 就绪
+        await new Promise((r) => setTimeout(r, 500));
+    }
+    const child = server.process;
+    if (!child.stdin?.writable)
+        throw new Error(`MCP server stdin 不可写: ${serverName}`);
+    const id = mcpRequestSeq++;
+    const isNotification = method.startsWith('notifications/');
+    // 通知 (notifications/*) 是 fire-and-forget: 无 id, server 不响应
+    const line = JSON.stringify(isNotification
+        ? { jsonrpc: '2.0', method, params: params ?? {} }
+        : { jsonrpc: '2.0', id, method, params: params ?? {} });
+    if (isNotification) {
+        child.stdin.write(line + '\n');
+        return undefined;
+    }
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => {
+            server.pending.delete(id);
+            reject(new Error(`MCP request timeout (${MCP_REQUEST_TIMEOUT_MS}ms): ${method}`));
+        }, MCP_REQUEST_TIMEOUT_MS);
+        server.pending.set(id, { resolve, reject, timer });
+        child.stdin.write(line + '\n');
+    });
+}
+/** 挂上 stdout 行读取器 (按 id 分发响应) */
+function attachStdoutReader(serverName, child) {
+    const server = servers.get(serverName);
+    if (!server)
+        return;
+    const rl = readline.createInterface({ input: child.stdout });
+    rl.on('line', (line) => {
+        const trimmed = line.trim();
+        if (!trimmed)
+            return;
+        let msg;
+        try {
+            msg = JSON.parse(trimmed);
+        }
+        catch {
+            console.log(`[McpAdapter][${serverName}] non-JSON stdout:`, trimmed.slice(0, 200));
+            return;
+        }
+        // 服务端主动推送 (无 id) → 忽略
+        if (msg.id === undefined || msg.id === null)
+            return;
+        const entry = server.pending.get(msg.id);
+        if (!entry)
+            return;
+        clearTimeout(entry.timer);
+        server.pending.delete(msg.id);
+        if (msg.error) {
+            entry.reject(new Error(`MCP error ${msg.error.code}: ${msg.error.message}`));
+        }
+        else {
+            entry.resolve(msg.result);
+        }
+    });
 }
 /**
  * Start an MCP server process
@@ -215,16 +319,20 @@ export async function startServer(serverName) {
         });
         child.on('error', (err) => {
             console.error(`[McpAdapter][${serverName}] error:`, err);
+            rejectAllPending(server, `MCP server process error: ${err.message}`);
             server.running = false;
             server.process = null;
         });
         child.on('exit', (code) => {
             console.log(`[McpAdapter][${serverName}] exited with code:`, code);
+            rejectAllPending(server, `MCP server exited with code ${code}`);
             server.running = false;
             server.process = null;
         });
         server.process = child;
         server.running = true;
+        // 2026-08-03: 挂 stdout 行读取器, 按 id 分发 JSON-RPC 响应
+        attachStdoutReader(serverName, child);
         console.log(`[McpAdapter] Started server: ${serverName}`);
         return true;
     }
@@ -233,6 +341,14 @@ export async function startServer(serverName) {
         return false;
     }
 }
+/** server 退出时把挂起请求全部 reject, 避免调用方永远等待 */
+function rejectAllPending(server, reason) {
+    for (const [, entry] of server.pending) {
+        clearTimeout(entry.timer);
+        entry.reject(new Error(reason));
+    }
+    server.pending.clear();
+}
 /**
  * Stop an MCP server
  */

package/dist/security/tool-gate.js

@@ -46,6 +46,14 @@ const TOOL_WHITELIST = new Set([
     'create_skill', 'update_skill', 'list_skill_candidates', 'promote_skill',
     // 2026-08-02: plan/todo/review 工具 (plan-store.ts)
     'create_plan', 'update_plan', 'review_plan', 'list_plans',
+    // 2026-08-03: 决策协议工具 (decision-store.ts, Context OS §7 九要素)
+    'create_decision', 'decide_decision', 'rollback_decision', 'list_decisions',
+    // 2026-08-03: Context OS 资产层工具 (context-os.ts, 12+3 层文件夹体系)
+    'list_context_layers', 'write_context_asset', 'read_context_assets',
+    // 2026-08-03: MCP 工具 (pi-ecosystem-mcp, 真实 stdio JSON-RPC)
+    'mcp_list_tools', 'mcp_tool',
+    // 2026-08-03: DID 发布到 IPFS+IPNS (自动安装 Kubo)
+    'publish_did',
     // 2026-08-02: 远端 channel 工具 (本地智能体 @ 远程交流)
     'list_remote_channels', 'send_to_remote_channel',
 ]);

package/dist/web/server.js

@@ -1614,6 +1614,47 @@ export async function createWebServer(port = 3000, options = {}) {
     catch (err) {
         console.warn('[createWebServer] bootstrap 失败 (非致命):', err);
     }
+    // 2026-08-03 (Context OS P5): 初始化资产层 12+3 目录 (幂等, 每层 README 声明职责边界)
+    try {
+        const { ensureContextOsDirs } = await import('../bootstrap/context-os.js');
+        await ensureContextOsDirs();
+        console.log('[createWebServer] Context OS 资产层就绪 (~/.bolloon/context-os/, 12+3 层)');
+    }
+    catch (err) {
+        console.warn('[createWebServer] Context OS 资产层初始化失败 (非致命):', err);
+    }
+    // 2026-08-03: 后台自动安装/启动本地 Kubo (IPFS+IPNS 发布用, 全自动零手动).
+    //   fire-and-forget, 不阻塞 server 启动; 首次下载 ~100MB 需 1-2 分钟.
+    //   装好后 publish_did / DID 发布自动走 IPFS+IPNS; 没装好则降级本地模式.
+    (async () => {
+        try {
+            const sdk = await import('@diap/sdk');
+            const checkKuboSetup = sdk.checkKuboSetup;
+            if (typeof checkKuboSetup !== 'function')
+                return;
+            const setup = await checkKuboSetup(true, true);
+            if (setup?.ready && setup?.daemonRunning) {
+                console.log('[ipfs] 本地 Kubo 就绪 (自动安装/启动) → DID 发布支持 IPFS+IPNS');
+            }
+            else {
+                console.log('[ipfs] Kubo 不可用, DID 发布降级本地模式 (可用 publish_did 工具重试)');
+            }
+        }
+        catch (e) {
+            console.warn('[ipfs] Kubo 自动安装失败 (非致命):', e?.message?.slice(0, 120));
+        }
+    })();
+    // 2026-08-03: 初始化 MCP 适配器 (读 ~/.mcp.json, 自动握手发现工具).
+    //   后台异步: 不阻塞启动, 失败静默 (agent 调 mcp_list_tools 时再触发).
+    (async () => {
+        try {
+            const { initializeMcpAdapter } = await import('../pi-ecosystem-mcp/index.js');
+            await initializeMcpAdapter();
+        }
+        catch (e) {
+            console.warn('[mcp] 初始化失败 (非致命):', e?.message?.slice(0, 120));
+        }
+    })();
     // 重置旧的 agent session，确保使用新的 LLM 配置
     const { resetAgentSession } = await import('../agents/pi-sdk.js');
     resetAgentSession();
@@ -3303,7 +3344,7 @@ ${goalDesc}
                     }
                     if (summariesToRead.length > 0) {
                         const memBlock = summariesToRead.map(s => s.trim().slice(-1500)).join('\n\n---\n\n');
-                        contextHint += `[系统上下文] 本 channel 的历史记忆 (来自 memory-compressor 摘要, 帮助你延续之前的对话, 引用而非复述):\n${memBlock.slice(-2500)}\n\n`;
+                        contextHint += `[系统上下文] 动态状态层 · chat-worksite (上次做到哪 — 本 channel 历史记忆, 来自 memory-compressor 摘要, 引用而非复述):\n${memBlock.slice(-2500)}\n\n`;
                     }
                 }
             }
@@ -3318,12 +3359,25 @@ ${goalDesc}
                 const plans = await listActivePlans();
                 if (plans.length > 0) {
                     const plansBlock = plans.slice(0, 3).map(p => planToContext(p)).join('\n\n');
-                    contextHint += `[系统上下文] 进行中的计划 (来自 plan-store, 执行中每完成一步调 update_plan 勾选):\n${plansBlock}\n\n`;
+                    contextHint += `[系统上下文] 动态状态层 · focus (此刻优先级与时间边界 — 进行中的计划, 来自 plan-store, 执行中每完成一步调 update_plan 勾选):\n${plansBlock}\n\n`;
                 }
             }
             catch (planErr) {
                 // 静默失败
             }
+            // 2026-08-03 (Context OS P5): 资产层目录注入 — LLM 知道有 12+3 层资产,
+            //   需要细节时用 read_context_assets 按层路由读取, 不全仓扫描 (Context OS §4).
+            try {
+                const { readContextAssets, formatLayerListing } = await import('../bootstrap/context-os.js');
+                const listings = await readContextAssets();
+                const total = listings.reduce((s, l) => s + l.fileCount, 0);
+                if (total > 0) {
+                    contextHint += `[系统上下文] 资产层 (Context OS 12+3 层, ${total} 篇资产 — 任务需要细节时用 read_context_assets 按层读取, 不要假装知道没读过的内容):\n${formatLayerListing(listings)}`;
+                }
+            }
+            catch (ctxErr) {
+                // 静默失败
+            }
             const linkedIds = channelForJudgment?.linkedDocumentIds;
             if (Array.isArray(linkedIds) && linkedIds.length > 0) {
                 try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.3.27",
+  "version": "0.3.28",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli-entry.js",