@nextclaw/channel-plugin-feishu 0.2.25 → 0.2.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/channel-plugin-feishu",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "private": false,
   "description": "NextClaw Feishu/Lark channel plugin with doc/wiki/drive tools.",
   "type": "module",

package/src/bitable.ts

@@ -1,7 +1,6 @@
 import type * as Lark from "@larksuiteoapi/node-sdk";
 import { Type } from "@sinclair/typebox";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
 import { createFeishuToolClient } from "./tool-account.js";
 
 // ============ Helpers ============
@@ -538,12 +537,6 @@ export function registerFeishuBitableTools(api: OpenClawPluginApi) {
     return;
   }
 
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) {
-    api.logger.debug?.("feishu_bitable: No Feishu accounts configured, skipping bitable tools");
-    return;
-  }
-
   type AccountAwareParams = { accountId?: string };
 
   const getClient = (params: AccountAwareParams | undefined, defaultAccountId?: string) =>

package/src/calendar.ts

@@ -1,16 +1,13 @@
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
 import { registerFeishuCalendarCalendarTool } from "./calendar-calendar.js";
 import { registerFeishuCalendarEventTool } from "./calendar-event.js";
 import { registerFeishuCalendarEventAttendeeTool } from "./calendar-event-attendee.js";
 import { registerFeishuCalendarFreebusyTool } from "./calendar-freebusy.js";
