The best way to control Claude Code, Codex and more from any computer or phone
test(ssh): wait for server exit during handover (#22252)
Theo Browne committed
Oct 20, 2026 at 02:48 UTC
729c56c3cb63e7ee4b855690c27daf5c9e77131b
1 file changed
+32
-18
packages/ssh/src/tunnel.test.ts
+32
-18
@@ -1309,26 +1309,17 @@ server.listen(Number(flag("--port")), "127.0.0.1", () => {
1309
assert.equal(launched.serverKind, "managed");
1310
return { launched, pid };
1311
});
1312
- // An unreaped server runs under a parent that never waits on it, so once it
1313
- // exits it lingers as a zombie.
1314
- const startDefaultHomeServer = (
1315
- flags: ReadonlyArray<string>,
1316
- options?: { readonly unreaped?: boolean },
1317
- ) =>
1312
+ const startDefaultHomeServer = (flags: ReadonlyArray<string>) =>
1313
Effect.gen(function* () {
1314
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
1315
const args = [fakeServer, "serve", "--port", "0", "--base-dir", `${home}/.t3`, ...flags];
1321
- const server = yield* spawner.spawn(
1322
- options?.unreaped
1323
- ? ChildProcess.make("sh", ["-c", 'node "$@" & exec sleep 600', "sh", ...args])
1324
- : ChildProcess.make("node", args),
1325
- );
1316
+ const server = yield* spawner.spawn(ChildProcess.make("node", args));
1317
const port = yield* server.stdout.pipe(
1318
Stream.decodeText(),
1319
Stream.splitLines,
1320
Stream.runHead,
1321
);
1331
- return Number(Option.getOrThrow(port));
1322
+ return { port: Number(Option.getOrThrow(port)), exitCode: server.exitCode };
1323
});
1324
return {
1325
home,
@@ -1363,7 +1354,7 @@ server.listen(Number(flag("--port")), "127.0.0.1", () => {
1354
`${launched.remotePort}`,
1355
);
1356
1366
- const servicePort = yield* startDefaultHomeServer([]);
1357
+ const { port: servicePort } = yield* startDefaultHomeServer([]);
1358
assert.deepEqual(yield* runLaunch, {
1359
remotePort: servicePort,
1360
serverKind: "external",
@@ -1516,7 +1507,7 @@ server.listen(Number(flag("--port")), "127.0.0.1", () => {
1507
const fs = yield* FileSystem.FileSystem;
1508
const { stateDir, runLaunch, startDefaultHomeServer } = yield* prepareLaunch;
1509
yield* fs.writeFileString(`${stateDir}/managed`, "managed\n");
1519
- const servicePort = yield* startDefaultHomeServer(["--answer-once"]);
1510
+ const { port: servicePort } = yield* startDefaultHomeServer(["--answer-once"]);
1511
1512
assert.deepEqual(yield* runLaunch, { remotePort: servicePort, serverKind: "external" });
1513
assert.isFalse(yield* fs.exists(`${stateDir}/pid`));
@@ -1528,13 +1519,36 @@ server.listen(Number(flag("--port")), "127.0.0.1", () => {
1519
"launches a replacement when the adopted server exits during the handover",
1520
() =>
1521
Effect.gen(function* () {
1531
- const { readManagedPid, runLaunch, launchManaged, startDefaultHomeServer } =
1522
+ const fs = yield* FileSystem.FileSystem;
1523
+ const { home, launch, readManagedPid, launchManaged, startDefaultHomeServer } =
1524
yield* prepareLaunch;
1525
const { pid: previousPid } = yield* launchManaged;
1534
- yield* startDefaultHomeServer(["--exit-after-answer"], { unreaped: true });
1526
+ const server = yield* startDefaultHomeServer(["--exit-after-answer"]);
1527
+ const adopted = yield* Deferred.make<void>();
1528
+ const script = yield* fs.readFileString(launch);
1529
+ const adoption = 'ADOPTED_PID="$DEFAULT_RUNTIME_PID"';
1530
+ assert.include(script, adoption);
1531
+ // A flushed response can arrive before process exit. Hold the launcher at
1532
+ // adoption until the fixture has exited, then test its handover check.
1533
+ yield* fs.writeFileString(
1534
+ launch,
1535
+ script.replace(adoption, `${adoption}\n echo adopted >&2\n read -r release`),
1536
+ );
1537
1536
- const result = yield* runLaunch;
1537
- assert.equal(result.serverKind, "managed");
1538
+ const result = yield* runScript(home, [launch, "test-state"], {
1539
+ stdin: Stream.fromEffect(
1540
+ Deferred.await(adopted).pipe(
1541
+ Effect.andThen(server.exitCode.pipe(Effect.orDie)),
1542
+ Effect.as(new TextEncoder().encode("release\n")),
1543
+ ),
1544
+ ),
1545
+ onStderrLine: (line) =>
1546
+ line === "adopted"
1547
+ ? Deferred.succeed(adopted, undefined).pipe(Effect.asVoid)
1548
+ : Effect.void,
1549
+ });
1550
+ assert.equal(result.exitCode, 0, result.stderr);
1551
+ assert.equal(launchResult(result.stdout).serverKind, "managed");
1552
const replacementPid = yield* readManagedPid;
1553
assert.notEqual(replacementPid, previousPid);
1554
assert.isTrue(isAlive(replacementPid));