create-ailk 0.22.0 → 0.24.0

package/templates/apps/mcp/__tests__/submit_lead.test.ts

@@ -1,17 +1,22 @@
 /**
- * Tests for the submit_lead MCP tool handler.
+ * Tests for the capture_lead MCP tool handler.
  *
- * Acceptance criteria verified here:
+ * The tool takes the body `POST /v1/leads/submit` takes and returns the
+ * route's 201 body (#7171 AC-11 — the tool adopted the API). Verified here:
  * 1. Malformed input → { ok: false, error: { kind: 'invalid_input', issues } }, api-client never called
- * 2. Happy path → forwards to apiClient.leads.submit, returns { ok: true, id, persisted }
- * 3. API 400 → { ok: false, error: { kind: 'api_error', status: 400 } }
- * 4. API 503 → { ok: false, error: { kind: 'api_error', status: 503 } }
- * 5. API 429 → { ok: false, error: { kind: 'api_error', status: 429 } }
- * 6. #8073 — forwards the trusted caller address + AILK_VISITOR_FORWARD_KEY
+ * 2. Happy path → posts exactly the parsed body to apiClient.leads.submit —
+ *    no `siteId`, whatever AILK_SITE_ID says, and no stamped `source` — and
+ *    returns the route's body unchanged, `email` included
+ * 3. API 400 / 503 / 429 → { ok: false, error: { kind: 'api_error', status } }
+ * 4. #7397 — the spoke marker `payload.site` from AILK_LEAD_SITE, spread last
+ * 5. #8073 — forwards the trusted caller address + AILK_VISITOR_FORWARD_KEY
  *    as the two visitor-forwarding headers only when both are present
  */
 
-import { LEAD_SITE_MARKER_KEY, leadSubmitSchema } from "@working-theory/validation";
+import {
+  LEAD_SITE_MARKER_KEY,
+  leadSubmitBodySchema,
+} from "@working-theory/validation";
 import { ailkCaptureLead } from "../src/tools/capture_lead.js";
 import { trustedCallerAddress } from "../src/request-context.js";
 
@@ -30,222 +35,141 @@ jest.mock("@working-theory/api-client", () => {
   };
 });
 
- 
+
 const { apiClient } = require("@working-theory/api-client") as {
   apiClient: { leads: { submit: jest.Mock } };
 };
 
