@bolloon/bolloon-agent 0.4.18 → 0.4.19

package/dist/agents/agent-registry.js

@@ -13,6 +13,8 @@ import * as path from 'path';
 import { getCIDDatabase } from '../orbitdb/cid-database.js';
 const home = () => process.env.HOME || os.homedir() || '/tmp';
 export const REGISTRY_ORBIT_KEY = 'services';
+/** 网络启动包 meta 键 (networkId/name/version/capacityOfMembers/sharedContextCid) */
+export const REGISTRY_ORBIT_META_KEY = 'meta';
 /** OrbitDB store 名 (按 did 短名确定性) */
 export function registryStoreName(did) {
     const short = String(did || 'local').replace(/[^a-zA-Z0-9-]/g, '_').slice(0, 40) || 'local';
@@ -118,6 +120,28 @@ export class OrbitDBAgentRegistry {
             return orbit;
         return this.loadLocalFromDisk();
     }
+    async writeMeta(meta) {
+        if (!this.ready || !this._store)
+            return { ok: false, error: 'registry store 未就绪 (离线模式)' };
+        try {
+            await this._store.put(REGISTRY_ORBIT_META_KEY, meta);
+            return { ok: true };
+        }
+        catch (e) {
+            return { ok: false, error: String(e?.message || e).slice(0, 120) };
+        }
+    }
+    async readMeta() {
+        if (!this.ready || !this._store)
+            return null;
+        try {
+            const v = await this._store.get(REGISTRY_ORBIT_META_KEY);
+            return v && typeof v === 'object' ? v : null;
+        }
+        catch {
+            return null;
+        }
+    }
     async discover(query) {
         const all = await this.list();
         const q = String(query || '').trim().toLowerCase();

package/dist/agents/gateway-network.js

@@ -182,30 +182,34 @@ export async function joinNetwork(link, deps) {
     // 合并到本地 registry (按 agentId + service.name 去重)
     const registry = deps?.registry ?? getAgentRegistry();
     const local = await registry.list();
-    let joined = 0;
-    for (const svc of remote) {
-        if (!svc?.agentId || !svc?.service?.name)
-            continue;
-        const exists = local.some((l) => l.agentId === svc.agentId && l.service?.name === svc.service?.name);
-        if (!exists) {
+    const remoteServices = Array.isArray(remote) ? remote : [];
+    const { merged, joined } = mergeRemoteServices(remoteServices, local);
+    for (const svc of merged) {
+        if (!local.some((l) => l.agentId === svc.agentId && l.service?.name === svc.service?.name)) {
             await registry.register(svc).catch(() => { });
-            joined++;
         }
     }
-    // 记录成员身份 (持久化 → 重启后自动恢复)
+    // ① 网络启动包 (meta): 拉网络声明 (networkId/名称/版本/容量/共享context CID), 尽力而为
+    const meta = await fetchNetworkMeta(parsed).catch(() => null);
+    const bootstrap = buildNetworkBootstrap(meta);
+    // 记录成员身份 (持久化 → 重启后自动恢复) + 网络启动包信息
     await saveNetworks([
         ...existing,
         {
             link: norm,
             linkKey: identityKey,
             kind: parsed.kind,
-            name: parsed.networkName,
+            name: bootstrap.name || parsed.networkName,
             joinedAt: new Date().toISOString(),
-            serviceCount: remote.length,
+            serviceCount: remoteServices.length,
             lastSyncAt: new Date().toISOString(),
+            networkId: bootstrap.networkId,
+            version: bootstrap.version,
+            capacityOfMembers: bootstrap.capacityOfMembers,
+            sharedContextCid: bootstrap.sharedContextCid,
         },
     ]);
-    return { ok: true, joined, total: remote.length, linkKind: parsed.kind, networkName: parsed.networkName };
+    return { ok: true, joined, total: remoteServices.length, linkKind: parsed.kind, networkName: bootstrap.name || parsed.networkName, networkId: bootstrap.networkId, sharedContextCid: bootstrap.sharedContextCid };
 }
 /** 启动恢复: 重拉所有已加入网络 (失败静默, 保留记录). 返回恢复统计. */
 export async function restoreJoinedNetworks() {
@@ -228,6 +232,156 @@ export async function restoreJoinedNetworks() {
     }
     return { restored, failed, total: nets.length };
 }
+/** 把任意 meta 对象规整成 NetworkBootstrap (纯函数, 容错) */
+export function buildNetworkBootstrap(meta) {
+    const m = meta && typeof meta === 'object' ? meta : {};
+    const str = (v) => (typeof v === 'string' && v.trim() ? v.trim() : undefined);
+    return {
+        networkId: str(m.networkId),
+        name: str(m.name),
+        version: str(m.version),
+        capacityOfMembers: typeof m.capacityOfMembers === 'number' ? m.capacityOfMembers : undefined,
+        sharedContextCid: str(m.sharedContextCid),
+    };
+}
+/** 拉取网络 meta (尽力而为, 失败返回 null): orbitdb('meta' 键) / ipns(network.json) / http(doc.meta) */
+async function fetchNetworkMeta(parsed) {
+    try {
+        if (parsed.kind === 'http') {
+            const r = await fetch(parsed.url, { signal: AbortSignal.timeout(15000) });
+            if (!r.ok)
+                return null;
+            const d = await r.json();
+            return d?.meta ?? null;
+        }
+        if (parsed.kind === 'ipns') {
+            const r = await fetch(`http://127.0.0.1:8080/ipns/${parsed.name}/network.json`, { signal: AbortSignal.timeout(15000) });
+            if (!r.ok)
+                return null;
+            const d = await r.json();
+            return d?.meta ?? d;
+        }
+        if (parsed.kind === 'orbitdb') {
+            const { getCIDDatabase } = await import('../orbitdb/cid-database.js');
+            const db = getCIDDatabase();
+            const store = await db.openStoreByAddress(parsed.address, 'keyvalue');
+            if (!store)
+                return null;
+            const v = await store.get('meta').catch(() => null);
+            return v ?? null;
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+/** 纯函数: 远端服务并入本地 (按 agentId + service.name 去重), 返回合并结果 + 新增数 */
+export function mergeRemoteServices(remote, local) {
+    const out = local.slice();
+    let joined = 0;
+    for (const svc of remote) {
+        if (!svc?.agentId || !svc?.service?.name)
+            continue;
+        const exists = out.some((l) => l.agentId === svc.agentId && l.service?.name === svc.service?.name);
+        if (!exists) {
+            out.push(svc);
+            joined++;
+        }
+    }
+    return { merged: out, joined };
+}
+/** ② 拉取网络画像 (只读, 不落盘): 供 on-join 告知 agent "网络里有什么" */
+export async function pullNetworkProfile(link) {
+    const parsed = parseNetworkLink(link);
+    if (!parsed)
+        return null;
+    let services = null;
+    if (parsed.kind === 'http')
+        services = await fetchRemoteRegistry(parsed.url);
+    else if (parsed.kind === 'ipns')
+        services = await fetchIpnsRegistry(parsed.name);
+    else if (parsed.kind === 'orbitdb')
+        services = await fetchOrbitdbRegistry(parsed.address);
+    const meta = await fetchNetworkMeta(parsed).catch(() => null);
+    if (!services || services.length === 0)
+        return null;
+    return { bootstrap: buildNetworkBootstrap(meta), members: services };
+}
+/**
+ * ③ 成员自描述广播: 把本机服务声明(list .agentId 匹配 self)写回共享网络 store ('services' 合并 self).
+ *   ① ipns/http 无回写 → 只本地登记 (返回 note); ② orbitdb replica 只读时写穿失败 → 非致命 (返回 note).
+ *   opts.members: 本机要广播的成员声明 (通常 = 自己注册的 AgentService 列表).
+ */
+export async function networkShareSelf(link, members, opts) {
+    if (!members || members.length === 0)
+        return { ok: true, note: '无本机成员声明可广播' };
+    const parsed = parseNetworkLink(link);
+    if (!parsed)
+        return { ok: false, error: '链接无法解析' };
+    if (parsed.kind !== 'orbitdb') {
+        return { ok: true, note: `${parsed.kind} 无回写能力, 已本地登记 (发起方自托管 registry 应含本机)` };
+    }
+    try {
+        const { getCIDDatabase } = await import('../orbitdb/cid-database.js');
+        const db = getCIDDatabase();
+        const store = await db.openStoreByAddress(parsed.address, 'keyvalue');
+        if (!store)
+            return { ok: false, error: '网络 store 不可达' };
+        const cur = (await store.get('services').catch(() => null));
+        const arr = Array.isArray(cur) ? cur.slice() : [];
+        for (const m of members) {
+            const i = arr.findIndex((s) => s.agentId === m.agentId && s.service?.name === m.service?.name);
+            const entry = { ...m, updatedAt: new Date().toISOString(), registeredAt: m.registeredAt || new Date().toISOString() };
+            if (i >= 0)
+                arr[i] = entry;
+            else
+                arr.push(entry);
+        }
+        await store.put('services', arr);
+        return { ok: true, note: `已广播 ${members.length} 条本机声明到网络` };
+    }
+    catch (e) {
+        return { ok: false, error: `写穿失败(疑似只读 replica): ${String(e?.message || e).slice(0, 120)}`, note: '已在本地登记, 可在你的分享链接中带上本机' };
+    }
+}
+/**
+ * ① 拉取共享 context (由启动包 sharedContextCid 指向): 从本地 IPFS 网关读文本返回,
+ *   调用方负责注入本地 context (了解"所有信息"的最后一段).
+ */
+export async function pullNetworkSharedContext(cid) {
+    try {
+        const r = await fetch(`http://127.0.0.1:8080/ipfs/${cid}`, { signal: AbortSignal.timeout(15000) });
+        if (!r.ok)
+            return null;
+        return await r.text();
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * ① 发布共享 context 到 OrbitDB (内容寻址), 返回 CID — 供 shareNetworkLink 的 sharedContextCid,
+ *   手机/PC 入网后拉取即"近期上下文同步". opts.share=true 时把块放入 helia blockstore 供网络拉取.
+ */
+export async function publishNetworkSharedContext(text, opts) {
+    try {
+        const { getCIDDatabase } = await import('../orbitdb/cid-database.js');
+        const db = getCIDDatabase();
+        const rec = await db.save({ agentId: opts?.agentId || 'bolloon-network', type: 'context', content: text });
+        let cid = rec.id;
+        if (opts?.share !== false) {
+            try {
+                cid = await db.share(cid);
+            }
+            catch { /* 分享失败仍可用 CID 读 */ }
+        }
+        return { ok: true, cid };
+    }
+    catch (e) {
+        return { ok: false, error: String(e?.message || e).slice(0, 140) };
+    }
+}
 // ============ 分享链接 ============
 /**
  * 生成本机可分享的网络链接: orbitdb://<registry storeAddress>?name=<网络名>.
@@ -244,8 +398,24 @@ export async function shareNetworkLink(opts) {
         if (!registry.ready || !registry.storeAddress) {
             return { ok: false, error: 'OrbitDB registry 未就绪 (离线模式). 备选: 把 registry 列表发布成 https://.../registry 端点分享' };
         }
-        const name = encodeURIComponent(String(opts?.name || registry.storeName || 'bolloon-network'));
-        return { ok: true, link: `orbitdb://${registry.storeAddress}?name=${name}` };
+        // ① 全量启动包: 把 networkId/名称/版本/容量/共享context CID 写进共享 store (尽力而为, 失败仍分享)
+        const networkId = opts?.meta?.networkId || registry.storeName;
+        const name = String(opts?.name || opts?.meta?.name || registry.storeName || 'bolloon-network');
+        const metaObj = {
+            networkId,
+            name,
+            version: opts?.meta?.version,
+            capacityOfMembers: opts?.meta?.capacityOfMembers,
+            sharedContextCid: opts?.meta?.sharedContextCid,
+        };
+        let note;
+        if (registry.writeMeta) {
+            const w = await registry.writeMeta(metaObj).catch(() => ({ ok: false, error: 'writeMeta 异常' }));
+            if (!w.ok)
+                note = `meta 写共享库失败 (${w.error || '未知'}) — 读方仍可拉到服务, 但拿不到启动包`;
+        }
+        const encodedName = encodeURIComponent(name);
+        return { ok: true, link: `orbitdb://${registry.storeAddress}?name=${encodedName}`, note };
     }
     catch (e) {
         return { ok: false, error: `生成分享链接失败: ${String(e?.message || e).slice(0, 160)}` };
@@ -268,7 +438,15 @@ export async function maybeAutoJoinGateway(text, deps) {
             return null; // 已在网络, 静默
         if (r.ok) {
             const netName = r.networkName ? `「${r.networkName}」` : ''; // URLSearchParams 已 decode
-            return `🆕 已自动加入 Agent 网络${netName} (${r.linkKind}): 拉取 ${r.total} 个服务, 新增 ${r.joined} 个。用 gateway_status 查看, gateway_call 调用网络里的服务。`;
+            // ② on-join 广播: 写入自己的服务声明 (orbitdb 可回写时), 非致命
+            let selfNote = '';
+            if (deps?.self && deps.self.length > 0) {
+                const s = await networkShareSelf(link, deps.self, deps).catch(() => null);
+                selfNote = s?.ok ? ' · 已广播本机声明' : (s?.note ? ` · ${s.note}` : ' · 本机声明广播失败');
+            }
+            const bootPart = r.networkId ? ` (net=${String(r.networkId).slice(0, 16)})` : '';
+            const ctxPart = r.sharedContextCid ? ` · 共享ctx:${String(r.sharedContextCid).slice(0, 12)}` : '';
+            return `🆕 已自动加入 Agent 网络${netName}${bootPart} (${r.linkKind}): 拉取 ${r.total} 个服务, 新增 ${r.joined} 个${ctxPart}${selfNote}。用 gateway_status 查看, gateway_call 调用网络里的服务。`;
         }
         return `⚠️ 检测到 Agent 网络链接 (${r.linkKind || 'unknown'}) 但加入失败: ${r.error}`;
     }

package/dist/agents/network-link.js

@@ -0,0 +1,33 @@
+// ─── 网络链接纯函数 (无 Node 依赖, 桌面/手机浏览器共用) ────────────────────
+//   parseNetworkLink / detectGatewayLink 从 gateway-network.ts 抽出,
+//   供 browser 端 (mobile-gateway) 复用, 不拖 OrbitDB/fs 进 WebView.
+/** 解析链接字符串 → ParsedNetworkLink (剥离 ?name= query) */
+export function parseNetworkLink(link) {
+    const l = String(link || '').trim();
+    if (!l)
+        return null;
+    const [base, query] = l.split('?');
+    let networkName;
+    try {
+        networkName = query ? (new URLSearchParams(query).get('name') || undefined) : undefined;
+    }
+    catch { /* 忽略坏 query */ }
+    if (base.startsWith('ipns://'))
+        return { kind: 'ipns', value: base.slice('ipns://'.length), url: base, networkName };
+    if (base.startsWith('orbitdb://')) {
+        let address = base.slice('orbitdb://'.length);
+        if (!address.startsWith('/'))
+            address = `/${address}`;
+        return { kind: 'orbitdb', value: address, url: base, networkName };
+    }
+    if (base.startsWith('http://') || base.startsWith('https://'))
+        return { kind: 'http', value: base, url: base, networkName };
+    return null;
+}
+/** 从消息文本检测 gateway 链接 (自动加入触发器用) */
+export function detectGatewayLink(text) {
+    const t = String(text || '');
+    const re = /(orbitdb:\/\/\/?orbitdb\/[^\s)'"<>，。；]+|ipns:\/\/[^\s)'"<>，。；]+|https?:\/\/[^\s)'"<>，。；]*\/registry(?:\?[^\s)'"<>，。；]*)?)/;
+    const m = re.exec(t);
+    return m ? m[1].trim() : null;
+}

package/dist/index.js

@@ -1122,6 +1122,74 @@ async function processInput(input, comm) {
     }
     // ==================== 2026-08-06: 系统命令组 (/model /now /ipfs /memory ...) ====================
     const cmd = trimmed.toLowerCase();
+    // /net — Agent 网络快捷命令 (join/status/ctx, 2026-09-08)
+    if (cmd === '/net' || cmd.startsWith('/net ')) {
+        const arg = trimmed.slice(4).trim();
+        if (arg.toLowerCase().startsWith('join ')) {
+            const link = arg.slice(5).trim();
+            const { joinNetwork, pullNetworkProfile, pullNetworkSharedContext, networkShareSelf } = await import('./agents/gateway-network.js');
+            const r = await joinNetwork(link);
+            if (!r.ok) {
+                appendLine(`${C_ERROR}加入失败: ${r.error}${RESET}`);
+                return;
+            }
+            appendLine(r.already ? `${C_DIM}已在网络 (${r.linkKind})${RESET}` : `${C_OK}已加入${RESET} (${r.linkKind}) · ${r.total} 服务 · 新增 ${r.joined}${r.networkId ? ` · ${C_DIM}net=${String(r.networkId).slice(0, 16)}${RESET}` : ''}`);
+            const profile = await pullNetworkProfile(link).catch(() => null);
+            if (profile?.members?.length) {
+                appendLine(`${C_ACCENT}网络画像:${RESET}`);
+                for (const m of profile.members.slice(0, 8))
+                    appendLine(`  ${m.name} ${C_DIM}(${String(m.agentId).slice(0, 16)}…) · ${m.service?.name || ''}${RESET}`);
+            }
+            if (profile?.bootstrap?.sharedContextCid) {
+                const ctx = await pullNetworkSharedContext(profile.bootstrap.sharedContextCid).catch(() => null);
+                if (ctx)
+                    appendLine(`${C_DIM}📡 共享context: ${ctx.slice(0, 140).replace(/\n/g, ' ')}${RESET}`);
+            }
+            try {
+                const self = { agentId: cliAgentId || 'cli-agent', name: cliAgentName || 'bolloon', wallet: '0x0', service: { name: 'agent', description: 'bolloon cli node', price: { amount: '0', currency: 'USDC', per: 'query' } } };
+                const s = await networkShareSelf(link, [self]);
+                if (s?.ok && s.note)
+                    appendLine(`${C_DIM}${s.note}${RESET}`);
+            }
+            catch { /* 广播失败不致命 */ }
+            return;
+        }
+        if (arg.toLowerCase() === 'status' || arg === '') {
+            const { listJoinedNetworks } = await import('./agents/gateway-network.js');
+            const nets = await listJoinedNetworks();
+            appendLine(nets.length
+                ? `🔗 ${C_ACCENT}已加入网络:${RESET}\n` + nets.map((n) => `  ${n.name || n.kind} ${C_DIM}(${n.serviceCount}S${n.networkId ? ` · ${String(n.networkId).slice(0, 16)}` : ''})${RESET}`).join('\n')
+                : `${C_DIM}未加入任何网络 — /net join <链接>${RESET}`);
+            return;
+        }
+        if (arg.toLowerCase() === 'qr') {
+            const { shareNetworkLink } = await import('./agents/gateway-network.js');
+            const sh = await shareNetworkLink({ name: cliAgentName || 'bolloon' });
+            if (!sh.link) {
+                appendLine(`${C_ERROR}生成链接失败: ${sh.error}${RESET}`);
+                return;
+            }
+            const { buildQrPayload, encodeQrTerminal } = await import('./web/qr.js');
+            const payload = buildQrPayload({ link: sh.link, version: '1' });
+            const qr = await encodeQrTerminal(payload);
+            if (qr) {
+                appendLine(renderMessageBox({ title: '📷 扫码入网', body: `${qr}\n\n${C_DIM}链接 (手机粘贴也可): ${payload}${RESET}`, color: C_ACCENT, maxLines: 0 }));
+            }
+            else {
+                appendLine(`${C_ERROR}二维码生成失败 — 链接: ${payload}${RESET}`);
+            }
+            return;
+        }
+        if (arg.toLowerCase().startsWith('ctx ')) {
+            const text = arg.slice(4).trim();
+            const { publishNetworkSharedContext } = await import('./agents/gateway-network.js');
+            const p = await publishNetworkSharedContext(text);
+            appendLine(p.ok ? `${C_OK}共享context已发布:${RESET} ${p.cid}` : `${C_ERROR}发布失败: ${p.error}${RESET}`);
+            return;
+        }
+        appendLine(`${C_DIM}用法: /net join <链接> | /net status | /net ctx <文本>${RESET}`);
+        return;
+    }
     // /model — 模型供应商选择器 (ink 交互渲染, 复用 MentionPopup)
     if (cmd === '/model') {
         try {

package/dist/web/mobile-agent.js

@@ -13,6 +13,8 @@
 // ============ 身份 (WebCrypto) ============
 const IDENTITY_DB = 'bolloon-mobile';
 let _identity = null;
+// #2 手机自动入网 (browser-safe gateway, 与桌面同一协议): 检测到链接自动 join
+import { mobileAutoJoinGateway } from './mobile-gateway.js';
 async function generateDID() {
     const bytes = crypto.getRandomValues(new Uint8Array(32));
     const digest = await crypto.subtle.digest('SHA-256', bytes);
@@ -269,6 +271,10 @@ export async function handleIncomingAgentMessage(type, payload, fromPeer) {
             try {
                 const { text, channelId } = JSON.parse(payload);
                 notifyInboundChat(text || '', channelId || '', fromPeer);
+                // #2 手机自动入网: 消息里带 network 链接 → 自动 join (browser-safe, 不阻塞回复)
+                if (text && /orbitdb:\/\/|ipns:\/\/|https?:\/\/[^\s]*\/registry/.test(text)) {
+                    void mobileAutoJoinGateway(text).catch(() => { });
+                }
                 const reply = await runLocalAgent(text || '');
                 await _send('agent.chat.reply', JSON.stringify({ channelId, text: reply, fromPublicKey: _ownDid }), fromPeer);
             }