From 9b6859e5db7756f82c199e946d6ad7ed283b0f6f Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Wed, 18 Mar 2026 01:01:57 -0700
Subject: [PATCH] Feishu: break plugin-sdk setup cycle

---
 extensions/feishu/setup-api.ts               | 2 ++
 src/auto-reply/reply/commands-acp/context.ts | 3 ++-
 src/plugin-sdk/feishu.ts                     | 5 ++---
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 extensions/feishu/setup-api.ts

diff --git a/extensions/feishu/setup-api.ts b/extensions/feishu/setup-api.ts
new file mode 100644
index 00000000000..8d44582cd03
--- /dev/null
+++ b/extensions/feishu/setup-api.ts
@@ -0,0 +1,2 @@
+export { feishuSetupAdapter } from "./src/setup-core.js";
+export { feishuSetupWizard } from "./src/setup-surface.js";
diff --git a/src/auto-reply/reply/commands-acp/context.ts b/src/auto-reply/reply/commands-acp/context.ts
index 59db08384af..1ec405742b6 100644
--- a/src/auto-reply/reply/commands-acp/context.ts
+++ b/src/auto-reply/reply/commands-acp/context.ts
@@ -1,3 +1,5 @@
+// Avoid routing a core ACP helper back through the Feishu plugin-sdk seam.
+import { buildFeishuConversationId } from "../../../../extensions/feishu/src/conversation-id.js";
 import {
   buildTelegramTopicConversationId,
   normalizeConversationText,
@@ -6,7 +8,6 @@ import {
 import { DISCORD_THREAD_BINDING_CHANNEL } from "../../../channels/thread-bindings-policy.js";
 import { resolveConversationIdFromTargets } from "../../../infra/outbound/conversation-id.js";
 import { getSessionBindingService } from "../../../infra/outbound/session-binding-service.js";
-import { buildFeishuConversationId } from "../../../plugin-sdk/feishu.js";
 import { parseAgentSessionKey } from "../../../routing/session-key.js";
 import type { HandleCommandsParams } from "../commands-types.js";
 import { parseDiscordParentChannelFromSessionKey } from "../discord-parent-channel.js";
diff --git a/src/plugin-sdk/feishu.ts b/src/plugin-sdk/feishu.ts
index 3a4fa4779c4..cde08767535 100644
--- a/src/plugin-sdk/feishu.ts
+++ b/src/plugin-sdk/feishu.ts
@@ -67,8 +67,7 @@ export type { RuntimeEnv } from "../runtime.js";
 export { formatDocsLink } from "../terminal/links.js";
 export { evaluateSenderGroupAccessForPolicy } from "./group-access.js";
 export type { WizardPrompter } from "../wizard/prompts.js";
-export { feishuSetupWizard } from "../../extensions/feishu/api.js";
-export { feishuSetupAdapter } from "../../extensions/feishu/api.js";
+export { feishuSetupWizard, feishuSetupAdapter } from "../../extensions/feishu/setup-api.js";
 export { buildAgentMediaPayload } from "./agent-media-payload.js";
 export { readJsonFileWithFallback } from "./json-store.js";
 export { createScopedPairingAccess } from "./pairing-access.js";
@@ -84,7 +83,7 @@ export { withTempDownloadPath } from "./temp-path.js";
 export {
   buildFeishuConversationId,
   parseFeishuConversationId,
-} from "../../extensions/feishu/api.js";
+} from "../../extensions/feishu/src/conversation-id.js";
 export {
   createFixedWindowRateLimiter,
   createWebhookAnomalyTracker,