@bolloon/bolloon-agent 0.1.41 → 0.1.42

package/dist/index.js

@@ -4,6 +4,7 @@ import { HybridMessenger } from './network/hybrid-messenger.js';
 import * as ed25519 from '@noble/ed25519';
 import { sha512 } from '@noble/hashes/sha2.js';
 import * as fs from 'fs/promises';
+import * as path from 'path';
 import { documentReader } from './documents/reader.js';
 import { initMinimax } from './constraints/index.js';
 import { createAgentSession } from './agents/pi-sdk.js';
@@ -127,33 +128,23 @@ async function bootstrapIdentity() {
     return { keypair: kp, did, name };
 }
 function publishDID(name, kp) {
+    // 2026-06-17: 去掉 IPNS 重试机制 — 老逻辑 60s × 10 次 = 10 分钟阻塞,
+    //   严重拖慢 agent 启动. 失败就立刻 fallback, 不阻塞主流程.
     s.step(2, 5, '发布 DID → IPFS (后台)', 'loading');
     return new Promise((resolve) => {
         const attempt = async () => {
-            let lastLogTime = 0;
-            const retryWithBackoff = async (retries) => {
-                try {
-                    const auth = await AgentAuthManager.newWithRemoteIpfs('http://127.0.0.1:5001', 'http://127.0.0.1:8080');
-                    const result = await auth.registerAgent({ name, services: [] }, kp, '');
-                    s.step(2, 5, '发布 DID → IPFS', 'ok');
-                    resolve({ cid: result.cid });
-                }
-                catch (e) {
-                    const now = Date.now();
-                    if (now - lastLogTime > 30000) {
-                        process.stdout.write(`     ${YELLOW}⏳ IPNS发布中 (失败${retries}次), 后台重试...${RESET}\r`);
-                        lastLogTime = now;
-                    }
-                    if (retries < 10) {
-                        setTimeout(() => retryWithBackoff(retries + 1), 60000);
-                    }
-                    else {
-                        process.stdout.write(`     ${YELLOW}⚠ IPNS发布重试结束，本地模式运行${RESET}\n`);
-                        resolve({});
-                    }
-                }
-            };
-            setTimeout(() => retryWithBackoff(1), 100);
+            try {
+                const auth = await AgentAuthManager.newWithRemoteIpfs('http://127.0.0.1:5001', 'http://127.0.0.1:8080');
+                const result = await auth.registerAgent({ name, services: [] }, kp, '');
+                s.step(2, 5, '发布 DID → IPFS', 'ok');
+                resolve({ cid: result.cid });
+            }
+            catch (e) {
+                // 一次失败直接放弃 — 本地模式运行就够了, 不重试
+                process.stdout.write(`     ${YELLOW}⚠ IPFS 发布失败 (${e?.message?.slice(0, 80) || 'unknown'}), 本地模式运行${RESET}\n`);
+                s.step(2, 5, '发布 DID → IPFS', 'warn');
+                resolve({});
+            }
         };
         attempt();
     });
@@ -637,6 +628,105 @@ async function runToolCommand(tool, args, outputJson, comm) {
                 response = `消息已发送到 ${peerId.substring(0, 16)}...`;
                 break;
             }
+            // ---- Collaboration: 派任务给对端 agent 跑, 等回结果 ----
+            // 走 P2PDirect, 不经 GitHub
+            case 'collab': {
+                response = '';
+                const [peerOrName, ...rest] = args;
+                const task = rest.join(' ').trim();
+                if (!peerOrName || !task) {
+                    response = '用法: --collab <peer-name-or-publicKey> "<任务描述>"';
+                    error = response;
+                    break;
+                }
+                let targetPk = peerOrName;
+                if (!/^[0-9a-fA-F]{64}$/.test(peerOrName)) {
+                    const { listPeers } = await import('./network/known-peers.js');
+                    const peers = await listPeers();
+                    for (const p of peers) {
+                        if (p.name === peerOrName) {
+                            targetPk = p.publicKey;
+                            break;
+                        }
+                    }
+                    if (targetPk === peerOrName) {
+                        response = `❌ 找不到 peer "${peerOrName}" (也不是 64-hex publicKey)`;
+                        error = response;
+                        break;
+                    }
+                }
+                const { resolveIdentity } = await import('./git-transport/chat-repo.js');
+                const { P2PDirect } = await import('./network/p2p-direct.js');
+                const id = await resolveIdentity();
+                const requestId = `collab-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+                // 启动一个 listen 实例专门等 reply (含超时)
+                const p2pListen = new P2PDirect({ name: 'cli-collab-listen', role: id.role });
+                const replyPromise = new Promise((resolve, reject) => {
+                    const timer = setTimeout(() => {
+                        reject(new Error('reply timeout (90s)'));
+                    }, 90_000);
+                    p2pListen.on('data', (ev) => {
+                        try {
+                            const text = Buffer.isBuffer(ev.data) ? ev.data.toString('utf8') : String(ev.data);
+                            if (ev.fromPublicKey !== targetPk)
+                                return; // 不是对方回的就忽略
+                            const env = JSON.parse(text);
+                            if (env?.v === 3 && env?.op === 'agent.collab.reply' && env.payload?.requestId === requestId) {
+                                clearTimeout(timer);
+                                resolve(env.payload);
+                            }
+                        }
+                        catch { }
+                    });
+                });
+                try {
+                    await p2pListen.start();
+                    await p2pListen.joinTopic(Buffer.from('bolloon-agent-harness'));
+                    const envelope = JSON.stringify({
+                        v: 3,
+                        op: 'agent.collab.run',
+                        payload: {
+                            requestId,
+                            task,
+                            fromRole: id.role,
+                            fromPk: id.publicKey,
+                            ts: new Date().toISOString(),
+                            timeoutMs: 85_000,
+                        },
+                    });
+                    const sent = await p2pListen.sendToWithWait(targetPk, Buffer.from(envelope), 8000);
+                    if (!sent) {
+                        response = `❌ 握手超时: 对方 ${targetPk.slice(0, 12)}... 不可达`;
+                        error = response;
+                        try {
+                            await p2pListen.stop();
+                        }
+                        catch { }
+                        break;
+                    }
+                    process.stdout.write(`⏳ 任务已派给 ${targetPk.slice(0, 12)}..., 等回复 (最多 90s)...\n`);
+                    const reply = await replyPromise;
+                    const lines = [
+                        `✅ 协作完成 (${reply.durationMs ? Math.round(reply.durationMs / 1000) + 's' : '?'})`,
+                        `   任务:  ${task.slice(0, 80)}${task.length > 80 ? '...' : ''}`,
+                        ``,
+                        `📥 对方结果:`,
+                        `${reply.result || '(empty)'}`,
+                    ];
+                    response = lines.join('\n');
+                }
+                catch (e) {
+                    response = `❌ 协作失败: ${e?.message ?? e}`;
+                    error = response;
+                }
+                finally {
+                    try {
+                        await p2pListen.stop();
+                    }
+                    catch { }
+                }
+                break;
+            }
             case 'prompt': {
                 const [text] = args;
                 if (!text) {
@@ -661,6 +751,14 @@ async function runToolCommand(tool, args, outputJson, comm) {
                     `已加载 Harness Skills: ${harnessSkills.length}\n\n` +
                     `Skills:\n${skills.map(s => `  - ${s.name}: ${s.description}`).join('\n')}\n\n` +
                     `Gates: 0-8 (8-Gate 工作流)`;
+                // Fix 1: write-back 初始化摘要到 AGENTS.md
+                try {
+                    const fs_write = await import('fs');
+                    const agentMd = path.join(process.cwd(), 'AGENTS.md');
+                    const entry = `\n<!-- bolloon-init -->\n**Bollharness 初始化**: ${new Date().toISOString().slice(0, 10)} | Skills: ${skills.length} | Gates: 0-8\n`;
+                    fs_write.appendFileSync(agentMd, entry);
+                }
+                catch { /* 静默 */ }
                 break;
             }
             case 'harness-gate': {
@@ -717,6 +815,14 @@ async function runToolCommand(tool, args, outputJson, comm) {
                 response = `📊 变更分类: ${result.classification}\n` +
                     `最小路径: ${result.minimum_gates}\n` +
                     `快速通道: ${result.fast_track ? '✅ 可用' : '❌ 不可用'}`;
+                // Fix 1: write-back 分类结果到 CLAUDE.md
+                try {
+                    const fs_write = await import('fs');
+                    const agentMd = path.join(process.cwd(), 'CLAUDE.md');
+                    const entry = `\n<!-- bolloon-classify -->\n**变更分类**: ${result.classification} | ${description} | ${new Date().toISOString().slice(0, 10)}\n`;
+                    fs_write.appendFileSync(agentMd, entry);
+                }
+                catch { /* 静默 */ }
                 break;
             }
             case 'harness-context': {
@@ -926,6 +1032,273 @@ async function runToolCommand(tool, args, outputJson, comm) {
                 }
                 break;
             }
+            // ---- chat transport (commits-as-messages) ----
+            case 'chat-init': {
+                const { chatInit } = await import('./git-transport/chat-repo.js');
+                const r = await chatInit(process.cwd());
+                response = ['✅ chat-init', ...r.messages].join('\n');
+                break;
+            }
+            case 'chat-send': {
+                const { chatSend, resolveIdentity } = await import('./git-transport/chat-repo.js');
+                // body 优先: 显式参数 > stdin
+                let body = args.join(' ').trim();
+                if (!body && !process.stdin.isTTY) {
+                    body = await new Promise((resolve) => {
+                        let chunks = '';
+                        process.stdin.setEncoding('utf8');
+                        process.stdin.on('data', (c) => { chunks += c; });
+                        process.stdin.on('end', () => resolve(chunks.trim()));
+                        process.stdin.on('error', () => resolve(''));
+                        // 1s timeout 防止无 stdin 时挂住
+                        setTimeout(() => resolve(chunks.trim()), 1000);
+                    });
+                }
+                const r = await chatSend({ repoDir: process.cwd(), body });
+                if (!r.ok) {
+                    response = `❌ chat-send: ${r.reason}`;
+                    error = response;
+                }
+                else {
+                    const id = await resolveIdentity();
+                    const lines = [
+                        `✅ chat-send`,
+                        `   role:    ${id.role}`,
+                        `   sha:     ${r.sha?.slice(0, 12)}`,
+                        `   pushed:  ${r.pushed ? 'yes' : 'no (will retry on next send)'}`,
+                        `   file:    ${r.filePath}`,
+                        `   p2pNotify: ${r.p2pNotifyEligible ? 'eligible' : 'skipped (>4 KiB)'}`,
+                    ];
+                    response = lines.join('\n');
+                    // 短消息且 P2P 在线 → 走 v3 RPC 推通知 (best-effort)
+                    if (r.p2pNotifyEligible && r.sha) {
+                        try {
+                            const { listPeers } = await import('./network/known-peers.js');
+                            const peers = listPeers();
+                            const peerPks = Object.values(peers).map((p) => p.publicKey);
+                            if (peerPks.length > 0 && comm && typeof comm.sendTo === 'function') {
+                                const envelope = JSON.stringify({
+                                    v: 3,
+                                    op: 'agent.chat.gitnotify',
+                                    payload: { sha: r.sha, fromPk: id.publicKey, role: id.role, ts: new Date().toISOString(), file: r.filePath },
+                                });
+                                let pushed = 0;
+                                for (const pk of peerPks) {
+                                    try {
+                                        comm.sendTo(pk, envelope);
+                                        pushed++;
+                                    }
+                                    catch { }
+                                }
+                                response += `\n   p2p:     sent to ${pushed}/${peerPks.length} peer(s)`;
+                            }
+                            else {
+                                response += `\n   p2p:     no peers or no sendTo`;
+                            }
+                        }
+                        catch (e) {
+                            response += `\n   p2p:     notify failed (${e?.message ?? e})`;
+                        }
+                    }
+                }
+                break;
+            }
+            case 'chat-pull': {
+                const { chatPull } = await import('./git-transport/chat-repo.js');
+                const { renderOneLine } = await import('./git-transport/chat-render.js');
+                const r = await chatPull({ repoDir: process.cwd() });
+                if (!r.ok) {
+                    response = `❌ chat-pull: ${r.reason}`;
+                    error = response;
+                }
+                else if (r.newMessages.length === 0) {
+                    response = `✅ chat-pull: 0 new (${r.newCommits} commit(s) scanned)`;
+                }
+                else {
+                    response = [
+                        `✅ chat-pull: ${r.newMessages.length} new message(s)`,
+                        ...r.newMessages.map(renderOneLine),
+                    ].join('\n');
+                }
+                break;
+            }
+            case 'chat-list': {
+                const { listMessages } = await import('./git-transport/chat-render.js');
+                const limit = (() => {
+                    const idx = args.indexOf('--limit');
+                    if (idx >= 0 && args[idx + 1])
+                        return parseInt(args[idx + 1], 10);
+                    return 20;
+                })();
+                const withIdx = args.indexOf('--with');
+                const withRole = withIdx >= 0 ? args[withIdx + 1] : undefined;
+                const all = listMessages(process.cwd(), withRole, limit);
+                const { renderOneLine } = await import('./git-transport/chat-render.js');
+                if (all.length === 0) {
+                    response = '(no messages yet — try `bolloon --chat-init` first)';
+                }
+                else {
+                    response = [
+                        `📜 ${all.length} message(s)${withRole ? ` (with=${withRole})` : ''}:`,
+                        ...all.map(renderOneLine),
+                    ].join('\n');
+                }
+                break;
+            }
+            case 'chat-watch': {
+                // 长循环, 直接 runToolCommand 内部跑, main 末尾的 process.exit(0) 不会触发
+                // (见 main() 特判)
+                const { chatWatch } = await import('./git-transport/chat-watch.js');
+                const idx = args.indexOf('--interval');
+                const intervalMs = idx >= 0 && args[idx + 1] ? parseInt(args[idx + 1], 10) : undefined;
+                await chatWatch({ repoDir: process.cwd(), intervalMs });
+                response = '✅ chat-watch stopped';
+                break;
+            }
+            case 'chat-status': {
+                const { chatStatus } = await import('./git-transport/chat-repo.js');
+                const s = await chatStatus({ repoDir: process.cwd() });
+                const lines = [
+                    `📡 chat status`,
+                    `   role:     ${s.role}`,
+                    `   publicKey: ${s.publicKey.slice(0, 16)}...`,
+                    `   repo:     ${s.repoDir}`,
+                    `   remote:   ${s.remote ?? '(none — local-only mode)'}`,
+                    `   branch:   ${s.branch ?? '(unknown)'}`,
+                    `   head:     ${s.head ?? '(no commits)'}`,
+                    `   ahead/behind: ${s.ahead ?? 0} / ${s.behind ?? 0}`,
+                    `   mode:     ${s.mode}`,
+                    `   files:    ${s.fileCount} (${Object.entries(s.byRole).map(([k, v]) => `${k}=${v}`).join(', ') || 'none'})`,
+                ];
+                response = lines.join('\n');
+                break;
+            }
+            // ---- P2P-only chat (no git, no GitHub) ----
+            case 'chat-p2p-send': {
+                response = '';
+                // 形态: --chat-p2p-send <peerOrName> "消息正文"
+                // peerOrName: 64-hex publicKey 或 known_peers.json 里的 name
+                // 走 P2PDirect (纯 TS, 不走坏了的 @diap/sdk HyperswarmCommunicator)
+                const [peerOrName, ...rest] = args;
+                const body = rest.join(' ').trim();
+                if (!peerOrName || !body) {
+                    response = '用法: --chat-p2p-send <peer-name-or-publicKey> "消息正文"';
+                    error = response;
+                    break;
+                }
+                let targetPk = peerOrName;
+                if (!/^[0-9a-fA-F]{64}$/.test(peerOrName)) {
+                    const { listPeers } = await import('./network/known-peers.js');
+                    const peers = await listPeers();
+                    for (const p of peers) {
+                        if (p.name === peerOrName) {
+                            targetPk = p.publicKey;
+                            break;
+                        }
+                    }
+                    if (targetPk === peerOrName) {
+                        response = `❌ 找不到 peer "${peerOrName}" (也不是 64-hex publicKey)`;
+                        error = response;
+                        break;
+                    }
+                }
+                const { resolveIdentity } = await import('./git-transport/chat-repo.js');
+                const { P2PDirect } = await import('./network/p2p-direct.js');
+                const id = await resolveIdentity();
+                const envelope = JSON.stringify({
+                    v: 3,
+                    op: 'agent.chat.direct',
+                    payload: {
+                        text: body,
+                        fromRole: id.role,
+                        fromPk: id.publicKey,
+                        ts: new Date().toISOString(),
+                    },
+                });
+                const p2p = new P2PDirect({ name: 'cli-send', role: id.role });
+                try {
+                    await p2p.start();
+                    await p2p.joinTopic(Buffer.from('bolloon-agent-harness'));
+                    const sent = await p2p.sendToWithWait(targetPk, Buffer.from(envelope), 8000);
+                    if (sent) {
+                        response = `✅ 私发 → ${targetPk.slice(0, 12)}...\n   role: ${id.role}\n   text: ${body.slice(0, 80)}${body.length > 80 ? '...' : ''}\n   (P2P-only, 未写入 git / GitHub)`;
+                    }
+                    else {
+                        response = `❌ 握手超时: 对方 ${targetPk.slice(0, 12)}... 未在 8s 内响应 (对方可能离线 / NAT 后 / DHT 还在 bootstrap)`;
+                        error = response;
+                    }
+                }
+                catch (e) {
+                    response = `❌ 发送失败: ${e?.message ?? e}`;
+                    error = response;
+                }
+                finally {
+                    try {
+                        await p2p.stop();
+                    }
+                    catch { }
+                }
+                break;
+            }
+            case 'chat-p2p-listen': {
+                response = '';
+                // 后台长循环: P2PDirect 监听, 只打印 op=agent.chat.direct 的
+                const { resolveIdentity } = await import('./git-transport/chat-repo.js');
+                const { P2PDirect } = await import('./network/p2p-direct.js');
+                const id = await resolveIdentity();
+                const p2p = new P2PDirect({ name: 'cli-listen', role: id.role });
+                process.stdout.write(`[chat-p2p-listen] role=${id.role} pk=${id.publicKey.slice(0, 12)} listening on bolloon-agent-harness\n`);
+                process.stdout.write(`[chat-p2p-listen] press Ctrl-C to stop\n`);
+                const onData = (ev) => {
+                    try {
+                        const text = Buffer.isBuffer(ev.data) ? ev.data.toString('utf8') : String(ev.data);
+                        try {
+                            const env = JSON.parse(text);
+                            if (env && env.v === 3 && env.op === 'agent.chat.direct') {
+                                const { text: body, fromRole } = env.payload || {};
+                                const ts = (env.payload?.ts || new Date().toISOString()).replace('T', ' ').replace(/\.\d+Z$/, '');
+                                process.stdout.write(`\n[${ts} ${fromRole || ev.fromPublicKey?.slice(0, 12)} → me] ${body}\n> `);
+                                return;
+                            }
+                        }
+                        catch { /* 非 v3 envelope, 当 raw 显示 */ }
+                        process.stdout.write(`\n[raw ${ev.fromPublicKey?.slice(0, 12)}] ${text.slice(0, 200)}\n> `);
+                    }
+                    catch (e) {
+                        process.stdout.write(`[chat-p2p-listen] decode error: ${e?.message ?? e}\n`);
+                    }
+                };
+                p2p.on('data', onData);
+                let lastPing = 0;
+                const keepAlive = setInterval(() => {
+                    const now = Date.now();
+                    if (now - lastPing > 5 * 60_000) {
+                        process.stdout.write(`[chat-p2p-listen] alive, role=${id.role}\n`);
+                        lastPing = now;
+                    }
+                }, 30_000);
+                const stop = async () => {
+                    process.stdout.write(`\n[chat-p2p-listen] stopping...\n`);
+                    try {
+                        p2p.off('data', onData);
+                    }
+                    catch { }
+                    clearInterval(keepAlive);
+                    try {
+                        await p2p.stop();
+                    }
+                    catch { }
+                    process.exit(0);
+                };
+                process.on('SIGINT', stop);
+                process.on('SIGTERM', stop);
+                process.on('SIGHUP', stop);
+                await p2p.start();
+                await p2p.joinTopic(Buffer.from('bolloon-agent-harness'));
+                process.stdout.write(`[chat-p2p-listen] joined topic ✓\n> `);
+                await new Promise(() => { });
+                break;
+            }
             default:
                 response = `错误: 未知工具 "${tool}"`;
                 error = response;
@@ -1218,6 +1591,61 @@ function parseArgs() {
                 }
                 result.toolArgs = sessionArgs;
                 break;
+            // --- chat transport (commits as messages) ---
+            case '--chat-init':
+                result.chatInit = true;
+                result.tool = 'chat-init';
+                break;
+            case '--chat-send':
+                result.chatSend = true;
+                result.tool = 'chat-send';
+                // 吃掉所有非 flag 参数作为消息体 (--chat-send "消息正文" 或 stdin)
+                const chatSendArgs = [];
+                while (i + 1 < args.length && !args[i + 1].startsWith('-')) {
+                    chatSendArgs.push(args[++i]);
+                }
+                result.toolArgs = chatSendArgs;
+                break;
+            case '--chat-pull':
+                result.chatPull = true;
+                result.tool = 'chat-pull';
+                break;
+            case '--chat-list':
+                result.chatList = true;
+                result.tool = 'chat-list';
+                break;
+            case '--chat-watch':
+                result.chatWatch = true;
+                result.tool = 'chat-watch';
+                const watchArgs = [];
+                while (i + 1 < args.length && !args[i + 1].startsWith('-')) {
+                    watchArgs.push(args[++i]);
+                }
+                result.toolArgs = watchArgs;
+                break;
+            case '--chat-status':
+                result.chatStatus = true;
+                result.tool = 'chat-status';
+                break;
+            case '--chat-p2p-send':
+                result.tool = 'chat-p2p-send';
+                const p2pSendArgs = [];
+                while (i + 1 < args.length && !args[i + 1].startsWith('-')) {
+                    p2pSendArgs.push(args[++i]);
+                }
+                result.toolArgs = p2pSendArgs;
+                break;
+            case '--chat-p2p-listen':
+                result.tool = 'chat-p2p-listen';
+                break;
+            case '--collab':
+                result.tool = 'collab';
+                const collabArgs = [];
+                while (i + 1 < args.length && !args[i + 1].startsWith('-')) {
+                    collabArgs.push(args[++i]);
+                }
+                result.toolArgs = collabArgs;
+                break;
             case '--update-check':
                 result.updateCheck = true;
                 result.tool = 'update-check';
@@ -1304,6 +1732,21 @@ function printHelp() {
   --update-check             检查 npm 包更新
   --update-now [pkg]        更新到最新版本
 
+  # 跨机聊天 (commits-as-messages, 共享 GitHub 仓库)
+  --chat-init                初始化 .comm/ 目录 (一次性)
+  --chat-send "消息正文"     把消息写到 .comm/<role>/, commit + push
+  --chat-pull                拉取远端 .comm/ 的新消息并显示
+  --chat-list                列出本地所有已同步消息
+  --chat-watch [--interval 15s]  后台定时拉取, 有新消息时输出
+  --chat-status              一屏查看: role / publicKey / remote / ahead-behind
+
+  # 纯 P2P 私聊 (不走 GitHub, 不写 git, 不持久化)
+  --chat-p2p-send <peer|publicKey> "消息正文"   通过 P2P 直接发一条
+  --chat-p2p-listen          后台监听对方 P2P 私聊消息 (Ctrl-C 退出)
+
+  # 跨机 agent 协作 (对方 bolloon --web 起着才能处理, 走 P2P 不经 GitHub)
+  --collab <peer|publicKey> "<任务描述>"  派任务给对端 LLM 干活, 等回结果 (90s 超时)
+
   # AI 对话
   --prompt, -p <text>        通用 AI 对话（默认）
   --model <name>             指定使用的模型
@@ -1497,7 +1940,10 @@ async function main() {
         console.log();
         await runNonInteractive(args, comm);
         comm?.stop();
-        process.exit(0);
+        // chat-watch / chat-p2p-listen 是长循环, 不会自然 return, 走 SIGINT 自然退出
+        if (!args.chatWatch && args.tool !== 'chat-p2p-listen') {
+            process.exit(0);
+        }
     }
     else {
         s.section('对话模式');