@bolloon/bolloon-agent 0.1.29 → 0.1.30

package/dist/web/client.js

@@ -2862,43 +2862,71 @@ function openRemoteChannelChat(peerPublicKey, channelId, channelName) {
   loadHistory();
 }
 
-// Phase 3: 我的 ID 按钮 → 弹窗显示并支持复制自己的 P2PDirect publicKey
+// Phase 3: 我的 ID 按钮 → 真 modal (避免 confirm 在某些环境被禁用)
 const showMyIdBtn = document.getElementById('show-my-p2p-id-btn');
 if (showMyIdBtn) {
   showMyIdBtn.addEventListener('click', async (e) => {
     e.stopPropagation();
+    // 移除已有 modal
+    document.getElementById('my-p2p-id-modal')?.remove();
+    // 立即弹出 loading 状态 modal
+    const html = `
+      <div id="my-p2p-id-modal" style="position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:10003;display:flex;align-items:center;justify-content:center;">
+        <div style="background:#fff;border-radius:8px;width:480px;max-width:92vw;display:flex;flex-direction:column;box-shadow:0 10px 40px rgba(0,0,0,0.2);">
+          <div style="padding:14px 18px;border-bottom:1px solid #e5e7eb;display:flex;align-items:center;justify-content:space-between;">
+            <div style="font-size:15px;font-weight:600;">🪪 我的 P2P 身份</div>
+            <button id="mpim-close" style="background:none;border:none;font-size:20px;color:#6b7280;cursor:pointer;">×</button>
+          </div>
+          <div id="mpim-body" style="padding:16px 18px;">
+            <div style="color:#6b7280;font-size:13px;margin-bottom:10px;">正在获取 publicKey…</div>
+          </div>
+        </div>
+      </div>
+    `;
+    document.body.insertAdjacentHTML('beforeend', html);
+    document.getElementById('mpim-close').onclick = () => document.getElementById('my-p2p-id-modal').remove();
+
     try {
       const res = await fetch('/api/p2p-publickey');
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
       const data = await res.json();
       const pk = data.publicKey || '';
+      const body = document.getElementById('mpim-body');
       if (!pk || pk.length !== 64) {
-        alert('P2PDirect 还没启动, 刷新页面稍后再试');
+        body.innerHTML = `<div style="color:#b91c1c;font-size:13px;">✗ P2PDirect 还没启动, 刷新页面稍后再试</div>`;
         return;
       }
-      // 显示 + 一键复制
-      const ok = confirm(
-        `我的 P2P publicKey (64 字符 hex):\n\n${pk}\n\n` +
-        `点 "确定" 复制到剪贴板, 发给好友.\n` +
-        `好友点 "+ 好友" 粘贴这个 ID 就能加我.`
-      );
-      if (ok) {
+      body.innerHTML = `
+        <div style="font-size:12px;color:#6b7280;margin-bottom:8px;">把下面这串发给好友, 好友在 P2P 好友区点 "+ 好友" 粘贴即可加你:</div>
+        <div style="display:flex;gap:6px;align-items:center;margin-bottom:12px;">
+          <code id="mpim-pk" style="flex:1;padding:8px 10px;background:#f3f4f6;border:1px solid #d1d5db;border-radius:4px;font-family:monospace;font-size:11px;word-break:break-all;line-height:1.4;">${escapeHtml(pk)}</code>
+          <button id="mpim-copy" style="padding:8px 14px;background:#2563eb;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:13px;white-space:nowrap;">📋 复制</button>
+        </div>
+        <div id="mpim-status" style="font-size:12px;color:#059669;min-height:16px;"></div>
+        <div style="margin-top:14px;padding-top:12px;border-top:1px solid #e5e7eb;font-size:11px;color:#6b7280;">
+          💡 同一个 role 重启后 publicKey 不会变, 好友不需要重新加你.
+        </div>
+      `;
+      document.getElementById('mpim-copy').onclick = async () => {
+        const statusEl = document.getElementById('mpim-status');
         try {
           await navigator.clipboard.writeText(pk);
-          alert('✓ 已复制到剪贴板');
+          statusEl.textContent = '✓ 已复制到剪贴板';
         } catch {
-          // 旧浏览器 fallback
           const ta = document.createElement('textarea');
           ta.value = pk;
+          ta.style.position = 'fixed';
+          ta.style.opacity = '0';
           document.body.appendChild(ta);
           ta.select();
-          document.execCommand('copy');
+          try { document.execCommand('copy'); statusEl.textContent = '✓ 已复制 (fallback)'; }
+          catch { statusEl.textContent = '✗ 复制失败, 请手动选中复制'; }
           document.body.removeChild(ta);
-          alert('✓ 已复制到剪贴板 (fallback)');
         }
-      }
+      };
     } catch (err) {
-      alert('获取 publicKey 失败: ' + (err.message || err));
+      const body = document.getElementById('mpim-body');
+      if (body) body.innerHTML = `<div style="color:#b91c1c;font-size:13px;">✗ 获取失败: ${escapeHtml(err.message || String(err))}</div>`;
     }
   });
 }

