Skip to content

Commit 58c10bb

Browse files
committed
progress but not really
1 parent b71893d commit 58c10bb

8 files changed

Lines changed: 607 additions & 100 deletions

File tree

‎AGENTS.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ If a tradeoff is required, choose correctness and robustness over short-term con
1717
- `apps/web`: React/Vite UI. Owns session UX, conversation/event rendering, and client-side state. Connects to the server via WebSocket.
1818
- `packages/contracts`: Shared Zod schemas and TypeScript contracts for provider events, WebSocket protocol, and model/session types.
1919

20+
## Provider WS API Docs Sync (Required)
21+
- The canonical provider API spec lives at `docs/provider-ws-api.md`.
22+
- Any change to provider WS contracts, methods/channels, canonical event shapes, normalization mappings, replay/backpressure behavior, or client apply semantics must update `docs/provider-ws-api.md` in the same PR.
23+
- If code and docs diverge, treat it as a bug and resolve before merge.
24+
2025
## Codex App Server (Important)
2126
T3 Code is currently Codex-first. The server starts `codex app-server` (JSON-RPC over stdio) per provider session, then streams structured events to the browser through WebSocket push messages.
2227

‎apps/server/src/providerEventNormalizer.test.ts‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,69 @@ describe("ProviderEventNormalizer", () => {
102102
expect(normalized).toHaveLength(0);
103103
});
104104

