@bolloon/bolloon-agent 0.2.12 → 0.2.13

package/dist/web/server-storage.js

@@ -0,0 +1,154 @@
+/**
+ * server-storage.ts — server.ts 拆出的持久化层
+ *
+ * 包含:
+ *   - loadChannels / saveChannels + 去重 + 写盘保护
+ *   - loadSession / saveSession + 50MB 内存保护
+ *   - loadTheme / saveTheme
+ *   - 任务队列 (loadTaskQueue / saveTaskQueue / executeTask)
+ *
+ * 从 src/web/server.ts 抽出 (2026-07-06).
+ * Channel / Session / Task / SessionMessage / SessionSummary type 来自 ./server-types.ts.
+ */
+import * as fs from 'fs/promises';
+import { CHANNELS_PATH, SESSION_CACHE_PATH, TASK_QUEUE_PATH, THEME_PATH, } from './server-types.js';
+import { saveWindow as saveSessionWindow, loadWindow as loadSessionWindow } from '../bootstrap/session-window.js';
+// 写盘去重: 上次写盘内容, 用于跳过幂等调用
+let lastChannelsJson = '';
+// 写盘保护: 任何调用 saveChannels 后更新
+let lastChannelsWriteAt = 0;
+export function getLastChannelsWriteAt() {
+    return lastChannelsWriteAt;
+}
+export async function loadChannels() {
+    try {
+        const data = await fs.readFile(CHANNELS_PATH, 'utf-8');
+        return JSON.parse(data);
+    }
+    catch {
+        return [];
+    }
+}
+export async function saveChannels(channels) {
+    // 写盘前剥掉任何遗留的 didDocument 字段, 防止历史脏数据撑大文件
+    const sanitized = channels.map(ch => {
+        const { didDocument: _omit, ...rest } = ch;
+        return rest;
+    });
+    const jsonStr = JSON.stringify(sanitized, null, 2);
+    // 写盘保护: 内容和上次完全一致就跳过, 避免 SSE ping / 重新 init 触发的无意义写盘
+    if (jsonStr === lastChannelsJson) {
+        return;
+    }
+    lastChannelsJson = jsonStr;
+    console.log('[saveChannels] 保存频道数据, 数量:', sanitized.length);
+    console.log('[saveChannels] JSON 长度:', jsonStr.length);
+    await fs.writeFile(CHANNELS_PATH, jsonStr);
+    lastChannelsWriteAt = Date.now();
+}
+/**
+ * loadSession 加 L0 window fallback 链 (2026-07-07 P0-B):
+ *   1) full session.json (主路径)
+ *   2) full 超 50MB 拒加载 → 读 <key>.window.json
+ *   3) window 也没有 → 返回 null (前端 fallback "你好! 我是 Bolloon Agent")
+ */
+export async function loadSession(channelId, sessionId) {
+    const key = sessionId ? `${channelId}:${sessionId}` : channelId;
+    const sessionPath = `${SESSION_CACHE_PATH}/${key}.json`;
+    const sid = sessionId || 'default';
+    try {
+        // 内存保护: 拒绝加载过大的 session 文件 (> 50MB 视为异常, 避免 OOM)
+        const stat = await fs.stat(sessionPath);
+        if (stat.size > 50 * 1024 * 1024) {
+            console.warn(`[loadSession] session 过大 (${stat.size} bytes): ${key}, fallback to window`);
+            return await loadSessionWindowFallback(channelId, sid);
+        }
+        const data = await fs.readFile(sessionPath, 'utf-8');
+        return JSON.parse(data);
+    }
+    catch {
+        // 文件不存在 → 仍尝试 window (可能上次 session 删了, window 还在)
+        return await loadSessionWindowFallback(channelId, sid);
+    }
+}
+/** window-only fallback: 窗口消息填入 Session.messages, 其他字段填占位 */
+async function loadSessionWindowFallback(channelId, sessionId) {
+    const win = await loadSessionWindow(channelId, sessionId);
+    if (!win || win.messages.length === 0)
+        return null;
+    console.log(`[loadSession] window fallback for ${channelId}: ${sessionId}, ${win.messages.length} msgs (${win.totalBehind} behind)`);
+    // WindowEntry → SessionMessage 映射 (id/timestamp 缺失时补占位)
+    const messages = win.messages.map((m, idx) => ({
+        id: m.id || `win-${win.lastUpdated}-${idx}`,
+        type: (m.type === 'user' || m.type === 'ai' ? m.type : 'user'),
+        content: m.content,
+        timestamp: m.timestamp || win.lastUpdated,
+        metadata: m.metadata,
+    }));
+    return {
+        channelId,
+        sessionId,
+        messages,
+        lastUpdated: win.lastUpdated,
+        _windowOnly: true,
+        _totalBehind: win.totalBehind,
+    };
+}
+export async function saveSession(session) {
+    const key = session.sessionId ? `${session.channelId}:${session.sessionId}` : session.channelId;
+    const sessionPath = `${SESSION_CACHE_PATH}/${key}.json`;
+    await fs.writeFile(sessionPath, JSON.stringify(session, null, 2));
+    // L0 窗口联动 (2026-07-07): 同步写最近 30 条到 <key>.window.json
+    // 失败静默 — 不阻塞主对话流
+    try {
+        await saveSessionWindow(session.channelId, session.sessionId || 'default', session.messages || [], { windowSize: 30 });
+    }
+    catch (e) {
+        console.warn(`[saveSession] window write failed for ${key}: ${e?.message || e}`);
+    }
+}
+export async function loadTheme() {
+    try {
+        const data = await fs.readFile(THEME_PATH, 'utf-8');
+        return JSON.parse(data);
+    }
+    catch {
+        return { theme: 'light', agentId: '' };
+    }
+}
+export async function saveTheme(theme, agentId) {
+    await fs.writeFile(THEME_PATH, JSON.stringify({ theme, agentId }, null, 2));
+}
+// ==================== Task Queue & Workflow System ====================
+let isExecutingTask = false;
+let executionTaskId = null;
+export function isTaskExecuting() {
+    return isExecutingTask;
+}
+export function getExecutingTaskId() {
+    return executionTaskId;
+}
+export async function loadTaskQueue() {
+    try {
+        const data = await fs.readFile(TASK_QUEUE_PATH, 'utf-8');
+        return JSON.parse(data);
+    }
+    catch {
+        return [];
+    }
+}
+export async function saveTaskQueue(tasks) {
+    await fs.writeFile(TASK_QUEUE_PATH, JSON.stringify(tasks, null, 2));
+}
+/** 执行 task 的 helper 标记 (server.ts 内部 still 持有 lock) */
+export function startTaskExecution(taskId) {
+    if (isExecutingTask)
+        return false;
+    isExecutingTask = true;
+    executionTaskId = taskId;
+    return true;
+}
+export function endTaskExecution() {
+    isExecutingTask = false;
+    executionTaskId = null;
+}

