lobster-roundtable 3.0.5 → 3.0.7

package/main.js

@@ -22,6 +22,7 @@ const {
   getOpenClawApiPort,
   getOpenClawApiToken,
 } = require("./src/env.js");
+const { readTextSafe, parseJsonFileFlexible } = require("./src/fileio.js");
 // Node.js 原生 HTTP 请求工具（避免依赖外部命令）
 function httpRequest(urlStr, options = {}) {
   return new Promise((resolve, reject) => {
@@ -60,7 +61,7 @@ try {
 }
 
 const CHANNEL_ID = "lobster-roundtable";
-const PLUGIN_VERSION = "3.0.5";
+const PLUGIN_VERSION = "3.0.7";
 const ENABLE_OPENCLAW_CONFIG_SYNC = isOpenClawConfigSyncEnabled();
 const OPENCLAW_CONFIG_ALLOWED_KEYS = new Set(["url", "token", "ownerToken", "name", "persona", "maxTokens"]);
 
@@ -111,64 +112,6 @@ function ensureDirForFile(filePath) {
   fsModule.mkdirSync(pathModule.dirname(filePath), { recursive: true });
 }
 
-function readTextSafe(filePath) {
-  try {
-    return fsModule.existsSync(filePath) ? String(fsModule.readFileSync(filePath, "utf-8") || "").trim() : "";
-  } catch {
-    return "";
-  }
-}
-
-function decodeFileBuffer(buf) {
-  if (!Buffer.isBuffer(buf) || buf.length === 0) return "";
-  // UTF-8 BOM
-  if (buf.length >= 3 && buf[0] === 0xef && buf[1] === 0xbb && buf[2] === 0xbf) {
-    return buf.slice(3).toString("utf8");
-  }
-  // UTF-16 LE BOM
-  if (buf.length >= 2 && buf[0] === 0xff && buf[1] === 0xfe) {
-    return buf.slice(2).toString("utf16le");
-  }
-  // UTF-16 BE BOM
-  if (buf.length >= 2 && buf[0] === 0xfe && buf[1] === 0xff) {
-    const swapped = Buffer.allocUnsafe(buf.length - 2);
-    for (let i = 2; i + 1 < buf.length; i += 2) {
-      swapped[i - 2] = buf[i + 1];
-      swapped[i - 1] = buf[i];
-    }
-    return swapped.toString("utf16le");
-  }
-  // Heuristic: UTF-16 LE without BOM (lots of NUL bytes in odd positions)
-  const sample = buf.slice(0, Math.min(buf.length, 128));
-  let nulOdd = 0;
-  for (let i = 1; i < sample.length; i += 2) {
-    if (sample[i] === 0) nulOdd++;
-  }
-  if (sample.length > 8 && nulOdd >= sample.length / 6) {
-    return buf.toString("utf16le");
-  }
-  return buf.toString("utf8");
-}
-
-function parseJsonFileFlexible(filePath) {
-  const raw = fsModule.readFileSync(filePath);
-  let text = decodeFileBuffer(raw);
-  if (!text) return {};
-  text = String(text).replace(/^\uFEFF/, "").trim();
-  try {
-    return JSON.parse(text);
-  } catch {
-    // Recover from contaminated files like: log-prefix + {...json...} + log-suffix
-    const first = text.indexOf("{");
-    const last = text.lastIndexOf("}");
-    if (first >= 0 && last > first) {
-      const candidate = text.slice(first, last + 1).trim();
-      return JSON.parse(candidate);
-    }
-    throw new Error("invalid_json");
-  }
-}
-
 function writeJsonUtf8NoBomAtomic(filePath, value) {
   const tmp = `${filePath}.tmp`;
   const out = JSON.stringify(value, null, 2);
@@ -611,10 +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 reportDiag(event, payload = {}, throttleMs = 8000) {
     if (!event) return;
@@ -639,7 +589,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
       roomMode: currentRoomMode || "",
       wsUrl,
       botName: myName || "",
-      token: token || "",
+      tokenMasked: maskTokenForDiag(token),
       instanceId: instanceId || "",
       sessionId: sessionId || "",
       detail: payload.detail && typeof payload.detail === "object" ? payload.detail : null,
@@ -661,7 +611,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
         roomMode: currentRoomMode || "",
         wsUrl,
         botName: myName || "",
-        token: token || "",
+        tokenMasked: maskTokenForDiag(token),
         instanceId: instanceId || "",
         sessionId: sessionId || "",
         stack: safeDiagText(payload.stack || "", 1200),
@@ -1098,6 +1048,67 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
     }
   }
 
+  function getPromptTimeoutMs(turnContext) {
+    const ctx = String(turnContext || '').trim().toLowerCase();
+    switch (ctx) {
+      case 'evo_review':
+        return 22000; // server discuss timeout: 25s
+      case 'evo_share':
+      case 'evo_experience':
+        return 38000; // server share timeout: 45s
+      case 'evo_vote':
+        return 18000; // server vote timeout: 20~30s
+      case 'debate_speak':
+        return 24000; // server debate speak timeout: 30s
+      case 'debate_judge':
+        return 42000; // server judge timeout: 45s
+      case 'host_comment':
+        return 12000; // server host comment timeout: 15s
+      case 'host_summary':
+        return 42000; // server host summary timeout: 45s
+      case 'speaking':
+        return 38000; // server generic speaking timeout: 45s
+      default:
+        return 28000; // conservative default to avoid late replies
+    }
+  }
+
+  function buildPromptFallbackReply(turnContext, promptText = '') {
+    const ctx = String(turnContext || '').trim().toLowerCase();
+    if (ctx === 'evo_vote') return '不通过';
+    if (ctx === 'host_comment') return '这个点挺有意思，我先记下，继续下一位。';
+    if (ctx === 'host_summary') return '本轮先总结到这里：观点已收集，下一轮继续聚焦核心分歧。';
+    if (ctx === 'evo_review') return '我暂时倾向不通过，建议补充可复用步骤与真实案例。';
+    if (ctx === 'evo_share' || ctx === 'evo_experience') {
+      return '我补充一点可落地经验：先明确目标，再小步验证，再按反馈迭代。';
+    }
+    if (ctx === 'debate_judge') return '本轮先给出保守判定：双方都有可取点，建议继续下一轮交锋。';
+    if (ctx === 'debate_speak') return '我方观点是先给可验证证据，再谈结论，避免空泛表态。';
+    if (ctx === 'speaking') return '我补充一个观点：先对齐目标和约束，再讨论方案优先级。';
+    if (String(promptText || '').includes('通过') && String(promptText || '').includes('不通过')) return '不通过';
+    return '我先给一个简短结论：建议先明确目标，再执行并复盘。';
+  }
+
+  function inferLegacyTurnContext(msg = {}) {
+    const roomMode = String(msg.roomMode || '').trim().toLowerCase();
+    const modePrompt = String(msg.modePrompt || '');
+    if (msg.isHostComment) return 'host_comment';
+    if (msg.isHostSummary) return 'host_summary';
+    if (roomMode === 'debate') {
+      if (/评委|打分|评分|本轮结果/.test(modePrompt)) return 'debate_judge';
+      return 'debate_speak';
+    }
+    if (roomMode === 'evolution') {
+      if (msg.parallelReview || /评审|可复用|宁可错杀/.test(modePrompt)) return 'evo_review';
+      if (/只需回复\s*[“"]?通过[”"]?\s*或\s*[“"]?不通过/.test(modePrompt) || /通过.*不通过|不通过.*通过/.test(modePrompt)) {
+        return 'evo_vote';
+      }
+      if (/没有.*Skill|改为分享|使用经验|真实经验/.test(modePrompt)) return 'evo_experience';
+      return 'evo_share';
+    }
+    return 'speaking';
+  }
+
   function buildSkillShareDraft(skillName, rawContent) {
     const name = String(skillName || '').trim() || '未命名Skill';
     const text = String(rawContent || '').replace(/\r\n/g, '\n').trim();
@@ -1173,7 +1184,8 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
       send({ type: 'skill_picked', skillName, skillContent });
     } catch (err) {
       api.logger.error(`[roundtable] pick_skill 失败(${source}): ${err.message}`);
-      send({ type: 'skill_picked', noSkill: true, reason: 'error' });
+      // 失败时必须降级到经验分享，避免服务端将本轮直接判定为“跳过”导致无发言
+      send({ type: 'skill_picked', noSkill: true, reason: 'experience' });
     }
   }
 
@@ -1683,7 +1695,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
         const turnContext = String(msg.turnContext || '').trim();
         const promptText = String(msg.text || '').trim();
         if (!promptText) {
-          send({ type: 'bot_reply', text: '' });
+          send({ type: 'bot_reply', text: buildPromptFallbackReply(turnContext, promptText) });
           break;
         }
         if (turnContext === 'pick_skill') {
@@ -1691,21 +1703,22 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
           break;
         }
         try {
-          const timeoutMs = turnContext === 'evo_review'
-            ? 22000
-            : (turnContext === 'evo_share' || turnContext === 'evo_experience')
-              ? 42000
-              : (turnContext === 'host_comment' ? 15000 : (turnContext === 'host_summary' ? 45000 : 65000));
+          const timeoutMs = getPromptTimeoutMs(turnContext);
           const reply = await callAIWithTimeout(promptText, timeoutMs, `prompt_${turnContext || 'generic'}`);
-          send({ type: 'bot_reply', text: String(reply || '') });
-          if (reply) rememberFact(`频道提示(${turnContext || 'generic'})已响应`);
-        } catch (err) {
-          api.logger.error(`[roundtable] prompt(${turnContext || 'generic'}) 失败: ${err.message}`);
-          if (turnContext === 'evo_vote') {
-            send({ type: 'bot_reply', text: '不通过' });
+          const normalized = String(reply || '').trim();
+          if (normalized) {
+            send({ type: 'bot_reply', text: normalized });
+            rememberFact(`频道提示(${turnContext || 'generic'})已响应`);
           } else {
-            send({ type: 'bot_reply', text: '' });
+            const fallback = buildPromptFallbackReply(turnContext, promptText);
+            api.logger.warn(`[roundtable] prompt(${turnContext || 'generic'}) 返回空文本，使用兜底回复`);
+            send({ type: 'bot_reply', text: fallback });
+            rememberFact(`频道提示(${turnContext || 'generic'})空回复，已兜底`);
           }
+        } catch (err) {
+          api.logger.error(`[roundtable] prompt(${turnContext || 'generic'}) 失败: ${err.message}`);
+          const fallback = buildPromptFallbackReply(turnContext, promptText);
+          send({ type: 'bot_reply', text: fallback });
         }
         break;
       }
@@ -1716,6 +1729,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
         );
         send({ type: 'bot_status', status: 'speaking', text: `🧠 正在思考：${msg.topic || ''}` });
         try {
+          const turnContext = inferLegacyTurnContext(msg);
           const reply = await generateReply(
             api,
             core,
@@ -1725,22 +1739,27 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
             msg,
             getFactualContext(10)
           );
-          if (reply) {
-            send({ type: "bot_reply", text: reply });
+          const normalized = String(reply || '').trim();
+          if (normalized) {
+            send({ type: "bot_reply", text: normalized });
             api.logger.info(
-              `[roundtable] ✅ 已发言: ${reply.slice(0, 60)}...`
+              `[roundtable] ✅ 已发言: ${normalized.slice(0, 60)}...`
             );
-            rememberFact(`房间发言：${reply.slice(0, 80)}`);
+            rememberFact(`房间发言：${normalized.slice(0, 80)}`);
           } else {
-            send({ type: "bot_reply", text: "" });
-            api.logger.warn("[roundtable] AI 返回空内容，跳过本轮");
-            send({ type: 'bot_status', status: 'idle', text: '⚪ 本轮空回复' });
+            const fallback = buildPromptFallbackReply(turnContext, msg.modePrompt || msg.topic || '');
+            send({ type: "bot_reply", text: fallback });
+            api.logger.warn(`[roundtable] your_turn(${turnContext}) AI 返回空内容，已使用兜底回复`);
+            rememberFact(`房间发言兜底(${turnContext})`);
+            send({ type: 'bot_status', status: 'idle', text: '⚪ 本轮使用兜底回复' });
           }
         } catch (err) {
+          const turnContext = inferLegacyTurnContext(msg);
+          const fallback = buildPromptFallbackReply(turnContext, msg.modePrompt || msg.topic || '');
           api.logger.error(
             `[roundtable] AI 调用失败: ${err.message}`
           );
-          send({ type: "bot_reply", text: "" });
+          send({ type: "bot_reply", text: fallback });
           send({ type: 'bot_status', status: 'error', text: `❌ AI 调用失败: ${err.message}` });
         }
         break;
@@ -1767,26 +1786,12 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
         } else {
           const next = remaining[0];
           api.logger.info(`[roundtable] 🧬 改选: ${next}`);
-          try {
-            const chineseName = await translateSkillNameToChinese(next);
-            const finalSkillName = chineseName
-              ? (chineseName === next ? chineseName : `${chineseName}（${next}）`)
-              : next;
-            const descPrompt = [
-              `请输出可审核、可复用的 Skill 分享稿。`,
-              `Skill：${next}（中文名建议：${chineseName || next}）`,
-              `只讲真实实践，不要编造，不要空话。`,
-              `格式：`,
-              `【Skill名称】中文名（英文名）`,
-              `① 解决痛点 ② 核心步骤 ③ 实战案例 ④ 边界与风险`,
-              `全中文，180字以内。`,
-            ].join('\n');
-            const descReply = await callAI(api, core, myName, descPrompt);
-            rememberFact(`改选分享 Skill：${finalSkillName}`);
-            send({ type: 'skill_picked', skillName: finalSkillName, skillContent: descReply || `Skill: ${finalSkillName}` });
-          } catch {
-            send({ type: 'skill_picked', skillName: next, skillContent: `Skill: ${next}` });
-          }
+          const safeName = sanitizeSkillDirName(next);
+          const skillFile = safeName ? pathModule.join(skillsRoot, safeName, 'SKILL.md') : '';
+          const raw = skillFile ? readTextSafe(skillFile) : '';
+          const draft = buildSkillShareDraft(next, raw);
+          rememberFact(`改选分享 Skill：${next}`);
+          send({ type: 'skill_picked', skillName: next, skillContent: draft });
         }
         break;
       }
@@ -2086,12 +2091,24 @@ function callAIViaHTTP(prompt, maxTokens = 500, timeoutMs = 45000) {
       let data = '';
       res.on('data', (c) => (data += c));
       res.on('end', () => {
+        const status = Number(res.statusCode || 0);
+        if (status < 200 || status >= 300) {
+          const bodyPreview = String(data || '').replace(/\s+/g, ' ').trim().slice(0, 240);
+          reject(new Error(`HTTP AI status ${status}${bodyPreview ? `: ${bodyPreview}` : ''}`));
+          return;
+        }
         try {
           const json = JSON.parse(data);
           const text = json.choices?.[0]?.message?.content || '';
-          resolve(String(text).trim());
-        } catch {
-          resolve('');
+          const normalized = String(text).trim();
+          if (!normalized) {
+            const errMsg = String(json?.error?.message || json?.error || '').trim();
+            reject(new Error(errMsg ? `HTTP AI empty content: ${errMsg}` : 'HTTP AI empty content'));
+            return;
+          }
+          resolve(normalized);
+        } catch (err) {
+          reject(new Error(`HTTP AI invalid JSON: ${err.message}`));
         }
       });
     });
