@intentic/machine 1.325.0 → 1.327.0

package/dist/sync/retire.js

@@ -0,0 +1,66 @@
+import { spawnSync } from "node:child_process";
+import { rm } from "node:fs/promises";
+import { errorMessage } from "@intentic/base/errors";
+import { sandboxNames } from "@intentic/sandbox-run";
+import { baseDir } from "../config.js";
+import { isProjectPairing, pairingKey, pairingTransport, readState, removeSandboxPairings } from "./config.js";
+import { realBridgeExec, realUnbridgeFs, unbridgeRepos } from "./git-bridge.js";
+import { existingSyncSessions, MUTAGEN_CALL_TIMEOUT_MS, ourForwardSessions, forwardSessionName, syncSessionNames } from "./mutagen.js";
+import { listingRecordPath } from "./project/project-local.js";
+import { forgetKnownHost, pairingSshConfig, sanitizeId, sshAlias, writeManagedSshConfig } from "./ssh.js";
+import { pairingSlugs } from "./swap-pause.js";
+export const sandboxesNamed = (pairings, name) => {
+    const wanted = name.trim();
+    if (wanted === "") {
+        return [];
+    }
+    const matches = (pairing) => pairing.sandboxId === wanted ||
+        sanitizeId(pairing.sandboxId) === sanitizeId(wanted) ||
+        pairingSlugs(pairing.sandboxUrl).includes(wanted) ||
+        pairing.icSlug === wanted ||
+        (pairing.container !== undefined && (pairing.container === wanted || pairing.container === sandboxNames(wanted).container));
+    return [...new Set(pairings.filter(matches).map((pairing) => pairing.sandboxId))];
+};
+const terminateSyncSessions = (mutagen, names) => {
+    const live = existingSyncSessions(mutagen, names);
+    for (const batch of live === undefined ? names.map((name) => [name]) : live.length > 0 ? [live] : []) {
+        spawnSync(mutagen, ["sync", "terminate", ...batch], { stdio: "ignore", windowsHide: true, timeout: MUTAGEN_CALL_TIMEOUT_MS });
+    }
+};
+const terminateForwards = (mutagen, sandboxId, recorded) => {
+    const held = ourForwardSessions(mutagen, sandboxId) ??
+        recorded.flatMap((pairing) => (pairing.mirroredPorts ?? []).map((port) => forwardSessionName(sandboxId, port.port)));
+    for (const name of held) {
+        spawnSync(mutagen, ["forward", "terminate", name], { stdio: "ignore", windowsHide: true, timeout: MUTAGEN_CALL_TIMEOUT_MS });
+    }
+};
+export const retireSandbox = async (sandboxId, log, why, seams) => {
+    const held = (await readState()).pairings.filter((pairing) => pairing.sandboxId === sandboxId);
+    if (held.length === 0) {
+        return undefined;
+    }
+    await removeSandboxPairings(sandboxId);
+    const remaining = (await readState()).pairings;
+    if (seams.mutagen !== undefined) {
+        terminateSyncSessions(seams.mutagen, held.filter((pairing) => pairing.mode === "sync").flatMap((pairing) => syncSessionNames(pairing)));
+        terminateForwards(seams.mutagen, sandboxId, held);
+    }
+    const step = async (what, act) => {
+        await act().catch((error) => log(`  ${sandboxId}: ${what} failed (${errorMessage(error)}); the rest of its retirement went ahead.`));
+    };
+    if (held.some((pairing) => pairingTransport(pairing) === "ssh")) {
+        await step("rewriting the ssh configuration", async () => await writeManagedSshConfig(pairingSshConfig(remaining)));
+        await step("forgetting its host key", async () => await forgetKnownHost(sandboxId));
+    }
+    for (const pairing of held) {
+        await step("dropping its hash cache", async () => await rm(listingRecordPath(baseDir, pairingKey(pairing)), { force: true }));
+    }
+    const unbridge = seams.unbridge ?? (async (alias, localDir) => await unbridgeRepos(realBridgeExec, realUnbridgeFs, alias, localDir));
+    for (const pairing of held.filter((candidate) => !isProjectPairing(candidate) && candidate.mode === "sync" && candidate.localDir !== undefined)) {
+        await step("removing the git bridge's remote", async () => await unbridge(sshAlias(sandboxId), pairing.localDir ?? ""));
+    }
+    const folders = held.flatMap((pairing) => (pairing.localDir === undefined ? [] : [pairing.localDir]));
+    log(`retired ${sandboxId} (${why}): its file sync, forwarded ports, ssh entry, host key, hash cache and git bridge are gone from this machine${folders.length === 0 ? "" : `; ${folders.join(", ")} and ${folders.length === 1 ? "its" : "their"} restore points are kept`}.`);
+    return { sandboxId, pairings: held.map(pairingKey), folders };
+};
+//# sourceMappingURL=retire.js.map

package/dist/sync/retire.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"retire.js","sourceRoot":"","sources":["../../src/sync/retire.ts"],"names":[],"mappings":"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"}

package/dist/sync/siblings.d.ts

@@ -0,0 +1,27 @@
+export interface SiblingFolder {
+    readonly environment: string;
+    readonly localDir: string;
+    readonly sandboxId: string;
+}
+export interface Siblings {
+    readonly folders: readonly SiblingFolder[];
+    readonly unread: readonly string[];
+}
+export declare const siblingFoldersIn: (raw: string, environment: string) => SiblingFolder[] | undefined;
+export declare const readSiblings: () => Promise<Siblings>;
+export declare const comparableFolder: (folder: string, side: "windows" | "wsl", distro?: string) => string | undefined;
+export declare const comparableOverlap: (first: string, second: string) => boolean;
+export declare const siblingClash: (folder: string, here: {
+    readonly side: "windows" | "wsl";
+    readonly distro?: string | undefined;
+}, siblings: readonly SiblingFolder[]) => SiblingFolder | undefined;
+export declare const siblingClashSentence: (folder: string, clash: SiblingFolder) => string;
+export declare const hereOnThisPc: () => Promise<{
+    readonly side: "windows" | "wsl";
+    readonly distro?: string;
+} | undefined>;
+export declare const refuseAcrossPc: (folder: string, read?: () => Promise<Siblings>) => Promise<{
+    readonly refusal?: string;
+    readonly unread: readonly string[];
+}>;
+//# sourceMappingURL=siblings.d.ts.map