+/** The route body, as an agent sends it. */
 const VALID_INPUT = {
-  name: "Jane Smith",
+  source: "mcp",
   email: "jane@example.com",
-  message: "I am interested in your services.",
+  payload: { name: "Jane Smith", message: "I am interested in your services." },
+};
+
+/** The route's 201 body, as the api-client hands it back. */
+const WIRE = {
+  id: "lead_00000000-0000-7000-8000-0000000000d1",
+  persisted: "db",
+  email: { ok: true, messageId: "msg-1" },
 };
 
 beforeEach(() => {
   jest.clearAllMocks();
   // The exact-body assertions below assume no spoke marker (#7397).
   delete process.env.AILK_LEAD_SITE;
+  delete process.env.AILK_SITE_ID;
 });
 
 describe("ailkCaptureLead — input validation", () => {
-  it("rejects malformed input (missing required fields) without calling api-client", async () => {
+  it("rejects malformed input (no source) without calling api-client", async () => {
     const result = await ailkCaptureLead({ email: "not-an-email" } as never);
 
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.kind).toBe("invalid_input");
-      if (result.error.kind === "invalid_input") {
-        expect(Array.isArray(result.error.issues)).toBe(true);
-        expect(result.error.issues.length).toBeGreaterThan(0);
-      }
+    expect(result).toMatchObject({ ok: false, error: { kind: "invalid_input" } });
+    if (!result.ok && result.error.kind === "invalid_input") {
+      expect(result.error.issues.length).toBeGreaterThan(0);
     }
     expect(apiClient.leads.submit).not.toHaveBeenCalled();
   });
-});
 
-describe("ailkCaptureLead — happy path", () => {
-  it("forwards canonical body to api-client and returns ok:true with id and persisted", async () => {
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000d1", persisted: "db" },
-    });
+  it("admits the StepFlow envelope — email inside payload, none at the top level — as the route does", async () => {
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
+    const envelope = { source: "step-flow", payload: { email: "env@example.com" } };
 
-    const result = await ailkCaptureLead(VALID_INPUT);
+    await ailkCaptureLead(envelope);
 
-    expect(apiClient.leads.submit).toHaveBeenCalledWith({
-      siteId: "default",
-      source: "mcp",
-      email: "jane@example.com",
-      payload: { name: "Jane Smith", message: "I am interested in your services." },
-    });
-    expect(result.ok).toBe(true);
-    if (result.ok) {
-      expect(result.id).toBe("lead_00000000-0000-7000-8000-0000000000d1");
-      expect(result.persisted).toBe("db");
-    }
+    expect(apiClient.leads.submit).toHaveBeenCalledWith(envelope);
   });
 });
 
-describe("ailkCaptureLead — API error mapping", () => {
-  it("maps API 400 to { ok: false, error: { kind: 'api_error', status: 400 } }", async () => {
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: false,
-      status: 400,
-      body: { error: "bad_request" },
-    });
-
-    const result = await ailkCaptureLead(VALID_INPUT);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.kind).toBe("api_error");
-      if (result.error.kind === "api_error") {
-        expect(result.error.status).toBe(400);
-      }
-    }
-  });
-
-  it("maps API 503 to { ok: false, error: { kind: 'api_error', status: 503 } }", async () => {
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: false,
-      status: 503,
-      body: { error: "service_unavailable" },
-    });
-
-    const result = await ailkCaptureLead(VALID_INPUT);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.kind).toBe("api_error");
-      if (result.error.kind === "api_error") {
-        expect(result.error.status).toBe(503);
-      }
-    }
-  });
-
-  it("maps API 429 to { ok: false, error: { kind: 'api_error', status: 429 } }", async () => {
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: false,
-      status: 429,
-      body: { error: "rate_limited" },
-    });
+describe("ailkCaptureLead — happy path", () => {
+  it("posts exactly the parsed body and returns the route's body unchanged, email included", async () => {
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
 
     const result = await ailkCaptureLead(VALID_INPUT);
 
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.kind).toBe("api_error");
-      if (result.error.kind === "api_error") {
-        expect(result.error.status).toBe(429);
-      }
-    }
+    expect(apiClient.leads.submit).toHaveBeenCalledWith(VALID_INPUT);
+    expect(result).toEqual(WIRE);
   });
-});
 
-describe("ailkCaptureLead — siteId default", () => {
-  it("uses siteId 'default' when AILK_SITE_ID is unset", async () => {
-    delete process.env.AILK_SITE_ID;
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000d2", persisted: "db" },
-    });
+  it("never sends a siteId, whatever AILK_SITE_ID says, and strips one the agent sent", async () => {
+    process.env.AILK_SITE_ID = "site-abc";
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
 
-    await ailkCaptureLead(VALID_INPUT);
+    await ailkCaptureLead({ ...VALID_INPUT, siteId: "site-xyz" } as never);
 
-    const call = apiClient.leads.submit.mock.calls[0][0] as { siteId: string };
-    expect(call.siteId).toBe("default");
+    expect(apiClient.leads.submit.mock.calls[0][0]).toEqual(VALID_INPUT);
   });
 });
 
