@vui-design/openclaw-plugin-feishu-progress 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vui-design/openclaw-plugin-feishu-progress",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "飞书任务进度卡片插件 — 在 AI 执行复杂多步骤任务时，实时更新飞书进度卡片",
   "keywords": [
     "openclaw-plugin",

package/src/feishu-client.ts

@@ -11,6 +11,8 @@ interface TokenCache {
 
 export class FeishuClient {
   private tokenCache: TokenCache | null = null;
+  // 并发刷新去重：多个调用同时过期时只发一次请求
+  private refreshPromise: Promise<string> | null = null;
 
   constructor(private config: FeishuConfig) {}
 
@@ -24,6 +26,14 @@ export class FeishuClient {
     if (this.tokenCache && Date.now() < this.tokenCache.expiresAt) {
       return this.tokenCache.token;
     }
+    if (this.refreshPromise) return this.refreshPromise;
+    this.refreshPromise = this.doRefresh().finally(() => {
+      this.refreshPromise = null;
+    });
+    return this.refreshPromise;
+  }
+
+  private async doRefresh(): Promise<string> {
     const res = await fetch(
       `${this.baseUrl}/open-apis/auth/v3/tenant_access_token/internal`,
       {
@@ -38,7 +48,12 @@ export class FeishuClient {
     if (!res.ok) {
       throw new Error(`飞书获取 token 失败: HTTP ${res.status}`);
     }
-    const data = (await res.json()) as { tenant_access_token: string; expire: number; code: number; msg: string };
+    const data = (await res.json()) as {
+      tenant_access_token: string;
+      expire: number;
+      code: number;
+      msg: string;
+    };
     if (data.code !== 0) {
       throw new Error(`飞书获取 token 失败: ${data.msg} (code=${data.code})`);
     }
@@ -78,7 +93,11 @@ export class FeishuClient {
     if (!res.ok) {
       throw new Error(`飞书发送消息失败: HTTP ${res.status}`);
     }
-    const data = (await res.json()) as { code: number; msg: string; data: { message_id: string } };
+    const data = (await res.json()) as {
+      code: number;
+      msg: string;
+      data: { message_id: string };
+    };
     if (data.code !== 0) {
       throw new Error(`飞书发送消息失败: ${data.msg} (code=${data.code})`);
     }

package/src/index.ts

@@ -15,110 +15,108 @@ function buildToolLabel(toolName: string, args: Record<string, unknown>): string
     case 'exec':
     case 'bash': {
       const cmd = s(args?.command ?? args?.cmd ?? args?.input, 150);
-
       const brewInstall = cmd.match(/brew\s+install\s+([\w@./-]+)/);
       if (brewInstall) return `📦 安装 ${brewInstall[1]}`;
       const brewUninstall = cmd.match(/brew\s+uninstall\s+([\w@./-]+)/);
       if (brewUninstall) return `🗑️ 卸载 ${brewUninstall[1]}`;
       const which = cmd.match(/^(?:which|command\s+-v)\s+([\w.-]+)/);
       if (which) return `🔍 检查 ${which[1]} 是否已安装`;
-
       const npmInstall = cmd.match(/(?:npm|pnpm|yarn)\s+(?:install|add)\s+([\w@./-]+)?/);
       if (npmInstall) return npmInstall[1] ? `📦 安装 ${npmInstall[1]}` : '📦 安装依赖';
       const npmRun = cmd.match(/(?:npm|pnpm|yarn)\s+run\s+([\w:.-]+)/);
       if (npmRun) return `▶️ 运行 ${npmRun[1]}`;
-
       const pip = cmd.match(/pip(?:\d)?\s+install\s+([\w@.-]+)/);
       if (pip) return `📦 安装 ${pip[1]}`;
-
       const gitClone = cmd.match(/git\s+clone\s+(?:.*\/)?([^/\s]+?)(?:\.git)?(?:\s|$)/);
       if (gitClone) return `📥 克隆仓库 ${gitClone[1]}`;
       if (/git\s+commit/.test(cmd)) return '💾 提交代码';
       if (/git\s+push/.test(cmd)) return '🚀 推送代码';
       if (/git\s+pull/.test(cmd)) return '⬇️ 拉取代码';
-
       const mkdir = cmd.match(/^mkdir\s+(?:-[\w]+\s+)?([\w./~-]+)/);
       if (mkdir) return `📁 创建目录 ${basename(mkdir[1])}`;
       const rm = cmd.match(/^rm\s+(?:-[\w]+\s+)?([\w./~-]+)/);
       if (rm) return `🗑️ 删除 ${basename(rm[1])}`;
-
       const curlUrl = cmd.match(/(?:curl|wget)\s+.*?(https?:\/\/[^\s]+)/);
       if (curlUrl) { try { return `🌐 请求 ${new URL(curlUrl[1]).hostname}`; } catch { /**/ } }
-
       if (cmd) return `⚡ ${cmd.slice(0, 40)}`;
       return '⚡ 执行命令';
     }
-
     case 'process': {
       const cmd = s(args?.command ?? args?.cmd, 80);
       return cmd ? `⚡ ${cmd.slice(0, 40)}` : '⚡ 执行进程';
     }
-
     case 'read':
     case 'read_file': {
       const p = s(args?.path ?? args?.file_path ?? args?.filePath);
       return p ? `📂 读取 ${basename(p)}` : '📂 读取文件';
     }
-
     case 'write':
     case 'write_file':
     case 'create_file': {
       const p = s(args?.path ?? args?.file_path ?? args?.filePath);
       return p ? `✏️ 写入 ${basename(p)}` : '✏️ 写入文件';
     }
-
     case 'str_replace_editor':
     case 'edit_file': {
       const p = s(args?.path ?? args?.file_path);
       return p ? `✏️ 编辑 ${basename(p)}` : '✏️ 编辑文件';
     }
-
     case 'list_directory': {
       const p = s(args?.path ?? args?.directory);
       return p ? `📋 浏览 ${basename(p) || p}` : '📋 浏览目录';
     }
-
     case 'search':
     case 'web_search':
     case 'tavily_search': {
       const q = s(args?.query ?? args?.q, 30);
       return q ? `🌐 搜索「${q}」` : '🌐 网络搜索';
     }
-
     case 'fetch':
     case 'web_fetch': {
       const url = s(args?.url ?? args?.href);
       try { return `🌐 访问 ${new URL(url).hostname}`; } catch { /**/ }
       return '🌐 抓取网页';
     }
-
     case 'computer': {
       const action = s(args?.action);
       return action ? `🖥️ 操作电脑：${action}` : '🖥️ 操作电脑';
     }
-
     case 'screenshot': return '📸 截图';
-
     case 'delete_file': {
       const p = s(args?.path ?? args?.file_path);
       return p ? `🗑️ 删除 ${basename(p)}` : '🗑️ 删除文件';
     }
-
     default: return `🔧 ${toolName}`;
   }
 }
 
-// 从 AI 输出文本中提取最末一句（作为进度提示优先显示）
+// 从 AI 输出文本提取最末一句（去掉 markdown 标记符）
 function extractSnippet(text: string): string {
-  const lines = text.split(/\n+/).map(l => l.trim()).filter(Boolean);
+  const lines = text
+    .split(/\n+/)
+    .map(l => l.replace(/^[#*>\-\s]+/, '').trim())
+    .filter(Boolean);
   return (lines[lines.length - 1] ?? '').slice(0, 50);
 }
 
+// 从 sessionKey 提取飞书用户 ID
+// sessionKey 格式：agent:{agentId}:feishu:direct:{userId}
+function chatIdFromSessionKey(sessionKey: string | undefined): string | undefined {
+  if (!sessionKey) return undefined;
+  const m = sessionKey.match(/^agent:[^:]+:feishu:(?:direct|group):(.+)$/);
+  return m?.[1];
+}
+
 // ── 主插件 ────────────────────────────────────────────────────────────────
 
 interface RunState {
   chatId: string;
+  /** 用于 agent_end 精确匹配，避免按 chatId 误删并发 run */
+  agentId: string;
+  sessionKey: string;
   assistantBuffer: string;
+  /** 已发送过的 snippet，防止重复推送 */
+  sentSnippets: Set<string>;
   startedAt: number;
   lastSentAt: number;
   heartbeatTimer: ReturnType<typeof setInterval>;
@@ -133,7 +131,6 @@ export default {
     if (!cfg.appId || !cfg.appSecret) {
       api.logger?.warn(
         '[feishu-progress] appId / appSecret 未配置，进度通知已禁用。\n' +
-        '请执行：\n' +
         '  openclaw config set plugins.entries.feishu-progress.config.appId     "cli_xxx"\n' +
         '  openclaw config set plugins.entries.feishu-progress.config.appSecret "xxx"\n' +
         '然后重启 OpenClaw。'
@@ -147,13 +144,23 @@ export default {
       domain: cfg.domain ?? 'feishu',
     });
 
-    // accountId ("main") → 飞书裸 ID（ou_xxx / oc_xxx）
+    // accountId ("main") → 飞书裸 ID，兜底用（sessionKey 解析失败时）
     const accountChatMap = new Map<string, string>();
 
-    // runId → RunState（每次 agent run 的状态）
+    // runId → RunState
     const runStateMap = new Map<string, RunState>();
 
-    // ── 1. 收到用户消息 → 记录 accountId 对应的飞书 chat ID ─────────────────
+    // 统一清理入口
+    function cleanupRun(runId: string): void {
+      const state = runStateMap.get(runId);
+      if (!state) return;
+      clearInterval(state.heartbeatTimer);
+      runStateMap.delete(runId);
+    }
+
+    // ── Hooks ───────────────────────────────────────────────────────────────
+
+    // 收到飞书消息 → 记录 accountId → chatId（兜底索引）
     api.on('message_received', async (_event: any, ctx: any) => {
       if (ctx.channelId !== 'feishu') return;
       if (!ctx.conversationId) return;
@@ -161,23 +168,30 @@ export default {
       const rawId = ctx.conversationId.includes(':')
         ? ctx.conversationId.split(':').pop()!
         : ctx.conversationId;
-      accountChatMap.set(ctx.accountId ?? 'default', rawId);
+      if (ctx.accountId) accountChatMap.set(ctx.accountId, rawId);
     });
 
-    // ── 2. LLM 调用前 → 用 runId+agentId 建立关联，并启动心跳 ─────────────
+    // llm_input → 建立 runId → RunState，启动心跳
     api.on('llm_input', async (event: any, ctx: any) => {
-      if (!event.runId || !ctx.agentId) return;
+      if (!event.runId) return;
       if (runStateMap.has(event.runId)) return; // 同一 run 只初始化一次
 
-      const chatId = accountChatMap.get(ctx.agentId);
+      // 从 sessionKey 精确解析 chatId；无法解析时退回 accountChatMap
+      const chatId =
+        chatIdFromSessionKey(ctx.sessionKey) ??
+        (ctx.agentId ? accountChatMap.get(ctx.agentId) : undefined);
       if (!chatId) return;
 
       const startedAt = Date.now();
       const state: RunState = {
         chatId,
+        agentId: ctx.agentId ?? '',
+        sessionKey: ctx.sessionKey ?? '',
         assistantBuffer: '',
+        sentSnippets: new Set(),
         startedAt,
         lastSentAt: startedAt,
+        // 10s 间隔确保 55s 阈值能准时触发
         heartbeatTimer: setInterval(() => {
           if (!runStateMap.has(event.runId)) return;
           const idleSec = (Date.now() - state.lastSentAt) / 1000;
@@ -186,34 +200,40 @@ export default {
             state.lastSentAt = Date.now();
             client.sendText(chatId, `⏳ 处理中，已用时约 ${elapsed} 秒...`).catch(() => {});
           }
-        }, 30_000),
+        }, 10_000),
       };
 
       runStateMap.set(event.runId, state);
     });
 
-    // ── 3. 实时流事件 → 核心逻辑 ─────────────────────────────────────────────
+    // ── 实时流事件（与钉钉插件使用相同的事件总线）──────────────────────────
     api.runtime.events.onAgentEvent((evt: any) => {
       const { runId, stream, data } = evt;
       const state = runStateMap.get(runId);
       if (!state) return;
 
-      // assistant 流：累积 AI 输出文本
+      // assistant 流 → 累积 AI 文本 delta
       if (stream === 'assistant') {
         state.assistantBuffer += (data?.delta ?? '') as string;
         return;
       }
 
-      // tool:start → 推送进度消息
+      // tool:start → 推送进度
       if (stream === 'tool' && data?.phase === 'start') {
-        // AI 文本优先，没有则用参数解析标签
         const snippet = extractSnippet(state.assistantBuffer);
-        state.assistantBuffer = ''; // 每次工具调用前消费一次
-
-        const label = snippet || buildToolLabel(
-          data.name as string,
-          (data.args ?? {}) as Record<string, unknown>,
-        );
+        state.assistantBuffer = ''; // 每次工具调用前消费
+
+        let label: string;
+        if (snippet && !state.sentSnippets.has(snippet)) {
+          // AI 文本优先，且去重
+          state.sentSnippets.add(snippet);
+          label = snippet;
+        } else {
+          label = buildToolLabel(
+            data.name as string,
+            (data.args ?? {}) as Record<string, unknown>,
+          );
+        }
 
         state.lastSentAt = Date.now();
         client.sendText(state.chatId, label).catch((err: any) => {
@@ -224,8 +244,16 @@ export default {
 
       // lifecycle:end/error → 清理
       if (stream === 'lifecycle' && (data?.phase === 'end' || data?.phase === 'error')) {
-        clearInterval(state.heartbeatTimer);
-        runStateMap.delete(runId);
+        cleanupRun(runId);
+      }
+    });
+
+    // agent_end → 兜底清理（按 sessionKey/agentId 精确匹配，不按 chatId）
+    api.on('agent_end', async (_event: any, ctx: any) => {
+      for (const [runId, state] of runStateMap) {
+        const matchBySession = ctx.sessionKey && state.sessionKey === ctx.sessionKey;
+        const matchByAgent = !ctx.sessionKey && ctx.agentId && state.agentId === ctx.agentId;
+        if (matchBySession || matchByAgent) cleanupRun(runId);
       }
     });
   },