Archived
Startup progress could still be shown on the wrong session's row. Routing by known session id first closed the case where the browser knew the other session, but left open the case where it does not -- which the browser is designed to produce. While a create is pending for a workspace, applyCreatedSession deliberately withholds a session.created event for that workspace and stashes it, to avoid a duplicate row. So during exactly the window this feature exists for, a session created by an agent's spawn or by another tab is intentionally absent from the session list. Its startup events carried an unrecognised id and a matching cwd, and were routed onto the user's pending create row, showing a phase and a label belonging to another session. Workspace path was never evidence of identity; it was the only key both sides happened to share. Give them a real one. The browser already invents a temporary row id for a pending create, so it now sends that id with the create request as an opaque startupToken; the daemon carries it through construction, echoes it on the startup events it publishes for that construction, and the browser matches it exactly. The token is a throwaway label the daemon never interprets. It never becomes the session id: activity.sessionId still carries Pi's SessionManager id, which remains how an open of an already-known session is routed. With exact identity available, the guessing is deleted rather than gated. startupProgressPendingStart goes entirely, and with it the selected-machine comparison, the cwd filter, and the single-match ambiguity rule: a second concurrent create carries a different token, and a foreign workspace or non-selected machine carries no token this browser is waiting on, so those cases stop existing rather than needing detection. One Map lookup replaces a filtered scan. cwd comes off the event, since it existed only as the routing key and nothing else read it. No compatibility path is needed. session.startup is unreleased -- checked against the published tarball, not only git tags -- so no deployed daemon emits these events and no deployed browser parses them. An older daemon ignores the extra request field; a newer daemon talking to an older browser degrades to the pre-existing generic wording, as does any unmatched token. One silent behaviour change to state plainly: startupProgress guarded on `sessionId === "" || cwd === ""`. Removing cwd from the event removes the meaningful half of that guard, and that half had no test. The session-id half is kept, which is the half that actually protects honest reporting. The replaced ambiguity test is rewritten rather than dropped, so the same three scenarios still pin the user-visible guarantee -- no match means the generic wording stays -- now including the reproduced foreign-session case, which fails against the previous code. Session creation ordering, semantics, and queueing are unchanged; the token is a passthrough label read only to build an event.
211 lines
7.4 KiB
TypeScript
211 lines
7.4 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { RealtimeSocket, SessionSocket, parseRealtimeSocketEvent, parseSessionSocketEvent } from "./sessionSocket";
|
|
|
|
function notification(order = 1) {
|
|
return {
|
|
id: `daemon-a:${String(order)}`,
|
|
message: "notice",
|
|
truncated: false,
|
|
severity: "info",
|
|
receivedAt: "2026-07-18T00:00:00.000Z",
|
|
order,
|
|
};
|
|
}
|
|
|
|
function summary() {
|
|
return {
|
|
sessionId: "session-1",
|
|
cwd: "/repo",
|
|
inboxRevision: 1,
|
|
retainedCount: 1,
|
|
discardedCount: 0,
|
|
highestSeverity: "info",
|
|
};
|
|
}
|
|
|
|
function inboxEvent() {
|
|
return {
|
|
type: "notifications.inbox",
|
|
daemonInstanceId: "daemon-a",
|
|
catalogRevision: 1,
|
|
summary: summary(),
|
|
dismissThrough: { order: 1, overflowWatermark: 0 },
|
|
delta: { kind: "added", notification: notification() },
|
|
};
|
|
}
|
|
|
|
describe("notification socket guards", () => {
|
|
it("accepts validated selected-session events and drops global notification summaries", () => {
|
|
expect(parseSessionSocketEvent(inboxEvent())).toMatchObject({ type: "notifications.inbox", delta: { kind: "added" } });
|
|
|
|
expect(parseRealtimeSocketEvent({
|
|
type: "notifications.summary",
|
|
daemonInstanceId: "daemon-a",
|
|
catalogRevision: 1,
|
|
summary: summary(),
|
|
})).toBeUndefined();
|
|
});
|
|
|
|
it("ignores malformed notification events instead of widening type-only acceptance", () => {
|
|
expect(parseSessionSocketEvent({
|
|
type: "notifications.inbox",
|
|
daemonInstanceId: "daemon-a",
|
|
catalogRevision: 1,
|
|
summary: { ...summary(), highestSeverity: "fatal" },
|
|
dismissThrough: { order: 1, overflowWatermark: 0 },
|
|
delta: { kind: "added", notification: notification() },
|
|
})).toBeUndefined();
|
|
});
|
|
|
|
it("accepts only strictly validated global unread deltas", () => {
|
|
const unread = {
|
|
sessionId: "session-1",
|
|
cwd: "/repo",
|
|
completionOrder: 1,
|
|
completedAt: "2026-07-20T00:00:01.000Z",
|
|
};
|
|
expect(parseRealtimeSocketEvent({
|
|
type: "sessions.unread",
|
|
catalogId: "catalog-a",
|
|
catalogRevision: 1,
|
|
sessionId: unread.sessionId,
|
|
cwd: unread.cwd,
|
|
unread,
|
|
})).toMatchObject({ type: "sessions.unread", unread });
|
|
expect(parseRealtimeSocketEvent({
|
|
type: "sessions.unread",
|
|
catalogId: "catalog-a",
|
|
catalogRevision: 1,
|
|
sessionId: "other-session",
|
|
cwd: unread.cwd,
|
|
unread,
|
|
})).toBeUndefined();
|
|
expect(parseRealtimeSocketEvent({
|
|
type: "sessions.unread",
|
|
catalogId: "catalog-a",
|
|
catalogRevision: 3.5,
|
|
sessionId: unread.sessionId,
|
|
cwd: unread.cwd,
|
|
unread: null,
|
|
})).toBeUndefined();
|
|
});
|
|
|
|
it("accepts validated session startup progress and drops malformed frames", () => {
|
|
const activity = { sessionId: "session-1", phase: "active", label: "Creating session", detail: "Starting the Pi session", at: "2026-07-20T00:00:01.000Z" };
|
|
|
|
expect(parseRealtimeSocketEvent({ type: "session.startup", startupToken: "pending-session-1-abc", activity }))
|
|
.toMatchObject({ type: "session.startup", startupToken: "pending-session-1-abc", activity });
|
|
expect(parseRealtimeSocketEvent({ type: "session.startup", activity })).toMatchObject({ type: "session.startup", activity });
|
|
expect(parseRealtimeSocketEvent({ type: "session.startup", startupToken: "", activity })).toBeUndefined();
|
|
expect(parseRealtimeSocketEvent({ type: "session.startup" })).toBeUndefined();
|
|
expect(parseRealtimeSocketEvent({ type: "session.startup", activity: { ...activity, phase: "waiting" } })).toBeUndefined();
|
|
// Startup progress is global-only, so it must not be accepted as a
|
|
// per-session frame even when it is well formed.
|
|
expect(parseSessionSocketEvent({ type: "session.startup", activity })).toBeUndefined();
|
|
});
|
|
|
|
it("preserves existing event acceptance without treating unknown types as realtime events", () => {
|
|
expect(parseSessionSocketEvent({ type: "command.output", level: "info", message: "legacy" })).toMatchObject({ type: "command.output" });
|
|
expect(parseRealtimeSocketEvent({ type: "future.notification", payload: {} })).toBeUndefined();
|
|
});
|
|
});
|
|
|
|
class FakeWebSocket {
|
|
static readonly CONNECTING = 0;
|
|
static readonly instances: FakeWebSocket[] = [];
|
|
|
|
readyState = 1;
|
|
onopen: (() => void) | null = null;
|
|
onmessage: ((event: { data: MessageEvent["data"] }) => void) | null = null;
|
|
onerror: (() => void) | null = null;
|
|
onclose: (() => void) | null = null;
|
|
|
|
constructor(readonly url: string) {
|
|
FakeWebSocket.instances.push(this);
|
|
}
|
|
|
|
close(): void {
|
|
this.readyState = 3;
|
|
}
|
|
}
|
|
|
|
describe("socket instance isolation", () => {
|
|
const setTimeoutSpy = vi.fn(() => 1);
|
|
|
|
beforeEach(() => {
|
|
FakeWebSocket.instances.length = 0;
|
|
setTimeoutSpy.mockClear();
|
|
vi.stubGlobal("WebSocket", FakeWebSocket);
|
|
vi.stubGlobal("document", { baseURI: "https://pi.example.test/" });
|
|
vi.stubGlobal("window", { clearTimeout: vi.fn(), setTimeout: setTimeoutSpy });
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.unstubAllGlobals();
|
|
});
|
|
|
|
it("drops queued session frames and close callbacks from a replaced machine socket", async () => {
|
|
const socket = new SessionSocket();
|
|
const oldHandler = vi.fn();
|
|
const newHandler = vi.fn();
|
|
const onInitialOpen = vi.fn();
|
|
const target = { id: "session-1", cwd: "/repo" };
|
|
socket.connect(target, oldHandler, undefined, "machine-a");
|
|
const oldSocket = FakeWebSocket.instances[0];
|
|
if (oldSocket === undefined) throw new Error("expected old session socket");
|
|
const staleClose = oldSocket.onclose;
|
|
oldSocket.onmessage?.({ data: JSON.stringify(inboxEvent()) });
|
|
|
|
socket.connect(target, newHandler, undefined, "machine-b", onInitialOpen);
|
|
staleClose?.();
|
|
await Promise.resolve();
|
|
await Promise.resolve();
|
|
|
|
expect(oldHandler).not.toHaveBeenCalled();
|
|
expect(newHandler).not.toHaveBeenCalled();
|
|
expect(setTimeoutSpy).not.toHaveBeenCalled();
|
|
|
|
const newSocket = FakeWebSocket.instances[1];
|
|
if (newSocket === undefined) throw new Error("expected replacement session socket");
|
|
newSocket.onopen?.();
|
|
expect(onInitialOpen).toHaveBeenCalledOnce();
|
|
newSocket.onmessage?.({ data: JSON.stringify(inboxEvent()) });
|
|
await Promise.resolve();
|
|
await Promise.resolve();
|
|
expect(newHandler).toHaveBeenCalledOnce();
|
|
});
|
|
|
|
it("does not attribute a queued global frame to a replacement machine", async () => {
|
|
const socket = new RealtimeSocket();
|
|
const oldHandler = vi.fn();
|
|
const newHandler = vi.fn();
|
|
const event = {
|
|
type: "workspace.activity",
|
|
activity: {
|
|
cwd: "/repo",
|
|
hasSessionActivity: true,
|
|
hasTerminalActivity: false,
|
|
updatedAt: "2026-07-18T00:00:00.000Z",
|
|
},
|
|
};
|
|
socket.connect(oldHandler, undefined, "machine-a");
|
|
const oldSocket = FakeWebSocket.instances[0];
|
|
if (oldSocket === undefined) throw new Error("expected old realtime socket");
|
|
oldSocket.onmessage?.({ data: JSON.stringify(event) });
|
|
|
|
socket.connect(newHandler, undefined, "machine-b");
|
|
await Promise.resolve();
|
|
await Promise.resolve();
|
|
|
|
expect(oldHandler).not.toHaveBeenCalled();
|
|
expect(newHandler).not.toHaveBeenCalled();
|
|
|
|
const newSocket = FakeWebSocket.instances[1];
|
|
if (newSocket === undefined) throw new Error("expected replacement realtime socket");
|
|
newSocket.onmessage?.({ data: JSON.stringify(event) });
|
|
await Promise.resolve();
|
|
await Promise.resolve();
|
|
expect(newHandler).toHaveBeenCalledOnce();
|
|
});
|
|
});
|