-describe("ailkCaptureLead — siteId override", () => {
-  afterEach(() => {
-    delete process.env.AILK_SITE_ID;
-  });
-
-  it("uses AILK_SITE_ID env var when set", async () => {
-    process.env.AILK_SITE_ID = "site-abc";
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000d3", persisted: "db" },
-    });
-
-    await ailkCaptureLead(VALID_INPUT);
-
-    const call = apiClient.leads.submit.mock.calls[0][0] as { siteId: string };
-    expect(call.siteId).toBe("site-abc");
-  });
+describe("ailkCaptureLead — API error mapping", () => {
+  it.each([400, 503, 429])(
+    "maps API %i to { ok: false, error: { kind: 'api_error', status } }",
+    async (status) => {
+      apiClient.leads.submit.mockResolvedValueOnce({
+        ok: false,
+        status,
+        body: { error: "refused" },
+      });
+
+      const result = await ailkCaptureLead(VALID_INPUT);
+
+      expect(result).toEqual({ ok: false, error: { kind: "api_error", status } });
+    },
+  );
 });
 
 // #7397 — a spoke of a hub-and-spokes deployment is marked in the lead
-// PAYLOAD (`payload.site`); `source` stays "mcp" because
-// MESSAGE_LEAD_SOURCE_LIST is frozen. The marker comes from the MCP server's
-// own env, so an MCP-origin lead reaches the hub inbox attributed.
+// PAYLOAD (`payload.site`). The marker comes from the MCP server's own env,
+// so an MCP-origin lead reaches the hub inbox attributed; it is the one key
+// the tool adds to the body the agent sent.
 describe("ailkCaptureLead — payload site marker (#7397)", () => {
-  afterEach(() => {
-    delete process.env.AILK_LEAD_SITE;
-  });
-
   it("names the marker key 'site', the key the issue's hub-and-spokes design names", () => {
     expect(LEAD_SITE_MARKER_KEY).toBe("site");
   });
 
-  it("carries payload.site from AILK_LEAD_SITE, leaving source 'mcp'", async () => {
+  it("spreads payload.site from AILK_LEAD_SITE LAST, over an agent's own value", async () => {
     process.env.AILK_LEAD_SITE = "spoke-a.example";
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000d4", persisted: "db" },
-    });
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
 
-    await ailkCaptureLead(VALID_INPUT);
+    await ailkCaptureLead({
+      ...VALID_INPUT,
+      payload: { ...VALID_INPUT.payload, site: "agent-said" },
+    });
 
     expect(apiClient.leads.submit).toHaveBeenCalledWith({
-      siteId: "default",
-      source: "mcp",
-      email: "jane@example.com",
-      payload: {
-        name: "Jane Smith",
-        message: "I am interested in your services.",
-        site: "spoke-a.example",
-      },
+      ...VALID_INPUT,
+      payload: { ...VALID_INPUT.payload, site: "spoke-a.example" },
     });
   });
 
-  it("sends a marked body the API's submit schema accepts", async () => {
+  it("marks a body the agent sent without a payload", async () => {
     process.env.AILK_LEAD_SITE = "spoke-a.example";
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000d5", persisted: "db" },
-    });
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
 
-    await ailkCaptureLead(VALID_INPUT);
+    await ailkCaptureLead({ source: "mcp", email: "jane@example.com" });
 
     const body = apiClient.leads.submit.mock.calls[0][0] as Record<string, unknown>;
-    expect(leadSubmitSchema.safeParse({ kind: "submit", ...body }).success).toBe(true);
+    expect(body["payload"]).toEqual({ site: "spoke-a.example" });
+    expect(leadSubmitBodySchema.safeParse(body).success).toBe(true);
   });
 
   it.each([
     ["unset", undefined],
     ["empty", ""],
     ["whitespace only", "   "],
-  ])("omits payload.site when AILK_LEAD_SITE is %s", async (_label, value) => {
+  ])("sends the payload as it came when AILK_LEAD_SITE is %s", async (_label, value) => {
     if (value !== undefined) process.env.AILK_LEAD_SITE = value;
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000d6", persisted: "db" },
-    });
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
 
     await ailkCaptureLead(VALID_INPUT);
 
-    const call = apiClient.leads.submit.mock.calls[0][0] as { payload: Record<string, unknown> };
-    expect(call.payload).not.toHaveProperty("site");
+    expect(apiClient.leads.submit.mock.calls[0][0]).toEqual(VALID_INPUT);
   });
 
   it("trims surrounding whitespace from AILK_LEAD_SITE", async () => {
     process.env.AILK_LEAD_SITE = "  spoke-a.example\n";
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000d7", persisted: "db" },
-    });
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
 
     await ailkCaptureLead(VALID_INPUT);
 
