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

package/package.json

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

package/src/index.ts

@@ -1,26 +1,25 @@
 import { FeishuClient } from './feishu-client.js';
 
-// ── 工具名称标签构建（解析实际参数，生成语义化中文描述）──────────────────────
+// ── 工具参数 → 语义化中文标签 ────────────────────────────────────────────────
 
 function basename(p: string): string {
   return p.split(/[/\\]/).filter(Boolean).pop() ?? p;
 }
 
-function str(v: unknown, max = 60): string {
+function s(v: unknown, max = 60): string {
   return String(v ?? '').slice(0, max).trim();
 }
 
-function buildToolLabel(toolName: string, params: Record<string, unknown>): string {
+function buildToolLabel(toolName: string, args: Record<string, unknown>): string {
   switch (toolName) {
     case 'exec':
     case 'bash': {
-      const cmd = str(params?.command ?? params?.cmd ?? params?.input, 150);
+      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]} 是否已安装`;
 
@@ -40,7 +39,6 @@ function buildToolLabel(toolName: string, params: Record<string, unknown>): stri
 
       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])}`;
 
@@ -52,57 +50,57 @@ function buildToolLabel(toolName: string, params: Record<string, unknown>): stri
     }
 
     case 'process': {
-      const cmd = str(params?.command ?? params?.cmd, 80);
-      return cmd ? `⚡ 运行：${cmd.slice(0, 40)}` : '⚡ 执行进程';
+      const cmd = s(args?.command ?? args?.cmd, 80);
+      return cmd ? `⚡ ${cmd.slice(0, 40)}` : '⚡ 执行进程';
     }
 
     case 'read':
     case 'read_file': {
-      const p = str(params?.path ?? params?.file_path ?? params?.filePath);
+      const p = s(args?.path ?? args?.file_path ?? args?.filePath);
       return p ? `📂 读取 ${basename(p)}` : '📂 读取文件';
     }
 
     case 'write':
     case 'write_file':
     case 'create_file': {
-      const p = str(params?.path ?? params?.file_path ?? params?.filePath);
+      const p = s(args?.path ?? args?.file_path ?? args?.filePath);
       return p ? `✏️ 写入 ${basename(p)}` : '✏️ 写入文件';
     }
 
     case 'str_replace_editor':
     case 'edit_file': {
-      const p = str(params?.path ?? params?.file_path);
+      const p = s(args?.path ?? args?.file_path);
       return p ? `✏️ 编辑 ${basename(p)}` : '✏️ 编辑文件';
     }
 
     case 'list_directory': {
-      const p = str(params?.path ?? params?.directory);
+      const p = s(args?.path ?? args?.directory);
       return p ? `📋 浏览 ${basename(p) || p}` : '📋 浏览目录';
     }
 
     case 'search':
     case 'web_search':
     case 'tavily_search': {
-      const q = str(params?.query ?? params?.q, 30);
+      const q = s(args?.query ?? args?.q, 30);
       return q ? `🌐 搜索「${q}」` : '🌐 网络搜索';
     }
 
     case 'fetch':
     case 'web_fetch': {
-      const url = str(params?.url ?? params?.href);
+      const url = s(args?.url ?? args?.href);
       try { return `🌐 访问 ${new URL(url).hostname}`; } catch { /**/ }
       return '🌐 抓取网页';
     }
 
     case 'computer': {
-      const action = str(params?.action);
+      const action = s(args?.action);
       return action ? `🖥️ 操作电脑：${action}` : '🖥️ 操作电脑';
     }
 
     case 'screenshot': return '📸 截图';
 
     case 'delete_file': {
-      const p = str(params?.path ?? params?.file_path);
+      const p = s(args?.path ?? args?.file_path);
       return p ? `🗑️ 删除 ${basename(p)}` : '🗑️ 删除文件';
     }
 
@@ -110,22 +108,21 @@ function buildToolLabel(toolName: string, params: Record<string, unknown>): stri
   }
 }
 
-// ── 提取 AI 文本中最有意义的一句（用于工具调用前的说明）─────────────────────
-
+// 从 AI 输出文本中提取最末一句（作为进度提示优先显示）
 function extractSnippet(text: string): string {
-  // 取最后一段非空文本，截取前 50 字
   const lines = text.split(/\n+/).map(l => l.trim()).filter(Boolean);
-  const last = lines[lines.length - 1] ?? '';
-  return last.slice(0, 50);
+  return (lines[lines.length - 1] ?? '').slice(0, 50);
 }
 
-// ── 主插件逻辑 ──────────────────────────────────────────────────────────────
-
-// agentId → 飞书裸 ID（ou_xxx / oc_xxx）
-const sessionChatMap = new Map<string, string>();
+// ── 主插件 ────────────────────────────────────────────────────────────────
 
