@bolloon/bolloon-agent 0.1.36 → 0.1.38

package/src/network/source-intent-broadcaster.ts

@@ -1,242 +0,0 @@
-/**
- * source-intent-broadcaster.ts — 包装 P2PDirect, 收发 SourceIntentMsg
- *
- * 用法:
- *   const p2p = new P2PDirect({ name: 'bolloon', role: 'source-agent' });
- *   await p2p.start();
- *   const sb = new SourceIntentBroadcaster(p2p, { agent: 'agent-A@mac1' });
- *   await sb.start();
- *
- *   // 我方要改 src/foo.ts 行 42-50
- *   const conflict = await sb.reserve({ taskId, file: 'src/foo.ts', lines: [42, 50] });
- *   if (conflict) {
- *     // 对方已 reserve, 选: 让出 / 改别的 / 强制
- *   } else {
- *     sb.writeFileAndCommit(...);
- *     await sb.broadcastCommitIntent({ taskId, file, lines, sha, diffHash });
- *   }
- *
- * 主题: 复用现有 'bolloon-agent-harness' topic (P2PDirect 已 join),
- *       上层加 'source-intent:' 前缀避免和别的协议混.
- */
-import { EventEmitter } from 'events';
-import { P2PDirect } from './p2p-direct.js';
-import {
-  ReserveLock,
-  SourceIntentMsg,
-  ReserveMsg,
-  AckMsg,
-  ReleaseMsg,
-  CommitIntentMsg,
-  LineRange,
-  rangesOverlap,
-} from './source-intent.js';
-
-export interface BroadcasterOptions {
-  agent: string;       // 智能体身份
-  topic?: string;      // P2P 主题, 默认复用 'bolloon-agent-harness'
-  waitMs?: number;     // reserve 等待 ack 多久, 默认 200ms
-}
-
-export class SourceIntentBroadcaster extends EventEmitter {
-  readonly p2p: P2PDirect;
-  readonly agent: string;
-  readonly topic: string;
-  readonly waitMs: number;
-  readonly lock = new ReserveLock();
-
-  private started = false;
-  private dataHandler: ((data: Buffer, from: string) => void) | null = null;
-
-  constructor(p2p: P2PDirect, opts: BroadcasterOptions) {
-    super();
-    this.p2p = p2p;
-    this.agent = opts.agent;
-    this.topic = opts.topic || 'bolloon-agent-harness';
-    this.waitMs = opts.waitMs ?? 200;
-  }
-
-  async start(): Promise<void> {
-    if (this.started) return;
-    // 确保 p2p 已 join topic
-    await this.p2p.joinTopic(this.topic);
-
-    this.dataHandler = (data: Buffer, from: string) => {
-      try {
-        const text = data.toString('utf8');
-        // 协议前缀 'source-intent:'
-        if (!text.startsWith('source-intent:')) return;
-        const json = text.slice('source-intent:'.length);
-        const msg = JSON.parse(json) as SourceIntentMsg;
-        this.onMessage(msg, from);
-      } catch (err) {
-        // 静默忽略非本协议消息
-      }
-    };
-    this.p2p.on('data', this.dataHandler);
-    this.started = true;
-  }
-
-  stop(): void {
-    if (!this.started) return;
-    if (this.dataHandler) this.p2p.off('data', this.dataHandler);
-    this.started = false;
-  }
-
-  /**
-   * 申请 reserve (file, lines).
-   * 返回 {ok:true} → 成功 (没有重叠)
-   * 返回 {ok:false, existing} → 本地 lock 已有重叠, LLM 决定让出 / 改方向 / 强制
-   */
-  async reserve(args: {
-    taskId: string;
-    file: string;
-    lines: LineRange;
-  }): Promise<{ ok: true } | { ok: false; existing: { agent: string; lines: LineRange } }> {
-    const now = Date.now();
-    const msg: ReserveMsg = {
-      type: 'reserve',
-      taskId: args.taskId,
-      agent: this.agent,
-      file: args.file,
-      lines: args.lines,
-      expiresAt: now + ReserveLock.TTL_MS,
-      ts: now,
-    };
-
-    // 1. 先查本地 lock: 本端/远端任何 reserve 重叠都立即冲突 (避免 [5,15] 漏检 [1,10])
-    const existing = this.lock.isReserved(args.file, args.lines);
-    if (existing) {
-      return { ok: false, existing: { agent: existing.agent, lines: existing.lines } };
-    }
-
-    // 2. 写本地 lock
-    this.lock.add({
-      taskId: msg.taskId,
-      agent: msg.agent,
-      file: msg.file,
-      lines: msg.lines,
-      expiresAt: msg.expiresAt,
-      ts: msg.ts,
-    });
-
-    // 3. 广播
-    this.broadcastMsg(msg);
-
-    // 4. 等待 waitMs 看远端是否 ack 同一区间
-    return new Promise((resolve) => {
-      const timer = setTimeout(() => {
-        this.off('remoteConflict', onRemote);
-        resolve({ ok: true });
-      }, this.waitMs);
-
-      const onRemote = (existing: { agent: string; lines: LineRange }) => {
-        clearTimeout(timer);
-        resolve({ ok: false, existing });
-      };
-      this.once('remoteConflict', onRemote);
-    });
-  }
-
-  /** 释放我方 reserve */
-  release(args: { taskId: string; file: string; lines: LineRange }): void {
-    const msg: ReleaseMsg = {
-      type: 'release',
-      taskId: args.taskId,
-      agent: this.agent,
-      file: args.file,
-      lines: args.lines,
-      ts: Date.now(),
-    };
-    this.lock.release(args.file, args.lines);
-    this.broadcastMsg(msg);
-  }
-
-  /** commit 后广播, 供对方做轻量审计 (diffHash 验真伪) */
-  async broadcastCommitIntent(args: {
-    taskId: string;
-    file: string;
-    lines: LineRange;
-    sha: string;
-    diffHash: string;
-  }): Promise<void> {
-    const msg: CommitIntentMsg = {
-      type: 'commit-intent',
-      taskId: args.taskId,
-      agent: this.agent,
-      file: args.file,
-      lines: args.lines,
-      sha: args.sha,
-      diffHash: args.diffHash,
-      ts: Date.now(),
-    };
-    this.broadcastMsg(msg);
-  }
-
-  /** 取所有 live reserves (给 pi-ai 注入到 LLM 系统 prompt) */
-  liveReserves() {
-    return this.lock.live();
-  }
-
-  // ---- 内部 ----
-
-  private broadcastMsg(msg: SourceIntentMsg): void {
-    const text = 'source-intent:' + JSON.stringify(msg);
-    this.p2p.broadcast(Buffer.from(text, 'utf8'));
-  }
-
-  private onMessage(msg: SourceIntentMsg, from: string): void {
-    // 忽略自己发出的消息 (P2PDirect 自身会发到自己的 loopback)
-    if (msg.agent === this.agent) return;
-
-    switch (msg.type) {
-      case 'reserve': {
-        // 检查本地是否已 reserve 重叠区间
-        const existing = this.lock.isReserved(msg.file, msg.lines);
-        if (existing) {
-          // 我方有重叠, 对方也 reserve → 触发 conflict
-          this.emit('remoteConflict', { agent: msg.agent, lines: msg.lines });
-          // 自己也回一个 ack 让对方知道我方已 reserve
-          const ack: AckMsg = {
-            type: 'ack',
-            taskId: existing.taskId,
-            agent: this.agent,
-            file: existing.file,
-            lines: existing.lines,
-            ts: Date.now(),
-          };
-          this.broadcastMsg(ack);
-        }
-        // 记入 lock (远端的 reserve 我方也要避开, LLM 看 prompt 知道)
-        this.lock.add({
-          taskId: msg.taskId,
-          agent: msg.agent,
-          file: msg.file,
-          lines: msg.lines,
-          expiresAt: msg.expiresAt,
-          ts: msg.ts,
-        });
-        this.emit('remoteReserve', msg);
-        break;
-      }
-      case 'ack': {
-        // 远端 ack 我方已 reserve 同一区间 → 立即触发 conflict
-        const local = this.lock.isReserved(msg.file, msg.lines);
-        if (local) {
-          this.emit('remoteConflict', { agent: msg.agent, lines: msg.lines });
-        }
-        break;
-      }
-      case 'release': {
-        this.lock.release(msg.file, msg.lines);
-        this.emit('remoteRelease', msg);
-        break;
-      }
-      case 'commit-intent': {
-        this.lock.release(msg.file, msg.lines);
-        this.emit('remoteCommit', msg);
-        break;
-      }
-    }
-  }
-}

