Skip to content

Commit c257092

Browse files
authored
Merge branch 'main' into fix/macos-keychain-main-thread
2 parents 7a408aa + 3a69f7a commit c257092

321 files changed

Lines changed: 15401 additions & 1916 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/desktop/src/app/DesktopApp.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,7 @@ const bootstrap = Effect.gen(function* () {
239239
}
240240

241241
if (!(yield* Ref.get(state.quitting))) {
242-
if (settings.wslOnly === true && settings.wslBackendEnabled === true) {
243-
yield* desktopWindow.showConnectingSplash;
244-
}
242+
yield* desktopWindow.showConnectingSplash;
245243
yield* primaryBackend.start;
246244
yield* logBootstrapInfo("bootstrap backend start requested");
247245
yield* appActivation.start.pipe(

‎apps/desktop/src/backend/DesktopBackendPool.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export const layer = Layer.effect(
180180
electronDialog
181181
.showErrorBox(
182182
"This T3 home is unavailable",
183-
"Another T3 Code server, such as the background service, is using this data directory. Stop that server and reopen T3 Code, or set a separate T3CODE_HOME and pair with the running server.",
183+
"Another T3 Code server, such as the background service, is using this data directory, or an older background service is set up for it. Stop that server or try `t3 update`. If the older launcher cannot update, run `t3 service uninstall` and optionally reinstall with `t3 service install` from a current CLI. Use `npx t3@latest` if `t3` is missing or outdated, and pass `--base-dir` with the service's T3 home to each command. Then reopen T3 Code. You can also set a separate T3CODE_HOME and pair with the running server.",
184184
)
185185
.pipe(Effect.andThen(electronApp.quit)),
186186
});

‎apps/desktop/src/electron/ElectronShell.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ describe("ElectronShell", () => {
7878

7979
const electronShell = yield* ElectronShell.ElectronShell;
8080
const result = yield* electronShell.openExternal(
81-
"vscode://vscode-remote/ssh-remote+example.com/home/user/project",
81+
"vscode://vscode-remote/ssh-remote+user%40example.com/home/user/project",
8282
);
8383

8484
assert.equal(result, true);
8585
assert.deepEqual(openExternalMock.mock.calls, [
86-
["vscode://vscode-remote/ssh-remote+example.com/home/user/project"],
86+
["vscode://vscode-remote/ssh-remote+user%40example.com/home/user/project"],
8787
]);
8888
}).pipe(Effect.provide(ElectronShell.layer)),
8989
);
@@ -94,13 +94,13 @@ describe("ElectronShell", () => {
9494

9595
const electronShell = yield* ElectronShell.ElectronShell;
9696
const results = yield* Effect.all([
97-
electronShell.openExternal("zed://ssh/example.com/home/user/project"),
97+
electronShell.openExternal("zed://ssh/user@example.com/home/user/project"),
9898
electronShell.openExternal("zed://ssh/example.com/"),
9999
]);
100100

101101
assert.deepEqual(results, [true, true]);
102102
assert.deepEqual(openExternalMock.mock.calls, [
103-
["zed://ssh/example.com/home/user/project"],
103+
["zed://ssh/user@example.com/home/user/project"],
104104
["zed://ssh/example.com/"],
105105
]);
106106
}).pipe(Effect.provide(ElectronShell.layer)),
@@ -111,7 +111,7 @@ describe("ElectronShell", () => {
111111
openExternalMock.mockResolvedValue(undefined);
112112

113113
const url =
114-
"jetbrains://gateway/ssh/environment?h=example.com&launchIde=true&ideHint=IU&projectHint=%2Fhome%2Fuser%2Fproject";
114+
"jetbrains://gateway/ssh/environment?h=example.com&launchIde=true&ideHint=IU&projectHint=%2Fhome%2Fuser%2Fproject&u=user";
115115
const electronShell = yield* ElectronShell.ElectronShell;
116116
const result = yield* electronShell.openExternal(url);
117117

@@ -150,7 +150,7 @@ describe("ElectronShell", () => {
150150
electronShell.openExternal(
151151
"vscode://:secret@vscode-remote/ssh-remote+example.com/home/user/project",
152152
),
153-
electronShell.openExternal("zed://ssh/[email protected]/home/user/project"),
153+
electronShell.openExternal("zed://ssh/user:secret@example.com/home/user/project"),
154154
electronShell.openExternal("jetbrains://user@gateway/ssh/environment?h=example.com"),
155155
]);
156156

‎apps/desktop/src/electron/ElectronShell.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const REMOTE_EDITOR_PROTOCOLS = new Set(
2222
}),
2323
);
2424

25-
// Zed's host sits in the first path segment, so it needs its own userinfo ban.
26-
const ZED_SSH_PATHNAME = /^\/[^/@:]+\/.*$/;
25+
// Zed embeds [user@]host in the path; reject passwords and ports there.
26+
const ZED_SSH_PATHNAME = /^\/(?:[^/@:]+@)?[^/@:]+\/.*$/;
2727

2828
const isRemoteEditorUrl = (url: URL) =>
2929
REMOTE_EDITOR_PROTOCOLS.has(url.protocol) &&

‎apps/desktop/src/electron/ElectronUpdater.test.ts‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { assert, describe, it } from "@effect/vitest";
22
import * as Effect from "effect/Effect";
3+
import type { VerifyUpdateCodeSignature } from "electron-updater";
34
import { beforeEach, vi } from "vite-plus/test";
45

56
const { autoUpdaterMock } = vi.hoisted(() => ({
@@ -13,6 +14,8 @@ const { autoUpdaterMock } = vi.hoisted(() => ({
1314
fullChangelog: false,
1415
checkForUpdates: vi.fn(() => Promise.resolve(null)),
1516
downloadUpdate: vi.fn(() => Promise.resolve([])),
17+
logger: { info: vi.fn(), warn: vi.fn(), error: vi.fn() },
18+
verifyUpdateCodeSignature: undefined as VerifyUpdateCodeSignature | undefined,
1619
on: vi.fn(),
1720
quitAndInstall: vi.fn(),
1821
removeListener: vi.fn(),
@@ -43,6 +46,7 @@ describe("ElectronUpdater", () => {
4346
autoUpdaterMock.quitAndInstall.mockClear();
4447
autoUpdaterMock.removeListener.mockClear();
4548
autoUpdaterMock.setFeedURL.mockClear();
49+
autoUpdaterMock.verifyUpdateCodeSignature = undefined;
4650
});
4751

4852
it.effect("scopes updater event listeners", () =>
@@ -136,4 +140,84 @@ describe("ElectronUpdater", () => {
136140
assert.deepEqual(autoUpdaterMock.quitAndInstall.mock.calls, [[true, false]]);
137141
}).pipe(Effect.provide(ElectronUpdater.layer)),
138142
);
143+
144+
describe("Windows update signature check", () => {
145+
const publisherNames = ["T3 Tools Inc"];
146+
const installerPath = "C:\\updater\\pending\\temp-T3-Code-x64.exe";
147+
// execFile marks the error killed when the verifier exceeds its 20-second timeout.
148+
const timedOut = () =>
149+
Object.assign(new Error("Command failed: powershell.exe"), { killed: true });
150+
151+
const downloadVerifyingSignature = () => {
152+
autoUpdaterMock.downloadUpdate.mockImplementationOnce(async () => {
153+
const rejection = await autoUpdaterMock.verifyUpdateCodeSignature!(
154+
publisherNames,
155+
installerPath,
156+
);
157+
// NSIS accepts only null as a successful signature check.
158+
if (rejection !== null) throw new Error(`Invalid signature: ${rejection}`);
159+
return [];
160+
});
161+
return Effect.flatMap(ElectronUpdater.ElectronUpdater, (updater) => updater.downloadUpdate);
162+
};
163+
164+
it.effect("retries a timed-out signature check with the same verifier and installer", () =>
165+
Effect.gen(function* () {
166+
const verify = vi
167+
.fn<VerifyUpdateCodeSignature>()
168+
.mockRejectedValueOnce(timedOut())
169+
.mockResolvedValueOnce(null);
170+
autoUpdaterMock.verifyUpdateCodeSignature = verify;
171+
172+
yield* downloadVerifyingSignature();
173+
174+
assert.deepEqual(verify.mock.calls, [
175+
[publisherNames, installerPath],
176+
[publisherNames, installerPath],
177+
]);
178+
}).pipe(Effect.provide(ElectronUpdater.layer)),
179+
);
180+
181+
it.effect("fails on invalid signatures, other errors and two timeouts on each download", () =>
182+
Effect.gen(function* () {
183+
const cases = [
184+
{ outcome: () => Promise.resolve("Invalid publisher"), calls: 1 },
185+
{ outcome: () => Promise.reject(new Error("Cannot execute PowerShell")), calls: 1 },
186+
{ outcome: () => Promise.reject(timedOut()), calls: 2 },
187+
];
188+
for (const { outcome, calls } of cases) {
189+
const verify = vi.fn<VerifyUpdateCodeSignature>(outcome);
190+
autoUpdaterMock.verifyUpdateCodeSignature = verify;
191+
192+
// Reusing the installed verifier must neither stack retries nor exhaust future retries.
193+
for (let download = 1; download <= 2; download++) {
194+
const error = yield* downloadVerifyingSignature().pipe(Effect.flip);
195+
assert.instanceOf(error, ElectronUpdater.ElectronUpdaterDownloadUpdateError);
196+
assert.equal(verify.mock.calls.length, calls * download);
197+
}
198+
}
199+
}).pipe(Effect.provide(ElectronUpdater.layer)),
200+
);
201+
202+
it.effect("rejects a retry when the upstream capability probe skips verification", () =>
203+
Effect.gen(function* () {
204+
const verify = vi
205+
.fn<VerifyUpdateCodeSignature>()
206+
.mockRejectedValueOnce(timedOut())
207+
.mockImplementationOnce(async () => {
208+
// Upstream resolves null even though its failed capability probe skips verification.
209+
autoUpdaterMock.logger.warn(
210+
"Cannot execute ConvertTo-Json: spawnSync powershell.exe ETIMEDOUT. Ignoring signature validation due to unsupported powershell version. Please upgrade to powershell 3 or higher.",
211+
);
212+
return null;
213+
});
214+
autoUpdaterMock.verifyUpdateCodeSignature = verify;
215+
216+
const error = yield* downloadVerifyingSignature().pipe(Effect.flip);
217+
218+
assert.instanceOf(error, ElectronUpdater.ElectronUpdaterDownloadUpdateError);
219+
assert.equal(verify.mock.calls.length, 2);
220+
}).pipe(Effect.provide(ElectronUpdater.layer)),
221+
);
222+
});
139223
});

‎apps/desktop/src/electron/ElectronUpdater.ts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as Schema from "effect/Schema";
55
import * as Scope from "effect/Scope";
66

77
import { autoUpdater } from "electron-updater";
8+
import type { NsisUpdater, VerifyUpdateCodeSignature } from "electron-updater";
89

910
type AutoUpdater = typeof autoUpdater;
1011

@@ -80,6 +81,45 @@ export class ElectronUpdater extends Context.Service<
8081
}
8182
>()("@t3tools/desktop/electron/ElectronUpdater") {}
8283

84+
const signatureChecksWithRetry = new WeakSet<VerifyUpdateCodeSignature>();
85+
86+
const retrySignatureCheckAfterTimeout = () => {
87+
// Only the Windows NSIS updater exposes this hook; its PowerShell check times out after 20 s.
88+
const updater = autoUpdater as AutoUpdater &
89+
Partial<Pick<NsisUpdater, "verifyUpdateCodeSignature">>;
90+
const verify = updater.verifyUpdateCodeSignature;
91+
if (verify === undefined || signatureChecksWithRetry.has(verify)) return;
92+
93+
const verifyWithRetry: VerifyUpdateCodeSignature = async (publisherNames, path) => {
94+
try {
95+
return await verify(publisherNames, path);
96+
} catch (error) {
97+
if (!(error instanceof Error && "killed" in error && error.killed === true)) throw error;
98+
}
99+
100+
const logger = updater.logger;
101+
let skipped = false;
102+
updater.logger = {
103+
info: (message) => logger?.info(message),
104+
warn: (message) => {
105+
// A failed capability probe makes electron-updater warn and return null without checking.
106+
skipped ||= String(message).includes("Ignoring signature validation");
107+
logger?.warn(message);
108+
},
109+
error: (message) => logger?.error(message),
110+
debug: (message) => logger?.debug?.(message),
111+
};
112+
try {
113+
const result = await verify(publisherNames, path);
114+
return skipped ? "Signature validation was skipped after a timed-out check." : result;
115+
} finally {
116+
updater.logger = logger;
117+
}
118+
};
119+
signatureChecksWithRetry.add(verifyWithRetry);
120+
updater.verifyUpdateCodeSignature = verifyWithRetry;
121+
};
122+
83123
/** @public Service construction is part of the canonical Effect module API. */
84124
export const make = ElectronUpdater.of({
85125
setFeedURL: (options) =>
@@ -131,6 +171,7 @@ export const make = ElectronUpdater.of({
131171
}).pipe(Effect.asVoid);
132172
}),
133173
downloadUpdate: Effect.suspend(() => {
174+
retrySignatureCheckAfterTimeout();
134175
const channel = autoUpdater.channel;
135176
return Effect.tryPromise({
136177
try: () => autoUpdater.downloadUpdate(),

‎apps/desktop/src/ipc/DesktopIpcHandlers.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import {
4040
import {
4141
getAppBranding,
4242
getLocalEnvironmentBootstraps,
43+
readLocalEnvironmentBootstraps,
4344
getLocalEnvironmentBearerToken,
4445
getRelayTelemetryEnabled,
4546
getSystemLocale,
@@ -100,6 +101,7 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers"
100101
yield* ipc.handleSync(getSystemLocale);
101102
yield* ipc.handleSync(getWindowFullscreenState);
102103
yield* ipc.handleSync(getLocalEnvironmentBootstraps);
104+
yield* ipc.handle(readLocalEnvironmentBootstraps);
103105
yield* ipc.handleSync(getLocalEnvironmentEnabled);
104106
yield* ipc.handle(setLocalEnvironmentEnabled);
105107
yield* ipc.handle(getLocalEnvironmentBearerToken);
@@ -164,7 +166,11 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers"
164166
yield* ipc.handle(installCliCommand);
165167
yield* ipc.handle(uninstallCliCommand);
166168
for (const previewMethod of PreviewIpc.methods) {
167-
yield* ipc.handle(previewMethod);
169+
// Explicit types preserve the error/service union of these heterogeneous preview methods.
170+
yield* ipc.handle<
171+
Effect.Error<ReturnType<(typeof PreviewIpc.methods)[number]["handler"]>>,
172+
Effect.Services<ReturnType<(typeof PreviewIpc.methods)[number]["handler"]>>
173+
>(previewMethod);
168174
}
169175
yield* ipc.handle(PreviewIpc.listBrowserImportSources);
170176
yield* ipc.handle(PreviewIpc.importBrowserCookies);

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

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
DEFAULT_BROWSER_PROFILE_ID,
44
INCOGNITO_BROWSER_PROFILE_ID,
55
PreviewAutomationStatus,
6+
PreviewCaptureFailure,
67
} from "@t3tools/contracts";
78
import * as Cause from "effect/Cause";
89
import * as Effect from "effect/Effect";
@@ -14,6 +15,8 @@ import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
1415
import * as PreviewManager from "../../preview/Manager.ts";
1516
import * as BrowserImport from "../../preview/BrowserImport/BrowserImport.ts";
1617
import * as PreviewIpc from "./preview.ts";
18+
import * as DesktopIpc from "../DesktopIpc.ts";
19+
import * as DesktopClientSettings from "../../settings/DesktopClientSettings.ts";
1720

1821
const { fromPartition } = vi.hoisted(() => ({
1922
fromPartition: vi.fn(() => {
@@ -33,7 +36,102 @@ vi.mock("electron", () => ({
3336
},
3437
}));
3538

39+
const decodeCaptureFailure = Schema.decodeUnknownEffect(PreviewCaptureFailure);
40+
3641
describe("preview IPC methods", () => {
42+
const invokeCapture = (
43+
method: typeof PreviewIpc.startRecording | typeof PreviewIpc.captureScreenshot,
44+
manager: Partial<PreviewManager.PreviewManager["Service"]>,
45+
) =>
46+
Effect.scoped(
47+
Effect.gen(function* () {
48+
let listener: DesktopIpc.DesktopIpcHandleListener | undefined;
49+
const ipc = DesktopIpc.make({
50+
removeHandler: vi.fn(),
51+
handle: (_channel, registered) => {
52+
listener = registered;
53+
},
54+
removeAllListeners: vi.fn(),
55+
on: vi.fn(),
56+
});
57+
yield* ipc.handle(method);
58+
return yield* Effect.promise(async () =>
59+
structuredClone(await listener!({ sender: { id: 7 } }, { tabId: "capture-tab" })),
60+
);
61+
}).pipe(
62+
Effect.provideService(
63+
PreviewManager.PreviewManager,
64+
manager as PreviewManager.PreviewManager["Service"],
65+
),
66+
Effect.provideService(DesktopClientSettings.DesktopClientSettings, {
67+
get: Effect.succeedNone,
68+
set: () => Effect.void,
69+
}),
70+
),
71+
);
72+
73+
effectIt.effect.each([
74+
{
75+
cause: new Error("Current display surface not available for capture"),
76+
reason: "capture-unavailable",
77+
guidance: ["target tab", "unlocked", "display is on", "window is restored"],
78+
},
79+
{
80+
cause: new Cause.TimeoutError(),
81+
reason: "capture-timeout",
82+
guidance: ["timed out during capture-page"],
83+
},
84+
{
85+
cause: new Error("Current display surface not available for capture: private page data"),
86+
reason: "capture-failed",
87+
guidance: ["Preview capture failed during capture-page"],
88+
},
89+
])(
90+
"transports a safe $reason screenshot diagnostic through registered IPC",
91+
({ cause, reason, guidance }) =>
92+
Effect.gen(function* () {
93+
const result = yield* invokeCapture(PreviewIpc.captureScreenshot, {
94+
captureScreenshot: (tabId) =>
95+
Effect.fail(
96+
new PreviewManager.PreviewOperationError({
97+
operation: "captureScreenshot.capturePage",
98+
tabId,
99+
artifactPath: "/private/capture.png",
100+
cause,
101+
}),
102+
),
103+
});
104+
expect(result).toEqual({
105+
_tag: "PreviewCaptureFailure",
106+
reason,
107+
stage: "capture-page",
108+
});
109+
const failure = yield* decodeCaptureFailure(result);
110+
for (const phrase of guidance) expect(failure.message).toContain(phrase);
111+
}),
112+
);
113+
114+
effectIt.effect("preserves recording arm failures without erasing successful void results", () =>
115+
Effect.gen(function* () {
116+
const result = yield* invokeCapture(PreviewIpc.startRecording, {
117+
startRecording: (tabId) =>
118+
Effect.fail(new PreviewManager.PreviewTabNotFoundError({ tabId })),
119+
});
120+
expect(result).toEqual({
121+
_tag: "PreviewCaptureFailure",
122+
reason: "renderer-unavailable",
123+
stage: "recording-start",
124+
});
125+
const failure = yield* decodeCaptureFailure(result);
126+
expect(failure.message).toContain("Reopen the preview tab");
127+
expect(
128+
yield* invokeCapture(PreviewIpc.startRecording, {
129+
startRecording: () => Effect.void,
130+
}),
131+
).toBeUndefined();
132+
}),
133+
);
134+
37135
beforeEach(() => {
38136
fromPartition.mockClear();
39137
});

0 commit comments

Comments
 (0)