fix(sdk): skip comment-only chunks when splitting migrations

* fix(sync): don't delete a local row when the server can't send its copy

A push conflict on a live record whose server row failed to serialize
came back as row: null, deleted: false, and the desktop treated that as
a delete. The server now rejects that op as unavailable, the desktop
never deletes on a conflict without a row, and serialization failures
are logged.

* fix(sync): retry temporarily unavailable records

.github/workflows/electron.yml

@@ -148,7 +148,7 @@ jobs:
       # The updater only installs the x64 NSIS build; 32-bit installs get a link.
       # The combined x64+ia32 installer is never uploaded.
       - name: Fix Windows update files
-        run: node scripts/fix-update-info.cjs --drop ia32 --drop termix_windows_nsis.exe release/latest.yml release/beta.yml release/alpha.yml
+        run: node scripts/fix-update-info.cjs --drop ia32 --drop termix_windows_nsis.exe release/latest.yml release/beta.yml
 
       - name: Upload Windows x64 NSIS Installer
         uses: actions/upload-artifact@v7
@@ -1153,6 +1153,49 @@ jobs:
             --locales "en-US"
           echo "metadata_path=$META_DIR" >> "$GITHUB_OUTPUT"
 
+      # Apple won't create a new version while the last one is still in
+      # review. Pull it out so deliver can rename it to this version.
+      - name: Cancel pending App Store review
+        if: steps.check_certs.outputs.has_certs == 'true' && steps.check_asc_creds.outputs.has_credentials == 'true'
+        run: |
+          LANE_DIR="$RUNNER_TEMP/asc_cancel/fastlane"
+          mkdir -p "$LANE_DIR"
+
+          cat > "$LANE_DIR/Fastfile" <<'EOF'
+          default_platform(:mac)
+
+          lane :cancel_pending_review do
+            Spaceship::ConnectAPI.token = Spaceship::ConnectAPI::Token.from_json_file("/tmp/asc_keys/api_key.json")
+            app = Spaceship::ConnectAPI::App.find("com.karmaa.termix")
+            UI.user_error!("App not found") unless app
+
+            app.get_app_store_versions(filter: { platform: "MAC_OS" }, limit: 5).each do |v|
+              UI.message("Version #{v.version_string}: #{v.app_version_state || v.app_store_state}")
+            end
+
+            active = %w[WAITING_FOR_REVIEW IN_REVIEW UNRESOLVED_ISSUES]
+            canceled = false
+            app.get_review_submissions(filter: { platform: "MAC_OS" }).each do |sub|
+              UI.message("Review submission #{sub.id}: #{sub.state}")
+              next unless active.include?(sub.state)
+              sub.cancel_submission
+              canceled = true
+              UI.important("Canceled review submission #{sub.id}")
+            end
+            next unless canceled
+
+            30.times do
+              busy = app.get_review_submissions(filter: { platform: "MAC_OS" }).any? do |sub|
+                (active + %w[CANCELING]).include?(sub.state)
+              end
+              break unless busy
+              sleep(10)
+            end
+          end
+          EOF
+
+          cd "$RUNNER_TEMP/asc_cancel" && fastlane cancel_pending_review
+
       - name: Upload and submit to Mac App Store
         if: steps.check_certs.outputs.has_certs == 'true' && steps.check_asc_creds.outputs.has_credentials == 'true'
         run: |

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## 26.10.2
+
+### Added
+
+- Hide sidebar after opening, in Customize Sidebar, closes the host list once you open a host
+- Sort the dashboard's Host Status card by name, IP address or status
+
+### Changed
+
+- The side menu now opens over the page when it expands on hover, so open sessions like remote desktop are not resized each time
+
+### Fixed
+
+- Picking a section lower down in the host editor, like Warpgate, stuttered on the way and sometimes stopped before it got there
+- Sorting hosts by IP address put 10.0.0.210 before 10.0.0.3
+- The local terminal failed to start in the universal macOS build
+- Hosts shared with you never showed up on a linked desktop
+- A linked desktop could never turn on an unsigned plugin the server had enabled
+- Creating, cloning or deleting hosts failed with "no such table: main.p_vault_profiles" after the Vault plugin was removed
+- Opening a user in Settings, Users blocked the other admin sections until you went back to the user list
+- A linked desktop could keep showing the same sync conflicts, or delete a local host, when the server could not send its copy
+- Usernames are now unique
+- Importing user data keeps foreign keys on
+- Trusted proxy login checks the address nginx saw, not nginx itself
+- The desktop login frame only trusts the server's own origin
+- External login URLs and callback ports are checked on the desktop app
+- A changed jump host key is no longer accepted without asking
+- Synced plugins signed only by a key the server sent are no longer turned on by themselves
+- Two connects to the same host at once could overwrite each other's connection
+- Indonesian uses the same technical terms everywhere
+- When the server was down or still starting, the login page said it could not connect to the database and stopped trying. It now says the server is not responding and continues on its own once the server is back
+- nginx answered 404 instead of 502 while the backend was down
+- A client tunnel that could not start always said "Endpoint SSH connection closed" on the desktop app instead of the real reason, like the target refusing the connection
+- The Docker server crashed and restarted every few hours in ssh2's native crypto on Node 24
+
 ## 26.10.1
 
 ### Added

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Termix is a small core plus plugins. This repo is the core: hosts, credentials,
 npm run dev
 ```
 
-This builds everything, starts the backend and then the Vite server at `http://localhost:5173/`. Backend changes restart the backend, and plugin changes in `../Termix-Plugins` rebuild and reload that plugin. `npm run dev:electron` does the same with the desktop app, and `npm run dev -- --help` lists the other options.
+This builds everything, starts the backend and then the Vite server at `http://localhost:5173/`. Backend changes restart the backend, and plugin changes in `../Plugins` rebuild and reload that plugin. `npm run dev:electron` does the same with the desktop app, and `npm run dev -- --help` lists the other options.
 
 ## Useful commands
 
@@ -38,21 +38,21 @@ npm run format       # format the code with Prettier
 
 ## Making a change
 
