Skip to content

Commit f7d42ba

Browse files
committed
fix(preview): restore presentation and cold client synchronization
1 parent 78059f7 commit f7d42ba

10 files changed

Lines changed: 156 additions & 32 deletions

File tree

‎apps/mobile/src/features/browser/ThreadBrowserFloat.tsx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,20 @@ export function ThreadBrowserFloat(props: {
2727
readonly onOpen: (tabId: string) => void;
2828
}) {
2929
const [tabId, setTabId] = useState<string | null>(null);
30-
const known = useRef<ReadonlySet<string> | null>(null);
30+
const known = useRef<ReadonlyMap<string, string | undefined> | null>(null);
3131
useEffect(() => {
3232
if (!props.loaded) return;
33-
const ids = props.tabs.map((tab) => tab.tabId);
3433
const previous = known.current;
35-
known.current = new Set(ids);
34+
known.current = new Map(props.tabs.map((tab) => [tab.tabId, tab.revealRequest?.id]));
3635
// The first list is a baseline, so reopening a thread does not resurface old tabs.
3736
if (previous === null) return;
38-
const opened = props.tabs.findLast((tab) => tab.reveal === true && !previous.has(tab.tabId));
37+
const opened = props.tabs.findLast(
38+
(tab) =>
39+
tab.reveal === true &&
40+
(tab.revealRequest
41+
? previous.get(tab.tabId) !== tab.revealRequest.id
42+
: !previous.has(tab.tabId)),
43+
);
3944
if (opened !== undefined) setTabId(opened.tabId);
4045
}, [props.loaded, props.tabs]);
4146
const focused = useIsFocused();

‎apps/mobile/src/state/preview.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ const threadPreviewTabsAtom = Atom.family((threadKey: string) => {
143143
}
144144
publish(applyEvent(state, event));
145145
});
146+
get.mount(listAtom);
147+
get.mount(eventsAtom);
146148
const cached = get.once(listAtom);
147149
if (AsyncResult.isSuccess(cached)) state = applyList(cached.value) ?? state;
148150
// The cached list can predate an agent-opened tab.

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,44 @@ it.layer(PreviewManager.layer)("PreviewManager", (it) => {
8989
}),
9090
);
9191