-// runId → 最近一次 LLM turn 的 AI 文本（用于 before_tool_call 显示上下文）
-const runTextMap = new Map<string, string>();
+interface RunState {
+  chatId: string;
+  assistantBuffer: string;
+  startedAt: number;
+  lastSentAt: number;
+  heartbeatTimer: ReturnType<typeof setInterval>;
+}
 
 export default {
   id: 'feishu-progress',
@@ -150,51 +147,86 @@ export default {
       domain: cfg.domain ?? 'feishu',
     });
 
-    // ── 1. 收到用户消息时，记录 agentId → 飞书 ID ────────────────────────────
+    // accountId ("main") → 飞书裸 ID（ou_xxx / oc_xxx）
+    const accountChatMap = new Map<string, string>();
+
+    // runId → RunState（每次 agent run 的状态）
+    const runStateMap = new Map<string, RunState>();
+
+    // ── 1. 收到用户消息 → 记录 accountId 对应的飞书 chat ID ─────────────────
     api.on('message_received', async (_event: any, ctx: any) => {
       if (ctx.channelId !== 'feishu') return;
       if (!ctx.conversationId) return;
-      // OpenClaw 内部格式 "user:ou_xxx" / "group:oc_xxx"，剥离前缀取裸 Feishu ID
+      // OpenClaw 内部格式 "user:ou_xxx"，剥离前缀
       const rawId = ctx.conversationId.includes(':')
         ? ctx.conversationId.split(':').pop()!
         : ctx.conversationId;
-      sessionChatMap.set(ctx.accountId ?? 'default', rawId);
+      accountChatMap.set(ctx.accountId ?? 'default', rawId);
     });
 
-    // ── 2. LLM 完成一轮生成后，缓存 AI 文本供 before_tool_call 使用 ──────────
-    api.on('llm_output', async (event: any, _ctx: any) => {
-      if (!event.runId) return;
-      const texts: string[] = event.assistantTexts ?? [];
-      const text = texts.join('').trim();
-      if (text) runTextMap.set(event.runId, text);
-    });
+    // ── 2. LLM 调用前 → 用 runId+agentId 建立关联，并启动心跳 ─────────────
+    api.on('llm_input', async (event: any, ctx: any) => {
+      if (!event.runId || !ctx.agentId) return;
+      if (runStateMap.has(event.runId)) return; // 同一 run 只初始化一次
 
-    // ── 3. 工具调用前，推送进度到飞书 ───────────────────────────────────────
-    api.on('before_tool_call', async (event: any, ctx: any) => {
-      const key = ctx.agentId ?? ctx.sessionKey ?? 'default';
-      const chatId = sessionChatMap.get(key);
+      const chatId = accountChatMap.get(ctx.agentId);
       if (!chatId) return;
 
-      // AI 文本优先（取自本轮 LLM 输出的最后一句），没有则用参数解析标签
-      let label: string;
-      if (event.runId && runTextMap.has(event.runId)) {
-        const snippet = extractSnippet(runTextMap.get(event.runId)!);
-        runTextMap.delete(event.runId); // 每轮只用一次
-        label = snippet || buildToolLabel(event.toolName, event.params ?? {});
-      } else {
-        label = buildToolLabel(event.toolName, event.params ?? {});
+      const startedAt = Date.now();
+      const state: RunState = {
+        chatId,
+        assistantBuffer: '',
+        startedAt,
+        lastSentAt: startedAt,
+        heartbeatTimer: setInterval(() => {
+          if (!runStateMap.has(event.runId)) return;
+          const idleSec = (Date.now() - state.lastSentAt) / 1000;
+          if (idleSec >= 55) {
+            const elapsed = Math.round((Date.now() - state.startedAt) / 1000);
+            state.lastSentAt = Date.now();
+            client.sendText(chatId, `⏳ 处理中，已用时约 ${elapsed} 秒...`).catch(() => {});
+          }
+        }, 30_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 输出文本
+      if (stream === 'assistant') {
+        state.assistantBuffer += (data?.delta ?? '') as string;
+        return;
       }
 
-      try {
-        await client.sendText(chatId, label);
-      } catch (err: any) {
-        api.logger?.warn(`[feishu-progress] 推送失败: ${err?.message}`);
+      // 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.lastSentAt = Date.now();
+        client.sendText(state.chatId, label).catch((err: any) => {
+          api.logger?.warn(`[feishu-progress] 推送失败: ${err?.message}`);
+        });
+        return;
       }
-    });
 
-    // ── 4. 任务结束后清理 session 映射 ─────────────────────────────────────
-    api.on('agent_end', async (_event: any, ctx: any) => {
-      sessionChatMap.delete(ctx.agentId ?? ctx.sessionKey ?? 'default');
+      // lifecycle:end/error → 清理
+      if (stream === 'lifecycle' && (data?.phase === 'end' || data?.phase === 'error')) {
+        clearInterval(state.heartbeatTimer);
+        runStateMap.delete(runId);
+      }
     });
   },
 };