105+
it("maps message delta events when payload uses msg/message fallback fields", () => {
106+
const normalizer = new ProviderEventNormalizer();
107+
108+
const normalized = normalizer.normalize(
109+
makeRawEvent({
110+
method: "item/agentMessage/delta",
111+
threadId: undefined,
112+
turnId: undefined,
113+
itemId: undefined,
114+
payload: {
115+
msg: {
116+
id: "msg-1",
117+
thread_id: "thread-1",
118+
turn_id: "turn-1",
119+
},
120+
delta: "hello",
121+
},
122+
}),
123+
makeSession(),
124+
);
125+
126+
const delta = normalized.find((event) => event.type === "message.delta");
127+
expect(delta).toBeDefined();
128+
if (!delta || delta.type !== "message.delta") {
129+
throw new Error("expected message.delta event");
130+
}
131+
132+
expect(delta.messageId).toBe("msg-1");
133+
expect(delta.threadId).toBe("thread-1");
134+
expect(delta.turnId).toBe("turn-1");
135+
expect(delta.delta).toBe("hello");
136+
});
137+
138+
it("maps assistant message completion with assistantMessage type aliases", () => {
139+
const normalizer = new ProviderEventNormalizer();
140+
141+
const normalized = normalizer.normalize(
142+
makeRawEvent({
143+
method: "item/completed",
144+
itemId: "msg_abc",
145+
payload: {
146+
threadId: "thread-1",
147+
turnId: "turn-1",
148+
item: {
149+
id: "msg_abc",
150+
type: "assistant_message",
151+
text: "done",
152+
},
153+
},
154+
}),
155+
makeSession(),
156+
);
157+
158+
const completed = normalized.find((event) => event.type === "message.completed");
159+
expect(completed).toBeDefined();
160+
if (!completed || completed.type !== "message.completed") {
161+
throw new Error("expected message.completed event");
162+
}
163+
164+
expect(completed.messageId).toBe("msg_abc");
165+
expect(completed.text).toBe("done");
166+
});
167+
105168
it("creates debug.raw wrappers", () => {
106169
const normalizer = new ProviderEventNormalizer();
107170
const raw = makeRawEvent({ method: "item/reasoning/summaryPartAdded" });

‎apps/server/src/providerEventNormalizer.ts‎

Lines changed: 69 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,68 @@ function asBoolean(value: unknown): boolean | undefined {
1717
return typeof value === "boolean" ? value : undefined;
1818
}
1919

20+
function normalizeType(raw: string | undefined): string {
21+
if (!raw) return "";
22+
return raw.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
23+
}
24+
25+
function isAgentMessageType(raw: string | undefined): boolean {
26+
const normalized = normalizeType(raw);
27+
return normalized.includes("agentmessage") || normalized.includes("assistantmessage");
28+
}
29+
2030
function readThreadId(event: ProviderRawEvent): string | undefined {
2131
if (event.threadId) return event.threadId;
2232
const payload = asObject(event.payload);
2333
const thread = asObject(payload?.thread);
34+
const message = asObject(payload?.message);
35+
const msg = asObject(payload?.msg);
2436
return (
2537
asString(payload?.threadId) ??
2638
asString(payload?.thread_id) ??
27-
asString(thread?.id)
39+
asString(payload?.conversationId) ??
40+
asString(thread?.id) ??
41+
asString(message?.threadId) ??
42+
asString(message?.thread_id) ??
43+
asString(msg?.threadId) ??
44+
asString(msg?.thread_id)
2845
);
2946
}
3047

3148
function readTurnId(event: ProviderRawEvent): string | undefined {
3249
if (event.turnId) return event.turnId;
3350
const payload = asObject(event.payload);
3451
const turn = asObject(payload?.turn);
35-
return asString(payload?.turnId) ?? asString(payload?.turn_id) ?? asString(turn?.id);
52+
const message = asObject(payload?.message);
53+
const msg = asObject(payload?.msg);
54+
return (
55+
asString(payload?.turnId) ??
56+
asString(payload?.turn_id) ??
57+
asString(turn?.id) ??
58+
asString(message?.turnId) ??
59+
asString(message?.turn_id) ??
60+
asString(msg?.turnId) ??
61+
asString(msg?.turn_id)
62+
);
3663
}
3764

3865
function readItemId(event: ProviderRawEvent): string | undefined {
3966
if (event.itemId) return event.itemId;
4067
const payload = asObject(event.payload);
4168
const item = asObject(payload?.item);
42-
return asString(payload?.itemId) ?? asString(payload?.item_id) ?? asString(item?.id);
69+
const message = asObject(payload?.message);
70+
const msg = asObject(payload?.msg);
71+
return (
72+
asString(payload?.itemId) ??
73+
asString(payload?.item_id) ??
74+
asString(payload?.messageId) ??
75+
asString(payload?.message_id) ??
76+
asString(payload?.msgId) ??
77+
asString(payload?.msg_id) ??
78+
asString(item?.id) ??
79+
asString(message?.id) ??
80+
asString(msg?.id)
81+
);
4382
}
4483

4584
function mapApprovalDecision(decision: string): "accept" | "accept_for_session" | "decline" | "cancel" | "timed_out" {
@@ -252,7 +291,12 @@ export class ProviderEventNormalizer implements ProviderEventAdapter {
252291
}
253292

254293
if (raw.method === "item/agentMessage/delta" && threadId && itemId) {
255-
const delta = raw.textDelta ?? asString(payload?.delta) ?? "";
294+
const delta =
295+
raw.textDelta ??
296+
asString(payload?.delta) ??
297+
asString(asObject(payload?.message)?.delta) ??
298+
asString(asObject(payload?.msg)?.delta) ??
299+
"";
256300
if (delta.length > 0) {
257301
events.push({
258302
type: "message.delta",
@@ -268,7 +312,11 @@ export class ProviderEventNormalizer implements ProviderEventAdapter {
268312

269313
if (raw.method === "item/completed" && threadId) {
270314
const item = asObject(payload?.item);
271-
if (asString(item?.type) === "agentMessage") {
315+
const itemType = asString(item?.type);
316+
const isAgentMessage =
317+
isAgentMessageType(itemType) ||
318+
(!!raw.itemId && raw.itemId.startsWith("msg_"));
319+
if (isAgentMessage) {
272320
const messageId = asString(item?.id) ?? itemId;
273321
const text = asString(item?.text) ?? "";
274322
if (messageId) {
@@ -352,6 +400,22 @@ export class ProviderEventNormalizer implements ProviderEventAdapter {
352400
if (raw.method === "item/started" || raw.method === "item/completed") {
353401
const item = asObject(payload?.item);
354402
const itemType = asString(item?.type);
403+
const itemText = asString(item?.text);
404+
const isAgentMessage = isAgentMessageType(itemType);
405+
if (raw.method === "item/started" && threadId && itemId && isAgentMessage) {
406+
if (itemText && itemText.length > 0) {
407+
events.push({
408+
type: "message.delta",
409+
sessionId: raw.sessionId,
410+
threadId,
411+
...(turnId ? { turnId } : {}),
412+
messageId: itemId,
413+
role: "assistant",
414+
delta: itemText,
415+
});
416+
}
417+
}
418+
355419
if (threadId && itemId && isActionableItemType(itemType)) {
356420
events.push({
357421
type: "activity",

‎apps/web/src/store.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,24 @@ describe("store reducer stream integration", () => {
119119
expect(next.lastProviderSeq).toBe(1);
120120
});
121121

122+
it("always applies session.updated even when thread id changes", () => {
123+
const state = makeState(makeThread({ codexThreadId: "thr_old" }));
124+
const next = reducer(state, {
125+
type: "APPLY_STREAM_FRAME",
126+
frame: makeEventFrame({
127+
type: "session.updated",
128+
session: makeSession({
129+
threadId: "thr_new",
130+
updatedAt: "2026-02-09T00:00:01.000Z",
131+
}),
132+
}),
133+
activeAssistantMessageRef: { current: null },
134+
});
135+
136+
expect(next.threads[0]?.codexThreadId).toBe("thr_new");
137+
expect(next.threads[0]?.session?.threadId).toBe("thr_new");
138+
});
139+
122140
it("applies snapshot frames as authoritative baseline", () => {
123141
const state = makeState(
124142
makeThread({

‎apps/web/src/store.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,12 @@ function eventThreadId(event: ProviderCoreEvent): string | undefined {
184184
}
185185

186186
function shouldIgnoreForeignThreadEvent(thread: Thread, event: ProviderCoreEvent): boolean {
187+
if (event.type === "session.updated") {
188+
// Session snapshots are authoritative for thread identity and should never
189+
// be blocked by stale local thread bindings.
190+
return false;
191+
}
192+
187193
const emittedThreadId = eventThreadId(event);
188194
if (!emittedThreadId) {
189195
return false;
@@ -194,10 +200,6 @@ function shouldIgnoreForeignThreadEvent(thread: Thread, event: ProviderCoreEvent
194200
return false;
195201
}
196202

197-
if (event.type === "session.updated" && thread.session?.status === "connecting") {
198-
return false;
199-
}
200-
201203
return true;
202204
}
203205

0 commit comments

Comments
 (0)