package/dist/web/server.js

@@ -14,10 +14,32 @@ import { irohTransport } from '../network/iroh-transport.js';
 import { createAgentDelegateApp } from './agent-delegate-server.js';
 import { createIrohDelegateTransport } from './iroh-delegate-transport.js';
 import { verifyMessage, isAddress, getAddress } from 'viem';
-// 前端资源路径：在打包后会通过 CommonJS require 加载，使用 import.meta.url
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const webRoot = path.join(__dirname, '..', '..', 'dist', 'web');
+// 前端资源路径: 兼容 src 运行 + dist 运行 + npm 全局安装
+// - src 跑 (tsx):   __dirname = .../src/web  →  .../dist/web
+// - dist 跑 (npm):  __dirname = .../dist/web → 自身就是 web 根
+// - 环境变量覆盖:  BOLLOON_WEB_ROOT=xxx
+// ESM scope 没有 __dirname, 这里自己声明
+const __filename_local = fileURLToPath(import.meta.url);
+const __dirname_local = dirname(__filename_local);
+let _baseDirname = __dirname_local;
+function resolveWebRoot() {
+    if (process.env.BOLLOON_WEB_ROOT && fsSync.existsSync(process.env.BOLLOON_WEB_ROOT)) {
+        return process.env.BOLLOON_WEB_ROOT;
+    }
+    const d = _baseDirname;
+    const candidates = [
+        path.join(d), // dist/web
+        path.join(d, '..', '..', 'dist', 'web'), // src/web → dist/web
+        path.join(d, '..', 'web'), // dist/ → web/ 兄弟
+    ];
+    for (const c of candidates) {
+        if (fsSync.existsSync(path.join(c, 'index.html')))
+            return c;
+    }
+    return candidates[1];
+}
+const webRoot = resolveWebRoot();
+console.log(`[web] webRoot = ${webRoot}`);
 const SHARED_SESSION_PATH = path.join(process.env.HOME || '/tmp', '.bolloon', 'sessions');
 const SESSION_CACHE_PATH = path.join(SHARED_SESSION_PATH, 'cache');
 const CHANNELS_PATH = path.join(SHARED_SESSION_PATH, 'channels.json');

package/package.json

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

package/src/llm/config-store.ts

@@ -6,7 +6,7 @@
 import * as fs from 'fs/promises';
 import * as path from 'path';
 
