lobster-roundtable 3.0.8 → 3.0.10

package/main.js

@@ -19,6 +19,8 @@ const cryptoModule = require("crypto");
 const {
   getOpenClawDir,
   isOpenClawConfigSyncEnabled,
+  getOpenClawApiPort,
+  getOpenClawApiToken,
 } = require("./src/env.js");
 const { readTextSafe, parseJsonFileFlexible } = require("./src/fileio.js");
 // Node.js 原生 HTTP 请求工具（避免依赖外部命令）
@@ -59,7 +61,7 @@ try {
 }
 
 const CHANNEL_ID = "lobster-roundtable";
-const PLUGIN_VERSION = "3.0.8";
+const PLUGIN_VERSION = "3.0.10";
 const ENABLE_OPENCLAW_CONFIG_SYNC = isOpenClawConfigSyncEnabled();
 const OPENCLAW_CONFIG_ALLOWED_KEYS = new Set(["url", "token", "ownerToken", "name", "persona", "maxTokens"]);
 
@@ -552,17 +554,17 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
     } catch { }
   }
 
-function safeDiagText(v, max = 280) {
-  const s = String(v || "").trim();
-  return s.length > max ? s.slice(0, max) : s;
-}
+  function safeDiagText(v, max = 280) {
+    const s = String(v || "").trim();
+    return s.length > max ? s.slice(0, max) : s;
+  }
 
