diff --git a/packages/app/src/context/server-sdk.tsx b/packages/app/src/context/server-sdk.tsx
index 62c5857794..6a04fff00a 100644
--- a/packages/app/src/context/server-sdk.tsx
+++ b/packages/app/src/context/server-sdk.tsx
@@ -18,7 +18,10 @@ const isAbortError = (error: unknown) =>
   error !== null && typeof error === "object" && "name" in error && error.name === "AbortError"
 
 const isStreamClosed = (error: unknown, signal?: AbortSignal) => isAbortError(error) || signal?.aborted === true
-export type ServerEvent = Event & { current?: OpenCodeEvent }
+type CurrentServerEvent<T extends OpenCodeEvent = OpenCodeEvent> = T extends OpenCodeEvent
+  ? { id: string; type: T["type"]; properties: T["data"]; current: T }
+  : never
+export type ServerEvent = (Event & { current?: OpenCodeEvent }) | CurrentServerEvent
 type QueuedServerEvent = { directory: string; payload: ServerEvent }
 type CurrentDelta = Extract<
   OpenCodeEvent,