package/src/network/source-intent.ts

@@ -1,167 +0,0 @@
-/**
- * source-intent.ts — 行级 P2P 协作: 类型 + reserve.lock
- *
- * 为什么: 两台机上的智能体要协作维护同一份源码仓库, 粗粒度 task 协调不够
- * (同一文件不同行会冲突). 用行级 reserve 让 LLM 在改前先广播"我要改 X 行",
- * 对方看到重叠可让出/改方向/强制 merge.
- *
- * 数据流 (P2P RPC 消息, 走现有 P2PDirect.broadcast):
- *   reserve  →  我方申请改 file:[start,end]
- *   ack      →  对方也在这区间, 互相知道, 等 commit-intent 时看谁先到
- *   release  →  我方放弃 (LLM 决定改别的行)
- *   commit-intent → 我方 commit 后广播, 附 diffHash, 对方用 diffHash 验真伪
- *
- * 兜底:
- *   - TTL 5min, reserve 不 release 就过期
- *   - 200ms 等待 + 检冲突, 极端 race 双方都收到 conflict, LLM 自己重选
- *   - diffHash 不去判语义, 行级 merge 后 lefthook 失败 → revert
- */
-import { EventEmitter } from 'events';
-
-/** [start, end] 闭区间, 1-based, 含 start 和 end (跟 editor 一致) */
-export type LineRange = readonly [number, number];
-
-export interface ReserveMsg {
-  type: 'reserve';
-  taskId: string;          // 任务 uuid
-  agent: string;           // 智能体身份 (e.g. "agent-A@mac1")
-  file: string;            // 仓库内相对路径, e.g. "src/llm/foo.ts"
-  lines: LineRange;
-  /** 过期时间 epoch ms; 到期后 reserve.lock 自动清理 */
-  expiresAt: number;
-  ts: number;              // 发出时间, 用于调试/排序
-}
-
-export interface AckMsg {
-  type: 'ack';
-  taskId: string;
-  agent: string;
-  file: string;
-  lines: LineRange;
-  ts: number;
-}
-
-export interface ReleaseMsg {
-  type: 'release';
-  taskId: string;
-  agent: string;
-  file: string;
-  lines: LineRange;
-  ts: number;
-}
-
-export interface CommitIntentMsg {
-  type: 'commit-intent';
-  taskId: string;
-  agent: string;
-  file: string;
-  lines: LineRange;
-  sha: string;             // git commit SHA (短 7 位即可)
-  diffHash: string;        // diff 内容 sha256 前 16 字符
-  ts: number;
-}
-
-export type SourceIntentMsg =
-  | ReserveMsg
-  | AckMsg
-  | ReleaseMsg
-  | CommitIntentMsg;
-
-/** 我方本地的 reserve 记录 (含 ttl) */
-interface LocalReserve {
-  taskId: string;
-  agent: string;
-  file: string;
-  lines: LineRange;
-  expiresAt: number;
-  ts: number;
-}
-
-/**
- * 检测两个 LineRange 是否重叠.
- * 规则: 任一区间的一端落在对方区间内 → 重叠.
- * 不重叠示例: [1,5] vs [6,10] (边界相邻不算重叠).
- */
-export function rangesOverlap(a: LineRange, b: LineRange): boolean {
-  return a[0] <= b[1] && b[0] <= a[1];
-}
-
-/**
- * ReserveLock — 本地内存表, 记录"我方 + 远端"所有 live reserves.
- *
- * 事件:
- *   'added'    新增 reserve (我方或远端)
- *   'removed'  reserve 被释放 / 过期
- *   'conflict' 检测到重叠 (a,b)
- */
-export class ReserveLock extends EventEmitter {
-  /** key = `${file}:${start}-${end}` */
-  private byKey: Map<string, LocalReserve> = new Map();
-  /** TTL: 5 min, 兜底防止对方死掉/网络断后 reserve 永远不释放 */
-  static readonly TTL_MS = 5 * 60 * 1000;
-
-  /** 清理过期 reserve, 触发 'removed' 事件 */
-  sweep(now: number = Date.now()): void {
-    for (const [k, r] of this.byKey) {
-      if (r.expiresAt <= now) {
-        this.byKey.delete(k);
-        this.emit('removed', r);
-      }
-    }
-  }
-
-  /** 我方/远端 reserve, 仅清自己区间后写入 (不清全表, 避免过期 reserve 干扰 add 测试) */
-  add(r: LocalReserve): void {
-    const key = keyOf(r.file, r.lines);
-    const prev = this.byKey.get(key);
-    this.byKey.set(key, r);
-    if (prev) {
-      // 同一区间已被对方 reserve, 我方再 reserve → 触发冲突
-      this.emit('conflict', { a: prev, b: r });
-    } else {
-      this.emit('added', r);
-    }
-  }
-
-  /** 释放指定 reserve (我方 LLM 决定让出时调用) */
-  release(file: string, lines: LineRange): LocalReserve | null {
-    const key = keyOf(file, lines);
-    const r = this.byKey.get(key);
-    if (!r) return null;
-    this.byKey.delete(key);
-    this.emit('removed', r);
-    return r;
-  }
-
-  /** 查询某 (file, lines) 是否已被 reserve (含我方) */
-  isReserved(file: string, lines: LineRange, now: number = Date.now()): LocalReserve | null {
-    this.sweep(now);
-    for (const r of this.byKey.values()) {
-      if (r.file === file && rangesOverlap(r.lines, lines)) {
-        return r;
-      }
-    }
-    return null;
-  }
-
-  /** 取所有 live reserves (给 pi-ai 注入到系统 prompt) */
-  live(now: number = Date.now()): LocalReserve[] {
-    this.sweep(now);
-    return [...this.byKey.values()];
-  }
-
-  /** 调试: dump 全部 */
-  dump(): LocalReserve[] {
-    return [...this.byKey.values()];
-  }
-}
-
-function keyOf(file: string, lines: LineRange): string {
-  return `${file}:${lines[0]}-${lines[1]}`;
-}
-
-/** 算 diffHash (git diff 的 sha256 前 16 字符) */
-export function diffHashOf(diffText: string): string {
-  const crypto = require('crypto') as typeof import('crypto');
-  return crypto.createHash('sha256').update(diffText, 'utf8').digest('hex').slice(0, 16);
-}