@@ -260,10 +184,7 @@ describe("ailkCaptureLead — visitor-forwarding headers (#8073)", () => {
   });
 
   it("calls api-client with exactly one argument when there is no trusted address", async () => {
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000e1", persisted: "db" },
-    });
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
     process.env.AILK_VISITOR_FORWARD_KEY = "spoke-key";
 
     await ailkCaptureLead(VALID_INPUT);
@@ -272,10 +193,7 @@ describe("ailkCaptureLead — visitor-forwarding headers (#8073)", () => {
   });
 
   it("forwards the trusted address and the forward key as the two visitor headers", async () => {
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000e2", persisted: "db" },
-    });
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
     process.env.AILK_VISITOR_FORWARD_KEY = "spoke-key";
 
     await trustedCallerAddress.run("203.0.113.9", () =>
@@ -292,10 +210,7 @@ describe("ailkCaptureLead — visitor-forwarding headers (#8073)", () => {
   });
 
   it("sends no headers when there is a trusted address but no forward key", async () => {
-    apiClient.leads.submit.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "lead_00000000-0000-7000-8000-0000000000e3", persisted: "db" },
-    });
+    apiClient.leads.submit.mockResolvedValueOnce({ ok: true, body: WIRE });
     delete process.env.AILK_VISITOR_FORWARD_KEY;
 
     await trustedCallerAddress.run("203.0.113.9", () =>

package/templates/apps/mcp/__tests__/subscribe_newsletter.test.ts

@@ -1,13 +1,15 @@
 /**
  * Tests for the subscribe_newsletter MCP tool handler.
  *
- * Acceptance criteria verified here:
+ * The tool takes the body `POST /v1/leads/subscribe` takes — `{ email,
+ * source }` — and returns the route's 201 body (#7172 AC-11 — the tool
+ * adopted the API). Verified here:
  * 1. Malformed input → { ok: false, error: { kind: 'invalid_input', issues } }, api-client never called
- * 2. Happy path → forwards to apiClient.leads.subscribe, returns { ok: true, id, persisted }
- * 3. API 400 → { ok: false, error: { kind: 'api_error', status: 400 } }
- * 4. API 503 → { ok: false, error: { kind: 'api_error', status: 503 } }
- * 5. API 429 → { ok: false, error: { kind: 'api_error', status: 429 } }
- * 6. #8073 — forwards the trusted caller address + AILK_VISITOR_FORWARD_KEY
+ * 2. Happy path → posts exactly the parsed body to apiClient.leads.subscribe —
+ *    no `siteId`, whatever AILK_SITE_ID says, no stamped `source`, no
+ *    `firstName` — and returns the route's body unchanged, `email` included
+ * 3. API 400 / 503 / 429 → { ok: false, error: { kind: 'api_error', status } }
+ * 4. #8073 — forwards the trusted caller address + AILK_VISITOR_FORWARD_KEY
  *    as the two visitor-forwarding headers only when both are present
  */
 
@@ -29,145 +31,81 @@ jest.mock("@working-theory/api-client", () => {
   };
 });
 
- 
+
 const { apiClient } = require("@working-theory/api-client") as {
   apiClient: { leads: { subscribe: jest.Mock } };
 };
 
