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

package/package.json

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

package/src/index.ts

@@ -1,35 +1,128 @@
 import { FeishuClient } from './feishu-client.js';
 
-// 常见工具名称中文映射（含 OpenClaw 内部工具名 + Claude 工具名）
-const TOOL_LABEL: Record<string, string> = {
-  // OpenClaw 内部工具名
-  exec: '执行命令',
-  process: '执行进程',
-  read: '读取文件',
-  write: '写入文件',
-  search: '网络搜索',
-  fetch: '抓取网页',
-  // Claude 工具名
-  read_file: '读取文件',
-  write_file: '写入文件',
-  list_directory: '浏览目录',
-  bash: '执行命令',
-  web_search: '网络搜索',
-  tavily_search: '网络搜索',
-  web_fetch: '抓取网页',
-  computer: '操作电脑',
-  screenshot: '截图',
-  str_replace_editor: '编辑文件',
-  create_file: '创建文件',
-  delete_file: '删除文件',
-};
+// ── 工具参数 → 语义化中文标签 ────────────────────────────────────────────────
+
+function basename(p: string): string {
+  return p.split(/[/\\]/).filter(Boolean).pop() ?? p;
+}
 
-function toolLabel(name: string): string {
-  return TOOL_LABEL[name] ?? name;
+function s(v: unknown, max = 60): string {
+  return String(v ?? '').slice(0, max).trim();
 }
 
-// sessionKey → conversationId（飞书 chat_id）
-const sessionChatMap = new Map<string, string>();
+function buildToolLabel(toolName: string, args: Record<string, unknown>): string {
+  switch (toolName) {
+    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 输出文本中提取最末一句（作为进度提示优先显示）
+function extractSnippet(text: string): string {
+  const lines = text.split(/\n+/).map(l => l.trim()).filter(Boolean);
+  return (lines[lines.length - 1] ?? '').slice(0, 50);
+}
+
+// ── 主插件 ────────────────────────────────────────────────────────────────
+
+interface RunState {
+  chatId: string;
+  assistantBuffer: string;
+  startedAt: number;
+  lastSentAt: number;
+  heartbeatTimer: ReturnType<typeof setInterval>;
+}
 
 export default {
   id: 'feishu-progress',
@@ -39,7 +132,7 @@ export default {
 
     if (!cfg.appId || !cfg.appSecret) {
       api.logger?.warn(
-        '[feishu-progress] appId / appSecret 未配置，进度卡片功能已禁用。\n' +
+        '[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' +
@@ -54,32 +147,86 @@ export default {
       domain: cfg.domain ?? 'feishu',
     });
 
-    // ── 1. 收到用户消息时，记录当前会话对应的飞书 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. 每次工具调用前，自动推送进度到飞书 ──────────────────────────────
-    api.on('before_tool_call', async (event: any, ctx: any) => {
-      const key = ctx.agentId ?? ctx.sessionKey ?? 'default';
-      const chatId = sessionChatMap.get(key);
+    // ── 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 只初始化一次
+
+      const chatId = accountChatMap.get(ctx.agentId);
       if (!chatId) return;
-      try {
-        await client.sendText(chatId, `🔧 正在执行：${toolLabel(event.toolName)}`);
-      } catch (err: any) {
-        api.logger?.warn(`[feishu-progress] 推送失败: ${err?.message}`);
-      }
+
+      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. 任务结束后清理 session 映射 ───────────────────────────────────────
-    api.on('agent_end', async (_event: any, ctx: any) => {
-      sessionChatMap.delete(ctx.agentId ?? ctx.sessionKey ?? 'default');
+    // ── 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;
+      }
+
+      // 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;
+      }
+
+      // lifecycle:end/error → 清理
+      if (stream === 'lifecycle' && (data?.phase === 'end' || data?.phase === 'error')) {
+        clearInterval(state.heartbeatTimer);
+        runStateMap.delete(runId);
+      }
     });
   },
 };