@@ -2133,17 +2150,21 @@ async function callAIViaRuntime(api, core, prompt, sessionLabel = '龙虾圆桌'
     CommandAuthorized: true,
   });
 
-  let fullReply = "";
-
-  await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+  const finalParts = [];
+  const blockParts = [];
+  const dispatchResult = await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
     ctx: ctxPayload,
     cfg: api.config,
     dispatcherOptions: {
-      deliver: async (payload) => {
+      deliver: async (payload, info) => {
         const text =
           typeof payload?.text === "string" ? payload.text.trim() : "";
         if (text) {
-          fullReply += (fullReply ? "\n" : "") + text;
+          if (info?.kind === "block") {
+            blockParts.push(text);
+          } else {
+            finalParts.push(text);
+          }
         }
       },
       onError: (err, info) => {
@@ -2154,7 +2175,16 @@ async function callAIViaRuntime(api, core, prompt, sessionLabel = '龙虾圆桌'
     },
   });
 
-  return fullReply.trim();
+  const finalReply = finalParts.join("\n").trim();
+  if (finalReply) return finalReply;
+
+  const blockReply = blockParts.join("\n").trim();
+  if (blockReply) return blockReply;
+
+  if (!dispatchResult?.queuedFinal) {
+    throw new Error("runtime_no_reply_queued");
+  }
+  throw new Error("runtime_empty_reply");
 }
 
 /**

package/openclaw.plugin.json

@@ -5,7 +5,7 @@
     "lobster-roundtable"
   ],
   "description": "Connect OpenClaw to the Lobster Roundtable service.",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

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

package/src/channel.js

@@ -16,7 +16,22 @@ const CHANNEL_ID = "lobster-roundtable";
 
 function createOutboundMessageId() {
     return `rt-outbound-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-}
+}
+
+function isExplicitConfigValue(value) {
+    if (value === undefined || value === null) return false;
+    if (typeof value === "string" && value.trim() === "") return false;
+    return true;
+}
+
+function mergeConfigPreferExplicitChannel(pluginEntryConfig, channelConfig) {
+    const merged = { ...(pluginEntryConfig || {}) };
+    for (const [key, value] of Object.entries(channelConfig || {})) {
+        if (!isExplicitConfigValue(value)) continue;
+        merged[key] = value;
+    }
+    return merged;
+}
 
 /**
  * �?ChannelGatewayContext 适配�?main.js 所需�?api 兼容对象
@@ -27,12 +42,12 @@ function createOutboundMessageId() {
  *   - api.runtime         �?ctx.runtime
  *   - api.config          �?ctx.cfg （完�?OpenClawConfig，用�?dispatchReply �?cfg 参数�?
  */
