@devries-cameron20 / t3code-1 / commits / e9fbb56922
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

test(web): terminal drawer test keeps its session atoms across GC (#36888)

Julius Marminge committed Nov 14, 2026 at 11:14 UTC e9fbb5692241b1d18a7dd046ae842c9fc01dc20b
1 file changed +17 -15
apps/web/src/components/ThreadTerminalDrawer.browser.test.tsx
+17 -15
@@ -59,23 +59,25 @@ vi.mock("~/terminal/ghostty/surface", () => ({
59 }));
60 vi.mock("../state/terminalSessions", async () => {
61 const Atom = await import("effect/reactivity/Atom");
62 - // Families cache their atoms, so each test needs fresh ones for its own statuses.
63 - const makeSessions = () =>
64 - Atom.family((_environmentId: EnvironmentId) =>
65 - Atom.family((threadId: ThreadId) =>
66 - Atom.make({
67 - ...EMPTY_TERMINAL_SESSION_STATE,
68 - status: fixture.statusByThreadId.get(threadId) ?? "closed",
69 - version: 1,
70 - }),
71 - ),
72 - );
73 - let sessions = makeSessions();
62 + // A strong map, not Atom.family: a family holds weakly, so a GC could hand setSession a new atom.
63 + const makeSession = (threadId: ThreadId) =>
64 + Atom.make<typeof EMPTY_TERMINAL_SESSION_STATE>({
65 + ...EMPTY_TERMINAL_SESSION_STATE,
66 + status: fixture.statusByThreadId.get(threadId) ?? "closed",
67 + version: 1,
68 + });
69 + let sessions = new Map<string, ReturnType<typeof makeSession>>();
70 + const session = (environmentId: EnvironmentId, threadId: ThreadId) => {
71 + const key = JSON.stringify([environmentId, threadId]);
72 + const atom = sessions.get(key) ?? makeSession(threadId);
73 + sessions.set(key, atom);
74 + return atom;
75 + };
76 fixture.resetSessions = () => {
75 - sessions = makeSessions();
77 + sessions = new Map();
78 };
79 fixture.setSession = (thread, status, version) => {
78 - appAtomRegistry.set(sessions(thread.environmentId)(thread.threadId), {
80 + appAtomRegistry.set(session(thread.environmentId, thread.threadId), {
81 ...EMPTY_TERMINAL_SESSION_STATE,
82 status,
83 version,
@@ -83,7 +85,7 @@ vi.mock("../state/terminalSessions", async () => {
85 };
86 return {
87 attachedTerminalSessionAtom: (environmentId: EnvironmentId, terminal: { threadId: ThreadId }) =>
86 - sessions(environmentId)(terminal.threadId),
88 + session(environmentId, terminal.threadId),
89 };
90 });
91 vi.mock("../state/session", () => ({