tabby-rdp 0.3.4 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## 0.4.0
+
+**New**
+- **Saved accounts** ([#11](https://github.com/meanaverage/tabby-rdp/issues/11)): a user name and domain under a
+  name, with the password kept once, for desktops that share an account. Chosen in a remote desktop profile's
+  **Account** field or in the form for a desktop behind an SSH host (**New account…** there adds one), or for a whole
+  profile group through the group's defaults. Listed, added, edited and removed in **Settings › Remote Desktop ›
+  Accounts**, which names the desktops using each account. A password a server refuses is asked for again and saved
+  for every desktop; **Sign in again…** asks anew.
+- **Passwords in Tabby's Vault** when it is enabled, as Tabby keeps SSH passwords: encrypted, and carried by config
+  sync. The system keychain as before otherwise, and still read for what was saved before the Vault was turned on.
+- **Configurable shortcuts** ([#15](https://github.com/meanaverage/tabby-rdp/issues/15)): view only, a screenshot,
+  Ctrl+Alt+Del, typing into all desktops of a tab, pasting to all of them, the connection status and Disconnect join
+  the desktop/console switch as Tabby hotkeys, set on the settings page in the look of Tabby's Hotkeys page (or
+  there). A key another hotkey already has is refused, and collisions made elsewhere are shown.
+- **The settings page in tabs** — Getting started, Settings, Overlay, Desktops, Accounts, Troubleshooting — as
+  Tabby's Profiles & connections page is, with the settings grouped (Picture, Sound, Keyboard, SSH hosts, Updates)
+  and the detail behind ⓘ tooltips. The Desktops tab lists remote desktop profiles as well as desktops behind SSH
+  hosts, and adds, edits and removes both; profiles the plugin makes go into a "Remote desktops" group.
+- **A clearer reason when a connection fails** before it is up ("10.3.0.5:3389 did not answer"), in place of
+  IronRDP's "general error (code 1)".
+- The **name overlay preview** says which desktop resolution it stands for, and lets you pick one
+  ([#16](https://github.com/meanaverage/tabby-rdp/issues/16)).
+
+**Fixed**
+- **The window could not be moved by its tab bar while a dialog was open**
+  ([#19](https://github.com/meanaverage/tabby-rdp/issues/19)), the plugin's and Tabby's alike. Each dialog keeps a
+  strip the height of the tab bar draggable. Submitted to Tabby as well.
+- **A stale update notice** in a Tabby left open across several releases
+  ([#17](https://github.com/meanaverage/tabby-rdp/issues/17)): opening the settings page with an update known asks
+  npm again.
+- Opening the settings page no longer prompts for the Vault passphrase.
+
+**Docs**
+- README: saved accounts, shortcuts, and where passwords are kept. Tabby's Vault page labels the plugin's secrets
+  generically until Tabby ships [#11765](https://github.com/Eugeny/tabby/pull/11765)
+  ([#18](https://github.com/meanaverage/tabby-rdp/issues/18)).
+
 ## 0.3.4
 
 **Fixed**

package/README.md

@@ -40,8 +40,8 @@ nothing is opened on the network, and nothing has to be installed on the remote
 - **`desk`:** type `desk` in the console and the same shell, with its history and running programs, moves into a
   terminal on the desktop.
 
-Everything is in **Settings › Remote Desktop**: getting started, every setting with a line on what it does, the keys,
-the desktops and certificates the plugin keeps, and troubleshooting.
+Everything is in **Settings › Remote Desktop**, in tabs: getting started and the shortcuts, the settings, the name
+overlay, the desktops and certificates the plugin keeps, saved accounts, and troubleshooting.
 
 The remote desktop itself is [IronRDP](https://github.com/Devolutions/IronRDP)'s web client, running inside Tabby.
 Making it work with GNOME took fixes in IronRDP, which we contribute upstream ([below](#built-on-ironrdp)).
@@ -53,6 +53,7 @@ Making it work with GNOME took fixes in IronRDP, which we contribute upstream ([
 - [Features](#features)
 - [Windows and other desktops behind a host](#windows-and-other-desktops-behind-a-host)
 - [Remote desktop profiles](#remote-desktop-profiles)
+- [Saved accounts](#saved-accounts)
 - [Several desktops in one tab](#several-desktops-in-one-tab)
 - [VMs on a host](#vms-on-a-host)
 - [desk: the console on the desktop](#desk-the-console-on-the-desktop)
@@ -120,7 +121,8 @@ connecting again.
 | **Screenshots** | **Save a screenshot** in the desktop's menus saves the remote screen at its full resolution as a PNG in Downloads, and copies it to the clipboard. |
 | **Connection status** | Optionally, a small line in the corner of the desktop with the throughput each way, frames per second, the SSH round trip, and how it is connected (desktop, host, resolution, graphics mode, sharpness). |
 | **Reconnecting** | After sleep or a network change, the desktop reconnects by itself once the connection is back. |
-| **Sign-in** | GNOME desktops need none: the plugin manages their credentials. Windows and xrdp desktops ask for the account once and can remember it in the system keychain; **Sign in again…** in the menu replaces it. |
+| **Sign-in** | GNOME desktops need none: the plugin manages their credentials. Windows and xrdp desktops ask for the account once and can remember it, in Tabby's Vault when that is on and in the system keychain otherwise; **Sign in again…** in the menu replaces it. Desktops that share an account can use a [saved account](#saved-accounts), whose password is kept once. |
+| **Shortcuts** | Switching between the desktop and the console, view only, a screenshot, Ctrl+Alt+Del, typing into or pasting to all desktops of a tab, the connection status and Disconnect each have a hotkey, set on the settings page or in Tabby's Hotkeys. They work while the desktop has the keyboard; a key another hotkey has is refused. |
 | **Certificates** | GNOME desktops accept only the certificate the plugin made for them. Windows and xrdp desktops remember theirs on first use and ask before accepting a different one. |
 
 <p align="center"><img src="docs/images/files.png" width="760" alt="A file copied on the remote desktop, offered for saving"></p>
@@ -217,6 +219,25 @@ A direct connection is a plain TCP connection from this computer, encrypted with
 server's certificate is remembered on the first connection and checked on every later one, as for desktops behind a
 host (above).
 
+## Saved accounts
+
+Several desktops often share one account: a domain admin, a lab user. A saved account keeps that user name (and
+domain) under a name, with its password stored once, so when the password changes it is entered once for all of them.
+
+**Settings › Remote Desktop › Accounts** lists them, with the desktops that use each one (click a name to open its
+settings), and adds, edits and removes them. A desktop picks its account in its profile's **Account** field, or in the
+form that adds a desktop behind an SSH host; **New account…** there adds one on the spot. A profile group's defaults
+for **Remote desktop (RDP)** can pick an account for every profile in the group (**Profiles & connections**, the group's
+menu), which is how to give a whole group of servers one sign-in.
+
+Signing in with a saved account that has no password yet, or whose password a server refused, asks for it, and the
+form saves what you enter as the account's new password for every desktop. A refused password is not dropped by
+itself: one server refusing it doesn't make it wrong for the others. **Sign in again…** on such a desktop asks anew.
+
+The accounts' names and user names are in Tabby's config (`remoteDesktop.accounts`); the passwords are in Tabby's
+Vault when it is enabled (encrypted, and carried by Tabby's config sync), else in the system keychain. Removing an
+account removes its password and sets its desktops back to asking.
+
 ## Several desktops in one tab
 
 Split a tab (Tabby's **Split** in the tab's menu, or drag one tab onto another) and each pane can show a desktop: one
@@ -285,12 +306,14 @@ They are stored in Tabby's config under `remoteDesktop`:
 | Microphone (`microphone`) | Off | Send your microphone while an app on the remote desktop records. Applies on the next connection. |
 | Show connection status (`connectionStatus`) | Off | The indicator in the desktop's corner; fades when the pointer comes near. |
 | Mac shortcuts (`macShortcuts`) | On | macOS. Off: ⌘ is the Windows key. |
+| Shortcuts (`hotkeys.remote-desktop-*`) | ⌘⇧G / Ctrl+Shift+G for the switch; the rest unbound | Tabby's hotkeys: the switch between desktop and console, view only, screenshot, Ctrl+Alt+Del, type into all, paste to all, connection status, disconnect. Changed on the settings page (Getting started › Shortcuts) or in Settings › Hotkeys. |
+| Saved accounts (`accounts`) | None | `[{ id, name, username, domain }]`; see [Saved accounts](#saved-accounts). The passwords are not in the config. |
 | Bring the console along with `desk` (`desk`) | Off | Installs `desk` and a login line on each machine you open a desktop on; applies on the next connection there. |
 | Session backend (`sessionBackend`) | `native` | For `desk`: `native` (trd-pty) or `tmux`. Config file only. |
 | Find virtual machines on SSH hosts (`discoverVMs`) | On | Lists a host's libvirt VMs with a desktop in its menu ([VMs on a host](#vms-on-a-host)). |
 | Shut down VMs it started (`shutDownIdle`) | Never | 5, 15 or 60: minutes without a desktop open after which a VM the plugin started is shut down again ([VMs on a host](#vms-on-a-host)). |
 | Tell me about new versions (`checkUpdates`) | On | Once a day, asks npm for the latest tabby-rdp (nothing else is sent), and says so in a note, the menus and the settings page when there's a newer one: Tabby itself shows plugin upgrades only on its Plugins page. |
-| Desktop name overlay (`osd`) | When it helps | `show` (`auto`, `always`, `off`), `font`, `size`, `position`, `color` (empty: white) and `seconds`; the settings page previews it. |
+| Desktop name overlay (`osd`) | When it helps | `show` (`auto`, `always`, `off`), `font`, `size`, `position`, `color` (empty: white) and `seconds`; the settings page previews it, at a resolution you pick. |
 
 ## Requirements
 

package/dist/accountForm.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STYLE = exports.NEW_ACCOUNT = void 0;
+exports.newAccountOption = newAccountOption;
+exports.NEW_ACCOUNT = '__new__';
+exports.STYLE = `
+.trd-new-account { display: grid; grid-template-columns: 1fr 1fr; gap: 8px; margin-top: 8px; padding: 10px; border-radius: 6px;
+    border: 1px solid rgba(128, 128, 128, 0.35); }
+.trd-new-account .trd-new-account-error { grid-column: 1 / -1; color: #f08080; font-size: 12px; }
+.trd-new-account .trd-new-account-error:empty { display: none; }
+.trd-new-account .trd-new-account-buttons { grid-column: 1 / -1; display: flex; gap: 8px; justify-content: flex-end; }
+`;
+/**
+ * Wires an account `<select>` that ends with "New account…": choosing it opens the form under the select; "Add" hands
+ * the fields to `save`, which returns the saved account, and the select then offers and shows it. `onChange` is told
+ * the chosen id ('' for none) whenever it changes, the new account included.
+ */
+function newAccountOption(select, label, save, onChange) {
+    select.append(new Option('New account…', exports.NEW_ACCOUNT));
+    let last = select.value;
+    let form = null;
+    const close = () => {
+        form?.remove();
+        form = null;
+    };
+    select.addEventListener('change', () => {
+        if (select.value !== exports.NEW_ACCOUNT) {
+            close();
+            last = select.value;
+            onChange(select.value);
+            return;
+        }
+        if (form) {
+            return;
+        }
+        form = document.createElement('form');
+        form.className = 'trd-new-account';
+        form.autocomplete = 'off';
+        form.innerHTML = `
+            <input class="form-control form-control-sm" name="name" placeholder="Name, e.g. Domain A admin" spellcheck="false">
+            <input class="form-control form-control-sm" name="username" placeholder="User name, or DOMAIN\\user" spellcheck="false">
+            <input class="form-control form-control-sm" name="domain" placeholder="Domain (optional)" spellcheck="false">
+            <input class="form-control form-control-sm" name="password" type="password" autocomplete="new-password" placeholder="Password (optional; asked on the first connection)">
+            <div class="trd-new-account-error"></div>
+            <div class="trd-new-account-buttons">
+                <button type="button" class="btn btn-secondary btn-sm" name="cancel">Cancel</button>
+                <button type="submit" class="btn btn-primary btn-sm">Add account</button>
+            </div>`;
+        const field = (name) => form.querySelector(`[name="${name}"]`);
+        const error = form.querySelector('.trd-new-account-error');
+        // Keys typed in it are its own (the forms around it act on Enter and Escape).
+        form.addEventListener('keydown', event => {
+            event.stopPropagation();
+            if (event.key === 'Escape') {
+                event.preventDefault();
+                field('cancel').click();
+            }
+        });
+        field('cancel').addEventListener('click', () => {
+            close();
+            select.value = last;
+        });
+        form.addEventListener('submit', async (event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            const username = field('username').value.trim();
+            if (!username) {
+                error.textContent = 'Give it a user name.';
+                field('username').focus();
+                return;
+            }
+            try {
+                const account = await save({ name: field('name').value.trim(), username, domain: field('domain').value.trim(), password: field('password').value });
+                const option = new Option(label(account), account.id);
+                select.insertBefore(option, select.querySelector(`option[value="${exports.NEW_ACCOUNT}"]`));
+                select.value = account.id;
+                last = account.id;
+                close();
+                onChange(account.id);
+            }
+            catch (e) {
+                error.textContent = `Couldn't save it: ${e?.message ?? e}`;
+            }
+        });
+        select.insertAdjacentElement('afterend', form);
+        field('name').focus();
+    });
+}
+//# sourceMappingURL=accountForm.js.map

package/dist/accountForm.js.map

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

package/dist/accounts.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.accountsOf = accountsOf;
+exports.newAccountId = newAccountId;
+exports.signInName = signInName;
+exports.accountKey = accountKey;
+/** The usable entries of `remoteDesktop.accounts` (hand-written ones may lack fields). */
+function accountsOf(store) {
+    const list = Array.isArray(store?.accounts) ? store.accounts : [];
+    const seen = new Set();
+    return list.flatMap((a) => {
+        const id = typeof a?.id === 'string' ? a.id.trim() : '';
+        const username = typeof a?.username === 'string' ? a.username.trim() : '';
+        if (!/^[A-Za-z0-9_-]+$/.test(id) || !username || seen.has(id)) {
+            return [];
+        }
+        seen.add(id);
+        const domain = typeof a.domain === 'string' && a.domain.trim() ? a.domain.trim() : undefined;
+        return [{ id, name: typeof a.name === 'string' && a.name.trim() ? a.name.trim() : signInName({ username, domain }), username, ...domain ? { domain } : {} }];
+    });
+}
+/** A new account's id: nothing in it but that it is unused. */
+function newAccountId(taken) {
+    for (;;) {
+        const id = Math.random().toString(36).slice(2, 10).padEnd(8, '0');
+        if (!taken.some(a => a.id === id)) {
+            return id;
+        }
+    }
+}
+/** What the account signs in as: DOMAIN\user, or the user name as typed when it names its domain itself. */
+function signInName(account) {
+    return account.domain && !/[\\@]/.test(account.username) ? `${account.domain}\\${account.username}` : account.username;
+}
+/** Where the keychain keeps an account's password (next to the desktops' own entries, which are session keys). */
+function accountKey(id) {
+    return `account#${id}`;
+}
+//# sourceMappingURL=accounts.js.map

package/dist/accounts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../src/accounts.ts"],"names":[],"mappings":";;AAoBA,gCAaC;AAGD,oCAOC;AAGD,gCAEC;AAGD,gCAEC;AAlCD,0FAA0F;AAC1F,SAAgB,UAAU,CAAE,KAAU;IAClC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAA;IACjE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAM,EAAkB,EAAE;QAC3C,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACvD,MAAM,QAAQ,GAAG,OAAO,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACzE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC5D,OAAO,EAAE,CAAA;QACb,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACZ,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;QAC5F,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAChK,CAAC,CAAC,CAAA;AACN,CAAC;AAED,+DAA+D;AAC/D,SAAgB,YAAY,CAAE,KAAqB;IAC/C,SAAS,CAAC;QACN,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;QACjE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YAChC,OAAO,EAAE,CAAA;QACb,CAAC;IACL,CAAC;AACL,CAAC;AAED,4GAA4G;AAC5G,SAAgB,UAAU,CAAE,OAAkD;IAC1E,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAA;AAC1H,CAAC;AAED,kHAAkH;AAClH,SAAgB,UAAU,CAAE,EAAU;IAClC,OAAO,WAAW,EAAE,EAAE,CAAA;AAC1B,CAAC"}

package/dist/desktop.service.js

@@ -25,6 +25,8 @@ const audio_1 = require("./audio");
 const connectionStatus_1 = require("./connectionStatus");
 const microphone_1 = require("./microphone");
 const desktopForm_1 = require("./desktopForm");
+const accounts_1 = require("./accounts");
+const accountForm_1 = require("./accountForm");
 const fileTransfer_1 = require("./fileTransfer");
 const desktops_1 = require("./desktops");
 const help_1 = require("./help");
@@ -322,6 +324,11 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
          * long as Tabby runs; a Windows host is found out on the first connect there, which costs a failed setup.
          */
         this.ownDesktops = new Map();
+        /**
+         * Forgets the saved account of the pane's desktop and connects again, with the sign-in form. For xrdp above all:
+         * with a wrong password it shows its own login window rather than refusing, so the form never comes back.
+         */
+        this.askAgain = new WeakSet();
         /** VMs found on SSH hosts (see vms.ts), by target key: when, and as desktops. */
         this.vms = new Map();
         this.lastUsed = new Map();
@@ -389,14 +396,12 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
         const spec = this.sessions.get(pane)?.spec;
         return !!spec && this.signsIn(spec);
     }
-    /**
-     * Forgets the saved account of the pane's desktop and connects again, with the sign-in form. For xrdp above all:
-     * with a wrong password it shows its own login window rather than refusing, so the form never comes back.
-     */
     async signInAgain(pane) {
         const session = this.sessions.get(pane);
         if (session && this.signsIn(session.spec)) {
             await (0, signin_1.forgetCredentials)(session.key);
+            // With a saved account, the form asks for its password anew (the saved one stays until then).
+            this.askAgain.add(pane);
             await this.reopen(pane, session.spec);
         }
     }
@@ -480,6 +485,106 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
     desktopOf(pane) {
         return this.sessions.get(pane)?.spec ?? null;
     }
+    /** `remoteDesktop.accounts`: the saved accounts desktops can sign in with (see accounts.ts). */
+    accounts() {
+        return (0, accounts_1.accountsOf)(this.config.store.remoteDesktop);
+    }
+    /**
+     * The desktops that sign in with a saved account: configured ones behind SSH hosts, and RDP profiles (their own
+     * choice, or their profile group's default when they make none). Each comes with what opens its editor.
+     */
+    accountUses(id) {
+        const desktops = this.configuredDesktops().flatMap((d, i) => d.account === id ? [{ name: String(d.name ?? (0, desktops_1.desktopIdOf)(d)), desktopIndex: i }] : []);
+        const groups = this.config.store.groups ?? [];
+        const inherited = (p) => p.options?.account === undefined && groups.find(g => g.id === p.group)?.defaults?.[targets_1.RDP_PROFILE_TYPE]?.options?.account === id;
+        const profiles = (this.config.store.profiles ?? [])
+            .filter((p) => p?.type === targets_1.RDP_PROFILE_TYPE && (p.options?.account === id || inherited(p)))
+            .map((p) => ({ name: String(p.name ?? p.options?.host ?? ''), profileId: p.id ? String(p.id) : undefined }));
+        return [...desktops, ...profiles];
+    }
+    /**
+     * Adds a saved account (no id) or changes one. `password`: the new one for the keychain; undefined keeps what is
+     * there. A new user name or domain without a new password drops the old password: it was for the old account.
+     * Returns the account's id, and the keychain's complaint if the password couldn't be saved.
+     */
+    async saveAccount(account, password) {
+        const list = this.accounts();
+        const old = list.find(a => a.id === account.id);
+        const entry = {
+            id: old?.id ?? (0, accounts_1.newAccountId)(list),
+            name: account.name.trim() || (0, accounts_1.signInName)(account),
+            username: account.username.trim(),
+            ...account.domain?.trim() ? { domain: account.domain.trim() } : {},
+        };
+        this.config.store.remoteDesktop.accounts = old ? list.map(a => a === old ? entry : a) : [...list, entry];
+        this.config.save();
+        this.changed$.next();
+        let keychainError;
+        if (password !== undefined && password !== '') {
+            await (0, signin_1.saveCredentials)((0, accounts_1.accountKey)(entry.id), { username: (0, accounts_1.signInName)(entry), password }).catch(e => { keychainError = String(e?.message ?? e); });
+        }
+        else if (old && (0, accounts_1.signInName)(old) !== (0, accounts_1.signInName)(entry)) {
+            await (0, signin_1.forgetCredentials)((0, accounts_1.accountKey)(entry.id));
+        }
+        return { id: entry.id, keychainError };
+    }
+    /** A desktop form's "New account…": saves it and hands it back for the form's list. */
+    async addAccountFromForm(input) {
+        const { id, keychainError } = await this.saveAccount({ name: input.name, username: input.username, domain: input.domain }, input.password);
+        if (keychainError) {
+            throw new Error(keychainError);
+        }
+        return this.accounts().find(a => a.id === id);
+    }
+    /** Whether a password is saved for the account; 'unknown' while the Vault is locked (it isn't unlocked for this). */
+    accountHasPassword(id) {
+        return (0, signin_1.hasCredentials)((0, accounts_1.accountKey)(id));
+    }
+    /** "Remove…" on a saved account: asks first, naming the desktops that use it. Resolves true when removed. */
+    async confirmRemoveAccount(id) {
+        const account = this.accounts().find(a => a.id === id);
+        if (!account) {
+            return false;
+        }
+        const uses = this.accountUses(id);
+        const { response } = await this.platform.showMessageBox({
+            type: 'warning',
+            message: `Remove the account "${account.name}"?`,
+            detail: `${(0, accounts_1.signInName)(account)}. Its saved password is removed too. ` + (uses.length
+                ? `${uses.length === 1 ? 'One desktop uses' : `${uses.length} desktops use`} it and will ask for an account when connecting: ${uses.map(u => u.name).join(', ')}.`
+                : 'No desktop uses it.'),
+            buttons: ['Remove', 'Keep'],
+            defaultId: 1,
+            cancelId: 1,
+        });
+        if (response !== 0) {
+            return false;
+        }
+        await this.removeAccount(id);
+        return true;
+    }
+    /** Removes a saved account and its password; desktops that used it go back to asking. */
+    async removeAccount(id) {
+        const store = this.config.store.remoteDesktop;
+        store.accounts = this.accounts().filter(a => a.id !== id);
+        if (this.configuredDesktops().some(d => d.account === id)) {
+            store.desktops = this.configuredDesktops().map(d => {
+                if (d.account !== id) {
+                    return d;
+                }
+                const { account: _account, ...rest } = d;
+                return rest;
+            });
+        }
+        for (const profile of this.config.store.profiles ?? []) {
+            if (profile?.type === targets_1.RDP_PROFILE_TYPE && profile.options?.account === id) {
+                profile.options.account = '';
+            }
+        }
+        this.config.save();
+        this.changed$.next();
+        await (0, signin_1.forgetCredentials)((0, accounts_1.accountKey)(id));
+    }
     /** `remoteDesktop.desktops`: the desktops configured behind SSH hosts. */
     configuredDesktops() {
         const list = this.config.store.remoteDesktop?.desktops;
@@ -500,6 +605,8 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
         const entry = await (0, desktopForm_1.askDesktop)(pane.element.nativeElement, {
             title: `Add a desktop reached through ${target.label}`,
             action: 'Add and open',
+            accounts: this.accounts(),
+            addAccount: input => this.addAccountFromForm(input),
             entry: { via: hostname, host: '127.0.0.1', port: 3389 },
             check: e => this.addressTaken(e, -1),
         });
@@ -524,20 +631,37 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
      * sharpness along; a new user name drops the saved account, which was for the old one. Open sessions keep running.
      */
     async editDesktop(pane, index) {
-        const old = this.configuredDesktops()[index];
-        if (!old) {
+        if (!this.configuredDesktops()[index]) {
             return;
         }
         if (this.isVisible(pane)) {
             this.showConsole(pane);
         }
-        const entry = await (0, desktopForm_1.askDesktop)(pane.element.nativeElement, {
-            title: `Edit ${old.name ?? (0, desktops_1.desktopIdOf)(old)} (behind ${old.via})`,
+        await this.editDesktopIn(pane.element.nativeElement, index);
+        pane.frontend?.focus();
+    }
+    /** What a desktop's `via` can name: the SSH profiles' names and hosts (see viaMatches), for the form to suggest. */
+    async sshHosts() {
+        const profiles = await this.profiles.getProfiles().catch(() => []);
+        const names = profiles.filter((p) => p.type === 'ssh' && !p.isTemplate)
+            .flatMap((p) => [p.name?.replace(/\s*\(\.ssh\/config\)$/, ''), p.options?.host].filter(Boolean));
+        return [...new Set(names)].sort((a, b) => a.localeCompare(b));
+    }
+    /** "Edit a desktop" with the form over any element (a pane, or the settings page). */
+    async editDesktopIn(host, index, askVia = false) {
+        const old = this.configuredDesktops()[index];
+        if (!old) {
+            return;
+        }
+        const entry = await (0, desktopForm_1.askDesktop)(host, {
+            title: `Edit ${old.name ?? (0, desktops_1.desktopIdOf)(old)}${askVia ? '' : ` (behind ${old.via})`}`,
             action: 'Save',
+            accounts: this.accounts(),
+            addAccount: input => this.addAccountFromForm(input),
+            hosts: askVia ? await this.sshHosts() : undefined,
             entry: old,
             check: e => this.addressTaken(e, index),
         });
-        pane.frontend?.focus();
         // Compared with the entry as it is now: the config can change while the form shows.
         const list = this.configuredDesktops();
         if (!entry || list[index] !== old) {
@@ -547,7 +671,7 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
         this.config.store.remoteDesktop.desktops = list;
         this.config.save();
         this.changed$.next();
-        const accountChanged = (old.username ?? '') !== (entry.username ?? '') || (old.domain ?? '') !== (entry.domain ?? '');
+        const accountChanged = (old.username ?? '') !== (entry.username ?? '') || (old.domain ?? '') !== (entry.domain ?? '') || (old.account ?? '') !== (entry.account ?? '');
         await this.desktopEdited((0, desktops_1.desktopIdOf)(old), (0, desktops_1.desktopIdOf)(entry), accountChanged, false);
     }
     /**
@@ -610,6 +734,21 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
             await this.importRdp(new Uint8Array(await file.arrayBuffer()), file.name);
         }
     }
+    /**
+     * The profile group for remote desktop profiles the plugin makes itself (an .rdp import, "New profile…" on the
+     * settings page): "Remote desktops", made the first time. Profiles made on Tabby's Profiles page go where the user
+     * puts them.
+     */
+    async remoteDesktopGroup() {
+        const groups = await this.profiles.getProfileGroups({ includeNonUserGroup: false });
+        const existing = groups.find(g => g.name === 'Remote desktops');
+        if (existing?.id) {
+            return existing.id;
+        }
+        const group = { name: 'Remote desktops', profiles: [] };
+        await this.profiles.newProfileGroup(group, { genId: true });
+        return group.id;
+    }
     /**
      * Adds a "Remote desktop (RDP)" profile from a .rdp file's contents (address, user name, domain; see rdpFile.ts)
      * and opens it; or opens the profile that already has that address and user. Returns the profile, or null.
@@ -631,6 +770,7 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
             type: targets_1.RDP_PROFILE_TYPE,
             name: fileName.replace(/^.*[\\/]/, '').replace(/\.rdp$/i, '') || parsed.host,
             icon: 'fas fa-desktop',
+            group: await this.remoteDesktopGroup(),
             options: { host: parsed.host, port: parsed.port, kind: 'windows', username: parsed.username ?? '', domain: parsed.domain ?? '', via: '' },
         };
         await this.profiles.newProfile(profile);
@@ -1437,23 +1577,34 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
             spec.port = endpoint.port;
             spec.username ??= endpoint.username;
         }
-        const saved = retryError ? null : await (0, signin_1.loadCredentials)(session.key);
+        // A saved account (Settings): its user name, and its password from the keychain. One that has none yet, or that
+        // this desktop just refused, is asked for here and saved for every desktop that uses the account.
+        const account = spec.account ? this.accounts().find(a => a.id === spec.account) : undefined;
+        if (spec.account && !account) {
+            session.log.push('sign-in: its saved account no longer exists; asking');
+        }
+        const again = this.askAgain.delete(pane);
+        const saved = retryError || again ? null : await (0, signin_1.loadCredentials)(account ? (0, accounts_1.accountKey)(account.id) : session.key);
         if (saved) {
-            return { host: spec.host, port: spec.port, credentials: saved, remember: false };
+            if (account) {
+                session.log.push(`sign-in: the saved account "${account.name}"`);
+            }
+            return { host: spec.host, port: spec.port, credentials: account ? { username: (0, accounts_1.signInName)(account), password: saved.password } : saved, remember: false };
         }
         session.status('');
         const asked = (0, signin_1.askCredentials)(session.overlay, {
             // The host's own desktops (its own, or its xrdp besides GNOME) and direct ones need no "via".
             title: spec.id === desktops_1.OWN_DESKTOP || target.direct || spec.kind === 'xrdp' && spec.host === '127.0.0.1' ? `Sign in to ${spec.name}` : `Sign in to ${spec.name} (via ${target.label})`,
-            username: spec.username,
+            username: account ? (0, accounts_1.signInName)(account) : spec.username,
             error: retryError,
             canRemember: true,
+            account: account?.name,
         }, session.disposed);
         if (session.visible) {
             setTimeout(() => session.visible && session.focusDesktop());
         }
         const entered = await asked;
-        return entered && { host: spec.host, port: spec.port, credentials: entered, remember: entered.remember };
+        return entered && { host: spec.host, port: spec.port, credentials: entered, remember: entered.remember, saveKey: account && (0, accounts_1.accountKey)(account.id) };
     }
     async connect(pane, target, spec, session) {
         const alive = () => this.sessions.get(pane) === session;
@@ -1505,6 +1656,8 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
                     return;
                 }
                 if (outcome.signInFailed && this.signsIn(spec) && attempt < 5 && alive()) {
+                    // The desktop's own saved account goes. A shared one stays until a new password is entered: this
+                    // desktop refusing it doesn't make it wrong for the others.
                     await (0, signin_1.forgetCredentials)(session.key);
                     retryError = outcome.signInFailed;
                     endpoint = null;
@@ -1848,7 +2001,7 @@ let RemoteDesktopService = RemoteDesktopService_1 = class RemoteDesktopService {
             this.changed$.next();
             this.reconnects.delete(pane); // connected again: a later drop starts over
             if (endpoint.remember) {
-                (0, signin_1.saveCredentials)(session.key, credentials).then(() => session.log.push('sign-in: saved in the keychain'), e => session.log.push(`sign-in: keychain: ${e?.message ?? e}`));
+                (0, signin_1.saveCredentials)(endpoint.saveKey ?? session.key, credentials, endpoint.saveLabel).then(() => session.log.push(`sign-in: saved ${endpoint.saveKey ? 'as the account\'s password ' : ''}in ${(0, signin_1.storeName)()}`), e => session.log.push(`sign-in: ${(0, signin_1.storeName)()}: ${e?.message ?? e}`));
             }
             if (session.visible) {
                 session.focusDesktop();
@@ -1901,7 +2054,38 @@ function installStyle() {
     }
     styleInstalled = true;
     const style = document.createElement('style');
-    style.textContent = STYLE + signin_1.STYLE + fileTransfer_1.STYLE + connectionStatus_1.STYLE + osd_1.OSD_STYLE;
+    style.textContent = STYLE + signin_1.STYLE + fileTransfer_1.STYLE + connectionStatus_1.STYLE + osd_1.OSD_STYLE + DRAGBAR_STYLE + accountForm_1.STYLE;
     document.head.appendChild(style);
+    keepWindowDraggable();
+}
+/** A strip the height of the tab bar that stays a window drag region over a dialog (the plugin's, and Tabby's). */
+const DRAGBAR_STYLE = `
+.trd-form-dragbar { display: none; }
+.modal > .trd-form-dragbar { display: block; position: fixed; left: 0; right: 0; top: 0; height: var(--tabs-height, 38px); -webkit-app-region: drag; }
+`;
+/**
+ * Tabby's dialogs (ng-bootstrap modals) cover the whole window, tab bar included, with nothing marked as a drag
+ * region, so the window can't be moved while one shows. Each gets a strip where the tab bar is; the dialog box itself
+ * is below it. The plugin's own dialogs do the same (see settingsPage.ts).
+ */
+function keepWindowDraggable() {
+    const strip = (modal) => {
+        if (!modal.querySelector(':scope > .trd-form-dragbar')) {
+            const bar = document.createElement('div');
+            bar.className = 'trd-form-dragbar';
+            modal.prepend(bar);
+        }
+    };
+    // ng-bootstrap appends each dialog (ngb-modal-window.modal) to the body itself: only the body's children are watched.
+    document.querySelectorAll('body > .modal').forEach(strip);
+    new MutationObserver(records => {
+        for (const record of records) {
+            record.addedNodes.forEach(node => {
+                if (node instanceof Element && node.classList.contains('modal')) {
+                    strip(node);
+                }
+            });
+        }
+    }).observe(document.body, { childList: true });
 }
 //# sourceMappingURL=desktop.service.js.map