4681126832
Two real bugs found in an adversarial review of the core real-time path:
1. Queued message vanishes (high impact): the message.updated handler dropped
EVERY temp- optimistic message when any real message arrived, so sending a
second message while the first was still processing made the second
disappear from the chat until its own event landed ('did my message send?').
Extracted the merge into a tested pure helper (mergeIncomingMessage) that
resolves only the oldest pending temp of the same role.
2. selectSession race: rapidly switching sessions on a flaky network could let
a slow fetch for a previous session overwrite currentSession/messages of the
newer selection. Added a monotonic sequence token; a stale result is
discarded.
Also reviewed but intentionally NOT changed: the SSE-reconnect-on-connection-
switch path (already handled via the [client] effect cleanup + reconnect) and
abortSession leaving 'sending' set on failure (deliberate — the run may still
be live; per its own comment).
Claude-Session: https://claude.ai/code/session_01T12AhSnQVrSxNnvwfCx2z6
Co-authored-by: engineer <engineer@macbookpro.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
49 lines
2.0 KiB
TypeScript
49 lines
2.0 KiB
TypeScript
import { test } from "node:test"
|
|
import assert from "node:assert/strict"
|
|
import { mergeIncomingMessage } from "./message-merge.ts"
|
|
import type { Message } from "./sdk.ts"
|
|
|
|
const msg = (id: string, role: "user" | "assistant" = "user"): Message => ({
|
|
id,
|
|
sessionID: "s1",
|
|
role,
|
|
time: { created: 1 },
|
|
})
|
|
|
|
test("appends an assistant reply that has no optimistic placeholder", () => {
|
|
const out = mergeIncomingMessage([msg("temp-1", "user")], msg("real-a", "assistant"))
|
|
assert.deepEqual(out.map((m) => m.id), ["temp-1", "real-a"])
|
|
})
|
|
|
|
test("replaces the single pending temp user message", () => {
|
|
const out = mergeIncomingMessage([msg("temp-1", "user")], msg("real-1", "user"))
|
|
assert.deepEqual(out.map((m) => m.id), ["real-1"])
|
|
})
|
|
|
|
test("resolving the first message keeps a second queued temp message (the bug)", () => {
|
|
// User sent msg1 (temp-1) then msg2 (temp-2) while msg1 was still processing.
|
|
const list = [msg("temp-1", "user"), msg("temp-2", "user")]
|
|
// The real event for msg1 arrives first.
|
|
const out = mergeIncomingMessage(list, msg("real-1", "user"))
|
|
// temp-1 is resolved; temp-2 must remain so it doesn't vanish from the UI.
|
|
assert.deepEqual(out.map((m) => m.id), ["real-1", "temp-2"])
|
|
})
|
|
|
|
test("updates an already-present message in place without reordering", () => {
|
|
const list = [msg("real-1", "user"), msg("real-2", "assistant")]
|
|
const updated: Message = { ...msg("real-2", "assistant"), time: { created: 1, completed: 9 } }
|
|
const out = mergeIncomingMessage(list, updated)
|
|
assert.deepEqual(out.map((m) => m.id), ["real-1", "real-2"])
|
|
assert.equal(out[1].time.completed, 9)
|
|
})
|
|
|
|
test("appends a real message when there is no matching temp and it is new", () => {
|
|
const out = mergeIncomingMessage([msg("real-1", "user")], msg("real-2", "user"))
|
|
assert.deepEqual(out.map((m) => m.id), ["real-1", "real-2"])
|
|
})
|
|
|
|
test("does not remove a temp of a different role", () => {
|
|
const out = mergeIncomingMessage([msg("temp-1", "user")], msg("real-a", "assistant"))
|
|
assert.ok(out.some((m) => m.id === "temp-1"))
|
|
})
|