The best way to control Claude Code, Codex and more from any computer or phone
fix(ssh): a slow reconnect no longer replaces a healthy port forward (#35874)
Julius Marminge committed
Nov 12, 2026 at 19:37 UTC
6bc3726eb3ba9775dd912a5d76eaab234a64be24
2 files changed
+29
-6
packages/ssh/src/tunnel.test.ts
+25
-5
@@ -681,22 +681,31 @@ describe("ssh tunnel scripts", () => {
681
}),
682
);
683
684
- it.effect("connects through a tunnel whose responses take longer than a second", () =>
684
+ it.effect("connects and reuses a tunnel whose responses take over a second", () =>
685
Effect.gen(function* () {
686
// Over a ~1s RTT link each request through the forward takes a few round trips.
687
const RESPONSE_MS = 2_500;
688
const tunnelSpawned = yield* Deferred.make<void>();
689
+ const reconnectProbed = yield* Deferred.make<void>();
690
+ const forwardReplaced = yield* Deferred.make<void>();
691
+ let forwards = 0;
692
+ let connected = false;
693
const spawner = ChildProcessSpawner.make((command) =>
694
commandArgs(command).includes("-N")
691
- ? Deferred.succeed(tunnelSpawned, undefined).pipe(
695
+ ? Effect.sync(() => ++forwards).pipe(
696
+ Effect.flatMap((count) =>
697
+ Deferred.succeed(count === 1 ? tunnelSpawned : forwardReplaced, undefined),
698
+ ),
699
Effect.as(makeRunningProcess(() => undefined)),
700
)
701
: Effect.succeed(makeSuccessfulProcess('{"remotePort":3773}\n')),
702
);
703
const httpClient = HttpClient.make((request) =>
697
- Effect.sleep(Duration.millis(RESPONSE_MS)).pipe(
698
- Effect.as(HttpClientResponse.fromWeb(request, new Response("", { status: 200 }))),
699
- ),
704
+ Effect.gen(function* () {
705
+ if (connected) yield* Deferred.succeed(reconnectProbed, undefined);
706
+ yield* Effect.sleep(Duration.millis(RESPONSE_MS));
707
+ return HttpClientResponse.fromWeb(request, new Response("", { status: 200 }));
708
+ }),
709
);
710
const layer = Layer.mergeAll(
711
NodeServices.layer,
@@ -726,6 +735,17 @@ describe("ssh tunnel scripts", () => {
735
Result.isSuccess(result),
736
Result.isFailure(result) ? result.failure.message : undefined,
737
);
738
+ if (Result.isFailure(result)) return;
739
+
740
+ connected = true;
741
+ const reconnect = yield* Effect.forkChild(manager.ensureEnvironment(result.success.target));
742
+ yield* Deferred.await(reconnectProbed);
743
+ yield* TestClock.adjust(Duration.seconds(60));
744
+ const outcome = yield* Effect.raceFirst(
745
+ Fiber.join(reconnect).pipe(Effect.map((environment) => environment.httpBaseUrl)),
746
+ Deferred.await(forwardReplaced).pipe(Effect.as("replaced the forward")),
747
+ );
748
+ assert.equal(outcome, result.success.httpBaseUrl);
749
}).pipe(Effect.provide(layer), Effect.scoped);
750
}),
751
);
packages/ssh/src/tunnel.ts
+4
-1
@@ -1859,7 +1859,10 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
1859
remotePort: entry.remotePort,
1860
});
1861
const readinessExit = yield* Effect.exit(
1862
- waitForHttpReady({ baseUrl: entry.httpBaseUrl, timeoutMs: 2_000 }),
1862
+ waitForHttpReady({
1863
+ baseUrl: entry.httpBaseUrl,
1864
+ timeoutMs: SSH_TUNNEL_READY_PROBE_TIMEOUT_MS,
1865
+ }),
1866
);
1867
if (Exit.isSuccess(readinessExit)) {
1868
yield* Effect.logDebug("ssh.environment.tunnel.reused", {