Skip to content

Commit 9e2656d

Browse files
fix(fork): green the trunk after the v0.0.43 nightly sync
## What Changed Four fork-side repairs after the sync to `v0.0.43-nightly.20260921.2058`: | Commit | Fix | | --- | --- | | `fix(web)` | restore upstream's `buildThreadRouteParams` import in `useThreadActions.ts` | | `test(web)` | stub `resolvePullRequestPreviewTarget` in the fork GitHub link test | | `fix(desktop)` | forward `startRecording` options and recording inputs through the per-window preview policy | | `fix(desktop)` | route `startRecording` through `previewForSender`, so a project window records on its own manager | ## Why The sync push `d1f933bc9dd48cf5acf9abb009666fe80181bdce` turned `hyprws CI` red: one web typecheck error, two desktop and three web test failures. The driver's check battery misses app typecheck and tests (`#1165`), so the seams landed on the trunk. Every change keeps fork behavior and adopts upstream's new recording contract at the wrapper boundary. Checks: web and desktop typecheck clean; `Manager.test.ts`, `ChatMarkdown.fork.test.tsx`, `useThreadActions.undo.test.ts` green; `fork:delta --check` ok. ## Checklist - [x] This PR is small and focused - [x] I explained what changed and why - [ ] I included before/after screenshots for any UI changes - [ ] I included a video for animation/interaction changes ## Fork trailers Refs #1165 Fork-Domain: project-windows Fork-Tier: bugfix Fork-Upstreamable: no Co-authored-by: donjor <[email protected]>
1 parent 3df351d commit 9e2656d

6 files changed

Lines changed: 95 additions & 6 deletions

File tree

‎apps/desktop/src/ipc/methods/preview.fork.test.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ import * as Layer from "effect/Layer";
1414
import * as Option from "effect/Option";
1515
import { beforeEach, describe, expect, vi } from "vite-plus/test";
1616
import * as ElectronWindow from "../../electron/ElectronWindow.ts";
17+
import * as DesktopClientSettings from "../../settings/DesktopClientSettings.ts";
1718
import * as PreviewManager from "../../preview/Manager.ts";
1819
import * as BrowserSession from "../../preview/BrowserSession.ts";
1920
import { previewManagerFixtureLayer } from "../../preview/Manager.fork-test-harness.ts";
2021
import {
2122
projectWindowIdentity,
2223
windowIdentityKey,
2324
HUB_WINDOW_IDENTITY,
25+
type WindowIdentity,
2426
} from "../../window/WindowIdentity.ts";
2527
import { projectWindowPreloadArgument } from "../../window/projectWindowArgument.ts";
2628
import * as DesktopIpc from "../DesktopIpc.ts";
@@ -268,11 +270,57 @@ describe("fork preview IPC ownership", () => {
268270
stateListener = listener;
269271
}),
270272
subscribeOwnedRecordingFrames: () => Effect.void,
273+
subscribeOwnedRecordingInputs: () => Effect.void,
271274
subscribeOwnedPointerEvents: () => Effect.void,
272275
} as never),
273276
);
274277
});
275278

