The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 19:45 UTC
fix(desktop): installing an update closes SSH port forwards before relaunch (#35018)
Julius Marminge committed
Nov 12, 2026 at 02:32 UTC
dd9c2f8e21071e3ab4290fc456d23f6e53f1efe6
6 files changed
+45
-17
apps/desktop/src/main.ts
+2
-1
@@ -214,7 +214,6 @@ const layerDesktopApplication = Layer.mergeAll(
214
DesktopApplicationMenu.layer,
215
DesktopLinuxUrlHandler.layer,
216
DesktopCliCommand.layer,
217
- layerDesktopSsh,
217
).pipe(
218
Layer.provideMerge(layerDesktopSnapShot),
219
Layer.provideMerge(
@@ -224,6 +223,8 @@ const layerDesktopApplication = Layer.mergeAll(
223
Layer.provide(DesktopManagedPolicy.layer),
224
),
225
),
226
+ // Updates closes the same tunnels the SSH IPC opens before quitAndInstall.
227
+ Layer.provideMerge(layerDesktopSsh),
228
Layer.provideMerge(layerDesktopWslBackend),
229
Layer.provideMerge(layerDesktopLocalEnvironmentAuth),
230
);
apps/desktop/src/ssh/DesktopSshEnvironment.ts
+2
@@ -64,6 +64,7 @@ export class DesktopSshEnvironment extends Context.Service<
64
readonly disconnectEnvironment: (
65
target: DesktopSshEnvironmentTarget,
66
) => Effect.Effect<void, DesktopSshEnvironmentOperationError>;
67
+ readonly closeAllTunnels: Effect.Effect<void>;
68
}
69
>()("@t3tools/desktop/ssh/DesktopSshEnvironment") {}
70
@@ -156,6 +157,7 @@ export const make = Effect.gen(function* () {
157
Effect.provideService(SshAuth.SshPasswordPrompt, passwordPrompt),
158
Effect.provide(runtimeContext),
159
),
160
+ closeAllTunnels: manager.closeAllTunnels,
161
});
162
});
163
apps/desktop/src/updates/DesktopUpdates.test.ts
+11
-3
@@ -655,7 +655,11 @@ describe("DesktopUpdates", () => {
655
const result = yield* updates.install;
656
assert.isTrue(result.accepted);
657
assert.isFalse(yield* Ref.get(desktopState.quitting));
658
- assert.deepEqual(harness.installSteps, ["quitAndInstall", "startBackend"]);
658
+ assert.deepEqual(harness.installSteps, [
659
+ "closeSshTunnels",
660
+ "quitAndInstall",
661
+ "startBackend",
662
+ ]);
663
assert.equal(harness.updateRestartMarkers.size, 0);
664
assert.equal(harness.installRecords.size, 0);
665
}),
@@ -685,7 +689,7 @@ describe("DesktopUpdates", () => {
689
690
const result = yield* updates.install;
691
assert.equal(result.state.errorContext, "install");
688
- assert.deepEqual(harness.installSteps, ["quitAndInstall"]);
692
+ assert.deepEqual(harness.installSteps, ["closeSshTunnels", "quitAndInstall"]);
693
assert.isFalse((yield* (yield* pool.primary).snapshot).desiredRunning);
694
}),
695
).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
@@ -779,7 +783,11 @@ describe("DesktopUpdates", () => {
783
assert.equal(harness.quitAndInstalls(), 1);
784
harness.emit("error", new Error("duplicate native installer error"));
785
yield* flushCallbacks;
782
- assert.deepEqual(harness.installSteps, ["quitAndInstall", "startBackend"]);
786
+ assert.deepEqual(harness.installSteps, [
787
+ "closeSshTunnels",
788
+ "quitAndInstall",
789
+ "startBackend",
790
+ ]);
791
792
yield* Deferred.succeed(releaseRecovery, undefined);
793
const failedResult = yield* Fiber.join(failedInstall);
apps/desktop/src/updates/DesktopUpdates.ts
+13
-5
@@ -35,6 +35,7 @@ import * as ElectronUpdater from "../electron/ElectronUpdater.ts";
35
import * as ElectronWindow from "../electron/ElectronWindow.ts";
36
import * as IpcChannels from "../ipc/channels.ts";
37
import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
38
+import * as DesktopSshEnvironment from "../ssh/DesktopSshEnvironment.ts";
39
import * as DesktopUpdatePolicy from "./DesktopUpdatePolicy.ts";
40
import {
41
normalizeDesktopUpdateReleaseNotes,
@@ -369,6 +370,7 @@ function isArm64HostRunningIntelBuild(runtimeInfo: DesktopRuntimeInfo): boolean
370
export const make = Effect.gen(function* () {
371
const config = yield* DesktopConfig.DesktopConfig;
372
const pool = yield* DesktopBackendPool.DesktopBackendPool;
373
+ const sshEnvironment = yield* DesktopSshEnvironment.DesktopSshEnvironment;
374
const desktopState = yield* DesktopState.DesktopState;
375
const electronUpdater = yield* ElectronUpdater.ElectronUpdater;
376
const electronWindow = yield* ElectronWindow.ElectronWindow;
@@ -816,17 +818,23 @@ export const make = Effect.gen(function* () {
818
yield* writeUpdateRestartMarker;
819
const { downloadedVersion } = yield* Ref.get(updateStateRef);
820
if (downloadedVersion !== null) yield* writeInstallRecord(downloadedVersion);
819
- // Stop pooled backends before quitAndInstall can outrun their scope finalizers.
821
+ // Stop pooled backends and SSH tunnels before quitAndInstall can outrun their scope finalizers.
822
const instances = yield* pool.list;
823
// stop clears desiredRunning, so retain the recovery set beforehand.
824
const runningInstances = yield* Effect.filter(instances, (instance) =>
825
instance.snapshot.pipe(Effect.map((snapshot) => snapshot.desiredRunning)),
826
);
827
yield* Ref.set(installRunningBackendsRef, runningInstances);
826
- yield* Effect.forEach(
827
- instances,
828
- (instance) =>
829
- instance.stop({ timeout: DesktopBackendManager.BACKEND_QUIT_STOP_TIMEOUT }),
828
+ yield* Effect.all(
829
+ [
830
+ Effect.forEach(
831
+ instances,
832
+ (instance) =>
833
+ instance.stop({ timeout: DesktopBackendManager.BACKEND_QUIT_STOP_TIMEOUT }),
834
+ { concurrency: "unbounded" },
835
+ ),
836
+ sshEnvironment.closeAllTunnels,
837
+ ],
838
{ concurrency: "unbounded" },
839
);
840
yield* electronUpdater.quitAndInstall({
apps/desktop/src/updates/updatesTestHarness.ts
+8
@@ -13,6 +13,7 @@ import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
13
import * as ElectronUpdater from "../electron/ElectronUpdater.ts";
14
import * as ElectronWindow from "../electron/ElectronWindow.ts";
15
import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
16
+import * as DesktopSshEnvironment from "../ssh/DesktopSshEnvironment.ts";
17
import * as DesktopState from "../app/DesktopState.ts";
18
import * as DesktopUpdatePolicy from "./DesktopUpdatePolicy.ts";
19
import * as DesktopUpdates from "./DesktopUpdates.ts";
@@ -136,6 +137,12 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
137
syncAllAppearance: () => Effect.void,
138
} satisfies ElectronWindow.ElectronWindow["Service"]);
139
140
+ const layerSshEnvironment = Layer.mock(DesktopSshEnvironment.DesktopSshEnvironment, {
141
+ closeAllTunnels: Effect.sync(() => {
142
+ installSteps.push("closeSshTunnels");
143
+ }),
144
+ });
145
+
146
let backendDesiredRunning = options.backendDesiredRunning ?? true;
147
const stubBackendInstance: DesktopBackendPool.DesktopBackendInstance = {
148
id: DesktopBackendPool.PRIMARY_INSTANCE_ID,
@@ -278,6 +285,7 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
285
Layer.provideMerge(layerUpdater),
286
Layer.provideMerge(layerWindow),
287
Layer.provideMerge(layerBackend),
288
+ Layer.provideMerge(layerSshEnvironment),
289
Layer.provideMerge(DesktopState.layer),
290
Layer.provideMerge(layerSettings),
291
Layer.provideMerge(
packages/ssh/src/tunnel.ts
+9
-8
@@ -164,6 +164,8 @@ export interface SshEnvironmentManagerShape {
164
readonly disconnectEnvironment: (
165
target: DesktopSshEnvironmentTarget,
166
) => Effect.Effect<void, SshEnvironmentEffectError, SshEnvironmentEffectContext>;
167
+ /** Closes every tunnel, as the manager's scope finalizer does. */
168
+ readonly closeAllTunnels: Effect.Effect<void>;
169
}
170
171
const RemoteLaunchResult = Schema.Struct({
@@ -1521,16 +1523,15 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
1523
});
1524
});
1525
1524
- yield* Scope.addFinalizer(
1525
- managerScope,
1526
- Effect.sync(() => [...tunnels.values()]).pipe(
1527
- Effect.flatMap((entries) =>
1528
- Effect.forEach(entries, closeTunnelEntry, { concurrency: "unbounded" }),
1529
- ),
1530
- Effect.ignore,
1526
+ const closeAllTunnels = Effect.sync(() => [...tunnels.values()]).pipe(
1527
+ Effect.flatMap((entries) =>
1528
+ Effect.forEach(entries, closeTunnelEntry, { concurrency: "unbounded" }),
1529
),
1530
+ Effect.ignore,
1531
);
1532
1533
+ yield* Scope.addFinalizer(managerScope, closeAllTunnels);
1534
+
1535
const promptForPassword = Effect.fn("ssh/tunnel.promptForPassword")(function* (
1536
target: DesktopSshEnvironmentTarget,
1537
attempt: number,
@@ -1920,7 +1921,7 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
1921
);
1922
});
1923
1923
- return SshEnvironmentManager.of({ ensureEnvironment, disconnectEnvironment });
1924
+ return SshEnvironmentManager.of({ ensureEnvironment, disconnectEnvironment, closeAllTunnels });
1925
});
1926
1927
/**