package/dist/web/server-types.js

@@ -0,0 +1,15 @@
+/**
+ * server-types.ts — server.ts 拆出的纯类型 + 常量 + 路径
+ *
+ * 从 src/web/server.ts 抽出 (2026-07-06).
+ * 0 副作用, 0 模块级 state, 只放 type / interface / const 路径.
+ */
+import * as path from 'path';
+const HOME = process.env.HOME || process.env.USERPROFILE || '/tmp';
+export const SHARED_SESSION_PATH = path.join(HOME, '.bolloon', 'sessions');
+export const SESSION_CACHE_PATH = path.join(SHARED_SESSION_PATH, 'cache');
+export const CHANNELS_PATH = path.join(SHARED_SESSION_PATH, 'channels.json');
+export const THEME_PATH = path.join(SHARED_SESSION_PATH, 'theme.json');
+export const TASK_QUEUE_PATH = path.join(SHARED_SESSION_PATH, 'task-queue.json');
+export const IPFS_ENDPOINT = 'http://127.0.0.1:5001';
+export const REMOTE_CACHE_FILE = path.join(HOME, '.bolloon', 'remote-channels-cache.json');

package/dist/web/server-v3-p2p.js

@@ -0,0 +1,224 @@
+/**
+ * server-v3-p2p.ts — server.ts 拆出的 v3 P2P 层
+ *
+ * 包含:
+ *   - sanitizeChannelForPeer / isSharedWith
+ *   - routeMentionsInReply (LLM 回复 @-mention 路由)
+ *   - loadRemoteChannelCacheFromDisk / persistRemoteChannelCache
+ *   - loadLocalSubAgents (跳过 subagent-manager 懒加载, 直接读 agents.json)
+ *   - v3P2PRef (P2PDirect 引用, 让闭包外能拿到)
+ *
+ * 从 src/web/server.ts 抽出 (2026-07-06).
+ */
+import { REMOTE_CACHE_FILE } from './server-types.js';
+import { loadChannels, saveSession, loadSession } from './server-storage.js';
+import { broadcast } from './server-sse.js';
+// v3: 远端 channel UI 元数据缓存 — key: peerId, value: sanitize 过的 channel 列表
+// in-memory only, 进程重启清空 (judgment 内容永远不在这里)
+const remoteChannelCache = new Map();
+export function getRemoteChannelCache() {
+    return remoteChannelCache;
+}
+// v3: P2PDirect 引用 (Hyperswarm 薄包装) - 模块级, 因为 web server 闭包里不可用
+let v3P2PRef = null;
+export function getV3P2PRef() {
+    return v3P2PRef;
+}
+export function setV3P2PRef(ref) {
+    v3P2PRef = ref;
+}
+// 2026-07-05: 一次性 prompt 附加块 — key: channelId, value: 下一次 LLM prompt 时 prepend 的内容
+const nextPromptHints = new Map();
+export function getNextPromptHints() {
+    return nextPromptHints;
+}
+// 2026-07-05: 等待中的 history RPC (B 端 chat-history endpoint 用) — rpcId → { resolve, reject }
+const v3PendingHistoryGets = new Map();
+export function getV3PendingHistoryGets() {
+    return v3PendingHistoryGets;
+}
+/**
+ * v3: 过滤 channel 元数据, 只返回对远端 peer 安全的字段.
+ * 关键: bound_judgment_ids / walletBinding / autoInvokeTools 内部状态不外传.
+ */
+export function sanitizeChannelForPeer(ch, peerPublicKey) {
+    if (peerPublicKey) {
+        const shared = Array.isArray(ch.shared_with_peers) ? ch.shared_with_peers : [];
+        if (!shared.includes(peerPublicKey)) {
+            return null;
+        }
+    }
+    return {
+        id: ch.id,
+        name: ch.name,
+        did: ch.did,
+        publicKey: ch.publicKey,
+        createdAt: ch.createdAt,
+        updatedAt: ch.updatedAt,
+        hasWallet: !!ch.walletAddress,
+        share_id: ch.share_id,
+    };
+}
+/** v3 新增: 判断 channel 是否分享给 peerPublicKey */
+export function isSharedWith(ch, peerPublicKey) {
+    const shared = Array.isArray(ch.shared_with_peers) ? ch.shared_with_peers : [];
+    return shared.includes(peerPublicKey);
+}
+/**
+ * v3 新增: 解析 LLM 回复里的 @-mentions, 把消息发到目标 channel.
+ *
+ * 语法: "@渠道名 消息内容" — 渠道名匹配 local channels by name, 或 remote channels by name.
+ */
+export async function routeMentionsInReply(originChannelId, replyText, localChannels, remoteChannels) {
+    const results = [];
+    const regex = /@([一-龥A-Za-z0-9_\-]{1,30})\s+([^\n@]+?)(?=(?:\s*@[一-龥A-Za-z0-9_\-]{1,30}\s)|$)/g;
+    const matches = [...replyText.matchAll(regex)];
+    if (matches.length === 0)
+        return results;
+    let originChannelName = originChannelId;
+    try {
+        const chs = await loadChannels();
+        const oc = chs.find(c => c.id === originChannelId);
+        if (oc)
+            originChannelName = oc.name;
+    }
+    catch { }
+    console.log(`[v3-cross] (${originChannelName}) 解析到 ${matches.length} 个 @-mention`);
+    for (const m of matches) {
+        const targetName = m[1].trim();
+        const text = m[2].trim();
+        if (!text)
+            continue;
+        const localTarget = localChannels.find(c => c.name === targetName);
+        const remoteTarget = !localTarget ? remoteChannels.find(c => c.name === targetName) : null;
+        if (localTarget) {
+            try {
+                const existing = await loadSession(localTarget.id, 'default');
+                const session = existing || {
+                    channelId: localTarget.id, sessionId: 'default', messages: [], lastUpdated: new Date().toISOString()
+                };
+                session.messages.push({
+                    id: `msg-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`,
+                    type: 'ai',
+                    content: text,
+                    timestamp: new Date().toISOString(),
+                    source: 'ai-mention',
+                    originChannelId,
+                    originChannelName
+                });
+                session.lastUpdated = new Date().toISOString();
+                await saveSession(session);
+                console.log(`[v3-cross] (${originChannelName}) @${targetName} → 本地 channel ${localTarget.id}, 存了 ${text.length} chars`);
+                broadcast({
+                    type: 'cross-mention-received',
+                    originChannelId, originChannelName,
+                    targetChannelId: localTarget.id, targetChannelName: localTarget.name,
+                    text, source: 'ai-mention'
+                }, 'broadcast');
+                results.push({ targetName, targetId: localTarget.id, source: 'local', text, status: 'sent' });
+            }
+            catch (err) {
+                console.error(`[v3-cross] @${targetName} 本地存失败:`, err.message);
+                results.push({ targetName, targetId: localTarget.id, source: 'local', text, status: 'failed' });
+            }
+        }
+        else if (remoteTarget) {
+            const ownerPk = remoteTarget._ownerPublicKey;
+            if (!v3P2PRef) {
+                console.warn(`[v3-cross] P2PDirect 未启动, 跳过远端 @${targetName}`);
+                results.push({ targetName, targetId: remoteTarget.id, source: 'remote', text, status: 'failed' });
+                continue;
+            }
+            try {
+                const rpcPayload = {
+                    targetChannelId: remoteTarget.id,
+                    targetChannelName: remoteTarget.name,
+                    originChannelId,
+                    originChannelName,
+                    text,
+                    fromPublicKey: v3P2PRef.getPublicKey()
+                };
+                const { sendOrQueue } = await import('../network/p2p-outbox.js');
+                const r = await sendOrQueue(ownerPk, 'agent.cross.post', rpcPayload, v3P2PRef);
+                if (r === 'SENT') {
+                    console.log(`[v3-cross] (${originChannelName}) @${targetName} → 远端 peer ${ownerPk.substring(0, 12)}... (channelId=${remoteTarget.id})`);
+                    results.push({ targetName, targetId: remoteTarget.id, source: 'remote', text, status: 'sent' });
+                }
+                else if (r === 'QUEUED') {
+                    console.log(`[v3-cross] (${originChannelName}) @${targetName} → 远端 peer ${ownerPk.substring(0, 12)}... 已入队 (对方不在线)`);
+                    results.push({ targetName, targetId: remoteTarget.id, source: 'remote', text, status: 'queued' });
+                }
+                else {
+                    results.push({ targetName, targetId: remoteTarget.id, source: 'remote', text, status: 'failed' });
+                }
+            }
+            catch (err) {
+                console.error(`[v3-cross] @${targetName} 远端 RPC 失败:`, err.message);
+                results.push({ targetName, targetId: remoteTarget.id, source: 'remote', text, status: 'failed' });
+            }
+        }
+        else {
+            console.warn(`[v3-cross] @${targetName} 找不到匹配 channel (本地 ${localChannels.length} 个, 远端 ${remoteChannels.length} 个)`);
+        }
+    }
+    return results;
+}
+// 2026-06-10: 持久化 remote channel cache 到 ~/.bolloon/remote-channels-cache.json
+export async function loadRemoteChannelCacheFromDisk() {
+    try {
+        const { readFile } = await import('fs/promises');
+        const { existsSync } = await import('fs');
+        if (!existsSync(REMOTE_CACHE_FILE))
+            return;
+        const raw = await readFile(REMOTE_CACHE_FILE, 'utf-8');
+        const obj = JSON.parse(raw);
+        if (obj && typeof obj === 'object') {
+            for (const [pk, list] of Object.entries(obj)) {
+                if (Array.isArray(list)) {
+                    remoteChannelCache.set(pk, list);
+                }
+            }
+            console.log(`[v3-meta] 从磁盘恢复 ${remoteChannelCache.size} 个 peer 的 channel cache`);
+        }
+    }
+    catch (err) {
+        console.warn('[v3-meta] 恢复 remote channel cache 失败 (非致命):', err.message);
+    }
+}
+export async function persistRemoteChannelCache() {
+    try {
+        const { writeFile, mkdir } = await import('fs/promises');
+        const { existsSync } = await import('fs');
+        if (!existsSync(`${process.env.HOME || '/tmp'}/.bolloon`)) {
+            await mkdir(`${process.env.HOME || '/tmp'}/.bolloon`, { recursive: true });
+        }
+        const obj = {};
+        for (const [pk, list] of remoteChannelCache.entries()) {
+            obj[pk] = list;
+        }
+        await writeFile(REMOTE_CACHE_FILE, JSON.stringify(obj, null, 2), 'utf-8');
+    }
+    catch (err) {
+        console.warn('[v3-meta] 持久化 remote channel cache 失败 (非致命):', err.message);
+    }
+}
+// 2026-07-05: 直接读 ~/.bolloon/agents/agents.json, 跳过 subagent-manager 的 lazy init
+export async function loadLocalSubAgents() {
+    try {
+        const fsPromises = await import('fs/promises');
+        const path = await import('path');
+        const home = process.env.BOLLOON_HOME || process.env.HOME || '/tmp';
+        const file = path.join(home, '.bolloon', 'agents', 'agents.json');
+        const raw = await fsPromises.readFile(file, 'utf-8');
+        const parsed = JSON.parse(raw);
+        const arr = Array.isArray(parsed) ? parsed : [];
+        process.stderr.write(`[LOADED] ${arr.length} agents from ${file}\n`);
+        return arr;
+    }
+    catch (e) {
+        process.stderr.write(`[LOAD FAIL] ${e?.message}\n`);
+        return [];
+    }
+}
+// 启动时立即同步读一次 (异步, 不阻塞)
+loadRemoteChannelCacheFromDisk();