@bolloon/bolloon-agent 0.4.4 → 0.4.5

package/dist/web/manifest.json

@@ -1,21 +1,21 @@
-{
-  "name": "Bolloon Agent",
-  "short_name": "Bolloon",
-  "description": "AI Agent with Claude API integration",
-  "start_url": "/",
-  "display": "standalone",
-  "background_color": "#1a1a2e",
-  "theme_color": "#1a1a2e",
-  "icons": [
-    {
-      "src": "/icons/favicon-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "/icons/favicon-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ]
+{
+  "name": "Bolloon Agent",
+  "short_name": "Bolloon",
+  "description": "AI Agent with Claude API integration",
+  "start_url": "/",
+  "display": "standalone",
+  "background_color": "#1a1a2e",
+  "theme_color": "#1a1a2e",
+  "icons": [
+    {
+      "src": "/icons/favicon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/icons/favicon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ]
 }

package/dist/web/server.js

@@ -2397,19 +2397,19 @@ export async function createWebServer(port = 3000, options = {}) {
                         .map((p) => `- ${p.name || p.publicKey.slice(0, 8)} (pk=${p.publicKey.slice(0, 12)}…): 渠道[${p.channels.map((c) => c.name).join(', ') || '无'}]`)
                         .join('\n');
                     const goalDesc = ctx.goal ? `当前目标: ${ctx.goal.description} (已发起 ${ctx.goal.initiationsUsed}/${ctx.goal.maxInitiations}, 有效回复 ${ctx.goal.effectfulReplies}/${ctx.goal.effectThreshold})` : '当前无明确目标';
-                    const prompt = `你是智能体「${ctx.self.name || '本地智能体'}」。你通过 P2P 网络认识以下其他智能体:
-${peerLines}
-
-${goalDesc}
-
-规则:
-1. 社交是为了达成上述目标, 不是闲聊。只在你有真正有价值的信息要分享/询问、且能推进目标时才主动发起。
-2. 不要重复最近已经聊过的话题, 不要每条心跳都发消息, 保持克制。
-3. 如果目标已经通过已有交流达成 (或你认为无需再聊), 输出 {"initiate": false, "goalAchieved": true}。
-4. 如果决定发起, 选一个最合适的目标渠道 (用对方渠道的真实 id)。
-
-现在是否要主动联系其中某个智能体? 只输出一个 JSON 对象, 不要任何其他文字:
-{"initiate": true 或 false, "goalAchieved": true 或 false, "targetPeerPublicKey": "对方 pk", "targetChannelId": "对方渠道 id", "message": "你要说的话"}
+                    const prompt = `你是智能体「${ctx.self.name || '本地智能体'}」。你通过 P2P 网络认识以下其他智能体:
+${peerLines}
+
+${goalDesc}
+
+规则:
+1. 社交是为了达成上述目标, 不是闲聊。只在你有真正有价值的信息要分享/询问、且能推进目标时才主动发起。
+2. 不要重复最近已经聊过的话题, 不要每条心跳都发消息, 保持克制。
+3. 如果目标已经通过已有交流达成 (或你认为无需再聊), 输出 {"initiate": false, "goalAchieved": true}。
+4. 如果决定发起, 选一个最合适的目标渠道 (用对方渠道的真实 id)。
+
+现在是否要主动联系其中某个智能体? 只输出一个 JSON 对象, 不要任何其他文字:
+{"initiate": true 或 false, "goalAchieved": true 或 false, "targetPeerPublicKey": "对方 pk", "targetChannelId": "对方渠道 id", "message": "你要说的话"}
 若不想发起, 输出 {"initiate": false}。`;
                     const raw = await agent.promptStream(prompt, () => { }, undefined, local.id);
                     const m = raw.match(/\{[\s\S]*\}/);
@@ -2845,39 +2845,32 @@ ${goalDesc}
     });
     // ========== 登录框架 (2026-08-09) — GitHub/Google/邮箱/手机号, 仅骨架 ==========
     // 所有登录方式最终都归属到用户 DID (右下角唯一身份).
+    // 2026-08-12: 登录配置托管到 Cloudflare 边缘 (Workers+KV), 本地 accounts.json 仅作降级 fallback.
     // 真实 OAuth / 验证码后续接入, 这里先做: 记录账号 + 绑定用户 DID + 提供状态查询.
     const ACCOUNTS_FILE = `${process.env.HOME || '/tmp'}/.bolloon/accounts.json`;
-    async function loadAccounts() {
-        try {
-            const { readFile } = await import('fs/promises');
-            const parsed = JSON.parse(await readFile(ACCOUNTS_FILE, 'utf-8'));
-            return Array.isArray(parsed) ? parsed : [];
-        }
-        catch {
-            return [];
-        }
-    }
-    async function saveAccounts(accs) {
-        const { mkdir, writeFile } = await import('fs/promises');
-        await mkdir(`${process.env.HOME || '/tmp'}/.bolloon`, { recursive: true });
-        await writeFile(ACCOUNTS_FILE, JSON.stringify(accs, null, 2), { mode: 0o600 });
-    }
+    const EDGE_AUTH_URL = process.env.BOLLOON_EDGE_AUTH_URL || 'http://127.0.0.1:8788';
+    const { EdgeAuthClient } = await import('./edge-auth-client.js');
+    const edgeAuth = new EdgeAuthClient({
+        baseUrl: EDGE_AUTH_URL,
+        timeoutMs: 4000,
+        fallbackFile: ACCOUNTS_FILE,
+        log: (m) => { try {
+            console.log(m);
+        }
+        catch { /* noop */ } },
+    });
+    async function loadAccounts() { return edgeAuth.loadAccounts(); }
     // GET /api/auth/status — 当前用户 DID + 已绑定账号列表
     app.get('/api/auth/status', async (_req, res) => {
         try {
             const identity = await loadOrCreateUserIdentity();
-            const accs = await loadAccounts();
+            const accounts = await loadAccounts();
             res.json({
                 did: identity.did,
                 didShort: identity.didShort,
                 name: identity.name,
-                // 只返回脱敏视图 (不含 token)
-                accounts: accs.map((a) => ({
-                    provider: a.provider,
-                    identifier: a.identifier || a.email || a.username || '',
-                    loggedAt: a.loggedAt,
-                    skeleton: !!a.skeleton,
-                })),
+                // 只返回脱敏视图 (不含 token), 来源: 边缘 KV (worker 不可达时本地 fallback)
+                accounts,
             });
         }
         catch (err) {
@@ -2899,31 +2892,9 @@ ${goalDesc}
                 return res.status(400).json({ error: `${prov === 'email' ? '邮箱' : '手机号'}必填` });
             }
             const identity = await loadOrCreateUserIdentity();
-            const accs = await loadAccounts();
             const idStr = String(identifier || '').trim();
-            const existing = accs.find((a) => a.provider === prov && (!idStr || a.identifier === idStr || a.email === idStr));
-            const now = new Date().toISOString();
-            if (existing) {
-                // 已绑定 → 更新归属 DID + 时间
-                existing.ownerDid = identity.did;
-                existing.loggedAt = now;
-                existing.skeleton = true;
-            }
-            else {
-                accs.push({
-                    provider: prov,
-                    identifier: idStr || '',
-                    email: prov === 'email' ? idStr : '',
-                    phone: prov === 'phone' ? idStr : '',
-                    username: idStr || '',
-                    token: '', // 真实 OAuth 后填
-                    ownerDid: identity.did, // 归属用户唯一 DID
-                    loggedAt: now,
-                    skeleton: true, // 骨架标记: 未做真实 OAuth/验证码
-                });
-            }
-            await saveAccounts(accs);
-            console.log(`[auth] 登录骨架: ${prov}${idStr ? ' ' + idStr : ''} → 归属 DID ${identity.did.substring(0, 20)}...`);
+            const result = await edgeAuth.login({ provider: prov, identifier: idStr, ownerDid: identity.did });
+            console.log(`[auth] 登录骨架: ${prov}${idStr ? ' ' + idStr : ''} → 归属 DID ${identity.did.substring(0, 20)}...${result.degraded ? ' (本地 fallback)' : ' (边缘)'}`);
             res.json({
                 ok: true,
                 provider: prov,
@@ -2931,6 +2902,7 @@ ${goalDesc}
                 ownerDid: identity.did,
                 skeleton: true,
                 message: `${prov} 登录骨架已记录 (归属用户 DID), 真实 OAuth/验证码后续接入`,
+                storage: result.degraded ? 'local' : 'edge',
             });
         }
         catch (err) {
@@ -2942,13 +2914,8 @@ ${goalDesc}
         try {
             const { provider } = req.body || {};
             const prov = String(provider || '').trim().toLowerCase();
-            const accs = await loadAccounts();
-            const before = accs.length;
-            const remaining = accs.filter((a) => a.provider !== prov);
-            if (remaining.length === before)
-                return res.status(404).json({ error: `未绑定 ${prov} 账号` });
-            await saveAccounts(remaining);
-            res.json({ ok: true, provider: prov });
+            const result = await edgeAuth.logout({ provider: prov });
+            res.json({ ok: true, provider: prov, storage: result.degraded ? 'local' : 'edge' });
         }
         catch (err) {
             res.status(500).json({ error: err.message });