package/dist/sync/siblings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"siblings.d.ts","sourceRoot":"","sources":["../../src/sync/siblings.ts"],"names":[],"mappings":"AA0BA,MAAM,WAAW,aAAa;IAE1B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC9B;AAGD,MAAM,WAAW,QAAQ;IACrB,QAAQ,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;CACtC;AAOD,eAAO,MAAM,gBAAgB,QAAS,MAAM,eAAe,MAAM,KAAG,aAAa,EAAE,GAAG,SAgBrF,CAAC;AA4BF,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,QAAQ,CAcrD,CAAC;AAQF,eAAO,MAAM,gBAAgB,WAAY,MAAM,QAAQ,SAAS,GAAG,KAAK,WAAW,MAAM,KAAG,MAAM,GAAG,SAgBpG,CAAC;AAGF,eAAO,MAAM,iBAAiB,UAAW,MAAM,UAAU,MAAM,KAAG,OACsB,CAAC;AAIzF,eAAO,MAAM,YAAY,WACb,MAAM,QACR;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,YACtE,SAAS,aAAa,EAAE,KACnC,aAAa,GAAG,SAYlB,CAAC;AAGF,eAAO,MAAM,oBAAoB,WAAY,MAAM,SAAS,aAAa,KAAG,MACiT,CAAC;AAI9X,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAMvH,CAAC;AAIF,eAAO,MAAM,cAAc,WACf,MAAM,SACR,MAAM,OAAO,CAAC,QAAQ,CAAC,KAC9B,OAAO,CAAC;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAQ3E,CAAC"}

package/dist/sync/siblings.js