92+
it.effect("reissues presentation requests without replaying them on navigation", () =>
93+
Effect.gen(function* () {
94+
const threadId = freshThreadId();
95+
const manager = yield* PreviewManager.PreviewManager;
96+
const collector = yield* collectEvents;
97+
const opened = yield* manager.open({ threadId, runtime: "server", reveal: false });
98+
yield* manager.requestReveal({ threadId, tabId: opened.tabId, force: true });
99+
const first = (yield* manager.list({ threadId })).sessions[0];
100+
expect(first?.reveal).toBe(true);
101+
expect(first?.revealRequest?.force).toBe(true);
102+
const navigated = yield* manager.navigate({
103+
threadId,
104+
tabId: opened.tabId,
105+
url: "localhost:5173",
106+
});
107+
expect(navigated.revealRequest).toEqual(first?.revealRequest);
108+
yield* manager.reportStatus({
109+
threadId,
110+
tabId: opened.tabId,
111+
navStatus: { _tag: "Success", url: "http://localhost:5173/", title: "Dev" },
112+
canGoBack: false,
113+
canGoForward: false,
114+
});
115+
expect((yield* manager.list({ threadId })).sessions[0]?.revealRequest).toEqual(
116+
first?.revealRequest,
117+
);
118+
yield* manager.requestReveal({ threadId, tabId: opened.tabId, force: false });
119+
const second = (yield* manager.list({ threadId })).sessions[0];
120+
expect(second?.revealRequest?.id).not.toBe(first?.revealRequest?.id);
121+
expect(second?.revealRequest?.force).toBe(false);
122+
const events = yield* collector.drain;
123+
const last = events.at(-1);
124+
expect(last?.type).toBe("navigated");
125+
if (last?.type === "navigated")
126+
expect(last.snapshot.revealRequest).toEqual(second?.revealRequest);
127+
}),
128+
);
129+
92130
it.effect("opens an Idle tab when no URL is supplied", () =>
93131
Effect.gen(function* () {
94132
const threadId = freshThreadId();

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ export class PreviewManager extends Context.Service<
5050
input: PreviewNavigateInput,
5151
) => Effect.Effect<PreviewSessionSnapshot, PreviewError>;
5252
readonly reportStatus: (input: PreviewReportStatusInput) => Effect.Effect<void, PreviewError>;
53+
readonly requestReveal: (
54+
input: PreviewCloseInput & { readonly tabId: string; readonly force: boolean },
55+
) => Effect.Effect<void, PreviewError>;
5356
readonly resize: (
5457
input: PreviewResizeInput,
5558
) => Effect.Effect<PreviewSessionSnapshot, PreviewError>;
@@ -307,6 +310,9 @@ export const make = Effect.gen(function* PreviewManagerMake() {
307310
? {}
308311
: { runtime: session.snapshot.runtime }),
309312
...(session.snapshot.reveal === undefined ? {} : { reveal: session.snapshot.reveal }),
313+
...(session.snapshot.revealRequest === undefined
314+
? {}
315+
: { revealRequest: session.snapshot.revealRequest }),
310316
updatedAt,
311317
};
312318
return {
@@ -345,6 +351,9 @@ export const make = Effect.gen(function* PreviewManagerMake() {
345351
: { profileId: session.snapshot.profileId }),
346352
...(session.snapshot.runtime === undefined ? {} : { runtime: session.snapshot.runtime }),
347353
...(session.snapshot.reveal === undefined ? {} : { reveal: session.snapshot.reveal }),
354+
...(session.snapshot.revealRequest === undefined
355+
? {}
356+
: { revealRequest: session.snapshot.revealRequest }),
348357
updatedAt,
349358
};
350359
const emit: PreviewEventDraft =
@@ -464,8 +473,37 @@ export const make = Effect.gen(function* PreviewManagerMake() {
464473
},
465474
);
466475

476+
const requestReveal: PreviewManager["Service"]["requestReveal"] = Effect.fn(
477+
"PreviewManager.requestReveal",
478+
)(function* (input) {
479+
yield* mutateExistingSession(
480+
input.threadId,
481+
input.tabId,
482+
Effect.fn("PreviewManager.revealSession")(function* (session) {
483+
const snapshot = {
484+
...session.snapshot,
485+
reveal: true,
486+
revealRequest: { id: NodeCrypto.randomUUID(), force: input.force },
487+
updatedAt: yield* currentIsoTimestamp,
488+
};
489+
return {
490+
next: { ...session, snapshot },
491+
emit: {
492+
type: "navigated" as const,
493+
threadId: session.threadId,
494+
tabId: session.tabId,
495+
createdAt: snapshot.updatedAt,
496+
snapshot,
497+
},
498+
result: undefined,
499+
};
500+
}),
501+
);
502+
});
503+
467504
return PreviewManager.of({
468505
open,
506+
requestReveal,
469507
navigate,
470508
reportStatus,
471509
resize,

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

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ interface ViewerState {
185185
readonly resume: () => Promise<void>;
186186
/** Last wheel input from this viewer, for motion mode. */
187187
scrolledAt: number;
188+
/** Panel bounds, retained in fixed mode; passive viewers never request a size. */
189+
requestedSize: { width: number; height: number; order: number } | null;
188190
}
189191

190192
interface Recording {
@@ -257,6 +259,7 @@ const make = Effect.gen(function* () {
257259
const pendingTabs = new Map<string, Promise<ServerTab>>();
258260
const contexts = new Map<string, Promise<BrowserContext>>();
259261
let hostConnectionId: string | null = null;
262+
let viewerResizeOrder = 0;
260263

261264
const profilesDir = NodePath.join(config.stateDir, "server-browser", "profiles");
262265

@@ -373,8 +376,13 @@ const make = Effect.gen(function* () {
373376

374377
const applySetting = async (tab: ServerTab, setting: PreviewViewportSetting) => {
375378
tab.setting = setting;
376-
const size = fixedViewportSize(setting);
377-
if (size) await tab.page.setViewportSize(size);
379+
const size =
380+
fixedViewportSize(setting) ??
381+
[...tab.viewers]
382+
.map((viewer) => viewer.requestedSize)
383+
.filter((requested) => requested !== null)
384+
.sort((left, right) => right.order - left.order)[0];
385+
if (size) await tab.page.setViewportSize({ width: size.width, height: size.height });
378386
broadcastViewport(tab);
379387
};
380388

@@ -853,19 +861,32 @@ const make = Effect.gen(function* () {
853861
reuse && request.tabId !== undefined
854862
? tabs.get(tabKey(request.threadId, request.tabId))
855863
: undefined;
864+
const reveal = open.open ?? open.show;
865+
const revealTab = async (tab: ServerTab) => {
866+
if (reveal === false) return;
867+
await Effect.runPromise(
868+
manager.requestReveal({
869+
threadId: tab.threadId,
870+
tabId: tab.tabId,
871+
force: reveal === true,
872+
}),
873+
);
874+
};
856875
if (existing) {
857876
if (url) await navigate(existing, url, "load", request.timeoutMs);
877+
await revealTab(existing);
858878
return statusWithTitle(existing);
859879
}
860880
const snapshot = await Effect.runPromise(
861881
manager.open({
862882
threadId: request.threadId,
863883
...(url ? { url } : {}),
864884
runtime: "server",
865-
reveal: (open.open ?? open.show) !== false,
885+
reveal: false,
866886
}),
867887
);
868888
const tab = await ensureTab(snapshot);
889+
await revealTab(tab);
869890
if (url) {
870891
await tab.page
871892
.waitForLoadState("load", { timeout: request.timeoutMs })
@@ -963,14 +984,15 @@ const make = Effect.gen(function* () {
963984
return { tabId: tab.tabId, recording: true, startedAt: recording.startedAt };
964985
}
965986
case "recordingStop": {
987+
const recordings = [...tabs.values()].filter(
988+
(candidate) =>
989+
candidate.threadId === request.threadId &&
990+
(candidate.recording || candidate.recordingStart),
991+
);
992+
const targetTabId = request.tabId ?? latestThreadTab(request.threadId)?.tabId;
966993
const tab =
967-
request.tabId === undefined
968-
? [...tabs.values()].find(
969-
(candidate) =>
970-
candidate.threadId === request.threadId &&
971-
(candidate.recording || candidate.recordingStart),
972-
)
973-
: await requireTab(request);
994+
recordings.find((candidate) => candidate.tabId === targetTabId) ??
995+
(!request.tabIdExplicit && recordings.length === 1 ? recordings[0] : undefined);
974996
if (!tab) {
975997
throw new ServerBrowserPage.ServerBrowserOperationError(
976998
"PreviewAutomationRecordingNotActiveError",
@@ -1090,15 +1112,14 @@ const make = Effect.gen(function* () {
10901112
}
10911113
return;
10921114
case "resize": {
1093-
const width = Math.round(num(message.width));
1094-
const height = Math.round(num(message.height));
1095-
if (tab.setting._tag !== "fill" || width < 100 || height < 100) return;
1115+
const width = Math.min(Math.round(num(message.width)), 3840);
1116+
const height = Math.min(Math.round(num(message.height)), 2160);
1117+
if (width < 100 || height < 100) return;
1118+
viewer.requestedSize = { width, height, order: ++viewerResizeOrder };
1119+
if (tab.setting._tag !== "fill") return;
10961120
const current = tab.page.viewportSize();
10971121
if (current?.width === width && current.height === height) return;
1098-
await tab.page.setViewportSize({
1099-
width: Math.min(width, 3840),
1100-
height: Math.min(height, 2160),
1101-
});
1122+
await tab.page.setViewportSize({ width, height });
11021123
broadcastViewport(tab);
11031124
return;
11041125
}
@@ -1194,6 +1215,7 @@ const make = Effect.gen(function* () {
11941215
},
11951216
resume: () => startScreencast(screencastScale),
11961217
scrolledAt: 0,
1218+
requestedSize: null,
11971219
};
11981220
yield* Effect.acquireRelease(
11991221
Effect.sync(() => {

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,6 +2243,7 @@ export default function ChatView(props: ChatViewProps) {
22432243
);
22442244
const activePreviewState = useThreadPreviewState(activeThreadRef);
22452245
const activePreviewServerEpoch = activePreviewState.serverEpoch;
2246+
const previewSessionsReady = !activeEnvironmentServerBrowser || activePreviewState.listLoaded;
22462247
const resolvePreviewRuntimeTabId = useMemo(
22472248
() =>
22482249
activeThreadRef
@@ -2317,21 +2318,26 @@ export default function ChatView(props: ChatViewProps) {
23172318
);
23182319

23192320
useEffect(() => {
2320-
if (!activeThreadRef) return;
2321+
if (!activeThreadRef || !previewSessionsReady) return;
23212322
useRightPanelStore
23222323
.getState()
23232324
.reconcileBrowserSurfaces(activeThreadRef, Object.keys(activePreviewState.sessions));
2324-
}, [activePreviewState.sessions, activeThreadRef]);
2325+
}, [activePreviewState.sessions, activeThreadRef, previewSessionsReady]);
23252326

23262327
useEffect(() => {
2327-
if (!activeThreadRef || activePreviewMiniPlayer?.source.kind !== "browser") return;
2328+
if (
2329+
!activeThreadRef ||
2330+
!previewSessionsReady ||
2331+
activePreviewMiniPlayer?.source.kind !== "browser"
2332+
)
2333+
return;
23282334
const miniTabStillExists = Boolean(
23292335
activePreviewState.sessions[activePreviewMiniPlayer.source.tabId],
23302336
);
23312337
if (!miniTabStillExists) {
23322338
usePreviewMiniPlayerStore.getState().close(activeThreadRef);
23332339
}
2334-
}, [activePreviewMiniPlayer, activePreviewState.sessions, activeThreadRef]);
2340+
}, [activePreviewMiniPlayer, activePreviewState.sessions, activeThreadRef, previewSessionsReady]);
23352341

23362342
const existingOpenTerminalThreadKeys = useMemo(() => {
23372343
const existingThreadKeys = new Set<string>([...serverThreadKeys, ...draftThreadKeys]);
@@ -5127,7 +5133,7 @@ export default function ChatView(props: ChatViewProps) {
51275133
// desktop automation host does for its own tabs. Tabs present when the
51285134
// thread's preview state first loads are a baseline, so reloads do not
51295135
// resurrect them, and tabs already shown in a surface stay where they are.
5130-
const previousServerPreviewTabs = useRef(new Map<string, Set<string>>());
5136+
const previousServerPreviewTabs = useRef(new Map<string, Map<string, string | undefined>>());
51315137
useEffect(() => {
51325138
if (!activeThreadRef || !activeEnvironmentServerBrowser) return;
51335139
// Nothing has loaded yet; an empty baseline would make every tab look new.
@@ -5139,15 +5145,22 @@ export default function ChatView(props: ChatViewProps) {
51395145
const previous = previousServerPreviewTabs.current.get(threadKey);
51405146
previousServerPreviewTabs.current.set(
51415147
threadKey,
5142-
new Set(serverSessions.map((session) => session.tabId)),
5148+
new Map(serverSessions.map((session) => [session.tabId, session.revealRequest?.id])),
51435149
);
5144-
if (!previous || !autoShowFloatingPreview) return;
5150+
if (!previous) return;
51455151
for (const session of serverSessions) {
5146-
if (previous.has(session.tabId) || session.reveal !== true) continue;
5147-
const shown = rightPanelState.surfaces.some(
5152+
const requested = session.revealRequest;
5153+
const fresh = requested
5154+
? previous.get(session.tabId) !== requested.id
5155+
: !previous.has(session.tabId);
5156+
if (!fresh || session.reveal !== true) continue;
5157+
if (!autoShowFloatingPreview && requested?.force !== true) continue;
5158+
const surface = rightPanelState.surfaces.find(
51485159
(surface) => surface.kind === "preview" && surface.resourceId === session.tabId,
51495160
);
5150-
if (!shown) {
5161+
if (surface && requested?.force === true) {
5162+
useRightPanelStore.getState().activateSurface(activeThreadRef, surface.id);
5163+
} else if (!surface) {
51515164
usePreviewMiniPlayerStore
51525165
.getState()
51535166
.open(activeThreadRef, browserMiniPlayerSource(session.tabId));

‎apps/web/src/components/preview/usePreviewSession.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ const previewSessionSyncAtom = Atom.family((threadKey: string) => {
6767
eventsVersion += 1;
6868
applyLatestEvent(result);
6969
});
70+
get.mount(sessionsAtom);
71+
get.mount(eventsAtom);
7072
queueMicrotask(() => {
7173
if (disposed) return;
7274
// The cached list can predate an automation-created tab. Keep the local

‎packages/contracts/src/preview.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ export const PreviewSessionSnapshot = Schema.Struct({
188188
runtime: Schema.optional(PreviewRuntime),
189189
/** An agent opened this tab and asked to show it, so viewers float it. */
190190
reveal: Schema.optional(Schema.Boolean),
191+
/** A fresh presentation request, including whether it overrides automatic-floating settings. */
192+
revealRequest: Schema.optional(Schema.Struct({ id: Schema.String, force: Schema.Boolean })),
191193
updatedAt: Schema.String,
192194
});
193195
export type PreviewSessionSnapshot = typeof PreviewSessionSnapshot.Type;

‎scripts/lib/cli-external-packages.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ describe("selectCliRuntimeExternalDependencies", () => {
8383
it("selects every external root declared by the server", () => {
8484
assert.deepStrictEqual(
8585
Object.keys(selectCliRuntimeExternalDependencies(serverPackageJson.dependencies)).sort(),
86-
["@cursor/sdk", "@ff-labs/fff-node", "@napi-rs/keyring", "node-pty"],
86+
["@cursor/sdk", "@ff-labs/fff-node", "@napi-rs/keyring", "node-pty", "playwright-core"],
8787
);
8888
});
8989
});

‎scripts/lib/cli-external-packages.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
export const CLI_RUNTIME_EXTERNAL_PREFIXES = [
2929
// Cursor ships computed Webpack imports and platform helper packages.
3030
"@cursor/sdk",
31+
// Playwright reads package.json and browsers.json beside its runtime modules.
32+
"playwright-core",
3133
"node-pty",
3234
"ffi-rs",
3335
"@yuuang/",

0 commit comments

Comments
 (0)