@bolloon/bolloon-agent 0.3.16 → 0.3.18

package/dist/lsp/lsp-tools.js

@@ -0,0 +1,222 @@
+/**
+ * lsp/lsp-tools.ts — 注册 LSP 工具到 Bolloon agent 工具系统
+ *
+ * 暴露 6 个工具:
+ *   - lsp_detect: 检测本机已安装的语言服务器
+ *   - lsp_hover: 悬停查看类型/文档
+ *   - lsp_completion: 代码补全
+ *   - lsp_diagnostics: 诊断当前文件
+ *   - lsp_go_to_definition: 跳转到定义
+ *   - lsp_start / lsp_stop: 手动管理 LSP 服务器生命周期
+ */
+import { detectInstalledLspServers, startLspServer, stopLspServer, stopAllLspServers, findLspForFile, lspDidOpen, lspHover, lspCompletion, lspDiagnostics, lspGoToDefinition, } from './lsp-manager.js';
+/** 已检测到的 LSP 服务器列表 (缓存) */
+let cachedSpecs = null;
+async function getSpecs() {
+    if (!cachedSpecs)
+        cachedSpecs = await detectInstalledLspServers();
+    return cachedSpecs;
+}
+/**
+ * 注册 6 个 LSP 工具到 Bolloon agent 的工具系统.
+ * 在 registerBuiltinTools 内部调用.
+ */
+export function registerLspTools(ctx) {
+    ctx.tools.set('lsp_detect', {
+        name: 'lsp_detect',
+        description: '检测本机已安装的 LSP (Language Server Protocol) 服务器, 返回可用的语言列表',
+        parameters: {},
+        execute: async (_args) => {
+            try {
+                const specs = await getSpecs();
+                if (specs.length === 0) {
+                    return { success: true, output: '⚠️ 未检测到任何 LSP 服务器。可安装:\n  npm install -g typescript-language-server\n  cargo install rust-analyzer' };
+                }
+                const lines = specs.map(s => `  ✅ ${s.displayName} (${s.language}): ${s.fileExtensions.join(', ')}`);
+                return { success: true, output: `已检测到 ${specs.length} 个 LSP 服务器:\n${lines.join('\n')}` };
+            }
+            catch (e) {
+                return { success: false, error: String(e) };
+            }
+        },
+    });
+    ctx.tools.set('lsp_start', {
+        name: 'lsp_start',
+        description: '启动指定语言的语言服务器 (如 typescript / rust / python)',
+        parameters: { language: '语言 id, 如 typescript / rust / python (必填)' },
+        execute: async (args) => {
+            try {
+                const language = String(args.language || '').trim().toLowerCase();
+                if (!language)
+                    return { success: false, error: 'language 必填' };
+                const inst = await startLspServer(language);
+                if (!inst)
+                    return { success: false, error: `未找到 ${language} 的 LSP 服务器, 请先安装` };
+                return { success: true, output: `✅ ${inst.spec.displayName} 已启动` };
+            }
+            catch (e) {
+                return { success: false, error: String(e) };
+            }
+        },
+    });
+    ctx.tools.set('lsp_hover', {
+        name: 'lsp_hover',
+        description: '在文件某位置悬停, 查看类型/文档 (需要先 lsp_start)',
+        parameters: {
+            file: '文件路径 (必填)',
+            line: '行号 (从 0 开始)',
+            character: '列号 (从 0 开始)',
+            content: '文件内容 (可选, 首次需要以触发 didOpen)',
+        },
+        execute: async (args) => {
+            try {
+                const file = String(args.file || '').trim();
+                if (!file)
+                    return { success: false, error: 'file 必填' };
+                const line = parseInt(String(args.line || '0'), 10);
+                const character = parseInt(String(args.character || '0'), 10);
+                const content = args.content ? String(args.content) : undefined;
+                const specs = await getSpecs();
+                const spec = findLspForFile(file, specs);
+                if (!spec)
+                    return { success: false, error: `未找到 ${file} 对应的 LSP 服务器` };
+                const inst = await startLspServer(spec.language);
+                if (!inst)
+                    return { success: false, error: `LSP ${spec.language} 启动失败` };
+                if (content)
+                    lspDidOpen(inst, file, content);
+                const result = await lspHover(inst, file, line, character);
+                if (!result)
+                    return { success: true, output: '(无悬停信息)' };
+                return { success: true, output: result.contents };
+            }
+            catch (e) {
+                return { success: false, error: String(e) };
+            }
+        },
+    });
+    ctx.tools.set('lsp_completion', {
+        name: 'lsp_completion',
+        description: '在文件某位置获取代码补全建议 (需要先 lsp_start)',
+        parameters: {
+            file: '文件路径 (必填)',
+            line: '行号 (从 0 开始)',
+            character: '列号 (从 0 开始)',
+            content: '文件内容 (可选)',
+        },
+        execute: async (args) => {
+            try {
+                const file = String(args.file || '').trim();
+                if (!file)
+                    return { success: false, error: 'file 必填' };
+                const line = parseInt(String(args.line || '0'), 10);
+                const character = parseInt(String(args.character || '0'), 10);
+                const content = args.content ? String(args.content) : undefined;
+                const specs = await getSpecs();
+                const spec = findLspForFile(file, specs);
+                if (!spec)
+                    return { success: false, error: `未找到 ${file} 对应的 LSP 服务器` };
+                const inst = await startLspServer(spec.language);
+                if (!inst)
+                    return { success: false, error: `LSP ${spec.language} 启动失败` };
+                if (content)
+                    lspDidOpen(inst, file, content);
+                const result = await lspCompletion(inst, file, line, character);
+                if (result.items.length === 0)
+                    return { success: true, output: '(无补全建议)' };
+                const items = result.items.slice(0, 20).map(i => `  ${i.label}${i.detail ? ` — ${i.detail}` : ''}`);
+                return { success: true, output: `补全建议 (显示前 20 条):\n${items.join('\n')}` };
+            }
+            catch (e) {
+                return { success: false, error: String(e) };
+            }
+        },
+    });
+    ctx.tools.set('lsp_diagnostics', {
+        name: 'lsp_diagnostics',
+        description: '获取文件的诊断结果 (错误/警告)',
+        parameters: { file: '文件路径 (必填)', content: '文件内容 (可选)' },
+        execute: async (args) => {
+            try {
+                const file = String(args.file || '').trim();
+                if (!file)
+                    return { success: false, error: 'file 必填' };
+                const content = args.content ? String(args.content) : undefined;
+                const specs = await getSpecs();
+                const spec = findLspForFile(file, specs);
+                if (!spec)
+                    return { success: false, error: `未找到 ${file} 对应的 LSP 服务器` };
+                const inst = await startLspServer(spec.language);
+                if (!inst)
+                    return { success: false, error: `LSP ${spec.language} 启动失败` };
+                if (content)
+                    lspDidOpen(inst, file, content);
+                const result = await lspDiagnostics(inst, file);
+                if (result.diagnostics.length === 0)
+                    return { success: true, output: '✅ 无诊断问题' };
+                const lines = result.diagnostics.map(d => {
+                    const sev = ['', '错误', '警告', '信息', '提示'][d.severity || 0] || '未知';
+                    const pos = `L${d.range.start.line}:${d.range.start.character}`;
+                    return `  ${sev === '错误' ? '❌' : sev === '警告' ? '⚠️' : 'ℹ️'} [${pos}] ${sev}: ${d.message}`;
+                });
+                return { success: true, output: `诊断结果 (${result.diagnostics.length} 条):\n${lines.join('\n')}` };
+            }
+            catch (e) {
+                return { success: false, error: String(e) };
+            }
+        },
+    });
+    ctx.tools.set('lsp_go_to_definition', {
+        name: 'lsp_go_to_definition',
+        description: '跳转到符号定义的位置',
+        parameters: {
+            file: '当前文件路径 (必填)',
+            line: '行号 (从 0 开始)',
+            character: '列号 (从 0 开始)',
+        },
+        execute: async (args) => {
+            try {
+                const file = String(args.file || '').trim();
+                if (!file)
+                    return { success: false, error: 'file 必填' };
+                const line = parseInt(String(args.line || '0'), 10);
+                const character = parseInt(String(args.character || '0'), 10);
+                const specs = await getSpecs();
+                const spec = findLspForFile(file, specs);
+                if (!spec)
+                    return { success: false, error: `未找到 ${file} 对应的 LSP 服务器` };
+                const inst = await startLspServer(spec.language);
+                if (!inst)
+                    return { success: false, error: `LSP ${spec.language} 启动失败` };
+                const loc = await lspGoToDefinition(inst, file, line, character);
+                if (!loc)
+                    return { success: true, output: '(未找到定义位置)' };
+                return { success: true, output: `定义位置: ${loc.uri} (L${loc.range.start.line}:${loc.range.start.character})` };
+            }
+            catch (e) {
+                return { success: false, error: String(e) };
+            }
+        },
+    });
+    ctx.tools.set('lsp_stop', {
+        name: 'lsp_stop',
+        description: '关闭指定语言的语言服务器 (或 all 关闭所有)',
+        parameters: { language: '语言 id, 如 typescript, 或 all 关闭全部' },
+        execute: async (args) => {
+            try {
+                const language = String(args.language || '').trim().toLowerCase();
+                if (!language)
+                    return { success: false, error: 'language 必填 (或 "all")' };
+                if (language === 'all') {
+                    stopAllLspServers();
+                    return { success: true, output: '✅ 所有 LSP 服务器已关闭' };
+                }
+                await stopLspServer(language);
+                return { success: true, output: `✅ ${language} LSP 服务器已关闭` };
+            }
+            catch (e) {
+                return { success: false, error: String(e) };
+            }
+        },
+    });
+}

