From 98d57d0dd2def1f1482205e36ff62236209d1a9f Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Thu, 8 Oct 2026 06:56:27 +1000
Subject: [PATCH] fix(app): focus search input when opening /model dialog
(#53707)
---
packages/app/e2e/regression/composer.spec.ts | 11 +++++++++++
packages/app/src/composer/commands.tsx | 4 ++--
packages/app/src/composer/editor/interaction.ts | 2 +-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/packages/app/e2e/regression/composer.spec.ts b/packages/app/e2e/regression/composer.spec.ts
index 8851b67a2de..4d0c45dbcec 100644
--- a/packages/app/e2e/regression/composer.spec.ts
+++ b/packages/app/e2e/regression/composer.spec.ts
@@ -213,7 +213,18 @@ test("keeps a narrow session composer contained when invoking a built-in", async
await page.getByRole("menuitem", { name: "Commands" }).click()
await page.locator('[data-suggestion-id="model.choose"]').click()
+ const dialog = page.getByRole("dialog", { name: "Select model", exact: true })
+ const search = dialog.getByRole("searchbox", { name: "Search models", exact: true })
+ await expect(search).toBeFocused()
await expect(editor).toHaveText("keep me")
+ await page.keyboard.press("Escape")
+ await expect(dialog).toBeHidden()
+
+ await editor.fill("/model")
+ await expect(page.locator('[data-suggestion-id="model.choose"]')).toHaveAttribute("data-active", "")
+ await editor.press("Enter")
+ await expect(search).toBeFocused()
+ await expect(editor).toBeEmpty()
})
test("lists slash commands in their built-in order", async ({ page }) => {
diff --git a/packages/app/src/composer/commands.tsx b/packages/app/src/composer/commands.tsx
index 86b0936e10a..22a5813aa85 100644
--- a/packages/app/src/composer/commands.tsx
+++ b/packages/app/src/composer/commands.tsx
@@ -1,5 +1,6 @@
import { useCommand, type CommandOption } from "@/shell/commands/command"
import { useLanguage } from "@/runtime/i18n/language"
+import { DialogSelectModel } from "@/providers/models/select-dialog"
import { useLocal, type ModelSelection } from "@/providers/models/selection"
import { useDialog } from "@opencode/ui/context/dialog"
import { getCursorPosition, setCursorPosition } from "./editor/dom"
@@ -33,7 +34,7 @@ export const useComposerCommands = (input: { model?: ModelSelection } = {}) => {
void dialog.show(() => )
}
- const chooseModel = async () => {
+ const chooseModel = () => {
const owner = sessionOwnership.capture()
const editor = document.querySelector('[data-component="composer-editor"]')
const selection = window.getSelection()
@@ -54,7 +55,6 @@ export const useComposerCommands = (input: { model?: ModelSelection } = {}) => {
})
}
- const { DialogSelectModel } = await import("@/providers/models/select-dialog")
owner.run(() => {
void dialog.show(() => , restoreComposer)
})
diff --git a/packages/app/src/composer/editor/interaction.ts b/packages/app/src/composer/editor/interaction.ts
index 015c8772fb9..bde7d860d51 100644
--- a/packages/app/src/composer/editor/interaction.ts
+++ b/packages/app/src/composer/editor/interaction.ts
@@ -204,7 +204,7 @@ export function createComposerEditor(input: {
const action = event.type === "popover.select" ? input.onSuggestionSelect?.(event.item) : undefined
if (event.type === "popover.select") {
- if (!action || state.popover.type !== "command-menu") result.commands.forEach(execute)
+ if (!action) result.commands.forEach(execute)
if (action && event.item.kind === "command" && state.popover.type !== "command-menu") {
draft.setPrompt(draft.state.prompt.filter(isAttachment), 0)