diff --git a/extensions/googlechat/runtime-api.ts b/extensions/googlechat/runtime-api.ts
index be223fd5463..fb71b4196fc 100644
--- a/extensions/googlechat/runtime-api.ts
+++ b/extensions/googlechat/runtime-api.ts
@@ -16,9 +16,9 @@ export {
 export {
   buildOpenGroupPolicyConfigureRouteAllowlistWarning,
   collectAllowlistProviderGroupPolicyWarnings,
-  resolveMentionGatingWithBypass,
-} from "../../src/channels/channel-policy.js";
-export { formatNormalizedAllowFromEntries } from "../../src/channels/allow-from.js";
+} from "../../src/plugin-sdk/channel-policy.js";
+export { resolveMentionGatingWithBypass } from "../../src/channels/mention-gating.js";
+export { formatNormalizedAllowFromEntries } from "../../src/plugin-sdk/allow-from.js";
 export { buildComputedAccountStatusSnapshot } from "../../src/plugin-sdk/status-helpers.js";
 export {
   createAccountStatusSink,
diff --git a/extensions/irc/src/channel.ts b/extensions/irc/src/channel.ts
index e6a2cf6f11e..18fa8953045 100644
--- a/extensions/irc/src/channel.ts
+++ b/extensions/irc/src/channel.ts
@@ -8,6 +8,16 @@ import {
   buildOpenGroupPolicyWarning,
   collectAllowlistProviderGroupPolicyWarnings,
 } from "openclaw/plugin-sdk/channel-policy";
+import {
+  buildBaseAccountStatusSnapshot,
+  buildBaseChannelStatusSummary,
+  buildChannelConfigSchema,
+  createAccountStatusSink,
+  DEFAULT_ACCOUNT_ID,
+  getChatChannelMeta,
+  PAIRING_APPROVED_MESSAGE,
+  type ChannelPlugin,
+} from "openclaw/plugin-sdk/irc";
 import { runStoppablePassiveMonitor } from "../../shared/passive-monitor.js";
 import {
   listIrcAccountIds,
@@ -25,16 +35,6 @@ import {
 } from "./normalize.js";
 import { resolveIrcGroupMatch, resolveIrcRequireMention } from "./policy.js";
 import { probeIrc } from "./probe.js";
-import {
-  buildBaseAccountStatusSnapshot,
-  buildBaseChannelStatusSummary,
-  buildChannelConfigSchema,
-  createAccountStatusSink,
-  DEFAULT_ACCOUNT_ID,
-  getChatChannelMeta,
-  PAIRING_APPROVED_MESSAGE,
-  type ChannelPlugin,
-} from "./runtime-api.js";
 import { getIrcRuntime } from "./runtime.js";
 import { sendMessageIrc } from "./send.js";
 import { ircSetupAdapter } from "./setup-core.js";
diff --git a/extensions/irc/src/config-schema.ts b/extensions/irc/src/config-schema.ts
index d1af189484b..8b9625b5bc4 100644
--- a/extensions/irc/src/config-schema.ts
+++ b/extensions/irc/src/config-schema.ts
@@ -1,5 +1,3 @@
-import { z } from "zod";
-import { requireChannelOpenAllowFrom } from "../../shared/config-schema-helpers.js";
 import {
   BlockStreamingCoalesceSchema,
   DmConfigSchema,
@@ -9,7 +7,9 @@ import {
   ReplyRuntimeConfigSchemaShape,
   ToolPolicySchema,
   requireOpenAllowFrom,
-} from "./runtime-api.js";
+} from "openclaw/plugin-sdk/irc";
+import { z } from "zod";
+import { requireChannelOpenAllowFrom } from "../../shared/config-schema-helpers.js";
 
 const IrcGroupSchema = z
   .object({
diff --git a/extensions/signal/runtime-api.ts b/extensions/signal/runtime-api.ts
index b7b73960068..e258df15c9c 100644
--- a/extensions/signal/runtime-api.ts
+++ b/extensions/signal/runtime-api.ts
@@ -1,2 +1 @@
-export * from "openclaw/plugin-sdk/signal";
-export * from "openclaw/plugin-sdk/signal-core";
+export * from "./src/index.js";
diff --git a/extensions/signal/src/channel.ts b/extensions/signal/src/channel.ts
index 6e1a22337e2..8552a26c8df 100644
--- a/extensions/signal/src/channel.ts
+++ b/extensions/signal/src/channel.ts
@@ -16,7 +16,7 @@ import {
   PAIRING_APPROVED_MESSAGE,
   resolveChannelMediaMaxBytes,
   type ChannelPlugin,
-} from "../runtime-api.js";
+} from "openclaw/plugin-sdk/signal";
 import { resolveSignalAccount, type ResolvedSignalAccount } from "./accounts.js";
 import { markdownToSignalTextChunks } from "./format.js";
 import {
diff --git a/extensions/signal/src/shared.ts b/extensions/signal/src/shared.ts
index e72807edbca..e9370474de2 100644
--- a/extensions/signal/src/shared.ts
+++ b/extensions/signal/src/shared.ts
@@ -11,7 +11,7 @@ import {
   normalizeE164,
   SignalConfigSchema,
   type ChannelPlugin,
-} from "../runtime-api.js";
+} from "openclaw/plugin-sdk/signal";
 import {
   listSignalAccountIds,
   resolveDefaultSignalAccountId,