279+
effectIt.effect("starts recording on the sender's window manager, not the hub", () => {
280+
const identity = projectWindowIdentity(
281+
EnvironmentId.make("environment-1"),
282+
ProjectId.make("project-1"),
283+
);
284+
const sender = { id: 1 } as Electron.WebContents;
285+
const senderWindow = {} as Electron.BrowserWindow;
286+
const projectStartRecording = vi.fn(() => Effect.void);
287+
const hubStartRecording = vi.fn(() => Effect.void);
288+
fromId.mockReturnValue(sender);
289+
fromWebContents.mockReturnValue(senderWindow);
290+
291+
return PreviewIpc.startRecording.handler({ tabId: "owned-tab" }, { sender }).pipe(
292+
Effect.provideService(ElectronWindow.ElectronWindow, {
293+
identityFor: () => Effect.succeed(Option.some(identity)),
294+
} as never),
295+
Effect.provideService(DesktopClientSettings.DesktopClientSettings, {
296+
get: Effect.succeed(
297+
Option.some({
298+
browserRecordingShowKeyPresses: true,
299+
browserRecordingShowMousePresses: false,
300+
}),
301+
),
302+
} as never),
303+
Effect.provideService(PreviewManager.PreviewManager, {
304+
forWindow: (requested: WindowIdentity) =>
305+
Effect.succeed({
306+
startRecording:
307+
windowIdentityKey(requested) === windowIdentityKey(HUB_WINDOW_IDENTITY)
308+
? hubStartRecording
309+
: projectStartRecording,
310+
} as never),
311+
} as never),
312+
Effect.tap(() =>
313+
Effect.sync(() => {
314+
expect(projectStartRecording).toHaveBeenCalledWith("owned-tab", {
315+
showKeyPresses: true,
316+
showMousePresses: false,
317+
});
318+
expect(hubStartRecording).not.toHaveBeenCalled();
319+
}),
320+
),
321+
);
322+
});
323+
276324
effectIt.effect("resolves the sender identity before invoking its window manager", () => {
277325
const identity = projectWindowIdentity(
278326
EnvironmentId.make("environment-1"),

‎apps/desktop/src/ipc/methods/preview.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ export const startRecording = DesktopIpc.makeIpcMethod({
211211
channel: IpcChannels.PREVIEW_RECORDING_START_CHANNEL,
212212
payload: DesktopPreviewTabInputSchema,
213213
result: Schema.Void,
214-
handler: Effect.fn("desktop.ipc.preview.startRecording")(function* ({ tabId }) {
215-
const manager = yield* PreviewManager.PreviewManager;
214+
handler: Effect.fn("desktop.ipc.preview.startRecording")(function* ({ tabId }, event) {
215+
const { windowManager: manager } = yield* previewForSender(event);
216216
const store = yield* DesktopClientSettings.DesktopClientSettings;
217217
const settings = yield* store.get;
218218
const options = Option.map(settings, (value) => ({

‎apps/desktop/src/preview/WindowPolicy.fork.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const makeOperationsFactory = (
107107
).pipe(Effect.asVoid),
108108
subscribePointerEvents: () => Effect.void,
109109
subscribeRecordingFrames: () => Effect.void,
110+
subscribeRecordingInputs: () => Effect.void,
110111
} as unknown as WindowPolicy.OwnedPreviewOperations;
111112
});
112113

@@ -266,11 +267,13 @@ describe("desktop preview window policy", () => {
266267
stateListener = listener;
267268
}),
268269
subscribeOwnedRecordingFrames: () => Effect.void,
270+
subscribeOwnedRecordingInputs: () => Effect.void,
269271
subscribeOwnedPointerEvents: () => Effect.void,
270272
} as never,
271273
{
272274
stateChange: "preview-state",
273275
recordingFrame: "preview-recording",
276+
recordingInput: "preview-recording-input",
274277
pointerEvent: "preview-pointer",
275278
},
276279
);

‎apps/desktop/src/preview/WindowPolicy.ts‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import type { DesktopPreviewPointerEvent, DesktopPreviewRecordingFrame } from "@t3tools/contracts";
1+
import type {
2+
DesktopPreviewPointerEvent,
3+
DesktopPreviewRecordingFrame,
4+
DesktopPreviewRecordingInputEvent,
5+
} from "@t3tools/contracts";
26
import { BrowserWindow, webContents } from "electron";
37
import * as Cause from "effect/Cause";
48
import * as Effect from "effect/Effect";
@@ -36,6 +40,7 @@ export type { WindowIdentity };
3640
type StateListener = (tabId: string, state: PreviewTabState) => Effect.Effect<void>;
3741
type PointerEventListener = (event: DesktopPreviewPointerEvent) => Effect.Effect<void>;
3842
type RecordingFrameListener = (frame: DesktopPreviewRecordingFrame) => Effect.Effect<void>;
43+
type RecordingInputListener = (event: DesktopPreviewRecordingInputEvent) => Effect.Effect<void>;
3944
type OwnedStateListener = (
4045
identity: WindowIdentity,
4146
tabId: string,
@@ -49,6 +54,10 @@ type OwnedRecordingFrameListener = (
4954
identity: WindowIdentity,
5055
frame: DesktopPreviewRecordingFrame,
5156
) => Effect.Effect<void>;
57+
type OwnedRecordingInputListener = (
58+
identity: WindowIdentity,
59+
input: DesktopPreviewRecordingInputEvent,
60+
) => Effect.Effect<void>;
5261

5362
export interface OwnedPreviewOperations extends PreviewWindowManager {
5463
readonly hasTab: (tabId: string) => Effect.Effect<boolean>;
@@ -62,6 +71,9 @@ export interface OwnedPreviewOperations extends PreviewWindowManager {
6271
readonly subscribeRecordingFrames: (
6372
listener: RecordingFrameListener,
6473
) => Effect.Effect<void, never, Scope.Scope>;
74+
readonly subscribeRecordingInputs: (
75+
listener: RecordingInputListener,
76+
) => Effect.Effect<void, never, Scope.Scope>;
6577
}
6678

6779
interface WindowOperationsEntry {
@@ -83,7 +95,7 @@ const subscribe = <A>(ref: Ref.Ref<ReadonlySet<A>>, listener: A) =>
8395
).pipe(Effect.asVoid);
8496

8597
const deliverOwned = <A>(
86-
kind: "state-change" | "recording-frame" | "pointer-event",
98+
kind: "state-change" | "recording-frame" | "recording-input" | "pointer-event",
8799
listeners: ReadonlySet<A>,
88100
deliver: (listener: A) => Effect.Effect<void>,
89101
) =>
@@ -119,6 +131,9 @@ export const makeWindowOwnership = Effect.fn("PreviewWindowPolicy.makeWindowOwne
119131
const ownedRecordingListenersRef = yield* Ref.make<ReadonlySet<OwnedRecordingFrameListener>>(
120132
new Set(),
121133
);
134+
const ownedRecordingInputListenersRef = yield* Ref.make<ReadonlySet<OwnedRecordingInputListener>>(
135+
new Set(),
136+
);
122137

123138
const createEntry = Effect.fn("PreviewWindowPolicy.createWindowOperations")(function* (
124139
identity: WindowIdentity,
@@ -156,6 +171,15 @@ export const makeWindowOwnership = Effect.fn("PreviewWindowPolicy.makeWindowOwne
156171
),
157172
)
158173
.pipe(Effect.provideService(Scope.Scope, scope)),
174+
operations
175+
.subscribeRecordingInputs((input) =>
176+
Ref.get(ownedRecordingInputListenersRef).pipe(
177+
Effect.flatMap((listeners) =>
178+
deliverOwned("recording-input", listeners, (listener) => listener(identity, input)),
179+
),
180+
),
181+
)
182+
.pipe(Effect.provideService(Scope.Scope, scope)),
159183
],
160184
{ discard: true },
161185
).pipe(Effect.onError(() => Scope.close(scope, Exit.void).pipe(Effect.ignore)));
@@ -220,7 +244,8 @@ export const makeWindowOwnership = Effect.fn("PreviewWindowPolicy.makeWindowOwne
220244
copyArtifactToClipboard: operations.copyArtifactToClipboard,
221245
openPictureInPicture: (tabId) => authorized(tabId, operations.openPictureInPicture(tabId)),
222246
closePictureInPicture: (tabId) => authorized(tabId, operations.closePictureInPicture(tabId)),
223-
startRecording: (tabId) => authorized(tabId, operations.startRecording(tabId)),
247+
startRecording: (tabId, options) =>
248+
authorized(tabId, operations.startRecording(tabId, options)),
224249
stopRecording: (tabId) => authorized(tabId, operations.stopRecording(tabId)),
225250
saveRecording: (tabId, mimeType, data) =>
226251
authorized(tabId, operations.saveRecording(tabId, mimeType, data)),
@@ -302,6 +327,8 @@ export const makeWindowOwnership = Effect.fn("PreviewWindowPolicy.makeWindowOwne
302327
subscribe(ownedPointerListenersRef, listener),
303328
subscribeOwnedRecordingFrames: (listener: OwnedRecordingFrameListener) =>
304329
subscribe(ownedRecordingListenersRef, listener),
330+
subscribeOwnedRecordingInputs: (listener: OwnedRecordingInputListener) =>
331+
subscribe(ownedRecordingInputListenersRef, listener),
305332
subscribeStateChanges: (listener: StateListener) =>
306333
subscribe(ownedStateListenersRef, (identity, tabId, state) =>
307334
identity.kind === "hub" ? listener(tabId, state) : Effect.void,
@@ -314,6 +341,10 @@ export const makeWindowOwnership = Effect.fn("PreviewWindowPolicy.makeWindowOwne
314341
subscribe(ownedRecordingListenersRef, (identity, frame) =>
315342
identity.kind === "hub" ? listener(frame) : Effect.void,
316343
),
344+
subscribeRecordingInputs: (listener: RecordingInputListener) =>
345+
subscribe(ownedRecordingInputListenersRef, (identity, input) =>
346+
identity.kind === "hub" ? listener(input) : Effect.void,
347+
),
317348
};
318349
});
319350

@@ -347,6 +378,7 @@ export const installEventForwarding = Effect.fn("PreviewWindowPolicy.installEven
347378
channels: {
348379
readonly stateChange: string;
349380
readonly recordingFrame: string;
381+
readonly recordingInput: string;
350382
readonly pointerEvent: string;
351383
},
352384
) {
@@ -365,6 +397,9 @@ export const installEventForwarding = Effect.fn("PreviewWindowPolicy.installEven
365397
yield* manager.subscribeOwnedRecordingFrames((identity, frame) =>
366398
send(identity, channels.recordingFrame, frame),
367399
);
400+
yield* manager.subscribeOwnedRecordingInputs((identity, input) =>
401+
send(identity, channels.recordingInput, input),
402+
);
368403
yield* manager.subscribeOwnedPointerEvents((identity, event) =>
369404
send(identity, channels.pointerEvent, event),
370405
);

‎apps/web/src/components/ChatMarkdown.fork.test.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ vi.mock("~/lib/openPullRequestLink", () => ({
2525
findProjectForChangeRequest: () => undefined,
2626
matchesLinkedPullRequestUrl: () => false,
2727
parseChangeRequestUrl: () => null,
28+
// Upstream resolves a preview target before the fork's GitHub destination
29+
// controls render; stub it so the fork controls stay the only path under test.
30+
resolvePullRequestPreviewTarget: () => null,
2831
useOpenChangeRequestLink: () => vi.fn(),
2932
}));
3033

‎apps/web/src/hooks/useThreadActions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
} from "../state/entities";
3939
import { useTerminalUiStateStore } from "../terminalUiStateStore";
4040
import { useUiStateStore } from "../uiStateStore";
41-
import { resolveThreadRouteRef } from "../threadRoutes";
41+
import { buildThreadRouteParams, resolveThreadRouteRef } from "../threadRoutes";
4242
import { resolveThreadRouteDeparture } from "../lib/threadRouteNavigation";
4343
import {
4444
formatWorktreePathForDisplay,

0 commit comments

Comments
 (0)