refactor: eliminate jscpd clones and boost tests

src/gateway/server.agent.gateway-server-agent-a.e2e.test.ts

@@ -3,6 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import type { ChannelPlugin } from "../channels/plugins/types.js";
+import { createChannelTestPluginBase } from "../test-utils/channel-plugins.js";
 import { setRegistry } from "./server.agent.gateway-server-agent.mocks.js";
 import { createRegistry } from "./server.e2e-registry-helpers.js";
 import {
@@ -95,22 +96,15 @@ const createStubChannelPlugin = (params: {
   label: string;
   resolveAllowFrom?: (cfg: Record<string, unknown>) => string[];
 }): ChannelPlugin => ({
-  id: params.id,
-  meta: {
+  ...createChannelTestPluginBase({
     id: params.id,
     label: params.label,
-    selectionLabel: params.label,
-    docsPath: `/channels/${params.id}`,
-    blurb: "test stub.",
-  },
-  capabilities: { chatTypes: ["direct"] },
-  config: {
-    listAccountIds: () => ["default"],
-    resolveAccount: () => ({}),
-    resolveAllowFrom: params.resolveAllowFrom
-      ? ({ cfg }) => params.resolveAllowFrom?.(cfg as Record<string, unknown>) ?? []
-      : undefined,
-  },
+    config: {
+      resolveAllowFrom: params.resolveAllowFrom
+        ? ({ cfg }) => params.resolveAllowFrom?.(cfg as Record<string, unknown>) ?? []
+        : undefined,
+    },
+  }),
   outbound: {
     deliveryMode: "direct",
     resolveTarget: ({ to, allowFrom }) => {

src/gateway/server.agent.gateway-server-agent-b.e2e.test.ts

@@ -7,11 +7,11 @@ import { whatsappPlugin } from "../../extensions/whatsapp/src/channel.js";
 import { BARE_SESSION_RESET_PROMPT } from "../auto-reply/reply/session-reset-prompt.js";
 import type { ChannelPlugin } from "../channels/plugins/types.js";
 import { emitAgentEvent, registerAgentRunContext } from "../infra/agent-events.js";
-import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js";
 import { setRegistry } from "./server.agent.gateway-server-agent.mocks.js";
 import { createRegistry } from "./server.e2e-registry-helpers.js";
 import {
   agentCommand,
+  connectWebchatClient,
   connectOk,
   installGatewayTestHooks,
   onceMessage,
@@ -367,18 +367,7 @@ describe("gateway server agent", () => {
   test("agent events stream to webchat clients when run context is registered", async () => {
     await writeMainSessionEntry({ sessionId: "sess-main" });
 
-    const webchatWs = new WebSocket(`ws://127.0.0.1:${port}`, {
-      headers: { origin: `http://127.0.0.1:${port}` },
-    });
-    await new Promise<void>((resolve) => webchatWs.once("open", resolve));
-    await connectOk(webchatWs, {
-      client: {
-        id: GATEWAY_CLIENT_NAMES.WEBCHAT,
-        version: "1.0.0",
-        platform: "test",
-        mode: GATEWAY_CLIENT_MODES.WEBCHAT,
-      },
-    });
+    const webchatWs = await connectWebchatClient({ port });
 
     registerAgentRunContext("run-auto-1", { sessionKey: "main" });
 

src/gateway/server.canvas-auth.e2e.test.ts

@@ -83,6 +83,16 @@ function scopedCanvasPath(capability: string, path: string): string {
   return `${CANVAS_CAPABILITY_PATH_PREFIX}/${encodeURIComponent(capability)}${path}`;
 }
 
+const allowCanvasHostHttp: CanvasHostHandler["handleHttpRequest"] = async (req, res) => {
+  const url = new URL(req.url ?? "/", "http://localhost");
+  if (url.pathname !== CANVAS_HOST_PATH && !url.pathname.startsWith(`${CANVAS_HOST_PATH}/`)) {
+    return false;
+  }
+  res.statusCode = 200;
+  res.setHeader("Content-Type", "text/plain; charset=utf-8");
+  res.end("ok");
+  return true;
+};
 async function withCanvasGatewayHarness(params: {
   resolvedAuth: ResolvedGatewayAuth;
   listenHost?: string;
@@ -162,19 +172,7 @@ describe("gateway canvas host auth", () => {
       run: async () => {
         await withCanvasGatewayHarness({
           resolvedAuth,
-          handleHttpRequest: async (req, res) => {
-            const url = new URL(req.url ?? "/", "http://localhost");
-            if (
-              url.pathname !== CANVAS_HOST_PATH &&
-              !url.pathname.startsWith(`${CANVAS_HOST_PATH}/`)
-            ) {
-              return false;
-            }
-            res.statusCode = 200;
-            res.setHeader("Content-Type", "text/plain; charset=utf-8");
-            res.end("ok");
-            return true;
-          },
+          handleHttpRequest: allowCanvasHostHttp,
           run: async ({ listener, clients }) => {
             const host = "127.0.0.1";
             const operatorOnlyCapability = "operator-only";
@@ -287,19 +285,7 @@ describe("gateway canvas host auth", () => {
       run: async () => {
         await withCanvasGatewayHarness({
           resolvedAuth,
-          handleHttpRequest: async (req, res) => {
-            const url = new URL(req.url ?? "/", "http://localhost");
-            if (
-              url.pathname !== CANVAS_HOST_PATH &&
-              !url.pathname.startsWith(`${CANVAS_HOST_PATH}/`)
-            ) {
-              return false;
-            }
-            res.statusCode = 200;
-            res.setHeader("Content-Type", "text/plain; charset=utf-8");
-            res.end("ok");
-            return true;
-          },
+          handleHttpRequest: allowCanvasHostHttp,
           run: async ({ listener, clients }) => {
             clients.add(
               makeWsClient({

src/gateway/server.channels.e2e.test.ts

@@ -2,6 +2,7 @@ import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import type { ChannelPlugin } from "../channels/plugins/types.js";
 import type { PluginRegistry } from "../plugins/registry.js";
 import { setActivePluginRegistry } from "../plugins/runtime.js";
+import { createChannelTestPluginBase } from "../test-utils/channel-plugins.js";
 import { createRegistry } from "./server.e2e-registry-helpers.js";
 import {
   connectOk,
@@ -48,20 +49,11 @@ const createStubChannelPlugin = (params: {
   summary?: Record<string, unknown>;
   logoutCleared?: boolean;
 }): ChannelPlugin => ({
-  id: params.id,
-  meta: {
+  ...createChannelTestPluginBase({
     id: params.id,
     label: params.label,
-    selectionLabel: params.label,
-    docsPath: `/channels/${params.id}`,
-    blurb: "test stub.",
-  },
-  capabilities: { chatTypes: ["direct"] },
-  config: {
-    listAccountIds: () => ["default"],
-    resolveAccount: () => ({}),
-    isConfigured: async () => false,
-  },
+    config: { isConfigured: async () => false },
+  }),
   status: {
     buildChannelSummary: async () => ({
       configured: false,

src/gateway/test-helpers.server.ts

@@ -573,6 +573,43 @@ export async function connectOk(ws: WebSocket, opts?: Parameters<typeof connectR
   return res.payload as { type: "hello-ok" };
 }
 
+export async function connectWebchatClient(params: {
+  port: number;
+  origin?: string;
+  client?: NonNullable<Parameters<typeof connectReq>[1]>["client"];
+}): Promise<WebSocket> {
+  const origin = params.origin ?? `http://127.0.0.1:${params.port}`;
+  const ws = new WebSocket(`ws://127.0.0.1:${params.port}`, {
+    headers: { origin },
+  });
+  await new Promise<void>((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error("timeout waiting for ws open")), 10_000);
+    const onOpen = () => {
+      clearTimeout(timer);
+      ws.off("error", onError);
+      resolve();
+    };
+    const onError = (err: Error) => {
+      clearTimeout(timer);
+      ws.off("open", onOpen);
+      reject(err);
+    };
+    ws.once("open", onOpen);
+    ws.once("error", onError);
+  });
+  await connectOk(ws, {
+    client:
+      params.client ??
+      ({
+        id: GATEWAY_CLIENT_NAMES.WEBCHAT,
+        version: "1.0.0",
+        platform: "test",
+        mode: GATEWAY_CLIENT_MODES.WEBCHAT,
+      } as NonNullable<Parameters<typeof connectReq>[1]>["client"]),
+  });
+  return ws;
+}
+
 export async function rpcReq<T extends Record<string, unknown>>(
   ws: WebSocket,
   method: string,