feat!: move msteams to plugin

src/channels/plugins/catalog.test.ts

@@ -0,0 +1,16 @@
+import { describe, expect, it } from "vitest";
+
+import { getChannelPluginCatalogEntry, listChannelPluginCatalogEntries } from "./catalog.js";
+
+describe("channel plugin catalog", () => {
+  it("includes Microsoft Teams", () => {
+    const entry = getChannelPluginCatalogEntry("msteams");
+    expect(entry?.install.npmSpec).toBe("@clawdbot/msteams");
+    expect(entry?.meta.aliases).toContain("teams");
+  });
+
+  it("lists plugin catalog entries", () => {
+    const ids = listChannelPluginCatalogEntries().map((entry) => entry.id);
+    expect(ids).toContain("msteams");
+  });
+});

src/channels/plugins/catalog.ts

@@ -11,6 +11,24 @@ export type ChannelPluginCatalogEntry = {
 };
 
 const CATALOG: ChannelPluginCatalogEntry[] = [
+  {
+    id: "msteams",
+    meta: {
+      id: "msteams",
+      label: "Microsoft Teams",
+      selectionLabel: "Microsoft Teams (Bot Framework)",
+      docsPath: "/channels/msteams",
+      docsLabel: "msteams",
+      blurb: "Bot Framework; enterprise support.",
+      aliases: ["teams"],
+      order: 60,
+    },
+    install: {
+      npmSpec: "@clawdbot/msteams",
+      localPath: "extensions/msteams",
+      defaultChoice: "npm",
+    },
+  },
   {
     id: "matrix",
     meta: {

src/channels/plugins/index.ts

@@ -1,7 +1,6 @@
 import { CHAT_CHANNEL_ORDER, type ChatChannelId, normalizeChatChannelId } from "../registry.js";
 import { discordPlugin } from "./discord.js";
 import { imessagePlugin } from "./imessage.js";
-import { msteamsPlugin } from "./msteams.js";
 import { signalPlugin } from "./signal.js";
 import { slackPlugin } from "./slack.js";
 import { telegramPlugin } from "./telegram.js";
@@ -27,7 +26,6 @@ function resolveCoreChannels(): ChannelPlugin[] {
     slackPlugin,
     signalPlugin,
     imessagePlugin,
-    msteamsPlugin,
   ];
 }
 
@@ -85,7 +83,6 @@ export function normalizeChannelId(raw?: string | null): ChannelId | null {
 export {
   discordPlugin,
   imessagePlugin,
-  msteamsPlugin,
   signalPlugin,
   slackPlugin,
   telegramPlugin,

src/channels/plugins/load.test.ts

@@ -0,0 +1,71 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+
+import type { ChannelOutboundAdapter, ChannelPlugin } from "./types.js";
+import type { PluginRegistry } from "../../plugins/registry.js";
+import { setActivePluginRegistry } from "../../plugins/runtime.js";
+import { loadChannelPlugin } from "./load.js";
+import { loadChannelOutboundAdapter } from "./outbound/load.js";
+
+const createRegistry = (channels: PluginRegistry["channels"]): PluginRegistry => ({
+  plugins: [],
+  tools: [],
+  channels,
+  providers: [],
+  gatewayHandlers: {},
+  httpHandlers: [],
+  cliRegistrars: [],
+  services: [],
+  diagnostics: [],
+});
+
+const emptyRegistry = createRegistry([]);
+
+const msteamsOutbound: ChannelOutboundAdapter = {
+  deliveryMode: "direct",
+  sendText: async () => ({ channel: "msteams", messageId: "m1" }),
+  sendMedia: async () => ({ channel: "msteams", messageId: "m2" }),
+};
+
+const msteamsPlugin: ChannelPlugin = {
+  id: "msteams",
+  meta: {
+    id: "msteams",
+    label: "Microsoft Teams",
+    selectionLabel: "Microsoft Teams (Bot Framework)",
+    docsPath: "/channels/msteams",
+    blurb: "Bot Framework; enterprise support.",
+    aliases: ["teams"],
+  },
+  capabilities: { chatTypes: ["direct"] },
+  config: {
+    listAccountIds: () => [],
+    resolveAccount: () => ({}),
+  },
+  outbound: msteamsOutbound,
+};
+
+const registryWithMSTeams = createRegistry([
+  { pluginId: "msteams", plugin: msteamsPlugin, source: "test" },
+]);
+
+describe("channel plugin loader", () => {
+  beforeEach(() => {
+    setActivePluginRegistry(emptyRegistry);
+  });
+
+  afterEach(() => {
+    setActivePluginRegistry(emptyRegistry);
+  });
+
+  it("loads channel plugins from the active registry", async () => {
+    setActivePluginRegistry(registryWithMSTeams);
+    const plugin = await loadChannelPlugin("msteams");
+    expect(plugin).toBe(msteamsPlugin);
+  });
+
+  it("loads outbound adapters from registered plugins", async () => {
+    setActivePluginRegistry(registryWithMSTeams);
+    const outbound = await loadChannelOutboundAdapter("msteams");
+    expect(outbound).toBe(msteamsOutbound);
+  });
+});

src/channels/plugins/load.ts

@@ -15,7 +15,6 @@ const LOADERS: Record<ChatChannelId, PluginLoader> = {
   slack: async () => (await import("./slack.js")).slackPlugin,
   signal: async () => (await import("./signal.js")).signalPlugin,
   imessage: async () => (await import("./imessage.js")).imessagePlugin,
-  msteams: async () => (await import("./msteams.js")).msteamsPlugin,
 };
 
 const cache = new Map<ChannelId, ChannelPlugin>();

src/channels/plugins/msteams.ts

@@ -1,218 +0,0 @@
-import { chunkMarkdownText } from "../../auto-reply/chunk.js";
-import type { ClawdbotConfig } from "../../config/config.js";
-import { createMSTeamsPollStoreFs } from "../../msteams/polls.js";
-import { sendMessageMSTeams, sendPollMSTeams } from "../../msteams/send.js";
-import { resolveMSTeamsCredentials } from "../../msteams/token.js";
-import { DEFAULT_ACCOUNT_ID } from "../../routing/session-key.js";
-import { msteamsOnboardingAdapter } from "./onboarding/msteams.js";
-import { PAIRING_APPROVED_MESSAGE } from "./pairing-message.js";
-import type { ChannelMessageActionName, ChannelPlugin } from "./types.js";
-
-type ResolvedMSTeamsAccount = {
-  accountId: string;
-  enabled: boolean;
-  configured: boolean;
-};
-
-const meta = {
-  id: "msteams",
-  label: "Microsoft Teams",
-  selectionLabel: "Microsoft Teams (Bot)",
-  docsPath: "/msteams",
-  docsLabel: "msteams",
-  blurb: "bot via Microsoft Teams.",
-} as const;
-
-export const msteamsPlugin: ChannelPlugin<ResolvedMSTeamsAccount> = {
-  id: "msteams",
-  meta: {
-    ...meta,
-  },
-  onboarding: msteamsOnboardingAdapter,
-  pairing: {
-    idLabel: "msteamsUserId",
-    normalizeAllowEntry: (entry) => entry.replace(/^(msteams|user):/i, ""),
-    notifyApproval: async ({ cfg, id }) => {
-      await sendMessageMSTeams({
-        cfg,
-        to: id,
-        text: PAIRING_APPROVED_MESSAGE,
-      });
-    },
-  },
-  capabilities: {
-    chatTypes: ["direct", "channel", "thread"],
-    polls: true,
-    threads: true,
-    media: true,
-  },
-  reload: { configPrefixes: ["channels.msteams"] },
-  config: {
-    listAccountIds: () => [DEFAULT_ACCOUNT_ID],
-    resolveAccount: (cfg) => ({
-      accountId: DEFAULT_ACCOUNT_ID,
-      enabled: cfg.channels?.msteams?.enabled !== false,
-      configured: Boolean(resolveMSTeamsCredentials(cfg.channels?.msteams)),
-    }),
-    defaultAccountId: () => DEFAULT_ACCOUNT_ID,
-    setAccountEnabled: ({ cfg, enabled }) => ({
-      ...cfg,
-      channels: {
-        ...cfg.channels,
-        msteams: {
-          ...cfg.channels?.msteams,
-          enabled,
-        },
-      },
-    }),
-    deleteAccount: ({ cfg }) => {
-      const next = { ...cfg } as ClawdbotConfig;
-      const nextChannels = { ...cfg.channels };
-      delete nextChannels.msteams;
-      if (Object.keys(nextChannels).length > 0) {
-        next.channels = nextChannels;
-      } else {
-        delete next.channels;
-      }
-      return next;
-    },
-    isConfigured: (_account, cfg) => Boolean(resolveMSTeamsCredentials(cfg.channels?.msteams)),
-    describeAccount: (account) => ({
-      accountId: account.accountId,
-      enabled: account.enabled,
-      configured: account.configured,
-    }),
-    resolveAllowFrom: ({ cfg }) => cfg.channels?.msteams?.allowFrom ?? [],
-    formatAllowFrom: ({ allowFrom }) =>
-      allowFrom
-        .map((entry) => String(entry).trim())
-        .filter(Boolean)
-        .map((entry) => entry.toLowerCase()),
-  },
-  security: {
-    collectWarnings: ({ cfg }) => {
-      const groupPolicy = cfg.channels?.msteams?.groupPolicy ?? "allowlist";
-      if (groupPolicy !== "open") return [];
-      return [
-        `- MS Teams groups: groupPolicy="open" allows any member to trigger (mention-gated). Set channels.msteams.groupPolicy="allowlist" + channels.msteams.groupAllowFrom to restrict senders.`,
-      ];
-    },
-  },
-  setup: {
-    resolveAccountId: () => DEFAULT_ACCOUNT_ID,
-    applyAccountConfig: ({ cfg }) => ({
-      ...cfg,
-      channels: {
-        ...cfg.channels,
-        msteams: {
-          ...cfg.channels?.msteams,
-          enabled: true,
-        },
-      },
-    }),
-  },
-  actions: {
-    listActions: ({ cfg }) => {
-      const enabled =
-        cfg.channels?.msteams?.enabled !== false &&
-        Boolean(resolveMSTeamsCredentials(cfg.channels?.msteams));
-      if (!enabled) return [];
-      return ["poll"] satisfies ChannelMessageActionName[];
-    },
-  },
-  outbound: {
-    deliveryMode: "direct",
-    chunker: chunkMarkdownText,
-    textChunkLimit: 4000,
-    pollMaxOptions: 12,
-    resolveTarget: ({ to }) => {
-      const trimmed = to?.trim();
-      if (!trimmed) {
-        return {
-          ok: false,
-          error: new Error(
-            "Delivering to MS Teams requires --to <conversationId|user:ID|conversation:ID>",
-          ),
-        };
-      }
-      return { ok: true, to: trimmed };
-    },
-    sendText: async ({ cfg, to, text, deps }) => {
-      const send = deps?.sendMSTeams ?? ((to, text) => sendMessageMSTeams({ cfg, to, text }));
-      const result = await send(to, text);
-      return { channel: "msteams", ...result };
-    },
-    sendMedia: async ({ cfg, to, text, mediaUrl, deps }) => {
-      const send =
-        deps?.sendMSTeams ??
-        ((to, text, opts) => sendMessageMSTeams({ cfg, to, text, mediaUrl: opts?.mediaUrl }));
-      const result = await send(to, text, { mediaUrl });
-      return { channel: "msteams", ...result };
-    },
-    sendPoll: async ({ cfg, to, poll }) => {
-      const maxSelections = poll.maxSelections ?? 1;
-      const result = await sendPollMSTeams({
-        cfg,
-        to,
-        question: poll.question,
-        options: poll.options,
-        maxSelections,
-      });
-      const pollStore = createMSTeamsPollStoreFs();
-      await pollStore.createPoll({
-        id: result.pollId,
-        question: poll.question,
-        options: poll.options,
-        maxSelections,
-        createdAt: new Date().toISOString(),
-        conversationId: result.conversationId,
-        messageId: result.messageId,
-        votes: {},
-      });
-      return result;
-    },
-  },
-  status: {
-    defaultRuntime: {
-      accountId: DEFAULT_ACCOUNT_ID,
-      running: false,
-      lastStartAt: null,
-      lastStopAt: null,
-      lastError: null,
-      port: null,
-    },
-    buildChannelSummary: ({ snapshot }) => ({
-      configured: snapshot.configured ?? false,
-      running: snapshot.running ?? false,
-      lastStartAt: snapshot.lastStartAt ?? null,
-      lastStopAt: snapshot.lastStopAt ?? null,
-      lastError: snapshot.lastError ?? null,
-      port: snapshot.port ?? null,
-      probe: snapshot.probe,
-      lastProbeAt: snapshot.lastProbeAt ?? null,
-    }),
-    buildAccountSnapshot: ({ account, runtime }) => ({
-      accountId: account.accountId,
-      enabled: account.enabled,
-      configured: account.configured,
-      running: runtime?.running ?? false,
-      lastStartAt: runtime?.lastStartAt ?? null,
-      lastStopAt: runtime?.lastStopAt ?? null,
-      lastError: runtime?.lastError ?? null,
-      port: runtime?.port ?? null,
-    }),
-  },
-  gateway: {
-    startAccount: async (ctx) => {
-      const { monitorMSTeamsProvider } = await import("../../msteams/index.js");
-      const port = ctx.cfg.channels?.msteams?.webhook?.port ?? 3978;
-      ctx.setStatus({ accountId: ctx.accountId, port });
-      ctx.log?.info(`starting provider (port ${port})`);
-      return monitorMSTeamsProvider({
-        cfg: ctx.cfg,
-        runtime: ctx.runtime,
-        abortSignal: ctx.abortSignal,
-      });
-    },
-  },
-};

src/channels/plugins/onboarding/msteams.ts

@@ -1,193 +0,0 @@
-import type { ClawdbotConfig } from "../../../config/config.js";
-import type { DmPolicy } from "../../../config/types.js";
-import { resolveMSTeamsCredentials } from "../../../msteams/token.js";
-import { DEFAULT_ACCOUNT_ID } from "../../../routing/session-key.js";
-import { formatDocsLink } from "../../../terminal/links.js";
-import type { WizardPrompter } from "../../../wizard/prompts.js";
-import type { ChannelOnboardingAdapter, ChannelOnboardingDmPolicy } from "../onboarding-types.js";
-import { addWildcardAllowFrom } from "./helpers.js";
-
-const channel = "msteams" as const;
-
-function setMSTeamsDmPolicy(cfg: ClawdbotConfig, dmPolicy: DmPolicy) {
-  const allowFrom =
-    dmPolicy === "open"
-      ? addWildcardAllowFrom(cfg.channels?.msteams?.allowFrom)?.map((entry) => String(entry))
-      : undefined;
-  return {
-    ...cfg,
-    channels: {
-      ...cfg.channels,
-      msteams: {
-        ...cfg.channels?.msteams,
-        dmPolicy,
-        ...(allowFrom ? { allowFrom } : {}),
-      },
-    },
-  };
-}
-
-async function noteMSTeamsCredentialHelp(prompter: WizardPrompter): Promise<void> {
-  await prompter.note(
-    [
-      "1) Azure Bot registration → get App ID + Tenant ID",
-      "2) Add a client secret (App Password)",
-      "3) Set webhook URL + messaging endpoint",
-      "Tip: you can also set MSTEAMS_APP_ID / MSTEAMS_APP_PASSWORD / MSTEAMS_TENANT_ID.",
-      `Docs: ${formatDocsLink("/msteams", "msteams")}`,
-    ].join("\n"),
-    "MS Teams credentials",
-  );
-}
-
-const dmPolicy: ChannelOnboardingDmPolicy = {
-  label: "MS Teams",
-  channel,
-  policyKey: "channels.msteams.dmPolicy",
-  allowFromKey: "channels.msteams.allowFrom",
-  getCurrent: (cfg) => cfg.channels?.msteams?.dmPolicy ?? "pairing",
-  setPolicy: (cfg, policy) => setMSTeamsDmPolicy(cfg, policy),
-};
-
-export const msteamsOnboardingAdapter: ChannelOnboardingAdapter = {
-  channel,
-  getStatus: async ({ cfg }) => {
-    const configured = Boolean(resolveMSTeamsCredentials(cfg.channels?.msteams));
-    return {
-      channel,
-      configured,
-      statusLines: [`MS Teams: ${configured ? "configured" : "needs app credentials"}`],
-      selectionHint: configured ? "configured" : "needs app creds",
-      quickstartScore: configured ? 2 : 0,
-    };
-  },
-  configure: async ({ cfg, prompter }) => {
-    const resolved = resolveMSTeamsCredentials(cfg.channels?.msteams);
-    const hasConfigCreds = Boolean(
-      cfg.channels?.msteams?.appId?.trim() &&
-      cfg.channels?.msteams?.appPassword?.trim() &&
-      cfg.channels?.msteams?.tenantId?.trim(),
-    );
-    const canUseEnv = Boolean(
-      !hasConfigCreds &&
-      process.env.MSTEAMS_APP_ID?.trim() &&
-      process.env.MSTEAMS_APP_PASSWORD?.trim() &&
-      process.env.MSTEAMS_TENANT_ID?.trim(),
-    );
-
-    let next = cfg;
-    let appId: string | null = null;
-    let appPassword: string | null = null;
-    let tenantId: string | null = null;
-
-    if (!resolved) {
-      await noteMSTeamsCredentialHelp(prompter);
-    }
-
-    if (canUseEnv) {
-      const keepEnv = await prompter.confirm({
-        message:
-          "MSTEAMS_APP_ID + MSTEAMS_APP_PASSWORD + MSTEAMS_TENANT_ID detected. Use env vars?",
-        initialValue: true,
-      });
-      if (keepEnv) {
-        next = {
-          ...next,
-          channels: {
-            ...next.channels,
-            msteams: { ...next.channels?.msteams, enabled: true },
-          },
-        };
-      } else {
-        appId = String(
-          await prompter.text({
-            message: "Enter MS Teams App ID",
-            validate: (value) => (value?.trim() ? undefined : "Required"),
-          }),
-        ).trim();
-        appPassword = String(
-          await prompter.text({
-            message: "Enter MS Teams App Password",
-            validate: (value) => (value?.trim() ? undefined : "Required"),
-          }),
-        ).trim();
-        tenantId = String(
-          await prompter.text({
-            message: "Enter MS Teams Tenant ID",
-            validate: (value) => (value?.trim() ? undefined : "Required"),
-          }),
-        ).trim();
-      }
-    } else if (hasConfigCreds) {
-      const keep = await prompter.confirm({
-        message: "MS Teams credentials already configured. Keep them?",
-        initialValue: true,
-      });
-      if (!keep) {
-        appId = String(
-          await prompter.text({
-            message: "Enter MS Teams App ID",
-            validate: (value) => (value?.trim() ? undefined : "Required"),
-          }),
-        ).trim();
-        appPassword = String(
-          await prompter.text({
-            message: "Enter MS Teams App Password",
-            validate: (value) => (value?.trim() ? undefined : "Required"),
-          }),
-        ).trim();
-        tenantId = String(
-          await prompter.text({
-            message: "Enter MS Teams Tenant ID",
-            validate: (value) => (value?.trim() ? undefined : "Required"),
-          }),
-        ).trim();
-      }
-    } else {
-      appId = String(
-        await prompter.text({
-          message: "Enter MS Teams App ID",
-          validate: (value) => (value?.trim() ? undefined : "Required"),
-        }),
-      ).trim();
-      appPassword = String(
-        await prompter.text({
-          message: "Enter MS Teams App Password",
-          validate: (value) => (value?.trim() ? undefined : "Required"),
-        }),
-      ).trim();
-      tenantId = String(
-        await prompter.text({
-          message: "Enter MS Teams Tenant ID",
-          validate: (value) => (value?.trim() ? undefined : "Required"),
-        }),
-      ).trim();
-    }
-
-    if (appId && appPassword && tenantId) {
-      next = {
-        ...next,
-        channels: {
-          ...next.channels,
-          msteams: {
-            ...next.channels?.msteams,
-            enabled: true,
-            appId,
-            appPassword,
-            tenantId,
-          },
-        },
-      };
-    }
-
-    return { cfg: next, accountId: DEFAULT_ACCOUNT_ID };
-  },
-  dmPolicy,
-  disable: (cfg) => ({
-    ...cfg,
-    channels: {
-      ...cfg.channels,
-      msteams: { ...cfg.channels?.msteams, enabled: false },
-    },
-  }),
-};

src/channels/plugins/outbound/load.ts

@@ -16,7 +16,6 @@ const LOADERS: Record<ChatChannelId, OutboundLoader> = {
   slack: async () => (await import("./slack.js")).slackOutbound,
   signal: async () => (await import("./signal.js")).signalOutbound,
   imessage: async () => (await import("./imessage.js")).imessageOutbound,
-  msteams: async () => (await import("./msteams.js")).msteamsOutbound,
 };
 
 const cache = new Map<ChannelId, ChannelOutboundAdapter>();

src/channels/plugins/outbound/msteams.ts

@@ -1,57 +0,0 @@
-import { chunkMarkdownText } from "../../../auto-reply/chunk.js";
-import { createMSTeamsPollStoreFs } from "../../../msteams/polls.js";
-import { sendMessageMSTeams, sendPollMSTeams } from "../../../msteams/send.js";
-import type { ChannelOutboundAdapter } from "../types.js";
-
-export const msteamsOutbound: ChannelOutboundAdapter = {
-  deliveryMode: "direct",
-  chunker: chunkMarkdownText,
-  textChunkLimit: 4000,
-  pollMaxOptions: 12,
-  resolveTarget: ({ to }) => {
-    const trimmed = to?.trim();
-    if (!trimmed) {
-      return {
-        ok: false,
-        error: new Error(
-          "Delivering to MS Teams requires --to <conversationId|user:ID|conversation:ID>",
-        ),
-      };
-    }
-    return { ok: true, to: trimmed };
-  },
-  sendText: async ({ cfg, to, text, deps }) => {
-    const send = deps?.sendMSTeams ?? ((to, text) => sendMessageMSTeams({ cfg, to, text }));
-    const result = await send(to, text);
-    return { channel: "msteams", ...result };
-  },
-  sendMedia: async ({ cfg, to, text, mediaUrl, deps }) => {
-    const send =
-      deps?.sendMSTeams ??
-      ((to, text, opts) => sendMessageMSTeams({ cfg, to, text, mediaUrl: opts?.mediaUrl }));
-    const result = await send(to, text, { mediaUrl });
-    return { channel: "msteams", ...result };
-  },
-  sendPoll: async ({ cfg, to, poll }) => {
-    const maxSelections = poll.maxSelections ?? 1;
-    const result = await sendPollMSTeams({
-      cfg,
-      to,
-      question: poll.question,
-      options: poll.options,
-      maxSelections,
-    });
-    const pollStore = createMSTeamsPollStoreFs();
-    await pollStore.createPoll({
-      id: result.pollId,
-      question: poll.question,
-      options: poll.options,
-      maxSelections,
-      createdAt: new Date().toISOString(),
-      conversationId: result.conversationId,
-      messageId: result.messageId,
-      votes: {},
-    });
-    return result;
-  },
-};