huskies: merge 820

frontend/src/api/client.test.ts

@@ -267,6 +267,7 @@ describe("ChatWebSocket", () => {
 			qa: [],
 			merge: [],
 			done: [],
+			deterministic_merges_in_flight: [],
 		};
 		instances[1].simulateMessage({ type: "pipeline_state", ...freshState });
 

frontend/src/api/client/types.ts

@@ -69,6 +69,8 @@ export interface PipelineState {
 	qa: PipelineStageItem[];
 	merge: PipelineStageItem[];
 	done: PipelineStageItem[];
+	/** Story IDs that currently have a deterministic merge in progress. */
+	deterministic_merges_in_flight: string[];
 }
 
 /** A message received from the Huskies server over WebSocket. */
@@ -84,6 +86,7 @@ export type WsResponse =
 			qa: PipelineStageItem[];
 			merge: PipelineStageItem[];
 			done: PipelineStageItem[];
+			deterministic_merges_in_flight: string[];
 	  }
 	| {
 			type: "permission_request";

frontend/src/api/client/websocket.ts

@@ -123,6 +123,8 @@ export class ChatWebSocket {
 						qa: data.qa,
 						merge: data.merge,
 						done: data.done,
+						deterministic_merges_in_flight:
+							data.deterministic_merges_in_flight ?? [],
 					});
 				if (data.type === "permission_request")
 					this.onPermissionRequest?.(