@nyte-ai/host 0.0.18 → 0.0.21

package/src/local/files.ts

@@ -167,7 +167,7 @@ export function localFiles(
       if (stats === null) return null;
 
       if (stats.isSymbolicLink()) {
-        const link = await readlink(target);
+        const link = await readLink(target);
 
         return { kind: "symlink", size: stats.size, version: hashVersion(link), target: link };
       }
@@ -218,7 +218,7 @@ export function localFiles(
 
       const current =
         (await currentVersion(target)) ??
-        (link.isSymbolicLink() ? hashVersion(await readlink(target)) : null);
+        (link.isSymbolicLink() ? hashVersion(await readLink(target)) : null);
 
       if (removeOptions?.expect !== undefined && removeOptions.expect !== current)
         return { kind: "stale", current };
@@ -326,6 +326,10 @@ async function currentVersion(path: string): Promise<FileVersion | null> {
   return stats.isDirectory() ? directoryVersion(path) : hashFile(path).catch(missing);
 }
 
+async function readLink(path: string): Promise<string> {
+  return (await readlink(path)).split(sep).join("/");
+}
+
 async function resolveLink(path: string): Promise<string> {
   const link = await lstat(path).catch(missing);
 
@@ -529,7 +533,7 @@ function rejectFailure(code: number | null, stderr: string): void {
 }
 
 function ripgrepPath(path: string): string {
-  return path.replace(/^\.\//, "").split(sep).join("/");
+  return path.split(sep).join("/").replace(/^\.\//, "");
 }
 
 async function* grep(
@@ -586,6 +590,7 @@ async function* grep(
   } finally {
     lines.close();
     child.kill();
+    await closed;
   }
 }
 

package/src/local/git-watch.ts

@@ -1,4 +1,5 @@
-import { isAbsolute, relative, sep } from "node:path";
+import { lstat } from "node:fs/promises";
+import { isAbsolute, join, relative, sep } from "node:path";
 import type { Disposer, GitStatus } from "@nyte-ai/schema";
 import type { FeedSink } from "./feed.ts";
 import { createIgnores, watchTree } from "./tree.ts";
@@ -33,7 +34,7 @@ const GIT_STATE = new Set([
   "rebase-apply",
 ]);
 
-/** Returns the status watch `localGit` shares among its watchers: the first subscriber starts it and the last one stops it, and each gets the status at once, then again whenever a change could move it. A recursive `fs.watch` on the workspace hears worktree paths that `.gitignore` and `.git/info/exclude` do not ignore, and, in the git directory and the common directory, only HEAD, the index, branch and remote refs, `packed-refs`, `config` and the merge, cherry-pick, revert and rebase state, so object writes, logs and Nyte's snapshot refs read nothing; the `.git` entry itself appearing or going drops the remembered repository and starts over. Only where `fs.watch` is unavailable does it poll, every 2 s. */
+/** Returns the status watch `localGit` shares among its watchers: the first subscriber starts it and the last one stops it, and each gets the status at once, then again whenever a change could move it. A recursive `fs.watch` on the workspace hears worktree paths that `.gitignore` and `.git/info/exclude` do not ignore, and, in the git directory and the common directory, only HEAD, the index, branch and remote refs, `packed-refs`, `config` and the merge, cherry-pick, revert and rebase state, so object writes, logs and Nyte's snapshot refs read nothing; the `.git` entry itself appearing or going (not a change inside it, which Windows also reports on the folder) drops the remembered repository and starts over. Only where `fs.watch` is unavailable does it poll, every 2 s. */
 export function createWatcher(
   cwd: string,
   read: () => Promise<GitStatus>,
@@ -88,7 +89,10 @@ export function createWatcher(
       );
     };
 
-    void repository().then((repo) => {
+    const gitEntry = async (): Promise<boolean> =>
+      (await lstat(join(cwd, ".git")).catch(() => null)) !== null;
+
+    void Promise.all([repository(), gitEntry()]).then(([repo, hadGit]) => {
       if (stopped) return;
       const insideGitDir = repo === null ? null : pathInside(cwd, repo.gitDir);
       const ignores = repo === null ? null : createIgnores(repo.root);
@@ -99,7 +103,11 @@ export function createWatcher(
         let found: "none" | "status" = "none";
 
         for (const path of paths) {
-          if (path === ".git") return "repository";
+          if (path === ".git") {
+            if ((await gitEntry()) !== hadGit) return "repository";
+
+            continue;
+          }
 
           if (repo === null || ignores === null) continue;
 
@@ -115,7 +123,10 @@ export function createWatcher(
           if (path.endsWith(".gitignore"))
             ignores.forget(`${repo.prefix}${path}`.split("/").slice(0, -1).join("/"));
 
-          if (found === "none" && !(await ignores.ignored(`${repo.prefix}${path}`, false)))
+          if (found !== "none") continue;
+          const directory = (await lstat(join(cwd, path)).catch(() => null))?.isDirectory();
+
+          if (!(await ignores.ignored(`${repo.prefix}${path}`, directory === true)))
             found = "status";
         }
 
@@ -175,7 +186,6 @@ function movesStatus(path: string): boolean {
   return (
     path === "" ||
     GIT_STATE.has(top) ||
-    path === "refs" ||
     path.startsWith("refs/heads/") ||
     path.startsWith("refs/remotes/")
   );

package/src/local/git.ts

@@ -1,5 +1,5 @@
 import { lstat, readFile, stat } from "node:fs/promises";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { asId, SdkError } from "@nyte-ai/schema";
 import type {
   BlameView,
@@ -101,7 +101,12 @@ export function localGit(env: ExecutionEnv, options?: { readonly git?: string })
 
     return root === undefined || gitDir === undefined
       ? null
-      : { root, gitDir, commonDir: commonDir || gitDir, prefix };
+      : {
+          root: resolve(root),
+          gitDir: resolve(gitDir),
+          commonDir: resolve(commonDir || gitDir),
+          prefix,
+        };
   };
 
   const repository = async (): Promise<Repository | null> => {

package/src/local/github.ts

@@ -1,4 +1,3 @@
-import { spawn } from "node:child_process";
 import { homedir } from "node:os";
 import type { ChildProcess } from "node:child_process";
 import { Type } from "typebox";
@@ -17,7 +16,7 @@ import type {
 } from "@nyte-ai/schema";
 import { dev } from "@nyte-ai/core";
 import type { ExecutionEnv, GitHubAccountApi, GitHubApi } from "@nyte-ai/core";
-import { findExecutable, run } from "./command.ts";
+import { findExecutable, killTree, run, spawnCommand } from "./command.ts";
 
 const ENV = {
   GH_PROMPT_DISABLED: "1",
@@ -255,7 +254,7 @@ function startSignIn(file: string, cwd: string, ended: () => void): SignIn {
   let verificationUri: string | undefined;
   let done = false;
 
-  const child: ChildProcess = spawn(
+  const child: ChildProcess = spawnCommand(
     file,
     [
       "auth",
@@ -278,7 +277,7 @@ function startSignIn(file: string, cwd: string, ended: () => void): SignIn {
     child.stdout?.destroy();
     child.stderr?.destroy();
 
-    if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
+    if (child.exitCode === null && child.signalCode === null) killTree(child, "SIGKILL");
     started.resolve(start);
     ended();
   };

package/src/local/jobs.ts

@@ -1,7 +1,7 @@
 import { spawn } from "node:child_process";
 import type { ChildProcess, SpawnOptions } from "node:child_process";
 import { createRequire } from "node:module";
-import { resolve } from "node:path";
+import { basename, resolve } from "node:path";
 import type { IPty, IPtyForkOptions } from "@lydell/node-pty";
 import { asId, SdkError } from "@nyte-ai/schema";
 import type { JobEnd, OutputFrame, RequestOptions } from "@nyte-ai/schema";
@@ -14,6 +14,7 @@ import {
   tracing,
 } from "@nyte-ai/core";
 import type { EndSpan, ExecutionEnv, Job } from "@nyte-ai/core";
+import { findExecutable, killTree, run, spawnCommand } from "./command.ts";
 
 type PtyModule = {
   spawn(file: string, args: string[] | string, options: IPtyForkOptions): IPty;
@@ -22,7 +23,7 @@ type PtyModule = {
 type Driver = {
   write(bytes: Uint8Array): Promise<void>;
   resize(size: { readonly columns: number; readonly rows: number }): boolean;
-  idle(): boolean;
+  idle(): boolean | Promise<boolean>;
   kill(signal: NodeJS.Signals): void;
   readonly pty: boolean;
 };
@@ -38,19 +39,11 @@ const STOP_GRACE_MS = 2_000;
 
 const CLOSE_GRACE_MS = 2_000;
 
-const QUIET_MS = 300;
-
 const DONE = { done: true, value: undefined } as const;
 
-const ESC = "\u001b";
-
-const BEL = "\u0007";
-
-const PROMPT_MARKER = new RegExp(`${ESC}\\]133;([ABCD])`, "g");
-
 let loaded: PtyModule | null | undefined;
 
-/** Returns `exec` for a folder: each call starts one process as a `Job` (a fresh id; `key` null, core keys pty jobs) in `cwd` resolved against `root` (default `root`), with `env` laid over `process.env`. A string command runs through the platform shell (`/bin/sh -c`, `cmd.exe /d /s /c` on Windows) and an argv directly; `[]` with `pty` runs the login shell (`shell()` read at each start, else `$SHELL`, else `/bin/sh`, as a login shell; §37h), a pty's environment carrying `TERM=xterm-256color`, `COLORTERM=truecolor` and `TERM_PROGRAM=Nyte` without Electron's `ELECTRON_RUN_AS_NODE` and `NODE_OPTIONS`, and `[]` without one throws `SdkError("invalid")`. A program that cannot start throws `SdkError("unavailable")`. Without `pty` the process is piped through `node:child_process` in its own process group, stdout and stderr interleaved in `output` (with `stdio: "protocol"`, stderr's frames tagged `stream: "stderr"` and the pipe paced like a pty, so a reader open from the start misses nothing) and stdin fed by `write`; with `pty` it runs under `@lydell/node-pty`, loaded on first use through `createRequire` (§41a; `loadPty`, given, loads it instead, on every pty start), at the given size, and a platform where it does not load throws `SdkError("unavailable")`. `output()` opens a reader over the last 1 MiB of output that yields `bytes`, a `gap` where the reader fell behind or opened after output was dropped, and `exit { code }` last; a merged pipe never stalls, and a pty or a protocol pipe pauses while its slowest open reader is 256 KiB behind, resuming once it is within 64 KiB. `resize` resizes a pty (`not-pty` for a pipe, `missing` once it ended); `idle` answers whether a pty's shell sits at a prompt: by its OSC 133 prompt markers once it sent one, else when it has printed nothing for 300 ms and the cursor's line holds text after the last newline, as a prompt does (false for a pipe); `stop` sends SIGTERM to a pipe's process group (SIGHUP to a pty), SIGKILL after 2 s, and answers `settled { outcome }` (also once it ended); `settled` resolves `exited { code, reason }` (`code` null after a signal), `reason` `exited` when the process ended on its own and `terminated` after `stop` or an aborted `signal`, and an aborted `settled` signal rejects with `SdkError("unavailable")`; `close` detaches this handle's readers. An aborted `signal` stops the process. `signal` on the options ends every reader of every job started here, leaving the processes running (what the provider's `close` does). */
+/** Returns `exec` for a folder: each call starts one process as a `Job` (a fresh id; `key` null, core keys pty jobs) in `cwd` resolved against `root` (default `root`), with `env` laid over `process.env`. A string command runs through the platform shell (`/bin/sh -c`, `cmd.exe /d /s /c` on Windows) and an argv directly; `[]` with `pty` runs the login shell (`shell()` read at each start, else `$SHELL`, else `/bin/sh`, as a login shell; §37h), a pty's environment carrying `TERM=xterm-256color`, `COLORTERM=truecolor` and `TERM_PROGRAM=Nyte` without Electron's `ELECTRON_RUN_AS_NODE` and `NODE_OPTIONS`, and `[]` without one throws `SdkError("invalid")`. A program that cannot start throws `SdkError("unavailable")`. Without `pty` the process is piped through `node:child_process` in its own process group, stdout and stderr interleaved in `output` (with `stdio: "protocol"`, stderr's frames tagged `stream: "stderr"` and the pipe paced like a pty, so a reader open from the start misses nothing) and stdin fed by `write`; with `pty` it runs under `@lydell/node-pty`, loaded on first use through `createRequire` (§41a; `loadPty`, given, loads it instead, on every pty start), at the given size, and a platform where it does not load throws `SdkError("unavailable")`. `output()` opens a reader over the last 1 MiB of output that yields `bytes`, a `gap` where the reader fell behind or opened after output was dropped, and `exit { code }` last; a merged pipe never stalls, and a pty or a protocol pipe pauses while its slowest open reader is 256 KiB behind, resuming once it is within 64 KiB. `resize` resizes a pty (`not-pty` for a pipe, `missing` once it ended); `idle` checks the OS process table for a login shell with no live children (false for a pipe or explicit command, true once it ended); `stop` sends SIGTERM to a pipe's process group (SIGHUP to a pty), SIGKILL after 2 s (on Windows, which has no signals, it ends a pipe's process tree at once with `taskkill /T /F`), and answers `settled { outcome }` (also once it ended); `settled` resolves `exited { code, reason }` (`code` null after a signal), `reason` `exited` when the process ended on its own and `terminated` after `stop` or an aborted `signal`, and an aborted `settled` signal rejects with `SdkError("unavailable")`; `close` detaches this handle's readers. An aborted `signal` stops the process. `signal` on the options ends every reader of every job started here, leaving the processes running (what the provider's `close` does). */
 export function localExec(
   root: string,
   options?: {
@@ -167,7 +160,7 @@ export function localExec(
 
         return finished === null && driver.resize(size) ? { kind: "resized" } : { kind: "missing" };
       },
-      idle: async () => finished === null && driver.idle(),
+      idle: async () => driver.pty && (finished !== null || driver.idle()),
       stop: async () => ({ kind: "settled", outcome: await stop() }),
       settled: (request) => waitEnd(ended, request),
       close,
@@ -184,13 +177,13 @@ async function pipe(
   log: OutputLog,
   finish: (code: number | null) => void,
 ): Promise<Driver> {
-  const group = process.platform !== "win32";
+  const windows = process.platform === "win32";
   const [file, ...args] = typeof command === "string" ? [command] : command;
 
   const settings: SpawnOptions = {
     cwd: options.cwd,
     env: options.env,
-    detached: group,
+    detached: !windows,
     stdio: "pipe",
     windowsHide: true,
   };
@@ -198,7 +191,11 @@ async function pipe(
   const child: ChildProcess =
     typeof command === "string"
       ? spawn(command, { ...settings, shell: true })
-      : spawn(file ?? "", args, settings);
+      : spawnCommand(
+          windows ? ((await findExecutable(file ?? "")) ?? file ?? "") : (file ?? ""),
+          args,
+          settings,
+        );
 
   await new Promise<void>((started, failed) => {
     child.once("spawn", started);
@@ -224,12 +221,13 @@ async function pipe(
       },
     });
   child.stdin?.on("error", () => undefined);
-  child.on("close", (code) => finish(code));
+  let killed = false;
+  child.on("close", (code) => finish(killed ? null : code));
   child.on("exit", (code) => {
     setTimeout(() => {
       child.stdout?.destroy();
       child.stderr?.destroy();
-      finish(code);
+      finish(killed ? null : code);
     }, CLOSE_GRACE_MS).unref();
   });
 
@@ -245,8 +243,15 @@ async function pipe(
     resize: () => false,
     idle: () => false,
     kill(signal) {
+      if (windows) {
+        killed = true;
+        killTree(child, signal);
+
+        return;
+      }
+
       try {
-        if (group && child.pid !== undefined) process.kill(-child.pid, signal);
+        if (child.pid !== undefined) process.kill(-child.pid, signal);
         else child.kill(signal);
       } catch {
         child.kill(signal);
@@ -316,22 +321,8 @@ async function terminal(
   }
 
   const encoder = new TextEncoder();
-  let marker: string | null = null;
-  let line = "";
-  let quietSince = 0;
 
-  term.onData((text) => {
-    log.push(encoder.encode(text));
-    quietSince = Date.now();
-
-    marker = lastMarker(text) ?? marker;
-    const plain = withoutEscapes(text);
-    const broken = plain.lastIndexOf("\n");
-    line = (broken < 0 ? line + plain : plain.slice(broken + 1)).slice(-1024);
-    const returned = line.replace(/\r+$/, "").lastIndexOf("\r");
-
-    if (returned >= 0) line = line.slice(returned + 1);
-  });
+  term.onData((text) => log.push(encoder.encode(text)));
   term.onExit(({ exitCode, signal }) => finish(signal ? null : exitCode));
   log.throttle({ pause: () => term.pause(), resume: () => term.resume() });
 
@@ -345,10 +336,38 @@ async function terminal(
 
       return true;
     },
-    idle() {
-      if (marker !== null) return marker !== "C";
+    async idle() {
+      if (typeof command === "string" || command.length !== 0) return false;
+
+      const result = await run(
+        windows ? "powershell.exe" : "ps",
+        windows
+          ? [
+              "-NoProfile",
+              "-NonInteractive",
+              "-Command",
+              `Get-CimInstance Win32_Process -Filter "ParentProcessId = ${term.pid} AND Name != 'conhost.exe' AND Name != 'OpenConsole.exe'" | Select-Object -ExpandProperty ProcessId`,
+            ]
+          : ["-A", "-o", "pid=,ppid=,stat=,comm="],
+        { cwd: options.cwd, timeoutMs: 1_500 },
+      );
+
+      if (result.code !== 0) throw new SdkError("unavailable", "Cannot inspect terminal processes");
+      const processes = result.stdout.toString("utf8").trim();
+
+      if (windows) return processes === "";
+
+      return !processes.split("\n").some((line) => {
+        const [pid, parent, state, ...name] = line.trim().split(/\s+/);
 
-      return quietSince > 0 && Date.now() - quietSince >= QUIET_MS && line.trim() !== "";
+        if (state?.startsWith("Z")) return false;
+
+        if (Number(parent) === term.pid) return true;
+
+        return (
+          Number(pid) === term.pid && basename(name.join(" ")).replace(/^-/, "") !== basename(shell)
+        );
+      });
     },
     kill(signal) {
       try {
@@ -358,39 +377,6 @@ async function terminal(
   };
 }
 
-function lastMarker(text: string): string | null {
-  return Array.from(text.matchAll(PROMPT_MARKER), (match) => match[1]).at(-1) ?? null;
-}
-
-function withoutEscapes(text: string): string {
-  let plain = "";
-  let at = 0;
-
-  while (at < text.length) {
-    const char = text[at] ?? "";
-
-    if (char !== ESC) {
-      plain += char;
-      at += 1;
-      continue;
-    }
-
-    const kind = text[at + 1] ?? "";
-    at += 2;
-
-    if (kind === "[") {
-      while (at < text.length && !/[@-~]/.test(text[at] ?? "")) at += 1;
-      at += 1;
-    } else if (kind === "]") {
-      while (at < text.length && text[at] !== BEL && !(text[at] === ESC && text[at + 1] === "\\"))
-        at += 1;
-      at += text[at] === BEL ? 1 : 2;
-    }
-  }
-
-  return plain;
-}
-
 function loadPty(): PtyModule | null {
   if (loaded === undefined)
     loaded = ptyFrom(() => createRequire(import.meta.url)("@lydell/node-pty"));

package/src/local/snapshots.ts

@@ -11,7 +11,7 @@ import {
   writeFile,
 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { asId, SdkError } from "@nyte-ai/schema";
 import type {
   ChangeSet,
@@ -132,7 +132,9 @@ export function localSnapshots(
     if (ran === null || ran.code !== 0) return null;
     const [root, gitDir, prefix = ""] = ran.stdout.toString("utf8").split("\n");
 
-    return root === undefined || gitDir === undefined ? null : { root, gitDir, prefix };
+    return root === undefined || gitDir === undefined
+      ? null
+      : { root: resolve(root), gitDir: resolve(gitDir), prefix };
   };
 
   const repository = (): Promise<Repository | null> => {

package/src/local/worktrees.ts

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { copyFile, mkdir, realpath, rm, stat } from "node:fs/promises";
 import { homedir, tmpdir } from "node:os";
-import { basename, dirname, join } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { SdkError } from "@nyte-ai/schema";
 import type { WorkspaceTarget } from "@nyte-ai/schema";
 import type { WorktreeProvider } from "@nyte-ai/core";
@@ -50,7 +50,7 @@ export async function listWorktrees(
     const path = fields.find((field) => field.startsWith("worktree "))?.slice(9);
     const branch = fields.find((field) => field.startsWith("branch refs/heads/"))?.slice(18);
 
-    return path === undefined ? [] : [{ path, branch: branch ?? null }];
+    return path === undefined ? [] : [{ path: resolve(path), branch: branch ?? null }];
   });
 }
 
@@ -147,7 +147,7 @@ export function localWorktrees(options?: {
       const branch = `nyte/${slug}`;
       const below = (root: string): WorkspaceTarget => ({
         kind: "local",
-        path: repo.prefix === "" ? root : join(root, repo.prefix).replace(/\/+$/u, ""),
+        path: resolve(root, repo.prefix),
       });
 
       const listed = (await listWorktrees(repo.root, options)).find(
@@ -224,7 +224,7 @@ async function readRepository(git: Git, cwd: string): Promise<Repository | null>
 
   return root === undefined || gitDir === undefined || root === ""
     ? null
-    : { root, gitDir, prefix };
+    : { root: resolve(root), gitDir: resolve(gitDir), prefix };
 }
 
 function worktreeSlug(name: string, title: string | null): string {

package/src/mcp/connect.ts

@@ -10,13 +10,6 @@ import type { McpServerEntry } from "./config.ts";
 import { createAuthProvider, oauthKey, oauthStore } from "./oauth.ts";
 import type { McpOAuthSettings } from "./oauth.ts";
 
-/**
- * Opens the transport to one server for one workspace. A url server that
- * needs OAuth sends its stored tokens; when it needs a new sign-in the
- * connection fails with `McpOAuthAuthorizationRequiredError`, after passing
- * the server's challenge to `challenged`. Throws when the entry cannot be
- * started, such as a missing `${VAR}`.
- */
 export type McpConnector = (
   entry: McpServerEntry,
   context: {
@@ -27,11 +20,6 @@ export type McpConnector = (
   },
 ) => McpTransport;
 
-/**
- * Runs stdio servers on this machine, in `cwd` resolved against the
- * workspace folder, and connects to url servers over streamable HTTP. A url
- * server without an `Authorization` header signs in with OAuth.
- */
 export const connectServer: McpConnector = (entry, context) => {
   const { transport } = entry;
 
@@ -65,7 +53,6 @@ export const connectServer: McpConnector = (entry, context) => {
   });
 };
 
-/** A server's OAuth options with `${VAR}`s in `clientSecret` resolved. */
 export function oauthSettings(config: McpOAuthConfig, server: string): McpOAuthSettings {
   const { clientSecret, authServerMetadataUrl, ...rest } = config;
 
@@ -95,7 +82,7 @@ function expand(values: Readonly<Record<string, string>>, server: string): Recor
 
         if (found === undefined)
           throw new Error(
-            `${server} needs the environment variable ${name}. Set it where Nyte runs, then restart Nyte (for the CLI, \`nyte service stop\`).`,
+            `${server} needs the environment variable ${name}. Set it where Nyte runs, then restart Nyte.`,
           );
 
         return found;

package/src/mcp/hub.ts

@@ -104,8 +104,18 @@ function hub(input: {
   const contents = new Map<string, McpFileContents>();
   const watched = new Map<string, Disposer>();
   const userPath = join(input.home, ".nyte", "mcp.json");
+  const retiring = new Set<Promise<void>>();
   let closed = false;
 
+  const retire = (client: McpClient | null): Promise<void> => {
+    if (client === null) return Promise.resolve();
+    const done = client.close().catch(() => undefined);
+    retiring.add(done);
+    void done.then(() => retiring.delete(done));
+
+    return done;
+  };
+
   const notify = (pool: Pool): void => {
     for (const listener of pool.listeners) listener();
   };
@@ -149,6 +159,7 @@ function hub(input: {
     } | null = null;
 
     let client: McpClient | null = null;
+    let opening: McpClient | null = null;
     let stderr: () => string | null = () => null;
     let challenge: OAuthChallenge | null = null;
     let ended = false;
@@ -184,7 +195,7 @@ function hub(input: {
     const drop = (message: string): void => {
       const previous = client;
       client = null;
-      void previous?.close().catch(() => undefined);
+      void retire(previous);
 
       if (ended) return;
       set({ kind: "failed", message, stderr: stderr() });
@@ -197,11 +208,7 @@ function hub(input: {
 
       if (ended) return;
 
-      const next = new TracingMcpClient({
-        name: "nyte",
-        version: "0.1.0",
-        requestTimeoutMs: link.entry.timeoutMs,
-      });
+      const next = new TracingMcpClient({ name: "nyte", version: "0.1.0" });
 
       next.onClose(() => {
         if (client === next) drop(`The connection to ${entry.name} closed.`);
@@ -229,10 +236,11 @@ function hub(input: {
           transport instanceof StdioTransport && transport.stderr !== ""
             ? transport.stderr.slice(-STDERR_TAIL)
             : null;
+        opening = next;
         await next.connect(transport);
 
         if (ended) {
-          await next.close();
+          await retire(next);
 
           return;
         }
@@ -261,7 +269,7 @@ function hub(input: {
         await refresh();
       } catch (error) {
         if (client === next) client = null;
-        await next.close().catch(() => undefined);
+        await retire(next);
 
         if (ended) return;
 
@@ -321,7 +329,7 @@ function hub(input: {
         clearTimeout(timer);
         const previous = client;
         client = null;
-        await previous?.close().catch(() => undefined);
+        await Promise.all([retire(previous), retire(opening)]);
       },
     };
 
@@ -788,6 +796,7 @@ function hub(input: {
 
       for (const pool of live) shut(pool);
       await Promise.all(links.map((link) => link.close()));
+      await Promise.all(retiring);
     },
   };
 }