fix: proxmox guest sync, startup snippet sync, drop dead cloudflare ssh transport

src/backend/hosts/cloudflare-websocket.ts

@@ -1,64 +0,0 @@
-import { Duplex } from "node:stream";
-import type { RawData, WebSocket } from "ws";
-
-export function waitForWebSocketOpen(
-  socket: WebSocket,
-  timeoutMs: number,
-): Promise<void> {
-  return new Promise((resolve, reject) => {
-    const cleanup = () => {
-      clearTimeout(timer);
-      socket.off("open", onOpen);
-      socket.off("error", onError);
-    };
-    const onOpen = () => {
-      cleanup();
-      resolve();
-    };
-    const onError = (error: Error) => {
-      cleanup();
-      socket.terminate();
-      reject(error);
-    };
-    const timer = setTimeout(() => {
-      cleanup();
-      socket.terminate();
-      reject(new Error("Cloudflare tunnel timeout"));
-    }, timeoutMs);
-
-    socket.once("open", onOpen);
-    socket.once("error", onError);
-  });
-}
-
-export function createWebSocketDuplex(socket: WebSocket): Duplex {
-  const duplex = new Duplex({
-    read() {},
-    write(chunk, _encoding, callback) {
-      try {
-        socket.send(chunk, (error) => callback(error || undefined));
-      } catch (error) {
-        callback(error instanceof Error ? error : new Error(String(error)));
-      }
-    },
-    destroy(error, callback) {
-      cleanup();
-      socket.terminate();
-      callback(error);
-    },
-  });
-
-  const onMessage = (data: RawData) => duplex.push(data);
-  const onClose = () => duplex.destroy();
-  const onError = () => duplex.destroy();
-  const cleanup = () => {
-    socket.off("message", onMessage);
-    socket.off("close", onClose);
-    socket.off("error", onError);
-  };
-
-  socket.on("message", onMessage);
-  socket.on("close", onClose);
-  socket.on("error", onError);
-  return duplex;
-}

src/backend/hosts/connect/transport.ts

@@ -1,6 +1,6 @@
 /**
- * How the bytes get to a host: port knocking, a Cloudflare Access tunnel, a
- * jump host chain or a SOCKS5 proxy, in that order. Sets config.sock and
+ * How the bytes get to a host: port knocking, a jump host chain or a SOCKS5
+ * proxy, in that order. Sets config.sock and
  * returns the jump client so the caller can close it with the connection.
  */
 
