@bolloon/bolloon-agent 0.4.22 → 0.4.24

package/dist/web/server.js

@@ -2886,6 +2886,16 @@ ${goalDesc}
                 out.judgments = [];
                 out.judgmentsError = e?.message;
             }
+            // 本机 skills (~/.bolloon/skills/) — 手机端「智能体控制 (MCP / Skills)」页读取
+            try {
+                const { loadSkillsFromPaths, defaultSkillPaths } = await import('../agents/skill-loader.js');
+                const list = await loadSkillsFromPaths(defaultSkillPaths());
+                out.skills = list.map((k) => ({ name: String(k.name || ''), description: String(k.description || '').slice(0, 200) }));
+            }
+            catch (e) {
+                out.skills = [];
+                out.skillsError = e?.message;
+            }
             // Agent 服务 Registry (发现层)
             try {
                 const { getAgentRegistry } = await import('../agents/agent-registry.js');
@@ -3007,6 +3017,68 @@ ${goalDesc}
             res.status(500).json({ ok: false, error: e?.message });
         }
     });
+    // 2026-09-15: agent-delegate (manifest 协议 + agent_delegate) **启动即挂载**
+    //   文档 bolloon-gateway-join.md 第 3 节要求 POST /api/agent/register 可用;
+    //   之前只在 iroh 懒初始化 (/api/iroh/info 首次访问) 的收尾挂上 → 没触发时恒 404。
+    //
+    //   2026-09-15 (二修): 同时注入**真执行器** —— 被委派的一方不再是
+    //   `resultCid: mock-<ts>` 的假签收: 真的跑本地 agent session 出结果,
+    //   并把结果存进 OrbitDB 得到真实内容寻址 CID; 无活跃 channel / 无 LLM 时如实报错。
+    const delegateExecutor = async (req) => {
+        try {
+            const channels = await loadChannels();
+            const active = (() => {
+                try {
+                    const raw = fsSync.existsSync(path.join(process.env.HOME || '/tmp', '.bolloon', 'active-channel.json'))
+                        ? fsSync.readFileSync(path.join(process.env.HOME || '/tmp', '.bolloon', 'active-channel.json'), 'utf-8') : '';
+                    return raw ? JSON.parse(raw) : null;
+                }
+                catch {
+                    return null;
+                }
+            })();
+            const ch = channels.find((c) => c.id === active?.channelId) || channels.find((c) => c.id === active?.id) || channels[0];
+            if (!ch)
+                return { ok: false, summary: 'no local channel to execute with', error: 'no-channel' };
+            const agent = await getAgentForChannel(ch.id, ch.publicKey, ch.name, ch.didDocument);
+            const task = [
+                `【被委派任务 · 能力 ${req.capability}】`,
+                req.instruction,
+                req.docPath ? `\n资料路径: ${req.docPath}` : '',
+                req.docContent ? `\n资料内容:\n${req.docContent}` : '',
+                `\n(来自 agent ${req.fromAgentId || 'unknown'})，请直接给出可交付结果。`,
+            ].join('');
+            const out = await agent.prompt(task);
+            const text = String(out || '').trim();
+            if (!text || text.startsWith('❌') || text.startsWith('[AI 服务调用失败]')) {
+                return { ok: false, summary: text.slice(0, 800) || '(空结果)', error: 'execution-failed' };
+            }
+            // 真结果 → 内容寻址存储 (CID), 失败不编造 CID, 只回摘要
+            let cid;
+            try {
+                const { getCIDDatabase } = await import('../orbitdb/cid-database.js');
+                const rec = await getCIDDatabase().save({ agentId: req.targetAgentId, type: 'context', content: text, metadata: { capability: req.capability, fromAgentId: req.fromAgentId, kind: 'delegate-result' } });
+                cid = rec?.id;
+            }
+            catch { /* 存不上就不给 CID */ }
+            return { ok: true, summary: text.slice(0, 4000), resultCid: cid };
+        }
+        catch (e) {
+            return { ok: false, summary: `delegate executor failed: ${String(e?.message || e).slice(0, 300)}`, error: 'executor-error' };
+        }
+    };
+    let agentDelegateMounted = false;
+    try {
+        const delegateTransport = createIrohDelegateTransport({ verbose: true });
+        // 注意: createAgentDelegateApp 内部声明的是绝对路径 (/api/agent/...),
+        // 所以挂载时**不能**再带 '/api/agent' 前缀 (否则变成 /api/agent/api/agent/... 恒 404)
+        app.use(createAgentDelegateApp(delegateTransport, { execute: delegateExecutor }));
+        agentDelegateMounted = true;
+        console.log('[agent-delegate] 已挂载到 /api/agent (启动即用: local-manifest / register / pick / delegate, 真执行器已注入)');
+    }
+    catch (e) {
+        console.warn('[agent-delegate] 挂载失败 (非致命):', e?.message);
+    }
     // 2026-08-14: Agent Gateway — 网络加入 / 分享链接 / 成员 / 状态 (入口要小: 一条链接)
     app.post('/api/gateway/join', async (req, res) => {
         try {
@@ -3043,6 +3115,36 @@ ${goalDesc}
             res.status(500).json({ error: e?.message });
         }
     });
