@max1874/feishu 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@max1874/feishu",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "type": "module",
   "description": "OpenClaw Feishu/Lark channel plugin",
   "license": "MIT",

package/src/docx.ts

@@ -1,6 +1,7 @@
 import { Type } from "@sinclair/typebox";
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { createFeishuClient } from "./client.js";
+import { resolveFeishuCredentials, mergeFeishuAccountConfig } from "./accounts.js";
 import { getConversationContext } from "./runtime.js";
 import type { FeishuConfig } from "./types.js";
 import type * as Lark from "@larksuiteoapi/node-sdk";
@@ -887,16 +888,50 @@ const WikiSpaceIdSchema = Type.Object({
   ),
 });
 
+/**
+ * Resolve a FeishuConfig that has credentials, checking:
+ * 1. Top-level appId/appSecret (legacy / pre-v2026.3.2 layout)
+ * 2. The defaultAccount entry under accounts
+ * 3. The first account that has valid credentials
+ */
+function resolveEffectiveFeishuConfig(cfg: FeishuConfig): FeishuConfig | null {
+  // 1. Top-level credentials
+  if (resolveFeishuCredentials(cfg)) return cfg;
+
+  // 2. defaultAccount (e.g. "main")
+  const defaultId = (cfg as any).defaultAccount as string | undefined;
+  if (defaultId && cfg.accounts?.[defaultId]) {
+    const merged = mergeFeishuAccountConfig(cfg, defaultId);
+    if (resolveFeishuCredentials(merged)) return merged;
+  }
+
+  // 3. First account with credentials
+  for (const id of Object.keys(cfg.accounts ?? {})) {
+    const merged = mergeFeishuAccountConfig(cfg, id);
+    if (resolveFeishuCredentials(merged)) return merged;
+  }
+
+  return null;
+}
+
 // ============ Tool Registration ============
 
 export function registerFeishuDocTools(api: OpenClawPluginApi) {
   const feishuCfg = api.config?.channels?.feishu as FeishuConfig | undefined;
-  if (!feishuCfg?.appId || !feishuCfg?.appSecret) {
-    api.logger.debug?.("feishu_doc: Feishu credentials not configured, skipping doc tools");
+  if (!feishuCfg) {
+    api.logger.debug?.("feishu_doc: Feishu not configured, skipping doc tools");
+    return;
+  }
+
+  // Resolve effective config: try top-level credentials first, then fall back
+  // to defaultAccount or the first account that has credentials configured.
+  const resolvedCfg = resolveEffectiveFeishuConfig(feishuCfg);
+  if (!resolvedCfg) {
+    api.logger.debug?.("feishu_doc: Feishu credentials not configured (appId, appSecret required), skipping doc tools");
     return;
   }
 
-  const getClient = () => createFeishuClient(feishuCfg);
+  const getClient = () => createFeishuClient(resolvedCfg);
 
   // Tool 1: feishu_doc_read
   api.registerTool(