From 171dbd6abe416cc1d9adaab8752bc3d60b133725 Mon Sep 17 00:00:00 2001 From: usrnk1 <7547651+usrnk1@users.noreply.github.com> Date: Fri, 30 Oct 2026 22:12:50 +0100 Subject: [PATCH] feat(app): add worktree picker shortcuts and toggle shell mode (#60713) --- bun.lock | 1 + package.json | 3 +- packages/app/e2e/regression/composer.spec.ts | 33 ++++ .../app/e2e/regression/new-session.spec.ts | 170 +++++++++++++++--- packages/app/src/composer/model.ts | 10 +- .../app/src/new-session/location/dialog.css | 4 - .../app/src/new-session/location/dialog.tsx | 20 ++- packages/app/src/new-session/view.tsx | 84 +++++---- .../src/new-session/workspace/selector.tsx | 6 +- packages/app/src/runtime/i18n/en.ts | 1 + packages/desktop/script/picker.ts | 1 + packages/ui/src/components/menu-scroll.css | 59 ++++++ packages/ui/src/components/menu-scroll.tsx | 84 +++++++++ packages/ui/src/forms/typeahead/typeahead.tsx | 11 +- ...onovich%2Fvite-plugin-opencode@0.1.3.patch | 12 ++ 15 files changed, 426 insertions(+), 73 deletions(-) create mode 100644 packages/ui/src/components/menu-scroll.css create mode 100644 packages/ui/src/components/menu-scroll.tsx create mode 100644 patches/@brendonovich%2Fvite-plugin-opencode@0.1.3.patch diff --git a/bun.lock b/bun.lock index 4a0b6be1d7b..dab69739ad9 100644 --- a/bun.lock +++ b/bun.lock @@ -1011,6 +1011,7 @@ "patchedDependencies": { "@ai-sdk/openai-compatible@2.0.41": "patches/@ai-sdk%2Fopenai-compatible@2.0.41.patch", "@tanstack/virtual-core@3.17.8": "patches/@tanstack%2Fvirtual-core@3.17.8.patch", + "@brendonovich/vite-plugin-opencode@0.1.3": "patches/@brendonovich%2Fvite-plugin-opencode@0.1.3.patch", "electron-updater@6.8.9": "patches/electron-updater@6.8.9.patch", "pacote@21.5.1": "patches/pacote@21.5.1.patch", "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch", diff --git a/package.json b/package.json index f859e99d29b..dd2487e17d0 100644 --- a/package.json +++ b/package.json @@ -180,6 +180,7 @@ "@corvu/drawer@0.2.4": "patches/@corvu%2Fdrawer@0.2.4.patch", "app-builder-lib@26.15.7": "patches/app-builder-lib@26.15.7.patch", "electron-updater@6.8.9": "patches/electron-updater@6.8.9.patch", - "@pierre/trees@1.0.0-beta.6": "patches/@pierre%2Ftrees@1.0.0-beta.6.patch" + "@pierre/trees@1.0.0-beta.6": "patches/@pierre%2Ftrees@1.0.0-beta.6.patch", + "@brendonovich/vite-plugin-opencode@0.1.3": "patches/@brendonovich%2Fvite-plugin-opencode@0.1.3.patch" } } diff --git a/packages/app/e2e/regression/composer.spec.ts b/packages/app/e2e/regression/composer.spec.ts index e57638b7cb1..8ea8c93d44d 100644 --- a/packages/app/e2e/regression/composer.spec.ts +++ b/packages/app/e2e/regression/composer.spec.ts @@ -1133,6 +1133,39 @@ test("/reload reloads the server's configuration once and reports it", async ({ const followUp = "Add follow-up, / for commands, @ for context…" +test("the shell shortcut toggles modes and keeps explicit bindings", async ({ page }) => { + const view = await openDraft(page, { + name: "ShellToggle", + seed: { + settings: { + keybinds: { "prompt.mode.shell": "mod+alt+s", "prompt.mode.normal": "mod+alt+e" }, + }, + }, + }) + + const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control")) + + const exit = page.getByRole("button", { name: /^Exit/ }) + + await view.editor.fill("echo hello") + await view.editor.press(`${modifier}+Shift+x`) + await expect(exit).toBeVisible() + await expect(view.editor).toHaveText("echo hello") + await view.editor.press(`${modifier}+Shift+x`) + await expect(exit).toHaveCount(0) + await expect(view.editor).toHaveText("echo hello") + await view.editor.press(`${modifier}+Shift+x`) + await expect(exit).toBeVisible() + await view.editor.press("Escape") + await expect(exit).toHaveCount(0) + await expect(view.editor).toBeFocused() + await view.editor.press(`${modifier}+Alt+s`) + await expect(exit).toBeVisible() + await view.editor.press(`${modifier}+Alt+e`) + await expect(exit).toHaveCount(0) + await expect(view.editor).toHaveText("echo hello") +}) + for (const row of [ { state: "an idle", copy: "Ask anything, / for commands, @ for context…" }, { state: "a running", copy: followUp, sessionStatus: { ses_placeholder: { type: "running" } } }, diff --git a/packages/app/e2e/regression/new-session.spec.ts b/packages/app/e2e/regression/new-session.spec.ts index d2413619ba0..4f1ee96867d 100644 --- a/packages/app/e2e/regression/new-session.spec.ts +++ b/packages/app/e2e/regression/new-session.spec.ts @@ -58,7 +58,7 @@ test("the new session screen does not show session details", async ({ page }) => await expect(page.getByRole("button", { name: "Session details", exact: true })).toHaveCount(0) }) -test("the location shortcut keeps cycling after hovering its icon", async ({ page }) => { +test("the location shortcuts choose worktrees from every state and keep cycling", async ({ page }) => { const existing = "C:/OpenCode/LocationShortcut/.worktrees/quiet-river" const view = await openDraft(page, { @@ -67,27 +67,133 @@ test("the location shortcut keeps cycling after hovering its icon", async ({ pag }) const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control")) - const path = page.locator('[data-slot="new-session-location-path"]') - const icon = page.locator('[data-slot="new-session-location-icon"]') - // The worktree trigger already says Local, so the local path has no icon of its own. + const path = page.locator('[data-slot="new-session-location-path"]') + + const search = page.getByRole("combobox", { name: "Search worktrees", exact: true }) + await expect(path).toHaveText(view.directory) - await expect(icon).toHaveCount(0) - await newSessionWorktree(page).click() + await view.editor.press(`${modifier}+Alt+KeyO`) + await expect(search).toBeFocused() await page.getByRole("option", { name: /^quiet-river / }).click() await expect(view.editor).toBeFocused() await expect(path).toHaveText(existing) - await icon.hover() - await expect(page.getByRole("tooltip")).toContainText("Toggle session location") - await view.editor.press(`${modifier}+Alt+KeyL`) - await expect(newSessionWorktree(page)).toHaveText("Local") - await expect(icon).toHaveCount(0) - await expect(view.editor).toBeFocused() + await expect(page.locator('[data-slot="new-session-location-icon"]')).toHaveCount(0) + await view.editor.press(`${modifier}+Alt+KeyO`) + await expect(search).toBeFocused() + await page.getByRole("option", { name: /LocationShortcut C:\/OpenCode\/LocationShortcut$/ }).click() await view.editor.press(`${modifier}+Alt+KeyL`) await expect(newSessionWorktree(page)).toContainText("New worktree") + await view.editor.press(`${modifier}+Alt+KeyO`) + await expect(search).toBeFocused() + await page.getByRole("option", { name: /^quiet-river / }).click() + await expect(path).toHaveText(existing) await expect(view.editor).toBeFocused() }) +for (const binding of ["custom", "none"]) { + test(`the picker tooltips reflect ${binding} shortcuts`, async ({ page }) => { + const view = await openDraft(page, { + name: "PickerShortcuts", + seed: { + settings: { + keybinds: { + "project.select": binding === "custom" ? "mod+alt+p" : "none", + "session.location.select": binding === "custom" ? "mod+alt+x" : "none", + "session.location.cycle": binding === "custom" ? "mod+alt+k" : "none", + }, + }, + }, + }) + + const tooltip = page.getByRole("tooltip").and(page.locator("[data-expanded]")) + + const keys = tooltip.locator('[data-component="keybind-v2"]') + + await newSessionLocation(page).hover() + await expect(tooltip).toContainText("Choose project") + + await expect(keys).toHaveText(binding === "custom" ? [/P$/] : []) + await newSessionWorktree(page).hover() + await expect(tooltip).toContainText("Isolate sessions with worktrees") + + await expect(keys).toHaveText(binding === "custom" ? [/X$/] : []) + + const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control")) + + if (binding === "none") { + await view.editor.press(`${modifier}+Alt+o`) + await expect(page.getByRole("dialog")).toHaveCount(0) + await expect(newSessionWorktree(page)).toHaveText("Local") + + return + } + + await view.editor.press(`${modifier}+Alt+k`) + await expect(newSessionWorktree(page)).toContainText("New worktree") + await view.editor.press(`${modifier}+Alt+x`) + const search = page.getByRole("combobox", { name: "Search worktrees", exact: true }) + + await expect(search).toBeFocused() + await search.press("Escape") + await expect(page.getByRole("dialog")).toHaveCount(0) + await expect(newSessionWorktree(page)).toContainText("New worktree") + await expect(view.editor).toBeFocused() + await view.editor.press(`${modifier}+Alt+p`) + await expect(page.getByRole("combobox", { name: "Search projects", exact: true })).toBeFocused() + }) +} + +test("the worktree picker shortcut is disabled for non-Git projects", async ({ page }) => { + const view = await openDraft(page, { name: "NoWorktrees", project: { vcs: undefined } }) + + const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control")) + + await expect(newSessionWorktree(page)).toHaveCount(0) + await view.editor.press(`${modifier}+Alt+o`) + await expect(page.getByRole("dialog")).toHaveCount(0) + await view.editor.fill("Keep working locally") + await expect(view.editor).toHaveText("Keep working locally") +}) + +test("picker scrollbars overlay full-width rows and support dragging", async ({ page }) => { + const root = "C:/OpenCode/OverlayMenus" + + await openDraft(page, { + name: "OverlayMenus", + worktrees: () => [ + { directory: root }, + ...Array.from({ length: 24 }, (_, index) => ({ + directory: `${root}/worktree-${index}`, + strategy: "git" as const, + })), + ], + }) + await newSessionWorktree(page).click() + await expect(page.getByRole("combobox", { name: "Search worktrees", exact: true })).toBeFocused() + + const menu = page.locator('[data-component="menu-scroll"]') + + const viewport = menu.locator('[data-slot="menu-scroll-viewport"]') + + const thumb = menu.locator('[data-slot="menu-scroll-thumb"]') + + await menu.hover() + await expect(thumb).toHaveCSS("opacity", "1") + await expect.poll(() => viewport.evaluate((el) => el.getBoundingClientRect().width - el.clientWidth)).toBe(0) + + const track = (await menu.boundingBox())! + + const handle = (await thumb.boundingBox())! + + await thumb.hover() + await page.mouse.down() + await page.mouse.move(handle.x + handle.width / 2, track.y + track.height - 4) + await page.mouse.up() + await expect.poll(() => viewport.evaluate((el) => el.scrollTop > 0)).toBe(true) + await expect(page.getByRole("option", { name: /^worktree-23 / })).toBeInViewport() +}) + for (const row of [ { name: "POSIX", @@ -108,6 +214,21 @@ for (const row of [ await expect.poll(() => path.evaluate((el) => el.scrollWidth <= el.clientWidth)).toBe(true) await path.hover() await expect(page.getByRole("tooltip")).toHaveText(row.directory) + + if (row.name !== "POSIX") return + await expect(path).toHaveCSS("user-select", "text") + await path.click() + await path.evaluate((element) => { + const range = document.createRange() + + range.selectNodeContents(element) + window.getSelection()?.removeAllRanges() + window.getSelection()?.addRange(range) + }) + const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control")) + + await page.keyboard.press(`${modifier}+c`) + await expect.poll(() => page.evaluate(() => navigator.clipboard.readText())).toBe(row.directory) }) } @@ -234,11 +355,7 @@ test("the worktree trigger opens the current project's worktree step", async ({ await local.click() await expect(search).toBeFocused() await expect(back).toHaveText("Run session in") - await expect(options.locator(".command-palette-title")).toHaveText([ - "BranchWorktrees", - "New worktree", - "quiet-river", - ]) + await expect(options.locator(".command-palette-title")).toHaveText(["BranchWorktrees", "New worktree", "quiet-river"]) await expect(options.nth(0)).toHaveAttribute("aria-selected", "true") // Stepping back lands on the projects step with the drilled project active, as after drilling in with →. @@ -247,15 +364,28 @@ test("the worktree trigger opens the current project's worktree step", async ({ await expect(projects).toBeFocused() await expect(back).toHaveCount(0) await expect(options.filter({ hasText: "BranchWorktrees" })).toHaveAttribute("aria-selected", "true") + await projects.press("ArrowRight") + await expect(search).toBeFocused() + await search.press("Escape") + await expect(projects).toBeFocused() await projects.press("Escape") await expect(dialog).toHaveCount(0) await expect(view.editor).toBeFocused() - // Escape also steps back first, then closes. + // A directly opened worktree picker closes on Escape without showing projects first. await local.focus() await page.keyboard.press("Enter") await expect(search).toBeFocused() await search.press("Escape") + await expect(dialog).toHaveCount(0) + await expect(view.editor).toBeFocused() + + // Drilling in from the project picker still makes Escape step back. + await newSessionLocation(page).click() + await expect(projects).toBeFocused() + await projects.press("ArrowRight") + await expect(search).toBeFocused() + await search.press("Escape") await expect(projects).toBeFocused() await projects.press("Escape") await expect(dialog).toHaveCount(0) @@ -277,7 +407,7 @@ test("the branch shortcut chooses a base branch and stays inactive on Local", as const modifier = await page.evaluate(() => (/Mac/i.test(navigator.platform) ? "Meta" : "Control")) - const shortcut = `${modifier}+Alt+Period` + const shortcut = `${modifier}+Alt+KeyB` const base = page.getByRole("button", { name: "from dev", exact: true }) @@ -285,7 +415,7 @@ test("the branch shortcut chooses a base branch and stays inactive on Local", as await base.hover() await expect(page.getByRole("tooltip")).toContainText("Choose base branch") - await expect(page.getByRole("tooltip").locator('[data-component="keybind-v2"]')).toContainText(".") + await expect(page.getByRole("tooltip").locator('[data-component="keybind-v2"]')).toContainText("B") await expect(view.editor).toBeFocused() await view.editor.press(shortcut) await expect(search).toBeFocused() diff --git a/packages/app/src/composer/model.ts b/packages/app/src/composer/model.ts index dfcb828760f..3ac0318debe 100644 --- a/packages/app/src/composer/model.ts +++ b/packages/app/src/composer/model.ts @@ -579,11 +579,18 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue? disabled: controller.state.mode !== "normal", onSelect: () => controller.attach(), }, + { + id: "prompt.mode.toggle", + title: language.t("command.prompt.mode.toggle"), + category: language.t("command.category.session"), + keybind: "mod+shift+x", + onSelect: () => + void controller.dispatch({ type: controller.state.mode === "normal" ? "mode.shell" : "mode.normal" }), + }, { id: "prompt.mode.shell", title: language.t("command.prompt.mode.shell"), category: language.t("command.category.session"), - keybind: "mod+shift+x", disabled: controller.state.mode === "shell", onSelect: () => void controller.dispatch({ type: "mode.shell" }), }, @@ -591,7 +598,6 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue? id: "prompt.mode.normal", title: language.t("command.prompt.mode.normal"), category: language.t("command.category.session"), - keybind: "mod+shift+e", disabled: controller.state.mode === "normal", onSelect: () => void controller.dispatch({ type: "mode.normal" }), }, diff --git a/packages/app/src/new-session/location/dialog.css b/packages/app/src/new-session/location/dialog.css index f9fa739e752..bafc1911fa3 100644 --- a/packages/app/src/new-session/location/dialog.css +++ b/packages/app/src/new-session/location/dialog.css @@ -111,10 +111,6 @@ color: var(--v2-text-text-faint); } -.new-session-location-workspace .command-palette-row-icon { - color: var(--v2-icon-icon-base); -} - .new-session-location-workspace .command-palette-row-text > .command-palette-title { max-width: 60%; flex-shrink: 0; diff --git a/packages/app/src/new-session/location/dialog.tsx b/packages/app/src/new-session/location/dialog.tsx index dae5f102279..0aba30d5fff 100644 --- a/packages/app/src/new-session/location/dialog.tsx +++ b/packages/app/src/new-session/location/dialog.tsx @@ -3,6 +3,7 @@ import { Dialog, DialogBody } from "@opencode/ui/dialog" import { useDialog } from "@opencode/ui/context/dialog" import { Icon } from "@opencode/ui/icon" import { Keybind } from "@opencode/ui/keybind" +import { MenuScroll } from "@opencode/ui/menu-scroll" import { displayName, getProjectAvatarGenerated, @@ -77,6 +78,7 @@ function NewSessionLocationDialog(props: { const [store, setStore] = createStore<{ drilled?: PromptProject + direct: boolean /** Picking the server to add a project to. */ picking?: boolean /** Browsing server projects this client has not added. */ @@ -88,6 +90,7 @@ function NewSessionLocationDialog(props: { query: "", others: false, drilled: props.drilled, + direct: !!props.drilled, back: props.drilled ? { query: "", active: projectEntryID(props.drilled), others: false } : undefined, }) @@ -281,6 +284,7 @@ function NewSessionLocationDialog(props: { setStore({ drilled: undefined, picking: undefined, + direct: false, others: store.drilled || store.picking ? (store.back?.others ?? false) : false, query: store.drilled || store.picking ? (store.back?.query ?? "") : "", back: undefined, @@ -367,6 +371,14 @@ function NewSessionLocationDialog(props: { return } + if (event.key === "Escape" && store.direct && store.drilled) { + event.preventDefault() + event.stopPropagation() + dialog.close() + + return + } + if ( (store.drilled || store.picking || store.others) && ((event.key === backward && atStart) || (event.key === "Backspace" && !target.value) || event.key === "Escape") @@ -405,7 +417,11 @@ function NewSessionLocationDialog(props: { />