From 1f8a8bd13344a2a6d1e1f782f8b0dc735654c0af Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" <219766164+opencode-agent[bot]@users.noreply.github.com> Date: Sun, 25 Oct 2026 12:01:54 +0000 Subject: [PATCH] fix(app): tidy search shortcuts and add Unbind while recording (#58964) Co-authored-by: vimtor <36263538+vimtor@users.noreply.github.com> --- .../e2e/regression/command-palette.spec.ts | 37 ++++++++++++++ .../e2e/regression/settings-search.spec.ts | 8 +-- packages/app/e2e/regression/settings.spec.ts | 22 ++++++++ packages/app/src/home/sessions/search.ts | 5 +- packages/app/src/new-session/commands.tsx | 4 +- packages/app/src/new-session/screen.tsx | 8 ++- packages/app/src/runtime/i18n/en.ts | 4 +- .../app/src/settings/keybinds/keybinds.tsx | 51 +++++++++++++------ .../app/src/settings/keybinds/migration.ts | 4 +- .../app/src/shell/commands/command-search.tsx | 51 +++++++++++++++++++ packages/app/src/shell/commands/command.tsx | 3 ++ packages/app/src/shell/shell.tsx | 13 ++++- packages/app/src/shell/state/layout.tsx | 16 ++++++ packages/app/src/shell/titlebar/titlebar.tsx | 28 +++++++--- packages/ui/src/actions/button/button.css | 19 +++++++ .../ui/src/actions/button/button.stories.tsx | 16 +++++- packages/ui/src/actions/button/button.tsx | 1 + 17 files changed, 254 insertions(+), 36 deletions(-) create mode 100644 packages/app/src/shell/commands/command-search.tsx diff --git a/packages/app/e2e/regression/command-palette.spec.ts b/packages/app/e2e/regression/command-palette.spec.ts index b7ccba66a37..afe1d25b471 100644 --- a/packages/app/e2e/regression/command-palette.spec.ts +++ b/packages/app/e2e/regression/command-palette.spec.ts @@ -129,6 +129,43 @@ test("titlebar search lists recent sessions and opens the typed match", async ({ await expect(page.getByRole("heading", { name: paletteSession.title, exact: true })).toBeVisible() }) +test("Search commands lists only commands and runs the chosen one", async ({ page }) => { + const { dialog, input } = await openCommandPalette(page, true) + await input.fill("search commands") + await dialog.getByRole("option", { name: /^Search commands/ }).click() + const search = page.getByRole("dialog").getByRole("combobox") + await expect(search).toHaveAttribute("placeholder", "Search commands") + await expect(search).toBeFocused() + await expect(page.getByRole("dialog").getByRole("option", { name: /^Open settings/ })).toBeVisible() + await search.fill("Palette fixture") + await expect(page.getByRole("dialog").getByText("No results found", { exact: true })).toBeVisible() + await search.fill("open settings") + await expect(page.getByRole("dialog").getByRole("option")).toHaveCount(1) + await search.press("Enter") + await expect(page).toHaveURL("/settings") +}) + +test("Search projects opens a new session's project picker from a session and from Home", async ({ page }) => { + const editor = page.locator('[data-component="composer-editor"]') + const picker = page.getByRole("combobox", { name: "Search projects", exact: true }) + const { dialog, input } = await openCommandPalette(page) + await input.fill("search projects") + await dialog.getByRole("option", { name: /^Search projects/ }).click() + await expect(page).toHaveURL(/\/new-session\?draftId=.+$/) + await expect(picker).toBeFocused() + await picker.press("Escape") + await expect(picker).toHaveCount(0) + await expect(editor).toBeFocused() + + await page.goto("/") + await expect( + page.getByRole("region", { name: "Recent sessions" }).getByRole("button", { name: /Palette fixture session/ }), + ).toBeEnabled() + await page.keyboard.press("ControlOrMeta+Shift+O") + await expect(page).toHaveURL(/\/new-session\?draftId=.+$/) + await expect(picker).toBeFocused() +}) + test("reopens from its shortcut as soon as it closes", async ({ page }) => { const { dialog, input } = await openCommandPalette(page) await input.press("Escape") diff --git a/packages/app/e2e/regression/settings-search.spec.ts b/packages/app/e2e/regression/settings-search.spec.ts index 8ca44ac0bcd..fabceae84b8 100644 --- a/packages/app/e2e/regression/settings-search.spec.ts +++ b/packages/app/e2e/regression/settings-search.spec.ts @@ -210,11 +210,11 @@ test("Models and Shortcuts leave focus on navigation until the user types", asyn } const search = view.settings.getByRole("searchbox", { name: "Search shortcuts", exact: true }) - await page.keyboard.press("p") + await page.keyboard.press("e") await expect(search).toBeFocused() - await page.keyboard.type("alette") - await expect(search).toHaveValue("palette") - await expect(view.settings.getByText("Command palette", { exact: true })).toBeVisible() + await page.keyboard.type("verything") + await expect(search).toHaveValue("everything") + await expect(view.settings.getByText("Search everything", { exact: true })).toBeVisible() }) test("section search takes typed input, clears in place, and escapes in steps", async ({ page }) => { diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts index 22fc573008f..3b016ce6dee 100644 --- a/packages/app/e2e/regression/settings.spec.ts +++ b/packages/app/e2e/regression/settings.spec.ts @@ -564,6 +564,28 @@ test("clearing project fields sends explicit removal values", async ({ page }) = } }) +test("shortcuts list Search sessions once and unbind a shortcut while recording it", async ({ page }) => { + // Opening Settings from Home registers Home's Find, which must not add a second Search sessions. + const { settings } = await open(page) + await settings.getByRole("tab", { name: "Shortcuts", exact: true }).click() + await expect(settings.locator('[data-keybind-id="sessions.search"]')).toBeVisible() + await expect(settings.getByText("Search sessions", { exact: true })).toHaveCount(1) + + const binding = settings.locator('[data-keybind-id="settings.open"]') + const unbind = settings.getByRole("button", { name: "Unbind", exact: true }) + await expect(binding).toHaveText("Ctrl+,") + await expect(unbind).toHaveCount(0) + await binding.click() + await expect(binding).toHaveText("Press keys") + await unbind.click() + await expect(binding).toHaveText("Unassigned") + await expect(unbind).toHaveCount(0) + // An unassigned shortcut has nothing to unbind. + await binding.click() + await expect(binding).toHaveText("Press keys") + await expect(unbind).toHaveCount(0) +}) + test("the new session shortcut waits for a shortcut recording, then leaves settings", async ({ page }) => { const { settings } = await open(page) await settings.getByRole("tab", { name: "Shortcuts", exact: true }).click() diff --git a/packages/app/src/home/sessions/search.ts b/packages/app/src/home/sessions/search.ts index 0d4f1b43ce5..bade5e332ad 100644 --- a/packages/app/src/home/sessions/search.ts +++ b/packages/app/src/home/sessions/search.ts @@ -91,10 +91,11 @@ export function createHomeSessionSearchController(home: HomeController, sessions if (layout.home.searchFocus.take()) focus() }) + // Home's Find focuses its session search, so Settings > Shortcuts lists one Find and one Search sessions. command.register("home.search", () => [ { - id: "home.sessions.search.focus", - title: placeholder(), + id: "session.search", + title: language.t("session.search.placeholder"), keybind: "mod+f", hidden: true, onSelect: focus, diff --git a/packages/app/src/new-session/commands.tsx b/packages/app/src/new-session/commands.tsx index 868174b60eb..5bd5de1bf58 100644 --- a/packages/app/src/new-session/commands.tsx +++ b/packages/app/src/new-session/commands.tsx @@ -2,6 +2,7 @@ import { useDialog } from "@opencode/ui/context/dialog" import { useSettingsCommand } from "@/settings/command" import { useCommand } from "@/shell/commands/command" import { useLanguage } from "@/runtime/i18n/language" +import { projectSearchCommand } from "@/shell/titlebar/titlebar" export function useNewSessionCommands(input: { restoreFocus: () => void @@ -39,10 +40,9 @@ export function useNewSessionCommands(input: { onSelect: input.restoreFocus, }, { - id: "project.select", + ...projectSearchCommand, title: language.t("session.new.project.search"), category: language.t("command.category.project"), - keybind: "mod+shift+o", disabled: input.project.empty(), onSelect: input.project.open, }, diff --git a/packages/app/src/new-session/screen.tsx b/packages/app/src/new-session/screen.tsx index 12288c66e56..1e5a170886b 100644 --- a/packages/app/src/new-session/screen.tsx +++ b/packages/app/src/new-session/screen.tsx @@ -1,6 +1,7 @@ import { createPromptProjectController } from "@/new-session/project/selector" import { useNewSessionLocationDialog } from "@/new-session/location/dialog" import { useTabs, type DraftTab } from "@/shell/tabs/tabs" +import { useLayout } from "@/shell/state/layout" import { useSearchParams } from "@solidjs/router" import { createEffect, createMemo, createResource, on, untrack } from "solid-js" import { createComposerModel } from "@/composer/model" @@ -15,6 +16,7 @@ import { createDraftMcpControls } from "./mcp" export default function NewSessionPage(props: { draftId: string }) { const [search, setSearch] = useSearchParams<{ draftId?: string; prompt?: string }>() const tabs = useTabs() + const layout = useLayout() const draftTab = createMemo(() => tabs.store.find((tab): tab is DraftTab => tab.type === "draft" && tab.draftID === search.draftId), @@ -62,7 +64,11 @@ export default function NewSessionPage(props: { draftId: string }) { // a stale cursor a frame after every key-up and yank the caret from a key pressed in that frame. createEffect( on(composer.ready, (ready) => { - if (ready) model.restoreFocus() + if (!ready) return + + // Search projects opened this draft; the picker returns focus to the composer when it closes. + if (layout.draft.projectSearch.take()) location() + else model.restoreFocus() }), ) createEffect(() => { diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index 997a0195332..61f2c45a020 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -66,7 +66,8 @@ export const dict = { "command.usage.view.description": "See your OpenCode Go allowance and Console budgets", "command.session.location.cycle": "Cycle session location", - "command.palette": "Command palette", + "command.palette": "Search everything", + "command.commands.search": "Search commands", "command.session.new": "New session", "command.session.search": "Search sessions", @@ -1078,6 +1079,7 @@ export const dict = { "settings.shortcuts.conflict.description": "{{keybind}} is already assigned to {{titles}}.", "settings.shortcuts.unassigned": "Unassigned", "settings.shortcuts.pressKeys": "Press keys", + "settings.shortcuts.unbind": "Unbind", "settings.shortcuts.search.placeholder": "Search shortcuts", "settings.shortcuts.group.general": "General", diff --git a/packages/app/src/settings/keybinds/keybinds.tsx b/packages/app/src/settings/keybinds/keybinds.tsx index 740bb7258fa..68e067c1c55 100644 --- a/packages/app/src/settings/keybinds/keybinds.tsx +++ b/packages/app/src/settings/keybinds/keybinds.tsx @@ -308,6 +308,11 @@ export function createKeybindSettingsController( input.command.keybinds(false) } + const unbind = (id: string) => { + input.settings.keybinds.set(id, "none") + stop() + } + const notify = input.notify ?? ((toast: { title: string; description: string }) => showToast(toast)) const handle = (event: KeyboardEvent) => { @@ -333,8 +338,7 @@ export function createKeybindSettingsController( !event.shiftKey if (clear) { - input.settings.keybinds.set(id, "none") - stop() + unbind(id) return } @@ -387,6 +391,7 @@ export function createKeybindSettingsController( capture: { active: () => store.active, toggle, + unbind, }, settings: { hasOverrides: () => Object.values(overrides()).some((value) => typeof value === "string"), @@ -420,6 +425,7 @@ export function SettingsKeybinds(props: { active?: boolean }) { keybind={controller.catalog.keybind} active={controller.capture.active()} onCapture={controller.capture.toggle} + onUnbind={controller.capture.unbind} hasOverrides={controller.settings.hasOverrides()} onReset={controller.settings.reset} /> @@ -434,6 +440,7 @@ function SettingsKeybindsView(props: { keybind: (id: string) => string active: string | null onCapture: (id: string) => void + onUnbind: (id: string) => void hasOverrides: boolean onReset: () => void }) { @@ -476,21 +483,33 @@ function SettingsKeybindsView(props: { return (