@bolloon/bolloon-agent 0.4.22 → 0.4.24

package/dist/agents/gateway-join.js

@@ -0,0 +1,271 @@
+/**
+ * gateway-join.ts — 文档驱动的「加入全球智能体网络」编排 (2026-09-15)
+ *
+ * 背景: 手机端 / PC 端的人类入口只有一句话 —— `read https://bolloon.cn/bolloon-gateway-join.md`
+ * (默认 prompt, 见 src/web/mobile.js DEFAULT_JOIN_PROMPT)。文档本身是 SKILL.md 形状的入网说明,
+ * 但文档第 1-8 节写的是 SDK 伪码 (KeyManager / p2pNetwork.createNode / buildManifestRequest),
+ * 智能体手里只有工具, 照抄不了 → 需要一个工具把整条链路真正串起来。
+ *
+ * 本模块把「读文档 → 入网」收成一个可验证的闭环:
+ *   ① 读入网说明 (http(s), 校验 frontmatter 是 bolloon-gateway-join)
+ *   ② 确保 DID 身份
+ *   ③ 确保 P2P 节点 (拿 peerId)
+ *   ④ 注册本地 manifest (文档第 3 节 /api/agent/register 的等效物: setLocalManifest)
+ *   ⑤ 建成可分享的网络 (orbitdb registry 链接) + 登记到本机 Agent 服务注册表
+ *   ⑥ 落盘入网态 (幂等: 同 url 重复入网 → already)
+ *
+ * 诚实原则: 每一步都记 step.note; 拿不到的 (文档不可达 / 非入网说明 / 节点未就绪 / registry 离线)
+ * 一律如实报 ok=false 或 step.ok=false, 不假装入网成功。
+ */
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+export const DEFAULT_GATEWAY_JOIN_DOC = 'https://bolloon.cn/bolloon-gateway-join.md';
+/** 入网说明文档的识别名 (frontmatter name) / 能力标记 */
+export const GATEWAY_JOIN_DOC_NAME = 'bolloon-gateway-join';
+export const GATEWAY_JOIN_CAPABILITY = 'gateway-join';
+const home = () => process.env.HOME || os.homedir() || '/tmp';
+const STATE_FILE = () => path.join(home(), '.bolloon', 'gateway-join.json');
+/** 极简 frontmatter 解析 (只认 name/version/capabilities 三个键, 够用且不引 yaml 依赖) */
+export function parseSkillFrontmatter(text) {
+    const raw = String(text || '');
+    const m = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/.exec(raw);
+    if (!m)
+        return { body: raw };
+    const head = m[1];
+    const body = raw.slice(m[0].length);
+    const out = {};
+    for (const line of head.split(/\r?\n/)) {
+        const kv = /^([A-Za-z_][\w-]*)\s*:\s*(.*)$/.exec(line.trim());
+        if (!kv)
+            continue;
+        const key = kv[1].toLowerCase();
+        const val = kv[2].trim();
+        if (key === 'name')
+            out.name = val.replace(/^["']|["']$/g, '');
+        else if (key === 'version')
+            out.version = val.replace(/^["']|["']$/g, '');
+        else if (key === 'capabilities') {
+            out.capabilities = val.replace(/^\[|\]$/g, '').split(',').map((s) => s.trim().replace(/^["']|["']$/g, '')).filter(Boolean);
+        }
+    }
+    return { ...out, body };
+}
+/** 从文档文本判定「这是不是入网说明」 */
+export function isGatewayJoinDoc(text) {
+    const fm = parseSkillFrontmatter(text);
+    if (fm.name === GATEWAY_JOIN_DOC_NAME)
+        return true;
+    if (fm.capabilities?.includes(GATEWAY_JOIN_CAPABILITY))
+        return true;
+    // 没有 frontmatter 也允许 (纯正文版本): 标题 + 关键步骤同时出现才算
+    return /加入网关|加入 Bolloon|bolloon-gateway-join/.test(text) && /api\/agent\/register/.test(text);
+}
+export async function readGatewaySkillDoc(url, opts = {}) {
+    const u = String(url || '').trim();
+    if (!/^https?:\/\//i.test(u))
+        return { ok: false, url: u, error: `url 必须以 http(s):// 开头 (收到: ${u.slice(0, 60)})` };
+    let text = opts.text;
+    if (text === undefined) {
+        const f = opts.fetchImpl || fetch;
+        try {
+            const r = await f(u, { signal: AbortSignal.timeout(opts.timeoutMs ?? 15000) });
+            if (!r.ok)
+                return { ok: false, url: u, error: `文档不可达 (HTTP ${r.status})` };
+            text = await r.text();
+        }
+        catch (e) {
+            return { ok: false, url: u, error: `文档不可达: ${String(e?.message || e).slice(0, 140)}` };
+        }
+    }
+    const raw = String(text || '');
+    if (!raw.trim())
+        return { ok: false, url: u, error: '文档为空' };
+    const fm = parseSkillFrontmatter(raw);
+    if (!isGatewayJoinDoc(raw)) {
+        return { ok: false, url: u, name: fm.name, error: '这不是 Bolloon 网关入网说明 (缺 name: bolloon-gateway-join), 拒绝据此入网' };
+    }
+    return { ok: true, url: u, name: fm.name, version: fm.version, capabilities: fm.capabilities, body: fm.body };
+}
+export async function getGatewayJoinState() {
+    try {
+        const raw = fs.readFileSync(STATE_FILE(), 'utf-8');
+        const parsed = JSON.parse(raw);
+        return parsed && typeof parsed === 'object' ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+export function writeGatewayJoinState(state) {
+    try {
+        const f = STATE_FILE();
+        fs.mkdirSync(path.dirname(f), { recursive: true });
+        fs.writeFileSync(f, JSON.stringify(state, null, 2), { mode: 0o600 });
+    }
+    catch { /* 落盘失败不影响本次入网, 只影响幂等/重启恢复 */ }
+}
+/** 节点初始化并发去重 (同一进程内只起一次 libp2p 节点) */
+let nodeInitPromise = null;
+/**
+ * 确保本机 libp2p 节点在跑 (文档第 2 节 p2pNetwork.createNode 的等价物)。
+ * p2pNetwork.createNode 不是幂等的, 所以先用 getNodePeerId() 探测 + 单飞 promise 兜住并发。
+ */
+export async function ensureGatewayNode(deps = {}) {
+    if (deps.peerId)
+        return { ok: true, peerId: deps.peerId, started: false };
+    try {
+        const { p2pNetwork } = await import('../network/p2p.js');
+        const existing = String(p2pNetwork.getNodePeerId?.() || '');
+        if (existing)
+            return { ok: true, peerId: existing, multiaddrs: p2pNetwork.getWsMultiaddrs?.() || [], started: false };
+        if (!nodeInitPromise) {
+            const timeoutMs = deps.nodeTimeoutMs ?? 25_000;
+            nodeInitPromise = (async () => {
+                try {
+                    const info = await Promise.race([
+                        p2pNetwork.createNode({
+                            enableRelay: true,
+                            enableRelayServer: true,
+                            enableAutoNat: deps.enableAutoNat ?? false,
+                            enableUPnP: deps.enableUPnP ?? false,
+                        }),
+                        new Promise((_, rej) => setTimeout(() => rej(new Error(`节点初始化超时 (${timeoutMs}ms)`)), timeoutMs)),
+                    ]);
+                    const peerId = String(info?.peerId || p2pNetwork.getNodePeerId?.() || '');
+                    return peerId
+                        ? { ok: true, peerId, multiaddrs: (info?.multiaddrs || []) }
+                        : { ok: false, error: '节点起来了但拿不到 peerId' };
+                }
+                catch (e) {
+                    return { ok: false, error: String(e?.message || e).slice(0, 160) };
+                }
+                finally {
+                    // 失败也允许下次重试 (成功时后续调用被 getNodePeerId 分支短路)
+                    setTimeout(() => { nodeInitPromise = null; }, 1000);
+                }
+            })();
+        }
+        const r = await nodeInitPromise;
+        return { ...r, started: !!r.ok };
+    }
+    catch (e) {
+        return { ok: false, error: String(e?.message || e).slice(0, 160) };
+    }
+}
+function readUserDid() {
+    try {
+        const f = path.join(home(), '.bolloon', 'identity', 'user.json');
+        const parsed = JSON.parse(fs.readFileSync(f, 'utf-8'));
+        return String(parsed?.did || '');
+    }
+    catch {
+        return '';
+    }
+}
+/**
+ * 文档驱动入网: 读说明 → DID → 节点 → manifest → 建网 → 落盘。
+ * 核心三步 (文档/DID/manifest) 任一失败 → ok=false; 网络/服务登记失败只记 note (部分成功不谎报)。
+ */
+export async function joinGlobalGateway(opts = {}) {
+    const url = String(opts.url || DEFAULT_GATEWAY_JOIN_DOC).trim();
+    const deps = opts.deps || {};
+    const steps = [];
+    // 幂等: 已经按同一文档入过网 → already (不重复建, 但仍返回既有信息)
+    const prev = await getGatewayJoinState();
+    if (prev && prev.url === url && prev.did && !opts.force) {
+        return {
+            ok: true, already: true, url, did: prev.did, peerId: prev.peerId,
+            networkLink: prev.networkLink, networkId: prev.networkId,
+            steps: [{ step: '幂等', ok: true, note: `已于 ${prev.joinedAt} 入网 (${prev.did.slice(0, 24)}…)` }],
+        };
+    }
+    // ① 读入网说明
+    const doc = await readGatewaySkillDoc(url, { fetchImpl: deps.fetchImpl, text: deps.docText });
+    steps.push({ step: '读入网说明', ok: doc.ok, note: doc.ok ? `${doc.name || 'doc'} v${doc.version || '?'} (${(doc.body || '').length} 字符)` : (doc.error || '') });
+    if (!doc.ok)
+        return { ok: false, url, error: doc.error, steps };
+    // ② DID 身份
+    const did = String(opts.did || deps.did || readUserDid() || '');
+    steps.push({ step: 'DID 身份', ok: !!did, note: did ? `${did.slice(0, 30)}…` : '本机无 DID (先运行 bolloon 让 server 生成 ~/.bolloon/identity/user.json)' });
+    if (!did)
+        return { ok: false, url, error: '缺少 DID 身份, 无法入网', steps };
+    const name = String(opts.name || 'bolloon-agent');
+    // ③ P2P 节点 (文档第 2 节: p2pNetwork.createNode) — 起不来的话如实在 note 里说
+    const node = await ensureGatewayNode(deps);
+    const peerId = String(node.peerId || '');
+    const multiaddrs = node.multiaddrs || [];
+    steps.push({
+        step: 'P2P 节点',
+        ok: !!peerId,
+        note: peerId ? `peerId=${peerId.slice(0, 16)}…${node.started ? ' (本次启动)' : ' (已在跑)'}` : `节点未就绪: ${node.error || '未知原因'}`,
+    });
+    // ③b 登记节点端点 + 广播地址 (文档第 2/7 节) — 非致命
+    if (peerId) {
+        try {
+            const { initializeAgentNetwork, broadcastOwnAddress } = await import('../network/agent-network.js');
+            await initializeAgentNetwork(did, name, peerId, multiaddrs);
+            await broadcastOwnAddress().catch(() => { });
+            steps.push({ step: '登记节点端点 + 广播地址', ok: true, note: `multiaddrs=${multiaddrs.length} 条` });
+        }
+        catch (e) {
+            steps.push({ step: '登记节点端点 + 广播地址', ok: false, note: `失败: ${String(e?.message || e).slice(0, 120)}` });
+        }
+    }
+    // ④ 注册本地 manifest (文档第 3 节)
+    const capabilities = (opts.capabilities && opts.capabilities.length ? opts.capabilities : ['chat', 'gateway-join']).map(String);
+    const entry = { id: `${name}-main`.replace(/\s+/g, '-'), name, capabilities, status: 'active', ...(peerId ? { peerId } : {}) };
+    let registered = false;
+    try {
+        if (deps.registerManifest) {
+            deps.registerManifest({ ownerName: name, ownerPublicKey: did, agents: [entry] });
+            registered = true;
+        }
+        else {
+            const { setLocalManifest, getLocalManifest } = await import('./agent-manifest-protocol.js');
+            setLocalManifest({ ownerName: name, ownerPublicKey: did, agents: [entry] });
+            registered = (getLocalManifest().agents || []).some((a) => a.id === entry.id);
+        }
+    }
+    catch (e) {
+        steps.push({ step: '注册 manifest', ok: false, note: `注册失败: ${String(e?.message || e).slice(0, 120)}` });
+        return { ok: false, url, did, error: 'manifest 注册失败', steps };
+    }
+    steps.push({ step: '注册 manifest', ok: registered, note: registered ? `agents=[${entry.id}] capabilities=[${capabilities.join(',')}]` : 'register 后读回为空' });
+    if (!registered)
+        return { ok: false, url, did, error: 'manifest 注册后读回为空', steps };
+    // ⑤ 建网 (可分享的 orbitdb 网络链接) — 离线/registry 未就绪时如实记 note
+    let networkLink;
+    let networkId;
+    try {
+        const share = deps.shareLink
+            ? await deps.shareLink({ name })
+            : await (await import('./gateway-network.js')).shareNetworkLink({ name });
+        if (share.ok && share.link) {
+            networkLink = share.link;
+            networkId = new URLSearchParams(share.link.split('?')[1] || '').get('name') || undefined;
+            steps.push({ step: '建成网络 (可分享链接)', ok: true, note: share.link.slice(0, 72) });
+        }
+        else {
+            steps.push({ step: '建成网络 (可分享链接)', ok: false, note: `未建成: ${share.error || 'registry 未就绪 (离线模式)'}` });
+        }
+    }
+    catch (e) {
+        steps.push({ step: '建成网络 (可分享链接)', ok: false, note: `异常: ${String(e?.message || e).slice(0, 120)}` });
+    }
+    // ⑥ 登记到本机 Agent 服务注册表 (让他方按能力发现/委派)
+    try {
+        const r = deps.registerService
+            ? await deps.registerService({ capability: capabilities[0], did, name })
+            : await (await import('./agent-gateway.js')).gatewayRegisterAgent({ capability: capabilities[0], description: `${name} 入网节点`, price: '0', per: 'task' }, { did, name, wallet: '' });
+        steps.push({ step: '服务登记 (可被发现)', ok: !!r?.ok, note: r?.ok ? '已写入本机 registry' : (r?.error || '未写入') });
+    }
+    catch (e) {
+        steps.push({ step: '服务登记 (可被发现)', ok: false, note: `异常: ${String(e?.message || e).slice(0, 120)}` });
+    }
+    // ⑦ 落盘入网态 (幂等 + 重启恢复)
+    writeGatewayJoinState({ url, did, name, capabilities, peerId: peerId || undefined, networkLink, networkId, joinedAt: new Date().toISOString() });
+    steps.push({ step: '落盘入网态', ok: (await getGatewayJoinState())?.url === url, note: STATE_FILE() });
+    return { ok: true, url, did, peerId: peerId || undefined, networkLink, networkId, docVersion: doc.version, steps };
+}
+export default { DEFAULT_GATEWAY_JOIN_DOC, readGatewaySkillDoc, isGatewayJoinDoc, parseSkillFrontmatter, joinGlobalGateway, getGatewayJoinState, writeGatewayJoinState };

package/dist/agents/pi-sdk-tools.js

@@ -1031,12 +1031,23 @@ export function registerBuiltinTools(ctx) {
     // 通用文件读取 (M4)
     ctx.tools.set('read_file', {
         name: 'read_file',
-        description: '读取任意文件内容 (相对 cwd). 只读操作, 无白名单限制.',
-        parameters: { path: '相对路径 (必填)', startLine: '起始行号 (可选, 默认 0)', maxLines: '最大行数 (可选, 默认 500)' },
+        description: '读取任意文件内容 (相对 cwd); 也支持 http(s) URL (如 "read https://…/doc.md" 这种口令 → 直接给 URL 即可). 只读操作, 无白名单限制.',
+        parameters: { path: '相对路径或 http(s) URL (必填)', startLine: '起始行号 (可选, 默认 0)', maxLines: '最大行数 (可选, 默认 500)' },
         execute: async (args) => {
             const relPath = String(args.path || '').trim();
             if (!relPath)
                 return { success: false, error: 'path 必填' };
+            // 2026-09-15: URL 直读 — 人类口令 "read <url>" 落到的就是本工具, 之前会 ENOENT (当成相对路径)
+            if (/^https?:\/\//i.test(relPath)) {
+                const r = await readUrlAsText(relPath);
+                if (!r.ok)
+                    return { success: false, error: `读取 URL 失败: ${r.error}` };
+                const start = Math.max(0, parseInt(String(args.startLine || '0')) || 0);
+                const max = parseInt(String(args.maxLines || '500')) || 500;
+                const lines = String(r.text || '').split('\n');
+                const slice = lines.slice(start, start + max);
+                return { success: true, output: `🌐 ${relPath} (第 ${start + 1}-${start + slice.length} 行, 共 ${lines.length} 行):\n${slice.map((l, i) => `${String(start + i + 1).padStart(4)} | ${l}`).join('\n')}` };
+            }
             try {
                 const absPath = path.resolve(ctx.cwd, relPath);
                 const content = fsSync.readFileSync(absPath, 'utf-8');
@@ -1175,6 +1186,25 @@ export function registerBuiltinTools(ctx) {
     // Web 上网工具 (2026-08-04) — fetch_url + web_search
     // 用 undici request (独立连接池, 与 pi-ai 一致, 避开全局 fetch 僵尸连接问题)
     // ============================================================
+    /** 读一个 http(s) URL 的正文 (curl, 兼容 TLS 指纹风控). read_file 的 URL 分支复用. 函数声明提升, 上面可调用. */
+    async function readUrlAsText(url, maxChars = 60_000) {
+        try {
+            const { execFile } = await import('child_process');
+            const { promisify } = await import('util');
+            const pExecFile = promisify(execFile);
+            const { stdout, stderr } = await pExecFile('curl', [
+                '-sL', '--max-time', '25',
+                '-A', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0 Safari/537.36',
+                url,
+            ], { maxBuffer: 4 * 1024 * 1024, timeout: 30_000 });
+            if (!stdout)
+                return { ok: false, error: String(stderr || '空响应').slice(0, 200) };
+            return { ok: true, text: String(stdout).slice(0, maxChars) };
+        }
+        catch (e) {
+            return { ok: false, error: String(e?.message || e).slice(0, 200) };
+        }
+    }
     ctx.tools.set('fetch_url', {
         name: 'fetch_url',
         description: '抓取一个 URL 的网页内容并转成纯文本. 适合查文档/新闻/API 页面. 返回前 4000 字符. HTML 自动去标签, JSON/文本原样返回. (走 curl, 兼容 TLS 指纹风控)',
@@ -2835,6 +2865,10 @@ export function registerBuiltinTools(ctx) {
             const link = String(args.link || '').trim();
             if (!link)
                 return { success: false, error: 'link 必填 (ipns:// / orbitdb:// / https://)' };
+            // 2026-09-15: 入网说明文档 (.md) 不是 registry 链接 — 别静默当 registry 拉, 指到正确工具
+            if (/^https?:\/\//i.test(link) && (/\.md(\?|#|$)/i.test(link) || /gateway-join/i.test(link))) {
+                return { success: false, error: `这是一个「入网说明文档」而不是网络链接。请改用 join_global_gateway (url=${link}) 走文档驱动入网。` };
+            }
             try {
                 const { joinNetwork } = await import('./gateway-network.js');
                 const r = await joinNetwork(link);
@@ -2847,6 +2881,45 @@ export function registerBuiltinTools(ctx) {
             }
         },
     });
+    // ============================================================
+    // join_global_gateway (2026-09-15) — 文档驱动的「加入全球智能体网络」
+    // 人类口令只有一句: `read https://bolloon.cn/bolloon-gateway-join.md`
+    // 文档写的是 SDK 伪码, agent 手里只有工具 → 本工具把整条链路串成闭环:
+    // 读说明 → DID → P2P 节点 → 注册 manifest → 建成可分享网络 → 服务登记 → 落盘(幂等)
+    // ============================================================
+    ctx.tools.set('join_global_gateway', {
+        name: 'join_global_gateway',
+        description: '按「入网说明文档」加入全球智能体网络 (完整闭环: 读文档 → DID 身份 → P2P 节点 → 注册本地 manifest → 建成可分享的网络 → 服务登记 → 落盘). 默认文档即 https://bolloon.cn/bolloon-gateway-join.md (人类口令 "read <该文档>" 时用本工具)。幂等: 重复入网返回 already。文档不可达或不是入网说明 → 如实失败, 不假装入网。',
+        parameters: {
+            url: '入网说明文档 URL (可选, 默认 https://bolloon.cn/bolloon-gateway-join.md)',
+            name: '本智能体名字 (可选, 默认取当前身份名)',
+            capabilities: '声明能力, 逗号分隔 (可选, 默认 chat,gateway-join)',
+            force: 'true = 忽略幂等重新入网 (可选)',
+        },
+        execute: async (args) => {
+            try {
+                const { joinGlobalGateway } = await import('./gateway-join.js');
+                const caps = String(args.capabilities || '').split(',').map((s) => s.trim()).filter(Boolean);
+                const r = await joinGlobalGateway({
+                    url: String(args.url || '').trim() || undefined,
+                    did: ctx.identity?.did || undefined,
+                    name: String(args.name || '').trim() || ctx.identity?.name || undefined,
+                    capabilities: caps.length ? caps : undefined,
+                    force: String(args.force || '') === 'true',
+                });
+                const lines = r.steps.map((s) => `${s.ok ? '✓' : '✗'} ${s.step}: ${s.note}`);
+                if (!r.ok)
+                    return { success: false, error: `${r.error}\n${lines.join('\n')}` };
+                return {
+                    success: true,
+                    output: `🌐 已加入全球智能体网络${r.already ? ' (已在网, 幂等)' : ''}\nDID: ${r.did}\npeerId: ${r.peerId || '(节点后台启动中)'}${r.networkLink ? `\n可分享网络链接: ${r.networkLink}` : ''}\n${lines.join('\n')}`,
+                };
+            }
+            catch (e) {
+                return { success: false, error: `join_global_gateway 失败: ${String(e?.message || e).slice(0, 200)}` };
+            }
+        },
+    });
     ctx.tools.set('gateway_status', {
         name: 'gateway_status',
         description: '查看 Agent 网络状态 (已注册服务 + 信誉 + 已加入的网络).',

package/dist/agents/pi-sdk.js

@@ -1473,6 +1473,8 @@ ${PiAgentSession.TOOL_SELECTION_GUIDE}
                     role: 'assistant',
                     content: reply,
                     toolCalls: toolCalls.length > 1 ? toolCalls : [toolCalls[0]],
+                    // 2026-09-15: 思考模式思维链原样存回 (下一轮带 tools 的请求必须回带, 否则 deepseek 400)
+                    reasoningContent: response?.reasoningContent,
                 });
                 // 2026-08-09: 并发执行本轮所有工具 (Hermes 式 Agent Runtime: 一轮内多工具并行,
                 //   一轮没跑完之前不中断 — 工具执行不检查 abort, 全部完成才 continue 下一轮)
@@ -1747,7 +1749,8 @@ ${PiAgentSession.TOOL_SELECTION_GUIDE}
                 // LLM 返回的不是 tool call 格式
                 this.messageHistory.push({
                     role: 'assistant',
-                    content: reply
+                    content: reply,
+                    reasoningContent: response?.reasoningContent,
                 });
                 // 通知前端收到非工具调用回复 (2026-08-09: 完整内容, 不再截断 150)
                 if (onStream) {
@@ -1979,7 +1982,7 @@ ${PiAgentSession.TOOL_SELECTION_GUIDE}
                         continue;
                     }
                     if (r === 'assistant') {
-                        out.push({ role: 'assistant', content: (m.content || '').slice(0, 4000) });
+                        out.push({ role: 'assistant', content: (m.content || '').slice(0, 4000), reasoningContent: m.reasoningContent });
                         continue;
                     }
                     if (r === 'user') {
@@ -2001,7 +2004,7 @@ ${PiAgentSession.TOOL_SELECTION_GUIDE}
                     continue;
                 }
                 if (r === 'assistant') {
-                    out.push({ role: 'assistant', content: m.content || '' });
+                    out.push({ role: 'assistant', content: m.content || '', reasoningContent: m.reasoningContent });
                     continue;
                 }
                 if (r === 'user') {

package/dist/ios/index.html

@@ -34,9 +34,10 @@
 <div id="app" class="app">
   <!-- 顶部导航 -->
   <header class="topbar">
+    <button class="icon-btn" id="btn-index" title="索引"><svg class="ico" viewBox="0 0 24 24"><path d="M4 6h16M4 12h16M4 18h16"/></svg></button>
     <div class="topbar-title" id="topbar-title">首页</div>
     <div class="topbar-actions" id="topbar-actions">
-      <button class="icon-btn" id="btn-refresh" title="刷新"><svg class="ico" viewBox="0 0 24 24"><path d="M20 12a8 8 0 1 1-2.3-5.6"/><path d="M20 4v4.5h-4.5"/></svg></button>
+      <button class="icon-btn" id="btn-search" title="搜索"><svg class="ico" viewBox="0 0 24 24"><circle cx="11" cy="11" r="6.5"/><path d="M16 16l4.5 4.5"/></svg></button>
       <button class="icon-btn" id="btn-add" title="添加会话"><svg class="ico" viewBox="0 0 24 24"><path d="M12 5v14M5 12h14"/></svg></button>
     </div>
   </header>
@@ -60,31 +61,43 @@
       <div class="detail-body" id="detail-body"></div>
     </div>
   </main>
-
-  <!-- 网络 tab -->
-  <section class="page" id="page-network" data-tab="network" hidden>
+  <!-- 好友 tab: 好友与 P2P (原来散在网络页, 现已归拢; 网络页不再重复这些) -->
+  <section class="page" id="page-friends" data-tab="friends" hidden>
     <div class="list">
-      <div class="list-item" id="item-join-net"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><path d="M3.5 9.5a13 13 0 0 1 17 0M6.5 13a8.5 8.5 0 0 1 11 0M9.6 16.3a4 4 0 0 1 4.8 0"/><circle cx="12" cy="19.5" r="1.1" fill="currentColor" stroke="none"/></svg></span><span>加入网络</span></div>
-      <div class="list-item" id="item-scan-net"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><path d="M4 8V6a2 2 0 0 1 2-2h2M16 4h2a2 2 0 0 1 2 2v2M20 16v2a2 2 0 0 1-2 2h-2M8 20H6a2 2 0 0 1-2-2v-2"/><path d="M4 12h16"/></svg></span><span>扫码入网</span></div>
+      <div class="list-item" id="item-add-friend"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><circle cx="9" cy="8" r="3.2"/><path d="M3.5 19c.8-3 3-4.6 5.5-4.6S13.7 16 14.5 19"/><path d="M17 8v6M14 11h6"/></svg></span><span>连接好友</span><span class="list-arrow">›</span></div>
+      <div class="list-item" id="item-nearby"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><path d="M4 12a8 8 0 0 1 16 0"/><path d="M7.5 12a4.5 4.5 0 0 1 9 0"/><circle cx="12" cy="12" r="1.4"/><path d="M12 13.6V19"/></svg></span><span>附近设备</span><span class="list-arrow">›</span></div>
+      <div class="list-item" id="item-scan-net"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><path d="M4 8V6a2 2 0 0 1 2-2h2M16 4h2a2 2 0 0 1 2 2v2M20 16v2a2 2 0 0 1-2 2h-2M8 20H6a2 2 0 0 1-2-2v-2"/><path d="M4 12h16"/></svg></span><span>扫码入网 / 加好友</span></div>
     </div>
     <input type="file" id="qr-scan-input" accept="image/*" capture="environment" style="display:none">
-    <div class="section-label">P2P 连接</div>
-    <div class="list" id="p2p-status"></div>
-    <div class="section-label">Agent 网络</div>
-    <div class="list" id="net-members"></div>
     <div class="list">
       <div class="list-item" id="item-p2p"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="8.5"/><path d="M3.5 12h17"/><path d="M12 3.5c2.3 2.3 3.5 5.3 3.5 8.5s-1.2 6.2-3.5 8.5c-2.3-2.3-3.5-5.3-3.5-8.5S9.7 5.8 12 3.5z"/></svg></span><span>P2P 好友</span></div>
       <div class="list-item" id="item-p2p-id"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="5.5" width="18" height="13" rx="2.5"/><circle cx="8.5" cy="11" r="2"/><path d="M5.6 15.8a3.2 3.2 0 0 1 5.8 0M13.5 10h5M13.5 13.5h5"/></svg></span><span>我的 P2P ID</span></div>
     </div>
+    <div class="section-label">P2P 连接</div>
+    <div class="list" id="p2p-status"></div>
+    <div class="section-label">好友列表</div>
+    <div class="list" id="contacts-list"></div>
+  </section>
+
+  </main>
+
+  <!-- 网络 tab -->
+  <section class="page" id="page-network" data-tab="network" hidden>
+    <div class="list">
+      <div class="list-item" id="item-join-global"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="8.5"/><path d="M3.5 12h17"/><path d="M12 3.5c2.7 2.6 2.7 14.4 0 17M12 3.5c-2.7 2.6-2.7 14.4 0 17"/><circle cx="12" cy="12" r="1.2" fill="currentColor" stroke="none"/></svg></span><span>一键入网 · 全球智能体网络</span><span class="list-arrow">›</span></div>
+      <div class="list-item" id="item-join-net"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><path d="M3.5 9.5a13 13 0 0 1 17 0M6.5 13a8.5 8.5 0 0 1 11 0M9.6 16.3a4 4 0 0 1 4.8 0"/><circle cx="12" cy="19.5" r="1.1" fill="currentColor" stroke="none"/></svg></span><span>加入网络</span><span class="list-arrow">›</span></div>
+    </div>
+    <div class="section-label">Agent 网络</div>
+    <div class="list" id="net-members"></div>
     <div class="section-label">Agent 服务 (协议自动发现)</div>
     <div class="list" id="agent-services"></div>
     <div class="list">
       <div class="list-item" id="item-trade"><span class="list-icon"><svg class="ico" viewBox="0 0 24 24"><path d="M4 7h16M4 12h10M4 17h7"/><path d="M17.5 14.5l2.5 2.5-2.5 2.5"/></svg></span><span style="flex:1">资源交易</span><span class="list-arrow">›</span></div>
     </div>
-    <div class="section-label">P2P 好友列表</div>
-    <div class="list" id="contacts-list"></div>
-    <div class="section-label">MCP 工具 (触控调用)</div>
-    <div class="list" id="mcp-tools"></div>
+    <div class="section-label">微信息 (微支付)</div>
+    <div class="list" id="x402-info-list"></div>
+    <div class="section-label">智能体控制 (MCP / Skills)</div>
+    <div class="list" id="agent-control"></div>
     <div class="section-label">待人工审批支付</div>
     <div class="list" id="approval-list"></div>
     <div class="section-label">A2UI 动态面板 (智能体生成)</div>
@@ -117,6 +130,7 @@
 <!-- 底部 tab -->
 <nav class="tabbar" id="tabbar">
   <button class="tab active" data-tab="main"><span class="tab-icon"><svg class="ico" viewBox="0 0 24 24"><rect x="3.5" y="3.5" width="7" height="7" rx="1.6"/><rect x="13.5" y="3.5" width="7" height="7" rx="1.6"/><rect x="3.5" y="13.5" width="7" height="7" rx="1.6"/><rect x="13.5" y="13.5" width="7" height="7" rx="1.6"/></svg></span><span>首页</span></button>
+  <button class="tab" data-tab="friends"><span class="tab-icon"><svg class="ico" viewBox="0 0 24 24"><circle cx="9" cy="8" r="3.2"/><path d="M3.5 19c.8-3 3-4.6 5.5-4.6S13.7 16 14.5 19"/><path d="M17 8v6M14 11h6"/></svg></span><span>好友</span></button>
   <button class="tab" data-tab="network"><span class="tab-icon"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="8.5"/><path d="M3.5 12h17"/><path d="M12 3.5c2.3 2.3 3.5 5.3 3.5 8.5s-1.2 6.2-3.5 8.5c-2.3-2.3-3.5-5.3-3.5-8.5S9.7 5.8 12 3.5z"/></svg></span><span>网络</span></button>
   <button class="tab" data-tab="me"><span class="tab-icon"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="8.5" r="4"/><path d="M4.5 20.5a7.5 7.5 0 0 1 15 0"/></svg></span><span>我</span></button>
 </nav>
@@ -132,15 +146,58 @@
   </div>
 </div>
 
-<!-- 添加好友: 底部滑出选择 sheet -->
+<!-- 添加好友: 底部滑出选择 sheet (点按式: 扫码 / 附近 / 待处理申请 / 手动) -->
 <div class="sheet" id="addfriend-sheet" hidden>
   <div class="sheet-inner sheet-inner-choices">
-    <div class="sheet-title">添加 P2P 好友</div>
+    <div class="sheet-title">连接好友</div>
+    <button class="sheet-choice" id="choice-nearby"><svg class="ico" viewBox="0 0 24 24"><path d="M4 12a8 8 0 0 1 16 0"/><path d="M7.5 12a4.5 4.5 0 0 1 9 0"/><circle cx="12" cy="12" r="1.4"/><path d="M12 13.6V19"/></svg> 附近的设备</button>
     <button class="sheet-choice" id="choice-scan"><svg class="ico" viewBox="0 0 24 24"><path d="M4 8V6a2 2 0 0 1 2-2h2M16 4h2a2 2 0 0 1 2 2v2M20 16v2a2 2 0 0 1-2 2h-2M8 20H6a2 2 0 0 1-2-2v-2"/><path d="M4 12h16"/></svg> 扫码添加</button>
-    <button class="sheet-choice" id="choice-manual"><svg class="ico" viewBox="0 0 24 24"><path d="M10.5 13.5a3.5 3.5 0 0 1 0-5l2-2a3.5 3.5 0 0 1 5 5l-1 1"/><path d="M13.5 10.5a3.5 3.5 0 0 1 0 5l-2 2a3.5 3.5 0 0 1-5-5l1-1"/></svg> 手动输入地址</button>
+    <button class="sheet-choice" id="choice-requests"><svg class="ico" viewBox="0 0 24 24"><path d="M6 4h9l4 4v12a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1z"/><path d="M9 12h6M9 16h4"/></svg> 待处理申请</button>
+    <button class="sheet-choice sheet-cancel" id="choice-manual">⌨️ 手动输入地址 (兜底)</button>
     <button class="sheet-choice sheet-cancel" id="choice-cancel">取消</button>
   </div>
 </div>
+
+<!-- 加入网络: 点按式 sheet (扫一扫 / 附近设备 / 手动粘贴兜底) -->
+<div class="sheet" id="network-sheet" hidden>
+  <div class="sheet-inner sheet-inner-choices">
+    <div class="sheet-title">加入网络</div>
+    <button class="sheet-choice" id="choice-join-nearby"><svg class="ico" viewBox="0 0 24 24"><path d="M4 12a8 8 0 0 1 16 0"/><path d="M7.5 12a4.5 4.5 0 0 1 9 0"/><circle cx="12" cy="12" r="1.4"/><path d="M12 13.6V19"/></svg> 附近的电脑 / 设备</button>
+    <button class="sheet-choice" id="choice-join-scan"><svg class="ico" viewBox="0 0 24 24"><path d="M4 8V6a2 2 0 0 1 2-2h2M16 4h2a2 2 0 0 1 2 2v2M20 16v2a2 2 0 0 1-2 2h-2M8 20H6a2 2 0 0 1-2-2v-2"/><path d="M4 12h16"/></svg> 扫电脑上的二维码</button>
+    <button class="sheet-choice sheet-cancel" id="choice-join-manual">🔗 粘贴入网链接 (兜底)</button>
+    <button class="sheet-choice sheet-cancel" id="choice-join-cancel">取消</button>
+  </div>
+</div>
+
+<!-- 附近设备: 点按列表 (点一条即连接 / 建立好友) -->
+<div class="sheet" id="nearby-sheet" hidden>
+  <div class="sheet-inner">
+    <div class="sheet-title" id="nearby-title">附近设备</div>
+    <div class="sheet-text" id="nearby-hint">正在查找...</div>
+    <div class="list" id="nearby-list" style="width:100%;max-height:46vh;overflow-y:auto"></div>
+    <button class="sheet-choice" id="nearby-refresh">↻ 刷新</button>
+    <button class="sheet-choice sheet-cancel" id="nearby-close">关闭</button>
+  </div>
+</div>
+<!-- 微信息 (x402 付费信息): 点一条看详情 → 购买并验真 / 只看元数据 -->
+<div class="sheet" id="x402-sheet" hidden>
+  <div class="sheet-inner">
+    <div class="sheet-title" id="x402-title">微信息</div>
+    <div class="sheet-text" id="x402-body" style="width:100%;max-height:46vh;overflow-y:auto;text-align:left;white-space:pre-wrap;word-break:break-word"></div>
+    <button class="sheet-choice" id="x402-buy">购买并验真</button>
+    <button class="sheet-choice" id="x402-verify">只看元数据 (离线验真)</button>
+    <button class="sheet-choice sheet-cancel" id="x402-close">关闭</button>
+  </div>
+</div>
+
+<!-- 微信息结果: 内容 + 验真分档 (verified / self-attested / content-only / unverified) -->
+<div class="sheet" id="x402-result-sheet" hidden>
+  <div class="sheet-inner">
+    <div class="sheet-title" id="x402-result-title">验真结果</div>
+    <div class="sheet-text" id="x402-result-body" style="width:100%;max-height:56vh;overflow-y:auto;text-align:left;white-space:pre-wrap;word-break:break-word"></div>
+    <button class="sheet-choice sheet-cancel" id="x402-result-close">关闭</button>
+  </div>
+</div>
 </div>
 
 <!-- 2026-08-14: 手机端内化内核 (IndexedDB 数据 + 本地身份 + 支付审批 + Agent). 必须最先加载 -->

package/dist/ios/mobile-agent.js

@@ -52,6 +52,45 @@ export async function resetAgentDb() {
         }
     });
 }
+async function _kvGet(key) {
+    try {
+        const db = _identityDb || (await openIdentityDb());
+        _identityDb = db;
+        return await new Promise((res) => { const t = db.transaction('kv', 'readonly'); const r = t.objectStore('kv').get(key); r.onsuccess = () => res(r.result ?? null); r.onerror = () => res(null); });
+    }
+    catch {
+        return null;
+    }
+}
+async function _kvPut(key, val) {
+    try {
+        const db = _identityDb || (await openIdentityDb());
+        _identityDb = db;
+        await new Promise((res) => { const t = db.transaction('kv', 'readwrite'); t.objectStore('kv').put(val, key); t.oncomplete = () => res(); t.onerror = () => res(); });
+    }
+    catch { /* IDB 不可用则仅内存态 */ }
+}
+/** 登录: 设置本机身份昵称 (无身份则新建) + 标记已登录 */
+export async function loginIdentity(name) {
+    const id = await ensureIdentity();
+    const nm = String(name || '').trim() || 'blln-mobile';
+    const next = { ...id, name: nm };
+    await _kvPut('identity', next);
+    await _kvPut('loggedIn', true);
+    _identity = next;
+    return { ...next, loggedIn: true };
+}
+/** 注销: 清除登录态 (保留设备 DID, 不影响 P2P/频道) */
+export async function logoutIdentity() {
+    await _kvPut('loggedIn', false);
+    return { ok: true };
+}
+/** 身份状态 (含登录态; 未登录时 name 置空) */
+export async function identityStatus() {
+    const id = await ensureIdentity();
+    const loggedIn = (await _kvGet('loggedIn')) === true;
+    return { did: id.did, didShort: id.did ? id.did.slice(0, 12) : '', name: loggedIn ? id.name : '', createdAt: id.createdAt, loggedIn };
+}
 /** 获取本机 DID (首次生成并持久化) */
 export async function ensureIdentity() {
     if (_identity)
@@ -318,12 +357,18 @@ export async function runPhoneAgent(goal) {
                 stepCount: r?.stepCount,
             };
         }
-        // 离线 fallback: 内置规则 (不依赖 LLM/无障碍, 手机仍自治可用)
+        // 离线 fallback: 内置规则 (不依赖 LLM/原生执行能力, 手机仍自治可用)
         const reply = await runLocalAgent(goal);
-        return { ok: true, goal, result: reply, did: id.did, mode: 'fallback' };
+        return {
+            ok: true, goal, result: reply, did: id.did, mode: 'fallback',
+            hint: '当前是「手机本地规则」模式：这台手机上还没接原生执行能力 (iOS 暂不支持原生操控 App; Android 需开无障碍服务)，所以只能用内置规则回复。连上电脑端后，任务可以交给电脑端 Agent 真正执行。',
+        };
     }
     catch (e) {
-        return { ok: false, goal, error: String(e?.message || e).slice(0, 100), did: id.did, mode: native ? 'native' : 'fallback' };
+        return {
+            ok: false, goal, error: String(e?.message || e).slice(0, 100), did: id.did, mode: native ? 'native' : 'fallback',
+            hint: '任务没跑起来。常见原因：① 电脑端没在运行或不同网段 (设置 → 电脑端同步 里配置/测试) ② 没配 LLM API (设置 → API 配置) ③ 这台手机没接原生执行能力 (iOS 不支持原生操控, Android 需无障碍服务)。',
+        };
     }
 }
 /** 手机端 Agent 状态 (phone.agent.status) */
@@ -400,4 +445,4 @@ export async function handleIncomingPhoneMessage(type, payload, fromPeer) {
     }
     catch { /* 控制消息处理失败静默 */ }
 }
-export default { ensureIdentity, runLocalAgent, setAgentTransport, onAgentReply, callRemoteAgent, handleIncomingAgentMessage, notifyAgentReply, onInboundChat, setLlmConfig, getLlmConfig, runPhoneAgent, phoneStatus, cancelPhoneAgent, handleIncomingPhoneMessage };
+export default { ensureIdentity, loginIdentity, logoutIdentity, identityStatus, runLocalAgent, setAgentTransport, onAgentReply, callRemoteAgent, handleIncomingAgentMessage, notifyAgentReply, onInboundChat, setLlmConfig, getLlmConfig, runPhoneAgent, phoneStatus, cancelPhoneAgent, handleIncomingPhoneMessage };