+    // 2026-09-15: 文档驱动「加入全球智能体网络」— 人类/手机只给一句 read <doc>, 这里做落地执行.
+    //   GET: 查入网态 (joined/url/did/networkLink); POST: 真执行 (可指定 url/name/capabilities/force).
+    app.get('/api/gateway/join-global', async (_req, res) => {
+        try {
+            const { getGatewayJoinState, DEFAULT_GATEWAY_JOIN_DOC } = await import('../agents/gateway-join.js');
+            const state = await getGatewayJoinState();
+            res.json({ ok: true, joined: !!state, docUrl: DEFAULT_GATEWAY_JOIN_DOC, state });
+        }
+        catch (e) {
+            res.status(500).json({ ok: false, error: e?.message });
+        }
+    });
+    app.post('/api/gateway/join-global', async (req, res) => {
+        try {
+            const { joinGlobalGateway } = await import('../agents/gateway-join.js');
+            const identity = await loadOrCreateUserIdentity();
+            const caps = String(req.body?.capabilities || '').split(',').map((s) => s.trim()).filter(Boolean);
+            const r = await joinGlobalGateway({
+                url: String(req.body?.url || '').trim() || undefined,
+                did: identity?.did || undefined,
+                name: String(req.body?.name || '').trim() || identity?.name || undefined,
+                capabilities: caps.length ? caps : undefined,
+                force: req.body?.force === true,
+            });
+            res.status(r.ok ? 200 : 400).json(r);
+        }
+        catch (e) {
+            res.status(500).json({ ok: false, error: e?.message });
+        }
+    });
     app.get('/api/gateway/status', async (_req, res) => {
         try {
             const { gatewayStatus } = await import('../agents/agent-gateway.js');
@@ -6529,15 +6631,18 @@ ${goalDesc}
             };
             irohInitialized = true;
             // 挂载 agent-delegate app (manifest 协议 + agent_delegate)
-            // 必须在 irohInitialized 之后挂, 因为适配器要监听 irohTransport.onMessage
-            try {
-                const delegateTransport = createIrohDelegateTransport({ verbose: true });
-                const delegateApp = createAgentDelegateApp(delegateTransport);
-                app.use('/api/agent', delegateApp);
-                console.log('[iroh API] agent-delegate app 已挂载到 /api/agent');
-            }
-            catch (e) {
-                console.error('[iroh API] 挂载 agent-delegate app 失败:', e);
+            // 2026-09-15: 已改为启动时提前挂载 (见 createWebServer 的 /api/agent 段), 这里不再重复挂.
+            if (!agentDelegateMounted) {
+                try {
+                    const delegateTransport = createIrohDelegateTransport({ verbose: true });
+                    const delegateApp = createAgentDelegateApp(delegateTransport, { execute: delegateExecutor });
+                    app.use(delegateApp);
+                    agentDelegateMounted = true;
+                    console.log('[iroh API] agent-delegate app 已挂载到 /api/agent (补挂, 真执行器已注入)');
+                }
+                catch (e) {
+                    console.error('[iroh API] 挂载 agent-delegate app 失败:', e);
+                }
             }
             // 设置消息处理
             irohTransport.onMessage('chat', (msg) => {

package/dist/web/sw.js

@@ -1,5 +1,12 @@
-/* Bolloon 手机端 Service Worker — app-shell 缓存, 让 iPhone 可"添加到主屏幕"独立运行 */
-const CACHE = 'bolloon-mobile-v1';
+/* Bolloon 手机端 Service Worker — app-shell 缓存, 让 iPhone 可"添加到主屏幕"独立运行
+ *
+ * 2026-09-14 修: 原来是 cache-first + 固定缓存名 (bolloon-mobile-v1) →
+ *   一旦装上, 之后每次升级 APK / 重新部署站点, WebView 里跑的仍是**旧的 mobile.js/mobile-core.js**,
+ *   表现为「改了 UI 手机上没变化」「升级后还是老界面」。
+ * 现在: 代码类资源 (html/js/css/json) 一律 **network-first** (拿不到网才回退缓存),
+ *   缓存名带版本号, activate 时清掉所有旧缓存; 图标等静态资源仍 cache-first。
+ */
+const CACHE = 'bolloon-mobile-v1.1';
 const SHELL = [
   './mobile.html',
   './mobile.css',
@@ -25,6 +32,9 @@ self.addEventListener('activate', (e) => {
   );
 });
 
+// 代码类资源: 必须联网拿最新的 (离线才回退缓存); 图标/manifest 之类可以 cache-first
+const CODE_EXT = /\.(?:html|js|mjs|css|json|webmanifest)$/i;
+
 self.addEventListener('fetch', (e) => {
   const req = e.request;
   if (req.method !== 'GET') return;
@@ -32,6 +42,20 @@ self.addEventListener('fetch', (e) => {
   try { url = new URL(req.url); } catch { return; }
   // 跨域 / API / 实时通道不缓存 (registry fetch、WebSocket 等)
   if (url.origin !== location.origin || url.pathname.includes('/api/')) return;
+
+  if (CODE_EXT.test(url.pathname) || req.mode === 'navigate') {
+    e.respondWith(
+      fetch(req).then((res) => {
+        if (res && res.ok) {
+          const copy = res.clone();
+          caches.open(CACHE).then((c) => c.put(req, copy)).catch(() => {});
+        }
+        return res;
+      }).catch(() => caches.match(req).then((hit) => hit || caches.match('./mobile.html'))),
+    );
+    return;
+  }
+
   e.respondWith(
     caches.match(req).then((hit) => hit || fetch(req).then((res) => {
       const copy = res.clone();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.4.22",
+  "version": "0.4.24",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli-entry.js",