Skip to content

Commit 9b254b3

Browse files
donjor-agent[bot]donjor
authored andcommitted
refactor(desktop): extract remaining window helper seams (#1820)
## Problem `DesktopWindow.ts` still carried fork window helpers inline, widening the upstream conflict surface on every sync. ## Change The remaining fork helpers move to `DesktopWindowDispatch.fork.ts`. `DesktopWindow.ts` keeps only marked one-line insertions. Follows `b85db359b3c` (createWindow seams as marked insertions); no behavior change. ## Scope and approval Fork sync-conflict reduction. ## Verification On the rebased head, base `origin/hyprws` `2023697`: ```text vp run fork:ci → exit 0 apps/desktop: vp exec tsc-rs --noEmit → exit 0 ``` Claude Opus 5.5 (host) and GPT Sol (peer), via Claude Code and Pi. ## Fork trailers Fork-Domain: multi-window Fork-Tier: core Co-authored-by: donjor <[email protected]>
1 parent a3d23d5 commit 9b254b3

2 files changed

Lines changed: 59 additions & 38 deletions

File tree

‎apps/desktop/src/window/DesktopWindow.ts‎

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -369,23 +369,17 @@ export const make = Effect.gen(function* () {
369369
const requestTargetWindow = electronWindow.currentMainOrFirst.pipe(Effect.flatMap(withoutSplash)); // fork-hook: multi-window/window-targets-request-target
370370
const captureRevealWindow = withSnapShotRevealTarget(requestTargetWindow); // fork-hook: multi-window/window-targets-capture-reveal-target
371371

372+
const preserveGuestZoomsFork = yield* WindowDispatch.makeWindowGuestZoomsFork; // fork-hook: multi-window/window-zoom-factory
372373
const zoomWindow = Effect.fn("desktop.window.zoomWindow")(function* (
373374
window: Electron.BrowserWindow,
374375
direction: MainWindowZoomDirection,
375376
) {
376377
const webContents = window.webContents;
377-
const windowId = yield* electronWindow.windowIdFor(window); // fork-hook: multi-window/window-id-zoom
378-
const windowPreviewManager = Option.isSome(windowId) // fork-hook: multi-window/window-id-zoom-owner
379-
? yield* previewManager.forWindow(windowId.value) // fork-hook: multi-window/window-id-zoom-manager
380-
: previewManager;
381-
// Chromium pushes the new level down to embedded guests, which would zoom
382-
// the previewed page along with the app UI. The preview browser keeps its
383-
// own zoom, so each guest owned by this window keeps its level.
384-
yield* windowPreviewManager.preserveGuestZooms(() => {
378+
yield* preserveGuestZoomsFork(window, () => {
385379
webContents.setZoomLevel(
386380
direction === "reset" ? 0 : webContents.getZoomLevel() + (direction === "in" ? 0.5 : -0.5),
387381
);
388-
});
382+
}); // fork-hook: multi-window/window-id-zoom
389383
if (environment.platform === "darwin") syncMacosWindowButtons(window);
390384
});
391385

@@ -975,34 +969,7 @@ export const make = Effect.gen(function* () {
975969
Effect.flatMap(requireWindow),
976970
); // fork-hook: multi-window/quit-create-or-interrupt
977971

978-
const ensureIdentity = Effect.fn("desktop.window.ensureIdentity")(function* (
979-
identity: WindowIdentity,
980-
windowId?: WindowId, // fork-hook: multi-window/window-id-ensure-param
981-
) {
982-
if (yield* Ref.get(desktopState.quitting)) return Option.none(); // fork-hook: multi-window/quit-ensure
983-
const create = (reservedId: WindowId) =>
984-
createWindow().pipe(
985-
WindowDispatch.withWindowCreateTargetFork({ identity, windowId: reservedId }),
986-
Effect.flatMap(Effect.fromOption),
987-
); // fork-hook: multi-window/window-id-create
988-
const ensured = yield* electronWindow
989-
.getOrCreate(identity, create, windowId)
990-
.pipe(Effect.catchNoSuchElement); // fork-hook: multi-window/window-id-get-or-create
991-
if (Option.isNone(ensured)) return ensured; // fork-hook: multi-window/quit-ensure-cancelled
992-
const result = ensured.value; // fork-hook: multi-window/quit-ensure-result
993-
if (result.created) {
994-
yield* logWindowInfo(
995-
identity.kind === "hub" ? "main window created" : "project window created",
996-
{
997-
identity: identity.kind === "hub" ? "hub" : "project",
998-
...(identity.kind === "hub"
999-
? {}
1000-
: { environmentId: identity.ref.environmentId, projectId: identity.ref.projectId }),
1001-
},
1002-
);
1003-
}
1004-
return Option.some(result); // fork-hook: multi-window/window-id-ensure-result
1005-
}); // fork-hook: multi-window/ensure-identity
972+
const ensureIdentity = yield* WindowDispatch.makeEnsureIdentityFork(createWindow); // fork-hook: multi-window/ensure-identity
1006973

1007974
const revealOrCreateIdentity = Effect.fn("desktop.window.revealOrCreateIdentity")(function* (
1008975
identity: WindowIdentity,

‎apps/desktop/src/window/DesktopWindowDispatch.fork.ts‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ import type { ScopedProjectRef } from "@t3tools/contracts";
22
import * as Context from "effect/Context";
33
import * as Effect from "effect/Effect";
44
import * as Option from "effect/Option";
5+
import * as Ref from "effect/Ref";
56
import type * as Electron from "electron";
67

78
import { makeComponentLogger } from "../app/DesktopObservability.ts";
8-
import type * as ElectronWindow from "../electron/ElectronWindow.ts";
9+
import * as DesktopState from "../app/DesktopState.ts";
10+
import * as ElectronWindow from "../electron/ElectronWindow.ts";
11+
import * as PreviewManager from "../preview/Manager.ts";
912
import type { DesktopWindowBounds } from "../settings/DesktopAppSettings.ts";
1013
import type { WindowRestoreEntry } from "./DesktopWindowSession.ts";
1114
import {
@@ -39,6 +42,57 @@ const WindowCreateTargetFork = Context.Reference<Option.Option<WindowCreateTarge
3942
{ defaultValue: () => Option.none() },
4043
);
4144

45+
export const makeEnsureIdentityFork = Effect.fn("desktop.window.makeEnsureIdentityFork")(function* <
46+
E,
47+
>(createWindow: () => Effect.Effect<Option.Option<Electron.BrowserWindow>, E>) {
48+
const { quitting } = yield* DesktopState.DesktopState;
49+
const electronWindow = yield* ElectronWindow.ElectronWindow;
50+
return Effect.fn("desktop.window.ensureIdentity")(function* (
51+
identity: WindowIdentity,
52+
windowId?: WindowId,
53+
) {
54+
if (yield* Ref.get(quitting)) return Option.none();
55+
const create = (reservedId: WindowId) =>
56+
createWindow().pipe(
57+
withWindowCreateTargetFork({ identity, windowId: reservedId }),
58+
Effect.flatMap(Effect.fromOption),
59+
);
60+
const ensured = yield* electronWindow
61+
.getOrCreate(identity, create, windowId)
62+
.pipe(Effect.catchNoSuchElement);
63+
if (Option.isNone(ensured)) return ensured;
64+
const result = ensured.value;
65+
if (result.created) {
66+
yield* logWindowInfo(
67+
identity.kind === "hub" ? "main window created" : "project window created",
68+
{
69+
identity: identity.kind === "hub" ? "hub" : "project",
70+
...(identity.kind === "hub"
71+
? {}
72+
: { environmentId: identity.ref.environmentId, projectId: identity.ref.projectId }),
73+
},
74+
);
75+
}
76+
return Option.some(result);
77+
});
78+
});
79+
80+
// Preserve only this embedder's guests; other windows keep independent preview zoom.
81+
export const makeWindowGuestZoomsFork = Effect.gen(function* () {
82+
const electronWindow = yield* ElectronWindow.ElectronWindow;
83+
const previewManager = yield* PreviewManager.PreviewManager;
84+
return Effect.fn("desktop.window.preserveWindowGuestZoomsFork")(function* (
85+
window: Electron.BrowserWindow,
86+
updateZoom: () => void,
87+
) {
88+
const windowId = yield* electronWindow.windowIdFor(window);
89+
const manager = Option.isSome(windowId)
90+
? yield* previewManager.forWindow(windowId.value)
91+
: previewManager;
92+
yield* manager.preserveGuestZooms(updateZoom);
93+
});
94+
});
95+
4296
export const requireWindowCreateTargetFork = Effect.gen(function* () {
4397
const target = yield* WindowCreateTargetFork;
4498
if (Option.isNone(target)) return yield* Effect.die("createWindow ran without a create target");

0 commit comments

Comments
 (0)