Skip to content

Commit b9fa58f

Browse files
t3dotggcodex
andcommitted
fix(preview): keep headless pages and stream them across thread switches
Keep the existing page, session state, downloads, and recordings when desktop rendering arrives late. Use native frame leases for background captures, including threads without a loaded shell. Co-authored-by: davidesala <[email protected]> Co-authored-by: GPT-6.1 Sol <[email protected]>
1 parent 3dd0bd1 commit b9fa58f

21 files changed

Lines changed: 1349 additions & 147 deletions

‎apps/server/src/preview/Manager.test.ts‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,89 @@ it.layer(layer)("PreviewManager", (it) => {
100100
}),
101101
);
102102

103+
it.effect("publishes the server's page mode once and preserves a headless choice", () =>
104+
Effect.gen(function* () {
105+
const threadId = freshThreadId();
106+
const manager = yield* PreviewManager.PreviewManager;
107+
const collector = yield* collectEvents;
108+
const opened = yield* manager.open({
109+
threadId,
110+
runtime: "server",
111+
url: "http://localhost:5173/",
112+
profileId: "work",
113+
automationOwner: "agent",
114+
});
115+
const native = yield* manager.setServerPageMode({
116+
threadId,
117+
tabId: opened.tabId,
118+
mode: "native",
119+
});
120+
const headless = yield* manager.setServerPageMode({
121+
threadId,
122+
tabId: opened.tabId,
123+
mode: "headless",
124+
});
125+
expect(native.serverPageMode).toBe("native");
126+
expect(headless).toMatchObject({
127+
...opened,
128+
serverPageMode: "headless",
129+
updatedAt: expect.any(String),
130+
});
131+
const before = yield* manager.list({ threadId });
132+
for (const mode of ["headless", "native"] as const) {
133+
expect(yield* manager.setServerPageMode({ threadId, tabId: opened.tabId, mode })).toEqual(
134+
headless,
135+
);
136+
}
137+
const after = yield* manager.list({ threadId });
138+
expect(after).toEqual(before);
139+
const events = yield* collector.drain;
140+
expect(events.map((event) => event.type)).toEqual(["opened", "resized", "resized"]);
141+
expect(events.at(-1)).toMatchObject({ snapshot: headless, revision: after.revision });
142+
yield* manager.reportStatus({
143+
threadId,
144+
tabId: opened.tabId,
145+
serverControlled: true,
146+
navStatus: { _tag: "Success", url: "http://localhost:5173/next", title: "Next" },
147+
canGoBack: true,
148+
canGoForward: false,
149+
});
150+
yield* manager.resize({ threadId, tabId: opened.tabId, viewport: { _tag: "fill" } });
151+
expect((yield* manager.list({ threadId })).sessions[0]?.serverPageMode).toBe("headless");
152+
}),
153+
);
154+
155+
it.effect(
156+
"allows only server sessions to select a page mode, and never recreates a closed tab",
157+
() =>
158+
Effect.gen(function* () {
159+
const threadId = freshThreadId();
160+
const manager = yield* PreviewManager.PreviewManager;
161+
const desktop = yield* manager.open({ threadId, serverPageMode: "headless" });
162+
expect(desktop).not.toHaveProperty("serverPageMode");
163+
expect(
164+
(yield* manager
165+
.setServerPageMode({ threadId, tabId: desktop.tabId, mode: "headless" })
166+
.pipe(Effect.flip))._tag,
167+
).toBe("PreviewControlRequiredError");
168+
const server = yield* manager.open({
169+
threadId,
170+
runtime: "server",
171+
serverPageMode: "headless",
172+
});
173+
expect(server.serverPageMode).toBe("headless");
174+
yield* manager.close({ threadId, tabId: server.tabId });
175+
expect(
176+
(yield* manager
177+
.setServerPageMode({ threadId, tabId: server.tabId, mode: "headless" })
178+
.pipe(Effect.flip))._tag,
179+
).toBe("PreviewSessionLookupError");
180+
expect(
181+
(yield* manager.list({ threadId })).sessions.map((session) => session.tabId),
182+
).toEqual([desktop.tabId]);
183+
}),
184+
);
185+
103186
it.effect("lets any client size, theme, and zoom a server tab", () =>
104187
Effect.gen(function* () {
105188
const threadId = freshThreadId();

‎apps/server/src/preview/Manager.ts‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ export class PreviewManager extends Context.Service<
4848
readonly open: (
4949
input: PreviewOpenInput & {
5050
readonly automationOwner?: string;
51+
/** Only the server browser selects how its page is presented. */
52+
readonly serverPageMode?: PreviewSessionSnapshot["serverPageMode"];
5153
/** Runs before the `opened` event publishes, so subscribers find state keyed by the tab. */
5254
readonly beforePublish?: (snapshot: PreviewSessionSnapshot) => void;
5355
},
@@ -58,6 +60,13 @@ export class PreviewManager extends Context.Service<
5860
readonly reportStatus: (
5961
input: PreviewReportStatusInput & { readonly serverControlled?: boolean },
6062
) => Effect.Effect<void, PreviewError>;
63+
/** Publishes the backing page selected by the server; headless cannot be promoted later. */
64+
readonly setServerPageMode: (
65+
input: PreviewCloseInput & {
66+
readonly tabId: string;
67+
readonly mode: "native" | "headless";
68+
},
69+
) => Effect.Effect<PreviewSessionSnapshot, PreviewError>;
6170
readonly requestReveal: (
6271
input: PreviewCloseInput & { readonly tabId: string; readonly force: boolean },
6372
) => Effect.Effect<void, PreviewError>;
@@ -221,6 +230,9 @@ export const make = Effect.gen(function* PreviewManagerMake() {
221230
viewport: input.viewport ?? FILL_PREVIEW_VIEWPORT,
222231
...(input.profileId === undefined ? {} : { profileId: input.profileId }),
223232
...(runtime === undefined ? {} : { runtime }),
233+
...(runtime === "server" && input.serverPageMode !== undefined
234+
? { serverPageMode: input.serverPageMode }
235+
: {}),
224236
...(runtime === "server" && input.automationOwner !== undefined
225237
? { automationOwner: input.automationOwner }
226238
: {}),
@@ -337,6 +349,40 @@ export const make = Effect.gen(function* PreviewManagerMake() {
337349
);
338350
});
339351

352+
const setServerPageMode: PreviewManager["Service"]["setServerPageMode"] = Effect.fn(
353+
"PreviewManager.setServerPageMode",
354+
)(function* (input) {
355+
return yield* mutateExistingSession(
356+
input.threadId,
357+
input.tabId,
358+
Effect.fn("PreviewManager.setSessionPageMode")(function* (session) {
359+
if (session.snapshot.runtime !== "server")
360+
return yield* new PreviewControlRequiredError({ tabId: input.tabId });
361+
if (
362+
session.snapshot.serverPageMode === input.mode ||
363+
session.snapshot.serverPageMode === "headless"
364+
)
365+
return { next: session, emit: null, result: session.snapshot };
366+
const snapshot: PreviewSessionSnapshot = {
367+
...session.snapshot,
368+
serverPageMode: input.mode,
369+
updatedAt: yield* currentIsoTimestamp,
370+
};
371+
return {
372+
next: { ...session, snapshot },
373+
emit: {
374+
type: "resized",
375+
threadId: session.threadId,
376+
tabId: session.tabId,
377+
createdAt: snapshot.updatedAt,
378+
snapshot,
379+
},
380+
result: snapshot,
381+
};
382+
}),
383+
);
384+
});
385+
340386
const resize: PreviewManager["Service"]["resize"] = Effect.fn("PreviewManager.resize")(
341387
function* (input) {
342388
return yield* mutateExistingSession(
@@ -456,7 +502,8 @@ export const make = Effect.gen(function* PreviewManagerMake() {
456502

457503
const list: PreviewManager["Service"]["list"] = Effect.fn("PreviewManager.list")(
458504
function* (input) {
459-
return yield* SynchronizedRef.get(stateRef).pipe(
505+
// Events publish inside a mutation; their consumers must wait for its state commit.
506+
return yield* SynchronizedRef.modify(stateRef, (state) => [state, state] as const).pipe(
460507
Effect.map((state): PreviewListResult => ({
461508
sessions: sessionsForThread(state, input.threadId)
462509
.map((s) => s.snapshot)
@@ -504,6 +551,7 @@ export const make = Effect.gen(function* PreviewManagerMake() {
504551
requestReveal,
505552
navigate,
506553
reportStatus,
554+
setServerPageMode,
507555
resize,
508556
adjust,
509557
refresh,

0 commit comments

Comments
 (0)