-import { resolveAnyEnabledFeishuToolsConfig } from "./tool-account.js";
+import { resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 
 export function registerFeishuCalendarTools(api: OpenClawPluginApi) {
   if (!api.config) return;
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) return;
-  if (!resolveAnyEnabledFeishuToolsConfig(accounts).calendar) return;
+  if (!resolveRegisteredFeishuToolsConfig(api.config).calendar) return;
   registerFeishuCalendarCalendarTool(api);
   registerFeishuCalendarEventTool(api);
   registerFeishuCalendarEventAttendeeTool(api);

package/src/chat.ts

@@ -1,9 +1,7 @@
 import type * as Lark from "@larksuiteoapi/node-sdk";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
 import { FeishuChatSchema, type FeishuChatParams } from "./chat-schema.js";
-import { createFeishuClient } from "./client.js";
-import { resolveToolsConfig } from "./tools-config.js";
+import { createFeishuToolClient, resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 
 function json(data: unknown) {
   return {
@@ -77,21 +75,12 @@ export function registerFeishuChatTools(api: OpenClawPluginApi) {
     return;
   }
 
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) {
-    api.logger.debug?.("feishu_chat: No Feishu accounts configured, skipping chat tools");
-    return;
-  }
-
-  const firstAccount = accounts[0];
-  const toolsCfg = resolveToolsConfig(firstAccount.config.tools);
+  const toolsCfg = resolveRegisteredFeishuToolsConfig(api.config);
   if (!toolsCfg.chat) {
     api.logger.debug?.("feishu_chat: chat tool disabled in config");
     return;
   }
 
-  const getClient = () => createFeishuClient(firstAccount);
-
   api.registerTool(
     {
       name: "feishu_chat",
@@ -101,7 +90,7 @@ export function registerFeishuChatTools(api: OpenClawPluginApi) {
       async execute(_toolCallId, params) {
         const p = params as FeishuChatParams;
         try {
-          const client = getClient();
+          const client = createFeishuToolClient({ api });
           switch (p.action) {
             case "members":
               return json(

package/src/docx.ts

@@ -5,7 +5,6 @@ import { basename } from "node:path";
 import type * as Lark from "@larksuiteoapi/node-sdk";
 import { Type } from "@sinclair/typebox";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
 import { FeishuDocSchema, type FeishuDocParams } from "./doc-schema.js";
 import { BATCH_SIZE, insertBlocksInBatches } from "./docx-batch-insert.js";
 import { updateColorText } from "./docx-color-text.js";
@@ -20,8 +19,8 @@ import {
 import { getFeishuRuntime } from "./runtime.js";
 import {
   createFeishuToolClient,
-  resolveAnyEnabledFeishuToolsConfig,
   resolveFeishuToolAccount,
+  resolveRegisteredFeishuToolsConfig,
 } from "./tool-account.js";
 
 // ============ Helpers ============
@@ -1232,15 +1231,8 @@ export function registerFeishuDocTools(api: OpenClawPluginApi) {
     return;
   }
 
-  // Check if any account is configured
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) {
-    api.logger.debug?.("feishu_doc: No Feishu accounts configured, skipping doc tools");
-    return;
-  }
-
-  // Register if enabled on any account; account routing is resolved per execution.
-  const toolsCfg = resolveAnyEnabledFeishuToolsConfig(accounts);
+  // Register if enabled by config; account routing is resolved per execution.
+  const toolsCfg = resolveRegisteredFeishuToolsConfig(api.config);
 
   const registered: string[] = [];
   type FeishuDocExecuteParams = FeishuDocParams & { accountId?: string };

package/src/drive.ts

@@ -1,8 +1,7 @@
 import type * as Lark from "@larksuiteoapi/node-sdk";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
 import { FeishuDriveSchema, type FeishuDriveParams } from "./drive-schema.js";
-import { createFeishuToolClient, resolveAnyEnabledFeishuToolsConfig } from "./tool-account.js";
+import { createFeishuToolClient, resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 import {
   jsonToolResult,
   toolExecutionErrorResult,
@@ -169,13 +168,7 @@ export function registerFeishuDriveTools(api: OpenClawPluginApi) {
     return;
   }
 
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) {
-    api.logger.debug?.("feishu_drive: No Feishu accounts configured, skipping drive tools");
-    return;
-  }
-
-  const toolsCfg = resolveAnyEnabledFeishuToolsConfig(accounts);
+  const toolsCfg = resolveRegisteredFeishuToolsConfig(api.config);
   if (!toolsCfg.drive) {
     api.logger.debug?.("feishu_drive: drive tool disabled in config");
     return;

package/src/identity.ts

@@ -1,7 +1,6 @@
 import { Type } from "@sinclair/typebox";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
-import { resolveAnyEnabledFeishuToolsConfig } from "./tool-account.js";
+import { resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 import {
   assertLarkOk,
   createToolContext,
@@ -43,12 +42,7 @@ export function registerFeishuIdentityTools(api: OpenClawPluginApi) {
     return;
   }
 
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) {
-    return;
-  }
-
-  const toolsConfig = resolveAnyEnabledFeishuToolsConfig(accounts);
+  const toolsConfig = resolveRegisteredFeishuToolsConfig(api.config);
   if (!toolsConfig.identity) {
     return;
   }

package/src/oauth.ts

@@ -1,11 +1,10 @@
 import { Type } from "@sinclair/typebox";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
 import { requestDeviceAuthorization, pollDeviceToken } from "./device-flow.js";
 import { feishuFetch } from "./feishu-fetch.js";
 import { getTicket } from "./lark-ticket.js";
 import { getStoredToken, setStoredToken, tokenStatus } from "./token-store.js";
-import { resolveAnyEnabledFeishuToolsConfig } from "./tool-account.js";
+import { resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 import { revokeUAT } from "./uat-client.js";
 import { createUserToolClient } from "./user-tool-client.js";
 import { jsonToolResult } from "./tool-result.js";
@@ -188,12 +187,7 @@ export function registerFeishuOAuthTool(api: OpenClawPluginApi) {
     return;
   }
 
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) {
-    return;
-  }
-
-  const toolsConfig = resolveAnyEnabledFeishuToolsConfig(accounts);
+  const toolsConfig = resolveRegisteredFeishuToolsConfig(api.config);
   if (!toolsConfig.oauth) {
     return;
   }

package/src/perm.ts

@@ -1,8 +1,7 @@
 import type * as Lark from "@larksuiteoapi/node-sdk";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
 import { FeishuPermSchema, type FeishuPermParams } from "./perm-schema.js";
-import { createFeishuToolClient, resolveAnyEnabledFeishuToolsConfig } from "./tool-account.js";
+import { createFeishuToolClient, resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 import {
   jsonToolResult,
   toolExecutionErrorResult,
@@ -118,13 +117,7 @@ export function registerFeishuPermTools(api: OpenClawPluginApi) {
     return;
   }
 
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) {
-    api.logger.debug?.("feishu_perm: No Feishu accounts configured, skipping perm tools");
-    return;
-  }
-
-  const toolsCfg = resolveAnyEnabledFeishuToolsConfig(accounts);
+  const toolsCfg = resolveRegisteredFeishuToolsConfig(api.config);
   if (!toolsCfg.perm) {
     api.logger.debug?.("feishu_perm: perm tool disabled in config (default: false)");
     return;

package/src/sheets.ts

@@ -1,6 +1,5 @@
 import { Type } from "@sinclair/typebox";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
 import {
   type SheetParams,
   handleCreate,
@@ -11,7 +10,7 @@ import {
   handleWrite,
   resolveToken,
 } from "./sheets-shared.js";
-import { resolveAnyEnabledFeishuToolsConfig } from "./tool-account.js";
+import { resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 import { createToolContext, handleInvokeError, registerTool, StringEnum } from "./user-tool-helpers.js";
 
 const SheetSchema = Type.Union([
@@ -70,9 +69,7 @@ const SheetSchema = Type.Union([
 
 export function registerFeishuSheetsTools(api: OpenClawPluginApi) {
   if (!api.config) return;
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) return;
-  if (!resolveAnyEnabledFeishuToolsConfig(accounts).sheets) return;
+  if (!resolveRegisteredFeishuToolsConfig(api.config).sheets) return;
 
   registerTool(api, {
     name: "feishu_sheet",

package/src/task.ts

@@ -1,6 +1,5 @@
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
-import { resolveAnyEnabledFeishuToolsConfig } from "./tool-account.js";
+import { resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 import { registerFeishuTaskCommentTool } from "./task-comment.js";
 import { registerFeishuTaskSubtaskTool } from "./task-subtask.js";
 import { registerFeishuTaskTaskTool } from "./task-task.js";
@@ -8,9 +7,7 @@ import { registerFeishuTaskTasklistTool } from "./task-tasklist.js";
 
 export function registerFeishuTaskTools(api: OpenClawPluginApi) {
   if (!api.config) return;
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) return;
-  if (!resolveAnyEnabledFeishuToolsConfig(accounts).task) return;
+  if (!resolveRegisteredFeishuToolsConfig(api.config).task) return;
   registerFeishuTaskTaskTool(api);
   registerFeishuTaskTasklistTool(api);
   registerFeishuTaskCommentTool(api);

package/src/tool-account.ts

@@ -1,6 +1,6 @@
 import type * as Lark from "@larksuiteoapi/node-sdk";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { resolveFeishuAccount } from "./accounts.js";
+import { listFeishuAccountIds, resolveFeishuAccount } from "./accounts.js";
 import { createFeishuClient } from "./client.js";
 import { getTicket } from "./lark-ticket.js";
 import { resolveToolsConfig } from "./tools-config.js";
@@ -84,3 +84,12 @@ export function resolveAnyEnabledFeishuToolsConfig(
   }
   return merged;
 }
+
+export function resolveRegisteredFeishuToolsConfig(
+  config: OpenClawPluginApi["config"],
+): Required<FeishuToolsConfig> {
+  const accounts = listFeishuAccountIds(config).map((accountId) =>
+    resolveFeishuAccount({ cfg: config, accountId }),
+  );
+  return resolveAnyEnabledFeishuToolsConfig(accounts);
+}

package/src/wiki.ts

@@ -1,7 +1,6 @@
 import type * as Lark from "@larksuiteoapi/node-sdk";
 import type { OpenClawPluginApi } from "./nextclaw-sdk/feishu.js";
-import { listEnabledFeishuAccounts } from "./accounts.js";
-import { createFeishuToolClient, resolveAnyEnabledFeishuToolsConfig } from "./tool-account.js";
+import { createFeishuToolClient, resolveRegisteredFeishuToolsConfig } from "./tool-account.js";
 import {
   jsonToolResult,
   toolExecutionErrorResult,
@@ -157,13 +156,7 @@ export function registerFeishuWikiTools(api: OpenClawPluginApi) {
     return;
   }
 
-  const accounts = listEnabledFeishuAccounts(api.config);
-  if (accounts.length === 0) {
-    api.logger.debug?.("feishu_wiki: No Feishu accounts configured, skipping wiki tools");
-    return;
-  }
-
-  const toolsCfg = resolveAnyEnabledFeishuToolsConfig(accounts);
+  const toolsCfg = resolveRegisteredFeishuToolsConfig(api.config);
   if (!toolsCfg.wiki) {
     api.logger.debug?.("feishu_wiki: wiki tool disabled in config");
     return;