dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

story-kit: merge 225_story_surface_merge_conflicts_and_failures_in_the_web_ui

Browse Source
This commit is contained in:
Dave
2026-02-27 10:23:30 +00:00
parent e6b18cfc3b
commit f8bbe1ea31
8 changed files with 174 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/src/components/LozengeFlyContext.test.tsx
View File

@@ -57,6 +57,7 @@ describe("AgentLozenge fixed intrinsic width", () => {
story_id: "74_width_test",
name: "Width Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: "sonnet", status: "running" },
},
];
@@ -108,6 +109,7 @@ describe("LozengeFlyProvider fly-in visibility", () => {
story_id: "74_hidden_test",
name: "Hidden Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
],
@@ -143,6 +145,7 @@ describe("LozengeFlyProvider fly-in visibility", () => {
story_id: "74_no_roster",
name: "No Roster",
error: null,
merge_failure: null,
agent: {
agent_name: "unknown-agent",
model: null,
@@ -208,6 +211,7 @@ describe("LozengeFlyProvider fly-in clone", () => {
story_id: "74_portal_test",
name: "Portal Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: "sonnet", status: "running" },
},
],
@@ -248,6 +252,7 @@ describe("LozengeFlyProvider fly-in clone", () => {
story_id: "74_clone_remove",
name: "Clone Remove",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
],
@@ -294,6 +299,7 @@ describe("LozengeFlyProvider fly-in clone", () => {
story_id: "74_reveal_test",
name: "Reveal Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
],
@@ -362,6 +368,7 @@ describe("LozengeFlyProvider fly-out", () => {
story_id: "74_fly_out_test",
name: "Fly Out Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: "haiku", status: "completed" },
},
],
@@ -386,6 +393,7 @@ describe("LozengeFlyProvider fly-out", () => {
story_id: "74_fly_out_test",
name: "Fly Out Test",
error: null,
merge_failure: null,
agent: null,
},
],
@@ -417,6 +425,7 @@ describe("AgentLozenge idle vs active appearance", () => {
story_id: "74_running_color",
name: "Running",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
];
@@ -440,6 +449,7 @@ describe("AgentLozenge idle vs active appearance", () => {
story_id: "74_pending_color",
name: "Pending",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "pending" },
},
];
@@ -463,6 +473,7 @@ describe("AgentLozenge idle vs active appearance", () => {
story_id: "74_pulse_dot",
name: "Pulse",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
];
@@ -513,6 +524,7 @@ describe("hiddenRosterAgents: assigned agents are absent from roster", () => {
story_id: "85_assign_test",
name: "Assign Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
],
@@ -533,6 +545,7 @@ describe("hiddenRosterAgents: assigned agents are absent from roster", () => {
story_id: "85_no_agent",
name: "No Agent",
error: null,
merge_failure: null,
agent: null,
},
],
@@ -554,6 +567,7 @@ describe("hiddenRosterAgents: assigned agents are absent from roster", () => {
story_id: "85_transition_test",
name: "Transition",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
],
@@ -613,6 +627,7 @@ describe("hiddenRosterAgents: fly-out keeps agent hidden until clone lands", ()
story_id: "85_flyout_hidden",
name: "Fly-out Hidden",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "completed" },
},
],
@@ -623,6 +638,7 @@ describe("hiddenRosterAgents: fly-out keeps agent hidden until clone lands", ()
story_id: "85_flyout_hidden",
name: "Fly-out Hidden",
error: null,
merge_failure: null,
agent: null,
},
],
@@ -664,6 +680,7 @@ describe("hiddenRosterAgents: fly-out keeps agent hidden until clone lands", ()
story_id: "85_flyout_reveal",
name: "Fly-out Reveal",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "completed" },
},
],
@@ -674,6 +691,7 @@ describe("hiddenRosterAgents: fly-out keeps agent hidden until clone lands", ()
story_id: "85_flyout_reveal",
name: "Fly-out Reveal",
error: null,
merge_failure: null,
agent: null,
},
],
@@ -746,6 +764,7 @@ describe("LozengeFlyProvider agent swap (name change)", () => {
story_id: "109_swap_test",
name: "Swap Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: "sonnet", status: "running" },
},
],
@@ -756,6 +775,7 @@ describe("LozengeFlyProvider agent swap (name change)", () => {
story_id: "109_swap_test",
name: "Swap Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-2", model: "haiku", status: "running" },
},
],
@@ -835,6 +855,7 @@ describe("LozengeFlyProvider fly-out without roster element", () => {
story_id: "109_no_roster_flyout",
name: "No Roster Flyout",
error: null,
merge_failure: null,
agent: {
agent_name: "orphan-agent",
model: null,
@@ -849,6 +870,7 @@ describe("LozengeFlyProvider fly-out without roster element", () => {
story_id: "109_no_roster_flyout",
name: "No Roster Flyout",
error: null,
merge_failure: null,
agent: null,
},
],
@@ -919,6 +941,7 @@ describe("FlyingLozengeClone initial non-flying render", () => {
story_id: "109_nontransition_test",
name: "Non-transition Test",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
],
@@ -993,6 +1016,7 @@ describe("Bug 137: no animation actions lost during rapid pipeline updates", ()
story_id: "137_rapid_swap",
name: "Rapid Swap",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: "sonnet", status: "running" },
},
],
@@ -1003,6 +1027,7 @@ describe("Bug 137: no animation actions lost during rapid pipeline updates", ()
story_id: "137_rapid_swap",
name: "Rapid Swap",
error: null,
merge_failure: null,
agent: { agent_name: "coder-2", model: "haiku", status: "running" },
},
],
@@ -1068,6 +1093,7 @@ describe("Bug 137: no animation actions lost during rapid pipeline updates", ()
story_id: "137_reveal_last",
name: "Reveal Last",
error: null,
merge_failure: null,
agent: { agent_name: "coder-1", model: null, status: "running" },
},
],
@@ -1078,6 +1104,7 @@ describe("Bug 137: no animation actions lost during rapid pipeline updates", ()
story_id: "137_reveal_last",
name: "Reveal Last",
error: null,
merge_failure: null,
agent: { agent_name: "coder-2", model: null, status: "running" },
},
],
@@ -1162,6 +1189,7 @@ describe("Bug 137: animations remain functional through sustained agent activity
story_id: "137_sustained",
name: "Sustained",
error: null,
merge_failure: null,
agent: { agent_name: agentName, model: null, status: "running" },
},
],