fix: Failing tests due to import sorting.

src/discord/monitor/message-handler.inbound-contract.test.ts

@@ -40,6 +40,7 @@ describe("discord processDiscordMessage inbound contract", () => {
       historyLimit: 0,
       mediaMaxBytes: 1024,
       textLimit: 4000,
+      sender: { label: "user" },
       replyToMode: "off",
       ackReactionScope: "direct",
       groupPolicy: "open",

src/discord/monitor/message-handler.preflight.ts

@@ -1,5 +1,8 @@
 import { ChannelType, MessageType, type User } from "@buape/carbon";
-
+import type {
+  DiscordMessagePreflightContext,
+  DiscordMessagePreflightParams,
+} from "./message-handler.preflight.types.js";
 import { hasControlCommand } from "../../auto-reply/command-detection.js";
 import { shouldHandleTextCommands } from "../../auto-reply/commands-registry.js";
 import {
@@ -43,10 +46,6 @@ import {
   resolveDiscordSystemLocation,
   resolveTimestampMs,
 } from "./format.js";
-import type {
-  DiscordMessagePreflightContext,
-  DiscordMessagePreflightParams,
-} from "./message-handler.preflight.types.js";
 import { resolveDiscordChannelInfo, resolveDiscordMessageText } from "./message-utils.js";
 import { resolveDiscordSenderIdentity, resolveDiscordWebhookId } from "./sender-identity.js";
 import { resolveDiscordSystemEvent } from "./system-events.js";
@@ -55,7 +54,6 @@ import { resolveDiscordThreadChannel, resolveDiscordThreadParentInfo } from "./t
 export type {
   DiscordMessagePreflightContext,
   DiscordMessagePreflightParams,
-  DiscordSenderIdentity,
 } from "./message-handler.preflight.types.js";
 
 export async function preflightDiscordMessage(

src/discord/monitor/message-handler.process.test.ts

@@ -26,7 +26,7 @@ vi.mock("../../auto-reply/reply/reply-dispatcher.js", () => ({
   })),
 }));
 
-import { processDiscordMessage } from "./message-handler.process.js";
+const { processDiscordMessage } = await import("./message-handler.process.js");
 
 async function createBaseContext(overrides: Record<string, unknown> = {}) {
   const dir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-discord-"));
@@ -102,6 +102,7 @@ describe("processDiscordMessage ack reactions", () => {
     const ctx = await createBaseContext({
       shouldRequireMention: false,
       effectiveWasMentioned: false,
+      sender: { label: "user" },
     });
 
     await processDiscordMessage(ctx as any);
@@ -113,6 +114,7 @@ describe("processDiscordMessage ack reactions", () => {
     const ctx = await createBaseContext({
       shouldRequireMention: true,
       effectiveWasMentioned: true,
+      sender: { label: "user" },
     });
 
     await processDiscordMessage(ctx as any);

src/discord/monitor/native-command.ts

@@ -50,8 +50,8 @@ import {
   resolveDiscordGuildEntry,
   resolveDiscordUserAllowed,
 } from "./allow-list.js";
-import { resolveDiscordSenderIdentity } from "./sender-identity.js";
 import { resolveDiscordChannelInfo } from "./message-utils.js";
+import { resolveDiscordSenderIdentity } from "./sender-identity.js";
 import { resolveDiscordThreadParentInfo } from "./threading.js";
 
 type DiscordConfig = NonNullable<OpenClawConfig["channels"]>["discord"];

src/discord/monitor/sender-identity.ts

@@ -1,8 +1,6 @@
 import type { User } from "@buape/carbon";
-
-import { formatDiscordUserTag } from "./format.js";
-import type { DiscordMessageEvent } from "./listeners.js";
 import type { PluralKitMessageInfo } from "../pluralkit.js";
+import { formatDiscordUserTag } from "./format.js";
 
 export type DiscordSenderIdentity = {
   id: string;
@@ -30,7 +28,7 @@ export function resolveDiscordWebhookId(message: DiscordWebhookMessageLike): str
 
 export function resolveDiscordSenderIdentity(params: {
   author: User;
-  member?: DiscordMessageEvent["member"] | null;
+  member?: any;
   pluralkitInfo?: PluralKitMessageInfo | null;
 }): DiscordSenderIdentity {
   const pkInfo = params.pluralkitInfo ?? null;
@@ -75,7 +73,7 @@ export function resolveDiscordSenderIdentity(params: {
 
 export function resolveDiscordSenderLabel(params: {
   author: User;
-  member?: DiscordMessageEvent["member"] | null;
+  member?: any;
   pluralkitInfo?: PluralKitMessageInfo | null;
 }): string {
   return resolveDiscordSenderIdentity(params).label;