gloomberb 0.13.2 → 0.14.0

package/src/plugins/builtin/chat/controller.test.ts

@@ -1,6 +1,4 @@
 import { afterEach, beforeEach, describe, expect, jest, test } from "bun:test";
-import type { AppNotificationRequest } from "../../../types/plugin";
-import { MemoryPluginPersistence as MemoryPersistence } from "../../../test-support/plugin-persistence";
 import {
   apiClient,
   type ChatChannel,
@@ -9,9 +7,30 @@ import {
   type ChatStateResponse,
 } from "../../../api-client";
 import { ApiRequestError } from "../../../api-client/errors";
+import { MemoryPluginPersistence as MemoryPersistence } from "../../../test-support/plugin-persistence";
+import type { AppNotificationRequest } from "../../../types/plugin";
 import { ChatController } from "./controller";
 import { SESSION_RETRY_MS } from "./controller/state";
 
+const testControllers = new Set<ChatController>();
+
+function createController(): ChatController {
+  const controller = new ChatController();
+  testControllers.add(controller);
+  return controller;
+}
+
+function persistSession(persistence: MemoryPersistence, user: Record<string, unknown> = {}) {
+  persistence.setState("session", {
+    sessionToken: "token-123",
+    user: { id: "u1", username: "vince", ...user },
+  }, { schemaVersion: 1 });
+}
+
+function chatMessage(input: Pick<ChatMessage, "id" | "content" | "createdAt"> & Partial<ChatMessage>): ChatMessage {
+  return { channelId: "everyone", replyToId: null, user: { id: "u1", username: "vince", displayName: "Vince" }, ...input };
+}
+
 const TRANSCRIPT_KIND = "channel-transcript";
 const TRANSCRIPT_KEY = "everyone";
 const TRANSCRIPT_SOURCE = "server";
@@ -100,6 +119,8 @@ beforeEach(() => {
 });
 
 afterEach(() => {
+  for (const controller of testControllers) controller.dispose();
+  testControllers.clear();
   jest.useRealTimers();
   apiClient.dispose();
   apiClient.setSessionToken(null);
@@ -121,20 +142,14 @@ afterEach(() => {
 describe("ChatController", () => {
   test("hydrates cached session, draft, and transcript from plugin persistence", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const message: ChatMessage = {
+    const controller = createController();
+    const message: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "hello",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince" },
-    }, { schemaVersion: 1 });
+    persistSession(persistence);
     persistence.setState("channel:everyone", {
       draft: "cached draft",
       replyToId: "m1",
@@ -161,7 +176,7 @@ describe("ChatController", () => {
 
   test("uses a browser cookie session without exposing its token", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const sentMessages: string[] = [];
 
     apiClient.setCookieSessionMode(true);
@@ -201,7 +216,7 @@ describe("ChatController", () => {
   });
 
   test("rejects unknown shortcut channels after the server list loads", async () => {
-    const controller = new ChatController();
+    const controller = createController();
     apiClient.getChannels = async () => SERVER_CHAT_CHANNELS;
 
     await expect(controller.resolveRequiredChannelId("help")).resolves.toBe("help");
@@ -212,24 +227,28 @@ describe("ChatController", () => {
 
   test("keeps private channels when a public refresh finishes after chat state", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const directChannel: ChatChannel = {
       id: "dm:u2",
       name: "u2",
       kind: "direct",
       created_at: "2026-03-28T00:00:00.000Z",
     };
+    const teamChannel: ChatChannel = {
+      id: "team:org-1:trades",
+      name: "trades",
+      kind: "team",
+      teamId: "org-1",
+      created_at: "2026-09-14T00:00:00.000Z",
+    };
     let resolvePublicChannels: ((channels: ChatChannel[]) => void) | undefined;
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     apiClient.getChannels = () => new Promise((resolve) => {
       resolvePublicChannels = resolve;
     });
     apiClient.getChatState = async () => ({
-      channels: [...SERVER_CHAT_CHANNELS, directChannel],
+      channels: [...SERVER_CHAT_CHANNELS, directChannel, teamChannel],
       onlineCount: 0,
       channelStates: [],
       notifications: [],
@@ -239,21 +258,20 @@ describe("ChatController", () => {
     const publicRefresh = controller.refreshChannels();
     await controller.refreshChatState();
     expect(controller.getChannels().map((channel) => channel.id)).toContain(directChannel.id);
+    expect(controller.getChannels().map((channel) => channel.id)).toContain(teamChannel.id);
 
     resolvePublicChannels!(SERVER_CHAT_CHANNELS);
     await publicRefresh;
 
     expect(controller.getChannels().map((channel) => channel.id)).toContain(directChannel.id);
+    expect(controller.getChannels().map((channel) => channel.id)).toContain(teamChannel.id);
   });
 
   test("hydrates a cached verified user into the api client for offline use", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.attachPersistence(persistence);
 
@@ -271,7 +289,7 @@ describe("ChatController", () => {
 
   test("does not restore persisted websocket tokens", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
 
     persistence.setState("session", {
       sessionToken: "token-123",
@@ -292,12 +310,9 @@ describe("ChatController", () => {
 
   test("reset clears persisted chat state and session token", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince" },
-    }, { schemaVersion: 1 });
+    persistSession(persistence);
     persistence.setState("channel:everyone", {
       draft: "cached draft",
       replyToId: null,
@@ -325,7 +340,7 @@ describe("ChatController", () => {
 
   test("defers draft persistence and subscriber sync until the user pauses or leaves", () => {
     const persistence = new TrackingPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const draftSnapshots: string[] = [];
 
     controller.attachPersistence(persistence);
@@ -352,7 +367,7 @@ describe("ChatController", () => {
   });
 
   test("pauses verification polling while the app is backgrounded", () => {
-    const controller = new ChatController();
+    const controller = createController();
 
     apiClient.setSessionToken("token-123");
     (controller as any).session.sessionToken = "token-123";
@@ -369,7 +384,7 @@ describe("ChatController", () => {
   });
 
   test("dispose stops verification polling and closes the live connection", () => {
-    const controller = new ChatController();
+    const controller = createController();
     let closed = false;
 
     apiClient.setSessionToken("token-123");
@@ -398,7 +413,7 @@ describe("ChatController", () => {
 
   test("runs a quiet safety refresh while the live connection is active", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const originalSetInterval = globalThis.setInterval;
     const originalClearInterval = globalThis.clearInterval;
     const intervalCallbacks: Array<() => void> = [];
@@ -407,10 +422,7 @@ describe("ChatController", () => {
     let getMessagesCalls = 0;
     const loadingSnapshots: boolean[] = [];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     (globalThis as any).setInterval = (callback: () => void, timeout: number) => {
       expect(timeout).toBe(30_000);
@@ -466,7 +478,7 @@ describe("ChatController", () => {
 
   test("validates a persisted native session through protected chat state", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const directChannel: ChatChannel = {
       id: "dm:u2",
       name: "u2",
@@ -474,10 +486,7 @@ describe("ChatController", () => {
       created_at: "2026-03-28T00:00:00.000Z",
     };
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.attachPersistence(persistence);
     apiClient.getSession = async () => {
@@ -513,7 +522,7 @@ describe("ChatController", () => {
 
   test("clears an expired persisted session when protected chat rejects it", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
 
     persistence.setState("session", {
       sessionToken: "expired-token",
@@ -543,7 +552,7 @@ describe("ChatController", () => {
 
   test("clears an expired persisted session for an unverified user", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     let profileRequests = 0;
 
     persistence.setState("session", {
@@ -572,12 +581,9 @@ describe("ChatController", () => {
 
   test("downgrades stale verification state when protected chat rejects it", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.attachPersistence(persistence);
     apiClient.getSession = async () => {
@@ -602,7 +608,7 @@ describe("ChatController", () => {
 
   test("does not let a stale validation failure clear a replacement session", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     let rejectProbe: ((error: Error) => void) | null = null;
     let markProbeStarted: (() => void) | null = null;
     const probeStarted = new Promise<void>((resolve) => {
@@ -649,7 +655,7 @@ describe("ChatController", () => {
 
   test("does not apply stale chat state after a replacement session", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     let resolveProbe: ((state: ChatStateResponse) => void) | null = null;
     let markProbeStarted: (() => void) | null = null;
     const probeStarted = new Promise<void>((resolve) => {
@@ -701,12 +707,9 @@ describe("ChatController", () => {
   test("revalidates a persisted session after an offline validation probe", async () => {
     jest.useFakeTimers();
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.attachPersistence(persistence);
     apiClient.getSession = async () => {
@@ -739,7 +742,7 @@ describe("ChatController", () => {
 
   test("signs out when get-session returns no user and no token is stored", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
 
     persistence.setState("session", {
       sessionToken: null,
@@ -758,12 +761,9 @@ describe("ChatController", () => {
 
   test("keeps the cached session when session refresh fails transiently", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.attachPersistence(persistence);
     apiClient.getSession = async () => {
@@ -790,15 +790,12 @@ describe("ChatController", () => {
 
   test("refreshes the public transcript without requiring a session", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const message: ChatMessage = {
+    const controller = createController();
+    const message: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "hello from the lobby",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
+    });
 
     controller.attachPersistence(persistence);
     apiClient.getMessages = async () => [message];
@@ -816,23 +813,19 @@ describe("ChatController", () => {
 
   test("keeps per-channel drafts and transcripts isolated", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const everyoneMessage: ChatMessage = {
+    const controller = createController();
+    const everyoneMessage: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "general",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
-    const optionsMessage: ChatMessage = {
+    });
+    const optionsMessage: ChatMessage = chatMessage({
       id: "m2",
       channelId: "options",
       content: "options note",
-      replyToId: null,
       createdAt: "2026-03-28T00:01:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
     persistence.setState("channel:everyone", {
       draft: "general draft",
@@ -868,23 +861,18 @@ describe("ChatController", () => {
 
   test("stores the latest message id as the incremental cursor", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const initial: ChatMessage = {
+    const controller = createController();
+    const initial: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "hello",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
-    const next: ChatMessage = {
+    });
+    const next: ChatMessage = chatMessage({
       id: "m2",
-      channelId: "everyone",
       content: "new message",
-      replyToId: null,
       createdAt: "2026-03-28T00:01:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
     persistence.setState("channel:everyone", {
       draft: "",
@@ -924,31 +912,24 @@ describe("ChatController", () => {
 
   test("recovers a message the cursor already moved past", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const asked: ChatMessage = {
+    const controller = createController();
+    const asked: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "why is the chart glitching",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
-    const missed: ChatMessage = {
+    });
+    const missed: ChatMessage = chatMessage({
       id: "m2",
-      channelId: "everyone",
       content: "charts open with GP",
       replyToId: "m1",
       createdAt: "2026-03-28T00:01:00.000Z",
       user: { id: "u2", username: "gloombot", displayName: "Gloombot" },
-    };
-    const acknowledged: ChatMessage = {
+    });
+    const acknowledged: ChatMessage = chatMessage({
       id: "m3",
-      channelId: "everyone",
       content: "got it",
-      replyToId: null,
       createdAt: "2026-03-28T00:02:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
+    });
 
     // The cursor already sits on m3, so an incremental fetch can never ask for
     // m2 again even though the server still has it.
@@ -979,21 +960,16 @@ describe("ChatController", () => {
 
   test("hydrates missing transcript cache without marking history unread", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
-    const history: ChatMessage = {
+    const history: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "already seen",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     persistence.setState("channel:everyone", {
       draft: "",
       replyToId: null,
@@ -1027,23 +1003,18 @@ describe("ChatController", () => {
 
   test("backfills from cached transcript when persisted cursor is ahead of the cache", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const cached: ChatMessage = {
+    const controller = createController();
+    const cached: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "cached",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
-    const fresh: ChatMessage = {
+    });
+    const fresh: ChatMessage = chatMessage({
       id: "m2",
-      channelId: "everyone",
       content: "fresh",
-      replyToId: null,
       createdAt: "2026-03-28T00:01:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
     persistence.setState("channel:everyone", {
       draft: "",
@@ -1083,29 +1054,22 @@ describe("ChatController", () => {
 
   test("shows a pending message immediately and replaces it when the send succeeds", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const replyTarget: ChatMessage = {
+    const controller = createController();
+    const replyTarget: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "first",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
-    const sentMessage: ChatMessage = {
+    });
+    const sentMessage: ChatMessage = chatMessage({
       id: "m2",
-      channelId: "everyone",
       content: "hello",
       replyToId: "m1",
       createdAt: "2026-03-28T00:01:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
       replyTo: { content: "first", user: { username: "bob" } },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     persistence.setState("channel:everyone", {
       draft: "hello",
       replyToId: "m1",
@@ -1154,13 +1118,10 @@ describe("ChatController", () => {
 
   test("sends one idempotency key while the same message is pending", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const clientMessageIds: Array<string | undefined> = [];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.attachPersistence(persistence);
     apiClient.getMessages = async () => [];
@@ -1188,20 +1149,14 @@ describe("ChatController", () => {
 
   test("edits the latest message from the current user", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const original: ChatMessage = {
+    const controller = createController();
+    const original: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "helo",
-      replyToId: null,
       createdAt: recentChatTimestamp(),
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     persistence.setResource(TRANSCRIPT_KIND, TRANSCRIPT_KEY, {
       messages: [original],
     }, {
@@ -1230,21 +1185,15 @@ describe("ChatController", () => {
 
   test("refuses to edit after the edit window expires", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
-    const original: ChatMessage = {
+    const original: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "old typo",
-      replyToId: null,
       createdAt: recentChatTimestamp(16 * 60_000),
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     persistence.setResource(TRANSCRIPT_KIND, TRANSCRIPT_KEY, {
       messages: [original],
     }, {
@@ -1266,31 +1215,22 @@ describe("ChatController", () => {
 
   test("refuses to edit an older message from the current user", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
     const messages: ChatMessage[] = [
-      {
+      chatMessage({
         id: "m1",
-        channelId: "everyone",
         content: "older",
-        replyToId: null,
         createdAt: "2026-03-28T00:00:00.000Z",
-        user: { id: "u1", username: "vince", displayName: "Vince" },
-      },
-      {
+      }),
+      chatMessage({
         id: "m2",
-        channelId: "everyone",
         content: "newer",
-        replyToId: null,
         createdAt: "2026-03-28T00:01:00.000Z",
-        user: { id: "u1", username: "vince", displayName: "Vince" },
-      },
+      }),
     ];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     persistence.setResource(TRANSCRIPT_KIND, TRANSCRIPT_KEY, {
       messages,
     }, {
@@ -1312,13 +1252,10 @@ describe("ChatController", () => {
 
   test("marks a pending message as failed when sending errors", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.setNotifier((notification) => {
       notifications.push(notification);
@@ -1347,21 +1284,16 @@ describe("ChatController", () => {
 
   test("tracks unread mentions from fetched messages without issuing local notifications", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
-    const message: ChatMessage = {
+    const message: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "hey @Vince can you take a look?",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.setNotifier((notification) => {
       notifications.push(notification);
@@ -1380,14 +1312,11 @@ describe("ChatController", () => {
 
   test("delivers background notifications while the focused chat stays unread", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
     const deliveredIds: string[][] = [];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.setNotifier((notification) => {
       notifications.push(notification);
@@ -1421,15 +1350,12 @@ describe("ChatController", () => {
 
   test("keeps undeliverable background notifications pending for email fallback", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const deliveredIds: string[][] = [];
     let desktopAvailable = false;
     let presentationCount = 0;
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     controller.setNotifier(() => {
       presentationCount += 1;
       return { toastVisible: false, desktopRequested: desktopAvailable };
@@ -1456,21 +1382,16 @@ describe("ChatController", () => {
 
   test("marks mentions viewed when a chat view opens", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
-    const message: ChatMessage = {
+    const message: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "hey @vince",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.setNotifier((notification) => {
       notifications.push(notification);
@@ -1493,14 +1414,11 @@ describe("ChatController", () => {
 
   test("keeps focused foreground notifications read without presenting an alert", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
     const deliveredIds: string[][] = [];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
 
     controller.setNotifier((notification) => {
       notifications.push(notification);
@@ -1526,14 +1444,11 @@ describe("ChatController", () => {
 
   test("keeps an unfocused foreground chat unread while presenting an in-app alert", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
     const deliveredIds: string[][] = [];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     controller.setNotifier((notification) => {
       notifications.push(notification);
       return { toastVisible: true, desktopRequested: false };
@@ -1559,14 +1474,11 @@ describe("ChatController", () => {
 
   test("loads server chat state, pending reply notifications, and acks delivery", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
     const deliveredIds: string[][] = [];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     apiClient.getSession = async () => ({
       id: "u1",
       name: "Vince",
@@ -1592,7 +1504,7 @@ describe("ChatController", () => {
         channelId: "options",
         messageId: "m2",
         createdAt: "2026-03-28T00:02:00.000Z",
-        message: {
+        message: chatMessage({
           id: "m2",
           channelId: "options",
           content: "answering you",
@@ -1600,7 +1512,7 @@ describe("ChatController", () => {
           createdAt: "2026-03-28T00:02:00.000Z",
           user: { id: "u2", username: "bob", displayName: "Bob" },
           replyTo: { content: "question", user: { id: "u1", username: "vince" } },
-        },
+        }),
       }],
     });
     apiClient.markChatNotificationsDelivered = async (ids) => {
@@ -1638,13 +1550,10 @@ describe("ChatController", () => {
 
   test("toggles channel notifications optimistically and keeps the channel connected", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const connectedChannels: string[] = [];
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     apiClient.updateChatChannelState = async (channelId, body) => ({
       channelId,
       notificationsEnabled: body.notificationsEnabled === true,
@@ -1673,7 +1582,7 @@ describe("ChatController", () => {
 
   test("dedupes reply notifications by message id", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
     const notification: ChatNotification = {
       id: "n1",
@@ -1681,21 +1590,17 @@ describe("ChatController", () => {
       channelId: "everyone",
       messageId: "m2",
       createdAt: "2026-03-28T00:02:00.000Z",
-      message: {
+      message: chatMessage({
         id: "m2",
-        channelId: "everyone",
         content: "same reply",
         replyToId: "m1",
         createdAt: "2026-03-28T00:02:00.000Z",
         user: { id: "u2", username: "bob", displayName: "Bob" },
         replyTo: { content: "question", user: { id: "u1", username: "vince" } },
-      },
+      }),
     };
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     controller.setNotifier((entry) => {
       notifications.push(entry);
       return { toastVisible: true, desktopRequested: false };
@@ -1710,22 +1615,18 @@ describe("ChatController", () => {
 
   test("opens a server-issued channel notification at its exact message", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
     const openedMessages: string[] = [];
-    const message: ChatMessage = {
+    const message: ChatMessage = chatMessage({
       id: "m1",
       channelId: "options",
       content: "new option flow",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     controller.setNotifier((entry) => {
       notifications.push(entry);
     }, (channelId, messageId) => {
@@ -1755,7 +1656,7 @@ describe("ChatController", () => {
 
   test("uses direct channel labels in server-issued notification titles", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
     const directChannel: ChatChannel = {
       id: "dm:u2",
@@ -1764,14 +1665,13 @@ describe("ChatController", () => {
       created_at: "2026-03-28T00:00:00.000Z",
       dmUser: { id: "u2", username: "bob", displayName: "Bob" },
     };
-    const message: ChatMessage = {
+    const message: ChatMessage = chatMessage({
       id: "m1",
       channelId: directChannel.id,
       content: "ping",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
     apiClient.getChatState = async () => ({
       channels: [...SERVER_CHAT_CHANNELS, directChannel],
@@ -1784,10 +1684,7 @@ describe("ChatController", () => {
       })),
       notifications: [],
     });
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     controller.setNotifier((entry) => {
       notifications.push(entry);
     });
@@ -1813,20 +1710,16 @@ describe("ChatController", () => {
 
   test("tracks unread channel messages and clears them when the channel opens", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const message: ChatMessage = {
+    const controller = createController();
+    const message: ChatMessage = chatMessage({
       id: "m1",
       channelId: "options",
       content: "new option flow",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     controller.attachPersistence(persistence);
 
     (controller as any).mergeMessages("options", [message]);
@@ -1845,9 +1738,9 @@ describe("ChatController", () => {
 
   test("server reply notifications fire even when channel notifications are disabled", () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const notifications: AppNotificationRequest[] = [];
-    const message: ChatMessage = {
+    const message: ChatMessage = chatMessage({
       id: "m2",
       channelId: "options",
       content: "reply without channel notify",
@@ -1855,12 +1748,9 @@ describe("ChatController", () => {
       createdAt: "2026-03-28T00:00:00.000Z",
       user: { id: "u2", username: "bob", displayName: "Bob" },
       replyTo: { content: "question", user: { id: "u1", username: "vince" } },
-    };
+    });
 
-    persistence.setState("session", {
-      sessionToken: "token-123",
-      user: { id: "u1", username: "vince", emailVerified: true },
-    }, { schemaVersion: 1 });
+    persistSession(persistence, { emailVerified: true });
     controller.setNotifier((notification) => {
       notifications.push(notification);
     });
@@ -1885,25 +1775,20 @@ describe("ChatController", () => {
 
   test("recovers from a legacy timestamp cursor by falling back to a full transcript fetch", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
-    const cached: ChatMessage = {
+    const controller = createController();
+    const cached: ChatMessage = chatMessage({
       id: "m1",
-      channelId: "everyone",
       content: "cached",
-      replyToId: null,
       createdAt: "2026-03-28T00:00:00.000Z",
-      user: { id: "u1", username: "vince", displayName: "Vince" },
-    };
+    });
     const fullTranscript: ChatMessage[] = [
       cached,
-      {
+      chatMessage({
         id: "m2",
-        channelId: "everyone",
         content: "fresh",
-        replyToId: null,
         createdAt: "2026-03-28T00:01:00.000Z",
         user: { id: "u2", username: "bob", displayName: "Bob" },
-      },
+      }),
     ];
 
     persistence.setState("channel:everyone", {
@@ -1942,42 +1827,34 @@ describe("ChatController", () => {
 
   test("loads older messages before the oldest cached message without moving the latest cursor", async () => {
     const persistence = new MemoryPersistence();
-    const controller = new ChatController();
+    const controller = createController();
     const cached: ChatMessage[] = [
-      {
+      chatMessage({
         id: "m3",
-        channelId: "everyone",
         content: "cached older",
-        replyToId: null,
         createdAt: "2026-03-28T00:03:00.000Z",
         user: { id: "u3", username: "cara", displayName: "Cara" },
-      },
-      {
+      }),
+      chatMessage({
         id: "m4",
-        channelId: "everyone",
         content: "cached newer",
-        replyToId: null,
         createdAt: "2026-03-28T00:04:00.000Z",
         user: { id: "u4", username: "drew", displayName: "Drew" },
-      },
+      }),
     ];
     const older: ChatMessage[] = [
-      {
+      chatMessage({
         id: "m1",
-        channelId: "everyone",
         content: "oldest",
-        replyToId: null,
         createdAt: "2026-03-28T00:01:00.000Z",
         user: { id: "u1", username: "alice", displayName: "Alice" },
-      },
-      {
+      }),
+      chatMessage({
         id: "m2",
-        channelId: "everyone",
         content: "older",
-        replyToId: null,
         createdAt: "2026-03-28T00:02:00.000Z",
         user: { id: "u2", username: "bob", displayName: "Bob" },
-      },
+      }),
     ];
 
     persistence.setState("channel:everyone", {