chattercatcher 0.1.28 → 0.1.29

package/dist/cli.js

@@ -8,7 +8,7 @@ import fs15 from "fs/promises";
 // package.json
 var package_default = {
   name: "chattercatcher",
-  version: "0.1.28",
+  version: "0.1.29",
   description: "\u672C\u5730\u4F18\u5148\u7684\u98DE\u4E66/Lark \u5BB6\u5EAD\u7FA4\u77E5\u8BC6\u5E93\u673A\u5668\u4EBA",
   type: "module",
   main: "dist/index.js",
@@ -537,6 +537,18 @@ function migrateDatabase(database) {
 
     CREATE INDEX IF NOT EXISTS image_multimodal_tasks_status_idx ON image_multimodal_tasks(status, updated_at);
 
+    CREATE TABLE IF NOT EXISTS feishu_chat_members (
+      chat_id TEXT NOT NULL,
+      open_id TEXT NOT NULL,
+      user_id TEXT,
+      user_name TEXT,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (chat_id, open_id)
+    );
+
+    CREATE INDEX IF NOT EXISTS feishu_chat_members_chat_name_idx
+    ON feishu_chat_members(chat_id, user_name);
+
     CREATE TABLE IF NOT EXISTS cron_jobs (
       id TEXT PRIMARY KEY,
       chat_id TEXT NOT NULL,
@@ -554,11 +566,29 @@ function migrateDatabase(database) {
 
     CREATE INDEX IF NOT EXISTS cron_jobs_chat_status_idx ON cron_jobs(chat_id, status, updated_at);
     CREATE INDEX IF NOT EXISTS cron_jobs_due_idx ON cron_jobs(status, next_run_at);
+
+    CREATE TABLE IF NOT EXISTS feishu_chat_members (
+      chat_id TEXT NOT NULL,
+      open_id TEXT NOT NULL,
+      user_id TEXT,
+      user_name TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      PRIMARY KEY (chat_id, open_id)
+    );
+
+    CREATE INDEX IF NOT EXISTS feishu_chat_members_chat_name_idx
+    ON feishu_chat_members(chat_id, user_name);
   `);
   const cronJobColumns = database.prepare("PRAGMA table_info(cron_jobs)").all();
-  if (!cronJobColumns.some((column) => column.name === "image_file_name")) {
-    database.prepare("ALTER TABLE cron_jobs ADD COLUMN image_file_name TEXT").run();
-  }
+  const ensureCronJobColumn = (name, definition) => {
+    if (!cronJobColumns.some((column) => column.name === name)) {
+      database.prepare(`ALTER TABLE cron_jobs ADD COLUMN ${definition}`).run();
+    }
+  };
+  ensureCronJobColumn("image_file_name", "image_file_name TEXT");
+  ensureCronJobColumn("mention_target_name", "mention_target_name TEXT");
+  ensureCronJobColumn("mention_open_id", "mention_open_id TEXT");
+  ensureCronJobColumn("mention_user_id", "mention_user_id TEXT");
 }
 
 // src/doctor/checks.ts
@@ -2901,6 +2931,9 @@ var CronJobRepository = class {
     const schedule = input2.schedule.trim();
     const prompt = input2.prompt.trim();
     const imageFileName = input2.imageFileName?.trim();
+    const mentionTargetName = input2.mentionTargetName?.trim();
+    const mentionOpenId = input2.mentionOpenId?.trim();
+    const mentionUserId = input2.mentionUserId?.trim();
     if (!isValidCronSchedule(schedule)) {
       throw new Error("cron \u8868\u8FBE\u5F0F\u65E0\u6548\u3002");
     }
@@ -2919,6 +2952,9 @@ var CronJobRepository = class {
       schedule,
       prompt,
       ...imageFileName ? { imageFileName } : {},
+      ...mentionTargetName ? { mentionTargetName } : {},
+      ...mentionOpenId ? { mentionOpenId } : {},
+      ...mentionUserId ? { mentionUserId } : {},
       status: "active",
       nextRunAt: nextRunAt.toISOString(),
       createdAt: now.toISOString(),
@@ -2927,17 +2963,22 @@ var CronJobRepository = class {
     this.database.prepare(
       `
         INSERT INTO cron_jobs (
-          id, chat_id, created_by_open_id, schedule, prompt, image_file_name, status,
+          id, chat_id, created_by_open_id, schedule, prompt, image_file_name,
+          mention_target_name, mention_open_id, mention_user_id, status,
           last_run_at, next_run_at, last_error, created_at, updated_at
         )
         VALUES (
-          @id, @chatId, @createdByOpenId, @schedule, @prompt, @imageFileName, @status,
+          @id, @chatId, @createdByOpenId, @schedule, @prompt, @imageFileName,
+          @mentionTargetName, @mentionOpenId, @mentionUserId, @status,
           NULL, @nextRunAt, NULL, @createdAt, @updatedAt
         )
       `
     ).run({
       ...record,
-      imageFileName: record.imageFileName ?? null
+      imageFileName: record.imageFileName ?? null,
+      mentionTargetName: record.mentionTargetName ?? null,
+      mentionOpenId: record.mentionOpenId ?? null,
+      mentionUserId: record.mentionUserId ?? null
     });
     return record;
   }
@@ -2964,6 +3005,9 @@ var CronJobRepository = class {
           schedule,
           prompt,
           image_file_name AS imageFileName,
+          mention_target_name AS mentionTargetName,
+          mention_open_id AS mentionOpenId,
+          mention_user_id AS mentionUserId,
           status,
           last_run_at AS lastRunAt,
           next_run_at AS nextRunAt,
@@ -2983,6 +3027,9 @@ var CronJobRepository = class {
       schedule: row.schedule,
       prompt: row.prompt,
       imageFileName: row.imageFileName ?? void 0,
+      mentionTargetName: row.mentionTargetName ?? void 0,
+      mentionOpenId: row.mentionOpenId ?? void 0,
+      mentionUserId: row.mentionUserId ?? void 0,
       status: row.status,
       lastRunAt: row.lastRunAt ?? void 0,
       nextRunAt: row.nextRunAt,
@@ -3057,6 +3104,9 @@ var CronJobRepository = class {
           schedule,
           prompt,
           image_file_name AS imageFileName,
+          mention_target_name AS mentionTargetName,
+          mention_open_id AS mentionOpenId,
+          mention_user_id AS mentionUserId,
           status,
           last_run_at AS lastRunAt,
           next_run_at AS nextRunAt,
@@ -3076,6 +3126,9 @@ var CronJobRepository = class {
       schedule: row.schedule,
       prompt: row.prompt,
       imageFileName: row.imageFileName ?? void 0,
+      mentionTargetName: row.mentionTargetName ?? void 0,
+      mentionOpenId: row.mentionOpenId ?? void 0,
+      mentionUserId: row.mentionUserId ?? void 0,
       status: row.status,
       lastRunAt: row.lastRunAt ?? void 0,
       nextRunAt: row.nextRunAt,
@@ -3101,8 +3154,12 @@ async function generateCronJobMessage(input2) {
   if (!input2.model.completeWithTools) {
     throw new Error("\u5F53\u524D LLM \u5BA2\u6237\u7AEF\u4E0D\u652F\u6301\u5DE5\u5177\u8C03\u7528\u3002");
   }
+  const systemPrompt = input2.memberPrompt ? `${SYSTEM_PROMPT}
+
+${input2.memberPrompt}
+\u751F\u6210\u6D88\u606F\u65F6\u9047\u5230\u4E0A\u8FF0 ID \u65F6\u4F18\u5148\u4F7F\u7528\u5BF9\u5E94\u7FA4\u6635\u79F0\uFF1B\u6CA1\u6709\u6620\u5C04\u65F6\u4FDD\u7559\u539F ID\uFF0C\u4E0D\u8981\u7F16\u9020\u6635\u79F0\u3002` : SYSTEM_PROMPT;
   const messages = [
-    { role: "system", content: SYSTEM_PROMPT },
+    { role: "system", content: systemPrompt },
     { role: "user", content: `\u5F53\u524D\u65F6\u95F4\uFF1A${input2.now.toISOString()}
 \u4EFB\u52A1\u63D0\u793A\u8BCD\uFF1A${input2.prompt}` }
   ];
@@ -3120,7 +3177,7 @@ async function generateCronJobMessage(input2) {
     for (const call of result.toolCalls) {
       if (toolCallsUsed >= maxToolCalls) {
         return input2.model.complete([
-          { role: "system", content: SYSTEM_PROMPT },
+          { role: "system", content: systemPrompt },
           {
             role: "user",
             content: `\u5F53\u524D\u65F6\u95F4\uFF1A${input2.now.toISOString()}
@@ -3179,7 +3236,12 @@ function createCronJobScheduler(options) {
       for (const job of jobs) {
         try {
           const text = await options.generateMessage(job, startedAt);
-          await options.sendTextToChat(job.chatId, text);
+          const sendOptions = job.mentionOpenId && job.mentionTargetName ? { mentions: [{ openId: job.mentionOpenId, name: job.mentionTargetName }] } : void 0;
+          if (sendOptions) {
+            await options.sendTextToChat(job.chatId, text, sendOptions);
+          } else {
+            await options.sendTextToChat(job.chatId, text);
+          }
           if (job.imageFileName) {
             if (!options.sendImageToChat) {
               throw new Error("\u5F53\u524D\u5B9A\u65F6\u4EFB\u52A1\u8FD0\u884C\u73AF\u5883\u4E0D\u652F\u6301\u53D1\u9001\u56FE\u7247\u3002");
@@ -3677,6 +3739,185 @@ var ImageMultimodalWorker = class {
   }
 };
 
+// src/feishu/members.ts
+var DEFAULT_TTL_MS = 60 * 60 * 1e3;
+var FeishuMemberRepository = class {
+  constructor(database) {
+    this.database = database;
+  }
+  database;
+  upsert(record) {
+    this.database.prepare(
+      `
+          INSERT INTO feishu_chat_members (chat_id, open_id, user_id, user_name, updated_at)
+          VALUES (@chatId, @openId, @userId, @userName, @updatedAt)
+          ON CONFLICT(chat_id, open_id)
+          DO UPDATE SET
+            user_id = excluded.user_id,
+            user_name = excluded.user_name,
+            updated_at = excluded.updated_at
+        `
+    ).run({
+      chatId: record.chatId,
+      openId: record.openId,
+      userId: record.userId ?? null,
+      userName: record.userName,
+      updatedAt: record.updatedAt
+    });
+  }
+  get(chatId, openId) {
+    const row = this.database.prepare(
+      `
+          SELECT
+            chat_id AS chatId,
+            open_id AS openId,
+            user_id AS userId,
+            user_name AS userName,
+            updated_at AS updatedAt
+          FROM feishu_chat_members
+          WHERE chat_id = ? AND open_id = ?
+        `
+    ).get(chatId, openId);
+    return row ?? null;
+  }
+  listByChat(chatId) {
+    return this.database.prepare(
+      `
+          SELECT
+            chat_id AS chatId,
+            open_id AS openId,
+            user_id AS userId,
+            user_name AS userName,
+            updated_at AS updatedAt
+          FROM feishu_chat_members
+          WHERE chat_id = ?
+          ORDER BY user_name ASC, open_id ASC
+        `
+    ).all(chatId);
+  }
+  findUniqueByName(chatId, userName) {
+    const rows = this.database.prepare(
+      `
+          SELECT
+            chat_id AS chatId,
+            open_id AS openId,
+            user_id AS userId,
+            user_name AS userName,
+            updated_at AS updatedAt
+          FROM feishu_chat_members
+          WHERE chat_id = ? AND user_name = ?
+          ORDER BY open_id ASC
+          LIMIT 2
+        `
+    ).all(chatId, userName);
+    return rows.length === 1 ? rows[0] : null;
+  }
+};
+var FeishuMemberResolver = class {
+  constructor(options) {
+    this.options = options;
+    this.now = options.now ?? (() => /* @__PURE__ */ new Date());
+    this.ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
+    this.logger = options.logger;
+  }
+  options;
+  now;
+  ttlMs;
+  logger;
+  async resolveOpenIdName(chatId, openId) {
+    const cached = this.options.repository.get(chatId, openId);
+    if (!cached || this.isExpired(cached.updatedAt)) {
+      try {
+        await this.refreshChatMembers(chatId);
+      } catch (error) {
+        this.logger?.warn("Failed to refresh Feishu chat members for open id resolution", {
+          chatId,
+          openId,
+          error
+        });
+        return cached?.userName ?? openId;
+      }
+    }
+    return this.options.repository.get(chatId, openId)?.userName ?? openId;
+  }
+  async resolveUniqueName(chatId, userName) {
+    const cached = this.options.repository.findUniqueByName(chatId, userName);
+    if (cached && !this.isExpired(cached.updatedAt)) {
+      return cached;
+    }
+    try {
+      await this.refreshChatMembers(chatId);
+    } catch (error) {
+      this.logger?.warn("Failed to refresh Feishu chat members for unique name resolution", {
+        chatId,
+        userName,
+        error
+      });
+      return cached ?? null;
+    }
+    return this.options.repository.findUniqueByName(chatId, userName);
+  }
+  isExpired(updatedAt) {
+    const updatedAtMs = Date.parse(updatedAt);
+    if (Number.isNaN(updatedAtMs)) {
+      return true;
+    }
+    return this.now().getTime() - updatedAtMs >= this.ttlMs;
+  }
+  async refreshChatMembers(chatId) {
+    const members = await this.options.client.listChatMembers({ chatId, memberIdType: "open_id" });
+    const updatedAt = this.now().toISOString();
+    for (const member of members) {
+      this.options.repository.upsert({
+        chatId,
+        openId: member.openId,
+        userId: member.userId,
+        userName: member.userName,
+        updatedAt
+      });
+    }
+  }
+};
+function formatFeishuMemberPrompt(members, limit = 80) {
+  const lines = members.filter((member) => member.userName).slice(0, limit).map((member) => `${member.openId} = ${member.userName}`);
+  return lines.length ? `\u5F53\u524D\u7FA4\u804A\u6210\u5458 ID \u4E0E\u7FA4\u6635\u79F0\u6620\u5C04\uFF1A
+${lines.join("\n")}` : "";
+}
+function createFeishuChatMembersClient(client) {
+  return {
+    async listChatMembers(payload) {
+      const api = client.im.v1?.chatMembers?.get;
+      if (!api) {
+        throw new Error("\u5F53\u524D\u98DE\u4E66 SDK \u4E0D\u652F\u6301 chatMembers.get\uFF0C\u65E0\u6CD5\u83B7\u53D6\u7FA4\u6210\u5458\u3002");
+      }
+      const members = [];
+      let pageToken;
+      do {
+        const response = await api({
+          path: { chat_id: payload.chatId },
+          params: {
+            member_id_type: payload.memberIdType,
+            ...pageToken ? { page_token: pageToken } : {}
+          }
+        });
+        const items = response.data?.items ?? [];
+        for (const item of items) {
+          if (!item.member_id || !item.name) {
+            continue;
+          }
+          members.push({
+            openId: item.member_id,
+            userId: item.user_id,
+            userName: item.name
+          });
+        }
+        pageToken = response.data?.has_more ? response.data.page_token : void 0;
+      } while (pageToken);
+      return members;
+    }
+  };
+}
+
 // src/cron/tools.ts
 function readString(input2, key) {
   const value = typeof input2 === "object" && input2 !== null && key in input2 ? input2[key] : void 0;
@@ -3715,18 +3956,27 @@ function createCronJobTools(input2) {
           imageFileName: {
             type: "string",
             description: "Optional image filename already stored from the current chat, for example om_xxx-image.jpg."
+          },
+          mentionTargetName: {
+            type: "string",
+            description: "Optional exact Feishu chat nickname to @ when the scheduled message is sent."
           }
         },
         required: ["schedule", "prompt"],
         additionalProperties: false
       },
       execute: async (rawInput) => {
+        const mentionTargetName = readOptionalString(rawInput, "mentionTargetName");
+        const mentionTarget = mentionTargetName && input2.memberResolver ? await input2.memberResolver.resolveUniqueName(input2.chatId, mentionTargetName) : null;
         const job = input2.repository.create({
           chatId: input2.chatId,
           createdByOpenId: input2.createdByOpenId,
           schedule: readString(rawInput, "schedule"),
           prompt: readString(rawInput, "prompt"),
-          imageFileName: readOptionalString(rawInput, "imageFileName")
+          imageFileName: readOptionalString(rawInput, "imageFileName"),
+          mentionTargetName,
+          mentionOpenId: mentionTarget?.openId,
+          mentionUserId: mentionTarget?.userId
         });
         return JSON.stringify({ ok: true, job });
       }
@@ -3930,8 +4180,12 @@ async function runFeishuToolLoop(input2) {
   }
   const maxModelTurns = input2.maxModelTurns ?? DEFAULT_MAX_MODEL_TURNS;
   const maxToolCalls = input2.maxToolCalls ?? DEFAULT_MAX_TOOL_CALLS;
+  const systemPrompt = input2.memberPrompt ? `${FEISHU_TOOL_SYSTEM_PROMPT}
+
+${input2.memberPrompt}
+\u56DE\u7B54\u4E2D\u9047\u5230\u4E0A\u8FF0 ID \u65F6\u4F18\u5148\u4F7F\u7528\u5BF9\u5E94\u7FA4\u6635\u79F0\uFF1B\u6CA1\u6709\u6620\u5C04\u65F6\u4FDD\u7559\u539F ID\uFF0C\u4E0D\u8981\u7F16\u9020\u6635\u79F0\u3002` : FEISHU_TOOL_SYSTEM_PROMPT;
   const messages = [
-    { role: "system", content: FEISHU_TOOL_SYSTEM_PROMPT },
+    { role: "system", content: systemPrompt },
     { role: "user", content: `\u5F53\u524D\u65F6\u95F4\uFF1A${input2.now.toISOString()}
 \u95EE\u9898\uFF1A${input2.question}` }
   ];
@@ -4043,8 +4297,13 @@ function getFeishuQuestionDecision(payload, config) {
 var FeishuQuestionHandler = class {
   constructor(options) {
     this.options = options;
+    this.memberResolver = options.memberResolver;
   }
   options;
+  memberResolver;
+  setMemberResolver(memberResolver) {
+    this.memberResolver = memberResolver;
+  }
   async sendResponse(chatId, messageId, text) {
     if (messageId && this.options.sender.replyTextToMessage) {
       try {
@@ -4091,14 +4350,18 @@ var FeishuQuestionHandler = class {
         const cronTools = createCronJobTools({
           repository: new CronJobRepository(this.options.database),
           chatId: decision.chatId,
-          createdByOpenId: payload.event?.sender?.sender_id?.open_id
+          createdByOpenId: payload.event?.sender?.sender_id?.open_id,
+          memberResolver: this.memberResolver
         });
         const allTools = [...tools, ...cronTools];
+        const memberRepository = this.options.memberRepository ?? new FeishuMemberRepository(this.options.database);
+        const memberPrompt = formatFeishuMemberPrompt(memberRepository.listByChat(decision.chatId));
         const answer = await runFeishuToolLoop({
           question: decision.question,
           now,
           tools: allTools,
-          model: this.options.model
+          model: this.options.model,
+          memberPrompt
         });
         qaLogs.create({
           chatId: decision.chatId,
@@ -4151,6 +4414,15 @@ function extractImageKey(response) {
   }
   throw new Error("\u98DE\u4E66\u56FE\u7247\u4E0A\u4F20\u54CD\u5E94\u7F3A\u5C11 image_key\u3002");
 }
+function escapeAtText(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function formatTextWithMentions(text, options) {
+  const mentions = options?.mentions ?? [];
+  if (mentions.length === 0) return text;
+  const prefix = mentions.map((mention) => `<at user_id="${escapeAtText(mention.openId)}">${escapeAtText(mention.name)}</at>`).join(" ");
+  return `${prefix} ${text}`.trim();
+}
 var FeishuMessageSender = class _FeishuMessageSender {
   constructor(client) {
     this.client = client;
@@ -4164,12 +4436,12 @@ var FeishuMessageSender = class _FeishuMessageSender {
     });
     return new _FeishuMessageSender(client);
   }
-  async sendTextToChat(chatId, text) {
+  async sendTextToChat(chatId, text, options) {
     const payload = {
       data: {
         receive_id: chatId,
         msg_type: "text",
-        content: JSON.stringify({ text })
+        content: JSON.stringify({ text: formatTextWithMentions(text, options) })
       },
       params: {
         receive_id_type: "chat_id"
@@ -4291,13 +4563,24 @@ function createFeishuEventDispatcher(options) {
           return;
         }
       }
-      const result = options.resourceDownloader ? await options.ingestor.ingestFeishuEventAndDownloadAttachments({
-        payload,
-        downloader: options.resourceDownloader,
-        config: options.config,
-        secrets: options.secrets,
-        vectorIndexMessage: options.attachmentVectorIndexer
-      }) : options.ingestor.ingestFeishuEvent(payload);
+      let result;
+      if (options.resourceDownloader) {
+        result = await options.ingestor.ingestFeishuEventAndDownloadAttachments({
+          payload,
+          downloader: options.resourceDownloader,
+          config: options.config,
+          secrets: options.secrets,
+          vectorIndexMessage: options.attachmentVectorIndexer,
+          memberResolver: options.memberResolver
+        });
+      } else if (options.memberResolver) {
+        result = await options.ingestor.ingestFeishuEventWithMembers({
+          payload,
+          memberResolver: options.memberResolver
+        });
+      } else {
+        result = options.ingestor.ingestFeishuEvent(payload);
+      }
       if (!result.accepted) {
         console.log(`\u98DE\u4E66\u6D88\u606F\u672A\u5165\u5E93\uFF1A${result.reason}`);
         return;
@@ -4388,10 +4671,20 @@ function createFeishuGateway(options) {
     onReconnecting: () => console.log("\u98DE\u4E66\u957F\u8FDE\u63A5\u6B63\u5728\u91CD\u8FDE\u3002"),
     onReconnected: () => console.log("\u98DE\u4E66\u957F\u8FDE\u63A5\u5DF2\u91CD\u8FDE\u3002")
   });
+  const memberResolver = new FeishuMemberResolver({
+    repository: new FeishuMemberRepository(options.ingestor.database),
+    client: createFeishuChatMembersClient(new lark2.Client({
+      appId: options.config.feishu.appId,
+      appSecret: options.secrets.feishu.appSecret,
+      domain: mapDomain(options.config.feishu.domain)
+    }))
+  });
+  options.questionHandler?.setMemberResolver?.(memberResolver);
   const eventDispatcher = createFeishuEventDispatcher({
     config: options.config,
     secrets: options.secrets,
     ingestor: options.ingestor,
+    memberResolver,
     questionHandler: options.questionHandler,
     resourceDownloader: options.resourceDownloader,
     attachmentVectorIndexer: options.attachmentVectorIndexer,
@@ -4411,7 +4704,7 @@ function createFeishuGateway(options) {
   }) : void 0);
   const cronJobScheduler = options.cronJobScheduler ?? (options.cronJobProcessor ? createCronJobScheduler({
     repository: new CronJobRepository(options.cronJobProcessor.database),
-    sendTextToChat: (chatId, text) => options.cronJobProcessor.sender.sendTextToChat(chatId, text),
+    sendTextToChat: (chatId, text, sendOptions) => options.cronJobProcessor.sender.sendTextToChat(chatId, text, sendOptions),
     sendImageToChat: options.cronJobProcessor.sender.sendImageToChat ? (chatId, imageFileName) => options.cronJobProcessor.sender.sendImageToChat(
       chatId,
       resolveFeishuImagePath(options.config, imageFileName)
@@ -4425,7 +4718,16 @@ function createFeishuGateway(options) {
         scope: { platform: "feishu", platformChatId: job.chatId }
       });
       try {
-        return await generateCronJobMessage({ prompt: job.prompt, model: options.cronJobProcessor.model, tools, now });
+        const memberPrompt = formatFeishuMemberPrompt(
+          new FeishuMemberRepository(options.cronJobProcessor.database).listByChat(job.chatId)
+        );
+        return await generateCronJobMessage({
+          prompt: job.prompt,
+          model: options.cronJobProcessor.model,
+          tools,
+          now,
+          memberPrompt
+        });
       } finally {
         close();
       }
@@ -4783,7 +5085,9 @@ function normalizeFeishuReceiveMessageEvent(payload) {
   if (!text) {
     return null;
   }
-  const senderId = event.sender?.sender_id?.open_id || event.sender?.sender_id?.user_id || event.sender?.sender_id?.union_id || "unknown";
+  const senderOpenId = event.sender?.sender_id?.open_id;
+  const senderUserId = event.sender?.sender_id?.user_id;
+  const senderId = senderOpenId || senderUserId || event.sender?.sender_id?.union_id || "unknown";
   return {
     platform: "feishu",
     platformChatId: message.chat_id,
@@ -4798,12 +5102,24 @@ function normalizeFeishuReceiveMessageEvent(payload) {
       platform: "feishu",
       raw: payload,
       content,
+      sender: {
+        ...senderOpenId ? { openId: senderOpenId } : {},
+        ...senderUserId ? { userId: senderUserId } : {}
+      },
       attachment: extractFeishuAttachment(messageType, content)
     }
   };
 }
 
 // src/gateway/ingest.ts
+function extractFeishuSenderOpenId(message) {
+  const raw = message.rawPayload;
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const sender = raw.sender;
+  if (!sender || typeof sender !== "object" || Array.isArray(sender)) return void 0;
+  const openId = sender.openId;
+  return typeof openId === "string" && openId.trim() ? openId.trim() : void 0;
+}
 function extractAttachment(message) {
   const raw = message.rawPayload;
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
@@ -4823,14 +5139,16 @@ function isMultimodalReady(config, secrets) {
   return Boolean(config.multimodal.baseUrl && config.multimodal.model && secrets.multimodal.apiKey);
 }
 var GatewayIngestor = class {
-  messages;
-  jobs;
-  imageTasks;
   constructor(database) {
+    this.database = database;
     this.messages = new MessageRepository(database);
     this.jobs = new FileJobRepository(database);
     this.imageTasks = new ImageMultimodalTaskRepository(database);
   }
+  database;
+  messages;
+  jobs;
+  imageTasks;
   ingestFeishuEvent(payload) {
     const normalized = normalizeFeishuReceiveMessageEvent(payload);
     if (!normalized) {
@@ -4848,8 +5166,28 @@ var GatewayIngestor = class {
       duplicate
     };
   }
+  async ingestFeishuEventWithMembers(input2) {
+    const normalized = normalizeFeishuReceiveMessageEvent(input2.payload);
+    if (!normalized) {
+      return {
+        accepted: false,
+        reason: "\u4E8B\u4EF6\u4E0D\u662F\u53EF\u5165\u5E93\u7684\u98DE\u4E66\u6D88\u606F\u3002"
+      };
+    }
+    const openId = extractFeishuSenderOpenId(normalized);
+    const senderName = openId ? await input2.memberResolver.resolveOpenIdName(normalized.platformChatId, openId) : normalized.senderName;
+    const enriched = { ...normalized, senderName };
+    const duplicate = this.messages.hasPlatformMessage(enriched.platform, enriched.platformMessageId);
+    const messageId = this.messages.ingest(enriched);
+    return {
+      accepted: true,
+      messageId,
+      message: enriched,
+      duplicate
+    };
+  }
   async ingestFeishuEventAndDownloadAttachments(input2) {
-    const result = this.ingestFeishuEvent(input2.payload);
+    const result = input2.memberResolver ? await this.ingestFeishuEventWithMembers({ payload: input2.payload, memberResolver: input2.memberResolver }) : this.ingestFeishuEvent(input2.payload);
     if (!result.accepted || !result.messageId || !result.message || result.duplicate) {
       return result;
     }
@@ -5104,6 +5442,9 @@ function createMultimodalModel(config, secrets) {
   });
 }
 
+// src/cli.ts
+import * as lark4 from "@larksuiteoapi/node-sdk";
+
 // src/rag/answer.ts
 var DEFAULT_MAX_EVIDENCE_BLOCKS = 8;
 var DEFAULT_MAX_CHARS_PER_BLOCK = 1200;
@@ -6201,6 +6542,14 @@ async function startGatewayForegroundCommand() {
   const database = openDatabase(config);
   const chatModel = createChatModel(config, secrets);
   const sender = FeishuMessageSender.fromConfig(config, secrets);
+  const memberResolver = new FeishuMemberResolver({
+    repository: new FeishuMemberRepository(database),
+    client: createFeishuChatMembersClient(new lark4.Client({
+      appId: config.feishu.appId,
+      appSecret: secrets.feishu.appSecret,
+      domain: mapDomain(config.feishu.domain)
+    }))
+  });
   const vectorStore = hasEmbeddingConfig(config, secrets) ? new SqliteVectorStore(database, { model: config.embedding.model }) : null;
   const gatewayRuntime = createFeishuGateway({
     config,
@@ -6233,6 +6582,7 @@ async function startGatewayForegroundCommand() {
       config,
       secrets,
       database,
+      memberResolver,
       sender,
       model: chatModel
     })