-const VALID_INPUT = {
-  email: "jane@example.com",
+/** The route body, as an agent sends it. */
+const VALID_INPUT = { email: "jane@example.com", source: "mcp" };
+
+/** The route's 201 body, as the api-client hands it back. */
+const WIRE = {
+  id: "subscr_00000000-0000-7000-8000-0000000000d1",
+  persisted: "db",
+  email: { skipped: true, reason: "no sender configured" },
 };
 
 beforeEach(() => {
   jest.clearAllMocks();
+  delete process.env.AILK_SITE_ID;
 });
 
 describe("ailkSubscribeNewsletter — input validation", () => {
-  it("rejects malformed input (invalid email) without calling api-client", async () => {
-    const result = await ailkSubscribeNewsletter({ email: "not-an-email" });
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.kind).toBe("invalid_input");
-      if (result.error.kind === "invalid_input") {
-        expect(Array.isArray(result.error.issues)).toBe(true);
-        expect(result.error.issues.length).toBeGreaterThan(0);
-      }
+  it.each([
+    ["an invalid email", { email: "not-an-email", source: "mcp" }],
+    ["no source", { email: "jane@example.com" }],
+    ["a source with a control character", { email: "jane@example.com", source: "a\nb" }],
+  ])("rejects %s without calling api-client", async (_label, input) => {
+    const result = await ailkSubscribeNewsletter(input as never);
+
+    expect(result).toMatchObject({ ok: false, error: { kind: "invalid_input" } });
+    if (!result.ok && result.error.kind === "invalid_input") {
+      expect(result.error.issues.length).toBeGreaterThan(0);
     }
     expect(apiClient.leads.subscribe).not.toHaveBeenCalled();
   });
 });
 
 describe("ailkSubscribeNewsletter — happy path", () => {
-  it("forwards canonical body to api-client and returns ok:true with id and persisted", async () => {
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "subscr_00000000-0000-7000-8000-0000000000d1", persisted: "db" },
-    });
-
-    const result = await ailkSubscribeNewsletter(VALID_INPUT);
-
-    expect(apiClient.leads.subscribe).toHaveBeenCalledWith({
-      siteId: "default",
-      email: "jane@example.com",
-      source: "mcp",
-    });
-    expect(result.ok).toBe(true);
-    if (result.ok) {
-      expect(result.id).toBe("subscr_00000000-0000-7000-8000-0000000000d1");
-      expect(result.persisted).toBe("db");
-    }
-  });
-});
-
-describe("ailkSubscribeNewsletter — API error mapping", () => {
-  it("maps API 400 to { ok: false, error: { kind: 'api_error', status: 400 } }", async () => {
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: false,
-      status: 400,
-      body: { error: "bad_request" },
-    });
-
-    const result = await ailkSubscribeNewsletter(VALID_INPUT);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.kind).toBe("api_error");
-      if (result.error.kind === "api_error") {
-        expect(result.error.status).toBe(400);
-      }
-    }
-  });
-
-  it("maps API 503 to { ok: false, error: { kind: 'api_error', status: 503 } }", async () => {
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: false,
-      status: 503,
-      body: { error: "service_unavailable" },
-    });
-
-    const result = await ailkSubscribeNewsletter(VALID_INPUT);
-
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.kind).toBe("api_error");
-      if (result.error.kind === "api_error") {
-        expect(result.error.status).toBe(503);
-      }
-    }
-  });
-
-  it("maps API 429 to { ok: false, error: { kind: 'api_error', status: 429 } }", async () => {
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: false,
-      status: 429,
-      body: { error: "rate_limited" },
-    });
+  it("posts exactly the parsed body and returns the route's body unchanged, email included", async () => {
+    apiClient.leads.subscribe.mockResolvedValueOnce({ ok: true, body: WIRE });
 
     const result = await ailkSubscribeNewsletter(VALID_INPUT);
 
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.error.kind).toBe("api_error");
-      if (result.error.kind === "api_error") {
-        expect(result.error.status).toBe(429);
-      }
-    }
+    expect(apiClient.leads.subscribe).toHaveBeenCalledWith(VALID_INPUT);
+    expect(result).toEqual(WIRE);
   });
-});
 
