diff --git a/extensions/mattermost/src/mattermost/monitor-gating.ts b/extensions/mattermost/src/mattermost/monitor-gating.ts
index fdd29722ae77..6ebd97b38cb5 100644
--- a/extensions/mattermost/src/mattermost/monitor-gating.ts
+++ b/extensions/mattermost/src/mattermost/monitor-gating.ts
@@ -26,7 +26,7 @@ export function resolveMattermostTrustedChatKind(params: {
   return params.fallback ?? "direct";
 }
 
-export type MattermostRequireMentionResolverInput = {
+type MattermostRequireMentionResolverInput = {
   cfg: OpenClawConfig;
   channel: "mattermost";
   accountId: string;
@@ -34,7 +34,7 @@ export type MattermostRequireMentionResolverInput = {
   requireMentionOverride?: boolean;
 };
 
-export type MattermostMentionGateInput = {
+type MattermostMentionGateInput = {
   kind: ChatType;
   cfg: OpenClawConfig;
   accountId: string;
diff --git a/extensions/mattermost/src/mattermost/monitor.channel-kind.test.ts b/extensions/mattermost/src/mattermost/monitor.channel-kind.test.ts
index 9416aec3efd0..11fca7d97163 100644
--- a/extensions/mattermost/src/mattermost/monitor.channel-kind.test.ts
+++ b/extensions/mattermost/src/mattermost/monitor.channel-kind.test.ts
@@ -1,6 +1,6 @@
 // Mattermost tests cover monitor.channel kind plugin behavior.
 import { describe, expect, it } from "vitest";
-import { mapMattermostChannelTypeToChatType } from "./monitor.js";
+import { mapMattermostChannelTypeToChatType } from "./monitor-gating.js";
 
 describe("mapMattermostChannelTypeToChatType", () => {
   it("maps direct and group dm channel types", () => {
diff --git a/extensions/mattermost/src/mattermost/monitor.test.ts b/extensions/mattermost/src/mattermost/monitor.test.ts
index 59c65488eb34..fafe5320a966 100644
--- a/extensions/mattermost/src/mattermost/monitor.test.ts
+++ b/extensions/mattermost/src/mattermost/monitor.test.ts
@@ -5,11 +5,11 @@ import type { OpenClawConfig } from "../../runtime-api.js";
 import { resolveMattermostAccount } from "./accounts.js";
 import * as clientModule from "./client.js";
 import type { MattermostClient } from "./client.js";
+import { evaluateMattermostMentionGate } from "./monitor-gating.js";
 import {
   buildMattermostModelPickerSelectMessageSid,
   canFinalizeMattermostPreviewInPlace,
   deliverMattermostReplyWithDraftPreview,
-  evaluateMattermostMentionGate,
   formatMattermostFinalDeliveryOutcomeLog,
   MattermostRetryableInboundError,
   processMattermostReplayGuardedPost,
@@ -20,10 +20,13 @@ import {
   resolveMattermostThreadSessionContext,
   shouldSuppressMattermostDefaultToolProgressMessages,
   shouldUpdateMattermostDraftToolProgress,
-  type MattermostMentionGateInput,
-  type MattermostRequireMentionResolverInput,
 } from "./monitor.js";
 
+type MattermostMentionGateInput = Parameters<typeof evaluateMattermostMentionGate>[0];
+type MattermostRequireMentionResolverInput = Parameters<
+  MattermostMentionGateInput["resolveRequireMention"]
+>[0];
+
 function resolveRequireMentionForTest(params: MattermostRequireMentionResolverInput): boolean {
   const root = params.cfg.channels?.mattermost;
   const accountGroups = (
diff --git a/extensions/mattermost/src/mattermost/monitor.ts b/extensions/mattermost/src/mattermost/monitor.ts
index 9f8b2db16a32..58d8c04adbc2 100644
--- a/extensions/mattermost/src/mattermost/monitor.ts
+++ b/extensions/mattermost/src/mattermost/monitor.ts
@@ -129,16 +129,6 @@ import {
   recordMattermostThreadParticipation,
 } from "./thread-participation.js";
 
-export {
-  evaluateMattermostMentionGate,
-  mapMattermostChannelTypeToChatType,
-  resolveMattermostTrustedChatKind,
-} from "./monitor-gating.js";
-export type {
-  MattermostMentionGateInput,
-  MattermostRequireMentionResolverInput,
-} from "./monitor-gating.js";
-
 type MonitorMattermostOpts = {
   botToken?: string;
   baseUrl?: string;
diff --git a/scripts/deadcode-exports.baseline.mjs b/scripts/deadcode-exports.baseline.mjs
index b56777b3edcc..6c465504fce8 100644
--- a/scripts/deadcode-exports.baseline.mjs
+++ b/scripts/deadcode-exports.baseline.mjs
@@ -301,8 +301,6 @@ export const KNIP_UNUSED_EXPORT_BASELINE = [
   "extensions/mattermost/src/mattermost/interactions.ts: generateInteractionToken",
   "extensions/mattermost/src/mattermost/interactions.ts: getInteractionSecret",
   "extensions/mattermost/src/mattermost/interactions.ts: verifyInteractionToken",
-  "extensions/mattermost/src/mattermost/monitor-gating.ts: MattermostMentionGateInput",
-  "extensions/mattermost/src/mattermost/monitor-gating.ts: MattermostRequireMentionResolverInput",
   "extensions/mattermost/src/mattermost/monitor-resources.ts: MATTERMOST_MEDIA_READ_IDLE_TIMEOUT_MS",
   "extensions/mattermost/src/mattermost/monitor-resources.ts: MATTERMOST_MEDIA_RESPONSE_HEADER_TIMEOUT_MS",
   "extensions/mattermost/src/mattermost/monitor-websocket.ts: MATTERMOST_WEBSOCKET_MAX_PAYLOAD_BYTES",
@@ -311,11 +309,7 @@ export const KNIP_UNUSED_EXPORT_BASELINE = [
   "extensions/mattermost/src/mattermost/monitor.ts: buildMattermostModelPickerSelectMessageSid",
   "extensions/mattermost/src/mattermost/monitor.ts: canFinalizeMattermostPreviewInPlace",
   "extensions/mattermost/src/mattermost/monitor.ts: deliverMattermostReplyWithDraftPreview",
-  "extensions/mattermost/src/mattermost/monitor.ts: evaluateMattermostMentionGate",
   "extensions/mattermost/src/mattermost/monitor.ts: formatMattermostFinalDeliveryOutcomeLog",
-  "extensions/mattermost/src/mattermost/monitor.ts: mapMattermostChannelTypeToChatType",
-  "extensions/mattermost/src/mattermost/monitor.ts: MattermostMentionGateInput",
-  "extensions/mattermost/src/mattermost/monitor.ts: MattermostRequireMentionResolverInput",
   "extensions/mattermost/src/mattermost/monitor.ts: MattermostRetryableInboundError",
   "extensions/mattermost/src/mattermost/monitor.ts: processMattermostReplayGuardedPost",
   "extensions/mattermost/src/mattermost/monitor.ts: resolveMattermostEffectiveReplyToId",
@@ -323,7 +317,6 @@ export const KNIP_UNUSED_EXPORT_BASELINE = [
   "extensions/mattermost/src/mattermost/monitor.ts: resolveMattermostReactionChannelId",
   "extensions/mattermost/src/mattermost/monitor.ts: resolveMattermostReplyRootId",
   "extensions/mattermost/src/mattermost/monitor.ts: resolveMattermostThreadSessionContext",
-  "extensions/mattermost/src/mattermost/monitor.ts: resolveMattermostTrustedChatKind",
   "extensions/mattermost/src/mattermost/monitor.ts: shouldSuppressMattermostDefaultToolProgressMessages",
   "extensions/mattermost/src/mattermost/monitor.ts: shouldUpdateMattermostDraftToolProgress",
   "extensions/mattermost/src/mattermost/reactions.ts: resetMattermostReactionBotUserCacheForTests",
diff --git a/scripts/ts-max-loc-baseline-v2.json b/scripts/ts-max-loc-baseline-v2.json
index 1be73df0f8d7..5f1092624c4f 100644
--- a/scripts/ts-max-loc-baseline-v2.json
+++ b/scripts/ts-max-loc-baseline-v2.json
@@ -193,7 +193,7 @@
   "extensions/mattermost/src/channel.ts": 961,
   "extensions/mattermost/src/mattermost/client.ts": 736,
   "extensions/mattermost/src/mattermost/interactions.ts": 677,
-  "extensions/mattermost/src/mattermost/monitor.ts": 2476,
+  "extensions/mattermost/src/mattermost/monitor.ts": 2466,
   "extensions/mattermost/src/mattermost/send.ts": 554,
   "extensions/mattermost/src/mattermost/slash-commands.ts": 620,
   "extensions/mattermost/src/mattermost/slash-http.ts": 948,