From 0c9428a865899f7c6abe45af0131bdebf6d1d10b Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Sun, 15 Mar 2026 19:32:48 -0700
Subject: [PATCH] MSTeams: split setup adapter helpers

---
 extensions/msteams/src/channel.ts       |  3 ++-
 extensions/msteams/src/setup-core.ts    | 16 ++++++++++++++++
 extensions/msteams/src/setup-surface.ts | 16 ++--------------
 src/plugin-sdk/msteams.ts               |  6 ++----
 4 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 extensions/msteams/src/setup-core.ts

diff --git a/extensions/msteams/src/channel.ts b/extensions/msteams/src/channel.ts
index a4e62e5e310..f87f239166c 100644
--- a/extensions/msteams/src/channel.ts
+++ b/extensions/msteams/src/channel.ts
@@ -26,7 +26,8 @@ import {
   resolveMSTeamsUserAllowlist,
 } from "./resolve-allowlist.js";
 import { getMSTeamsRuntime } from "./runtime.js";
-import { msteamsSetupAdapter, msteamsSetupWizard } from "./setup-surface.js";
+import { msteamsSetupAdapter } from "./setup-core.js";
+import { msteamsSetupWizard } from "./setup-surface.js";
 import { resolveMSTeamsCredentials } from "./token.js";
 
 type ResolvedMSTeamsAccount = {
diff --git a/extensions/msteams/src/setup-core.ts b/extensions/msteams/src/setup-core.ts
new file mode 100644
index 00000000000..74079aaf389
--- /dev/null
+++ b/extensions/msteams/src/setup-core.ts
@@ -0,0 +1,16 @@
+import type { ChannelSetupAdapter } from "../../../src/channels/plugins/types.adapters.js";
+import { DEFAULT_ACCOUNT_ID } from "../../../src/routing/session-key.js";
+
+export const msteamsSetupAdapter: ChannelSetupAdapter = {
+  resolveAccountId: () => DEFAULT_ACCOUNT_ID,
+  applyAccountConfig: ({ cfg }) => ({
+    ...cfg,
+    channels: {
+      ...cfg.channels,
+      msteams: {
+        ...cfg.channels?.msteams,
+        enabled: true,
+      },
+    },
+  }),
+};
diff --git a/extensions/msteams/src/setup-surface.ts b/extensions/msteams/src/setup-surface.ts
index 8d5ebdbb5ef..f8db90e5079 100644
--- a/extensions/msteams/src/setup-surface.ts
+++ b/extensions/msteams/src/setup-surface.ts
@@ -8,7 +8,6 @@ import {
   splitOnboardingEntries,
 } from "../../../src/channels/plugins/onboarding/helpers.js";
 import type { ChannelSetupWizard } from "../../../src/channels/plugins/setup-wizard.js";
-import type { ChannelSetupAdapter } from "../../../src/channels/plugins/types.adapters.js";
 import type { OpenClawConfig } from "../../../src/config/config.js";
 import type { DmPolicy, MSTeamsTeamConfig } from "../../../src/config/types.js";
 import { DEFAULT_ACCOUNT_ID } from "../../../src/routing/session-key.js";
@@ -20,6 +19,7 @@ import {
   resolveMSTeamsUserAllowlist,
 } from "./resolve-allowlist.js";
 import { normalizeSecretInputString } from "./secret-input.js";
+import { msteamsSetupAdapter } from "./setup-core.js";
 import { hasConfiguredMSTeamsCredentials, resolveMSTeamsCredentials } from "./token.js";
 
 const channel = "msteams" as const;
@@ -201,19 +201,7 @@ const msteamsDmPolicy: ChannelOnboardingDmPolicy = {
   promptAllowFrom: promptMSTeamsAllowFrom,
 };
 
-export const msteamsSetupAdapter: ChannelSetupAdapter = {
-  resolveAccountId: () => DEFAULT_ACCOUNT_ID,
-  applyAccountConfig: ({ cfg }) => ({
-    ...cfg,
-    channels: {
-      ...cfg.channels,
-      msteams: {
-        ...cfg.channels?.msteams,
-        enabled: true,
-      },
-    },
-  }),
-};
+export { msteamsSetupAdapter } from "./setup-core.js";
 
 export const msteamsSetupWizard: ChannelSetupWizard = {
   channel,
diff --git a/src/plugin-sdk/msteams.ts b/src/plugin-sdk/msteams.ts
index d99f703ed64..2f5a91d8989 100644
--- a/src/plugin-sdk/msteams.ts
+++ b/src/plugin-sdk/msteams.ts
@@ -117,7 +117,5 @@ export {
   createDefaultChannelRuntimeState,
 } from "./status-helpers.js";
 export { normalizeStringEntries } from "../shared/string-normalization.js";
-export {
-  msteamsSetupAdapter,
-  msteamsSetupWizard,
-} from "../../extensions/msteams/src/setup-surface.js";
+export { msteamsSetupWizard } from "../../extensions/msteams/src/setup-surface.js";
+export { msteamsSetupAdapter } from "../../extensions/msteams/src/setup-core.js";