From 6784cc692c1f8552d5d4be94af77db616e48cdcd Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Fri, 10 Apr 2026 07:30:03 +0100
Subject: [PATCH] fix(extensions): split account config type seams

---
 extensions/imessage/runtime-api.ts             | 8 +-------
 extensions/imessage/src/account-types.ts       | 6 ++++++
 extensions/imessage/src/accounts.ts            | 2 +-
 extensions/line/src/reply-payload-transform.ts | 2 +-
 extensions/signal/src/account-types.ts         | 6 ++++++
 extensions/signal/src/accounts.ts              | 2 +-
 extensions/signal/src/runtime-api.ts           | 5 +----
 7 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 extensions/imessage/src/account-types.ts
 create mode 100644 extensions/signal/src/account-types.ts

diff --git a/extensions/imessage/runtime-api.ts b/extensions/imessage/runtime-api.ts
index 7e1dd30dc6f..53d50b07a28 100644
--- a/extensions/imessage/runtime-api.ts
+++ b/extensions/imessage/runtime-api.ts
@@ -1,5 +1,3 @@
-import type { OpenClawConfig as RuntimeApiOpenClawConfig } from "openclaw/plugin-sdk/core";
-
 export {
   DEFAULT_ACCOUNT_ID,
   getChatChannelMeta,
@@ -31,8 +29,4 @@ export type { IMessageProbe } from "./src/probe.js";
 export { sendMessageIMessage } from "./src/send.js";
 export { setIMessageRuntime } from "./src/runtime.js";
 export { chunkTextForOutbound } from "./src/channel-api.js";
-
-export type IMessageAccountConfig = Omit<
-  NonNullable<NonNullable<RuntimeApiOpenClawConfig["channels"]>["imessage"]>,
-  "accounts" | "defaultAccount"
->;
+export type { IMessageAccountConfig } from "./src/account-types.js";
diff --git a/extensions/imessage/src/account-types.ts b/extensions/imessage/src/account-types.ts
new file mode 100644
index 00000000000..fd3b3b9d350
--- /dev/null
+++ b/extensions/imessage/src/account-types.ts
@@ -0,0 +1,6 @@
+import type { OpenClawConfig } from "openclaw/plugin-sdk/config-runtime";
+
+export type IMessageAccountConfig = Omit<
+  NonNullable<NonNullable<OpenClawConfig["channels"]>["imessage"]>,
+  "accounts" | "defaultAccount"
+>;
diff --git a/extensions/imessage/src/accounts.ts b/extensions/imessage/src/accounts.ts
index a0b36b24ed9..6eff691cd55 100644
--- a/extensions/imessage/src/accounts.ts
+++ b/extensions/imessage/src/accounts.ts
@@ -5,7 +5,7 @@ import {
   type OpenClawConfig,
 } from "openclaw/plugin-sdk/account-resolution";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
-import type { IMessageAccountConfig } from "../runtime-api.js";
+import type { IMessageAccountConfig } from "./account-types.js";
 
 export type ResolvedIMessageAccount = {
   accountId: string;
diff --git a/extensions/line/src/reply-payload-transform.ts b/extensions/line/src/reply-payload-transform.ts
index 85f88e57420..12a95c44381 100644
--- a/extensions/line/src/reply-payload-transform.ts
+++ b/extensions/line/src/reply-payload-transform.ts
@@ -1,5 +1,5 @@
+import type { ReplyPayload } from "openclaw/plugin-sdk/reply-runtime";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/text-runtime";
-import type { ReplyPayload } from "../runtime-api.js";
 import {
   createAgendaCard,
   createAppleTvRemoteCard,
diff --git a/extensions/signal/src/account-types.ts b/extensions/signal/src/account-types.ts
new file mode 100644
index 00000000000..107bd763d87
--- /dev/null
+++ b/extensions/signal/src/account-types.ts
@@ -0,0 +1,6 @@
+import type { OpenClawConfig } from "openclaw/plugin-sdk/config-runtime";
+
+export type SignalAccountConfig = Omit<
+  Exclude<NonNullable<OpenClawConfig["channels"]>["signal"], undefined>,
+  "accounts"
+>;
diff --git a/extensions/signal/src/accounts.ts b/extensions/signal/src/accounts.ts
index b55767d4c72..e5bc281ddcf 100644
--- a/extensions/signal/src/accounts.ts
+++ b/extensions/signal/src/accounts.ts
@@ -5,7 +5,7 @@ import {
   type OpenClawConfig,
 } from "openclaw/plugin-sdk/account-resolution";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
-import type { SignalAccountConfig } from "./runtime-api.js";
+import type { SignalAccountConfig } from "./account-types.js";
 
 export type ResolvedSignalAccount = {
   accountId: string;
diff --git a/extensions/signal/src/runtime-api.ts b/extensions/signal/src/runtime-api.ts
index 0dec5aa05d4..2dab3b7acba 100644
--- a/extensions/signal/src/runtime-api.ts
+++ b/extensions/signal/src/runtime-api.ts
@@ -49,7 +49,4 @@ export { removeReactionSignal, sendReactionSignal } from "./send-reactions.js";
 export { sendMessageSignal } from "./send.js";
 export { signalMessageActions } from "./message-actions.js";
 export type { ResolvedSignalAccount } from "./accounts.js";
-export type SignalAccountConfig = Omit<
-  Exclude<NonNullable<RuntimeOpenClawConfig["channels"]>["signal"], undefined>,
-  "accounts"
->;
+export type { SignalAccountConfig } from "./account-types.js";