From 40b0cd77c99f9ec8767bd0c8733b24ef16a1cb80 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 23 Feb 2026 21:39:40 +0000 Subject: [PATCH] fix: resolve merge conflicts from story-95/96 squash merges Co-Authored-By: Claude Opus 4.6 --- frontend/src/components/AgentPanel.test.tsx | 23 +-------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/frontend/src/components/AgentPanel.test.tsx b/frontend/src/components/AgentPanel.test.tsx index 817da39..324362b 100644 --- a/frontend/src/components/AgentPanel.test.tsx +++ b/frontend/src/components/AgentPanel.test.tsx @@ -154,28 +154,7 @@ describe("RosterBadge availability state", () => { session_id: null, worktree_path: null, base_branch: null, - }, - ]; - mockedAgents.listAgents.mockResolvedValue(agentList); - - render(); - - const badge = await screen.findByTestId("roster-badge-coder-1"); - // Always idle: grey background and grey text - expect(badge.style.background).toBe("rgba(170, 170, 170, 0.094)"); - expect(badge.style.color).toBe("rgb(170, 170, 170)"); - }); - - // AC2: after agent completes and returns to roster, badge shows idle - it("shows idle state after agent status changes from running to completed", async () => { - const agentList: AgentInfo[] = [ - { - story_id: "81_completed", - agent_name: "coder-1", - status: "completed", - session_id: null, - worktree_path: null, - base_branch: null, + log_session_id: null, }, ]; mockedAgents.listAgents.mockResolvedValue(agentList);