@@ -39,7 +39,7 @@ function getHostSocks5Config(host: SshConnectHost): SOCKS5Config | null {
 class SshTransportError extends Error {
   constructor(
     message: string,
-    readonly stage: "cloudflare" | "jump-host" | "jump-forward" | "proxy",
+    readonly stage: "jump-host" | "jump-forward" | "proxy",
     options?: { cause?: unknown },
   ) {
     super(message, options);
@@ -50,8 +50,6 @@ class SshTransportError extends Error {
 export interface OpenTransportOptions {
   /** Knock before connecting when the host has a sequence. Default true. */
   portKnock?: boolean;
-  /** Use terminalConfig.cfAccessClient* when present. Default true. */
-  cloudflare?: boolean;
   /** Resolve DNS up front for a direct connection. Default true. */
   resolveDns?: boolean;
   log?: SshAuthLog;
@@ -59,7 +57,7 @@ export interface OpenTransportOptions {
 
 export interface OpenedTransport {
   jumpClient: Client | null;
-  via: "direct" | "proxy" | "jump" | "cloudflare";
+  via: "direct" | "proxy" | "jump";
 }
 
 function forwardThrough(
@@ -94,8 +92,6 @@ export async function openSshTransport(
   config: MutableConnectConfig,
   options: OpenTransportOptions = {},
 ): Promise<OpenedTransport> {
-  const log = options.log ?? (() => {});
-
   if (
     options.portKnock !== false &&
     Array.isArray(host.portKnockSequence) &&
@@ -113,42 +109,6 @@ export async function openSshTransport(
 
   let via: OpenedTransport["via"] = "direct";
 
-  const terminalConfig = (host.terminalConfig ?? {}) as Record<string, unknown>;
-  if (
-    options.cloudflare !== false &&
-    terminalConfig.cfAccessClientId &&
-    terminalConfig.cfAccessClientSecret
-  ) {
-    try {
-      const WebSocket = (await import("ws")).default;
-      const { createWebSocketDuplex, waitForWebSocketOpen } =
-        await import("../cloudflare-websocket.js");
-      const cfHostname = (terminalConfig.cfTunnelHostname as string) || host.ip;
-      const cfWs = new WebSocket(
-        `wss://${cfHostname}/cdn-cgi/access/ssh-connect`,
-        {
-          headers: {
-            "CF-Access-Client-Id": terminalConfig.cfAccessClientId as string,
-            "CF-Access-Client-Secret":
-              terminalConfig.cfAccessClientSecret as string,
-          },
-        },
-      );
-      await waitForWebSocketOpen(cfWs, 30000);
-      config.sock = createWebSocketDuplex(
-        cfWs,
-      ) as unknown as typeof config.sock;
-      via = "cloudflare";
-      log("info", "Connected via Cloudflare Tunnel");
-    } catch (error) {
-      throw new SshTransportError(
-        "Cloudflare tunnel connection failed: " + getErrorMessage(error),
-        "cloudflare",
-        { cause: error },
-      );
-    }
-  }
-
   const jumpUserId = host.userId || "";
   if (host.jumpHosts && host.jumpHosts.length > 0 && jumpUserId) {
     const jumpClient = await createJumpHostChain(host.jumpHosts, jumpUserId);

src/backend/sync/entities.ts

@@ -58,6 +58,7 @@ const HOST_REFERENCES = [
   },
   { field: "jumpHosts[].hostId", entityType: "hosts" },
   { field: "quickActions[].snippetId", entityType: "commandSnippet" },
+  { field: "terminalConfig.startupSnippetId", entityType: "commandSnippet" },
 ] as const;
 
 /** Columns that only mean something on the device that holds them. */

src/backend/tests/hosts/cloudflare-websocket.test.ts

@@ -1,74 +0,0 @@
-import { EventEmitter } from "node:events";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import type { WebSocket } from "ws";
-import {
-  createWebSocketDuplex,
-  waitForWebSocketOpen,
-} from "../../hosts/cloudflare-websocket.js";
-
-function setupSocket() {
-  const socket = new EventEmitter() as EventEmitter & {
-    terminate: ReturnType<typeof vi.fn>;
-    send: ReturnType<typeof vi.fn>;
-  };
-  socket.terminate = vi.fn();
-  socket.send = vi.fn();
-  return socket as unknown as WebSocket;
-}
-
-describe("waitForWebSocketOpen", () => {
-  afterEach(() => vi.useRealTimers());
-
-  it("clears listeners and leaves an opened socket alive", async () => {
-    vi.useFakeTimers();
-    const socket = setupSocket();
-    const result = waitForWebSocketOpen(socket, 30_000);
-
-    socket.emit("open");
-
-    await expect(result).resolves.toBeUndefined();
-    expect(socket.terminate).not.toHaveBeenCalled();
-    expect(socket.listenerCount("open")).toBe(0);
-    expect(socket.listenerCount("error")).toBe(0);
-    expect(vi.getTimerCount()).toBe(0);
-  });
-
-  it("terminates a socket that does not open before the deadline", async () => {
-    vi.useFakeTimers();
-    const socket = setupSocket();
-    const result = waitForWebSocketOpen(socket, 30_000);
-    const rejection = expect(result).rejects.toThrow(
-      "Cloudflare tunnel timeout",
-    );
-
-    await vi.advanceTimersByTimeAsync(30_000);
-
-    await rejection;
-    expect(socket.terminate).toHaveBeenCalledOnce();
-    expect(socket.listenerCount("open")).toBe(0);
-    expect(socket.listenerCount("error")).toBe(0);
-  });
-
-  it("terminates the socket when the SSH duplex is destroyed", () => {
-    const socket = setupSocket();
-    const duplex = createWebSocketDuplex(socket);
-
-    duplex.destroy();
-
-    expect(socket.terminate).toHaveBeenCalledOnce();
-    expect(socket.listenerCount("message")).toBe(0);
-    expect(socket.listenerCount("close")).toBe(0);
-    expect(socket.listenerCount("error")).toBe(0);
-  });
-
-  it("handles established socket errors without an unhandled event", () => {
-    const socket = setupSocket();
-    const duplex = createWebSocketDuplex(socket);
-
-    socket.emit("error", new Error("connection lost"));
-
-    expect(duplex.destroyed).toBe(true);
-    expect(socket.terminate).toHaveBeenCalledOnce();
-    expect(socket.listenerCount("error")).toBe(0);
-  });
-});

src/backend/tests/hosts/host-session-status.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
-import { HostSessionStatus } from "./host-session-status.js";
+import { HostSessionStatus } from "../../hosts/host-session-status.js";
 
 describe("HostSessionStatus", () => {
   it("reports only the first connection and last disconnection per host", () => {

src/backend/tests/hosts/jump-host-proxy.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { getJumpHostSocks5Config } from "./jump-host-proxy.js";
+import { getJumpHostSocks5Config } from "../../hosts/jump-host-proxy.js";
 
 describe("getJumpHostSocks5Config", () => {
   it("uses the first jump host proxy settings", () => {

src/backend/tests/hosts/ssh-keepalive.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { resolveSshKeepalive } from "./ssh-keepalive.js";
+import { resolveSshKeepalive } from "../../hosts/ssh-keepalive.js";
 
 describe("resolveSshKeepalive", () => {
   it("preserves zero to disable SSH keepalives", () => {

src/backend/tests/plugins/sync-registry.test.ts

@@ -197,6 +197,16 @@ describe("core sync entities", () => {
     );
   });
 
+  it("translates every snippet a host points at", () => {
+    const fields = (getEntity("hosts")?.references ?? [])
+      .filter((reference) => reference.entityType === "commandSnippet")
+      .map((reference) => reference.field);
+    expect(fields).toEqual([
+      "quickActions[].snippetId",
+      "terminalConfig.startupSnippetId",
+    ]);
+  });
+
   it("encrypts host and credential secrets", () => {
     expect(getEntity("hosts")?.encryptedFields).toContain("password");
     expect(getEntity("sshCredentials")?.encryptedFields).toContain(

src/backend/tests/sync/wire.test.ts

@@ -35,6 +35,7 @@ beforeEach(() => {
     references: [
       { field: "parentId", syncField: "parentSyncId", entityType: "things" },
       { field: "hops[].thingId", entityType: "things" },
+      { field: "config.startId", entityType: "things" },
       {
         field: "bindings[].action.snippetId",
         entityType: "things",
@@ -111,6 +112,29 @@ describe("serializing references", () => {
     expect(back.bindings).toEqual([{ action: { snippetId: "12" } }]);
   });
 
+  it("rewrites an id nested in a JSON object column", async () => {
+    const wire = await serializeReferences(
+      entity("things"),
+      { config: JSON.stringify({ theme: "dark", startId: 5 }) },
+      toSync,
+    );
+    expect(JSON.parse(wire.config as string)).toEqual({
+      theme: "dark",
+      startId: "sync-5",
+    });
+
+    const back = await deserializeReferences(
+      entity("things"),
+      wire,
+      toId,
+      null,
+    );
+    expect(JSON.parse(back.config as string)).toEqual({
+      theme: "dark",
+      startId: 5,
+    });
+  });
+
   it("keeps the current value when a referenced row is not here", async () => {
     const back = await deserializeReferences(
       entity("things"),

src/ui/lib/default-keybindings.ts

@@ -3,7 +3,7 @@ import type { KeyCombo } from "@/types/keybindings";
 export interface DefaultKeybindingInfo {
   id: string;
   combo: KeyCombo;
-  description: string;
+  descriptionKey: string;
 }
 
 export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
@@ -17,7 +17,7 @@ export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
       shift: false,
       meta: false,
     },
-    description: "Copy selection (Ctrl+C, only when text is selected)",
+    descriptionKey: "newUi.sidebar.keybindings.builtIn.copyCtrlC",
   },
   {
     id: "default-copy-ctrlshiftc",
@@ -29,7 +29,7 @@ export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
       shift: true,
       meta: false,
     },
-    description: "Copy selection (Ctrl+Shift+C)",
+    descriptionKey: "newUi.sidebar.keybindings.builtIn.copyCtrlShiftC",
   },
   {
     id: "default-copy-cmdc",
@@ -41,7 +41,7 @@ export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
       shift: false,
       meta: true,
     },
-    description: "Copy selection (Cmd+C)",
+    descriptionKey: "newUi.sidebar.keybindings.builtIn.copyCmdC",
   },
   {
     id: "default-paste-ctrlshiftv",
@@ -53,7 +53,7 @@ export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
       shift: true,
       meta: false,
     },
-    description: "Paste from clipboard (Ctrl+Shift+V)",
+    descriptionKey: "newUi.sidebar.keybindings.builtIn.pasteCtrlShiftV",
   },
   {
     id: "default-ctrlaltw",
@@ -65,7 +65,7 @@ export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
       shift: false,
       meta: false,
     },
-    description: "Send Ctrl+W to shell (blocked from closing browser tab)",
+    descriptionKey: "newUi.sidebar.keybindings.builtIn.ctrlW",
   },
   {
     id: "default-ctrlaltt",
@@ -77,7 +77,7 @@ export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
       shift: false,
       meta: false,
     },
-    description: "Send Ctrl+T to shell (blocked from opening browser tab)",
+    descriptionKey: "newUi.sidebar.keybindings.builtIn.ctrlT",
   },
   {
     id: "default-ctrlaltn",
@@ -89,7 +89,7 @@ export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
       shift: false,
       meta: false,
     },
-    description: "Send Ctrl+N to shell (blocked from opening browser window)",
+    descriptionKey: "newUi.sidebar.keybindings.builtIn.ctrlN",
   },
   {
     id: "default-ctrlaltq",
@@ -101,6 +101,6 @@ export const BUILT_IN_DEFAULTS: DefaultKeybindingInfo[] = [
       shift: false,
       meta: false,
     },
-    description: "Send Ctrl+Q to shell (blocked from quitting browser)",
+    descriptionKey: "newUi.sidebar.keybindings.builtIn.ctrlQ",
   },
 ];

src/ui/lib/terminal-themes.ts

@@ -815,22 +815,26 @@ export function resolveTerminalFontFamily(fontFamily?: string): string {
 }
 
 export const CURSOR_STYLES = [
-  { value: "block", label: "Block" },
-  { value: "underline", label: "Underline" },
-  { value: "bar", label: "Bar" },
+  { value: "block", label: "Block", labelKey: "hosts.cursorStyleBlock" },
+  {
+    value: "underline",
+    label: "Underline",
+    labelKey: "hosts.cursorStyleUnderline",
+  },
+  { value: "bar", label: "Bar", labelKey: "hosts.cursorStyleBar" },
 ] as const;
 
 export const BELL_STYLES = [
-  { value: "none", label: "None" },
-  { value: "sound", label: "Sound" },
-  { value: "visual", label: "Visual" },
-  { value: "both", label: "Both" },
+  { value: "none", label: "None", labelKey: "hosts.bellStyleNone" },
+  { value: "sound", label: "Sound", labelKey: "hosts.bellStyleSound" },
+  { value: "visual", label: "Visual", labelKey: "hosts.bellStyleVisual" },
+  { value: "both", label: "Both", labelKey: "hosts.bellStyleBoth" },
 ] as const;
 
 export const FAST_SCROLL_MODIFIERS = [
-  { value: "alt", label: "Alt" },
-  { value: "ctrl", label: "Ctrl" },
-  { value: "shift", label: "Shift" },
+  { value: "alt", label: "Alt", labelKey: "hosts.fastScrollModifierAlt" },
+  { value: "ctrl", label: "Ctrl", labelKey: "hosts.fastScrollModifierCtrl" },
+  { value: "shift", label: "Shift", labelKey: "hosts.fastScrollModifierShift" },
 ] as const;
 
 export const DEFAULT_TERMINAL_CONFIG = {

src/ui/locales/en.json

@@ -1008,7 +1008,19 @@
     "localOnly": "Keep on this device only",
     "localOnlyDesc": "This host is not sent to the server and does not appear on your other devices.",
     "folderLocalOnly": "Keep on this device only",
-    "folderLocalOnlyDesc": "This folder and every host in it stay on this device and are not sent to the server."
+    "folderLocalOnlyDesc": "This folder and every host in it stay on this device and are not sent to the server.",
+    "cursorStyleBlock": "Block",
+    "cursorStyleUnderline": "Underline",
+    "cursorStyleBar": "Bar",
+    "bellStyleNone": "None",
+    "bellStyleSound": "Sound",
+    "bellStyleVisual": "Visual",
+    "bellStyleBoth": "Both",
+    "fastScrollModifierAlt": "Alt",
+    "fastScrollModifierCtrl": "Ctrl",
+    "fastScrollModifierShift": "Shift",
+    "backspaceModeNormal": "Normal (DEL)",
+    "backspaceModeControlH": "Control-H (BS)"
   },
   "commandPalette": {
     "searchPlaceholder": "Search hosts, commands, or settings...",
@@ -2008,7 +2020,17 @@
         "snippetLabel": "Snippet",
         "selectSnippetPlaceholder": "Select a snippet",
         "orphanedSnippetWarning": "snippet not found",
-        "clipboardPermissionNote": "May prompt for clipboard permission on first use in some browsers."
+        "clipboardPermissionNote": "May prompt for clipboard permission on first use in some browsers.",
+        "builtIn": {
+          "copyCtrlC": "Copy selection (Ctrl+C, only when text is selected)",
+          "copyCtrlShiftC": "Copy selection (Ctrl+Shift+C)",
+          "copyCmdC": "Copy selection (Cmd+C)",
+          "pasteCtrlShiftV": "Paste from clipboard (Ctrl+Shift+V)",
+          "ctrlW": "Send Ctrl+W to shell (blocked from closing browser tab)",
+          "ctrlT": "Send Ctrl+T to shell (blocked from opening browser tab)",
+          "ctrlN": "Send Ctrl+N to shell (blocked from opening browser window)",
+          "ctrlQ": "Send Ctrl+Q to shell (blocked from quitting browser)"
+        }
       },
       "connectionDefaults": {
         "title": "Connection Defaults",

src/ui/sidebar/ConnectionDefaultsSettings.tsx

@@ -278,7 +278,7 @@ export function ConnectionDefaultsSettings() {
                   <option value="">{inheritLabel}</option>
                   {CURSOR_STYLES.map((style) => (
                     <option key={style.value} value={style.value}>
-                      {style.label}
+                      {t(style.labelKey)}
                     </option>
                   ))}
                 </select>

src/ui/sidebar/HostTerminalSettings.tsx

@@ -270,7 +270,7 @@ export function HostTerminalSettings({
                 >
                   {CURSOR_STYLES.map((s) => (
                     <option key={s.value} value={s.value}>
-                      {s.label}
+                      {t(s.labelKey)}
                     </option>
                   ))}
                 </Select2>
@@ -322,7 +322,7 @@ export function HostTerminalSettings({
                 >
                   {BELL_STYLES.map((b) => (
                     <option key={b.value} value={b.value}>
-                      {b.label}
+                      {t(b.labelKey)}
                     </option>
                   ))}
                 </Select2>
@@ -341,8 +341,12 @@ export function HostTerminalSettings({
                   }
                   className="flex h-9 w-full border border-border bg-background px-3 py-1 text-xs outline-none focus:ring-1 focus:ring-ring"
                 >
-                  <option value="normal">Normal (DEL)</option>
-                  <option value="control-h">Control-H (BS)</option>
+                  <option value="normal">
+                    {t("hosts.backspaceModeNormal")}
+                  </option>
+                  <option value="control-h">
+                    {t("hosts.backspaceModeControlH")}
+                  </option>
                 </Select2>
               </div>
             </div>
@@ -850,7 +854,7 @@ export function HostTerminalSettings({
               >
                 {FAST_SCROLL_MODIFIERS.map((m) => (
                   <option key={m.value} value={m.value}>
-                    {m.label}
+                    {t(m.labelKey)}
                   </option>
                 ))}
               </Select2>

src/ui/sidebar/KeybindingsDialog.tsx

@@ -299,7 +299,7 @@ export function KeybindingsDialog({
                           : formatCombo(def.combo)}
                       </span>
                       <span className="text-xs text-muted-foreground truncate">
-                        {def.description}
+                        {t(def.descriptionKey)}
                       </span>
                     </div>
                     <div className="flex items-center gap-1 shrink-0">