From c21c8f30596a56c5d64bc46b1f8080b07c8f73b7 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 24 Apr 2026 04:45:29 +0100
Subject: [PATCH] perf: narrow mattermost setup imports

---
 extensions/mattermost/src/setup-core.ts    | 9 ++++-----
 extensions/mattermost/src/setup-surface.ts | 8 +++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/extensions/mattermost/src/setup-core.ts b/extensions/mattermost/src/setup-core.ts
index d5695b130ff..e160cd98fd9 100644
--- a/extensions/mattermost/src/setup-core.ts
+++ b/extensions/mattermost/src/setup-core.ts
@@ -1,13 +1,12 @@
+import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import type { ChannelSetupAdapter } from "openclaw/plugin-sdk/channel-setup";
-import { createSetupInputPresenceValidator } from "openclaw/plugin-sdk/setup-runtime";
+import type { OpenClawConfig } from "openclaw/plugin-sdk/config-runtime";
 import {
   applyAccountNameToChannelSection,
   applySetupAccountConfigPatch,
-  DEFAULT_ACCOUNT_ID,
   migrateBaseNameToDefaultAccount,
-  normalizeAccountId,
-  type OpenClawConfig,
-} from "./runtime-api.js";
+} from "openclaw/plugin-sdk/setup";
+import { createSetupInputPresenceValidator } from "openclaw/plugin-sdk/setup-runtime";
 import {
   resolveMattermostAccount,
   type ResolvedMattermostAccount,
diff --git a/extensions/mattermost/src/setup-surface.ts b/extensions/mattermost/src/setup-surface.ts
index 68d97830361..3fe0fea8a57 100644
--- a/extensions/mattermost/src/setup-surface.ts
+++ b/extensions/mattermost/src/setup-surface.ts
@@ -1,13 +1,11 @@
+import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
+import type { OpenClawConfig } from "openclaw/plugin-sdk/config-runtime";
 import {
+  applySetupAccountConfigPatch,
   createStandardChannelSetupStatus,
   formatDocsLink,
   type ChannelSetupWizard,
 } from "openclaw/plugin-sdk/setup";
-import {
-  applySetupAccountConfigPatch,
-  DEFAULT_ACCOUNT_ID,
-  type OpenClawConfig,
-} from "./runtime-api.js";
 import { isMattermostConfigured, resolveMattermostAccountWithSecrets } from "./setup-core.js";
 import { normalizeMattermostBaseUrl } from "./setup.client.runtime.js";
 import { hasConfiguredSecretInput } from "./setup.secret-input.runtime.js";