@m1heng-clawd/feishu 0.1.10 → 0.1.11

package/src/drive.ts

@@ -2,7 +2,7 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import type * as Lark from "@larksuiteoapi/node-sdk";
 import { FeishuDriveSchema, type FeishuDriveParams } from "./drive-schema.js";
 import { hasFeishuToolEnabledForAnyAccount, withFeishuToolClient } from "./tools-common/tool-exec.js";
-import { writeDoc } from "./docx.js";
+import { createAndWriteDoc } from "./doc-write-service.js";
 
 // ============ Helpers ============
 
@@ -161,34 +161,7 @@ async function importDocument(
   folderToken?: string,
   _docType?: "docx" | "doc",
 ) {
-  // Step 1: Create empty document
-  const createRes = await client.docx.document.create({
-    data: { title, folder_token: folderToken },
-  });
-  
-  if (createRes.code !== 0) {
-    throw new Error(`Failed to create document: ${createRes.msg}`);
-  }
-
-  const docId = createRes.data?.document?.document_id;
-  if (!docId) {
-    throw new Error("Document created but no document_id returned");
-  }
-
-  // Step 2: Write markdown content to the document
-  // This ensures proper structure preservation using the writeDoc function
-  const writeResult = await writeDoc(client, docId, content, mediaMaxBytes);
-
-  return {
-    success: true,
-    document_id: docId,
-    title: title,
-    url: `https://feishu.cn/docx/${docId}`,
-    import_method: "create_and_write",
-    blocks_added: writeResult.blocks_added,
-    images_processed: writeResult.images_processed,
-    ...("warning" in writeResult && { warning: writeResult.warning }),
-  };
+  return createAndWriteDoc(client, title, content, mediaMaxBytes, folderToken);
 }
 
 // ============ Tool Registration ============

package/src/onboarding.ts

@@ -23,6 +23,7 @@ import { probeFeishu } from "./probe.js";
 import type { FeishuConfig } from "./types.js";
 
 const channel = "feishu" as const;
+let onboardingDmPolicyAccountId: string | undefined;
 
 function resolveOnboardingAccountId(cfg: ClawdbotConfig, accountId?: string | null): string {
   const raw = accountId?.trim();
@@ -32,6 +33,10 @@ function resolveOnboardingAccountId(cfg: ClawdbotConfig, accountId?: string | nu
   return resolveDefaultFeishuAccountId(cfg);
 }
 
+function resolveDmPolicyAccountId(cfg: ClawdbotConfig, accountId?: string | null): string {
+  return resolveOnboardingAccountId(cfg, accountId ?? onboardingDmPolicyAccountId);
+}
+
 function upsertFeishuAccountConfig(
   cfg: ClawdbotConfig,
   accountId: string,
@@ -79,7 +84,7 @@ function setFeishuDmPolicy(
   dmPolicy: DmPolicy,
   accountId?: string,
 ): ClawdbotConfig {
-  const resolvedAccountId = resolveOnboardingAccountId(cfg, accountId);
+  const resolvedAccountId = resolveDmPolicyAccountId(cfg, accountId);
   const account = resolveFeishuAccount({ cfg, accountId: resolvedAccountId });
   // Feishu channel config does not support "disabled" as a dmPolicy value.
   const effectiveDmPolicy = dmPolicy === "disabled" ? "pairing" : dmPolicy;
@@ -110,7 +115,7 @@ async function promptFeishuAllowFrom(params: {
   prompter: WizardPrompter;
   accountId?: string;
 }): Promise<ClawdbotConfig> {
-  const accountId = resolveOnboardingAccountId(params.cfg, params.accountId);
+  const accountId = resolveDmPolicyAccountId(params.cfg, params.accountId);
   const existing = resolveFeishuAccount({ cfg: params.cfg, accountId }).config.allowFrom ?? [];
   const accountLabel = accountId === DEFAULT_ACCOUNT_ID ? "default" : accountId;
   await params.prompter.note(
@@ -189,10 +194,10 @@ const dmPolicy: ChannelOnboardingDmPolicy = {
   policyKey: "channels.feishu.dmPolicy",
   allowFromKey: "channels.feishu.allowFrom",
   getCurrent: (cfg) => {
-    const accountId = resolveDefaultFeishuAccountId(cfg);
+    const accountId = resolveDmPolicyAccountId(cfg);
     return resolveFeishuAccount({ cfg, accountId }).config.dmPolicy ?? "pairing";
   },
-  setPolicy: (cfg, policy, accountId?: string) => setFeishuDmPolicy(cfg, policy, accountId),
+  setPolicy: (cfg, policy) => setFeishuDmPolicy(cfg, policy, onboardingDmPolicyAccountId),
   promptAllowFrom: promptFeishuAllowFrom,
 };
 
@@ -260,6 +265,7 @@ export const feishuOnboardingAdapter: ChannelOnboardingAdapter = {
         defaultAccountId: defaultFeishuAccountId,
       });
     }
+    onboardingDmPolicyAccountId = feishuAccountId;
     const accountLabel = feishuAccountId === DEFAULT_ACCOUNT_ID ? "default" : feishuAccountId;
     const currentAccount = resolveFeishuAccount({ cfg, accountId: feishuAccountId });
     const resolved = resolveFeishuCredentials(currentAccount.config);
@@ -429,6 +435,10 @@ export const feishuOnboardingAdapter: ChannelOnboardingAdapter = {
 
   dmPolicy,
 
+  onAccountRecorded: (accountId) => {
+    onboardingDmPolicyAccountId = normalizeAccountId(accountId);
+  },
+
   disable: (cfg) => ({
     ...cfg,
     channels: {