feat: move desktop, status, import, audit and branding features into plugins

CHANGELOG.md

@@ -11,6 +11,9 @@
 - Restore the bundled copy of a plugin from the repair screen, which also pins the shipped version
 - Switching layouts closes the tabs only the old layout could show, like its Settings tab
 - A chosen layout whose plugin was uninstalled falls back to the default instead of the repair screen
+- Filter plugins by type, like layouts, themes or tabs, from a filter list beside the results
+- Browse shows plugins a page at a time
+- Plugins that need a newer Termix are hidden in Browse, with a toggle to show them
 
 ### Changed
 
@@ -18,6 +21,20 @@
 - Your theme is saved to your account so your other devices use it too, unless you keep settings on this device only
 - The themes besides light and dark now come from a bundled themes plugin. It can be swapped but not removed, and Termix keeps a basic light and dark theme of its own
 - A theme that no longer exists shows as System instead of an unstyled page
+- Installs and updates from a registry check the Termix version a plugin needs, not only its plugin API
+- Host online and offline dots now come from the Host Status plugin. The check interval setting moved to its settings and keeps its value. Without the plugin hosts show no dot
+- Audit log forwarding and the CSV and NDJSON export now come from the Audit Tools plugin. The collector URL and token move to its settings on upgrade. The audit log viewer, retention and the audit log itself stay in Termix
+- Client tunnels on your own computer and opening a host in Windows Remote Desktop moved out of the desktop app into plugins, so fixes to them no longer need a new desktop build
+- The local terminal, the local side of the file manager with its transfers, and opening a file in an external editor moved out of the desktop app into plugins, so fixes to them no longer need a new desktop build
+- The recent activity list and the first run steps for the preset and for theme, accent, font and language now come from bundled plugins. Existing entries and choices are kept, and people who went through those steps are not asked again
+- Branding (app name, tagline and logo) is now saved by the bundled layout plugin. An existing setup keeps its branding, and the sign in screen still reads it from Termix
+- Without the plugin that stores recent activity, the list stays empty and nothing is recorded
+- Importing hosts from a JSON or SSH config file and exporting hosts now come from the Import and Export plugin. Exports are now written to the audit log. Without the plugin there is no import or export
+- Generating and checking SSH keys in the credential editor and deploying a key to a host now come from the Credential Tools plugin. Deploys are now written to the audit log. Without the plugin those buttons are hidden
+
+### Removed
+
+- The desktop app no longer has its own client tunnel and native Remote Desktop code
 
 ## 26.10.2
 

README.md

@@ -62,13 +62,19 @@ Plugins add everything else. The official ones ship with Termix, and admins can
 | [ACME Certificates](https://github.com/Termix-SSH/Plugin-ACME-SSL)          | Gets the Termix HTTPS certificate from Let's Encrypt or any ACME provider and renews it for you.            |
 | [AI Assistant](https://github.com/Termix-SSH/Plugin-AI)                     | An AI assistant that reads your setup and proposes changes for you to approve.                              |
 | [Alerts](https://github.com/Termix-SSH/Plugin-Alerts)                       | One inbox for every alert in Termix, with delivery to webhooks, ntfy, Discord and email.                    |
+| [Audit Tools](https://github.com/Termix-SSH/Plugin-Audit-Tools)             | Send the audit log to your SIEM and export it as CSV or NDJSON.                                             |
 | [Automations](https://github.com/Termix-SSH/Plugin-Automations)             | Run steps on your hosts on a schedule or when something happens.                                            |
+| [Classic Layout](https://github.com/Termix-SSH/Plugin-Classic-Layout)       | The classic Termix layout with an icon rail, sidebar, tab bar and dock.                                     |
+| [Classic Themes](https://github.com/Termix-SSH/Plugin-Classic-Themes)       | Light, dark and seven more color themes for Termix.                                                         |
+| [Credential Tools](https://github.com/Termix-SSH/Plugin-Credential-Tools)   | Generate SSH keys, check them and copy a public key to a host.                                              |
 | [Docker](https://github.com/Termix-SSH/Plugin-Docker)                       | Manage Docker and Podman containers on your hosts over SSH, with logs, stats and a console.                 |
 | [File Manager](https://github.com/Termix-SSH/Plugin-File-Manager)           | Browse, edit and move files over SFTP, including straight from one server to another.                       |
 | [Fleets](https://github.com/Termix-SSH/Plugin-Fleets)                       | Group hosts into fleets and run commands, package actions and file transfers on all of them at once.        |
 | [HashiCorp Vault](https://github.com/Termix-SSH/Plugin-Vault)               | Connect to hosts with short-lived SSH certificates signed by HashiCorp Vault.                               |
 | [Homepage](https://github.com/Termix-SSH/Plugin-Homepage)                   | A drag and drop widget page for your servers and services, plus service links for the dashboard.            |
 | [Host Metrics](https://github.com/Termix-SSH/Plugin-Host-Metrics)           | Live CPU, memory, disk, network and GPU stats, plus tools to manage your hosts.                             |
+| [Host Status](https://github.com/Termix-SSH/Plugin-Host-Status)             | Shows if each host is online with a dot in the host list, checked by connecting to its port.                |
+| [Import and Export](https://github.com/Termix-SSH/Plugin-Import-Export)     | Import hosts from a JSON file or an SSH config file and export them to share or back up.                    |
 | [LDAP](https://github.com/Termix-SSH/Plugin-LDAP)                           | Sign in with your LDAP or Active Directory username and password.                                           |
 | [Network Topology](https://github.com/Termix-SSH/Plugin-Network-Topology)   | Draws your hosts and the links between them as a live, interactive graph.                                   |
 | [OPKSSH](https://github.com/Termix-SSH/Plugin-OPKSSH)                       | Connect to hosts with short-lived OpenPubkey SSH certificates after signing in with your identity provider. |

drizzle/mysql/0074_mature_puff_adder.sql

@@ -0,0 +1,4 @@
+-- recent_activity moved to the homepage plugin, whose migration renames it to
+-- p_homepage_recent_activity. Dropping it here would lose every entry, so this
+-- only stops drizzle tracking it. SELECT 1 because MySQL rejects an empty query.
+SELECT 1;

drizzle/mysql/meta/_journal.json

@@ -519,6 +519,13 @@
       "when": 1792357129912,
       "tag": "0073_user_look_preferences",
       "breakpoints": true
+    },
+    {
+      "idx": 74,
+      "version": "5",
+      "when": 1792374489419,
+      "tag": "0074_mature_puff_adder",
+      "breakpoints": true
     }
   ]
 }

drizzle/postgres/0074_bouncy_sersi.sql

@@ -0,0 +1,4 @@
+-- recent_activity moved to the homepage plugin, whose migration renames it to
+-- p_homepage_recent_activity. Dropping it here would lose every entry, so this
+-- only stops drizzle tracking it. SELECT 1 because MySQL rejects an empty query.
+SELECT 1;

drizzle/postgres/meta/_journal.json

@@ -519,6 +519,13 @@
       "when": 1792357128746,
       "tag": "0073_user_look_preferences",
       "breakpoints": true
+    },
+    {
+      "idx": 74,
+      "version": "7",
+      "when": 1792374488837,
+      "tag": "0074_bouncy_sersi",
+      "breakpoints": true
     }
   ]
 }

drizzle/sqlite/0069_normal_ozymandias.sql

@@ -0,0 +1,4 @@
+-- recent_activity moved to the homepage plugin, whose migration renames it to
+-- p_homepage_recent_activity. Dropping it here would lose every entry, so this
+-- only stops drizzle tracking it. SELECT 1 because MySQL rejects an empty query.
+SELECT 1;

drizzle/sqlite/meta/_journal.json

@@ -484,6 +484,13 @@
       "when": 1792357127581,
       "tag": "0068_user_look_preferences",
       "breakpoints": true
+    },
+    {
+      "idx": 69,
+      "version": "6",
+      "when": 1792374488196,
+      "tag": "0069_normal_ozymandias",
+      "breakpoints": true
     }
   ]
 }

electron/c2s-auth.cjs

@@ -1,78 +0,0 @@
-const { randomUUID } = require("node:crypto");
-
-function createC2SAuthBridge(ipcMain, getWindow) {
-  const pending = new Map();
-  ipcMain.handle("answer-c2s-auth", (event, id, answer) => {
-    const item = pending.get(id);
-    if (!item || item.sender !== event.sender) return false;
-    if (answer !== null && (typeof answer !== "string" || answer.length > 8192))
-      return false;
-    item.finish(answer);
-    return true;
-  });
-  return function attach(ws, tunnelName) {
-    const active = new Set();
-    const close = () => {
-      for (const id of active) pending.get(id)?.finish(null);
-      ws.off("message", onMessage);
-      ws.off("close", close);
-      ws.off("error", close);
-    };
-    const onMessage = (raw, binary) => {
-      if (binary) return;
-      let message;
-      try {
-        message = JSON.parse(raw.toString());
-      } catch {
-        return;
-      }
-      if (message.type !== "auth-prompt") return;
-      const window = getWindow();
-      if (
-        !window ||
-        window.isDestroyed() ||
-        active.size ||
-        typeof message.requestId !== "string" ||
-        !["totp", "input", "browser"].includes(message.request?.kind) // plugin-id-ok: SSH prompt kind, not the plugin
-      ) {
-        ws.close();
-        return;
-      }
-      const sender = window.webContents;
-      const id = randomUUID();
-      const finish = (answer) => {
-        if (!pending.delete(id)) return;
-        active.delete(id);
-        clearTimeout(timer);
-        sender.off("destroyed", cancelled);
-        sender.off("did-start-loading", cancelled);
-        if (!sender.isDestroyed())
-          sender.send("c2s-auth-prompt", { id, closed: true });
-        if (ws.readyState === 1)
-          ws.send(
-            JSON.stringify({
-              type: "auth-response",
-              requestId: message.requestId,
-              answer,
-            }),
-          );
-        if (answer === null) ws.close();
-      };
-      const cancelled = () => finish(null);
-      const timer = setTimeout(cancelled, 60_000);
-      active.add(id);
-      pending.set(id, { sender, finish });
-      sender.once("destroyed", cancelled);
-      sender.once("did-start-loading", cancelled);
-      sender.send("c2s-auth-prompt", {
-        id,
-        tunnelName,
-        request: message.request,
-      });
-    };
-    ws.on("message", onMessage);
-    ws.once("close", close);
-    ws.once("error", close);
-  };
-}
-module.exports = { createC2SAuthBridge };

electron/external-editor.cjs

@@ -1,70 +0,0 @@
-const path = require("path");
-
-// Saved by the file manager after the user picks an editor in a file dialog.
-const EXTERNAL_EDITOR_SETTING = "fileManager.externalEditorPath";
-
-// Extensions the OS would run rather than open in an editor. With no editor
-// configured the temp copy goes to shell.openPath, and its name comes from
-// the remote server.
-const LAUNCHABLE_EXTENSIONS = new Set([
-  // Windows
-  "application",
-  "appref-ms",
-  "bat",
-  "chm",
-  "cmd",
-  "com",
-  "cpl",
-  "exe",
-  "gadget",
-  "hta",
-  "inf",
-  "jar",
-  "js",
-  "jse",
-  "library-ms",
-  "lnk",
-  "msc",
-  "msi",
-  "msp",
-  "mst",
-  "pif",
-  "ps1",
-  "psd1",
-  "psm1",
-  "py",
-  "pyw",
-  "reg",
-  "scf",
-  "scr",
-  "search-ms",
-  "settingcontent-ms",
-  "url",
-  "vbe",
-  "vbs",
-  "ws",
-  "wsf",
-  "wsh",
-  "xll",
-  // macOS
-  "app",
-  "command",
-  "pkg",
-  "terminal",
-  "tool",
-  "workflow",
-  // Linux
-  "appimage",
-  "desktop",
-  "run",
-  "sh",
-]);
-
-function isLaunchableFileName(fileName) {
-  // Windows drops trailing dots and spaces, so "a.exe. " is saved as a.exe.
-  const name = path.basename(String(fileName || "")).replace(/[. ]+$/, "");
-  const extension = path.extname(name).slice(1).toLowerCase();
-  return LAUNCHABLE_EXTENSIONS.has(extension);
-}
-
-module.exports = { EXTERNAL_EDITOR_SETTING, isLaunchableFileName };

electron/local-shell.cjs

@@ -1,71 +0,0 @@
-const fs = require("node:fs");
-const path = require("node:path");
-
-function isUsableShell(file, exists) {
-  return !!file && (!path.isAbsolute(file) || exists(file));
-}
-
-function resolveLocalShell(
-  platform,
-  requestedShell,
-  env = process.env,
-  exists = fs.existsSync,
-) {
-  if (platform === "win32") {
-    if (requestedShell === "wsl") {
-      return { file: "wsl.exe", args: [] };
-    }
-    return {
-      file: env.TERMIX_LOCAL_SHELL || "powershell.exe",
-      args: ["-NoLogo"],
-    };
-  }
-
-  // A SHELL left pointing at an uninstalled shell makes the spawn fail.
-  const fallbacks =
-    platform === "darwin"
-      ? ["/bin/zsh", "/bin/bash", "/bin/sh"]
-      : ["/bin/bash", "/bin/sh"];
-  const file =
-    [env.TERMIX_LOCAL_SHELL, env.SHELL, ...fallbacks].find((candidate) =>
-      isUsableShell(candidate, exists),
-    ) || fallbacks[0];
-  return { file, args: ["-l"] };
-}
-
-/**
- * node-pty starts every shell through its spawn-helper binary, and a packaged
- * copy that lost its execute bit fails with "posix_spawnp failed". Returns
- * how many helpers were fixed.
- */
-function repairSpawnHelpers(ptyDir, fsImpl = fs) {
-  // A universal macOS build ships app-arm64.asar and app-x64.asar.
-  const dir = ptyDir.replace(
-    /\b(app(?:-[a-z0-9]+)?)\.asar(?!\.unpacked)/,
-    "$1.asar.unpacked",
-  );
-  const candidates = [
-    path.join(dir, "build", "Release", "spawn-helper"),
-    path.join(
-      dir,
-      "prebuilds",
-      `${process.platform}-${process.arch}`,
-      "spawn-helper",
-    ),
-  ];
-  let fixed = 0;
-  for (const helper of candidates) {
-    try {
-      const mode = fsImpl.statSync(helper).mode;
-      if ((mode & 0o111) === 0) {
-        fsImpl.chmodSync(helper, mode | 0o755);
-        fixed += 1;
-      }
-    } catch {
-      // Missing or read-only; nothing to fix here.
-    }
-  }
-  return fixed;
-}
-
-module.exports = { resolveLocalShell, repairSpawnHelpers };

electron/native-rdp.cjs

@@ -1,85 +0,0 @@
-const fs = require("fs");
-const os = require("os");
-const path = require("path");
-const { spawn } = require("child_process");
-
-function singleLine(value, maxLength = 255) {
-  return String(value ?? "")
-    .replace(/[\r\n\0]/g, "")
-    .trim()
-    .slice(0, maxLength);
-}
-
-function validateNativeRdpOptions(options) {
-  const host = singleLine(options?.host);
-  const port = Number(options?.port ?? 3389);
-  if (!host || host.length > 253 || /[\\/]/.test(host)) {
-    throw new Error("Invalid RDP host");
-  }
-  if (!Number.isInteger(port) || port < 1 || port > 65535) {
-    throw new Error("Invalid RDP port");
-  }
-  return {
-    host,
-    port,
-    username: singleLine(options?.username),
-    domain: singleLine(options?.domain),
-  };
-}
-
-function buildRdpFile(options) {
-  const { host, port, username, domain } = validateNativeRdpOptions(options);
-  const address = host.includes(":") ? `[${host}]:${port}` : `${host}:${port}`;
-  const qualifiedUsername = username
-    ? domain
-      ? `${domain}\\${username}`
-      : username
-    : "";
-  return [
-    `full address:s:${address}`,
-    "prompt for credentials:i:1",
-    "administrative session:i:0",
-    ...(qualifiedUsername ? [`username:s:${qualifiedUsername}`] : []),
-    "",
-  ].join("\r\n");
-}
-
-async function launchNativeRdp(options, platform = process.platform) {
-  if (platform !== "win32") {
-    return {
-      success: false,
-      error: "Windows Remote Desktop is only available on Windows",
-    };
-  }
-
-  const rdpContent = buildRdpFile(options);
-  const tempDir = await fs.promises.mkdtemp(
-    path.join(os.tmpdir(), "termix-rdp-"),
-  );
-  const rdpPath = path.join(tempDir, "connection.rdp");
-  await fs.promises.writeFile(rdpPath, rdpContent, {
-    encoding: "utf8",
-    mode: 0o600,
-  });
-
-  return new Promise((resolve) => {
-    const child = spawn("mstsc.exe", [rdpPath], {
-      detached: true,
-      windowsHide: true,
-      stdio: "ignore",
-    });
-    const cleanup = () =>
-      fs.promises.rm(tempDir, { recursive: true, force: true }).catch(() => {});
-    child.once("error", (error) => {
-      cleanup();
-      resolve({ success: false, error: error.message });
-    });
-    child.once("spawn", () => {
-      child.unref();
-      setTimeout(cleanup, 30_000).unref();
-      resolve({ success: true });
-    });
-  });
-}
-
-module.exports = { buildRdpFile, launchNativeRdp, validateNativeRdpOptions };

electron/preload.js

@@ -58,36 +58,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
 
   getSetting: (key) => ipcRenderer.invoke("get-setting", key),
   setSetting: (key, value) => ipcRenderer.invoke("set-setting", key, value),
-  answerC2SAuth: (id, answer) =>
-    ipcRenderer.invoke("answer-c2s-auth", id, answer),
-  onC2SAuthPrompt: (callback) => {
-    const listener = (_event, prompt) => callback(prompt);
-    ipcRenderer.on("c2s-auth-prompt", listener);
-    return () => ipcRenderer.removeListener("c2s-auth-prompt", listener);
-  },
-  getC2STunnelConfig: () => ipcRenderer.invoke("get-c2s-tunnel-config"),
-  saveC2STunnelConfig: (config) =>
-    ipcRenderer.invoke("save-c2s-tunnel-config", config),
-  checkLocalPortAvailable: (host, port) =>
-    ipcRenderer.invoke("check-local-port-available", host, port),
-  getC2STunnelPresetDefaultName: () =>
-    ipcRenderer.invoke("get-c2s-tunnel-preset-default-name"),
-  startC2STunnel: (tunnel, index, authToken) =>
-    ipcRenderer.invoke("start-c2s-tunnel", tunnel, index, authToken),
-  testC2STunnel: (tunnel, index, authToken) =>
-    ipcRenderer.invoke("test-c2s-tunnel", tunnel, index, authToken),
-  stopC2STunnel: (tunnelName) =>
-    ipcRenderer.invoke("stop-c2s-tunnel", tunnelName),
-  getC2STunnelStatuses: () => ipcRenderer.invoke("get-c2s-tunnel-statuses"),
-  onC2STunnelStatuses: (callback) => {
-    const listener = (_event, statuses) => callback(statuses);
-    ipcRenderer.on("c2s-tunnel-statuses", listener);
-    return () => ipcRenderer.removeListener("c2s-tunnel-statuses", listener);
-  },
-  startC2SAutoStartTunnels: () =>
-    ipcRenderer.invoke("start-c2s-autostart-tunnels"),
-  setC2SRelayPath: (relayPath) =>
-    ipcRenderer.invoke("set-c2s-relay-path", relayPath),
 
   onCloseActiveTab: (callback) => {
     const listener = () => callback();
@@ -100,32 +70,8 @@ contextBridge.exposeInMainWorld("electronAPI", {
   externalBrowserLogin: (authUrl, callbackPort) =>
     ipcRenderer.invoke("external-browser-login", authUrl, callbackPort),
 
-  openExternalEditor: (fileData) =>
-    ipcRenderer.invoke("open-external-editor", fileData),
-  closeExternalEditor: (editId) =>
-    ipcRenderer.invoke("close-external-editor", editId),
-  onExternalEditorSaved: (callback) => {
-    const listener = (_event, payload) => callback(payload);
-    ipcRenderer.on("external-editor-saved", listener);
-    return () => ipcRenderer.removeListener("external-editor-saved", listener);
-  },
-
   showSaveDialog: (options) => ipcRenderer.invoke("show-save-dialog", options),
   showOpenDialog: (options) => ipcRenderer.invoke("show-open-dialog", options),
-  getLocalHomeDirectory: () => ipcRenderer.invoke("get-local-home-directory"),
-  listLocalDirectory: (dirPath) =>
-    ipcRenderer.invoke("list-local-directory", dirPath),
-  statLocalPaths: (paths) => ipcRenderer.invoke("stat-local-paths", paths),
-  collectLocalFiles: (paths) =>
-    ipcRenderer.invoke("collect-local-files", paths),
-  createLocalFolder: (parentPath, folderName) =>
-    ipcRenderer.invoke("create-local-folder", parentPath, folderName),
-  renameLocalPath: (entryPath, newName) =>
-    ipcRenderer.invoke("rename-local-path", entryPath, newName),
-  trashLocalPath: (entryPath) =>
-    ipcRenderer.invoke("trash-local-path", entryPath),
-  chmodLocalPath: (entryPath, permissions) =>
-    ipcRenderer.invoke("chmod-local-path", entryPath, permissions),
   createTempFile: (fileData) =>
     ipcRenderer.invoke("create-temp-file", fileData),
   createTempFolder: (folderData) =>
@@ -134,63 +80,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
     ipcRenderer.invoke("start-drag-to-desktop", dragData),
   cleanupTempFile: (tempId) => ipcRenderer.invoke("cleanup-temp-file", tempId),
 
-  startLocalTerminal: (dimensions) =>
-    ipcRenderer.invoke("local-terminal-start", dimensions),
-  writeLocalTerminal: (sessionId, data) =>
-    ipcRenderer.invoke("local-terminal-write", sessionId, data),
-  readyLocalTerminal: (sessionId) =>
-    ipcRenderer.invoke("local-terminal-ready", sessionId),
-  resizeLocalTerminal: (sessionId, cols, rows) =>
-    ipcRenderer.invoke("local-terminal-resize", sessionId, cols, rows),
-  closeLocalTerminal: (sessionId) =>
-    ipcRenderer.invoke("local-terminal-close", sessionId),
-  onLocalTerminalData: (sessionId, callback) => {
-    const channel = `local-terminal:data:${sessionId}`;
-    const listener = (_event, data) => callback(data);
-    ipcRenderer.on(channel, listener);
-    return () => ipcRenderer.removeListener(channel, listener);
-  },
-  onLocalTerminalExit: (sessionId, callback) => {
-    const channel = `local-terminal:exit:${sessionId}`;
-    const listener = (_event, exitCode) => callback(exitCode);
-    ipcRenderer.on(channel, listener);
-    return () => ipcRenderer.removeListener(channel, listener);
-  },
-
-  // Dual-pane file manager: local disk browsing and streamed transfers.
-  localFs: {
-    home: () => ipcRenderer.invoke("local-fs:home"),
-    list: (dirPath) => ipcRenderer.invoke("local-fs:list", dirPath),
-    mkdir: (parentPath, name) =>
-      ipcRenderer.invoke("local-fs:mkdir", parentPath, name),
-    createFile: (parentPath, name) =>
-      ipcRenderer.invoke("local-fs:create-file", parentPath, name),
-    rename: (oldPath, newName) =>
-      ipcRenderer.invoke("local-fs:rename", oldPath, newName),
-    trash: (paths) => ipcRenderer.invoke("local-fs:trash", paths),
-    ensureDir: (dirPath, rootPath) =>
-      ipcRenderer.invoke("local-fs:ensure-dir", dirPath, rootPath),
-    exists: (paths) => ipcRenderer.invoke("local-fs:exists", paths),
-    walk: (paths) => ipcRenderer.invoke("local-fs:walk", paths),
-    reveal: (targetPath) => ipcRenderer.invoke("local-fs:reveal", targetPath),
-    open: (targetPath) => ipcRenderer.invoke("local-fs:open", targetPath),
-  },
-  localTransfer: {
-    setApiPath: (apiPath) =>
-      ipcRenderer.invoke("local-transfer:set-api", apiPath),
-    upload: (options) => ipcRenderer.invoke("local-transfer:upload", options),
-    download: (options) =>
-      ipcRenderer.invoke("local-transfer:download", options),
-    cancel: (transferId) =>
-      ipcRenderer.invoke("local-transfer:cancel", transferId),
-    onProgress: (callback) => {
-      const listener = (_event, payload) => callback(payload);
-      ipcRenderer.on("local-transfer:progress", listener);
-      return () =>
-        ipcRenderer.removeListener("local-transfer:progress", listener);
-    },
-  },
-
   invoke: invokeAllowed,
 });
 

electron/rename-local-path.cjs

@@ -1,22 +0,0 @@
-const fs = require("node:fs");
-
-function renameLocalPath(source, target) {
-  if (source === target) return;
-  try {
-    fs.lstatSync(target);
-    const error = new Error("A file or folder with that name already exists");
-    error.code = "EEXIST";
-    throw error;
-  } catch (error) {
-    if (error.code !== "ENOENT") throw error;
-  }
-  if (fs.lstatSync(source).isDirectory()) {
-    fs.renameSync(source, target);
-    return;
-  }
-  // link is exclusive: a destination created concurrently is never replaced.
-  fs.linkSync(source, target);
-  fs.unlinkSync(source);
-}
-
-module.exports = { renameLocalPath };

env.catalog.json

@@ -332,17 +332,6 @@
       "default": "10000",
       "description": "Most audit entries kept. The oldest go first."
     },
-    {
-      "name": "AUDIT_LOG_FORWARD_URL",
-      "group": "logging",
-      "description": "Also POST every audit entry as JSON to this URL. Overrides the admin setting."
-    },
-    {
-      "name": "AUDIT_LOG_FORWARD_TOKEN",
-      "group": "logging",
-      "secret": true,
-      "description": "Bearer token sent with forwarded audit entries."
-    },
     {
       "name": "SESSION_RECORDING_RETENTION_DAYS",
       "group": "logging",
@@ -433,6 +422,12 @@
       "internal": true,
       "description": "Set by the desktop app when it runs its own backend."
     },
+    {
+      "name": "ELECTRON_USER_DATA",
+      "group": "desktop",
+      "internal": true,
+      "description": "Set by the desktop app to its user data folder."
+    },
     {
       "name": "EMBEDDED_BACKEND_PORT",
       "group": "desktop",

package-lock.json

@@ -15058,7 +15058,7 @@
     },
     "packages/plugin-sdk": {
       "name": "@termix-ssh/plugin-sdk",
-      "version": "1.0.12",
+      "version": "1.0.13",
       "license": "Apache-2.0",
       "dependencies": {
         "@deadendjs/swagger-jsdoc": "^8.1.2",

packages/plugin-sdk/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.0.13
+
+Plugin API 1.5.0.
+
+### Added
+
+- `runtime: "desktop"` in the manifest for a plugin that only loads on the desktop app
+- `desktop:local` and `ctx.desktop.local`: file system, local shell and machine info on the desktop app's own backend
+- `ctx.audit.subscribe`, `ctx.audit.list` and `ctx.audit.exportBatches` under `audit:read`
+- `ctx.hosts.importMany`, `importSshConfig`, `exportMany` and `registerImportNormalizer`, with the `hosts:export` capability
+- `ctx.credentials.publicKey` and `resolveKeyRefs`, `ctx.ssh.exec`, and `@termix-ssh/plugin-sdk/ssh-keys`
+- `ctx.hosts.status.provide` and `ctx.hosts.activity.provide` so a plugin can own host status and recent activity, with `ctx.network.tcpProbe`, `ctx.ssh.probe`, `ctx.hosts.probeTargets` and `ctx.hosts.sessionActive`
+- `registerHostStatusIndicator` and `registerHostEditorToolbarItem`, and `order` for host badges
+- Onboarding steps can sit in a `start` section, take a `position` and `replaces` a core step
+- A plugin can provide the app name, tagline and logo through the `<id>.brandingProvider` registry key
+
 ## 1.0.12
 
 Plugin API 1.4.0.

packages/plugin-sdk/PLUGIN-GUIDE.md

@@ -1,6 +1,6 @@
 # Termix plugin guide
 
-SDK 1.0.12 | Plugin API 1.4.0
+SDK 1.0.13 | Plugin API 1.5.0
 
 This guide is for anyone, person or AI coding tool, building a Termix plugin. It ships inside
 `@termix-ssh/plugin-sdk`, so the copy in your `node_modules` always matches the SDK you have installed.
@@ -164,7 +164,7 @@ Unknown fields are refused at every level, so a typo fails validation. The schem
 | `icon`                                 | A [Lucide](https://lucide.dev/icons/) icon name, like `Hand`.                                                       |
 | `features`                             | Up to 20 short lines shown on the plugin's page.                                                                    |
 | `docs`                                 | An https link to your docs.                                                                                         |
-| `engine.termix`                        | Termix versions you work with, like `>=26.10.0`.                                                                    |
+| `engine.termix`                        | Termix versions you work with, like `>=26.10.0`. Older Termix builds don't list a release they can't run.           |
 | `engine.api`                           | Plugin API range, like `^1.2`. A major bump of the API is breaking.                                                 |
 | `capabilities`                         | What your code may do. See the reference at the end.                                                                |
 | `dependencies`, `optionalDependencies` | Other plugins, `{ "snippets": "^1.0.0" }`. You must keep working without optional ones.                             |
@@ -325,6 +325,24 @@ try {
 commands. `@termix-ssh/plugin-sdk/host-commands` has helpers to detect the OS and run package manager and
 sudo commands. Hosts from `ctx.hosts` never carry secrets. Pass the host or its id to `ctx.ssh`.
 
+### The desktop app
+
+Set `"runtime": "desktop"` in the manifest for a plugin that only makes sense on a desktop app. It never
+loads on a server, ignores server sync and may declare `desktop:local`. Any plugin can declare
+`desktop:local` and check `ctx.desktop.local.available()` at runtime.
+
+`ctx.desktop.local` works on the desktop app's own backend only:
+
+- `info()`: home folder, platform, user data folder, backend port and the linked server (url and token) or null
+- `fs`: `list`, `mkdir`, `createFile`, `rename`, `ensureDir`, `exists`, `walk`, `trash`, `reveal`, `open`,
+  `openRead` and `openDownload`. Downloads stay inside the folder the user picked, links in it are refused and
+  an existing file is never replaced by accident
+- `pty.spawn()`: a local shell, stopped when the plugin stops
+- `pluginFetch(origin, subPath, init)`: calls this plugin's own routes on the desktop's backend ("local") or the linked server ("remote") as the acting user. Bodies can be streams, so a plugin can move big files without the renderer
+
+Use `ctx.audit.subscribe`, `list` and `exportBatches` (`audit:read`) to read the audit trail. Subscribers
+are called after a line is accepted and never delay the action that wrote it.
+
 ### Events, timers, alerts, services
 
 ```ts
@@ -470,13 +488,15 @@ your plugin's error boundary and Suspense.
 | `registerHostEditorSection`                                                        | Your own host editor section (host settings get one for free)     |
 | `registerHostProtocol`                                                             | A connection protocol next to SSH                                 |
 | `registerHostBadge`, `registerHostContextMenuItem`                                 | Badges and menu items on host rows                                |
+| `registerHostStatusIndicator`                                                      | The status dot or stripe on a host row (a layout draws it)        |
+| `registerHostEditorToolbarItem`                                                    | A control in the host editor toolbar (a layout draws it)          |
 | `registerPaletteEntry`, `registerPaletteGroup`                                     | Command palette entries                                           |
 | `registerKeybindingAction`, `registerKeybindingDefault`                            | Bindable actions                                                  |
 | `registerSettingsComponent`                                                        | A component for a `custom` settings field                         |
 | `registerAction`, `invokeAction`                                                   | Actions across plugins                                            |
 | `registerSlotContribution`, `declareActionSlot`                                    | Fill or own a UI slot                                             |
 | `registerComponent`, `registerExtension`                                           | Offer a component by id, add to an extension point                |
-| `registerOnboardingStep`                                                           | A first run setup step                                            |
+| `registerOnboardingStep`                                                           | A first run setup step (`section`, `position`, `replaces`)        |
 | `registerLoginMethod`, `registerSecondFactorUI`, `registerSshAuthEditor`           | Sign in UI                                                        |
 | `registerLayout`                                                                   | A whole-app layout (`contributes.layouts`, API 1.4)               |
 | `api`                                                                              | Axios client for your `/plugin-api/<id>/` routes, auth included   |
@@ -484,6 +504,16 @@ your plugin's error boundary and Suspense.
 | `docs`, `tabs`, `confirm`, `listHosts`, `getHost`, `t`, `hasPermission`, `desktop` | Helpers                                                           |
 | `onSettingsChanged`, `onDispose`                                                   | Hooks                                                             |
 
+Badges, status indicators and toolbar items take `{ id, when(host), component, order? }`; lower `order`
+comes first. An onboarding step sits in a section (`start`, `setup`, `explore`, `security`) or at an exact
+`position` from 1 to 99. `replaces: ["preset"]` lists older step keys the step took over, so people who saw
+those are not shown it again.
+
+Branding: a plugin that owns the app name, tagline and logo provides
+`ctx.registry.provide("<id>.brandingProvider", async () => ({ appName, tagline, logo }))` in its backend.
+Core reads it for `GET /users/branding` (the login page, the browser tab and the sync server name) and falls
+back to "Termix" with no logo when no plugin provides one. `logo` is a PNG data URL or null.
+
 Hooks from `@termix-ssh/plugin-sdk/frontend`: `useTranslation`, `usePermission`, `useSettings`, `useHost`,
 `useHosts`, `usePluginApi`, `useCurrentUser`, `useTheme`, `useToast`, `useDocsUrl`, `useTabs`,
 `useSlotContributions`, `useSshAuthTypes`, `useExtensions`, `useShell`.
@@ -563,8 +593,6 @@ export function activate(app: TermixApp) {
   `classic-layout.hostTree` and `classic-layout.dashboard` for other plugins to place with `PluginComponent`.
   It reads the shell with `useShellController()` from `@termix-ssh/plugin-sdk/ui`, which exposes more than
   `useShell()` and may change with Termix. A third party layout should start from `useShell()`.
-- Example Top Bar Layout (https://github.com/Termix-SSH/Plugin-Example-Topbar-Layout) is a small third party
-  style layout built only on `useShell()`, `TabStage` and `@termix-ssh/plugin-sdk/ui`, with a phone version.
 
 A theme is CSS only. Declare it in `contributes.themes` (`id`, `label`, `mode` light or dark, `css` path,
 optional `swatch` colors for the picker) with the `ui:theme` capability. The id becomes a class on `<html>`,
@@ -582,9 +610,7 @@ A plugin that only holds themes needs no code. Leave out `src/`: `termix-plugin
 - Themes show in the picker in the order core lists its own, then the plugin's order.
 - A theme someone saved that no longer exists shows as System. It comes back when the plugin does.
 - Accent color, UI font, font size and density are not part of a theme. Core applies them on top.
-- Bundled Classic Themes (https://github.com/Termix-SSH/Plugin-Classic-Themes) is a full example, and
-  Example Theme (https://github.com/Termix-SSH/Plugin-Example-Theme) a small one with one light and one dark
-  theme.
+- Bundled Classic Themes (https://github.com/Termix-SSH/Plugin-Classic-Themes) is a full example.
 
 ## Looking native
 
@@ -832,60 +858,66 @@ To run your own registry instead, see https://docs.termix.site/develop/registrie
 
 ## SDK entry points
 
-| Import                                                               | What it is                                                            |
-| -------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| `@termix-ssh/plugin-sdk/backend`                                     | `PluginContext` and the backend types                                 |
-| `@termix-ssh/plugin-sdk/frontend`                                    | `TermixApp`, `TabProps` and the hooks                                 |
-| `@termix-ssh/plugin-sdk/ui`                                          | The UI kit, served by Termix at runtime                               |
-| `@termix-ssh/plugin-sdk/db`                                          | `defineTable` and column builders                                     |
-| `@termix-ssh/plugin-sdk/manifest`                                    | `PluginManifest` type and manifest checks                             |
-| `@termix-ssh/plugin-sdk/capabilities`                                | The capability catalog                                                |
-| `@termix-ssh/plugin-sdk/settings`                                    | Settings field validation                                             |
-| `@termix-ssh/plugin-sdk/testing`                                     | `createMockCtx`, `createTestDb`, `renderWithApp`, `createFakeContext` |
-| `@termix-ssh/plugin-sdk/vitest-preset`                               | `pluginVitestConfig`                                                  |
-| `@termix-ssh/plugin-sdk/host-commands`                               | OS detection, package manager and sudo helpers over ssh2              |
-| `@termix-ssh/plugin-sdk/ssh-certs`                                   | `applyCertificateAuth()` for certificate based SSH auth               |
-| `@termix-ssh/plugin-sdk/desktop`                                     | The desktop app bridge, typed. Check it exists before use             |
-| `@termix-ssh/plugin-sdk/openapi`                                     | `buildOpenApi()`                                                      |
-| `@termix-ssh/plugin-sdk/changelog`                                   | Changelog parsing and checks                                          |
-| `@termix-ssh/plugin-sdk/docs`                                        | Docs link and env var helpers                                         |
-| `@termix-ssh/plugin-sdk/ddl`, `@termix-ssh/plugin-sdk/table-builder` | Table to SQL and Drizzle mapping. You rarely need these               |
+| Import                                                               | What it is                                                                                     |
+| -------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
+| `@termix-ssh/plugin-sdk/backend`                                     | `PluginContext` and the backend types                                                          |
+| `@termix-ssh/plugin-sdk/frontend`                                    | `TermixApp`, `TabProps` and the hooks                                                          |
+| `@termix-ssh/plugin-sdk/ui`                                          | The UI kit, served by Termix at runtime                                                        |
+| `@termix-ssh/plugin-sdk/db`                                          | `defineTable` and column builders                                                              |
+| `@termix-ssh/plugin-sdk/manifest`                                    | `PluginManifest` type and manifest checks                                                      |
+| `@termix-ssh/plugin-sdk/capabilities`                                | The capability catalog                                                                         |
+| `@termix-ssh/plugin-sdk/settings`                                    | Settings field validation                                                                      |
+| `@termix-ssh/plugin-sdk/testing`                                     | `createMockCtx`, `createTestDb`, `renderWithApp`, `createFakeContext`                          |
+| `@termix-ssh/plugin-sdk/vitest-preset`                               | `pluginVitestConfig`                                                                           |
+| `@termix-ssh/plugin-sdk/host-commands`                               | OS detection, package manager and sudo helpers over ssh2                                       |
+| `@termix-ssh/plugin-sdk/ssh-certs`                                   | `applyCertificateAuth()` for certificate based SSH auth                                        |
+| `@termix-ssh/plugin-sdk/ssh-keys`                                    | `generateSshKeyPair()`, `detectSshKeyType()`, `publicKeyFromPrivate()`, `validateSshKeyPair()` |
+| `@termix-ssh/plugin-sdk/desktop`                                     | The desktop app bridge, typed. Check it exists before use                                      |
+| `@termix-ssh/plugin-sdk/openapi`                                     | `buildOpenApi()`                                                                               |
+| `@termix-ssh/plugin-sdk/changelog`                                   | Changelog parsing and checks                                                                   |
+| `@termix-ssh/plugin-sdk/docs`                                        | Docs link and env var helpers                                                                  |
+| `@termix-ssh/plugin-sdk/ddl`, `@termix-ssh/plugin-sdk/table-builder` | Table to SQL and Drizzle mapping. You rarely need these                                        |
 
 ## Capabilities
 
-| Capability           | Risk     | What it allows                                          |
-| -------------------- | -------- | ------------------------------------------------------- |
-| `credentials:read`   | critical | Read stored secrets for hosts the user can reach        |
-| `system:tls`         | critical | Replace the HTTPS certificate, answer CA domain checks  |
-| `ssh:connect`        | high     | Run any command on hosts, with the user's access        |
-| `process:spawn`      | high     | Run programs on the Termix server                       |
-| `users:write`        | high     | Add users and change their roles                        |
-| `users:impersonate`  | high     | Act as another user, or get a session for them, audited |
-| `db:core-refs`       | high     | Query core users, roles and hosts tables (read only)    |
-| `auth:provide`       | high     | Add login methods, second factors, SSH auth types       |
-| `device:serial`      | high     | Open serial and USB ports on the server                 |
-| `notify:hub`         | high     | Receive every alert (the alerts hub only)               |
-| `ui:layout`          | high     | Replace the whole app layout                            |
-| `hosts:write`        | medium   | Add and edit hosts                                      |
-| `credentials:use`    | medium   | Connect with saved credentials without seeing them      |
-| `credentials:write`  | medium   | Save new credentials                                    |
-| `network:outbound`   | medium   | Outbound HTTP through `ctx.fetch`                       |
-| `network:serve`      | medium   | HTTP routes and sockets                                 |
-| `network:broadcast`  | medium   | Local network broadcasts, like Wake-on-LAN              |
-| `users:read`         | medium   | Usernames, roles and UI language                        |
-| `events:core`        | medium   | Listen to core events                                   |
-| `notify:send`        | medium   | Send alerts                                             |
-| `audit:read`         | medium   | Read the audit log                                      |
-| `desktop:window`     | medium   | Open windows in the desktop app                         |
-| `hosts:read`         | low      | Read hosts the user can see                             |
-| `db:own`             | low      | Your own tables                                         |
-| `kv:own`             | low      | Small key value state                                   |
-| `files:own`          | low      | Your own folder on disk                                 |
-| `secrets:own`        | low      | Your own encrypted secrets                              |
-| `settings:read-core` | low      | Read Termix server settings                             |
-| `plugins:read`       | low      | See installed plugins                                   |
-| `ui:surface`         | low      | Add tabs, panels and settings                           |
-| `ui:theme`           | low      | Add color themes, CSS only                              |
+| Capability               | Risk     | What it allows                                          |
+| ------------------------ | -------- | ------------------------------------------------------- |
+| `credentials:read`       | critical | Read stored secrets for hosts the user can reach        |
+| `system:tls`             | critical | Replace the HTTPS certificate, answer CA domain checks  |
+| `ssh:connect`            | high     | Run any command on hosts, with the user's access        |
+| `process:spawn`          | high     | Run programs on the Termix server                       |
+| `users:write`            | high     | Add users and change their roles                        |
+| `users:impersonate`      | high     | Act as another user, or get a session for them, audited |
+| `db:core-refs`           | high     | Query core users, roles and hosts tables (read only)    |
+| `auth:provide`           | high     | Add login methods, second factors, SSH auth types       |
+| `device:serial`          | high     | Open serial and USB ports on the server                 |
+| `desktop:local`          | high     | Use the user's own computer, desktop app only           |
+| `hosts:export`           | high     | Export hosts with their saved logins                    |
+| `notify:hub`             | high     | Receive every alert (the alerts hub only)               |
+| `ui:layout`              | high     | Replace the whole app layout                            |
+| `hosts:write`            | medium   | Add and edit hosts                                      |
+| `hosts:status-provide`   | medium   | Be the source of host status dots                       |
+| `hosts:activity-provide` | medium   | Be the source of the recent activity list               |
+| `network:probe`          | medium   | Check that a host answers on a TCP port                 |
+| `credentials:use`        | medium   | Connect with saved credentials without seeing them      |
+| `credentials:write`      | medium   | Save new credentials                                    |
+| `network:outbound`       | medium   | Outbound HTTP through `ctx.fetch`                       |
+| `network:serve`          | medium   | HTTP routes and sockets                                 |
+| `network:broadcast`      | medium   | Local network broadcasts, like Wake-on-LAN              |
+| `users:read`             | medium   | Usernames, roles and UI language                        |
+| `events:core`            | medium   | Listen to core events                                   |
+| `notify:send`            | medium   | Send alerts                                             |
+| `audit:read`             | medium   | Read the audit log                                      |
+| `desktop:window`         | medium   | Open windows in the desktop app                         |
+| `hosts:read`             | low      | Read hosts the user can see                             |
+| `db:own`                 | low      | Your own tables                                         |
+| `kv:own`                 | low      | Small key value state                                   |
+| `files:own`              | low      | Your own folder on disk                                 |
+| `secrets:own`            | low      | Your own encrypted secrets                              |
+| `settings:read-core`     | low      | Read Termix server settings                             |
+| `plugins:read`           | low      | See installed plugins                                   |
+| `ui:surface`             | low      | Add tabs, panels and settings                           |
+| `ui:theme`               | low      | Add color themes, CSS only                              |
 
 An update that adds a capability waits for an admin to approve it.
 

packages/plugin-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@termix-ssh/plugin-sdk",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "The contract between Termix core and a plugin: types, the capability catalog and the manifest schema.",
   "license": "Apache-2.0",
   "repository": {
@@ -85,6 +85,10 @@
       "types": "./dist/ssh-certs.d.ts",
       "default": "./dist/ssh-certs.js"
     },
+    "./ssh-keys": {
+      "types": "./dist/ssh-keys.d.ts",
+      "default": "./dist/ssh-keys.js"
+    },
     "./tsconfig.plugin.json": "./tsconfig.plugin.json",
     "./schema/manifest.schema.json": "./schema/manifest.schema.json",
     "./ui": {

packages/plugin-sdk/schema/manifest.schema.json

@@ -154,6 +154,7 @@
           "system:tls",
           "device:serial",
           "hosts:write",
+          "hosts:export",
           "credentials:use",
           "credentials:write",
           "network:outbound",
@@ -163,7 +164,11 @@
           "events:core",
           "notify:send",
           "audit:read",
+          "network:probe",
+          "hosts:status-provide",
+          "hosts:activity-provide",
           "desktop:window",
+          "desktop:local",
           "users:impersonate",
           "db:core-refs",
           "hosts:read",
@@ -1261,6 +1266,11 @@
       "enum": ["mirror", "local", "server"],
       "description": "How a desktop linked to a server treats this plugin: mirror follows the server, local is decided on each desktop, server never runs on a linked desktop. Defaults to mirror."
     },
+    "runtime": {
+      "type": "string",
+      "enum": ["desktop"],
+      "description": "desktop: the plugin only loads on a desktop app's own embedded backend, never on a server. It implies desktop local and may declare desktop:local."
+    },
     "nativeDependencies": {
       "type": "array",
       "minItems": 1,

packages/plugin-sdk/src/backend.ts

@@ -848,6 +848,168 @@ export interface PluginHosts {
    * Needs hosts:read.
    */
   status: PluginHostStatusApi;
+  /**
+   * The hosts the acting user may connect to (their own and shared ones) as a
+   * status provider needs them: address, port and jump hosts, no secrets.
+   * Pass hostIds to narrow it. Needs hosts:read.
+   */
+  probeTargets: (filter?: {
+    hostIds?: number[];
+  }) => Promise<PluginHostProbeTarget[]>;
+  /** Whether a session is open to the host right now. Needs hosts:read. */
+  sessionActive: (hostId: number) => boolean;
+  /**
+   * Imports Termix JSON host rows for the acting user, the same way POST
+   * /host/bulk-import does: up to 100 rows, jump hosts remapped by exportId,
+   * defaults, protocol logins and plugin settings applied, one save at the end.
+   * Needs hosts:write, plus credentials:write when credentials are passed, and
+   * the acting user needs the core hosts.create and hosts.edit permissions.
+   */
+  importMany: (
+    hosts: Record<string, unknown>[],
+    options?: PluginHostImportOptions,
+  ) => Promise<PluginHostImportResult>;
+  /** Imports the Host entries of an OpenSSH config file. Same rules as importMany. */
+  importSshConfig: (
+    content: string,
+    options?: Pick<PluginHostImportOptions, "overwrite" | "atomic">,
+  ) => Promise<PluginHostImportResult>;
+  /**
+   * The acting user's own hosts as Termix JSON. Without share the secrets are
+   * included, decrypted. With share every secret is left out and credential
+   * logins point at a scrubbed credentials list by alias. Needs hosts:export
+   * and is always audited.
+   */
+  exportMany: (options?: {
+    share?: boolean;
+    /** Only these of the user's hosts. */
+    hostIds?: number[];
+  }) => Promise<PluginHostExport>;
+  /**
+   * Validates and writes this plugin's own host settings from an imported
+   * row. Called for every imported row once the host exists. Return the
+   * values to write, or null to write nothing. Removed when the plugin
+   * deactivates. Needs hosts:write.
+   */
+  registerImportNormalizer: (
+    normalizer: PluginHostImportNormalizer,
+  ) => () => void;
+  /** The recent activity list on the dashboard. */
+  activity: PluginHostActivityApi;
+}
+
+export interface PluginHostImportOptions {
+  /** Update a host that matches on ip, port and username instead of skipping it. */
+  overwrite?: boolean;
+  /**
+   * All or nothing: if any row fails, the hosts this call created are deleted
+   * and the result says rolledBack. Cannot be combined with overwrite.
+   */
+  atomic?: boolean;
+  /** Credential placeholders rows can refer to by credentialAlias. */
+  credentials?: Array<Record<string, unknown>>;
+}
+
+export interface PluginHostImportResult {
+  success: number;
+  updated: number;
+  skipped: number;
+  failed: number;
+  errors: string[];
+  createdHostIds: number[];
+  rolledBack?: boolean;
+}
+
+export interface PluginHostExport {
+  hosts: Array<Record<string, unknown>>;
+  /** Share exports only. */
+  version?: string;
+  exportedAt?: string;
+  credentials?: Array<Record<string, unknown>>;
+}
+
+export type PluginHostImportNormalizer = (
+  raw: Record<string, unknown>,
+) => Record<string, unknown> | null;
+
+export interface PluginHostProbeTarget {
+  id: number;
+  /** The user who owns the host; its jump hosts are theirs. */
+  ownerUserId: string;
+  ip: string;
+  port: number;
+  connectionType: string;
+  jumpHosts: Array<{ hostId: number }>;
+  statusCheckEnabled: boolean;
+  /** Seconds, or null to use the global interval. */
+  statusCheckInterval: number | null;
+}
+
+/**
+ * The plugin that owns host status. Core keeps the routes, the sync feed and
+ * ctx.hosts.status; this fills them. One provider at a time.
+ */
+export interface PluginHostStatusProvider {
+  start: () => void;
+  stop: () => void;
+  get: (hostId: number) => PluginHostStatusEntry | null;
+  /**
+   * Every status known, after polling is brought in line with the request:
+   * with hostIds, exactly those of the user's hosts; without, all of them.
+   */
+  statusesFor: (
+    userId: string,
+    hostIds: number[] | null,
+  ) => Promise<Map<number, PluginHostStatusEntry>>;
+  /** Restarts the user's checks. */
+  refresh: (userId: string) => Promise<void>;
+  check: (hostId: number) => Promise<PluginHostStatusEntry | null>;
+  reportLogin: (hostId: number, outcome: { ok: boolean }) => void;
+  registerPort: (
+    connectionType: string,
+    resolve: (
+      hostId: number,
+    ) => number | undefined | Promise<number | undefined>,
+  ) => () => void;
+  /** The global check interval in seconds. */
+  getIntervalSeconds: () => Promise<number>;
+  setIntervalSeconds: (seconds: number) => Promise<void>;
+}
+
+export interface PluginActivityEntry {
+  id: number;
+  userId: string;
+  type: string;
+  hostId: number;
+  hostName: string | null;
+  timestamp: string;
+}
+
+export type PluginRecordActivityResult =
+  | { status: "logged"; id: number }
+  | { status: "rate_limited" }
+  | { status: "invalid_type" }
+  | { status: "denied" }
+  | { status: "unavailable" };
+
+/** The plugin that stores recent activity. One provider at a time. */
+export interface PluginActivityProvider {
+  record: (
+    userId: string,
+    entry: { type: string; hostId: number; hostName: string },
+  ) => Promise<PluginRecordActivityResult>;
+  list: (userId: string, limit: number) => Promise<PluginActivityEntry[]>;
+  deleteByUserId: (userId: string) => Promise<void>;
+  deleteByHostIds: (hostIds: number[]) => Promise<void>;
+}
+
+export interface PluginHostActivityApi {
+  /**
+   * Becomes the store behind the dashboard's recent activity and
+   * ctx.hosts.recordActivity. Needs hosts:activity-provide. Removed on
+   * deactivate.
+   */
+  provide: (provider: PluginActivityProvider) => () => void;
 }
 
 /**
@@ -896,6 +1058,11 @@ export interface PluginHostStatusApi {
       hostId: number,
     ) => number | undefined | Promise<number | undefined>,
   ) => () => void;
+  /**
+   * Becomes core's host status. Needs hosts:status-provide. Removed on
+   * deactivate, which hands status back to core's built-in checks.
+   */
+  provide: (provider: PluginHostStatusProvider) => () => void;
 }
 
 /**
@@ -1060,6 +1227,25 @@ export interface PluginSshConnectOptions {
   sock?: unknown;
 }
 
+export interface PluginSshExecOptions extends PluginSshConnectOptions {
+  /** Time to wait for the command to finish. Default 30s, at most 10 minutes. */
+  timeoutMs?: number;
+  /** Most bytes kept of each of stdout and stderr. Default 256 KB, at most 4 MB. */
+  maxOutputBytes?: number;
+  /** Written to the command's standard input, then closed. */
+  stdin?: string;
+}
+
+export interface PluginSshExecResult {
+  stdout: string;
+  stderr: string;
+  /** The exit code. Null when the command was killed or ran out of time. */
+  code: number | null;
+  /** Output went past maxOutputBytes and the rest was dropped. */
+  truncated: boolean;
+  timedOut: boolean;
+}
+
 export interface PluginSshConnection<Client = unknown> {
   /** An ssh2 Client, already "ready". */
   client: Client;
@@ -1079,12 +1265,47 @@ export interface PluginSshConnection<Client = unknown> {
  * audit line per new connection. Connections still open on deactivate are
  * closed.
  */
+export interface PluginNetwork {
+  /**
+   * Whether a TCP port answers. An SSH banner is read and answered politely;
+   * nothing is ever sent that logs in. Loopback, private and link-local
+   * addresses are allowed, since status checks target the user's own hosts.
+   */
+  tcpProbe: (
+    host: string,
+    port: number,
+    options?: { timeoutMs?: number },
+  ) => Promise<boolean>;
+}
+
 export interface PluginSsh {
+  /**
+   * Whether a TCP port answers through the host's jump host chain. Chains are
+   * shared and closed when idle. The acting user must be able to connect to
+   * the host. Needs ssh:connect.
+   */
+  probe: (
+    hostId: number,
+    options?: { port?: number; timeoutMs?: number },
+  ) => Promise<boolean>;
+
   connect: <Client = unknown>(
     host: number | PluginSshHost,
     options?: PluginSshConnectOptions,
   ) => Promise<PluginSshConnection<Client>>;
 
+  /**
+   * Runs one command on a host with its stored login and closes the
+   * connection. The acting user needs connect access to the host, the same as
+   * connect. Output is capped and the command is stopped at the time limit.
+   * Needs ssh:connect and credentials:use.
+   */
+  exec: (
+    host: number | PluginSshHost,
+    command: string,
+    options?: PluginSshExecOptions,
+  ) => Promise<PluginSshExecResult>;
+
   /** Borrows a pooled connection. The pool key is `<pool>:<owner>:<address>`. */
   withConnection: <T, Client = unknown>(
     host: number | PluginSshHost,
@@ -1603,6 +1824,148 @@ export interface PluginDesktop {
   ) => Promise<{ success: boolean; error?: string }>;
   /** Whether the server runs embedded in the desktop app, so the calls above can work. */
   available: () => boolean;
+  /**
+   * The user's own machine. Only works on the desktop app's embedded backend
+   * and needs desktop:local; every call is audited once per plugin start.
+   */
+  readonly local: PluginDesktopLocal;
+}
+
+export interface PluginLocalDirEntry {
+  name: string;
+  path: string;
+  type: "file" | "directory" | "link";
+  size: number;
+  modifiedTimestamp?: number;
+  linkTarget?: string;
+  hidden: boolean;
+}
+
+export interface PluginLocalWalkResult {
+  files: Array<{ localPath: string; relativePath: string; size: number }>;
+  emptyDirs: string[];
+  totalBytes: number;
+}
+
+export interface PluginLocalPty {
+  readonly pid: number;
+  /** The shell program that was started. */
+  readonly shell: string;
+  write: (data: string) => void;
+  resize: (cols: number, rows: number) => void;
+  kill: () => void;
+  onData: (handler: (data: string) => void) => () => void;
+  onExit: (handler: (exitCode: number) => void) => () => void;
+}
+
+/** A download being written next to its final name, published when done. */
+export interface PluginLocalDownload {
+  /** Final path inside the chosen folder, links inside it already refused. */
+  readonly path: string;
+  readonly stream: NodeJS.WritableStream;
+  /** Moves the finished partial onto its final name. */
+  publish: (options?: { overwrite?: boolean }) => Promise<string>;
+  /** Removes the partial file. Safe to call after publish. */
+  abort: () => Promise<void>;
+}
+
+export interface PluginLocalResponse {
+  readonly status: number;
+  readonly ok: boolean;
+  readonly headers: { get: (name: string) => string | null };
+  /** A web stream of the body, or null when there is none. */
+  readonly body: AsyncIterable<Uint8Array> | null;
+  text: () => Promise<string>;
+}
+
+export interface PluginDesktopLocal {
+  /** Whether local access is possible: embedded backend and capability granted. */
+  available: () => boolean;
+  /**
+   * Calls this plugin's own HTTP routes on the embedded backend ("local") or
+   * on the server the desktop is linked to ("remote"), as the acting user.
+   * The path is under /plugin-api/<this plugin id>; nothing else is
+   * reachable. The link's proxy headers and certificate rules apply. A body
+   * may be a string, a buffer or a Node stream.
+   */
+  pluginFetch: (
+    origin: "local" | "remote",
+    subPath: string,
+    init?: {
+      method?: string;
+      headers?: Record<string, string>;
+      body?: string | Buffer | NodeJS.ReadableStream;
+      signal?: AbortSignal;
+    },
+  ) => Promise<PluginLocalResponse>;
+  info: () => Promise<{
+    home: string;
+    separator: string;
+    platform: NodeJS.Platform;
+    /** The desktop app's user data folder. */
+    userDataDir: string;
+    /** The port the embedded backend listens on. */
+    backendPort: number;
+    /** The server this desktop is linked to, or null. */
+    link: {
+      serverUrl: string;
+      token: string | null;
+      /**
+       * Headers for a request to the linked server: the session, plus the
+       * proxy headers and basic auth the link was set up with.
+       */
+      headers: Record<string, string>;
+      /** The link accepts a self-signed certificate. */
+      allowInvalidCertificate: boolean;
+    } | null;
+  }>;
+  /**
+   * GET a JSON route on the linked server with the link's session, proxy
+   * headers and certificate rules. Rejects with an error whose `kind` is
+   * "signed_out" when the server refused the session.
+   */
+  linkJson: (pathname: string) => Promise<unknown>;
+  readonly fs: {
+    list: (dirPath: string) => Promise<{
+      path: string;
+      parent: string | null;
+      entries: PluginLocalDirEntry[];
+    }>;
+    mkdir: (parentPath: string, name: string) => Promise<string>;
+    createFile: (parentPath: string, name: string) => Promise<string>;
+    /** Renames inside the same folder; never replaces an existing name. */
+    rename: (path: string, newName: string) => Promise<string>;
+    /** Creates a folder; with rootPath it must stay inside that folder. */
+    ensureDir: (dirPath: string, rootPath?: string) => Promise<string>;
+    /** Which of the given paths exist. */
+    exists: (paths: string[]) => Promise<string[]>;
+    walk: (rootPaths: string[]) => Promise<PluginLocalWalkResult>;
+    /** Sends entries to the operating system's trash. */
+    trash: (paths: string[]) => Promise<{
+      trashed: number;
+      failed: Array<{ path: string; error: string }>;
+    }>;
+    reveal: (path: string) => Promise<void>;
+    open: (path: string) => Promise<void>;
+    openRead: (path: string) => Promise<{
+      stream: NodeJS.ReadableStream;
+      size: number;
+    }>;
+    openDownload: (options: {
+      rootPath: string;
+      destPath: string;
+      transferId: string;
+      overwrite?: boolean;
+    }) => Promise<PluginLocalDownload>;
+  };
+  readonly pty: {
+    spawn: (options?: {
+      cols?: number;
+      rows?: number;
+      /** "wsl" on Windows starts WSL instead of PowerShell. */
+      shell?: string;
+    }) => Promise<PluginLocalPty>;
+  };
 }
 
 /**
@@ -1699,6 +2062,23 @@ export interface PluginCredentials {
     scheme: string,
     resolve: (userId: string, reference: string) => Promise<string>,
   ) => void;
+  /**
+   * The public key line of an SSH key credential the acting user can see
+   * (their own, with the core credentials.view permission). Derived from the
+   * private key when none is stored, including a key kept behind a secret
+   * reference. Null when the credential is missing, is not a key, or cannot
+   * be read. Needs credentials:use. Audited.
+   */
+  publicKey: (credentialId: number) => Promise<string | null>;
+  /**
+   * Replaces secret references ("op://...") in a key and its passphrase with
+   * the real values, for the acting user. Plain values pass through. Hands
+   * private key material to the plugin. Needs credentials:read. Audited.
+   */
+  resolveKeyRefs: (
+    key: string,
+    passphrase?: string | null,
+  ) => Promise<{ key: string; passphrase?: string }>;
 }
 
 /**
@@ -1721,6 +2101,57 @@ export interface PluginAudit {
      */
     request?: unknown;
   }) => Promise<void>;
+  /**
+   * Called for every audit line core or any plugin writes, after it is
+   * accepted. Fire and forget: a slow or throwing handler never delays or
+   * fails the audited action. Lines written before the plugin started are not
+   * replayed; read them with list or export. Returns an unsubscribe function;
+   * it is also removed when the plugin deactivates. Needs audit:read.
+   */
+  subscribe: (handler: (entry: PluginAuditEntry) => void) => () => void;
+  /** A page of stored lines, newest first. Needs audit:read. */
+  list: (options?: {
+    filters?: PluginAuditFilters;
+    limit?: number;
+    offset?: number;
+  }) => Promise<{ entries: PluginAuditEntry[]; total: number }>;
+  /**
+   * Stored lines in time order, in batches, so an export never holds the
+   * whole trail in memory. Needs audit:read.
+   */
+  exportBatches: (
+    filters?: PluginAuditFilters,
+    batchSize?: number,
+  ) => AsyncGenerator<PluginAuditEntry[]>;
+}
+
+export interface PluginAuditFilters {
+  userId?: string;
+  action?: string;
+  resourceType?: string;
+  success?: boolean;
+  /** ISO date-time. */
+  startDate?: string;
+  /** ISO date-time. */
+  endDate?: string;
+}
+
+export interface PluginAuditEntry {
+  /** Only on stored lines (list and export). */
+  id?: number;
+  /** ISO date-time. */
+  timestamp: string;
+  userId: string | null;
+  username: string;
+  action: string;
+  resourceType: string;
+  resourceId: string | null;
+  resourceName: string | null;
+  details: string | null;
+  ipAddress: string | null;
+  userAgent: string | null;
+  success: boolean;
+  errorMessage: string | null;
 }
 
 /** A notification channel a user set up. Its config never leaves the hub. */
@@ -2066,6 +2497,8 @@ export interface PluginContext {
   readonly notify: PluginNotify;
   /** Outbound HTTP through core's SSRF guard. Needs network:outbound. */
   readonly fetch: PluginFetch;
+  /** Plain reachability checks. Needs network:probe. */
+  readonly network: PluginNetwork;
   /** Programs on the Termix server. Needs process:spawn. */
   readonly process: PluginProcess;
   /** The server certificate. Needs system:tls. */

packages/plugin-sdk/src/capabilities.ts

@@ -52,16 +52,21 @@ export const CAPABILITY_CATALOG: readonly CapabilityInfo[] = [
   entry("ui:layout", "high"),
 
   entry("hosts:write", "medium"),
+  entry("hosts:export", "high"),
   entry("credentials:use", "medium"),
   entry("credentials:write", "medium"),
   entry("network:outbound", "medium"),
   entry("network:serve", "medium"),
   entry("network:broadcast", "medium"),
+  entry("network:probe", "medium"),
+  entry("hosts:status-provide", "medium"),
+  entry("hosts:activity-provide", "medium"),
   entry("users:read", "medium"),
   entry("events:core", "medium"),
   entry("notify:send", "medium"),
   entry("audit:read", "medium"),
   entry("desktop:window", "medium"),
+  entry("desktop:local", "high"),
 
   entry("hosts:read", "low"),
   entry("db:own", "low"),

packages/plugin-sdk/src/db.ts

@@ -256,6 +256,7 @@ export const LEGACY_TABLE_OWNERS: Readonly<Record<string, string>> = {
   homepage_items: "homepage",
   homepage_layouts: "homepage",
   dashboard_service_links: "homepage",
+  recent_activity: "homepage",
   secret_sources: "secret-sources",
   opkssh_tokens: "opkssh",
   vault_profiles: "vault",

packages/plugin-sdk/src/desktop.ts

@@ -3,8 +3,6 @@
  * only inside the Termix desktop app; check isElectron before calling it.
  */
 
-import type { PluginSshPromptRequest } from "./backend.js";
-
 export interface ServerConfig {
   serverUrl?: string;
   allowInvalidCertificate?: boolean;
@@ -33,27 +31,6 @@ export interface DialogResult {
   [key: string]: unknown;
 }
 
-export interface LocalDirectoryResult {
-  success: boolean;
-  path: string;
-  parent?: string;
-  entries: LocalFileEntry[];
-  error?: string;
-}
-
-export interface LocalCollectedFile {
-  path: string;
-  name: string;
-  relativePath: string;
-  size: number;
-  created?: string;
-  modified: string;
-}
-
-export type LocalPathMutationResult =
-  | ({ success: true } & Partial<LocalFileEntry>)
-  | { success: false; error?: string };
-
 export interface ElectronAPI {
   getAppVersion: () => Promise<string>;
   setZoomFactor?: (factor: number) => void;
@@ -67,60 +44,6 @@ export interface ElectronAPI {
     serverUrl: string,
     allowInvalidCertificate?: boolean,
   ) => Promise<ConnectionTestResult>;
-  answerC2SAuth: (id: string, answer: string | null) => Promise<boolean>;
-  onC2SAuthPrompt: (
-    callback: (prompt: {
-      id: string;
-      closed?: boolean;
-      tunnelName?: string;
-      request?: PluginSshPromptRequest;
-    }) => void,
-  ) => () => void;
-  getC2STunnelConfig: () => Promise<unknown[]>;
-  saveC2STunnelConfig: (
-    config: unknown[],
-  ) => Promise<{ success: boolean; error?: string }>;
-  checkLocalPortAvailable: (
-    host: string,
-    port: number,
-  ) => Promise<{ available: boolean; error?: string }>;
-  getC2STunnelPresetDefaultName: () => Promise<string>;
-  startC2STunnel: (
-    tunnel: unknown,
-    index: number,
-    authToken?: string,
-  ) => Promise<{
-    success: boolean;
-    tunnelName?: string;
-    error?: string;
-    code?: string;
-  }>;
-  testC2STunnel: (
-    tunnel: unknown,
-    index: number,
-    authToken?: string,
-  ) => Promise<{
-    success: boolean;
-    message?: string;
-    error?: string;
-    code?: string;
-  }>;
-  stopC2STunnel: (
-    tunnelName: string,
-  ) => Promise<{ success: boolean; error?: string }>;
-  getC2STunnelStatuses: () => Promise<Record<string, unknown>>;
-  onC2STunnelStatuses?: (
-    callback: (statuses: Record<string, unknown>) => void,
-  ) => () => void;
-  startC2SAutoStartTunnels: () => Promise<{
-    success: boolean;
-    started: number;
-    errors: string[];
-  }>;
-  /** Where the linked server relays client tunnel streams, a /plugin-ws/ path. */
-  setC2SRelayPath?: (
-    relayPath: string,
-  ) => Promise<{ success: boolean; error?: string }>;
   onCloseActiveTab?: (callback: () => void) => () => void;
   clearSessionCookies: () => Promise<void>;
   getSessionCookie: (
@@ -136,62 +59,6 @@ export interface ElectronAPI {
 
   showSaveDialog: (options: DialogOptions) => Promise<DialogResult>;
   showOpenDialog: (options: DialogOptions) => Promise<DialogResult>;
-  getLocalHomeDirectory?: () => Promise<string>;
-  listLocalDirectory?: (path?: string) => Promise<LocalDirectoryResult>;
-  statLocalPaths?: (
-    paths: string[],
-  ) => Promise<
-    Array<
-      | (LocalFileEntry & { success: true })
-      | { success: false; path: string; error?: string }
-    >
-  >;
-  collectLocalFiles?: (paths: string[]) => Promise<{
-    success: boolean;
-    files: LocalCollectedFile[];
-    truncated?: boolean;
-    error?: string;
-  }>;
-  createLocalFolder?: (
-    parentPath: string,
-    folderName: string,
-  ) => Promise<LocalPathMutationResult>;
-  renameLocalPath?: (
-    path: string,
-    newName: string,
-  ) => Promise<LocalPathMutationResult>;
-  trashLocalPath?: (path: string) => Promise<LocalPathMutationResult>;
-  chmodLocalPath?: (
-    path: string,
-    permissions: string,
-  ) => Promise<LocalPathMutationResult>;
-
-  openExternalEditor: (fileData: {
-    fileName: string;
-    content: string;
-    encoding?: "utf8" | "base64";
-    editorPath?: string | null;
-  }) => Promise<{
-    success: boolean;
-    editId?: string;
-    path?: string;
-    error?: string;
-  }>;
-
-  closeExternalEditor: (editId: string) => Promise<{
-    success: boolean;
-    error?: string;
-  }>;
-
-  onExternalEditorSaved?: (
-    callback: (payload: {
-      editId: string;
-      content: string;
-      encoding: "utf8";
-      path: string;
-    }) => void,
-  ) => () => void;
-
   onUpdateAvailable: (callback: () => void) => void;
   onUpdateDownloaded: (callback: () => void) => void;
 
@@ -238,159 +105,6 @@ export interface ElectronAPI {
     success: boolean;
     error?: string;
   }>;
-
-  startLocalTerminal(dimensions: {
-    cols: number;
-    rows: number;
-    shell?: "default" | "wsl";
-  }): Promise<{ sessionId: string; shell: string }>;
-  readyLocalTerminal(sessionId: string): Promise<boolean>;
-  writeLocalTerminal(sessionId: string, data: string): Promise<boolean>;
-  resizeLocalTerminal(
-    sessionId: string,
-    cols: number,
-    rows: number,
-  ): Promise<boolean>;
-  closeLocalTerminal(sessionId: string): Promise<boolean>;
-  onLocalTerminalData(
-    sessionId: string,
-    callback: (data: string) => void,
-  ): () => void;
-  onLocalTerminalExit(
-    sessionId: string,
-    callback: (exitCode: number) => void,
-  ): () => void;
-
-  /** Local disk browsing for the dual-pane file manager (desktop only). */
-  localFs?: {
-    home: () => Promise<LocalFsResult<LocalFsHomeInfo>>;
-    list: (dirPath: string) => Promise<LocalFsResult<LocalDirectoryListing>>;
-    mkdir: (
-      parentPath: string,
-      name: string,
-    ) => Promise<LocalFsResult<{ path: string }>>;
-    createFile: (
-      parentPath: string,
-      name: string,
-    ) => Promise<LocalFsResult<{ path: string }>>;
-    rename: (
-      oldPath: string,
-      newName: string,
-    ) => Promise<LocalFsResult<{ path: string }>>;
-    trash: (paths: string[]) => Promise<LocalFsResult<LocalTrashResult>>;
-    ensureDir: (
-      dirPath: string,
-      rootPath?: string,
-    ) => Promise<LocalFsResult<{ path: string }>>;
-    exists: (paths: string[]) => Promise<LocalFsResult<{ existing: string[] }>>;
-    walk: (paths: string[]) => Promise<LocalFsResult<LocalWalkResult>>;
-    reveal: (targetPath: string) => Promise<LocalFsResult<unknown>>;
-    open: (targetPath: string) => Promise<LocalFsResult<unknown>>;
-  };
-
-  /** Streamed local<->remote transfers driven by the main process. */
-  localTransfer?: {
-    /** The /plugin-api/<id> path that serves the streaming routes. */
-    setApiPath?: (apiPath: string) => Promise<LocalFsResult<object>>;
-    upload: (
-      options: LocalUploadRequest,
-    ) => Promise<LocalFsResult<{ bytes: number }>>;
-    download: (
-      options: LocalDownloadRequest,
-    ) => Promise<LocalFsResult<{ path: string }>>;
-    cancel: (
-      transferId: string,
-    ) => Promise<LocalFsResult<{ cancelled: boolean }>>;
-    onProgress: (
-      callback: (payload: LocalTransferProgress) => void,
-    ) => () => void;
-  };
-}
-
-export type LocalFsResult<T> =
-  ({ success: true } & T) | { success: false; error: string; code?: string };
-
-export interface LocalFsHomeInfo {
-  home: string;
-  separator: string;
-  platform: string;
-}
-
-export interface LocalFileEntry {
-  name: string;
-  path: string;
-  type: "file" | "directory" | "link" | "other";
-  created?: string;
-  modified?: string;
-  permissions?: string;
-  owner?: string;
-  group?: string;
-  size: number;
-  modifiedTimestamp?: number;
-  linkTarget?: string;
-  hidden: boolean;
-}
-
-export interface LocalDirectoryListing {
-  path: string;
-  parent: string | null;
-  entries: LocalFileEntry[];
-}
-
-export interface LocalTrashResult {
-  trashed: number;
-  failed: Array<{ path: string; error: string }>;
-}
-
-export interface LocalWalkFile {
-  localPath: string;
-  /** Path relative to the drop root; "/"-separated and includes the root's own name. */
-  relativePath: string;
-  size: number;
-}
-
-export interface LocalWalkResult {
-  files: LocalWalkFile[];
-  emptyDirs: string[];
-  totalBytes: number;
-}
-
-/**
- * Which Termix backend a transfer talks to. The main process resolves the
- * actual URL and credentials for the origin; the renderer never supplies them.
- */
-export type LocalTransferOrigin = "local" | "remote";
-
-export interface LocalUploadRequest {
-  transferId: string;
-  origin: LocalTransferOrigin;
-  fields: Record<string, string>;
-  localPath: string;
-  fileName: string;
-  deviceId?: string;
-  /** The renderer's token for the embedded backend (origin "local"); sent as a Bearer header. */
-  authToken?: string;
-}
-
-export interface LocalDownloadRequest {
-  transferId: string;
-  origin: LocalTransferOrigin;
-  body: Record<string, unknown>;
-  destPath: string;
-  /** Selected download folder; destPath must resolve strictly inside it (code EINVAL otherwise). */
-  rootPath: string;
-  expectedSize?: number;
-  /** Replace an existing file at destPath; otherwise the transfer is refused with code EEXIST. */
-  overwrite?: boolean;
-  deviceId?: string;
-  /** The renderer's token for the embedded backend (origin "local"); sent as a Bearer header. */
-  authToken?: string;
-}
-
-export interface LocalTransferProgress {
-  transferId: string;
-  transferred: number;
-  total?: number;
 }
 
 declare global {

packages/plugin-sdk/src/frontend.ts

@@ -653,8 +653,16 @@ export interface HostBadgeContribution {
   id: string;
   when: (host: PluginHostRecord) => boolean;
   component: ComponentType<{ host: PluginHostRecord }>;
+  /** Lower comes first. Ties sort by id. */
+  order?: number;
 }
 
+/** The dot or stripe that shows a host's status on its row. */
+export type HostStatusIndicatorContribution = HostBadgeContribution;
+
+/** A control in the host editor's toolbar. */
+export type HostEditorToolbarItemContribution = HostBadgeContribution;
+
 export interface HostContextMenuItemContribution {
   id: string;
   titleKey: string;
@@ -838,10 +846,11 @@ export type OnboardingMode = "full" | "partial" | "rerun";
  * Where a plugin step sits in onboarding. "setup" comes right after the
  * appearance steps, for things that need doing before the feature works
  * (like pointing at a guacd server). "explore" (the default) comes after
- * that, "security" after the account security step. Onboarding is for
+ * that, "security" after the account security step. "start" comes before
+ * the appearance steps, for choices that shape how the rest looks. Onboarding is for
  * choices, not for explaining features.
  */
-export type OnboardingSection = "setup" | "explore" | "security";
+export type OnboardingSection = "start" | "setup" | "explore" | "security";
 
 export interface OnboardingStepProps {
   /**
@@ -884,6 +893,16 @@ export interface OnboardingStepContribution {
   permission?: string;
   section?: OnboardingSection;
   order?: number;
+  /**
+   * Exact place in the flow, 1 to 99, instead of a section. Core steps sit at
+   * 10 (plugins), 20, 25, 30 (preset), 40 (appearance) and 90 (security).
+   */
+  position?: number;
+  /**
+   * Older step keys this step took over, like "preset". People who already
+   * saw one of them are not shown this step again.
+   */
+  replaces?: string[];
   when?: (context: {
     isAdmin: boolean;
     isDesktop: boolean;
@@ -1055,6 +1074,14 @@ export interface TermixApp extends TermixAppInfo {
   registerHostAction: (action: HostActionContribution) => Disposer;
   registerHostProtocol: (protocol: HostProtocolContribution) => Disposer;
   registerHostBadge: (badge: HostBadgeContribution) => Disposer;
+  /** Draws a host row's status. A layout renders every registered one. */
+  registerHostStatusIndicator: (
+    indicator: HostStatusIndicatorContribution,
+  ) => Disposer;
+  /** Adds a control to the host editor's toolbar. */
+  registerHostEditorToolbarItem: (
+    item: HostEditorToolbarItemContribution,
+  ) => Disposer;
   registerHostContextMenuItem: (
     item: HostContextMenuItemContribution,
   ) => Disposer;

packages/plugin-sdk/src/manifest.ts

@@ -37,7 +37,7 @@ export {
  * "^1.2" needs 1.2 or later). engine.termix is checked against the core
  * version by the server.
  */
-export const PLUGIN_API_VERSION = "1.4.0";
+export const PLUGIN_API_VERSION = "1.5.0";
 
 /** The API major, the default engine.api for a new plugin. */
 export const SUPPORTED_PLUGIN_API_VERSION = String(
@@ -688,6 +688,21 @@ export interface PluginManifest {
   nativeDependencies?: string[];
   /** How a linked desktop treats this plugin. Defaults to "mirror". */
   desktop?: PluginDesktopMode;
+  /**
+   * "desktop": the plugin only loads on a desktop app's own embedded backend,
+   * never on a server. It implies desktop "local" and may declare desktop:local.
+   */
+  runtime?: PluginRuntime;
+}
+
+export type PluginRuntime = "desktop";
+export const PLUGIN_RUNTIMES: readonly PluginRuntime[] = ["desktop"];
+
+/** The desktop mode a manifest resolves to. */
+export function resolvePluginDesktopMode(
+  m: Pick<PluginManifest, "desktop" | "runtime">,
+): PluginDesktopMode {
+  return m.desktop ?? (m.runtime === "desktop" ? "local" : "mirror");
 }
 
 export const DEFAULT_BACKEND_ENTRY = "dist/backend.js";
@@ -727,6 +742,7 @@ const ALLOWED_TOP_LEVEL = new Set([
   "platforms",
   "nativeDependencies",
   "desktop",
+  "runtime",
 ]);
 
 const ALLOWED_CONTRIBUTES = new Set([
@@ -904,6 +920,21 @@ export function validateManifest(manifest: unknown): string[] {
       `Field "desktop" must be one of: ${PLUGIN_DESKTOP_MODES.join(", ")}`,
     );
   }
+  if (
+    m.runtime !== undefined &&
+    !PLUGIN_RUNTIMES.includes(m.runtime as PluginRuntime)
+  ) {
+    errors.push(
+      `Field "runtime" must be one of: ${PLUGIN_RUNTIMES.join(", ")}`,
+    );
+  }
+  if (
+    m.runtime === "desktop" &&
+    m.desktop !== undefined &&
+    m.desktop !== "local"
+  ) {
+    errors.push(`A "desktop" runtime plugin must use desktop "local"`);
+  }
   validateDependencyMap(m.dependencies, "dependencies", errors);
   validateDependencyMap(m.optionalDependencies, "optionalDependencies", errors);
   validateProvides(m.provides, errors);

packages/plugin-sdk/src/ssh-keys.ts

@@ -0,0 +1,122 @@
+/**
+ * SSH key helpers for plugins that make, check or deploy keys: generate a key
+ * pair, tell what a key is, derive a public key and check a pair belongs
+ * together. Pure functions over ssh2, which the host supplies. Core keeps its
+ * own copy for the connect pipeline.
+ */
+
+import ssh2 from "ssh2";
+
+export type SshKeyKind = "ssh-ed25519" | "ssh-rsa" | "ecdsa-sha2-nistp256";
+
+export interface GeneratedSshKeyPair {
+  privateKey: string;
+  publicKey: string;
+  keyType: SshKeyKind;
+}
+
+export interface GenerateSshKeyPairOptions {
+  /** RSA only. 2048 to 8192, default 4096. */
+  bits?: number;
+  passphrase?: string;
+  comment?: string;
+}
+
+/** Makes a new key pair; the public half is one authorized_keys line. */
+export function generateSshKeyPair(
+  type: SshKeyKind,
+  options: GenerateSshKeyPairOptions = {},
+): GeneratedSshKeyPair {
+  const algorithm =
+    type === "ssh-rsa" ? "rsa" : type === "ssh-ed25519" ? "ed25519" : "ecdsa";
+  if (
+    type !== "ssh-rsa" &&
+    type !== "ssh-ed25519" &&
+    type !== "ecdsa-sha2-nistp256"
+  ) {
+    throw new Error(`Unsupported key type: ${String(type)}`);
+  }
+  const generateOptions: Record<string, unknown> = {
+    comment: options.comment ?? "",
+  };
+  if (options.passphrase) {
+    generateOptions.passphrase = options.passphrase;
+    generateOptions.cipher = "aes256-ctr";
+  }
+  if (type === "ssh-rsa") {
+    const bits = options.bits ?? 4096;
+    if (!Number.isInteger(bits) || bits < 2048 || bits > 8192) {
+      throw new Error("RSA keys need 2048 to 8192 bits");
+    }
+    generateOptions.bits = bits;
+  }
+  if (type === "ecdsa-sha2-nistp256") generateOptions.bits = 256;
+
+  const pair = ssh2.utils.generateKeyPairSync(
+    algorithm as "rsa",
+    generateOptions as never,
+  );
+  return {
+    privateKey: pair.private,
+    publicKey: pair.public.trim(),
+    keyType: type,
+  };
+}
+
+function parse(key: string, passphrase?: string) {
+  const parsed = ssh2.utils.parseKey(key.trim(), passphrase || undefined);
+  const first = Array.isArray(parsed) ? parsed[0] : parsed;
+  if (!first || first instanceof Error) {
+    throw first instanceof Error ? first : new Error("Not a readable SSH key");
+  }
+  return first;
+}
+
+/** The key's algorithm, like "ssh-ed25519", or null when it cannot be read. */
+export function detectSshKeyType(
+  key: string,
+  passphrase?: string,
+): string | null {
+  try {
+    return parse(key, passphrase).type;
+  } catch {
+    return null;
+  }
+}
+
+/** The authorized_keys line for a private key, or null. */
+export function publicKeyFromPrivate(
+  privateKey: string,
+  passphrase?: string,
+): string | null {
+  try {
+    const parsed = parse(privateKey, passphrase);
+    return `${parsed.type} ${parsed.getPublicSSH().toString("base64")}`;
+  } catch {
+    return null;
+  }
+}
+
+/** Whether a public key line belongs to the private key. */
+export function validateSshKeyPair(
+  privateKey: string,
+  publicKey: string,
+  passphrase?: string,
+): { isValid: boolean; error?: string } {
+  try {
+    const priv = parse(privateKey, passphrase);
+    const pub = parse(publicKey);
+    const same = priv.getPublicSSH().equals(pub.getPublicSSH());
+    return same
+      ? { isValid: true }
+      : {
+          isValid: false,
+          error: "The public key does not match the private key",
+        };
+  } catch (error) {
+    return {
+      isValid: false,
+      error: error instanceof Error ? error.message : String(error),
+    };
+  }
+}

packages/plugin-sdk/src/testing.ts

@@ -14,7 +14,10 @@ import {
   PluginCapabilityError,
 } from "./backend.js";
 import type {
+  PluginAuditEntry,
+  PluginAuditFilters,
   PluginContext,
+  PluginDesktopLocal,
   PluginDisposables,
   PluginLogger,
 } from "./backend.js";
@@ -70,7 +73,10 @@ import type { PluginDatabase } from "./backend.js";
 import type {
   PluginExternalClientRequest,
   PluginProtocolTarget,
+  PluginHostProbeTarget,
   PluginHostStatusEntry,
+  PluginActivityProvider,
+  PluginHostStatusProvider,
   PluginNotification,
   PluginNotificationChannel,
   PluginNotifyHub,
@@ -101,6 +107,8 @@ export interface FakeContextOptions {
   settings?: Record<string, unknown>;
   /** Seed for the core settings ctx.settings.readCore can reach. */
   coreSettings?: Record<string, string>;
+  /** What ctx.files.dataDir() answers. Defaults to /tmp/<pluginId>. */
+  dataDir?: string;
   /** What ctx.ssh.connect and withConnection hand back as the client. */
   sshClient?: unknown;
   /** A real database behind ctx.db, usually createTestDb().database. */
@@ -134,8 +142,18 @@ export interface FakeContextOptions {
   sshKeyCredentials?: PluginSshKeyCredential[];
   /** What ctx.desktop.available() answers. Defaults to false. */
   desktopAvailable?: boolean;
+  /** What ctx.desktop.local is. Calls throw when this is not given. */
+  desktopLocal?: PluginDesktopLocal;
+  /** The stored audit lines ctx.audit.list and exportBatches serve. */
+  auditEntries?: PluginAuditEntry[];
   /** What ctx.hosts.status.get and check answer, by host id. */
   hostStatuses?: Record<number, PluginHostStatusEntry>;
+  /** What ctx.hosts.probeTargets answers. */
+  probeTargets?: PluginHostProbeTarget[];
+  /** Host ids ctx.hosts.sessionActive answers true for. */
+  activeSessions?: number[];
+  /** What ctx.network.tcpProbe and ctx.ssh.probe answer. Defaults to false. */
+  reachable?: (target: string | number, port?: number) => boolean;
   /** The acting user's channels, what ctx.notify.channels answers. */
   notificationChannels?: PluginNotificationChannel[];
   /**
@@ -263,6 +281,10 @@ export interface FakePluginContext {
   ) => Promise<Record<string, string>>;
   /** Everything the plugin registered through ctx.disposables. */
   disposals: Array<() => void | Promise<void>>;
+  /** Providers registered through ctx.hosts.status.provide. */
+  hostStatusProviders: PluginHostStatusProvider[];
+  /** Every provider passed to ctx.hosts.activity.provide that is still registered. */
+  activityProviders: PluginActivityProvider[];
   /** Topics emitted through ctx.events.emit, in order. */
   emitted: Array<{ topic: string; payload: unknown }>;
   /** Backing store behind ctx.kv. */
@@ -338,6 +360,8 @@ export interface FakePluginContext {
     challenges: Map<string, string>;
     renewers: number;
   };
+  /** Calls every ctx.audit.subscribe handler, like a line core just accepted. */
+  emitAudit: (entry: PluginAuditEntry) => void;
   /** Every ctx.audit.record entry, in order. */
   audits: Array<{ action: string; success: boolean; [key: string]: unknown }>;
   /** Every ctx.hosts.recordActivity call, in order. */
@@ -491,6 +515,8 @@ export function createFakeContext(
   const pluginId = options.pluginId ?? "test-plugin";
   const disposals: Array<() => void | Promise<void>> = [];
   const emitted: Array<{ topic: string; payload: unknown }> = [];
+  const hostStatusProviders: PluginHostStatusProvider[] = [];
+  const activityProviders: PluginActivityProvider[] = [];
   const kv = new Map<string, unknown>();
   const tables: PluginTableDefinition[] = [];
   const syncEntities: SyncEntityRegistration[] = [];
@@ -531,6 +557,7 @@ export function createFakeContext(
   };
   const secretStore = new Map<string, string>();
   const audits: FakePluginContext["audits"] = [];
+  const auditSubscribers = new Set<(entry: PluginAuditEntry) => void>();
   const activities: FakePluginContext["activities"] = [];
   const trackedSessions: number[] = [];
   const interactions: FakePluginContext["interactions"] = [];
@@ -665,7 +692,7 @@ export function createFakeContext(
     files: {
       // A fake path; a test that needs a real folder uses the OS temp dir
       // itself, not this double.
-      dataDir: async () => `/tmp/${pluginId}`,
+      dataDir: async () => options.dataDir ?? `/tmp/${pluginId}`,
     },
 
     db: options.db
@@ -902,6 +929,27 @@ export function createFakeContext(
     disposables,
 
     hosts: {
+      importMany: async (rows) => {
+        const created = rows.map(() => nextHostId++);
+        return {
+          success: created.length,
+          updated: 0,
+          skipped: 0,
+          failed: 0,
+          errors: [],
+          createdHostIds: created,
+        };
+      },
+      importSshConfig: async () => ({
+        success: 0,
+        updated: 0,
+        skipped: 0,
+        failed: 0,
+        errors: [],
+        createdHostIds: [],
+      }),
+      exportMany: async () => ({ hosts: [] }),
+      registerImportNormalizer: () => () => {},
       list: async () => [...hostsById.values()],
       get: async (hostId) => hostsById.get(hostId) ?? null,
       checkAccess: async (hostId): Promise<PluginHostAccess> => {
@@ -971,7 +1019,29 @@ export function createFakeContext(
       recordActivity: async (hostId, type, hostName) => {
         activities.push({ hostId, type, hostName });
       },
+      probeTargets: async (filter) =>
+        (options.probeTargets ?? []).filter(
+          (target) => !filter?.hostIds || filter.hostIds.includes(target.id),
+        ),
+      sessionActive: (hostId) =>
+        options.activeSessions?.includes(hostId) ?? false,
+      activity: {
+        provide: (provider) => {
+          activityProviders.push(provider);
+          return () => {
+            const at = activityProviders.indexOf(provider);
+            if (at >= 0) activityProviders.splice(at, 1);
+          };
+        },
+      },
       status: {
+        provide: (provider) => {
+          hostStatusProviders.push(provider);
+          return () => {
+            const at = hostStatusProviders.indexOf(provider);
+            if (at >= 0) hostStatusProviders.splice(at, 1);
+          };
+        },
         get: async (hostId) => hostStatuses.get(hostId) ?? null,
         check: async (hostId) => hostStatuses.get(hostId) ?? null,
         reportLogin: (hostId, outcome) => {
@@ -996,12 +1066,45 @@ export function createFakeContext(
     },
 
     audit: {
+      subscribe: (handler) => {
+        auditSubscribers.add(handler);
+        return () => {
+          auditSubscribers.delete(handler);
+        };
+      },
+      list: async (listOptions) => {
+        const matching = filterAuditEntries(
+          options.auditEntries ?? [],
+          listOptions?.filters,
+        ).reverse();
+        const offset = listOptions?.offset ?? 0;
+        return {
+          entries: matching.slice(offset, offset + (listOptions?.limit ?? 50)),
+          total: matching.length,
+        };
+      },
+      exportBatches: async function* (filters, batchSize) {
+        const matching = filterAuditEntries(
+          options.auditEntries ?? [],
+          filters,
+        );
+        const size = batchSize ?? 500;
+        for (let at = 0; at < matching.length; at += size) {
+          yield matching.slice(at, at + size);
+        }
+      },
       record: async (entry) => {
         audits.push({ ...entry });
       },
     },
 
+    network: {
+      tcpProbe: async (host, port) => options.reachable?.(host, port) ?? false,
+    },
+
     ssh: {
+      probe: async (hostId, probeOptions) =>
+        options.reachable?.(hostId, probeOptions?.port) ?? false,
       connect: async (host, connectOptions) => {
         sshConnections.push({ host, options: connectOptions });
         return {
@@ -1013,6 +1116,16 @@ export function createFakeContext(
           dispose: () => {},
         };
       },
+      exec: async (host) => {
+        sshConnections.push({ host });
+        return {
+          stdout: "",
+          stderr: "",
+          code: 0,
+          truncated: false,
+          timedOut: false,
+        };
+      },
       withConnection: async (host, connectOptions, fn) => {
         sshConnections.push({ host, pool: connectOptions.pool });
         return fn(sshClient as never);
@@ -1169,6 +1282,7 @@ export function createFakeContext(
         return { success: true };
       },
       available: () => options.desktopAvailable ?? false,
+      local: options.desktopLocal ?? unavailableDesktopLocal(),
     },
 
     credentials: {
@@ -1195,6 +1309,13 @@ export function createFakeContext(
         credentialReads.push({ hostId, protocol });
         return options.protocolTargets?.[`${hostId}:${protocol}`] ?? null;
       },
+      publicKey: async (credentialId) =>
+        (options.sshKeyCredentials ?? []).find((k) => k.id === credentialId)
+          ?.publicKey ?? null,
+      resolveKeyRefs: async (key, passphrase) => ({
+        key,
+        passphrase: passphrase ?? undefined,
+      }),
       registerSecretResolver: (scheme, resolve) => {
         auth.secretResolvers.set(scheme, resolve);
         disposals.push(() => {
@@ -1345,6 +1466,8 @@ export function createFakeContext(
       return errors;
     },
     disposals,
+    hostStatusProviders,
+    activityProviders,
     emitted,
     kv,
     tables,
@@ -1368,6 +1491,9 @@ export function createFakeContext(
     tls,
     secretStore,
     audits,
+    emitAudit: (entry) => {
+      for (const handler of auditSubscribers) handler(entry);
+    },
     activities,
     trackedSessions,
     interactions,
@@ -1409,6 +1535,8 @@ export interface MockContextOptions {
   settings?: Record<string, unknown>;
   /** Seed for the core settings readCore can reach. */
   coreSettings?: Record<string, string>;
+  /** What ctx.files.dataDir() answers. */
+  dataDir?: string;
   /** Acting user returned by currentActor and used by asUser. */
   actor?: string;
   /** What ctx.ssh.connect and withConnection hand back as the client. */
@@ -1434,8 +1562,18 @@ export interface MockContextOptions {
   sshKeyCredentials?: PluginSshKeyCredential[];
   /** What ctx.desktop.available() answers. */
   desktopAvailable?: boolean;
+  /** What ctx.desktop.local is. See FakeContextOptions. */
+  desktopLocal?: PluginDesktopLocal;
+  /** See FakeContextOptions. */
+  auditEntries?: PluginAuditEntry[];
   /** What ctx.hosts.status answers. See FakeContextOptions. */
   hostStatuses?: Record<number, PluginHostStatusEntry>;
+  /** What ctx.hosts.probeTargets answers. */
+  probeTargets?: PluginHostProbeTarget[];
+  /** Host ids ctx.hosts.sessionActive answers true for. */
+  activeSessions?: number[];
+  /** What ctx.network.tcpProbe and ctx.ssh.probe answer. */
+  reachable?: (target: string | number, port?: number) => boolean;
   /** The acting user's channels, what ctx.notify.channels answers. */
   notificationChannels?: PluginNotificationChannel[];
   /**
@@ -1481,6 +1619,63 @@ export interface MockPluginContext extends FakePluginContext {
  * (users:impersonate on issueUserToken), and users:read on ctx.users. Reading a plugin's own settings is deliberately
  * ungated. As the SDK grows a member, add its gate here in the same shape.
  */
+function filterAuditEntries(
+  entries: PluginAuditEntry[],
+  filters: PluginAuditFilters | undefined,
+): PluginAuditEntry[] {
+  return entries.filter(
+    (entry) =>
+      (filters?.userId === undefined || entry.userId === filters.userId) &&
+      (filters?.action === undefined || entry.action === filters.action) &&
+      (filters?.resourceType === undefined ||
+        entry.resourceType === filters.resourceType) &&
+      (filters?.success === undefined || entry.success === filters.success) &&
+      (filters?.startDate === undefined ||
+        entry.timestamp >= filters.startDate) &&
+      (filters?.endDate === undefined || entry.timestamp <= filters.endDate),
+  );
+}
+
+function gateDesktopLocal(
+  target: PluginDesktopLocal,
+  check: () => void,
+): PluginDesktopLocal {
+  const wrap = (value: unknown): unknown => {
+    if (typeof value === "function") {
+      return (...args: unknown[]) => {
+        check();
+        return (value as (...a: unknown[]) => unknown)(...args);
+      };
+    }
+    if (value && typeof value === "object") {
+      return new Proxy(value as object, {
+        get: (obj, key) => wrap((obj as Record<string | symbol, unknown>)[key]),
+      });
+    }
+    return value;
+  };
+  return new Proxy(target, {
+    get: (obj, key) =>
+      key === "available"
+        ? obj.available
+        : wrap((obj as unknown as Record<string | symbol, unknown>)[key]),
+  });
+}
+
+function unavailableDesktopLocal(): PluginDesktopLocal {
+  const fail = (): never => {
+    throw new Error("ctx.desktop.local needs the desktopLocal test option");
+  };
+  const deep = (): unknown =>
+    new Proxy(() => fail(), { get: () => deep(), apply: () => fail() });
+  return {
+    available: () => false,
+    info: fail,
+    fs: deep(),
+    pty: deep(),
+  } as unknown as PluginDesktopLocal;
+}
+
 export function createMockCtx(
   options: MockContextOptions = {},
 ): MockPluginContext {
@@ -1492,6 +1687,7 @@ export function createMockCtx(
     actor: options.actor,
     settings: options.settings,
     coreSettings: options.coreSettings,
+    dataDir: options.dataDir,
     sshClient: options.sshClient,
     db: options.db,
     router: options.router,
@@ -1504,7 +1700,12 @@ export function createMockCtx(
     protocolTargets: options.protocolTargets,
     sshKeyCredentials: options.sshKeyCredentials,
     desktopAvailable: options.desktopAvailable,
+    desktopLocal: options.desktopLocal,
+    auditEntries: options.auditEntries,
     hostStatuses: options.hostStatuses,
+    probeTargets: options.probeTargets,
+    activeSessions: options.activeSessions,
+    reachable: options.reachable,
     notificationChannels: options.notificationChannels,
     fetch: options.fetch,
     process: options.process,
@@ -1650,6 +1851,23 @@ export function createMockCtx(
     },
 
     hosts: {
+      importMany: async (rows, importOptions) => {
+        require("hosts:write");
+        if (importOptions?.credentials?.length) require("credentials:write");
+        return ctx.hosts.importMany(rows, importOptions);
+      },
+      importSshConfig: async (content, importOptions) => {
+        require("hosts:write");
+        return ctx.hosts.importSshConfig(content, importOptions);
+      },
+      exportMany: async (exportOptions) => {
+        require("hosts:export");
+        return ctx.hosts.exportMany(exportOptions);
+      },
+      registerImportNormalizer: (normalizer) => {
+        require("hosts:write");
+        return ctx.hosts.registerImportNormalizer(normalizer);
+      },
       list: async () => {
         require("hosts:read");
         return ctx.hosts.list();
@@ -1698,7 +1916,26 @@ export function createMockCtx(
         require("hosts:read");
         return ctx.hosts.recordActivity(hostId, type, hostName);
       },
+      probeTargets: async (filter) => {
+        require("hosts:read");
+        return ctx.hosts.probeTargets(filter);
+      },
+      sessionActive: (hostId) => {
+        require("hosts:read");
+        return ctx.hosts.sessionActive(hostId);
+      },
+      activity: {
+        provide: (provider) => {
+          require("hosts:activity-provide");
+          return ctx.hosts.activity.provide(provider);
+        },
+      },
       status: {
+        provide: (provider) => {
+          require("hosts:read");
+          require("hosts:status-provide");
+          return ctx.hosts.status.provide(provider);
+        },
         get: async (hostId) => {
           require("hosts:read");
           return ctx.hosts.status.get(hostId);
@@ -1720,11 +1957,20 @@ export function createMockCtx(
 
     ssh: {
       ...ctx.ssh,
+      probe: async (hostId, probeOptions) => {
+        require("ssh:connect");
+        return ctx.ssh.probe(hostId, probeOptions);
+      },
       connect: async (host, connectOptions) => {
         require("ssh:connect");
         require("credentials:use");
         return ctx.ssh.connect(host, connectOptions);
       },
+      exec: async (host, command, execOptions) => {
+        require("ssh:connect");
+        require("credentials:use");
+        return ctx.ssh.exec(host, command, execOptions);
+      },
       withConnection: async (host, connectOptions, fn) => {
         require("ssh:connect");
         require("credentials:use");
@@ -1820,6 +2066,22 @@ export function createMockCtx(
       },
     },
 
+    audit: {
+      record: (entry) => ctx.audit.record(entry),
+      subscribe: (handler) => {
+        require("audit:read");
+        return ctx.audit.subscribe(handler);
+      },
+      list: async (listOptions) => {
+        require("audit:read");
+        return ctx.audit.list(listOptions);
+      },
+      exportBatches: (filters, batchSize) => {
+        require("audit:read");
+        return ctx.audit.exportBatches(filters, batchSize);
+      },
+    },
+
     desktop: {
       openIsolatedWindow: async (request) => {
         require("desktop:window");
@@ -1830,6 +2092,9 @@ export function createMockCtx(
         return ctx.desktop.launchExternalClient(request);
       },
       available: () => ctx.desktop.available(),
+      local: gateDesktopLocal(ctx.desktop.local, () =>
+        require("desktop:local"),
+      ),
     },
 
     credentials: {
@@ -1851,6 +2116,14 @@ export function createMockCtx(
         }
         return ctx.credentials.resolveHostProtocol(hostId, protocol);
       },
+      publicKey: async (credentialId) => {
+        require("credentials:use");
+        return ctx.credentials.publicKey(credentialId);
+      },
+      resolveKeyRefs: async (key, passphrase) => {
+        require("credentials:read");
+        return ctx.credentials.resolveKeyRefs(key, passphrase);
+      },
       registerSecretResolver: (scheme, resolve) => {
         require("auth:provide");
         ctx.credentials.registerSecretResolver(scheme, resolve);
@@ -1877,6 +2150,13 @@ export function createMockCtx(
       return ctx.fetch(url, init);
     },
 
+    network: {
+      tcpProbe: async (host, port, probeOptions) => {
+        require("network:probe");
+        return ctx.network.tcpProbe(host, port, probeOptions);
+      },
+    },
+
     process: {
       run: async (file, args, runOptions) => {
         require("process:spawn");

packages/plugin-sdk/ui.api.txt

@@ -115,13 +115,11 @@ DropdownMenuSubTrigger (value): ({ className, inset, children, ...props }: Dropd
 DropdownMenuTrigger (value): ({ ...props }: DropdownMenuTriggerProps & RefAttributes<HTMLButtonElement>) => Element
 EditingWidth (type): EditingWidth
 EmptyState (value): ({ icon: Icon, title, hint, action, className, }: { icon?: LucideIcon; title: string; hint?: string; action?: ReactNode; className?: string; }) => Element
-ExportPayload (type): ExportPayload
 FOLDER_COLORS (value): string[]
 FONT_SIZES (value): { id: FontSizeId; label: string; }[]
 Facts (value): ({ className, children, }: { className?: string; children: ReactNode; }) => Element
 FakeSwitch (value): ({ defaultChecked, disabled, checked, onChange, }: { defaultChecked?: boolean; disabled?: boolean; checked?: boolean; onChange?: (v: boolean) => void; }) => Element
 Field (value): ({ label, hint, error, aside, htmlFor, className, children, }: { label: string; hint?: ReactNode; error?: string; aside?: ReactNode; htmlFor?: string; className?: string; children: ReactNode; }) => Element
-FieldGroup (type): FieldGroup
 FieldPair (value): ({ children }: { children: ReactNode; }) => Element
 FolderAccessRule (type): FolderAccessRule
 FolderIconEl (value): ({ icon, className, style, }: { icon?: string; className?: string; style?: CSSProperties; }) => Element
@@ -200,6 +198,7 @@ NumberField (value): ({ label, value, onChange, placeholder, hint, error, min, m
 OPEN_PLUGINS_EVENT (value): "termix:open-plugins"
 OpenTabRecord (type): OpenTabRecord
 PANEL (value): { readonly body: "p-2.5"; readonly gap: "gap-2"; readonly band: "px-3 py-2"; readonly cardHead: "px-3 py-2.5"; readonly header: "h-12.5"; }
+PRESETS (value): Record<"simple" | "balanced" | "advanced", UiAreaPreferences>
 PROMPT_BUTTON (value): "inline-flex h-7 items-center justify-center gap-1.5 border border-border px-3 text-xs text-muted-foreground transition-colors hover:bg-muted hover:text-foreground focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
 PROMPT_DESTRUCTIVE_BUTTON (value): "inline-flex h-7 items-center justify-center gap-1.5 bg-destructive px-3 text-xs font-medium text-white transition-colors hover:bg-destructive/90 focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
 PROMPT_PRIMARY_BUTTON (value): "inline-flex h-7 items-center justify-center gap-1.5 border border-accent-brand/40 px-3 text-xs font-medium text-accent-brand transition-colors hover:bg-accent-brand/10 focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
@@ -344,13 +343,11 @@ adminUpdateUserCredential (value): (targetUserId: string, credentialId: number,
 adminUpdateUserHost (value): (targetUserId: string, hostId: number, hostData: HostData) => Promise<Host>
 applyAccentColor (value): (colorValue: string) => void
 applyFontSize (value): (id: FontSizeId) => void
-applyPresetSideEffects (value): (preset: "advanced" | "simple" | "balanced") => Promise<void>
+applyPresetSideEffects (value): (preset: "simple" | "balanced" | "advanced") => Promise<void>
 applyUiFont (value): (id: UiFontId) => void
 assignRoleToUser (value): (userId: string, roleId: number) => Promise<{ success: boolean; }>
 beginSplitDrag (value): (source: SplitDragSource, x: number, y: number) => void
-buildExportPayload (value): (raw: ExportPayload, selected: Set<string>, groups: Set<FieldGroup>, withCredentials: boolean, pluginSecrets?: PluginSecretKeys) => ExportPayload
 buildOriginWsUrl (value): ({ origin, localPort, localPath, remotePath, includeJwt, }: { origin: ConnectionOrigin; localPort: number; localPath: string; remotePath: string; includeJwt?: boolean; }) => Promise<WebSocketConnectionTarget>
-bulkImportSSHHosts (value): (hosts: HostData[], overwrite?: boolean, credentials?: Record<string, unknown>[]) => Promise<{ message: string; success: number; updated: number; skipped: number; failed: number; errors: string[]; }>
 bulkUpdateSSHHosts (value): (hostIds: number[], updates: Record<string, unknown>) => Promise<{ updated: number; failed: number; errors: string[]; }>
 canConfigureUpdates (value): (state: DesktopUpdateState) => state is DesktopUpdateState
 canJoinSplit (value): (tab: Tab) => boolean
@@ -379,22 +376,17 @@ deleteOpenTab (value): (instanceId: string) => Promise<void>
 deleteRole (value): (roleId: number) => Promise<{ success: boolean; }>
 deleteSSHHost (value): (hostId: number) => Promise<Record<string, unknown>>
 deleteUser (value): (username: string, successorUserId?: string) => Promise<Record<string, unknown>>
-deployCredentialToHost (value): (credentialId: number, targetHostId: number) => Promise<Record<string, unknown>>
 desktopUpdates (value): () => DesktopUpdatesBridge
 docsUrl (value): (page?: "dashboard" | "users" | "sessions" | "roles" | "branding" | "database" | "manage" | "settings" | "plugins" | "install" | "cli" | "develop" | "home" | "updating" | "betas" | "envVars" | "https" | "reverseProxy" | "desktopSync" | "interface" | "hosts" | "portKnocking" | "hostDefaults" | "credentials" | "sharing" | "account" | "accountSecurity" | "accountData" | "apiKeys" | "commandPalette" | "interfaceSettings" | "appearance" | "keybindings" | "adminGeneral" | "adminDatabase" | "adminSsl" | "auditLog" | "importExport" | "pluginCatalog" | "communityRegistry" | "pluginRegistries" | "hostRegistry") => string
 duplicateCredential (value): (credentialId: number, data: Record<string, unknown>) => Promise<Record<string, unknown>>
 enabledHostProtocols (value): (host: { pluginSettings?: Record<string, Record<string, unknown>>; }, list?: HostProtocolDef[]) => HostProtocolDef[]
 endSplitDrag (value): (commit: boolean) => void
-exportAllSSHHosts (value): { (): Promise<{ hosts: Host[]; }>; (options: { share: true; }): Promise<{ version: string; exportedAt: string; credentials: Record<string, unknown>[]; hosts: Host[]; }>; }
 filterPaletteItems (value): (items: PaletteItemDef[], query: string, showWhenEmpty?: boolean) => PaletteItemDef[]
 findCoreHostDefault (value): (key: string) => CoreHostDefault
 findMatchingKeybinding (value): (e: KeyboardEvent, bindings: CustomKeybinding[]) => CustomKeybinding
-generateKeyPair (value): (keyType: "ssh-ed25519" | "ssh-rsa" | "ecdsa-sha2-nistp256", keySize?: number, passphrase?: string) => Promise<GeneratedKeyPair>
-generatePublicKeyFromPrivate (value): (privateKey: string, keyPassword?: string) => Promise<GeneratedPublicKey>
 getActiveSessions (value): () => Promise<ActiveSessionInfo[]>
 getAdaptiveResourceBudget (value): (kind: AdaptiveTaskKind) => AdaptiveResourceBudget
 getApiKeys (value): () => Promise<{ apiKeys: ApiKey[]; }>
-getAuditForwarding (value): () => Promise<AuditForwardingSettings>
 getAuditLogActions (value): () => Promise<{ actions: string[]; }>
 getAuditLogs (value): (filters?: AuditLogFilters) => Promise<AuditLogResponse>
 getBasePath (value): () => string
@@ -463,11 +455,11 @@ groupRailItems (value): (items: RailItemDef[]) => { group: RailGroup; items: Rai
 hasVisibleFields (value): (fields: PluginSettingsField[]) => boolean
 hostActionsFor (value): (all: HostActionDef[], host: Host, kind?: "open" | "connect") => HostActionDef[]
 hostBadgesFor (value): (all: HostBadgeDef[], host: Host) => HostBadgeDef[]
-hostKey (value): (host: Record<string, unknown>) => string
+hostEditorToolbarItemsFor (value): (all: HostBadgeDef[], host: Host) => HostBadgeDef[]
 hostMenuItemsFor (value): (all: HostContextMenuItemDef[], host: Host) => HostContextMenuItemDef[]
 hostProtocolFlags (value): (host: { enableSsh?: boolean; pluginSettings?: Record<string, Record<string, unknown>>; }, list?: HostProtocolDef[]) => HostProtocols
+hostStatusIndicatorsFor (value): (all: HostBadgeDef[], host: Host) => HostBadgeDef[]
 hydrateLocalSharedHostAuth (value): <T>(host: T) => Promise<T>
-importSSHConfigHosts (value): (content: string, overwrite?: boolean) => Promise<{ message: string; success: number; updated: number; skipped: number; failed: number; errors: string[]; }>
 invalidateHostsAndStatusCaches (value): () => void
 invalidateServerStatusCache (value): () => void
 isCoreRailView (value): (id: string) => boolean
@@ -492,7 +484,6 @@ makeUserAdmin (value): (userId: string) => Promise<Record<string, unknown>>
 mapCredentials (value): (res: unknown) => Credential[]
 markAdaptiveResourceUsed (value): (kind: AdaptiveTaskKind, action: string, now?: number) => void
 markTabSurfaceUsed (value): (type: TabType) => void
-maskSecrets (value): (payload: ExportPayload, pluginSecrets?: PluginSecretKeys) => ExportPayload
 moveRailItem (value): (items: RailItemDef[], id: string, beforeId: string) => string[]
 moveSplitDrag (value): (x: number, y: number) => void
 normalizeLanguageCode (value): (language?: string) => string
@@ -503,7 +494,6 @@ parseCustomKeybindings (value): (raw?: string) => CustomKeybinding[]
 parseServerTime (value): (ts: string) => Date
 pluginKey (value): { (pluginId: string, key: string): string; (pluginId: string, key: string): string; }
 pluginName (value): (t: Translator, plugin: { id: string; name: string; }) => string
-pluginSecretKeys (value): (summaries: { id: string; contributes?: { settings?: { host?: { fields?: { key: string; secretKeys?: string[]; }[]; }; }; }; }[]) => PluginSecretKeys
 pluginWsUrl (value): (pluginId: string, path: string, options?: { origin?: ConnectionOrigin; }) => Promise<WebSocketConnectionTarget>
 preloadTabSurface (value): (type: TabType) => void
 previewHostDefaultsLevel (value): (target: HostDefaultsTarget, change: HostDefaultsChange) => Promise<{ changedHosts: number; }>
@@ -576,8 +566,6 @@ tabJumpHotkeyKeys (value): () => string[]
 takePendingManageRequest (value): () => ManageRequest
 unlinkExternalFromPasswordAccount (value): (userId: string) => Promise<{ success: boolean; message: string; }>
 unlinkServer (value): (keepData: boolean) => Promise<SyncStatus>
-updateAuditForwarding (value): (url: string, token?: string) => Promise<{ url: string; hasToken: boolean; }>
-updateBranding (value): (update: BrandingSettingsUpdate) => Promise<BrandingSettings>
 updateCredential (value): (credentialId: number, credentialData: Record<string, unknown>) => Promise<Record<string, unknown>>
 updateExternalAutoProvision (value): (enabled: boolean) => Promise<Record<string, unknown>>
 updateFolderMetadata (value): (name: string, color?: string, icon?: string, credentialId?: number, localOnly?: boolean) => Promise<void>
@@ -613,8 +601,10 @@ useHostActions (value): () => HostActionDef[]
 useHostBadges (value): () => HostBadgeDef[]
 useHostContextMenuItems (value): () => HostContextMenuItemDef[]
 useHostEditorSections (value): () => HostEditorSectionDef[]
+useHostEditorToolbarItems (value): () => HostBadgeDef[]
 useHostProtocols (value): () => HostProtocolDef[]
 useHostStatus (value): (hostId: number, statusCheckEnabled?: boolean) => StatusValue
+useHostStatusIndicators (value): () => HostBadgeDef[]
 useInstalledPlugins (value): () => PluginSummary[]
 useIsDefaultsEditor (value): () => boolean
 useIsMobile (value): () => boolean

scripts/bundled-plugins.test.ts

@@ -276,6 +276,33 @@ describe("pinsFromIndex", () => {
     expect(pins[0]).not.toHaveProperty("onboarding");
   });
 
+  it("pins a release kept in gated", () => {
+    const pins = pinsFromIndex(
+      {
+        plugins: [
+          {
+            id: "look",
+            versions: [],
+            gated: [
+              {
+                version: "1.1.0-beta.1",
+                url: "https://example.test/look-1.1.0-beta.1.tmxplug",
+                sha256: "d".repeat(64),
+              },
+              {
+                version: "1.0.0",
+                url: "https://example.test/look-1.0.0.tmxplug",
+                sha256: "e".repeat(64),
+              },
+            ],
+          },
+        ],
+      },
+      null,
+    );
+    expect(pins[0].url).toBe("https://example.test/look-1.0.0.tmxplug");
+  });
+
   it("pins only the ids asked for", () => {
     expect(pinsFromIndex(index, ["beta"]).map((pin) => pin.id)).toEqual([
       "beta",

scripts/check-core-plugin-ids.cjs

@@ -32,14 +32,18 @@ const OFFICIAL_IDS = [
   "acme-ssl",
   "ai",
   "alerts",
+  "audit-tools",
   "automations",
   "classic-layout",
   "classic-themes",
+  "credential-tools",
   "docker",
   "file-manager",
   "fleets",
   "homepage",
   "host-metrics",
+  "host-status",
+  "import-export",
   "ldap",
   "network-topology",
   "opkssh",

scripts/check-sdk-ui-exports.cjs

@@ -136,13 +136,11 @@ const ALLOWED = [
   "DropdownMenuTrigger",
   "EditingWidth",
   "EmptyState",
-  "ExportPayload",
   "FOLDER_COLORS",
   "FONT_SIZES",
   "Facts",
   "FakeSwitch",
   "Field",
-  "FieldGroup",
   "FieldPair",
   "FolderAccessRule",
   "FolderIconEl",
@@ -235,6 +233,7 @@ const ALLOWED = [
   "PasswordInput",
   "PermissionCatalogEntry",
   "PluginComponent",
+  "PRESETS",
   "PluginIcon",
   "PluginSettingsErrors",
   "PluginSettingsField",
@@ -369,9 +368,7 @@ const ALLOWED = [
   "applyUiFont",
   "assignRoleToUser",
   "beginSplitDrag",
-  "buildExportPayload",
   "buildOriginWsUrl",
-  "bulkImportSSHHosts",
   "bulkUpdateSSHHosts",
   "canConfigureUpdates",
   "canJoinSplit",
@@ -400,22 +397,17 @@ const ALLOWED = [
   "deleteRole",
   "deleteSSHHost",
   "deleteUser",
-  "deployCredentialToHost",
   "desktopUpdates",
   "docsUrl",
   "duplicateCredential",
   "enabledHostProtocols",
   "endSplitDrag",
-  "exportAllSSHHosts",
   "filterPaletteItems",
   "findCoreHostDefault",
   "findMatchingKeybinding",
-  "generateKeyPair",
-  "generatePublicKeyFromPrivate",
   "getActiveSessions",
   "getAdaptiveResourceBudget",
   "getApiKeys",
-  "getAuditForwarding",
   "getAuditLogActions",
   "getAuditLogs",
   "getBasePath",
@@ -484,11 +476,11 @@ const ALLOWED = [
   "hasVisibleFields",
   "hostActionsFor",
   "hostBadgesFor",
-  "hostKey",
+  "hostEditorToolbarItemsFor",
   "hostMenuItemsFor",
   "hostProtocolFlags",
+  "hostStatusIndicatorsFor",
   "hydrateLocalSharedHostAuth",
-  "importSSHConfigHosts",
   "invalidateHostsAndStatusCaches",
   "invalidateServerStatusCache",
   "isCoreRailView",
@@ -513,7 +505,6 @@ const ALLOWED = [
   "mapCredentials",
   "markAdaptiveResourceUsed",
   "markTabSurfaceUsed",
-  "maskSecrets",
   "moveRailItem",
   "moveSplitDrag",
   "normalizeLanguageCode",
@@ -524,7 +515,6 @@ const ALLOWED = [
   "parseServerTime",
   "pluginKey",
   "pluginName",
-  "pluginSecretKeys",
   "pluginWsUrl",
   "preloadTabSurface",
   "previewHostDefaultsLevel",
@@ -597,8 +587,6 @@ const ALLOWED = [
   "takePendingManageRequest",
   "unlinkExternalFromPasswordAccount",
   "unlinkServer",
-  "updateAuditForwarding",
-  "updateBranding",
   "updateCredential",
   "updateExternalAutoProvision",
   "updateFolderMetadata",
@@ -633,6 +621,8 @@ const ALLOWED = [
   "useHostActions",
   "useHostBadges",
   "useHostContextMenuItems",
+  "useHostEditorToolbarItems",
+  "useHostStatusIndicators",
   "useHostEditorSections",
   "useHostProtocols",
   "useHostStatus",

scripts/electron-backend-ready.test.ts

@@ -48,7 +48,11 @@ function start() {
       writeFileSync: vi.fn(),
     },
     fork: () => child,
-    app: { isPackaged: true, getVersion: () => "2.9.0" },
+    app: {
+      isPackaged: true,
+      getVersion: () => "2.9.0",
+      getPath: () => "/user-data",
+    },
     process: { env: { LOG_LEVEL: "error" } },
     isDev: false,
     appRoot: "/app",

scripts/electron-external-editor.test.ts

@@ -1,40 +0,0 @@
-import { createRequire } from "node:module";
-import { describe, expect, it } from "vitest";
-
-const require = createRequire(import.meta.url);
-const { isLaunchableFileName } = require("../electron/external-editor.cjs") as {
-  isLaunchableFileName: (fileName: unknown) => boolean;
-};
-
-describe("Electron external editor", () => {
-  it("refuses remote file names the OS would run instead of open", () => {
-    for (const name of [
-      "payload.exe",
-      "run.BAT",
-      "script.ps1",
-      "a.exe. ",
-      "a.cmd...",
-      "../../evil.vbs",
-      "start.command",
-      "launch.desktop",
-      "install.sh",
-    ]) {
-      expect(isLaunchableFileName(name)).toBe(true);
-    }
-  });
-
-  it("opens ordinary text files", () => {
-    for (const name of [
-      "nginx.conf",
-      "README.md",
-      "Dockerfile",
-      ".bashrc",
-      "config.json",
-      "index.ts",
-      "",
-      undefined,
-    ]) {
-      expect(isLaunchableFileName(name)).toBe(false);
-    }
-  });
-});

scripts/electron-security-boundary.test.ts

@@ -39,12 +39,24 @@ describe("Electron security boundary", () => {
     }
   });
 
-  it("launches only the editor saved from a file dialog", () => {
-    expect(main).not.toContain("fileData?.editorPath");
-    expect(main).toContain("readSetting(EXTERNAL_EDITOR_SETTING)");
+  it("saves an external editor only if it was chosen in a file dialog", () => {
     expect(main).toContain("dialogChosenPaths.has(value)");
   });
 
+  it("keeps local files, the local terminal and the external editor out of Electron", () => {
+    for (const channel of [
+      "open-external-editor",
+      "close-external-editor",
+      "local-terminal-start",
+      "local-fs:",
+      "local-transfer:",
+      "list-local-directory",
+    ]) {
+      expect(main).not.toContain(channel);
+      expect(preload).not.toContain(channel);
+    }
+  });
+
   it("scopes proxy headers and basic auth to the linked origin", () => {
     expect(main).toContain('"sync-proxy-config"');
     expect(main).toContain("linkedServer.applyLinkHeaders(");

scripts/lib/bundled-plugins.cjs

@@ -25,6 +25,7 @@
 const crypto = require("node:crypto");
 const fs = require("node:fs");
 const path = require("node:path");
+const semver = require("semver");
 
 const ID = /^[a-z0-9][a-z0-9-]*$/;
 const ENV_NAME = /^[A-Z][A-Z0-9_]*$/;
@@ -251,7 +252,12 @@ function pinsFromIndex(index, ids, current = []) {
   const currentById = new Map(current.map((entry) => [entry.id, entry]));
   const wanted = ids ?? plugins.map((plugin) => plugin.id);
   return [...wanted].sort().map((id) => {
-    const latest = byId.get(id)?.versions?.[0];
+    const listed = byId.get(id);
+    // gated holds releases that need a newer Termix than old builds check for.
+    const latest = [...(listed?.versions ?? []), ...(listed?.gated ?? [])]
+      .filter((entry) => semver.valid(entry.version))
+      .filter((entry) => !semver.prerelease(entry.version))
+      .sort((a, b) => semver.rcompare(a.version, b.version))[0];
     if (!latest) throw new Error(`${id} is not in the registry index`);
     const onboarding = currentById.get(id)?.onboarding;
     const defaultLook = currentById.get(id)?.defaultLook === true;

src/backend/database/db/index.ts

@@ -370,17 +370,6 @@ async function initializeCompleteDatabase(): Promise<void> {
         FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
     );
 
-    CREATE TABLE IF NOT EXISTS recent_activity (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        user_id TEXT NOT NULL,
-        type TEXT NOT NULL,
-        host_id INTEGER NOT NULL,
-        host_name TEXT,
-        timestamp TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE,
-        FOREIGN KEY (host_id) REFERENCES ssh_data (id) ON DELETE CASCADE
-    );
-
     CREATE TABLE IF NOT EXISTS host_access (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         host_id INTEGER NOT NULL,

src/backend/database/db/performance-indexes.ts

@@ -98,12 +98,7 @@ export const PERFORMANCE_INDEXES: PerformanceIndex[] = [
     columns: "user_id",
   },
 
-  // Per-user history and file manager surfaces.
-  {
-    name: "idx_recent_activity_user_ts",
-    table: "recent_activity",
-    columns: "user_id, timestamp",
-  },
+  // Per-user open tabs.
   {
     name: "idx_user_open_tabs_user_id",
     table: "user_open_tabs",

src/backend/database/db/schema.mysql.ts

@@ -414,28 +414,6 @@ export const hostDefaults = mysqlTable(
   ],
 );
 
-export const recentActivity = mysqlTable(
-  "recent_activity",
-  {
-    id: int("id").autoincrement().primaryKey(),
-    userId: varchar("user_id", { length: 255 })
-      .notNull()
-      .references(() => users.id, { onDelete: "cascade" }),
-    type: text("type").notNull(),
-    hostId: int("host_id")
-      .notNull()
-      .references(() => hosts.id, { onDelete: "cascade" }),
-    hostName: text("host_name"),
-    timestamp: varchar("timestamp", { length: 255 })
-      .notNull()
-      .default(sql`(CURRENT_TIMESTAMP)`),
-  },
-  // Always read newest-first for one user, so timestamp follows user_id.
-  (table) => [
-    index("idx_recent_activity_user_ts").on(table.userId, table.timestamp),
-  ],
-);
-
 export const hostAccess = mysqlTable(
   "host_access",
   {

src/backend/database/db/schema.pg.ts

@@ -414,28 +414,6 @@ export const hostDefaults = pgTable(
   ],
 );
 
-export const recentActivity = pgTable(
-  "recent_activity",
-  {
-    id: serial("id").primaryKey(),
-    userId: varchar("user_id", { length: 255 })
-      .notNull()
-      .references(() => users.id, { onDelete: "cascade" }),
-    type: text("type").notNull(),
-    hostId: integer("host_id")
-      .notNull()
-      .references(() => hosts.id, { onDelete: "cascade" }),
-    hostName: text("host_name"),
-    timestamp: varchar("timestamp", { length: 255 })
-      .notNull()
-      .default(sql`CURRENT_TIMESTAMP`),
-  },
-  // Always read newest-first for one user, so timestamp follows user_id.
-  (table) => [
-    index("idx_recent_activity_user_ts").on(table.userId, table.timestamp),
-  ],
-);
-
 export const hostAccess = pgTable(
   "host_access",
   {

src/backend/database/db/schema.ts

@@ -404,28 +404,6 @@ export const hostDefaults = sqliteTable(
   ],
 );
 
-export const recentActivity = sqliteTable(
-  "recent_activity",
-  {
-    id: integer("id").primaryKey({ autoIncrement: true }),
-    userId: text("user_id")
-      .notNull()
-      .references(() => users.id, { onDelete: "cascade" }),
-    type: text("type").notNull(),
-    hostId: integer("host_id")
-      .notNull()
-      .references(() => hosts.id, { onDelete: "cascade" }),
-    hostName: text("host_name"),
-    timestamp: text("timestamp")
-      .notNull()
-      .default(sql`CURRENT_TIMESTAMP`),
-  },
-  // Always read newest-first for one user, so timestamp follows user_id.
-  (table) => [
-    index("idx_recent_activity_user_ts").on(table.userId, table.timestamp),
-  ],
-);
-
 export const hostAccess = sqliteTable(
   "host_access",
   {

src/backend/database/repositories/factory.ts

@@ -23,7 +23,6 @@ import { PluginPermissionGrantRepository } from "./plugin-permission-grant-repos
 import { UserAuthRepository } from "./user-auth-repository.js";
 import { RbacAccessRepository } from "./rbac-access-repository.js";
 import { RbacPermissionRepository } from "./rbac-permission-repository.js";
-import { RecentActivityRepository } from "./recent-activity-repository.js";
 import { RoleRepository } from "./role-repository.js";
 import { SessionRepository } from "./session-repository.js";
 import { CredentialAccessRepository } from "./credential-access-repository.js";
@@ -269,13 +268,6 @@ export function createCurrentRbacAccessRepository(): RbacAccessRepository {
   );
 }
 
-export function createCurrentRecentActivityRepository(): RecentActivityRepository {
-  return new RecentActivityRepository(
-    createCurrentRepositoryContext(),
-    createCurrentRepositoryWriteHook("recent_activity_repository_write"),
-  );
-}
-
 export function createCurrentRoleRepository(): RoleRepository {
   return new RoleRepository(
     createCurrentRepositoryContext(),

src/backend/database/repositories/recent-activity-repository.ts

@@ -1,107 +0,0 @@
-import { desc, eq, inArray } from "drizzle-orm";
-import { recentActivity } from "../db/schema.js";
-import type { DatabaseContext } from "./database-context.js";
-import { rowsAffected } from "./mutation-result.js";
-import { insertReturning } from "./returning.js";
-
-export type RecentActivityRecord = typeof recentActivity.$inferSelect;
-export type NewRecentActivityRecord = typeof recentActivity.$inferInsert;
-
-export class RecentActivityRepository {
-  constructor(
-    private readonly context: DatabaseContext,
-    private readonly onWrite?: () => void | Promise<void>,
-  ) {}
-
-  async listByUserId(
-    userId: string,
-    limit: number,
-  ): Promise<RecentActivityRecord[]> {
-    return this.context.drizzle
-      .select()
-      .from(recentActivity)
-      .where(eq(recentActivity.userId, userId))
-      .orderBy(desc(recentActivity.timestamp))
-      .limit(limit);
-  }
-
-  async create(
-    activity: NewRecentActivityRecord,
-  ): Promise<RecentActivityRecord> {
-    const rows = await insertReturning(this.context, recentActivity, activity);
-
-    await this.afterWrite();
-    return rows[0];
-  }
-
-  async trimUserActivity(userId: string, keepCount: number): Promise<number> {
-    const rows = await this.context.drizzle
-      .select({ id: recentActivity.id })
-      .from(recentActivity)
-      .where(eq(recentActivity.userId, userId))
-      .orderBy(desc(recentActivity.timestamp));
-
-    const idsToDelete = rows
-      .slice(keepCount)
-      .map((row) => row.id)
-      .filter((id) => typeof id === "number");
-
-    if (idsToDelete.length === 0) {
-      return 0;
-    }
-
-    const result = await this.context.drizzle
-      .delete(recentActivity)
-      .where(inArray(recentActivity.id, idsToDelete));
-
-    if (rowsAffected(result) > 0) {
-      await this.afterWrite();
-    }
-
-    return rowsAffected(result);
-  }
-
-  async deleteByUserId(userId: string): Promise<number> {
-    const result = await this.context.drizzle
-      .delete(recentActivity)
-      .where(eq(recentActivity.userId, userId));
-
-    if (rowsAffected(result) > 0) {
-      await this.afterWrite();
-    }
-
-    return rowsAffected(result);
-  }
-
-  async deleteByHostId(hostId: number): Promise<number> {
-    const result = await this.context.drizzle
-      .delete(recentActivity)
-      .where(eq(recentActivity.hostId, hostId));
-
-    if (rowsAffected(result) > 0) {
-      await this.afterWrite();
-    }
-
-    return rowsAffected(result);
-  }
-
-  async deleteByHostIds(hostIds: number[]): Promise<number> {
-    if (hostIds.length === 0) {
-      return 0;
-    }
-
-    const result = await this.context.drizzle
-      .delete(recentActivity)
-      .where(inArray(recentActivity.hostId, hostIds));
-
-    if (rowsAffected(result) > 0) {
-      await this.afterWrite();
-    }
-
-    return rowsAffected(result);
-  }
-
-  private async afterWrite(): Promise<void> {
-    await this.onWrite?.();
-  }
-}

src/backend/database/routes/audit-log-routes.ts

@@ -5,12 +5,6 @@ import {
   createCurrentUserRepository,
 } from "../repositories/factory.js";
 import { apiLogger } from "../../utils/logger.js";
-import { exportFilename, toCsv, toNdjson } from "../../utils/audit-export.js";
-import {
-  logAudit,
-  getAuditUsername,
-  getRequestMeta,
-} from "../../utils/audit-logger.js";
 
 async function isAdminUser(userId: string | undefined): Promise<boolean> {
   if (!userId) return false;
@@ -138,125 +132,4 @@ export function registerAuditLogRoutes(
         .json({ error: "Failed to fetch audit log actions" });
     }
   });
-
-  /**
-   * @openapi
-   * /audit-logs/export:
-   *   get:
-   *     summary: Export audit logs
-   *     description: Streams the full filtered result set as CSV or NDJSON. Accepts the same filters as GET /audit-logs. Admin only. The export is itself audited.
-   *     tags:
-   *       - Audit
-   *     parameters:
-   *       - in: query
-   *         name: format
-   *         schema: { type: string, enum: [csv, ndjson], default: csv }
-   *       - in: query
-   *         name: userId
-   *         schema: { type: string }
-   *       - in: query
-   *         name: action
-   *         schema: { type: string }
-   *       - in: query
-   *         name: resourceType
-   *         schema: { type: string }
-   *       - in: query
-   *         name: success
-   *         schema: { type: string, enum: [true, false] }
-   *       - in: query
-   *         name: startDate
-   *         schema: { type: string, format: date-time }
-   *       - in: query
-   *         name: endDate
-   *         schema: { type: string, format: date-time }
-   *     responses:
-   *       200:
-   *         description: Audit log file.
-   *       403:
-   *         description: Not authorized.
-   *       500:
-   *         description: Failed to export audit logs.
-   */
-  router.get("/audit-logs/export", authenticateJWT, async (req, res) => {
-    const authReq = req as AuthenticatedRequest;
-    try {
-      if (!(await isAdminUser(authReq.userId))) {
-        return res.status(403).json({ error: "Not authorized" });
-      }
-
-      const format = req.query.format === "ndjson" ? "ndjson" : "csv";
-      const { userId, action, resourceType, success, startDate, endDate } =
-        req.query as Record<string, string | undefined>;
-      const filters = {
-        userId,
-        action,
-        resourceType,
-        success:
-          success !== undefined && success !== ""
-            ? success === "true"
-            : undefined,
-        startDate,
-        endDate,
-      };
-
-      res.setHeader(
-        "Content-Type",
-        format === "csv" ? "text/csv; charset=utf-8" : "application/x-ndjson",
-      );
-      res.setHeader(
-        "Content-Disposition",
-        `attachment; filename="${exportFilename(format, new Date())}"`,
-      );
-
-      // Streamed in batches: an export is unbounded by definition, and the
-      // whole point is to move data out before retention drops it.
-      const BATCH = 500;
-      let offset = 0;
-      let exported = 0;
-
-      for (;;) {
-        const rows = await createCurrentAuditLogRepository().listForExport({
-          filters,
-          limit: BATCH,
-          offset,
-        });
-        if (rows.length === 0) break;
-
-        if (format === "csv") {
-          // Header only on the first batch.
-          const chunk = toCsv(rows);
-          res.write(
-            offset === 0 ? chunk : chunk.slice(chunk.indexOf("\n") + 1),
-          );
-        } else {
-          res.write(toNdjson(rows));
-        }
-
-        exported += rows.length;
-        offset += rows.length;
-        if (rows.length < BATCH) break;
-      }
-
-      res.end();
-
-      // Reading the whole trail is itself worth recording.
-      const { ipAddress, userAgent } = getRequestMeta(req);
-      void logAudit({
-        userId: authReq.userId!,
-        username: await getAuditUsername(authReq.userId!),
-        action: "export_audit_logs",
-        resourceType: "audit_log",
-        details: JSON.stringify({ format, exported, filters }),
-        ipAddress,
-        userAgent,
-        success: true,
-      });
-    } catch (err) {
-      apiLogger.error("Failed to export audit logs", err);
-      if (!res.headersSent) {
-        return res.status(500).json({ error: "Failed to export audit logs" });
-      }
-      res.end();
-    }
-  });
 }

src/backend/database/routes/branding-routes.ts

@@ -1,98 +1,9 @@
-import type { Request, RequestHandler, Response, Router } from "express";
+import type { Request, Response, Router } from "express";
 import { databaseLogger } from "../../utils/logger.js";
 import { createCurrentSettingsRepository } from "../repositories/factory.js";
-import {
-  BRANDING_KEYS,
-  parseBrandingAppName,
-  parseBrandingLogoDataUrl,
-  parseBrandingTagline,
-  resolveBrandingSettings,
-} from "./branding-settings.js";
+import { resolveBrandingSettings } from "./branding-settings.js";
 
-const PATCHABLE_FIELDS = ["appName", "tagline", "logo"] as const;
-type PatchableField = (typeof PATCHABLE_FIELDS)[number];
-
-function invalidField(res: Response, field: string): void {
-  res.status(400).json({
-    error: `Invalid value for ${field}`,
-    code: "BRANDING_SETTINGS_INVALID",
-    field,
-  });
-}
-
-/**
- * Validates a PATCH body and returns the settings-table writes/deletes it
- * implies, or null after the response has already been failed with a 400.
- * `logo: null` clears the custom logo (falls back to the bundled default).
- */
-async function buildBrandingWrites(
-  body: unknown,
-  res: Response,
-): Promise<{
-  writes: Array<{ key: string; value: string }>;
-  deletes: string[];
-} | null> {
-  if (typeof body !== "object" || body === null || Array.isArray(body)) {
-    res.status(400).json({
-      error: "Invalid request body",
-      code: "BRANDING_SETTINGS_INVALID",
-    });
-    return null;
-  }
-
-  for (const field of Object.keys(body)) {
-    if (!(PATCHABLE_FIELDS as readonly string[]).includes(field)) {
-      res.status(400).json({
-        error: `Unknown setting field: ${field}`,
-        code: "BRANDING_SETTINGS_UNKNOWN_FIELD",
-        field,
-      });
-      return null;
-    }
-  }
-
-  const input = body as Partial<Record<PatchableField, unknown>>;
-  const writes: Array<{ key: string; value: string }> = [];
-  const deletes: string[] = [];
-
-  if (input.appName !== undefined) {
-    const appName = parseBrandingAppName(input.appName);
-    if (appName === null) {
-      invalidField(res, "appName");
-      return null;
-    }
-    writes.push({ key: BRANDING_KEYS.appName, value: appName });
-  }
-
-  if (input.tagline !== undefined) {
-    const tagline = parseBrandingTagline(input.tagline);
-    if (tagline === null) {
-      invalidField(res, "tagline");
-      return null;
-    }
-    writes.push({ key: BRANDING_KEYS.tagline, value: tagline });
-  }
-
-  if (input.logo !== undefined) {
-    if (input.logo === null) {
-      deletes.push(BRANDING_KEYS.logo);
-    } else {
-      const logo = await parseBrandingLogoDataUrl(input.logo);
-      if (logo === null) {
-        invalidField(res, "logo");
-        return null;
-      }
-      writes.push({ key: BRANDING_KEYS.logo, value: logo });
-    }
-  }
-
-  return { writes, deletes };
-}
-
-export function registerBrandingRoutes(
-  router: Router,
-  requireAdmin: RequestHandler,
-): void {
+export function registerBrandingRoutes(router: Router): void {
   /**
    * @openapi
    * /users/branding:
@@ -118,48 +29,4 @@ export function registerBrandingRoutes(
       res.status(500).json({ error: "Failed to load branding settings" });
     }
   });
-
-  /**
-   * @openapi
-   * /users/branding:
-   *   patch:
-   *     summary: Update white-label branding (admin only)
-   *     description: Persists a partial update to appName, tagline and/or logo (a PNG/JPEG/WEBP data URL; pass null to clear the logo). Invalid values are rejected with a 400.
-   *     tags:
-   *       - Users
-   *     responses:
-   *       200:
-   *         description: Updated effective branding settings.
-   *       400:
-   *         description: Invalid or unknown setting field.
-   *       401:
-   *         description: Not authenticated.
-   *       403:
-   *         description: Admin access required.
-   *       500:
-   *         description: Failed to save branding settings.
-   */
-  router.patch(
-    "/branding",
-    requireAdmin,
-    async (req: Request, res: Response) => {
-      const result = await buildBrandingWrites(req.body, res);
-      if (result === null) return;
-
-      try {
-        const settings = createCurrentSettingsRepository();
-        if (result.writes.length > 0) {
-          await settings.setMany(result.writes);
-        }
-        for (const key of result.deletes) {
-          await settings.delete(key);
-        }
-        const resolved = await resolveBrandingSettings(settings);
-        res.json(resolved);
-      } catch (err) {
-        databaseLogger.error("Failed to save branding settings", err);
-        res.status(500).json({ error: "Failed to save branding settings" });
-      }
-    },
-  );
 }

src/backend/database/routes/branding-settings.ts

@@ -1,5 +1,4 @@
-import sharp from "sharp";
-import { databaseLogger } from "../../utils/logger.js";
+import { consumeByName } from "../../plugins/registry.js";
 
 /**
  * White-label branding: admin-configurable app name, logo and tagline shown
@@ -20,25 +19,33 @@ export const BRANDING_KEYS = {
 } as const;
 
 export const BRANDING_DEFAULT_APP_NAME = "Termix";
-const APP_NAME_MAX_LENGTH = 60;
-const TAGLINE_MAX_LENGTH = 160;
-
-/**
- * Cap applies to the decoded image bytes, not the base64 text. The settings
- * table is fully cached in memory per backend process (see
- * settings-cache.ts), so an oversized logo would be permanently resident RAM
- * on every instance, not just a one-time upload cost.
- */
-export const BRANDING_LOGO_MAX_BYTES = 750 * 1024;
-const BRANDING_LOGO_MAX_INPUT_PIXELS = 20_000_000;
 
 interface SettingSource {
   get(key: string): Promise<string | null>;
 }
 
+export const BRANDING_PROVIDER_NAME = "brandingProvider";
+
+/** A plugin supplies branding by providing "<its id>.brandingProvider". */
+export type BrandingProvider = () =>
+  Promise<BrandingSettings> | BrandingSettings;
+
 export async function resolveBrandingSettings(
   settings: SettingSource,
 ): Promise<BrandingSettings> {
+  const provider = consumeByName<BrandingProvider>(BRANDING_PROVIDER_NAME);
+  if (provider) {
+    try {
+      const provided = await provider();
+      return {
+        appName: provided.appName?.trim() || BRANDING_DEFAULT_APP_NAME,
+        tagline: provided.tagline ?? "",
+        logo: provided.logo || null,
+      };
+    } catch {
+      // A broken provider falls back to the stored settings.
+    }
+  }
   const [appName, tagline, logo] = await Promise.all([
     settings.get(BRANDING_KEYS.appName),
     settings.get(BRANDING_KEYS.tagline),
@@ -53,74 +60,3 @@ export async function resolveBrandingSettings(
 }
 
 /** Trimmed, 1-60 chars. Falls back to the default when cleared. */
-export function parseBrandingAppName(value: unknown): string | null {
-  if (typeof value !== "string") return null;
-  const trimmed = value.trim();
-  if (trimmed.length === 0) return BRANDING_DEFAULT_APP_NAME;
-  if (trimmed.length > APP_NAME_MAX_LENGTH) return null;
-  return trimmed;
-}
-
-/** Trimmed, 0-160 chars. An empty string means "use the built-in default". */
-export function parseBrandingTagline(value: unknown): string | null {
-  if (typeof value !== "string") return null;
-  const trimmed = value.trim();
-  if (trimmed.length > TAGLINE_MAX_LENGTH) return null;
-  return trimmed;
-}
-
-/**
- * Validates and re-encodes an uploaded logo. Only raster formats are
- * accepted (no SVG), sidestepping SVG-script XSS entirely rather than trying
- * to sanitize markup. The image is always re-encoded to PNG through sharp:
- * this both proves the payload is a genuine image (not a disguised file
- * behind a spoofed data-URL prefix) and strips any embedded metadata.
- *
- * Returns null on any validation failure; the caller is expected to reject
- * the request with a 400 without echoing back details of what was rejected.
- */
-export async function parseBrandingLogoDataUrl(
-  value: unknown,
-): Promise<string | null> {
-  if (typeof value !== "string") return null;
-  const match = value.match(
-    /^data:image\/(png|jpe?g|webp);base64,([a-zA-Z0-9+/]+=*)$/,
-  );
-  if (!match) return null;
-
-  const [, , base64] = match;
-  let buffer: Buffer;
-  try {
-    buffer = Buffer.from(base64, "base64");
-  } catch {
-    return null;
-  }
-  if (buffer.length === 0 || buffer.length > BRANDING_LOGO_MAX_BYTES * 4) {
-    // Reject wildly oversized input before decoding it with sharp; the final
-    // size check happens below on the re-encoded PNG.
-    return null;
-  }
-
-  try {
-    const source = sharp(buffer, {
-      failOn: "error",
-      limitInputPixels: BRANDING_LOGO_MAX_INPUT_PIXELS,
-    });
-    const metadata = await source.metadata();
-    if (
-      !metadata.format ||
-      !["png", "jpeg", "webp"].includes(metadata.format)
-    ) {
-      return null;
-    }
-    const normalized = await source.rotate().png().toBuffer();
-    if (normalized.length > BRANDING_LOGO_MAX_BYTES) return null;
-    return `data:image/png;base64,${normalized.toString("base64")}`;
-  } catch (err) {
-    databaseLogger.warn("Rejected invalid branding logo upload", {
-      operation: "branding_logo_invalid",
-      error: err instanceof Error ? err.message : String(err),
-    });
-    return null;
-  }
-}

src/backend/database/routes/credential-deploy-routes.ts

@@ -1,436 +0,0 @@
-import { getErrorMessage } from "../../utils/error-message.js";
-import type {
-  AuthenticatedRequest,
-  CredentialBackend,
-} from "../../../types/index.js";
-import type { Request, RequestHandler, Response, Router } from "express";
-import type { Client as SshClient } from "ssh2";
-import { createCurrentHostResolutionRepository } from "../repositories/factory.js";
-import { connectHost } from "../../hosts/connect/connect-host.js";
-import type { SshConnectHost } from "../../hosts/connect/types.js";
-import { resolveHostById } from "../../hosts/host-resolver.js";
-import { isSecretReference } from "../../hosts/external-secrets.js";
-import { resolveKeyReferences } from "../../hosts/stored-ssh-key.js";
-import { parseSSHKey } from "../../utils/ssh-key-utils.js";
-
-function describeDeployError(err: unknown): string {
-  const message = getErrorMessage(err, "Connection failed");
-  if (message.includes("All configured authentication methods failed")) {
-    return "Authentication failed. Please check your credentials and ensure the SSH service is running.";
-  }
-  if (message.includes("ENOTFOUND") || message.includes("ENOENT")) {
-    return "Could not resolve hostname or connect to server.";
-  }
-  if (message.includes("ECONNREFUSED")) {
-    return "Connection refused. The server may not be running or the port may be incorrect.";
-  }
-  if (message.includes("ETIMEDOUT")) {
-    return "Connection timed out. Check your network connection and server availability.";
-  }
-  if (
-    message.includes("authentication failed") ||
-    message.includes("Permission denied")
-  ) {
-    return "Authentication failed. Please check your username and password/key.";
-  }
-  if (message === "SSH connection timeout") return "Connection timeout";
-  return message;
-}
-
-async function deploySSHKeyToHost(
-  host: SshConnectHost,
-  userId: string,
-  credData: CredentialBackend,
-): Promise<{ success: boolean; message?: string; error?: string }> {
-  const publicKey = credData.publicKey as string;
-
-  let conn: SshClient;
-  try {
-    ({ client: conn } = await connectHost(host, {
-      userId,
-      purpose: "credential-deploy",
-      timeoutMs: 120000,
-    }));
-  } catch (error) {
-    return { success: false, error: describeDeployError(error) };
-  }
-
-  return new Promise((resolve) => {
-    void (async () => {
-      try {
-        await new Promise<void>((resolveCmd, rejectCmd) => {
-          const cmdTimeout = setTimeout(() => {
-            rejectCmd(new Error("mkdir command timeout"));
-          }, 10000);
-
-          conn.exec(
-            "test -d ~/.ssh || mkdir -p ~/.ssh; chmod 700 ~/.ssh",
-            (err, stream) => {
-              if (err) {
-                clearTimeout(cmdTimeout);
-                return rejectCmd(err);
-              }
-
-              stream.on("close", (code) => {
-                clearTimeout(cmdTimeout);
-                if (code === 0) {
-                  resolveCmd();
-                } else {
-                  rejectCmd(
-                    new Error(`mkdir command failed with code ${code}`),
-                  );
-                }
-              });
-
-              stream.on("data", () => {
-                // Ignore output
-              });
-            },
-          );
-        });
-
-        const keyExists = await new Promise<boolean>(
-          (resolveCheck, rejectCheck) => {
-            const checkTimeout = setTimeout(() => {
-              rejectCheck(new Error("Key check timeout"));
-            }, 5000);
-
-            let actualPublicKey = publicKey;
-            try {
-              const parsed = JSON.parse(publicKey);
-              if (parsed.data) {
-                actualPublicKey = parsed.data;
-              }
-            } catch {
-              // Ignore parse errors
-            }
-
-            const keyParts = actualPublicKey.trim().split(" ");
-            if (keyParts.length < 2) {
-              clearTimeout(checkTimeout);
-              return rejectCheck(
-                new Error(
-                  "Invalid public key format - must contain at least 2 parts",
-                ),
-              );
-            }
-
-            const keyPattern = keyParts[1];
-            if (!/^[A-Za-z0-9+/]+={0,2}$/.test(keyPattern)) {
-              clearTimeout(checkTimeout);
-              return rejectCheck(new Error("Invalid public key data"));
-            }
-
-            conn.exec(
-              `if [ -f ~/.ssh/authorized_keys ]; then grep -F "${keyPattern}" ~/.ssh/authorized_keys >/dev/null 2>&1; echo $?; else echo 1; fi`,
-              (err, stream) => {
-                if (err) {
-                  clearTimeout(checkTimeout);
-                  return rejectCheck(err);
-                }
-
-                let output = "";
-                stream.on("data", (data) => {
-                  output += data.toString();
-                });
-
-                stream.on("close", () => {
-                  clearTimeout(checkTimeout);
-                  const exists = output.trim() === "0";
-                  resolveCheck(exists);
-                });
-              },
-            );
-          },
-        );
-
-        if (keyExists) {
-          conn.end();
-          resolve({ success: true, message: "SSH key already deployed" });
-          return;
-        }
-
-        await new Promise<void>((resolveAdd, rejectAdd) => {
-          const addTimeout = setTimeout(() => {
-            rejectAdd(new Error("Key add timeout"));
-          }, 30000);
-
-          let actualPublicKey = publicKey;
-          try {
-            const parsed = JSON.parse(publicKey);
-            if (parsed.data) {
-              actualPublicKey = parsed.data;
-            }
-          } catch {
-            // Ignore parse errors
-          }
-
-          const escapedKey = actualPublicKey
-            .replace(/\\/g, "\\\\")
-            .replace(/'/g, "'\\''");
-          const escapedName = credData.name
-            .replace(/\\/g, "\\\\")
-            .replace(/'/g, "'\\''");
-
-          conn.exec(
-            `printf '%s\n' '${escapedKey} ${escapedName}@Termix' >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys`,
-            (err, stream) => {
-              if (err) {
-                clearTimeout(addTimeout);
-                return rejectAdd(err);
-              }
-
-              stream.on("data", () => {
-                // Consume output
-              });
-
-              stream.on("close", (code) => {
-                clearTimeout(addTimeout);
-                if (code === 0) {
-                  resolveAdd();
-                } else {
-                  rejectAdd(
-                    new Error(`Key deployment failed with code ${code}`),
-                  );
-                }
-              });
-            },
-          );
-        });
-
-        const verifySuccess = await new Promise<boolean>(
-          (resolveVerify, rejectVerify) => {
-            const verifyTimeout = setTimeout(() => {
-              rejectVerify(new Error("Key verification timeout"));
-            }, 5000);
-
-            let actualPublicKey = publicKey;
-            try {
-              const parsed = JSON.parse(publicKey);
-              if (parsed.data) {
-                actualPublicKey = parsed.data;
-              }
-            } catch {
-              // Ignore parse errors
-            }
-
-            const keyParts = actualPublicKey.trim().split(" ");
-            if (keyParts.length < 2) {
-              clearTimeout(verifyTimeout);
-              return rejectVerify(
-                new Error(
-                  "Invalid public key format - must contain at least 2 parts",
-                ),
-              );
-            }
-
-            const keyPattern = keyParts[1];
-            if (!/^[A-Za-z0-9+/]+={0,2}$/.test(keyPattern)) {
-              clearTimeout(verifyTimeout);
-              return rejectVerify(new Error("Invalid public key data"));
-            }
-            conn.exec(
-              `grep -F "${keyPattern}" ~/.ssh/authorized_keys >/dev/null 2>&1; echo $?`,
-              (err, stream) => {
-                if (err) {
-                  clearTimeout(verifyTimeout);
-                  return rejectVerify(err);
-                }
-
-                let output = "";
-                stream.on("data", (data) => {
-                  output += data.toString();
-                });
-
-                stream.on("close", () => {
-                  clearTimeout(verifyTimeout);
-                  const verified = output.trim() === "0";
-                  resolveVerify(verified);
-                });
-              },
-            );
-          },
-        );
-
-        conn.end();
-
-        if (verifySuccess) {
-          resolve({ success: true, message: "SSH key deployed successfully" });
-        } else {
-          resolve({
-            success: false,
-            error: "Key deployment verification failed",
-          });
-        }
-      } catch (error) {
-        conn.end();
-        resolve({
-          success: false,
-          error: getErrorMessage(error, "Deployment failed"),
-        });
-      }
-    })();
-  });
-}
-
-export function registerCredentialDeployRoutes(
-  router: Router,
-  authenticateJWT: RequestHandler,
-  requireCredentialViewPermission: RequestHandler,
-  requireHostEditPermission: RequestHandler,
-  requireDataAccess: RequestHandler,
-): void {
-  /**
-   * @openapi
-   * /credentials/{id}/deploy-to-host:
-   *   post:
-   *     summary: Deploy SSH key to a host
-   *     description: Deploys an SSH public key to a target host's authorized_keys file.
-   *     tags:
-   *       - Credentials
-   *     parameters:
-   *       - in: path
-   *         name: id
-   *         required: true
-   *         schema:
-   *           type: integer
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             type: object
-   *             properties:
-   *               targetHostId:
-   *                 type: integer
-   *     responses:
-   *       200:
-   *         description: SSH key deployed successfully.
-   *       400:
-   *         description: Credential ID and target host ID are required.
-   *       401:
-   *         description: Authentication required.
-   *       404:
-   *         description: Credential or target host not found.
-   *       500:
-   *         description: Failed to deploy SSH key.
-   */
-  router.post(
-    "/:id/deploy-to-host",
-    authenticateJWT,
-    requireCredentialViewPermission,
-    requireHostEditPermission,
-    requireDataAccess,
-    async (req: Request, res: Response) => {
-      const id = Array.isArray(req.params.id)
-        ? req.params.id[0]
-        : req.params.id;
-      const credentialId = parseInt(id);
-      const { targetHostId } = req.body;
-
-      if (!credentialId || !targetHostId) {
-        return res.status(400).json({
-          success: false,
-          error: "Credential ID and target host ID are required",
-        });
-      }
-
-      try {
-        const userId = (req as AuthenticatedRequest).userId;
-        if (!userId) {
-          return res.status(401).json({
-            success: false,
-            error: "Authentication required",
-          });
-        }
-
-        const repository = createCurrentHostResolutionRepository();
-        const credential = await repository.findCredentialByIdForUser(
-          credentialId,
-          userId,
-        );
-
-        if (!credential) {
-          return res.status(404).json({
-            success: false,
-            error: "Credential not found",
-          });
-        }
-
-        const credData = credential as unknown as CredentialBackend;
-
-        if (credData.authType !== "key") {
-          return res.status(400).json({
-            success: false,
-            error: "Only SSH key-based credentials can be deployed",
-          });
-        }
-
-        let publicKey = credData.publicKey;
-        const storedKey = credData.privateKey || credData.key;
-        if (!publicKey && isSecretReference(storedKey)) {
-          // A key kept in a secret source has no stored public key; derive
-          // it from the resolved key.
-          const resolved = await resolveKeyReferences(
-            userId,
-            storedKey,
-            (credData as { keyPassword?: string | null }).keyPassword,
-          );
-          publicKey =
-            parseSSHKey(resolved.key, resolved.passphrase).publicKey ||
-            undefined;
-        }
-        if (!publicKey) {
-          return res.status(400).json({
-            success: false,
-            error: "Public key is required for deployment",
-          });
-        }
-        // Writing authorized_keys is an owner action, so ownership is checked
-        // before the shared resolver fills in the credentials.
-        const hostData = await repository.findHostByIdForUser(
-          targetHostId,
-          userId,
-        );
-
-        if (!hostData) {
-          return res.status(404).json({
-            success: false,
-            error: "Target host not found",
-          });
-        }
-
-        const resolvedHost = await resolveHostById(targetHostId, userId);
-        if (!resolvedHost) {
-          return res.status(400).json({
-            success: false,
-            error: "Host credential not found",
-          });
-        }
-
-        const deployResult = await deploySSHKeyToHost(
-          resolvedHost as unknown as SshConnectHost,
-          userId,
-          credData,
-        );
-
-        if (deployResult.success) {
-          res.json({
-            success: true,
-            message: deployResult.message || "SSH key deployed successfully",
-          });
-        } else {
-          res.status(500).json({
-            success: false,
-            error: deployResult.error || "Deployment failed",
-          });
-        }
-      } catch (error) {
-        res.status(500).json({
-          success: false,
-          error: getErrorMessage(error, "Failed to deploy SSH key"),
-        });
-      }
-    },
-  );
-}

src/backend/database/routes/credential-key-routes.ts

@@ -1,519 +0,0 @@
-import { getErrorMessage } from "../../utils/error-message.js";
-import type { Request, RequestHandler, Response, Router } from "express";
-import crypto from "crypto";
-import ssh2Pkg from "ssh2";
-import { authLogger } from "../../utils/logger.js";
-import {
-  parsePublicKey,
-  parseSSHKey,
-  validateKeyPair,
-} from "../../utils/ssh-key-utils.js";
-import { resolveKeyReferences } from "../../hosts/stored-ssh-key.js";
-import type { AuthenticatedRequest } from "../../../types/index.js";
-
-const { utils: ssh2Utils } = ssh2Pkg;
-
-function generateSSHKeyPair(
-  keyType: string,
-  keySize?: number,
-  passphrase?: string,
-): {
-  success: boolean;
-  privateKey?: string;
-  publicKey?: string;
-  error?: string;
-} {
-  try {
-    let ssh2Type = keyType;
-    const options: {
-      bits?: number;
-      passphrase?: string;
-      cipher?: string;
-    } = {};
-
-    if (keyType === "ssh-rsa") {
-      ssh2Type = "rsa";
-      options.bits = keySize || 2048;
-    } else if (keyType === "ssh-ed25519") {
-      ssh2Type = "ed25519";
-    } else if (keyType === "ecdsa-sha2-nistp256") {
-      ssh2Type = "ecdsa";
-      options.bits = 256;
-    }
-
-    if (passphrase && passphrase.trim()) {
-      options.passphrase = passphrase;
-      options.cipher = "aes128-cbc";
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const keyPair = ssh2Utils.generateKeyPairSync(ssh2Type as any, options);
-
-    return {
-      success: true,
-      privateKey: keyPair.private,
-      publicKey: keyPair.public,
-    };
-  } catch (error) {
-    return {
-      success: false,
-      error: getErrorMessage(error, "SSH key generation failed"),
-    };
-  }
-}
-
-export function registerCredentialKeyRoutes(
-  router: Router,
-  authenticateJWT: RequestHandler,
-  requireCredentialViewPermission: RequestHandler,
-  requireDataAccess: RequestHandler,
-): void {
-  /**
-   * @openapi
-   * /credentials/detect-key-type:
-   *   post:
-   *     summary: Detect SSH key type
-   *     description: Detects the type of an SSH private key.
-   *     tags:
-   *       - Credentials
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             type: object
-   *             properties:
-   *               privateKey:
-   *                 type: string
-   *               keyPassword:
-   *                 type: string
-   *     responses:
-   *       200:
-   *         description: Key type detection result.
-   *       400:
-   *         description: Private key is required.
-   *       500:
-   *         description: Failed to detect key type.
-   */
-  router.post(
-    "/detect-key-type",
-    authenticateJWT,
-    requireCredentialViewPermission,
-    requireDataAccess,
-    async (req: Request, res: Response) => {
-      if (!req.body?.privateKey || typeof req.body.privateKey !== "string") {
-        return res.status(400).json({ error: "Private key is required" });
-      }
-
-      try {
-        const { key: privateKey, passphrase: keyPassword } =
-          await resolveKeyReferences(
-            (req as AuthenticatedRequest).userId,
-            req.body.privateKey,
-            req.body.keyPassword,
-          );
-        const keyInfo = parseSSHKey(privateKey, keyPassword);
-
-        const response = {
-          success: keyInfo.success,
-          keyType: keyInfo.keyType,
-          detectedKeyType: keyInfo.keyType,
-          hasPublicKey: !!keyInfo.publicKey,
-          error: keyInfo.error || null,
-        };
-
-        res.json(response);
-      } catch (error) {
-        authLogger.error("Failed to detect key type", error);
-        res.status(500).json({
-          error: getErrorMessage(error, "Failed to detect key type"),
-        });
-      }
-    },
-  );
-
-  /**
-   * @openapi
-   * /credentials/detect-public-key-type:
-   *   post:
-   *     summary: Detect SSH public key type
-   *     description: Detects the type of an SSH public key.
-   *     tags:
-   *       - Credentials
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             type: object
-   *             properties:
-   *               publicKey:
-   *                 type: string
-   *     responses:
-   *       200:
-   *         description: Key type detection result.
-   *       400:
-   *         description: Public key is required.
-   *       500:
-   *         description: Failed to detect public key type.
-   */
-  router.post(
-    "/detect-public-key-type",
-    authenticateJWT,
-    requireCredentialViewPermission,
-    requireDataAccess,
-    async (req: Request, res: Response) => {
-      const { publicKey } = req.body;
-
-      if (!publicKey || typeof publicKey !== "string") {
-        return res.status(400).json({ error: "Public key is required" });
-      }
-
-      try {
-        const keyInfo = parsePublicKey(publicKey);
-
-        const response = {
-          success: keyInfo.success,
-          keyType: keyInfo.keyType,
-          detectedKeyType: keyInfo.keyType,
-          error: keyInfo.error || null,
-        };
-
-        res.json(response);
-      } catch (error) {
-        authLogger.error("Failed to detect public key type", error);
-        res.status(500).json({
-          error: getErrorMessage(error, "Failed to detect public key type"),
-        });
-      }
-    },
-  );
-
-  /**
-   * @openapi
-   * /credentials/validate-key-pair:
-   *   post:
-   *     summary: Validate SSH key pair
-   *     description: Validates if a given SSH private key and public key match.
-   *     tags:
-   *       - Credentials
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             type: object
-   *             properties:
-   *               privateKey:
-   *                 type: string
-   *               publicKey:
-   *                 type: string
-   *               keyPassword:
-   *                 type: string
-   *     responses:
-   *       200:
-   *         description: Key pair validation result.
-   *       400:
-   *         description: Private key and public key are required.
-   *       500:
-   *         description: Failed to validate key pair.
-   */
-  router.post(
-    "/validate-key-pair",
-    authenticateJWT,
-    requireCredentialViewPermission,
-    requireDataAccess,
-    async (req: Request, res: Response) => {
-      const { privateKey, publicKey, keyPassword } = req.body;
-
-      if (!privateKey || typeof privateKey !== "string") {
-        return res.status(400).json({ error: "Private key is required" });
-      }
-
-      if (!publicKey || typeof publicKey !== "string") {
-        return res.status(400).json({ error: "Public key is required" });
-      }
-
-      try {
-        const validationResult = validateKeyPair(
-          privateKey,
-          publicKey,
-          keyPassword,
-        );
-
-        const response = {
-          isValid: validationResult.isValid,
-          privateKeyType: validationResult.privateKeyType,
-          publicKeyType: validationResult.publicKeyType,
-          generatedPublicKey: validationResult.generatedPublicKey,
-          error: validationResult.error || null,
-        };
-
-        res.json(response);
-      } catch (error) {
-        authLogger.error("Failed to validate key pair", error);
-        res.status(500).json({
-          error: getErrorMessage(error, "Failed to validate key pair"),
-        });
-      }
-    },
-  );
-
-  /**
-   * @openapi
-   * /credentials/generate-key-pair:
-   *   post:
-   *     summary: Generate new SSH key pair
-   *     description: Generates a new SSH key pair.
-   *     tags:
-   *       - Credentials
-   *     requestBody:
-   *       content:
-   *         application/json:
-   *           schema:
-   *             type: object
-   *             properties:
-   *               keyType:
-   *                 type: string
-   *               keySize:
-   *                 type: integer
-   *               passphrase:
-   *                 type: string
-   *     responses:
-   *       200:
-   *         description: The new key pair.
-   *       500:
-   *         description: Failed to generate SSH key pair.
-   */
-  router.post(
-    "/generate-key-pair",
-    authenticateJWT,
-    requireCredentialViewPermission,
-    requireDataAccess,
-    async (req: Request, res: Response) => {
-      const { keyType = "ssh-ed25519", keySize = 2048, passphrase } = req.body;
-
-      try {
-        const result = generateSSHKeyPair(keyType, keySize, passphrase);
-
-        if (result.success && result.privateKey && result.publicKey) {
-          const response = {
-            success: true,
-            privateKey: result.privateKey,
-            publicKey: result.publicKey,
-            keyType: keyType,
-            format: "ssh",
-            algorithm: keyType,
-            keySize: keyType === "ssh-rsa" ? keySize : undefined,
-            curve: keyType === "ecdsa-sha2-nistp256" ? "nistp256" : undefined,
-          };
-
-          res.json(response);
-        } else {
-          res.status(500).json({
-            success: false,
-            error: result.error || "Failed to generate SSH key pair",
-          });
-        }
-      } catch (error) {
-        authLogger.error("Failed to generate key pair", error);
-        res.status(500).json({
-          success: false,
-          error: getErrorMessage(error, "Failed to generate key pair"),
-        });
-      }
-    },
-  );
-
-  /**
-   * @openapi
-   * /credentials/generate-public-key:
-   *   post:
-   *     summary: Generate public key from private key
-   *     description: Generates a public key from a given private key.
-   *     tags:
-   *       - Credentials
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             type: object
-   *             properties:
-   *               privateKey:
-   *                 type: string
-   *               keyPassword:
-   *                 type: string
-   *     responses:
-   *       200:
-   *         description: The generated public key.
-   *       400:
-   *         description: Private key is required.
-   *       500:
-   *         description: Failed to generate public key.
-   */
-  router.post(
-    "/generate-public-key",
-    authenticateJWT,
-    requireCredentialViewPermission,
-    requireDataAccess,
-    async (req: Request, res: Response) => {
-      if (!req.body?.privateKey || typeof req.body.privateKey !== "string") {
-        return res.status(400).json({ error: "Private key is required" });
-      }
-
-      try {
-        const { key: privateKey, passphrase: keyPassword } =
-          await resolveKeyReferences(
-            (req as AuthenticatedRequest).userId,
-            req.body.privateKey,
-            req.body.keyPassword,
-          );
-        let privateKeyObj;
-        const parseAttempts = [];
-
-        try {
-          privateKeyObj = crypto.createPrivateKey({
-            key: privateKey,
-            passphrase: keyPassword,
-          });
-        } catch (error) {
-          parseAttempts.push(`Method 1 (with passphrase): ${error.message}`);
-        }
-
-        if (!privateKeyObj) {
-          try {
-            privateKeyObj = crypto.createPrivateKey(privateKey);
-          } catch (error) {
-            parseAttempts.push(
-              `Method 2 (without passphrase): ${error.message}`,
-            );
-          }
-        }
-
-        if (!privateKeyObj) {
-          try {
-            privateKeyObj = crypto.createPrivateKey({
-              key: privateKey,
-              format: "pem",
-              type: "pkcs8",
-            });
-          } catch (error) {
-            parseAttempts.push(`Method 3 (PKCS#8): ${error.message}`);
-          }
-        }
-
-        if (
-          !privateKeyObj &&
-          privateKey.includes("-----BEGIN RSA PRIVATE KEY-----")
-        ) {
-          try {
-            privateKeyObj = crypto.createPrivateKey({
-              key: privateKey,
-              format: "pem",
-              type: "pkcs1",
-            });
-          } catch (error) {
-            parseAttempts.push(`Method 4 (PKCS#1): ${error.message}`);
-          }
-        }
-
-        if (
-          !privateKeyObj &&
-          privateKey.includes("-----BEGIN EC PRIVATE KEY-----")
-        ) {
-          try {
-            privateKeyObj = crypto.createPrivateKey({
-              key: privateKey,
-              format: "pem",
-              type: "sec1",
-            });
-          } catch (error) {
-            parseAttempts.push(`Method 5 (SEC1): ${error.message}`);
-          }
-        }
-
-        if (!privateKeyObj) {
-          try {
-            const keyInfo = parseSSHKey(privateKey, keyPassword);
-
-            if (keyInfo.success && keyInfo.publicKey) {
-              const publicKeyString = String(keyInfo.publicKey);
-              return res.json({
-                success: true,
-                publicKey: publicKeyString,
-                keyType: keyInfo.keyType,
-              });
-            } else {
-              parseAttempts.push(
-                `SSH2 fallback: ${keyInfo.error || "No public key generated"}`,
-              );
-            }
-          } catch (error) {
-            parseAttempts.push(`SSH2 fallback exception: ${error.message}`);
-          }
-        }
-
-        if (!privateKeyObj) {
-          return res.status(400).json({
-            success: false,
-            error: "Unable to parse private key. Tried multiple formats.",
-            details: parseAttempts,
-          });
-        }
-
-        const publicKeyObj = crypto.createPublicKey(privateKeyObj);
-        const publicKeyPem = publicKeyObj.export({
-          type: "spki",
-          format: "pem",
-        });
-
-        const publicKeyString =
-          typeof publicKeyPem === "string"
-            ? publicKeyPem
-            : (publicKeyPem as Buffer).toString("utf8");
-
-        let keyType = "unknown";
-        const asymmetricKeyType = privateKeyObj.asymmetricKeyType;
-
-        if (asymmetricKeyType === "rsa") {
-          keyType = "ssh-rsa";
-        } else if (asymmetricKeyType === "ed25519") {
-          keyType = "ssh-ed25519";
-        } else if (asymmetricKeyType === "ec") {
-          keyType = "ecdsa-sha2-nistp256";
-        }
-
-        let finalPublicKey = publicKeyString;
-        let formatType = "pem";
-
-        try {
-          const ssh2PrivateKey = ssh2Utils.parseKey(privateKey, keyPassword);
-          if (!(ssh2PrivateKey instanceof Error)) {
-            const publicKeyBuffer = ssh2PrivateKey.getPublicSSH();
-            const base64Data = publicKeyBuffer.toString("base64");
-            finalPublicKey = `${keyType} ${base64Data}`;
-            formatType = "ssh";
-          }
-        } catch {
-          // Ignore validation errors
-        }
-
-        const response = {
-          success: true,
-          publicKey: finalPublicKey,
-          keyType: keyType,
-          format: formatType,
-        };
-
-        res.json(response);
-      } catch (error) {
-        authLogger.error("Failed to generate public key", error);
-        res.status(500).json({
-          success: false,
-          error: getErrorMessage(error, "Failed to generate public key"),
-        });
-      }
-    },
-  );
-}

src/backend/database/routes/credentials.ts

@@ -8,8 +8,6 @@ import { authLogger } from "../../utils/logger.js";
 import { PermissionManager } from "../../utils/permission-manager.js";
 import { AuthManager } from "../../utils/auth-manager.js";
 import { parseKeyForStorage } from "../../hosts/stored-ssh-key.js";
-import { registerCredentialKeyRoutes } from "./credential-key-routes.js";
-import { registerCredentialDeployRoutes } from "./credential-deploy-routes.js";
 import { registerCredentialBulkRoutes } from "./credential-bulk-routes.js";
 import {
   logAudit,
@@ -1211,19 +1209,4 @@ router.put(
   },
 );
 
-registerCredentialKeyRoutes(
-  router,
-  authenticateJWT,
-  permissionManager.requirePermission("credentials.view"),
-  requireDataAccess,
-);
-
-registerCredentialDeployRoutes(
-  router,
-  authenticateJWT,
-  permissionManager.requirePermission("credentials.view"),
-  permissionManager.requirePermission("hosts.edit"),
-  requireDataAccess,
-);
-
 export default router;

src/backend/database/routes/dashboard-routes.ts

@@ -3,8 +3,7 @@ import express, { type Request, type Response } from "express";
 import { dashboardLogger } from "../../utils/logger.js";
 import { AuthManager } from "../../utils/auth-manager.js";
 import { DataCrypto } from "../../utils/data-crypto.js";
-import { createCurrentRecentActivityRepository } from "../repositories/factory.js";
-import { recordRecentActivity } from "../../services/recent-activity.js";
+import { recentActivity } from "../../plugins/activity-provider.js";
 
 const router = express.Router();
 
@@ -99,11 +98,7 @@ router.get(
 
       const limit = Number(req.query.limit) || 20;
 
-      const activities =
-        await createCurrentRecentActivityRepository().listByUserId(
-          userId,
-          limit,
-        );
+      const activities = await recentActivity.list(userId, limit);
 
       res.json(activities);
     } catch (err) {
@@ -169,7 +164,7 @@ router.post(
         });
       }
 
-      const result = await recordRecentActivity(userId, {
+      const result = await recentActivity.record(userId, {
         type,
         hostId,
         hostName,
@@ -185,6 +180,11 @@ router.post(
           message: "Activity already logged recently (rate limited)",
         });
       }
+      if (result.status === "unavailable") {
+        return res
+          .status(404)
+          .json({ error: "Recent activity is not available" });
+      }
       if (result.status === "denied") {
         return res
           .status(404)
@@ -222,7 +222,7 @@ router.delete(
     try {
       const userId = (req as AuthenticatedRequest).userId;
 
-      await createCurrentRecentActivityRepository().deleteByUserId(userId);
+      await recentActivity.deleteByUserId(userId);
 
       dashboardLogger.success("Recent activity cleared", {
         operation: "reset_recent_activity",

src/backend/database/routes/delete-user-data.ts

@@ -1,4 +1,5 @@
 import { authLogger } from "../../utils/logger.js";
+import { recentActivity } from "../../plugins/activity-provider.js";
 import {
   createCurrentApiKeyRepository,
   createCurrentAuditLogRepository,
@@ -9,7 +10,6 @@ import {
   createCurrentCredentialSidebarPreferenceRepository,
   createCurrentUiPreferenceRepository,
   createCurrentOpenTabRepository,
-  createCurrentRecentActivityRepository,
   createCurrentRbacAccessRepository,
   createCurrentRoleRepository,
   createCurrentSessionRepository,
@@ -64,7 +64,7 @@ export async function deleteUserAndRelatedData(
 
     await createCurrentSshCredentialUsageRepository().deleteByUserId(userId);
 
-    await createCurrentRecentActivityRepository().deleteByUserId(userId);
+    await recentActivity.deleteByUserId(userId);
 
     await createCurrentHostFolderRepository().deleteByUserId(userId);
 

src/backend/database/routes/host-bulk-routes.ts

@@ -1,172 +1,22 @@
-import {
-  prepareHostImports,
-  remapImportedJumpHosts,
-} from "./host-import-order.js";
-import { sshOptionsForWrite } from "../../hosts/ssh-options.js";
-import {
-  applyDefaultsAfterHostWrites,
-  applyHostDefaultsToWrite,
-} from "../../hosts/defaults/index.js";
 import {
   changeHostOverrides,
   type OverrideChange,
 } from "../../hosts/defaults/overrides.js";
 import { recompute } from "../../hosts/defaults/recompute.js";
 import { splitDefaultKey } from "../../../types/host-defaults.js";
-import {
-  keepUsableProtocolCredentials,
-  readProtocolAuthPayload,
-  writeProtocolAuth,
-} from "../../hosts/protocol-auth/protocol-auth.js";
-import { getErrorMessage } from "../../utils/error-message.js";
+
 import type { AuthenticatedRequest } from "../../../types/index.js";
 import type { Request, RequestHandler, Response, Router } from "express";
 import { sshLogger } from "../../utils/logger.js";
 import { DatabaseSaveTrigger } from "../../utils/database-save-trigger.js";
-import { pluginEvents, TOPICS } from "../../plugins/events.js";
-import {
-  createCurrentCredentialRepository,
-  createCurrentHostRepository,
-  createCurrentHostResolutionRepository,
-  createCurrentHostDefaultsRepository,
-} from "../repositories/factory.js";
+import { createCurrentHostRepository } from "../repositories/factory.js";
 import { validateParentHostId } from "./host-parent-validation.js";
-import {
-  listSshAuthProviders,
-  listSshAuthTypeOwners,
-} from "../../hosts/connect/auth-provider-registry.js";
-import {
-  applyPluginHostImportSettings,
-  setHostPluginEnabled,
-} from "./host-plugin-settings.js";
-import {
-  isNonEmptyString,
-  isValidPort,
-  normalizeImportedHost,
-} from "./host-normalizers.js";
 
-type SSHConfigHost = {
-  name: string;
-  hostname?: string;
-  user?: string;
-  port?: number;
-  identityFile?: string;
-  proxyJump?: string;
-};
-
-type ShareCredential = {
-  alias?: unknown;
-  name?: unknown;
-  description?: unknown;
-  folder?: unknown;
-  tags?: unknown;
-  authType?: unknown;
-  username?: unknown;
-  keyType?: unknown;
-};
-
-function textValue(value: unknown): string | null {
-  return typeof value === "string" && value.trim() ? value.trim() : null;
-}
-
-function tagString(value: unknown): string {
-  if (Array.isArray(value)) {
-    return value
-      .map((tag) => textValue(tag))
-      .filter((tag): tag is string => !!tag)
-      .join(",");
-  }
-  return textValue(value) || "";
-}
-
-function normalizeCredentialAuthType(value: unknown): "password" | "key" {
-  return value === "key" ? "key" : "password";
-}
-
-export function parseSSHConfig(content: string): SSHConfigHost[] {
-  const results: SSHConfigHost[] = [];
-  let current: SSHConfigHost | null = null;
-
-  for (const rawLine of content.split("\n")) {
-    const line = rawLine.trim();
-    if (!line || line.startsWith("#")) continue;
-
-    const match = /^(\S+?)(?:\s*=\s*|\s+)(.+)$/.exec(line);
-    if (!match) continue;
-
-    const key = match[1].toLowerCase();
-    const value = match[2];
-
-    if (key === "host") {
-      if (current && current.hostname) results.push(current);
-      // Skip wildcard patterns
-      if (value === "*" || value.includes("*") || value.includes("?")) {
-        current = null;
-      } else {
-        current = { name: value };
-      }
-      continue;
-    }
-
-    if (!current) continue;
-
-    switch (key) {
-      case "hostname":
-        current.hostname = value;
-        break;
-      case "user":
-        current.user = value;
-        break;
-      case "port": {
-        const p = Number.parseInt(value, 10);
-        if (p > 0 && p <= 65535) current.port = p;
-        break;
-      }
-      case "identityfile":
-        if (!current.identityFile) current.identityFile = value;
-        break;
-      case "proxyjump":
-        current.proxyJump = value;
-        break;
-    }
-  }
-
-  if (current && current.hostname) results.push(current);
-
-  return results;
-}
-
-/**
- * Tells status checks and other pollers about hosts an import wrote, the way
- * a single host create or update does.
- */
-export function notifyImportedHosts(
-  userId: string,
-  hostIds: number[],
-  createdHostIds: number[],
-): void {
-  for (const hostId of createdHostIds) {
-    pluginEvents.emit(TOPICS.hostCreated, { hostId, userId });
-  }
-  for (const hostId of hostIds) {
-    pluginEvents.emit(TOPICS.hostUpdated, { hostId, userId });
-  }
-}
-
-export function importedHostUsername(
-  connectionType: string,
-  authType: unknown,
-  username: unknown,
-): string | null {
-  if (isNonEmptyString(username)) return username;
-  if (connectionType !== "ssh" || authType === "credential") return "";
-  return null;
-}
+import { setHostPluginEnabled } from "./host-plugin-settings.js";
 
 export function registerHostBulkRoutes(
   router: Router,
   authenticateJWT: RequestHandler,
-  requireCreatePermission: RequestHandler,
   requireEditPermission: RequestHandler,
   requireDataAccess: RequestHandler,
 ): void {
@@ -467,674 +317,6 @@ export function registerHostBulkRoutes(
       }
     },
   );
-
-  router.post(
-    "/bulk-import",
-    authenticateJWT,
-    requireCreatePermission,
-    requireEditPermission,
-    requireDataAccess,
-    DatabaseSaveTrigger.batched(async (req: Request, res: Response) => {
-      const userId = (req as AuthenticatedRequest).userId;
-      const {
-        hosts: hostsToImport,
-        overwrite,
-        credentials: credentialsToImport,
-      } = req.body;
-
-      if (!Array.isArray(hostsToImport) || hostsToImport.length === 0) {
-        return res
-          .status(400)
-          .json({ error: "Hosts array is required and must not be empty" });
-      }
-
-      if (hostsToImport.length > 100) {
-        return res
-          .status(400)
-          .json({ error: "Maximum 100 hosts allowed per import" });
-      }
-
-      let orderedHosts: ReturnType<typeof prepareHostImports>;
-      try {
-        orderedHosts = prepareHostImports(hostsToImport);
-      } catch (error) {
-        return res.status(400).json({ error: getErrorMessage(error) });
-      }
-      const importedIds = new Map<unknown, number>();
-
-      const results = {
-        success: 0,
-        updated: 0,
-        skipped: 0,
-        failed: 0,
-        errors: [] as string[],
-      };
-
-      const credentialAliasMap = new Map<string, number>();
-      const addCredentialAlias = (alias: unknown, id: number) => {
-        const key = textValue(alias);
-        if (key) credentialAliasMap.set(key.toLowerCase(), id);
-      };
-
-      try {
-        const credentialRepository = createCurrentCredentialRepository();
-        const existingCredentials =
-          await credentialRepository.listDecryptedByUserId(userId);
-
-        for (const credential of existingCredentials) {
-          addCredentialAlias(credential.name, credential.id as number);
-        }
-
-        if (Array.isArray(credentialsToImport)) {
-          for (const rawCredential of credentialsToImport as ShareCredential[]) {
-            const alias = textValue(rawCredential.alias);
-            const name = textValue(rawCredential.name) || alias;
-            if (!alias || !name) continue;
-
-            const existingId = credentialAliasMap.get(name.toLowerCase());
-            if (existingId) {
-              addCredentialAlias(alias, existingId);
-              continue;
-            }
-
-            const now = new Date().toISOString();
-            const created = await credentialRepository.createEncryptedForUser(
-              userId,
-              {
-                userId,
-                name,
-                description:
-                  textValue(rawCredential.description) ||
-                  "Imported placeholder. Add the secret before connecting.",
-                folder: textValue(rawCredential.folder),
-                tags: tagString(rawCredential.tags),
-                authType: normalizeCredentialAuthType(rawCredential.authType),
-                username: textValue(rawCredential.username),
-                password: null,
-                key: null,
-                privateKey: null,
-                publicKey: null,
-                keyPassword: null,
-                keyType: textValue(rawCredential.keyType),
-                detectedKeyType: null,
-                usageCount: 0,
-                lastUsed: null,
-                createdAt: now,
-                updatedAt: now,
-              },
-            );
-
-            const createdCredential = created as Record<string, unknown>;
-            addCredentialAlias(alias, createdCredential.id as number);
-            addCredentialAlias(name, createdCredential.id as number);
-          }
-        }
-      } catch (error) {
-        results.errors.push(
-          `Credential placeholders: ${getErrorMessage(error, "failed to prepare credential aliases")}`,
-        );
-      }
-
-      // Loaded for both modes: overwrite updates a match, skip leaves it alone.
-      let existingHostMap: Map<string, { id: number }> | undefined;
-      const hostRepository = createCurrentHostRepository();
-      try {
-        const allHosts =
-          await createCurrentHostResolutionRepository().findHostsByUserId(
-            userId,
-          );
-        existingHostMap = new Map();
-        for (const h of allHosts) {
-          const key = `${h.ip}:${h.port}:${h.username}`;
-          existingHostMap.set(key, { id: h.id as number });
-        }
-      } catch {
-        existingHostMap = undefined;
-      }
-
-      const knownAuthTypes = listKnownAuthTypes();
-      const writtenHostIds: number[] = [];
-      const createdHostIds: number[] = [];
-      for (const { host: hostData, index: i, exportId } of orderedHosts) {
-        try {
-          const effectiveConnectionType = hostData.connectionType || "ssh";
-
-          if (
-            effectiveConnectionType === "ssh" &&
-            hostData.authType === "credential" &&
-            !hostData.credentialId &&
-            hostData.credentialAlias
-          ) {
-            hostData.credentialId = credentialAliasMap.get(
-              hostData.credentialAlias.toLowerCase(),
-            );
-          }
-
-          if (!isNonEmptyString(hostData.ip) || !isValidPort(hostData.port)) {
-            results.failed++;
-            results.errors.push(
-              `Host ${i + 1}: Missing required fields (ip, port)`,
-            );
-            continue;
-          }
-
-          const username = importedHostUsername(
-            effectiveConnectionType,
-            hostData.authType,
-            hostData.username,
-          );
-          if (username === null) {
-            results.failed++;
-            results.errors.push(
-              `Host ${i + 1}: Username required for SSH connections`,
-            );
-            continue;
-          }
-
-          const lookupKey = `${hostData.ip}:${hostData.port}:${hostData.username}`;
-          const existing = existingHostMap?.get(lookupKey);
-          if (existing && !overwrite) {
-            // Hosts that jump through this one still resolve to the kept host.
-            if (exportId !== undefined) importedIds.set(exportId, existing.id);
-            results.skipped++;
-            continue;
-          }
-
-          if (
-            effectiveConnectionType === "ssh" &&
-            hostData.authType &&
-            !knownAuthTypes.has(hostData.authType)
-          ) {
-            results.failed++;
-            results.errors.push(
-              `Host ${i + 1}: Invalid authType. Must be one of ${[...knownAuthTypes].join(", ")}`,
-            );
-            continue;
-          }
-
-          if (
-            effectiveConnectionType === "ssh" &&
-            hostData.authType === "password" &&
-            !isNonEmptyString(hostData.password)
-          ) {
-            results.failed++;
-            results.errors.push(
-              `Host ${i + 1}: Password required for password authentication`,
-            );
-            continue;
-          }
-
-          if (
-            effectiveConnectionType === "ssh" &&
-            hostData.authType === "key" &&
-            !isNonEmptyString(hostData.key)
-          ) {
-            results.failed++;
-            results.errors.push(
-              `Host ${i + 1}: Key required for key authentication`,
-            );
-            continue;
-          }
-
-          if (
-            effectiveConnectionType === "ssh" &&
-            hostData.authType === "credential" &&
-            !hostData.credentialId
-          ) {
-            results.failed++;
-            results.errors.push(
-              `Host ${i + 1}: credentialId required for credential authentication`,
-            );
-            continue;
-          }
-
-          if (
-            effectiveConnectionType === "ssh" &&
-            hostData.authType === "credential" &&
-            hostData.credentialId
-          ) {
-            const credentialRepository = createCurrentCredentialRepository();
-            const cred = await credentialRepository.findByIdForUser(
-              userId,
-              hostData.credentialId,
-            );
-
-            if (!cred) {
-              const fallback = await credentialRepository.listByUserId(userId);
-
-              if (fallback.length > 0) {
-                hostData.credentialId = fallback[0].id;
-              } else if (isNonEmptyString(hostData.key)) {
-                hostData.authType = "key";
-                hostData.credentialId = undefined;
-              } else if (isNonEmptyString(hostData.password)) {
-                hostData.authType = "password";
-                hostData.credentialId = undefined;
-              } else {
-                results.failed++;
-                results.errors.push(
-                  `Host ${i + 1}: credentialId ${hostData.credentialId} not found and no fallback credential available`,
-                );
-                continue;
-              }
-            }
-          }
-
-          const jumpHosts = remapImportedJumpHosts(
-            hostData.jumpHosts,
-            importedIds,
-          );
-          const sshDataObj: Record<string, unknown> = {
-            userId: userId,
-            connectionType: effectiveConnectionType,
-            name: hostData.name || `${username}@${hostData.ip}`,
-            folder: hostData.folder || "Default",
-            tags: Array.isArray(hostData.tags) ? hostData.tags.join(",") : "",
-            ip: hostData.ip,
-            port: hostData.port,
-            username,
-            pin: hostData.pin || false,
-            sudoPassword: hostData.sudoPassword || null,
-            jumpHosts: jumpHosts ? JSON.stringify(jumpHosts) : null,
-            ...importedStatusCheck(hostData as Record<string, unknown>),
-            // A 2.8 export carries these inside terminalConfig.
-            sshOptions:
-              sshOptionsForWrite({
-                sshOptions: hostData.sshOptions,
-                terminalConfig: hostData.terminalConfig,
-              }) ?? null,
-            forceKeyboardInteractive: hostData.forceKeyboardInteractive
-              ? "true"
-              : "false",
-            notes: hostData.notes || null,
-            useSocks5: hostData.useSocks5 ? 1 : 0,
-            socks5Host: hostData.socks5Host || null,
-            socks5Port: hostData.socks5Port || null,
-            socks5Username: hostData.socks5Username || null,
-            socks5Password: hostData.socks5Password || null,
-            socks5ProxyChain: hostData.socks5ProxyChain
-              ? JSON.stringify(hostData.socks5ProxyChain)
-              : null,
-            portKnockSequence: hostData.portKnockSequence
-              ? JSON.stringify(hostData.portKnockSequence)
-              : null,
-            overrideCredentialUsername: hostData.overrideCredentialUsername
-              ? 1
-              : 0,
-            enableSsh: hostData.enableSsh ?? effectiveConnectionType === "ssh",
-            updatedAt: new Date().toISOString(),
-          };
-
-          if (effectiveConnectionType !== "ssh") {
-            sshDataObj.password = hostData.password || null;
-            sshDataObj.authType = "password";
-            sshDataObj.credentialId = null;
-            sshDataObj.key = null;
-            sshDataObj.keyPassword = null;
-            sshDataObj.keyType = null;
-          } else {
-            sshDataObj.password =
-              hostData.authType === "password" ? hostData.password : null;
-            sshDataObj.authType = hostData.authType || "password";
-            sshDataObj.credentialId =
-              hostData.authType === "credential" ? hostData.credentialId : null;
-            sshDataObj.key = hostData.authType === "key" ? hostData.key : null;
-            sshDataObj.keyPassword =
-              hostData.authType === "key" ? hostData.keyPassword || null : null;
-            sshDataObj.keyType =
-              hostData.authType === "key" ? hostData.keyType || "auto" : null;
-          }
-
-          await withHostDefaults(
-            userId,
-            existing?.id ?? null,
-            sshDataObj,
-            hostData as Record<string, unknown>,
-          );
-
-          let savedHostId: number;
-          if (existing) {
-            const saved = await hostRepository.updateEncryptedForUser(
-              userId,
-              existing.id,
-              sshDataObj,
-            );
-            if (!saved) throw new Error("Host no longer exists");
-            if (exportId !== undefined) importedIds.set(exportId, existing.id);
-            savedHostId = existing.id;
-            results.updated++;
-          } else {
-            sshDataObj.createdAt = new Date().toISOString();
-            const saved = await hostRepository.createEncryptedForUser(
-              userId,
-              sshDataObj,
-            );
-            if (exportId !== undefined) importedIds.set(exportId, saved.id);
-            savedHostId = saved.id;
-            createdHostIds.push(saved.id);
-            results.success++;
-          }
-
-          const protocolAuth = readProtocolAuthPayload(
-            hostData as Record<string, unknown>,
-          );
-          if (protocolAuth) {
-            await writeProtocolAuth(
-              userId,
-              savedHostId,
-              await keepUsableProtocolCredentials(protocolAuth, userId),
-              { isOwner: true },
-            );
-          }
-
-          // Every enabled plugin that declares host-scope settings and
-          // registered a hostImportNormalizer validates and writes its own
-          // fields here, so this loop does not need to know which plugins
-          // exist. See host-plugin-settings.ts.
-          await applyPluginHostImportSettings(
-            savedHostId,
-            hostData as Record<string, unknown>,
-          );
-          writtenHostIds.push(savedHostId);
-        } catch (error) {
-          results.failed++;
-          results.errors.push(`Host ${i + 1}: ${getErrorMessage(error)}`);
-        }
-      }
-
-      await applyDefaultsAfterHostWrites(writtenHostIds);
-      notifyImportedHosts(userId, writtenHostIds, createdHostIds);
-
-      res.json({
-        message: `Import completed: ${results.success} created, ${results.updated} updated, ${results.skipped} skipped, ${results.failed} failed`,
-        success: results.success,
-        updated: results.updated,
-        skipped: results.skipped,
-        failed: results.failed,
-        errors: results.errors,
-      });
-    }),
-  );
-
-  /**
-   * @openapi
-   * /host/ssh-config-import:
-   *   post:
-   *     summary: Import hosts from an OpenSSH config file
-   *     description: Parses an OpenSSH ~/.ssh/config file and imports the defined hosts.
-   *     tags:
-   *       - SSH
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             type: object
-   *             required:
-   *               - content
-   *             properties:
-   *               content:
-   *                 type: string
-   *                 description: Raw text content of the SSH config file.
-   *               overwrite:
-   *                 type: boolean
-   *     responses:
-   *       200:
-   *         description: Import completed.
-   *       400:
-   *         description: Invalid request body.
-   */
-  router.post(
-    "/ssh-config-import",
-    authenticateJWT,
-    requireCreatePermission,
-    requireEditPermission,
-    requireDataAccess,
-    DatabaseSaveTrigger.batched(async (req: Request, res: Response) => {
-      const userId = (req as AuthenticatedRequest).userId;
-      const { content, overwrite } = req.body;
-
-      if (!isNonEmptyString(content)) {
-        return res.status(400).json({
-          error: "content is required and must be a non-empty string",
-        });
-      }
-
-      let parsed: SSHConfigHost[];
-      try {
-        parsed = parseSSHConfig(content);
-      } catch {
-        return res
-          .status(400)
-          .json({ error: "Failed to parse SSH config file" });
-      }
-
-      if (parsed.length === 0) {
-        return res.status(400).json({
-          error: "No valid Host entries found in the SSH config file",
-        });
-      }
-
-      if (parsed.length > 100) {
-        return res
-          .status(400)
-          .json({ error: "Maximum 100 hosts allowed per import" });
-      }
-
-      const hostsToImport = parsed.map((h) => ({
-        name: h.name,
-        ip: h.hostname,
-        port: h.port ?? 22,
-        username: h.user,
-        authType: h.identityFile ? "key" : undefined,
-        connectionType: "ssh",
-        enableSsh: true,
-        ...(h.proxyJump
-          ? {
-              jumpHosts: [{ host: h.proxyJump, port: 22 }],
-            }
-          : {}),
-      }));
-
-      const results = {
-        success: 0,
-        updated: 0,
-        skipped: 0,
-        failed: 0,
-        errors: [] as string[],
-      };
-
-      let existingHostMap: Map<string, { id: number }> | undefined;
-      const hostRepository = createCurrentHostRepository();
-      try {
-        const allHosts =
-          await createCurrentHostResolutionRepository().findHostsByUserId(
-            userId,
-          );
-        existingHostMap = new Map();
-        for (const h of allHosts) {
-          const key = `${h.ip}:${h.port}:${h.username}`;
-          existingHostMap.set(key, { id: h.id as number });
-        }
-      } catch {
-        existingHostMap = undefined;
-      }
-
-      const writtenHostIds: number[] = [];
-      const createdHostIds: number[] = [];
-      for (let i = 0; i < hostsToImport.length; i++) {
-        const hostData = normalizeImportedHost(
-          hostsToImport[i] as Record<string, unknown>,
-        );
-
-        try {
-          if (!isNonEmptyString(hostData.ip) || !isValidPort(hostData.port)) {
-            results.failed++;
-            results.errors.push(
-              `Host "${parsed[i].name}": Missing required fields (HostName, Port)`,
-            );
-            continue;
-          }
-
-          const lookupKey = `${hostData.ip}:${hostData.port}:${hostData.username}`;
-          const existing = existingHostMap?.get(lookupKey);
-          if (existing && !overwrite) {
-            results.skipped++;
-            continue;
-          }
-
-          const sshDataObj: Record<string, unknown> = {
-            userId,
-            connectionType: "ssh",
-            name: hostData.name || hostData.ip,
-            folder: "Default",
-            tags: "",
-            ip: hostData.ip,
-            port: hostData.port,
-            username: hostData.username || null,
-            authType: hostData.authType || "none",
-            password: null,
-            key: null,
-            keyPassword: null,
-            keyType: null,
-            credentialId: null,
-            pin: false,
-            sudoPassword: null,
-            jumpHosts: hostData.jumpHosts
-              ? JSON.stringify(hostData.jumpHosts)
-              : null,
-            statusCheckEnabled: true,
-            statusCheckInterval: null,
-            sshOptions: null,
-            forceKeyboardInteractive: "false",
-            notes: null,
-            useSocks5: 0,
-            socks5Host: null,
-            socks5Port: null,
-            socks5Username: null,
-            socks5Password: null,
-            socks5ProxyChain: null,
-            portKnockSequence: null,
-            overrideCredentialUsername: 0,
-            enableSsh: true,
-            updatedAt: new Date().toISOString(),
-          };
-
-          await withHostDefaults(
-            userId,
-            existing?.id ?? null,
-            sshDataObj,
-            hostData as unknown as Record<string, unknown>,
-          );
-
-          if (existing) {
-            await hostRepository.updateEncryptedForUser(
-              userId,
-              existing.id,
-              sshDataObj,
-            );
-            writtenHostIds.push(existing.id);
-            results.updated++;
-          } else {
-            sshDataObj.createdAt = new Date().toISOString();
-            const saved = await hostRepository.createEncryptedForUser(
-              userId,
-              sshDataObj,
-            );
-            writtenHostIds.push(saved.id);
-            createdHostIds.push(saved.id);
-            results.success++;
-          }
-        } catch (error) {
-          results.failed++;
-          results.errors.push(
-            `Host "${parsed[i].name}": ${getErrorMessage(error)}`,
-          );
-        }
-      }
-
-      await applyDefaultsAfterHostWrites(writtenHostIds);
-      notifyImportedHosts(userId, writtenHostIds, createdHostIds);
-
-      res.json({
-        message: `Import completed: ${results.success} created, ${results.updated} updated, ${results.skipped} skipped, ${results.failed} failed`,
-        success: results.success,
-        updated: results.updated,
-        skipped: results.skipped,
-        failed: results.failed,
-        errors: results.errors,
-      });
-    }),
-  );
-}
-
-/**
- * Status check fields from an import row. Exports from before 2.9.0 carried
- * them inside statsConfig.
- */
-function importedStatusCheck(raw: Record<string, unknown>): {
-  statusCheckEnabled: boolean;
-  statusCheckInterval: number | null;
-} {
-  const legacy =
-    raw.statsConfig && typeof raw.statsConfig === "object"
-      ? (raw.statsConfig as Record<string, unknown>)
-      : {};
-  const enabled = raw.statusCheckEnabled ?? legacy.statusCheckEnabled;
-  const useGlobal = legacy.useGlobalStatusInterval !== false;
-  const interval =
-    raw.statusCheckInterval ?? (useGlobal ? null : legacy.statusCheckInterval);
-  const seconds = Number(interval);
-  return {
-    statusCheckEnabled: enabled !== false && legacy.disableTcpPing !== true,
-    statusCheckInterval:
-      interval != null && Number.isInteger(seconds) && seconds >= 5
-        ? seconds
-        : null,
-  };
-}
-
-const BUILTIN_SSH_AUTH_TYPES = [
-  "password",
-  "key",
-  "credential",
-  "agent",
-  "none",
-];
-
-/** Core's own types plus every type a plugin registers or declares. */
-function listKnownAuthTypes(): Set<string> {
-  return new Set([
-    ...BUILTIN_SSH_AUTH_TYPES,
-    ...listSshAuthProviders().map((provider) => provider.type),
-    ...listSshAuthTypeOwners().map((owner) => owner.type),
-  ]);
-}
-
-/** Fills an imported host's inherited keys and records what it sets itself. */
-async function withHostDefaults(
-  userId: string,
-  hostId: number | null,
-  columns: Record<string, unknown>,
-  body: Record<string, unknown>,
-): Promise<void> {
-  const stored =
-    hostId === null
-      ? null
-      : ((
-          await createCurrentHostDefaultsRepository().listHosts({
-            hostIds: [hostId],
-          })
-        )[0] ?? null);
-  columns.defaultOverrides = JSON.stringify(
-    await applyHostDefaultsToWrite({
-      ownerId: userId,
-      hostId,
-      columns,
-      body,
-      stored,
-    }),
-  );
 }
 
 /** A resetDefaults body as an override change, or null when there is none. */

src/backend/database/routes/host-folder-routes.ts

@@ -2,11 +2,11 @@ import type { Request, RequestHandler, Response, Router } from "express";
 import type { AuthenticatedRequest } from "../../../types/index.js";
 import { databaseLogger, sshLogger } from "../../utils/logger.js";
 import { pluginEvents, TOPICS } from "../../plugins/events.js";
+import { recentActivity } from "../../plugins/activity-provider.js";
 import {
   createCurrentCredentialRepository,
   createCurrentHostFolderRepository,
   createCurrentFolderAccessRepository,
-  createCurrentRecentActivityRepository,
   createCurrentRbacAccessRepository,
   createCurrentSshCredentialUsageRepository,
 } from "../repositories/factory.js";
@@ -432,9 +432,7 @@ export function registerHostFolderRoutes(
             hostIds,
           );
 
-          await createCurrentRecentActivityRepository().deleteByHostIds(
-            hostIds,
-          );
+          await recentActivity.deleteByHostIds(hostIds);
 
           await createCurrentRbacAccessRepository().deleteHostAccessForHosts(
             hostIds,

src/backend/database/routes/host-status-routes.ts

@@ -3,13 +3,10 @@ import type { Request, RequestHandler, Response, Router } from "express";
 import { PermissionManager } from "../../utils/permission-manager.js";
 import { DataCrypto } from "../../utils/data-crypto.js";
 import { sshLogger } from "../../utils/logger.js";
-import { createCurrentSettingsRepository } from "../repositories/factory.js";
 import {
-  DEFAULT_STATUS_INTERVAL,
-  GLOBAL_STATUS_INTERVAL_KEY,
-  hostStatusService,
+  hostStatus,
   type HostStatusEntry,
-} from "../../hosts/status/host-status-service.js";
+} from "../../plugins/host-status-provider.js";
 
 interface HostStatusRoutesDeps {
   authenticateJWT: RequestHandler;
@@ -71,7 +68,7 @@ export function registerHostStatusRoutes(
         return sessionExpired(res);
 
       const requested = parseStatusHostIds(req.query.hostIds);
-      const statuses = await hostStatusService.statusesFor(userId, requested);
+      const statuses = await hostStatus.statusesFor(userId, requested);
 
       // One batched permission check: this is polled every few seconds, and a
       // per-host check made it linear in host count against the database.
@@ -110,15 +107,7 @@ export function registerHostStatusRoutes(
     authenticateJWT,
     requireAdmin,
     async (_req: Request, res: Response) => {
-      const value = Number(
-        await createCurrentSettingsRepository().get(GLOBAL_STATUS_INTERVAL_KEY),
-      );
-      res.json({
-        statusCheckInterval:
-          Number.isInteger(value) && value >= 5
-            ? value
-            : DEFAULT_STATUS_INTERVAL,
-      });
+      res.json({ statusCheckInterval: await hostStatus.getIntervalSeconds() });
     },
   );
 
@@ -161,11 +150,7 @@ export function registerHostStatusRoutes(
           .json({ error: "Status check interval must be 5 to 3600 seconds" });
       }
       try {
-        await createCurrentSettingsRepository().set(
-          GLOBAL_STATUS_INTERVAL_KEY,
-          String(seconds),
-        );
-        hostStatusService.retimeAll();
+        await hostStatus.setIntervalSeconds(seconds);
         res.json({ statusCheckInterval: seconds });
       } catch (error) {
         sshLogger.error("Failed to save status check settings", error, {
@@ -198,7 +183,7 @@ export function registerHostStatusRoutes(
       if (DataCrypto.getUserDataKey(userId) === null) {
         return sessionExpired(res);
       }
-      await hostStatusService.refresh(userId);
+      await hostStatus.refresh(userId);
       res.json({ message: "Status checks restarted" });
     },
   );
@@ -247,9 +232,8 @@ export function registerHostStatusRoutes(
         return res.status(404).json({ error: "Status not available" });
       }
 
-      await hostStatusService.statusesFor(userId, null);
-      const entry =
-        hostStatusService.get(id) ?? (await hostStatusService.check(id));
+      await hostStatus.statusesFor(userId, null);
+      const entry = hostStatus.get(id) ?? (await hostStatus.check(id));
       if (!entry) {
         return res.status(404).json({ error: "Status not available" });
       }

src/backend/database/routes/host.ts

@@ -7,25 +7,21 @@ import type { AuthenticatedRequest } from "../../../types/index.js";
 import express, { type Request, type Response } from "express";
 import multer from "multer";
 import { sshLogger, databaseLogger } from "../../utils/logger.js";
+import { resolveHostCredentials } from "../../hosts/resolve-host-credentials.js";
 import { pluginEvents, TOPICS } from "../../plugins/events.js";
 import { AuthManager } from "../../utils/auth-manager.js";
 import { PermissionManager } from "../../utils/permission-manager.js";
 import { DataCrypto } from "../../utils/data-crypto.js";
 import { parseKeyForStorage } from "../../hosts/stored-ssh-key.js";
-import {
-  pickResolvedPassword,
-  pickResolvedUsername,
-} from "../../hosts/credential-username.js";
+import { pickResolvedPassword } from "../../hosts/credential-username.js";
 import { emitInternalEvent } from "../../hosts/internal-events.js";
 import { deleteOwnedHost } from "../../hosts/delete-host.js";
 import {
-  createCurrentCredentialRepository,
   createCurrentRbacAccessRepository,
   createCurrentRoleRepository,
   createCurrentHostResolutionRepository,
   createCurrentHostRepository,
   createCurrentUserRepository,
-  createCurrentSharedHostAuthOverrideRepository,
   createCurrentHostDefaultsRepository,
 } from "../repositories/factory.js";
 import {
@@ -41,7 +37,6 @@ import {
   OWNER_PRIVATE_AUTH_FIELDS,
   OWNER_PRIVATE_SSH_OPTION_FIELDS,
   OWNER_PRIVATE_TERMINAL_CONFIG_FIELDS,
-  hostTerminalExport,
   sanitizeHostForRecipient,
   stripSensitiveFields,
   transformHostResponse,
@@ -67,14 +62,8 @@ import {
   getAuditUsername,
   getRequestMeta,
 } from "../../utils/audit-logger.js";
-import type {
-  HostResolutionCredentialRecord,
-  HostResolutionHostRecord,
-} from "../repositories/host-resolution-repository.js";
-import {
-  requiresPersonalHostAuthentication,
-  resolveRecipientSharedHostAuthentication,
-} from "../../utils/shared-host-auth-resolver.js";
+import type { HostResolutionCredentialRecord } from "../repositories/host-resolution-repository.js";
+
 import { rejectSharedCopyWrites } from "../../sync/shared-copy-guard.js";
 import { sshOptionsForWrite } from "../../hosts/ssh-options.js";
 import {
@@ -91,15 +80,11 @@ import {
   planProtocolAuthWrite,
   ProtocolAuthWriteError,
   readProtocolAuthPayload,
-  toPortableLogins,
   withProtocolAuth,
   writeProtocolAuth,
   type PlannedProtocolAuth,
 } from "../../hosts/protocol-auth/protocol-auth.js";
-import {
-  findHostProtocol,
-  listHostProtocols,
-} from "../../hosts/protocol-auth/registry.js";
+import { findHostProtocol } from "../../hosts/protocol-auth/registry.js";
 import {
   mergeStoredSshOptions,
   parseTerminalConfig,
@@ -1688,340 +1673,6 @@ router.get(
   },
 );
 
-/**
- * @openapi
- * /host/db/host/{id}/export:
- *   get:
- *     summary: Export SSH host
- *     description: Exports a specific SSH host with decrypted credentials.
- *     tags:
- *       - SSH
- *     parameters:
- *       - in: path
- *         name: id
- *         required: true
- *         schema:
- *           type: integer
- *     responses:
- *       200:
- *         description: The exported SSH host.
- *       400:
- *         description: Invalid userId or hostId.
- *       404:
- *         description: SSH host not found.
- *       500:
- *         description: Failed to export SSH host.
- */
-router.get(
-  "/db/host/:id/export",
-  authenticateJWT,
-  requireDataAccess,
-  async (req: Request, res: Response) => {
-    const hostId = Array.isArray(req.params.id)
-      ? req.params.id[0]
-      : req.params.id;
-    const userId = (req as AuthenticatedRequest).userId;
-
-    if (!isNonEmptyString(userId) || !hostId) {
-      return res.status(400).json({ error: "Invalid userId or hostId" });
-    }
-
-    try {
-      const host =
-        await createCurrentHostResolutionRepository().findHostByIdForUser(
-          Number(hostId),
-          userId,
-        );
-
-      if (!host) {
-        return res.status(404).json({ error: "SSH host not found" });
-      }
-
-      const resolvedHost = (await resolveHostCredentials(host, userId)) || host;
-      const hostPluginSettings = (
-        await loadHostPluginSettings([Number(hostId)])
-      ).get(Number(hostId));
-
-      const exportedConnectionType =
-        (resolvedHost.connectionType as string) || "ssh";
-      const isRemoteDesktop = exportedConnectionType !== "ssh";
-
-      const baseExportData = {
-        exportId: resolvedHost.id,
-        connectionType: exportedConnectionType,
-        name: resolvedHost.name,
-        ip: resolvedHost.ip,
-        port: resolvedHost.port,
-        username: resolvedHost.username,
-        password: resolvedHost.password || null,
-        folder: resolvedHost.folder,
-        tags:
-          typeof resolvedHost.tags === "string"
-            ? resolvedHost.tags.split(",").filter(Boolean)
-            : resolvedHost.tags || [],
-        pin: !!resolvedHost.pin,
-        notes: resolvedHost.notes || null,
-        // Every plugin's host settings, secrets redacted, for import to hand back.
-        pluginSettings: hostPluginSettings ?? {},
-        // Each plugin protocol's login, secrets included like the SSH ones.
-        protocolAuth: toPortableLogins(
-          await listProtocolLogins(Number(hostId), userId),
-        ),
-      };
-
-      const exportData = isRemoteDesktop
-        ? baseExportData
-        : {
-            ...baseExportData,
-            authType: resolvedHost.authType,
-            key: resolvedHost.key || null,
-            keyPassword: resolvedHost.keyPassword || null,
-            keyType: resolvedHost.keyType || null,
-            credentialId: resolvedHost.credentialId || null,
-            overrideCredentialUsername:
-              !!resolvedHost.overrideCredentialUsername,
-            sudoPassword: resolvedHost.sudoPassword || null,
-            jumpHosts: resolvedHost.jumpHosts
-              ? JSON.parse(resolvedHost.jumpHosts as string)
-              : null,
-            terminalConfig:
-              hostTerminalExport(resolvedHost).terminalConfig ?? null,
-            sshOptions: hostTerminalExport(resolvedHost).sshOptions,
-            forceKeyboardInteractive:
-              resolvedHost.forceKeyboardInteractive === "true",
-            useSocks5: !!resolvedHost.useSocks5,
-            socks5Host: resolvedHost.socks5Host || null,
-            socks5Port: resolvedHost.socks5Port || null,
-            socks5Username: resolvedHost.socks5Username || null,
-            socks5Password: resolvedHost.socks5Password || null,
-            socks5ProxyChain: resolvedHost.socks5ProxyChain
-              ? JSON.parse(resolvedHost.socks5ProxyChain as string)
-              : null,
-            portKnockSequence: resolvedHost.portKnockSequence
-              ? JSON.parse(resolvedHost.portKnockSequence as string)
-              : null,
-          };
-
-      sshLogger.success("Host exported with decrypted credentials", {
-        operation: "host_export",
-        hostId: parseInt(hostId),
-        userId,
-      });
-
-      res.json(exportData);
-    } catch (err) {
-      sshLogger.error("Failed to export SSH host", err, {
-        operation: "host_export",
-        hostId: parseInt(hostId),
-        userId,
-      });
-      res.status(500).json({ error: "Failed to export SSH host" });
-    }
-  },
-);
-
-/**
- * @openapi
- * /host/db/hosts/export:
- *   get:
- *     summary: Export all SSH hosts
- *     description: Exports all SSH hosts for the current user. By default credentials are decrypted and embedded. With `share=1`, secrets are omitted and credential-authenticated hosts instead reference a scrubbed `credentials` array by alias, suitable for handing off to another user.
- *     tags:
- *       - SSH
- *     parameters:
- *       - in: query
- *         name: share
- *         required: false
- *         schema:
- *           type: string
- *         description: Set to "1" to export without embedded secrets.
- *     responses:
- *       200:
- *         description: All exported SSH hosts.
- *       400:
- *         description: Invalid userId.
- *       500:
- *         description: Failed to export SSH hosts.
- */
-router.get(
-  "/db/hosts/export",
-  authenticateJWT,
-  requireDataAccess,
-  async (req: Request, res: Response) => {
-    const userId = (req as AuthenticatedRequest).userId;
-    const shareMode = req.query.share === "1" || req.query.share === "true";
-
-    if (!isNonEmptyString(userId)) {
-      return res.status(400).json({ error: "Invalid userId" });
-    }
-
-    try {
-      const allHosts =
-        await createCurrentHostResolutionRepository().findHostsByUserId(userId);
-      const pluginSettingsByHost = await loadHostPluginSettings(
-        allHosts.map((h) => h.id as number),
-      );
-
-      const exportedHosts = [];
-      const usedCredentialIds = new Set<number>();
-
-      for (const host of allHosts) {
-        const resolvedHost = shareMode
-          ? host
-          : (await resolveHostCredentials(host, userId)) || host;
-        const hostPluginSettings = pluginSettingsByHost.get(host.id as number);
-
-        const exportedConnectionType =
-          (resolvedHost.connectionType as string) || "ssh";
-        const isRemoteDesktop = exportedConnectionType !== "ssh";
-
-        const baseExportData = {
-          exportId: resolvedHost.id,
-          connectionType: exportedConnectionType,
-          name: resolvedHost.name,
-          ip: resolvedHost.ip,
-          port: resolvedHost.port,
-          username: resolvedHost.username,
-          password: shareMode ? null : resolvedHost.password || null,
-          folder: resolvedHost.folder,
-          tags:
-            typeof resolvedHost.tags === "string"
-              ? resolvedHost.tags.split(",").filter(Boolean)
-              : resolvedHost.tags || [],
-          pin: !!resolvedHost.pin,
-          notes: resolvedHost.notes || null,
-          // Every plugin's host settings, secrets redacted, for import to hand back.
-          pluginSettings: hostPluginSettings ?? {},
-          protocolAuth: shareableLogins(
-            toPortableLogins(
-              await listProtocolLogins(host.id as number, userId),
-            ),
-            shareMode,
-          ),
-        };
-
-        const exportData = isRemoteDesktop
-          ? baseExportData
-          : {
-              ...baseExportData,
-              authType: resolvedHost.authType,
-              key: shareMode ? null : resolvedHost.key || null,
-              keyPassword: shareMode ? null : resolvedHost.keyPassword || null,
-              keyType: resolvedHost.keyType || null,
-              credentialId: resolvedHost.credentialId || null,
-              overrideCredentialUsername:
-                !!resolvedHost.overrideCredentialUsername,
-              sudoPassword: shareMode
-                ? null
-                : resolvedHost.sudoPassword || null,
-              jumpHosts: resolvedHost.jumpHosts
-                ? JSON.parse(resolvedHost.jumpHosts as string)
-                : null,
-              terminalConfig:
-                hostTerminalExport(resolvedHost).terminalConfig ?? null,
-              sshOptions: hostTerminalExport(resolvedHost).sshOptions,
-              forceKeyboardInteractive:
-                resolvedHost.forceKeyboardInteractive === "true",
-              useSocks5: !!resolvedHost.useSocks5,
-              socks5Host: resolvedHost.socks5Host || null,
-              socks5Port: resolvedHost.socks5Port || null,
-              socks5Username: resolvedHost.socks5Username || null,
-              socks5Password: shareMode
-                ? null
-                : resolvedHost.socks5Password || null,
-              socks5ProxyChain: resolvedHost.socks5ProxyChain
-                ? JSON.parse(resolvedHost.socks5ProxyChain as string)
-                : null,
-            };
-
-        if (
-          shareMode &&
-          !isRemoteDesktop &&
-          resolvedHost.authType === "credential" &&
-          resolvedHost.credentialId
-        ) {
-          usedCredentialIds.add(resolvedHost.credentialId as number);
-        }
-
-        exportedHosts.push(exportData);
-      }
-
-      if (!shareMode) {
-        sshLogger.success("All hosts exported with decrypted credentials", {
-          operation: "hosts_export_all",
-          count: exportedHosts.length,
-          userId,
-        });
-
-        return res.json({ hosts: exportedHosts });
-      }
-
-      const exportedCredentials: Record<string, unknown>[] = [];
-      if (usedCredentialIds.size > 0) {
-        const credentialRepository = createCurrentCredentialRepository();
-        const ownedCredentials =
-          await credentialRepository.listDecryptedByUserId(userId);
-        const credentialById = new Map(
-          ownedCredentials.map((credential) => [credential.id, credential]),
-        );
-
-        for (const host of exportedHosts as Record<string, unknown>[]) {
-          const credentialId = host.credentialId as number | null;
-          if (!credentialId) continue;
-          const credential = credentialById.get(credentialId);
-          if (!credential) continue;
-
-          host.credentialAlias = credential.name;
-
-          if (
-            !exportedCredentials.some(
-              (entry) => entry.alias === credential.name,
-            )
-          ) {
-            exportedCredentials.push({
-              alias: credential.name,
-              name: credential.name,
-              description: credential.description || null,
-              folder: credential.folder || null,
-              tags:
-                typeof credential.tags === "string"
-                  ? credential.tags.split(",").filter(Boolean)
-                  : [],
-              authType: credential.authType,
-              username: credential.username || null,
-              keyType: credential.keyType || null,
-            });
-          }
-        }
-      }
-
-      for (const host of exportedHosts as Record<string, unknown>[]) {
-        delete host.credentialId;
-      }
-
-      sshLogger.success("All hosts exported for sharing without secrets", {
-        operation: "hosts_export_all_share",
-        count: exportedHosts.length,
-        credentialCount: exportedCredentials.length,
-        userId,
-      });
-
-      res.json({
-        version: "1",
-        exportedAt: new Date().toISOString(),
-        credentials: exportedCredentials,
-        hosts: exportedHosts,
-      });
-    } catch (err) {
-      sshLogger.error("Failed to export all SSH hosts", err, {
-        operation: "hosts_export_all",
-        userId,
-      });
-      res.status(500).json({ error: "Failed to export SSH hosts" });
-    }
-  },
-);
-
 /**
  * @openapi
  * /host/db/host/{id}:
@@ -2117,231 +1768,6 @@ router.delete(
 // the file-manager plugin, under /plugin-api/file-manager/, and command
 // history to the ssh-terminal plugin, under /plugin-api/ssh-terminal/.
 
-/**
- * A share export leaves out every secret and credential link, the same as
- * it does for SSH.
- */
-function shareableLogins(
-  logins: ReturnType<typeof toPortableLogins>,
-  shareMode: boolean,
-): ReturnType<typeof toPortableLogins> {
-  if (!shareMode) return logins;
-  const out: ReturnType<typeof toPortableLogins> = {};
-  for (const [protocol, login] of Object.entries(logins)) {
-    const declared = findHostProtocol(protocol);
-    const secret = new Set(
-      (declared?.credentialFields ?? [])
-        .filter((field) => field.secret)
-        .map((field) => field.key),
-    );
-    out[protocol] = {
-      authType: login.authType === "credential" ? "direct" : login.authType,
-      credentialId: null,
-      username: login.username,
-      password: null,
-      fields: Object.fromEntries(
-        Object.entries(login.fields).filter(
-          ([key]) => declared && !secret.has(key),
-        ),
-      ),
-    };
-  }
-  return out;
-}
-
-async function resolveHostCredentials(
-  host: Record<string, unknown>,
-  requestingUserId?: string,
-  /**
-   * Credentials already fetched for this request, keyed by id. The host list
-   * preloads them in one query; single-host callers omit it and fall back to
-   * fetching the one credential they need.
-   */
-  preloadedCredentials?: Map<number, HostResolutionCredentialRecord>,
-): Promise<Record<string, unknown>> {
-  try {
-    const ownerId = (host.ownerId || host.userId) as string | undefined;
-    if (
-      requestingUserId &&
-      ownerId &&
-      requestingUserId !== ownerId &&
-      typeof host.id === "number"
-    ) {
-      const authHost = host as unknown as HostResolutionHostRecord;
-      const needsPersonalCredential = requiresPersonalHostAuthentication(
-        authHost,
-        "ssh",
-      );
-      const baseSshOverrideState = {
-        required: needsPersonalCredential,
-        ownerAuthShared: !!host.shareSshAuth,
-      };
-      // Owner auth for the remote desktop protocols is always snapshotted
-      // for recipients; only their own override credential varies per user.
-      const authOverrides: Record<string, unknown> = {
-        ssh: baseSshOverrideState,
-      };
-      const overrideCredentialIds =
-        await createCurrentSharedHostAuthOverrideRepository().listCredentialIds(
-          host.id,
-          requestingUserId,
-        );
-      // Whether a plugin protocol is on is its plugin's host setting; the
-      // client only offers an override for one that is.
-      for (const { id: protocol } of listHostProtocols()) {
-        authOverrides[protocol] = {
-          credentialId: overrideCredentialIds[protocol],
-          required: false,
-          ownerAuthShared: true,
-        };
-      }
-      const recipientHost: Record<string, unknown> = {
-        ...host,
-        credentialId: null,
-        password: null,
-        key: null,
-        keyPassword: null,
-        keyType: null,
-        authOverrides,
-      };
-
-      try {
-        const resolution = await resolveRecipientSharedHostAuthentication(
-          authHost,
-          host.id,
-          requestingUserId,
-          "ssh",
-        );
-
-        if (resolution.source === "personal-override") {
-          const credential = resolution.credential;
-          return {
-            ...recipientHost,
-            authOverrides: {
-              ...authOverrides,
-              ssh: {
-                credentialId: resolution.credentialId,
-                required: false,
-                ownerAuthShared: !!host.shareSshAuth,
-              },
-            },
-            authType:
-              credential.key || credential.privateKey
-                ? "key"
-                : credential.password
-                  ? "password"
-                  : "none",
-            username: credential.username || recipientHost.username,
-            password: credential.password,
-            key: credential.privateKey || credential.key,
-            keyPassword: credential.keyPassword,
-            keyType: credential.keyType,
-          };
-        }
-
-        if (resolution.source === "owner-shared") {
-          if (resolution.authType === "agent") {
-            return {
-              ...recipientHost,
-              authOverrides: {
-                ...authOverrides,
-                ssh: {
-                  required: false,
-                  ownerAuthShared: true,
-                },
-              },
-              authType: "agent",
-            };
-          }
-
-          const sharedAuth = resolution.secret;
-          if (sharedAuth) {
-            const resolvedUsername = pickResolvedUsername(
-              recipientHost.username,
-              sharedAuth.username,
-              host.overrideCredentialUsername,
-            );
-            return {
-              ...recipientHost,
-              authOverrides: {
-                ...authOverrides,
-                ssh: {
-                  required: false,
-                  ownerAuthShared: true,
-                },
-              },
-              authType: sharedAuth.key
-                ? "key"
-                : sharedAuth.password
-                  ? "password"
-                  : "none",
-              username: resolvedUsername,
-              password: sharedAuth.password,
-              key: sharedAuth.key,
-              keyPassword: sharedAuth.keyPassword,
-              keyType: sharedAuth.keyType,
-            };
-          }
-        }
-
-        if (resolution.source === "secretless") {
-          return {
-            ...recipientHost,
-            authOverrides: {
-              ...authOverrides,
-              ssh: {
-                required: false,
-                ownerAuthShared: !!host.shareSshAuth,
-              },
-            },
-          };
-        }
-      } catch {
-        // A missing/deleted override or snapshot behaves like unavailable auth.
-      }
-
-      return recipientHost;
-    }
-
-    if (host.credentialId && (host.userId || host.ownerId)) {
-      const credentialId = host.credentialId as number;
-      const credentialOwnerId = (host.ownerId || host.userId) as string;
-
-      const credential =
-        preloadedCredentials?.get(credentialId) ??
-        (await findUsableCredential(credentialId, credentialOwnerId));
-
-      if (credential) {
-        const resolvedHost: Record<string, unknown> = {
-          ...host,
-          password: pickResolvedPassword(host.password, credential.password),
-          key: credential.key,
-          keyPassword: credential.keyPassword,
-          keyType: credential.keyType,
-        };
-
-        const resolvedUsername = pickResolvedUsername(
-          host.username,
-          credential.username,
-          host.overrideCredentialUsername,
-        );
-        if (resolvedUsername !== undefined) {
-          resolvedHost.username = resolvedUsername;
-        }
-
-        return resolvedHost;
-      }
-    }
-
-    return { ...host };
-  } catch (error) {
-    sshLogger.warn(
-      `Failed to resolve credentials for host ${host.id}: ${getErrorMessage(error)}`,
-    );
-    return host;
-  }
-}
-
 registerHostFolderRoutes(router, {
   authenticateJWT,
   requireViewPermission: permissionManager.requirePermission("hosts.view"),
@@ -2355,7 +1781,6 @@ registerHostFolderRoutes(router, {
 registerHostBulkRoutes(
   router,
   authenticateJWT,
-  permissionManager.requirePermission("hosts.create"),
   permissionManager.requirePermission("hosts.edit"),
   requireDataAccess,
 );

src/backend/database/routes/plugins.ts

@@ -13,6 +13,7 @@ import {
   createCurrentPluginRepository,
 } from "../repositories/factory.js";
 import { getPluginRuntime } from "../../plugins/index.js";
+import { resolvePluginDesktopMode } from "@termix-ssh/plugin-sdk/manifest";
 import { describePluginFrontend } from "../../plugins/assets.js";
 import { isDefaultLookPlugin } from "../../plugins/bundled-index.js";
 import { invalidatePluginPermissionCache } from "../../plugins/permissions.js";
@@ -297,7 +298,9 @@ router.get("/", authenticateJWT, async (req: Request, res: Response) => {
         let features: string[] = [];
         let docs: string | undefined;
         let env: PluginEnvVar[] = [];
-        let desktopMode: unknown = loaded?.manifest.desktop;
+        let desktopMode: unknown = loaded
+          ? resolvePluginDesktopMode(loaded.manifest)
+          : undefined;
         try {
           const manifest = JSON.parse(record.manifestJson) as {
             contributes?: unknown;
@@ -313,8 +316,12 @@ router.get("/", authenticateJWT, async (req: Request, res: Response) => {
             dependencies?: Record<string, string>;
             optionalDependencies?: Record<string, string>;
             desktop?: unknown;
+            runtime?: unknown;
           };
-          desktopMode = loaded?.manifest.desktop ?? manifest?.desktop;
+          desktopMode = loaded
+            ? resolvePluginDesktopMode(loaded.manifest)
+            : (manifest?.desktop ??
+              (manifest?.runtime === "desktop" ? "local" : undefined));
           contributes = manifest?.contributes ?? null;
           capabilities = Array.isArray(manifest?.capabilities)
             ? (manifest.capabilities as string[])

src/backend/database/routes/user-password-reset-routes.ts

@@ -2,13 +2,13 @@ import type { Router } from "express";
 import crypto from "crypto";
 import bcrypt from "bcryptjs";
 import { nanoid } from "nanoid";
+import { recentActivity } from "../../plugins/activity-provider.js";
 import { AuthManager } from "../../utils/auth-manager.js";
 import { authLogger } from "../../utils/logger.js";
 import { loginRateLimiter } from "../../utils/login-rate-limiter.js";
 import {
   createCurrentCredentialRepository,
   createCurrentHostRepository,
-  createCurrentRecentActivityRepository,
   createCurrentSettingsRepository,
   createCurrentSshCredentialUsageRepository,
   createCurrentUserRepository,
@@ -68,7 +68,7 @@ export async function resetUserPassword(
   await userRepository.update(userId, { passwordHash });
 
   await createCurrentSshCredentialUsageRepository().deleteByUserId(userId);
-  await createCurrentRecentActivityRepository().deleteByUserId(userId);
+  await recentActivity.deleteByUserId(userId);
   await createCurrentHostRepository().deleteByUserId(userId);
   await createCurrentCredentialRepository().deleteByUserId(userId);
   // A plugin holding this user's data (anything keyed by

src/backend/database/routes/user-settings-routes.ts

@@ -6,11 +6,6 @@ import {
   setGlobalLogLevel,
 } from "../../utils/logger.js";
 import { logAudit, getRequestMeta } from "../../utils/audit-logger.js";
-import {
-  AUDIT_FORWARD_TOKEN_SETTING,
-  AUDIT_FORWARD_URL_ENV,
-  AUDIT_FORWARD_URL_SETTING,
-} from "../../utils/audit-forwarder.js";
 import {
   NOTIFICATION_PRIVATE_ALLOWLIST_KEY,
   parseNotificationAllowlist,
@@ -192,125 +187,6 @@ export function registerUserSettingsRoutes(
     }
   });
 
-  /**
-   * @openapi
-   * /users/audit-forwarding:
-   *   get:
-   *     summary: Get audit log forwarding settings (admin only)
-   *     tags:
-   *       - Users
-   *     responses:
-   *       200:
-   *         description: Forwarding target. The token itself is never returned.
-   */
-  router.get("/audit-forwarding", authenticateJWT, async (req, res) => {
-    const userId = (req as AuthenticatedRequest).userId;
-    try {
-      if (!(await getAdminActor(userId))) {
-        return res.status(403).json({ error: "Not authorized" });
-      }
-      const settingsRepository = createCurrentSettingsRepository();
-      const url =
-        (await settingsRepository.get(AUDIT_FORWARD_URL_SETTING)) ?? "";
-      const hasToken = !!(await settingsRepository.get(
-        AUDIT_FORWARD_TOKEN_SETTING,
-      ));
-      res.json({
-        url,
-        hasToken,
-        envConfigured: !!process.env[AUDIT_FORWARD_URL_ENV]?.trim(),
-      });
-    } catch (err) {
-      authLogger.error("Failed to get audit forwarding settings", err);
-      res
-        .status(500)
-        .json({ error: "Failed to get audit forwarding settings" });
-    }
-  });
-
-  /**
-   * @openapi
-   * /users/audit-forwarding:
-   *   patch:
-   *     summary: Update audit log forwarding settings (admin only)
-   *     description: Sets the collector URL audit entries are shipped to. An empty URL disables forwarding and clears the stored token. Omitting token keeps the stored one.
-   *     tags:
-   *       - Users
-   *     requestBody:
-   *       required: true
-   *       content:
-   *         application/json:
-   *           schema:
-   *             type: object
-   *             properties:
-   *               url:
-   *                 type: string
-   *               token:
-   *                 type: string
-   *     responses:
-   *       200:
-   *         description: Setting updated.
-   *       403:
-   *         description: Not authorized.
-   */
-  router.patch("/audit-forwarding", authenticateJWT, async (req, res) => {
-    const userId = (req as AuthenticatedRequest).userId;
-    try {
-      const actor = await getAdminActor(userId);
-      if (!actor) {
-        return res.status(403).json({ error: "Not authorized" });
-      }
-      const { url, token } = req.body ?? {};
-      if (
-        typeof url !== "string" ||
-        (token !== undefined && typeof token !== "string")
-      ) {
-        return res.status(400).json({ error: "url must be a string" });
-      }
-      const trimmedUrl = url.trim();
-      if (trimmedUrl && !/^https?:\/\//i.test(trimmedUrl)) {
-        return res.status(400).json({ error: "url must be http(s)" });
-      }
-
-      const settingsRepository = createCurrentSettingsRepository();
-      if (!trimmedUrl) {
-        await settingsRepository.delete(AUDIT_FORWARD_URL_SETTING);
-        await settingsRepository.delete(AUDIT_FORWARD_TOKEN_SETTING);
-      } else {
-        await settingsRepository.set(AUDIT_FORWARD_URL_SETTING, trimmedUrl);
-        if (token !== undefined) {
-          if (token.trim()) {
-            await settingsRepository.set(
-              AUDIT_FORWARD_TOKEN_SETTING,
-              token.trim(),
-            );
-          } else {
-            await settingsRepository.delete(AUDIT_FORWARD_TOKEN_SETTING);
-          }
-        }
-      }
-
-      const { ipAddress, userAgent } = getRequestMeta(req);
-      await logAudit({
-        userId,
-        username: actor.username ?? userId,
-        action: "update_audit_forwarding",
-        resourceType: "setting",
-        details: JSON.stringify({ enabled: !!trimmedUrl }),
-        ipAddress,
-        userAgent,
-        success: true,
-      });
-
-      res.json({ url: trimmedUrl, hasToken: !!token?.trim() });
-    } catch (err) {
-      authLogger.error("Failed to update audit forwarding settings", err);
-      res
-        .status(500)
-        .json({ error: "Failed to update audit forwarding settings" });
-    }
-  });
-
   /**
    * GET/PATCH a comma-list of private hosts an outbound feature may reach.
    * One route pair per private endpoint allowlist, each with its own setting key.

src/backend/database/routes/users.ts

@@ -1543,7 +1543,7 @@ registerUserSocketTicketRoutes(router, { authenticateJWT, authManager });
 registerTlsRoutes(router, authenticateJWT);
 
 registerUserApiKeyRoutes(router, requireAdmin);
-registerBrandingRoutes(router, requireAdmin);
+registerBrandingRoutes(router);
 
 registerAuthRoutes(router);
 registerAuthCompatRoutes(router);

src/backend/hosts/delete-host.ts

@@ -2,10 +2,10 @@ import {
   createCurrentHostRepository,
   createCurrentHostResolutionRepository,
   createCurrentRbacAccessRepository,
-  createCurrentRecentActivityRepository,
   createCurrentSshCredentialUsageRepository,
 } from "../database/repositories/factory.js";
 import { pluginEvents, TOPICS } from "../plugins/events.js";
+import { recentActivity } from "../plugins/activity-provider.js";
 import { sshLogger } from "../utils/logger.js";
 import { emitInternalEvent } from "./internal-events.js";
 
@@ -33,7 +33,7 @@ export async function deleteOwnedHost(
 
   // Plugin rows tied to a host cascade on their refHost() foreign keys.
   await createCurrentSshCredentialUsageRepository().deleteByHostId(hostId);
-  await createCurrentRecentActivityRepository().deleteByHostId(hostId);
+  await recentActivity.deleteByHostId(hostId);
   await createCurrentRbacAccessRepository().deleteHostAccessForHost(hostId);
   await createCurrentHostRepository().deleteForUser(userId, hostId);
 

src/backend/hosts/import/host-export.ts

@@ -0,0 +1,213 @@
+import {
+  createCurrentCredentialRepository,
+  createCurrentHostResolutionRepository,
+} from "../../database/repositories/factory.js";
+import { hostTerminalExport } from "../../database/routes/host-normalizers.js";
+import { loadHostPluginSettings } from "../../database/routes/host-plugin-settings.js";
+import {
+  listProtocolLogins,
+  toPortableLogins,
+} from "../protocol-auth/protocol-auth.js";
+import { findHostProtocol } from "../protocol-auth/registry.js";
+import { resolveHostCredentials } from "../resolve-host-credentials.js";
+
+/**
+ * A share export leaves out every secret and credential link, the same as
+ * it does for SSH.
+ */
+function shareableLogins(
+  logins: ReturnType<typeof toPortableLogins>,
+  shareMode: boolean,
+): ReturnType<typeof toPortableLogins> {
+  if (!shareMode) return logins;
+  const out: ReturnType<typeof toPortableLogins> = {};
+  for (const [protocol, login] of Object.entries(logins)) {
+    const declared = findHostProtocol(protocol);
+    const secret = new Set(
+      (declared?.credentialFields ?? [])
+        .filter((field) => field.secret)
+        .map((field) => field.key),
+    );
+    out[protocol] = {
+      authType: login.authType === "credential" ? "direct" : login.authType,
+      credentialId: null,
+      username: login.username,
+      password: null,
+      fields: Object.fromEntries(
+        Object.entries(login.fields).filter(
+          ([key]) => declared && !secret.has(key),
+        ),
+      ),
+    };
+  }
+  return out;
+}
+
+type Row = Record<string, unknown>;
+
+/** One host as the Termix JSON export carries it. */
+async function exportRow(
+  host: Row,
+  userId: string,
+  shareMode: boolean,
+  pluginSettings: Awaited<ReturnType<typeof loadHostPluginSettings>>,
+): Promise<{ data: Row; isRemoteDesktop: boolean; resolved: Row }> {
+  const resolvedHost = shareMode
+    ? host
+    : (await resolveHostCredentials(host, userId)) || host;
+  const connectionType = (resolvedHost.connectionType as string) || "ssh";
+  const isRemoteDesktop = connectionType !== "ssh";
+
+  const base = {
+    exportId: resolvedHost.id,
+    connectionType,
+    name: resolvedHost.name,
+    ip: resolvedHost.ip,
+    port: resolvedHost.port,
+    username: resolvedHost.username,
+    password: shareMode ? null : resolvedHost.password || null,
+    folder: resolvedHost.folder,
+    tags:
+      typeof resolvedHost.tags === "string"
+        ? resolvedHost.tags.split(",").filter(Boolean)
+        : resolvedHost.tags || [],
+    pin: !!resolvedHost.pin,
+    notes: resolvedHost.notes || null,
+    // Every plugin's host settings, secrets redacted, for import to hand back.
+    pluginSettings: pluginSettings.get(host.id as number) ?? {},
+    // Each plugin protocol's login, secrets included like the SSH ones.
+    protocolAuth: shareableLogins(
+      toPortableLogins(await listProtocolLogins(host.id as number, userId)),
+      shareMode,
+    ),
+  };
+
+  if (isRemoteDesktop) {
+    return { data: base, isRemoteDesktop, resolved: resolvedHost };
+  }
+
+  const terminal = hostTerminalExport(resolvedHost);
+  const data = {
+    ...base,
+    authType: resolvedHost.authType,
+    key: shareMode ? null : resolvedHost.key || null,
+    keyPassword: shareMode ? null : resolvedHost.keyPassword || null,
+    keyType: resolvedHost.keyType || null,
+    credentialId: resolvedHost.credentialId || null,
+    overrideCredentialUsername: !!resolvedHost.overrideCredentialUsername,
+    sudoPassword: shareMode ? null : resolvedHost.sudoPassword || null,
+    jumpHosts: resolvedHost.jumpHosts
+      ? JSON.parse(resolvedHost.jumpHosts as string)
+      : null,
+    terminalConfig: terminal.terminalConfig ?? null,
+    sshOptions: terminal.sshOptions,
+    forceKeyboardInteractive: resolvedHost.forceKeyboardInteractive === "true",
+    useSocks5: !!resolvedHost.useSocks5,
+    socks5Host: resolvedHost.socks5Host || null,
+    socks5Port: resolvedHost.socks5Port || null,
+    socks5Username: resolvedHost.socks5Username || null,
+    socks5Password: shareMode ? null : resolvedHost.socks5Password || null,
+    socks5ProxyChain: resolvedHost.socks5ProxyChain
+      ? JSON.parse(resolvedHost.socks5ProxyChain as string)
+      : null,
+    portKnockSequence: resolvedHost.portKnockSequence
+      ? JSON.parse(resolvedHost.portKnockSequence as string)
+      : null,
+  };
+  return { data, isRemoteDesktop, resolved: resolvedHost };
+}
+
+export interface HostExport {
+  hosts: Row[];
+  /** Share mode only. */
+  version?: string;
+  exportedAt?: string;
+  credentials?: Row[];
+}
+
+/**
+ * All of the user's own hosts. Without shareMode credentials are decrypted and
+ * embedded. With it every secret is left out and credential logins point at a
+ * scrubbed credentials list by alias.
+ */
+export async function exportAllHosts(
+  userId: string,
+  shareMode: boolean,
+  hostIds?: number[],
+): Promise<HostExport> {
+  const owned =
+    await createCurrentHostResolutionRepository().findHostsByUserId(userId);
+  const wanted = hostIds ? new Set(hostIds) : null;
+  const allHosts = wanted
+    ? owned.filter((host) => wanted.has(host.id as number))
+    : owned;
+  const settings = await loadHostPluginSettings(
+    allHosts.map((h) => h.id as number),
+  );
+
+  const hosts: Row[] = [];
+  const usedCredentialIds = new Set<number>();
+
+  for (const host of allHosts) {
+    const { data, isRemoteDesktop, resolved } = await exportRow(
+      host as unknown as Row,
+      userId,
+      shareMode,
+      settings,
+    );
+    if (
+      shareMode &&
+      !isRemoteDesktop &&
+      resolved.authType === "credential" &&
+      resolved.credentialId
+    ) {
+      usedCredentialIds.add(resolved.credentialId as number);
+    }
+    hosts.push(data);
+  }
+
+  if (!shareMode) return { hosts };
+
+  const credentials: Row[] = [];
+  if (usedCredentialIds.size > 0) {
+    const owned =
+      await createCurrentCredentialRepository().listDecryptedByUserId(userId);
+    const byId = new Map(
+      owned.map((credential) => [credential.id, credential]),
+    );
+
+    for (const host of hosts) {
+      const credentialId = host.credentialId as number | null;
+      if (!credentialId) continue;
+      const credential = byId.get(credentialId);
+      if (!credential) continue;
+
+      host.credentialAlias = credential.name;
+
+      if (!credentials.some((entry) => entry.alias === credential.name)) {
+        credentials.push({
+          alias: credential.name,
+          name: credential.name,
+          description: credential.description || null,
+          folder: credential.folder || null,
+          tags:
+            typeof credential.tags === "string"
+              ? credential.tags.split(",").filter(Boolean)
+              : [],
+          authType: credential.authType,
+          username: credential.username || null,
+          keyType: credential.keyType || null,
+        });
+      }
+    }
+  }
+
+  for (const host of hosts) delete host.credentialId;
+
+  return {
+    version: "1",
+    exportedAt: new Date().toISOString(),
+    credentials,
+    hosts,
+  };
+}

src/backend/hosts/import/host-import.ts

@@ -0,0 +1,829 @@
+import {
+  prepareHostImports,
+  remapImportedJumpHosts,
+} from "../../database/routes/host-import-order.js";
+import { sshOptionsForWrite } from "../ssh-options.js";
+import {
+  applyDefaultsAfterHostWrites,
+  applyHostDefaultsToWrite,
+} from "../defaults/index.js";
+import {
+  keepUsableProtocolCredentials,
+  readProtocolAuthPayload,
+  writeProtocolAuth,
+} from "../protocol-auth/protocol-auth.js";
+import { getErrorMessage } from "../../utils/error-message.js";
+import { pluginEvents, TOPICS } from "../../plugins/events.js";
+import {
+  createCurrentCredentialRepository,
+  createCurrentHostRepository,
+  createCurrentHostResolutionRepository,
+  createCurrentHostDefaultsRepository,
+} from "../../database/repositories/factory.js";
+import {
+  listSshAuthProviders,
+  listSshAuthTypeOwners,
+} from "../connect/auth-provider-registry.js";
+import { applyPluginHostImportSettings } from "../../database/routes/host-plugin-settings.js";
+import {
+  isNonEmptyString,
+  isValidPort,
+  normalizeImportedHost,
+} from "../../database/routes/host-normalizers.js";
+
+/** A request the caller got wrong. Routes answer it with a 400. */
+export class ImportError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "ImportError";
+  }
+}
+
+export interface ImportResults {
+  success: number;
+  updated: number;
+  skipped: number;
+  failed: number;
+  errors: string[];
+  /** Hosts this call created. */
+  createdHostIds: number[];
+  /** True when atomic was set and a failure undid the creates. */
+  rolledBack?: boolean;
+}
+
+export interface BulkImportInput {
+  hosts: unknown;
+  overwrite?: unknown;
+  credentials?: unknown;
+  /** All or nothing: any failure deletes what this call created. */
+  atomic?: boolean;
+}
+
+type SSHConfigHost = {
+  name: string;
+  hostname?: string;
+  user?: string;
+  port?: number;
+  identityFile?: string;
+  proxyJump?: string;
+};
+
+type ShareCredential = {
+  alias?: unknown;
+  name?: unknown;
+  description?: unknown;
+  folder?: unknown;
+  tags?: unknown;
+  authType?: unknown;
+  username?: unknown;
+  keyType?: unknown;
+};
+
+function textValue(value: unknown): string | null {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+
+function tagString(value: unknown): string {
+  if (Array.isArray(value)) {
+    return value
+      .map((tag) => textValue(tag))
+      .filter((tag): tag is string => !!tag)
+      .join(",");
+  }
+  return textValue(value) || "";
+}
+
+function normalizeCredentialAuthType(value: unknown): "password" | "key" {
+  return value === "key" ? "key" : "password";
+}
+
+export function parseSSHConfig(content: string): SSHConfigHost[] {
+  const results: SSHConfigHost[] = [];
+  let current: SSHConfigHost | null = null;
+
+  for (const rawLine of content.split("\n")) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) continue;
+
+    const match = /^(\S+?)(?:\s*=\s*|\s+)(.+)$/.exec(line);
+    if (!match) continue;
+
+    const key = match[1].toLowerCase();
+    const value = match[2];
+
+    if (key === "host") {
+      if (current && current.hostname) results.push(current);
+      // Skip wildcard patterns
+      if (value === "*" || value.includes("*") || value.includes("?")) {
+        current = null;
+      } else {
+        current = { name: value };
+      }
+      continue;
+    }
+
+    if (!current) continue;
+
+    switch (key) {
+      case "hostname":
+        current.hostname = value;
+        break;
+      case "user":
+        current.user = value;
+        break;
+      case "port": {
+        const p = Number.parseInt(value, 10);
+        if (p > 0 && p <= 65535) current.port = p;
+        break;
+      }
+      case "identityfile":
+        if (!current.identityFile) current.identityFile = value;
+        break;
+      case "proxyjump":
+        current.proxyJump = value;
+        break;
+    }
+  }
+
+  if (current && current.hostname) results.push(current);
+
+  return results;
+}
+
+/**
+ * Tells status checks and other pollers about hosts an import wrote, the way
+ * a single host create or update does.
+ */
+export function notifyImportedHosts(
+  userId: string,
+  hostIds: number[],
+  createdHostIds: number[],
+): void {
+  for (const hostId of createdHostIds) {
+    pluginEvents.emit(TOPICS.hostCreated, { hostId, userId });
+  }
+  for (const hostId of hostIds) {
+    pluginEvents.emit(TOPICS.hostUpdated, { hostId, userId });
+  }
+}
+
+export function importedHostUsername(
+  connectionType: string,
+  authType: unknown,
+  username: unknown,
+): string | null {
+  if (isNonEmptyString(username)) return username;
+  if (connectionType !== "ssh" || authType === "credential") return "";
+  return null;
+}
+
+/**
+ * Status check fields from an import row. Exports from before 2.9.0 carried
+ * them inside statsConfig.
+ */
+function importedStatusCheck(raw: Record<string, unknown>): {
+  statusCheckEnabled: boolean;
+  statusCheckInterval: number | null;
+} {
+  const legacy =
+    raw.statsConfig && typeof raw.statsConfig === "object"
+      ? (raw.statsConfig as Record<string, unknown>)
+      : {};
+  const enabled = raw.statusCheckEnabled ?? legacy.statusCheckEnabled;
+  const useGlobal = legacy.useGlobalStatusInterval !== false;
+  const interval =
+    raw.statusCheckInterval ?? (useGlobal ? null : legacy.statusCheckInterval);
+  const seconds = Number(interval);
+  return {
+    statusCheckEnabled: enabled !== false && legacy.disableTcpPing !== true,
+    statusCheckInterval:
+      interval != null && Number.isInteger(seconds) && seconds >= 5
+        ? seconds
+        : null,
+  };
+}
+
+const BUILTIN_SSH_AUTH_TYPES = [
+  "password",
+  "key",
+  "credential",
+  "agent",
+  "none",
+];
+
+/** Core's own types plus every type a plugin registers or declares. */
+function listKnownAuthTypes(): Set<string> {
+  return new Set([
+    ...BUILTIN_SSH_AUTH_TYPES,
+    ...listSshAuthProviders().map((provider) => provider.type),
+    ...listSshAuthTypeOwners().map((owner) => owner.type),
+  ]);
+}
+
+/** Fills an imported host's inherited keys and records what it sets itself. */
+async function withHostDefaults(
+  userId: string,
+  hostId: number | null,
+  columns: Record<string, unknown>,
+  body: Record<string, unknown>,
+): Promise<void> {
+  const stored =
+    hostId === null
+      ? null
+      : ((
+          await createCurrentHostDefaultsRepository().listHosts({
+            hostIds: [hostId],
+          })
+        )[0] ?? null);
+  columns.defaultOverrides = JSON.stringify(
+    await applyHostDefaultsToWrite({
+      ownerId: userId,
+      hostId,
+      columns,
+      body,
+      stored,
+    }),
+  );
+}
+
+export function importSummary(results: ImportResults): string {
+  return `Import completed: ${results.success} created, ${results.updated} updated, ${results.skipped} skipped, ${results.failed} failed`;
+}
+
+export function importResponse(results: ImportResults) {
+  return {
+    message: importSummary(results),
+    success: results.success,
+    updated: results.updated,
+    skipped: results.skipped,
+    failed: results.failed,
+    errors: results.errors,
+  };
+}
+
+export const MAX_IMPORT_HOSTS = 100;
+
+/** Deletes what an atomic import created, newest first. */
+async function rollBackCreated(
+  userId: string,
+  results: ImportResults,
+): Promise<void> {
+  const repository = createCurrentHostRepository();
+  for (const hostId of [...results.createdHostIds].reverse()) {
+    await repository.deleteForUser(userId, hostId).catch(() => {});
+  }
+  results.rolledBack = true;
+  results.success = 0;
+  results.createdHostIds = [];
+}
+
+/**
+ * The Termix JSON import: shared by POST /host/bulk-import and
+ * ctx.hosts.importMany. Callers wrap it in DatabaseSaveTrigger.batched.
+ */
+export async function runBulkImport(
+  userId: string,
+  input: BulkImportInput,
+): Promise<ImportResults> {
+  const {
+    hosts: hostsToImport,
+    overwrite,
+    credentials: credentialsToImport,
+  } = input;
+  if (input.atomic && overwrite) {
+    throw new ImportError("An atomic import cannot overwrite existing hosts");
+  }
+
+  if (!Array.isArray(hostsToImport) || hostsToImport.length === 0) {
+    throw new ImportError("Hosts array is required and must not be empty");
+  }
+
+  if (hostsToImport.length > 100) {
+    throw new ImportError("Maximum 100 hosts allowed per import");
+  }
+
+  let orderedHosts: ReturnType<typeof prepareHostImports>;
+  try {
+    orderedHosts = prepareHostImports(hostsToImport);
+  } catch (error) {
+    throw new ImportError(getErrorMessage(error));
+  }
+  const importedIds = new Map<unknown, number>();
+
+  const results: ImportResults = {
+    success: 0,
+    updated: 0,
+    skipped: 0,
+    failed: 0,
+    errors: [],
+    createdHostIds: [],
+  };
+
+  const credentialAliasMap = new Map<string, number>();
+  const addCredentialAlias = (alias: unknown, id: number) => {
+    const key = textValue(alias);
+    if (key) credentialAliasMap.set(key.toLowerCase(), id);
+  };
+
+  try {
+    const credentialRepository = createCurrentCredentialRepository();
+    const existingCredentials =
+      await credentialRepository.listDecryptedByUserId(userId);
+
+    for (const credential of existingCredentials) {
+      addCredentialAlias(credential.name, credential.id as number);
+    }
+
+    if (Array.isArray(credentialsToImport)) {
+      for (const rawCredential of credentialsToImport as ShareCredential[]) {
+        const alias = textValue(rawCredential.alias);
+        const name = textValue(rawCredential.name) || alias;
+        if (!alias || !name) continue;
+
+        const existingId = credentialAliasMap.get(name.toLowerCase());
+        if (existingId) {
+          addCredentialAlias(alias, existingId);
+          continue;
+        }
+
+        const now = new Date().toISOString();
+        const created = await credentialRepository.createEncryptedForUser(
+          userId,
+          {
+            userId,
+            name,
+            description:
+              textValue(rawCredential.description) ||
+              "Imported placeholder. Add the secret before connecting.",
+            folder: textValue(rawCredential.folder),
+            tags: tagString(rawCredential.tags),
+            authType: normalizeCredentialAuthType(rawCredential.authType),
+            username: textValue(rawCredential.username),
+            password: null,
+            key: null,
+            privateKey: null,
+            publicKey: null,
+            keyPassword: null,
+            keyType: textValue(rawCredential.keyType),
+            detectedKeyType: null,
+            usageCount: 0,
+            lastUsed: null,
+            createdAt: now,
+            updatedAt: now,
+          },
+        );
+
+        const createdCredential = created as Record<string, unknown>;
+        addCredentialAlias(alias, createdCredential.id as number);
+        addCredentialAlias(name, createdCredential.id as number);
+      }
+    }
+  } catch (error) {
+    results.errors.push(
+      `Credential placeholders: ${getErrorMessage(error, "failed to prepare credential aliases")}`,
+    );
+  }
+
+  // Loaded for both modes: overwrite updates a match, skip leaves it alone.
+  let existingHostMap: Map<string, { id: number }> | undefined;
+  const hostRepository = createCurrentHostRepository();
+  try {
+    const allHosts =
+      await createCurrentHostResolutionRepository().findHostsByUserId(userId);
+    existingHostMap = new Map();
+    for (const h of allHosts) {
+      const key = `${h.ip}:${h.port}:${h.username}`;
+      existingHostMap.set(key, { id: h.id as number });
+    }
+  } catch {
+    existingHostMap = undefined;
+  }
+
+  const knownAuthTypes = listKnownAuthTypes();
+  const writtenHostIds: number[] = [];
+  const createdHostIds: number[] = [];
+  for (const { host: hostData, index: i, exportId } of orderedHosts) {
+    try {
+      const effectiveConnectionType = hostData.connectionType || "ssh";
+
+      if (
+        effectiveConnectionType === "ssh" &&
+        hostData.authType === "credential" &&
+        !hostData.credentialId &&
+        hostData.credentialAlias
+      ) {
+        hostData.credentialId = credentialAliasMap.get(
+          hostData.credentialAlias.toLowerCase(),
+        );
+      }
+
+      if (!isNonEmptyString(hostData.ip) || !isValidPort(hostData.port)) {
+        results.failed++;
+        results.errors.push(
+          `Host ${i + 1}: Missing required fields (ip, port)`,
+        );
+        continue;
+      }
+
+      const username = importedHostUsername(
+        effectiveConnectionType,
+        hostData.authType,
+        hostData.username,
+      );
+      if (username === null) {
+        results.failed++;
+        results.errors.push(
+          `Host ${i + 1}: Username required for SSH connections`,
+        );
+        continue;
+      }
+
+      const lookupKey = `${hostData.ip}:${hostData.port}:${hostData.username}`;
+      const existing = existingHostMap?.get(lookupKey);
+      if (existing && !overwrite) {
+        // Hosts that jump through this one still resolve to the kept host.
+        if (exportId !== undefined) importedIds.set(exportId, existing.id);
+        results.skipped++;
+        continue;
+      }
+
+      if (
+        effectiveConnectionType === "ssh" &&
+        hostData.authType &&
+        !knownAuthTypes.has(hostData.authType)
+      ) {
+        results.failed++;
+        results.errors.push(
+          `Host ${i + 1}: Invalid authType. Must be one of ${[...knownAuthTypes].join(", ")}`,
+        );
+        continue;
+      }
+
+      if (
+        effectiveConnectionType === "ssh" &&
+        hostData.authType === "password" &&
+        !isNonEmptyString(hostData.password)
+      ) {
+        results.failed++;
+        results.errors.push(
+          `Host ${i + 1}: Password required for password authentication`,
+        );
+        continue;
+      }
+
+      if (
+        effectiveConnectionType === "ssh" &&
+        hostData.authType === "key" &&
+        !isNonEmptyString(hostData.key)
+      ) {
+        results.failed++;
+        results.errors.push(
+          `Host ${i + 1}: Key required for key authentication`,
+        );
+        continue;
+      }
+
+      if (
+        effectiveConnectionType === "ssh" &&
+        hostData.authType === "credential" &&
+        !hostData.credentialId
+      ) {
+        results.failed++;
+        results.errors.push(
+          `Host ${i + 1}: credentialId required for credential authentication`,
+        );
+        continue;
+      }
+
+      if (
+        effectiveConnectionType === "ssh" &&
+        hostData.authType === "credential" &&
+        hostData.credentialId
+      ) {
+        const credentialRepository = createCurrentCredentialRepository();
+        const cred = await credentialRepository.findByIdForUser(
+          userId,
+          hostData.credentialId,
+        );
+
+        if (!cred) {
+          const fallback = await credentialRepository.listByUserId(userId);
+
+          if (fallback.length > 0) {
+            hostData.credentialId = fallback[0].id;
+          } else if (isNonEmptyString(hostData.key)) {
+            hostData.authType = "key";
+            hostData.credentialId = undefined;
+          } else if (isNonEmptyString(hostData.password)) {
+            hostData.authType = "password";
+            hostData.credentialId = undefined;
+          } else {
+            results.failed++;
+            results.errors.push(
+              `Host ${i + 1}: credentialId ${hostData.credentialId} not found and no fallback credential available`,
+            );
+            continue;
+          }
+        }
+      }
+
+      const jumpHosts = remapImportedJumpHosts(hostData.jumpHosts, importedIds);
+      const sshDataObj: Record<string, unknown> = {
+        userId: userId,
+        connectionType: effectiveConnectionType,
+        name: hostData.name || `${username}@${hostData.ip}`,
+        folder: hostData.folder || "Default",
+        tags: Array.isArray(hostData.tags) ? hostData.tags.join(",") : "",
+        ip: hostData.ip,
+        port: hostData.port,
+        username,
+        pin: hostData.pin || false,
+        sudoPassword: hostData.sudoPassword || null,
+        jumpHosts: jumpHosts ? JSON.stringify(jumpHosts) : null,
+        ...importedStatusCheck(hostData as Record<string, unknown>),
+        // A 2.8 export carries these inside terminalConfig.
+        sshOptions:
+          sshOptionsForWrite({
+            sshOptions: hostData.sshOptions,
+            terminalConfig: hostData.terminalConfig,
+          }) ?? null,
+        forceKeyboardInteractive: hostData.forceKeyboardInteractive
+          ? "true"
+          : "false",
+        notes: hostData.notes || null,
+        useSocks5: hostData.useSocks5 ? 1 : 0,
+        socks5Host: hostData.socks5Host || null,
+        socks5Port: hostData.socks5Port || null,
+        socks5Username: hostData.socks5Username || null,
+        socks5Password: hostData.socks5Password || null,
+        socks5ProxyChain: hostData.socks5ProxyChain
+          ? JSON.stringify(hostData.socks5ProxyChain)
+          : null,
+        portKnockSequence: hostData.portKnockSequence
+          ? JSON.stringify(hostData.portKnockSequence)
+          : null,
+        overrideCredentialUsername: hostData.overrideCredentialUsername ? 1 : 0,
+        enableSsh: hostData.enableSsh ?? effectiveConnectionType === "ssh",
+        updatedAt: new Date().toISOString(),
+      };
+
+      if (effectiveConnectionType !== "ssh") {
+        sshDataObj.password = hostData.password || null;
+        sshDataObj.authType = "password";
+        sshDataObj.credentialId = null;
+        sshDataObj.key = null;
+        sshDataObj.keyPassword = null;
+        sshDataObj.keyType = null;
+      } else {
+        sshDataObj.password =
+          hostData.authType === "password" ? hostData.password : null;
+        sshDataObj.authType = hostData.authType || "password";
+        sshDataObj.credentialId =
+          hostData.authType === "credential" ? hostData.credentialId : null;
+        sshDataObj.key = hostData.authType === "key" ? hostData.key : null;
+        sshDataObj.keyPassword =
+          hostData.authType === "key" ? hostData.keyPassword || null : null;
+        sshDataObj.keyType =
+          hostData.authType === "key" ? hostData.keyType || "auto" : null;
+      }
+
+      await withHostDefaults(
+        userId,
+        existing?.id ?? null,
+        sshDataObj,
+        hostData as Record<string, unknown>,
+      );
+
+      let savedHostId: number;
+      if (existing) {
+        const saved = await hostRepository.updateEncryptedForUser(
+          userId,
+          existing.id,
+          sshDataObj,
+        );
+        if (!saved) throw new Error("Host no longer exists");
+        if (exportId !== undefined) importedIds.set(exportId, existing.id);
+        savedHostId = existing.id;
+        results.updated++;
+      } else {
+        sshDataObj.createdAt = new Date().toISOString();
+        const saved = await hostRepository.createEncryptedForUser(
+          userId,
+          sshDataObj,
+        );
+        if (exportId !== undefined) importedIds.set(exportId, saved.id);
+        savedHostId = saved.id;
+        createdHostIds.push(saved.id);
+        results.success++;
+      }
+
+      const protocolAuth = readProtocolAuthPayload(
+        hostData as Record<string, unknown>,
+      );
+      if (protocolAuth) {
+        await writeProtocolAuth(
+          userId,
+          savedHostId,
+          await keepUsableProtocolCredentials(protocolAuth, userId),
+          { isOwner: true },
+        );
+      }
+
+      // Every enabled plugin that declares host-scope settings and
+      // registered a hostImportNormalizer validates and writes its own
+      // fields here, so this loop does not need to know which plugins
+      // exist. See host-plugin-settings.ts.
+      await applyPluginHostImportSettings(
+        savedHostId,
+        hostData as Record<string, unknown>,
+      );
+      writtenHostIds.push(savedHostId);
+    } catch (error) {
+      results.failed++;
+      results.errors.push(`Host ${i + 1}: ${getErrorMessage(error)}`);
+    }
+  }
+
+  results.createdHostIds = createdHostIds;
+  if (input.atomic && results.failed > 0) {
+    await rollBackCreated(userId, results);
+    return results;
+  }
+
+  await applyDefaultsAfterHostWrites(writtenHostIds);
+  notifyImportedHosts(userId, writtenHostIds, createdHostIds);
+  results.createdHostIds = createdHostIds;
+  return results;
+}
+
+/** The OpenSSH config import, shared by the route and ctx.hosts. */
+export async function runSshConfigImport(
+  userId: string,
+  input: { content?: unknown; overwrite?: unknown; atomic?: boolean },
+): Promise<ImportResults> {
+  const { content, overwrite } = input;
+  if (input.atomic && overwrite) {
+    throw new ImportError("An atomic import cannot overwrite existing hosts");
+  }
+
+  if (!isNonEmptyString(content)) {
+    throw new ImportError("content is required and must be a non-empty string");
+  }
+
+  let parsed: SSHConfigHost[];
+  try {
+    parsed = parseSSHConfig(content);
+  } catch {
+    throw new ImportError("Failed to parse SSH config file");
+  }
+
+  if (parsed.length === 0) {
+    throw new ImportError("No valid Host entries found in the SSH config file");
+  }
+
+  if (parsed.length > 100) {
+    throw new ImportError("Maximum 100 hosts allowed per import");
+  }
+
+  const hostsToImport = parsed.map((h) => ({
+    name: h.name,
+    ip: h.hostname,
+    port: h.port ?? 22,
+    username: h.user,
+    authType: h.identityFile ? "key" : undefined,
+    connectionType: "ssh",
+    enableSsh: true,
+    ...(h.proxyJump
+      ? {
+          jumpHosts: [{ host: h.proxyJump, port: 22 }],
+        }
+      : {}),
+  }));
+
+  const results: ImportResults = {
+    success: 0,
+    updated: 0,
+    skipped: 0,
+    failed: 0,
+    errors: [],
+    createdHostIds: [],
+  };
+
+  let existingHostMap: Map<string, { id: number }> | undefined;
+  const hostRepository = createCurrentHostRepository();
+  try {
+    const allHosts =
+      await createCurrentHostResolutionRepository().findHostsByUserId(userId);
+    existingHostMap = new Map();
+    for (const h of allHosts) {
+      const key = `${h.ip}:${h.port}:${h.username}`;
+      existingHostMap.set(key, { id: h.id as number });
+    }
+  } catch {
+    existingHostMap = undefined;
+  }
+
+  const writtenHostIds: number[] = [];
+  const createdHostIds: number[] = [];
+  for (let i = 0; i < hostsToImport.length; i++) {
+    const hostData = normalizeImportedHost(
+      hostsToImport[i] as Record<string, unknown>,
+    );
+
+    try {
+      if (!isNonEmptyString(hostData.ip) || !isValidPort(hostData.port)) {
+        results.failed++;
+        results.errors.push(
+          `Host "${parsed[i].name}": Missing required fields (HostName, Port)`,
+        );
+        continue;
+      }
+
+      const lookupKey = `${hostData.ip}:${hostData.port}:${hostData.username}`;
+      const existing = existingHostMap?.get(lookupKey);
+      if (existing && !overwrite) {
+        results.skipped++;
+        continue;
+      }
+
+      const sshDataObj: Record<string, unknown> = {
+        userId,
+        connectionType: "ssh",
+        name: hostData.name || hostData.ip,
+        folder: "Default",
+        tags: "",
+        ip: hostData.ip,
+        port: hostData.port,
+        username: hostData.username || null,
+        authType: hostData.authType || "none",
+        password: null,
+        key: null,
+        keyPassword: null,
+        keyType: null,
+        credentialId: null,
+        pin: false,
+        sudoPassword: null,
+        jumpHosts: hostData.jumpHosts
+          ? JSON.stringify(hostData.jumpHosts)
+          : null,
+        statusCheckEnabled: true,
+        statusCheckInterval: null,
+        sshOptions: null,
+        forceKeyboardInteractive: "false",
+        notes: null,
+        useSocks5: 0,
+        socks5Host: null,
+        socks5Port: null,
+        socks5Username: null,
+        socks5Password: null,
+        socks5ProxyChain: null,
+        portKnockSequence: null,
+        overrideCredentialUsername: 0,
+        enableSsh: true,
+        updatedAt: new Date().toISOString(),
+      };
+
+      await withHostDefaults(
+        userId,
+        existing?.id ?? null,
+        sshDataObj,
+        hostData as unknown as Record<string, unknown>,
+      );
+
+      if (existing) {
+        await hostRepository.updateEncryptedForUser(
+          userId,
+          existing.id,
+          sshDataObj,
+        );
+        writtenHostIds.push(existing.id);
+        results.updated++;
+      } else {
+        sshDataObj.createdAt = new Date().toISOString();
+        const saved = await hostRepository.createEncryptedForUser(
+          userId,
+          sshDataObj,
+        );
+        writtenHostIds.push(saved.id);
+        createdHostIds.push(saved.id);
+        results.success++;
+      }
+    } catch (error) {
+      results.failed++;
+      results.errors.push(
+        `Host "${parsed[i].name}": ${getErrorMessage(error)}`,
+      );
+    }
+  }
+
+  results.createdHostIds = createdHostIds;
+  if (input.atomic && results.failed > 0) {
+    await rollBackCreated(userId, results);
+    return results;
+  }
+
+  await applyDefaultsAfterHostWrites(writtenHostIds);
+  notifyImportedHosts(userId, writtenHostIds, createdHostIds);
+  results.createdHostIds = createdHostIds;
+  return results;
+}

src/backend/hosts/resolve-host-credentials.ts

@@ -0,0 +1,211 @@
+import { getErrorMessage } from "../utils/error-message.js";
+import { sshLogger } from "../utils/logger.js";
+import { findUsableCredential } from "./usable-credential.js";
+import {
+  pickResolvedPassword,
+  pickResolvedUsername,
+} from "./credential-username.js";
+import { createCurrentSharedHostAuthOverrideRepository } from "../database/repositories/factory.js";
+import { listHostProtocols } from "./protocol-auth/registry.js";
+import {
+  requiresPersonalHostAuthentication,
+  resolveRecipientSharedHostAuthentication,
+} from "../utils/shared-host-auth-resolver.js";
+import type {
+  HostResolutionCredentialRecord,
+  HostResolutionHostRecord,
+} from "../database/repositories/host-resolution-repository.js";
+
+/** A host with its credential's secrets filled in for the asking user. */
+export async function resolveHostCredentials(
+  host: Record<string, unknown>,
+  requestingUserId?: string,
+  /**
+   * Credentials already fetched for this request, keyed by id. The host list
+   * preloads them in one query; single-host callers omit it and fall back to
+   * fetching the one credential they need.
+   */
+  preloadedCredentials?: Map<number, HostResolutionCredentialRecord>,
+): Promise<Record<string, unknown>> {
+  try {
+    const ownerId = (host.ownerId || host.userId) as string | undefined;
+    if (
+      requestingUserId &&
+      ownerId &&
+      requestingUserId !== ownerId &&
+      typeof host.id === "number"
+    ) {
+      const authHost = host as unknown as HostResolutionHostRecord;
+      const needsPersonalCredential = requiresPersonalHostAuthentication(
+        authHost,
+        "ssh",
+      );
+      const baseSshOverrideState = {
+        required: needsPersonalCredential,
+        ownerAuthShared: !!host.shareSshAuth,
+      };
+      // Owner auth for the remote desktop protocols is always snapshotted
+      // for recipients; only their own override credential varies per user.
+      const authOverrides: Record<string, unknown> = {
+        ssh: baseSshOverrideState,
+      };
+      const overrideCredentialIds =
+        await createCurrentSharedHostAuthOverrideRepository().listCredentialIds(
+          host.id,
+          requestingUserId,
+        );
+      // Whether a plugin protocol is on is its plugin's host setting; the
+      // client only offers an override for one that is.
+      for (const { id: protocol } of listHostProtocols()) {
+        authOverrides[protocol] = {
+          credentialId: overrideCredentialIds[protocol],
+          required: false,
+          ownerAuthShared: true,
+        };
+      }
+      const recipientHost: Record<string, unknown> = {
+        ...host,
+        credentialId: null,
+        password: null,
+        key: null,
+        keyPassword: null,
+        keyType: null,
+        authOverrides,
+      };
+
+      try {
+        const resolution = await resolveRecipientSharedHostAuthentication(
+          authHost,
+          host.id,
+          requestingUserId,
+          "ssh",
+        );
+
+        if (resolution.source === "personal-override") {
+          const credential = resolution.credential;
+          return {
+            ...recipientHost,
+            authOverrides: {
+              ...authOverrides,
+              ssh: {
+                credentialId: resolution.credentialId,
+                required: false,
+                ownerAuthShared: !!host.shareSshAuth,
+              },
+            },
+            authType:
+              credential.key || credential.privateKey
+                ? "key"
+                : credential.password
+                  ? "password"
+                  : "none",
+            username: credential.username || recipientHost.username,
+            password: credential.password,
+            key: credential.privateKey || credential.key,
+            keyPassword: credential.keyPassword,
+            keyType: credential.keyType,
+          };
+        }
+
+        if (resolution.source === "owner-shared") {
+          if (resolution.authType === "agent") {
+            return {
+              ...recipientHost,
+              authOverrides: {
+                ...authOverrides,
+                ssh: {
+                  required: false,
+                  ownerAuthShared: true,
+                },
+              },
+              authType: "agent",
+            };
+          }
+
+          const sharedAuth = resolution.secret;
+          if (sharedAuth) {
+            const resolvedUsername = pickResolvedUsername(
+              recipientHost.username,
+              sharedAuth.username,
+              host.overrideCredentialUsername,
+            );
+            return {
+              ...recipientHost,
+              authOverrides: {
+                ...authOverrides,
+                ssh: {
+                  required: false,
+                  ownerAuthShared: true,
+                },
+              },
+              authType: sharedAuth.key
+                ? "key"
+                : sharedAuth.password
+                  ? "password"
+                  : "none",
+              username: resolvedUsername,
+              password: sharedAuth.password,
+              key: sharedAuth.key,
+              keyPassword: sharedAuth.keyPassword,
+              keyType: sharedAuth.keyType,
+            };
+          }
+        }
+
+        if (resolution.source === "secretless") {
+          return {
+            ...recipientHost,
+            authOverrides: {
+              ...authOverrides,
+              ssh: {
+                required: false,
+                ownerAuthShared: !!host.shareSshAuth,
+              },
+            },
+          };
+        }
+      } catch {
+        // A missing/deleted override or snapshot behaves like unavailable auth.
+      }
+
+      return recipientHost;
+    }
+
+    if (host.credentialId && (host.userId || host.ownerId)) {
+      const credentialId = host.credentialId as number;
+      const credentialOwnerId = (host.ownerId || host.userId) as string;
+
+      const credential =
+        preloadedCredentials?.get(credentialId) ??
+        (await findUsableCredential(credentialId, credentialOwnerId));
+
+      if (credential) {
+        const resolvedHost: Record<string, unknown> = {
+          ...host,
+          password: pickResolvedPassword(host.password, credential.password),
+          key: credential.key,
+          keyPassword: credential.keyPassword,
+          keyType: credential.keyType,
+        };
+
+        const resolvedUsername = pickResolvedUsername(
+          host.username,
+          credential.username,
+          host.overrideCredentialUsername,
+        );
+        if (resolvedUsername !== undefined) {
+          resolvedHost.username = resolvedUsername;
+        }
+
+        return resolvedHost;
+      }
+    }
+
+    return { ...host };
+  } catch (error) {
+    sshLogger.warn(
+      `Failed to resolve credentials for host ${host.id}: ${getErrorMessage(error)}`,
+    );
+    return host;
+  }
+}

src/backend/hosts/status/host-status-service.ts

@@ -1,491 +0,0 @@
-/**
- * The host list's status dot.
- *
- * Every host with status checks on gets a TCP connection to its port on a
- * timer. A port that answers is "online", one that does not (twice in a row)
- * is "offline". An open session or a working login also counts as online.
- * Probing never logs in to the host itself: on RADIUS or Duo backed devices a
- * login fires a real 2FA push, every interval. A host behind jump hosts is
- * probed through a chain, which does log in to the hops, so hosts that share
- * a hop list share one chain (jump-probe-pool.ts).
- *
- * Polling is demand driven. A user asking for statuses starts polling their
- * own hosts; nothing is probed for a user who never opened the app. The first
- * request waits briefly for those first checks so it is not empty.
- */
-
-import { pluginEvents, TOPICS } from "../../plugins/events.js";
-import { hostSessionStatus } from "../host-session-status.js";
-import { sshLogger } from "../../utils/logger.js";
-import {
-  createCurrentHostResolutionRepository,
-  getCurrentSettingValue,
-} from "../../database/repositories/factory.js";
-import type { HostStatusTargetRow } from "../../database/repositories/host-resolution-repository.js";
-import type { HostStatus } from "./host-status.js";
-import { ConcurrentLimiter } from "./limiter.js";
-import { tcpPing } from "./tcp-ping.js";
-import { JumpProbePool } from "./jump-probe-pool.js";
-
-export const GLOBAL_STATUS_INTERVAL_KEY = "global_status_check_interval";
-export const DEFAULT_STATUS_INTERVAL = 30;
-/** How long the first request for a user waits for the first checks. */
-const FIRST_CHECK_WAIT_MS = 6_000;
-/** A status younger than this is fresh enough for check(). */
-const FRESH_MS = 30_000;
-
-export interface HostStatusEntry {
-  status: HostStatus;
-  lastChecked: string;
-}
-
-export interface HostStatusPayload {
-  hostId: number;
-  ownerUserId: string;
-  status: HostStatus;
-  previous: HostStatus | null;
-  /** Anything but offline, the shape automations' trigger already reads. */
-  online: boolean;
-}
-
-export interface StatusTarget {
-  id: number;
-  userId: string;
-  ip: string;
-  port: number;
-  connectionType: string;
-  jumpHosts: Array<{ hostId: number }>;
-  statusCheckEnabled: boolean;
-  statusCheckInterval: number | null;
-}
-
-type PortResolver = (
-  hostId: number,
-) => number | undefined | Promise<number | undefined>;
-
-export interface HostStatusDeps {
-  loadTargets: (filter: {
-    userId?: string;
-    hostIds?: number[];
-  }) => Promise<StatusTarget[]>;
-  /** Hosts other users shared with this one, directly or through a role. */
-  loadSharedHostIds?: (userId: string) => Promise<number[]>;
-  ping: (host: string, port: number) => Promise<boolean>;
-  pingThroughJumpHosts: (
-    target: StatusTarget,
-    port: number,
-  ) => Promise<boolean>;
-  hasActiveSession?: (hostId: number) => boolean;
-  globalInterval: () => number;
-  emit: (payload: HostStatusPayload) => void;
-  /** Pause before a failed ping is tried again. */
-  retryDelayMs?: number;
-}
-
-function parseJumpHosts(raw: string | null): Array<{ hostId: number }> {
-  if (!raw) return [];
-  try {
-    const parsed = JSON.parse(raw);
-    return Array.isArray(parsed)
-      ? parsed.filter(
-          (hop): hop is { hostId: number } =>
-            !!hop && Number.isInteger((hop as { hostId?: unknown }).hostId),
-        )
-      : [];
-  } catch {
-    return [];
-  }
-}
-
-export function toStatusTarget(row: HostStatusTargetRow): StatusTarget {
-  return {
-    id: row.id,
-    userId: row.userId,
-    ip: row.ip,
-    port: row.port,
-    connectionType: row.connectionType || "ssh",
-    jumpHosts: parseJumpHosts(row.jumpHosts),
-    statusCheckEnabled: row.statusCheckEnabled !== false,
-    statusCheckInterval: row.statusCheckInterval ?? null,
-  };
-}
-
-const jumpProbes = new JumpProbePool(async (jumpHosts, userId) => {
-  const { createJumpHostChain } = await import("../jump-host-chain.js");
-  return createJumpHostChain(jumpHosts, userId);
-});
-
-const defaultDeps: HostStatusDeps = {
-  loadTargets: async (filter) =>
-    (
-      await createCurrentHostResolutionRepository().listStatusTargets(filter)
-    ).map(toStatusTarget),
-  loadSharedHostIds: async (userId) => {
-    const { createCurrentRbacAccessRepository, createCurrentRoleRepository } =
-      await import("../../database/repositories/factory.js");
-    const roleIds = await createCurrentRoleRepository().listUserRoleIds(userId);
-    const entries =
-      await createCurrentRbacAccessRepository().listVisibleHostAccessEntries(
-        userId,
-        roleIds,
-      );
-    return [...new Set(entries.map((entry) => entry.hostId))];
-  },
-  hasActiveSession: (hostId) => hostSessionStatus.hasActiveSession(hostId),
-  ping: (host, port) => tcpPing(host, port, 5000),
-  pingThroughJumpHosts: (target, port) =>
-    jumpProbes.ping(target.jumpHosts, target.userId, target.ip, port, 5000),
-  globalInterval: () => {
-    const value = Number(getCurrentSettingValue(GLOBAL_STATUS_INTERVAL_KEY));
-    return Number.isInteger(value) && value >= 5
-      ? value
-      : DEFAULT_STATUS_INTERVAL;
-  },
-  emit: (payload) => pluginEvents.emit(TOPICS.hostStatus, payload),
-};
-
-interface Polled {
-  target: StatusTarget;
-  timer?: NodeJS.Timeout;
-}
-
-export class HostStatusService {
-  private readonly polled = new Map<number, Polled>();
-  private readonly store = new Map<number, HostStatusEntry>();
-  private readonly owners = new Map<number, string>();
-  private readonly inFlight = new Map<number, Promise<void>>();
-  private readonly startedUsers = new Set<string>();
-  private readonly portResolvers = new Map<string, Set<PortResolver>>();
-  private readonly limiter = new ConcurrentLimiter(20);
-  private unsubscribers: Array<() => void> = [];
-
-  constructor(private readonly deps: HostStatusDeps = defaultDeps) {}
-
-  /** Subscribes to the core events the status depends on. */
-  start(): void {
-    if (this.unsubscribers.length > 0) return;
-    this.unsubscribers = [
-      hostSessionStatus.subscribe((hostId, online) => {
-        if (online) this.reportLogin(hostId, { ok: true });
-      }),
-      pluginEvents.on(TOPICS.hostUpdated, (payload) => {
-        const { hostId } = payload as { hostId?: number };
-        if (hostId) void this.reload(hostId);
-      }),
-      pluginEvents.on(TOPICS.hostDeleted, (payload) => {
-        const { hostId } = payload as { hostId?: number };
-        if (hostId) this.forget(hostId);
-      }),
-    ];
-  }
-
-  stop(): void {
-    for (const unsubscribe of this.unsubscribers) unsubscribe();
-    this.unsubscribers = [];
-    for (const hostId of [...this.polled.keys()]) this.stopPolling(hostId);
-    this.startedUsers.clear();
-  }
-
-  get(hostId: number): HostStatusEntry | null {
-    return this.store.get(hostId) ?? null;
-  }
-
-  /**
-   * Statuses for a user's request. With hostIds, polling is brought in line
-   * with exactly those of their own hosts (the desktop app sends only the
-   * hosts that live on this backend). Without, their own hosts are started
-   * once.
-   */
-  async statusesFor(
-    userId: string,
-    requestedHostIds: Set<number> | null,
-  ): Promise<Map<number, HostStatusEntry>> {
-    const started: Promise<void>[] = [];
-    if (requestedHostIds !== null) {
-      await this.reconcile(userId, requestedHostIds, started);
-    } else if (!this.startedUsers.has(userId)) {
-      await this.startUser(userId, started);
-    }
-    if (started.length > 0) await this.waitFor(started);
-    return this.store;
-  }
-
-  /** Drops every timer for a user's hosts and starts them again. */
-  async refresh(userId: string): Promise<void> {
-    const targets = await this.deps.loadTargets({ userId });
-    for (const target of targets) this.stopPolling(target.id);
-    for (const target of targets) this.startPolling(target);
-    this.startedUsers.add(userId);
-  }
-
-  /** Re-times every polled host, after the global interval changed. */
-  retimeAll(): void {
-    for (const { target } of [...this.polled.values()]) {
-      this.startPolling(target, false);
-    }
-  }
-
-  /** Checks now unless the last result is fresh. */
-  async check(hostId: number): Promise<HostStatusEntry | null> {
-    const current = this.store.get(hostId);
-    if (current && Date.now() - Date.parse(current.lastChecked) < FRESH_MS) {
-      return current;
-    }
-    const target =
-      this.polled.get(hostId)?.target ??
-      (await this.deps.loadTargets({ hostIds: [hostId] }))[0];
-    if (!target || !target.statusCheckEnabled) return current ?? null;
-    await this.probe(target);
-    return this.store.get(hostId) ?? null;
-  }
-
-  /**
-   * A working login proves the host is up. A failed one says nothing about
-   * reachability (a wrong password, another user's login), so it is ignored.
-   */
-  reportLogin(hostId: number, outcome: { ok: boolean }): void {
-    if (outcome.ok) this.set(hostId, { status: "online" });
-  }
-
-  registerPort(connectionType: string, resolve: PortResolver): () => void {
-    let set = this.portResolvers.get(connectionType);
-    if (!set) {
-      set = new Set();
-      this.portResolvers.set(connectionType, set);
-    }
-    set.add(resolve);
-    return () => {
-      set!.delete(resolve);
-      if (set!.size === 0) this.portResolvers.delete(connectionType);
-    };
-  }
-
-  private async waitFor(started: Promise<void>[]): Promise<void> {
-    let timer: NodeJS.Timeout | undefined;
-    await Promise.race([
-      Promise.allSettled(started),
-      new Promise<void>((resolve) => {
-        timer = setTimeout(resolve, FIRST_CHECK_WAIT_MS);
-        timer.unref?.();
-      }),
-    ]);
-    if (timer) clearTimeout(timer);
-  }
-
-  private track(started: Promise<void>[], target: StatusTarget): void {
-    const probe = this.startPolling(target);
-    if (probe) started.push(probe);
-  }
-
-  private async startUser(
-    userId: string,
-    started: Promise<void>[],
-  ): Promise<void> {
-    this.startedUsers.add(userId);
-    const targets = await this.deps.loadTargets({ userId });
-    for (const target of targets) {
-      if (!this.polled.has(target.id)) this.track(started, target);
-    }
-    await this.startShared(userId, null, started);
-  }
-
-  /**
-   * Hosts shared with the user are checked as their owners, even when no
-   * owner has asked for statuses since the server started.
-   */
-  private async startShared(
-    userId: string,
-    allowed: Set<number> | null,
-    started: Promise<void>[],
-  ): Promise<void> {
-    if (!this.deps.loadSharedHostIds) return;
-    try {
-      const shared = (await this.deps.loadSharedHostIds(userId)).filter(
-        (hostId) =>
-          !this.polled.has(hostId) && (allowed === null || allowed.has(hostId)),
-      );
-      if (shared.length === 0) return;
-      const targets = await this.deps.loadTargets({ hostIds: shared });
-      for (const target of targets) {
-        if (!this.polled.has(target.id)) this.track(started, target);
-      }
-    } catch (error) {
-      sshLogger.warn("Could not start status checks for shared hosts", {
-        operation: "host_status_shared",
-        userId,
-        error: error instanceof Error ? error.message : String(error),
-      });
-    }
-  }
-
-  private async reconcile(
-    userId: string,
-    allowed: Set<number>,
-    started: Promise<void>[],
-  ): Promise<void> {
-    const targets = await this.deps.loadTargets({ userId });
-    for (const target of targets) {
-      if (!allowed.has(target.id)) {
-        this.stopPolling(target.id);
-        this.store.delete(target.id);
-        continue;
-      }
-      if (!this.polled.has(target.id)) this.track(started, target);
-    }
-    await this.startShared(userId, allowed, started);
-  }
-
-  private async reload(hostId: number): Promise<void> {
-    try {
-      const [target] = await this.deps.loadTargets({ hostIds: [hostId] });
-      if (!target) {
-        this.forget(hostId);
-        return;
-      }
-      if (this.polled.has(hostId) || this.startedUsers.has(target.userId)) {
-        this.startPolling(target);
-      }
-    } catch (error) {
-      sshLogger.warn("Could not reload host for status checks", {
-        operation: "host_status_reload",
-        hostId,
-        error: error instanceof Error ? error.message : String(error),
-      });
-    }
-  }
-
-  private forget(hostId: number): void {
-    this.stopPolling(hostId);
-    this.store.delete(hostId);
-    this.owners.delete(hostId);
-  }
-
-  private intervalMs(target: StatusTarget): number {
-    const seconds = target.statusCheckInterval ?? this.deps.globalInterval();
-    const intervalMs = Math.max(5, seconds) * 1000;
-    // Spread hosts so a fleet does not fire on the same second.
-    const spread = Math.min(intervalMs * 0.2, 15_000);
-    return (
-      intervalMs + ((target.id * 1103515245) % Math.max(1, Math.floor(spread)))
-    );
-  }
-
-  /** Returns the first probe when one was started. */
-  private startPolling(
-    target: StatusTarget,
-    probeNow = true,
-  ): Promise<void> | undefined {
-    this.stopPolling(target.id);
-    this.owners.set(target.id, target.userId);
-    if (!target.statusCheckEnabled) {
-      this.store.delete(target.id);
-      return undefined;
-    }
-    const polled: Polled = { target };
-    this.polled.set(target.id, polled);
-    const first = probeNow ? this.probe(target) : undefined;
-    polled.timer = setInterval(() => {
-      const latest = this.polled.get(target.id);
-      if (latest) void this.probe(latest.target);
-    }, this.intervalMs(target));
-    polled.timer.unref?.();
-    return first;
-  }
-
-  private stopPolling(hostId: number): void {
-    const polled = this.polled.get(hostId);
-    if (polled?.timer) clearInterval(polled.timer);
-    this.polled.delete(hostId);
-  }
-
-  private probe(target: StatusTarget): Promise<void> {
-    const running = this.inFlight.get(target.id);
-    if (running) return running;
-    const job = this.limiter
-      .run(() => this.probeNow(target))
-      .catch((error) => {
-        sshLogger.error("Status check failed", error, {
-          operation: "host_status_probe",
-          hostId: target.id,
-        });
-      })
-      .finally(() => this.inFlight.delete(target.id));
-    this.inFlight.set(target.id, job);
-    return job;
-  }
-
-  private async portFor(target: StatusTarget): Promise<number> {
-    if (target.connectionType !== "ssh") {
-      for (const resolve of this.portResolvers.get(target.connectionType) ??
-        []) {
-        try {
-          const port = await resolve(target.id);
-          if (Number.isInteger(port) && port! > 0) return port!;
-        } catch {
-          // fall through to the next resolver
-        }
-      }
-    }
-    return target.port;
-  }
-
-  private async pingOnce(target: StatusTarget): Promise<boolean> {
-    try {
-      if (this.deps.hasActiveSession?.(target.id)) return true;
-      const port = await this.portFor(target);
-      return target.jumpHosts.length > 0
-        ? await this.deps.pingThroughJumpHosts(target, port)
-        : await this.deps.ping(target.ip, port);
-    } catch {
-      return false;
-    }
-  }
-
-  private async probeNow(target: StatusTarget): Promise<void> {
-    this.owners.set(target.id, target.userId);
-    let reachable = await this.pingOnce(target);
-    if (!reachable) {
-      // One lost packet should not flip the dot.
-      const delay = this.deps.retryDelayMs ?? 1000;
-      if (delay > 0) await new Promise((resolve) => setTimeout(resolve, delay));
-      reachable = await this.pingOnce(target);
-    }
-    this.set(target.id, { status: reachable ? "online" : "offline" });
-  }
-
-  private set(hostId: number, entry: Omit<HostStatusEntry, "lastChecked">) {
-    const previous = this.store.get(hostId)?.status ?? null;
-    const next: HostStatusEntry = {
-      ...entry,
-      lastChecked: new Date().toISOString(),
-    };
-    this.store.set(hostId, next);
-    if (previous === next.status) return;
-    void this.emitChange(hostId, next, previous);
-  }
-
-  private async emitChange(
-    hostId: number,
-    entry: HostStatusEntry,
-    previous: HostStatus | null,
-  ): Promise<void> {
-    let ownerUserId = this.owners.get(hostId);
-    if (!ownerUserId) {
-      const [target] = await this.deps
-        .loadTargets({ hostIds: [hostId] })
-        .catch(() => []);
-      if (!target) return;
-      ownerUserId = target.userId;
-      this.owners.set(hostId, ownerUserId);
-    }
-    this.deps.emit({
-      hostId,
-      ownerUserId,
-      status: entry.status,
-      previous,
-      online: entry.status === "online",
-    });
-  }
-}
-
-export const hostStatusService = new HostStatusService();

src/backend/hosts/status/host-status.ts

@@ -1,9 +0,0 @@
-export type HostStatus = "online" | "offline";
-
-export function isHostKeyVerificationError(error: unknown): boolean {
-  return (
-    error instanceof Error &&
-    (error.message.includes("Host denied (verification failed)") ||
-      error.message.includes("Host key changed"))
-  );
-}

src/backend/hosts/status/limiter.ts

@@ -1,81 +0,0 @@
-/**
- * Limits how many async jobs run at once. Extra callers wait in FIFO order.
- */
-export class ConcurrentLimiter {
-  private active = 0;
-  private readonly waiters: Array<() => void> = [];
-
-  constructor(private maxConcurrent: number) {
-    if (maxConcurrent < 1) {
-      throw new Error("maxConcurrent must be >= 1");
-    }
-  }
-
-  get activeCount(): number {
-    return this.active;
-  }
-
-  get pendingCount(): number {
-    return this.waiters.length;
-  }
-
-  get limit(): number {
-    return this.maxConcurrent;
-  }
-
-  /**
-   * Changes the ceiling at runtime.
-   *
-   * Raising it wakes the waiters the new headroom allows, so a queue that built
-   * up under the old limit drains at once instead of one job at a time as
-   * running work finishes. Lowering it never interrupts work already running;
-   * the new limit simply applies from the next release onward.
-   */
-  setLimit(maxConcurrent: number): void {
-    if (maxConcurrent < 1) {
-      throw new Error("maxConcurrent must be >= 1");
-    }
-    this.maxConcurrent = maxConcurrent;
-    this.releaseWaiters();
-  }
-
-  /**
-   * Wakes as many queued callers as there is now room for.
-   *
-   * `woken` counts callers that have been resumed but have not yet reached the
-   * `active += 1` on the far side of their await. Without it the occupancy
-   * looks lower than it really is for a microtask, and the loop would release
-   * past the ceiling.
-   */
-  private releaseWaiters(): void {
-    while (
-      this.active + this.woken < this.maxConcurrent &&
-      this.waiters.length > 0
-    ) {
-      this.woken += 1;
-      this.waiters.shift()!();
-    }
-  }
-
-  private woken = 0;
-
-  async run<T>(fn: () => Promise<T>): Promise<T> {
-    // Queue behind anything already woken, so a caller arriving mid-handoff
-    // cannot jump the queue and push occupancy past the ceiling.
-    if (this.active + this.woken >= this.maxConcurrent) {
-      await new Promise<void>((resolve) => {
-        this.waiters.push(resolve);
-      });
-      // Resumed by a slot handoff; that reservation is now consumed.
-      this.woken = Math.max(0, this.woken - 1);
-    }
-
-    this.active += 1;
-    try {
-      return await fn();
-    } finally {
-      this.active -= 1;
-      this.releaseWaiters();
-    }
-  }
-}

src/backend/plugins/activity-provider.ts

@@ -0,0 +1,105 @@
+/**
+ * Recent activity is a provider: core owns the callers (the dashboard routes,
+ * ctx.hosts.recordActivity, the cleanup when a user or host goes away) and one
+ * provider owns the storage. A plugin registers with
+ * ctx.hosts.activity.provide. With none, nothing is recorded and the list is
+ * empty. Core checks that the user may reach the host before it records.
+ */
+
+export interface ActivityEntry {
+  id: number;
+  userId: string;
+  type: string;
+  hostId: number;
+  hostName: string | null;
+  timestamp: string;
+}
+
+export type RecordActivityResult =
+  | { status: "logged"; id: number }
+  | { status: "rate_limited" }
+  | { status: "invalid_type" }
+  | { status: "denied" }
+  | { status: "unavailable" };
+
+export interface ActivityProvider {
+  record(
+    userId: string,
+    entry: { type: string; hostId: number; hostName: string },
+  ): Promise<RecordActivityResult>;
+  list(userId: string, limit: number): Promise<ActivityEntry[]>;
+  deleteByUserId(userId: string): Promise<void>;
+  deleteByHostIds(hostIds: number[]): Promise<void>;
+}
+
+let plugged: { pluginId: string; provider: ActivityProvider } | null = null;
+
+export function provideActivity(
+  pluginId: string,
+  provider: ActivityProvider,
+): () => void {
+  if (plugged) {
+    throw new Error(
+      `Recent activity is already provided by plugin "${plugged.pluginId}"`,
+    );
+  }
+  const entry = { pluginId, provider };
+  plugged = entry;
+  return () => {
+    if (plugged === entry) plugged = null;
+  };
+}
+
+function active(): ActivityProvider | null {
+  return plugged?.provider ?? null;
+}
+
+async function canReachHost(userId: string, hostId: number): Promise<boolean> {
+  const {
+    createCurrentHostResolutionRepository,
+    createCurrentRbacAccessRepository,
+    createCurrentRoleRepository,
+  } = await import("../database/repositories/factory.js");
+  if (
+    await createCurrentHostResolutionRepository().isHostOwnedByUser(
+      hostId,
+      userId,
+    )
+  ) {
+    return true;
+  }
+  const roleIds = await createCurrentRoleRepository().listUserRoleIds(userId);
+  const shared =
+    await createCurrentRbacAccessRepository().listVisibleHostAccessEntries(
+      userId,
+      roleIds,
+    );
+  return shared.some((access) => access.hostId === hostId);
+}
+
+/** What the rest of core calls. */
+export const recentActivity = {
+  async record(
+    userId: string,
+    entry: { type: string; hostId: number; hostName: string },
+  ): Promise<RecordActivityResult> {
+    const provider = active();
+    if (!provider) return { status: "unavailable" };
+    if (!(await canReachHost(userId, entry.hostId))) {
+      return { status: "denied" };
+    }
+    return provider.record(userId, entry);
+  },
+  async list(userId: string, limit: number): Promise<ActivityEntry[]> {
+    return (await active()?.list(userId, limit)) ?? [];
+  },
+  async deleteByUserId(userId: string): Promise<void> {
+    await active()?.deleteByUserId(userId);
+  },
+  async deleteByHostId(hostId: number): Promise<void> {
+    await active()?.deleteByHostIds([hostId]);
+  },
+  async deleteByHostIds(hostIds: number[]): Promise<void> {
+    await active()?.deleteByHostIds(hostIds);
+  },
+};

src/backend/plugins/ctx-audit.ts

@@ -0,0 +1,143 @@
+/**
+ * ctx.audit.subscribe, list and exportBatches: reading the audit trail,
+ * behind audit:read. Writing lines (record) stays in ctx.ts.
+ */
+
+import type {
+  PluginAudit,
+  PluginAuditEntry,
+  PluginAuditFilters,
+} from "@termix-ssh/plugin-sdk/backend";
+import type { PluginManifest } from "@termix-ssh/plugin-sdk/manifest";
+import { assertCapability, capabilityRefused } from "./permissions.js";
+import type { DisposableBag } from "./disposables.js";
+import { onAuditEntry } from "../utils/audit-hooks.js";
+import type { AuditLogRecord } from "../database/repositories/audit-log-repository.js";
+
+type AuditFn = (
+  action: string,
+  details: string,
+  outcome: { success: boolean; errorMessage?: string },
+) => Promise<void>;
+
+interface Deps {
+  manifest: PluginManifest;
+  bag: DisposableBag;
+  audit: AuditFn;
+}
+
+const MAX_PAGE = 200;
+const MAX_BATCH = 1000;
+
+function toEntry(row: AuditLogRecord): PluginAuditEntry {
+  return {
+    id: row.id,
+    timestamp: new Date(
+      row.timestamp as unknown as string | number,
+    ).toISOString(),
+    userId: row.userId ?? null,
+    username: row.username,
+    action: row.action,
+    resourceType: row.resourceType,
+    resourceId: row.resourceId ?? null,
+    resourceName: row.resourceName ?? null,
+    details: row.details ?? null,
+    ipAddress: row.ipAddress ?? null,
+    userAgent: row.userAgent ?? null,
+    success: Boolean(row.success),
+    errorMessage: row.errorMessage ?? null,
+  };
+}
+
+export function createPluginAuditReader(
+  deps: Deps,
+): Pick<PluginAudit, "subscribe" | "list" | "exportBatches"> {
+  const { manifest, bag, audit } = deps;
+  const require = (action: string) =>
+    assertCapability(manifest.id, "audit:read", manifest.capabilities, action);
+
+  return {
+    subscribe: (handler) => {
+      if (!manifest.capabilities.includes("audit:read")) {
+        throw capabilityRefused(manifest.id, "audit:read", "audit_subscribe");
+      }
+      let remove: (() => void) | null = null;
+      let forgetBag: (() => void) | null = null;
+      // Granted state is checked once, then every line is delivered until
+      // unsubscribed; a revoked grant stops the next subscribe.
+      void require("audit_subscribe")
+        .then(async () => {
+          await audit("audit_subscribe", "listened to the audit log", {
+            success: true,
+          });
+          remove = onAuditEntry((entry) => {
+            handler({
+              timestamp: entry.timestamp.toISOString(),
+              userId: entry.userId,
+              username: entry.username,
+              action: entry.action,
+              resourceType: entry.resourceType,
+              resourceId: entry.resourceId ?? null,
+              resourceName: entry.resourceName ?? null,
+              details: entry.details ?? null,
+              ipAddress: entry.ipAddress ?? null,
+              userAgent: entry.userAgent ?? null,
+              success: entry.success,
+              errorMessage: entry.errorMessage ?? null,
+            });
+          });
+        })
+        .catch(() => {});
+      forgetBag = bag.add(() => remove?.(), "audit subscription");
+      return () => {
+        remove?.();
+        remove = null;
+        forgetBag?.();
+      };
+    },
+
+    list: async (options) => {
+      await require("audit_list");
+      const { createCurrentAuditLogRepository } =
+        await import("../database/repositories/factory.js");
+      const limit = Math.min(MAX_PAGE, Math.max(1, options?.limit ?? 50));
+      const page = await createCurrentAuditLogRepository().listPage({
+        filters: options?.filters ?? {},
+        limit,
+        offset: Math.max(0, options?.offset ?? 0),
+      });
+      await audit("audit_list", "read audit log entries", { success: true });
+      return { entries: page.logs.map(toEntry), total: page.total };
+    },
+
+    exportBatches: async function* (
+      filters?: PluginAuditFilters,
+      batchSize?: number,
+    ) {
+      await require("audit_export");
+      const { createCurrentAuditLogRepository } =
+        await import("../database/repositories/factory.js");
+      const limit = Math.min(MAX_BATCH, Math.max(1, batchSize ?? 500));
+      let offset = 0;
+      let exported = 0;
+      try {
+        for (;;) {
+          const rows = await createCurrentAuditLogRepository().listForExport({
+            filters: filters ?? {},
+            limit,
+            offset,
+          });
+          if (rows.length === 0) break;
+          exported += rows.length;
+          offset += rows.length;
+          yield rows.map(toEntry);
+          if (rows.length < limit) break;
+        }
+      } finally {
+        await audit("audit_export", `exported ${exported} audit log entries`, {
+          success: true,
+        });
+      }
+    },
+  };
+}

src/backend/plugins/ctx-credentials.ts

@@ -194,6 +194,74 @@ export function createPluginCredentials({
       }
     },
 
+    publicKey: async (credentialId) => {
+      const details = `public key of credential ${credentialId}`;
+      try {
+        await assertCapability(pluginId, "credentials:use", declared);
+        const userId = actingUser();
+        await requireCorePermission(userId, "credentials.view");
+        if (!Number.isInteger(credentialId) || credentialId <= 0) {
+          throw new Error("A credential id is required");
+        }
+        const { createCurrentHostResolutionRepository } =
+          await import("../database/repositories/factory.js");
+        const credential =
+          await createCurrentHostResolutionRepository().findCredentialByIdForUser(
+            credentialId,
+            userId,
+          );
+        const row = credential as unknown as Record<string, unknown> | null;
+        if (!row || row.authType !== "key") {
+          await audit("credentials_public_key", details, { success: true });
+          return null;
+        }
+        let publicKey =
+          typeof row.publicKey === "string" && row.publicKey.trim()
+            ? row.publicKey.trim()
+            : null;
+        if (!publicKey) {
+          const stored = str(row.privateKey) || str(row.key);
+          if (stored) {
+            const { resolveKeyReferences } =
+              await import("../hosts/stored-ssh-key.js");
+            const resolved = await resolveKeyReferences(
+              userId,
+              stored,
+              typeof row.keyPassword === "string" ? row.keyPassword : null,
+            );
+            publicKey = derivePublicKey(resolved.key, resolved.passphrase);
+          }
+        }
+        await audit("credentials_public_key", details, { success: true });
+        return publicKey;
+      } catch (error) {
+        await audit("credentials_public_key", details, {
+          success: false,
+          errorMessage: errorText(error),
+        });
+        throw error;
+      }
+    },
+
+    resolveKeyRefs: async (key, passphrase) => {
+      const details = "resolved key references";
+      try {
+        await assertCapability(pluginId, "credentials:read", declared);
+        const userId = actingUser();
+        const { resolveKeyReferences } =
+          await import("../hosts/stored-ssh-key.js");
+        const resolved = await resolveKeyReferences(userId, key, passphrase);
+        await audit("credentials_resolve_key", details, { success: true });
+        return resolved;
+      } catch (error) {
+        await audit("credentials_resolve_key", details, {
+          success: false,
+          errorMessage: errorText(error),
+        });
+        throw error;
+      }
+    },
+
     registerSecretResolver: (scheme, resolve) => {
       if (!declared.includes("auth:provide")) {
         throw capabilityRefused(pluginId, "auth:provide");

src/backend/plugins/ctx-desktop-local.ts

@@ -0,0 +1,259 @@
+/**
+ * ctx.desktop.local: the user's own machine, behind desktop:local.
+ *
+ * Only works on the desktop app's embedded backend. On a server every call
+ * throws, and available() is false. Path rules live in desktop-local/local-fs.
+ */
+
+import type {
+  PluginDesktopLocal,
+  PluginLocalPty,
+} from "@termix-ssh/plugin-sdk/backend";
+import type { PluginManifest } from "@termix-ssh/plugin-sdk/manifest";
+import { assertCapability } from "./permissions.js";
+import type { DisposableBag } from "./disposables.js";
+import * as localFs from "./desktop-local/local-fs.js";
+import { remoteJson, requestHeaders } from "../sync/client/http.js";
+import { spawnLocalPty } from "./desktop-local/local-pty.js";
+
+type AuditFn = (
+  action: string,
+  details: string,
+  outcome: { success: boolean; errorMessage?: string },
+) => Promise<void>;
+
+interface Deps {
+  manifest: PluginManifest;
+  bag: DisposableBag;
+  audit: AuditFn;
+}
+
+function isEmbedded(): boolean {
+  return process.env.ELECTRON_EMBEDDED === "true";
+}
+
+export function createPluginDesktopLocal(deps: Deps): PluginDesktopLocal {
+  const { manifest, bag, audit } = deps;
+  const audited = new Set<string>();
+
+  const guard = async (action: string, details: string, every = false) => {
+    await assertCapability(
+      manifest.id,
+      "desktop:local",
+      manifest.capabilities,
+      action,
+    );
+    if (!isEmbedded()) {
+      throw new Error(
+        `Plugin ${manifest.id} used the local machine outside the desktop app`,
+      );
+    }
+    if (every || !audited.has(action)) {
+      audited.add(action);
+      await audit(action, details, { success: true });
+    }
+  };
+
+  const mainRequest = async (channel: string, path: string) => {
+    const { requestFromElectronMain } =
+      await import("../utils/electron-ipc-bridge.js");
+    return requestFromElectronMain<{ success: boolean; error?: string }>(
+      channel,
+      { path },
+    );
+  };
+
+  return {
+    available: () =>
+      isEmbedded() && manifest.capabilities.includes("desktop:local"),
+
+    pluginFetch: async (origin, subPath, init) => {
+      await guard("desktop_local_fetch", "called its own routes");
+      if (
+        typeof subPath !== "string" ||
+        !subPath.startsWith("/") ||
+        subPath.startsWith("//") ||
+        subPath.includes("\\") ||
+        /(^|\/)\.\.?(\/|\?|$)/.test(subPath)
+      ) {
+        throw new Error("Invalid plugin route path");
+      }
+      const route = `/plugin-api/${manifest.id}${subPath}`;
+      const headers: Record<string, string> = { ...init?.headers };
+      for (const name of Object.keys(headers)) {
+        if (/^(authorization|cookie|host)$/i.test(name)) delete headers[name];
+      }
+      if (origin === "remote") {
+        const { getLink } = await import("../sync/client/link-store.js");
+        const link = await getLink();
+        if (!link) throw new Error("This device is not linked to a server");
+        const { remoteStreamFetch } = await import("../sync/client/http.js");
+        return (await remoteStreamFetch(link, route, {
+          method: init?.method,
+          headers,
+          body: init?.body,
+          signal: init?.signal,
+        })) as never;
+      }
+      if (origin !== "local") throw new Error("Unknown origin");
+      const { getActor } = await import("./actor.js");
+      const actor = getActor();
+      if (!actor) throw new Error("No acting user");
+      const { AuthManager } = await import("../utils/auth-manager.js");
+      const session = await AuthManager.getInstance().issuePluginSession(
+        actor,
+        {
+          pluginId: manifest.id,
+          purpose: "desktop local transfer",
+          ttlSeconds: 900,
+        },
+      );
+      const port = Number(process.env.EMBEDDED_BACKEND_PORT) || 30001;
+      const { fetch: undiciFetch } = await import("undici");
+      return (await undiciFetch(`http://127.0.0.1:${port}${route}`, {
+        method: init?.method ?? "GET",
+        headers: {
+          ...headers,
+          "X-Electron-App": "true",
+          Authorization: `Bearer ${session.token}`,
+        },
+        body: init?.body as never,
+        duplex: "half",
+        signal: init?.signal,
+      } as never)) as never;
+    },
+
+    info: async () => {
+      await guard("desktop_local_info", "read local machine info");
+      const home = await localFs.homeInfo();
+      const { getLink } = await import("../sync/client/link-store.js");
+      const link = await getLink();
+      return {
+        ...home,
+        userDataDir: process.env.ELECTRON_USER_DATA ?? "",
+        backendPort: Number(process.env.EMBEDDED_BACKEND_PORT) || 30001,
+        link: link
+          ? {
+              serverUrl: link.serverUrl,
+              token: link.sessionToken,
+              headers: requestHeaders(link),
+              allowInvalidCertificate: !!link.allowInvalidCertificate,
+            }
+          : null,
+      };
+    },
+
+    linkJson: async (pathname) => {
+      await guard("desktop_local_link", "called the linked server");
+      const { getLink } = await import("../sync/client/link-store.js");
+      const link = await getLink();
+      if (!link)
+        throw new Error("This device is not linked to a Termix server");
+      if (!pathname.startsWith("/")) throw new Error("Invalid path");
+      return remoteJson(
+        {
+          serverUrl: link.serverUrl,
+          sessionToken: link.sessionToken,
+          customHeaders: link.customHeaders,
+          basicAuth: link.basicAuth,
+          allowInvalidCertificate: link.allowInvalidCertificate,
+        },
+        pathname,
+      );
+    },
+
+    fs: {
+      list: async (dirPath) => {
+        await guard("desktop_local_fs", "used the local file system");
+        return localFs.listDirectory(dirPath);
+      },
+      mkdir: async (parentPath, name) => {
+        await guard("desktop_local_fs", "used the local file system");
+        return localFs.makeDirectory(parentPath, name);
+      },
+      createFile: async (parentPath, name) => {
+        await guard("desktop_local_fs", "used the local file system");
+        return localFs.createEmptyFile(parentPath, name);
+      },
+      rename: async (path, newName) => {
+        await guard("desktop_local_fs", "used the local file system");
+        return localFs.renameEntry(path, newName);
+      },
+      ensureDir: async (dirPath, rootPath) => {
+        await guard("desktop_local_fs", "used the local file system");
+        return localFs.ensureDirectory(dirPath, rootPath);
+      },
+      exists: async (paths) => {
+        await guard("desktop_local_fs", "used the local file system");
+        return localFs.existingPaths(paths);
+      },
+      walk: async (rootPaths) => {
+        await guard("desktop_local_fs", "used the local file system");
+        if (!Array.isArray(rootPaths) || rootPaths.length === 0) {
+          throw new Error("No local paths provided");
+        }
+        return localFs.walkPaths(rootPaths);
+      },
+      trash: async (paths) => {
+        await guard(
+          "desktop_local_trash",
+          `moved ${Array.isArray(paths) ? paths.length : 0} local items to the trash`,
+          true,
+        );
+        if (!Array.isArray(paths) || paths.length === 0) {
+          throw new Error("No local paths provided");
+        }
+        const failed: Array<{ path: string; error: string }> = [];
+        for (const candidate of paths) {
+          const target = localFs.normalizeLocalPath(candidate);
+          try {
+            const result = await mainRequest("shell-trash-item", target);
+            if (!result?.success) throw new Error(result?.error ?? "Failed");
+          } catch (error) {
+            failed.push({
+              path: target,
+              error: error instanceof Error ? error.message : String(error),
+            });
+          }
+        }
+        return { trashed: paths.length - failed.length, failed };
+      },
+      reveal: async (path) => {
+        await guard("desktop_local_fs", "used the local file system");
+        await mainRequest("shell-show-item", localFs.normalizeLocalPath(path));
+      },
+      open: async (path) => {
+        await guard("desktop_local_open", "opened a local path", true);
+        const result = await mainRequest(
+          "shell-open-path",
+          localFs.normalizeLocalPath(path),
+        );
+        if (!result?.success) throw new Error(result?.error ?? "Failed");
+      },
+      openRead: async (path) => {
+        await guard("desktop_local_fs", "used the local file system");
+        return localFs.openRead(path);
+      },
+      openDownload: async (options) => {
+        await guard("desktop_local_fs", "used the local file system");
+        return localFs.openDownload(options);
+      },
+    },
+
+    pty: {
+      spawn: async (options) => {
+        await guard("desktop_local_pty", "started a local shell", true);
+        const child: PluginLocalPty = spawnLocalPty(options);
+        // A shell never outlives the plugin that started it.
+        bag.add(() => {
+          try {
+            child.kill();
+          } catch {
+            // already gone
+          }
+        });
+        return child;
+      },
+    },
+  };
+}

src/backend/plugins/ctx-host-import.ts

@@ -0,0 +1,192 @@
+/**
+ * ctx.hosts.importMany, importSshConfig, exportMany and registerImportNormalizer.
+ *
+ * The import and export logic is the same code the host routes run
+ * (hosts/import/), so a plugin gets the same validation, defaults, protocol
+ * logins and plugin settings. What this file adds is the capability checks,
+ * the core permission checks, one batched save and the audit lines.
+ */
+
+import type {
+  PluginHostExport,
+  PluginHostImportNormalizer,
+  PluginHostImportOptions,
+  PluginHostImportResult,
+  PluginHosts,
+} from "@termix-ssh/plugin-sdk/backend";
+import type { PluginManifest } from "@termix-ssh/plugin-sdk/manifest";
+import { assertCapability, capabilityRefused } from "./permissions.js";
+import { getActor } from "./actor.js";
+import * as registry from "./registry.js";
+import type { DisposableBag } from "./disposables.js";
+import { DatabaseSaveTrigger } from "../utils/database-save-trigger.js";
+import { PermissionManager } from "../utils/permission-manager.js";
+
+type AuditFn = (
+  action: string,
+  details: string,
+  outcome: { success: boolean; errorMessage?: string },
+) => Promise<void>;
+
+interface Deps {
+  manifest: PluginManifest;
+  bag?: DisposableBag;
+  audit: AuditFn;
+}
+
+type ImportApi = Pick<
+  PluginHosts,
+  "importMany" | "importSshConfig" | "exportMany" | "registerImportNormalizer"
+>;
+
+function actingUser(): string {
+  const actor = getActor();
+  if (!actor) throw new Error("This call needs an acting user");
+  return actor;
+}
+
+async function requirePermissions(userId: string, names: string[]) {
+  const permissions = PermissionManager.getInstance();
+  for (const name of names) {
+    if (!(await permissions.hasPermission(userId, name))) {
+      throw new Error(`The acting user lacks the ${name} permission`);
+    }
+  }
+}
+
+function toResult(
+  results: Awaited<
+    ReturnType<typeof import("../hosts/import/host-import.js").runBulkImport>
+  >,
+): PluginHostImportResult {
+  return {
+    success: results.success,
+    updated: results.updated,
+    skipped: results.skipped,
+    failed: results.failed,
+    errors: results.errors,
+    createdHostIds: results.createdHostIds,
+    ...(results.rolledBack ? { rolledBack: true } : {}),
+  };
+}
+
+export function createPluginHostImport({
+  manifest,
+  bag,
+  audit,
+}: Deps): ImportApi {
+  const pluginId = manifest.id;
+  const declared = manifest.capabilities;
+
+  const runImport = async (
+    action: string,
+    run: (userId: string) => Promise<PluginHostImportResult>,
+    needsCredentials: boolean,
+  ): Promise<PluginHostImportResult> => {
+    try {
+      await assertCapability(pluginId, "hosts:write", declared, action);
+      if (needsCredentials) {
+        await assertCapability(pluginId, "credentials:write", declared, action);
+      }
+      const userId = actingUser();
+      await requirePermissions(userId, ["hosts.create", "hosts.edit"]);
+
+      const result = await DatabaseSaveTrigger.batched(() => run(userId))();
+      await audit(
+        action,
+        `${result.success} created, ${result.updated} updated, ${result.skipped} skipped, ${result.failed} failed`,
+        { success: true },
+      );
+      return result;
+    } catch (error) {
+      await audit(action, "host import", {
+        success: false,
+        errorMessage: error instanceof Error ? error.message : String(error),
+      });
+      throw error;
+    }
+  };
+
+  return {
+    importMany: (hosts, options?: PluginHostImportOptions) =>
+      runImport(
+        "hosts_import",
+        async (userId) => {
+          const { runBulkImport } =
+            await import("../hosts/import/host-import.js");
+          return toResult(
+            await runBulkImport(userId, {
+              hosts,
+              overwrite: options?.overwrite,
+              credentials: options?.credentials,
+              atomic: options?.atomic,
+            }),
+          );
+        },
+        Array.isArray(options?.credentials) && options.credentials.length > 0,
+      ),
+
+    importSshConfig: (content, options) =>
+      runImport(
+        "hosts_import_ssh_config",
+        async (userId) => {
+          const { runSshConfigImport } =
+            await import("../hosts/import/host-import.js");
+          return toResult(
+            await runSshConfigImport(userId, {
+              content,
+              overwrite: options?.overwrite,
+              atomic: options?.atomic,
+            }),
+          );
+        },
+        false,
+      ),
+
+    exportMany: async (options): Promise<PluginHostExport> => {
+      const share = options?.share === true;
+      try {
+        await assertCapability(
+          pluginId,
+          "hosts:export",
+          declared,
+          "hosts_export",
+        );
+        const userId = actingUser();
+        const { exportAllHosts } =
+          await import("../hosts/import/host-export.js");
+        const exported = await exportAllHosts(userId, share, options?.hostIds);
+        await audit(
+          "export_hosts",
+          `exported ${exported.hosts.length} hosts${share ? " without secrets" : " with secrets"}`,
+          { success: true },
+        );
+        return exported;
+      } catch (error) {
+        await audit("export_hosts", share ? "share export" : "full export", {
+          success: false,
+          errorMessage: error instanceof Error ? error.message : String(error),
+        });
+        throw error;
+      }
+    },
+
+    registerImportNormalizer: (normalizer: PluginHostImportNormalizer) => {
+      if (!declared.includes("hosts:write")) {
+        throw capabilityRefused(pluginId, "hosts:write");
+      }
+      // Same key the import path has always read, so the older
+      // ctx.registry.provide form keeps working.
+      const key = `${pluginId}.hostImportNormalizer`;
+      registry.provide(key, normalizer);
+      const remove = () => {
+        registry.revoke(key, normalizer);
+      };
+      const drop = bag?.add(remove, "host import normalizer");
+      return () => {
+        drop?.();
+        remove();
+      };
+    },
+  };
+}

src/backend/plugins/ctx-hosts.ts

@@ -26,7 +26,10 @@ import type { PluginManifest } from "@termix-ssh/plugin-sdk/manifest";
 import { assertCapability, capabilityRefused } from "./permissions.js";
 import { hostSessionStatus } from "../hosts/host-session-status.js";
 import { getActor } from "./actor.js";
-import { hostStatusService } from "../hosts/status/host-status-service.js";
+import { hostStatus, provideHostStatus } from "./host-status-provider.js";
+import { provideActivity, recentActivity } from "./activity-provider.js";
+import { loadProbeTargets } from "./ctx-probe.js";
+import { createPluginHostImport } from "./ctx-host-import.js";
 import { parseSshOptions } from "../hosts/ssh-options.js";
 import { hostTerminalExport } from "../database/routes/host-normalizers.js";
 import type { DisposableBag } from "./disposables.js";
@@ -171,7 +174,7 @@ export function toRecord(
     connectionOrigin: origin === "local" || origin === "remote" ? origin : null,
     sshOptions: hostTerminalExport(host).sshOptions,
     pluginSettings,
-    status: Number.isInteger(id) ? hostStatusService.get(id) : null,
+    status: Number.isInteger(id) ? hostStatus.get(id) : null,
     localOnly: asFlag(host.localOnly, false),
     createdAt: (host.createdAt as string | null) ?? null,
     updatedAt: (host.updatedAt as string | null) ?? null,
@@ -389,6 +392,8 @@ export function createPluginHosts({ manifest, bag, audit }: Deps): PluginHosts {
   };
 
   return {
+    ...createPluginHostImport({ manifest, bag, audit }),
+
     list: async () => {
       await requireRead();
       const userId = actingUser();
@@ -787,38 +792,100 @@ export function createPluginHosts({ manifest, bag, audit }: Deps): PluginHosts {
       await requireRead();
       const userId = actingUser();
       if (!(await actorMayReach(hostId))) return;
-      const { recordRecentActivity } =
-        await import("../services/recent-activity.js");
-      await recordRecentActivity(userId, { type, hostId, hostName });
+      await recentActivity.record(userId, { type, hostId, hostName });
+    },
+
+    probeTargets: async (filter) => {
+      await requireRead();
+      const actor = getActor();
+      if (!actor) {
+        throw new Error("ctx.hosts.probeTargets needs an acting user");
+      }
+      const ids = filter?.hostIds?.filter((id) => Number.isInteger(id));
+      return loadProbeTargets(actor, ids);
+    },
+
+    sessionActive: (hostId) => {
+      requireReadSync();
+      return hostSessionStatus.hasActiveSession(hostId);
+    },
+
+    activity: {
+      provide: (provider) => {
+        if (!declared.includes("hosts:activity-provide")) {
+          throw capabilityRefused(pluginId, "hosts:activity-provide");
+        }
+        const remove = provideActivity(
+          pluginId,
+          provider as Parameters<typeof provideActivity>[1],
+        );
+        void audit(
+          "host_activity_provide",
+          `${pluginId} stores recent activity`,
+          {
+            success: true,
+          },
+        );
+        const drop = bag?.add(remove, "activity provider");
+        return () => {
+          drop?.();
+          remove();
+        };
+      },
     },
 
     // Not audited: pollers call these on every sample.
     status: {
+      provide: (provider) => {
+        requireReadSync();
+        if (!declared.includes("hosts:status-provide")) {
+          throw capabilityRefused(pluginId, "hosts:status-provide");
+        }
+        const remove = provideHostStatus(pluginId, {
+          start: () => provider.start(),
+          stop: () => provider.stop(),
+          get: (hostId) => provider.get(hostId),
+          statusesFor: (userId, requested) =>
+            provider.statusesFor(userId, requested ? [...requested] : null),
+          refresh: (userId) => provider.refresh(userId),
+          check: (hostId) => provider.check(hostId),
+          reportLogin: (hostId, outcome) =>
+            provider.reportLogin(hostId, outcome),
+          registerPort: (type, resolve) => provider.registerPort(type, resolve),
+          getIntervalSeconds: () => provider.getIntervalSeconds(),
+          setIntervalSeconds: (seconds) => provider.setIntervalSeconds(seconds),
+        });
+        void audit("host_status_provide", `${pluginId} provides host status`, {
+          success: true,
+        });
+        const drop = bag?.add(remove, "host status provider");
+        return () => {
+          drop?.();
+          remove();
+        };
+      },
       get: async (hostId) => {
         await requireRead();
         if (!(await actorMayReach(hostId))) return null;
-        return hostStatusService.get(hostId);
+        return hostStatus.get(hostId);
       },
       check: async (hostId) => {
         await requireRead();
         if (!(await actorMayReach(hostId))) return null;
-        return hostStatusService.check(hostId);
+        return hostStatus.check(hostId);
       },
       // Synchronous for the same reason as trackSession.
       reportLogin: (hostId, outcome) => {
         requireReadSync();
         void actorMayReach(hostId)
           .then((allowed) => {
-            if (allowed) hostStatusService.reportLogin(hostId, outcome);
+            if (allowed) hostStatus.reportLogin(hostId, outcome);
           })
           .catch(() => {});
       },
       registerPort: (connectionType, resolve) => {
         requireReadSync();
-        const unregister = hostStatusService.registerPort(
-          connectionType,
-          resolve,
-        );
+        const unregister = hostStatus.registerPort(connectionType, resolve);
         const drop = bag?.add(unregister, `status port for ${connectionType}`);
         return () => {
           drop?.();

src/backend/plugins/ctx-probe.ts

@@ -0,0 +1,172 @@
+/**
+ * Reachability for status providers: ctx.network.tcpProbe, ctx.ssh.probe and
+ * ctx.hosts.probeTargets. Nothing here ever logs in to the probed host.
+ */
+
+import type {
+  PluginHostProbeTarget,
+  PluginNetwork,
+} from "@termix-ssh/plugin-sdk/backend";
+import type { PluginManifest } from "@termix-ssh/plugin-sdk/manifest";
+import { assertCapability } from "./permissions.js";
+import { getActor } from "./actor.js";
+import { tcpPing } from "./probe/tcp-ping.js";
+import { sharedJumpProbes } from "./probe/jump-probe-pool.js";
+import type { HostStatusTargetRow } from "../database/repositories/host-resolution-repository.js";
+
+type AuditFn = (
+  action: string,
+  details: string,
+  outcome: { success: boolean; errorMessage?: string },
+) => Promise<void>;
+
+const MIN_TIMEOUT_MS = 500;
+const MAX_TIMEOUT_MS = 15_000;
+const DEFAULT_TIMEOUT_MS = 5000;
+
+function clampTimeout(value?: number): number {
+  const n = Number(value);
+  if (!Number.isFinite(n)) return DEFAULT_TIMEOUT_MS;
+  return Math.min(MAX_TIMEOUT_MS, Math.max(MIN_TIMEOUT_MS, n));
+}
+
+function validPort(port: number): boolean {
+  return Number.isInteger(port) && port > 0 && port <= 65535;
+}
+
+function parseJumpHosts(raw: string | null): Array<{ hostId: number }> {
+  if (!raw) return [];
+  try {
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed)
+      ? parsed.filter(
+          (hop): hop is { hostId: number } =>
+            !!hop && Number.isInteger((hop as { hostId?: unknown }).hostId),
+        )
+      : [];
+  } catch {
+    return [];
+  }
+}
+
+function toTarget(row: HostStatusTargetRow): PluginHostProbeTarget {
+  return {
+    id: row.id,
+    ownerUserId: row.userId,
+    ip: row.ip,
+    port: row.port,
+    connectionType: row.connectionType || "ssh",
+    jumpHosts: parseJumpHosts(row.jumpHosts),
+    statusCheckEnabled: row.statusCheckEnabled !== false,
+    statusCheckInterval: row.statusCheckInterval ?? null,
+  };
+}
+
+export function createPluginNetwork(deps: {
+  manifest: PluginManifest;
+  audit: AuditFn;
+}): PluginNetwork {
+  const { manifest, audit } = deps;
+  let audited = false;
+  return {
+    tcpProbe: async (host, port, options) => {
+      await assertCapability(
+        manifest.id,
+        "network:probe",
+        manifest.capabilities,
+        "network_tcp_probe",
+      );
+      if (typeof host !== "string" || !host.trim() || host.length > 255) {
+        throw new Error("A host name or address is required");
+      }
+      if (!validPort(port))
+        throw new Error("A port from 1 to 65535 is required");
+      if (!audited) {
+        audited = true;
+        await audit("network_tcp_probe", "checked if TCP ports answer", {
+          success: true,
+        });
+      }
+      return tcpPing(host.trim(), port, clampTimeout(options?.timeoutMs));
+    },
+  };
+}
+
+/** The hosts the actor owns or was shared, narrowed to ones they may connect to. */
+export async function loadProbeTargets(
+  actor: string,
+  hostIds?: number[],
+): Promise<PluginHostProbeTarget[]> {
+  const {
+    createCurrentHostResolutionRepository,
+    createCurrentRbacAccessRepository,
+    createCurrentRoleRepository,
+  } = await import("../database/repositories/factory.js");
+  const { PermissionManager } = await import("../utils/permission-manager.js");
+  const hosts = createCurrentHostResolutionRepository();
+
+  const own = await hosts.listStatusTargets({
+    userId: actor,
+    hostIds,
+  });
+  const ownIds = new Set(own.map((row) => row.id));
+
+  const roleIds = await createCurrentRoleRepository().listUserRoleIds(actor);
+  const entries =
+    await createCurrentRbacAccessRepository().listVisibleHostAccessEntries(
+      actor,
+      roleIds,
+    );
+  let sharedIds = [...new Set(entries.map((entry) => entry.hostId))].filter(
+    (id) => !ownIds.has(id) && (!hostIds || hostIds.includes(id)),
+  );
+  if (sharedIds.length > 0) {
+    const allowed =
+      await PermissionManager.getInstance().filterAccessibleHostIds(
+        actor,
+        sharedIds,
+      );
+    sharedIds = sharedIds.filter((id) => allowed.has(id));
+  }
+  const shared =
+    sharedIds.length > 0
+      ? await hosts.listStatusTargets({ hostIds: sharedIds })
+      : [];
+  return [...own, ...shared].map(toTarget);
+}
+
+export async function probeHost(
+  hostId: number,
+  options?: { port?: number; timeoutMs?: number },
+): Promise<boolean> {
+  const actor = getActor();
+  if (actor) {
+    const { PermissionManager } =
+      await import("../utils/permission-manager.js");
+    const access = await PermissionManager.getInstance().canAccessHost(
+      actor,
+      hostId,
+      "connect",
+    );
+    if (!access.hasAccess) return false;
+  }
+  const { createCurrentHostResolutionRepository } =
+    await import("../database/repositories/factory.js");
+  const [row] = await createCurrentHostResolutionRepository().listStatusTargets(
+    { hostIds: [hostId] },
+  );
+  if (!row) return false;
+  const target = toTarget(row);
+  const port = options?.port ?? target.port;
+  if (!validPort(port)) throw new Error("A port from 1 to 65535 is required");
+  const timeout = clampTimeout(options?.timeoutMs);
+  return target.jumpHosts.length > 0
+    ? sharedJumpProbes.ping(
+        target.jumpHosts,
+        target.ownerUserId,
+        target.ip,
+        port,
+        timeout,
+      )
+    : tcpPing(target.ip, port, timeout);
+}

src/backend/plugins/ctx-ssh-auth.ts

@@ -26,6 +26,8 @@ import { getActor, getActorSessionId } from "./actor.js";
 import type { DisposableBag } from "./disposables.js";
 import { redactHostSecrets } from "./ctx-hosts.js";
 import { issueUserToken } from "./ctx-users.js";
+import { hostStatus } from "./host-status-provider.js";
+import { probeHost } from "./ctx-probe.js";
 import {
   getSshAuthProvider,
   listSshAuthProviders,
@@ -224,11 +226,7 @@ export function createPluginSsh({ manifest, bag, audit }: Deps): PluginSsh {
   const reportLogin = (host: number | PluginSshHost) => {
     const hostId = typeof host === "number" ? host : lookup(host)?.host.id;
     if (!Number.isInteger(hostId) || hostId <= 0) return;
-    void import("../hosts/status/host-status-service.js")
-      .then(({ hostStatusService }) =>
-        hostStatusService.reportLogin(hostId, { ok: true }),
-      )
-      .catch(() => {});
+    hostStatus.reportLogin(hostId, { ok: true });
   };
 
   /** Checks, connects and audits one new connection. */
@@ -296,6 +294,11 @@ export function createPluginSsh({ manifest, bag, audit }: Deps): PluginSsh {
     }`;
 
   return {
+    probe: async (hostId, probeOptions) => {
+      await assertCapability(pluginId, "ssh:connect", declared);
+      if (!Number.isInteger(hostId) || hostId <= 0) return false;
+      return probeHost(hostId, probeOptions);
+    },
     connect: async (host, options) => {
       const connection = await connectOnce(host, options);
       return {
@@ -306,6 +309,33 @@ export function createPluginSsh({ manifest, bag, audit }: Deps): PluginSsh {
       };
     },
 
+    exec: async (host, command, execOptions) => {
+      const connection = await connectOnce(host, {
+        ...execOptions,
+        purpose: execOptions?.purpose ?? "exec",
+        timeoutMs: undefined,
+      });
+      const details = `${describeHost(host)}: command run`;
+      try {
+        const { runExec } = await import("./ctx-ssh-exec.js");
+        const result = await runExec(
+          connection.client as never,
+          command,
+          execOptions,
+        );
+        await audit("ssh_exec", details, { success: true });
+        return result;
+      } catch (error) {
+        await audit("ssh_exec", details, {
+          success: false,
+          errorMessage: error instanceof Error ? error.message : String(error),
+        });
+        throw error;
+      } finally {
+        connection.dispose();
+      }
+    },
+
     withConnection: async (host, options, fn) => {
       await checkSsh(true);
       const { resolveConnectHost } =

src/backend/plugins/ctx-ssh-exec.ts

@@ -0,0 +1,123 @@
+/**
+ * Runs one command on an open ssh2 client for ctx.ssh.exec, with a time limit
+ * and caps on how much output is kept.
+ */
+
+import type { PluginSshExecOptions } from "@termix-ssh/plugin-sdk/backend";
+
+export const EXEC_DEFAULT_TIMEOUT_MS = 30_000;
+export const EXEC_MAX_TIMEOUT_MS = 10 * 60_000;
+export const EXEC_DEFAULT_MAX_OUTPUT = 256 * 1024;
+export const EXEC_HARD_MAX_OUTPUT = 4 * 1024 * 1024;
+export const EXEC_MAX_COMMAND_LENGTH = 64 * 1024;
+
+interface ExecStream {
+  on: (event: string, listener: (...args: never[]) => void) => unknown;
+  stderr: { on: (event: string, listener: (chunk: Buffer) => void) => unknown };
+  write: (data: string) => unknown;
+  end: (data?: string) => unknown;
+  close: () => void;
+}
+
+export interface ExecClient {
+  exec: (
+    command: string,
+    callback: (error: Error | undefined, stream: ExecStream) => void,
+  ) => unknown;
+}
+
+export interface ExecResult {
+  stdout: string;
+  stderr: string;
+  /** Null when the command was killed by a signal or hit the time limit. */
+  code: number | null;
+  truncated: boolean;
+  timedOut: boolean;
+}
+
+export function runExec(
+  client: ExecClient,
+  command: string,
+  options: PluginSshExecOptions = {},
+): Promise<ExecResult> {
+  if (typeof command !== "string" || command.trim() === "") {
+    return Promise.reject(new Error("A command is required"));
+  }
+  if (command.length > EXEC_MAX_COMMAND_LENGTH) {
+    return Promise.reject(new Error("The command is too long"));
+  }
+  const timeoutMs = Math.min(
+    EXEC_MAX_TIMEOUT_MS,
+    Math.max(1000, options.timeoutMs ?? EXEC_DEFAULT_TIMEOUT_MS),
+  );
+  const maxOutput = Math.min(
+    EXEC_HARD_MAX_OUTPUT,
+    Math.max(1024, options.maxOutputBytes ?? EXEC_DEFAULT_MAX_OUTPUT),
+  );
+
+  return new Promise<ExecResult>((resolve, reject) => {
+    let settled = false;
+    let timedOut = false;
+    let truncated = false;
+    let stdout = "";
+    let stderr = "";
+    let timer: NodeJS.Timeout | null = null;
+
+    const finish = (code: number | null) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      resolve({ stdout, stderr, code, truncated, timedOut });
+    };
+
+    const append = (current: string, chunk: Buffer): string => {
+      const room = maxOutput - Buffer.byteLength(current);
+      if (room <= 0) {
+        truncated = true;
+        return current;
+      }
+      if (chunk.length > room) {
+        truncated = true;
+        return current + chunk.subarray(0, room).toString("utf8");
+      }
+      return current + chunk.toString("utf8");
+    };
+
+    client.exec(command, (error, stream) => {
+      if (error) {
+        if (!settled) {
+          settled = true;
+          reject(error);
+        }
+        return;
+      }
+      timer = setTimeout(() => {
+        timedOut = true;
+        try {
+          stream.close();
+        } catch {
+          // already closed
+        }
+        finish(null);
+      }, timeoutMs);
+
+      stream.on("data", ((chunk: Buffer) => {
+        stdout = append(stdout, chunk);
+      }) as never);
+      stream.stderr.on("data", (chunk: Buffer) => {
+        stderr = append(stderr, chunk);
+      });
+      stream.on("close", ((code: number | null | undefined) => {
+        finish(typeof code === "number" ? code : null);
+      }) as never);
+      stream.on("error", ((streamError: Error) => {
+        if (!settled) {
+          settled = true;
+          if (timer) clearTimeout(timer);
+          reject(streamError);
+        }
+      }) as never);
+      if (options.stdin !== undefined) stream.end(options.stdin);
+    });
+  });
+}

src/backend/plugins/ctx.ts

@@ -22,6 +22,9 @@
 import { pluginLogger } from "../utils/logger.js";
 import { getRequestBaseUrlWithForceHTTPS } from "../utils/request-origin.js";
 import { pluginEvents } from "./events.js";
+import { createPluginDesktopLocal } from "./ctx-desktop-local.js";
+import { createPluginAuditReader } from "./ctx-audit.js";
+import { createPluginNetwork } from "./ctx-probe.js";
 import * as registry from "./registry.js";
 import * as serviceRegistry from "./service-registry.js";
 import type { ServiceRegistration } from "./service-registry.js";
@@ -950,6 +953,7 @@ export function createPluginContext(
       bag: handle.bag,
     }),
     fetch: createPluginFetch({ manifest, audit: auditCall }),
+    network: createPluginNetwork({ manifest, audit: auditCall }),
     process: createPluginProcess({
       manifest,
       bag: handle.bag,
@@ -964,6 +968,11 @@ export function createPluginContext(
       openIsolatedWindow: (request) => desktopOpenIsolatedWindow(request),
       launchExternalClient: (request) => desktopLaunchExternalClient(request),
       available: () => isElectronIpcAvailable(),
+      local: createPluginDesktopLocal({
+        manifest,
+        bag: handle.bag,
+        audit: auditCall,
+      }),
     },
 
     credentials: createPluginCredentials({
@@ -995,6 +1004,11 @@ export function createPluginContext(
           // Auditing must never break the caller.
         }
       },
+      ...createPluginAuditReader({
+        manifest,
+        bag: handle.bag,
+        audit: auditCall,
+      }),
     },
 
     /**

src/backend/plugins/desktop-local/local-fs.ts

@@ -0,0 +1,572 @@
+/**
+ * Local filesystem helpers for plugins on the desktop app's embedded backend.
+ * Ported from the old Electron local-files module. The path rules are the
+ * security part: a download can never leave the folder the user picked, links
+ * inside it are refused, and a download never replaces a file by accident.
+ */
+
+import fs from "node:fs";
+import fsp from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import type {
+  PluginLocalDirEntry,
+  PluginLocalDownload,
+  PluginLocalWalkResult,
+} from "@termix-ssh/plugin-sdk/backend";
+
+export class LocalFileError extends Error {
+  code: string;
+  constructor(code: string, message: string) {
+    super(message);
+    this.name = "LocalFileError";
+    this.code = code;
+  }
+}
+
+type PathImpl = typeof path;
+
+export function normalizeLocalPath(candidate: unknown): string {
+  if (typeof candidate !== "string" || !path.isAbsolute(candidate)) {
+    throw new Error("A local absolute path is required");
+  }
+  return path.normalize(candidate);
+}
+
+// A single path segment: no separators, not "." / "..", no NULs.
+export function requireEntryName(name: unknown, what: string): string {
+  const safeName = String(name || "").trim();
+  if (
+    !safeName ||
+    safeName === "." ||
+    safeName === ".." ||
+    /[/\\\0]/.test(safeName)
+  ) {
+    throw new Error(`Invalid ${what}`);
+  }
+  return safeName;
+}
+
+// pathImpl is injectable so the Windows rules can be tested on any OS.
+export function assertWithinRoot(
+  rootPath: string,
+  candidate: string,
+  pathImpl: PathImpl = path,
+): string {
+  if (typeof rootPath !== "string" || !rootPath.trim()) {
+    throw new LocalFileError("EINVAL", "A download folder is required");
+  }
+  const root = pathImpl.normalize(pathImpl.resolve(rootPath));
+  const target = pathImpl.normalize(pathImpl.resolve(candidate));
+  const rel = pathImpl.relative(root, target);
+  const escapes =
+    rel === "" ||
+    rel === ".." ||
+    rel.startsWith(`..${pathImpl.sep}`) ||
+    pathImpl.isAbsolute(rel) ||
+    rel.split(pathImpl.sep).some((seg) => seg === ".." || seg === "");
+  if (escapes) {
+    throw new LocalFileError(
+      "EINVAL",
+      `"${pathImpl.basename(candidate)}" would be written outside the selected folder`,
+    );
+  }
+  return target;
+}
+
+// Resolve a deliberately selected root once, but never follow links supplied
+// as descendants of a downloaded tree.
+export async function prepareDownloadPath(
+  rootPath: string,
+  candidate: string,
+  directory = false,
+): Promise<{ root: string; path: string }> {
+  const target = assertWithinRoot(rootPath, normalizeLocalPath(candidate));
+  const selected = path.resolve(rootPath);
+  const realRoot = await fsp.realpath(selected);
+  if (!(await fsp.stat(realRoot)).isDirectory()) {
+    throw new LocalFileError("EINVAL", "The download root is not a directory");
+  }
+  const parts = path.relative(selected, target).split(path.sep);
+  let current = realRoot;
+  for (let i = 0; i < parts.length; i++) {
+    current = path.join(current, parts[i]);
+    const needsDirectory = directory || i < parts.length - 1;
+    if (needsDirectory) {
+      await fsp.mkdir(current).catch((error: NodeJS.ErrnoException) => {
+        if (error.code !== "EEXIST") throw error;
+      });
+    }
+    const stat = await fsp
+      .lstat(current)
+      .catch((error: NodeJS.ErrnoException) => {
+        if (error.code === "ENOENT" && !needsDirectory) return null;
+        throw error;
+      });
+    if (stat?.isSymbolicLink()) {
+      throw new LocalFileError(
+        "EINVAL",
+        "Downloads cannot follow links inside the selected folder",
+      );
+    }
+    if (needsDirectory && !stat?.isDirectory()) {
+      throw new LocalFileError(
+        "ENOTDIR",
+        "A download parent is not a directory",
+      );
+    }
+  }
+  return { root: realRoot, path: current };
+}
+
+export async function pathExists(target: string): Promise<boolean> {
+  try {
+    await fsp.lstat(target);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function describeEntry(
+  dirPath: string,
+  dirent: fs.Dirent,
+): Promise<PluginLocalDirEntry> {
+  const entryPath = path.join(dirPath, dirent.name);
+  let type: PluginLocalDirEntry["type"] = "file";
+  let size = 0;
+  let modifiedTimestamp: number | undefined;
+  let linkTarget: string | undefined;
+
+  try {
+    if (dirent.isSymbolicLink()) {
+      type = "link";
+      try {
+        linkTarget = await fsp.readlink(entryPath);
+      } catch {
+        // dangling or unreadable link
+      }
+      try {
+        const target = await fsp.stat(entryPath);
+        if (target.isDirectory()) type = "directory";
+        size = target.size;
+        modifiedTimestamp = target.mtimeMs;
+      } catch {
+        const own = await fsp.lstat(entryPath);
+        modifiedTimestamp = own.mtimeMs;
+      }
+    } else if (dirent.isDirectory()) {
+      type = "directory";
+      modifiedTimestamp = (await fsp.stat(entryPath)).mtimeMs;
+    } else {
+      const stat = await fsp.stat(entryPath);
+      size = stat.size;
+      modifiedTimestamp = stat.mtimeMs;
+    }
+  } catch {
+    // Unreadable entry: still list it so the user sees it exists.
+  }
+
+  return {
+    name: dirent.name,
+    path: entryPath,
+    type,
+    size,
+    modifiedTimestamp,
+    linkTarget,
+    hidden: dirent.name.startsWith("."),
+  };
+}
+
+export async function listDirectory(dirPath: string): Promise<{
+  path: string;
+  parent: string | null;
+  entries: PluginLocalDirEntry[];
+}> {
+  const resolved = normalizeLocalPath(dirPath);
+  const dirents = await fsp.readdir(resolved, { withFileTypes: true });
+  const entries = await Promise.all(
+    dirents.map((dirent) => describeEntry(resolved, dirent)),
+  );
+  const parent = path.dirname(resolved);
+  return {
+    path: resolved,
+    parent: parent === resolved ? null : parent,
+    entries,
+  };
+}
+
+// Expands dropped local paths into a flat file list with paths relative to the
+// drop root, plus empty directories.
+export async function walkPaths(
+  rootPaths: string[],
+): Promise<PluginLocalWalkResult> {
+  const files: PluginLocalWalkResult["files"] = [];
+  const emptyDirs: string[] = [];
+  let totalBytes = 0;
+
+  async function walkDir(absDir: string, relDir: string): Promise<void> {
+    const dirents = await fsp.readdir(absDir, { withFileTypes: true });
+    if (dirents.length === 0) {
+      emptyDirs.push(relDir);
+      return;
+    }
+    for (const dirent of dirents) {
+      const abs = path.join(absDir, dirent.name);
+      const rel = `${relDir}/${dirent.name}`;
+      if (dirent.isDirectory()) {
+        await walkDir(abs, rel);
+      } else if (dirent.isFile()) {
+        const stat = await fsp.stat(abs);
+        files.push({ localPath: abs, relativePath: rel, size: stat.size });
+        totalBytes += stat.size;
+      } else if (dirent.isSymbolicLink()) {
+        try {
+          const stat = await fsp.stat(abs);
+          if (stat.isFile()) {
+            files.push({ localPath: abs, relativePath: rel, size: stat.size });
+            totalBytes += stat.size;
+          }
+        } catch {
+          // dangling link: skip
+        }
+      }
+    }
+  }
+
+  for (const rootPath of rootPaths) {
+    const abs = normalizeLocalPath(rootPath);
+    const stat = await fsp.stat(abs);
+    const name = path.basename(abs);
+    if (stat.isDirectory()) {
+      await walkDir(abs, name);
+    } else if (stat.isFile()) {
+      files.push({ localPath: abs, relativePath: name, size: stat.size });
+      totalBytes += stat.size;
+    }
+  }
+
+  return { files, emptyDirs, totalBytes };
+}
+
+export async function homeInfo(): Promise<{
+  home: string;
+  separator: string;
+  platform: NodeJS.Platform;
+}> {
+  return {
+    home: os.homedir(),
+    separator: path.sep,
+    platform: process.platform,
+  };
+}
+
+export async function makeDirectory(
+  parentPath: string,
+  name: string,
+): Promise<string> {
+  const target = path.join(
+    normalizeLocalPath(parentPath),
+    requireEntryName(name, "folder name"),
+  );
+  await fsp.mkdir(target);
+  return target;
+}
+
+export async function createEmptyFile(
+  parentPath: string,
+  name: string,
+): Promise<string> {
+  const target = path.join(
+    normalizeLocalPath(parentPath),
+    requireEntryName(name, "file name"),
+  );
+  // "wx" fails if the file already exists rather than truncating it.
+  await fsp.writeFile(target, "", { flag: "wx" });
+  return target;
+}
+
+// Exclusive rename: a destination that appeared meanwhile is never replaced.
+export async function renameLocalPath(
+  source: string,
+  target: string,
+): Promise<void> {
+  if (source === target) return;
+  try {
+    await fsp.lstat(target);
+    throw new LocalFileError(
+      "EEXIST",
+      "A file or folder with that name already exists",
+    );
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
+  }
+  if ((await fsp.lstat(source)).isDirectory()) {
+    await fsp.rename(source, target);
+    return;
+  }
+  await fsp.link(source, target);
+  await fsp.unlink(source);
+}
+
+export async function renameEntry(
+  oldPath: string,
+  newName: string,
+): Promise<string> {
+  const source = normalizeLocalPath(oldPath);
+  const safeName = requireEntryName(newName, "name");
+  const target = path.join(path.dirname(source), safeName);
+  if (target === source) return source;
+  if (await pathExists(target)) {
+    throw new LocalFileError("EEXIST", `"${safeName}" already exists`);
+  }
+  await renameLocalPath(source, target);
+  return target;
+}
+
+export async function ensureDirectory(
+  dirPath: string,
+  rootPath?: string,
+): Promise<string> {
+  let target = normalizeLocalPath(dirPath);
+  if (rootPath !== undefined) {
+    target = (await prepareDownloadPath(rootPath, target, true)).path;
+  } else {
+    await fsp.mkdir(target, { recursive: true });
+  }
+  return target;
+}
+
+export async function existingPaths(paths: string[]): Promise<string[]> {
+  if (!Array.isArray(paths)) throw new Error("Expected a list of paths");
+  const existing: string[] = [];
+  for (const candidate of paths) {
+    const target = normalizeLocalPath(candidate);
+    if (await pathExists(target)) existing.push(target);
+  }
+  return existing;
+}
+
+export async function openRead(
+  localPath: string,
+): Promise<{ stream: fs.ReadStream; size: number }> {
+  const absPath = normalizeLocalPath(localPath);
+  const stat = await fsp.stat(absPath);
+  if (!stat.isFile()) throw new Error("Only regular files can be uploaded");
+  return {
+    stream: fs.createReadStream(absPath, { highWaterMark: 1024 * 1024 }),
+    size: stat.size,
+  };
+}
+
+// Destinations with a download in flight, so two transfers never race onto
+// the same file.
+const activeDestinations = new Set<string>();
+
+function transferToken(transferId: string): string {
+  return (
+    String(transferId)
+      .replace(/[^A-Za-z0-9_-]/g, "")
+      .slice(0, 48) || "transfer"
+  );
+}
+
+export interface PublishFs {
+  rename: (from: string, to: string) => Promise<void>;
+  link: (from: string, to: string) => Promise<void>;
+  copyFileExcl: (from: string, to: string) => Promise<void>;
+  rm: (target: string) => Promise<void>;
+  lstat: (target: string) => Promise<fs.Stats>;
+}
+
+export const defaultPublishFs: PublishFs = Object.freeze({
+  rename: (from, to) => fsp.rename(from, to),
+  link: (from, to) => fsp.link(from, to),
+  copyFileExcl: (from, to) =>
+    fsp.copyFile(from, to, fs.constants.COPYFILE_EXCL),
+  rm: (target) => fsp.rm(target, { force: true }),
+  lstat: (target) => fsp.lstat(target),
+});
+
+// link() is atomic and fails with EEXIST if the name is taken; filesystems
+// without hard links fall back to an exclusive copy.
+async function publishExclusive(
+  io: PublishFs,
+  sourcePath: string,
+  absDest: string,
+): Promise<void> {
+  const exists = () =>
+    new LocalFileError("EEXIST", `"${path.basename(absDest)}" already exists`);
+  try {
+    await io.link(sourcePath, absDest);
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException)?.code === "EEXIST") throw exists();
+    try {
+      await io.copyFileExcl(sourcePath, absDest);
+    } catch (copyError) {
+      if ((copyError as NodeJS.ErrnoException)?.code === "EEXIST") {
+        throw exists();
+      }
+      throw copyError;
+    }
+  }
+  await io.rm(sourcePath);
+}
+
+// rename() onto an existing file is not portable (it commonly fails on
+// Windows), so move the old file aside, publish exclusively, then drop it.
+async function replaceExisting(
+  io: PublishFs,
+  partialPath: string,
+  absDest: string,
+  transferId: string,
+): Promise<void> {
+  let current: fs.Stats;
+  try {
+    current = await io.lstat(absDest);
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException)?.code === "ENOENT") {
+      await publishExclusive(io, partialPath, absDest);
+      return;
+    }
+    throw error;
+  }
+  if (current.isDirectory()) {
+    throw new LocalFileError(
+      "EISDIR",
+      `"${path.basename(absDest)}" is a folder and cannot be replaced by a file`,
+    );
+  }
+
+  const asidePath = `${absDest}.${transferToken(transferId)}.termix-replaced`;
+  try {
+    await io.rename(absDest, asidePath);
+  } catch (error) {
+    const code = (error as NodeJS.ErrnoException)?.code;
+    if (code === "EPERM" || code === "EBUSY" || code === "EACCES") {
+      throw new LocalFileError(
+        "EBUSY",
+        `"${path.basename(absDest)}" is in use and could not be replaced`,
+      );
+    }
+    throw error;
+  }
+
+  try {
+    await publishExclusive(io, partialPath, absDest);
+  } catch (error) {
+    await io.rm(absDest).catch(() => {});
+    await io.rename(asidePath, absDest).catch(() => {});
+    throw error;
+  }
+
+  try {
+    await io.rm(asidePath);
+  } catch {
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    await io.rm(asidePath).catch(() => {});
+  }
+}
+
+export async function publishDownload(
+  partialPath: string,
+  absDest: string,
+  overwrite: boolean,
+  transferId: string,
+  io: PublishFs = defaultPublishFs,
+): Promise<void> {
+  if (overwrite) {
+    await replaceExisting(io, partialPath, absDest, transferId);
+    return;
+  }
+  await publishExclusive(io, partialPath, absDest);
+}
+
+// Bytes go to a transfer-unique temp sibling first and are published under the
+// real name only on success, so a failed transfer never leaves a truncated file.
+export async function openDownload(
+  options: {
+    rootPath: string;
+    destPath: string;
+    transferId: string;
+    overwrite?: boolean;
+  },
+  io: PublishFs = defaultPublishFs,
+): Promise<PluginLocalDownload> {
+  const { rootPath, destPath, transferId } = options;
+  if (!transferId || !destPath) throw new Error("Missing download parameters");
+
+  const destination = await prepareDownloadPath(rootPath, destPath);
+  const absDest = destination.path;
+  if (activeDestinations.has(absDest)) {
+    throw new LocalFileError(
+      "EBUSY",
+      `"${path.basename(absDest)}" is already being downloaded`,
+    );
+  }
+  activeDestinations.add(absDest);
+
+  const partialPath = `${path.join(destination.root, path.basename(absDest))}.${transferToken(
+    transferId,
+  )}.termix-part`;
+  let released = false;
+  const release = () => {
+    if (released) return;
+    released = true;
+    activeDestinations.delete(absDest);
+  };
+
+  try {
+    if (options.overwrite !== true && (await pathExists(absDest))) {
+      throw new LocalFileError(
+        "EEXIST",
+        `"${path.basename(absDest)}" already exists`,
+      );
+    }
+    // "wx": the temp name is ours alone; refuse to reuse a stale one.
+    const stream = fs.createWriteStream(partialPath, { flags: "wx" });
+    // A write error must not crash the backend. publish() reports it.
+    let streamError: Error | null = null;
+    stream.on("error", (error) => {
+      streamError = error;
+    });
+
+    return {
+      path: absDest,
+      stream,
+      publish: async (publishOptions) => {
+        try {
+          if (streamError) throw streamError;
+          await new Promise<void>((resolve, reject) => {
+            if (stream.writableFinished) return resolve();
+            stream.once("error", reject);
+            stream.end(() => resolve());
+          });
+          if (streamError) throw streamError;
+          await prepareDownloadPath(destination.root, absDest);
+          await publishDownload(
+            partialPath,
+            absDest,
+            (publishOptions?.overwrite ?? options.overwrite) === true,
+            transferId,
+            io,
+          );
+          return absDest;
+        } catch (error) {
+          await fsp.rm(partialPath, { force: true }).catch(() => {});
+          throw error;
+        } finally {
+          release();
+        }
+      },
+      abort: async () => {
+        stream.destroy();
+        await fsp.rm(partialPath, { force: true }).catch(() => {});
+        release();
+      },
+    };
+  } catch (error) {
+    release();
+    throw error;
+  }
+}

src/backend/plugins/desktop-local/local-pty.ts

@@ -0,0 +1,167 @@
+/**
+ * Local shells for plugins on the desktop app's embedded backend. Ported from
+ * the old Electron local terminal handlers.
+ */
+
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { createRequire } from "node:module";
+import type { PluginLocalPty } from "@termix-ssh/plugin-sdk/backend";
+
+export function resolveLocalShell(
+  platform: NodeJS.Platform,
+  requestedShell?: string,
+  env: NodeJS.ProcessEnv = process.env,
+  exists: (file: string) => boolean = fs.existsSync,
+): { file: string; args: string[] } {
+  if (platform === "win32") {
+    if (requestedShell === "wsl") return { file: "wsl.exe", args: [] };
+    return {
+      file: env.TERMIX_LOCAL_SHELL || "powershell.exe",
+      args: ["-NoLogo"],
+    };
+  }
+
+  // A SHELL left pointing at an uninstalled shell makes the spawn fail.
+  const fallbacks =
+    platform === "darwin"
+      ? ["/bin/zsh", "/bin/bash", "/bin/sh"]
+      : ["/bin/bash", "/bin/sh"];
+  const usable = (file?: string): file is string =>
+    !!file && (!path.isAbsolute(file) || exists(file));
+  const file =
+    [env.TERMIX_LOCAL_SHELL, env.SHELL, ...fallbacks].find(usable) ||
+    fallbacks[0];
+  return { file, args: ["-l"] };
+}
+
+/**
+ * node-pty starts every shell through its spawn-helper binary, and a packaged
+ * copy that lost its execute bit fails with "posix_spawnp failed". Returns how
+ * many helpers were fixed.
+ */
+export function repairSpawnHelpers(ptyDir: string, fsImpl = fs): number {
+  // A universal macOS build ships app-arm64.asar and app-x64.asar.
+  const dir = ptyDir.replace(
+    /\b(app(?:-[a-z0-9]+)?)\.asar(?!\.unpacked)/,
+    "$1.asar.unpacked",
+  );
+  const candidates = [
+    path.join(dir, "build", "Release", "spawn-helper"),
+    path.join(
+      dir,
+      "prebuilds",
+      `${process.platform}-${process.arch}`,
+      "spawn-helper",
+    ),
+  ];
+  let fixed = 0;
+  for (const helper of candidates) {
+    try {
+      const mode = fsImpl.statSync(helper).mode;
+      if ((mode & 0o111) === 0) {
+        fsImpl.chmodSync(helper, mode | 0o755);
+        fixed += 1;
+      }
+    } catch {
+      // Missing or read-only; nothing to fix here.
+    }
+  }
+  return fixed;
+}
+
+interface NodePty {
+  spawn: (
+    file: string,
+    args: string[],
+    options: Record<string, unknown>,
+  ) => {
+    pid: number;
+    write: (data: string) => void;
+    resize: (cols: number, rows: number) => void;
+    kill: () => void;
+    onData: (cb: (data: string) => void) => { dispose: () => void };
+    onExit: (cb: (e: { exitCode: number }) => void) => { dispose: () => void };
+  };
+}
+
+const requireFromHere = createRequire(import.meta.url);
+
+function loadNodePty(): NodePty {
+  try {
+    return requireFromHere("node-pty") as NodePty;
+  } catch {
+    throw new Error("The local terminal is not available in this build");
+  }
+}
+
+export const MAX_PTY_COLS = 500;
+export const MAX_PTY_ROWS = 300;
+
+export function spawnLocalPty(options?: {
+  cols?: number;
+  rows?: number;
+  shell?: string;
+}): PluginLocalPty {
+  const pty = loadNodePty();
+  const cols = Math.min(MAX_PTY_COLS, Math.max(2, Number(options?.cols) || 80));
+  const rows = Math.min(MAX_PTY_ROWS, Math.max(1, Number(options?.rows) || 24));
+  const shellConfig = resolveLocalShell(process.platform, options?.shell);
+
+  const start = () =>
+    pty.spawn(shellConfig.file, shellConfig.args, {
+      name: "xterm-256color",
+      cols,
+      rows,
+      cwd: os.homedir(),
+      env: { ...process.env, TERM: "xterm-256color", COLORTERM: "truecolor" },
+    });
+
+  let child: ReturnType<NodePty["spawn"]>;
+  try {
+    child = start();
+  } catch (error) {
+    const ptyDir = path.dirname(
+      requireFromHere.resolve("node-pty/package.json"),
+    );
+    if (
+      !String((error as Error)?.message).includes("posix_spawnp") ||
+      repairSpawnHelpers(ptyDir) === 0
+    ) {
+      throw error;
+    }
+    child = start();
+  }
+
+  return {
+    pid: child.pid,
+    shell: shellConfig.file,
+    write: (data) => {
+      if (typeof data === "string" && data.length <= 64 * 1024) {
+        child.write(data);
+      }
+    },
+    resize: (c, r) => {
+      if (
+        Number.isInteger(c) &&
+        Number.isInteger(r) &&
+        c >= 2 &&
+        c <= MAX_PTY_COLS &&
+        r >= 1 &&
+        r <= MAX_PTY_ROWS
+      ) {
+        child.resize(c, r);
+      }
+    },
+    kill: () => child.kill(),
+    onData: (handler) => {
+      const sub = child.onData(handler);
+      return () => sub.dispose();
+    },
+    onExit: (handler) => {
+      const sub = child.onExit(({ exitCode }) => handler(exitCode));
+      return () => sub.dispose();
+    },
+  };
+}

src/backend/plugins/events.ts

@@ -22,7 +22,7 @@ export const TOPICS = {
   hostSessionStatus: "host.session.status",
   /** A generic named internal event (host_deleted, user_login, ...). */
   internalEvent: "internal.event",
-  /** A host's status dot changed (hosts/status/host-status-service.ts). */
+  /** A host's status dot changed (the host status provider). */
   hostStatus: "host.status",
   /** A host's key was accepted again after it changed. */
   hostKeyUpdated: "host.key.updated",

src/backend/plugins/host-status-provider.ts

@@ -0,0 +1,149 @@
+/**
+ * Host status is a provider: core owns the interface and the callers (the
+ * status routes, the sync feed, ctx.hosts.status), and one provider fills it.
+ * A plugin registers with ctx.hosts.status.provide. With none, every status
+ * is unknown.
+ */
+
+export type ProviderHostStatus = "online" | "reachable" | "offline";
+
+export interface HostStatusEntry {
+  status: ProviderHostStatus;
+  lastChecked: string;
+}
+
+export type HostPortResolver = (
+  hostId: number,
+) => number | undefined | Promise<number | undefined>;
+
+export interface HostStatusProvider {
+  start(): void;
+  stop(): void;
+  get(hostId: number): HostStatusEntry | null;
+  /** All known statuses after bringing polling in line with the request. */
+  statusesFor(
+    userId: string,
+    requestedHostIds: Set<number> | null,
+  ): Promise<Map<number, HostStatusEntry>>;
+  refresh(userId: string): Promise<void>;
+  check(hostId: number): Promise<HostStatusEntry | null>;
+  reportLogin(hostId: number, outcome: { ok: boolean }): void;
+  registerPort(connectionType: string, resolve: HostPortResolver): () => void;
+  getIntervalSeconds(): Promise<number>;
+  setIntervalSeconds(seconds: number): Promise<void>;
+}
+
+let builtin: HostStatusProvider | null = null;
+let plugged: { pluginId: string; provider: HostStatusProvider } | null = null;
+let running = false;
+const ports = new Map<symbol, { type: string; resolve: HostPortResolver }>();
+const portDrops = new Map<symbol, () => void>();
+
+function active(): HostStatusProvider | null {
+  return plugged?.provider ?? builtin;
+}
+
+function attachPorts(provider: HostStatusProvider): void {
+  for (const [key, { type, resolve }] of ports) {
+    portDrops.set(key, provider.registerPort(type, resolve));
+  }
+}
+
+function detachPorts(): void {
+  for (const drop of portDrops.values()) drop();
+  portDrops.clear();
+}
+
+function swap(next: () => void): void {
+  const before = active();
+  if (running) before?.stop();
+  detachPorts();
+  next();
+  const after = active();
+  if (after) attachPorts(after);
+  if (running) after?.start();
+}
+
+/** A fallback provider. Core registers none; tests use it. */
+export function registerBuiltinHostStatusProvider(
+  provider: HostStatusProvider | null,
+): void {
+  swap(() => {
+    builtin = provider;
+  });
+}
+
+/** Returns the remover. A second provider is refused. */
+export function provideHostStatus(
+  pluginId: string,
+  provider: HostStatusProvider,
+): () => void {
+  if (plugged) {
+    throw new Error(
+      `Host status is already provided by plugin "${plugged.pluginId}"`,
+    );
+  }
+  const entry = { pluginId, provider };
+  swap(() => {
+    plugged = entry;
+  });
+  return () => {
+    if (plugged !== entry) return;
+    swap(() => {
+      plugged = null;
+    });
+  };
+}
+
+export function hostStatusProviderId(): string | null {
+  return plugged?.pluginId ?? null;
+}
+
+/** What the rest of core calls. */
+export const hostStatus = {
+  start(): void {
+    running = true;
+    active()?.start();
+  },
+  stop(): void {
+    running = false;
+    active()?.stop();
+  },
+  get(hostId: number): HostStatusEntry | null {
+    return active()?.get(hostId) ?? null;
+  },
+  async statusesFor(
+    userId: string,
+    requestedHostIds: Set<number> | null,
+  ): Promise<Map<number, HostStatusEntry>> {
+    return (await active()?.statusesFor(userId, requestedHostIds)) ?? new Map();
+  },
+  async refresh(userId: string): Promise<void> {
+    await active()?.refresh(userId);
+  },
+  async check(hostId: number): Promise<HostStatusEntry | null> {
+    return (await active()?.check(hostId)) ?? null;
+  },
+  reportLogin(hostId: number, outcome: { ok: boolean }): void {
+    active()?.reportLogin(hostId, outcome);
+  },
+  /** Kept across a provider change, so a plugin's port stays registered. */
+  registerPort(connectionType: string, resolve: HostPortResolver): () => void {
+    const key = Symbol(connectionType);
+    ports.set(key, { type: connectionType, resolve });
+    const provider = active();
+    if (provider)
+      portDrops.set(key, provider.registerPort(connectionType, resolve));
+    return () => {
+      ports.delete(key);
+      portDrops.get(key)?.();
+      portDrops.delete(key);
+    };
+  },
+  async getIntervalSeconds(): Promise<number> {
+    return (await active()?.getIntervalSeconds()) ?? 30;
+  },
+  async setIntervalSeconds(seconds: number): Promise<void> {
+    await active()?.setIntervalSeconds(seconds);
+  },
+};

src/backend/plugins/loader.ts

@@ -656,6 +656,15 @@ export class PluginLoader {
 
     if (plugin.state === "active" || plugin.state === "activating") return;
 
+    if (
+      plugin.manifest.runtime === "desktop" &&
+      process.env.ELECTRON_EMBEDDED !== "true"
+    ) {
+      plugin.state = "blocked";
+      plugin.lastError = "only runs in the desktop app";
+      return;
+    }
+
     plugin.state = "activating";
     plugin.lastError = null;
 
@@ -719,8 +728,12 @@ export class PluginLoader {
         bundled:
           plugin.source === "bundled" || plugin.signedTier === "official",
       });
-      // A new table may be where core data is waiting to move.
-      if (applied.length > 0) {
+      // A new table, or a plugin that keeps its state in settings, may be
+      // where core data is waiting to move. Every move is idempotent.
+      if (
+        applied.length > 0 ||
+        plugin.manifest.contributes?.settings?.admin?.length
+      ) {
         const { runPluginDataMoves } =
           await import("../upgrade/plugin-data-moves.js");
         await runPluginDataMoves();

src/backend/plugins/manage.ts

@@ -34,6 +34,7 @@ import {
 } from "./paths.js";
 import {
   OFFICIAL_REGISTRY_ID,
+  canRunRelease,
   downloadRelease,
   fetchRegistryIndex,
   channelReleases,
@@ -42,6 +43,7 @@ import {
   getRegistryStatus,
   isApiCompatible,
   latestOnChannel,
+  neededTermix,
   officialSource,
   parsePluginChannel,
   type PluginChannel,
@@ -257,10 +259,13 @@ export interface RegistryListing {
     videoId?: string;
     features: string[];
     docs?: string;
+    contributes: string[];
     versions: Array<{
       version: string;
       prerelease: boolean;
       compatible: boolean;
+      /** The Termix range this version needs, when this build is too old. */
+      needsTermix: string | null;
       capabilities: string[];
       publishedAt?: string;
       releaseNotesUrl?: string;
@@ -396,7 +401,7 @@ export async function listRegistry(
       const channel = channelOf(record);
       const latest = latestOnChannel(plugin, channel);
       const latestBeta =
-        plugin.prereleases.find((entry) => isApiCompatible(entry.api)) ?? null;
+        plugin.prereleases.find((entry) => canRunRelease(entry)) ?? null;
       const installedVersion =
         live?.manifest.version ?? record?.version ?? null;
       const updateAvailable = Boolean(
@@ -419,10 +424,12 @@ export async function listRegistry(
         videoId: plugin.videoId,
         features: plugin.features,
         docs: plugin.docs,
+        contributes: plugin.contributes,
         versions: channelReleases(plugin, "beta").map((entry) => ({
           version: entry.version,
           prerelease: Boolean(entry.prerelease),
-          compatible: isApiCompatible(entry.api),
+          compatible: canRunRelease(entry),
+          needsTermix: neededTermix(entry),
           capabilities: entry.capabilities,
           publishedAt: entry.publishedAt,
           releaseNotesUrl: entry.releaseNotesUrl,
@@ -902,9 +909,12 @@ async function requireRelease(
       "NOT_IN_REGISTRY",
     );
   }
-  if (!isApiCompatible(found.release.api)) {
+  if (!canRunRelease(found.release)) {
+    const termix = neededTermix(found.release);
     throw new PluginManageError(
-      `${pluginId} ${found.release.version} does not run on this version of Termix`,
+      termix
+        ? `${pluginId} ${found.release.version} needs Termix ${termix}`
+        : `${pluginId} ${found.release.version} does not run on this version of Termix`,
       409,
       "INCOMPATIBLE",
     );
@@ -1502,6 +1512,14 @@ function validateUpload(buffer: Buffer): PluginManifest {
       "INCOMPATIBLE",
     );
   }
+  const termix = neededTermix({ engine: manifest.engine });
+  if (termix) {
+    throw new PluginManageError(
+      `${manifest.id} ${manifest.version} needs Termix ${termix}`,
+      409,
+      "INCOMPATIBLE",
+    );
+  }
   return manifest;
 }
 

src/backend/plugins/probe/jump-probe-pool.ts

@@ -97,3 +97,10 @@ export class JumpProbePool {
     if (this.entries.get(key) === entry) this.entries.delete(key);
   }
 }
+
+/** One pool for core's checks and for plugins probing through ctx. */
+export const sharedJumpProbes = new JumpProbePool(async (jumpHosts, userId) => {
+  const { createJumpHostChain } =
+    await import("../../hosts/jump-host-chain.js");
+  return createJumpHostChain(jumpHosts, userId);
+});

src/backend/plugins/registry-index.ts

@@ -15,11 +15,14 @@ import fs from "node:fs";
 import path from "node:path";
 import semver from "semver";
 import {
+  isApiCompatible as satisfiesPluginApi,
+  isTermixCompatible,
   pluginDocsUrl,
   pluginFeatures,
   SUPPORTED_PLUGIN_API_VERSION,
   youtubeVideoId,
 } from "@termix-ssh/plugin-sdk/manifest";
+import { getLocalVersion } from "../utils/app-version.js";
 import { safeOutboundFetch } from "../utils/safe-outbound-fetch.js";
 import { pluginLogger } from "../utils/logger.js";
 import {
@@ -59,7 +62,10 @@ const ID_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
 
 export interface RegistryVersion {
   version: string;
+  /** The API major, all that builds before engine ranges read. */
   api: string;
+  /** The manifest's engine ranges, when the index lists them. */
+  engine?: { api: string; termix: string };
   url: string;
   sha256: string;
   signature: string;
@@ -92,6 +98,8 @@ export interface RegistryPlugin {
   features: string[];
   /** https docs link from the index. */
   docs?: string;
+  /** The manifest's contributes keys, like layouts, themes or tabs. */
+  contributes: string[];
   /** Stable releases, newest first. */
   versions: RegistryVersion[];
   /**
@@ -149,6 +157,9 @@ function parseVersion(raw: unknown): RegistryVersion | null {
     return null;
   }
   if (!/^[a-f0-9]{64}$/i.test(sha256)) return null;
+  const engine = entry.engine as Record<string, unknown> | undefined;
+  const engineApi = asString(engine?.api);
+  const engineTermix = asString(engine?.termix);
   try {
     if (new URL(url).protocol !== "https:") return null;
   } catch {
@@ -157,6 +168,9 @@ function parseVersion(raw: unknown): RegistryVersion | null {
   return {
     version,
     api: asString(entry.api) ?? "",
+    ...(engineApi && engineTermix
+      ? { engine: { api: engineApi, termix: engineTermix } }
+      : {}),
     url,
     sha256: sha256.toLowerCase(),
     signature,
@@ -191,11 +205,15 @@ export function parseRegistryIndex(raw: unknown): RegistryIndex {
         .map(parseVersion)
         .filter((v): v is RegistryVersion => v !== null)
         .sort((a, b) => semver.rcompare(a.version, b.version));
-    const versions = parseList(entry.versions).filter(
-      (v) => !semver.prerelease(v.version),
-    );
-    const prereleases = parseList(entry.prereleases)
+    // gated holds releases that need a newer Termix than builds which skip
+    // the engine.termix check, so only builds that check it read the list.
+    const gated = parseList(entry.gated);
+    const versions = [...parseList(entry.versions), ...gated]
+      .filter((v) => !semver.prerelease(v.version))
+      .sort((a, b) => semver.rcompare(a.version, b.version));
+    const prereleases = [...parseList(entry.prereleases), ...gated]
       .filter((v) => semver.prerelease(v.version))
+      .sort((a, b) => semver.rcompare(a.version, b.version))
       .map((v) => ({ ...v, prerelease: true }));
     if (versions.length === 0 && prereleases.length === 0) continue;
     plugins.push({
@@ -209,6 +227,14 @@ export function parseRegistryIndex(raw: unknown): RegistryIndex {
       videoId: youtubeVideoId(entry.video) ?? undefined,
       features: pluginFeatures(entry.features),
       docs: pluginDocsUrl(entry.docs) ?? undefined,
+      contributes: Array.isArray(entry.contributes)
+        ? entry.contributes
+            .filter(
+              (kind): kind is string =>
+                typeof kind === "string" && /^[A-Za-z]+$/.test(kind),
+            )
+            .slice(0, 50)
+        : [],
       versions,
       prereleases,
     });
@@ -229,6 +255,29 @@ export function isApiCompatible(api: string): boolean {
   return major !== undefined && String(major) === SUPPORTED_PLUGIN_API_VERSION;
 }
 
+/**
+ * The Termix range a release needs when this build is too old for it, or
+ * null when this build satisfies it.
+ */
+export function neededTermix(
+  release: Pick<RegistryVersion, "engine">,
+): string | null {
+  const range = release.engine?.termix;
+  if (!range) return null;
+  return isTermixCompatible(range, getLocalVersion()) ? null : range;
+}
+
+/** Whether this build can run a release: its API and its engine ranges. */
+export function canRunRelease(
+  release: Pick<RegistryVersion, "api" | "engine">,
+): boolean {
+  if (!isApiCompatible(release.api)) return false;
+  if (!release.engine) return true;
+  return (
+    satisfiesPluginApi(release.engine.api) && neededTermix(release) === null
+  );
+}
+
 /** Follows redirects by hand so each hop still gets the outbound checks. */
 async function fetchFollowing(url: string): Promise<Response> {
   let current = url;
@@ -427,9 +476,8 @@ export function latestOnChannel(
   channel: PluginChannel,
 ): RegistryVersion | null {
   return (
-    channelReleases(plugin, channel).find((entry) =>
-      isApiCompatible(entry.api),
-    ) ?? null
+    channelReleases(plugin, channel).find((entry) => canRunRelease(entry)) ??
+    null
   );
 }
 
@@ -486,9 +534,12 @@ export async function downloadRelease(
   release: RegistryVersion,
   keys: readonly TrustedPluginKey[] = TRUSTED_PLUGIN_KEYS,
 ): Promise<{ file: string; signatureFile: string }> {
-  if (!isApiCompatible(release.api)) {
+  if (!canRunRelease(release)) {
+    const termix = neededTermix(release);
     throw new Error(
-      `${pluginId} ${release.version} needs plugin API ${release.api}, this build runs ${SUPPORTED_PLUGIN_API_VERSION}`,
+      termix
+        ? `${pluginId} ${release.version} needs Termix ${termix}, this is ${getLocalVersion()}`
+        : `${pluginId} ${release.version} needs plugin API ${release.engine?.api ?? release.api}, this build runs ${SUPPORTED_PLUGIN_API_VERSION}`,
     );
   }
 

src/backend/plugins/registry.ts

@@ -41,6 +41,18 @@ export function revoke(key: string, value?: unknown): boolean {
   return providers.delete(key);
 }
 
+/**
+ * The provider under "<some plugin id>.<name>", for a well-known name core
+ * reads without knowing which plugin supplies it. First match wins.
+ */
+export function consumeByName<T>(name: string): T | undefined {
+  const suffix = `.${name}`;
+  for (const [key, value] of providers) {
+    if (key.endsWith(suffix)) return value as T;
+  }
+  return undefined;
+}
+
 export function has(key: string): boolean {
   return providers.has(key);
 }

src/backend/plugins/settings.ts

@@ -44,6 +44,10 @@ export type { PluginSettingsScope };
 export const CORE_SETTINGS_ALLOWLIST: readonly string[] = [
   "app_name",
   "notification_private_endpoint_allowlist",
+  // Read once by the branding provider to keep a pre-plugin install's branding.
+  "branding_app_name",
+  "branding_tagline",
+  "branding_logo",
 ];
 
 type ChangeListener = (value: unknown) => void;

src/backend/services/recent-activity.ts

@@ -1,90 +0,0 @@
-import {
-  createCurrentHostResolutionRepository,
-  createCurrentRbacAccessRepository,
-  createCurrentRecentActivityRepository,
-  createCurrentRoleRepository,
-} from "../database/repositories/factory.js";
-import { dashboardLogger } from "../utils/logger.js";
-
-const RATE_LIMIT_MS = 1000;
-const activityRateLimiter = new Map<string, number>();
-
-/**
- * Activity types are whatever the recording plugin calls them (each tab
- * declares the types it reopens), so only the shape is checked here.
- */
-function isActivityType(type: unknown): type is string {
-  return typeof type === "string" && /^[a-z][a-z0-9_]{0,31}$/.test(type);
-}
-
-export type RecordActivityResult =
-  | { status: "logged"; id: number }
-  | { status: "rate_limited" }
-  | { status: "invalid_type" }
-  | { status: "denied" };
-
-/**
- * Adds one recent activity entry: the dashboard's /activity/log route and
- * ctx.hosts.recordActivity both come through here, so the rate limit and the
- * access rule are the same for both.
- */
-export async function recordRecentActivity(
-  userId: string,
-  entry: { type: string; hostId: number; hostName: string },
-): Promise<RecordActivityResult> {
-  const { type, hostId, hostName } = entry;
-  if (!isActivityType(type)) {
-    return { status: "invalid_type" };
-  }
-
-  const rateLimitKey = `${userId}:${hostId}:${type}`;
-  const now = Date.now();
-  const lastLogged = activityRateLimiter.get(rateLimitKey);
-  if (lastLogged && now - lastLogged < RATE_LIMIT_MS) {
-    return { status: "rate_limited" };
-  }
-  activityRateLimiter.set(rateLimitKey, now);
-
-  if (activityRateLimiter.size > 10000) {
-    for (const [key, timestamp] of activityRateLimiter.entries()) {
-      if (now - timestamp > RATE_LIMIT_MS * 2) activityRateLimiter.delete(key);
-    }
-  }
-
-  const isOwnedHost =
-    await createCurrentHostResolutionRepository().isHostOwnedByUser(
-      hostId,
-      userId,
-    );
-  if (!isOwnedHost) {
-    const roleIds = await createCurrentRoleRepository().listUserRoleIds(userId);
-    const sharedHosts =
-      await createCurrentRbacAccessRepository().listVisibleHostAccessEntries(
-        userId,
-        roleIds,
-      );
-    if (!sharedHosts.some((access) => access.hostId === hostId)) {
-      return { status: "denied" };
-    }
-  }
-
-  const result = await createCurrentRecentActivityRepository().create({
-    userId,
-    type,
-    hostId,
-    hostName,
-  });
-
-  // Best-effort trim; a failure here must not fail the log itself.
-  try {
-    await createCurrentRecentActivityRepository().trimUserActivity(userId, 100);
-  } catch (trimErr) {
-    dashboardLogger.warn("Failed to trim recent_activity (non-fatal)", {
-      operation: "trim_recent_activity",
-      userId,
-      error: trimErr instanceof Error ? trimErr.message : String(trimErr),
-    });
-  }
-
-  return { status: "logged", id: result.id };
-}

src/backend/starter.ts

@@ -200,9 +200,9 @@ async function provisionLocalDesktopUserIfNeeded(): Promise<void> {
     const { runCoreBootMigrations } = await import("./boot.js");
     await runCoreBootMigrations();
 
-    const { hostStatusService } =
-      await import("./hosts/status/host-status-service.js");
-    hostStatusService.start();
+    // Status comes from whichever plugin provides it; none means unknown.
+    const { hostStatus } = await import("./plugins/host-status-provider.js");
+    hostStatus.start();
 
     // Counted before the desktop user is provisioned, so a first desktop
     // run counts as a fresh install too.
@@ -226,7 +226,7 @@ async function provisionLocalDesktopUserIfNeeded(): Promise<void> {
     // Plugins serve their routes under /plugin-api/<id>/ and /plugin-ws/<id>/
     // through ctx on activate, and start their own schedulers there, so
     // disabling one answers 503 instead of leaving a dead import here. The
-    // dashboard's own uptime and recent-activity routes are core and are
+    // dashboard's uptime and recent-activity routes are core forwarders and are
     // mounted on the main server in database.ts.
 
     // Initialize log level from database settings

src/backend/sync/client/http.ts

@@ -200,6 +200,38 @@ export async function remoteFetch(
   return response;
 }
 
+export interface RemoteStreamRequest {
+  method?: string;
+  headers?: Record<string, string>;
+  /** A string, a buffer or a Node stream. */
+  body?: unknown;
+  signal?: AbortSignal;
+}
+
+/**
+ * Sends a request with the link's proxy headers and certificate rules and a
+ * body that may be a stream. The response body is left unread for the caller.
+ */
+export async function remoteStreamFetch(
+  target: RemoteTarget,
+  pathname: string,
+  request: RemoteStreamRequest = {},
+) {
+  const headers = { ...request.headers, ...requestHeaders(target) };
+  try {
+    return await undiciFetch(remoteUrl(target.serverUrl, pathname), {
+      method: request.method ?? "GET",
+      headers,
+      body: request.body as never,
+      duplex: "half",
+      dispatcher: dispatcherFor(target),
+      signal: request.signal,
+    } as never);
+  } catch (error) {
+    throw describeNetworkError(error);
+  }
+}
+
 /** Sends a request and parses a JSON answer from Termix. */
 export async function remoteJson<T>(
   target: RemoteTarget,

src/backend/sync/client/plugins.ts

@@ -11,7 +11,10 @@
 import fs from "fs";
 import path from "path";
 import semver from "semver";
-import type { PluginDesktopMode } from "@termix-ssh/plugin-sdk/manifest";
+import {
+  resolvePluginDesktopMode,
+  type PluginDesktopMode,
+} from "@termix-ssh/plugin-sdk/manifest";
 import { syncLogger } from "../../utils/logger.js";
 import { sendCoreAlert } from "../../notify/core-notify.js";
 import {
@@ -227,7 +230,9 @@ async function mirrorOne(link: SyncLink, plugin: RemotePlugin): Promise<void> {
   }
   const { loader } = getPluginRuntime();
   let local = loader.get(plugin.id);
-  const mode = local?.manifest.desktop ?? plugin.desktop ?? "mirror";
+  const mode = local
+    ? resolvePluginDesktopMode(local.manifest)
+    : (plugin.desktop ?? "mirror");
 
   if (mode === "server") {
     if (local && (await isEnabledLocally(plugin.id))) {
@@ -328,7 +333,7 @@ export async function mirrorPlugins(link: SyncLink): Promise<void> {
   // A plugin the server no longer has is switched off here. Its data stays.
   for (const local of getPluginRuntime().loader.list()) {
     if (remoteIds.has(local.id) || local.source !== "user") continue;
-    if ((local.manifest.desktop ?? "mirror") !== "mirror") continue;
+    if (resolvePluginDesktopMode(local.manifest) !== "mirror") continue;
     if (await isEnabledLocally(local.id)) {
       await setPluginEnabled(local.id, false).catch(() => {});
     }
@@ -341,7 +346,7 @@ export async function mirrorPlugins(link: SyncLink): Promise<void> {
  */
 export function isServerManaged(pluginId: string): boolean {
   const local = getPluginRuntime().loader.get(pluginId);
-  const mode = local?.manifest.desktop ?? "mirror";
+  const mode = local ? resolvePluginDesktopMode(local.manifest) : "mirror";
   if (mode !== "mirror") return mode === "server";
   return local?.source !== "user" || vouchedHere(local);
 }

src/backend/sync/server/routes.ts

@@ -9,6 +9,7 @@ import { syncLogger } from "../../utils/logger.js";
 import { getLocalVersion } from "../../utils/app-version.js";
 import { getEntity, listEntities } from "../../plugins/sync-registry.js";
 import { getPluginRuntime } from "../../plugins/index.js";
+import { resolvePluginDesktopMode } from "@termix-ssh/plugin-sdk/manifest";
 import {
   createCurrentSessionRepository,
   createCurrentSettingsRepository,
@@ -447,13 +448,13 @@ router.get(
   async (req: Request, res: Response) => {
     const userId = userOf(req);
     try {
-      const { hostStatusService } =
-        await import("../../hosts/status/host-status-service.js");
+      const { hostStatus } =
+        await import("../../plugins/host-status-provider.js");
       const { PermissionManager } =
         await import("../../utils/permission-manager.js");
       const { createCurrentHostRepository } =
         await import("../../database/repositories/factory.js");
-      const statuses = await hostStatusService.statusesFor(userId, null);
+      const statuses = await hostStatus.statusesFor(userId, null);
       const entries = [...statuses.entries()];
       const allowed =
         await PermissionManager.getInstance().filterAccessibleHostIds(
@@ -516,7 +517,7 @@ router.get(
           artifact: !!plugin.artifact,
           enabled: records.get(plugin.id)?.state === "enabled",
           active: plugin.state === "active",
-          desktop: plugin.manifest.desktop ?? "mirror",
+          desktop: resolvePluginDesktopMode(plugin.manifest),
           syncEntities: plugin.manifest.contributes?.syncEntities ?? [],
           granted: (await grants.listByPlugin(plugin.id)).map(
             (grant) => grant.capability,

src/backend/tests/database/repositories/recent-activity-repository.test.ts

@@ -1,99 +0,0 @@
-import { sql } from "drizzle-orm";
-import { afterEach, describe, expect, it } from "vitest";
-import { TestSqliteDatabase } from "./test-support.js";
-import { RecentActivityRepository } from "../../../database/repositories/recent-activity-repository.js";
-
-describe("RecentActivityRepository", () => {
-  let adapter: TestSqliteDatabase | null = null;
-
-  afterEach(async () => {
-    if (adapter) {
-      await adapter.close();
-      adapter = null;
-    }
-  });
-
-  async function createRepository(
-    onWrite?: () => void | Promise<void>,
-  ): Promise<{
-    repository: RecentActivityRepository;
-  }> {
-    adapter = new TestSqliteDatabase();
-    const context = await adapter.connect();
-    await adapter.exec(`
-      INSERT INTO users (id, username, password_hash)
-      VALUES ('user-1', 'alice', 'hash'), ('user-2', 'bob', 'hash');
-      INSERT INTO ssh_data (id, user_id, name, ip, port, username, auth_type)
-      VALUES (1, 'user-1', 'one', '10.0.0.1', 22, 'root', 'password'), (2, 'user-1', 'two', '10.0.0.1', 22, 'root', 'password'), (3, 'user-2', 'other', '10.0.0.1', 22, 'root', 'password');
-      INSERT INTO recent_activity (id, user_id, type, host_id, host_name, timestamp)
-      VALUES
-        (1, 'user-1', 'connect', 1, 'one', '2026-06-26T00:00:00.000Z'),
-        (2, 'user-1', 'disconnect', 2, 'two', '2026-06-26T00:01:00.000Z'),
-        (3, 'user-2', 'connect', 3, 'other', '2026-06-26T00:02:00.000Z');
-    `);
-
-    return {
-      repository: new RecentActivityRepository(context, onWrite),
-    };
-  }
-
-  it("lists, creates, and trims recent activity", async () => {
-    let writeCount = 0;
-    const { repository } = await createRepository(() => {
-      writeCount += 1;
-    });
-
-    expect(
-      (await repository.listByUserId("user-1", 2)).map((row) => row.id),
-    ).toEqual([2, 1]);
-
-    const created = await repository.create({
-      userId: "user-1",
-      type: "terminal",
-      hostId: 1,
-      hostName: "one",
-      timestamp: "2026-06-26T00:03:00.000Z",
-    });
-    expect(created).toMatchObject({
-      userId: "user-1",
-      type: "terminal",
-      hostId: 1,
-    });
-
-    expect(await repository.trimUserActivity("user-1", 2)).toBe(1);
-    expect(
-      await adapter!.query(
-        sql`SELECT id FROM recent_activity WHERE user_id = 'user-1' ORDER BY timestamp DESC`,
-      ),
-    ).toEqual([{ id: created.id }, { id: 2 }]);
-    expect(writeCount).toBe(2);
-  });
-
-  it("deletes activity by user id and only triggers writes for changed rows", async () => {
-    let writeCount = 0;
-    const { repository: repo } = await createRepository(() => {
-      writeCount += 1;
-    });
-
-    expect(await repo.deleteByUserId("missing")).toBe(0);
-    expect(writeCount).toBe(0);
-
-    expect(await repo.deleteByUserId("user-1")).toBe(2);
-    expect(writeCount).toBe(1);
-    expect(await repo.deleteByUserId("user-1")).toBe(0);
-    expect(writeCount).toBe(1);
-  });
-
-  it("deletes activity by host id and host id list", async () => {
-    let writeCount = 0;
-    const { repository: repo } = await createRepository(() => {
-      writeCount += 1;
-    });
-
-    expect(await repo.deleteByHostId(1)).toBe(1);
-    expect(await repo.deleteByHostId(1)).toBe(0);
-    expect(await repo.deleteByHostIds([])).toBe(0);
-    expect(await repo.deleteByHostIds([2, 3])).toBe(2);
-    expect(writeCount).toBe(2);
-  });
-});

src/backend/tests/database/routes/branding-routes.test.ts

@@ -1,5 +1,4 @@
-import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import sharp from "sharp";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import express, {
   type NextFunction,
   type Request,
@@ -19,15 +18,6 @@ vi.mock("../../../utils/logger.js", () => ({
 vi.mock("../../../database/repositories/factory.js", () => ({
   createCurrentSettingsRepository: () => ({
     get: async (key: string) => state.settings[key] ?? null,
-    set: async (key: string, value: string) => {
-      state.settings[key] = value;
-    },
-    setMany: async (writes: Array<{ key: string; value: string }>) => {
-      for (const write of writes) state.settings[write.key] = write.value;
-    },
-    delete: async (key: string) => {
-      delete state.settings[key];
-    },
   }),
 }));
 
@@ -42,25 +32,17 @@ interface RouteLayer {
   };
 }
 
-/** Runs a route's full middleware chain (e.g. requireAdmin, then the handler). */
-function handlersFor(
-  router: express.Router,
-  pathName: string,
-  method: string,
-): RequestHandler[] {
-  const layer = (router as unknown as { stack: RouteLayer[] }).stack.find(
-    (candidate) =>
-      candidate.route?.path === pathName && candidate.route.methods[method],
-  );
-  if (!layer) throw new Error(`Route not registered: ${method} ${pathName}`);
-  return layer.route!.stack.map((entry) => entry.handle);
+function routesOf(router: express.Router) {
+  return (router as unknown as { stack: RouteLayer[] }).stack
+    .filter((layer) => layer.route)
+    .map((layer) => ({
+      path: layer.route!.path,
+      methods: Object.keys(layer.route!.methods),
+      handlers: layer.route!.stack.map((entry) => entry.handle),
+    }));
 }
 
-async function invokeChain(
-  handlers: RequestHandler[],
-  body: unknown = {},
-): Promise<{ statusCode: number; body: unknown }> {
-  const req = { body, headers: {} } as unknown as Request;
+async function call(handler: RequestHandler) {
   const result = { statusCode: 200, body: null as unknown };
   const res = {
     status(code: number) {
@@ -72,67 +54,34 @@ async function invokeChain(
       return this;
     },
   } as unknown as Response;
-
-  for (const handler of handlers) {
-    let proceeded = false;
-    await handler(req, res, ((err?: unknown) => {
-      if (err) throw err;
-      proceeded = true;
-    }) as NextFunction);
-    if (!proceeded) return result;
-  }
+  await handler(
+    { body: {}, headers: {} } as Request,
+    res,
+    (() => {}) as NextFunction,
+  );
   return result;
 }
 
-/** Mimics the real requireAdmin: 401 with no session, 403 for a non-admin. */
-function fakeRequireAdmin(
-  outcome: "unauthenticated" | "not-admin" | "admin",
-): RequestHandler {
-  return (_req, res, next) => {
-    if (outcome === "unauthenticated") {
-      res.status(401).json({ error: "Missing authentication token" });
-      return;
-    }
-    if (outcome === "not-admin") {
-      res.status(403).json({ error: "Not authorized" });
-      return;
-    }
-    // Must return (not just call) next() so invokeChain's await actually
-    // waits for the downstream async handler to finish before returning.
-    return next();
-  };
-}
-
-function buildRouter(requireAdmin: RequestHandler) {
-  const router = express.Router();
-  registerBrandingRoutes(router, requireAdmin);
-  return router;
-}
-
-let pngDataUrl: string;
-
-beforeAll(async () => {
-  const buffer = await sharp({
-    create: { width: 4, height: 4, channels: 3, background: "#112233" },
-  })
-    .png()
-    .toBuffer();
-  pngDataUrl = `data:image/png;base64,${buffer.toString("base64")}`;
-});
-
 beforeEach(() => {
   state.settings = {};
 });
 
 describe("GET /users/branding", () => {
-  it("succeeds with no auth at all, since the route registers no auth handler", async () => {
-    // requireAdmin is only ever wired onto PATCH below; GET's own handler chain
-    // has exactly one entry, proving the public route never runs an admin gate.
-    const router = buildRouter(fakeRequireAdmin("unauthenticated"));
-    const handlers = handlersFor(router, "/branding", "get");
-    expect(handlers).toHaveLength(1);
+  it("is the only branding route and has no auth handler", () => {
+    const router = express.Router();
+    registerBrandingRoutes(router);
+    const routes = routesOf(router);
 
-    const response = await invokeChain(handlers);
+    expect(routes).toHaveLength(1);
+    expect(routes[0].path).toBe("/branding");
+    expect(routes[0].methods).toEqual(["get"]);
+    expect(routes[0].handlers).toHaveLength(1);
+  });
+
+  it("answers defaults when nothing is set", async () => {
+    const router = express.Router();
+    registerBrandingRoutes(router);
+    const response = await call(routesOf(router)[0].handlers[0]);
 
     expect(response.statusCode).toBe(200);
     expect(response.body).toEqual({
@@ -142,126 +91,19 @@ describe("GET /users/branding", () => {
     });
   });
 
-  it("reflects persisted branding values", async () => {
-    state.settings.branding_app_name = "Acme Ops";
-    state.settings.branding_tagline = "Ship it";
-    state.settings.branding_logo = pngDataUrl;
-    const router = buildRouter(fakeRequireAdmin("admin"));
+  it("keeps serving the stored branding of an older install", async () => {
+    state.settings = {
+      branding_app_name: "Acme",
+      branding_tagline: "Ops",
+    };
+    const router = express.Router();
+    registerBrandingRoutes(router);
+    const response = await call(routesOf(router)[0].handlers[0]);
 
-    const response = await invokeChain(handlersFor(router, "/branding", "get"));
-
-    expect(response.statusCode).toBe(200);
     expect(response.body).toEqual({
-      appName: "Acme Ops",
-      tagline: "Ship it",
-      logo: pngDataUrl,
+      appName: "Acme",
+      tagline: "Ops",
+      logo: null,
     });
   });
 });
-
-describe("PATCH /users/branding", () => {
-  it("rejects an unauthenticated request and persists nothing", async () => {
-    const router = buildRouter(fakeRequireAdmin("unauthenticated"));
-
-    const response = await invokeChain(
-      handlersFor(router, "/branding", "patch"),
-      { appName: "Hijacked" },
-    );
-
-    expect(response.statusCode).toBe(401);
-    expect(state.settings).toEqual({});
-  });
-
-  it("rejects a non-admin request and persists nothing", async () => {
-    const router = buildRouter(fakeRequireAdmin("not-admin"));
-
-    const response = await invokeChain(
-      handlersFor(router, "/branding", "patch"),
-      { appName: "Hijacked" },
-    );
-
-    expect(response.statusCode).toBe(403);
-    expect(state.settings).toEqual({});
-  });
-
-  it("persists only the allowed fields for an admin request", async () => {
-    const router = buildRouter(fakeRequireAdmin("admin"));
-
-    const response = await invokeChain(
-      handlersFor(router, "/branding", "patch"),
-      { appName: "Acme Ops", tagline: "Ship it", logo: pngDataUrl },
-    );
-
-    expect(response.statusCode).toBe(200);
-    expect(state.settings.branding_app_name).toBe("Acme Ops");
-    expect(state.settings.branding_tagline).toBe("Ship it");
-    expect(state.settings.branding_logo).toMatch(/^data:image\/png;base64,/);
-    expect(response.body).toMatchObject({
-      appName: "Acme Ops",
-      tagline: "Ship it",
-    });
-  });
-
-  it("rejects unknown fields without writing anything", async () => {
-    const router = buildRouter(fakeRequireAdmin("admin"));
-
-    const response = await invokeChain(
-      handlersFor(router, "/branding", "patch"),
-      { theme: "dark" },
-    );
-
-    expect(response.statusCode).toBe(400);
-    expect(response.body).toMatchObject({
-      code: "BRANDING_SETTINGS_UNKNOWN_FIELD",
-    });
-    expect(state.settings).toEqual({});
-  });
-
-  it("rejects an app name over the length limit", async () => {
-    const router = buildRouter(fakeRequireAdmin("admin"));
-
-    const response = await invokeChain(
-      handlersFor(router, "/branding", "patch"),
-      { appName: "x".repeat(61) },
-    );
-
-    expect(response.statusCode).toBe(400);
-    expect(response.body).toMatchObject({
-      code: "BRANDING_SETTINGS_INVALID",
-      field: "appName",
-    });
-    expect(state.settings).toEqual({});
-  });
-
-  it("rejects malformed/non-raster logo data without persisting it", async () => {
-    const router = buildRouter(fakeRequireAdmin("admin"));
-
-    const response = await invokeChain(
-      handlersFor(router, "/branding", "patch"),
-      {
-        logo: `data:image/png;base64,${Buffer.from("not an image").toString("base64")}`,
-      },
-    );
-
-    expect(response.statusCode).toBe(400);
-    expect(response.body).toMatchObject({
-      code: "BRANDING_SETTINGS_INVALID",
-      field: "logo",
-    });
-    expect(state.settings).toEqual({});
-  });
-
-  it("clears the logo when patched with null", async () => {
-    state.settings.branding_logo = pngDataUrl;
-    const router = buildRouter(fakeRequireAdmin("admin"));
-
-    const response = await invokeChain(
-      handlersFor(router, "/branding", "patch"),
-      { logo: null },
-    );
-
-    expect(response.statusCode).toBe(200);
-    expect(state.settings.branding_logo).toBeUndefined();
-    expect(response.body).toMatchObject({ logo: null });
-  });
-});

src/backend/tests/database/routes/branding-settings.test.ts

@@ -1,149 +1,17 @@
-import { beforeAll, describe, expect, it, vi } from "vitest";
-import sharp from "sharp";
+import { describe, expect, it, vi } from "vitest";
 
 vi.mock("../../../utils/logger.js", () => ({
   authLogger: { warn: vi.fn(), error: vi.fn(), info: vi.fn() },
   databaseLogger: { warn: vi.fn(), error: vi.fn(), info: vi.fn() },
 }));
 
-const {
-  BRANDING_DEFAULT_APP_NAME,
-  BRANDING_LOGO_MAX_BYTES,
-  parseBrandingAppName,
-  parseBrandingLogoDataUrl,
-  parseBrandingTagline,
-  resolveBrandingSettings,
-} = await import("../../../database/routes/branding-settings.js");
+const { BRANDING_DEFAULT_APP_NAME, resolveBrandingSettings } =
+  await import("../../../database/routes/branding-settings.js");
 
 function settingSource(values: Record<string, string>) {
   return { get: async (key: string) => values[key] ?? null };
 }
 
-async function toDataUrl(
-  buffer: Buffer,
-  mime: "image/png" | "image/jpeg" | "image/webp",
-): Promise<string> {
-  return `data:${mime};base64,${buffer.toString("base64")}`;
-}
-
-let pngBuffer: Buffer;
-let jpegBuffer: Buffer;
-let webpBuffer: Buffer;
-let oversizedPngBuffer: Buffer;
-
-beforeAll(async () => {
-  const image = sharp({
-    create: { width: 4, height: 4, channels: 3, background: "#336699" },
-  });
-  pngBuffer = await image.clone().png().toBuffer();
-  jpegBuffer = await image.clone().jpeg().toBuffer();
-  webpBuffer = await image.clone().webp().toBuffer();
-  oversizedPngBuffer = await sharp({
-    create: { width: 1200, height: 1200, channels: 4, background: "#abcdef" },
-  })
-    .png({ compressionLevel: 0 })
-    .toBuffer();
-});
-
-describe("parseBrandingAppName", () => {
-  it("trims and accepts a normal name", () => {
-    expect(parseBrandingAppName("  My Company  ")).toBe("My Company");
-  });
-
-  it("falls back to the default when cleared", () => {
-    expect(parseBrandingAppName("")).toBe(BRANDING_DEFAULT_APP_NAME);
-    expect(parseBrandingAppName("   ")).toBe(BRANDING_DEFAULT_APP_NAME);
-  });
-
-  it("rejects names over 60 characters", () => {
-    expect(parseBrandingAppName("x".repeat(61))).toBeNull();
-  });
-
-  it("rejects non-string values", () => {
-    expect(parseBrandingAppName(42)).toBeNull();
-    expect(parseBrandingAppName(null)).toBeNull();
-  });
-});
-
-describe("parseBrandingTagline", () => {
-  it("trims and accepts a normal tagline", () => {
-    expect(parseBrandingTagline("  Ship faster  ")).toBe("Ship faster");
-  });
-
-  it("accepts an empty tagline (means: use the default)", () => {
-    expect(parseBrandingTagline("")).toBe("");
-    expect(parseBrandingTagline("   ")).toBe("");
-  });
-
-  it("rejects taglines over 160 characters", () => {
-    expect(parseBrandingTagline("x".repeat(161))).toBeNull();
-  });
-
-  it("rejects non-string values", () => {
-    expect(parseBrandingTagline(42)).toBeNull();
-  });
-});
-
-describe("parseBrandingLogoDataUrl", () => {
-  it("accepts a PNG data URL and re-encodes it to PNG", async () => {
-    const result = await parseBrandingLogoDataUrl(
-      await toDataUrl(pngBuffer, "image/png"),
-    );
-    expect(result).not.toBeNull();
-    expect(result!.startsWith("data:image/png;base64,")).toBe(true);
-    const decoded = Buffer.from(result!.split(",")[1]!, "base64");
-    expect(decoded.subarray(1, 4).toString()).toBe("PNG");
-  });
-
-  it("accepts a JPEG data URL and normalizes it to PNG", async () => {
-    const result = await parseBrandingLogoDataUrl(
-      await toDataUrl(jpegBuffer, "image/jpeg"),
-    );
-    expect(result).not.toBeNull();
-    expect(result!.startsWith("data:image/png;base64,")).toBe(true);
-  });
-
-  it("accepts a WEBP data URL and normalizes it to PNG", async () => {
-    const result = await parseBrandingLogoDataUrl(
-      await toDataUrl(webpBuffer, "image/webp"),
-    );
-    expect(result).not.toBeNull();
-    expect(result!.startsWith("data:image/png;base64,")).toBe(true);
-  });
-
-  it("rejects a non-image/SVG mime prefix outright", async () => {
-    const svg = Buffer.from('<svg onload="alert(1)"></svg>', "utf8").toString(
-      "base64",
-    );
-    const result = await parseBrandingLogoDataUrl(
-      `data:image/svg+xml;base64,${svg}`,
-    );
-    expect(result).toBeNull();
-  });
-
-  it("rejects a value that isn't a data URL at all", async () => {
-    expect(await parseBrandingLogoDataUrl("not-a-data-url")).toBeNull();
-    expect(await parseBrandingLogoDataUrl(undefined)).toBeNull();
-  });
-
-  it("rejects a spoofed data URL whose bytes aren't a real image", async () => {
-    const fake = Buffer.from("definitely not an image").toString("base64");
-    const result = await parseBrandingLogoDataUrl(
-      `data:image/png;base64,${fake}`,
-    );
-    expect(result).toBeNull();
-  });
-
-  it("rejects an image that normalizes over the size cap", async () => {
-    // Sanity check the fixture is actually large enough to exceed the cap.
-    expect(oversizedPngBuffer.length).toBeGreaterThan(BRANDING_LOGO_MAX_BYTES);
-    const result = await parseBrandingLogoDataUrl(
-      await toDataUrl(oversizedPngBuffer, "image/png"),
-    );
-    expect(result).toBeNull();
-  });
-});
-
 describe("resolveBrandingSettings", () => {
   it("returns built-in defaults when nothing is persisted", async () => {
     const settings = await resolveBrandingSettings(settingSource({}));
@@ -169,3 +37,34 @@ describe("resolveBrandingSettings", () => {
     });
   });
 });
+
+describe("branding provider", () => {
+  it("uses a plugin's branding provider and falls back when it throws", async () => {
+    const registry = await import("../../../plugins/registry.js");
+    const provider = async () => ({
+      appName: " Acme ",
+      tagline: "Hello",
+      logo: "data:image/png;base64,AAAA",
+    });
+    registry.provide("demo.brandingProvider", provider);
+    try {
+      await expect(resolveBrandingSettings(settingSource({}))).resolves.toEqual(
+        {
+          appName: "Acme",
+          tagline: "Hello",
+          logo: "data:image/png;base64,AAAA",
+        },
+      );
+
+      registry.revoke("demo.brandingProvider");
+      registry.provide("demo.brandingProvider", async () => {
+        throw new Error("broken");
+      });
+      await expect(
+        resolveBrandingSettings(settingSource({ branding_app_name: "Stored" })),
+      ).resolves.toMatchObject({ appName: "Stored" });
+    } finally {
+      registry.clearRegistry();
+    }
+  });
+});