-1. **Fork the repository**: Click "Fork" at the top right of the [repository page](https://github.com/Termix-SSH/Termix).
-2. **Create a branch**:
+1. Fork the [repo](https://github.com/Termix-SSH/Termix).
+2. Create a branch:
    ```sh
    git checkout -b feature/my-new-feature
    ```
-3. **Make your changes** and add or update tests for them.
-4. **Commit your changes**:
+3. Make your changes and add or update tests for them.
+4. Commit your changes:
    ```sh
    git commit -m "feat: add my new feature"
    ```
-5. **Push to your fork**:
+5. Push to your fork:
    ```sh
    git push origin feature/my-new-feature
    ```
-6. **Open a pull request** against the current `dev-*` branch with a clear description.
+6. Open a pull request against the current `dev-*` branch with a clear description.
 
 ## Guidelines
 
@@ -72,4 +72,4 @@ Start from the [plugin template](https://github.com/Termix-SSH/Termix-Plugin-Tem
 
 ## Support
 
-Bugs and ideas for Termix itself go in [this repo](https://github.com/Termix-SSH/Termix/issues/new/choose). Plugin problems go in that plugin's own `Plugin-<Name>` repo. Please be as detailed as possible, preferably in English. You can also ask in the [Discord](https://discord.gg/jVQGdvHDrf) server.
+Bugs and ideas for Termix itself go in [this repo](https://github.com/Termix-SSH/Termix/issues/new/choose). Plugin problems go in that plugin's own `Plugin-<Name>` repo. Add as much detail as you can, in English if possible. You can also ask in the [Discord](https://discord.gg/jVQGdvHDrf) server.

Casks/termix.rb

@@ -1,6 +1,6 @@
 cask "termix" do
-  version "26.10.0"
-  sha256 "66a76a62fbea3306bdf35b0951e9b1200fd1a084a95b4fee9d40edd6e326e11a"
+  version "26.10.1"
+  sha256 "08a8fdc6ce3f29bd9031b050a4f6364f3ca446f17cb272392f1b3b488cea5d30"
 
   url "https://github.com/Termix-SSH/Termix/releases/download/v#{version}/termix_macos_universal_dmg.dmg"
   name "Termix"

README.md

@@ -24,30 +24,30 @@
 
 ## Overview
 
-Termix is a free, open source, self-hosted platform for managing your servers, built on plugins. The core is small. It keeps your hosts, credentials, users, sharing and sessions. Everything else, like the SSH terminal, remote desktop, file manager, Docker and metrics, is a plugin you can turn on, turn off or remove.
+Termix is a free, open source, self-hosted server management platform built on plugins. The core keeps your hosts, credentials, users, sharing and sessions. Everything else, like the SSH terminal, remote desktop, file manager, Docker and metrics, is a plugin you can turn on, off or remove.
 
-It runs on web, desktop and mobile, and it is a self-hosted alternative to Termius that stays free forever.
+It runs on web, desktop and mobile. Think of it as a free, self-hosted Termius.
 
 <br />
 
 ## Try the Demo
 
-Want to see it before you install it? Try the demo at [demo.termix.site](https://demo.termix.site/). Any username and password works.
+Try it at [demo.termix.site](https://demo.termix.site/). Any username and password works.
 
 <br />
 
 ## Core
 
-What every Termix install has, with or without plugins:
+What every install has, with or without plugins:
 
-- **Hosts:** Save hosts in nested folders with tags and parent hosts, bulk edit, import and export, and use Quick Connect for one-off connections
-- **Credentials:** Reuse saved passwords and keys across hosts, with host defaults you can set for the server, a user or a folder
-- **Sharing and Roles:** Share hosts, credentials and folders with users or roles at four levels: connect, view, edit and manage
-- **Accounts:** Local accounts, sessions you can see and revoke, trusted devices, API keys and an audit log
-- **Security:** Passwords, keys and other secrets are encrypted per user, and the database can be encrypted on disk
-- **Desktop Sync:** The desktop app runs on its own and can link to a Termix server to keep an offline copy of your account
-- **Interface:** Tabs and split screen, a command palette (double tap left shift), rebindable shortcuts, themes, branding and around 30 languages
-- **Databases:** SQLite by default, with PostgreSQL and MySQL supported too
+- Hosts: Save hosts in nested folders with tags and parent hosts, bulk edit, import and export, and use Quick Connect for one-off connections
+- Credentials: Reuse saved passwords and keys across hosts, with host defaults you can set for the server, a user or a folder
+- Sharing and Roles: Share hosts, credentials and folders with users or roles at four levels: connect, view, edit and manage
+- Accounts: Local accounts, sessions you can see and revoke, trusted devices, API keys and an audit log
+- Security: Passwords, keys and other secrets are encrypted per user, and the database can be encrypted on disk
+- Desktop Sync: The desktop app runs on its own and can link to a Termix server to keep an offline copy of your account
+- Interface: Tabs and split screen, a command palette (double tap left shift), rebindable shortcuts, themes, branding and around 30 languages
+- Databases: SQLite by default, with PostgreSQL and MySQL supported too
 
 <br />
 
@@ -133,7 +133,7 @@ Want to build your own? Start from the [plugin template](https://github.com/Term
 
 ## Installation
 
-Visit the [Termix Docs](https://docs.termix.site/install) for full install steps on every platform.
+See the [docs](https://docs.termix.site/install) for install steps on every platform.
 
 Sample Docker Compose file (you can leave out `guacd` and the network if you don't plan to use the Remote Desktop plugin):
 
@@ -178,15 +178,15 @@ networks:
 
 ### Cloud Hosting
 
-You can run Termix on a VPS instead of inside your own network. If Termix runs on the network it manages, an outage takes Termix down with it, right when you need it to fix things. Running it somewhere else keeps it reachable, gives you a static IP and lets you get in from anywhere without a VPN or port forward.
+If Termix runs on the network it manages, an outage takes it down right when you need it. A VPS keeps it reachable, gives you a static IP and works from anywhere without a VPN or port forward.
 
-[GINERNET](https://docs.termix.site/install/ginernet) sponsors Termix, and the docs have a step by step guide for their VPS platform.
+[GINERNET](https://docs.termix.site/install/ginernet) sponsors Termix and the docs have a setup guide for their VPS.
 
 <br />
 
 ## Donate
 
-Termix is free and open source with no subscriptions or paid plans. If you find it useful, consider donating to help cover server costs, domains and development time.
+Termix has no paid plans. Donations cover servers, domains and development time.
 
 [Donate](https://donate.termix.site/)
 
@@ -194,7 +194,7 @@ Termix is free and open source with no subscriptions or paid plans. If you find
 
 ## Sponsors
 
-Interested in a paid placement to support development? Email [mail@termix.site](mailto:mail@termix.site).
+For a paid sponsor spot, email [mail@termix.site](mailto:mail@termix.site).
 
 <!-- SPONSORS:START -->
 
@@ -242,7 +242,7 @@ Bugs and ideas for Termix itself (login, hosts, credentials, sharing, sync, the
 
 Every plugin has its own repo, so a problem with the terminal, file manager, Docker, remote desktop or any other plugin goes in that plugin's repo (see the table above, or use Report an issue on the plugin's page in the app, which fills in your versions for you). Not sure where it goes? Open it here and it will be moved.
 
-You need to be logged in to GitHub. Please be as detailed as possible, preferably in English.
+You need a GitHub account. Add as much detail as you can, in English if possible.
 
 For discussions and questions, join the [Discord](https://discord.gg/jVQGdvHDrf) server. Update videos are on [YouTube](https://www.youtube.com/@TermixSSH/videos).
 
@@ -250,4 +250,4 @@ For discussions and questions, join the [Discord](https://discord.gg/jVQGdvHDrf)
 
 ## License
 
-Distributed under the Apache License Version 2.0. See [LICENSE](LICENSE) for more information.
+Apache License 2.0. See [LICENSE](LICENSE).

docker/Dockerfile

@@ -74,12 +74,15 @@ COPY vendor ./vendor
 
 COPY scripts/patch-ssh2-agent.cjs ./scripts/
 
+# ssh2's native crypto crashes Node 24 when a cipher is freed, so ssh2 uses
+# OpenSSL instead (chacha20-poly1305 is then left out).
 RUN npm ci --omit=dev --ignore-scripts && \
     node scripts/patch-ssh2-agent.cjs && \
     rm -rf node_modules/better-sqlite3/prebuilds && \
     npm run build-release --prefix node_modules/better-sqlite3 && \
     test -f node_modules/better-sqlite3/build/Release/better_sqlite3.node && \
-    npm rebuild bcryptjs ssh2 && \
+    npm rebuild bcryptjs && \
+    rm -rf node_modules/ssh2/lib/protocol/crypto/build && \
     npm cache clean --force
 
 # Stage 6: Final optimized image

docker/docker-compose.yml

@@ -28,7 +28,11 @@ services:
       # Trusted reverse-proxy authentication is disabled by default. When
       # enabled, do not expose this container directly to untrusted clients.
       # TRUSTED_PROXY_AUTH_ENABLED: "true"
-      # TRUSTED_PROXY_AUTH_TRUSTED_PROXIES: "172.16.0.0/12"
+      # List the address your authenticating proxy connects from, as this
+      # container sees it (for a proxy container on termix-net, its IP there).
+      # Keep it narrow: published ports can reach the container from the
+      # Docker gateway, so do not trust whole private ranges.
+      # TRUSTED_PROXY_AUTH_TRUSTED_PROXIES: "172.20.0.10"
       # TRUSTED_PROXY_AUTH_ROLE_MAP: '{"operators":["user"]}'
       # TRUSTED_PROXY_AUTH_USERNAME_HEADER: "x-forwarded-username"
       # TRUSTED_PROXY_AUTH_ROLE_HEADER: "x-forwarded-role"

docker/nginx-https.conf

@@ -200,6 +200,9 @@ http {
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
+            # The TCP peer before set_real_ip_from rewrites $remote_addr from
+            # X-Forwarded-For; trusted proxy login checks this address.
+            proxy_set_header X-Termix-Proxy-Peer $realip_remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
             proxy_set_header X-Forwarded-Port $proxy_x_forwarded_port;
@@ -473,9 +476,12 @@ http {
         }
 
         error_page 500 502 503 504 /50x.html;
+        # Only nginx's own errors land here (the backend is down or too slow).
+        # There is no 50x page, so answer directly instead of a 404.
         location = /50x.html {
-            root /app/html;
             internal;
+            default_type application/json;
+            return 502 '{"error":"The Termix server is not responding"}';
         }
     }
 }

docker/nginx.conf

@@ -169,6 +169,9 @@ http {
             proxy_http_version 1.1;
             proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
+            # The TCP peer before set_real_ip_from rewrites $remote_addr from
+            # X-Forwarded-For; trusted proxy login checks this address.
+            proxy_set_header X-Termix-Proxy-Peer $realip_remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
             proxy_set_header X-Forwarded-Port $proxy_x_forwarded_port;
@@ -442,9 +445,12 @@ http {
         }
 
         error_page 500 502 503 504 /50x.html;
+        # Only nginx's own errors land here (the backend is down or too slow).
+        # There is no 50x page, so answer directly instead of a 404.
         location = /50x.html {
-            root /app/html;
             internal;
+            default_type application/json;
+            return 502 '{"error":"The Termix server is not responding"}';
         }
     }
 }

drizzle/mysql/0072_unique_username.sql

@@ -0,0 +1,19 @@
+-- Choose an unused prefix from N + 1 disjoint prefixes for N existing users.
+WITH ranked AS (
+  SELECT id, username,
+    ROW_NUMBER() OVER (ORDER BY registered_at, id) AS sequence,
+    ROW_NUMBER() OVER (PARTITION BY username ORDER BY registered_at, id) AS occurrence
+  FROM users
+), candidates AS (
+  SELECT 0 AS candidate UNION ALL SELECT sequence FROM ranked
+), available AS (
+  SELECT MIN(candidate) AS candidate FROM candidates
+  WHERE NOT EXISTS (
+    SELECT 1 FROM ranked WHERE username LIKE CONCAT(CONCAT('termix-recovered-', candidate, '-'), '%')
+  )
+)
+UPDATE users JOIN ranked ON ranked.id = users.id CROSS JOIN available
+SET users.username = CONCAT('termix-recovered-', available.candidate, '-', ranked.sequence)
+WHERE ranked.occurrence > 1;--> statement-breakpoint
+ALTER TABLE `users` MODIFY COLUMN `username` varchar(255) NOT NULL;--> statement-breakpoint
+ALTER TABLE `users` ADD CONSTRAINT `idx_users_username` UNIQUE(`username`);

drizzle/mysql/meta/_journal.json

@@ -505,6 +505,13 @@
       "when": 1791755801066,
       "tag": "0071_drop_install_count_source",
       "breakpoints": true
+    },
+    {
+      "idx": 72,
+      "version": "5",
+      "when": 1791935283211,
+      "tag": "0072_unique_username",
+      "breakpoints": true
     }
   ]
 }

drizzle/postgres/0072_unique_username.sql

@@ -0,0 +1,18 @@
+-- Choose an unused prefix from N + 1 disjoint prefixes for N existing users.
+WITH ranked AS MATERIALIZED (
+  SELECT id, username,
+    ROW_NUMBER() OVER (ORDER BY registered_at, id) AS sequence,
+    ROW_NUMBER() OVER (PARTITION BY username ORDER BY registered_at, id) AS occurrence
+  FROM users
+), candidates AS (
+  SELECT 0 AS candidate UNION ALL SELECT sequence FROM ranked
+), available AS (
+  SELECT MIN(candidate) AS candidate FROM candidates
+  WHERE NOT EXISTS (
+    SELECT 1 FROM ranked WHERE username LIKE 'termix-recovered-' || candidate || '-' || '%'
+  )
+)
+UPDATE users SET username = 'termix-recovered-' || (SELECT candidate FROM available) || '-' || ranked.sequence
+FROM ranked WHERE ranked.id = users.id AND ranked.occurrence > 1;--> statement-breakpoint
+ALTER TABLE "users" ALTER COLUMN "username" SET DATA TYPE varchar(255);--> statement-breakpoint
+CREATE UNIQUE INDEX "idx_users_username" ON "users" USING btree ("username");

drizzle/postgres/meta/_journal.json

@@ -505,6 +505,13 @@
       "when": 1791755800419,
       "tag": "0071_drop_install_count_source",
       "breakpoints": true
+    },
+    {
+      "idx": 72,
+      "version": "7",
+      "when": 1791935282340,
+      "tag": "0072_unique_username",
+      "breakpoints": true
     }
   ]
 }

drizzle/sqlite/0067_unique_username.sql

@@ -0,0 +1,17 @@
+-- Choose an unused prefix from N + 1 disjoint prefixes for N existing users.
+WITH ranked AS MATERIALIZED (
+  SELECT id, username,
+    ROW_NUMBER() OVER (ORDER BY registered_at, id) AS sequence,
+    ROW_NUMBER() OVER (PARTITION BY username ORDER BY registered_at, id) AS occurrence
+  FROM users
+), candidates AS (
+  SELECT 0 AS candidate UNION ALL SELECT sequence FROM ranked
+), available AS (
+  SELECT MIN(candidate) AS candidate FROM candidates
+  WHERE NOT EXISTS (
+    SELECT 1 FROM ranked WHERE username LIKE 'termix-recovered-' || candidate || '-' || '%'
+  )
+)
+UPDATE users SET username = 'termix-recovered-' || (SELECT candidate FROM available) || '-' || ranked.sequence
+FROM ranked WHERE ranked.id = users.id AND ranked.occurrence > 1;--> statement-breakpoint
+CREATE UNIQUE INDEX `idx_users_username` ON `users` (`username`);

drizzle/sqlite/meta/_journal.json

@@ -470,6 +470,13 @@
       "when": 1791755799726,
       "tag": "0066_drop_install_count_source",
       "breakpoints": true
+    },
+    {
+      "idx": 67,
+      "version": "6",
+      "when": 1791935281343,
+      "tag": "0067_unique_username",
+      "breakpoints": true
     }
   ]
 }

electron-builder.json

@@ -156,6 +156,6 @@
       "NSAppleEventsUsageDescription": "Termix needs access to control other applications for terminal operations."
     }
   },
-  "generateUpdatesFilesForAllChannels": true,
+  "generateUpdatesFilesForAllChannels": false,
   "msiProjectCreated": "packaging/build/msi-shortcuts.cjs"
 }

electron/external-editor.cjs

@@ -0,0 +1,70 @@
+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/external-login.cjs

@@ -0,0 +1,20 @@
+/**
+ * The login URL a server hands the desktop app goes to shell.openExternal,
+ * so only web pages pass: any other scheme (file:, smb:, ms-msdt:, ...)
+ * would launch whatever OS handler is registered for it.
+ */
+function isExternalLoginUrl(value) {
+  try {
+    const { protocol } = new URL(value);
+    return protocol === "https:" || protocol === "http:";
+  } catch {
+    return false;
+  }
+}
+
+/** A non-privileged port for the loopback callback listener. */
+function isCallbackPort(value) {
+  return Number.isInteger(value) && value >= 1024 && value <= 65535;
+}
+
+module.exports = { isExternalLoginUrl, isCallbackPort };

electron/local-shell.cjs

@@ -39,7 +39,11 @@ function resolveLocalShell(
  * how many helpers were fixed.
  */
 function repairSpawnHelpers(ptyDir, fsImpl = fs) {
-  const dir = ptyDir.replace(/app\.asar(?!\.unpacked)/, "app.asar.unpacked");
+  // 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(

electron/main.cjs

@@ -36,6 +36,11 @@ const { quitApp } = require("./app-quit.cjs");
 const { selectLinuxPasswordStore } = require("./linux-password-store.cjs");
 const { resolveLocalShell, repairSpawnHelpers } = require("./local-shell.cjs");
 const { registerLocalFileHandlers } = require("./local-files.cjs");
+const {
+  EXTERNAL_EDITOR_SETTING,
+  isLaunchableFileName,
+} = require("./external-editor.cjs");
+const { isExternalLoginUrl, isCallbackPort } = require("./external-login.cjs");
 
 const localTerminalSessions = new Map();
 
@@ -700,6 +705,9 @@ let tray = null;
 let isQuitting = false;
 const tempFiles = new Map();
 const externalEditorSessions = new Map();
+// Paths the user picked in an open dialog this session. Only these may be
+// saved as the external editor, so the renderer cannot name an executable.
+const dialogChosenPaths = new Set();
 
 const isDev = process.env.NODE_ENV === "development" || !app.isPackaged;
 const appRoot = isDev ? process.cwd() : path.join(__dirname, "..");
@@ -1663,6 +1671,12 @@ ipcMain.handle("get-embedded-server-status", () => {
 ipcMain.handle(
   "external-browser-login",
   async (_event, authUrl, callbackPort) => {
+    if (!isExternalLoginUrl(authUrl)) {
+      return { success: false, error: "Invalid authentication URL" };
+    }
+    if (!isCallbackPort(callbackPort)) {
+      return { success: false, error: "Invalid callback port" };
+    }
     const http = require("http");
 
     return new Promise((resolve) => {
@@ -2375,6 +2389,8 @@ async function testC2SRelay(
   if (runtime) runtime.authSocket = ws;
   return new Promise((resolve) => {
     let settled = false;
+    // The relay sends its reason and then closes; keep the reason.
+    let relayError = null;
     const settle = (result) => {
       if (settled) return;
       settled = true;
@@ -2411,6 +2427,10 @@ async function testC2SRelay(
           settle({ success: true });
         } else if (message.type === "error") {
           clearTimeout(timer);
+          relayError = normalizeC2SErrorMessage(
+            message.error,
+            "Tunnel test failed",
+          );
           settle(createC2SFailure(message.error, "Tunnel test failed"));
         }
       } catch (error) {
@@ -2424,7 +2444,10 @@ async function testC2SRelay(
     });
     ws.on("close", () => {
       if (runtime && c2sTunnelRuntimes.get(tunnel.name) === runtime) {
-        setC2STunnelError(tunnel.name, "Endpoint SSH connection closed");
+        setC2STunnelError(
+          tunnel.name,
+          relayError || "Endpoint SSH connection closed",
+        );
       }
       clearTimeout(timer);
       settle({ success: false, error: "Tunnel test connection closed" });
@@ -3156,18 +3179,16 @@ ipcMain.handle("get-c2s-tunnel-preset-default-name", () => {
   return `[${date}] ${computerName} (${platform} ${release})`;
 });
 
+function readSetting(key) {
+  const settingsPath = path.join(app.getPath("userData"), "settings.json");
+  if (!fs.existsSync(settingsPath)) return null;
+  const settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
+  return settings[key] !== undefined ? settings[key] : null;
+}
+
 ipcMain.handle("get-setting", (event, key) => {
   try {
-    const userDataPath = app.getPath("userData");
-    const settingsPath = path.join(userDataPath, "settings.json");
-
-    if (!fs.existsSync(settingsPath)) {
-      return null;
-    }
-
-    const settingsData = fs.readFileSync(settingsPath, "utf8");
-    const settings = JSON.parse(settingsData);
-    return settings[key] !== undefined ? settings[key] : null;
+    return readSetting(key);
   } catch (error) {
     console.error("Error reading setting:", error);
     return null;
@@ -3175,6 +3196,16 @@ ipcMain.handle("get-setting", (event, key) => {
 });
 
 ipcMain.handle("set-setting", (event, key, value) => {
+  if (typeof key !== "string") {
+    return { success: false, error: "Invalid setting key" };
+  }
+  if (
+    key === EXTERNAL_EDITOR_SETTING &&
+    value &&
+    !dialogChosenPaths.has(value)
+  ) {
+    return { success: false, error: "Choose the editor in the file dialog" };
+  }
   try {
     const userDataPath = app.getPath("userData");
     const settingsPath = path.join(userDataPath, "settings.json");
@@ -3198,94 +3229,6 @@ ipcMain.handle("set-setting", (event, key, value) => {
   }
 });
 
-ipcMain.handle("get-session-cookie", async (_event, name, targetUrl) => {
-  try {
-    const ses = mainWindow?.webContents?.session;
-    if (!ses) return null;
-    const cookies = await ses.cookies.get({
-      name,
-      ...(targetUrl ? { url: targetUrl } : {}),
-    });
-    const cookie = cookies.find((candidate) =>
-      cookieMatchesUrl(candidate, targetUrl),
-    );
-    return (
-      cookie?.value ||
-      getRememberedElectronAuthCookie(name, targetUrl)?.value ||
-      null
-    );
-  } catch (error) {
-    console.error("Failed to get session cookie:", error);
-    return getRememberedElectronAuthCookie(name, targetUrl)?.value || null;
-  }
-});
-
-function cookieMatchesUrl(cookie, targetUrl) {
-  if (!targetUrl) return true;
-
-  try {
-    const targetHost = new URL(targetUrl).hostname;
-    const cookieDomain = (cookie.domain || "").replace(/^\./, "");
-
-    return (
-      cookieDomain === targetHost ||
-      targetHost.endsWith(`.${cookieDomain}`) ||
-      (!cookieDomain && targetHost === "localhost")
-    );
-  } catch {
-    return true;
-  }
-}
-
-ipcMain.handle(
-  "wait-session-cookie",
-  async (_event, name, targetUrl, previousValue, timeoutMs = 5000) => {
-    const ses = mainWindow?.webContents?.session;
-    if (!ses) return { success: false, error: "No Electron session" };
-
-    const existingCookies = await ses.cookies.get({
-      name,
-      ...(targetUrl ? { url: targetUrl } : {}),
-    });
-    const existingCookie = existingCookies.find((cookie) =>
-      cookieMatchesUrl(cookie, targetUrl),
-    );
-    if (existingCookie?.value && existingCookie.value !== previousValue) {
-      return { success: true, value: existingCookie.value };
-    }
-
-    const rememberedCookie = getRememberedElectronAuthCookie(name, targetUrl);
-    if (rememberedCookie?.value && rememberedCookie.value !== previousValue) {
-      return { success: true, value: rememberedCookie.value };
-    }
-
-    return new Promise((resolve) => {
-      const timeout = setTimeout(() => {
-        ses.cookies.off("changed", onCookieChanged);
-        resolve({ success: false, error: "Timed out waiting for cookie" });
-      }, timeoutMs);
-
-      function onCookieChanged(_event, cookie, _cause, removed) {
-        if (
-          removed ||
-          cookie.name !== name ||
-          !cookie.value ||
-          cookie.value === previousValue ||
-          !cookieMatchesUrl(cookie, targetUrl)
-        ) {
-          return;
-        }
-
-        clearTimeout(timeout);
-        ses.cookies.off("changed", onCookieChanged);
-        resolve({ success: true, value: cookie.value });
-      }
-
-      ses.cookies.on("changed", onCookieChanged);
-    });
-  },
-);
-
 ipcMain.handle("clear-session-cookies", async () => {
   try {
     clearPersistedElectronAuthCookies();
@@ -3413,7 +3356,9 @@ ipcMain.handle("show-save-dialog", async (_event, options) => {
 });
 
 ipcMain.handle("show-open-dialog", async (_event, options) => {
-  return dialog.showOpenDialog(mainWindow, options || {});
+  const result = await dialog.showOpenDialog(mainWindow, options || {});
+  for (const filePath of result.filePaths) dialogChosenPaths.add(filePath);
+  return result;
 });
 
 function toLocalFileType(stat) {
@@ -3736,6 +3681,15 @@ ipcMain.handle("cleanup-temp-file", (_event, tempId) => {
 
 ipcMain.handle("open-external-editor", async (_event, fileData) => {
   try {
+    // The editor comes from the saved setting, never from the caller.
+    const editorPath = readSetting(EXTERNAL_EDITOR_SETTING) || null;
+    if (!editorPath && isLaunchableFileName(fileData?.fileName)) {
+      return {
+        success: false,
+        error: "Choose an external editor to open this file type",
+      };
+    }
+
     const result = createManagedTempFile(
       fileData?.fileName,
       fileData?.content,
@@ -3757,10 +3711,6 @@ ipcMain.handle("open-external-editor", async (_event, fileData) => {
       lastMtimeMs: stat.mtimeMs,
     });
 
-    const editorPath =
-      typeof fileData?.editorPath === "string" && fileData.editorPath.trim()
-        ? fileData.editorPath.trim()
-        : null;
     const openError = await openPathWithEditor(result.path, editorPath);
     if (openError) {
       closeExternalEditorSession(editId);

electron/preload.js

@@ -87,16 +87,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
   },
 
   clearSessionCookies: () => ipcRenderer.invoke("clear-session-cookies"),
-  getSessionCookie: (name, targetUrl) =>
-    ipcRenderer.invoke("get-session-cookie", name, targetUrl),
-  waitForSessionCookie: (name, targetUrl, previousValue, timeoutMs) =>
-    ipcRenderer.invoke(
-      "wait-session-cookie",
-      name,
-      targetUrl,
-      previousValue,
-      timeoutMs,
-    ),
 
   externalBrowserLogin: (authUrl, callbackPort) =>
     ipcRenderer.invoke("external-browser-login", authUrl, callbackPort),

package-lock.json

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

packages/plugin-sdk/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.7
+
+### Fixed
+
+- A migration file, or a part of one, holding only comments made core fail to start the plugin
+
 ## 1.0.6
 
 ### Added

packages/plugin-sdk/PLUGIN-GUIDE.md

@@ -1,6 +1,6 @@
 # Termix plugin guide
 
-SDK 1.0.6 | Plugin API 1.2.0
+SDK 1.0.7 | Plugin API 1.2.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.

packages/plugin-sdk/README.md

@@ -50,7 +50,7 @@ in place of the flags. Reload the page to pick up frontend changes.
 
 ## Support
 
-Bugs and ideas for the SDK or the `termix-plugin` CLI go in the [Termix repo](https://github.com/Termix-SSH/Termix/issues/new/choose). You need to be logged in to GitHub. Please be as detailed as possible, preferably in English.
+Bugs and ideas for the SDK or the `termix-plugin` CLI go in the [Termix repo](https://github.com/Termix-SSH/Termix/issues/new/choose). Add as much detail as you can, in English if possible.
 
 For discussions and questions, join the [Discord](https://discord.gg/jVQGdvHDrf) server.
 
@@ -58,4 +58,4 @@ For discussions and questions, join the [Discord](https://discord.gg/jVQGdvHDrf)
 
 ## License
 
-Distributed under the Apache License Version 2.0. See [LICENSE](https://github.com/Termix-SSH/Termix/blob/main/LICENSE) for more information.
+Apache License 2.0. See [LICENSE](https://github.com/Termix-SSH/Termix/blob/main/LICENSE).

packages/plugin-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@termix-ssh/plugin-sdk",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "The contract between Termix core and a plugin: types, the capability catalog and the manifest schema.",
   "license": "Apache-2.0",
   "repository": {

packages/plugin-sdk/src/ddl.ts

@@ -309,17 +309,27 @@ export function splitStatements(source: string): string[] {
       continue;
     }
     if (char === ";") {
-      if (current.trim()) statements.push(current.trim());
+      if (hasSql(current)) statements.push(current.trim());
       current = "";
       continue;
     }
     current += char;
   }
 
-  if (current.trim()) statements.push(current.trim());
+  if (hasSql(current)) statements.push(current.trim());
   return statements;
 }
 
+/** False for a chunk that is only comments, which a driver refuses to run. */
+function hasSql(chunk: string): boolean {
+  return (
+    chunk
+      .replace(/--[^\n]*/g, "")
+      .replace(/\/\*[\s\S]*?\*\//g, "")
+      .trim() !== ""
+  );
+}
+
 /** DROP statement for a definition, for removePluginData. */
 export function dropTableSql(
   dialect: SqlDialect,

scripts/build-plugins.cjs

@@ -7,7 +7,7 @@
  * pinned sha256 and unpacked.
  *
  * For development, `--local <dir>` (or TERMIX_LOCAL_PLUGINS) points at a
- * folder of plugin repos like ../Termix-Plugins. A plugin there whose sources
+ * folder of plugin repos like ../Plugins. A plugin there whose sources
  * changed since its last build is rebuilt first with this checkout's SDK, so
  * SDK edits apply without publishing, then any built one (has
  * dist/) is copied in place of its pin, or added when it has no pin.

scripts/dev.mjs

@@ -3,7 +3,7 @@
  * and options.
  *
  * Every target builds the SDK and stages plugins (local builds from
- * ../Termix-Plugins when it exists), then:
+ * ../Plugins when it exists), then:
  *
  * - web: compiles the backend in watch mode, starts it, then starts Vite. A
  *   backend or SDK change restarts the backend. A plugin change rebuilds that
@@ -652,9 +652,7 @@ async function main() {
   const pluginsDir = options.local
     ? path.resolve(
         root,
-        options.pluginsDir ??
-          process.env.TERMIX_LOCAL_PLUGINS ??
-          "../Termix-Plugins",
+        options.pluginsDir ?? process.env.TERMIX_LOCAL_PLUGINS ?? "../Plugins",
       )
     : null;
   const localPlugins =

scripts/electron-external-editor.test.ts

@@ -0,0 +1,40 @@
+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-external-login.test.ts

@@ -0,0 +1,41 @@
+import { createRequire } from "node:module";
+import { describe, expect, it } from "vitest";
+
+const require = createRequire(import.meta.url);
+const { isExternalLoginUrl, isCallbackPort } =
+  require("../electron/external-login.cjs") as {
+    isExternalLoginUrl: (value: unknown) => boolean;
+    isCallbackPort: (value: unknown) => boolean;
+  };
+
+describe("Electron external login", () => {
+  it.each([
+    "https://idp.example.com/authorize?client_id=termix",
+    "http://keycloak.lan:8080/realms/home/protocol/openid-connect/auth",
+  ])("opens web login URLs: %s", (url) => {
+    expect(isExternalLoginUrl(url)).toBe(true);
+  });
+
+  it.each([
+    "file:///C:/Windows/System32/calc.exe",
+    "smb://attacker/share",
+    "ms-msdt:/id PCWDiagnostic",
+    "javascript:alert(1)",
+    "not a url",
+    undefined,
+  ])("refuses other schemes: %s", (url) => {
+    expect(isExternalLoginUrl(url)).toBe(false);
+  });
+
+  it("accepts the ports the login screen picks", () => {
+    expect(isCallbackPort(17832)).toBe(true);
+    expect(isCallbackPort(17931)).toBe(true);
+  });
+
+  it.each([0, 80, 65536, 17832.5, "17832", NaN, undefined])(
+    "refuses callback port %s",
+    (port) => {
+      expect(isCallbackPort(port)).toBe(false);
+    },
+  );
+});

scripts/electron-security-boundary.test.ts

@@ -32,9 +32,62 @@ describe("Electron security boundary", () => {
     }
   });
 
+  it("never hands the session cookie to the renderer over IPC", () => {
+    for (const channel of ["get-session-cookie", "wait-session-cookie"]) {
+      expect(main).not.toContain(`"${channel}"`);
+      expect(preload).not.toContain(`"${channel}"`);
+    }
+  });
+
+  it("launches only the editor saved from a file dialog", () => {
+    expect(main).not.toContain("fileData?.editorPath");
+    expect(main).toContain("readSetting(EXTERNAL_EDITOR_SETTING)");
+    expect(main).toContain("dialogChosenPaths.has(value)");
+  });
+
   it("scopes proxy headers and basic auth to the linked origin", () => {
     expect(main).toContain('"sync-proxy-config"');
     expect(main).toContain("linkedServer.applyLinkHeaders(");
     expect(main).toContain("linkedServer.answerLogin(");
   });
 });
+
+it("rejects setting keys that coerce to the protected editor key", async () => {
+  const { runInNewContext } = await import("node:vm");
+  const { vi } = await import("vitest");
+  const writeFileSync = vi.fn();
+  let handler: (event: unknown, key: unknown, value: unknown) => unknown;
+  runInNewContext(
+    main.slice(
+      main.indexOf('ipcMain.handle("set-setting"'),
+      main.indexOf('ipcMain.handle("clear-session-cookies"'),
+    ),
+    {
+      ipcMain: {
+        handle: (_: string, callback: typeof handler) => {
+          handler = callback;
+        },
+      },
+      EXTERNAL_EDITOR_SETTING: "fileManager.externalEditorPath",
+      dialogChosenPaths: new Set(["/chosen/editor"]),
+      app: { getPath: () => "/settings" },
+      path: { join: (...parts: string[]) => parts.join("/") },
+      fs: { existsSync: () => false, mkdirSync: vi.fn(), writeFileSync },
+      console,
+    },
+  );
+  for (const key of [["fileManager.externalEditorPath"], null, {}, 42]) {
+    expect(handler!({}, key, "/unapproved/editor")).toEqual({
+      success: false,
+      error: "Invalid setting key",
+    });
+  }
+  expect(writeFileSync).not.toHaveBeenCalled();
+  expect(
+    handler!({}, "fileManager.externalEditorPath", "/unapproved/editor"),
+  ).toEqual({ success: false, error: "Choose the editor in the file dialog" });
+  expect(
+    handler!({}, "fileManager.externalEditorPath", "/chosen/editor"),
+  ).toEqual({ success: true });
+  expect(writeFileSync).toHaveBeenCalledOnce();
+});

scripts/lib/dev-runner.mjs

@@ -122,7 +122,7 @@ Targets
   docker     Build the production image and run it with your local plugins
 
 Options
-  --plugins <dir>  Plugin repos to build and watch (default ../Termix-Plugins)
+  --plugins <dir>  Plugin repos to build and watch (default ../Plugins)
   --no-local       Use only the plugins pinned in docker/bundled-plugins.json
   --db <engine>    sqlite (default), postgres or mysql. Postgres and MySQL run in Docker
   --guacd          Run guacd in Docker for remote desktop

scripts/patch-node-pty.cjs

@@ -3,43 +3,45 @@ const path = require("node:path");
 
 const nodePtyDir = path.join(__dirname, "..", "node_modules", "node-pty");
 
-if (!fs.existsSync(nodePtyDir)) {
-  console.log("[patch-node-pty] node-pty not found, skipping");
-  process.exit(0);
-}
-
 const unixTerminalPath = path.join(nodePtyDir, "lib", "unixTerminal.js");
 
-const originalHelperRewrite = [
-  "helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');",
-  "helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');",
-].join("\n");
+// Older installs may still carry the first version of this patch.
+const knownHelperRewrites = [
+  [
+    "helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');",
+    "helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');",
+  ].join("\n"),
+  [
+    "if (!helperPath.includes('app.asar.unpacked')) {",
+    "    helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');",
+    "}",
+    "if (!helperPath.includes('node_modules.asar.unpacked')) {",
+    "    helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');",
+    "}",
+  ].join("\n"),
+];
 
-const patchedHelperRewrite = [
-  "if (!helperPath.includes('app.asar.unpacked')) {",
-  "    helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');",
-  "}",
-  "if (!helperPath.includes('node_modules.asar.unpacked')) {",
-  "    helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');",
-  "}",
-].join("\n");
+// A universal macOS build ships app-arm64.asar and app-x64.asar, not app.asar.
+const patchedHelperRewrite =
+  "helperPath = helperPath.replace(/\\b(app(?:-[a-z0-9]+)?|node_modules)\\.asar(?!\\.unpacked)/g, '$1.asar.unpacked');";
 
-function patchUnixTerminalHelperRewrite() {
-  if (!fs.existsSync(unixTerminalPath)) {
+function patchUnixTerminalHelperRewrite(file = unixTerminalPath) {
+  if (!fs.existsSync(file)) {
     return false;
   }
 
-  const source = fs.readFileSync(unixTerminalPath, "utf8");
+  const source = fs.readFileSync(file, "utf8");
   if (source.includes(patchedHelperRewrite)) {
     return false;
   }
-  if (!source.includes(originalHelperRewrite)) {
+  const known = knownHelperRewrites.find((rewrite) => source.includes(rewrite));
+  if (!known) {
     return false;
   }
 
   fs.writeFileSync(
-    unixTerminalPath,
-    source.replace(originalHelperRewrite, patchedHelperRewrite),
+    file,
+    source.replace(known, () => patchedHelperRewrite),
   );
   return true;
 }
@@ -67,19 +69,31 @@ function chmodSpawnHelpers(rootDir) {
   return fixed;
 }
 
-const helperRewritePatched = patchUnixTerminalHelperRewrite();
-const helpersChmodded = chmodSpawnHelpers(nodePtyDir);
+// Tests and afterPack require this file; only a direct run patches node_modules.
+function main() {
+  if (!fs.existsSync(nodePtyDir)) {
+    console.log("[patch-node-pty] node-pty not found, skipping");
+    return;
+  }
 
-if (helperRewritePatched) {
-  console.log("[patch-node-pty] Patched unixTerminal helper path rewrite");
+  const helperRewritePatched = patchUnixTerminalHelperRewrite();
+  const helpersChmodded = chmodSpawnHelpers(nodePtyDir);
+
+  if (helperRewritePatched) {
+    console.log("[patch-node-pty] Patched unixTerminal helper path rewrite");
+  }
+  if (helpersChmodded > 0) {
+    console.log(
+      `[patch-node-pty] Restored execute bit on ${helpersChmodded} spawn-helper binary(ies)`,
+    );
+  }
+  if (!helperRewritePatched && helpersChmodded === 0) {
+    console.log("[patch-node-pty] Already patched or target files not found");
+  }
 }
-if (helpersChmodded > 0) {
-  console.log(
-    `[patch-node-pty] Restored execute bit on ${helpersChmodded} spawn-helper binary(ies)`,
-  );
-}
-if (!helperRewritePatched && helpersChmodded === 0) {
-  console.log("[patch-node-pty] Already patched or target files not found");
+
+if (require.main === module) {
+  main();
 }
 
 module.exports = { chmodSpawnHelpers, patchUnixTerminalHelperRewrite };

src/backend/database/database.ts

@@ -79,7 +79,6 @@ import {
   createCurrentSshCredentialUsageRepository,
   createCurrentUserRepository,
 } from "./repositories/factory.js";
-import { withCurrentSqliteForeignKeysDisabled } from "./repositories/sqlite-foreign-keys.js";
 import { applyPluginHostImportSettings } from "./routes/host-plugin-settings.js";
 import {
   selectExportableSettings,
@@ -1235,227 +1234,218 @@ app.post(
       };
 
       try {
-        await withCurrentSqliteForeignKeysDisabled(async () => {
-          try {
-            const importedHosts = importDb
-              .prepare("SELECT * FROM ssh_data")
-              .all();
-            const importedHostIds: number[] = [];
-            for (const host of importedHosts) {
-              try {
-                const hostRepository = createCurrentHostRepository();
-                const exists = await hostRepository.existsForImportIdentity(
-                  userId,
-                  host.ip,
-                  host.port,
-                  host.username,
-                );
-
-                if (exists) {
-                  result.summary.skippedItems++;
-                  continue;
-                }
-
-                const hostData = {
-                  userId: userId,
-                  name: host.name,
-                  ip: host.ip,
-                  port: host.port,
-                  username: host.username,
-                  folder: host.folder,
-                  tags: host.tags,
-                  pin: Boolean(host.pin),
-                  authType: host.auth_type,
-                  forceKeyboardInteractive: host.force_keyboard_interactive,
-                  password: host.password,
-                  key: host.key,
-                  keyPassword: host.key_password,
-                  keyType: host.key_type,
-                  sudoPassword: host.sudo_password,
-                  credentialId: host.credential_id || null,
-                  overrideCredentialUsername: Boolean(
-                    host.override_credential_username,
-                  ),
-                  jumpHosts: host.jump_hosts,
-                  ...legacyStatusCheck(host),
-                  // Exports from before 2.9.0 carry these in terminal_config.
-                  sshOptions:
-                    host.ssh_options ??
-                    sshOptionsForWrite({
-                      terminalConfig: host.terminal_config,
-                    }) ??
-                    null,
-                  notes: host.notes,
-                  useSocks5: Boolean(host.use_socks5),
-                  socks5Host: host.socks5_host,
-                  socks5Port: host.socks5_port,
-                  socks5Username: host.socks5_username,
-                  socks5Password: host.socks5_password,
-                  socks5ProxyChain: host.socks5_proxy_chain,
-                  createdAt: host.created_at || new Date().toISOString(),
-                  updatedAt: new Date().toISOString(),
-                };
-
-                (hostData as Record<string, unknown>).defaultOverrides =
-                  JSON.stringify(
-                    await applyHostDefaultsToWrite({
-                      ownerId: userId,
-                      hostId: null,
-                      columns: hostData as Record<string, unknown>,
-                      body: hostData as Record<string, unknown>,
-                    }),
-                  );
-                const created = await hostRepository.createEncryptedForUser(
-                  userId,
-                  hostData,
-                );
-                await applyPluginHostImportSettings(
-                  Number(created.id),
-                  importedHostPluginSettings(importDb, host),
-                );
-                importedHostIds.push(Number(created.id));
-                await importHostProtocolLogins(
-                  importDb,
-                  host,
-                  Number(created.id),
-                  userId,
-                );
-                result.summary.sshHostsImported++;
-              } catch (hostError) {
-                result.summary.errors.push(
-                  `SSH host import error: ${hostError.message}`,
-                );
-              }
-            }
-            await applyDefaultsAfterHostWrites(importedHostIds);
-          } catch {
-            apiLogger.info("ssh_data table not found in import file, skipping");
-          }
-
-          try {
-            const importedCreds = importDb
-              .prepare("SELECT * FROM ssh_credentials")
-              .all();
-            for (const cred of importedCreds) {
-              try {
-                const credentialRepository =
-                  createCurrentCredentialRepository();
-                const exists =
-                  await credentialRepository.existsForImportIdentity(
-                    userId,
-                    cred.name,
-                    cred.username,
-                  );
-
-                if (exists) {
-                  result.summary.skippedItems++;
-                  continue;
-                }
-
-                const credData = {
-                  userId: userId,
-                  name: cred.name,
-                  description: cred.description,
-                  folder: cred.folder,
-                  tags: cred.tags,
-                  authType: cred.auth_type,
-                  username: cred.username,
-                  password: cred.password,
-                  key: cred.key,
-                  privateKey: cred.private_key,
-                  publicKey: cred.public_key,
-                  keyPassword: cred.key_password,
-                  keyType: cred.key_type,
-                  detectedKeyType: cred.detected_key_type,
-                  usageCount: cred.usage_count || 0,
-                  lastUsed: cred.last_used,
-                  createdAt: cred.created_at || new Date().toISOString(),
-                  updatedAt: new Date().toISOString(),
-                };
-
-                await credentialRepository.createEncryptedForUser(
-                  userId,
-                  credData,
-                );
-                result.summary.sshCredentialsImported++;
-              } catch (credError) {
-                result.summary.errors.push(
-                  `SSH credential import error: ${credError.message}`,
-                );
-              }
-            }
-          } catch {
-            apiLogger.info(
-              "ssh_credentials table not found in import file, skipping",
-            );
-          }
-
-          const pluginRows = await importUserPluginRows(importDb, userId);
-          result.summary.pluginItemsImported += pluginRows.imported;
-          result.summary.skippedItems += pluginRows.skipped;
-          result.summary.errors.push(...pluginRows.errors);
-
-          const hostDefaults = await importHostDefaults(importDb, userId);
-          result.summary.skippedItems += hostDefaults.skipped;
-          if (hostDefaults.imported > 0) {
-            await recompute({ userIds: [userId] });
-          }
-
-          const targetUser = await userRepository.findById(userId);
-          if (targetUser?.isAdmin) {
+        // The file's credential ids belong to the server that wrote it.
+        const credentialIds = new Map<number, number>();
+        try {
+          const importedCreds = importDb
+            .prepare("SELECT * FROM ssh_credentials")
+            .all();
+          for (const cred of importedCreds) {
             try {
-              const importedSettings = readImportedSettings(importDb);
-              for (const setting of importedSettings) {
-                try {
-                  await upsertImportedSetting(setting);
-                  result.summary.settingsImported++;
-                } catch (settingError) {
-                  result.summary.errors.push(
-                    `Setting import error (${setting.key}): ${settingError.message}`,
-                  );
-                }
+              const credentialRepository = createCurrentCredentialRepository();
+              const existingId =
+                await credentialRepository.findIdForImportIdentity(
+                  userId,
+                  cred.name,
+                  cred.username,
+                );
+
+              if (existingId !== null) {
+                credentialIds.set(cred.id, existingId);
+                result.summary.skippedItems++;
+                continue;
               }
-            } catch {
-              apiLogger.info(
-                "settings table not found in import file, skipping",
+
+              const credData = {
+                userId: userId,
+                name: cred.name,
+                description: cred.description,
+                folder: cred.folder,
+                tags: cred.tags,
+                authType: cred.auth_type,
+                username: cred.username,
+                password: cred.password,
+                key: cred.key,
+                privateKey: cred.private_key,
+                publicKey: cred.public_key,
+                keyPassword: cred.key_password,
+                keyType: cred.key_type,
+                detectedKeyType: cred.detected_key_type,
+                usageCount: cred.usage_count || 0,
+                lastUsed: cred.last_used,
+                createdAt: cred.created_at || new Date().toISOString(),
+                updatedAt: new Date().toISOString(),
+              };
+
+              const created = await credentialRepository.createEncryptedForUser(
+                userId,
+                credData,
+              );
+              credentialIds.set(cred.id, Number(created.id));
+              result.summary.sshCredentialsImported++;
+            } catch (credError) {
+              result.summary.errors.push(
+                `SSH credential import error: ${credError.message}`,
               );
             }
-          } else {
-            apiLogger.info(
-              "Settings import skipped - only admin users can import settings",
-            );
           }
+        } catch {
+          apiLogger.info(
+            "ssh_credentials table not found in import file, skipping",
+          );
+        }
 
-          result.success = true;
-
-          try {
-            await DatabaseSaveTrigger.forceSave("database_import");
-          } catch (saveError) {
-            apiLogger.error(
-              "Failed to persist imported data to disk",
-              saveError,
-              {
-                operation: "import_force_save_failed",
+        try {
+          const importedHosts = importDb
+            .prepare("SELECT * FROM ssh_data")
+            .all();
+          const importedHostIds: number[] = [];
+          for (const host of importedHosts) {
+            try {
+              const hostRepository = createCurrentHostRepository();
+              const exists = await hostRepository.existsForImportIdentity(
                 userId,
-              },
-            );
+                host.ip,
+                host.port,
+                host.username,
+              );
+
+              if (exists) {
+                result.summary.skippedItems++;
+                continue;
+              }
+
+              const hostData = {
+                userId: userId,
+                name: host.name,
+                ip: host.ip,
+                port: host.port,
+                username: host.username,
+                folder: host.folder,
+                tags: host.tags,
+                pin: Boolean(host.pin),
+                authType: host.auth_type,
+                forceKeyboardInteractive: host.force_keyboard_interactive,
+                password: host.password,
+                key: host.key,
+                keyPassword: host.key_password,
+                keyType: host.key_type,
+                sudoPassword: host.sudo_password,
+                credentialId: credentialIds.get(host.credential_id) ?? null,
+                overrideCredentialUsername: Boolean(
+                  host.override_credential_username,
+                ),
+                jumpHosts: host.jump_hosts,
+                ...legacyStatusCheck(host),
+                // Exports from before 2.9.0 carry these in terminal_config.
+                sshOptions:
+                  host.ssh_options ??
+                  sshOptionsForWrite({
+                    terminalConfig: host.terminal_config,
+                  }) ??
+                  null,
+                notes: host.notes,
+                useSocks5: Boolean(host.use_socks5),
+                socks5Host: host.socks5_host,
+                socks5Port: host.socks5_port,
+                socks5Username: host.socks5_username,
+                socks5Password: host.socks5_password,
+                socks5ProxyChain: host.socks5_proxy_chain,
+                createdAt: host.created_at || new Date().toISOString(),
+                updatedAt: new Date().toISOString(),
+              };
+
+              (hostData as Record<string, unknown>).defaultOverrides =
+                JSON.stringify(
+                  await applyHostDefaultsToWrite({
+                    ownerId: userId,
+                    hostId: null,
+                    columns: hostData as Record<string, unknown>,
+                    body: hostData as Record<string, unknown>,
+                  }),
+                );
+              const created = await hostRepository.createEncryptedForUser(
+                userId,
+                hostData,
+              );
+              await applyPluginHostImportSettings(
+                Number(created.id),
+                importedHostPluginSettings(importDb, host),
+              );
+              importedHostIds.push(Number(created.id));
+              await importHostProtocolLogins(
+                importDb,
+                host,
+                Number(created.id),
+                userId,
+                credentialIds,
+              );
+              result.summary.sshHostsImported++;
+            } catch (hostError) {
+              result.summary.errors.push(
+                `SSH host import error: ${hostError.message}`,
+              );
+            }
           }
-        });
+          await applyDefaultsAfterHostWrites(importedHostIds);
+        } catch {
+          apiLogger.info("ssh_data table not found in import file, skipping");
+        }
+
+        const pluginRows = await importUserPluginRows(importDb, userId);
+        result.summary.pluginItemsImported += pluginRows.imported;
+        result.summary.skippedItems += pluginRows.skipped;
+        result.summary.errors.push(...pluginRows.errors);
+
+        const hostDefaults = await importHostDefaults(importDb, userId);
+        result.summary.skippedItems += hostDefaults.skipped;
+        if (hostDefaults.imported > 0) {
+          await recompute({ userIds: [userId] });
+        }
+
+        const targetUser = await userRepository.findById(userId);
+        if (targetUser?.isAdmin) {
+          try {
+            const importedSettings = readImportedSettings(importDb);
+            for (const setting of importedSettings) {
+              try {
+                await upsertImportedSetting(setting);
+                result.summary.settingsImported++;
+              } catch (settingError) {
+                result.summary.errors.push(
+                  `Setting import error (${setting.key}): ${settingError.message}`,
+                );
+              }
+            }
+          } catch {
+            apiLogger.info("settings table not found in import file, skipping");
+          }
+        } else {
+          apiLogger.info(
+            "Settings import skipped - only admin users can import settings",
+          );
+        }
+
+        result.success = true;
+
+        try {
+          await DatabaseSaveTrigger.forceSave("database_import");
+        } catch (saveError) {
+          apiLogger.error(
+            "Failed to persist imported data to disk",
+            saveError,
+            {
+              operation: "import_force_save_failed",
+              userId,
+            },
+          );
+        }
       } finally {
         if (importDb) {
           importDb.close();
         }
       }
 
-      try {
-        fs.unlinkSync(req.file.path);
-      } catch {
-        apiLogger.warn("Failed to clean up uploaded file", {
-          operation: "file_cleanup_warning",
-          filePath: req.file.path,
-        });
-      }
-
       res.json({
         success: result.success,
         message: result.success
@@ -1472,17 +1462,6 @@ app.post(
         });
       }
     } catch (error) {
-      if (req.file?.path && fs.existsSync(req.file.path)) {
-        try {
-          fs.unlinkSync(req.file.path);
-        } catch {
-          apiLogger.warn("Failed to clean up uploaded file after error", {
-            operation: "file_cleanup_error",
-            filePath: req.file.path,
-          });
-        }
-      }
-
       apiLogger.error("SQLite import failed", error, {
         operation: "sqlite_import_api_failed",
         userId: (req as AuthenticatedRequest).userId,
@@ -1491,6 +1470,17 @@ app.post(
         error: "Failed to import SQLite data",
         details: getErrorMessage(error),
       });
+    } finally {
+      if (req.file) {
+        try {
+          fs.rmSync(req.file.path, { force: true });
+        } catch {
+          apiLogger.warn("Failed to clean up uploaded file", {
+            operation: "file_cleanup_warning",
+            filePath: req.file.path,
+          });
+        }
+      }
     }
   }),
 );
@@ -2012,14 +2002,15 @@ function legacyStatusCheck(row: Record<string, unknown>): {
 
 /**
  * A host's plugin protocol logins from an export. The file's credential ids
- * belong to the server that wrote it, so a login keeps one only when it is
- * a credential the importing user can use.
+ * belong to the server that wrote it, so a login keeps one only when it maps
+ * to a credential imported alongside it.
  */
 async function importHostProtocolLogins(
   importDb: Database.Database,
   host: Record<string, unknown>,
   hostId: number,
   userId: string,
+  credentialIds: Map<number, number>,
 ): Promise<void> {
   let rows: Array<Record<string, unknown>>;
   try {
@@ -2040,7 +2031,7 @@ async function importHostProtocolLogins(
     }
     protocolAuth[String(row.protocol)] = {
       authType: row.auth_type,
-      credentialId: row.credential_id,
+      credentialId: credentialIds.get(row.credential_id as number) ?? null,
       username: row.username,
       password: row.password,
       fields,

src/backend/database/db/index.ts

@@ -925,6 +925,38 @@ const dropRetiredColumns = () => {
   }
 };
 
+// Registration checked for a taken username and then inserted with nothing
+// enforcing it, so concurrent sign-ups could create two accounts with one
+// name, and every lookup by username picked between them arbitrarily. Later
+// duplicates are renamed rather than deleted, so no account is lost.
+const enforceUniqueUsernames = () => {
+  try {
+    sqlite.exec(`
+      WITH ranked AS MATERIALIZED (
+        SELECT id, username,
+          ROW_NUMBER() OVER (ORDER BY registered_at, id) AS sequence,
+          ROW_NUMBER() OVER (PARTITION BY username ORDER BY registered_at, id) AS occurrence
+        FROM users
+      ), candidates AS (
+        SELECT 0 AS candidate UNION ALL SELECT sequence FROM ranked
+      ), available AS (
+        SELECT MIN(candidate) AS candidate FROM candidates
+        WHERE NOT EXISTS (
+          SELECT 1 FROM ranked WHERE username LIKE 'termix-recovered-' || candidate || '-' || '%'
+        )
+      )
+      UPDATE users SET username = 'termix-recovered-' || (SELECT candidate FROM available) || '-' || ranked.sequence
+      FROM ranked WHERE ranked.id = users.id AND ranked.occurrence > 1;
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_users_username ON users (username);
+    `);
+  } catch (error) {
+    databaseLogger.warn("Failed to enforce unique usernames", {
+      operation: "schema_migration",
+      error: getErrorMessage(error),
+    });
+  }
+};
+
 const migrateSchema = () => {
   repairSnippetsColumns(sqlite);
   addColumnIfNotExists("user_preferences", "theme", "TEXT");
@@ -996,6 +1028,7 @@ const migrateSchema = () => {
       );
     }
   }
+  enforceUniqueUsernames();
   addColumnIfNotExists("sessions", "external_session_ref", "TEXT");
 
   addColumnIfNotExists("ssh_data", "name", "TEXT");
@@ -1893,6 +1926,23 @@ async function moveRemoteLegacySudoPasswords(remote: {
   }
 }
 
+async function dropMysqlForeignKeys(
+  remote: { execute: (query: SQL) => Promise<unknown> },
+  table: string,
+  column: string,
+): Promise<void> {
+  const keys = resultRows<{ name: string }>(
+    await remote.execute(
+      sql`SELECT CONSTRAINT_NAME AS name FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ${table} AND COLUMN_NAME = ${column} AND REFERENCED_TABLE_NAME IS NOT NULL`,
+    ),
+  );
+  for (const key of keys) {
+    await remote.execute(
+      sql`ALTER TABLE ${sql.identifier(table)} DROP FOREIGN KEY ${sql.identifier(key.name)}`,
+    );
+  }
+}
+
 /**
  * The columns 2.9.0 left in place without a drizzle migration, so drizzle no
  * longer knows them. Dropped by hand, only where they still exist.
@@ -1928,6 +1978,10 @@ async function dropRemoteRetired(
     for (const column of columns) {
       if (!existing.has(`${table}.${column}`)) continue;
       try {
+        // Postgres drops a column's foreign keys with it; MySQL refuses.
+        if (dialect === "mysql") {
+          await dropMysqlForeignKeys(remote, table, column);
+        }
         await remote.execute(
           sql`ALTER TABLE ${sql.identifier(table)} DROP COLUMN ${sql.identifier(column)}`,
         );

src/backend/database/db/retired-columns.ts

@@ -5,8 +5,11 @@
  *
  * Kept on purpose: columns a move only reads once the owner's data key opens
  * at a password login (users.totp_*, the rdp, vnc and telnet logins and
- * domain), so a user who never signed in to 2.9 still gets them, and
- * ssh_data.vault_profile_id, whose foreign key SQLite cannot drop in place.
+ * domain), so a user who never signed in to 2.9 still gets them.
+ *
+ * ssh_data.vault_profile_id goes because its foreign key follows the vault
+ * plugin's rename of vault_profiles: once the plugin is uninstalled, SQLite
+ * refuses every write to ssh_data and the other engines refuse the uninstall.
  */
 
 /** Columns drizzle never knew were removed, dropped by hand on every engine. */
@@ -52,6 +55,7 @@ export const REMOTE_RETIRED_COLUMNS: Record<string, string[]> = {
     "telnet_port",
     "tunnel_connections",
     "use_warpgate",
+    "vault_profile_id",
     "vnc_port",
     "web_ui_config",
     "wol_broadcast_address",

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

@@ -21,13 +21,19 @@ import {
 } from "drizzle-orm/mysql-core";
 import { sql } from "drizzle-orm";
 
-export const users = mysqlTable("users", {
-  id: varchar("id", { length: 255 }).primaryKey(),
-  username: text("username").notNull(),
-  passwordHash: text("password_hash").notNull(),
-  isAdmin: boolean("is_admin").notNull().default(false),
-  registeredAt: text("registered_at").notNull().default(sql`(CURRENT_TIMESTAMP)`),
-});
+export const users = mysqlTable(
+  "users",
+  {
+    id: varchar("id", { length: 255 }).primaryKey(),
+    username: varchar("username", { length: 255 }).notNull(),
+    passwordHash: text("password_hash").notNull(),
+    isAdmin: boolean("is_admin").notNull().default(false),
+    registeredAt: text("registered_at")
+      .notNull()
+      .default(sql`(CURRENT_TIMESTAMP)`),
+  },
+  (table) => [uniqueIndex("idx_users_username").on(table.username)],
+);
 
 export const settings = mysqlTable("settings", {
   key: varchar("key", { length: 255 }).primaryKey(),

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

@@ -21,13 +21,19 @@ import {
 } from "drizzle-orm/pg-core";
 import { sql } from "drizzle-orm";
 
-export const users = pgTable("users", {
-  id: varchar("id", { length: 255 }).primaryKey(),
-  username: text("username").notNull(),
-  passwordHash: text("password_hash").notNull(),
-  isAdmin: boolean("is_admin").notNull().default(false),
-  registeredAt: text("registered_at").notNull().default(sql`CURRENT_TIMESTAMP`),
-});
+export const users = pgTable(
+  "users",
+  {
+    id: varchar("id", { length: 255 }).primaryKey(),
+    username: varchar("username", { length: 255 }).notNull(),
+    passwordHash: text("password_hash").notNull(),
+    isAdmin: boolean("is_admin").notNull().default(false),
+    registeredAt: text("registered_at")
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+  },
+  (table) => [uniqueIndex("idx_users_username").on(table.username)],
+);
 
 export const settings = pgTable("settings", {
   key: varchar("key", { length: 255 }).primaryKey(),

src/backend/database/db/schema.ts

@@ -9,13 +9,19 @@ import {
 } from "drizzle-orm/sqlite-core";
 import { sql } from "drizzle-orm";
 
-export const users = sqliteTable("users", {
-  id: text("id").primaryKey(),
-  username: text("username").notNull(),
-  passwordHash: text("password_hash").notNull(),
-  isAdmin: integer("is_admin", { mode: "boolean" }).notNull().default(false),
-  registeredAt: text("registered_at").notNull().default(sql`CURRENT_TIMESTAMP`),
-});
+export const users = sqliteTable(
+  "users",
+  {
+    id: text("id").primaryKey(),
+    username: text("username").notNull(),
+    passwordHash: text("password_hash").notNull(),
+    isAdmin: integer("is_admin", { mode: "boolean" }).notNull().default(false),
+    registeredAt: text("registered_at")
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+  },
+  (table) => [uniqueIndex("idx_users_username").on(table.username)],
+);
 
 export const settings = sqliteTable("settings", {
   key: text("key").primaryKey(),

src/backend/database/repositories/credential-repository.ts

@@ -103,11 +103,11 @@ export class CredentialRepository {
       .orderBy(desc(sshCredentials.updatedAt));
   }
 
-  async existsForImportIdentity(
+  async findIdForImportIdentity(
     userId: string,
     name: string,
     username: string | null,
-  ): Promise<boolean> {
+  ): Promise<number | null> {
     const rows = await this.context.drizzle
       .select({ id: sshCredentials.id })
       .from(sshCredentials)
@@ -120,7 +120,7 @@ export class CredentialRepository {
       )
       .limit(1);
 
-    return rows.length > 0;
+    return rows[0]?.id ?? null;
   }
 
   async findDecryptedByIdForUser(

src/backend/database/repositories/sqlite-foreign-keys.ts

@@ -1,40 +0,0 @@
-import { getCurrentRepositorySqlite } from "./factory.js";
-import { needsExplicitPersist, resolveDatabaseDialect } from "../db/dialect.js";
-
-export interface SqliteForeignKeyClient {
-  exec(sql: string): unknown;
-}
-
-export async function withSqliteForeignKeysDisabled<T>(
-  sqlite: SqliteForeignKeyClient,
-  operation: () => Promise<T>,
-): Promise<T> {
-  sqlite.exec("PRAGMA foreign_keys = OFF");
-  try {
-    return await operation();
-  } finally {
-    sqlite.exec("PRAGMA foreign_keys = ON");
-  }
-}
-
-/**
- * Runs a bulk import with foreign keys relaxed.
- *
- * Backup restore writes tables in an order that is not dependency-safe, so the
- * constraints have to stand down for the duration.
- *
- * Postgres and MySQL keep their constraints enabled. The portable importer
- * writes through repositories and handles individual row failures, so it must
- * still be allowed to run there; only SQLite needs this connection-local
- * relaxation for legacy backups whose rows are not dependency ordered.
- */
-export async function withCurrentSqliteForeignKeysDisabled<T>(
-  operation: () => Promise<T>,
-): Promise<T> {
-  const dialect = resolveDatabaseDialect();
-  if (!needsExplicitPersist(dialect)) {
-    return operation();
-  }
-
-  return withSqliteForeignKeysDisabled(getCurrentRepositorySqlite(), operation);
-}

src/backend/database/repositories/user-repository.ts

@@ -24,6 +24,27 @@ const userColumns = {
     ),
 };
 
+// The unique-violation codes of better-sqlite3, node-postgres and mysql2.
+const UNIQUE_VIOLATION_CODES = new Set([
+  "SQLITE_CONSTRAINT_UNIQUE",
+  "23505",
+  "ER_DUP_ENTRY",
+]);
+
+/**
+ * Whether creating a user failed because the username is taken. The id is
+ * generated, so the username index is the only one a new row can collide on.
+ * drizzle wraps driver errors, so the code may sit on a cause.
+ */
+export function isUsernameTaken(error: unknown): boolean {
+  for (let e = error; e instanceof Error; e = e.cause) {
+    if (UNIQUE_VIOLATION_CODES.has((e as { code?: string }).code ?? "")) {
+      return true;
+    }
+  }
+  return false;
+}
+
 export class UserRepository {
   constructor(
     private readonly context: DatabaseContext,

src/backend/database/routes/plugins.ts

@@ -243,7 +243,9 @@ export async function listPreLoginPlugins(): Promise<
  *       frontends in the same order the server does.
  *
  *       On a desktop linked to a server, `runsOnServer` marks plugins that
- *       only run on that server and stay off here on purpose.
+ *       only run on that server and stay off here on purpose, and, for
+ *       admins, `managedByServer` marks plugins whose on/off state the server
+ *       decides.
  *     tags:
  *       - Plugins
  *     responses:
@@ -370,6 +372,7 @@ router.get("/", authenticateJWT, async (req: Request, res: Response) => {
           features,
           env,
           signedBy: loaded?.signedBy ?? null,
+          managedByServer: linked && (await isManagedByLinkedServer(record.id)),
           capabilities,
           grantedCapabilities: grantsByPlugin.get(record.id) ?? [],
           lastError: loaded?.lastError ?? record.lastError ?? null,
@@ -393,9 +396,7 @@ router.get("/", authenticateJWT, async (req: Request, res: Response) => {
 });
 
 async function isManagedByLinkedServer(pluginId: string): Promise<boolean> {
-  if (process.env.ELECTRON_EMBEDDED !== "true") return false;
-  const { getLink } = await import("../../sync/client/link-store.js");
-  if (!(await getLink())) return false;
+  if (!(await isLinkedDesktop())) return false;
   const { isServerManaged } = await import("../../sync/client/plugins.js");
   return isServerManaged(pluginId);
 }
@@ -500,7 +501,7 @@ router.get(
  * /plugins/onboarding/apply:
  *   post:
  *     summary: Apply the onboarding plugin picker
- *     description: Sets every listed plugin to enabled, disabled or removed in one pass. Choices are first raised so that every kept plugin still has its hard dependencies (the adjustments list says which and why). Enabling runs dependencies first, disabling and removing run dependents first, and one plugin failing does not stop the rest. Removing a bundled plugin deletes it and its data; it can be reinstalled from the registry later. Clears the fresh-install pending flag. With dryRun nothing changes and the response lists what would.
+ *     description: Sets every listed plugin to enabled, disabled or removed in one pass. Choices are first raised so that every kept plugin still has its hard dependencies (the adjustments list says which and why). Enabling runs dependencies first, disabling and removing run dependents first, and one plugin failing does not stop the rest. Removing a bundled plugin deletes it and its data; it can be reinstalled from the registry later. Clears the fresh-install pending flag. With dryRun nothing changes and the response lists what would. On a linked desktop, locally managed plugins require version and capabilities matching the reviewed manifest when enabling.
  *     tags:
  *       - Plugins
  *     requestBody:
@@ -887,7 +888,7 @@ router.delete(
  * /plugins/{id}/state:
  *   patch:
  *     summary: Enable or disable a plugin
- *     description: Persists the new state and starts or stops the plugin immediately. Disabling releases everything the plugin owns, including any port it was listening on. Enabling also starts any installed hard dependency that is off, and disabling also stops the running plugins that depend on it. With dryRun nothing changes and the response lists what would.
+ *     description: Persists the new state and starts or stops the plugin immediately. Disabling releases everything the plugin owns, including any port it was listening on. Enabling also starts any installed hard dependency that is off, and disabling also stops the running plugins that depend on it. With dryRun nothing changes and the response lists what would. On a linked desktop, locally managed plugins require version and capabilities matching the reviewed manifest when enabling.
  *     tags:
  *       - Plugins
  *     parameters:
@@ -909,6 +910,12 @@ router.delete(
  *             properties:
  *               enabled:
  *                 type: boolean
+ *               version:
+ *                 type: string
+ *               capabilities:
+ *                 type: array
+ *                 items:
+ *                   type: string
  *     responses:
  *       200:
  *         description: The plugin's new state.
@@ -962,7 +969,26 @@ router.patch(
         return;
       }
 
-      const result = await setPluginState(pluginId, enabled);
+      let result;
+      if (enabled && (await isLinkedDesktop())) {
+        const version = readVersion(req.body);
+        const capabilities = readCapabilities(req.body);
+        if (version === null || capabilities === null) {
+          res
+            .status(400)
+            .json({ error: "Invalid plugin version or capabilities" });
+          return;
+        }
+        const { enablePluginWithConsent } =
+          await import("../../plugins/manage.js");
+        result = await enablePluginWithConsent(pluginId, {
+          version,
+          capabilities,
+          userId: (req as AuthenticatedRequest).userId as string,
+        });
+      } else {
+        result = await setPluginState(pluginId, enabled);
+      }
       await auditPluginAction(
         req,
         enabled ? "enable_plugin" : "disable_plugin",

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

@@ -17,9 +17,10 @@ import {
   listUserSecondFactors,
   resetUserSecondFactors,
 } from "../../auth/second-factor-admin.js";
-import type {
-  UserRecord,
-  UserRepository,
+import {
+  isUsernameTaken,
+  type UserRecord,
+  type UserRepository,
 } from "../repositories/user-repository.js";
 
 function isNonEmptyString(val: unknown): val is string {
@@ -541,6 +542,9 @@ export function registerUserAdminRoutes(
         toast: { type: "success", message: `User created: ${username}` },
       });
     } catch (err) {
+      if (isUsernameTaken(err)) {
+        return res.status(409).json({ error: "Username already exists" });
+      }
       authLogger.error("Failed to admin-create user", err);
       res.status(500).json({ error: "Failed to create user" });
     }

src/backend/database/routes/users.ts

@@ -41,9 +41,13 @@ import {
   createCurrentUserAuthRepository,
   createCurrentUserRepository,
 } from "../repositories/factory.js";
-import type { UserRecord } from "../repositories/user-repository.js";
+import {
+  isUsernameTaken,
+  type UserRecord,
+} from "../repositories/user-repository.js";
 import {
   getTrustedProxyAuthConfig,
+  getTrustedProxySourceAddress,
   isTrustedProxyAddress,
   isTrustedProxyAuthEnabled,
   resolveTrustedProxyRoles,
@@ -264,6 +268,10 @@ router.post("/create", async (req, res) => {
       toast: { type: "success", message: `User created: ${username}` },
     });
   } catch (err) {
+    // Lost a race with a concurrent sign-up for the same name.
+    if (isUsernameTaken(err)) {
+      return res.status(409).json({ error: "Username already exists" });
+    }
     authLogger.error("Failed to create user", err);
     res.status(500).json({ error: "Failed to create user" });
   }
@@ -304,7 +312,7 @@ router.post("/proxy-login", async (req, res) => {
   }
   if (!config.enabled) return res.json({ enabled: false });
 
-  const sourceAddress = req.socket.remoteAddress;
+  const sourceAddress = getTrustedProxySourceAddress(req);
   try {
     if (!isTrustedProxyAddress(sourceAddress, config.trustedProxies)) {
       authLogger.warn(

src/backend/hosts/host-key-verifier.ts

@@ -263,28 +263,6 @@ export class SSHHostKeyVerifier {
             changeCount: host.hostKeyChangedCount || 0,
           });
 
-          if (isJumpHost) {
-            await this.updateHostKey(
-              hostId,
-              fingerprint,
-              keyType,
-              algorithm,
-              host.hostKeyChangedCount || 0,
-            );
-            sshLogger.warn("Jump host key changed - auto-accepted", {
-              operation: "host_key_updated",
-              hostId,
-              ip,
-              port,
-              fingerprint,
-              keyType,
-              userId,
-              isJumpHost: true,
-            });
-            verify(true);
-            return;
-          }
-
           if (!ws) {
             sshLogger.error(
               "Host key changed - please connect via Terminal to verify the new key",

src/backend/hosts/ssh-connection-pool.ts

@@ -86,7 +86,6 @@ export class SSHConnectionPool {
   private async createPooledClient(
     key: string,
     factory: () => Promise<Client>,
-    existing: PooledConnection[],
   ): Promise<Client> {
     const generation = this.generations.get(key) || 0;
     this.pendingConnections.set(
@@ -109,8 +108,11 @@ export class SSHConnectionPool {
         inUse: true,
         hostKey: key,
       };
-      existing.push(pooled);
-      this.connections.set(key, existing);
+      // Re-read after the await: concurrent connects and removals may have
+      // replaced this key's array in the meantime.
+      const connections = this.connections.get(key) ?? [];
+      connections.push(pooled);
+      this.connections.set(key, connections);
 
       client.on("end", () => {
         this.removeConnection(key, client);
@@ -187,7 +189,7 @@ export class SSHConnectionPool {
       if (queue.length === 0) this.waiters.delete(key);
       else this.waiters.set(key, queue);
       clearTimeout(waiter.timer);
-      this.createPooledClient(key, waiter.factory, connections)
+      this.createPooledClient(key, waiter.factory)
         .then(waiter.resolve)
         .catch(waiter.reject);
       return;
@@ -225,7 +227,7 @@ export class SSHConnectionPool {
     }
 
     if (this.hasCapacity(key, connections)) {
-      return this.createPooledClient(key, factory, connections);
+      return this.createPooledClient(key, factory);
     }
 
     return this.enqueueWaiter(key, factory);

src/backend/plugins/artifact-manifest.ts

@@ -1,50 +1,59 @@
+import path from "node:path";
 import zlib from "node:zlib";
+import * as tar from "tar";
 
 const MAX_UNPACKED_BYTES = 512 * 1024 * 1024;
 
 /**
- * Reads one file out of a .tmxplug (a gzipped tar) without unpacking it to
- * disk. Returns null when the archive has no such file.
+ * Reads every copy of one file out of a .tmxplug (a gzipped tar) without
+ * unpacking it to disk. Uses the same tar parser as the loader's unpack, so
+ * pax and long-name headers resolve the same way, and only plain files count
+ * because they are the only kind the unpack writes. Names compare
+ * case-insensitively since a case-insensitive disk folds them together.
  */
-export function readArtifactFile(
-  buffer: Buffer,
-  wanted: string,
-): Buffer | null {
-  const tar = zlib.gunzipSync(buffer, { maxOutputLength: MAX_UNPACKED_BYTES });
-  let offset = 0;
-  while (offset + 512 <= tar.length) {
-    const header = tar.subarray(offset, offset + 512);
-    if (header.every((byte) => byte === 0)) break;
-    const field = (start: number, length: number) =>
-      header
-        .subarray(start, start + length)
-        .toString("utf8")
-        .replace(/\0.*$/s, "");
-    const prefix = field(345, 155);
-    const name = (
-      prefix ? `${prefix}/${field(0, 100)}` : field(0, 100)
-    ).replace(/^\.\//, "");
-    const size = Number.parseInt(field(124, 12).trim() || "0", 8);
-    if (!Number.isFinite(size) || size < 0) break;
-    const start = offset + 512;
-    if (name === wanted) return tar.subarray(start, start + size);
-    offset = start + Math.ceil(size / 512) * 512;
-  }
-  return null;
+export function readArtifactFiles(buffer: Buffer, wanted: string): Buffer[] {
+  const archive = zlib.gunzipSync(buffer, {
+    maxOutputLength: MAX_UNPACKED_BYTES,
+  });
+  const key = wanted.toLowerCase();
+  const found: Buffer[] = [];
+  const parser = new tar.Parser({
+    strict: true,
+    onReadEntry: (entry) => {
+      const name = path.posix.normalize(entry.path.replace(/\\/g, "/"));
+      if (entry.type !== "File" || name.toLowerCase() !== key) {
+        entry.resume();
+        return;
+      }
+      const chunks: Buffer[] = [];
+      entry.on("data", (chunk: Buffer) => chunks.push(chunk));
+      entry.on("end", () => found.push(Buffer.concat(chunks)));
+    },
+  });
+  // The parser runs synchronously on an in-memory buffer.
+  parser.end(archive);
+  return found;
 }
 
-/** The manifest.json packed in a .tmxplug, parsed but not validated. */
+/**
+ * The manifest.json packed in a .tmxplug, parsed but not validated. An
+ * archive with more than one is refused: the unpack keeps the last copy, so
+ * whichever one this read the other could carry different capabilities.
+ */
 export function readArtifactManifest(buffer: Buffer): Record<string, unknown> {
-  let raw: Buffer | null;
+  let copies: Buffer[];
   try {
-    raw = readArtifactFile(buffer, "manifest.json");
+    copies = readArtifactFiles(buffer, "manifest.json");
   } catch {
     throw new Error("the file is not a valid .tmxplug archive");
   }
-  if (!raw) throw new Error("the archive has no manifest.json");
+  if (copies.length === 0) throw new Error("the archive has no manifest.json");
+  if (copies.length > 1) {
+    throw new Error("the archive has more than one manifest.json");
+  }
   let parsed: unknown;
   try {
-    parsed = JSON.parse(raw.toString("utf8"));
+    parsed = JSON.parse(copies[0].toString("utf8"));
   } catch {
     throw new Error("manifest.json is not valid JSON");
   }

src/backend/plugins/manage.ts

@@ -715,6 +715,28 @@ export async function planStateChange(
   };
 }
 
+/** A local admin consents to the exact mirrored version before granting it access. */
+export function enablePluginWithConsent(
+  pluginId: string,
+  options: { version?: string; capabilities?: string[]; userId: string },
+): Promise<StateChangePlan & { state: string }> {
+  return serialized(async () => {
+    const plugin = getPluginRuntime().loader.get(pluginId);
+    if (!plugin)
+      throw new PluginManageError("Plugin not found", 404, "NOT_FOUND");
+    if (options.version !== plugin.manifest.version) {
+      throw new PluginManageError(
+        "The plugin version changed; review it again",
+        409,
+        "CONSENT_MISMATCH",
+      );
+    }
+    assertConsent(options.capabilities, plugin.manifest.capabilities);
+    await grantDeclared(plugin, options.userId);
+    return setPluginStateUnlocked(pluginId, true);
+  });
+}
+
 export function setPluginState(
   pluginId: string,
   enabled: boolean,

src/backend/plugins/registries.ts

@@ -19,6 +19,9 @@ import {
   type RegistrySource,
 } from "./registry-index.js";
 import {
+  COMMUNITY_PLUGIN_KEYS,
+  TRUSTED_PLUGIN_KEYS,
+  getCustomPluginKeys,
   isPluginPublicKey,
   pluginKeyId,
   setCustomPluginKeys,
@@ -28,6 +31,8 @@ import {
 const CONFIG_KEY = "plugin_registries";
 /** Keys a linked desktop copied from its server, so mirrored plugins load. */
 const SYNCED_KEYS_KEY = "plugin_registry_synced_keys";
+/** `addedIn` of a key only the linked server vouches for. */
+const SYNCED = "synced";
 const ID_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
 const MAX_ID_LENGTH = 40;
 const MAX_NAME_LENGTH = 80;
@@ -117,8 +122,8 @@ async function writeRegistriesConfig(config: RegistriesConfig): Promise<void> {
   await applyCustomKeys(config);
 }
 
-function toKey(publicKey: string): TrustedPluginKey {
-  return { id: pluginKeyId(publicKey), publicKey, addedIn: "admin" };
+function toKey(publicKey: string, addedIn = "admin"): TrustedPluginKey {
+  return { id: pluginKeyId(publicKey), publicKey, addedIn };
 }
 
 async function readSyncedKeys(): Promise<string[]> {
@@ -134,19 +139,32 @@ async function readSyncedKeys(): Promise<string[]> {
 
 /**
  * Trusts the key of every custom registry, on or off: a plugin installed
- * from a registry that was later turned off still has to load.
+ * from a registry that was later turned off still has to load. A key added
+ * here wins over the same key synced from a server.
  */
 async function applyCustomKeys(config: RegistriesConfig): Promise<void> {
   const keys = new Map<string, TrustedPluginKey>();
+  for (const publicKey of await readSyncedKeys()) {
+    keys.set(pluginKeyId(publicKey), toKey(publicKey, SYNCED));
+  }
   for (const entry of config.custom) {
     keys.set(entry.keyId, toKey(entry.publicKey));
   }
-  for (const publicKey of await readSyncedKeys()) {
-    keys.set(pluginKeyId(publicKey), toKey(publicKey));
-  }
   setCustomPluginKeys([...keys.values()]);
 }
 
+/** Whether this app trusts the key independently of its linked server. */
+export function isLocallyTrustedPluginKey(keyId: string): boolean {
+  return (
+    [...TRUSTED_PLUGIN_KEYS, ...COMMUNITY_PLUGIN_KEYS].some(
+      (key) => key.id === keyId,
+    ) ||
+    getCustomPluginKeys().some(
+      (key) => key.id === keyId && key.addedIn !== SYNCED,
+    )
+  );
+}
+
 /** Called before the boot scan so plugins from custom registries load. */
 export async function loadCustomRegistryKeys(): Promise<void> {
   try {

src/backend/sync/client/engine.ts

@@ -351,7 +351,10 @@ export class SyncEngine {
         const key = recordKey(entity.type, row.syncId);
         const record = records.get(key);
         if (record && !record.deleted && record.hash === row.hash) continue;
-        if (record?.errorHash === row.hash) continue;
+        // Unavailable server rows can recover without another local edit.
+        if (record?.errorHash === row.hash && record.error !== "unavailable") {
+          continue;
+        }
         ops.push({
           entityType: entity.type,
           syncId: row.syncId,
@@ -367,7 +370,12 @@ export class SyncEngine {
         if (record.revision === 0) continue;
         if (rows.has(record.syncId) || failed.has(record.syncId)) continue;
         if (entity.covers && !entity.covers(record.syncId)) continue;
-        if (record.errorHash === DELETED_HASH) continue;
+        if (
+          record.errorHash === DELETED_HASH &&
+          record.error !== "unavailable"
+        ) {
+          continue;
+        }
         ops.push({
           entityType: entity.type,
           syncId: record.syncId,
@@ -433,6 +441,9 @@ export class SyncEngine {
       return;
     }
 
+    // A live row the server could not send says nothing; keep ours to retry.
+    if (!result.deleted && !result.row) return;
+
     // Conflict: the server moved on since this device last saw the row. Its
     // version wins here, and a local edit it replaced is kept for the user.
     if (op.op === "upsert" && op.row) {
@@ -445,7 +456,7 @@ export class SyncEngine {
       );
     }
     const resolvers = createResolvers(userId);
-    if (result.deleted || !result.row) {
+    if (result.deleted) {
       await deleteStoredRow(entity, userId, op.syncId);
       await putRecord(userId, op.entityType, op.syncId, {
         revision: result.revision,

src/backend/sync/client/plugins.ts

@@ -4,7 +4,8 @@
  * For every plugin in "mirror" mode, the server decides: a plugin installed
  * there is installed here, on or off to match, with the capabilities an
  * admin granted it there. Plugins marked "local" are left to the desktop and
- * "server" ones never run on a linked desktop.
+ * "server" ones never run on a linked desktop. A user plugin no key trusted
+ * here signed is only ever switched off; the desktop's admin turns it on.
  */
 
 import fs from "fs";
@@ -21,7 +22,10 @@ import {
   unloadPlugin,
 } from "../../plugins/index.js";
 import { getPluginsDir } from "../../plugins/paths.js";
-import { setSyncedRegistryKeys } from "../../plugins/registries.js";
+import {
+  isLocallyTrustedPluginKey,
+  setSyncedRegistryKeys,
+} from "../../plugins/registries.js";
 import type { LoadedPlugin } from "../../plugins/loader.js";
 import {
   createCurrentPluginPermissionGrantRepository,
@@ -57,6 +61,14 @@ async function isEnabledLocally(pluginId: string): Promise<boolean> {
   return record?.state === "enabled";
 }
 
+/**
+ * Signed by a key this desktop trusts on its own. A key the server sent
+ * would let the server's admin sign anything, so it does not count.
+ */
+function vouchedHere(local: LoadedPlugin): boolean {
+  return !!local.signedBy && isLocallyTrustedPluginKey(local.signedBy);
+}
+
 const PLUGIN_ID_PATTERN = /^[a-z0-9][a-z0-9-]*$/;
 
 /** Downloads next to the installed copy, which stays until the swap. */
@@ -112,6 +124,10 @@ async function replaceWithDownload(
   if (previous) await unloadPlugin(pluginId);
   try {
     const installed = await installPluginArtifact(file);
+    // Approval belongs to the reviewed version, regardless of remote metadata.
+    if (wasEnabled && installed.source === "user" && !vouchedHere(installed)) {
+      await setPluginEnabled(pluginId, false);
+    }
     await fs.promises.rm(backup, { force: true });
     await fs.promises.rm(`${backup}.sig`, { force: true });
     return installed;
@@ -155,7 +171,7 @@ async function matchGrants(plugin: RemotePlugin): Promise<void> {
   if (!local || local.source !== "user") return;
   // Grants are only copied for code a trusted key signed. Anything else the
   // desktop's own admin has to review, as with any plugin dropped on disk.
-  if (!local.signedBy) return;
+  if (!vouchedHere(local)) return;
   const declared = new Set(local.manifest.capabilities);
   const wanted = new Set(plugin.granted.filter((cap) => declared.has(cap)));
   const existing = await repository.listByPlugin(plugin.id);
@@ -196,7 +212,7 @@ async function alertUnsigned(plugin: RemotePlugin): Promise<void> {
   alertedVersions.add(key);
   await sendCoreAlert({
     title: "Review a feature from your server",
-    body: `${plugin.name} (${plugin.version}) was copied from your server but is not signed, so it stays off here until you turn it on.`,
+    body: `${plugin.name} (${plugin.version}) was copied from your server but is not signed by a key this app trusts, so it stays off here until you turn it on.`,
     severity: "warning",
     category: "termix.sync.unsigned_plugin",
     dedupeKey: `sync:${key}`,
@@ -239,7 +255,9 @@ async function mirrorOne(link: SyncLink, plugin: RemotePlugin): Promise<void> {
         await alertOlderDesktop(plugin);
         throw error;
       }
-      if (wasEnabled) await setPluginEnabled(plugin.id, true);
+      if (wasEnabled && local.source === "bundled") {
+        await setPluginEnabled(plugin.id, true);
+      }
     } else if (newer) {
       await alertOlderDesktop(plugin);
     }
@@ -263,19 +281,19 @@ async function mirrorOne(link: SyncLink, plugin: RemotePlugin): Promise<void> {
       }
     }
     await matchGrants(plugin);
-    // Unsigned code is only ever switched off from here, never on.
-    if (!local.signedBy) {
-      const enabledHere = await isEnabledLocally(plugin.id);
-      if (!plugin.enabled && enabledHere) {
-        await setPluginEnabled(plugin.id, false);
-      } else if (plugin.enabled && !enabledHere) {
-        await alertUnsigned(plugin);
-      }
-      return;
-    }
   }
 
   if (!local) return;
+  // Remote metadata cannot confer bundled trust on a locally loaded user plugin.
+  if (local.source === "user" && !vouchedHere(local)) {
+    const enabledHere = await isEnabledLocally(plugin.id);
+    if (!plugin.enabled && enabledHere) {
+      await setPluginEnabled(plugin.id, false);
+    } else if (plugin.enabled && !enabledHere) {
+      await alertUnsigned(plugin);
+    }
+    return;
+  }
   if (plugin.enabled !== (await isEnabledLocally(plugin.id))) {
     await setPluginEnabled(plugin.id, plugin.enabled);
   } else if (plugin.enabled && local.state !== "active") {
@@ -284,6 +302,7 @@ async function mirrorOne(link: SyncLink, plugin: RemotePlugin): Promise<void> {
 }
 
 export async function mirrorPlugins(link: SyncLink): Promise<void> {
+  const { serialized } = await import("../../plugins/manage.js");
   const { plugins, registryKeys } = await remoteJson<{
     plugins: RemotePlugin[];
     registryKeys?: unknown[];
@@ -295,7 +314,8 @@ export async function mirrorPlugins(link: SyncLink): Promise<void> {
 
   for (const plugin of plugins) {
     try {
-      await mirrorOne(link, plugin);
+      // Share the consent/enable lock so an update cannot swap code mid-approval.
+      await serialized(() => mirrorOne(link, plugin));
     } catch (error) {
       syncLogger.warn("Could not match a feature to the server", {
         operation: "sync_plugin_mirror",
@@ -315,8 +335,13 @@ export async function mirrorPlugins(link: SyncLink): Promise<void> {
   }
 }
 
-/** Whether a plugin's on/off state belongs to the linked server. */
+/**
+ * Whether a plugin's on/off state belongs to the linked server. Code no key
+ * trusted here vouches for is the desktop's own admin's call to turn on.
+ */
 export function isServerManaged(pluginId: string): boolean {
   const local = getPluginRuntime().loader.get(pluginId);
-  return (local?.manifest.desktop ?? "mirror") !== "local";
+  const mode = local?.manifest.desktop ?? "mirror";
+  if (mode !== "mirror") return mode === "server";
+  return local?.source !== "user" || vouchedHere(local);
 }

src/backend/sync/entities.ts

@@ -5,7 +5,7 @@
  * an entity in without renumbering; anything referenced syncs first.
  */
 
-import { and, eq } from "drizzle-orm";
+import { and, eq, getTableColumns } from "drizzle-orm";
 import type { SyncRow } from "@termix-ssh/plugin-sdk/backend";
 import type { PluginManifest } from "@termix-ssh/plugin-sdk/manifest";
 import {
@@ -493,6 +493,25 @@ const SHARED_HOST_DROP = [
   ...HOST_LOCAL_FIELDS,
 ];
 
+const HOST_TEXT_COLUMNS = new Set(
+  Object.entries(getTableColumns(hosts))
+    .filter(([, column]) => column.dataType === "string")
+    .map(([field]) => field),
+);
+
+/**
+ * A resolved host field back in the form its column stores, as an owned host
+ * sends it: the resolver parses JSON columns and turns the "true"/"false" of
+ * forceKeyboardInteractive into a boolean, which a text column cannot bind.
+ */
+function storedForm(field: string, value: unknown): unknown {
+  if (value !== null && typeof value === "object") return JSON.stringify(value);
+  if (typeof value === "boolean" && HOST_TEXT_COLUMNS.has(field)) {
+    return String(value);
+  }
+  return value;
+}
+
 async function loadSharedHosts(userId: string): Promise<SyncRow[]> {
   const {
     createCurrentRbacAccessRepository,
@@ -540,10 +559,7 @@ async function loadSharedHosts(userId: string): Promise<SyncRow[]> {
       const wire: SyncRow = {};
       for (const [field, value] of Object.entries(host)) {
         if (SHARED_HOST_DROP.includes(field)) continue;
-        wire[field] =
-          value !== null && typeof value === "object"
-            ? JSON.stringify(value)
-            : value;
+        wire[field] = storedForm(field, value);
       }
       wire.jumpHosts = await jumpHostsToSyncIds(host.jumpHosts);
       wire.pluginSettings = await exportHostPluginSettings(hostId, {

src/backend/sync/server/push.ts

@@ -134,12 +134,23 @@ export async function applyPush(
     const record = await getRecord(userId, op.entityType, op.syncId);
     const currentRevision = record?.revision ?? 0;
     if (op.baseRevision !== currentRevision) {
+      const row = record?.deleted ? null : (wire.get(key) ?? null);
+      // A live record with no row failed to serialize; a conflict without a
+      // row would read as a delete on the desktop.
+      if (record && !record.deleted && !row) {
+        results.set(key, {
+          ...base,
+          status: "rejected",
+          reason: "unavailable",
+        });
+        continue;
+      }
       results.set(key, {
         ...base,
         status: "conflict",
         revision: currentRevision,
         deleted: !!record?.deleted,
-        row: record?.deleted ? null : (wire.get(key) ?? null),
+        row,
       });
       continue;
     }

src/backend/sync/store.ts

@@ -13,6 +13,7 @@ import { createCurrentRepositoryContext } from "../database/repositories/factory
 import { DataCrypto } from "../utils/data-crypto.js";
 import { SystemCrypto } from "../utils/system-crypto.js";
 import { DatabaseSaveTrigger } from "../utils/database-save-trigger.js";
+import { syncLogger } from "../utils/logger.js";
 import {
   getEntity,
   type RegisteredSyncEntity,
@@ -229,7 +230,13 @@ export async function loadWireRows(
       );
       const wire = toWire(entity, serialized, syncId);
       rows.set(syncId, { syncId, wire, hash: hashWire(entity, wire, key) });
-    } catch {
+    } catch (error) {
+      syncLogger.warn("Could not serialize a sync row", {
+        operation: "sync_serialize",
+        entityType: entity.type,
+        syncId,
+        error: error instanceof Error ? error.message : String(error),
+      });
       failed.add(syncId);
     }
   }

src/backend/tests/database/db/unique-username.test.ts

@@ -0,0 +1,109 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
+import Database from "better-sqlite3";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+/**
+ * Registration checked for a taken username before inserting, with nothing in
+ * the schema to back it up, so two concurrent sign-ups could both get the same
+ * name. Startup renames the later duplicates instead of deleting anyone, then
+ * makes the name unique.
+ */
+describe("users.username uniqueness", () => {
+  let dataDir: string;
+
+  beforeEach(() => {
+    dataDir = fs.mkdtempSync(path.join(os.tmpdir(), "termix-unique-user-"));
+    vi.resetModules();
+    process.env.DATA_DIR = dataDir;
+    process.env.DB_FILE_ENCRYPTION = "false";
+    process.env.ALLOW_EMPTY_DATA_DIR = "true";
+  });
+
+  afterEach(() => {
+    delete process.env.DATA_DIR;
+    delete process.env.DB_FILE_ENCRYPTION;
+    delete process.env.ALLOW_EMPTY_DATA_DIR;
+    fs.rmSync(dataDir, { recursive: true, force: true });
+  });
+
+  function writeDatabaseWithDuplicates(): void {
+    const seed = new Database(":memory:");
+    seed.exec(`
+      CREATE TABLE users (
+        id TEXT PRIMARY KEY,
+        username TEXT NOT NULL,
+        password_hash TEXT NOT NULL,
+        is_admin INTEGER NOT NULL DEFAULT 0,
+        registered_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+      );
+
+      INSERT INTO users (id, username, password_hash, registered_at) VALUES
+        ('late', 'alice', 'hash', '2025-03-01 00:00:00'),
+        ('first', 'alice', 'hash', '2025-01-01 00:00:00'),
+        ('tie-b', 'bob', 'hash', '2025-01-01 00:00:00'),
+        ('tie-a', 'bob', 'hash', '2025-01-01 00:00:00'),
+        ('only', 'Alice', 'hash', '2025-02-01 00:00:00');
+    `);
+    fs.writeFileSync(path.join(dataDir, "db.sqlite"), seed.serialize());
+    seed.close();
+  }
+
+  async function bootAndGetSqlite(): Promise<Database.Database> {
+    const db = await import("../../../database/db/index.js");
+    await db.initializeDatabase();
+    return db.getSqlite();
+  }
+
+  it("keeps the oldest holder of a name and renames the rest", async () => {
+    writeDatabaseWithDuplicates();
+
+    const sqlite = await bootAndGetSqlite();
+
+    const names = Object.fromEntries(
+      sqlite
+        .prepare("SELECT id, username FROM users")
+        .raw()
+        .all() as [string, string][],
+    );
+    expect(names).toEqual({
+      first: "alice",
+      late: "termix-recovered-0-5",
+      "tie-a": "bob",
+      "tie-b": "termix-recovered-0-3",
+      only: "Alice",
+    });
+  });
+
+  it("rejects a second user with a taken name", async () => {
+    const sqlite = await bootAndGetSqlite();
+
+    const insert = sqlite.prepare(
+      "INSERT INTO users (id, username, password_hash) VALUES (?, ?, ?)",
+    );
+    insert.run("u1", "alice", "hash");
+
+    expect(() => insert.run("u2", "alice", "hash")).toThrow(/UNIQUE/i);
+  });
+});
+
+// Run the checked-in migration itself, including occupied recovery prefixes.
+it("migrates duplicate names without colliding with existing names", () => {
+  const db = new Database(":memory:");
+  try {
+    db.exec(`CREATE TABLE users (id TEXT PRIMARY KEY, username TEXT NOT NULL, registered_at TEXT NOT NULL);
+      INSERT INTO users VALUES
+        ('first', 'alice', '2025-01-01'),
+        ('late', 'alice', '2025-02-01'),
+        ('other', 'alice-late', '2025-01-01'),
+        ('occupied', 'termix-recovered-0-1', '2025-01-01');`);
+    db.exec(fs.readFileSync("drizzle/sqlite/0067_unique_username.sql", "utf8"));
+    const rows = db.prepare("SELECT username FROM users").pluck().all();
+    expect(new Set(rows).size).toBe(4);
+    expect(rows).toContain("alice");
+    expect(rows).toContain("alice-late");
+    expect(rows).toContain("termix-recovered-0-1");
+    expect(() => db.exec("INSERT INTO users VALUES ('new', 'alice', '2026-01-01')")).toThrow(/UNIQUE/i);
+  } finally { db.close(); }
+});

src/backend/tests/database/db/vault-profile-foreign-key.test.ts

@@ -0,0 +1,89 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
+import Database from "better-sqlite3";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+// ssh_data.vault_profile_id points at vault_profiles. The vault plugin renames
+// that table to p_vault_profiles, which SQLite follows into ssh_data's foreign
+// key, so uninstalling the plugin used to leave every host write failing with
+// "no such table: main.p_vault_profiles".
+describe("ssh_data and the vault plugin's tables", () => {
+  let dataDir: string;
+
+  beforeEach(() => {
+    dataDir = fs.mkdtempSync(path.join(os.tmpdir(), "termix-vault-fk-"));
+    vi.resetModules();
+    vi.stubEnv("DATA_DIR", dataDir);
+    vi.stubEnv("DB_FILE_ENCRYPTION", "false");
+    vi.stubEnv("ALLOW_EMPTY_DATA_DIR", "true");
+  });
+
+  afterEach(() => {
+    vi.unstubAllEnvs();
+    fs.rmSync(dataDir, { recursive: true, force: true });
+  });
+
+  function seed(afterAdoption: string): void {
+    const seed = new Database(":memory:");
+    seed.exec(
+      fs.readFileSync(
+        new URL("../../fixtures/sqlite-2.8-schema.sql", import.meta.url),
+        "utf8",
+      ),
+    );
+    seed.exec(`
+      CREATE TABLE plugin_migrations (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        plugin_id TEXT NOT NULL,
+        migration_id TEXT NOT NULL,
+        checksum TEXT NOT NULL,
+        applied_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        UNIQUE (plugin_id, migration_id),
+        FOREIGN KEY (plugin_id) REFERENCES plugins (id) ON DELETE CASCADE
+      );
+      INSERT INTO users (id, username, password_hash)
+        VALUES ('owner', 'alice', 'hash');
+      INSERT INTO ssh_data (id, user_id, ip, port, username, auth_type)
+        VALUES (1, 'owner', '192.0.2.1', 22, 'root', 'password');
+      ALTER TABLE vault_profiles RENAME TO p_vault_profiles;
+      ALTER TABLE vault_tokens RENAME TO p_vault_tokens;
+      ${afterAdoption}
+    `);
+    fs.writeFileSync(path.join(dataDir, "db.sqlite"), seed.serialize());
+    seed.close();
+  }
+
+  async function boot() {
+    const db = await import("../../../database/db/index.js");
+    await db.initializeDatabase();
+    return db.getSqlite();
+  }
+
+  function writeHosts(sqlite: Database.Database): void {
+    sqlite
+      .prepare(
+        "INSERT INTO ssh_data (user_id, ip, port, username, auth_type) VALUES ('owner', '192.0.2.2', 22, 'root', 'password')",
+      )
+      .run();
+    sqlite.prepare("DELETE FROM ssh_data WHERE id = 1").run();
+  }
+
+  it("repairs a database the plugin was already uninstalled from", async () => {
+    seed("DROP TABLE p_vault_tokens; DROP TABLE p_vault_profiles;");
+    const sqlite = await boot();
+
+    expect(() => writeHosts(sqlite)).not.toThrow();
+  });
+
+  it("leaves nothing in ssh_data pointing at the plugin", async () => {
+    seed("");
+    const sqlite = await boot();
+
+    expect(
+      sqlite.prepare("PRAGMA foreign_key_list(ssh_data)").all(),
+    ).not.toContainEqual(expect.objectContaining({ table: "p_vault_profiles" }));
+    sqlite.exec("DROP TABLE p_vault_tokens; DROP TABLE p_vault_profiles;");
+    expect(() => writeHosts(sqlite)).not.toThrow();
+  });
+});

src/backend/tests/database/import-route.test.ts

@@ -0,0 +1,147 @@
+import * as fs from "node:fs";
+import { existsSync, mkdtempSync, readFileSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { runInNewContext } from "node:vm";
+import Database from "better-sqlite3";
+import ts from "typescript";
+import { expect, it, vi } from "vitest";
+
+const source = readFileSync(
+  new URL("../../database/database.ts", import.meta.url),
+  "utf8",
+);
+const ast = ts.createSourceFile(
+  "database.ts",
+  source,
+  ts.ScriptTarget.Latest,
+  true,
+);
+const route = ast.statements.find(
+  (s) =>
+    ts.isExpressionStatement(s) &&
+    ts.isCallExpression(s.expression) &&
+    s.expression.arguments[0]?.getText(ast) === '"/database/import"',
+) as ts.ExpressionStatement;
+const batched = (route.expression as ts.CallExpression)
+  .arguments[3] as ts.CallExpression;
+const callback = batched.arguments[0];
+
+const dir = mkdtempSync(join(tmpdir(), "termix-import-route-"));
+
+function exportFile(): string {
+  const path = join(dir, `export-${Math.random()}.db`);
+  const db = new Database(path);
+  db.exec(`
+    CREATE TABLE ssh_credentials (id INTEGER, name TEXT, username TEXT);
+    CREATE TABLE ssh_data (id INTEGER, ip TEXT, port INTEGER, username TEXT, credential_id INTEGER);
+    INSERT INTO ssh_credentials VALUES (7, 'fresh', 'root'), (8, 'kept', 'admin');
+    INSERT INTO ssh_data VALUES
+      (1, '10.0.0.1', 22, 'root', 7),
+      (2, '10.0.0.2', 22, 'root', 8),
+      (3, '10.0.0.3', 22, 'root', 99),
+      (4, '10.0.0.4', 22, 'root', NULL);
+  `);
+  db.close();
+  return path;
+}
+
+async function invoke(path: string, user: unknown = { isExternal: false }) {
+  const writes: string[] = [];
+  const hosts: Array<Record<string, unknown>> = [];
+  const importHostProtocolLogins = vi.fn();
+  const handler = runInNewContext(
+    ts.transpileModule(`(${callback.getText(ast)})`, {
+      compilerOptions: { target: ts.ScriptTarget.ES2022 },
+    }).outputText,
+    {
+      fs,
+      Buffer,
+      Database,
+      parseUserAgent: () => ({ type: "web" }),
+      createCurrentUserRepository: () => ({ findById: async () => user }),
+      DataCrypto: { getUserDataKey: () => Buffer.from("key") },
+      apiLogger: {
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+        success: vi.fn(),
+      },
+      createCurrentCredentialRepository: () => ({
+        findIdForImportIdentity: async (_: string, name: string) =>
+          name === "kept" ? 42 : null,
+        createEncryptedForUser: async () => {
+          writes.push("credential");
+          return { id: 100 };
+        },
+      }),
+      createCurrentHostRepository: () => ({
+        existsForImportIdentity: async () => false,
+        createEncryptedForUser: async (_: string, host: never) => {
+          writes.push("host");
+          hosts.push(host);
+          return { id: 500 + hosts.length };
+        },
+      }),
+      legacyStatusCheck: () => ({}),
+      sshOptionsForWrite: () => null,
+      applyHostDefaultsToWrite: async () => ({}),
+      applyPluginHostImportSettings: async () => {},
+      importedHostPluginSettings: () => ({}),
+      importHostProtocolLogins,
+      applyDefaultsAfterHostWrites: async () => {},
+      importUserPluginRows: async () => ({
+        imported: 0,
+        skipped: 0,
+        errors: [],
+      }),
+      importHostDefaults: async () => ({ imported: 0, skipped: 0 }),
+      DatabaseSaveTrigger: { forceSave: async () => {} },
+      getErrorMessage: (error: Error) => error.message,
+    },
+  );
+  const res = { json: vi.fn(), status: vi.fn() };
+  res.status.mockReturnValue(res);
+  await handler(
+    { userId: "user-1", file: { path, originalname: "export.db" } },
+    res,
+  );
+  return { res, writes, hosts, importHostProtocolLogins };
+}
+
+it("points imported hosts at the credentials imported with them", async () => {
+  const { res, writes, hosts, importHostProtocolLogins } =
+    await invoke(exportFile());
+
+  expect(res.status).not.toHaveBeenCalled();
+  expect(writes).toEqual(["credential", "host", "host", "host", "host"]);
+  expect(hosts.map((host) => host.credentialId)).toEqual([100, 42, null, null]);
+  expect([...importHostProtocolLogins.mock.calls[0][4]]).toEqual([
+    [7, 100],
+    [8, 42],
+  ]);
+});
+
+it("removes the uploaded file when the user is gone", async () => {
+  const path = exportFile();
+  const { res } = await invoke(path, null);
+
+  expect(res.status).toHaveBeenCalledWith(404);
+  expect(existsSync(path)).toBe(false);
+});
+
+it("removes the uploaded file when it is not a SQLite database", async () => {
+  const path = join(dir, "not-sqlite.db");
+  writeFileSync(path, "definitely not a database");
+  const { res } = await invoke(path);
+
+  expect(res.status).toHaveBeenCalledWith(400);
+  expect(existsSync(path)).toBe(false);
+});
+
+it("removes the uploaded file after a successful import", async () => {
+  const path = exportFile();
+  await invoke(path);
+
+  expect(existsSync(path)).toBe(false);
+});

src/backend/tests/database/repositories/host-credential-repositories.test.ts

@@ -213,7 +213,7 @@ describe("HostRepository and CredentialRepository", () => {
   it("checks credential import identity", async () => {
     const repo = await createRepositories();
 
-    await repo.credentials.create({
+    const created = await repo.credentials.create({
       userId: "user-1",
       name: "primary",
       authType: "password",
@@ -221,11 +221,11 @@ describe("HostRepository and CredentialRepository", () => {
     });
 
     await expect(
-      repo.credentials.existsForImportIdentity("user-1", "primary", "root"),
-    ).resolves.toBe(true);
+      repo.credentials.findIdForImportIdentity("user-1", "primary", "root"),
+    ).resolves.toBe(created.id);
     await expect(
-      repo.credentials.existsForImportIdentity("user-1", "primary", "admin"),
-    ).resolves.toBe(false);
+      repo.credentials.findIdForImportIdentity("user-1", "primary", "admin"),
+    ).resolves.toBeNull();
   });
 
   it("renames credential folders through the write boundary", async () => {

src/backend/tests/database/repositories/sqlite-foreign-keys.test.ts

@@ -1,51 +0,0 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-const factory = vi.hoisted(() => ({
-  getCurrentRepositorySqlite: vi.fn(),
-}));
-
-vi.mock("../../../database/repositories/factory.js", () => factory);
-
-import {
-  withCurrentSqliteForeignKeysDisabled,
-  withSqliteForeignKeysDisabled,
-} from "../../../database/repositories/sqlite-foreign-keys.js";
-
-const previousDatabaseDialect = process.env.DATABASE_DIALECT;
-
-afterEach(() => {
-  if (previousDatabaseDialect === undefined)
-    delete process.env.DATABASE_DIALECT;
-  else process.env.DATABASE_DIALECT = previousDatabaseDialect;
-  vi.clearAllMocks();
-});
-
-describe("withSqliteForeignKeysDisabled", () => {
-  it("restores foreign keys after an import", async () => {
-    const sqlite = { exec: vi.fn() };
-
-    await expect(
-      withSqliteForeignKeysDisabled(sqlite, async () => "imported"),
-    ).resolves.toBe("imported");
-    expect(sqlite.exec.mock.calls).toEqual([
-      ["PRAGMA foreign_keys = OFF"],
-      ["PRAGMA foreign_keys = ON"],
-    ]);
-  });
-});
-
-describe("withCurrentSqliteForeignKeysDisabled", () => {
-  it.each(["postgres", "mysql"])(
-    "runs portable imports with constraints enabled on %s",
-    async (dialect) => {
-      process.env.DATABASE_DIALECT = dialect;
-      const operation = vi.fn().mockResolvedValue("imported");
-
-      await expect(
-        withCurrentSqliteForeignKeysDisabled(operation),
-      ).resolves.toBe("imported");
-      expect(operation).toHaveBeenCalledOnce();
-      expect(factory.getCurrentRepositorySqlite).not.toHaveBeenCalled();
-    },
-  );
-});

src/backend/tests/database/repositories/unique-username-migration.test.ts

@@ -0,0 +1,44 @@
+import fs from "node:fs";
+import { sql } from "drizzle-orm";
+import { expect, it } from "vitest";
+import { TestSqliteDatabase, testDialect } from "./test-support.js";
+
+it("migrates duplicate usernames without colliding with occupied recovery names", async () => {
+  const adapter = new TestSqliteDatabase();
+  await adapter.connect();
+  try {
+    await adapter.exec(`CREATE TABLE username_migration_fixture (
+      id varchar(255) PRIMARY KEY, username TEXT NOT NULL, registered_at varchar(255) NOT NULL
+    );
+    INSERT INTO username_migration_fixture VALUES
+      ('first', 'alice', '2025-01-01'),
+      ('late', 'alice', '2025-02-01'),
+      ('other', 'alice-late', '2025-01-01'),
+      ('occupied', 'termix-recovered-0-1', '2025-01-01');`);
+    const dialect = testDialect();
+    const number = dialect === "sqlite" ? "0067" : "0072";
+    const migration = fs
+      .readFileSync(`drizzle/${dialect}/${number}_unique_username.sql`, "utf8")
+      .replace(/\busers\b/g, "username_migration_fixture")
+      .replaceAll("idx_users_username", "idx_fixture_username");
+    for (const statement of migration.split("--> statement-breakpoint")) {
+      if (statement.trim()) await adapter.run(sql.raw(statement));
+    }
+    const rows = await adapter.query<{ username: string }>(
+      sql`SELECT username FROM username_migration_fixture`,
+    );
+    const names = rows.map((row) => row.username);
+    expect(new Set(names).size).toBe(4);
+    expect(names).toEqual(
+      expect.arrayContaining(["alice", "alice-late", "termix-recovered-0-1"]),
+    );
+    await expect(async () => {
+      await adapter.run(
+        sql`INSERT INTO username_migration_fixture VALUES ('new', 'alice', '2026-01-01')`,
+      );
+    }).rejects.toThrow();
+  } finally {
+    await adapter.exec("DROP TABLE IF EXISTS username_migration_fixture");
+    await adapter.close();
+  }
+});

src/backend/tests/database/repositories/user-repository.test.ts

@@ -1,6 +1,9 @@
 import { afterEach, describe, expect, it } from "vitest";
 import { TestSqliteDatabase } from "./test-support.js";
-import { UserRepository } from "../../../database/repositories/user-repository.js";
+import {
+  UserRepository,
+  isUsernameTaken,
+} from "../../../database/repositories/user-repository.js";
 
 describe("UserRepository.listPage", () => {
   let adapter: TestSqliteDatabase | null = null;
@@ -93,3 +96,27 @@ describe("UserRepository.listPage", () => {
     expect(page.total).toBe(5);
   });
 });
+
+describe("UserRepository.create", () => {
+  let adapter: TestSqliteDatabase | null = null;
+
+  afterEach(async () => {
+    if (adapter) {
+      await adapter.close();
+      adapter = null;
+    }
+  });
+
+  it("rejects a taken username in a way callers can recognise", async () => {
+    adapter = new TestSqliteDatabase();
+    const repo = new UserRepository(await adapter.connect());
+    await repo.create({ id: "u1", username: "alice", passwordHash: "hash" });
+
+    const error = await repo
+      .create({ id: "u2", username: "alice", passwordHash: "hash" })
+      .catch((e: unknown) => e);
+
+    expect(isUsernameTaken(error)).toBe(true);
+    expect(isUsernameTaken(new Error("unrelated"))).toBe(false);
+  });
+});

src/backend/tests/database/routes/plugins.test.ts

@@ -176,6 +176,7 @@ const manageMock = vi.hoisted(() => ({
   deletePluginData: vi.fn(),
   planStateChange: vi.fn(),
   setPluginState: vi.fn(),
+  enablePluginWithConsent: vi.fn(),
   getDeveloperMode: vi.fn(),
   setDeveloperMode: vi.fn(),
   stageUpload: vi.fn(),
@@ -215,6 +216,12 @@ const onboardingMock = vi.hoisted(() => ({
 
 vi.mock("../../../plugins/onboarding.js", () => onboardingMock);
 
+const syncPluginsMock = vi.hoisted(() => ({
+  isServerManaged: vi.fn((_id: string) => true),
+}));
+
+vi.mock("../../../sync/client/plugins.js", () => syncPluginsMock);
+
 const pluginRoutes = (await import("../../../database/routes/plugins.js"))
   .default;
 
@@ -1139,6 +1146,65 @@ describe("plugins route", () => {
       expect(manageMock.installPlugin).not.toHaveBeenCalled();
     });
 
+    describe("on a linked desktop", () => {
+      const switchOn = (id: string) =>
+        fetch(`${baseUrl}/plugins/${id}/state`, {
+          method: "PATCH",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({
+            enabled: true,
+            version: "1.0.0",
+            capabilities: ["kv:own"],
+          }),
+        });
+
+      beforeEach(() => {
+        manageMock.isLinkedDesktop.mockResolvedValue(true);
+        state.plugins.set("sample-plugin", makePlugin({ state: "disabled" }));
+      });
+
+      afterEach(() => {
+        syncPluginsMock.isServerManaged.mockImplementation(() => true);
+      });
+
+      it("refuses to switch a plugin the server decides", async () => {
+        const res = await switchOn("sample-plugin");
+        expect(res.status).toBe(409);
+        expect((await res.json()).code).toBe("MANAGED_BY_SERVER");
+        expect(manageMock.setPluginState).not.toHaveBeenCalled();
+      });
+
+      it("lets the desktop's admin switch one the server does not", async () => {
+        syncPluginsMock.isServerManaged.mockImplementation(() => false);
+        manageMock.enablePluginWithConsent.mockResolvedValue({
+          enable: [],
+          disable: [],
+        });
+        const res = await switchOn("sample-plugin");
+        expect(res.status).toBe(200);
+        expect(manageMock.enablePluginWithConsent).toHaveBeenCalledWith(
+          "sample-plugin",
+          expect.objectContaining({
+            version: "1.0.0",
+            capabilities: ["kv:own"],
+          }),
+        );
+      });
+
+      it("says per plugin whether the server decides it", async () => {
+        state.plugins.set("other", makePlugin({ id: "other" }));
+        syncPluginsMock.isServerManaged.mockImplementation(
+          (id) => id === "other",
+        );
+        const listed = (await (
+          await fetch(`${baseUrl}/plugins`)
+        ).json()) as Array<{ id: string; managedByServer: boolean }>;
+        expect(
+          Object.fromEntries(listed.map((p) => [p.id, p.managedByServer])),
+        ).toEqual({ "sample-plugin": false, other: true });
+      });
+    });
+
     it("previews a state change without making it", async () => {
       state.plugins.set("sample-plugin", makePlugin());
       manageMock.planStateChange.mockResolvedValue({

src/backend/tests/electron/c2s-runtime.test.ts

@@ -145,6 +145,35 @@ describe("client tunnel runtime authentication", () => {
     expect(sockets).toHaveLength(1);
   });
 
+  it("keeps the relay's reason when it closes after an error", async () => {
+    const { context, runtimes, sockets } = setup();
+    const runtime = { status: { connected: true } };
+    runtimes.set("web", runtime);
+    const test = context.testC2SRelay(
+      { name: "web" },
+      "127.0.0.1",
+      8443,
+      null,
+      runtime,
+    );
+    await vi.waitFor(() => expect(sockets).toHaveLength(1));
+    sockets[0].emit(
+      "message",
+      Buffer.from(
+        JSON.stringify({
+          type: "error",
+          error: "Target 127.0.0.1:8443 refused",
+        }),
+      ),
+      false,
+    );
+    sockets[0].close();
+    expect(await test).toMatchObject({ success: false });
+    expect(runtimes.get("web").status.reason).toBe(
+      "Target 127.0.0.1:8443 refused",
+    );
+  });
+
   it("keeps the tunnel connected when one of its connections fails", async () => {
     const { context, runtimes, sockets } = setup();
     runtimes.set("web", { status: { connected: true, status: "CONNECTED" } });

src/backend/tests/electron/local-shell.test.ts

@@ -80,4 +80,20 @@ describe("repairSpawnHelpers", () => {
     expect(chmods[0][1] & 0o111).not.toBe(0);
     expect(chmods[0][0]).toContain("app.asar.unpacked");
   });
+
+  it.each(["app-arm64.asar", "app-x64.asar"])(
+    "repairs the helper in the unpacked copy of a universal build's %s",
+    (asar) => {
+      const chmods: string[] = [];
+      const fsImpl = {
+        statSync: () => ({ mode: 0o644 }),
+        chmodSync: (file: string) => {
+          chmods.push(file.split(require("node:path").sep).join("/"));
+        },
+      };
+      const dir = `/Applications/Termix.app/Contents/Resources/${asar}/node_modules/node-pty`;
+      repairSpawnHelpers(dir, fsImpl);
+      expect(chmods[0]).toContain(`/${asar}.unpacked/node_modules/node-pty/`);
+    },
+  );
 });

src/backend/tests/electron/patch-node-pty.test.ts

@@ -11,7 +11,48 @@ import { tmpdir } from "node:os";
 import { describe, expect, it } from "vitest";
 
 const require = createRequire(import.meta.url);
-const { chmodSpawnHelpers } = require("../../../../scripts/patch-node-pty.cjs");
+const {
+  chmodSpawnHelpers,
+  patchUnixTerminalHelperRewrite,
+} = require("../../../../scripts/patch-node-pty.cjs");
+
+const upstreamRewrite = [
+  "helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');",
+  "helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');",
+].join("\n");
+
+const previouslyPatchedRewrite = [
+  "if (!helperPath.includes('app.asar.unpacked')) {",
+  "    helperPath = helperPath.replace('app.asar', 'app.asar.unpacked');",
+  "}",
+  "if (!helperPath.includes('node_modules.asar.unpacked')) {",
+  "    helperPath = helperPath.replace('node_modules.asar', 'node_modules.asar.unpacked');",
+  "}",
+].join("\n");
+
+const resources = "/Applications/Termix.app/Contents/Resources";
+const helperPaths = [
+  ["app.asar", "app.asar.unpacked"],
+  ["app-arm64.asar", "app-arm64.asar.unpacked"],
+  ["app-x64.asar", "app-x64.asar.unpacked"],
+  ["app.asar.unpacked", "app.asar.unpacked"],
+  ["app-arm64.asar.unpacked", "app-arm64.asar.unpacked"],
+].map(([from, to]) => [
+  `${resources}/${from}/node_modules/node-pty/build/Release/spawn-helper`,
+  `${resources}/${to}/node_modules/node-pty/build/Release/spawn-helper`,
+]);
+
+function writeUnixTerminal(rewrite: string) {
+  const file = join(
+    tmpdir(),
+    `termix-unix-terminal-${Date.now()}-${Math.random()}.cjs`,
+  );
+  writeFileSync(
+    file,
+    `module.exports = function (helperPath) {\n${rewrite}\nreturn helperPath;\n};\n`,
+  );
+  return file;
+}
 
 // chmod's execute bit is a POSIX concept; Windows/NTFS has no equivalent mode bit.
 const itPosix = process.platform === "win32" ? it.skip : it;
@@ -30,4 +71,22 @@ describe("patch-node-pty", () => {
     expect(chmodSpawnHelpers(root)).toBe(0);
     expect(existsSync(helper)).toBe(true);
   });
+
+  it.each([
+    ["upstream", upstreamRewrite],
+    ["previously patched", previouslyPatchedRewrite],
+  ])(
+    "points the %s helper path at the unpacked copy of any app asar",
+    (_, rewrite) => {
+      const file = writeUnixTerminal(rewrite);
+
+      expect(patchUnixTerminalHelperRewrite(file)).toBe(true);
+      expect(patchUnixTerminalHelperRewrite(file)).toBe(false);
+
+      const rewriteHelperPath = require(file);
+      for (const [from, to] of helperPaths) {
+        expect(rewriteHelperPath(from)).toBe(to);
+      }
+    },
+  );
 });

src/backend/tests/hosts/defaults/write-rules.test.ts

@@ -106,6 +106,31 @@ describe("applyHostDefaultsToWrite", () => {
     expect(overrides.core).toEqual(["statusCheckEnabled", "username"]);
   });
 
+  it("keeps a changed auth type on an update without a list", async () => {
+    userDefault("auth", { authType: "credential", credentialId: 3 });
+    const stored = {
+      id: 5,
+      userId: "u1",
+      authType: "credential",
+      credentialId: 3,
+      defaultOverrides: JSON.stringify({ core: ["username"] }),
+    };
+    const columns: Record<string, unknown> = {
+      authType: "vault",
+      credentialId: null,
+      overrideCredentialUsername: 0,
+    };
+    const overrides = await applyHostDefaultsToWrite({
+      ownerId: "u1",
+      hostId: 5,
+      columns,
+      body: { authType: "vault", credentialId: 0 },
+      stored: stored as never,
+    });
+    expect(columns.authType).toBe("vault");
+    expect(overrides.core).toContain("auth");
+  });
+
   it("keeps a locked key's state for a shared editor", async () => {
     const overrides = await applyHostDefaultsToWrite({
       ownerId: "u1",

src/backend/tests/hosts/host-key-verifier.test.ts

@@ -1,10 +1,16 @@
 import { EventEmitter } from "node:events";
 import type { WebSocket } from "ws";
-import { describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { SSHHostKeyVerifier } from "../../hosts/host-key-verifier.js";
 
+const repo = vi.hoisted(() => ({
+  updateHostKey: vi.fn(async () => {}),
+  storeHostKey: vi.fn(async () => {}),
+  touchHostKeyLastVerified: vi.fn(async () => {}),
+}));
+
 vi.mock("../../database/repositories/factory.js", () => ({
-  createCurrentHostResolutionRepository: () => ({}),
+  createCurrentHostResolutionRepository: () => repo,
 }));
 vi.mock("../../utils/logger.js", () => ({
   sshLogger: { info: vi.fn(), warn: vi.fn(), error: vi.fn() },
@@ -57,3 +63,50 @@ describe("quick connect host keys", () => {
     expect(await verifyUnsaved(null)).toBe(true);
   });
 });
+
+const pinned = {
+  hostKeyFingerprint: Buffer.from("old-key").toString("hex"),
+  hostKeyType: "ssh-ed25519",
+  hostKeyAlgorithm: "sha256",
+  hostKeyChangedCount: 0,
+  name: "bastion",
+};
+
+async function verifyJumpHop(socket: WebSocket | null, key: string) {
+  const verifier = await SSHHostKeyVerifier.createHostVerifier(
+    7,
+    "10.0.0.1",
+    22,
+    socket,
+    "user",
+    true,
+    pinned,
+  );
+  return new Promise<boolean>((resolve) => verifier(Buffer.from(key), resolve));
+}
+
+describe("jump host key changes", () => {
+  beforeEach(() => {
+    repo.updateHostKey.mockClear();
+  });
+
+  it("refuses a changed key and keeps the pin when nobody can be asked", async () => {
+    expect(await verifyJumpHop(null, "new-key")).toBe(false);
+    expect(repo.updateHostKey).not.toHaveBeenCalled();
+  });
+
+  it("asks the user and only replaces the pin when they accept", async () => {
+    const no = socketAnswering("reject");
+    expect(await verifyJumpHop(no.socket, "new-key")).toBe(false);
+    expect(no.sent[0]).toContain("host_key_changed");
+    expect(repo.updateHostKey).not.toHaveBeenCalled();
+
+    const yes = socketAnswering("accept");
+    expect(await verifyJumpHop(yes.socket, "new-key")).toBe(true);
+    expect(repo.updateHostKey).toHaveBeenCalledTimes(1);
+  });
+
+  it("still accepts the pinned key without asking", async () => {
+    expect(await verifyJumpHop(null, "old-key")).toBe(true);
+  });
+});

src/backend/tests/hosts/ssh-connection-pool.test.ts

@@ -42,6 +42,52 @@ describe("SSHConnectionPool", () => {
     pool.destroy();
   });
 
+  it("tracks every client from concurrent connects to a new host", async () => {
+    const pool = new SSHConnectionPool();
+    const clients = Array.from({ length: 3 }, deferredClient);
+    let factoryCalls = 0;
+    const factory = vi.fn(() => clients[factoryCalls++].promise);
+
+    const requests = Array.from({ length: 3 }, () =>
+      pool.getConnection("new-host", factory),
+    );
+    for (const pending of clients) pending.resolve(pending.client);
+    const connected = await Promise.all(requests);
+
+    for (const client of connected) pool.releaseConnection("new-host", client);
+    const reused = await Promise.all(
+      Array.from({ length: 3 }, () => pool.getConnection("new-host", factory)),
+    );
+    expect(new Set(reused)).toEqual(new Set(connected));
+    expect(factory).toHaveBeenCalledTimes(3);
+
+    pool.clearKeyConnections("new-host");
+    for (const pending of clients) {
+      expect(pending.client.end).toHaveBeenCalledOnce();
+    }
+    pool.destroy();
+  });
+
+  it("does not resurrect a connection removed while another connects", async () => {
+    const pool = new SSHConnectionPool();
+    const first = deferredClient();
+    const second = deferredClient();
+    first.resolve(first.client);
+    await pool.getConnection("host", () => first.promise);
+
+    const request = pool.getConnection("host", () => second.promise);
+    first.client.emit("close");
+    second.resolve(second.client);
+    await expect(request).resolves.toBe(second.client);
+
+    pool.releaseConnection("host", first.client);
+    pool.releaseConnection("host", second.client);
+    await expect(
+      pool.getConnection("host", () => deferredClient().promise),
+    ).resolves.toBe(second.client);
+    pool.destroy();
+  });
+
   it("discards a pending connection when its host pool is cleared", async () => {
     const pool = new SSHConnectionPool();
     const pending = deferredClient();

src/backend/tests/plugins/artifact-manifest.test.ts

@@ -2,9 +2,10 @@ import { describe, expect, it } from "vitest";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import zlib from "node:zlib";
 import * as tar from "tar";
 import {
-  readArtifactFile,
+  readArtifactFiles,
   readArtifactManifest,
   sameCapabilities,
 } from "../../plugins/artifact-manifest.js";
@@ -27,20 +28,42 @@ function pack(files: Record<string, string>, prefix = ""): Buffer {
   }
 }
 
-describe("readArtifactFile", () => {
+/** Two archives' entries back to back, so a name can appear twice. */
+function concat(first: Buffer, second: Buffer): Buffer {
+  const entries = (buffer: Buffer) => {
+    const raw = zlib.gunzipSync(buffer);
+    // Drop the two zero blocks that end every tar.
+    return raw.subarray(0, raw.length - 1024);
+  };
+  return zlib.gzipSync(
+    Buffer.concat([entries(first), entries(second), Buffer.alloc(1024)]),
+  );
+}
+
+describe("readArtifactFiles", () => {
   it("finds a file by name, with or without a ./ prefix", () => {
     const plain = pack({ "manifest.json": "{}", "dist/a.js": "x" });
-    expect(readArtifactFile(plain, "dist/a.js")?.toString()).toBe("x");
+    expect(
+      readArtifactFiles(plain, "dist/a.js").map((b) => b.toString()),
+    ).toEqual(["x"]);
     const dotted = pack({ "manifest.json": '{"id":"a"}' }, "./");
-    expect(readArtifactFile(dotted, "manifest.json")?.toString()).toBe(
-      '{"id":"a"}',
+    expect(
+      readArtifactFiles(dotted, "manifest.json").map((b) => b.toString()),
+    ).toEqual(['{"id":"a"}']);
+  });
+
+  it("returns nothing for a missing file", () => {
+    expect(readArtifactFiles(pack({ "a.txt": "a" }), "manifest.json")).toEqual(
+      [],
     );
   });
 
-  it("returns null for a missing file", () => {
-    expect(readArtifactFile(pack({ "a.txt": "a" }), "manifest.json")).toBe(
-      null,
-    );
+  it("resolves names that need a pax header", () => {
+    const long = `dist/${"x".repeat(150)}.js`;
+    const archive = pack({ "manifest.json": "{}", [long]: "x" });
+    expect(readArtifactFiles(archive, long).map((b) => b.toString())).toEqual([
+      "x",
+    ]);
   });
 });
 
@@ -68,6 +91,18 @@ describe("readArtifactManifest", () => {
       readArtifactManifest(pack({ "manifest.json": "[1]" })),
     ).toThrow(/not an object/);
   });
+
+  it("refuses an archive with two manifests", () => {
+    const first = pack({ "manifest.json": '{"capabilities":[]}' });
+    const second = pack({ "manifest.json": '{"capabilities":["ssh"]}' });
+    expect(() => readArtifactManifest(concat(first, second))).toThrow(
+      /more than one manifest.json/,
+    );
+    const upper = pack({ "MANIFEST.JSON": '{"capabilities":["ssh"]}' });
+    expect(() => readArtifactManifest(concat(first, upper))).toThrow(
+      /more than one manifest.json/,
+    );
+  });
 });
 
 describe("sameCapabilities", () => {

src/backend/tests/plugins/manage.test.ts

@@ -91,8 +91,8 @@ vi.mock("../../plugins/data.js", () => ({
   forgetTables: () => {},
 }));
 
-vi.mock("../../plugins/permissions.js", () => ({
-  invalidatePluginPermissionCache: () => {},
+vi.mock("../../plugins/permissions.js", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("../../plugins/permissions.js")>()),
 }));
 
 vi.mock("../../plugins/registry-index.js", async (importOriginal) => {
@@ -1084,3 +1084,48 @@ describe("more registries", () => {
     ).rejects.toMatchObject({ code: "KEY_CHANGED" });
   });
 });
+
+it("requires exact consent before enabling a mirrored plugin with capabilities", async () => {
+  createFixturePlugin({
+    id: "manual-mirror",
+    root: path.join(data, "plugins"),
+    capabilities: ["kv:own"],
+    backendSource:
+      'export async function activate(ctx) { await ctx.kv.set("probe", "value"); }',
+  });
+  await boot();
+  const options = {
+    version: "1.0.0",
+    capabilities: ["kv:own"],
+    userId: "admin",
+  };
+  await expect(
+    manage.enablePluginWithConsent("manual-mirror", {
+      ...options,
+      version: "0.9.0",
+    }),
+  ).rejects.toMatchObject({ code: "CONSENT_MISMATCH" });
+  await expect(
+    manage.enablePluginWithConsent("manual-mirror", {
+      ...options,
+      capabilities: [],
+    }),
+  ).rejects.toMatchObject({ code: "CONSENT_MISMATCH" });
+  await expect(
+    manage.enablePluginWithConsent("manual-mirror", {
+      version: "1.0.0",
+      userId: "admin",
+    }),
+  ).rejects.toMatchObject({ code: "CONSENT_REQUIRED" });
+  expect(db.grants).toEqual([]);
+  expect(db.rows.get("manual-mirror")?.state).toBe("disabled");
+  const result = await manage.enablePluginWithConsent("manual-mirror", options);
+  expect(result.state).toBe("active");
+  expect(db.grants).toContainEqual(
+    expect.objectContaining({
+      pluginId: "manual-mirror",
+      capability: "kv:own",
+      grantedBy: "admin",
+    }),
+  );
+});

src/backend/tests/plugins/registries.test.ts

@@ -256,4 +256,25 @@ describe("keys from a linked server", () => {
     await registries.setSyncedRegistryKeys([]);
     expect(getCustomPluginKeys()).toEqual([]);
   });
+
+  it("marks them as synced unless an admin added the same key here", async () => {
+    const synced = newKey();
+    const shared = newKey();
+    serve(URL_A, { registry: "acme", publicKey: shared });
+    await registries.addRegistry(URL_A, pluginKeyId(shared));
+    await registries.setSyncedRegistryKeys([synced, shared]);
+
+    expect(registries.isLocallyTrustedPluginKey(pluginKeyId(synced))).toBe(
+      false,
+    );
+    expect(registries.isLocallyTrustedPluginKey(pluginKeyId(shared))).toBe(
+      true,
+    );
+    expect(registries.isLocallyTrustedPluginKey("ec40e29bcc4986b2")).toBe(true);
+    await registries.setSyncedRegistryKeys([]);
+    expect(registries.isLocallyTrustedPluginKey(pluginKeyId(synced))).toBe(
+      false,
+    );
+    expect(registries.isLocallyTrustedPluginKey("unknown-key")).toBe(false);
+  });
 });

src/backend/tests/plugins/table-ddl.test.ts

@@ -308,4 +308,11 @@ describe("adoptTableSql", () => {
     const joined = adoptTableSql("sqlite", "fleets", adopted).join("\n");
     expect(splitStatements(joined)).toHaveLength(3);
   });
+
+  it("drops a chunk that is only comments", () => {
+    expect(splitStatements("-- nothing to do here.\n")).toEqual([]);
+    expect(
+      splitStatements("/* note */;\n-- why\nSELECT 1;\n-- trailing"),
+    ).toEqual(["-- why\nSELECT 1"]);
+  });
 });

src/backend/tests/sync/client/plugins.test.ts

@@ -11,6 +11,8 @@ const state = vi.hoisted(() => ({
   fetch: vi.fn(),
   loadBundled: vi.fn(),
   syncedKeys: vi.fn(async (_keys: unknown[]) => {}),
+  syncedOnlyKeys: new Set<string>(),
+  grants: [] as string[],
 }));
 
 vi.mock("../../../utils/logger.js", () => ({
@@ -28,10 +30,16 @@ vi.mock("../../../database/repositories/factory.js", () => ({
       state: state.enabled.has(id) ? "enabled" : "disabled",
     }),
   }),
-  createCurrentPluginPermissionGrantRepository: () => ({}),
+  createCurrentPluginPermissionGrantRepository: () => ({
+    listByPlugin: async () => [],
+    grant: async ({ capability }: { capability: string }) =>
+      void state.grants.push(capability),
+  }),
 }));
 vi.mock("../../../plugins/registries.js", () => ({
   setSyncedRegistryKeys: state.syncedKeys,
+  isLocallyTrustedPluginKey: (keyId: string) =>
+    keyId === "local-key" && !state.syncedOnlyKeys.has(keyId),
 }));
 vi.mock("../../../sync/client/http.js", () => ({
   remoteFetch: state.fetch,
@@ -56,8 +64,10 @@ vi.mock("../../../plugins/index.js", () => ({
   }),
 }));
 
-const { mirrorPlugins } = await import("../../../sync/client/plugins.js");
+const { mirrorPlugins, isServerManaged } =
+  await import("../../../sync/client/plugins.js");
 const { remoteJson } = await import("../../../sync/client/http.js");
+const { sendCoreAlert } = await import("../../../notify/core-notify.js");
 
 const bundled = {
   id: "ssh-terminal",
@@ -92,6 +102,9 @@ beforeEach(() => {
   state.install.mockReset();
   state.fetch.mockReset();
   state.loadBundled.mockReset();
+  state.syncedOnlyKeys = new Set();
+  state.grants = [];
+  vi.mocked(sendCoreAlert).mockClear();
   state.loadBundled.mockImplementation(async (id: string) => {
     const plugin = { ...bundled, id };
     state.loaded.set(id, plugin);
@@ -171,4 +184,226 @@ describe("mirrorPlugins", () => {
     expect(state.loaded.has("ssh-terminal")).toBe(true);
     expect(state.enabled.has("ssh-terminal")).toBe(true);
   });
+
+  describe("a user plugin the server has on", () => {
+    function serverRunsSignedBy(
+      keyId: string,
+      enabled = true,
+      version = keyId === "removed-key" ? "1.0.1" : "1.0.0",
+    ) {
+      state.loaded.set("extra", {
+        id: "extra",
+        source: "user",
+        state: "loaded",
+        signedBy: keyId,
+        manifest: { id: "extra", version, capabilities: ["net"] },
+      });
+      vi.mocked(remoteJson).mockResolvedValue({
+        plugins: [
+          {
+            id: "extra",
+            name: "Extra",
+            version,
+            source: "user",
+            artifact: true,
+            enabled,
+            active: enabled,
+            desktop: "mirror",
+            syncEntities: [],
+            granted: ["net"],
+          },
+        ],
+      });
+    }
+
+    it("turns it on when a key this desktop trusts signed it", async () => {
+      serverRunsSignedBy("local-key");
+
+      await mirrorPlugins({} as never);
+
+      expect(state.enabled.has("extra")).toBe(true);
+      expect(state.grants).toEqual(["net"]);
+    });
+
+    it.each(["server-key", "removed-key"])(
+      "leaves it off for untrusted key %s",
+      async (keyId) => {
+        serverRunsSignedBy(keyId);
+        state.syncedOnlyKeys.add("server-key");
+
+        await mirrorPlugins({} as never);
+
+        expect(state.enabled.has("extra")).toBe(false);
+        expect(state.grants).toEqual([]);
+        expect(sendCoreAlert).toHaveBeenCalledWith(
+          expect.objectContaining({ category: "termix.sync.unsigned_plugin" }),
+        );
+      },
+    );
+
+    it("leaves the server in charge of one a trusted key signed", () => {
+      serverRunsSignedBy("local-key");
+      expect(isServerManaged("extra")).toBe(true);
+    });
+
+    it.each(["server-key", "removed-key"])(
+      "lets this desktop's admin decide on one signed by %s",
+      async (keyId) => {
+        serverRunsSignedBy(keyId);
+        state.syncedOnlyKeys.add("server-key");
+        expect(isServerManaged("extra")).toBe(false);
+
+        state.enabled.add("extra");
+        await mirrorPlugins({} as never);
+        expect(state.enabled.has("extra")).toBe(true);
+      },
+    );
+
+    it("still switches an untrusted one off when the server does", async () => {
+      serverRunsSignedBy("server-key", false);
+      state.syncedOnlyKeys.add("server-key");
+      state.enabled.add("extra");
+
+      await mirrorPlugins({} as never);
+
+      expect(state.enabled.has("extra")).toBe(false);
+    });
+
+    it.each([
+      ["server-key", false],
+      ["local-key", true],
+    ])(
+      "after an update signed by %s, keeps it on: %s",
+      async (keyId, stays) => {
+        serverRunsSignedBy(keyId, true, "2.0.0");
+        state.syncedOnlyKeys.add("server-key");
+        const reviewed = state.loaded.get("extra")!;
+        state.loaded.set("extra", {
+          ...reviewed,
+          manifest: { id: "extra", version: "1.0.0", capabilities: ["net"] },
+        });
+        state.enabled.add("extra");
+        state.fetch.mockResolvedValue({
+          ok: true,
+          arrayBuffer: async () => new ArrayBuffer(4),
+          headers: new Headers(),
+        });
+        state.install.mockImplementation(async () => {
+          const plugin = { ...reviewed };
+          state.loaded.set("extra", plugin);
+          return plugin;
+        });
+
+        await mirrorPlugins({} as never);
+
+        expect(state.install).toHaveBeenCalled();
+        expect(state.enabled.has("extra")).toBe(stays);
+        expect(vi.mocked(sendCoreAlert).mock.calls.length > 0).toBe(!stays);
+      },
+    );
+  });
+});
+
+it("server bundled label must not enable a synced-only user plugin", async () => {
+  state.syncedOnlyKeys.add("server-key");
+  state.loaded.set("extra", {
+    id: "extra",
+    source: "user",
+    state: "loaded",
+    signedBy: "server-key",
+    manifest: { id: "extra", version: "1.0.0", capabilities: [] },
+  });
+  vi.mocked(remoteJson).mockResolvedValue({
+    plugins: [
+      {
+        id: "extra",
+        name: "Extra",
+        version: "1.0.0",
+        source: "bundled",
+        artifact: true,
+        enabled: true,
+        active: true,
+        desktop: "mirror",
+        syncEntities: [],
+        granted: [],
+      },
+    ],
+  });
+  await mirrorPlugins({} as never);
+  expect(state.enabled.has("extra")).toBe(false);
+});
+
+it("remote bundled label cannot preserve approval across an untrusted update", async () => {
+  const reviewed = {
+    id: "extra",
+    source: "user",
+    state: "loaded",
+    signedBy: "server-key",
+    manifest: { id: "extra", version: "1.0.0", capabilities: [] },
+  };
+  state.loaded.set("extra", reviewed);
+  state.syncedOnlyKeys.add("server-key");
+  state.enabled.add("extra");
+  vi.mocked(remoteJson).mockResolvedValue({
+    plugins: [
+      {
+        id: "extra",
+        name: "Extra",
+        version: "2.0.0",
+        source: "bundled",
+        artifact: true,
+        enabled: true,
+        active: true,
+        desktop: "mirror",
+        syncEntities: [],
+        granted: [],
+      },
+    ],
+  });
+  state.fetch.mockResolvedValue({
+    ok: true,
+    arrayBuffer: async () => new ArrayBuffer(4),
+    headers: new Headers(),
+  });
+  state.install.mockImplementation(async () => {
+    const plugin = {
+      ...reviewed,
+      manifest: { ...reviewed.manifest, version: "2.0.0" },
+    };
+    state.loaded.set("extra", plugin);
+    return plugin;
+  });
+  await mirrorPlugins({} as never);
+  expect(state.install).toHaveBeenCalledOnce();
+  expect(state.enabled.has("extra")).toBe(false);
+});
+
+it("waits for an in-flight local plugin change before applying a remote update", async () => {
+  const { serialized } = await import("../../../plugins/manage.js");
+  let release!: () => void;
+  let entered!: () => void;
+  const ready = new Promise<void>((resolve) => {
+    entered = resolve;
+  });
+  const barrier = new Promise<void>((resolve) => {
+    release = resolve;
+  });
+  const localChange = serialized(async () => {
+    entered();
+    await barrier;
+  });
+  await ready;
+  serverHas("1.1.0");
+  state.fetch.mockResolvedValue({ ok: false, status: 502 });
+  vi.mocked(remoteJson).mockClear();
+  const syncing = mirrorPlugins({} as never);
+  try {
+    await vi.waitFor(() => expect(remoteJson).toHaveBeenCalled());
+    expect(state.fetch).not.toHaveBeenCalled();
+  } finally {
+    release();
+  }
+  await localChange;
+  await syncing;
+  expect(state.fetch).toHaveBeenCalledOnce();
 });

src/backend/tests/sync/two-way.test.ts

@@ -14,6 +14,7 @@ const state = vi.hoisted(() => ({
   current: null as null | { drizzle: unknown },
   server: null as null | { drizzle: unknown },
   allow: true,
+  sharedHostIds: new Set<number>(),
 }));
 
 const SERVER_USER = "srv-user";
@@ -38,13 +39,18 @@ vi.mock("../../utils/system-crypto.js", () => ({
   },
 }));
 vi.mock("../../utils/data-crypto.js", () => ({
-  DataCrypto: { getUserDataKey: () => Buffer.alloc(32, 3) },
+  DataCrypto: {
+    getUserDataKey: () => Buffer.alloc(32, 3),
+    decryptRecord: (_table: string, record: unknown) => record,
+  },
 }));
 vi.mock("../../utils/permission-manager.js", () => ({
   PermissionManager: {
     getInstance: () => ({
       hasPermission: async () => state.allow,
-      canAccessHost: async () => ({ hasAccess: false }),
+      canAccessHost: async (_userId: string, hostId: number) => ({
+        hasAccess: state.sharedHostIds.has(hostId),
+      }),
       getUserPermissions: async () => [],
     }),
   },
@@ -147,11 +153,14 @@ const { default: syncRouter } = await import("../../sync/server/routes.js");
 const { SyncEngine } = await import("../../sync/client/engine.js");
 const { createLink, getLink, updateLink } =
   await import("../../sync/client/link-store.js");
-const { markChanged, resetFeed } = await import("../../sync/server/feed.js");
+const { markChanged, reconcileUser, resetFeed } =
+  await import("../../sync/server/feed.js");
 const { resetSeqAllocator, listConflicts, getConflict, deleteConflict } =
   await import("../../sync/records.js");
 const { createResolvers, writeWireRow } = await import("../../sync/store.js");
 const { getEntity } = await import("../../plugins/sync-registry.js");
+const { FieldCrypto } = await import("../../utils/field-crypto.js");
+const { syncLogger } = await import("../../utils/logger.js");
 
 const app = express();
 app.use(express.json({ limit: "5mb" }));
@@ -239,6 +248,7 @@ beforeEach(async () => {
   resetFeed();
   resetSeqAllocator();
   state.allow = true;
+  state.sharedHostIds.clear();
   server = await side(SERVER_USER);
   state.server = server.ctx;
   desktops = [await side("desk-a"), await side("desk-b")];
@@ -480,6 +490,181 @@ describe("after linking", () => {
   });
 });
 
+describe("a server row that cannot be read", () => {
+  async function recordOf(where: Side, syncId: string) {
+    const [record] = await on(where, () =>
+      db(where)
+        .select()
+        .from(schema.syncRecords)
+        .where(
+          and(
+            eq(schema.syncRecords.entityType, "hosts"),
+            eq(schema.syncRecords.syncId, syncId),
+          ),
+        ),
+    );
+    return record;
+  }
+
+  it.each(["upsert", "delete"] as const)(
+    "retries a local %s after the server row becomes readable",
+    async (op) => {
+      const [desk] = desktops;
+      await on(server, () => addHost(server, { name: "a" }));
+      const engine = await linkDesktop(desk);
+      await pass(desk, engine);
+
+      await on(desk, () =>
+        (op === "delete"
+          ? db(desk).delete(schema.hosts)
+          : db(desk).update(schema.hosts).set({ ip: "desk-edit" })
+        ).where(eq(schema.hosts.syncId, "host-a")),
+      );
+      await on(server, async () => {
+        await db(server)
+          .update(schema.hosts)
+          .set({ ip: "server-edit" })
+          .where(eq(schema.hosts.syncId, "host-a"));
+        await reconcileUser(SERVER_USER, { force: true });
+        // Then its secret stops decrypting, as under a different key.
+        const [host] = await hostsOf(server);
+        await db(server)
+          .update(schema.hosts)
+          .set({
+            password: FieldCrypto.encryptField(
+              "s3cret",
+              Buffer.alloc(32, 9),
+              String(host.id),
+              "password",
+            ),
+          })
+          .where(eq(schema.hosts.id, host.id));
+      });
+
+      const warn = vi.spyOn(syncLogger, "warn");
+      try {
+        await pass(desk, engine);
+        expect(warn).toHaveBeenCalledWith(
+          expect.any(String),
+          expect.objectContaining({
+            entityType: "hosts",
+            syncId: "host-a",
+            error: expect.any(String),
+          }),
+        );
+      } finally {
+        warn.mockRestore();
+      }
+
+      const [local] = await on(desk, () => hostsOf(desk));
+      expect(local?.ip).toBe(op === "upsert" ? "desk-edit" : undefined);
+      expect(await on(desk, () => listConflicts(desk.userId))).toEqual([]);
+      expect((await recordOf(desk, "host-a")).error).toBe("unavailable");
+
+      // Restore the same server content without another local edit or a new
+      // server revision. The failed operation must still be retried.
+      await on(server, () =>
+        db(server)
+          .update(schema.hosts)
+          .set({ password: null })
+          .where(eq(schema.hosts.syncId, "host-a")),
+      );
+      await on(server, () => reconcileUser(SERVER_USER, { force: true }));
+      await pass(desk, engine);
+      const [after] = await on(desk, () => hostsOf(desk));
+      expect(after?.ip).toBe("server-edit");
+      expect((await recordOf(desk, "host-a")).error).toBeNull();
+      const conflicts = await on(desk, () => listConflicts(desk.userId));
+      expect(conflicts.map((c) => JSON.parse(c.localRow).ip)).toEqual(
+        op === "upsert" ? ["desk-edit"] : [],
+      );
+    },
+  );
+
+  it("keeps the local row when a conflict carries no row", async () => {
+    const [desk] = desktops;
+    await on(server, () => addHost(server, { name: "a" }));
+    const engine = await linkDesktop(desk);
+    await pass(desk, engine);
+
+    await on(desk, async () => {
+      const link = (await getLink())!;
+      const settle = (
+        engine as unknown as {
+          settle: (...args: unknown[]) => Promise<void>;
+        }
+      ).settle.bind(engine);
+      await settle(
+        link,
+        {
+          entityType: "hosts",
+          syncId: "host-a",
+          baseRevision: 1,
+          op: "upsert",
+          row: { syncId: "host-a", name: "a" },
+        },
+        {
+          entityType: "hosts",
+          syncId: "host-a",
+          status: "conflict",
+          revision: 2,
+          deleted: false,
+          row: null,
+        },
+        "hash",
+      );
+    });
+
+    expect((await on(desk, () => hostsOf(desk))).map((h) => h.name)).toEqual([
+      "a",
+    ]);
+    const record = await recordOf(desk, "host-a");
+    expect(record.deleted).toBe(false);
+    expect(record.revision).toBe(1);
+  });
+});
+
+describe("hosts shared with the account", () => {
+  it("arrive on the desktop with their text columns as stored", async () => {
+    const [desk] = desktops;
+    await on(server, async () => {
+      await server.db.run(
+        sql`INSERT INTO users (id, username, password_hash, is_admin) VALUES ('owner', 'owner', '', 0)`,
+      );
+      await db(server).insert(schema.hosts).values({
+        userId: "owner",
+        name: "theirs",
+        ip: "10.0.0.5",
+        port: 22,
+        username: "root",
+        authType: "none",
+        forceKeyboardInteractive: "true",
+        syncId: "host-theirs",
+      });
+      const [host] = await db(server).select().from(schema.hosts);
+      await db(server).insert(schema.hostAccess).values({
+        hostId: host.id,
+        userId: SERVER_USER,
+        grantedBy: "owner",
+        permissionLevel: "view",
+      });
+      state.sharedHostIds.add(host.id);
+      markChanged();
+    });
+
+    const engine = await linkDesktop(desk);
+    await pass(desk, engine);
+
+    const [copy] = await on(desk, () => hostsOf(desk));
+    expect(copy?.name).toBe("theirs");
+    expect(copy.forceKeyboardInteractive).toBe("true");
+    expect(JSON.parse(copy.sharedSource!)).toMatchObject({
+      owner: "owner",
+      permissionLevel: "view",
+    });
+  });
+});
+
 describe("two desktops on one account", () => {
   it("converge on edits, creates and deletes made offline on each", async () => {
     const [a, b] = desktops;

src/backend/tests/utils/trusted-proxy-auth.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   getTrustedProxyAuthConfig,
+  getTrustedProxySourceAddress,
   isTrustedProxyAddress,
   parseTrustedProxyRoleMap,
   resolveTrustedProxyRoles,
@@ -28,6 +29,35 @@ describe("trusted proxy authentication config", () => {
     expect(isTrustedProxyAddress("2001:db8::5", trusted)).toBe(true);
   });
 
+  it("judges requests relayed by the bundled nginx by nginx's own peer", () => {
+    const viaNginx = (peer?: string) => ({
+      headers: peer ? { "x-termix-proxy-peer": peer } : {},
+      socket: { remoteAddress: "::ffff:127.0.0.1" },
+    });
+    expect(getTrustedProxySourceAddress(viaNginx("172.20.0.10"))).toBe(
+      "172.20.0.10",
+    );
+    // A client reaching nginx directly is reported as itself, so trusting
+    // the auth proxy no longer means trusting nginx on loopback.
+    expect(
+      isTrustedProxyAddress(
+        getTrustedProxySourceAddress(viaNginx("203.0.113.7")),
+        ["127.0.0.1"],
+      ),
+    ).toBe(false);
+    // A local reverse proxy that does not set the header keeps working.
+    expect(getTrustedProxySourceAddress(viaNginx())).toBe("::ffff:127.0.0.1");
+  });
+
+  it("ignores the peer header on connections that are not from loopback", () => {
+    expect(
+      getTrustedProxySourceAddress({
+        headers: { "x-termix-proxy-peer": "172.20.0.10" },
+        socket: { remoteAddress: "198.51.100.9" },
+      }),
+    ).toBe("198.51.100.9");
+  });
+
   it("fails closed when a supplied external role is not mapped", () => {
     const roleMap = parseTrustedProxyRoleMap(
       JSON.stringify({ operators: ["operator"], viewers: "readonly" }),

src/backend/utils/trusted-proxy-auth.ts

@@ -1,3 +1,4 @@
+import type { IncomingHttpHeaders } from "node:http";
 import { BlockList, isIP } from "node:net";
 
 export interface TrustedProxyAuthConfig {
@@ -108,6 +109,31 @@ export function isTrustedProxyAddress(
   );
 }
 
+function isLoopbackAddress(address: string): boolean {
+  const normalized = normalizeAddress(address);
+  return normalized === "::1" || normalized.startsWith("127.");
+}
+
+/**
+ * The address checked against the allowlist. The bundled nginx always
+ * connects from loopback and sets X-Termix-Proxy-Peer to its own TCP peer,
+ * overwriting whatever the client sent, so behind it the proxy that counts
+ * is that peer rather than nginx. Any other connection is judged by its
+ * socket address.
+ */
+export function getTrustedProxySourceAddress(req: {
+  headers: IncomingHttpHeaders;
+  socket: { remoteAddress?: string };
+}): string | undefined {
+  const socketAddress = req.socket.remoteAddress;
+  const peer = req.headers["x-termix-proxy-peer"];
+  return socketAddress &&
+    isLoopbackAddress(socketAddress) &&
+    typeof peer === "string"
+    ? peer
+    : socketAddress;
+}
+
 export function resolveTrustedProxyRoles(
   header: string,
   roleMap: Map<string, string[]>,

src/types/host-sidebar-preferences.ts

@@ -88,6 +88,8 @@ export interface HostSidebarDisplayPreferences extends HostRowFields {
   /** When false, nested folders hide the parent-path breadcrumb before their name. */
   showFolderPaths: boolean;
   hostClickBehavior: HostClickBehavior;
+  /** When true, the sidebar closes after a host is opened from it. */
+  closeOnOpen: boolean;
   /**
    * Host action id to whether it shows in the row's connect bar. An action
    * missing here follows its own default. Every action stays in the menu.
@@ -163,6 +165,7 @@ export function defaultHostSidebarPreferences(): HostSidebarPreferences {
       openOnDoubleClick: false,
       showFolderPaths: true,
       hostClickBehavior: "newTab",
+      closeOnOpen: false,
       barActions: {},
       ...defaultHostRowFields(),
     },
@@ -274,6 +277,10 @@ export function sanitizeHostSidebarPreferences(
     )
       ? (displayObj.hostClickBehavior as HostClickBehavior)
       : defaults.display.hostClickBehavior,
+    closeOnOpen:
+      typeof displayObj.closeOnOpen === "boolean"
+        ? displayObj.closeOnOpen
+        : defaults.display.closeOnOpen,
     barActions: sanitizeBarActions(displayObj.barActions),
   };
 

src/ui/AppShell.tsx

@@ -2698,6 +2698,7 @@ export function AppShell({
                   if (isMobile) setSidebarOpen(false);
                 }}
                 onEditHost={editHostInManager}
+                onCloseSidebar={() => setSidebarOpen(false)}
                 hostTree={realHostTree ?? undefined}
                 loading={hostsLoading}
                 onEditingChange={panelEditingSetter("hosts")}

src/ui/api/plugins-api.ts

@@ -263,6 +263,8 @@ export interface PluginSummary {
   /** Environment variables the plugin reads. Admins only. */
   env?: PluginEnvVar[];
   signedBy?: string | null;
+  /** A linked server decides whether it runs here. Admins only. */
+  managedByServer?: boolean;
 }
 
 export async function getPlugins(): Promise<PluginSummary[]> {
@@ -510,10 +512,12 @@ export async function previewPluginState(
 export async function setPluginState(
   pluginId: string,
   enabled: boolean,
+  consent?: { version: string; capabilities: string[] },
 ): Promise<PluginStateChange> {
   try {
     const response = await rbacApi.patch(`${pluginPath(pluginId)}/state`, {
       enabled,
+      ...consent,
     });
     return response.data;
   } finally {

src/ui/auth/Auth.tsx

@@ -434,10 +434,11 @@ export function Auth({ onLogin }: AuthProps) {
         })
         .catch(() => {
           if (cancelled) return;
+          // Past the first few tries, show the error but keep checking, so
+          // the page moves on by itself once the server is back.
           if (attemptNumber >= maxAttempts) {
             setDbConnectionFailed(true);
             setDbHealthChecking(false);
-            return;
           }
           const delay = Math.min(500 * 2 ** attemptNumber, 5000);
           retryTimer = setTimeout(() => {

src/ui/auth/ElectronLoginForm.tsx

@@ -73,11 +73,21 @@ export function ElectronLoginForm({
   );
 
   // postMessage from server Auth.tsx after the backend has set the HttpOnly cookie.
-  // Uses '*' as target origin because the iframe may be cross-origin (e.g. remote Docker server).
+  // Only the server's own origin is trusted: the iframe can navigate away
+  // (identity provider, redirects), and those pages must not hand us a token,
+  // start a system browser login, or receive the replies.
   useEffect(() => {
+    let serverOrigin: string;
+    try {
+      serverOrigin = new URL(serverUrl).origin;
+    } catch {
+      return;
+    }
+
     const handleMessage = async (event: MessageEvent) => {
       try {
         if (event.source !== iframeRef.current?.contentWindow) return;
+        if (event.origin !== serverOrigin) return;
         if (!event.data || typeof event.data !== "object") return;
         const {
           type,
@@ -115,7 +125,7 @@ export function ElectronLoginForm({
                 providerId,
                 ...result,
               },
-              "*",
+              serverOrigin,
             );
           };
           const electronAPI = (
@@ -181,14 +191,14 @@ export function ElectronLoginForm({
             success: false,
             error,
           },
-          "*",
+          serverOrigin,
         );
       }
     };
 
     window.addEventListener("message", handleMessage);
     return () => window.removeEventListener("message", handleMessage);
-  }, [handleAuthSuccess, t]);
+  }, [handleAuthSuccess, serverUrl, t]);
 
   useEffect(() => {
     const iframe = iframeRef.current;

src/ui/dashboard/DashboardTab.tsx

@@ -53,6 +53,8 @@ import {
 } from "@/lib/ServerStatusContext";
 import { withLiveHostStatus } from "@/sidebar/live-host-status";
 import { sshHostToHost } from "@/sidebar/HostManagerData";
+import { sortHostTree, type SortKey } from "@/sidebar/host-sort";
+import { Select2 } from "@/components/select2";
 import {
   CountersStrip,
   HostStatusList,
@@ -66,6 +68,17 @@ import { docsUrl } from "@/lib/docs";
 
 export { HostStatusList as HostStatusCard } from "./dashboard-core-cards";
 
+const HOST_STATUS_SORT_LABELS: Partial<Record<SortKey, string>> = {
+  default: "hosts.sortDefault",
+  "name-asc": "hosts.sortNameAsc",
+  "name-desc": "hosts.sortNameDesc",
+  "ip-asc": "hosts.sortIpAsc",
+  "ip-desc": "hosts.sortIpDesc",
+  "status-online": "hosts.sortOnlineFirst",
+  "status-offline": "hosts.sortOfflineFirst",
+};
+const HOST_STATUS_SORTS = Object.keys(HOST_STATUS_SORT_LABELS) as SortKey[];
+
 // ─── Types ────────────────────────────────────────────────────────────────────
 
 type PanelId = "main" | "side";
@@ -460,7 +473,20 @@ export function DashboardTab({
   const [dbHealth, setDbHealth] = useState<"healthy" | "error">("healthy");
   const [credentialCount, setCredentialCount] = useState(0);
   const [activity, setActivity] = useState<RecentActivityItem[]>([]);
-  const statusCheckHosts = hosts.filter(isStatusCheckEnabled);
+  const [hostStatusSort, setHostStatusSort] = useState<SortKey>(() => {
+    try {
+      const saved = localStorage.getItem("dashboardTab.hostStatusSort");
+      return HOST_STATUS_SORTS.includes(saved as SortKey)
+        ? (saved as SortKey)
+        : "default";
+    } catch {
+      return "default";
+    }
+  });
+  const statusCheckHosts = sortHostTree(
+    { name: "", children: hosts.filter(isStatusCheckEnabled) },
+    hostStatusSort,
+  ).children as Host[];
 
   useEffect(() => {
     let mounted = true;
@@ -580,7 +606,28 @@ export function DashboardTab({
         icon: core.icon,
         frame: core.frame,
         action:
-          id === "recent_activity" && activity.length > 0 ? (
+          id === "host_status" && statusCheckHosts.length > 1 ? (
+            <Select2
+              value={hostStatusSort}
+              aria-label={t("hosts.sortHosts")}
+              onChange={(e) => {
+                const key = e.target.value as SortKey;
+                setHostStatusSort(key);
+                try {
+                  localStorage.setItem("dashboardTab.hostStatusSort", key);
+                } catch {
+                  /* ignore */
+                }
+              }}
+              className="h-6 border border-border bg-background px-1.5 text-[10px] outline-none focus:ring-1 focus:ring-ring"
+            >
+              {HOST_STATUS_SORTS.map((key) => (
+                <option key={key} value={key}>
+                  {t(HOST_STATUS_SORT_LABELS[key]!)}
+                </option>
+              ))}
+            </Select2>
+          ) : id === "recent_activity" && activity.length > 0 ? (
             <button
               type="button"
               onClick={() => void handleClearActivity()}

src/ui/lib/embedded-frame.ts

@@ -16,9 +16,14 @@ export function isInMobileWebView(): boolean {
   );
 }
 
+// Being framed alone is not enough: any site could frame this page and
+// receive the token posted to window.parent. The desktop app tags every
+// request and frame with its own user agent, which a web page cannot fake
+// in someone else's browser.
 export function isInElectronWebView(): boolean {
   if (isInMobileWebView()) return false;
   if ((window as EmbeddedFrameWindow).IS_ELECTRON_WEBVIEW) return true;
+  if (!/Termix-Desktop\//.test(navigator.userAgent)) return false;
   try {
     if (window.self !== window.top) return true;
   } catch {

src/ui/locales/en.json

@@ -644,6 +644,8 @@
     "actionsClick": "Click to expand/collapse",
     "openOnDoubleClick": "Open on double click",
     "openOnDoubleClickDesc": "Require a double click to open a host session instead of a single click",
+    "closeOnOpen": "Hide sidebar after opening",
+    "closeOnOpenDesc": "Close the sidebar after you open a host from it",
     "showFolderPaths": "Show folder paths",
     "showFolderPathsDesc": "Show the parent folder path above nested subfolder names. Subfolders stay indented either way.",
     "rowDetailsTitle": "Row details",
@@ -1097,7 +1099,7 @@
     "acceptNewKey": "Accept New Key & Continue"
   },
   "errors": {
-    "databaseConnection": "Could not connect to the database",
+    "databaseConnection": "The Termix server is not responding",
     "embeddedServerFailed": "Termix's local server could not start",
     "unknownError": "Unknown error",
     "syncedHostMissing": "The synced host does not exist on the linked server",
@@ -1124,7 +1126,7 @@
   "messages": {
     "registrationDisabled": "You have no Termix account yet. Ask an admin to turn on Auto-create external accounts.",
     "userNotAllowed": "Your account is not authorized to register. Please contact an administrator.",
-    "databaseConnectionFailed": "Failed to connect to the database server",
+    "databaseConnectionFailed": "It may still be starting, or it stopped. This page keeps trying and continues on its own once the server is back.",
     "embeddedServerPortInUse": "Port {{port}} is already in use by another program. This is usually a Termix Docker container or a leftover Termix process from a previous session. Close it, then restart Termix.",
     "embeddedServerPortInUseUnknownPort": "One of the ports Termix needs is already in use by another program. Close whatever is using it, then restart Termix.",
     "embeddedServerOldDatabase": "Your local data is from Termix 2.8 or older and has to pass through 2.9 first. Install Termix 2.9.1, open it once so it can move your data, then update to this version again.",
@@ -1967,6 +1969,7 @@
         "syncEntities_other": "Desktop sync"
       },
       "consent": {
+        "enableTitle": "Enable {{name}}?",
         "installTitle": "Install {{name}}",
         "updateTitle": "Update {{name}}",
         "agreeUpdate": "Agree and update",

src/ui/locales/translated/id_ID.json

@@ -72,7 +72,7 @@
     "deleteFolder": "Hapus folder",
     "deleteCredentialConfirm": "Hapus kredensial \"{{name}}\"?",
     "deletedCredential": "{{name}} telah dihapus",
-    "deploySSHKeyTitle": "Terapkan kunci ke host",
+    "deploySSHKeyTitle": "Deploy kunci ke host",
     "loadingCredentials": "Memuat kredensial...",
     "noCredentialsFound": "Tidak ada kredensial ditemukan",
     "noCredentialsMatchSearch": "Tidak ada kredensial yang cocok dengan pencarian Anda",
@@ -80,7 +80,7 @@
     "failedToReorder": "Gagal mengurutkan ulang kredensial",
     "failedToMoveCredential": "Gagal memindahkan kredensial",
     "sortManual": "Manual (seret untuk mengurutkan)",
-    "customizeSidebar": "Sesuaikan Bilah Samping",
+    "customizeSidebar": "Sesuaikan Sidebar",
     "customizeSidebarDescription": "Pilih tampilan dan perilaku daftar kredensial.",
     "customizeDensityTitle": "Kepadatan",
     "densityComfortableDesc": "Satu kredensial per baris, dengan detail tambahan.",
@@ -108,20 +108,20 @@
     "actionsOnly": "Hanya sambung, lainnya saat diklik",
     "actionsHover": "Tampilkan saat kursor di atas",
     "actionsClick": "Tampilkan saat diklik",
-    "customizeSortHint": "Urutan pengurutan ada di menu urutkan pada bilah alat.",
+    "customizeSortHint": "Urutan pengurutan ada di menu urutkan pada toolbar.",
     "expandActions": "Bentangkan tindakan",
     "collapseActions": "Ciutkan tindakan",
     "backToHosts": "Kembali ke Host",
     "backToCredentials": "Kembali ke Kredensial",
     "searchCredentialsPlaceholder": "Cari kredensial…",
-    "deployDialogTitle": "Terapkan Kunci SSH",
-    "deployDialogDesc": "Terapkan {{name}} ke authorized_keys host.",
+    "deployDialogTitle": "Deploy Kunci SSH",
+    "deployDialogDesc": "Deploy {{name}} ke authorized_keys host.",
     "targetHostLabel": "Host Target",
     "selectHostOption": "Pilih host...",
-    "deployingBtn": "Menerapkan...",
-    "deployBtn": "Terapkan",
-    "keyDeployedSuccess": "Kunci berhasil diterapkan",
-    "failedToDeployKey": "Gagal menerapkan kunci",
+    "deployingBtn": "Men-deploy...",
+    "deployBtn": "Deploy",
+    "keyDeployedSuccess": "Kunci berhasil di-deploy",
+    "failedToDeployKey": "Gagal men-deploy kunci",
     "folderRenamedTo": "Folder diubah namanya menjadi \"{{name}}\"",
     "failedToRenameFolder": "Gagal mengubah nama folder",
     "arrangeUnlockedSwitchedToManual": "Beralih ke pengurutan manual agar urutan Anda tetap terjaga",
@@ -181,9 +181,9 @@
     "add": "Tambah",
     "update": "Perbarui",
     "noResults": "Tidak ada hasil ditemukan",
-    "sidebar": "Bilah sisi",
-    "mobileSidebarDescription": "Menampilkan bilah sisi mobile.",
-    "toggleSidebar": "Alihkan Bilah Sisi",
+    "sidebar": "Sidebar",
+    "mobileSidebarDescription": "Menampilkan sidebar mobile.",
+    "toggleSidebar": "Alihkan Sidebar",
     "search": "Cari...",
     "new": "Baru",
     "docs": "Dokumentasi"
@@ -225,7 +225,7 @@
     "securityTitle": "Amankan akun Anda",
     "securityIntro": "Tambahkan passkey atau aplikasi autentikator ke akun Anda. Anda juga dapat melakukan ini nanti di Pengaturan, di bawah Keamanan.",
     "desktopTitle": "Bagaimana Anda ingin menggunakan Termix?",
-    "desktopBody": "Anda dapat mengubah ini kapan saja dari Sinkronisasi di bilah sisi.",
+    "desktopBody": "Anda dapat mengubah ini kapan saja dari Sinkronisasi di sidebar.",
     "desktopLocalTitle": "Hanya di perangkat ini",
     "desktopLocalBody": "Semuanya disimpan di sini. Tidak perlu pengaturan.",
     "desktopLinkTitle": "Dengan server Termix saya",
@@ -297,8 +297,8 @@
     "fullscreenUnsupported": "Layar penuh tidak didukung oleh browser ini",
     "fullscreenFailed": "Gagal mengubah mode layar penuh",
     "resetSidebarWidth": "Atur ulang lebar",
-    "collapseSidebar": "Ciutkan bilah sisi",
-    "openSidebar": "Buka bilah sisi",
+    "collapseSidebar": "Ciutkan sidebar",
+    "openSidebar": "Buka sidebar",
     "confirmCloseHost": "Tutup {{host}}?",
     "enterFullscreen": "Masuk layar penuh (Ctrl+Shift+F)",
     "exitFullscreen": "Keluar layar penuh (Ctrl+Shift+F)",
@@ -310,11 +310,11 @@
     "searchEverything": "Cari host, tab, dan tindakan",
     "search": "Cari",
     "hiddenCount_other": "{{count}} disembunyikan",
-    "showInRail": "Tampilkan di bilah sisi",
+    "showInRail": "Tampilkan di sidebar",
     "moveUp": "Pindah ke atas",
     "moveDown": "Pindah ke bawah",
     "resetRailOrder": "Atur ulang urutan",
-    "hideFromRail": "Sembunyikan dari bilah sisi",
+    "hideFromRail": "Sembunyikan dari sidebar",
     "openSettings": "Buka pengaturan",
     "settings": "Pengaturan",
     "manage": "Kelola",
@@ -359,7 +359,7 @@
     "tabSharing": "Berbagi",
     "tabAuthentication": "Autentikasi",
     "terminal": "Terminal",
-    "tunnel": "Terowongan",
+    "tunnel": "Tunnel",
     "serverStats": "Metrik Host",
     "status": {
       "online": "Online",
@@ -377,8 +377,8 @@
     "editHostTooltip": "Edit host",
     "behavior": "Perilaku",
     "scrollbackBuffer": "Buffer Gulir",
-    "sshAgentForwarding": "Penerusan Agen SSH",
-    "selectSnippet": "Pilih cuplikan",
+    "sshAgentForwarding": "SSH Agent Forwarding",
+    "selectSnippet": "Pilih snippet",
     "forceKeyboardInteractive": "Paksa Keyboard-Interaktif",
     "overrideCredentialUsername": "Timpa Nama Pengguna Kredensial",
     "overrideCredentialUsernameDesc": "Gunakan nama pengguna yang ditentukan di atas daripada nama pengguna kredensial",
@@ -474,8 +474,8 @@
     "insecure": "Tidak Aman",
     "syntaxHighlightingCategories": "Kategori Sorotan",
     "syntaxHighlightingCategoriesDesc": "Pilih jenis konten yang akan diberi warna",
-    "sshAgentForwardingLabel": "Penerusan Agen SSH",
-    "sshAgentForwardingShortDesc": "Izinkan host jarak jauh ini menggunakan agen SSH lokal Anda untuk koneksi lebih lanjut. Ini tidak diperlukan untuk autentikasi Agen.",
+    "sshAgentForwardingLabel": "SSH Agent Forwarding",
+    "sshAgentForwardingShortDesc": "Izinkan host jarak jauh ini menggunakan SSH agent lokal Anda untuk koneksi lebih lanjut. Ini tidak diperlukan untuk autentikasi Agent.",
     "sudoPasswordAutoFillShortDesc": "Sediakan otomatis kata sandi sudo saat diminta",
     "sudoPasswordLabel": "Kata Sandi Sudo",
     "sudoPasswordSaved": "Kata sandi disimpan, ketik untuk mengubah",
@@ -615,13 +615,13 @@
     "GroupByProtocol": "Protokol",
     "GroupByAuth": "Jenis autentikasi",
     "groupUngrouped": "Tidak dikelompokkan",
-    "customizeSidebar": "Sesuaikan bilah sisi",
+    "customizeSidebar": "Sesuaikan sidebar",
     "customizeSidebarDescription": "Pilih tampilan dan perilaku daftar host.",
     "customizeDensityTitle": "Kepadatan",
     "customizeBehaviorTitle": "Perilaku",
     "connectBarTitle": "Bilah koneksi",
     "connectBarDesc": "Pilih tindakan mana yang ditampilkan sebagai tombol pada host. Semua tindakan tetap ada di menu host.",
-    "customizeSortHint": "Urutan pengurutan dan pengelompokan terdapat di menu urutkan dan kelompokkan pada bilah alat.",
+    "customizeSortHint": "Urutan pengurutan dan pengelompokan terdapat di menu urutkan dan kelompokkan pada toolbar.",
     "densityComfortableDesc": "Detail lebih banyak per host: alamat, tag, dan penggunaan sumber daya.",
     "densityCompactDesc": "Satu baris per host, untuk daftar yang lebih panjang.",
     "display": "Tampilan",
@@ -725,7 +725,7 @@
       "groupNotes": "Catatan",
       "groupTags": "Tag & sematan",
       "groupProxy": "Proxy",
-      "groupJumpHosts": "Host lompat",
+      "groupJumpHosts": "Jump host",
       "groupFeatureFlags": "Pengaturan plugin",
       "groupAdvanced": "Konfigurasi lanjutan",
       "preview": "Pratinjau",
@@ -804,7 +804,7 @@
       "levels": {
         "connect": {
           "label": "Sambungkan",
-          "description": "Hanya membuka sesi: terminal, desktop jarak jauh, pengelola file, terowongan, dan Docker. Tidak ada akses ke konfigurasi host."
+          "description": "Hanya membuka sesi: terminal, remote desktop, file manager, tunnel, dan Docker. Tidak ada akses ke konfigurasi host."
         },
         "view": {
           "label": "Lihat",
@@ -872,14 +872,14 @@
     "arrangeUnlockedSwitchedToManual": "Beralih ke pengurutan manual agar urutan Anda tetap",
     "dragToRearrange": "Seret untuk mengatur ulang",
     "arrangeUnlocked": "Buka kunci seret untuk mengatur ulang",
-    "webUiBindHostUnreachable": "Browser Anda tidak dapat menjangkau 127.0.0.1 pada mesin yang menjalankan Termix, sehingga titik akhir ini tidak akan dimuat. Gunakan alamat yang dijawab oleh mesin tersebut, seperti 0.0.0.0.",
-    "webUiBindHostSharesSessionCookie": "Dari browser ini, terowongan akan dijangkau di nama host yang sama tempat Termix disajikan, sehingga layanan terowongan akan menerima sesi Termix Anda. Cookie mengabaikan port. Titik akhir ini akan menolak untuk dibuka di sini; ini berfungsi dari aplikasi desktop Termix, atau ketika Termix dibuka di localhost.",
-    "webUiErrorLabelRequired": "Titik akhir {{row}} memerlukan label.",
-    "webUiErrorLabelDuplicate": "Setiap titik akhir memerlukan nama yang berbeda.",
-    "webUiErrorPortRange": "Titik akhir {{row}} memerlukan port antara 1 dan 65535.",
-    "webUiErrorPathInvalid": "Titik akhir {{row}} memiliki jalur yang tidak valid. Gunakan jalur seperti /admin.",
+    "webUiBindHostUnreachable": "Browser Anda tidak dapat menjangkau 127.0.0.1 pada mesin yang menjalankan Termix, sehingga endpoint ini tidak akan dimuat. Gunakan alamat yang dijawab oleh mesin tersebut, seperti 0.0.0.0.",
+    "webUiBindHostSharesSessionCookie": "Dari browser ini, forward akan dijangkau di nama host yang sama tempat Termix disajikan, sehingga layanan yang di-tunnel akan menerima sesi Termix Anda. Cookie mengabaikan port. Endpoint ini akan menolak untuk dibuka di sini; ini berfungsi dari aplikasi desktop Termix, atau ketika Termix dibuka di localhost.",
+    "webUiErrorLabelRequired": "Endpoint {{row}} memerlukan label.",
+    "webUiErrorLabelDuplicate": "Setiap endpoint memerlukan nama yang berbeda.",
+    "webUiErrorPortRange": "Endpoint {{row}} memerlukan port antara 1 dan 65535.",
+    "webUiErrorPathInvalid": "Endpoint {{row}} memiliki jalur yang tidak valid. Gunakan jalur seperti /admin.",
     "copyViewUrlAction": "Salin tautan {{name}}",
-    "filterAuthAgent": "Agen SSH",
+    "filterAuthAgent": "SSH Agent",
     "authTypeNeedsPlugin": "Host ini menggunakan {{type}}, yang memerlukan {{plugin}}. Fitur ini dinonaktifkan di server ini.",
     "authTypeUnknown": "Host ini menggunakan {{type}}, yang tidak tersedia di server ini.",
     "authFieldsAfterSave": "Simpan host terlebih dahulu, lalu isi bidang-bidang ini.",
@@ -932,7 +932,7 @@
     "newPaneRight": "Panel baru di sebelah kanan",
     "newPaneBelow": "Panel baru di bawah",
     "emptyTitle": "Panel kosong",
-    "emptyHint": "Pilih sesuatu untuk ditampilkan di sini. Saat panel ini dipilih, apa pun yang Anda buka dari bilah sisi juga akan terbuka di sini.",
+    "emptyHint": "Pilih sesuatu untuk ditampilkan di sini. Saat panel ini dipilih, apa pun yang Anda buka dari sidebar juga akan terbuka di sini.",
     "openTabs": "Buka tab",
     "noOpenTabs": "Tidak ada tab lain yang terbuka",
     "hosts": "Host",
@@ -972,7 +972,7 @@
   },
   "connections": {
     "noConnections": "Tidak ada koneksi",
-    "noConnectionsDesc": "Buka terminal, manajer file, atau remote desktop untuk melihat koneksi di sini",
+    "noConnectionsDesc": "Buka terminal, file manager, atau remote desktop untuk melihat koneksi di sini",
     "connectedFor": "Terhubung selama {{duration}}",
     "connected": "Terhubung",
     "disconnected": "Terputus",
@@ -1038,7 +1038,7 @@
     "sshTimeoutDescription": "Upaya autentikasi habis waktu. Silakan coba lagi.",
     "sshProvideCredentialsDescription": "Silakan masukkan kredensial SSH Anda untuk terhubung ke server ini.",
     "sshPasswordDescription": "Masukkan kata sandi untuk koneksi SSH ini.",
-    "sshKeyPasswordDescription": "Jika kunci SSH Anda terenkripsi, masukkan frasa sandi di sini.",
+    "sshKeyPasswordDescription": "Jika kunci SSH Anda terenkripsi, masukkan passphrase di sini.",
     "passphraseRequired": "Passphrase Diperlukan",
     "passphraseRequiredDescription": "Kunci SSH terenkripsi. Masukkan passphrase untuk membukanya.",
     "external": "Eksternal",
@@ -1401,7 +1401,7 @@
     "manageTabDanger": "Bahaya",
     "manageEditorBack": "Kembali ke data {{username}}",
     "dataLockedBadge": "TERKUNCI",
-    "dataLockedNotice": "Data {{username}} tetap terkunci hingga mereka masuk berikutnya. Host, kredensial, dan cuplikan mereka tidak dapat dilihat atau diedit hingga saat itu.",
+    "dataLockedNotice": "Data {{username}} tetap terkunci hingga mereka masuk berikutnya. Host, kredensial, dan snippet mereka tidak dapat dilihat atau diedit hingga saat itu.",
     "resetPasswordTitle": "Reset Kata Sandi",
     "resetPasswordExternalOnly": "Pengguna ini masuk melalui penyedia eksternal dan tidak memiliki kata sandi.",
     "resetPasswordPlaceholder": "Kata sandi baru",
@@ -1410,14 +1410,14 @@
     "resetPasswordSuccess": "Kata sandi direset",
     "resetPasswordSuccessWiped": "Kata sandi direset. Data terenkripsi pengguna dihapus.",
     "resetPasswordFailed": "Gagal mereset kata sandi",
-    "resetPasswordConfirmWipe": "{{username}} belum masuk sejak peningkatan enkripsi, sehingga data mereka tidak dapat dipulihkan. Mereset sekarang akan menghapus host, kredensial, dan cuplikan mereka. Lanjutkan?",
+    "resetPasswordConfirmWipe": "{{username}} belum masuk sejak peningkatan enkripsi, sehingga data mereka tidak dapat dipulihkan. Mereset sekarang akan menghapus host, kredensial, dan snippet mereka. Lanjutkan?",
     "manageApiKeys": "Kunci API",
     "apiKeyNamePlaceholder": "Nama kunci",
     "apiKeyCopyNotice": "Salin kunci ini sekarang, karena tidak akan ditampilkan lagi.",
     "noApiKeysForUser": "Tidak ada kunci API",
     "apiKeyDeleteFailed": "Gagal menghapus kunci API",
     "exportUserData": "Ekspor Data",
-    "exportUserDataDesc": "Unduh host, kredensial, dan data manajer file pengguna ini sebagai JSON. Rahasia telah dienkripsi.",
+    "exportUserDataDesc": "Unduh host, kredensial, dan data file manager pengguna ini sebagai JSON. Rahasia sudah didekripsi.",
     "exportUserDataSuccess": "Data pengguna berhasil diekspor",
     "exportUserDataFailed": "Gagal mengekspor data pengguna",
     "hostsCount_other": "{{count}} host",
@@ -1438,7 +1438,7 @@
     "deleteSuccessorMe": "Saya (admin yang menghapus)",
     "deleteSuccessorNone": "Tidak ada, hapus saja",
     "deleteSuccessorDesc": "Semua yang dibagikan pengguna ini akan tetap berfungsi di bawah pemilik baru; memilih tidak ada akan menghapus host, kredensial, dan berbagi mereka.",
-    "deleteUserDangerDesc": "Hapus {{username}} dan semua datanya (host, kredensial, cuplikan, riwayat) secara permanen. Tindakan ini tidak dapat dibatalkan.",
+    "deleteUserDangerDesc": "Hapus {{username}} dan semua datanya (host, kredensial, snippet, riwayat) secara permanen. Tindakan ini tidak dapat dibatalkan.",
     "deleteUserConfirm": "Hapus {{username}} dan semua datanya secara permanen?",
     "deleteUserAdminBlocked": "Hapus status admin sebelum menghapus pengguna ini.",
     "createRoleRequired": "Nama dan nama tampilan wajib diisi",
@@ -1482,7 +1482,7 @@
     "secondFactorsResetFailed": "Gagal mereset faktor kedua",
     "passwordLoginForced": "Login dengan kata sandi dimatikan, tetapi tidak ada metode login lain yang diaktifkan, jadi tetap menyala untuk saat ini. Tidak ada yang terkunci keluar.",
     "sslNotRenewed": "Tidak ada yang memperbarui sertifikat ini. Sertifikat ini kedaluwarsa pada {{date}}. Aktifkan perpanjangan otomatis di bagian Sertifikat ACME, atau unggah yang baru sebelum waktu itu.",
-    "sslSelfSigned": "Sertifikat tanda tangan sendiri yang dibuat oleh Termix. Peramban akan memperingatkan tentang hal ini.",
+    "sslSelfSigned": "Sertifikat tanda tangan sendiri yang dibuat oleh Termix. Browser akan memperingatkan tentang hal ini.",
     "sslRenewedBy": "Diperbarui secara otomatis oleh {{plugin}}",
     "sslIssuer": "Diterbitkan oleh {{issuer}}",
     "sslNames": "Meliputi {{names}}",
@@ -1527,8 +1527,8 @@
         "defaultsHeading": "Pintasan Bawaan",
         "fixedHeading": "Pintasan Aplikasi",
         "fixed": {
-          "splitRight": "Pembagian ke kanan",
-          "splitDown": "Pembagian ke bawah",
+          "splitRight": "Bagi ke kanan",
+          "splitDown": "Bagi ke bawah",
           "zoomPane": "Perbesar panel yang difokuskan",
           "navigatePane": "Pindah antar panel",
           "nextTab": "Tab berikutnya",
@@ -1588,7 +1588,7 @@
         "presetOverridesTitle": "Disesuaikan",
         "presetRevertArea": "Kembalikan",
         "presetConfirmTitle": "Beralih ke {{preset}}?",
-        "presetConfirmDesc": "Ini akan mengembalikan sidebar, navigasi, tata letak dasbor, bilah alat terminal, dan tampilan manajer file Anda. Host, kredensial, dan beranda Anda tidak akan tersentuh.",
+        "presetConfirmDesc": "Ini akan mengembalikan sidebar, navigasi, tata letak dasbor, toolbar terminal, dan tampilan file manager Anda. Host, kredensial, dan beranda Anda tidak akan tersentuh.",
         "presetConfirmApply": "Terapkan preset",
         "runSetupAgainDesc": "Lakukan pengaturan awal lagi.",
         "runSetupAgainButton": "Jalankan pengaturan",
@@ -1598,7 +1598,7 @@
         "uiArea_rail": "Navigasi",
         "uiArea_dashboard": "Dasbor",
         "uiArea_terminal": "Terminal",
-        "uiArea_fileManager": "Manajer file",
+        "uiArea_fileManager": "File manager",
         "uiArea_hostEditor": "Editor host",
         "sectionAppearance": "Tampilan",
         "sectionSecurity": "Keamanan",

src/ui/manage/EditorPane.tsx

@@ -119,17 +119,45 @@ export function useScrollSpy(
       let lastHeight = area.scrollHeight;
       area.scrollTo?.({ top: lastTop, behavior: "smooth" });
       // Sections above can still be mounting, which moves the target or
-      // cuts the scroll short. Follow it until the layout settles.
+      // cuts the scroll short. Follow it until the scroll lands and the
+      // layout stops changing, unless the user scrolls first.
       const started = Date.now();
+      let changedAt = started;
+      let userScrolled = false;
+      const onUser = () => {
+        userScrolled = true;
+      };
+      area.addEventListener("wheel", onUser, { passive: true });
+      area.addEventListener("touchstart", onUser, { passive: true });
+      const done = () => {
+        area.removeEventListener("wheel", onUser);
+        area.removeEventListener("touchstart", onUser);
+      };
       const follow = () => {
-        if (!el.isConnected || Date.now() - started > 1500) return;
+        const now = Date.now();
+        if (userScrolled || !el.isConnected || now - started > 5000) {
+          return done();
+        }
         const top = target();
+        // Keep the spy quiet for the whole trip, not just the first scroll.
+        lockUntil.current = now + 600;
         if (Math.abs(top - lastTop) > 4 || area.scrollHeight !== lastHeight) {
           lastTop = top;
           lastHeight = area.scrollHeight;
-          lockUntil.current = Date.now() + 600;
+          changedAt = now;
           area.scrollTo?.({ top, behavior: "smooth" });
         }
+        const reachable = Math.min(
+          lastTop,
+          area.scrollHeight - area.clientHeight,
+        );
+        if (
+          Math.abs(area.scrollTop - reachable) <= 2 &&
+          now - changedAt > 400
+        ) {
+          setActive(id);
+          return done();
+        }
         requestAnimationFrame(follow);
       };
       requestAnimationFrame(follow);
@@ -137,6 +165,24 @@ export function useScrollSpy(
   };
 }
 
+/** Resolves once the element's height holds still for a few frames. */
+function untilLayoutSettles(el: HTMLElement | null, max = 800): Promise<void> {
+  return new Promise((resolve) => {
+    if (!el || typeof requestAnimationFrame === "undefined") return resolve();
+    const started = Date.now();
+    let last = -1;
+    let still = 0;
+    const check = () => {
+      const height = el.scrollHeight;
+      still = height === last ? still + 1 : 0;
+      last = height;
+      if (still >= 3 || Date.now() - started > max) return resolve();
+      requestAnimationFrame(check);
+    };
+    requestAnimationFrame(check);
+  });
+}
+
 /** Wraps a section so the nav can find it. */
 export function EditorSection({
   id,
@@ -253,7 +299,15 @@ export function EditorPane({
   const ids = visibleBands.flatMap((band) => band.items.map((item) => item.id));
   const { active, scrollTo } = useScrollSpy(scrollRef, ids);
   const showNav = bands.flatMap((band) => band.items).length > 1;
-  if (revealRef) revealRef.current = scrollTo;
+  // A jump mounts every lazy section first and scrolls once the form stops
+  // growing. Mounting them on the way down made the scroll stall and restart.
+  const [mountAll, setMountAll] = useState(false);
+  const jump = (id: string) => {
+    if (mountAll) return scrollTo(id);
+    setMountAll(true);
+    void untilLayoutSettles(scrollRef.current).then(() => scrollTo(id));
+  };
+  if (revealRef) revealRef.current = jump;
 
   return (
     <div className={cn("flex min-h-0 flex-1", className)}>
@@ -272,7 +326,7 @@ export function EditorPane({
                     key={item.id}
                     type="button"
                     aria-current={on ? "true" : undefined}
-                    onClick={() => scrollTo(item.id)}
+                    onClick={() => jump(item.id)}
                     className={cn(
                       "flex w-full items-center gap-2 border-l-2 py-1.5 pl-2 pr-2 text-left transition-colors focus-visible:relative focus-visible:z-10 focus-visible:ring-1 focus-visible:ring-ring",
                       on
@@ -320,7 +374,7 @@ export function EditorPane({
                 band.items.map((item) => ({ id: item.id, label: item.label })),
               )}
               activeTab={active}
-              onTabChange={scrollTo}
+              onTabChange={jump}
             />
           </div>
         )}
@@ -336,7 +390,7 @@ export function EditorPane({
             className={`mx-auto flex max-w-3xl flex-col ${PANEL.gap} pb-6`}
           >
             {banner}
-            <SearchingContext.Provider value={searching}>
+            <SearchingContext.Provider value={searching || mountAll}>
               {children}
             </SearchingContext.Provider>
           </div>

src/ui/plugins/PluginConsentPrompt.tsx

@@ -8,7 +8,7 @@ import { capabilityRisk, orderByRisk, type PluginEntry } from "./plugin-model";
 
 export interface ConsentRequest {
   plugin: PluginEntry;
-  mode: "install" | "update" | "upload";
+  mode: "install" | "update" | "upload" | "enable";
   version: string;
   /** What the prompt lists: all of them to install, only the new ones to update. */
   capabilities: string[];
@@ -45,17 +45,19 @@ export function PluginConsentPrompt({
       onCancel={busy ? undefined : onCancel}
       icon={<PluginIconBox name={plugin.icon} size="sm" />}
       title={
-        mode === "update"
-          ? t("plugins.manager.consent.updateTitle", { name: plugin.name })
-          : mode === "upload"
-            ? t("plugins.manager.consent.uploadTitle", { name: plugin.name })
-            : t("plugins.manager.consent.installTitle", { name: plugin.name })
+        mode === "enable"
+          ? t("plugins.manager.consent.enableTitle", { name: plugin.name })
+          : mode === "update"
+            ? t("plugins.manager.consent.updateTitle", { name: plugin.name })
+            : mode === "upload"
+              ? t("plugins.manager.consent.uploadTitle", { name: plugin.name })
+              : t("plugins.manager.consent.installTitle", { name: plugin.name })
       }
       description={
         <Facts>
           {plugin.author && <span className="truncate">{plugin.author}</span>}
           <span className="shrink-0">
-            {mode !== "install" && plugin.version
+            {(mode === "update" || mode === "upload") && plugin.version
               ? t("plugins.manager.versionChange", {
                   from: plugin.version,
                   to: version,
@@ -75,9 +77,11 @@ export function PluginConsentPrompt({
             disabled={busy}
             className="border-accent-brand/40 text-accent-brand hover:bg-accent-brand/10 hover:text-accent-brand dark:border-accent-brand/40 dark:bg-transparent dark:hover:bg-accent-brand/10"
           >
-            {mode === "update"
-              ? t("plugins.manager.consent.agreeUpdate")
-              : t("plugins.manager.install")}
+            {mode === "enable"
+              ? t("plugins.manager.enable")
+              : mode === "update"
+                ? t("plugins.manager.consent.agreeUpdate")
+                : t("plugins.manager.install")}
           </Button>
         </>
       }

src/ui/plugins/PluginDetail.tsx

@@ -177,7 +177,7 @@ export function PluginDetail({
               <Button
                 variant="outline"
                 size="sm"
-                disabled={busy || locked}
+                disabled={busy || plugin.managedByServer}
                 onClick={() => void manager.toggle(plugin)}
               >
                 {plugin.enabled

src/ui/plugins/PluginsTab.tsx

@@ -793,7 +793,7 @@ function InstalledCard({
           <Button
             variant="outline"
             size="xs"
-            disabled={busy || locked}
+            disabled={busy || plugin.managedByServer}
             onClick={() => void manager.toggle(plugin)}
           >
             {plugin.enabled
@@ -907,7 +907,7 @@ function InstalledRowActions({
         <Button
           variant="outline"
           size="xs"
-          disabled={busy || locked}
+          disabled={busy || plugin.managedByServer}
           onClick={() => void manager.toggle(plugin)}
         >
           {plugin.enabled

src/ui/plugins/plugin-model.ts

@@ -69,6 +69,8 @@ export interface PluginEntry {
   /** The registry it is listed in or was installed from. */
   registryId: string | null;
   registryName: string | null;
+  /** A linked server decides whether it runs here. */
+  managedByServer: boolean;
 }
 
 export type PluginSource =
@@ -165,6 +167,7 @@ export function mergePlugins(
       unverified: pluginSource(summary) === "unverified",
       registryId: entry?.registryId ?? summary.registryId ?? null,
       registryName: entry?.registryName ?? null,
+      managedByServer: summary.managedByServer ?? false,
     });
   }
 
@@ -208,6 +211,7 @@ export function mergePlugins(
       unverified: false,
       registryId: entry.registryId ?? "official",
       registryName: entry.registryName ?? null,
+      managedByServer: false,
     });
   }
 
@@ -248,6 +252,7 @@ export function uploadEntry(preview: PluginUploadPreview): PluginEntry {
     unverified: true,
     registryId: null,
     registryName: null,
+    managedByServer: false,
   };
 }
 

src/ui/plugins/use-plugins-manager.ts

@@ -342,18 +342,42 @@ export function usePluginsManager() {
     [failToast],
   );
 
+  const doEnable = useCallback(
+    async (request: ConsentRequest) =>
+      run(request.plugin.id, async () => {
+        try {
+          const result = await setPluginState(request.plugin.id, true, {
+            version: request.version,
+            capabilities: request.capabilities,
+          });
+          if (result.state === "failed" || result.state === "blocked") {
+            toast.error(
+              t("plugins.manager.toast.failedToStart", {
+                name: request.plugin.name,
+              }),
+            );
+          }
+        } catch (error) {
+          failToast(error, "plugins.manager.errors.state", request.plugin.name);
+        }
+      }),
+    [run, t, failToast],
+  );
+
   const confirmConsent = useCallback(async () => {
     if (!consent) return;
     const request = consent;
     setConsent(null);
-    if (request.mode === "upload" && request.uploadToken) {
+    if (request.mode === "enable") {
+      await doEnable(request);
+    } else if (request.mode === "upload" && request.uploadToken) {
       await doInstallUpload(request);
     } else if (request.mode === "install") {
       await doInstall(request.plugin, request.version, request.capabilities);
     } else {
       await doUpdate(request.plugin, request.version, request.capabilities);
     }
-  }, [consent, doInstall, doUpdate, doInstallUpload]);
+  }, [consent, doInstall, doUpdate, doInstallUpload, doEnable]);
 
   const nameOf = useCallback(
     (id: string) => plugins.find((p) => p.id === id)?.name ?? id,
@@ -402,6 +426,15 @@ export function usePluginsManager() {
         failToast(error, "plugins.manager.errors.state", plugin.name);
         return;
       }
+      if (enable && registry?.managedByServer) {
+        setConsent({
+          plugin,
+          mode: "enable",
+          version: plugin.version!,
+          capabilities: plugin.capabilities,
+        });
+        return;
+      }
       await run(plugin.id, async () => {
         try {
           const result = await setPluginState(plugin.id, enable);
@@ -415,7 +448,7 @@ export function usePluginsManager() {
         }
       });
     },
-    [confirm, t, run, failToast, nameOf],
+    [confirm, t, run, failToast, nameOf, registry?.managedByServer],
   );
 
   const retry = useCallback(

src/ui/sidebar/AdminSettingsPanel.tsx

@@ -217,6 +217,12 @@ export function AdminSettingsPanel({
     setUserPage(0);
   }, [userSearch]);
 
+  // The panel stays mounted across Settings pages, so an open user view
+  // would otherwise replace whichever section is picked next.
+  useEffect(() => {
+    setManageUser(null);
+  }, [section]);
+
   useEffect(() => {
     onEditingChange?.(manageUser !== null);
     return () => onEditingChange?.(false);

src/ui/sidebar/AppRail.tsx

@@ -312,255 +312,268 @@ export function AppRail({
     );
   };
 
+  // Expanding on hover draws over the content instead of pushing it, so open
+  // sessions like remote desktop are not resized each time.
+  const takesSpace = pinned || managing;
+
   return (
     <div
       // The desktop app keeps the rail however narrow its window gets.
-      className={`${isElectron() ? "flex" : "hidden md:flex"} flex-col items-stretch bg-sidebar border-r border-border shrink-0 overflow-hidden pt-2 gap-1 transition-[width] duration-200 min-h-0`}
-      style={{ width: rem(railExpanded ? 172 : 40) }}
-      onMouseEnter={() => setHovered(true)}
-      onMouseLeave={() => setHovered(false)}
-      onContextMenu={(e) => {
-        e.preventDefault();
-        // Keep the menu on screen when right-clicking near the viewport edges
-        const MENU_W = 200;
-        const MENU_H = 180;
-        setMenuPos({
-          x: Math.min(e.clientX, window.innerWidth - MENU_W - 8),
-          y: Math.min(e.clientY, window.innerHeight - MENU_H - 8),
-        });
-        if (!(e.target as HTMLElement).closest("[data-rail-item]")) {
-          setMenuTarget(null);
-        }
-      }}
+      className={`${isElectron() ? "flex" : "hidden md:flex"} relative shrink-0 transition-[width] duration-200 min-h-0`}
+      style={{ width: rem(takesSpace ? 172 : 40) }}
     >
-      {onOpenPalette && (
-        <>
-          <button
-            type="button"
-            onClick={onOpenPalette}
-            title={t("nav.searchEverything")}
-            aria-label={t("nav.searchEverything")}
-            style={btnStyle}
-            className={`${btnBase} ${idle}`}
-          >
-            <RailIcon>
-              <Search size={16} />
-            </RailIcon>
-            <RailLabel expanded={railExpanded}>{t("nav.search")}</RailLabel>
-          </button>
-          <Rule expanded={railExpanded} />
-        </>
-      )}
-
-      <div className="flex flex-col flex-1 gap-1 overflow-y-auto scrollbar-none min-h-0">
-        {!pluginsSettled
-          ? Array.from({ length: mainItems.length || 8 }, (_, i) => (
-              <div
-                key={`rail-skeleton-${i}`}
-                style={btnStyle}
-                className="flex items-center h-7 shrink-0"
-              >
-                <Skeleton className="size-4 shrink-0" />
-              </div>
-            ))
-          : bands.map((band, i) => (
-              <div key={band.group} className="flex flex-col gap-1">
-                {i > 0 && (
-                  <GroupDivider group={band.group} expanded={railExpanded} />
-                )}
-                {band.items.map(renderItem)}
-              </div>
-            ))}
-
-        {pluginsSettled && hiddenItems.length > 0 && (
-          <>
-            <Rule expanded={railExpanded} />
-            <button
-              type="button"
-              onClick={() => setManaging((v) => !v)}
-              aria-expanded={managing}
-              title={t("nav.hiddenCount", { count: hiddenItems.length })}
-              style={btnStyle}
-              className={`${btnBase} ${managing ? activeClass : idle}`}
-            >
-              <RailIcon>
-                <EyeOff size={16} />
-              </RailIcon>
-              <RailLabel expanded={railExpanded}>
-                {t("nav.hiddenCount", { count: hiddenItems.length })}
-              </RailLabel>
-            </button>
-            {managing &&
-              hiddenItems.map((item) => {
-                const Icon = item.icon;
-                return (
-                  <button
-                    key={`hidden-${item.id}`}
-                    type="button"
-                    onClick={() => void toggleHiddenRailTab(item.id)}
-                    title={t("nav.showInRail")}
-                    style={btnStyle}
-                    className={`${btnBase} text-muted-foreground/70 hover:text-foreground hover:bg-muted/60`}
-                  >
-                    <RailIcon>
-                      <Icon size={16} />
-                    </RailIcon>
-                    <span className="min-w-0 truncate text-xs font-medium whitespace-nowrap">
-                      {t(item.labelKey)}
-                    </span>
-                    <Eye className="ml-auto size-3 shrink-0 opacity-60" />
-                  </button>
-                );
-              })}
-          </>
-        )}
-      </div>
-
-      <div className="shrink-0 flex flex-col gap-1 border-t border-border pt-1 pb-1">
-        {showPinButton && (
+      <div
+        className="absolute inset-y-0 left-0 z-40 flex flex-col items-stretch bg-sidebar border-r border-border overflow-hidden pt-2 gap-1 transition-[width] duration-200 min-h-0"
+        style={{ width: rem(railExpanded ? 172 : 40) }}
+        onMouseEnter={() => setHovered(true)}
+        onMouseLeave={() => setHovered(false)}
+        onContextMenu={(e) => {
+          e.preventDefault();
+          // Keep the menu on screen when right-clicking near the viewport edges
+          const MENU_W = 200;
+          const MENU_H = 180;
+          setMenuPos({
+            x: Math.min(e.clientX, window.innerWidth - MENU_W - 8),
+            y: Math.min(e.clientY, window.innerHeight - MENU_H - 8),
+          });
+          if (!(e.target as HTMLElement).closest("[data-rail-item]")) {
+            setMenuTarget(null);
+          }
+        }}
+      >
+        {onOpenPalette && (
           <>
             <button
               type="button"
-              onClick={() => setRailPreference("pinAppRail", !pinned)}
+              onClick={onOpenPalette}
+              title={t("nav.searchEverything")}
+              aria-label={t("nav.searchEverything")}
               style={btnStyle}
-              title={
-                pinned ? t("nav.collapseSideMenu") : t("nav.keepSideMenuOpen")
-              }
-              className={`${btnBase} ${pinned ? activeClass : idle}`}
+              className={`${btnBase} ${idle}`}
             >
               <RailIcon>
-                <Pin size={16} />
+                <Search size={16} />
               </RailIcon>
-              <RailLabel expanded={railExpanded}>
-                {pinned ? t("nav.collapseSideMenu") : t("nav.keepSideMenuOpen")}
-              </RailLabel>
+              <RailLabel expanded={railExpanded}>{t("nav.search")}</RailLabel>
             </button>
             <Rule expanded={railExpanded} />
           </>
         )}
-        {footerItems.map(renderItem)}
-        {footerItems.length > 0 && !isElectron() && (
-          <Rule expanded={railExpanded} />
-        )}
-        {/* The desktop signs in to its own local profile by itself. */}
-        {!isElectron() && (
-          <button
-            type="button"
-            onClick={() => onLogout({ manual: true })}
-            style={btnStyle}
-            title={t("common.logout")}
-            aria-label={t("common.logout")}
-            className={`${btnBase} text-muted-foreground hover:text-destructive hover:bg-destructive/10`}
-          >
-            <RailIcon>
-              <LogOut size={16} />
-            </RailIcon>
-            <RailLabel expanded={railExpanded}>{t("common.logout")}</RailLabel>
-          </button>
-        )}
-      </div>
 
-      <div className="shrink-0 border-t border-border">
-        <button
-          type="button"
-          onClick={onOpenSettings}
-          title={t("nav.openSettings")}
-          aria-label={t("nav.openSettings")}
-          className="flex items-center gap-2.5 w-full h-10 text-muted-foreground hover:text-foreground hover:bg-muted/60 transition-colors focus-visible:ring-1 focus-visible:ring-ring"
-          style={{ padding: `0 ${rem(8)}` }}
-        >
-          <div
-            className="rounded-full bg-accent-brand/20 border border-accent-brand/30 flex items-center justify-center font-bold text-accent-brand shrink-0"
-            style={{ width: rem(24), height: rem(24), fontSize: rem(11) }}
-          >
-            {username.charAt(0).toUpperCase() || "U"}
-          </div>
-          <div
-            className={`flex flex-col items-start overflow-hidden transition-opacity duration-150 ${
-              railExpanded ? "opacity-100 delay-75" : "opacity-0"
-            }`}
-          >
-            <span className="text-xs font-semibold leading-tight whitespace-nowrap">
-              {username || t("nav.roleUser")}
-            </span>
-            <span className="text-[10px] text-muted-foreground leading-tight whitespace-nowrap">
-              {isAdmin ? t("nav.roleAdministrator") : t("nav.roleUser")}
-            </span>
-          </div>
-        </button>
-      </div>
+        <div className="flex flex-col flex-1 gap-1 overflow-y-auto scrollbar-none min-h-0">
+          {!pluginsSettled
+            ? Array.from({ length: mainItems.length || 8 }, (_, i) => (
+                <div
+                  key={`rail-skeleton-${i}`}
+                  style={btnStyle}
+                  className="flex items-center h-7 shrink-0"
+                >
+                  <Skeleton className="size-4 shrink-0" />
+                </div>
+              ))
+            : bands.map((band, i) => (
+                <div key={band.group} className="flex flex-col gap-1">
+                  {i > 0 && (
+                    <GroupDivider group={band.group} expanded={railExpanded} />
+                  )}
+                  {band.items.map(renderItem)}
+                </div>
+              ))}
 
-      {menuPos && (
-        <div
-          data-rail-context-menu
-          role="menu"
-          style={{ position: "fixed", left: menuPos.x, top: menuPos.y }}
-          className="z-[10000] bg-popover border border-border shadow-lg py-1 min-w-[200px]"
-        >
-          {menuTarget && (
+          {pluginsSettled && hiddenItems.length > 0 && (
             <>
-              {menuTarget.promotable && (
-                <MenuItem
-                  icon={<SquareArrowOutUpRight className="size-3" />}
-                  onClick={() => {
-                    onOpenTab?.(menuTarget.id as TabType);
-                    setMenuPos(null);
-                  }}
-                >
-                  {t("nav.openAsTab")}
-                </MenuItem>
-              )}
-              {menuTarget.rightDockable && (
-                <MenuItem
-                  icon={<PanelRight className="size-3" />}
-                  onClick={() => {
-                    onOpenInRightDock?.(menuTarget.id);
-                    setMenuPos(null);
-                  }}
-                >
-                  {t("nav.openInRightDock")}
-                </MenuItem>
-              )}
-              {menuTarget.hideable && (
-                <MenuItem
-                  icon={<EyeOff className="size-3" />}
-                  onClick={() => {
-                    void toggleHiddenRailTab(menuTarget.id);
-                    setMenuPos(null);
-                  }}
-                >
-                  {t("nav.hideFromRail")}
-                </MenuItem>
-              )}
-              <div className="h-px bg-border my-1" />
+              <Rule expanded={railExpanded} />
+              <button
+                type="button"
+                onClick={() => setManaging((v) => !v)}
+                aria-expanded={managing}
+                title={t("nav.hiddenCount", { count: hiddenItems.length })}
+                style={btnStyle}
+                className={`${btnBase} ${managing ? activeClass : idle}`}
+              >
+                <RailIcon>
+                  <EyeOff size={16} />
+                </RailIcon>
+                <RailLabel expanded={railExpanded}>
+                  {t("nav.hiddenCount", { count: hiddenItems.length })}
+                </RailLabel>
+              </button>
+              {managing &&
+                hiddenItems.map((item) => {
+                  const Icon = item.icon;
+                  return (
+                    <button
+                      key={`hidden-${item.id}`}
+                      type="button"
+                      onClick={() => void toggleHiddenRailTab(item.id)}
+                      title={t("nav.showInRail")}
+                      style={btnStyle}
+                      className={`${btnBase} text-muted-foreground/70 hover:text-foreground hover:bg-muted/60`}
+                    >
+                      <RailIcon>
+                        <Icon size={16} />
+                      </RailIcon>
+                      <span className="min-w-0 truncate text-xs font-medium whitespace-nowrap">
+                        {t(item.labelKey)}
+                      </span>
+                      <Eye className="ml-auto size-3 shrink-0 opacity-60" />
+                    </button>
+                  );
+                })}
             </>
           )}
-          <MenuItem
-            icon={pinned ? <Check className="size-3" /> : null}
-            onClick={togglePinned}
-            checked={pinned}
-          >
-            {t("newUi.sidebar.userProfile.pinAppRail")}
-          </MenuItem>
-          <MenuItem
-            icon={expandOnHover ? <Check className="size-3" /> : null}
-            onClick={toggleExpandOnHover}
-            checked={expandOnHover}
-          >
-            {t("newUi.sidebar.userProfile.expandAppRailOnHover")}
-          </MenuItem>
-          <div className="h-px bg-border my-1" />
-          <MenuItem
-            icon={<SlidersHorizontal className="size-3" />}
-            onClick={() => {
-              onOpenNavigationSettings();
-              setMenuPos(null);
-            }}
-          >
-            {t("nav.openSettings")}
-          </MenuItem>
         </div>
-      )}
+
+        <div className="shrink-0 flex flex-col gap-1 border-t border-border pt-1 pb-1">
+          {showPinButton && (
+            <>
+              <button
+                type="button"
+                onClick={() => setRailPreference("pinAppRail", !pinned)}
+                style={btnStyle}
+                title={
+                  pinned ? t("nav.collapseSideMenu") : t("nav.keepSideMenuOpen")
+                }
+                className={`${btnBase} ${pinned ? activeClass : idle}`}
+              >
+                <RailIcon>
+                  <Pin size={16} />
+                </RailIcon>
+                <RailLabel expanded={railExpanded}>
+                  {pinned
+                    ? t("nav.collapseSideMenu")
+                    : t("nav.keepSideMenuOpen")}
+                </RailLabel>
+              </button>
+              <Rule expanded={railExpanded} />
+            </>
+          )}
+          {footerItems.map(renderItem)}
+          {footerItems.length > 0 && !isElectron() && (
+            <Rule expanded={railExpanded} />
+          )}
+          {/* The desktop signs in to its own local profile by itself. */}
+          {!isElectron() && (
+            <button
+              type="button"
+              onClick={() => onLogout({ manual: true })}
+              style={btnStyle}
+              title={t("common.logout")}
+              aria-label={t("common.logout")}
+              className={`${btnBase} text-muted-foreground hover:text-destructive hover:bg-destructive/10`}
+            >
+              <RailIcon>
+                <LogOut size={16} />
+              </RailIcon>
+              <RailLabel expanded={railExpanded}>
+                {t("common.logout")}
+              </RailLabel>
+            </button>
+          )}
+        </div>
+
+        <div className="shrink-0 border-t border-border">
+          <button
+            type="button"
+            onClick={onOpenSettings}
+            title={t("nav.openSettings")}
+            aria-label={t("nav.openSettings")}
+            className="flex items-center gap-2.5 w-full h-10 text-muted-foreground hover:text-foreground hover:bg-muted/60 transition-colors focus-visible:ring-1 focus-visible:ring-ring"
+            style={{ padding: `0 ${rem(8)}` }}
+          >
+            <div
+              className="rounded-full bg-accent-brand/20 border border-accent-brand/30 flex items-center justify-center font-bold text-accent-brand shrink-0"
+              style={{ width: rem(24), height: rem(24), fontSize: rem(11) }}
+            >
+              {username.charAt(0).toUpperCase() || "U"}
+            </div>
+            <div
+              className={`flex flex-col items-start overflow-hidden transition-opacity duration-150 ${
+                railExpanded ? "opacity-100 delay-75" : "opacity-0"
+              }`}
+            >
+              <span className="text-xs font-semibold leading-tight whitespace-nowrap">
+                {username || t("nav.roleUser")}
+              </span>
+              <span className="text-[10px] text-muted-foreground leading-tight whitespace-nowrap">
+                {isAdmin ? t("nav.roleAdministrator") : t("nav.roleUser")}
+              </span>
+            </div>
+          </button>
+        </div>
+
+        {menuPos && (
+          <div
+            data-rail-context-menu
+            role="menu"
+            style={{ position: "fixed", left: menuPos.x, top: menuPos.y }}
+            className="z-[10000] bg-popover border border-border shadow-lg py-1 min-w-[200px]"
+          >
+            {menuTarget && (
+              <>
+                {menuTarget.promotable && (
+                  <MenuItem
+                    icon={<SquareArrowOutUpRight className="size-3" />}
+                    onClick={() => {
+                      onOpenTab?.(menuTarget.id as TabType);
+                      setMenuPos(null);
+                    }}
+                  >
+                    {t("nav.openAsTab")}
+                  </MenuItem>
+                )}
+                {menuTarget.rightDockable && (
+                  <MenuItem
+                    icon={<PanelRight className="size-3" />}
+                    onClick={() => {
+                      onOpenInRightDock?.(menuTarget.id);
+                      setMenuPos(null);
+                    }}
+                  >
+                    {t("nav.openInRightDock")}
+                  </MenuItem>
+                )}
+                {menuTarget.hideable && (
+                  <MenuItem
+                    icon={<EyeOff className="size-3" />}
+                    onClick={() => {
+                      void toggleHiddenRailTab(menuTarget.id);
+                      setMenuPos(null);
+                    }}
+                  >
+                    {t("nav.hideFromRail")}
+                  </MenuItem>
+                )}
+                <div className="h-px bg-border my-1" />
+              </>
+            )}
+            <MenuItem
+              icon={pinned ? <Check className="size-3" /> : null}
+              onClick={togglePinned}
+              checked={pinned}
+            >
+              {t("newUi.sidebar.userProfile.pinAppRail")}
+            </MenuItem>
+            <MenuItem
+              icon={expandOnHover ? <Check className="size-3" /> : null}
+              onClick={toggleExpandOnHover}
+              checked={expandOnHover}
+            >
+              {t("newUi.sidebar.userProfile.expandAppRailOnHover")}
+            </MenuItem>
+            <div className="h-px bg-border my-1" />
+            <MenuItem
+              icon={<SlidersHorizontal className="size-3" />}
+              onClick={() => {
+                onOpenNavigationSettings();
+                setMenuPos(null);
+              }}
+            >
+              {t("nav.openSettings")}
+            </MenuItem>
+          </div>
+        )}
+      </div>
     </div>
   );
 }

src/ui/sidebar/CustomizeSidebarPanel.tsx

@@ -223,6 +223,20 @@ export function CustomizeSidebarPanel({
               }
             />
           </SettingRow>
+          <SettingRow
+            label={t("hosts.closeOnOpen")}
+            description={t("hosts.closeOnOpenDesc")}
+          >
+            <FakeSwitch
+              checked={preferences.display.closeOnOpen}
+              onChange={(v) =>
+                update((prev) => ({
+                  ...prev,
+                  display: { ...prev.display, closeOnOpen: v },
+                }))
+              }
+            />
+          </SettingRow>
           <SettingRow
             label={t("newUi.sidebar.userProfile.statusColors")}
             description={t("newUi.sidebar.userProfile.statusColorsDesc")}

src/ui/sidebar/HostsPanel.tsx

@@ -201,6 +201,7 @@ export function HostsPanel({
   hostTree,
   loading,
   active = true,
+  onCloseSidebar,
 }: {
   onOpenTab: (
     host: Host,
@@ -217,6 +218,7 @@ export function HostsPanel({
   /** Unused since editing moved to the Manage tab. */
   onEditingChange?: (editing: boolean) => void;
   active?: boolean;
+  onCloseSidebar?: () => void;
 }) {
   const { t } = useTranslation();
   const { statuses, getStatus } = useServerStatus();
@@ -1044,7 +1046,10 @@ export function HostsPanel({
                   ).children
                 : []
             }
-            onOpenTab={onOpenTab}
+            onOpenTab={(host, type, options) => {
+              onOpenTab(host, type, options);
+              if (sidebarPrefs.display.closeOnOpen) onCloseSidebar?.();
+            }}
             onEditHost={onEditHost}
             onShareHost={(host) => setShareModalHost(host)}
             query={hostSearch.trim().toLowerCase()}