@bolloon/bolloon-agent 0.1.40 → 0.1.42

package/dist/web/server.js

@@ -769,6 +769,50 @@ async function handleV3P2PMessage(parsed, conn, comm) {
         }
         return;
     }
+    // v3 新增: --collab CLI 派任务过来, 对方 web 收到后跑 LLM 干活, 回结果
+    if (op === 'agent.collab.run') {
+        const { requestId, task, fromPublicKey, fromRole, timeoutMs } = parsed.payload || {};
+        if (!requestId || !task) {
+            console.warn(`[v3-collab] agent.collab.run 缺少 requestId/task`);
+            return;
+        }
+        const senderKey = fromPublicKey || peerKey;
+        console.log(`[v3-collab] 收到 ${senderKey.substring(0, 12)}... (${fromRole}) 的协作任务: "${task.substring(0, 60)}..."`);
+        const startTs = Date.now();
+        try {
+            // 调 LLM: 走 getAgentForChannel 拿 agent, 用 prompt() 拿 string 结果
+            const visitorHint = `[系统上下文] 协作任务来源: 远端 peer (P2P, publicKey=${senderKey.substring(0, 12)}..., role=${fromRole || 'unknown'}). 这是通过 P2P 派过来的协作任务, 回答后会自动回到对方那里. 简洁完成, 不需要反问.\n\n`;
+            const fullPrompt = `【本轮协作任务】\n${task}\n【任务结束】\n\n${visitorHint}`;
+            // 临时用 channelId = "__collab__" 拿个一次性 agent
+            const collabChannelId = `__collab_${senderKey.substring(0, 8)}__`;
+            const agent = await getAgentForChannel(collabChannelId, '', `collab-${senderKey.substring(0, 8)}`, undefined);
+            const resultText = await agent.prompt(fullPrompt);
+            const reply = JSON.stringify({
+                v: 3,
+                op: 'agent.collab.reply',
+                payload: {
+                    requestId,
+                    fromPublicKey: v3P2PRef?.getPublicKey() || '',
+                    result: resultText || '(empty)',
+                    durationMs: Date.now() - startTs,
+                },
+            });
+            await comm.sendToConnection(conn.id, reply);
+            console.log(`[v3-collab] 已回 reply (${Date.now() - startTs}ms, ${(resultText || '').length} chars)`);
+        }
+        catch (e) {
+            console.error(`[v3-collab] 处理失败:`, e.message);
+            try {
+                const errReply = JSON.stringify({
+                    v: 3, op: 'agent.collab.reply',
+                    payload: { requestId, fromPublicKey: v3P2PRef?.getPublicKey() || '', error: e.message, result: '' }
+                });
+                await comm.sendToConnection(conn.id, errReply);
+            }
+            catch { }
+        }
+        return;
+    }
     // v3 新增: 收到远端发来的 @-mention 跨渠道消息, 存到本地 target channel
     if (op === 'agent.cross.post') {
         const { targetChannelId, targetChannelName, originChannelId, originChannelName, text, fromPublicKey } = parsed.payload || {};
@@ -936,7 +980,14 @@ async function getAgentForChannel(channelId, channelDid, channelName, channelDid
     const session = await createAgentSession({
         cwd: process.cwd(),
         peerId: `channel-${channelId}:${currentSessionId}`,
-        identityDoc
+        identityDoc,
+        // M2.3 (2026-06-17): 构造时从 session JSON 回灌历史 — 服务重启后 LLM 仍记得前面对话
+        //   key 跟 server.ts:240 写入路径保持一致: ~/.bolloon/sessions/cache/<key>.json
+        loadSessionKey: sessionKey,
+        // M3.1 (2026-06-17): 默认启用 WorkflowPivotLoop — web 路径以前死代码, 现在用
+        //   pivot loop 自带 quality scoring + task complexity analysis + 30 iters cap
+        //   (老 ReAct 10000 iter cap 容易跑飞)
+        usePivotLoop: true,
     }, true); // forceNew: true 强制创建新实例
     channelSessions.set(sessionKey, session);
     if (channelDid) {
@@ -1334,20 +1385,31 @@ export async function createWebServer(port = 3000, options = {}) {
     app.get('/', (req, res) => {
         res.sendFile(join(webRoot, 'index.html'));
     });
-    app.get('/api-config', (req, res) => {
-        // 防御: sendFile 在文件缺失时会异步抛 NotFoundError, 这里用同步读 + send 兜底
-        const filePath = join(webRoot, 'api-config.html');
-        if (!fsSync.existsSync(filePath)) {
-            // 回退到 SPA 主页, 避免 404 崩溃
-            return res.status(404).type('text/plain').send('api-config.html not found; please run `npm run build:web`');
-        }
-        res.sendFile(filePath, (err) => {
-            if (err && !res.headersSent) {
-                console.error('[api-config] sendFile failed:', err.message);
-                res.status(500).type('text/plain').send('api-config.html send error: ' + err.message);
+    // 2026-06-17: /api-config 与 / 改用 fs.readFileSync + res.send 兑底,
+    //   不再依赖 express.sendFile. 原因: npm 全局安装路径下, send library 偶发报
+    //   "Not Found" 即使 fs.existsSync+fs.stat 都成功. 现象: 页面 200 但内容是
+    //   "api-config.html send error: Not Found" 5xx 错误页. 同步读 + res.type().send
+    //   可靠返回原始 HTML bytes.
+    function serveStaticHtml(relPath, notFoundMsg, label) {
+        return (_req, res) => {
+            const filePath = join(webRoot, relPath);
+            if (!fsSync.existsSync(filePath)) {
+                return res.status(404).type('text/plain').send(notFoundMsg);
             }
-        });
-    });
+            try {
+                const html = fsSync.readFileSync(filePath);
+                res.type('text/html; charset=utf-8').send(html);
+            }
+            catch (err) {
+                console.error(`[${label}] readFileSync failed:`, err.message);
+                if (!res.headersSent) {
+                    res.status(500).type('text/plain').send(`${relPath} read error: ${err.message}`);
+                }
+            }
+        };
+    }
+    app.get('/', serveStaticHtml('index.html', 'index.html not found; please run `npm run build:web`', 'index'));
+    app.get('/api-config', serveStaticHtml('api-config.html', 'api-config.html not found; please run `npm run build:web`', 'api-config'));
     // 全局兜底: 任何 next(err) 走到这里, 给出结构化 4xx/5xx 而不是默认 HTML
     app.use((err, req, res, _next) => {
         console.error('[server] unhandled error on', req.method, req.path, '-', err?.message || err);
@@ -1654,13 +1716,19 @@ export async function createWebServer(port = 3000, options = {}) {
                     console.log(`[chat] aborted channel=${channelId}`);
                 }
                 else {
-                    throw err;
+                    // M1.2 (2026-06-17): 不再 rethrow — 把错误塞到 fullResponse 让 broadcast 出来, 后续 session 仍保存
+                    // 旧行为: 抛到外层 catch, 触发 500 + 用户消息丢失 (session 不保存)
+                    console.error(`[chat] LLM 调用失败 channel=${channelId}:`, err);
+                    fullResponse = `[错误: LLM 调用失败] ${String(err?.message || err).slice(0, 300)}`;
+                    broadcast({ type: 'error', content: fullResponse }, channelId);
                 }
             }
             // abort 模式: 给 partial 拼后缀
             if (runState.abortController?.signal.aborted && fullResponse.trim().length > 0) {
                 fullResponse = fullResponse + '\n\n_[生成已中断]_';
             }
+            // 2026-06-18: 修 lastFinalReply 没设 → /api/loop/inspect 永远返回空
+            runState.lastFinalReply = fullResponse;
             // v3 新增: 解析 LLM 回复里的 @-mentions, 转发到目标 channel
             await routeMentionsInReply(channelId, fullResponse, localChannels, remoteChannels);
             broadcast({ type: 'ai', content: fullResponse }, channelId);