@m1heng-clawd/feishu 0.1.17 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m1heng-clawd/feishu",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "type": "module",
   "description": "OpenClaw Feishu/Lark channel plugin",
   "scripts": {

package/src/accounts.ts

@@ -10,7 +10,11 @@ function listConfiguredAccountIds(cfg: ClawdbotConfig): string[] {
   if (!accounts || typeof accounts !== "object") {
     return [];
   }
-  return Object.keys(accounts).filter(Boolean);
+  return [...new Set(
+    Object.keys(accounts)
+      .filter((accountId) => accountId.trim())
+      .map((accountId) => normalizeAccountId(accountId)),
+  )];
 }
 
 /**
@@ -38,17 +42,35 @@ export function resolveDefaultFeishuAccountId(cfg: ClawdbotConfig): string {
 }
 
 /**
- * Get the raw account-specific config.
+ * Resolve the configured account key for a normalized account id.
+ * Preserves the original config key casing so write paths can avoid shadow entries.
  */
-function resolveAccountConfig(
+export function resolveConfiguredFeishuAccountKey(
   cfg: ClawdbotConfig,
   accountId: string,
-): FeishuAccountConfig | undefined {
+): string | undefined {
   const accounts = (cfg.channels?.feishu as FeishuConfig)?.accounts;
   if (!accounts || typeof accounts !== "object") {
     return undefined;
   }
-  return accounts[accountId];
+  if (Object.prototype.hasOwnProperty.call(accounts, accountId)) {
+    return accountId;
+  }
+  const normalizedId = normalizeAccountId(accountId);
+  return Object.keys(accounts).find((key) => normalizeAccountId(key) === normalizedId);
+}
+
+/**
+ * Get the raw account-specific config.
+ * Preserves mixed-case config keys by resolving through the normalized account id.
+ */
+function resolveAccountConfig(
+  cfg: ClawdbotConfig,
+  accountId: string,
+): FeishuAccountConfig | undefined {
+  const accounts = (cfg.channels?.feishu as FeishuConfig)?.accounts;
+  const matchedKey = resolveConfiguredFeishuAccountKey(cfg, accountId);
+  return matchedKey && accounts ? accounts[matchedKey] : undefined;
 }
 
 /**

package/src/bot.ts

@@ -94,6 +94,7 @@ const senderNameCache = new Map<string, { name: string; expireAt: number }>();
 // Key: appId or "default", Value: timestamp of last notification
 const permissionErrorNotifiedAt = new Map<string, number>();
 const PERMISSION_ERROR_COOLDOWN_MS = 5 * 60 * 1000; // 5 minutes
+const DEFAULT_MAX_MESSAGE_AGE_MS = 300_000; // 5 minutes
 
 type SenderNameResult = {
   name?: string;
@@ -918,13 +919,20 @@ export async function handleFeishuMessage(params: {
     return;
   }
 
-  let ctx = parseFeishuMessageEvent(event, botOpenId);
-
   // Parse message create_time (Feishu uses millisecond epoch string).
   const messageCreateTimeMs = event.message.create_time
     ? parseInt(event.message.create_time, 10)
     : undefined;
 
+  // Discard stale messages (e.g. replayed after gateway restart).
+  const maxAgeMs = feishuCfg.maxMessageAgeMs ?? DEFAULT_MAX_MESSAGE_AGE_MS;
+  if (messageCreateTimeMs && Date.now() - messageCreateTimeMs > maxAgeMs) {
+    log(`feishu[${account.accountId}]: discarding stale message ${messageId} (age: ${Math.round((Date.now() - messageCreateTimeMs) / 1000)}s, max: ${maxAgeMs / 1000}s)`);
+    return;
+  }
+
+  let ctx = parseFeishuMessageEvent(event, botOpenId);
+
   const messageType = event.message.message_type;
   const isForwardedInbound = isForwardedMessageType(messageType);
   const forwardedDispatchKey = getForwardedKey({
@@ -1304,9 +1312,12 @@ export async function handleFeishuMessage(params: {
       }
     }
 
-    // In group chats, the session is scoped to the group, but the *speaker* is the sender.
-    // Using a group-scoped From causes the agent to treat different users as the same person.
-    const feishuFrom = `feishu:${ctx.senderOpenId}`;
+    // In group chats, From must be group-scoped so the core's resolveGroupSessionKey can
+    // detect group context and route replies back to the group — not to a user's DM session.
+    // We include senderOpenId to preserve per-speaker identity within the group.
+    const feishuFrom = isGroup
+      ? `feishu:${ctx.chatId}:${ctx.senderOpenId}`
+      : `feishu:${ctx.senderOpenId}`;
     const feishuTo = isGroup ? `chat:${ctx.chatId}` : `user:${ctx.senderOpenId}`;
 
     // Resolve peer ID for session routing

package/src/channel.ts

@@ -2,11 +2,13 @@ import type { ChannelPlugin, ClawdbotConfig } from "openclaw/plugin-sdk";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, PAIRING_APPROVED_MESSAGE } from "openclaw/plugin-sdk";
 import type { ResolvedFeishuAccount, FeishuConfig } from "./types.js";
 import {
+  resolveConfiguredFeishuAccountKey,
   resolveFeishuAccount,
   resolveFeishuCredentials,
   listFeishuAccountIds,
   resolveDefaultFeishuAccountId,
 } from "./accounts.js";
+import { monitorFeishuProvider } from "./monitor.js";
 import { feishuOutbound } from "./outbound.js";
 import { probeFeishu } from "./probe.js";
 import { resolveFeishuGroupToolPolicy } from "./policy.js";
@@ -129,7 +131,6 @@ export const feishuPlugin: ChannelPlugin<ResolvedFeishuAccount> = {
     resolveAccount: (cfg, accountId) => resolveFeishuAccount({ cfg, accountId }),
     defaultAccountId: (cfg) => resolveDefaultFeishuAccountId(cfg),
     setAccountEnabled: ({ cfg, accountId, enabled }) => {
-      const account = resolveFeishuAccount({ cfg, accountId });
       const isDefault = accountId === DEFAULT_ACCOUNT_ID;
       
       if (isDefault) {
@@ -148,6 +149,7 @@ export const feishuPlugin: ChannelPlugin<ResolvedFeishuAccount> = {
       
       // For named accounts, set enabled in accounts[accountId]
       const feishuCfg = cfg.channels?.feishu as FeishuConfig | undefined;
+      const accountKey = resolveConfiguredFeishuAccountKey(cfg, accountId) ?? accountId;
       return {
         ...cfg,
         channels: {
@@ -156,8 +158,8 @@ export const feishuPlugin: ChannelPlugin<ResolvedFeishuAccount> = {
             ...feishuCfg,
             accounts: {
               ...feishuCfg?.accounts,
-              [accountId]: {
-                ...feishuCfg?.accounts?.[accountId],
+              [accountKey]: {
+                ...feishuCfg?.accounts?.[accountKey],
                 enabled,
               },
             },
@@ -184,7 +186,8 @@ export const feishuPlugin: ChannelPlugin<ResolvedFeishuAccount> = {
       // Delete specific account from accounts
       const feishuCfg = cfg.channels?.feishu as FeishuConfig | undefined;
       const accounts = { ...feishuCfg?.accounts };
-      delete accounts[accountId];
+      const accountKey = resolveConfiguredFeishuAccountKey(cfg, accountId) ?? accountId;
+      delete accounts[accountKey];
       
       return {
         ...cfg,
@@ -247,6 +250,7 @@ export const feishuPlugin: ChannelPlugin<ResolvedFeishuAccount> = {
       }
       
       const feishuCfg = cfg.channels?.feishu as FeishuConfig | undefined;
+      const accountKey = resolveConfiguredFeishuAccountKey(cfg, accountId) ?? accountId;
       return {
         ...cfg,
         channels: {
@@ -255,8 +259,8 @@ export const feishuPlugin: ChannelPlugin<ResolvedFeishuAccount> = {
             ...feishuCfg,
             accounts: {
               ...feishuCfg?.accounts,
-              [accountId]: {
-                ...feishuCfg?.accounts?.[accountId],
+              [accountKey]: {
+                ...feishuCfg?.accounts?.[accountKey],
                 enabled: true,
               },
             },
@@ -324,7 +328,6 @@ export const feishuPlugin: ChannelPlugin<ResolvedFeishuAccount> = {
   },
   gateway: {
     startAccount: async (ctx) => {
-      const { monitorFeishuProvider } = await import("./monitor.js");
       const account = resolveFeishuAccount({ cfg: ctx.cfg, accountId: ctx.accountId });
       const port = account.config?.webhookPort ?? null;
       ctx.setStatus({ accountId: ctx.accountId, port });

package/src/config-schema.ts

@@ -1,3 +1,4 @@
+import { normalizeAccountId } from "openclaw/plugin-sdk";
 import { z } from "zod";
 export { z };
 
@@ -157,6 +158,7 @@ export const FeishuAccountConfigSchema = z
     mediaMaxMb: z.number().positive().optional(),
     mediaLocalRoots: z.array(z.string()).optional(),
     heartbeat: ChannelHeartbeatVisibilitySchema,
+    maxMessageAgeMs: z.number().positive().optional(),
     renderMode: RenderModeSchema,
     streaming: StreamingModeSchema,
     tools: FeishuToolsConfigSchema,
@@ -196,6 +198,7 @@ export const FeishuConfigSchema = z
     mediaMaxMb: z.number().positive().optional(),
     mediaLocalRoots: z.array(z.string()).optional(),
     heartbeat: ChannelHeartbeatVisibilitySchema,
+    maxMessageAgeMs: z.number().positive().optional(),
     renderMode: RenderModeSchema, // raw = plain text (default), card = interactive card with markdown
     streaming: StreamingModeSchema,
     tools: FeishuToolsConfigSchema,
@@ -206,6 +209,23 @@ export const FeishuConfigSchema = z
   })
   .strict()
   .superRefine((value, ctx) => {
+    const normalizedAccountIds = new Map<string, string>();
+    for (const accountId of Object.keys(value.accounts ?? {})) {
+      const normalizedAccountId = normalizeAccountId(accountId);
+      const previousAccountId = normalizedAccountIds.get(normalizedAccountId);
+      if (previousAccountId && previousAccountId !== accountId) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ["accounts", accountId],
+          message:
+            `channels.feishu.accounts contains duplicate account ids after normalization: ` +
+            `"${previousAccountId}" and "${accountId}" both normalize to "${normalizedAccountId}"`,
+        });
+        continue;
+      }
+      normalizedAccountIds.set(normalizedAccountId, accountId);
+    }
+
     if (value.dmPolicy === "open") {
       const allowFrom = value.allowFrom ?? [];
       const hasWildcard = allowFrom.some((entry) => String(entry).trim() === "*");

package/src/media.ts

@@ -514,7 +514,14 @@ export async function sendMediaFeishu(params: {
       ...(mergedLocalRoots.length > 0 ? { localRoots: mergedLocalRoots } : {}),
     });
     buffer = loaded.buffer;
-    name = fileName ?? loaded.fileName ?? "file";
+    const loadedFileName = loaded.fileName ?? "file";
+    let decoded: string;
+    try {
+      decoded = decodeURIComponent(loadedFileName);
+    } catch {
+      decoded = loadedFileName;
+    }
+    name = fileName ?? decoded;
     contentType = loaded.contentType;
   } else {
     throw new Error("Either mediaUrl or mediaBuffer must be provided");

package/src/onboarding.ts

@@ -15,6 +15,7 @@ import {
 
 import {
   listFeishuAccountIds,
+  resolveConfiguredFeishuAccountKey,
   resolveDefaultFeishuAccountId,
   resolveFeishuAccount,
   resolveFeishuCredentials,
@@ -58,7 +59,8 @@ function upsertFeishuAccountConfig(
     };
   }
 
-  const existingAccount = feishuCfg?.accounts?.[normalizedAccountId];
+  const accountKey = resolveConfiguredFeishuAccountKey(cfg, normalizedAccountId) ?? normalizedAccountId;
+  const existingAccount = feishuCfg?.accounts?.[accountKey];
   return {
     ...cfg,
     channels: {
@@ -68,7 +70,7 @@ function upsertFeishuAccountConfig(
         enabled: true,
         accounts: {
           ...feishuCfg?.accounts,
-          [normalizedAccountId]: {
+          [accountKey]: {
             ...existingAccount,
             enabled: existingAccount?.enabled ?? true,
             ...patch,

package/src/text/markdown-links.ts

@@ -91,8 +91,23 @@ function normalizeNonCodeSegments(text: string): string {
     .join("");
 }
 
+function normalizeCodeBlockFences(block: string): string {
+  const lines = block.split("\n");
+  return lines
+    .map((line) => {
+      // Fix opening and closing fences: remove leading whitespace
+      if (line.match(/^\s*```/)) {
+        return line.replace(/^\s+/, "");
+      }
+      return line;
+    })
+    .join("\n");
+}
+
 export function normalizeFeishuMarkdownLinks(text: string): string {
-  if (!text || (!text.includes("http://") && !text.includes("https://"))) {
+  if (!text) return text;
+  text = normalizeCodeBlockFences(text);
+  if (!text.includes("http://") && !text.includes("https://")) {
     return text;
   }