@@ -0,0 +1,112 @@
+import { execFile } from "node:child_process";
+import { readFile } from "node:fs/promises";
+import { dirname, join, posix, win32 } from "node:path";
+import { promisify } from "node:util";
+import { undefinedIfMissing } from "@intentic/base/errors";
+import { z } from "zod";
+import { heldDistros, windowsRoot } from "../environments/machine.js";
+import { registeredDistro, WINDOWS_SIDE } from "../environments/wsl.js";
+const exec = promisify(execFile);
+const READ_TIMEOUT_MS = 20_000;
+const SiblingStateSchema = z.object({ pairings: z.array(z.unknown()) });
+const SiblingPairingSchema = z.object({ localDir: z.string(), sandboxId: z.string() });
+export const siblingFoldersIn = (raw, environment) => {
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        return undefined;
+    }
+    const state = SiblingStateSchema.safeParse(parsed);
+    if (!state.success) {
+        return undefined;
+    }
+    return state.data.pairings.flatMap((pairing) => {
+        const held = SiblingPairingSchema.safeParse(pairing);
+        return held.success ? [{ environment, localDir: held.data.localDir, sandboxId: held.data.sandboxId }] : [];
+    });
+};
+const SYNC_JSON_IN_DISTRO = `cat "$HOME/.intentic/machine/sync.json" 2>/dev/null || true`;
+const distroFolders = async (distro) => {
+    const answer = await exec("wsl.exe", ["-d", distro, "--cd", "~", "--exec", "sh", "-c", SYNC_JSON_IN_DISTRO], {
+        timeout: READ_TIMEOUT_MS,
+        windowsHide: true,
+        env: { ...process.env, WSL_UTF8: "1" },
+    }).catch(() => undefined);
+    if (answer === undefined) {
+        return undefined;
+    }
+    return answer.stdout.trim() === "" ? [] : siblingFoldersIn(answer.stdout, `wsl:${distro}`);
+};
+const windowsFolders = async () => {
+    const agent = await windowsRoot();
+    if (agent === undefined) {
+        return [];
+    }
+    const raw = await readFile(join(dirname(dirname(agent)), "sync.json"), "utf8").catch(undefinedIfMissing);
+    return raw === undefined ? [] : siblingFoldersIn(raw, "windows");
+};
+export const readSiblings = async () => {
+    if (WINDOWS_SIDE) {
+        const distros = await heldDistros();
+        const read = await Promise.all(distros.map(async (distro) => ({ environment: `wsl:${distro}`, folders: await distroFolders(distro) })));
+        return {
+            folders: read.flatMap((entry) => entry.folders ?? []),
+            unread: read.filter((entry) => entry.folders === undefined).map((entry) => entry.environment),
+        };
+    }
+    if ((await registeredDistro()) === undefined) {
+        return { folders: [], unread: [] };
+    }
+    const folders = await windowsFolders();
+    return { folders: folders ?? [], unread: folders === undefined ? ["windows"] : [] };
+};
+export const comparableFolder = (folder, side, distro) => {
+    if (side === "windows") {
+        const resolved = win32.resolve(folder);
+        const drive = /^([A-Za-z]):\\(.*)$/.exec(resolved);
+        if (drive?.[1] !== undefined) {
+            return `drive:${drive[1].toLowerCase()}/${(drive[2] ?? "").replaceAll("\\", "/").toLowerCase()}`.replace(/\/+$/, "");
+        }
+        const share = /^\\\\wsl(?:\.localhost|\$)\\([^\\]+)(\\.*)?$/i.exec(resolved);
+        return share?.[1] === undefined ? undefined : `wsl:${share[1].toLowerCase()}${(share[2] ?? "").replaceAll("\\", "/")}`.replace(/\/+$/, "");
+    }
+    const resolved = posix.resolve(folder);
+    const mounted = /^\/mnt\/([a-zA-Z])(\/.*)?$/.exec(resolved);
+    if (mounted?.[1] !== undefined) {
+        return `drive:${mounted[1].toLowerCase()}${(mounted[2] ?? "").toLowerCase()}`.replace(/\/+$/, "");
+    }
+    return distro === undefined ? undefined : `wsl:${distro.toLowerCase()}${resolved === "/" ? "" : resolved}`;
+};
+export const comparableOverlap = (first, second) => first === second || first.startsWith(`${second}/`) || second.startsWith(`${first}/`);
+export const siblingClash = (folder, here, siblings) => {
+    const mine = comparableFolder(folder, here.side, here.distro);
+    if (mine === undefined) {
+        return undefined;
+    }
+    return siblings.find((sibling) => {
+        const theirs = sibling.environment === "windows"
+            ? comparableFolder(sibling.localDir, "windows")
+            : comparableFolder(sibling.localDir, "wsl", sibling.environment.slice("wsl:".length));
+        return theirs !== undefined && comparableOverlap(mine, theirs);
+    });
+};
+export const siblingClashSentence = (folder, clash) => `${folder} overlaps ${clash.localDir}, which ${clash.environment === "windows" ? "this PC's Windows side" : `this PC's WSL distro ${clash.environment.slice("wsl:".length)}`} already syncs with ${clash.sandboxId}: two syncs over one folder overwrite each other's files, from whichever side of the PC they run. Choose a folder neither side syncs, or unpair that one there first.`;
+export const hereOnThisPc = async () => {
+    if (WINDOWS_SIDE) {
+        return { side: "windows" };
+    }
+    const distro = await registeredDistro();
+    return distro === undefined ? undefined : { side: "wsl", distro };
+};
+export const refuseAcrossPc = async (folder, read = readSiblings) => {
+    const here = await hereOnThisPc();
+    if (here === undefined) {
+        return { unread: [] };
+    }
+    const siblings = await read();
+    const clash = siblingClash(folder, here, siblings.folders);
+    return clash === undefined ? { unread: siblings.unread } : { refusal: siblingClashSentence(folder, clash), unread: siblings.unread };
+};
+//# sourceMappingURL=siblings.js.map

package/dist/sync/siblings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"siblings.js","sourceRoot":"","sources":["../../src/sync/siblings.ts"],"names":[],"mappings":"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"}

package/dist/sync/ssh.d.ts

@@ -14,6 +14,7 @@ export declare const sshConfigBlock: (args: {
 }) => string;
 export declare const hostKeyOf: (value: string | undefined) => string | undefined;
 export declare const knownHostsFor: (current: string, alias: string, port: number, hostKey: string | undefined) => string;
+export declare const forgetKnownHost: (sandboxId: string) => Promise<void>;
 export declare const replaceKnownHost: (alias: string, port: number, hostKey: string | undefined) => Promise<void>;
 export declare const INCLUDE_MARKER = "Include intentic-machine.conf";
 export declare const stripManagedIncludes: (config: string) => string;

package/dist/sync/ssh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssh.d.ts","sourceRoot":"","sources":["../../src/sync/ssh.ts"],"names":[],"mappings":"AAQA,OAAO,EAAW,KAAK,GAAG,EAAmB,MAAM,uBAAuB,CAAC;AAG3E,OAAO,EAAoC,KAAK,OAAO,EAAyF,MAAM,aAAa,CAAC;AASpK,eAAO,MAAM,OAAO,UAsDnB,CAAC;AAMF,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EAAmE,CAAC;AAGjH,eAAO,MAAM,UAAU,YAAa,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,KAAG,SAAS,MAAM,EAA6D,CAAC;AAS5I,eAAO,MAAM,cAAc,EAAE,SAAS,MAAM,EAO1C,CAAC;AAGH,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,MAAoE,CAAC;AAE9G,eAAO,MAAM,QAAQ,cAAe,MAAM,KAAG,MAAkD,CAAC;AAShG,eAAO,MAAM,cAAc,SAAU;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACnC,KAAG,MAeY,CAAC;AAUjB,eAAO,MAAM,SAAS,UAAW,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAA2D,CAAC;AAe3H,eAAO,MAAM,aAAa,YAAa,MAAM,SAAS,MAAM,QAAQ,MAAM,WAAW,MAAM,GAAG,SAAS,KAAG,MAWzG,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAAiB,MAAM,QAAQ,MAAM,WAAW,MAAM,GAAG,SAAS,KAAG,OAAO,CAAC,IAAI,CAM7G,CAAC;AAKF,eAAO,MAAM,cAAc,kCAA6B,CAAC;AAMzD,eAAO,MAAM,oBAAoB,WAAY,MAAM,KAAG,MAInC,CAAC;AAGpB,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,MAAM,CAgBnD,CAAC;AAKF,eAAO,MAAM,gBAAgB,aAAc,SAAS,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC,EAAE,KAAG,MAW5F,CAAC;AAIpB,eAAO,MAAM,qBAAqB,aAAoB,MAAM,KAAG,OAAO,CAAC,IAAI,CAa1E,CAAC;AAGF,eAAO,MAAM,sBAAsB,QAAa,OAAO,CAAC,IAAI,CAO3D,CAAC;AAgBF,eAAO,MAAM,cAAc,aAAc,MAAM,CAAC,QAAQ,YAAY,MAAM,GAAG,SAAS,KAAG,MAGxF,CAAC;AAKF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,KAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAIvF,CAAC;AAIF,eAAO,MAAM,sBAAsB,QAAS,MAAM,SAAS,MAAM,gBAAgB,MAAM,KAAG,IAsBzF,CAAC;AAIF,eAAO,MAAM,iBAAiB,QAAe,MAAM,SAAS,MAAM,OAAO,GAAG,KAAG,OAAO,CAAC,IAAI,CAK1F,CAAC;AASF,eAAO,MAAM,mBAAmB,QAAe,MAAM,SAAS,MAAM,KAAG,OAAO,CAAC,OAAO,CAIrF,CAAC"}
+{"version":3,"file":"ssh.d.ts","sourceRoot":"","sources":["../../src/sync/ssh.ts"],"names":[],"mappings":"AASA,OAAO,EAAW,KAAK,GAAG,EAAmB,MAAM,uBAAuB,CAAC;AAG3E,OAAO,EAGH,KAAK,OAAO,EAOf,MAAM,aAAa,CAAC;AAUrB,eAAO,MAAM,OAAO,UAsDnB,CAAC;AAMF,eAAO,MAAM,eAAe,EAAE,SAAS,MAAM,EAAmE,CAAC;AAGjH,eAAO,MAAM,UAAU,YAAa,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,KAAG,SAAS,MAAM,EAA6D,CAAC;AAS5I,eAAO,MAAM,cAAc,EAAE,SAAS,MAAM,EAO1C,CAAC;AAGH,eAAO,MAAM,UAAU,QAAS,MAAM,KAAG,MAAoE,CAAC;AAE9G,eAAO,MAAM,QAAQ,cAAe,MAAM,KAAG,MAAkD,CAAC;AAShG,eAAO,MAAM,cAAc,SAAU;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACnC,KAAG,MAeY,CAAC;AAUjB,eAAO,MAAM,SAAS,UAAW,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAA2D,CAAC;AAmB3H,eAAO,MAAM,aAAa,YAAa,MAAM,SAAS,MAAM,QAAQ,MAAM,WAAW,MAAM,GAAG,SAAS,KAAG,MAWzG,CAAC;AAIF,eAAO,MAAM,eAAe,cAAqB,MAAM,KAAG,OAAO,CAAC,IAAI,CAUrE,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAAiB,MAAM,QAAQ,MAAM,WAAW,MAAM,GAAG,SAAS,KAAG,OAAO,CAAC,IAAI,CAM7G,CAAC;AAKF,eAAO,MAAM,cAAc,kCAA6B,CAAC;AAOzD,eAAO,MAAM,oBAAoB,WAAY,MAAM,KAAG,MAA0D,CAAC;AAMjH,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,MAAM,CAmBnD,CAAC;AAMF,eAAO,MAAM,gBAAgB,aAAc,SAAS,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC,EAAE,KAAG,MAU5F,CAAC;AAIpB,eAAO,MAAM,qBAAqB,aAAoB,MAAM,KAAG,OAAO,CAAC,IAAI,CAW1E,CAAC;AAGF,eAAO,MAAM,sBAAsB,QAAa,OAAO,CAAC,IAAI,CAQ3D,CAAC;AAgBF,eAAO,MAAM,cAAc,aAAc,MAAM,CAAC,QAAQ,YAAY,MAAM,GAAG,SAAS,KAAG,MAGxF,CAAC;AAKF,eAAO,MAAM,gBAAgB,eAAgB,MAAM,KAAG;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAIvF,CAAC;AAIF,eAAO,MAAM,sBAAsB,QAAS,MAAM,SAAS,MAAM,gBAAgB,MAAM,KAAG,IAsBzF,CAAC;AAIF,eAAO,MAAM,iBAAiB,QAAe,MAAM,SAAS,MAAM,OAAO,GAAG,KAAG,OAAO,CAAC,IAAI,CAK1F,CAAC;AASF,eAAO,MAAM,mBAAmB,QAAe,MAAM,SAAS,MAAM,KAAG,OAAO,CAAC,OAAO,CAIrF,CAAC"}

package/dist/sync/ssh.js

@@ -1,17 +1,19 @@
 import { spawnSync } from "node:child_process";
 import { createHmac } from "node:crypto";
 import { existsSync } from "node:fs";
-import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
-import { hostname } from "node:os";
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { undefinedIfMissing } from "@intentic/base/errors";
+import { writeFileAtomic } from "@intentic/base/fs";
+import { withManagedInclude, withoutManagedIncludes } from "@intentic/base/ssh-config";
 import { REFERENCE_DIR, STATE_DIR } from "@intentic/constants";
 import { homeDir, writeSecretFile } from "@intentic/local-agent";
 import { SshHostKeySchema, STATE_GROUPS, stateGroupPaths, UNBACKED_STATE_PATHS } from "@intentic/sandbox-contract";
 import { baseDir } from "../config.js";
-import { isProjectPairing, knownHostsPath, pairingTransport, sshConfigName, sshConfigPath, sshDir, sshKeyPath, userSshConfigPath } from "./config.js";
+import { isProjectPairing, knownHostsPath, pairingTransport, sshConfigName, sshConfigPath, sshDir, sshKeyPath, userSshConfigPath, } from "./config.js";
+import { keyComment } from "./environment.js";
 import { runProcess } from "./exec.js";
-import { syncSshPort } from "./tunnel.js";
+import { syncSshPort, syncSshPorts } from "./tunnel.js";
 export const IGNORES = [
     "node_modules",
     "dist",
@@ -74,7 +76,9 @@ const namesHost = (pattern, names) => {
         return names.includes(pattern);
     }
     const [, , salt, hash] = pattern.split("|");
-    return salt !== undefined && hash !== undefined && names.some((name) => createHmac("sha1", Buffer.from(salt, "base64")).update(name).digest("base64") === hash);
+    return (salt !== undefined &&
+        hash !== undefined &&
+        names.some((name) => createHmac("sha1", Buffer.from(salt, "base64")).update(name).digest("base64") === hash));
 };
 export const knownHostsFor = (current, alias, port, hostKey) => {
     const names = [alias, `[${alias}]:${port}`];
@@ -88,6 +92,17 @@ export const knownHostsFor = (current, alias, port, hostKey) => {
     }
     return [...kept, ...(hostKey === undefined ? [] : [`${alias} ${hostKey}`])].map((line) => `${line}\n`).join("");
 };
+export const forgetKnownHost = async (sandboxId) => {
+    const current = await readFile(knownHostsPath, "utf8").catch(undefinedIfMissing);
+    if (current === undefined) {
+        return;
+    }
+    const alias = sshAlias(sandboxId);
+    const next = syncSshPorts(sandboxId).reduce((kept, port) => knownHostsFor(kept, alias, port, undefined), current);
+    if (next !== current) {
+        await writeSecretFile(knownHostsPath, baseDir, next);
+    }
+};
 export const replaceKnownHost = async (alias, port, hostKey) => {
     const current = (await readFile(knownHostsPath, "utf8").catch(undefinedIfMissing)) ?? "";
     const next = knownHostsFor(current, alias, port, hostKey);
@@ -96,11 +111,10 @@ export const replaceKnownHost = async (alias, port, hostKey) => {
     }
 };
 export const INCLUDE_MARKER = `Include ${sshConfigName}`;
-const MANAGED_INCLUDE = /^[ \t]*Include[ \t]+"?(?:intentic-machine\.conf|intentic-sync\.conf|.*[/\\]\.intentic[/\\]sync[/\\]ssh_config)"?[ \t]*$/;
-export const stripManagedIncludes = (config) => config
-    .split("\n")
-    .filter((line) => !MANAGED_INCLUDE.test(line))
-    .join("\n");
+const MANAGED_INCLUDE = /^(?:intentic-machine\.conf|intentic-sync\.conf|.*[/\\]\.intentic[/\\]sync[/\\]ssh_config)$/;
+const isManagedInclude = (path) => MANAGED_INCLUDE.test(path);
+export const stripManagedIncludes = (config) => withoutManagedIncludes(config, isManagedInclude);
+const SSH_CALL_TIMEOUT_MS = 30_000;
 export const ensureSshKey = async () => {
     await mkdir(baseDir, { recursive: true });
     const pub = `${sshKeyPath}.pub`;
@@ -108,18 +122,20 @@ export const ensureSshKey = async () => {
     if (existing !== undefined) {
         return existing.trim();
     }
-    const comment = hostname().replace(/\s+/g, "-") || "intentic-machine";
-    const result = spawnSync("ssh-keygen", ["-t", "ed25519", "-N", "", "-C", comment, "-f", sshKeyPath], { stdio: "inherit" });
+    const comment = keyComment();
+    const result = spawnSync("ssh-keygen", ["-t", "ed25519", "-N", "", "-C", comment, "-f", sshKeyPath], {
+        stdio: "inherit",
+        timeout: SSH_CALL_TIMEOUT_MS,
+    });
     if (result.status !== 0) {
         throw new Error("ssh-keygen failed: is an OpenSSH client installed?");
     }
     return (await readFile(pub, "utf8")).trim();
 };
-export const pairingSshConfig = (pairings) => pairings
-    .filter((pairing) => pairingTransport(pairing) === "ssh")
-    .map((pairing) => sshConfigBlock({
-    alias: sshAlias(pairing.sandboxId),
-    port: syncSshPort(pairing.sandboxId),
+export const pairingSshConfig = (pairings) => [...new Set(pairings.filter((pairing) => pairingTransport(pairing) === "ssh").map((pairing) => pairing.sandboxId))]
+    .map((sandboxId) => sshConfigBlock({
+    alias: sshAlias(sandboxId),
+    port: syncSshPort(sandboxId),
     identityFile: sshKeyPath,
     knownHostsFile: knownHostsPath,
 }))
@@ -128,20 +144,18 @@ export const writeManagedSshConfig = async (fragment) => {
     await mkdir(sshDir, { recursive: true, mode: 0o700 });
     await writeFile(sshConfigPath, fragment, { mode: 0o600 });
     const current = (await readFile(userSshConfigPath, "utf8").catch(undefinedIfMissing)) ?? "";
-    const desired = `${INCLUDE_MARKER}\n${stripManagedIncludes(current)}`;
+    const desired = withManagedInclude(current, INCLUDE_MARKER, isManagedInclude);
     if (desired === current) {
         return;
     }
-    const tmp = `${userSshConfigPath}.intentic-tmp`;
-    await writeFile(tmp, desired, { mode: 0o600 });
-    await rename(tmp, userSshConfigPath);
+    await writeFileAtomic(userSshConfigPath, desired, 0o600);
 };
 export const removeManagedSshConfig = async () => {
     await rm(sshConfigPath, { force: true });
     const current = await readFile(userSshConfigPath, "utf8").catch(() => "");
     const stripped = stripManagedIncludes(current);
     if (stripped !== current) {
-        await writeFile(userSshConfigPath, stripped, { mode: 0o600 });
+        await writeFileAtomic(userSshConfigPath, stripped, 0o600);
     }
 };
 const WINDOWS_SSH_SEARCH_PATHS = [
@@ -163,7 +177,7 @@ export const resolvedEndpoint = (sshGOutput) => {
     return { ...(host === undefined ? {} : { hostname: host }), ...(Number.isInteger(port) ? { port } : {}) };
 };
 export const assertSshConfigVisible = (ssh, alias, expectedPort) => {
-    const result = spawnSync(ssh, ["-G", alias], { encoding: "utf8", windowsHide: true });
+    const result = spawnSync(ssh, ["-G", alias], { encoding: "utf8", windowsHide: true, timeout: SSH_CALL_TIMEOUT_MS });
     if (result.error !== undefined) {
         throw new Error(`could not run "${ssh}", the SSH client Mutagen drives the sync transport with: ${result.error.message}`);
     }

package/dist/sync/ssh.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../src/sync/ssh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../src/sync/ssh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAY,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EACH,gBAAgB,EAChB,cAAc,EAEd,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,UAAU,EACV,iBAAiB,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOxD,MAAM,CAAC,MAAM,OAAO,GAAG;IACnB,cAAc;IACd,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,UAAU;IAGV,QAAQ;IAKR,OAAO;IACP,MAAM;IACN,aAAa;IACb,SAAS;IACT,MAAM;IACN,MAAM;IAGN,YAAY;IACZ,cAAc;IACd,eAAe;IACf,aAAa;IASb,IAAI,SAAS,EAAE;IAMf,IAAI,aAAa,EAAE;IACnB,MAAM;IACN,aAAa;IAIb,YAAY;IAMZ,MAAM,SAAS,QAAQ;IACvB,MAAM,SAAS,QAAQ;CAC1B,CAAC;AAIF,MAAM,mBAAmB,GAAwB,IAAI,GAAG,CAAC,CAAC,IAAI,SAAS,EAAE,EAAE,IAAI,aAAa,EAAE,CAAC,CAAC,CAAC;AAEjG,MAAM,CAAC,MAAM,eAAe,GAAsB,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;AAGjH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAiC,EAAqB,EAAE,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAI5I,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAU,EAAE;IACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACnE,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAsB,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;IAC5E,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/E,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACd,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACvF,CAAC,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,SAAiB,EAAU,EAAE,CAAC,iBAAiB,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;AAIhG,MAAM,SAAS,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAKvE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAK9B,EAAU,EAAE,CACT;IACI,QAAQ,IAAI,CAAC,KAAK,EAAE;IACpB,wBAAwB;IACxB,YAAY,IAAI,CAAC,IAAI,EAAE;IACvB,eAAe;IAEf,qBAAqB,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG;IACpD,wBAAwB;IACxB,2BAA2B,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG;IAC5D,sCAAsC;IAGtC,oBAAoB,IAAI,CAAC,KAAK,EAAE;IAChC,EAAE;CACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAUjB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAyB,EAAsB,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;AAI3H,MAAM,SAAS,GAAG,CAAC,OAAe,EAAE,KAAwB,EAAW,EAAE;IACrE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,EAAE,AAAD,EAAG,IAAI,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5C,OAAO,CACH,IAAI,KAAK,SAAS;QAClB,IAAI,KAAK,SAAS;QAClB,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,CAC/G,CAAC;AACN,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,KAAa,EAAE,IAAY,EAAE,OAA2B,EAAU,EAAE;IAC/G,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1E,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1I,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACpH,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,SAAiB,EAAiB,EAAE;IACtE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO;IACX,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;IAClH,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACnB,MAAM,eAAe,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;AACL,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,KAAa,EAAE,IAAY,EAAE,OAA2B,EAAiB,EAAE;IAC9G,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,IAAI,EAAE,CAAC;IACzF,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACnB,MAAM,eAAe,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;AACL,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,aAAa,EAAE,CAAC;AAIzD,MAAM,eAAe,GAAG,4FAA4F,CAAC;AACrH,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAE/E,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAU,EAAE,CAAC,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAGjH,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAGnC,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,IAAqB,EAAE;IACpD,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,MAAM,GAAG,GAAG,GAAG,UAAU,MAAM,CAAC;IAEhC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACvE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAGD,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE;QACjG,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,mBAAmB;KAC/B,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,CAAC,MAAM,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAChD,CAAC,CAAC;AAMF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAA2E,EAAU,EAAE,CACpH,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;KAC9G,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACf,cAAc,CAAC;IACX,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC;IAC1B,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC;IAC5B,YAAY,EAAE,UAAU;IACxB,cAAc,EAAE,cAAc;CACjC,CAAC,CACL;KACA,IAAI,CAAC,IAAI,CAAC,CAAC;AAIpB,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,QAAgB,EAAiB,EAAE;IAC3E,MAAM,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACtD,MAAM,SAAS,CAAC,aAAa,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5F,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC9E,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACtB,OAAO;IACX,CAAC;IAED,MAAM,eAAe,CAAC,iBAAiB,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AAC7D,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,IAAmB,EAAE;IAC5D,MAAM,EAAE,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QAEvB,MAAM,eAAe,CAAC,iBAAiB,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;AACL,CAAC,CAAC;AAIF,MAAM,wBAAwB,GAAG;IAC7B,kCAAkC;IAClC,wCAAwC;IACxC,sBAAsB;IACtB,sBAAsB;IACtB,iBAAiB;IACjB,mBAAmB;IACnB,gCAAgC;CACnC,CAAC;AAIF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAyB,EAAE,QAA4B,EAAU,EAAE;IAC9F,MAAM,IAAI,GAAG,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7H,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,CAAC;AACtI,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,UAAkB,EAAwC,EAAE;IACzF,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,OAAO,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AAC9G,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,YAAoB,EAAQ,EAAE;IAE7F,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IACpH,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,kBAAkB,GAAG,6DAA6D,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9H,CAAC;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjD,IAAI,QAAQ,CAAC,QAAQ,KAAK,WAAW,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACtE,OAAO;IACX,CAAC;IACD,MAAM,QAAQ,GAAG,aAAa,YAAY,EAAE,CAAC;IAC7C,MAAM,IAAI,KAAK,CACX;QACI,IAAI,GAAG,4CAA4C,KAAK,QAAQ,QAAQ,CAAC,QAAQ,IAAI,SAAS,IAAI,QAAQ,CAAC,IAAI,IAAI,GAAG,gBAAgB,QAAQ,GAAG;QACjJ,wBAAwB,aAAa,WAAW,iBAAiB,4CAA4C;QAC7G,oCAAoC,OAAO,EAAE,GAAG;QAChD,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9D,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC5B,CAAC,CAAC,CAAC,gHAAgH,CAAC;YACpH,CAAC,CAAC,EAAE,CAAC;KACZ,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;AACN,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,GAAW,EAAE,KAAa,EAAE,GAAQ,EAAiB,EAAE;IAC3F,IAAI,MAAM,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;QACxC,OAAO;IACX,CAAC;IACD,GAAG,CAAC,2EAA2E,cAAc,EAAE,CAAC,CAAC;AACrG,CAAC,CAAC;AAKF,IAAI,cAAc,GAAG,EAAE,CAAC;AAIxB,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,GAAW,EAAE,KAAa,EAAoB,EAAE;IACtF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACzI,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACtC,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AAGF,MAAM,gBAAgB,GAAG,MAAM,CAAC"}

package/dist/sync/tunnel.d.ts

@@ -2,7 +2,11 @@ import { type Socket } from "node:net";
 import type { Log } from "@intentic/local-agent";
 import type { Dialed } from "../daemon-base.js";
 import { type Pairing } from "./config.js";
-export declare const syncSshPort: (sandboxId: string) => number;
+import { type SyncEnvironment } from "./environment.js";
+export declare const SSH_PORT_BASE = 24000;
+export declare const SSH_PORT_SPAN = 4000;
+export declare const syncSshPort: (sandboxId: string, environment?: SyncEnvironment) => number;
+export declare const syncSshPorts: (sandboxId: string, environment?: SyncEnvironment) => readonly number[];
 export declare const sshSocketUrl: (base: string) => string;
 export interface TunnelTarget {
     readonly sandboxId: string;
@@ -12,7 +16,7 @@ export interface TunnelTarget {
 export declare const tunnelTargets: (dialed: readonly Dialed<Pairing>[]) => readonly TunnelTarget[];
 export declare const bridgeConnection: (socket: Socket, target: TunnelTarget, onError: (message: string) => void) => void;
 export declare const startSshTunnel: (target: TunnelTarget, log: Log) => Promise<(() => Promise<void>) | undefined>;
-export declare const createTunnelPool: (log: Log) => {
+export declare const createTunnelPool: (log: Log, signal?: AbortSignal) => {
     reconcile: (targets: readonly TunnelTarget[]) => Promise<void>;
     stopAll: () => Promise<void>;
 };

package/dist/sync/tunnel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/sync/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAE3E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,OAAO,EAAoB,MAAM,aAAa,CAAC;AAY7D,eAAO,MAAM,WAAW,cAAe,MAAM,KAAG,MAK/C,CAAC;AAKF,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,MAA6E,CAAC;AAqB1H,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC9B;AAKD,eAAO,MAAM,aAAa,WAAY,SAAS,MAAM,CAAC,OAAO,CAAC,EAAE,KAAG,SAAS,YAAY,EAGnF,CAAC;AAIN,eAAO,MAAM,gBAAgB,WAAY,MAAM,UAAU,YAAY,WAAW,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAG,IAyE3G,CAAC;AAOF,eAAO,MAAM,cAAc,WAAkB,YAAY,OAAO,GAAG,KAAG,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CA4B9G,CAAC;AAKF,eAAO,MAAM,gBAAgB,QAAS,GAAG;IAKjC,SAAS,YAAkB,SAAS,YAAY,EAAE,KAAG,OAAO,CAAC,IAAI,CAAC;IAiClE,OAAO,QAAY,OAAO,CAAC,IAAI,CAAC;CAMvC,CAAC;AAMF,eAAO,MAAM,WAAW,SAAU,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,OAAO,CAaxE,CAAC"}
+{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/sync/tunnel.ts"],"names":[],"mappings":"AACA,OAAO,EAAsC,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAG3E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,OAAO,EAAoB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,kBAAkB,CAAC;AAWzE,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,aAAa,OAAO,CAAC;AAmBlC,eAAO,MAAM,WAAW,cAAe,MAAM,gBAAe,eAAe,KAAuB,MAMjG,CAAC;AAIF,eAAO,MAAM,YAAY,cAAe,MAAM,gBAAe,eAAe,KAAuB,SAAS,MAAM,EAEjH,CAAC;AAKF,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,MAA6E,CAAC;AAO1H,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC9B;AAOD,eAAO,MAAM,aAAa,WAAY,SAAS,MAAM,CAAC,OAAO,CAAC,EAAE,KAAG,SAAS,YAAY,EAKnF,CAAC;AAIN,eAAO,MAAM,gBAAgB,WAAY,MAAM,UAAU,YAAY,WAAW,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAG,IA6D3G,CAAC;AAOF,eAAO,MAAM,cAAc,WAAkB,YAAY,OAAO,GAAG,KAAG,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CA4B9G,CAAC;AAQF,eAAO,MAAM,gBAAgB,QAAS,GAAG,WAAW,WAAW;IAOvD,SAAS,YAAkB,SAAS,YAAY,EAAE,KAAG,OAAO,CAAC,IAAI,CAAC;IAwClE,OAAO,QAAY,OAAO,CAAC,IAAI,CAAC;CAMvC,CAAC;AAMF,eAAO,MAAM,WAAW,SAAU,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,OAAO,CAaxE,CAAC"}

package/dist/sync/tunnel.js

@@ -1,33 +1,42 @@
+import { createHash } from "node:crypto";
 import { connect, createServer } from "node:net";
 import { pollUntil } from "@intentic/base/async";
+import { pumpTcpWebSocket } from "@intentic/base/ws-tcp-pump";
 import { pairingTransport } from "./config.js";
-const SSH_PORT_BASE = 24000;
-const SSH_PORT_SPAN = 4000;
-export const syncSshPort = (sandboxId) => {
+import { syncEnvironment } from "./environment.js";
+export const SSH_PORT_BASE = 24000;
+export const SSH_PORT_SPAN = 4000;
+const WSL_PORT_BASE = 20000;
+const legacyOffset = (sandboxId) => {
     const hex = (/[0-9a-f]{6}/i.exec(sandboxId)?.[0] ?? "000000").toLowerCase();
-    return SSH_PORT_BASE + (Number.parseInt(hex, 16) % SSH_PORT_SPAN);
+    return Number.parseInt(hex, 16) % SSH_PORT_SPAN;
 };
+export const syncSshPort = (sandboxId, environment = syncEnvironment()) => {
+    if (!environment.wsl) {
+        return SSH_PORT_BASE + legacyOffset(sandboxId);
+    }
+    const digest = createHash("sha256").update(`${environment.name}\0${sandboxId}`).digest();
+    return WSL_PORT_BASE + (digest.readUInt32BE(0) % SSH_PORT_SPAN);
+};
+export const syncSshPorts = (sandboxId, environment = syncEnvironment()) => [
+    ...new Set([syncSshPort(sandboxId, environment), SSH_PORT_BASE + legacyOffset(sandboxId)]),
+];
 export const sshSocketUrl = (base) => `${base.replace(/\/$/, "").replace(/^http/, "ws")}/system/sync/ssh`;
-const BUFFER_HIGH = 1_048_576;
-const BUFFER_LOW = 262_144;
-const DRAIN_POLL_MS = 50;
 const OPEN_TIMEOUT_MS = 10_000;
-const frameOf = (chunk) => {
-    const frame = new Uint8Array(chunk.byteLength);
-    frame.set(chunk);
-    return frame;
-};
-export const tunnelTargets = (dialed) => dialed.flatMap(({ pairing, base }) => pairing.syncToken === undefined || pairingTransport(pairing) === "docker" ? [] : [{ sandboxId: pairing.sandboxId, base, syncToken: pairing.syncToken }]);
+export const tunnelTargets = (dialed) => dialed.flatMap(({ pairing, base }) => pairing.syncToken === undefined || pairingTransport(pairing) === "docker" || pairing.goneSince !== undefined
+    ? []
+    : [{ sandboxId: pairing.sandboxId, base, syncToken: pairing.syncToken }]);
 export const bridgeConnection = (socket, target, onError) => {
     const ws = new WebSocket(sshSocketUrl(target.base), { headers: { "x-intentic-sync": target.syncToken } });
     ws.binaryType = "arraybuffer";
     const queued = [];
-    let open = false;
-    let drain;
+    const early = (chunk) => {
+        queued.push(chunk);
+    };
+    let pump;
     socket.pause();
     const close = () => {
-        clearInterval(drain);
-        drain = undefined;
+        pump?.stop();
         clearTimeout(handshake);
         socket.destroy();
         if (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CONNECTING) {
@@ -38,42 +47,22 @@ export const bridgeConnection = (socket, target, onError) => {
         onError(`the sync transport to ${target.sandboxId} did not open within ${OPEN_TIMEOUT_MS / 1000}s: the sandbox is not answering`);
         close();
     }, OPEN_TIMEOUT_MS);
-    socket.on("data", (chunk) => {
-        if (!open) {
-            queued.push(chunk);
-            return;
-        }
-        ws.send(frameOf(chunk));
-        if (drain === undefined && ws.bufferedAmount > BUFFER_HIGH) {
-            socket.pause();
-            drain = setInterval(() => {
-                if (ws.bufferedAmount < BUFFER_LOW) {
-                    clearInterval(drain);
-                    drain = undefined;
-                    socket.resume();
-                }
-            }, DRAIN_POLL_MS);
-        }
-    });
+    socket.on("data", early);
     socket.on("close", close);
     socket.on("error", close);
     ws.addEventListener("open", () => {
-        open = true;
         clearTimeout(handshake);
-        for (const chunk of queued) {
-            ws.send(frameOf(chunk));
-        }
-        queued.length = 0;
-        socket.resume();
+        socket.off("data", early);
+        pump = pumpTcpWebSocket(socket, { send: (frame) => ws.send(frame), bufferedAmount: () => ws.bufferedAmount }, {
+            queued: queued.splice(0),
+            onOverflow: () => {
+                onError(`the sync transport to ${target.sandboxId} was dropped: ssh stopped reading what the sandbox sent`);
+                close();
+            },
+        });
     });
     ws.addEventListener("message", (event) => {
-        const data = event.data;
-        if (data instanceof ArrayBuffer) {
-            socket.write(Buffer.from(data));
-        }
-        else if (typeof data === "string") {
-            socket.write(Buffer.from(data, "binary"));
-        }
+        pump?.inbound(event.data);
     });
     ws.addEventListener("error", () => {
         onError(`the sync transport to ${target.sandboxId} could not be opened`);
@@ -108,10 +97,14 @@ export const startSshTunnel = async (target, log) => {
         await new Promise((resolve) => server.close(() => resolve()));
     };
 };
-export const createTunnelPool = (log) => {
+export const createTunnelPool = (log, signal) => {
     const running = new Map();
+    const retired = () => signal?.aborted === true;
     return {
         reconcile: async (targets) => {
+            if (retired()) {
+                return;
+            }
             const wanted = new Set(targets.map((target) => target.sandboxId));
             for (const [sandboxId, held] of running) {
                 if (!wanted.has(sandboxId)) {
@@ -131,6 +124,10 @@ export const createTunnelPool = (log) => {
                     log(`  sync transport for ${target.sandboxId} moving to ${target.base}`);
                 }
                 const stop = await startSshTunnel(target, log);
+                if (stop !== undefined && retired()) {
+                    await stop();
+                    return;
+                }
                 if (stop !== undefined) {
                     running.set(target.sandboxId, { base: target.base, stop });
                     log(`  sync transport for ${target.sandboxId} listening on 127.0.0.1:${syncSshPort(target.sandboxId)}`);