fix(app): preserve settings route on refresh (#50364)

Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
This commit is contained in:
usrnk1
2026-09-24 06:52:21 +02:00
committed by GitHub
Unverified
parent 5253661d36
commit 27dfac3d36
17 changed files with 638 additions and 306 deletions
@@ -67,8 +67,7 @@ test("an inventory event updates the open all-project worktree list", async ({ p
await settings.getByRole("tab", { name: "Worktrees", exact: true }).click()
await expect(settings.getByText(sandboxes[0], { exact: true })).toBeVisible()
const listed = page.waitForResponse(
(response) =>
new URL(response.url()).pathname === "/api/worktree" && response.request().method() === "GET",
(response) => new URL(response.url()).pathname === "/api/worktree" && response.request().method() === "GET",
)
inventory.push({ directory: discovered, strategy: "git" })
events.push({
@@ -99,6 +98,51 @@ test("settings has its own route and returns through app history", async ({ page
await expect(home).toHaveAttribute("aria-pressed", "true")
})
test("settings page survives refresh", async ({ page }) => {
const settings = page.getByTestId("settings-screen")
const appearance = settings.getByRole("tab", { name: "Appearance", exact: true })
await appearance.click()
await expect(page).toHaveURL("/settings?tab=appearance")
await expect(appearance).toHaveAttribute("aria-selected", "true")
await page.reload()
await expect(settings).toBeVisible()
await expect(appearance).toHaveAttribute("aria-selected", "true")
await expect(page).toHaveURL("/settings?tab=appearance")
})
test("another server's settings page survives refresh", async ({ page }) => {
const remote = "http://127.0.0.1:4097"
await page.addInitScript(
(input) => {
localStorage.setItem(
"opencode.global.dat:server",
JSON.stringify({
list: [{ type: "http", http: { url: input.remote } }],
projects: { local: [{ worktree: input.directory, expanded: true }] },
}),
)
},
{ directory, remote },
)
const settings = page.getByTestId("settings-screen")
const url = (value: URL) =>
value.pathname === "/settings" &&
value.searchParams.get("server") === remote &&
value.searchParams.get("tab") === "providers"
await page.goto(`/settings?server=${encodeURIComponent(remote)}&tab=providers`)
await expect(settings.getByRole("heading", { name: "Providers", exact: true })).toBeVisible()
await expect(page).toHaveURL(url)
await page.reload()
await expect(settings.getByRole("heading", { name: "Providers", exact: true })).toBeVisible()
await expect(page).toHaveURL(url)
})
test("single-server settings expose scoped pages without a server picker", async ({ page }) => {
const settings = page.getByTestId("settings-screen")
await expect(settings.getByRole("tab", { name: "Server", exact: true })).toBeVisible()
@@ -146,22 +190,23 @@ test("project settings open as a nested autosaving view", async ({ page }) => {
.getByRole("button", { name: "More options", exact: true })
await expect(projectOptions).toHaveCSS("width", "28px")
await expect
.poll(async () =>
new Set(
await Promise.all(
[
settings.getByRole("button", { name: "Back to projects", exact: true }),
settings.getByRole("heading", { name: "Settings demo", exact: true }),
projectIcon,
projectOptions,
].map((item) =>
item.evaluate((element) => {
const bounds = element.getBoundingClientRect()
return Math.round(bounds.top + bounds.height / 2)
}),
.poll(
async () =>
new Set(
await Promise.all(
[
settings.getByRole("button", { name: "Back to projects", exact: true }),
settings.getByRole("heading", { name: "Settings demo", exact: true }),
projectIcon,
projectOptions,
].map((item) =>
item.evaluate((element) => {
const bounds = element.getBoundingClientRect()
return Math.round(bounds.top + bounds.height / 2)
}),
),
),
),
).size,
).size,
)
.toBe(1)
await expect
@@ -200,6 +245,17 @@ test("project settings open as a nested autosaving view", async ({ page }) => {
expect((await scriptSaved).postDataJSON()).toEqual({ commands: { start: "bun install" } })
await settings.getByRole("tab", { name: "Worktrees", exact: true }).click()
await expect(settings.getByRole("heading", { name: "Worktrees", exact: true })).toBeVisible()
await expect(page).toHaveURL(
(url) =>
url.pathname === "/settings" &&
url.searchParams.get("server") === "http://127.0.0.1:4096" &&
url.searchParams.get("project") === directory &&
url.searchParams.get("tab") === "workspaces",
)
await page.reload()
await expect(settings.getByRole("heading", { name: "Worktrees", exact: true })).toBeVisible()
await page.keyboard.press("Escape")
await expect(settings.getByRole("heading", { name: "Projects", exact: true })).toBeVisible()
@@ -269,7 +325,7 @@ test("recording a new session shortcut stays in settings until recording finishe
await page.keyboard.press("Control+t")
await expect(binding).toHaveText("Ctrl+T")
await expect(page).toHaveURL("/settings")
await expect(page).toHaveURL("/settings?tab=shortcuts")
await expect(page.locator("[data-titlebar-tab]")).toHaveCount(0)
await page.keyboard.press("Control+t")
await expect(page).toHaveURL(/\/new-session\?draftId=.+$/)
@@ -177,7 +177,7 @@ test("empty queries keep the closing quote beside the ellipsis while typing and
await expect(status).toHaveText('No results for "zzzzzzzzzzx"')
})
test("Models and Shortcuts autofocus their filters on normal navigation", async ({ page }) => {
test("Models and Shortcuts leave focus on navigation", async ({ page }) => {
const view = ui(page)
for (const entry of [
{ tab: "Models", search: "Search models" },
@@ -185,7 +185,7 @@ test("Models and Shortcuts autofocus their filters on normal navigation", async
{ tab: "Models", search: "Search models" },
]) {
await view.settings.getByRole("tab", { name: entry.tab, exact: true }).click()
await expect(view.settings.getByRole("searchbox", { name: entry.search, exact: true })).toBeFocused()
await expect(view.settings.getByRole("searchbox", { name: entry.search, exact: true })).not.toBeFocused()
}
await view.search.fill("shortcuts")
const result = view.results.getByRole("option", { name: "Keyboard shortcuts", exact: true })
@@ -204,6 +204,61 @@ test("Shortcuts search keeps focus while filtering", async ({ page }) => {
await expect(view.settings.getByText("Command palette", { exact: true })).toBeVisible()
})
test("section searches share controls and hierarchical Escape behavior", async ({ page }) => {
const projects = projectList(8)
await page.route("**/api/project", (route) => route.fulfill({ json: projects }))
await persistProjects(page, projects)
await page.reload()
const view = ui(page)
for (const [index, entry] of [
{ tab: "Projects", label: "Search projects", query: "missing-project" },
{ tab: "Shortcuts", label: "Search shortcuts", query: "missing-shortcut" },
{ tab: "Models", label: "Search models", query: "missing-model" },
].entries()) {
if (index > 0) {
await page.getByRole("button", { name: "Settings", exact: true }).click()
await expect(view.settings).toBeVisible()
}
await view.settings.getByRole("tab", { name: entry.tab, exact: true }).click()
const field = view.settings.locator('[data-component="settings-filter-search"]')
const search = field.getByRole("searchbox", { name: entry.label, exact: true })
await expect(field).toHaveCount(1)
await expect(field.locator('[data-slot="text-input-v2-leading-icon"]')).toBeVisible()
await expect(search).not.toBeFocused()
await page.keyboard.type(entry.query)
await expect(search).toBeFocused()
await expect(search).toHaveValue(entry.query)
await expect(view.settings.getByText(`No results for "${entry.query}"`, { exact: true })).toBeVisible()
const clear = field.getByRole("button", { name: "Clear", exact: true })
await expect(clear).toHaveAttribute("data-variant", "clear")
await clear.click()
await expect(search).toHaveValue("")
await expect(search).toBeFocused()
await search.fill(`${entry.query} `.repeat(20))
await search.press("End")
await expect(search).toHaveAttribute("data-overflow-start", "true")
await search.press("Home")
await expect(search).toHaveAttribute("data-overflow-start", "false")
await expect(search).toHaveAttribute("data-overflow-end", "true")
await search.press("Escape")
await expect(search).toHaveValue("")
await expect(search).toBeFocused()
await expect(view.settings).toBeVisible()
await search.press("Escape")
await expect(search).not.toBeFocused()
await expect(view.settings).toBeFocused()
await expect(view.settings).toBeVisible()
await page.keyboard.press("Escape")
await expect(view.settings).toBeHidden()
await expect(page).toHaveURL("/")
}
})
for (const count of [7, 8]) {
test(`Projects search uses the full list threshold with ${count} projects`, async ({ page }) => {
const inventory = projectList(count)
+12 -39
View File
@@ -1,8 +1,7 @@
import { For, Show, createEffect, createMemo, on, onCleanup } from "solid-js"
import { For, Show, createMemo, onCleanup } from "solid-js"
import { createStore } from "solid-js/store"
import { makeEventListener } from "@solid-primitives/event-listener"
import { Button } from "@opencode/ui/button"
import { TextInput } from "@opencode/ui/text-input"
import { showToast } from "@/shell/notifications/toast"
import fuzzysort from "fuzzysort"
import {
@@ -15,6 +14,8 @@ import {
import { useLanguage } from "@/runtime/i18n/language"
import { useSettings } from "@/settings/model"
import { SettingsList } from "@/settings/list"
import { SettingsSearchEmpty } from "@/settings/search-empty"
import { SettingsSearchField } from "@/settings/search-field"
const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
const PALETTE_ID = "command.palette"
@@ -338,7 +339,7 @@ export function createKeybindSettingsController(
}
}
export function SettingsKeybinds(props: { active?: boolean; autofocus?: boolean }) {
export function SettingsKeybinds(props: { active?: boolean }) {
const command = useCommand()
const settings = useSettings()
const controller = createKeybindSettingsController({
@@ -349,7 +350,6 @@ export function SettingsKeybinds(props: { active?: boolean; autofocus?: boolean
return (
<SettingsKeybindsView
visible={props.active}
autofocus={props.autofocus}
groups={controller.catalog.groups}
filtered={controller.catalog.filtered}
title={controller.catalog.title}
@@ -364,7 +364,6 @@ export function SettingsKeybinds(props: { active?: boolean; autofocus?: boolean
function SettingsKeybindsView(props: {
visible?: boolean
autofocus?: boolean
groups: KeybindGroup[]
filtered: (query: string) => Map<KeybindGroup, string[]>
title: (id: string) => string
@@ -375,20 +374,6 @@ function SettingsKeybindsView(props: {
onReset: () => void
}) {
const language = useLanguage()
let search: HTMLInputElement | undefined
createEffect(
on(
() => props.visible ?? true,
(visible) => {
if (!visible) return
const frame = requestAnimationFrame(() => {
if (props.visible !== false && props.autofocus !== false && search?.isConnected)
search.focus({ preventScroll: true })
})
onCleanup(() => cancelAnimationFrame(frame))
},
),
)
const [store, setStore] = createStore({ filter: "" })
const filtered = createMemo(() => props.filtered(store.filter))
const hasResults = createMemo(() => props.groups.some((group) => (filtered().get(group)?.length ?? 0) > 0))
@@ -405,23 +390,12 @@ function SettingsKeybindsView(props: {
{language.t("settings.shortcuts.reset.button")}
</Button>
</div>
<div class="settings-tab-search">
<TextInput
ref={search}
type="search"
appearance="base"
value={store.filter}
onInput={(event) => setStore("filter", event.currentTarget.value)}
placeholder={language.t("settings.shortcuts.search.placeholder")}
spellcheck={false}
autocorrect="off"
autocomplete="off"
autocapitalize="off"
aria-label={language.t("settings.shortcuts.search.placeholder")}
showClearButton={!!store.filter}
onClearClick={() => setStore("filter", "")}
/>
</div>
<SettingsSearchField
value={store.filter}
active={props.visible ?? true}
onInput={(value) => setStore("filter", value)}
placeholder={language.t("settings.shortcuts.search.placeholder")}
/>
</div>
<div class="settings-tab-body">
<div class="settings-shortcuts settings-section-stack">
@@ -462,9 +436,8 @@ function SettingsKeybindsView(props: {
)}
</For>
<Show when={store.filter && !hasResults()}>
<div class="settings-shortcuts-status">
<span>{language.t("settings.shortcuts.search.empty")}</span>
<span class="settings-shortcuts-status-filter">&quot;{store.filter}&quot;</span>
<div class="settings-tab-search-empty">
<SettingsSearchEmpty query={store.filter} />
</div>
</Show>
</div>
+19 -51
View File
@@ -1,9 +1,7 @@
import { useFilteredList } from "@opencode/ui/hooks"
import { Switch } from "@opencode/ui/switch"
import { Icon } from "@opencode/ui/icon"
import { IconButton } from "@opencode/ui/icon-button"
import { TextInput } from "@opencode/ui/text-input"
import { type Component, createEffect, createMemo, For, on, onCleanup, Show } from "solid-js"
import { type Component, createEffect, createMemo, For, Show } from "solid-js"
import { Schema } from "effect"
import { Persistence } from "@/runtime/persistence/schema"
import { useLanguage } from "@/runtime/i18n/language"
@@ -14,6 +12,9 @@ import { Persist, persisted } from "@/runtime/persistence/storage"
import { SettingsList } from "@/settings/list"
import { SettingsRow } from "@/settings/row"
import { CONSOLE_GROUP_KEY, consoleModelGroup, ProviderModelSections } from "@/providers/models/provider-group"
import { SettingsSearchEmpty } from "@/settings/search-empty"
import { SettingsSearchField } from "@/settings/search-field"
import "@/settings/settings.css"
type ModelItem = ReturnType<ReturnType<typeof useModels>["list"]>[number]
@@ -24,27 +25,12 @@ export const ModelProvidersSchema = Schema.Struct({
export const SettingsModels: Component<{
active?: boolean
autofocus?: boolean
provider?: string
onReveal?: () => void
}> = (props) => {
const language = useLanguage()
const models = useModels()
const serverSdk = useServerSDK()
let search: HTMLInputElement | undefined
createEffect(
on(
() => props.active ?? true,
(active) => {
if (!active) return
const frame = requestAnimationFrame(() => {
if (props.active !== false && props.autofocus !== false && search?.isConnected)
search.focus({ preventScroll: true })
})
onCleanup(() => cancelAnimationFrame(frame))
},
),
)
const [store, setStore] = persisted(
Persist.serverGlobal(serverSdk.scope, "settings-v2.models.providers"),
ModelProvidersSchema,
@@ -146,32 +132,12 @@ export const SettingsModels: Component<{
<span class="text-11-regular text-v2-text-text-muted">{language.t("settings.models.description")}</span>
</div>
</div>
<div class="settings-tab-search">
<TextInput
ref={search}
type="search"
appearance="base"
value={list.filter()}
onInput={(event) => list.onInput(event.currentTarget.value)}
placeholder={language.t("dialog.model.search.placeholder")}
spellcheck={false}
autocorrect="off"
autocomplete="off"
autocapitalize="off"
aria-label={language.t("dialog.model.search.placeholder")}
/>
<Show when={list.filter()}>
<IconButton
type="button"
variant="ghost-muted"
size="small"
class="settings-tab-search-clear"
icon={<Icon name="close" size="large" class="text-v2-icon-icon-muted" />}
onClick={() => list.clear()}
aria-label={language.t("common.clear")}
/>
</Show>
</div>
<SettingsSearchField
value={list.filter()}
active={props.active ?? true}
onInput={list.onInput}
placeholder={language.t("dialog.model.search.placeholder")}
/>
</div>
<div class="settings-tab-body settings-models">
@@ -187,12 +153,14 @@ export const SettingsModels: Component<{
<Show
when={list.flat().length > 0}
fallback={
<div class="settings-models-status">
<span>{language.t("dialog.model.empty")}</span>
<Show when={list.filter()}>
<span class="settings-models-status-filter">&quot;{list.filter()}&quot;</span>
</Show>
</div>
<Show
when={list.filter()}
fallback={<div class="settings-models-status">{language.t("dialog.model.empty")}</div>}
>
<div class="settings-tab-search-empty">
<SettingsSearchEmpty query={list.filter()} />
</div>
</Show>
}
>
<ProviderModelSections
+121
View File
@@ -0,0 +1,121 @@
import { describe, expect, test } from "bun:test"
import { parseSettingsView, settingsViewRedirect, settingsViewUrl, type SettingsView } from "./route"
describe("settings route", () => {
test("keeps root preferences at the canonical route", () => {
expect(settingsViewUrl({ type: "root", tab: "general" })).toBe("/settings")
expect(parseSettingsView("", false)).toEqual({ type: "root", tab: "general", subtab: undefined })
})
test("round trips root, server, and project pages", () => {
const root: SettingsView = { type: "root", tab: "appearance" }
const server: SettingsView = { type: "server", server: "wsl:Debian", tab: "models" }
const project: SettingsView = {
type: "project",
server: "local",
project: "C:\\work folder",
parent: "server",
tab: "extensions",
subtab: "skills",
}
expect(parseSettingsView(new URL(settingsViewUrl(root), "http://localhost").search, false)).toEqual({
...root,
subtab: undefined,
})
expect(parseSettingsView(new URL(settingsViewUrl(server), "http://localhost").search, true)).toEqual({
...server,
subtab: undefined,
})
expect(parseSettingsView(new URL(settingsViewUrl(project), "http://localhost").search, true)).toEqual(project)
})
test("derives project ancestry and keeps search reveal state transient", () => {
expect(
parseSettingsView("?server=local&project=%2Fwork&tab=extensions&subtab=plugins", false, {
target: "settings-plugin",
searchActivation: 2,
}),
).toEqual({
type: "project",
server: "local",
project: "/work",
parent: "root",
tab: "extensions",
subtab: "plugins",
target: "settings-plugin",
searchActivation: 2,
})
})
test("keeps a restored server page until the server lists load", () => {
const view: SettingsView = { type: "server", server: "wsl:Debian", tab: "models" }
const local = { key: "local", connected: true, starting: false }
const wsl = { key: "wsl:Debian", connected: false, starting: true }
expect(settingsViewRedirect({ view, loaded: false, servers: [local] })).toBeUndefined()
expect(settingsViewRedirect({ view, loaded: true, servers: [local, wsl] })).toBeUndefined()
expect(settingsViewRedirect({ view, loaded: true, servers: [local] })).toEqual({ type: "back" })
})
test("keeps a project page while its server starts", () => {
const view: SettingsView = {
type: "project",
server: "wsl:Debian",
project: "/work",
parent: "server",
tab: "general",
}
const local = { key: "local", connected: true, starting: false }
expect(
settingsViewRedirect({
view,
loaded: true,
servers: [local, { key: "wsl:Debian", connected: false, starting: true }],
}),
).toBeUndefined()
expect(
settingsViewRedirect({
view,
loaded: true,
servers: [local, { key: "wsl:Debian", connected: false, starting: false }],
}),
).toEqual({ type: "server", server: "wsl:Debian" })
})
test("moves a single server's page to the root settings", () => {
const local = { key: "local", connected: true, starting: false }
expect(
settingsViewRedirect({
view: { type: "server", server: "local", tab: "general" },
loaded: true,
servers: [local],
}),
).toEqual({ type: "root", tab: "servers" })
expect(
settingsViewRedirect({
view: { type: "server", server: "local", tab: "models" },
loaded: true,
servers: [local],
}),
).toEqual({ type: "root", tab: "models" })
})
test("falls back for invalid scope and tab combinations", () => {
expect(parseSettingsView("?tab=unknown", false)).toEqual({ type: "root", tab: "general" })
expect(parseSettingsView("?project=%2Fwork&tab=extensions", false)).toEqual({ type: "root", tab: "general" })
expect(parseSettingsView("?server=local&tab=about", true)).toEqual({ type: "root", tab: "general" })
expect(parseSettingsView("?tab=toString", false)).toEqual({ type: "root", tab: "general" })
expect(parseSettingsView("?tab=extensions&subtab=toString", false)).toEqual({
type: "root",
tab: "extensions",
subtab: undefined,
})
expect(parseSettingsView("?tab=extensions&subtab=lsps", false)).toEqual({
type: "root",
tab: "extensions",
subtab: undefined,
})
})
})
+145
View File
@@ -0,0 +1,145 @@
export type SettingsRootTab =
| "general"
| "appearance"
| "notifications"
| "shortcuts"
| "pairing"
| "projects"
| "workspaces"
| "providers"
| "models"
| "extensions"
| "servers"
| "experimental"
| "about"
export type SettingsServerTab = "general" | "projects" | "workspaces" | "providers" | "models" | "extensions"
export type SettingsProjectTab = "general" | "workspaces" | "extensions"
export type SettingsView = (
| { type: "root"; tab: SettingsRootTab }
| { type: "server"; server: string; tab: SettingsServerTab }
| {
type: "project"
server: string
project: string
tab: SettingsProjectTab
parent: "root" | "server"
}
) & {
target?: string
subtab?: "mcps" | "plugins" | "skills" | "lsps"
searchActivation?: number
}
export type SettingsTransientView = Pick<SettingsView, "target" | "searchActivation">
const rootTabs: Record<SettingsRootTab, true> = {
general: true,
appearance: true,
notifications: true,
shortcuts: true,
pairing: true,
projects: true,
workspaces: true,
providers: true,
models: true,
extensions: true,
servers: true,
experimental: true,
about: true,
}
const serverTabs: Record<SettingsServerTab, true> = {
general: true,
projects: true,
workspaces: true,
providers: true,
models: true,
extensions: true,
}
const projectTabs: Record<SettingsProjectTab, true> = {
general: true,
workspaces: true,
extensions: true,
}
const subtabs: Record<NonNullable<SettingsView["subtab"]>, true> = {
mcps: true,
plugins: true,
skills: true,
lsps: true,
}
export function parseSettingsView(
search: string,
multipleServers: boolean,
transient?: SettingsTransientView,
): SettingsView {
const params = new URLSearchParams(search)
const tab = params.get("tab") ?? "general"
const server = params.get("server")
const project = params.get("project")
const subtab = params.get("subtab")
const nested = subtab && isSubtab(subtab) && tab === "extensions" ? subtab : undefined
if (project && server && isProjectTab(tab)) {
return {
type: "project",
server,
project,
parent: multipleServers ? "server" : "root",
tab,
subtab: nested,
...transient,
}
}
if (!project && server && isServerTab(tab))
return { type: "server", server, tab, subtab: nested === "lsps" ? undefined : nested, ...transient }
if (!project && !server && isRootTab(tab))
return { type: "root", tab, subtab: nested === "lsps" ? undefined : nested, ...transient }
return { type: "root", tab: "general", ...transient }
}
export function settingsViewUrl(view: SettingsView) {
const params = new URLSearchParams()
if (view.type !== "root") params.set("server", view.server)
if (view.type === "project") params.set("project", view.project)
if (view.tab !== "general") params.set("tab", view.tab)
if (view.tab === "extensions" && view.subtab) params.set("subtab", view.subtab)
const search = params.toString()
return search ? `/settings?${search}` : "/settings"
}
type RedirectServer = { key: string; connected: boolean; starting: boolean }
/** Where a server or project view must go when its server is gone, unreachable, or the only one. */
export function settingsViewRedirect(input: {
view: SettingsView
/** False while the saved, WSL, and SSH server lists load; a restored route waits for them. */
loaded: boolean
servers: readonly RedirectServer[]
}): { type: "back" } | { type: "server"; server: string } | { type: "root"; tab: SettingsRootTab } | undefined {
const view = input.view
if (view.type === "root" || !input.loaded) return
const server = input.servers.find((item) => item.key === view.server)
if (!server) return { type: "back" }
// A starting WSL or SSH server connects shortly; only an unavailable one leaves the project page.
if (view.type === "project" && !server.connected && !server.starting) return { type: "server", server: server.key }
if (view.type === "server" && input.servers.length === 1)
return { type: "root", tab: view.tab === "general" ? "servers" : view.tab }
}
export function isRootTab(value: string): value is SettingsRootTab {
return Object.hasOwn(rootTabs, value)
}
export function isServerTab(value: string): value is SettingsServerTab {
return Object.hasOwn(serverTabs, value)
}
export function isProjectTab(value: string): value is SettingsProjectTab {
return Object.hasOwn(projectTabs, value)
}
function isSubtab(value: string): value is NonNullable<SettingsView["subtab"]> {
return Object.hasOwn(subtabs, value)
}
@@ -0,0 +1,95 @@
import { createEffect, on, onMount } from "solid-js"
import { createStore } from "solid-js/store"
import { makeEventListener } from "@solid-primitives/event-listener"
import { createResizeObserver } from "@solid-primitives/resize-observer"
import { Icon } from "@opencode/ui/icon"
import { TextInput } from "@opencode/ui/text-input"
import "@/settings/search.css"
export function SettingsSearchField(props: {
value: string
placeholder: string
active: boolean
onInput: (value: string) => void
}) {
const [state, setState] = createStore({ overflow: { start: false, end: false } })
let root: HTMLDivElement | undefined
let input: HTMLInputElement | undefined
const updateOverflow = () => {
if (!input) return
const offset = Math.abs(input.scrollLeft)
setState("overflow", {
start: offset > 1,
end: input.scrollWidth - input.clientWidth - offset > 1,
})
}
const clear = () => {
props.onInput("")
input?.focus({ preventScroll: true })
}
createEffect(on(() => props.value, updateOverflow))
onMount(() => {
const screen = root?.closest<HTMLElement>(".settings-screen")
if (!screen) return
makeEventListener(screen, "keydown", (event) => {
if (
!props.active ||
event.defaultPrevented ||
event.isComposing ||
event.ctrlKey ||
event.metaKey ||
event.altKey ||
event.key.length !== 1 ||
!event.key.trim() ||
(event.target instanceof Element && event.target.closest("input, textarea, select, [contenteditable=true]"))
)
return
event.preventDefault()
event.stopPropagation()
const value = `${props.value}${event.key}`
props.onInput(value)
input?.focus({ preventScroll: true })
queueMicrotask(() => input?.setSelectionRange(value.length, value.length))
})
})
return (
<div ref={root} class="settings-tab-search settings-filter-search" data-component="settings-filter-search">
<TextInput
ref={(element) => {
input = element
createResizeObserver(element, updateOverflow)
}}
type="search"
appearance="base"
leadingIcon={<Icon name="magnifying-glass" size="small" />}
value={props.value}
data-overflow-start={state.overflow.start}
data-overflow-end={state.overflow.end}
onScroll={updateOverflow}
onInput={(event) => props.onInput(event.currentTarget.value)}
onKeyDown={(event) => {
if (event.key !== "Escape" || event.defaultPrevented || event.isComposing) return
event.preventDefault()
event.stopPropagation()
if (props.value) {
clear()
return
}
event.currentTarget.blur()
event.currentTarget.closest<HTMLElement>(".settings-screen")?.focus({ preventScroll: true })
}}
placeholder={props.placeholder}
aria-label={props.placeholder}
showClearButton={!!props.value}
clearIcon="circle-xmark"
onClearClick={clear}
spellcheck={false}
autocorrect="off"
autocomplete="off"
autocapitalize="off"
/>
</div>
)
}
+6 -6
View File
@@ -15,12 +15,12 @@
visibility: hidden;
}
:is(.settings-search, .settings-projects-search) [data-slot="text-input-v2-icon-button"][data-variant="clear"] {
:is(.settings-search, .settings-filter-search) [data-slot="text-input-v2-icon-button"][data-variant="clear"] {
color: var(--v2-icon-icon-faint);
cursor: default;
}
:is(.settings-search, .settings-projects-search)
:is(.settings-search, .settings-filter-search)
[data-slot="text-input-v2-icon-button"][data-variant="clear"]:is(:hover, :active, :focus-visible):not(:disabled) {
background: transparent;
color: var(--v2-icon-icon-base);
@@ -38,19 +38,19 @@
background: var(--v2-overlay-simple-overlay-hover);
}
:is(.settings-search, .settings-projects-search) [data-slot="text-input-v2-input"][data-overflow-start="true"] {
:is(.settings-search, .settings-filter-search) [data-slot="text-input-v2-input"][data-overflow-start="true"] {
--mask-start: 16px;
}
:is(.settings-search, .settings-projects-search) [data-slot="text-input-v2-input"][data-overflow-end="true"] {
:is(.settings-search, .settings-filter-search) [data-slot="text-input-v2-input"][data-overflow-end="true"] {
--mask-end: 16px;
}
:is(.settings-search, .settings-projects-search) [data-slot="text-input-v2-input"]:dir(rtl) {
:is(.settings-search, .settings-filter-search) [data-slot="text-input-v2-input"]:dir(rtl) {
--mask-direction: to left;
}
:is(.settings-search, .settings-projects-search)
:is(.settings-search, .settings-filter-search)
[data-slot="text-input-v2-input"]:is([data-overflow-start="true"], [data-overflow-end="true"]) {
mask-image: linear-gradient(
var(--mask-direction, to right),
@@ -74,6 +74,14 @@ export function settingsServers(
]
}
// A restored settings route must not be redirected against a partial list: WSL and SSH servers load asynchronously.
export function useSettingsServersLoaded() {
const servers = useServers()
const wsl = useWslServers()
const ssh = useSsh()
return () => servers.hydrated() && !wsl.isLoading && !ssh.loading
}
export function useSettingsServers() {
const servers = useServers()
const wsl = useWslServers()
+9 -27
View File
@@ -931,43 +931,43 @@
padding-inline-end: 28px;
}
.settings-projects-search [data-component="text-input-v2"] {
.settings-filter-search [data-component="text-input-v2"] {
height: 36px;
background: color-mix(in oklab, var(--v2-background-bg-layer-02) 60%, transparent);
box-shadow: none;
}
.settings-projects-search [data-component="text-input-v2"]:is(:hover, :focus-within):not([data-disabled]) {
.settings-filter-search [data-component="text-input-v2"]:is(:hover, :focus-within):not([data-disabled]) {
background: var(--v2-background-bg-layer-02);
}
.settings-projects-search [data-slot="text-input-v2-input"] {
.settings-filter-search [data-slot="text-input-v2-input"] {
padding-inline-end: 0;
}
.settings-projects-search [data-slot="text-input-v2-leading-icon"] {
.settings-filter-search [data-slot="text-input-v2-leading-icon"] {
padding-inline-start: 16px;
}
.settings-projects-search [data-slot="text-input-v2-value"] {
.settings-filter-search [data-slot="text-input-v2-value"] {
gap: 8px;
}
.settings-projects-search [data-slot="text-input-v2-icon-button"][data-variant="clear"] {
.settings-filter-search [data-slot="text-input-v2-icon-button"][data-variant="clear"] {
margin-inline-end: -4px;
}
.settings-projects-empty {
.settings-tab-search-empty {
width: 60%;
margin-inline: auto;
}
.settings-projects-empty .settings-search-empty {
.settings-tab-search-empty .settings-search-empty {
justify-content: center;
padding-inline: 0;
}
.settings-projects-empty .settings-search-empty-quoted {
.settings-tab-search-empty .settings-search-empty-quoted {
flex: 0 1 auto;
}
@@ -1347,24 +1347,6 @@
font-variation-settings: "slnt" 0;
}
.settings-shortcuts-status {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 4px;
padding-block: 48px;
font-size: 13px;
font-weight: 440;
line-height: var(--line-height-compact);
color: var(--v2-text-text-muted);
text-align: center;
}
.settings-shortcuts-status-filter {
color: var(--v2-text-text-base);
}
.settings-servers-row {
display: flex;
align-items: center;
+21 -17
View File
@@ -22,7 +22,8 @@ import { SettingsPairing } from "./pairing/pairing"
import { SettingsProviders } from "./providers/providers"
import { SettingsModels } from "./models/models"
import { SettingsServerGeneral } from "./servers/servers"
import { useSettingsServers, type SettingsServer } from "./servers/inventory"
import { useSettingsServers, useSettingsServersLoaded, type SettingsServer } from "./servers/inventory"
import { isSshConnecting } from "@/servers/ssh/types"
import { SettingsWorkspaces } from "./workspaces/workspaces"
import { useWorkspacesPrefetch } from "./workspaces/queries"
import { SettingsProjects } from "./workspaces/projects"
@@ -33,6 +34,7 @@ import { SettingsNavigation, type SettingsNavGroup } from "./navigation"
import { SettingsProjectGeneral } from "./workspaces/project"
import { ProjectSettingsExtensions } from "./workspaces/project-extensions"
import { useSettingsSurface } from "./surface"
import { settingsViewRedirect } from "./route"
import { pageIcons } from "./pages"
import { revealSettingsSearch } from "./search-reveal"
import "@/settings/settings.css"
@@ -73,6 +75,7 @@ export function SettingsScreen() {
const surface = useSettingsSurface()
const dialog = useDialog()
const servers = useSettingsServers()
const loaded = useSettingsServersLoaded()
const global = useGlobal()
let root: HTMLDivElement | undefined
let viewType = surface.view().type
@@ -130,19 +133,18 @@ export function SettingsScreen() {
return server.connection && project(server.connection, view.project)
})
createEffect(() => {
const view = surface.view()
if (view.type === "root") return
const target = targetServer()
if (!target) {
surface.back()
return
}
if (view.type === "project" && !target.connection) surface.replaceServer(target.key)
})
createEffect(() => {
const view = surface.view()
if (view.type !== "server" || servers().length !== 1) return
surface.open(view.tab === "general" ? "servers" : view.tab)
const next = settingsViewRedirect({
view: surface.view(),
loaded: loaded(),
servers: servers().map((item) => ({
key: item.key,
connected: !!item.connection,
starting: item.wsl?.runtime.kind === "starting" || (!!item.ssh && isSshConnecting(item.ssh.stage)),
})),
})
if (next?.type === "back") surface.back()
if (next?.type === "server") surface.replaceServer(next.server)
if (next?.type === "root") surface.open(next.tab)
})
return (
@@ -189,6 +191,7 @@ function RootSettings() {
const tabs = useTabs()
const servers = useServerCollectionController()
const inventory = useSettingsServers()
const loaded = useSettingsServersLoaded()
const platform = usePlatform()
const [state, setState] = createStore({
worktreeFilterReset: 0,
@@ -257,7 +260,7 @@ function RootSettings() {
createEffect(() => {
const view = surface.view()
if (view.type !== "root" || !multiple()) return
if (view.type !== "root" || !loaded() || !multiple()) return
if (["projects", "workspaces", "providers", "models", "extensions", "servers"].includes(view.tab))
surface.open("general")
})
@@ -290,7 +293,7 @@ function RootSettings() {
<SettingsNotifications />
</Tabs.Content>
<Tabs.Content value="shortcuts" class="settings-panel">
<SettingsKeybinds active={surface.view().tab === "shortcuts"} autofocus={!surface.search.state.selected} />
<SettingsKeybinds active={surface.view().tab === "shortcuts"} />
</Tabs.Content>
<Tabs.Content value="pairing" class="settings-panel">
<SettingsPairing />
@@ -307,6 +310,7 @@ function RootSettings() {
<Tabs.Content value="projects" class="settings-panel">
<SettingsProjects
server={server}
active={surface.view().tab === "projects"}
onOpenProject={(project) =>
surface.openProject({
server: ServerConnection.key(server),
@@ -333,7 +337,6 @@ function RootSettings() {
<Tabs.Content value="models" class="settings-panel">
<SettingsModels
active={surface.view().tab === "models"}
autofocus={!surface.search.state.selected}
provider={state.modelProvider}
onReveal={() => setState("modelProvider", undefined)}
/>
@@ -403,6 +406,7 @@ function ServerSettings(props: { entry: SettingsServer }) {
<Tabs.Content value="projects" class="settings-panel">
<SettingsProjects
server={server}
active={surface.view().tab === "projects"}
onOpenProject={(project) =>
surface.openProject({
server: props.entry.key,
+38 -97
View File
@@ -5,81 +5,20 @@ import { createSimpleContext } from "@opencode/ui/context"
import { useLayout, type LayoutRoute } from "@/shell/state/layout"
import { useCommand } from "@/shell/commands/command"
import { useSettingsServers } from "./servers/inventory"
import {
isProjectTab,
isRootTab,
isServerTab,
parseSettingsView,
settingsViewUrl,
type SettingsProjectTab,
type SettingsRootTab,
type SettingsServerTab,
type SettingsTransientView,
type SettingsView,
} from "./route"
export type SettingsRootTab =
| "general"
| "appearance"
| "notifications"
| "shortcuts"
| "pairing"
| "projects"
| "workspaces"
| "providers"
| "models"
| "extensions"
| "servers"
| "experimental"
| "about"
export type SettingsServerTab = "general" | "projects" | "workspaces" | "providers" | "models" | "extensions"
export type SettingsProjectTab = "general" | "workspaces" | "extensions"
export type SettingsView = (
| { type: "root"; tab: SettingsRootTab }
| { type: "server"; server: string; tab: SettingsServerTab }
| {
type: "project"
server: string
project: string
tab: SettingsProjectTab
parent: "root" | "server"
}
) & {
target?: string
subtab?: "mcps" | "plugins" | "skills" | "lsps"
searchActivation?: number
}
const rootTabs: Record<SettingsRootTab, true> = {
general: true,
appearance: true,
notifications: true,
shortcuts: true,
pairing: true,
projects: true,
workspaces: true,
providers: true,
models: true,
extensions: true,
servers: true,
experimental: true,
about: true,
}
const serverTabs: Record<SettingsServerTab, true> = {
general: true,
projects: true,
workspaces: true,
providers: true,
models: true,
extensions: true,
}
const projectTabs: Record<SettingsProjectTab, true> = {
general: true,
workspaces: true,
extensions: true,
}
function isRootTab(value: string): value is SettingsRootTab {
return value in rootTabs
}
function isServerTab(value: string): value is SettingsServerTab {
return value in serverTabs
}
function isProjectTab(value: string): value is SettingsProjectTab {
return value in projectTabs
}
export type { SettingsProjectTab, SettingsRootTab, SettingsServerTab, SettingsView } from "./route"
export const { use: useSettingsSurface, provider: SettingsSurfaceProvider } = createSimpleContext({
name: "SettingsSurface",
@@ -90,11 +29,11 @@ export const { use: useSettingsSurface, provider: SettingsSurfaceProvider } = cr
const command = useCommand()
const servers = useSettingsServers()
const location = useLocation<{
settings?: { route: Exclude<LayoutRoute, { type: "settings" }>; view: SettingsView }
settings?: { route: Exclude<LayoutRoute, { type: "settings" }>; view?: SettingsTransientView }
}>()
const open = () => layout.route().type === "settings"
const source = () => location.state?.settings?.route ?? { type: "home" as const }
const view = (): SettingsView => location.state?.settings?.view ?? { type: "root", tab: "general" }
const view = () => parseSettingsView(location.search, servers().length > 1, location.state?.settings?.view)
const [search, setSearch] = createStore({
query: "",
origin: undefined as SettingsView | undefined,
@@ -106,12 +45,17 @@ export const { use: useSettingsSurface, provider: SettingsSurfaceProvider } = cr
})
let focus: HTMLElement | undefined
const show = (view: SettingsView, replace: boolean) => {
const show = (view: SettingsView) => {
const route = layout.route()
if (route.type !== "settings" && document.activeElement instanceof HTMLElement) focus = document.activeElement
navigate("/settings", {
replace,
state: { settings: { route: route.type === "settings" ? source() : route, view } },
navigate(settingsViewUrl(view), {
replace: route.type === "settings",
state: {
settings: {
route: route.type === "settings" ? source() : route,
view: { target: view.target, searchActivation: view.searchActivation },
},
},
})
}
@@ -150,7 +94,7 @@ export const { use: useSettingsSurface, provider: SettingsSurfaceProvider } = cr
},
open(destination: SettingsView, id: string) {
batch(() => {
show({ ...destination, searchActivation: search.activation + 1 }, true)
show({ ...destination, searchActivation: search.activation + 1 })
setSearch({ selected: id, highlighted: id, expanded: false, activation: search.activation + 1 })
})
},
@@ -159,30 +103,27 @@ export const { use: useSettingsSurface, provider: SettingsSurfaceProvider } = cr
},
back() {
if (!search.query.trim() || !search.selected || !search.origin) return false
show(search.origin, true)
show(search.origin)
setSearch({ selected: "", expanded: true })
return true
},
},
open(tab: SettingsRootTab = "general") {
show({ type: "root", tab }, open())
show({ type: "root", tab })
},
openServer(server: string, tab: SettingsServerTab = "general") {
show({ type: "server", server, tab }, false)
show({ type: "server", server, tab })
},
replaceServer(server: string, tab: SettingsServerTab = "general") {
show({ type: "server", server, tab }, true)
show({ type: "server", server, tab })
},
openProject(input: { server: string; project: string; tab?: SettingsProjectTab }) {
show(
{
type: "project",
...input,
parent: servers().length > 1 ? "server" : "root",
tab: input.tab ?? "general",
},
false,
)
show({
type: "project",
...input,
parent: servers().length > 1 ? "server" : "root",
tab: input.tab ?? "general",
})
},
select(tab: string) {
const current = view()
@@ -194,10 +135,10 @@ export const { use: useSettingsSurface, provider: SettingsSurfaceProvider } = cr
: current.type === "project" && isProjectTab(tab)
? { ...current, tab }
: current
show({ ...next, target: undefined, subtab: undefined }, true)
show({ ...next, target: undefined, subtab: undefined })
},
subtab(subtab: SettingsView["subtab"]) {
show({ ...view(), subtab, target: undefined }, true)
show({ ...view(), subtab, target: undefined })
},
back() {
const current = view()
@@ -209,7 +150,7 @@ export const { use: useSettingsSurface, provider: SettingsSurfaceProvider } = cr
current.type === "server" || current.parent === "root"
? { type: "root", tab: current.type === "server" ? "general" : "projects" }
: { type: "server", server: current.server, tab: "projects" }
show(parent, true)
show(parent)
},
close() {
if (open()) command.trigger("common.goBack")
@@ -1,10 +1,8 @@
import { Show, createEffect, createMemo, on, type Component } from "solid-js"
import { Show, createEffect, createMemo, type Component } from "solid-js"
import { Key } from "@solid-primitives/keyed"
import { createStore } from "solid-js/store"
import { createResizeObserver } from "@solid-primitives/resize-observer"
import { Button } from "@opencode/ui/button"
import { Icon } from "@opencode/ui/icon"
import { TextInput } from "@opencode/ui/text-input"
import { useLanguage } from "@/runtime/i18n/language"
import { useGlobal } from "@/runtime/server/runtime"
import { ServerConnection } from "@/runtime/server/registry"
@@ -14,31 +12,20 @@ import { useDirectoryPicker } from "@/workspaces/selection/picker"
import { addProjects } from "@/home/projects/add"
import { settingsProjects } from "../servers/inventory"
import { SettingsSearchEmpty } from "../search-empty"
import { SettingsSearchField } from "../search-field"
import { SettingsProjectRow } from "./project-row"
import "@/settings/search.css"
import "@/settings/settings.css"
export const SettingsProjects: Component<{
server: ServerConnection.Any
active: boolean
onOpenProject: (project: LocalProject) => void
}> = (props) => {
const language = useLanguage()
const global = useGlobal()
const pickDirectory = useDirectoryPicker()
const [store, setStore] = createStore({
filter: "",
overflow: { start: false, end: false },
})
let search: HTMLInputElement | undefined
const updateOverflow = () => {
if (!search) return
const offset = Math.abs(search.scrollLeft)
setStore("overflow", {
start: offset > 1,
end: search.scrollWidth - search.clientWidth - offset > 1,
})
}
createEffect(on(() => store.filter, updateOverflow))
const [store, setStore] = createStore({ filter: "" })
const context = createMemo(() => global.ensureServerCtx(props.server))
const projects = createMemo(() => settingsProjects(context()))
const searchable = createMemo(() => projects().length > 7)
@@ -82,34 +69,12 @@ export const SettingsProjects: Component<{
</Show>
</div>
<Show when={searchable()}>
<div class="settings-tab-search settings-projects-search">
<TextInput
ref={(element) => {
search = element
createResizeObserver(element, updateOverflow)
}}
type="search"
appearance="base"
leadingIcon={<Icon name="magnifying-glass" size="small" />}
value={store.filter}
data-overflow-start={store.overflow.start}
data-overflow-end={store.overflow.end}
onScroll={updateOverflow}
onInput={(event) => setStore("filter", event.currentTarget.value)}
placeholder={language.t("settings.projects.search.placeholder")}
aria-label={language.t("settings.projects.search.placeholder")}
showClearButton={!!store.filter}
clearIcon="circle-xmark"
onClearClick={() => {
setStore("filter", "")
search?.focus({ preventScroll: true })
}}
spellcheck={false}
autocorrect="off"
autocomplete="off"
autocapitalize="off"
/>
</div>
<SettingsSearchField
value={store.filter}
active={props.active}
onInput={(value) => setStore("filter", value)}
placeholder={language.t("settings.projects.search.placeholder")}
/>
</Show>
</div>
@@ -128,7 +93,7 @@ export const SettingsProjects: Component<{
</div>
}
>
<div class="settings-projects-empty">
<div class="settings-tab-search-empty">
<SettingsSearchEmpty query={store.filter} />
</div>
</Show>
@@ -79,4 +79,16 @@ describe("titlebar history", () => {
expect(back.to.url).toBe("/")
expect(forwardPath(applyPath(back.state, back.to))?.to.state).toEqual({ tab: "models" })
})
test("settings pages replace one history entry", () => {
const initial = applyPath(history(), { url: "/settings" })
const models = applyPath(initial, { url: "/settings?tab=models" })
const project = applyPath(models, { url: "/settings?server=local&project=%2Fwork&tab=extensions" })
expect(project.stack.map((entry) => entry.url)).toEqual([
"/",
"/settings?server=local&project=%2Fwork&tab=extensions",
])
expect(backPath(project)?.to.url).toBe("/")
})
})
+7 -2
View File
@@ -21,8 +21,9 @@ export function applyPath(
}
const active = state.stack[state.index]
if (current.url === active.url) {
if (!state.action && current.state === active.state) return state
const sameUrl = current.url === active.url
if (sameUrl || (isSettingsPath(current.url) && isSettingsPath(active.url))) {
if (sameUrl && !state.action && current.state === active.state) return state
return {
...state,
stack: state.stack.map((entry, index) => (index === state.index ? current : entry)),
@@ -35,6 +36,10 @@ export function applyPath(
return pushPath(state, current, max)
}
function isSettingsPath(url: string) {
return url.split(/[?#]/, 1)[0] === "/settings"
}
export function pushPath(state: TitlebarHistory, path: HistoryLocation, max = MAX_TITLEBAR_HISTORY): TitlebarHistory {
const stack = state.stack.slice(0, state.index + 1).concat(path)
const next = trimHistory(stack, stack.length - 1, max)
@@ -4,6 +4,7 @@ import { acceptedLastActiveUrl } from "./route-storage"
describe("desktop last active route", () => {
test("restores current desktop routes", () => {
expect(acceptedLastActiveUrl("/")).toBe("/")
expect(acceptedLastActiveUrl("/settings?server=local&tab=models")).toBe("/settings?server=local&tab=models")
expect(acceptedLastActiveUrl("/new-session?directory=C%3A%5Cwork#draft")).toBe(
"/new-session?directory=C%3A%5Cwork#draft",
)
@@ -14,7 +15,7 @@ describe("desktop last active route", () => {
test("falls back for invalid saved routes", () => {
expect(acceptedLastActiveUrl(undefined)).toBe("/")
expect(acceptedLastActiveUrl("/settings")).toBe("/")
expect(acceptedLastActiveUrl("/settings/extra")).toBe("/")
expect(acceptedLastActiveUrl("/new-session/extra")).toBe("/")
expect(acceptedLastActiveUrl("/server/sidecar/session/abc/extra")).toBe("/")
})
@@ -17,6 +17,7 @@ export function setLastActiveUrl(windowID: string, value: string) {
export function acceptedLastActiveUrl(value: string | null | undefined) {
if (value === "/") return value
const path = value?.split(/[?#]/, 1)[0]
if (path === "/settings") return value ?? "/"
if (path === "/new-session") return value ?? "/"
if (/^\/server\/[^/]+\/session\/[^/]+$/.test(path ?? "")) return value ?? "/"
return "/"