From d069f8b23a5b50531c074216735276819a677cd4 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 21 Feb 2026 22:32:37 +0000
Subject: [PATCH] test(subagents): dedupe focus thread setup fixtures

---
 .../reply/commands-subagents-focus.test.ts    | 82 ++++++++-----------
 1 file changed, 33 insertions(+), 49 deletions(-)

diff --git a/src/auto-reply/reply/commands-subagents-focus.test.ts b/src/auto-reply/reply/commands-subagents-focus.test.ts
index 1f19f6ed23e..a165acf0886 100644
--- a/src/auto-reply/reply/commands-subagents-focus.test.ts
+++ b/src/auto-reply/reply/commands-subagents-focus.test.ts
@@ -131,6 +131,35 @@ function createDiscordCommandParams(commandBody: string) {
   return params;
 }
 
+function createStoredBinding(overrides?: Partial<FakeBinding>): FakeBinding {
+  return {
+    accountId: "default",
+    channelId: "parent-1",
+    threadId: "thread-1",
+    targetKind: "subagent",
+    targetSessionKey: "agent:main:subagent:child",
+    agentId: "main",
+    label: "child",
+    boundBy: "user-1",
+    boundAt: Date.now(),
+    ...overrides,
+  };
+}
+
+async function focusCodexAcpInThread(fake = createFakeThreadBindingManager()) {
+  hoisted.getThreadBindingManagerMock.mockReturnValue(fake.manager);
+  hoisted.callGatewayMock.mockImplementation(async (request: unknown) => {
+    const method = (request as { method?: string }).method;
+    if (method === "sessions.resolve") {
+      return { key: "agent:codex-acp:session-1" };
+    }
+    return {};
+  });
+  const params = createDiscordCommandParams("/focus codex-acp");
+  const result = await handleSubagentsCommand(params, true);
+  return { fake, result };
+}
+
 describe("/focus, /unfocus, /agents", () => {
   beforeEach(() => {
     resetSubagentRegistryForTests();
@@ -140,18 +169,7 @@ describe("/focus, /unfocus, /agents", () => {
   });
 
   it("/focus resolves ACP sessions and binds the current Discord thread", async () => {
-    const fake = createFakeThreadBindingManager();
-    hoisted.getThreadBindingManagerMock.mockReturnValue(fake.manager);
-    hoisted.callGatewayMock.mockImplementation(async (request: unknown) => {
-      const method = (request as { method?: string }).method;
-      if (method === "sessions.resolve") {
-        return { key: "agent:codex-acp:session-1" };
-      }
-      return {};
-    });
-
-    const params = createDiscordCommandParams("/focus codex-acp");
-    const result = await handleSubagentsCommand(params, true);
+    const { fake, result } = await focusCodexAcpInThread();
 
     expect(result?.reply?.text).toContain("bound this thread");
     expect(result?.reply?.text).toContain("(acp)");
@@ -168,19 +186,7 @@ describe("/focus, /unfocus, /agents", () => {
   });
 
   it("/unfocus removes an active thread binding for the binding owner", async () => {
-    const fake = createFakeThreadBindingManager([
-      {
-        accountId: "default",
-        channelId: "parent-1",
-        threadId: "thread-1",
-        targetKind: "subagent",
-        targetSessionKey: "agent:main:subagent:child",
-        agentId: "main",
-        label: "child",
-        boundBy: "user-1",
-        boundAt: Date.now(),
-      },
-    ]);
+    const fake = createFakeThreadBindingManager([createStoredBinding()]);
     hoisted.getThreadBindingManagerMock.mockReturnValue(fake.manager);
 
     const params = createDiscordCommandParams("/unfocus");
@@ -196,30 +202,8 @@ describe("/focus, /unfocus, /agents", () => {
   });
 
   it("/focus rejects rebinding when the thread is focused by another user", async () => {
-    const fake = createFakeThreadBindingManager([
-      {
-        accountId: "default",
-        channelId: "parent-1",
-        threadId: "thread-1",
-        targetKind: "subagent",
-        targetSessionKey: "agent:main:subagent:child",
-        agentId: "main",
-        label: "child",
-        boundBy: "user-2",
-        boundAt: Date.now(),
-      },
-    ]);
-    hoisted.getThreadBindingManagerMock.mockReturnValue(fake.manager);
-    hoisted.callGatewayMock.mockImplementation(async (request: unknown) => {
-      const method = (request as { method?: string }).method;
-      if (method === "sessions.resolve") {
-        return { key: "agent:codex-acp:session-1" };
-      }
-      return {};
-    });
-
-    const params = createDiscordCommandParams("/focus codex-acp");
-    const result = await handleSubagentsCommand(params, true);
+    const fake = createFakeThreadBindingManager([createStoredBinding({ boundBy: "user-2" })]);
+    const { result } = await focusCodexAcpInThread(fake);
 
     expect(result?.reply?.text).toContain("Only user-2 can refocus this thread.");
     expect(fake.manager.bindTarget).not.toHaveBeenCalled();