From 2bb66d180becea8635bf04315d850101454a2a4c Mon Sep 17 00:00:00 2001
From: Egor Kraev <egor.kraev@gmail.com>
Date: Wed, 21 Oct 2026 18:11:44 +0200
Subject: [PATCH 1/2] Close the Hubs menu on a press outside it; no worktree
 menu on the main checkout

The Hubs menu now closes on a pointer press outside it and the Hubs button,
like the worktree menu and preset picker already do. Right-clicking the
main worktree opened a menu whose only item, Delete worktree, was always
disabled; it now opens none and closes any open one.
---
 src/web/ui/app.tsx       | 13 ++++++++++++-
 src/web/ui/view.ts       |  4 +++-
 test/e2e/contract.ts     |  4 ++--
 test/e2e/hubs.spec.ts    | 15 +++++++++++++++
 test/e2e/sidebar.spec.ts | 20 +++++++++++++++-----
 5 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/web/ui/app.tsx b/src/web/ui/app.tsx
index 2dfad91..453c6d4 100644
--- a/src/web/ui/app.tsx
+++ b/src/web/ui/app.tsx
@@ -116,6 +116,17 @@ const Hubs = ({ client }: { client: HubClient }) => {
   const [open, setOpen] = useState(false);
   const stateRef = useRef(state);
   const menuButton = useRef<HTMLButtonElement>(null);
+  const menu = useRef<HTMLSpanElement>(null);
+  useEffect(() => {
+    if (!open) return undefined;
+    const outside = (event: PointerEvent): void => {
+      if (event.target instanceof Node && menu.current?.contains(event.target) !== true) setOpen(false);
+    };
+    document.addEventListener('pointerdown', outside, true);
+    return () => {
+      document.removeEventListener('pointerdown', outside, true);
+    };
+  }, [open]);
   const hosts = client.store.hosts.value;
   const dispatch = (action: HubAction): void => {
     const { state: next, effect } = hubStep(stateRef.current, action);
@@ -174,7 +185,7 @@ const Hubs = ({ client }: { client: HubClient }) => {
         />
       )}
       {entries !== null && (
-        <span class="hubs">
+        <span class="hubs" ref={menu}>
           <button
             type="button"
             ref={menuButton}
diff --git a/src/web/ui/view.ts b/src/web/ui/view.ts
index 57364f1..6d2b060 100644
--- a/src/web/ui/view.ts
+++ b/src/web/ui/view.ts
@@ -570,8 +570,10 @@ export class View {
     this.confirmation.value = null;
   }
 
+  /** Opens the worktree menu at `x`, `y`; the main worktree has none, its only item being deletion. */
   openWorktreeMenu(worktree: string, x: number, y: number): void {
-    this.worktreeMenu.value = { worktree, x, y };
+    const main = this.repo.value?.worktrees.find((w) => w.path === worktree)?.main === true;
+    this.worktreeMenu.value = main ? null : { worktree, x, y };
   }
 
   closeWorktreeMenu(): void {
diff --git a/test/e2e/contract.ts b/test/e2e/contract.ts
index a5e4163..bd77953 100644
--- a/test/e2e/contract.ts
+++ b/test/e2e/contract.ts
@@ -58,7 +58,7 @@ export const TID = {
   addRepoPath: 'add-repo-path',
   /** In the add-repo dialog after a failed `addRepo`; text holds the error code. */
   addRepoError: 'add-repo-error',
-  /** Sidebar entry; `data-path` = path, `title` = path then `<preset> <id>: <status>` per terminal (or "no terminals"), `aria-selected`, `data-prunable="true"`, `data-gone="true"`; holds a checkbox input unless gone; a primary click anywhere in it but on the checkbox selects it; right-click opens the worktree menu without selecting. */
+  /** Sidebar entry; `data-path` = path, `title` = path then `<preset> <id>: <status>` per terminal (or "no terminals"), `aria-selected`, `data-prunable="true"`, `data-gone="true"`; holds a checkbox input unless gone; a primary click anywhere in it but on the checkbox selects it; right-click opens the worktree menu without selecting, except on the main worktree, which has none. */
   worktree: 'worktree',
   /** The label inside a sidebar entry; Enter or Space on it selects the worktree. */
   worktreeLabel: 'worktree-label',
@@ -132,7 +132,7 @@ export const TID = {
   terminal: 'terminal',
   /** Header button "Hubs", present only while there is a remote host; opens the list of `hubsEntry`; coloured like the selected repo tab, hovered or not. */
   hubsMenu: 'hubs-menu',
-  /** The open Hubs menu holding the `hubsEntry` items, with a thin border. */
+  /** The open Hubs menu holding the `hubsEntry` items, with a thin border; Escape or a pointer press outside it and the Hubs button closes it. */
   hubsList: 'hubs-list',
   /** One per hub in the open Hubs menu, in order: text = "This machine" or the host name; `aria-current="true"` on the page's own hub. */
   hubsEntry: 'hubs-entry',
diff --git a/test/e2e/hubs.spec.ts b/test/e2e/hubs.spec.ts
index 12ef1b3..0ad0bf3 100644
--- a/test/e2e/hubs.spec.ts
+++ b/test/e2e/hubs.spec.ts
@@ -81,6 +81,21 @@ test.describe('Hubs menu', () => {
     await expect(page.locator(byTestId(TID.hubsMenu))).toBeFocused();
   });
 
+  test('a press outside the menu closes it; the Hubs button toggles it', async ({ hub, page, ssh }) => {
+    ssh.failHost('box', RESOLVE_ERROR);
+    const repo = await home(hub, page, [{ name: 'box', ssh: 'box' }]);
+    const button = page.locator(byTestId(TID.hubsMenu));
+    const list = page.locator(byTestId(TID.hubsList));
+    await button.click();
+    await expect(list).toBeVisible();
+    await page.locator(repoTab(repo)).click();
+    await expect(list).toHaveCount(0);
+    await button.click();
+    await expect(list).toBeVisible();
+    await button.click();
+    await expect(list).toHaveCount(0);
+  });
+
   test('the open menu has a thin border', async ({ hub, page, ssh }) => {
     ssh.failHost('box', RESOLVE_ERROR);
     await home(hub, page, [{ name: 'box', ssh: 'box' }]);
diff --git a/test/e2e/sidebar.spec.ts b/test/e2e/sidebar.spec.ts
index 4c47953..bc9b246 100644
--- a/test/e2e/sidebar.spec.ts
+++ b/test/e2e/sidebar.spec.ts
@@ -510,14 +510,24 @@ test.describe('worktree status and deletion', () => {
     );
   });
 
-  test('the main worktree cannot be deleted, and Escape closes the menu', async ({ hub, page }) => {
-    const { repo } = makeRepoWith(hub, 'app', []);
+  test('right-clicking the main worktree opens no menu and closes an open one', async ({ hub, page }) => {
+    const { repo, worktrees } = makeRepoWith(hub, 'app', ['feat']);
+    const feat = worktrees[0] ?? '';
     hub.writeRepos([repo]);
     await openUi(hub, page);
     await page.locator(worktreeEntry(repo)).click({ button: 'right' });
-    const item = page.locator(byTestId(TID.deleteWorktree));
-    await expect(item).toBeDisabled();
-    await expect(item).toHaveAttribute('title', 'The main worktree cannot be deleted');
+    await expect(page.locator(byTestId(TID.worktreeMenu))).toHaveCount(0);
+    await page.locator(worktreeEntry(feat)).click({ button: 'right' });
+    await expect(page.locator(byTestId(TID.worktreeMenu))).toBeVisible();
+    await page.locator(worktreeEntry(repo)).click({ button: 'right' });
+    await expect(page.locator(byTestId(TID.worktreeMenu))).toHaveCount(0);
+  });
+
+  test('Escape closes the worktree menu', async ({ hub, page }) => {
+    const { repo, worktrees } = makeRepoWith(hub, 'app', ['feat']);
+    hub.writeRepos([repo]);
+    await openUi(hub, page);
+    await page.locator(worktreeEntry(worktrees[0] ?? '')).click({ button: 'right' });
     await page.locator(byTestId(TID.worktreeMenu)).press('Escape');
     await expect(page.locator(byTestId(TID.worktreeMenu))).toHaveCount(0);
   });

From 70c1758383a0a5d1ba070c7a5d2b38084502c6de Mon Sep 17 00:00:00 2001
From: Egor Kraev <egor.kraev@gmail.com>
Date: Wed, 21 Oct 2026 18:23:25 +0200
Subject: [PATCH 2/2] Write the fake SSH's argument file through a rename in
 the hub link tests

It was filled one printf at a time, so a loaded run could read a partial
argument list (seen as a forwardToHub failure).
---
 src/hub/links/hub.test.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hub/links/hub.test.ts b/src/hub/links/hub.test.ts
index 405d7d0..31b6dba 100644
--- a/src/hub/links/hub.test.ts
+++ b/src/hub/links/hub.test.ts
@@ -42,7 +42,11 @@ const sleep = (ms: number): Promise<void> => new Promise((resolve) => setTimeout
 /** Installs `body` as the SSH program; `$D` is the test directory, `$@` the SSH arguments. */
 const fakeSsh = (body: string): void => {
   const program = join(dir, 'ssh');
-  writeFileSync(program, `#!/bin/sh\nD='${dir}'\nfor a in "$@"; do printf '%s\\0' "$a"; done > "$D/args"\necho $$ >> "$D/pids"\n${body}\n`);
+  // `args` appears whole, through a rename, so a reader never sees part of it.
+  writeFileSync(
+    program,
+    `#!/bin/sh\nD='${dir}'\nfor a in "$@"; do printf '%s\\0' "$a"; done > "$D/args.tmp"\nmv "$D/args.tmp" "$D/args"\necho $$ >> "$D/pids"\n${body}\n`,
+  );
   chmodSync(program, 0o755);
   vi.stubEnv('WTD_SSH', program);
 };