@bolloon/bolloon-agent 0.1.32 → 0.1.34

package/dist/web/style.css

@@ -4083,3 +4083,373 @@ body:has(> .api-config-page) {
   cursor: pointer;
   accent-color: var(--accent);
 }
+
+/* ============================================================
+ * 2026-06-10: 远程聊天 modal — 完全对齐本地聊天风格
+ * 用 CSS 变量, 字体继承全局 JetBrains Mono, 支持深/浅色主题切换
+ * ============================================================ */
+.remote-chat-overlay {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.55);
+  z-index: 10002;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.remote-chat-shell {
+  background: var(--bg-main);
+  color: var(--text);
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  width: 720px;
+  max-width: 92vw;
+  height: 80vh;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 10px 40px rgba(0, 0, 0, 0.35);
+  font-family: inherit;
+}
+.remote-chat-header {
+  padding: 12px 16px;
+  border-bottom: 1px solid var(--border);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  background: var(--bg-sidebar);
+  border-radius: 8px 8px 0 0;
+}
+.remote-chat-title {
+  font-size: 15px;
+  font-weight: 600;
+  color: var(--text);
+}
+.remote-chat-meta {
+  font-size: 11px;
+  color: var(--text-muted);
+  margin-top: 2px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.remote-chat-btn-secondary {
+  background: var(--bg-hover);
+  border: 1px solid var(--border);
+  color: var(--text-secondary);
+  cursor: pointer;
+  padding: 4px 10px;
+  border-radius: 4px;
+  font-size: 11px;
+  font-family: inherit;
+}
+.remote-chat-btn-secondary:hover {
+  background: var(--bg-active);
+  color: var(--text);
+}
+.remote-chat-btn-close {
+  background: none;
+  border: none;
+  font-size: 20px;
+  color: var(--text-muted);
+  cursor: pointer;
+  padding: 0 8px;
+  line-height: 1;
+}
+.remote-chat-btn-close:hover {
+  color: var(--text);
+}
+.remote-chat-thinking {
+  padding: 8px 16px;
+  background: var(--bg-hover);
+  color: var(--text-secondary);
+  font-size: 12px;
+  border-bottom: 1px solid var(--border);
+}
+.remote-chat-log {
+  flex: 1;
+  overflow-y: auto;
+  padding: 12px 16px;
+  background: var(--bg-main);
+}
+.remote-chat-input-row {
+  padding: 10px 12px;
+  border-top: 1px solid var(--border);
+  display: flex;
+  gap: 6px;
+  background: var(--bg-sidebar);
+  border-radius: 0 0 8px 8px;
+}
+.remote-chat-input {
+  flex: 1;
+  padding: 8px 10px;
+  border: 1px solid var(--border);
+  border-radius: 4px;
+  font-size: 13px;
+  background: var(--bg-main);
+  color: var(--text);
+  font-family: inherit;
+}
+.remote-chat-input:focus {
+  outline: none;
+  border-color: var(--accent, #a4b630);
+}
+.remote-chat-btn-send {
+  padding: 8px 14px;
+  background: var(--user-bg);
+  color: var(--user-text);
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 13px;
+  font-weight: 600;
+  font-family: inherit;
+}
+.remote-chat-btn-send:hover:not(:disabled) {
+  filter: brightness(1.1);
+}
+.remote-chat-btn-send:disabled {
+  opacity: 0.5;
+  cursor: wait;
+}
+.remote-chat-sysmsg {
+  margin: 6px 0;
+  padding: 6px 10px;
+  border-radius: 4px;
+  font-size: 11px;
+  text-align: center;
+  border: 1px solid var(--border);
+}
+.remote-chat-sysmsg-info {
+  background: var(--bg-hover);
+  color: var(--text-secondary);
+}
+.remote-chat-sysmsg-warn {
+  background: var(--bg-hover);
+  color: var(--text);
+  border-color: var(--border-light);
+}
+.remote-chat-sysmsg-error {
+  background: rgba(220, 38, 38, 0.12);
+  color: #fca5a5;
+  border-color: rgba(220, 38, 38, 0.3);
+}
+.remote-chat-judgments {
+  margin: 0 0 8px;
+  padding: 8px 10px;
+  background: var(--bg-hover);
+  border-left: 3px solid var(--accent, #a4b630);
+  border-radius: 4px;
+  font-size: 12px;
+}
+.remote-chat-judgments-title {
+  font-weight: 600;
+  color: var(--text);
+  margin-bottom: 4px;
+}
+.remote-chat-judgment-item {
+  margin: 3px 0;
+  padding-left: 8px;
+  color: var(--text);
+}
+.remote-chat-judgment-tag {
+  color: var(--text-muted);
+  font-size: 10px;
+}
+.remote-chat-judgment-reason {
+  color: var(--text-secondary);
+  font-size: 11px;
+}
+.remote-chat-judgments-foot {
+  margin-top: 6px;
+  color: var(--text-muted);
+  font-size: 11px;
+}
+
+/* ============================================================
+ * 2026-06-10: 好友申请 modal — 对齐本地风格 + CSS 变量
+ * ============================================================ */
+.friend-req-overlay {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.55);
+  z-index: 10004;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.friend-req-shell {
+  background: var(--bg-main);
+  color: var(--text);
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  width: 460px;
+  max-width: 92vw;
+  box-shadow: 0 10px 40px rgba(0, 0, 0, 0.4);
+  font-family: inherit;
+}
+.friend-req-header {
+  padding: 14px 18px;
+  border-bottom: 1px solid var(--border);
+  background: var(--bg-sidebar);
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  border-radius: 8px 8px 0 0;
+}
+.friend-req-title {
+  font-size: 15px;
+  font-weight: 600;
+  color: var(--text);
+}
+.friend-req-meta {
+  font-size: 11px;
+  color: var(--text-muted);
+  margin-top: 2px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.friend-req-body {
+  padding: 14px 18px;
+  font-size: 13px;
+  color: var(--text);
+  line-height: 1.5;
+}
+.friend-req-actions {
+  padding: 10px 18px;
+  border-top: 1px solid var(--border);
+  display: flex;
+  gap: 8px;
+  justify-content: flex-end;
+  background: var(--bg-sidebar);
+  border-radius: 0 0 8px 8px;
+}
+.friend-req-btn-deny {
+  padding: 6px 14px;
+  background: var(--bg-hover);
+  color: var(--text-secondary);
+  border: 1px solid var(--border);
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 13px;
+  font-family: inherit;
+}
+.friend-req-btn-deny:hover {
+  background: var(--bg-active);
+  color: var(--text);
+}
+.friend-req-btn-accept {
+  padding: 6px 14px;
+  background: var(--user-bg);
+  color: var(--user-text);
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 13px;
+  font-weight: 600;
+  font-family: inherit;
+}
+.friend-req-btn-accept:hover {
+  filter: brightness(1.1);
+}
+
+/* ============================================================
+ * 2026-06-10: Toast 入场动画 (simple-toast 用)
+ * ============================================================ */
+@keyframes toast-in {
+  from {
+    opacity: 0;
+    transform: translateX(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateX(0);
+  }
+}
+
+/* ============================================================
+ * 2026-06-10: P2P peer-group 可折叠 — 复用 #remote-agents-section.collapsed 模式
+ * peer header 加 .peer-caret, 点击切 .remote-peer-group.collapsed
+ * 折叠后隐藏 .remote-peer-channels, caret 旋转 -90deg
+ * ============================================================ */
+.remote-peer-group .peer-caret {
+  display: inline-block;
+  font-size: 10px;
+  color: var(--text-muted);
+  transition: transform 0.15s ease;
+  user-select: none;
+  width: 12px;
+  text-align: center;
+}
+.remote-peer-group.collapsed .peer-caret {
+  transform: rotate(-90deg);
+}
+.remote-peer-group.collapsed > .remote-peer-channels {
+  display: none;
+}
+.remote-peer-group .remote-peer-header {
+  /* 让 caret 单独成可点区域时不撑破 header */
+  user-select: none;
+}
+
+/* ============================================================
+ * 2026-06-11: 分享 channel modal (P2P peer 分享) — 用 friend-req-shell 风格
+ * ============================================================ */
+.share-modal-shell {
+  width: 520px;
+  max-height: 80vh;
+}
+.share-modal-hint {
+  padding: 8px 18px;
+  font-size: 12px;
+  color: var(--text-muted);
+  background: var(--bg-sidebar);
+  border-bottom: 1px solid var(--border);
+}
+.share-modal-list {
+  flex: 1;
+  overflow-y: auto;
+  padding: 4px 18px;
+  max-height: 50vh;
+}
+.share-modal-empty {
+  color: var(--text-muted);
+  padding: 20px;
+  text-align: center;
+}
+.share-modal-row {
+  display: flex;
+  align-items: flex-start;
+  gap: 10px;
+  padding: 8px 4px;
+  cursor: pointer;
+  border-bottom: 1px solid var(--border);
+  font-family: inherit;
+}
+.share-modal-row:hover {
+  background: var(--bg-hover);
+}
+.share-modal-cb {
+  margin-top: 4px;
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+  accent-color: var(--accent);
+}
+.share-modal-row-info {
+  flex: 1;
+  min-width: 0;
+}
+.share-modal-row-name {
+  font-size: 13px;
+  font-weight: 500;
+  color: var(--text);
+}
+.share-modal-row-meta {
+  font-size: 10px;
+  color: var(--text-muted);
+  margin-top: 2px;
+  font-family: 'JetBrains Mono', monospace;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli.js",
@@ -60,6 +60,7 @@
     "viem": "^2.52.0"
   },
   "devDependencies": {
+    "@playwright/test": "^1.60.0",
     "@types/express": "^5.0.6",
     "@types/node": "^25.9.1",
     "@types/pdf-parse": "^1.1.5",

package/src/agents/pi-sdk.ts

@@ -1178,6 +1178,7 @@ ${toolDefs}
       const reply = response.reply.trim();
 
       console.log(`[PiAgent] LLM 回复长度: ${reply.length}, 内容预览: "${reply.substring(0, 80)}..."`);
+      console.log(`[PiAgent] LLM 完整回复:\n${reply}`);
 
       // 通知前端：收到 LLM 回复
       if (onStream) {
@@ -1450,7 +1451,14 @@ Workspace root folder: ${this.cwd}
     const marker = '<final gen>';
     const markerIndex = content.indexOf(marker);
     if (markerIndex !== -1) {
-      content = content.substring(markerIndex + marker.length).trim();
+      const after = content.substring(markerIndex + marker.length).trim();
+      // v3 修复: 如果 <final gen> 之后是空, fallback 用 marker 之前的内容 (去掉 marker)
+      // 否则 LLM 写了 <final gen> 在末尾时, 用户看到空回复 + error
+      if (after) {
+        content = after;
+      } else {
+        content = content.substring(0, markerIndex).trim();
+      }
     }
     // 移除任何 tool call 标记
     let cleaned = content

package/src/bollharness-integration/index.ts

@@ -96,38 +96,14 @@ export {
   type SubagentResult,
 } from '../pi-ecosystem-subagents/index.js';
 
-export {
-  registerAnt,
-  antScouting,
-  antWorking,
-  antReviewing,
-  antComplete,
-  antFail,
-  antAbort,
-  antTick,
-  createTask,
-  dispatchTask,
-  recordResult,
-  getAnt,
-  listAnts,
-  listAntsByRole,
-  listAntsBySignal,
-  getActiveAnts,
-  getTask,
-  listTasks,
-  getSignalHistory,
-  getColonyStatus,
-  getColonyDump,
-  persistColony,
-  loadColony,
-  onColonyEvent,
-  offColonyEvent,
-  type Ant,
-  type ColonyTask,
-  type ColonySignalEvent,
-  type ColonySignal,
-  type AntRole,
-} from '../pi-ecosystem-colony/index.js';
+// 2026-06-11: 蚁群模块 (pi-ecosystem-colony) 已被用户删除, 移除对应 re-export 防止启动失败
+// export {
+//   registerAnt, antScouting, antWorking, antReviewing, antComplete, antFail, antAbort, antTick,
+//   createTask, dispatchTask, recordResult, getAnt, listAnts, listAntsByRole, listAntsBySignal,
+//   getActiveAnts, getTask, listTasks, getSignalHistory, getColonyStatus, getColonyDump,
+//   persistColony, loadColony, onColonyEvent, offColonyEvent,
+//   type Ant, type ColonyTask, type ColonySignalEvent, type ColonySignal, type AntRole,
+// } from '../pi-ecosystem-colony/index.js';
 
 // Judgment exports
 export {

package/src/heartbeat/Watchdog.ts

@@ -42,11 +42,19 @@ export class Watchdog {
 
   /**
    * 记录活动（调用后更新 lastActivityTime）
+   * 2026-06-10: 加 5s 去抖, 防 broadcast / SSE 高频路径炸 log + CPU
+   * - lastActivityTime 始终更新 (cheap)
+   * - 但 onLog 回调只在距上次 ≥5s 时触发, 避免每秒几十次 console.log
    */
+  private _lastLogAt = 0;
   recordActivity(component?: string): void {
     this.state.lastActivityTime = Date.now();
     if (component) {
-      this.callbacks.onLog?.(`[Watchdog] Activity from ${component}`);
+      const now = Date.now();
+      if (now - this._lastLogAt >= 5000) {
+        this._lastLogAt = now;
+        this.callbacks.onLog?.(`[Watchdog] Activity from ${component}`);
+      }
     }
   }
 

package/src/llm/audio-config-store.ts

@@ -222,9 +222,14 @@ class AudioConfigStore {
         return { success: true, latency };
       } else {
         const errorText = await response.text().catch(() => 'Unknown error');
+        const hint = response.status === 401
+          ? '（请确认是 MiniMax 的 API Key）'
+          : response.status === 404
+          ? '（端点不存在 — 请检查 baseUrl）'
+          : '';
         return {
           success: false,
-          error: `HTTP ${response.status}: ${errorText.substring(0, 200)}`,
+          error: `HTTP ${response.status}: ${errorText.substring(0, 500)}${hint ? ' ' + hint : ''}`,
           latency
         };
       }

package/src/llm/config-store.ts

@@ -77,7 +77,7 @@ export const DEFAULT_PROVIDER_CONFIGS: Record<ModelProvider, ProviderConfig> = {
     enabled: false,
     apiKey: '',
     baseUrl: 'https://api.minimaxi.com/v1',
-    model: 'MiniMax-M2',
+    model: 'MiniMax-M3',
     temperature: 0.7,
     maxTokens: 4096,
     requiresApiKey: true
@@ -129,17 +129,22 @@ export const DEFAULT_PROVIDER_CONFIGS: Record<ModelProvider, ProviderConfig> = {
   }
 };
 
-export const PROVIDER_INFO: Record<ModelProvider, { name: string; description: string; requiresApiKey: boolean }> = {
-  openai: { name: 'OpenAI', description: 'GPT-4, GPT-3.5 等模型', requiresApiKey: true },
-  anthropic: { name: 'Anthropic', description: 'Claude 3.5 系列模型', requiresApiKey: true },
+export const PROVIDER_INFO: Record<ModelProvider, { name: string; description: string; requiresApiKey: boolean; models?: string[] }> = {
+  openai: { name: 'OpenAI', description: 'GPT-4, GPT-3.5 等模型', requiresApiKey: true, models: ['gpt-4', 'gpt-4o', 'gpt-4o-mini', 'gpt-4-turbo', 'gpt-3.5-turbo'] },
+  anthropic: { name: 'Anthropic', description: 'Claude 3.5 系列模型', requiresApiKey: true, models: ['claude-3-5-sonnet-20241022', 'claude-3-5-haiku-20241022', 'claude-3-opus-20240229'] },
   openrouter: { name: 'OpenRouter', description: '聚合多个 AI 供应商', requiresApiKey: true },
-  gemini: { name: 'Google Gemini', description: 'Gemini 系列模型', requiresApiKey: true },
+  gemini: { name: 'Google Gemini', description: 'Gemini 系列模型', requiresApiKey: true, models: ['gemini-2.0-flash', 'gemini-1.5-pro', 'gemini-1.5-flash'] },
   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 },
+  minimax: {
+    name: 'MiniMax',
+    description: '国产大模型服务',
+    requiresApiKey: true,
+    models: ['MiniMax-M3', 'MiniMax-M2.7', 'MiniMax-M2', 'MiniMax-M2.1-highspeed', 'MiniMax-M2.7-highspeed']
+  },
+  deepseek: { name: 'DeepSeek', description: '深度求索大模型', requiresApiKey: true, models: ['deepseek-chat', 'deepseek-reasoner'] },
+  kimi: { name: 'Kimi (月之暗面)', description: 'Moonshot 长上下文模型', requiresApiKey: true, models: ['moonshot-v1-8k', 'moonshot-v1-32k', 'moonshot-v1-128k'] },
+  glm: { name: 'GLM (智谱)', description: '智谱 ChatGLM 系列模型', requiresApiKey: true, models: ['glm-4-flash', 'glm-4', 'glm-4-plus', 'glm-4-air', 'glm-4-airx'] },
+  qwen: { name: 'Qwen (通义千问)', description: '阿里云通义千问系列', requiresApiKey: true, models: ['qwen-plus', 'qwen-max', 'qwen-turbo', 'qwen-long'] },
   local: { name: '本地模型', description: '本地部署的模型服务', requiresApiKey: false }
 };
 
@@ -323,7 +328,12 @@ class LLMConfigStore {
         return { success: true, latency };
       } else {
         const errorText = await response.text().catch(() => 'Unknown error');
-        return { success: false, error: `HTTP ${response.status}: ${errorText.substring(0, 100)}`, latency };
+        const hint = response.status === 401
+          ? '（API Key 无效或不匹配该供应商 — 请检查是否复制完整、有无多余空格）'
+          : response.status === 404
+          ? '（端点不存在 — 请检查 baseUrl）'
+          : '';
+        return { success: false, error: `HTTP ${response.status}: ${errorText.substring(0, 500)}${hint ? ' ' + hint : ''}`, latency };
       }
     } catch (error: any) {
       return { success: false, error: error.message || 'Connection failed', latency: Date.now() - startTime };

package/src/llm/pi-ai.ts

@@ -176,7 +176,7 @@ export class PiAIModel {
       ollama: this.config.model || 'llama3.2',
       openrouter: this.config.model || 'anthropic/claude-3.5-sonnet',
       gemini: this.config.model || 'gemini-2.0-flash',
-      minimax: this.config.model || process.env.MINIMAX_MODEL || 'MiniMax-M2.7',
+      minimax: this.config.model || process.env.MINIMAX_MODEL || 'MiniMax-M3',
       deepseek: this.config.model || process.env.DEEPSEEK_MODEL || 'deepseek-chat',
       kimi: this.config.model || process.env.KIMI_MODEL || process.env.MOONSHOT_MODEL || 'moonshot-v1-8k',
       glm: this.config.model || process.env.GLM_MODEL || process.env.ZHIPU_MODEL || 'glm-4-flash',
@@ -482,7 +482,7 @@ function detectModel(provider: ModelProvider): string {
     ollama: 'llama3.2',
     openrouter: 'anthropic/claude-3.5-sonnet',
     gemini: 'gemini-2.0-flash',
-    minimax: 'MiniMax-M2.7',
+    minimax: 'MiniMax-M3',
     deepseek: 'deepseek-chat',
     kimi: 'moonshot-v1-8k',
     glm: 'glm-4-flash',

package/src/llm/video-config-store.ts

@@ -232,9 +232,15 @@ class VideoConfigStore {
         return { success: true, latency };
       } else {
         const errorText = await response.text().catch(() => 'Unknown error');
+        // 401 通常是 key 错误，给出针对性提示
+        const hint = response.status === 401
+          ? '（请确认是火山方舟 ARK 的 API Key，不是 MiniMax / 其他平台）'
+          : response.status === 404
+          ? '（端点不存在 — 火山方舟可能没有 /models，请检查 baseUrl）'
+          : '';
         return {
           success: false,
-          error: `HTTP ${response.status}: ${errorText.substring(0, 200)}`,
+          error: `HTTP ${response.status}: ${errorText.substring(0, 500)}${hint ? ' ' + hint : ''}`,
           latency
         };
       }

package/src/network/p2p-direct.ts

@@ -88,10 +88,9 @@ export class P2PDirect extends EventEmitter {
       // 双向记录 (inbound + outbound 都能拿到)
       this.conns.set(remotePubKeyHex, conn);
 
-      // v3: 触发 'connection' 事件, 上层 (web server) 可以主动给新连接发消息
-      this.emit('connection', { remotePublicKey: remotePubKeyHex, conn });
-
       // 收到数据时 → 触发 'data' 事件
+      // 注意: data 监听器必须在 emit('connection') 之前注册,
+      // 否则 server 的 connection handler 发送消息后, 对端回复可能在 data 监听器就绪前到达
       conn.on('data', (chunk: Buffer | Uint8Array) => {
         const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
         console.log(`[P2PDirect:${this.name}] 收到数据 from ${remotePubKeyHex.substring(0,12)}... (${buf.length} bytes)`);
@@ -108,6 +107,10 @@ export class P2PDirect extends EventEmitter {
       conn.on('close', () => {
         this.conns.delete(remotePubKeyHex);
       });
+
+      // v3: 触发 'connection' 事件, 上层 (web server) 可以主动给新连接发消息
+      // 注意: 放在 data/error/close 监听器之后, 确保 server 的 connection handler 不会先于 data 就绪
+      this.emit('connection', { remotePublicKey: remotePubKeyHex, conn });
     });
 
     await this.swarm.listen(); // server 模式
@@ -159,6 +162,59 @@ export class P2PDirect extends EventEmitter {
     }
   }
 
+  /**
+   * 2026-06-10: 真"主动发, 等握手完成"版本 — 修复好友申请 fire-and-forget bug.
+   *
+   * 之前的问题: server.ts:2914 `await swarm.joinPeer(...)` 只触发握手, conn 还没 push 进 this.conns,
+   * 立即调 sendTo 找不到 conn → 静默返回 false → 消息扔进虚空.
+   *
+   * 现在: sendToWithWait 监听 'connection' 事件, 等到 targetPublicKey 真正出现在 this.conns,
+   * 才 write; 超时返回 NO_CONN; 写失败返回 WRITE_FAIL; 成功返回 SENT.
+   *
+   * 上层调用: const r = await p2p.sendToWithWait(pk, rpc, 5000);
+   *           if (r !== 'SENT') return 502 给前端.
+   */
+  async sendToWithWait(
+    publicKeyHex: string,
+    data: Buffer | string,
+    timeoutMs: number = 5000
+  ): Promise<'SENT' | 'NO_CONN' | 'WRITE_FAIL'> {
+    // 2026-06-11: 先主动触发 joinPeer, 否则 DHT 上对面可能没 push conn
+    if (this.swarm) {
+      try { await this.swarm.joinPeer(Buffer.from(publicKeyHex, 'hex')); } catch {}
+    }
+    // 1) 已有 conn → 立即试
+    let conn = this.conns.get(publicKeyHex);
+    if (!conn || conn.destroyed) {
+      // 2) 等 'connection' 事件 (this.emit('connection', { remotePublicKey, conn }))
+      const waitResult = await new Promise<'READY' | 'TIMEOUT'>((resolve) => {
+        const timer = setTimeout(() => {
+          this.off('connection', onConn);
+          resolve('TIMEOUT');
+        }, timeoutMs);
+        const onConn = (evt: { remotePublicKey: string; conn: any }) => {
+          if (evt.remotePublicKey === publicKeyHex) {
+            clearTimeout(timer);
+            this.off('connection', onConn);
+            resolve('READY');
+          }
+        };
+        this.on('connection', onConn);
+      });
+      if (waitResult === 'TIMEOUT') return 'NO_CONN';
+      conn = this.conns.get(publicKeyHex);
+      if (!conn || conn.destroyed) return 'NO_CONN'; // 双保险
+    }
+    const buf = typeof data === 'string' ? Buffer.from(data) : data;
+    try {
+      conn.write(buf);
+      return 'SENT';
+    } catch (err) {
+      console.error(`[P2PDirect:${this.name}] sendToWithWait 写失败 (${publicKeyHex.substring(0,12)}...):`, (err as Error).message);
+      return 'WRITE_FAIL';
+    }
+  }
+
   getPublicKey(): string {
     if (!this.swarm) return '';
     return b4a.toString(this.swarm.keyPair.publicKey, 'hex');