Mattermost: split setup adapter helpers

extensions/mattermost/src/channel.ts

@@ -38,7 +38,8 @@ import { sendMessageMattermost } from "./mattermost/send.js";
 import { resolveMattermostOpaqueTarget } from "./mattermost/target-resolution.js";
 import { looksLikeMattermostTargetId, normalizeMattermostMessagingTarget } from "./normalize.js";
 import { getMattermostRuntime } from "./runtime.js";
-import { mattermostSetupAdapter, mattermostSetupWizard } from "./setup-surface.js";
+import { mattermostSetupAdapter } from "./setup-core.js";
+import { mattermostSetupWizard } from "./setup-surface.js";
 
 const mattermostMessageActions: ChannelMessageActionAdapter = {
   listActions: ({ cfg }) => {

extensions/mattermost/src/setup-core.ts

@@ -0,0 +1,81 @@
+import {
+  applyAccountNameToChannelSection,
+  applySetupAccountConfigPatch,
+  DEFAULT_ACCOUNT_ID,
+  hasConfiguredSecretInput,
+  migrateBaseNameToDefaultAccount,
+  normalizeAccountId,
+  type OpenClawConfig,
+} from "openclaw/plugin-sdk/mattermost";
+import type { ChannelSetupAdapter } from "../../../src/channels/plugins/types.adapters.js";
+import { resolveMattermostAccount, type ResolvedMattermostAccount } from "./mattermost/accounts.js";
+import { normalizeMattermostBaseUrl } from "./mattermost/client.js";
+
+const channel = "mattermost" as const;
+
+export function isMattermostConfigured(account: ResolvedMattermostAccount): boolean {
+  const tokenConfigured =
+    Boolean(account.botToken?.trim()) || hasConfiguredSecretInput(account.config.botToken);
+  return tokenConfigured && Boolean(account.baseUrl);
+}
+
+export function resolveMattermostAccountWithSecrets(cfg: OpenClawConfig, accountId: string) {
+  return resolveMattermostAccount({
+    cfg,
+    accountId,
+    allowUnresolvedSecretRef: true,
+  });
+}
+
+export const mattermostSetupAdapter: ChannelSetupAdapter = {
+  resolveAccountId: ({ accountId }) => normalizeAccountId(accountId),
+  applyAccountName: ({ cfg, accountId, name }) =>
+    applyAccountNameToChannelSection({
+      cfg,
+      channelKey: channel,
+      accountId,
+      name,
+    }),
+  validateInput: ({ accountId, input }) => {
+    const token = input.botToken ?? input.token;
+    const baseUrl = normalizeMattermostBaseUrl(input.httpUrl);
+    if (input.useEnv && accountId !== DEFAULT_ACCOUNT_ID) {
+      return "Mattermost env vars can only be used for the default account.";
+    }
+    if (!input.useEnv && (!token || !baseUrl)) {
+      return "Mattermost requires --bot-token and --http-url (or --use-env).";
+    }
+    if (input.httpUrl && !baseUrl) {
+      return "Mattermost --http-url must include a valid base URL.";
+    }
+    return null;
+  },
+  applyAccountConfig: ({ cfg, accountId, input }) => {
+    const token = input.botToken ?? input.token;
+    const baseUrl = normalizeMattermostBaseUrl(input.httpUrl);
+    const namedConfig = applyAccountNameToChannelSection({
+      cfg,
+      channelKey: channel,
+      accountId,
+      name: input.name,
+    });
+    const next =
+      accountId !== DEFAULT_ACCOUNT_ID
+        ? migrateBaseNameToDefaultAccount({
+            cfg: namedConfig,
+            channelKey: channel,
+          })
+        : namedConfig;
+    return applySetupAccountConfigPatch({
+      cfg: next,
+      channelKey: channel,
+      accountId,
+      patch: input.useEnv
+        ? {}
+        : {
+            ...(token ? { botToken: token } : {}),
+            ...(baseUrl ? { baseUrl } : {}),
+          },
+    });
+  },
+};

extensions/mattermost/src/setup-surface.ts

@@ -1,90 +1,15 @@
-import {
+import { DEFAULT_ACCOUNT_ID, hasConfiguredSecretInput } from "openclaw/plugin-sdk/mattermost";
-  applyAccountNameToChannelSection,
-  applySetupAccountConfigPatch,
-  DEFAULT_ACCOUNT_ID,
-  hasConfiguredSecretInput,
-  migrateBaseNameToDefaultAccount,
-  normalizeAccountId,
-  type OpenClawConfig,
-} from "openclaw/plugin-sdk/mattermost";
 import { type ChannelSetupWizard } from "../../../src/channels/plugins/setup-wizard.js";
-import type { ChannelSetupAdapter } from "../../../src/channels/plugins/types.adapters.js";
 import { formatDocsLink } from "../../../src/terminal/links.js";
+import { listMattermostAccountIds } from "./mattermost/accounts.js";
 import {
-  listMattermostAccountIds,
+  isMattermostConfigured,
-  resolveMattermostAccount,
+  mattermostSetupAdapter,
-  type ResolvedMattermostAccount,
+  resolveMattermostAccountWithSecrets,
-} from "./mattermost/accounts.js";
+} from "./setup-core.js";
-import { normalizeMattermostBaseUrl } from "./mattermost/client.js";
 
 const channel = "mattermost" as const;
-
+export { mattermostSetupAdapter } from "./setup-core.js";
-function isMattermostConfigured(account: ResolvedMattermostAccount): boolean {
-  const tokenConfigured =
-    Boolean(account.botToken?.trim()) || hasConfiguredSecretInput(account.config.botToken);
-  return tokenConfigured && Boolean(account.baseUrl);
-}
-
-function resolveMattermostAccountWithSecrets(cfg: OpenClawConfig, accountId: string) {
-  return resolveMattermostAccount({
-    cfg,
-    accountId,
-    allowUnresolvedSecretRef: true,
-  });
-}
-
-export const mattermostSetupAdapter: ChannelSetupAdapter = {
-  resolveAccountId: ({ accountId }) => normalizeAccountId(accountId),
-  applyAccountName: ({ cfg, accountId, name }) =>
-    applyAccountNameToChannelSection({
-      cfg,
-      channelKey: channel,
-      accountId,
-      name,
-    }),
-  validateInput: ({ accountId, input }) => {
-    const token = input.botToken ?? input.token;
-    const baseUrl = normalizeMattermostBaseUrl(input.httpUrl);
-    if (input.useEnv && accountId !== DEFAULT_ACCOUNT_ID) {
-      return "Mattermost env vars can only be used for the default account.";
-    }
-    if (!input.useEnv && (!token || !baseUrl)) {
-      return "Mattermost requires --bot-token and --http-url (or --use-env).";
-    }
-    if (input.httpUrl && !baseUrl) {
-      return "Mattermost --http-url must include a valid base URL.";
-    }
-    return null;
-  },
-  applyAccountConfig: ({ cfg, accountId, input }) => {
-    const token = input.botToken ?? input.token;
-    const baseUrl = normalizeMattermostBaseUrl(input.httpUrl);
-    const namedConfig = applyAccountNameToChannelSection({
-      cfg,
-      channelKey: channel,
-      accountId,
-      name: input.name,
-    });
-    const next =
-      accountId !== DEFAULT_ACCOUNT_ID
-        ? migrateBaseNameToDefaultAccount({
-            cfg: namedConfig,
-            channelKey: channel,
-          })
-        : namedConfig;
-    return applySetupAccountConfigPatch({
-      cfg: next,
-      channelKey: channel,
-      accountId,
-      patch: input.useEnv
-        ? {}
-        : {
-            ...(token ? { botToken: token } : {}),
-            ...(baseUrl ? { baseUrl } : {}),
-          },
-    });
-  },
-};
 
 export const mattermostSetupWizard: ChannelSetupWizard = {
   channel,