From 549e0bb2684cb9ba876a015220e75a40f855dea1 Mon Sep 17 00:00:00 2001
From: Shakker <shakkerdroid@gmail.com>
Date: Fri, 3 Apr 2026 15:19:00 +0100
Subject: [PATCH] test: keep imessage test plugin facade-free by default

---
 src/test-utils/imessage-test-plugin.test.ts | 20 ++++++++
 src/test-utils/imessage-test-plugin.ts      | 53 ++++++++++++++-------
 2 files changed, 57 insertions(+), 16 deletions(-)
 create mode 100644 src/test-utils/imessage-test-plugin.test.ts

diff --git a/src/test-utils/imessage-test-plugin.test.ts b/src/test-utils/imessage-test-plugin.test.ts
new file mode 100644
index 00000000000..0707f84d00c
--- /dev/null
+++ b/src/test-utils/imessage-test-plugin.test.ts
@@ -0,0 +1,20 @@
+import { afterEach, describe, expect, it } from "vitest";
+import {
+  listImportedBundledPluginFacadeIds,
+  resetFacadeRuntimeStateForTest,
+} from "../plugin-sdk/facade-runtime.js";
+import { createIMessageTestPlugin } from "./imessage-test-plugin.js";
+
+afterEach(() => {
+  resetFacadeRuntimeStateForTest();
+});
+
+describe("createIMessageTestPlugin", () => {
+  it("does not load the bundled iMessage facade by default", () => {
+    expect(listImportedBundledPluginFacadeIds()).toEqual([]);
+
+    createIMessageTestPlugin();
+
+    expect(listImportedBundledPluginFacadeIds()).toEqual([]);
+  });
+});
diff --git a/src/test-utils/imessage-test-plugin.ts b/src/test-utils/imessage-test-plugin.ts
index db6b7f2d899..c2e81a8e2d6 100644
--- a/src/test-utils/imessage-test-plugin.ts
+++ b/src/test-utils/imessage-test-plugin.ts
@@ -1,22 +1,43 @@
 import { normalizeIMessageHandle } from "../channels/plugins/normalize/imessage.js";
 import type { ChannelOutboundAdapter, ChannelPlugin } from "../channels/plugins/types.js";
+import { resolveOutboundSendDep } from "../infra/outbound/send-deps.js";
 import { collectStatusIssuesFromLastError } from "../plugin-sdk/status-helpers.js";
-import { loadBundledPluginPublicSurfaceSync } from "./bundled-plugin-public-surface.js";
 
-let defaultIMessageOutbound: ChannelOutboundAdapter | null = null;
-
-function getDefaultIMessageOutbound(): ChannelOutboundAdapter {
-  if (defaultIMessageOutbound) {
-    return defaultIMessageOutbound;
-  }
-  defaultIMessageOutbound = loadBundledPluginPublicSurfaceSync<{
-    imessageOutbound: ChannelOutboundAdapter;
-  }>({
-    pluginId: "imessage",
-    artifactBasename: "src/outbound-adapter.js",
-  }).imessageOutbound;
-  return defaultIMessageOutbound;
-}
+const defaultIMessageOutbound: ChannelOutboundAdapter = {
+  deliveryMode: "direct",
+  sendText: async ({ to, text, accountId, replyToId, deps, cfg }) => {
+    const sendIMessage = resolveOutboundSendDep<
+      (
+        target: string,
+        content: string,
+        opts?: Record<string, unknown>,
+      ) => Promise<{ messageId: string }>
+    >(deps, "imessage");
+    const result = await sendIMessage?.(to, text, {
+      config: cfg,
+      accountId: accountId ?? undefined,
+      replyToId: replyToId ?? undefined,
+    });
+    return { channel: "imessage", messageId: result?.messageId ?? "imessage-test-stub" };
+  },
+  sendMedia: async ({ to, text, mediaUrl, accountId, replyToId, deps, cfg, mediaLocalRoots }) => {
+    const sendIMessage = resolveOutboundSendDep<
+      (
+        target: string,
+        content: string,
+        opts?: Record<string, unknown>,
+      ) => Promise<{ messageId: string }>
+    >(deps, "imessage");
+    const result = await sendIMessage?.(to, text, {
+      config: cfg,
+      mediaUrl,
+      accountId: accountId ?? undefined,
+      replyToId: replyToId ?? undefined,
+      mediaLocalRoots,
+    });
+    return { channel: "imessage", messageId: result?.messageId ?? "imessage-test-stub" };
+  },
+};
 
 export const createIMessageTestPlugin = (params?: {
   outbound?: ChannelOutboundAdapter;
@@ -38,7 +59,7 @@ export const createIMessageTestPlugin = (params?: {
   status: {
     collectStatusIssues: (accounts) => collectStatusIssuesFromLastError("imessage", accounts),
   },
-  outbound: params?.outbound ?? getDefaultIMessageOutbound(),
+  outbound: params?.outbound ?? defaultIMessageOutbound,
   messaging: {
     targetResolver: {
       looksLikeId: (raw) => {