4 files changed, 83 insertions, 2 deletions
diff --git a/src/core/chunks/reducer.test.ts b/src/core/chunks/reducer.test.ts
index 35a586c..a346545 100644
--- a/src/core/chunks/reducer.test.ts
+++ b/src/core/chunks/reducer.test.ts
@@ -7,6 +7,7 @@ import type {
 	TurnReasoningDeltaEvent,
 	TurnSealedEvent,
 	TurnStartEvent,
+	TurnSteeringEvent,
 	TurnTextDeltaEvent,
 	TurnToolCallEvent,
 	TurnToolResultEvent,
@@ -437,6 +438,59 @@ describe("foldEvent — user-message (the turn's user prompt; backend CR-3)", ()
 	});
 });
 
+describe("foldEvent — steering (mid-turn steering injection)", () => {
+	const steering = (text: string): TurnSteeringEvent => ({
+		type: "steering",
+		conversationId: "c1",
+		turnId: "t1",
+		text,
+	});
+
+	it("appends a provisional user bubble + keeps generating", () => {
+		let s = initialState();
+		s = foldEvent(s, turnStart("t1"));
+		s = foldEvent(s, toolResult("t1", "tc1", "read", "output"));
+		s = foldEvent(s, steering("actually, use a different file"));
+		const chunks = selectChunks(s);
+		const last = chunks[chunks.length - 1];
+		expect(last?.role).toBe("user");
+		expect(last?.chunk).toEqual({ type: "text", text: "actually, use a different file" });
+		expect(last?.provisional).toBe(true);
+		expect(s.generating).toBe(true);
+	});
+
+	it("does NOT dedup against the sender's queue (unlike user-message)", () => {
+		// The sender enqueued the message via `chat.queue` — the queue SURFACE
+		// showed it. The `steering` event places it in the transcript; the surface
+		// separately clears on drain. No de-dup here (the transcript never showed
+		// the queued message).
+		let s = initialState();
+		s = foldEvent(s, turnStart("t1"));
+		s = foldEvent(s, steering("steer once"));
+		s = foldEvent(s, steering("steer again"));
+		const users = selectChunks(s).filter((c) => c.role === "user");
+		expect(users).toHaveLength(2);
+	});
+
+	it("ignores an empty steering event", () => {
+		let s = initialState();
+		s = foldEvent(s, turnStart("t1"));
+		s = foldEvent(s, steering(""));
+		expect(selectChunks(s)).toHaveLength(0);
+		expect(s.generating).toBe(true); // turn-start already set it
+	});
+
+	it("flushes an accumulating chunk before appending the steering bubble", () => {
+		let s = initialState();
+		s = foldEvent(s, turnStart("t1"));
+		s = foldEvent(s, textDelta("t1", "partial response"));
+		s = foldEvent(s, steering("mid-turn correction"));
+		expect(s.accumulating).toBeNull();
+		const roles = selectChunks(s).map((c) => c.role);
+		expect(roles).toEqual(["assistant", "user"]);
+	});
+});
+
 describe("applyHistory", () => {
 	it("orders committed chunks by seq", () => {
 		const s = initialState();
diff --git a/src/core/chunks/reducer.ts b/src/core/chunks/reducer.ts
index 0a57839..035846c 100644
--- a/src/core/chunks/reducer.ts
+++ b/src/core/chunks/reducer.ts
@@ -83,6 +83,8 @@ export function applyHistory(
  * - `reasoning-delta` extends the current accumulating ThinkingChunk (or starts one).
  * - `tool-call` / `tool-result` / `error` finalize any accumulating chunk and
  *   add a new provisional chunk.
+ * - `steering` appends a user bubble mid-turn (drained from the message queue
+ *   at a tool-result boundary; the queue surface separately clears on drain).
  * - `usage` stores the latest Usage.
  * - `done` finalizes any accumulating chunk (turn still provisional).
  * - `turn-sealed` finalizes any accumulating chunk and sets sealedTurnId.
@@ -239,6 +241,23 @@ export function foldEvent(state: TranscriptState, event: AgentEvent): Transcript
 				generating: false,
 			};
 		}
+
+		case "steering": {
+			// A steering message drained from the queue at a tool-result boundary
+			// (the model sees it alongside the tool results). Append a user bubble
+			// to the provisional transcript; the turn is still in flight. The queue
+			// surface clears separately on drain (a different channel) — no de-dup
+			// here (unlike `user-message`, steering is never optimistically echoed
+			// into the transcript by the sender).
+			if (event.text.length === 0) return state;
+			const provisional = flushAccumulating(state.provisional, state.accumulating);
+			return {
+				...state,
+				provisional: [...provisional, { role: "user", chunk: { type: "text", text: event.text } }],
+				accumulating: null,
+				generating: true,
+			};
+		}
 	}
 }
 
diff --git a/src/core/wire/conformance.test.ts b/src/core/wire/conformance.test.ts
index a258873..2fdd3cb 100644
--- a/src/core/wire/conformance.test.ts
+++ b/src/core/wire/conformance.test.ts
@@ -75,6 +75,7 @@ describe("classifies every AgentEvent type", () => {
 		{ type: "error", conversationId: "c1", turnId: "t1", message: "oops" },
 		{ type: "done", conversationId: "c1", turnId: "t1", reason: "complete" },
 		{ type: "turn-sealed", conversationId: "c1", turnId: "t1" },
+		{ type: "steering", conversationId: "c1", turnId: "t1", text: "steer mid-turn" },
 	];
 
 	it("returns a stable label for every AgentEvent.type variant", () => {
@@ -93,11 +94,12 @@ describe("classifies every AgentEvent type", () => {
 			"error",
 			"done",
 			"turn-sealed",
+			"steering",
 		]);
 	});
 
-	it("covers all 13 AgentEvent variants", () => {
-		expect(samples).toHaveLength(13);
+	it("covers all 14 AgentEvent variants", () => {
+		expect(samples).toHaveLength(14);
 	});
 });
 
@@ -152,6 +154,7 @@ describe("classifies every WsClientMessage type", () => {
 			{ type: "chat.send" as const, message: "hi" },
 			{ type: "chat.subscribe" as const, conversationId: "c1" },
 			{ type: "chat.unsubscribe" as const, conversationId: "c1" },
+			{ type: "chat.queue" as const, conversationId: "c1", text: "steer" },
 		];
 		const labels = msgs.map(assertWsClientMessageExhaustive);
 		expect(labels).toEqual([
@@ -161,6 +164,7 @@ describe("classifies every WsClientMessage type", () => {
 			"chat.send",
 			"chat.subscribe",
 			"chat.unsubscribe",
+			"chat.queue",
 		]);
 	});
 });
diff --git a/src/core/wire/conformance.ts b/src/core/wire/conformance.ts
index 13be78c..6e87e5c 100644
--- a/src/core/wire/conformance.ts
+++ b/src/core/wire/conformance.ts
@@ -34,6 +34,8 @@ export function assertAgentEventExhaustive(event: AgentEvent): string {
 			return "turn-sealed";
 		case "step-complete":
 			return "step-complete";
+		case "steering":
+			return "steering";
 		default:
 			return event satisfies never;
 	}
@@ -102,6 +104,8 @@ export function assertWsClientMessageExhaustive(msg: WsClientMessage): string {
 			return "chat.subscribe";
 		case "chat.unsubscribe":
 			return "chat.unsubscribe";
+		case "chat.queue":
+			return "chat.queue";
 		default:
 			return msg satisfies never;
 	}