-describe("ailkSubscribeNewsletter — siteId default", () => {
-  it("uses siteId 'default' when AILK_SITE_ID is unset", async () => {
-    delete process.env.AILK_SITE_ID;
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "subscr_00000000-0000-7000-8000-0000000000d2", persisted: "db" },
-    });
+  it("never sends a siteId or a firstName, whatever AILK_SITE_ID says or the agent sent", async () => {
+    process.env.AILK_SITE_ID = "site-abc";
+    apiClient.leads.subscribe.mockResolvedValueOnce({ ok: true, body: WIRE });
 
-    await ailkSubscribeNewsletter(VALID_INPUT);
+    await ailkSubscribeNewsletter({
+      ...VALID_INPUT,
+      siteId: "site-xyz",
+      firstName: "Jane",
+    } as never);
 
-    const call = apiClient.leads.subscribe.mock.calls[0][0] as { siteId: string };
-    expect(call.siteId).toBe("default");
+    expect(apiClient.leads.subscribe.mock.calls[0][0]).toEqual(VALID_INPUT);
   });
 });
 
-describe("ailkSubscribeNewsletter — siteId override", () => {
-  afterEach(() => {
-    delete process.env.AILK_SITE_ID;
-  });
-
-  it("uses AILK_SITE_ID env var when set", async () => {
-    process.env.AILK_SITE_ID = "site-abc";
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "subscr_00000000-0000-7000-8000-0000000000d3", persisted: "db" },
-    });
-
-    await ailkSubscribeNewsletter(VALID_INPUT);
-
-    const call = apiClient.leads.subscribe.mock.calls[0][0] as { siteId: string };
-    expect(call.siteId).toBe("site-abc");
-  });
+describe("ailkSubscribeNewsletter — API error mapping", () => {
+  it.each([400, 503, 429])(
+    "maps API %i to { ok: false, error: { kind: 'api_error', status } }",
+    async (status) => {
+      apiClient.leads.subscribe.mockResolvedValueOnce({
+        ok: false,
+        status,
+        body: { error: "refused" },
+      });
+
+      const result = await ailkSubscribeNewsletter(VALID_INPUT);
+
+      expect(result).toEqual({ ok: false, error: { kind: "api_error", status } });
+    },
+  );
 });
 
 describe("ailkSubscribeNewsletter — visitor-forwarding headers (#8073)", () => {
@@ -176,10 +114,7 @@ describe("ailkSubscribeNewsletter — visitor-forwarding headers (#8073)", () =>
   });
 
   it("calls api-client with exactly one argument when there is no trusted address", async () => {
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "subscr_00000000-0000-7000-8000-0000000000e1", persisted: "db" },
-    });
+    apiClient.leads.subscribe.mockResolvedValueOnce({ ok: true, body: WIRE });
     process.env.AILK_VISITOR_FORWARD_KEY = "spoke-key";
 
     await ailkSubscribeNewsletter(VALID_INPUT);
@@ -188,10 +123,7 @@ describe("ailkSubscribeNewsletter — visitor-forwarding headers (#8073)", () =>
   });
 
   it("forwards the trusted address and the forward key as the two visitor headers", async () => {
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "subscr_00000000-0000-7000-8000-0000000000e2", persisted: "db" },
-    });
+    apiClient.leads.subscribe.mockResolvedValueOnce({ ok: true, body: WIRE });
     process.env.AILK_VISITOR_FORWARD_KEY = "spoke-key";
 
     await trustedCallerAddress.run("203.0.113.9", () =>
@@ -208,10 +140,7 @@ describe("ailkSubscribeNewsletter — visitor-forwarding headers (#8073)", () =>
   });
 
   it("sends no headers when there is a trusted address but no forward key", async () => {
-    apiClient.leads.subscribe.mockResolvedValueOnce({
-      ok: true,
-      body: { id: "subscr_00000000-0000-7000-8000-0000000000e3", persisted: "db" },
-    });
+    apiClient.leads.subscribe.mockResolvedValueOnce({ ok: true, body: WIRE });
     delete process.env.AILK_VISITOR_FORWARD_KEY;
 
     await trustedCallerAddress.run("203.0.113.9", () =>