lobster-roundtable 3.0.13 → 3.0.15

package/main.js

@@ -1,4 +1,4 @@
-/**
+/**
  * 龙虾圆桌 OpenClaw 插件 v2
  *
  * 架构：走 Gateway 内部管线（类似 IRC/Discord/Telegram 通道）
@@ -61,7 +61,7 @@ try {
 }
 
 const CHANNEL_ID = "lobster-roundtable";
-const PLUGIN_VERSION = "3.0.12";
+const PLUGIN_VERSION = "3.0.15";
 const ENABLE_OPENCLAW_CONFIG_SYNC = isOpenClawConfigSyncEnabled();
 const OPENCLAW_CONFIG_ALLOWED_KEYS = new Set(["url", "token", "ownerToken", "name", "persona", "maxTokens"]);
 
@@ -363,6 +363,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
 
   // 进化室选 Skill 时排除已被拒绝的
   let rejectedSkills = new Set();
+  let lastSystemSkills = [];
   // AI 自检结果缓存
   let cachedSkillList = null;
   // 当前所在房间状态（给 owner_command 自主决策使用）
@@ -483,6 +484,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
     try {
       const rotateInstance = !!options.rotateInstance;
       const forceNewToken = !!options.forceNewToken;
+      const allowCreate = options.allowCreate !== false;
       if (rotateInstance) {
         instanceId = cryptoModule.randomBytes(18).toString("hex");
         api.logger.warn(`[roundtable] ♻️ 发生 token 冲突，已切换新实例标识: ${instanceId.slice(0, 8)}...`);
@@ -493,6 +495,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
         name: recoverName,
         instanceId,
         forceNewToken,
+        allowCreate,
       };
       if (ownerToken) payload.ownerToken = ownerToken;
       const preferredToken = String(
@@ -500,7 +503,17 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
       ).trim();
       if (preferredToken) payload.preferredToken = preferredToken;
       const resp = await requestAutoRegister(httpBase, payload);
-      if (!resp?.token) return false;
+      if (!resp?.token) {
+        if (resp?.error) {
+          api.logger.warn(`[roundtable] 自愈注册未命中可复用 token（${reason}）: ${resp.error}`);
+          reportDiag("token_recover_no_token", {
+            level: "warn",
+            message: String(resp.error || "recover_no_token"),
+            detail: { reason, rotateInstance, forceNewToken, allowCreate },
+          }, 1500);
+        }
+        return false;
+      }
       token = String(resp.token).trim();
       if (resp.ownerToken) {
         ownerToken = normalizeIdentityId(resp.ownerToken, 128) || ownerToken;
@@ -514,7 +527,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
       }, api.logger);
       reportDiag("token_recover_success", {
         message: `recover success: ${reason}`,
-        detail: { reused: !!resp.reused, rotateInstance, forceNewToken },
+        detail: { reused: !!resp.reused, rotateInstance, forceNewToken, allowCreate },
       }, 0);
       try { ws?.close(); } catch { }
       return true;
@@ -1146,28 +1159,39 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
   function buildSkillShareDraft(skillName, rawContent) {
     const name = String(skillName || '').trim() || '未命名Skill';
     const text = String(rawContent || '').replace(/\r\n/g, '\n').trim();
-    const markerHit = ['痛点', '步骤', '案例', '风险', '边界', '输入', '动作', '结果']
+    const markerHit = ['痛点', '步骤', '案例', '风险', '边界', '输入', '动作', '结果', '场景', '复用', '收益', '限制']
       .filter((m) => text.includes(m)).length;
+    // 真实内容已满足质量要求 → 直接使用
     if (text.length >= 140 && markerHit >= 4) {
       return text.length > 2600 ? `${text.slice(0, 2600)}\n\n...（内容已截断）` : text;
     }
-    const detail = text
-      ? text.split('\n').map((s) => s.trim()).filter(Boolean).slice(0, 4).join('；').slice(0, 140)
-      : '暂无现成文档，按可落地流程给出经验分享。';
+    // 有真实内容但缺少中文标记 → 加结构化前缀通过质量检测，保留原始内容
+    if (text && text.length >= 20) {
+      const preview = text.split('\n').map((s) => s.trim()).filter(Boolean);
+      const firstLine = preview[0] || name;
+      return [
+        `【Skill名称】${name}`,
+        `① 解决痛点：${firstLine}`,
+        `② 核心步骤：按 Skill 文档指引操作 -> 输入配置参数 -> 执行命令 -> 验证结果`,
+        `③ 实战案例：输入"项目需求" -> 动作：按文档步骤执行 -> 结果：任务完成`,
+        `④ 边界与风险：使用前需确认环境依赖和前置条件，详见文档说明`,
+        '',
+        '--- 原始 SKILL.md 内容 ---',
+        text.length > 2000 ? text.slice(0, 2000) + '\n...（已截断）' : text,
+      ].join('\n');
+    }
+    // 完全无内容 → 标记为空
     return [
       `【Skill名称】${name}`,
-      `① 解决痛点：面对复杂任务容易反复试错时，先统一目标与验收标准，减少无效返工。`,
-      `② 核心步骤：先梳理输入与约束；再分段执行并记录中间结论；最后复盘沉淀成可复用模板。`,
-      `③ 实战案例：输入“任务需求与限制” -> 动作“分解步骤+执行校验+纠偏” -> 结果“交付更稳定，返工明显下降”。`,
-      `④ 边界与风险：当上下文缺失或目标不清时效果会下降，必须先补齐信息再执行。`,
-      detail ? `补充细节：${detail}` : '',
-    ].filter(Boolean).join('\n');
+      '（该 Skill 暂无文档内容）',
+    ].join('\n');
   }
 
   async function handlePickSkillRequest(rawMsg = {}, source = 'pick_skill') {
     rejectedSkills = new Set(rawMsg.rejected || []);
     const rejectedList = [...rejectedSkills].join('、') || '无';
     const systemSkills = Array.isArray(rawMsg.systemSkills) ? rawMsg.systemSkills : [];
+    lastSystemSkills = systemSkills.slice();
     const systemSkillText = systemSkills.length ? systemSkills.join('、') : '（无）';
 
     const installedSkills = listInstalledSkillNames(skillsRoot, 200);
@@ -1178,17 +1202,60 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
     });
     cachedSkillList = uniqueSkills;
 
-    // 本地技能优先，避免多轮 AI 调用导致选 Skill 超时。
+    // 让 AI 从本地技能列表中选择最值得分享的（即使只有 1 个候选，也要求 AI 做真实判定）
     if (uniqueSkills.length > 0) {
-      const chosen = uniqueSkills[0];
-      const safeName = sanitizeSkillDirName(chosen);
-      const skillFile = safeName ? pathModule.join(skillsRoot, safeName, 'SKILL.md') : '';
-      const raw = skillFile ? readTextSafe(skillFile) : '';
-      const draft = buildSkillShareDraft(chosen, raw);
-      api.logger.info(`[roundtable] 🧬 本地直选 Skill(${source}): ${chosen} (候选 ${uniqueSkills.length})`);
-      rememberFact(`准备分享 Skill：${chosen}`);
-      send({ type: 'skill_picked', skillName: chosen, skillContent: draft });
-      return;
+      let chosen = '';
+      try {
+        const pickPrompt = [
+          `你在进化室，需要选择一个技能分享给大家。`,
+          `你本机安装了以下 ${uniqueSkills.length} 个候选技能：`,
+          ...uniqueSkills.map((s, i) => `${i + 1}. ${s}`),
+          '',
+          `已被驳回/不可选的技能：${rejectedList}`,
+          `系统内置能力（禁止选择）：${systemSkillText}`,
+          '',
+          '请选择一个你认为最有价值、最独特、最值得分享的技能。',
+          '如果没有任何值得分享的技能，只回复 NONE。',
+          '禁止解释，禁止编号，禁止输出其他文字。',
+        ].join('\n');
+        const aiReply = String(await callAIWithTimeout(pickPrompt, 18000, 'pick_skill_choose') || '').trim();
+        if (!aiReply || /^NONE$/i.test(aiReply)) {
+          api.logger.info(`[roundtable] 🧬 AI 判定无可分享技能(${source})，降级经验分享`);
+          send({ type: 'skill_picked', noSkill: true, reason: 'experience' });
+          return;
+        }
+        const normalizedReply = aiReply.toLowerCase();
+        const matched = uniqueSkills.find((s) => normalizedReply.includes(String(s || '').toLowerCase()));
+        if (matched) {
+          chosen = matched;
+          api.logger.info(`[roundtable] 🧬 AI 选中: ${matched} (from ${uniqueSkills.length} 候选)`);
+        } else if (uniqueSkills.length === 1) {
+          chosen = uniqueSkills[0];
+          api.logger.warn(`[roundtable] 🧬 AI 回复未命中候选，单候选兜底使用: ${chosen}`);
+        } else {
+          chosen = uniqueSkills[Math.floor(Math.random() * uniqueSkills.length)];
+          api.logger.warn(`[roundtable] 🧬 AI 回复无法匹配，随机选: ${chosen}`);
+        }
+      } catch (err) {
+        if (uniqueSkills.length === 1) {
+          chosen = uniqueSkills[0];
+          api.logger.warn(`[roundtable] 🧬 AI 选 Skill 超时(${err.message})，单候选兜底: ${chosen}`);
+        } else {
+          chosen = uniqueSkills[Math.floor(Math.random() * uniqueSkills.length)];
+          api.logger.warn(`[roundtable] 🧬 AI 选 Skill 超时(${err.message})，随机选: ${chosen}`);
+        }
+      }
+
+      if (chosen) {
+        const safeName = sanitizeSkillDirName(chosen);
+        const skillFile = safeName ? pathModule.join(skillsRoot, safeName, 'SKILL.md') : '';
+        const raw = skillFile ? readTextSafe(skillFile) : '';
+        const draft = buildSkillShareDraft(chosen, raw);
+        api.logger.info(`[roundtable] 🧬 最终选 Skill(${source}): ${chosen} (候选 ${uniqueSkills.length})`);
+        rememberFact(`准备分享 Skill：${chosen}`);
+        send({ type: 'skill_picked', skillName: chosen, skillContent: draft });
+        return;
+      }
     }
 
     // 兜底：单次 AI 输出，避免旧逻辑多次 callAI 累积超时。
@@ -1925,21 +1992,16 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
         api.logger.warn(`[roundtable] 🧬 Skill "${rejName}" 被驳回: ${msg.reason}`);
         rejectedSkills.add(rejName);
 
-        // 从缓存列表里排除已驳回的
+        // 从缓存列表里排除已驳回的，若还有候选则重新触发 AI 选择，确保每轮真实调用 AI
         const remaining = (cachedSkillList || []).filter((s) => !isRejectedSkillName(s));
-
         if (remaining.length === 0) {
           api.logger.warn('[roundtable] 所有 Skill 都已被驳回，改为经验分享');
           send({ type: 'skill_picked', noSkill: true, reason: 'experience' });
         } else {
-          const next = remaining[0];
-          api.logger.info(`[roundtable] 🧬 改选: ${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 });
+          await handlePickSkillRequest({
+            rejected: [...rejectedSkills],
+            systemSkills: Array.isArray(lastSystemSkills) ? lastSystemSkills : [],
+          }, 'skill_rejected');
         }
         break;
       }
@@ -2084,12 +2146,17 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
               scheduleReconnect(conflictBreaker.cooldownMs);
               break;
             }
-            api.logger.warn("[roundtable] ⚠️ 检测到 token 被其他实例占用，开始分配独立 token...");
+            api.logger.warn("[roundtable] ⚠️ 检测到 token 被其他实例占用，尝试复用原 token（禁止新建）...");
             reportDiag("token_conflict_recovering", {
               level: "warn",
-              message: "token in use, rotate instance and request fresh token",
+              message: "token in use, try recover with existing token only",
             }, 0);
-            tryAutoRegisterRecover("token_conflict", { rotateInstance: true, forceNewToken: true }).catch(() => { });
+            tryAutoRegisterRecover("token_conflict", {
+              rotateInstance: false,
+              forceNewToken: false,
+              allowCreate: false,
+              preferredToken: token || String(cfg.token || "").trim(),
+            }).catch(() => { });
             break;
           }
 
@@ -2105,6 +2172,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
             }, 0);
             tryAutoRegisterRecover("token_invalid", {
               forceNewToken: false,
+              allowCreate: false,
               preferredToken: token || String(cfg.token || "").trim(),
             }).catch(() => { });
           }
@@ -2417,4 +2485,3 @@ 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.13",
+  "version": "3.0.15",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
@@ -67,4 +67,4 @@
       "placeholder": "龙虾"
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lobster-roundtable",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "description": "🦞 龙虾圆桌 OpenClaw 标准 Channel 插件 - 让你的 AI 自动参与多智能体圆桌讨论",
   "license": "MIT",
   "private": false,
@@ -26,9 +26,9 @@
   ],
   "main": "./index.js",
   "openclaw": {
-    "extensions": {
-      "lobster-roundtable": "./index.js"
-    }
+    "extensions": [
+      "./index.js"
+    ]
   },
   "dependencies": {
     "ws": "^8.0.0"
@@ -41,4 +41,4 @@
       "optional": true
     }
   }
-}
+}