Merge branch 'feature/cancel-queued-message' into predev

# Conflicts:
#	backend-handoff.md

2 files changed, 4 insertions, 0 deletions

diff --git a/src/core/wire/conformance.test.ts b/src/core/wire/conformance.test.ts
index 0d955d5..2b98ca6 100644
--- a/src/core/wire/conformance.test.ts
+++ b/src/core/wire/conformance.test.ts
@@ -212,6 +212,7 @@ describe("classifies every WsClientMessage type", () => {
       { type: "chat.subscribe" as const, conversationId: "c1" },
       { type: "chat.unsubscribe" as const, conversationId: "c1" },
       { type: "chat.queue" as const, conversationId: "c1", text: "steer" },
+      { type: "chat.queue.cancel" as const, conversationId: "c1", messageId: "m1" },
     ];
     const labels = msgs.map(assertWsClientMessageExhaustive);
     expect(labels).toEqual([
@@ -222,6 +223,7 @@ describe("classifies every WsClientMessage type", () => {
       "chat.subscribe",
       "chat.unsubscribe",
       "chat.queue",
+      "chat.queue.cancel",
     ]);
   });
 });
diff --git a/src/core/wire/conformance.ts b/src/core/wire/conformance.ts
index bfa67dc..16558cd 100644
--- a/src/core/wire/conformance.ts
+++ b/src/core/wire/conformance.ts
@@ -116,6 +116,8 @@ export function assertWsClientMessageExhaustive(msg: WsClientMessage): string {
       return "chat.unsubscribe";
     case "chat.queue":
       return "chat.queue";
+    case "chat.queue.cancel":
+      return "chat.queue.cancel";
     default:
       return msg satisfies never;
   }