-export type ModelProvider = 'openai' | 'anthropic' | 'ollama' | 'openrouter' | 'gemini' | 'minimax' | 'local';
+export type ModelProvider = 'openai' | 'anthropic' | 'ollama' | 'openrouter' | 'gemini' | 'minimax' | 'deepseek' | 'kimi' | 'glm' | 'qwen' | 'local';
 
 export interface ProviderConfig {
   enabled: boolean;
@@ -82,6 +82,42 @@ export const DEFAULT_PROVIDER_CONFIGS: Record<ModelProvider, ProviderConfig> = {
     maxTokens: 4096,
     requiresApiKey: true
   },
+  deepseek: {
+    enabled: false,
+    apiKey: '',
+    baseUrl: 'https://api.deepseek.com/v1',
+    model: 'deepseek-chat',
+    temperature: 0.7,
+    maxTokens: 4096,
+    requiresApiKey: true
+  },
+  kimi: {
+    enabled: false,
+    apiKey: '',
+    baseUrl: 'https://api.moonshot.cn/v1',
+    model: 'moonshot-v1-8k',
+    temperature: 0.7,
+    maxTokens: 4096,
+    requiresApiKey: true
+  },
+  glm: {
+    enabled: false,
+    apiKey: '',
+    baseUrl: 'https://open.bigmodel.cn/api/paas/v4',
+    model: 'glm-4-flash',
+    temperature: 0.7,
+    maxTokens: 4096,
+    requiresApiKey: true
+  },
+  qwen: {
+    enabled: false,
+    apiKey: '',
+    baseUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1',
+    model: 'qwen-plus',
+    temperature: 0.7,
+    maxTokens: 4096,
+    requiresApiKey: true
+  },
   local: {
     enabled: false,
     apiKey: '',
@@ -100,6 +136,10 @@ export const PROVIDER_INFO: Record<ModelProvider, { name: string; description: s
   gemini: { name: 'Google Gemini', description: 'Gemini 系列模型', requiresApiKey: true },
   ollama: { name: 'Ollama', description: '本地 LLM 运行框架', requiresApiKey: false },
   minimax: { name: 'MiniMax', description: '国产大模型服务', requiresApiKey: true },
+  deepseek: { name: 'DeepSeek', description: '深度求索大模型', requiresApiKey: true },
+  kimi: { name: 'Kimi (月之暗面)', description: 'Moonshot 长上下文模型', requiresApiKey: true },
+  glm: { name: 'GLM (智谱)', description: '智谱 ChatGLM 系列模型', requiresApiKey: true },
+  qwen: { name: 'Qwen (通义千问)', description: '阿里云通义千问系列', requiresApiKey: true },
   local: { name: '本地模型', description: '本地部署的模型服务', requiresApiKey: false }
 };
 
@@ -121,6 +161,18 @@ function getDefaultConfig(): LLMConfig {
   if (process.env.MINIMAX_API_KEY) {
     envConfigs.minimax = { ...DEFAULT_PROVIDER_CONFIGS.minimax, enabled: true, apiKey: process.env.MINIMAX_API_KEY };
   }
+  if (process.env.DEEPSEEK_API_KEY) {
+    envConfigs.deepseek = { ...DEFAULT_PROVIDER_CONFIGS.deepseek, enabled: true, apiKey: process.env.DEEPSEEK_API_KEY };
+  }
+  if (process.env.KIMI_API_KEY || process.env.MOONSHOT_API_KEY) {
+    envConfigs.kimi = { ...DEFAULT_PROVIDER_CONFIGS.kimi, enabled: true, apiKey: process.env.KIMI_API_KEY || process.env.MOONSHOT_API_KEY || '' };
+  }
+  if (process.env.GLM_API_KEY || process.env.ZHIPU_API_KEY) {
+    envConfigs.glm = { ...DEFAULT_PROVIDER_CONFIGS.glm, enabled: true, apiKey: process.env.GLM_API_KEY || process.env.ZHIPU_API_KEY || '' };
+  }
+  if (process.env.QWEN_API_KEY || process.env.DASHSCOPE_API_KEY) {
+    envConfigs.qwen = { ...DEFAULT_PROVIDER_CONFIGS.qwen, enabled: true, apiKey: process.env.QWEN_API_KEY || process.env.DASHSCOPE_API_KEY || '' };
+  }
   if (process.env.OLLAMA_BASE_URL) {
     envConfigs.ollama = { ...DEFAULT_PROVIDER_CONFIGS.ollama, enabled: true, baseUrl: process.env.OLLAMA_BASE_URL };
   }
@@ -131,6 +183,10 @@ function getDefaultConfig(): LLMConfig {
   else if (process.env.OPENROUTER_API_KEY) activeProvider = 'openrouter';
   else if (process.env.GEMINI_API_KEY) activeProvider = 'gemini';
   else if (process.env.MINIMAX_API_KEY) activeProvider = 'minimax';
+  else if (process.env.DEEPSEEK_API_KEY) activeProvider = 'deepseek';
+  else if (process.env.KIMI_API_KEY || process.env.MOONSHOT_API_KEY) activeProvider = 'kimi';
+  else if (process.env.GLM_API_KEY || process.env.ZHIPU_API_KEY) activeProvider = 'glm';
+  else if (process.env.QWEN_API_KEY || process.env.DASHSCOPE_API_KEY) activeProvider = 'qwen';
   else if (process.env.OLLAMA_BASE_URL) activeProvider = 'ollama';
 
   const providers = { ...DEFAULT_PROVIDER_CONFIGS };
@@ -281,6 +337,10 @@ class LLMConfigStore {
       case 'openai':
       case 'openrouter':
       case 'minimax':
+      case 'deepseek':
+      case 'kimi':
+      case 'glm':
+      case 'qwen':
         if (config.apiKey) headers['Authorization'] = `Bearer ${config.apiKey}`;
         break;
       case 'anthropic':

package/src/llm/pi-ai.ts

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import * as fs from 'fs';
 
-export type ModelProvider = 'openai' | 'anthropic' | 'ollama' | 'openrouter' | 'gemini' | 'minimax' | 'local';
+export type ModelProvider = 'openai' | 'anthropic' | 'ollama' | 'openrouter' | 'gemini' | 'minimax' | 'deepseek' | 'kimi' | 'glm' | 'qwen' | 'local';
 
 export interface ModelConfig {
   provider: ModelProvider;
@@ -105,6 +105,10 @@ export class PiAIModel {
     switch (this.provider) {
       case 'openai':
       case 'minimax':
+      case 'deepseek':
+      case 'kimi':
+      case 'glm':
+      case 'qwen':
         return this.callOpenAI(messages, temperature, maxTokens);
       case 'anthropic':
         return this.callAnthropic(messages, temperature, maxTokens);

package/src/web/client.js

@@ -2862,43 +2862,71 @@ function openRemoteChannelChat(peerPublicKey, channelId, channelName) {
   loadHistory();
 }
 
-// Phase 3: 我的 ID 按钮 → 弹窗显示并支持复制自己的 P2PDirect publicKey
+// Phase 3: 我的 ID 按钮 → 真 modal (避免 confirm 在某些环境被禁用)
 const showMyIdBtn = document.getElementById('show-my-p2p-id-btn');
 if (showMyIdBtn) {
   showMyIdBtn.addEventListener('click', async (e) => {
     e.stopPropagation();
+    // 移除已有 modal
+    document.getElementById('my-p2p-id-modal')?.remove();
+    // 立即弹出 loading 状态 modal
+    const html = `
+      <div id="my-p2p-id-modal" style="position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:10003;display:flex;align-items:center;justify-content:center;">
+        <div style="background:#fff;border-radius:8px;width:480px;max-width:92vw;display:flex;flex-direction:column;box-shadow:0 10px 40px rgba(0,0,0,0.2);">
+          <div style="padding:14px 18px;border-bottom:1px solid #e5e7eb;display:flex;align-items:center;justify-content:space-between;">
+            <div style="font-size:15px;font-weight:600;">🪪 我的 P2P 身份</div>
+            <button id="mpim-close" style="background:none;border:none;font-size:20px;color:#6b7280;cursor:pointer;">×</button>
+          </div>
+          <div id="mpim-body" style="padding:16px 18px;">
+            <div style="color:#6b7280;font-size:13px;margin-bottom:10px;">正在获取 publicKey…</div>
+          </div>
+        </div>
+      </div>
+    `;
+    document.body.insertAdjacentHTML('beforeend', html);
+    document.getElementById('mpim-close').onclick = () => document.getElementById('my-p2p-id-modal').remove();
+
     try {
       const res = await fetch('/api/p2p-publickey');
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
       const data = await res.json();
       const pk = data.publicKey || '';
+      const body = document.getElementById('mpim-body');
       if (!pk || pk.length !== 64) {
-        alert('P2PDirect 还没启动, 刷新页面稍后再试');
+        body.innerHTML = `<div style="color:#b91c1c;font-size:13px;">✗ P2PDirect 还没启动, 刷新页面稍后再试</div>`;
         return;
       }
-      // 显示 + 一键复制
-      const ok = confirm(
-        `我的 P2P publicKey (64 字符 hex):\n\n${pk}\n\n` +
-        `点 "确定" 复制到剪贴板, 发给好友.\n` +
-        `好友点 "+ 好友" 粘贴这个 ID 就能加我.`
-      );
-      if (ok) {
+      body.innerHTML = `
+        <div style="font-size:12px;color:#6b7280;margin-bottom:8px;">把下面这串发给好友, 好友在 P2P 好友区点 "+ 好友" 粘贴即可加你:</div>
+        <div style="display:flex;gap:6px;align-items:center;margin-bottom:12px;">
+          <code id="mpim-pk" style="flex:1;padding:8px 10px;background:#f3f4f6;border:1px solid #d1d5db;border-radius:4px;font-family:monospace;font-size:11px;word-break:break-all;line-height:1.4;">${escapeHtml(pk)}</code>
+          <button id="mpim-copy" style="padding:8px 14px;background:#2563eb;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:13px;white-space:nowrap;">📋 复制</button>
+        </div>
+        <div id="mpim-status" style="font-size:12px;color:#059669;min-height:16px;"></div>
+        <div style="margin-top:14px;padding-top:12px;border-top:1px solid #e5e7eb;font-size:11px;color:#6b7280;">
+          💡 同一个 role 重启后 publicKey 不会变, 好友不需要重新加你.
+        </div>
+      `;
+      document.getElementById('mpim-copy').onclick = async () => {
+        const statusEl = document.getElementById('mpim-status');
         try {
           await navigator.clipboard.writeText(pk);
-          alert('✓ 已复制到剪贴板');
+          statusEl.textContent = '✓ 已复制到剪贴板';
         } catch {
-          // 旧浏览器 fallback
           const ta = document.createElement('textarea');
           ta.value = pk;
+          ta.style.position = 'fixed';
+          ta.style.opacity = '0';
           document.body.appendChild(ta);
           ta.select();
-          document.execCommand('copy');
+          try { document.execCommand('copy'); statusEl.textContent = '✓ 已复制 (fallback)'; }
+          catch { statusEl.textContent = '✗ 复制失败, 请手动选中复制'; }
           document.body.removeChild(ta);
-          alert('✓ 已复制到剪贴板 (fallback)');
         }
-      }
+      };
     } catch (err) {
-      alert('获取 publicKey 失败: ' + (err.message || err));
+      const body = document.getElementById('mpim-body');
+      if (body) body.innerHTML = `<div style="color:#b91c1c;font-size:13px;">✗ 获取失败: ${escapeHtml(err.message || String(err))}</div>`;
     }
   });
 }

package/src/web/server.ts

@@ -23,10 +23,31 @@ import { createAgentDelegateApp } from './agent-delegate-server.js';
 import { createIrohDelegateTransport } from './iroh-delegate-transport.js';
 import { verifyMessage, isAddress, getAddress } from 'viem';
 
-// 前端资源路径：在打包后会通过 CommonJS require 加载，使用 import.meta.url
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const webRoot = path.join(__dirname, '..', '..', 'dist', 'web');
+// 前端资源路径: 兼容 src 运行 + dist 运行 + npm 全局安装
+// - src 跑 (tsx):   __dirname = .../src/web  →  .../dist/web
+// - dist 跑 (npm):  __dirname = .../dist/web → 自身就是 web 根
+// - 环境变量覆盖:  BOLLOON_WEB_ROOT=xxx
+// ESM scope 没有 __dirname, 这里自己声明
+const __filename_local = fileURLToPath(import.meta.url);
+const __dirname_local = dirname(__filename_local);
+let _baseDirname = __dirname_local;
+function resolveWebRoot(): string {
+  if (process.env.BOLLOON_WEB_ROOT && fsSync.existsSync(process.env.BOLLOON_WEB_ROOT)) {
+    return process.env.BOLLOON_WEB_ROOT;
+  }
+  const d = _baseDirname;
+  const candidates = [
+    path.join(d),                                    // dist/web
+    path.join(d, '..', '..', 'dist', 'web'),         // src/web → dist/web
+    path.join(d, '..', 'web'),                       // dist/ → web/ 兄弟
+  ];
+  for (const c of candidates) {
+    if (fsSync.existsSync(path.join(c, 'index.html'))) return c;
+  }
+  return candidates[1];
+}
+const webRoot = resolveWebRoot();
+console.log(`[web] webRoot = ${webRoot}`);
 
 const SHARED_SESSION_PATH = path.join(process.env.HOME || '/tmp', '.bolloon', 'sessions');
 const SESSION_CACHE_PATH = path.join(SHARED_SESSION_PATH, 'cache');