package/dist/utils/auto-update.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * npm 自动更新检查器
  *
@@ -14,48 +13,11 @@
  *   开发态下若 cwd 的 package.json 就是本包则回退到 cwd，不受任意工作目录影响。
  * - 检查频率受节流缓存约束（默认 24h 一次），不会每次启动都打 npm。
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAndUpdate = checkAndUpdate;
-exports.checkForUpdates = checkForUpdates;
-exports.performUpdate = performUpdate;
-const child_process_1 = require("child_process");
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const https = __importStar(require("https"));
-const http = __importStar(require("http"));
+import { execSync } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as https from 'https';
+import * as http from 'http';
 // ANSI 颜色
 const RESET = '\x1b[0m';
 const BOLD = '\x1b[1m';
@@ -113,7 +75,7 @@ function getGlobalBolloonDir() {
     const candidates = [];
     // 1. npm root -g（最可靠）
     try {
-        const npmRoot = (0, child_process_1.execSync)('npm root -g', { encoding: 'utf-8', timeout: 8000 }).trim();
+        const npmRoot = execSync('npm root -g', { encoding: 'utf-8', timeout: 8000 }).trim();
         if (npmRoot)
             candidates.push(path.join(npmRoot, '@bolloon', 'bolloon-agent'));
     }
@@ -122,7 +84,7 @@ function getGlobalBolloonDir() {
     }
     // 2. npm prefix -g
     try {
-        const npmPrefix = (0, child_process_1.execSync)('npm prefix -g', { encoding: 'utf-8', timeout: 8000 }).trim();
+        const npmPrefix = execSync('npm prefix -g', { encoding: 'utf-8', timeout: 8000 }).trim();
         if (npmPrefix)
             candidates.push(path.join(npmPrefix, 'lib', 'node_modules', '@bolloon', 'bolloon-agent'));
     }
@@ -280,7 +242,7 @@ async function checkBolloonUpdates() {
  */
 function checkNpmOutdated() {
     try {
-        const output = (0, child_process_1.execSync)('npm outdated --json', {
+        const output = execSync('npm outdated --json', {
             encoding: 'utf-8',
             timeout: 30000,
             maxBuffer: 10 * 1024 * 1024,
@@ -344,7 +306,7 @@ async function updatePackagesWithVersion(packagesWithVersion) {
     const args = ['npm', 'install', '-g', ...packagesWithVersion];
     notify(`\n${CYAN}📦 正在更新包...${RESET}\n`, RESET);
     try {
-        (0, child_process_1.execSync)(args.join(' '), {
+        execSync(args.join(' '), {
             encoding: 'utf-8',
             timeout: 300000,
             stdio: 'inherit',
@@ -462,7 +424,7 @@ function resolveAutoUpdatePolicy() {
  *                       例如 Electron 用 app.relaunch()，Node 用 detached 重新 spawn）。
  *                       若未提供或 autoRestart=false，则仅提示用户手动重启。
  */
-async function checkAndUpdate(opts = {}) {
+export async function checkAndUpdate(opts = {}) {
     const policy = resolveAutoUpdatePolicy();
     if (policy.blocked) {
         return { hasUpdate: false, info: null, updated: false, message: '跳过更新检查（已显式禁用）' };
@@ -566,13 +528,13 @@ async function checkAndUpdate(opts = {}) {
 /**
  * 仅检查更新，不自动安装
  */
-async function checkForUpdates() {
+export async function checkForUpdates() {
     return await checkBolloonUpdates();
 }
 /**
  * 手动触发更新
  */
-async function performUpdate(packages) {
+export async function performUpdate(packages) {
     return await updatePackages(packages);
 }
 // CLI 入口
@@ -595,4 +557,3 @@ if (process.argv[1]?.includes('auto-update')) {
         }
     })();
 }
-//# sourceMappingURL=auto-update.js.map

package/dist/web/client.js

@@ -3383,12 +3383,28 @@ ${data.error || "channel not found"}`, "error");
       console.error("Failed to check API config:", err);
     }
   }
+  async function loadUserIdentity() {
+    try {
+      const res = await fetch("/api/user/identity");
+      if (!res.ok) return;
+      const identity = await res.json();
+      const letter = identity.name ? identity.name.charAt(0).toUpperCase() : "?";
+      const nameEl = document.getElementById("user-name");
+      const didEl = document.getElementById("user-did");
+      const letterEl = document.getElementById("avatar-letter");
+      if (nameEl) nameEl.textContent = identity.name || "\u533F\u540D";
+      if (didEl) didEl.textContent = identity.didShort ? `did:key:${identity.didShort}` : "";
+      if (letterEl) letterEl.textContent = letter;
+    } catch (e) {
+    }
+  }
   async function init() {
     const themeData = await loadTheme();
     currentAgentId = themeData.agentId || `agent_${generateId().substring(0, 8)}`;
     if (!themeData.agentId) {
       await saveTheme(themeData.theme, currentAgentId);
     }
+    loadUserIdentity();
     try {
       const res = await fetch("/api/tools");
       if (res.ok) {

package/dist/web/index.html

@@ -78,6 +78,13 @@
       </div>
 
       <div class="sidebar-footer">
+        <div class="user-avatar" id="user-avatar" title="点击查看 DID 身份">
+          <span class="avatar-letter" id="avatar-letter">?</span>
+        </div>
+        <div class="user-info">
+          <span class="user-name" id="user-name">加载中...</span>
+          <span class="user-did" id="user-did"></span>
+        </div>
         <div class="agent-status">
           <span class="status-dot"></span>
           <span class="status-text">已连接</span>

package/dist/web/server.js

@@ -2082,9 +2082,7 @@ ${goalDesc}
         // v3 修复: 用 setInterval 替代一次性 setTimeout, 确保分享变更后能持续推送给 peer
         setInterval(v3BroadcastOwn, 30000);
         // 保留 @diap/sdk 的旧实例 (它的 Hyperswarm 实例能帮 P2PDirect 做 DHT bootstrap)
-        // 2026-07-04: hyperswarm 4.x 删除了 Discovery.update() (被 .flushed() 替代).
-        //   @diap/sdk 0.1.10 还调 .update(), 是上游 bug (已记录 docs/plans/2026-06-17-supervisor-iter-1.md).
-        //   这里静默 joinTopic 失败, P2PDirect (v3 主路径) 不依赖 @diap/sdk, 不影响功能.
+        // 2026-07-04: @diap/sdk v0.2.0 已修复 seed/*update*/connect 类型, 此处走正常路径.
         try {
             const rawSeed = crypto.getRandomValues(new Uint8Array(32));
             p2pCommunicator = createHyperswarmCommunicator({
@@ -2113,18 +2111,17 @@ ${goalDesc}
             });
             await p2pCommunicator.start();
             // @diap/sdk 也 join topic — 它的 Hyperswarm 实例帮 P2PDirect 做 DHT 引导
-            // joinTopic 失败已知 (hyperswarm 4.x + @diap/sdk 0.1.10), catch 静默
+            // v0.2.1 (2026-07-28): hyperswarm seed 类型固定 + join() 返回 { refresh, flushed, destroy }
+            //   discovery.update 错误已彻底修复. catch 保留做防御性兜底.
             const oldTopic = createTopic('bolloon-agent-harness');
             try {
                 await p2pCommunicator.joinTopic(oldTopic);
                 console.log(`P2P 老通道已就绪 (DHT bootstrap 帮 P2PDirect, 实际数据走 P2PDirect)`);
             }
             catch (joinErr) {
-                // 已知: @diap/sdk 0.1.10 + hyperswarm 4.x → discovery.update is not a function
-                // v3 P2PDirect 是主路径, 此处不阻断
                 const msg = String(joinErr?.message || joinErr);
                 if (msg.includes('discovery.update') || msg.includes('is not a function')) {
-                    console.warn(`[v3-legacy] @diap/sdk joinTopic 失败 (已知 hyperswarm 4.x 兼容问题, 已忽略): ${msg}`);
+                    console.warn(`[v3-legacy] joinTopic 触发旧版兼容警告: ${msg}`);
                 }
                 else {
                     throw joinErr;
@@ -2223,6 +2220,50 @@ ${goalDesc}
     app.get('/api/tools', (_req, res) => {
         res.json(listTools().map(t => t.id));
     });
+    // 2026-07-28: 用户 DID 身份端点 — 静默生成/加载, 持久化到 ~/.bolloon/identity/user.json
+    let userIdentityCache = null;
+    const IDENTITY_DIR = `${process.env.HOME || '/tmp'}/.bolloon/identity`;
+    async function loadOrCreateUserIdentity() {
+        if (userIdentityCache)
+            return userIdentityCache;
+        try {
+            const { readFileSync, existsSync, mkdirSync, writeFileSync } = await import('fs');
+            const file = `${IDENTITY_DIR}/user.json`;
+            if (existsSync(file)) {
+                const raw = readFileSync(file, 'utf-8');
+                const parsed = JSON.parse(raw);
+                if (parsed.did && parsed.publicKeyHex) {
+                    userIdentityCache = parsed;
+                    return parsed;
+                }
+            }
+            // 生成新 DID keypair
+            const kp = KeyManager.generate();
+            const didShort = kp.did.split(':').pop()?.substring(0, 8) || 'unknown';
+            const publicKeyHex = Buffer.from(kp.publicKey).toString('hex');
+            const username = getUserName();
+            const identity = {
+                did: kp.did,
+                didShort,
+                publicKeyHex,
+                name: `blln-${username}`,
+                createdAt: new Date().toISOString(),
+            };
+            mkdirSync(IDENTITY_DIR, { recursive: true });
+            writeFileSync(file, JSON.stringify(identity, null, 2), { mode: 0o600 });
+            userIdentityCache = identity;
+            console.log(`[user-identity] ✅ DID: ${kp.did.substring(0, 30)}...`);
+            return identity;
+        }
+        catch (e) {
+            console.warn('[user-identity] 加载失败:', e.message);
+            return { did: '', didShort: 'anon', publicKeyHex: '', name: getUserName() };
+        }
+    }
+    app.get('/api/user/identity', async (_req, res) => {
+        const identity = await loadOrCreateUserIdentity();
+        res.json(identity);
+    });
     // 2026-07-01 (v0.2.6): 前后端分离核心 — 后端切 LLM 输出为结构化 segments
     //   - POST /api/segment-reply { reply, knownTools }
     //   - 返回 ChatSegment[] (think / text / env_details / tool_call / final)

package/dist/web/style.css

@@ -822,16 +822,71 @@ body {
 
 /* Sidebar Footer */
 .sidebar-footer {
-  padding: 16px;
+  padding: 12px 16px;
   border-top: 1px solid var(--border);
+  display: flex;
+  align-items: center;
+  gap: 10px;
 }
 
-.agent-status {
+/* 用户头像 — DID 身份 */
+.user-avatar {
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  background: linear-gradient(135deg, var(--accent) 0%, var(--accent-dark) 100%);
   display: flex;
   align-items: center;
-  gap: 8px;
+  justify-content: center;
+  flex-shrink: 0;
+  cursor: pointer;
+  transition: transform 0.2s, box-shadow 0.2s;
+}
+.user-avatar:hover {
+  transform: scale(1.1);
+  box-shadow: 0 0 12px var(--accent-glow);
+}
+.avatar-letter {
+  font-size: 14px;
+  font-weight: 700;
+  color: #1a1a18;
+  text-transform: uppercase;
+  user-select: none;
+}
+
+.user-info {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+.user-name {
   font-size: 12px;
+  font-weight: 600;
+  color: var(--text);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 1.2;
+}
+.user-did {
+  font-size: 10px;
+  font-family: var(--font-mono);
+  color: var(--text-muted);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 1.2;
+}
+
+.agent-status {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 11px;
   color: var(--text-secondary);
+  flex-shrink: 0;
 }
 
 .status-dot {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "type": "module",
-  "description": "P2P AI Document Agent - \u5168\u5c40\u5b89\u88c5\u540e\u6267\u884c `bolloon` \u542f\u52a8\u4ea7\u54c1",
+  "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli-entry.js",
   "author": "Bolloon Leo",
   "repository": {
@@ -48,7 +48,7 @@
     "src/constraint-runtime"
   ],
   "dependencies": {
-    "@bolloon/bolloon-agent": "^0.3.13",
+    "@bolloon/bolloon-agent": "^0.3.16",
     "@bolloon/constraint-runtime": "0.1.0",
     "@capacitor/core": "^8.4.1",
     "@capacitor/ios": "^8.4.1",