@ian2018cs/agenthub 0.1.82 → 0.1.83

package/server/services/feishu/sdk-bridge.js

@@ -85,6 +85,11 @@ class FakeSendWriter {
     return this.sessionId;
   }
 
+  /** 优先用 chat_id，回退到 feishuOpenId（open_id），LarkClient 会自动识别类型 */
+  get _target() {
+    return this.chatId || this.feishuOpenId;
+  }
+
   // ─── 消息路由 ──────────────────────────────────────────────────────────────
 
   _handle(data) {
@@ -146,7 +151,7 @@ class FakeSendWriter {
             this.textBuffer.push(block.text);
           } else if (block.type === 'tool_use' && block.name) {
             this.toolNotices.push(`🔧 调用 \`${block.name}\``);
-            this.larkClient.sendText(this.chatId, `🔧 正在调用 \`${block.name}\`…`).catch(() => {});
+            this.larkClient.sendTextToTarget(this._target, `🔧 正在调用 \`${block.name}\`…`).catch(() => {});
             // 追踪 Write 工具写入的文件路径，完成后按类型发送给用户
             if (block.name === 'Write' && block.input?.file_path) {
               this.writtenFiles.push(block.input.file_path);
@@ -166,7 +171,7 @@ class FakeSendWriter {
         const block = msg.content_block;
         if (block?.type === 'tool_use' && block.name) {
           this.toolNotices.push(`🔧 调用 \`${block.name}\``);
-          this.larkClient.sendText(this.chatId, `🔧 正在调用 \`${block.name}\`…`).catch(() => {});
+          this.larkClient.sendTextToTarget(this._target, `🔧 正在调用 \`${block.name}\`…`).catch(() => {});
         }
         break;
       }
@@ -180,7 +185,7 @@ class FakeSendWriter {
       case 'tool_use':
         if (msg.name) {
           this.toolNotices.push(`🔧 调用 \`${msg.name}\``);
-          this.larkClient.sendText(this.chatId, `🔧 正在调用 \`${msg.name}\`…`).catch(() => {});
+          this.larkClient.sendTextToTarget(this._target, `🔧 正在调用 \`${msg.name}\`…`).catch(() => {});
         }
         break;
 
@@ -219,14 +224,13 @@ class FakeSendWriter {
 
     // 直接发送交互卡片（JSON 构建，无需模板 ID）
     const cardContent = buildToolApprovalCardDirect(toolName, input, requestId);
-    const cardMsgId = await this.larkClient.sendInteractiveAndGetMsgId(this.chatId, cardContent).catch(async () => {
-      // 兜底：降级为文本消息
+    const cardMsgId = await this.larkClient.sendInteractiveAndGetMsgId(this._target, cardContent).catch(async () => {
       const inputSummary = truncate(
         typeof input === 'object' ? JSON.stringify(input, null, 2) : String(input || ''),
         300
       );
       const text = `🔔 **工具审批请求**\n工具: \`${toolName}\`\n参数:\n\`\`\`\n${inputSummary}\n\`\`\`\n\n回复 **允许** 或 **拒绝**（或 **允许所有** 跳过同类工具询问）`;
-      await this.larkClient.sendText(this.chatId, text).catch(() => {});
+      await this.larkClient.sendTextToTarget(this._target, text).catch(() => {});
       return null;
     });
     this.pendingApprovals.set(this.feishuOpenId, { requestId, cardMessageId: cardMsgId, toolName });
@@ -237,7 +241,7 @@ class FakeSendWriter {
 
     // 发送交互卡片（动态 JSON，无需模板 ID）
     const cardContent = buildAskUserQuestionCard(questions, requestId);
-    const cardMsgId = await this.larkClient.sendInteractiveAndGetMsgId(this.chatId, cardContent)
+    const cardMsgId = await this.larkClient.sendInteractiveAndGetMsgId(this._target, cardContent)
       .catch(async (err) => {
         console.error('[Feishu:sdk-bridge] AskUserQuestion card send error:', err.message);
         // 降级：发送文字说明，用户通过文字回复选项字母
@@ -257,7 +261,7 @@ class FakeSendWriter {
           : '回复选项字母（多选用 + 连接，如 A+B）'
         );
         lines.push('回复"跳过"可跳过此问卷。');
-        await this.larkClient.sendText(this.chatId, lines.join('\n')).catch(() => {});
+        await this.larkClient.sendTextToTarget(this._target, lines.join('\n')).catch(() => {});
         return null;
       });
 
@@ -303,7 +307,7 @@ class FakeSendWriter {
       const chunks = splitMessage(cleanedText, 4000);
       for (const chunk of chunks) {
         try {
-          await this.larkClient.sendText(this.chatId, chunk);
+          await this.larkClient.sendTextToTarget(this._target, chunk);
           console.log('[Feishu:sdk-bridge] sendText OK, chunk.length=', chunk.length);
         } catch (err) {
           console.error('[Feishu:sdk-bridge] sendText FAILED:', err.message, err.stack);
@@ -343,10 +347,10 @@ class FakeSendWriter {
       try {
         const buf = await fs.readFile(resolved);
         if (FakeSendWriter.IMAGE_EXTS.has(ext)) {
-          await this.larkClient.sendImageBuffer(this.chatId, buf);
+          await this.larkClient.sendImageBuffer(this._target, buf);
           console.log(`[Feishu:sdk-bridge] Sent image: ${filename}`);
         } else {
-          await this.larkClient.sendFileBuffer(this.chatId, buf, filename);
+          await this.larkClient.sendFileBuffer(this._target, buf, filename);
           console.log(`[Feishu:sdk-bridge] Sent file: ${filename}`);
         }
       } catch (err) {
@@ -363,10 +367,10 @@ class FakeSendWriter {
       try {
         const buf = await fs.readFile(filePath);
         if (FakeSendWriter.IMAGE_EXTS.has(ext)) {
-          await this.larkClient.sendImageBuffer(this.chatId, buf);
+          await this.larkClient.sendImageBuffer(this._target, buf);
           console.log(`[Feishu:sdk-bridge] Sent tagged image: ${filename}`);
         } else {
-          await this.larkClient.sendFileBuffer(this.chatId, buf, filename);
+          await this.larkClient.sendFileBuffer(this._target, buf, filename);
           console.log(`[Feishu:sdk-bridge] Sent tagged file: ${filename}`);
         }
       } catch (err) {
@@ -382,7 +386,7 @@ class FakeSendWriter {
   async _handleError(errorMsg) {
     // 会话损坏时不发通用错误（由 runQuery 统一处理并重置会话）
     if (this.sessionCorrupted) return;
-    await this.larkClient.sendText(this.chatId, `❌ 出错了：${errorMsg || '未知错误'}`).catch(() => {});
+    await this.larkClient.sendTextToTarget(this._target, `❌ 出错了：${errorMsg || '未知错误'}`).catch(() => {});
   }
 }
 
@@ -421,7 +425,7 @@ async function runQuery({
       const reason = limitStatus.reason === 'daily_limit_exceeded'
         ? `每日用量已达上限 ($${limitStatus.limit.toFixed(2)})`
         : `总用量已达上限 ($${limitStatus.limit.toFixed(2)})`;
-      await larkClient.sendText(chatId, `⚠️ ${reason}，请联系管理员。`);
+      await larkClient.sendTextToTarget(chatId || feishuOpenId, `⚠️ ${reason}，请联系管理员。`);
       return;
     }
   }
@@ -462,7 +466,7 @@ async function runQuery({
   // 会话历史损坏（空 text block）：自动清除坏会话，提示用户重发
   if (writer.sessionCorrupted) {
     feishuDb.updateSessionState(feishuOpenId, { claude_session_id: null });
-    await larkClient.sendText(chatId,
+    await larkClient.sendTextToTarget(chatId || feishuOpenId,
       '⚠️ 检测到历史会话数据异常，已自动重置会话。请重新发送消息，将以新会话继续。'
     ).catch(() => {});
   }