-function buildApiAdapter(ctx) {
-    // 双源读取：channels.<id>（官方标准路径）优先，plugins.entries（兼容现有安装）降级
-    const channelConfig = ctx.cfg?.channels?.[CHANNEL_ID] || {};
-    const pluginEntryConfig = ctx.cfg?.plugins?.entries?.[CHANNEL_ID]?.config || {};
-    // channel 路径覆盖 plugin 路径（向标准迁移�?
-    const pluginConfig = { ...pluginEntryConfig, ...channelConfig };
+function buildApiAdapter(ctx) {
+    // 双源读取：channels.<id>（官方标准路径）优先，plugins.entries（兼容现有安装）降级。
+    // 关键：channels 中空字符串不覆盖 plugins.entries 中已有 token/url，避免“loaded 但离线”。
+    const channelConfig = ctx.cfg?.channels?.[CHANNEL_ID] || {};
+    const pluginEntryConfig = ctx.cfg?.plugins?.entries?.[CHANNEL_ID]?.config || {};
+    const pluginConfig = mergeConfigPreferExplicitChannel(pluginEntryConfig, channelConfig);
 
     return {
         // main.js �?api.logger.info/warn/error
@@ -76,12 +91,14 @@ const roundtablePlugin = {
     reload: { configPrefixes: [`channels.${CHANNEL_ID}`, `plugins.entries.${CHANNEL_ID}`] },
 
     config: {
-        listAccountIds: () => ["default"],
-        resolveAccount: (cfg, accountId) => {
-            const pluginCfg = cfg?.plugins?.entries?.[CHANNEL_ID]?.config || {};
-            return {
-                accountId: accountId || "default",
-                enabled: true,
+        listAccountIds: () => ["default"],
+        resolveAccount: (cfg, accountId) => {
+            const channelConfig = cfg?.channels?.[CHANNEL_ID] || {};
+            const pluginEntryConfig = cfg?.plugins?.entries?.[CHANNEL_ID]?.config || {};
+            const pluginCfg = mergeConfigPreferExplicitChannel(pluginEntryConfig, channelConfig);
+            return {
+                accountId: accountId || "default",
+                enabled: true,
                 // main.js 支持默认 URL + 自动注册，因此始终视�?configured
                 // 不拦截零配置启动，让 main.js 自己处理
                 configured: true,

package/src/fileio.js

@@ -0,0 +1,61 @@
+"use strict";
+
+const fs = require("fs");
+
+function readTextSafe(filePath) {
+  try {
+    return fs.existsSync(filePath) ? String(fs.readFileSync(filePath, "utf-8") || "").trim() : "";
+  } catch {
+    return "";
+  }
+}
+
+function decodeFileBuffer(buf) {
+  if (!Buffer.isBuffer(buf) || buf.length === 0) return "";
+  if (buf.length >= 3 && buf[0] === 0xef && buf[1] === 0xbb && buf[2] === 0xbf) {
+    return buf.slice(3).toString("utf8");
+  }
+  if (buf.length >= 2 && buf[0] === 0xff && buf[1] === 0xfe) {
+    return buf.slice(2).toString("utf16le");
+  }
+  if (buf.length >= 2 && buf[0] === 0xfe && buf[1] === 0xff) {
+    const swapped = Buffer.allocUnsafe(buf.length - 2);
+    for (let i = 2; i + 1 < buf.length; i += 2) {
+      swapped[i - 2] = buf[i + 1];
+      swapped[i - 1] = buf[i];
+    }
+    return swapped.toString("utf16le");
+  }
+  const sample = buf.slice(0, Math.min(buf.length, 128));
+  let nulOdd = 0;
+  for (let i = 1; i < sample.length; i += 2) {
+    if (sample[i] === 0) nulOdd++;
+  }
+  if (sample.length > 8 && nulOdd >= sample.length / 6) {
+    return buf.toString("utf16le");
+  }
+  return buf.toString("utf8");
+}
+
+function parseJsonFileFlexible(filePath) {
+  const raw = fs.readFileSync(filePath);
+  let text = decodeFileBuffer(raw);
+  if (!text) return {};
+  text = String(text).replace(/^\uFEFF/, "").trim();
+  try {
+    return JSON.parse(text);
+  } catch {
+    const first = text.indexOf("{");
+    const last = text.lastIndexOf("}");
+    if (first >= 0 && last > first) {
+      const candidate = text.slice(first, last + 1).trim();
+      return JSON.parse(candidate);
+    }
+    throw new Error("invalid_json");
+  }
+}
+
+module.exports = {
+  readTextSafe,
+  parseJsonFileFlexible,
+};