-function maskTokenForDiag(raw) {
-  const s = String(raw || "").trim();
-  if (!s) return "";
-  if (s.length <= 8) return s;
-  return `${s.slice(0, 6)}...${s.slice(-4)}`;
-}
+  function maskTokenForDiag(raw) {
+    const s = String(raw || "").trim();
+    if (!s) return "";
+    if (s.length <= 8) return s;
+    return `${s.slice(0, 6)}...${s.slice(-4)}`;
+  }
 
   function reportDiag(event, payload = {}, throttleMs = 8000) {
     if (!event) return;
@@ -1038,12 +1040,12 @@ function maskTokenForDiag(raw) {
     return msg.includes('timeout');
   }
 
-  async function callAIWithTimeout(prompt, timeoutMs = 30000, tag = 'callAI', options = {}) {
+  async function callAIWithTimeout(prompt, timeoutMs = 30000, tag = 'callAI') {
     const ms = Math.max(5000, parseInt(timeoutMs, 10) || 30000);
     let timeoutId = null;
     try {
       return await Promise.race([
-        callAI(api, core, myName, prompt, options),
+        callAI(api, core, myName, prompt),
         new Promise((_, reject) => {
           timeoutId = setTimeout(() => reject(new Error(`${tag}_timeout_${ms}`)), ms);
         }),
@@ -1201,12 +1203,7 @@ function maskTokenForDiag(raw) {
         `SKILL_NAME: 你要分享的技能名`,
         `SKILL_DESC: 用中文给出可审核、可复用的分享稿（至少140字，包含痛点/步骤/案例/风险，必须有“输入->动作->结果”链路）`,
       ].join('\n');
-      const reply = String(await callAIWithTimeout(oneShotPrompt, 28000, 'pick_skill_one_shot', {
-        turnContext: 'pick_skill',
-        roomMode: 'evolution',
-        roomId: currentRoomId || '',
-        senderId: 'evo-room',
-      }) || '').trim();
+      const reply = String(await callAIWithTimeout(oneShotPrompt, 28000, 'pick_skill_one_shot') || '').trim();
       if (!reply || (/NONE/i.test(reply) && !/SKILL_NAME/i.test(reply))) {
         api.logger.info(`[roundtable] 🧬 ${source} 兜底：无可分享技能，降级经验分享`);
         send({ type: 'skill_picked', noSkill: true, reason: 'experience' });
@@ -1731,11 +1728,7 @@ function maskTokenForDiag(raw) {
       case "prompt": {
         const turnContext = String(msg.turnContext || '').trim();
         const promptText = String(msg.text || '').trim();
-        const routeOptions = {
-          turnContext,
-          roomMode: currentRoomMode || String(msg.roomMode || ''),
-          roomId: currentRoomId || String(msg.roomId || ''),
-        };
+
         if (!promptText) {
           const syntheticPrompt = [
             `你在龙虾房间中，收到一个缺失正文的阶段提示（turnContext=${turnContext || 'generic'}）。`,
@@ -1746,8 +1739,7 @@ function maskTokenForDiag(raw) {
             const retry = String(await callAIWithTimeout(
               syntheticPrompt,
               Math.max(7000, Math.min(12000, getPromptTimeoutMs(turnContext))),
-              `prompt_empty_rebuild_${turnContext || 'generic'}`,
-              routeOptions
+              `prompt_empty_rebuild_${turnContext || 'generic'}`
             ) || '').trim();
             if (retry) {
               send({ type: 'bot_reply', text: retry });
@@ -1782,8 +1774,7 @@ function maskTokenForDiag(raw) {
           const reply = await callAIWithTimeout(
             promptText,
             timeoutMs,
-            `prompt_${turnContext || 'generic'}`,
-            routeOptions
+            `prompt_${turnContext || 'generic'}`
           );
           const normalized = String(reply || '').trim();
           if (normalized) {
@@ -1795,8 +1786,7 @@ function maskTokenForDiag(raw) {
               retried = String(await callAIWithTimeout(
                 promptText,
                 Math.max(6000, Math.min(12000, Math.floor(timeoutMs * 0.55))),
-                `prompt_retry_${turnContext || 'generic'}`,
-                routeOptions
+                `prompt_retry_${turnContext || 'generic'}`
               ) || '').trim();
             } catch { }
             if (retried) {
@@ -1826,8 +1816,7 @@ function maskTokenForDiag(raw) {
               recovered = String(await callAIWithTimeout(
                 promptText,
                 Math.max(6000, Math.min(14000, Math.floor(timeoutMs * 0.6))),
-                `prompt_timeout_retry_${turnContext || 'generic'}`,
-                routeOptions
+                `prompt_timeout_retry_${turnContext || 'generic'}`
               ) || '').trim();
             } catch { }
           }
@@ -1972,12 +1961,7 @@ function maskTokenForDiag(raw) {
               `任一条件不满足 -> 不通过。`,
               `只需回复 "通过" 或 "不通过"，不要回复其他内容。`,
             ].join("\n");
-            const voteReply = await callAI(api, core, myName, votePrompt, {
-              turnContext: 'evo_vote',
-              roomMode: 'evolution',
-              roomId: currentRoomId || '',
-              senderId: 'evo-room',
-            });
+            const voteReply = await callAI(api, core, myName, votePrompt);
             const decision = String(voteReply || '').trim();
             const rejected = /不通过|否决|拒绝|不建议/.test(decision);
             const approve = !rejected && /通过/.test(decision);
@@ -2230,20 +2214,21 @@ function resolveGatewayHttpOptions(api) {
   const cfg = (api && typeof api.config === "object" && api.config) ? api.config : {};
   const apiCfg = (cfg.api && typeof cfg.api === "object") ? cfg.api : {};
   const gatewayCfg = (cfg.gateway && typeof cfg.gateway === "object") ? cfg.gateway : {};
-  const listenCfg = (cfg.listen && typeof cfg.listen === "object") ? cfg.listen : {};
-  const portCandidates = [apiCfg.port, gatewayCfg.port, listenCfg.port];
-  let port = 18789;
-  for (const candidate of portCandidates) {
-    const parsed = parseInt(candidate, 10);
-    if (Number.isFinite(parsed) && parsed > 0) {
-      port = parsed;
-      break;
-    }
-  }
-  return {
-    port,
-    token: String(apiCfg.token || "").trim(),
-  };
+
+  // 端口：环境变量 > config.api.port > config.gateway.port > config.listen.port > 默认 18789
+  const envPort = getOpenClawApiPort();
+  const cfgPort = parseInt(apiCfg.port || gatewayCfg.port || cfg.listen?.port, 10);
+  const port = (envPort !== 18789) ? envPort
+    : (Number.isFinite(cfgPort) && cfgPort > 0) ? cfgPort
+      : 18789;
+
+  // Token：环境变量 > config.api.token > config.gateway.auth.token
+  const envToken = getOpenClawApiToken();
+  const cfgApiToken = String(apiCfg.token || "").trim();
+  const cfgGatewayToken = String(gatewayCfg.auth?.token || "").trim();
+  const token = envToken || cfgApiToken || cfgGatewayToken;
+
+  return { port, token };
 }
 
 /**
@@ -2309,199 +2294,13 @@ function callAIViaHTTP(prompt, maxTokens = 500, timeoutMs = 45000, httpOptions =
   });
 }
 
-function pushRuntimeRouteCandidate(list, candidate) {
-  if (!candidate) return;
-  const sessionKey = String(candidate.sessionKey || '').trim();
-  if (!sessionKey) return;
-  const chatType = String(candidate.chatType || 'direct').trim().toLowerCase() === 'group' ? 'group' : 'direct';
-  const peerId = String(candidate.peerId || '').trim();
-  const dedupeKey = `${sessionKey}|${chatType}|${peerId}`;
-  if (list.some((x) => x.__k === dedupeKey)) return;
-  list.push({ ...candidate, chatType, peerId, __k: dedupeKey });
-}
-
-function resolveRuntimeRouteCandidates(api, core, senderId, options = {}) {
-  const candidates = [];
-  const resolver = core?.channel?.routing?.resolveAgentRoute;
-  const accountId = String(api?.accountId || "default");
-  const sender = String(senderId || "roundtable-host").trim() || "roundtable-host";
-  const roomId = String(options.roomId || '').trim();
-  const roomMode = String(options.roomMode || '').trim().toLowerCase();
-
-  const peerCandidates = [];
-  if (roomId) peerCandidates.push({ kind: "group", id: roomId, chatType: "group" });
-  peerCandidates.push({ kind: "direct", id: sender, chatType: "direct" });
-  peerCandidates.push({ kind: "group", id: sender, chatType: "group" });
-  if (roomMode) peerCandidates.push({ kind: "group", id: `${CHANNEL_ID}:${roomMode}`, chatType: "group" });
-
-  if (typeof resolver === "function") {
-    for (const peer of peerCandidates) {
-      try {
-        const route = resolver({
-          cfg: api?.config,
-          channel: CHANNEL_ID,
-          accountId,
-          peer: { kind: peer.kind, id: peer.id },
-        });
-        pushRuntimeRouteCandidate(candidates, {
-          source: "resolver",
-          sessionKey: route?.sessionKey,
-          accountId: String(route?.accountId || accountId),
-          chatType: peer.chatType,
-          peerId: peer.id,
-        });
-      } catch (err) {
-        api?.logger?.warn?.(
-          `[roundtable] resolveAgentRoute(${peer.kind}:${peer.id}) 失败: ${err?.message || err}`
-        );
-      }
-    }
-  }
-
-  if (roomId) {
-    pushRuntimeRouteCandidate(candidates, {
-      source: "fallback",
-      sessionKey: `roundtable:room:${roomId}`,
-      accountId,
-      chatType: "group",
-      peerId: roomId,
-    });
-  }
-  pushRuntimeRouteCandidate(candidates, {
-    source: "fallback",
-    sessionKey: `roundtable:${sender}`,
-    accountId,
-    chatType: "direct",
-    peerId: sender,
-  });
-
-  return candidates.map(({ __k, ...x }) => x);
-}
-
-async function dispatchRuntimeOnce(api, core, prompt, sessionLabel, senderName, senderId, routeCandidate, attemptIndex = 0) {
-  const sessionKey = String(routeCandidate?.sessionKey || `roundtable:${senderId}`);
-  const accountId = String(routeCandidate?.accountId || api?.accountId || "default");
-  const chatType = String(routeCandidate?.chatType || 'direct').toLowerCase() === 'group' ? 'group' : 'direct';
-  const peerId = String(routeCandidate?.peerId || senderId || 'roundtable-host');
-  const timestamp = Date.now();
-  const toAddress = chatType === 'group'
-    ? `${CHANNEL_ID}:group:${peerId}`
-    : `${CHANNEL_ID}:bot:${peerId}`;
-
-  const ctxPayload = core.channel.reply.finalizeInboundContext({
-    Body: prompt,
-    BodyForAgent: prompt,
-    RawBody: prompt,
-    CommandBody: prompt,
-    From: `${CHANNEL_ID}:server`,
-    To: toAddress,
-    SessionKey: sessionKey,
-    AccountId: accountId,
-    ChatType: chatType,
-    ConversationLabel: sessionLabel,
-    SenderName: senderName,
-    SenderId: senderId,
-    GroupSubject: chatType === 'group' ? peerId : undefined,
-    Provider: CHANNEL_ID,
-    Surface: CHANNEL_ID,
-    MessageSid: `rt-${timestamp}-${attemptIndex}`,
-    Timestamp: timestamp,
-    OriginatingChannel: CHANNEL_ID,
-    OriginatingTo: toAddress,
-    CommandAuthorized: true,
-  });
-
-  const finalParts = [];
-  const blockParts = [];
-  const dispatchResult = await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
-    ctx: ctxPayload,
-    cfg: api.config,
-    dispatcherOptions: {
-      deliver: async (payload, info) => {
-        const text = typeof payload?.text === "string" ? payload.text.trim() : "";
-        if (!text) return;
-        if (info?.kind === "block") blockParts.push(text);
-        else finalParts.push(text);
-      },
-      onError: (err, info) => {
-        api.logger.error(`[roundtable] dispatch ${info.kind} 失败: ${String(err)}`);
-      },
-    },
-  });
-
-  const finalReply = finalParts.join("\n").trim();
-  if (finalReply) return finalReply;
-
-  const blockReply = blockParts.join("\n").trim();
-  if (blockReply) return blockReply;
-
-  if (!dispatchResult?.queuedFinal) {
-    const counts = dispatchResult?.counts ? JSON.stringify(dispatchResult.counts) : "{}";
-    throw new Error(`runtime_no_reply_queued counts=${counts}`);
-  }
-  throw new Error("runtime_empty_reply queuedFinal=true");
-}
-
-/**
- * 通过 runtime 内部管线调 AI（优先路径，在支持的 OpenClaw 版本上使用）
- */
-async function callAIViaRuntime(
-  api,
-  core,
-  prompt,
-  sessionLabel = '龙虾圆桌',
-  senderName = '圆桌主持人',
-  senderId = 'roundtable-host',
-  options = {}
-) {
-  const routeCandidates = resolveRuntimeRouteCandidates(api, core, senderId, options);
-  const failures = [];
-
-  for (let i = 0; i < routeCandidates.length; i++) {
-    const candidate = routeCandidates[i];
-    try {
-      const reply = await dispatchRuntimeOnce(
-        api,
-        core,
-        prompt,
-        sessionLabel,
-        senderName,
-        senderId,
-        candidate,
-        i + 1
-      );
-      if (i > 0) {
-        const diag = (api && typeof api.__rtReportDiag === 'function') ? api.__rtReportDiag : null;
-        diag?.("runtime_route_retry_success", {
-          level: "warn",
-          message: `runtime recovered on candidate #${i + 1}`,
-          detail: {
-            attempt: i + 1,
-            source: candidate.source || 'unknown',
-            chatType: candidate.chatType,
-            peerId: candidate.peerId,
-          },
-        }, 1200);
-      }
-      return reply;
-    } catch (err) {
-      const reason = String(err?.message || err);
-      failures.push(`#${i + 1}(${candidate.chatType}:${candidate.peerId || 'na'}): ${reason}`);
-    }
-  }
-
-  throw new Error(`runtime_all_candidates_failed ${failures.join(' | ')}`);
-}
-
 /**
- * 核心 AI 调用：优先 runtime API → 降级 HTTP API
+ * 核心 AI 调用：直接通过 Gateway HTTP API (/v1/chat/completions) 调用 LLM
  * 构造圆桌讨论的完整 prompt，让 Gateway 用用户配置的 AI 模型生成回复
  */
 async function generateReply(api, core, myName, persona, maxTokens, msg, factualContext = '') {
-  // 兼容服务器字段：可能是 msg.history 或 msg.context
   const rawHistory = msg.history || parseContext(msg.context);
   let systemPrompt = buildSystemPrompt(myName, persona, msg.topic, msg.roomMode);
-  // 融合服务器下发的模式/角色提示（辩论正反方、进化评审等）
   if (msg.modePrompt) {
     systemPrompt += "\n\n" + msg.modePrompt;
   }
@@ -2511,95 +2310,14 @@ async function generateReply(api, core, myName, persona, maxTokens, msg, factual
     : '';
 
   const fullPrompt = `${systemPrompt}${memoryBlock}\n\n---\n\n${userMessage}`;
-
-  // 优先 runtime API → 降级 HTTP API
-  const hasRuntime = !!(core?.channel?.reply?.finalizeInboundContext &&
-    core?.channel?.reply?.dispatchReplyWithBufferedBlockDispatcher);
-
-  if (hasRuntime) {
-    try {
-      return await callAIViaRuntime(
-        api,
-        core,
-        fullPrompt,
-        '龙虾圆桌',
-        '圆桌主持人',
-        'roundtable-host',
-        {
-          roomMode: String(msg?.roomMode || ''),
-          roomId: String(msg?.roomId || msg?.room?.id || ''),
-        }
-      );
-    } catch (err) {
-      api.logger.warn(`[roundtable] runtime API 调用失败，降级 HTTP: ${err.message}`);
-      const diag = (api && typeof api.__rtReportDiag === 'function') ? api.__rtReportDiag : null;
-      diag?.("runtime_to_http_fallback", {
-        level: "warn",
-        message: `generate_reply runtime failed: ${err.message}`,
-        reason: String(err.message || err),
-        detail: {
-          phase: "generate_reply",
-          roomMode: String(msg?.roomMode || ''),
-          topicLen: String(msg?.topic || '').length,
-        },
-      }, 1200);
-    }
-  }
-
   return await callAIViaHTTP(fullPrompt, maxTokens || 500, 65000, resolveGatewayHttpOptions(api));
 }
 
 /**
  * 精简版 AI 调用：给一个 prompt，拿一个回复
- * 用于进化室选 Skill 等不需要完整对话上下文的场景
- * 优先 runtime API → 降级 HTTP API
+ * 用于进化室选 Skill、评审、投票等不需要完整对话上下文的场景
+ * 直接通过 Gateway HTTP API 调用
  */
-async function callAI(api, core, myName, prompt, options = {}) {
-  const turnContext = String(options.turnContext || '').trim().toLowerCase();
-  const senderId = (() => {
-    const explicit = String(options.senderId || '').trim();
-    if (explicit) return explicit;
-    if (turnContext === 'pick_skill' || turnContext.startsWith('evo_')) return 'evo-room';
-    if (turnContext.startsWith('debate_')) return 'debate-room';
-    if (turnContext.startsWith('host_')) return 'roundtable-host';
-    return 'roundtable-host';
-  })();
-  const sessionLabel = String(options.sessionLabel || '龙虾圆桌·选Skill');
-  const hasRuntime = !!(core?.channel?.reply?.finalizeInboundContext &&
-    core?.channel?.reply?.dispatchReplyWithBufferedBlockDispatcher);
-
-  if (hasRuntime) {
-    try {
-      return await callAIViaRuntime(
-        api,
-        core,
-        prompt,
-        sessionLabel,
-        '进化室',
-        senderId,
-        {
-          turnContext,
-          roomMode: String(options.roomMode || ''),
-          roomId: String(options.roomId || ''),
-        }
-      );
-    } catch (err) {
-      api.logger.warn(`[roundtable] callAI runtime 失败，降级 HTTP: ${err.message}`);
-      const diag = (api && typeof api.__rtReportDiag === 'function') ? api.__rtReportDiag : null;
-      diag?.("runtime_to_http_fallback", {
-        level: "warn",
-        message: `call_ai runtime failed: ${err.message}`,
-        reason: String(err.message || err),
-        detail: {
-          phase: "call_ai",
-          promptLen: String(prompt || '').length,
-          turnContext,
-          roomMode: String(options.roomMode || ''),
-          roomId: String(options.roomId || ''),
-        },
-      }, 1200);
-    }
-  }
-
+async function callAI(api, core, myName, prompt) {
   return await callAIViaHTTP(prompt, 500, 30000, resolveGatewayHttpOptions(api));
 }

package/openclaw.plugin.json

@@ -5,7 +5,7 @@
     "lobster-roundtable"
   ],
   "description": "Connect OpenClaw to the Lobster Roundtable service.",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
@@ -67,4 +67,4 @@
       "placeholder": "龙虾"
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lobster-roundtable",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "description": "🦞 龙虾圆桌 OpenClaw 标准 Channel 插件 - 让你的 AI 自动参与多智能体圆桌讨论",
   "license": "MIT",
   "private": false,
@@ -41,4 +41,4 @@
       "optional": true
     }
   }
-}
+}