Merge branch 'ls-dev' into 'master'

JerryliDe · JerryliDe · commit 2db550a4db7b · 2026-06-06T13:25:57.000+08:00
feat(feishu): support merge_forward message parsing

See merge request ai_native/DeepVCode/DeepVcodeClient!491
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "easycode-ai",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "engines": {
     "node": ">=20.0.0"
   },
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "easycode-cli",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "DeepV Code - AI-powered coding assistant with enhanced capabilities",
   "repository": {
     "type": "git",
diff --git a/packages/cli/src/services/feishu/gateway.test.ts b/packages/cli/src/services/feishu/gateway.test.ts
@@ -322,6 +322,378 @@ describe('FeishuGateway - Message Parsing', () => {
     expect(receivedMsg.pendingImages[0].imageKey).toBe('img_v2_123');
     expect(receivedMsg.pendingImages[0].placeholder).toBe('[图片_1]');
   });
+
+  it('correctly parses merge_forward message and extracts nested sub-messages', async () => {
+    await gateway.connect();
+
+    const mockFetchOk = (body: any) => ({
+      ok: true,
+      json: async () => body,
+    });
+
+    const fetchMock = vi.fn().mockImplementation(async (url: string) => {
+      if (url.includes('/tenant_access_token')) {
+        return mockFetchOk({
+          tenant_access_token: 't-mock-token',
+          expire: 7200,
+        });
+      }
+      if (url.includes('/im/v1/messages/')) {
+        // 飞书「获取指定消息内容」对 merge_forward 返回扁平化消息树：
+        // 第一条是父消息（无 upper_message_id），其后子消息带 upper_message_id。
+        return mockFetchOk({
+          code: 0,
+          msg: 'success',
+          data: {
+            items: [
+              {
+                message_id: 'om_merge_123',
+                msg_type: 'merge_forward',
+                body: { content: '{}' },
+                create_time: '1615367850000',
+                sender: { id: 'ou_root', id_type: 'open_id', sender_type: 'user' },
+              },
+              {
+                message_id: 'om_sub_1',
+                upper_message_id: 'om_merge_123',
+                msg_type: 'text',
+                body: { content: JSON.stringify({ text: 'hello from sub1' }) },
+                create_time: '1615367851000',
+                sender: {
+                  id: 'ou_user_1',
+                  id_type: 'open_id',
+                  sender_type: 'user',
+                },
+              },
+              {
+                message_id: 'om_sub_2',
+                upper_message_id: 'om_merge_123',
+                msg_type: 'file',
+                body: { content: JSON.stringify({ file_key: 'file_sub_2', file_name: 'nested.zip' }) },
+                create_time: '1615367852000',
+                sender: {
+                  id: 'ou_user_2',
+                  id_type: 'open_id',
+                  sender_type: 'user',
+                },
+              },
+            ],
+          },
+        });
+      }
+      return mockFetchOk({ code: 0 });
+    });
+
+    vi.stubGlobal('fetch', fetchMock);
+
+    const mockEvent = {
+      event: {
+        message: {
+          message_id: 'om_merge_123',
+          message_type: 'merge_forward',
+          content: 'Merged and Forwarded Message',
+          chat_id: 'oc_456',
+          chat_type: 'p2p',
+        },
+        sender: {
+          sender_id: {
+            open_id: 'ou_789',
+          },
+        },
+      },
+    };
+
+    let receivedMsg: any = null;
+    gateway.onMessage = async (msg) => {
+      receivedMsg = msg;
+      return null;
+    };
+
+    await messageCallback(mockEvent);
+
+    expect(receivedMsg).not.toBeNull();
+    expect(receivedMsg.messageType).toBe('merge_forward');
+    expect(receivedMsg.text).toContain('[合并转发的消息记录]');
+    expect(receivedMsg.text).toContain('ou_user_1');
+    expect(receivedMsg.text).toContain('hello from sub1');
+    expect(receivedMsg.text).toContain('ou_user_2');
+    expect(receivedMsg.text).toContain('[文件消息: nested.zip]');
+    expect(receivedMsg.pendingFiles).toBeDefined();
+    expect(receivedMsg.pendingFiles).toHaveLength(1);
+    expect(receivedMsg.pendingFiles[0].fileKey).toBe('file_sub_2');
+    expect(receivedMsg.pendingFiles[0].fileName).toBe('nested.zip');
+  });
+
+  it('correctly generates unique placeholders for multiple rich-text images across sub-messages within merge_forward', async () => {
+    await gateway.connect();
+
+    const mockFetchOk = (body: any) => ({
+      ok: true,
+      json: async () => body,
+    });
+
+    const fetchMock = vi.fn().mockImplementation(async (url: string) => {
+      if (url.includes('/tenant_access_token')) {
+        return mockFetchOk({
+          tenant_access_token: 't-mock-token',
+          expire: 7200,
+        });
+      }
+      if (url.includes('/im/v1/messages/')) {
+        return mockFetchOk({
+          code: 0,
+          msg: 'success',
+          data: {
+            items: [
+              {
+                message_id: 'om_merge_125',
+                msg_type: 'merge_forward',
+                body: { content: '{}' },
+                create_time: '1615367850000',
+                sender: { id: 'ou_root', id_type: 'open_id', sender_type: 'user' },
+              },
+              {
+                message_id: 'om_sub_post_1',
+                upper_message_id: 'om_merge_125',
+                msg_type: 'post',
+                body: {
+                  content: JSON.stringify({
+                    zh_cn: {
+                      title: 'First post',
+                      content: [
+                        [
+                          { tag: 'text', text: 'Check first: ' },
+                          { tag: 'img', image_key: 'img_key_1' },
+                        ],
+                      ],
+                    },
+                  }),
+                },
+                create_time: '1615367851000',
+                sender: {
+                  id: 'ou_user_1',
+                  id_type: 'open_id',
+                  sender_type: 'user',
+                },
+              },
+              {
+                message_id: 'om_sub_post_2',
+                upper_message_id: 'om_merge_125',
+                msg_type: 'post',
+                body: {
+                  content: JSON.stringify({
+                    zh_cn: {
+                      title: 'Second post',
+                      content: [
+                        [
+                          { tag: 'text', text: 'Check second: ' },
+                          { tag: 'img', image_key: 'img_key_2' },
+                        ],
+                      ],
+                    },
+                  }),
+                },
+                create_time: '1615367852000',
+                sender: {
+                  id: 'ou_user_2',
+                  id_type: 'open_id',
+                  sender_type: 'user',
+                },
+              },
+            ],
+          },
+        });
+      }
+      return mockFetchOk({ code: 0 });
+    });
+
+    vi.stubGlobal('fetch', fetchMock);
+
+    const mockEvent = {
+      event: {
+        message: {
+          message_id: 'om_merge_125',
+          message_type: 'merge_forward',
+          content: 'Merged posts with images',
+          chat_id: 'oc_456',
+          chat_type: 'p2p',
+        },
+        sender: {
+          sender_id: {
+            open_id: 'ou_789',
+          },
+        },
+      },
+    };
+
+    let receivedMsg: any = null;
+    gateway.onMessage = async (msg) => {
+      receivedMsg = msg;
+      return null;
+    };
+
+    await messageCallback(mockEvent);
+
+    expect(receivedMsg).not.toBeNull();
+    expect(receivedMsg.messageType).toBe('merge_forward');
+
+    expect(receivedMsg.pendingImages).toBeDefined();
+    expect(receivedMsg.pendingImages).toHaveLength(2);
+    expect(receivedMsg.pendingImages[0].imageKey).toBe('img_key_1');
+    expect(receivedMsg.pendingImages[0].placeholder).toBe('[图片_1]');
+    expect(receivedMsg.pendingImages[1].imageKey).toBe('img_key_2');
+    expect(receivedMsg.pendingImages[1].placeholder).toBe('[图片_2]');
+
+    expect(receivedMsg.text).toContain('[图片_1]');
+    expect(receivedMsg.text).toContain('[图片_2]');
+  });
+
+  it('correctly reports error when fetching merge_forward sub-messages fails', async () => {
+    await gateway.connect();
+
+    const mockFetchError = (body: any) => ({
+      ok: true,
+      json: async () => body,
+    });
+
+    const fetchMock = vi.fn().mockImplementation(async (url: string) => {
+      if (url.includes('/tenant_access_token')) {
+        return mockFetchError({
+          tenant_access_token: 't-mock-token',
+          expire: 7200,
+        });
+      }
+      if (url.includes('/im/v1/messages/')) {
+        return mockFetchError({
+          code: 230002,
+          msg: 'Bot has no permission to access the message',
+        });
+      }
+      return mockFetchError({ code: 0 });
+    });
+
+    vi.stubGlobal('fetch', fetchMock);
+
+    const mockEvent = {
+      event: {
+        message: {
+          message_id: 'om_merge_error',
+          message_type: 'merge_forward',
+          content: 'Merged with error',
+          chat_id: 'oc_456',
+          chat_type: 'p2p',
+        },
+        sender: {
+          sender_id: {
+            open_id: 'ou_789',
+          },
+        },
+      },
+    };
+
+    let receivedMsg: any = null;
+    gateway.onMessage = async (msg) => {
+      receivedMsg = msg;
+      return null;
+    };
+
+    await messageCallback(mockEvent);
+
+    expect(receivedMsg).not.toBeNull();
+    expect(receivedMsg.messageType).toBe('merge_forward');
+    expect(receivedMsg.text).toContain('原因: 飞书接口返回错误 (code: 230002): Bot has no permission to access the message');
+  });
+
+  it('recursively expands nested merge_forward sub-messages using upper_message_id tree', async () => {
+    await gateway.connect();
+
+    const mockFetchOk = (body: any) => ({
+      ok: true,
+      json: async () => body,
+    });
+
+    // 扁平树：root -> (text A) 和 (nested merge_forward) -> (text B 挂在 nested 下)
+    const fetchMock = vi.fn().mockImplementation(async (url: string) => {
+      if (url.includes('/tenant_access_token')) {
+        return mockFetchOk({ tenant_access_token: 't-mock-token', expire: 7200 });
+      }
+      if (url.includes('/im/v1/messages/')) {
+        return mockFetchOk({
+          code: 0,
+          msg: 'success',
+          data: {
+            items: [
+              {
+                message_id: 'om_root',
+                msg_type: 'merge_forward',
+                body: { content: '{}' },
+                create_time: '1615367850000',
+                sender: { id: 'ou_root', id_type: 'open_id', sender_type: 'user' },
+              },
+              {
+                message_id: 'om_textA',
+                upper_message_id: 'om_root',
+                msg_type: 'text',
+                body: { content: JSON.stringify({ text: 'top level A' }) },
+                create_time: '1615367851000',
+                sender: { id: 'ou_a', id_type: 'open_id', sender_type: 'user' },
+              },
+              {
+                message_id: 'om_nested',
+                upper_message_id: 'om_root',
+                msg_type: 'merge_forward',
+                body: { content: '{}' },
+                create_time: '1615367852000',
+                sender: { id: 'ou_nest', id_type: 'open_id', sender_type: 'user' },
+              },
+              {
+                message_id: 'om_textB',
+                upper_message_id: 'om_nested',
+                msg_type: 'text',
+                body: { content: JSON.stringify({ text: 'deep nested B' }) },
+                create_time: '1615367853000',
+                sender: { id: 'ou_b', id_type: 'open_id', sender_type: 'user' },
+              },
+            ],
+          },
+        });
+      }
+      return mockFetchOk({ code: 0 });
+    });
+
+    vi.stubGlobal('fetch', fetchMock);
+
+    const mockEvent = {
+      event: {
+        message: {
+          message_id: 'om_root',
+          message_type: 'merge_forward',
+          content: 'Nested merged',
+          chat_id: 'oc_456',
+          chat_type: 'p2p',
+        },
+        sender: { sender_id: { open_id: 'ou_789' } },
+      },
+    };
+
+    let receivedMsg: any = null;
+    gateway.onMessage = async (msg) => {
+      receivedMsg = msg;
+      return null;
+    };
+
+    await messageCallback(mockEvent);
+
+    expect(receivedMsg).not.toBeNull();
+    expect(receivedMsg.messageType).toBe('merge_forward');
+    // 顶层文本与深层嵌套文本都应被展开
+    expect(receivedMsg.text).toContain('top level A');
+    expect(receivedMsg.text).toContain('deep nested B');
+    // 深层文本应有更深的缩进（嵌套渲染）
+    const lines = receivedMsg.text.split('\n');
+    const deepLine = lines.find((l: string) => l.includes('deep nested B'));
+    expect(deepLine.startsWith('  ')).toBe(true);
+  });
 });
 
 // ---------------------------------------------------------------------------
diff --git a/packages/cli/src/services/feishu/gateway.ts b/packages/cli/src/services/feishu/gateway.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "easycode-ai",`
`3`		`- "version": "1.1.3",`
	`3`	`+ "version": "1.1.5",`
`4`	`4`	`"engines": {`
`5`	`5`	`"node": ">=20.0.0"`
`6`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "easycode-cli",`
`3`		`- "version": "1.1.3",`
	`3`	`+ "version": "1.1.5",`
`4`	`4`	`"description": "DeepV Code - AI-powered coding assistant with enhanced capabilities",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`