@bolloon/bolloon-agent 0.3.12 → 0.3.14

package/dist/web/server-storage.js

@@ -17,35 +17,67 @@ import { saveWindow as saveSessionWindow, loadWindow as loadSessionWindow } from
 let lastChannelsJson = '';
 // 写盘保护: 任何调用 saveChannels 后更新
 let lastChannelsWriteAt = 0;
+// 2026-07-24: 简单的互斥锁, 防止并发 loadChannels→modify→saveChannels 的经典 read-modify-write 竞争
+let channelsLock = Promise.resolve();
 export function getLastChannelsWriteAt() {
     return lastChannelsWriteAt;
 }
-export async function loadChannels() {
+/** 对 channels 执行原子化的 read-modify-write, 自带互斥锁 */
+export async function updateChannels(fn) {
+    channelsLock = channelsLock.then(async () => {
+        const chs = await rawLoadChannels();
+        const result = fn(chs);
+        await rawSaveChannels(result);
+        return result;
+    });
+    return channelsLock;
+}
+async function rawLoadChannels() {
     try {
         const data = await fs.readFile(CHANNELS_PATH, 'utf-8');
         return JSON.parse(data);
     }
-    catch {
+    catch (readErr) {
+        // 2026-07-24: 主文件损坏时尝试从 .tmp 恢复
+        if (readErr?.code !== 'ENOENT') {
+            console.warn('[loadChannels] channels.json 解析失败, 尝试从 .tmp 恢复:', readErr?.message?.slice(0, 80));
+            try {
+                const tmpData = await fs.readFile(CHANNELS_PATH + '.tmp', 'utf-8');
+                const recovered = JSON.parse(tmpData);
+                console.log(`[loadChannels] 从 .tmp 恢复成功: ${recovered.length} 个 channel`);
+                // 立即把恢复的内容写回主文件
+                await fs.writeFile(CHANNELS_PATH, tmpData, 'utf-8');
+                return recovered;
+            }
+            catch (tmpErr) {
+                console.warn('[loadChannels] .tmp 恢复也失败:', tmpErr?.message?.slice(0, 80));
+            }
+        }
         return [];
     }
 }
-export async function saveChannels(channels) {
-    // 写盘前剥掉任何遗留的 didDocument 字段, 防止历史脏数据撑大文件
+async function rawSaveChannels(channels) {
     const sanitized = channels.map(ch => {
         const { didDocument: _omit, ...rest } = ch;
         return rest;
     });
     const jsonStr = JSON.stringify(sanitized, null, 2);
-    // 写盘保护: 内容和上次完全一致就跳过, 避免 SSE ping / 重新 init 触发的无意义写盘
-    if (jsonStr === lastChannelsJson) {
+    if (jsonStr === lastChannelsJson)
         return;
-    }
     lastChannelsJson = jsonStr;
     console.log('[saveChannels] 保存频道数据, 数量:', sanitized.length);
-    console.log('[saveChannels] JSON 长度:', jsonStr.length);
-    await fs.writeFile(CHANNELS_PATH, jsonStr);
+    // 2026-07-24: 原子写入 — 先写 .tmp 再 rename, 防止崩溃导致 channels.json 损坏
+    const tmpPath = CHANNELS_PATH + '.tmp';
+    await fs.writeFile(tmpPath, jsonStr, 'utf-8');
+    await fs.rename(tmpPath, CHANNELS_PATH);
     lastChannelsWriteAt = Date.now();
 }
+export async function loadChannels() {
+    return rawLoadChannels();
+}
+export async function saveChannels(channels) {
+    return rawSaveChannels(channels);
+}
 /**
  * loadSession 加 L0 window fallback 链 (2026-07-07 P0-B):
  *   1) full session.json (主路径)

package/dist/web/server.js

@@ -3728,6 +3728,77 @@ ${goalDesc}
             res.status(500).json({ error: err.message });
         }
     });
+    /**
+     * 存储加密私钥: 客户端用 DID 派生 AES-GCM 密钥加密私钥后上传.
+     * body: { encryptedPrivateKey (base64), encryptedPrivateKeyIv (base64), autoPayEnabled? }
+     */
+    app.post('/channels/:channelId/encrypted-key', async (req, res) => {
+        try {
+            const { channelId } = req.params;
+            const { encryptedPrivateKey, encryptedPrivateKeyIv, autoPayEnabled } = req.body || {};
+            if (!encryptedPrivateKey || !encryptedPrivateKeyIv) {
+                return res.status(400).json({ error: '缺少必填字段: encryptedPrivateKey, encryptedPrivateKeyIv' });
+            }
+            const channels = await loadChannels();
+            const channel = channels.find(c => c.id === channelId);
+            if (!channel)
+                return res.status(404).json({ error: 'Channel not found' });
+            channel.encryptedPrivateKey = encryptedPrivateKey;
+            channel.encryptedPrivateKeyIv = encryptedPrivateKeyIv;
+            if (typeof autoPayEnabled === 'boolean') {
+                channel.autoPayEnabled = autoPayEnabled;
+            }
+            channel.updatedAt = new Date().toISOString();
+            await saveChannels(channels);
+            console.log(`[Wallet] channel ${channelId} 已存储加密私钥 (autoPay=${channel.autoPayEnabled})`);
+            res.json(channel);
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+    /** 清除加密私钥 (用户选择不再自动支付) */
+    app.delete('/channels/:channelId/encrypted-key', async (req, res) => {
+        try {
+            const { channelId } = req.params;
+            const channels = await loadChannels();
+            const channel = channels.find(c => c.id === channelId);
+            if (!channel)
+                return res.status(404).json({ error: 'Channel not found' });
+            channel.encryptedPrivateKey = undefined;
+            channel.encryptedPrivateKeyIv = undefined;
+            channel.autoPayEnabled = false;
+            channel.updatedAt = new Date().toISOString();
+            await saveChannels(channels);
+            console.log(`[Wallet] channel ${channelId} 已清除加密私钥`);
+            res.json(channel);
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+    /** 切换 autoPay 开关 */
+    app.patch('/channels/:channelId/auto-pay', async (req, res) => {
+        try {
+            const { channelId } = req.params;
+            const { autoPayEnabled } = req.body || {};
+            if (typeof autoPayEnabled !== 'boolean') {
+                return res.status(400).json({ error: 'autoPayEnabled 必须是 boolean' });
+            }
+            const channels = await loadChannels();
+            const channel = channels.find(c => c.id === channelId);
+            if (!channel)
+                return res.status(404).json({ error: 'Channel not found' });
+            channel.autoPayEnabled = autoPayEnabled;
+            channel.updatedAt = new Date().toISOString();
+            await saveChannels(channels);
+            console.log(`[Wallet] channel ${channelId} autoPay → ${autoPayEnabled}`);
+            res.json(channel);
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
     // 2026-07-07 P1-C: 列出 channel 的项目事件日志 (L2)
     // 用于客户端时间线折叠块 + LLM prompt 注入
     app.get('/api/events/:channelId', async (req, res) => {

package/dist/web/style.css

@@ -2123,6 +2123,31 @@ body {
   border-color: var(--accent);
 }
 
+.wallet-row .wallet-badges {
+  display: flex;
+  gap: 4px;
+  margin-top: 2px;
+}
+
+.wallet-row .wallet-badge {
+  font-size: 9px;
+  font-weight: 700;
+  padding: 1px 5px;
+  border-radius: 3px;
+  letter-spacing: 0.3px;
+  text-transform: uppercase;
+}
+
+.wallet-row .badge-autopay {
+  background: #1a6d1a;
+  color: #8f8;
+}
+
+.wallet-row .badge-stored {
+  background: #1a4d6d;
+  color: #8cf;
+}
+
 .task-item {
   background: var(--bg-secondary);
   border: 1px solid var(--border);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli-entry.js",
@@ -48,7 +48,7 @@
     "src/constraint-runtime"
   ],
   "dependencies": {
-    "@bolloon/bolloon-agent": "^0.3.10",
+    "@bolloon/bolloon-agent": "^0.3.13",
     "@bolloon/constraint-runtime": "0.1.0",
     "@capacitor/core": "^8.4.1",
     "@capacitor/ios": "^8.4.1",
@@ -65,6 +65,24 @@
     "@multiformats/multiaddr": "^13.0.3",
     "@noble/hashes": "^1.3.0",
     "@rayhanadev/iroh": "^0.1.1",
+    "@x402/aptos": "^2.19.0",
+    "@x402/avm": "^2.19.0",
+    "@x402/axios": "^2.19.0",
+    "@x402/core": "^2.19.0",
+    "@x402/evm": "^2.19.0",
+    "@x402/express": "^2.19.0",
+    "@x402/extensions": "^2.19.0",
+    "@x402/fastify": "^2.19.0",
+    "@x402/fetch": "^2.19.0",
+    "@x402/hedera": "^2.19.0",
+    "@x402/hono": "^2.19.0",
+    "@x402/keeta": "^2.19.0",
+    "@x402/mcp": "^2.19.0",
+    "@x402/next": "^2.19.0",
+    "@x402/paywall": "^2.19.0",
+    "@x402/stellar": "^2.19.0",
+    "@x402/svm": "^2.19.0",
+    "@x402/tvm": "^2.19.0",
     "b4a": "^1.8.1",
     "dotenv": "^17.4.2",
     "esbuild": "^0.24.0",
@@ -155,6 +173,7 @@
     "asarUnpack": [
       "node_modules/@diap/**/*",
       "node_modules/@rayhanadev/**/*",
+      "node_modules/@x402/**/*",
       "node_modules/libp2p/**/*",
       "node_modules/@libp2p/**/*"
     ]