From 4eee827dce6bb86e7f0c39a474da5d0aab517266 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 15 Mar 2026 15:58:48 -0700
Subject: [PATCH] Channels: use owned helper imports

---
 extensions/discord/src/account-inspect.ts  | 9 ++++++---
 extensions/discord/src/accounts.ts         | 7 +++++--
 extensions/imessage/src/accounts.ts        | 3 +--
 extensions/signal/src/accounts.ts          | 3 +--
 extensions/slack/src/account-inspect.ts    | 9 ++++++---
 extensions/telegram/src/account-inspect.ts | 2 +-
 extensions/telegram/src/accounts.ts        | 2 +-
 extensions/whatsapp/src/accounts.ts        | 8 ++++++--
 src/plugin-sdk/whatsapp.ts                 | 1 +
 9 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/extensions/discord/src/account-inspect.ts b/extensions/discord/src/account-inspect.ts
index d99f87aeb56..bddea792c14 100644
--- a/extensions/discord/src/account-inspect.ts
+++ b/extensions/discord/src/account-inspect.ts
@@ -1,10 +1,13 @@
-import type { OpenClawConfig } from "../../../src/config/config.js";
-import type { DiscordAccountConfig } from "../../../src/config/types.discord.js";
+import {
+  DEFAULT_ACCOUNT_ID,
+  normalizeAccountId,
+  type OpenClawConfig,
+  type DiscordAccountConfig,
+} from "openclaw/plugin-sdk/discord";
 import {
   hasConfiguredSecretInput,
   normalizeSecretInputString,
 } from "../../../src/config/types.secrets.js";
-import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../../src/routing/session-key.js";
 import {
   mergeDiscordAccountConfig,
   resolveDefaultDiscordAccountId,
diff --git a/extensions/discord/src/accounts.ts b/extensions/discord/src/accounts.ts
index 6cd1699f192..a623e97446f 100644
--- a/extensions/discord/src/accounts.ts
+++ b/extensions/discord/src/accounts.ts
@@ -1,7 +1,10 @@
+import type {
+  OpenClawConfig,
+  DiscordAccountConfig,
+  DiscordActionConfig,
+} from "openclaw/plugin-sdk/discord";
 import { createAccountActionGate } from "../../../src/channels/plugins/account-action-gate.js";
 import { createAccountListHelpers } from "../../../src/channels/plugins/account-helpers.js";
-import type { OpenClawConfig } from "../../../src/config/config.js";
-import type { DiscordAccountConfig, DiscordActionConfig } from "../../../src/config/types.js";
 import { resolveAccountEntry } from "../../../src/routing/account-lookup.js";
 import { normalizeAccountId } from "../../../src/routing/session-key.js";
 import { resolveDiscordToken } from "./token.js";
diff --git a/extensions/imessage/src/accounts.ts b/extensions/imessage/src/accounts.ts
index f370fd54860..1a6ca8bceb9 100644
--- a/extensions/imessage/src/accounts.ts
+++ b/extensions/imessage/src/accounts.ts
@@ -1,8 +1,7 @@
+import { normalizeAccountId, type IMessageAccountConfig } from "openclaw/plugin-sdk/imessage";
 import { createAccountListHelpers } from "../../../src/channels/plugins/account-helpers.js";
 import type { OpenClawConfig } from "../../../src/config/config.js";
-import type { IMessageAccountConfig } from "../../../src/config/types.js";
 import { resolveAccountEntry } from "../../../src/routing/account-lookup.js";
-import { normalizeAccountId } from "../../../src/routing/session-key.js";
 
 export type ResolvedIMessageAccount = {
   accountId: string;
diff --git a/extensions/signal/src/accounts.ts b/extensions/signal/src/accounts.ts
index edcfa4c1d64..38316955edd 100644
--- a/extensions/signal/src/accounts.ts
+++ b/extensions/signal/src/accounts.ts
@@ -1,8 +1,7 @@
+import { normalizeAccountId, type SignalAccountConfig } from "openclaw/plugin-sdk/signal";
 import { createAccountListHelpers } from "../../../src/channels/plugins/account-helpers.js";
 import type { OpenClawConfig } from "../../../src/config/config.js";
-import type { SignalAccountConfig } from "../../../src/config/types.js";
 import { resolveAccountEntry } from "../../../src/routing/account-lookup.js";
-import { normalizeAccountId } from "../../../src/routing/session-key.js";
 
 export type ResolvedSignalAccount = {
   accountId: string;
diff --git a/extensions/slack/src/account-inspect.ts b/extensions/slack/src/account-inspect.ts
index 85fde407cbb..8ada00e9832 100644
--- a/extensions/slack/src/account-inspect.ts
+++ b/extensions/slack/src/account-inspect.ts
@@ -1,10 +1,13 @@
-import type { OpenClawConfig } from "../../../src/config/config.js";
+import {
+  DEFAULT_ACCOUNT_ID,
+  normalizeAccountId,
+  type OpenClawConfig,
+  type SlackAccountConfig,
+} from "openclaw/plugin-sdk/slack";
 import {
   hasConfiguredSecretInput,
   normalizeSecretInputString,
 } from "../../../src/config/types.secrets.js";
-import type { SlackAccountConfig } from "../../../src/config/types.slack.js";
-import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../../src/routing/session-key.js";
 import type { SlackAccountSurfaceFields } from "./account-surface-fields.js";
 import {
   mergeSlackAccountConfig,
diff --git a/extensions/telegram/src/account-inspect.ts b/extensions/telegram/src/account-inspect.ts
index 8014df80080..6aca9122b43 100644
--- a/extensions/telegram/src/account-inspect.ts
+++ b/extensions/telegram/src/account-inspect.ts
@@ -1,10 +1,10 @@
+import type { TelegramAccountConfig } from "openclaw/plugin-sdk/telegram";
 import type { OpenClawConfig } from "../../../src/config/config.js";
 import {
   coerceSecretRef,
   hasConfiguredSecretInput,
   normalizeSecretInputString,
 } from "../../../src/config/types.secrets.js";
-import type { TelegramAccountConfig } from "../../../src/config/types.telegram.js";
 import { tryReadSecretFileSync } from "../../../src/infra/secret-file.js";
 import { resolveAccountWithDefaultFallback } from "../../../src/plugin-sdk/account-resolution.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../../src/routing/session-key.js";
diff --git a/extensions/telegram/src/accounts.ts b/extensions/telegram/src/accounts.ts
index 71d78590488..cff6853a5b1 100644
--- a/extensions/telegram/src/accounts.ts
+++ b/extensions/telegram/src/accounts.ts
@@ -1,7 +1,7 @@
 import util from "node:util";
+import type { TelegramAccountConfig, TelegramActionConfig } from "openclaw/plugin-sdk/telegram";
 import { createAccountActionGate } from "../../../src/channels/plugins/account-action-gate.js";
 import type { OpenClawConfig } from "../../../src/config/config.js";
-import type { TelegramAccountConfig, TelegramActionConfig } from "../../../src/config/types.js";
 import { isTruthyEnvValue } from "../../../src/infra/env.js";
 import { createSubsystemLogger } from "../../../src/logging/subsystem.js";
 import {
diff --git a/extensions/whatsapp/src/accounts.ts b/extensions/whatsapp/src/accounts.ts
index a225b09dfb8..53e73128894 100644
--- a/extensions/whatsapp/src/accounts.ts
+++ b/extensions/whatsapp/src/accounts.ts
@@ -1,9 +1,13 @@
 import fs from "node:fs";
 import path from "node:path";
+import type {
+  DmPolicy,
+  GroupPolicy,
+  OpenClawConfig,
+  WhatsAppAccountConfig,
+} from "openclaw/plugin-sdk/whatsapp";
 import { createAccountListHelpers } from "../../../src/channels/plugins/account-helpers.js";
-import type { OpenClawConfig } from "../../../src/config/config.js";
 import { resolveOAuthDir } from "../../../src/config/paths.js";
-import type { DmPolicy, GroupPolicy, WhatsAppAccountConfig } from "../../../src/config/types.js";
 import { resolveAccountEntry } from "../../../src/routing/account-lookup.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../../src/routing/session-key.js";
 import { resolveUserPath } from "../../../src/utils.js";
diff --git a/src/plugin-sdk/whatsapp.ts b/src/plugin-sdk/whatsapp.ts
index 4ea4fa8d2de..e84a60e785c 100644
--- a/src/plugin-sdk/whatsapp.ts
+++ b/src/plugin-sdk/whatsapp.ts
@@ -1,6 +1,7 @@
 export type { ChannelMessageActionName } from "../channels/plugins/types.js";
 export type { ChannelPlugin } from "../channels/plugins/types.plugin.js";
 export type { OpenClawConfig } from "../config/config.js";
+export type { DmPolicy, GroupPolicy, WhatsAppAccountConfig } from "../config/types.js";
 export type { PluginRuntime } from "../plugins/runtime/types.js";
 export type { OpenClawPluginApi } from "../plugins/types.js";