diff --git a/packages/app/src/composer/composer.tsx b/packages/app/src/composer/composer.tsx index f80afc7a7c00..33b2ca435153 100644 --- a/packages/app/src/composer/composer.tsx +++ b/packages/app/src/composer/composer.tsx @@ -3,7 +3,7 @@ import { Button } from "@opencode/ui/button" import { useDialog } from "@opencode/ui/context/dialog" import { Icon } from "@opencode/ui/icon" import { Keybind } from "@opencode/ui/keybind" -import { ProviderIcon } from "@opencode/ui/provider-icon" +import { ProviderModelIcon } from "@/providers/models/provider-group" import { Tooltip } from "@opencode/ui/tooltip" import { ComposerEditor } from "./editor/editor" import { ModelSelectorPopover } from "@/providers/models/select-dialog" @@ -35,7 +35,7 @@ export function Composer(props: { class?: string; model: ComposerModel; borderUn title={language.t("command.model.choose")} keybind={command.keybindParts("model.choose")} model={props.model.model.selection} - providerID={props.model.model.selection.current()?.provider?.id} + provider={props.model.model.selection.current()?.provider} modelName={props.model.model.selection.current()?.name ?? language.t("dialog.model.select.title")} onClose={props.model.restoreFocus} onUnpaidClick={() => dialog.show(() => )} @@ -52,7 +52,7 @@ function ComposerModelControl(props: { title: string keybind: string[] model: ComposerModel["model"]["selection"] - providerID?: string + provider?: { id: string; canonical?: string; name: string } modelName: string onClose: () => void onUnpaidClick: () => void @@ -60,12 +60,11 @@ function ComposerModelControl(props: { const shouldAnimate = createMemo((previous) => previous ?? props.loading) const content = () => ( <> - - {(providerID) => ( - + {(provider) => ( + )} diff --git a/packages/app/src/composer/editor/editor.tsx b/packages/app/src/composer/editor/editor.tsx index 5a02e4fe196d..49984720d101 100644 --- a/packages/app/src/composer/editor/editor.tsx +++ b/packages/app/src/composer/editor/editor.tsx @@ -16,7 +16,7 @@ import { Icon } from "@opencode/ui/icon" import { IconButton } from "@opencode/ui/icon-button" import { createAnimatedPresence } from "@/runtime/animated-presence" import { resolveBlobUrl } from "@/runtime/persistence/drafts" -import { ProviderIcon } from "@opencode/ui/provider-icon" +import { ProviderModelIcon } from "@/providers/models/provider-group" import { useI18n } from "@opencode/ui/context/i18n" import { Button } from "@opencode/ui/button" import { Keybind } from "@opencode/ui/keybind" @@ -702,7 +702,7 @@ function ComposerEditorConfiguredSelect(props: { current={current()} currentIcon={ - + {(id) => } } onSelect={props.control.onSelect} diff --git a/packages/app/src/new-session/view.tsx b/packages/app/src/new-session/view.tsx index aef0818d7155..add373c25d71 100644 --- a/packages/app/src/new-session/view.tsx +++ b/packages/app/src/new-session/view.tsx @@ -152,6 +152,8 @@ export function NewSessionView(props: { void }) { +function NewSessionTips(props: { + selection: ComposerModel["model"]["selection"] + onDone: () => void + workspaceEligible: boolean + onWorkspace: () => void +}) { const language = useLanguage() const dialog = useDialog() const sdk = useWorkspaceLocation() @@ -188,9 +195,8 @@ function NewSessionTips(props: { workspaceEligible: boolean; onWorkspace: () => ) const providerVisible = createMemo( () => - providers.ready() && providerReady() && - providers.paid().length === 0 && + providers.anyConnection() === false && Date.now() - providerState.dismissedAt >= providerTipDismissalDuration, ) const tip = createMemo<"workspace" | "provider" | undefined>(() => { @@ -212,7 +218,9 @@ function NewSessionTips(props: { workspaceEligible: boolean; onWorkspace: () => return } void import("@/providers/connect/dialog").then(({ DialogConnectProvider }) => { - void dialog.show(() => ) + void dialog.show(() => ( + + )) }) } const dismiss = () => { diff --git a/packages/app/src/providers/catalog/console.test.ts b/packages/app/src/providers/catalog/console.test.ts new file mode 100644 index 000000000000..10c1785f946f --- /dev/null +++ b/packages/app/src/providers/catalog/console.test.ts @@ -0,0 +1,19 @@ +import { expect, test } from "bun:test" +import { consoleProviderGroup, consoleProviderName } from "./console" + +test("groups only providers managed by the active Console workspace", () => { + const direct = { id: "openai", integrationID: "openai", name: "Anomaly / OpenAI" } + const group = consoleProviderGroup([ + { id: "opencode", integrationID: "opencode", name: "Anomaly / OpenCode" }, + { id: "console-openai", integrationID: "opencode", name: "Anomaly / OpenAI" }, + { id: "console-google", integrationID: "opencode", name: "Anomaly / Google" }, + direct, + ]) + + expect(group).toBeDefined() + if (!group) throw new Error("Expected Console provider group") + expect(group.workspace).toBe("Anomaly") + expect(group.providers.map((provider) => provider.id)).toEqual(["opencode", "console-openai", "console-google"]) + expect(consoleProviderName(group, group.providers[1].name)).toBe("OpenAI") + expect(group.providers).not.toContain(direct) +}) diff --git a/packages/app/src/providers/catalog/console.ts b/packages/app/src/providers/catalog/console.ts new file mode 100644 index 000000000000..439960cfeedc --- /dev/null +++ b/packages/app/src/providers/catalog/console.ts @@ -0,0 +1,26 @@ +type Provider = { + id: string + integrationID?: string + name: string +} + +export function consoleProviderGroup(providers: readonly T[]) { + const root = providers.find((provider) => provider.id === "opencode" && provider.integrationID === "opencode") + const suffix = " / OpenCode" + if (!root?.name.endsWith(suffix)) return + const workspace = root.name.slice(0, -suffix.length).trim() + if (!workspace) return + const prefix = `${workspace} / ` + return { + root, + workspace, + prefix, + providers: providers.filter( + (provider) => provider.integrationID === "opencode" && provider.name.startsWith(prefix), + ), + } +} + +export function consoleProviderName(group: { prefix: string }, name: string) { + return name.startsWith(group.prefix) ? name.slice(group.prefix.length) : name +} diff --git a/packages/app/src/providers/catalog/integrations.ts b/packages/app/src/providers/catalog/integrations.ts index 23d73225d220..462158833abc 100644 --- a/packages/app/src/providers/catalog/integrations.ts +++ b/packages/app/src/providers/catalog/integrations.ts @@ -16,7 +16,13 @@ export function useIntegrations(directory: Accessor) { })().catch(() => undefined) }) + const location = () => { + const value = directory() + return value ? { directory: value } : undefined + } + return { - list: () => data.location.integration.list(directory() ? { directory: directory()! } : undefined) ?? [], + ready: () => data.location.integration.list(location()) !== undefined, + list: () => data.location.integration.list(location()) ?? [], } } diff --git a/packages/app/src/providers/catalog/providers.ts b/packages/app/src/providers/catalog/providers.ts index 27273c4a8224..2a5bab60ffa1 100644 --- a/packages/app/src/providers/catalog/providers.ts +++ b/packages/app/src/providers/catalog/providers.ts @@ -38,11 +38,13 @@ export function useProviders(directory: Accessor) { return normalizeProviderList(provider, model) }) + const ready = () => { + const ref = location() + return data.location.provider.list(ref) !== undefined && data.location.model.list(ref) !== undefined + } + return { - ready: () => { - const ref = location() - return data.location.provider.list(ref) !== undefined && data.location.model.list(ref) !== undefined - }, + ready, all: () => providers().all, default: () => providers().default, // V2 servers list only available providers, so the connectable catalog @@ -70,6 +72,15 @@ export function useProviders(directory: Accessor) { (v) => Array.from(v), ) }, + // Any stored or detected connection, or a provider with models beyond the keyless OpenCode catalog. + // Undefined until both catalogs load, so callers never mistake loading for a first run. + anyConnection: () => { + if (!integrations.ready() || !ready()) return undefined + if (integrations.list().some((integration) => integration.connections.length > 0)) return true + return providers().connected.some( + (id) => id !== "opencode" && Object.keys(providers().all.get(id)?.models ?? {}).length > 0, + ) + }, paid: () => { const connected = new Set(providers().connected) const paid = [ diff --git a/packages/app/src/providers/connect/console.tsx b/packages/app/src/providers/connect/console.tsx new file mode 100644 index 000000000000..1220d6d2ba3a --- /dev/null +++ b/packages/app/src/providers/connect/console.tsx @@ -0,0 +1,82 @@ +import { For, Show } from "solid-js" +import { Button } from "@opencode/ui/button" +import { TextShimmer } from "@opencode/ui/text-shimmer" +import { useLanguage } from "@/runtime/i18n/language" + +export function ConsoleAuthorization(props: { + /** Undefined until the server returns the sign-in attempt. */ + code: string | undefined + browserFailed: boolean + copied: boolean + copyFailed: boolean + onOpen: () => void + onCopy: () => void +}) { + const language = useLanguage() + return ( +
+

+ {language.t( + props.browserFailed ? "provider.connect.console.browserFailed" : "provider.connect.console.instructions", + )} +

+
+
{language.t("provider.connect.console.deviceCode")}
+ + +

+ } + > + {(code) => ( + <> +
+ + {(character) => ( + + )} + +
+

+ +

+ + )} +
+
+
+ {language.t("provider.connect.console.browserHint")} + + + + +
+ +

{language.t("provider.connect.console.copyFailed")}

+
+
+ ) +} diff --git a/packages/app/src/providers/connect/controller.ts b/packages/app/src/providers/connect/controller.ts index b1553cc6e699..3ce5151b92e7 100644 --- a/packages/app/src/providers/connect/controller.ts +++ b/packages/app/src/providers/connect/controller.ts @@ -23,12 +23,20 @@ export function consoleIntegration(provider: string) { return CONSOLE_PROVIDERS.has(provider) ? CONSOLE_INTEGRATION : provider } -function hiddenDefaults(method: ProviderConnectMethod | undefined) { - return Object.fromEntries( - (method?.form ?? []).flatMap((field) => - field.type !== "external" && field.hidden && field.default !== undefined ? [[field.key, field.default]] : [], - ), - ) as FormAnswer +export function providerFormDefaults(fields: ProviderConnectMethod["form"]) { + return (fields ?? []).reduce((answer, field) => { + if (field.type === "external" || !field.hidden || field.default === undefined) return answer + const active = (field.when ?? []).every((condition) => { + const actual = answer[condition.key] + if (actual === undefined) return false + const equal = Array.isArray(actual) + ? typeof condition.value === "string" && actual.includes(condition.value) + : actual === condition.value + return condition.op === "eq" ? equal : !equal + }) + if (!active) return answer + return { ...answer, [field.key]: field.default } + }, {}) } export function createProviderConnectionController(options: { @@ -39,6 +47,8 @@ export function createProviderConnectionController(options: { onComplete: () => void /** Picks the method to start without asking when the integration exposes several. */ autoSelect?: (methods: ProviderConnectMethod[]) => number | undefined + /** Runs after the catalogs refresh; returning false keeps the dialog on a retryable error. */ + prepare?: (active: () => boolean) => Promise pollInterval?: number }) { const language = useLanguage() @@ -49,6 +59,7 @@ export function createProviderConnectionController(options: { const directory = options.directory() return directory ? { directory } : undefined } + const isConsole = () => options.provider() === CONSOLE_INTEGRATION // Not createResource: the dialog is owned by whichever page opened it, so reading a pending // resource here would suspend that page's and blank the screen behind the dialog. const [integration, setIntegration] = createStore({ @@ -85,9 +96,14 @@ export function createProviderConnectionController(options: { formAnswer: undefined as FormAnswer | undefined, // Nothing is in flight until a method is selected; `busy()` reads this, so a truthy initial // value would keep multi-method providers on the spinner instead of the method list. - state: undefined as "pending" | "complete" | "error" | "form" | undefined, + state: undefined as "pending" | "waiting" | "refreshing" | "ready" | "error" | "form" | undefined, error: undefined as string | undefined, auto: false, + // The credential is stored; a retry only needs to reload the catalogs. + connected: false, + browserFailed: false, + // The attempt is still open on the server; a retry resumes polling it. + statusFailed: false, }) const polling = { generation: 0, @@ -112,26 +128,21 @@ export function createProviderConnectionController(options: { | { type: "auth.form" } | { type: "auth.answer"; answer: FormAnswer | undefined } | { type: "auth.pending" } - | { type: "auth.complete"; authorization: Authorization } + | { type: "auth.waiting"; authorization: Authorization } | { type: "auth.error"; error: string } const dispatch = (action: Action) => { setStore( produce((draft) => { - if (action.type === "method.select") { - draft.methodIndex = action.index - draft.authorization = undefined - draft.formAnswer = undefined - draft.state = undefined - draft.error = undefined - return - } - if (action.type === "method.reset") { - draft.methodIndex = undefined + if (action.type === "method.select" || action.type === "method.reset") { + draft.methodIndex = action.type === "method.select" ? action.index : undefined draft.authorization = undefined draft.formAnswer = undefined draft.state = undefined draft.error = undefined + draft.connected = false + draft.browserFailed = false + draft.statusFailed = false return } if (action.type === "auth.form") { @@ -150,8 +161,8 @@ export function createProviderConnectionController(options: { draft.error = undefined return } - if (action.type === "auth.complete") { - draft.state = "complete" + if (action.type === "auth.waiting") { + draft.state = "waiting" draft.authorization = action.authorization draft.error = undefined return @@ -162,6 +173,7 @@ export function createProviderConnectionController(options: { ) } + const errorMessage = (error: unknown) => (error instanceof Error ? error.message : String(error)) const cancelAttempt = () => { const attempt = polling.attempt polling.attempt = undefined @@ -179,16 +191,28 @@ export function createProviderConnectionController(options: { const finish = async () => { cancelPolling() polling.attempt = undefined + const generation = polling.generation + const active = () => !polling.disposed && generation === polling.generation + setStore({ connected: true, state: "refreshing", error: undefined }) const ref = location() data.location.integration.invalidate(ref) data.location.provider.invalidate(ref) data.location.model.invalidate(ref) - await Promise.all([ + const refreshed = await Promise.all([ data.location.integration.sync(ref), data.location.provider.sync(ref), data.location.model.sync(ref), - ]).catch(() => undefined) - if (polling.disposed) return + ]) + .then(() => true) + .catch(() => false) + if (!active()) return + const prepared = refreshed && options.prepare ? await options.prepare(active) : refreshed + if (!active()) return + if (!prepared && options.prepare) { + dispatch({ type: "auth.error", error: language.t("provider.connect.console.refreshFailed") }) + return + } + setStore("state", "ready") options.onComplete() } const poll = async (authorization: Authorization, generation: number) => { @@ -202,10 +226,10 @@ export function createProviderConnectionController(options: { .catch((error) => ({ ok: false as const, error })) if (polling.disposed || generation !== polling.generation) return if (!result.ok) { - polling.attempt = undefined + setStore("statusFailed", true) dispatch({ type: "auth.error", - error: result.error instanceof Error ? result.error.message : String(result.error), + error: isConsole() ? language.t("provider.connect.console.statusFailed") : errorMessage(result.error), }) return } @@ -215,19 +239,41 @@ export function createProviderConnectionController(options: { } if (result.status.status === "failed") { polling.attempt = undefined - dispatch({ type: "auth.error", error: result.status.message }) + const message = result.status.message + dispatch({ + type: "auth.error", + error: + isConsole() && message.includes("expired_token") + ? language.t("provider.connect.console.expired") + : isConsole() && message.includes("access_denied") + ? language.t("provider.connect.console.denied") + : message, + }) return } if (result.status.status === "expired") { polling.attempt = undefined - dispatch({ type: "auth.error", error: language.t("provider.connect.oauth.expired") }) + dispatch({ + type: "auth.error", + error: language.t(isConsole() ? "provider.connect.console.expired" : "provider.connect.oauth.expired"), + }) return } polling.timer = setTimeout(() => void poll(authorization, generation), options.pollInterval ?? 1_000) } - const open = () => { + const open = async () => { const url = store.authorization?.url - if (url) platform.openExternal(url) + if (!url) return + const generation = polling.generation + const opened = await Promise.resolve() + .then(() => { + if (platform.openBrowser) return platform.openBrowser(url) + platform.openExternal(url) + return true + }) + .catch(() => false) + if (polling.disposed || generation !== polling.generation) return + setStore("browserFailed", !opened) } const select = async (index: number, answer?: FormAnswer) => { cancelPolling() @@ -240,14 +286,14 @@ export function createProviderConnectionController(options: { dispatch({ type: "auth.form" }) return } - const merged = { ...hiddenDefaults(selected), ...answer } + const merged = { ...providerFormDefaults(selected.form), ...answer } if (selected.type === "key") { dispatch({ type: "auth.answer", answer: Object.keys(merged).length ? merged : undefined }) return } if (selected.type !== "oauth") return if (selected.form?.some((field) => field.type !== "string")) { - dispatch({ type: "auth.error", error: "This authentication form contains unsupported fields" }) + dispatch({ type: "auth.error", error: language.t("provider.connect.form.unsupported") }) return } dispatch({ type: "auth.pending" }) @@ -259,9 +305,11 @@ export function createProviderConnectionController(options: { location: location(), }) .then((response) => { - if (options.provider() === CONSOLE_INTEGRATION && platform.platform === "desktop") { + if (isConsole() && platform.platform === "desktop") { const url = new URL(response.data.url) url.searchParams.set("client_id", "opencode-desktop") + // Lets the Console return link focus the window that started the sign-in. + url.searchParams.set("return_window", platform.windowID) response.data.url = url.href } return { ok: true as const, authorization: response.data } @@ -281,21 +329,28 @@ export function createProviderConnectionController(options: { if (!result.ok) { dispatch({ type: "auth.error", - error: result.error instanceof Error ? result.error.message : String(result.error), + error: isConsole() ? language.t("provider.connect.console.startFailed") : errorMessage(result.error), }) return } polling.attempt = result.authorization - dispatch({ type: "auth.complete", authorization: result.authorization }) + dispatch({ type: "auth.waiting", authorization: result.authorization }) // Same as `opencode auth login`: hand the user straight to the browser instead of // asking them to click a link and retype a code. - platform.openExternal(result.authorization.url) + void open() if (result.authorization.mode === "auto") void poll(result.authorization, generation) } - const retry = () => { + const retry = async () => { + if (store.connected) return finish() + const authorization = store.authorization + if (store.statusFailed && authorization) { + polling.attempt = authorization + setStore({ state: "waiting", error: undefined, statusFailed: false }) + return poll(authorization, polling.generation) + } const index = store.methodIndex if (index === undefined) return - void select(index, store.formAnswer) + return select(index, store.formAnswer) } const reset = () => { cancelPolling() @@ -323,10 +378,7 @@ export function createProviderConnectionController(options: { }) .then(() => ({ ok: true as const })) .catch((error) => ({ ok: false as const, error })) - if (!result.ok) { - const message = result.error instanceof Error ? result.error.message : String(result.error) - return message || language.t("provider.connect.oauth.code.invalid") - } + if (!result.ok) return errorMessage(result.error) || language.t("provider.connect.oauth.code.invalid") await finish() return undefined } @@ -350,6 +402,7 @@ export function createProviderConnectionController(options: { currentMethod, methodIndex: () => store.methodIndex, authorization: () => store.authorization, + browserFailed: () => store.browserFailed, // True while nothing useful can be shown yet: the integration is loading, a method is // about to be picked automatically, or the authorization request is in flight. busy: () => @@ -363,6 +416,7 @@ export function createProviderConnectionController(options: { reset, retry, open, + refresh: finish, connectKey, completeCode, }, diff --git a/packages/app/src/providers/connect/dialog.tsx b/packages/app/src/providers/connect/dialog.tsx index 0e5576998abe..c7bbaf28d540 100644 --- a/packages/app/src/providers/connect/dialog.tsx +++ b/packages/app/src/providers/connect/dialog.tsx @@ -1,55 +1,91 @@ import { Button } from "@opencode/ui/button" +import { Badge } from "@opencode/ui/badge" import { useDialog } from "@opencode/ui/context/dialog" import { Icon } from "@opencode/ui/icon" import { List } from "@opencode/ui/list" -import { ProviderIcon } from "@opencode/ui/provider-icon" import { Spinner } from "@opencode/ui/spinner" import { TextField } from "@opencode/ui/text-field" import { DialogBody, DialogHeader, DialogTitle, Dialog } from "@opencode/ui/dialog" import { TextInput } from "@opencode/ui/text-input" import { showToast } from "@/shell/notifications/toast" -import { type Component, createMemo, createUniqueId, For, type JSX, Match, onMount, Show, Switch } from "solid-js" +import { + type Component, + createEffect, + createMemo, + createUniqueId, + For, + type JSX, + Match, + onMount, + Show, + Switch, +} from "solid-js" import { createStore } from "solid-js/store" import { useParams } from "@solidjs/router" import { ExternalLink } from "@/runtime/platform/external-link" import { useLanguage } from "@/runtime/i18n/language" +import { usePlatform } from "@/runtime/platform/platform" +import { useServerSDK } from "@/runtime/server/client" import { useData } from "@/runtime/server/current" import { useGlobal } from "@/runtime/server/runtime" +import { ServerConnection } from "@/runtime/server/registry" import { useProviders } from "@/providers/catalog/providers" +import { consoleProviderGroup, consoleProviderName } from "@/providers/catalog/console" import { useIntegrations } from "@/providers/catalog/integrations" import { CustomProviderForm } from "@/providers/credentials/dialog" +import { ProviderModelGroup, ProviderModelIcon } from "@/providers/models/provider-group" +import type { ModelSelection } from "@/providers/models/selection" +import { OpenCodeLogo } from "@/providers/opencode-logo" import { decode64 } from "@/runtime/persistence/base64" +import { SettingsList } from "@/settings/list" +import { useTabs } from "@/shell/tabs/tabs" import { + CONSOLE_INTEGRATION, CONSOLE_PROVIDERS, consoleIntegration, createProviderConnectionController, + providerFormDefaults, type ProviderConnectMethod, } from "./controller" +import { ConsoleAuthorization } from "./console" +import { authServerName, RemoteAuthNotice } from "./remote" +import "./models.css" const CUSTOM_ID = "_custom" type IntegrationForm = NonNullable[number] type StringForm = Extract -export function useProviderConnectController(options: { onBack?: () => void } = {}) { +export function useProviderConnectController() { const [store, setStore] = createStore({ selected: undefined as string | undefined }) const reset = () => setStore("selected", undefined) return { selected: () => store.selected, select: (provider?: string) => setStore("selected", provider), - back: options.onBack ?? reset, + reset, } } export const DialogConnectProvider: Component<{ directory?: string + /** Connects at the server's default Location instead of the current route's directory. */ + defaultLocation?: boolean controller?: ReturnType + selection?: ModelSelection + onDone?: () => void + onConnected?: (provider: string) => void }> = (props) => { const fallback = useProviderConnectController() const controller = props.controller ?? fallback + const [state, setState] = createStore({ + completed: false, + modelProvider: undefined as { id: string; name: string } | undefined, + authorization: false, + }) const language = useLanguage() - const reset = controller.back + const reset = controller.reset const back = { current: reset } + const consoleSelected = () => CONSOLE_PROVIDERS.has(controller.selected() ?? "") let focusHost: HTMLDivElement | undefined const holdFocus = () => focusHost?.focus({ preventScroll: true }) const select = (provider?: string) => { @@ -63,13 +99,22 @@ export const DialogConnectProvider: Component<{ - + {(provider) => ( (back.current = handler)} + selection={props.selection} + onDone={props.onDone ? () => setState("completed", true) : undefined} + onConnected={() => props.onConnected?.(provider)} + onFirstConnection={(provider) => setState("modelProvider", provider)} + onAuthorization={(authorization) => setState("authorization", authorization)} /> )} @@ -82,25 +127,53 @@ export const DialogConnectProvider: Component<{ return ( { + if (!state.completed || !props.onDone) return + event.preventDefault() + props.onDone() + }} class="[font-family:var(--v2-font-family-sans)] [&_[data-slot=dialog-header]]:!px-5 [&_[data-slot=dialog-header-title]]:!text-[15px] [&_[data-slot=dialog-header-title]]:!tracking-[-0.13px]" + classList={{ + "[&_[data-slot=dialog-header]]:!pt-4 [&_[data-slot=dialog-header]]:!pb-3": consoleSelected() && !state.modelProvider, + "[&_[data-slot=dialog-header]]:!pt-5": !!state.modelProvider, + }} > - {language.t("command.provider.connect")}} - > - - + + + {(provider) => ( +
+ + {language.t("provider.connect.models.title", { provider: provider().name })} +
+ )} +
+ + + + + {language.t("command.provider.connect")} + +
- +
@@ -119,10 +192,27 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string }) const featured = ["opencode-go", "opencode", "anthropic", "openai", "google", "openrouter", "vercel"] const custom = () => ({ id: CUSTOM_ID, name: language.t("dialog.provider.custom.label") }) + // Only a stored credential hides a provider: environment and config connections can still be + // replaced by a sign-in. OpenCode Zen stays until a Console account (not a key) is connected. + const consoleAccount = createMemo(() => + integrations + .list() + .find((integration) => integration.id === CONSOLE_INTEGRATION) + ?.connections.some((connection) => connection.type === "credential" && connection.method === "oauth"), + ) const all = createMemo(() => { language.locale() const query = store.filter.trim().toLowerCase() - const values = [custom(), ...integrations.list()] + const values = [ + custom(), + ...integrations + .list() + .filter((integration) => + integration.id === CONSOLE_INTEGRATION + ? !consoleAccount() + : !integration.connections.some((connection) => connection.type === "credential"), + ), + ] if (!query) return values return values.filter((provider) => `${provider.id} ${provider.name}`.toLowerCase().includes(query)) }) @@ -212,9 +302,9 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string aria-busy={store.connecting === provider.id} onClick={() => connect(provider.id)} > - + {provider.name} - + {language.t( provider.id === "opencode" @@ -259,48 +349,81 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string function ProviderConnection(props: { provider: string directory?: string + defaultLocation?: boolean onBack: () => void setBack: (handler: () => void) => void + selection?: ModelSelection + onDone?: () => void + onConnected?: () => void + onFirstConnection: (provider: { id: string; name: string }) => void + onAuthorization: (authorization: boolean) => void }) { const dialog = useDialog() const params = useParams() const language = useLanguage() + const platform = usePlatform() + const sdk = useServerSDK() const data = useData() const global = useGlobal() - const providers = useProviders(() => props.directory) - const integrations = useIntegrations(() => props.directory) - const directory = () => props.directory ?? decode64(params.dir) - const location = () => { - const value = directory() - return value ? { directory: value } : undefined - } - const integrationID = () => consoleIntegration(props.provider) - const isConsole = () => CONSOLE_PROVIDERS.has(props.provider) + const tabs = useTabs() + // A sign-in belongs to the Location where it began, even if the route changes underneath it. + const initialDirectory = props.defaultLocation ? undefined : (props.directory ?? decode64(params.dir)) + const directory = () => initialDirectory + const location = () => (initialDirectory ? { directory: initialDirectory } : undefined) + const providers = useProviders(directory) + const integrations = useIntegrations(directory) + const integrationID = consoleIntegration(props.provider) + const isConsole = CONSOLE_PROVIDERS.has(props.provider) + const remote = isConsole && authServerName(sdk.server) !== undefined + const [state, setState] = createStore({ + copied: false, + copyFailed: false, + firstConnection: undefined as boolean | undefined, + models: false, + noModels: false, + // The workspace providers had not loaded when the wait ran out. + catalogPending: false, + selectedModel: "", + collapsed: {} as Record, + }) const controller = createProviderConnectionController({ - provider: integrationID, + provider: () => integrationID, // A Go service-account key still belongs to the `opencode-go` integration (zen/go/v1), // exactly as before; only the sign-in is shared with the Console. keyProvider: () => props.provider, directory, autoSelect: (methods) => { - if (!isConsole()) return undefined + if (!isConsole) return undefined const index = methods.findIndex((method) => method.type === "oauth") return index === -1 ? undefined : index }, + prepare: isConsole ? prepareConsoleCatalog : undefined, + pollInterval: isConsole ? 500 : undefined, onComplete: () => { + props.onConnected?.() // The picker only lists the newest model per family by default, which hides most of // what a new connection just unlocked. Show everything the connected integration offers. - // Console sign-in returns Go models inside the `opencode` provider, so this covers Go too. - const linked = (data.location.provider.list(location()) ?? []).filter( - (item) => item.id === props.provider || item.integrationID === integrationID(), - ) - const ids = new Set(linked.map((item) => item.id)) global.models.show( - (data.location.model.list(location()) ?? []) - .filter((model) => ids.has(model.providerID) && model.status !== "deprecated") - .map((model) => ({ providerID: model.providerID, modelID: model.id })), + connectionModels().map((model) => ({ providerID: model.providerID, modelID: model.id })), ) + if (state.catalogPending) { + setState("noModels", true) + return + } + if (state.firstConnection) { + const first = connectionGroups()[0]?.models[0] + if (first) { + setState({ models: true, selectedModel: modelKey(first) }) + props.onFirstConnection({ id: props.provider, name: provider().name }) + return + } + // Keep the "connected, but no models" state visible so the workspace can be fixed. + if (isConsole) { + setState("noModels", true) + return + } + } dialog.close() showToast({ variant: "success", @@ -310,6 +433,75 @@ function ProviderConnection(props: { }) }, }) + // Captured before the new credential lands, so the connection itself never counts as existing. + createEffect(() => { + if (state.firstConnection !== undefined) return + const existing = providers.anyConnection() + if (existing === undefined) return + setState("firstConnection", !existing) + }) + const connectionProviders = createMemo(() => + (data.location.provider.list(location()) ?? []).filter( + (provider) => provider.id === props.provider || provider.integrationID === integrationID, + ), + ) + const connectionModels = createMemo(() => { + const ids = new Set(connectionProviders().map((provider) => provider.id)) + return (data.location.model.list(location()) ?? []).filter( + (model) => ids.has(model.providerID) && model.enabled && model.status !== "deprecated", + ) + }) + const connectionGroups = createMemo(() => { + const models = connectionModels() + return connectionProviders() + .map((provider) => ({ provider, models: models.filter((model) => model.providerID === provider.id) })) + .filter((group) => group.models.length > 0) + }) + const managedProviders = createMemo(() => (isConsole ? consoleProviderGroup(connectionProviders()) : undefined)) + + // The server loads the Console workspace's providers after the grant lands, so the first refresh + // can still show only the free catalog. Poll briefly for the workspace providers before moving on. + async function prepareConsoleCatalog(active: () => boolean) { + if (controller.currentMethod()?.type === "key") return active() + const loaded = () => + managedProviders() !== undefined || connectionProviders().some((provider) => provider.id !== "opencode") + const deadline = Date.now() + 10_000 + while (!loaded() && active() && Date.now() < deadline) { + await new Promise((resolve) => setTimeout(resolve, 250)) + if (!active()) return false + data.location.provider.invalidate(location()) + data.location.model.invalidate(location()) + await Promise.all([data.location.provider.sync(location()), data.location.model.sync(location())]).catch( + () => undefined, + ) + } + setState("catalogPending", !loaded()) + return active() + } + const connectionGroupName = (name: string) => { + const managed = managedProviders() + return managed ? consoleProviderName(managed, name) : name + } + const modelKey = (model: { providerID: string; id: string }) => `${model.providerID}:${model.id}` + const selectedModel = () => connectionModels().find((model) => modelKey(model) === state.selectedModel) + const copyLink = async () => { + const url = controller.authorization()?.url + if (!url) return + const copied = await Promise.resolve() + .then(() => (platform.writeClipboardText ? platform.writeClipboardText(url) : navigator.clipboard.writeText(url))) + .then(() => true) + .catch(() => false) + if (controller.authorization()?.url !== url) return + setState({ copied, copyFailed: !copied }) + } + createEffect(() => { + controller.authorization()?.attemptID + setState({ copied: false, copyFailed: false }) + }) + createEffect(() => { + const current = controller.auth.state() + props.onAuthorization(controller.authorization() !== undefined && (current === "waiting" || current === "refreshing")) + }) const provider = createMemo(() => ({ id: props.provider, name: @@ -339,16 +531,30 @@ function ProviderConnection(props: { } } const code = createMemo(() => { - const instructions = controller.authorization()?.instructions + const authorization = controller.authorization() + if (!authorization) return + const userCode = new URL(authorization.url).searchParams.get("user_code") + if (userCode) return userCode + const instructions = authorization.instructions if (instructions?.includes(":")) return instructions.split(":").pop()?.trim() return instructions }) const keyIndex = () => controller.methods().findIndex((method) => method.type === "key") const oauthIndex = () => controller.methods().findIndex((method) => method.type === "oauth") + // The Console device flow owns the dialog from the first frame until the catalogs are loaded. + const consoleSignIn = () => + isConsole && + !state.noModels && + controller.currentMethod()?.type !== "key" && + controller.auth.state() !== "error" && + (controller.busy() || controller.authorization()?.mode === "auto") function AuthFormView() { + const defaults = providerFormDefaults(controller.currentMethod()?.form) const [formStore, setFormStore] = createStore({ - value: {} as Record, + value: Object.fromEntries( + Object.entries(defaults).flatMap(([key, value]) => (typeof value === "string" ? [[key, value]] : [])), + ) as Record, index: 0, }) @@ -471,11 +677,11 @@ function ProviderConnection(props: { function goBack() { // The API key path for the Console is an escape hatch below the sign-in flow, so // "back" returns to the sign-in rather than leaving the provider. - if (isConsole() && controller.currentMethod()?.type === "key" && oauthIndex() !== -1) { + if (isConsole && controller.currentMethod()?.type === "key" && oauthIndex() !== -1) { void controller.auth.select(oauthIndex()) return } - if (!isConsole() && controller.methods().length > 1 && controller.methodIndex() !== undefined) { + if (!isConsole && controller.methods().length > 1 && controller.methodIndex() !== undefined) { controller.auth.reset() return } @@ -531,10 +737,12 @@ function ProviderConnection(props: {
- {language.t("provider.connect.status.failed", { error: controller.auth.error() ?? "" })} + {isConsole + ? controller.auth.error() + : language.t("provider.connect.status.failed", { error: controller.auth.error() ?? "" })}
- @@ -572,7 +780,7 @@ function ProviderConnection(props: { return (
@@ -586,7 +794,7 @@ function ProviderConnection(props: {
-
{language.t("provider.connect.status.waiting")}
-
@@ -708,109 +916,286 @@ function ProviderConnection(props: { ) } - // Rendered from the first frame of the Console sign-in, before the attempt exists. Only the - // status line changes once the browser opens, so nothing around it moves. - function ConsoleSignInView() { - const ready = () => controller.authorization()?.url !== undefined + // Deliberately quiet: most people should never need a key, so this stays small and at the bottom. + function ConsoleApiKeySwitch() { return ( -
-
{language.t("provider.connect.console.description", { provider: provider().name })}
- - {language.t(ready() ? "provider.connect.status.waiting" : "provider.connect.console.opening")} - -
- -
- +
+ {language.t("provider.connect.console.serviceAccount")} +
) } - // Deliberately quiet: most people should never need a key, so this stays small and at the bottom. - function ConsoleApiKeySwitch() { + function ConsoleNoModels() { return ( -
- + + +
+
+ ) + } + + const startWithModel = async () => { + const model = selectedModel() + if (!model) return + const selection = { providerID: model.providerID, modelID: model.id } + if (props.selection) { + props.selection.set(selection) + props.onDone?.() + dialog.close() + return + } + dialog.close() + await tabs.newDraft( + { + server: ServerConnection.key(sdk.server), + directory: initialDirectory ?? data.location.default().directory, + }, + undefined, + selection, + ) + } + + function ConnectionModelList(listProps: { items: ReturnType }) { + return ( + + + {(model) => { + const selected = () => state.selectedModel === modelKey(model) + return ( +
+ +
+ ) + }} +
+
+ ) + } + + function FirstConnectionModels() { + return ( +
+

+ {language.t("provider.connect.models.description")} +

+
- {language.t("provider.connect.console.apiKey.switch")} - +
+ + {language.t("provider.connect.models.available")} + + {(managed) => {managed().workspace}} +
+
+ 1} + fallback={} + > + + {(group) => { + const expanded = () => !state.collapsed[group.provider.id] + return ( +
+

+ +

+ + + +
+ ) + }} +
+
+ } + > +
+ + {(group) => ( + setState("collapsed", group.provider.id, !value)} + > + + + )} + +
+ +
+
+
+ +
) } return ( -
-
- -
- - - {language.t("provider.connect.title.anthropicProMax")} - - {language.t("provider.connect.title", { provider: provider().name })} - -
-
+ }>
- - + +
+ + + {language.t("provider.connect.console.title")} + + {language.t("provider.connect.title.anthropicProMax")} + + {language.t("provider.connect.title", { provider: provider().name })} + + +
+
+
+ +
+ +
+
+ + + + + +
+ void copyLink()} + onOpen={() => void controller.auth.open()} + /> +
+
+ +
+ {language.t("provider.connect.status.inProgress")} +
+
+ + + + + + + +
+ +
+
+ + + + + + + + + +
+ - - - -
- {language.t("provider.connect.status.inProgress")} -
-
- - - - - - - -
- -
-
- - - - - - - - - - - - - + +
+
- +
) } diff --git a/packages/app/src/providers/connect/models.css b/packages/app/src/providers/connect/models.css new file mode 100644 index 000000000000..36a01919cc03 --- /dev/null +++ b/packages/app/src/providers/connect/models.css @@ -0,0 +1,72 @@ +.connected-model-row-shell { + position: relative; + margin-inline: 4px; + padding-block: 4px; +} + +.connected-model-row-shell:not(:last-child)::after { + content: ""; + position: absolute; + inset-inline: 12px; + bottom: 0; + height: 0.5px; + background: var(--v2-border-border-base); +} + +.connected-model-row { + display: flex; + width: 100%; + height: 40px; + align-items: center; + padding-inline: 12px; + padding-block: 0; + border: 0; + border-radius: 4px; +} + +@media (hover: hover) { + .connected-model-row:hover { + background-color: var(--v2-background-bg-layer-03); + } +} + +.connected-model-row:focus-visible { + background-color: var(--v2-background-bg-layer-03); +} + +[data-component="first-provider-models"] [data-component="settings-list"] { + background-color: var(--v2-background-bg-layer-02); + overflow: hidden; + padding-inline: 0; +} + +[data-component="first-provider-models"] .provider-model-groups--dialog .provider-model-group { + background-color: var(--v2-background-bg-layer-02); +} + +[data-component="first-provider-models"] .provider-model-groups--dialog .provider-model-group-models { + padding-inline: 0; +} + +[data-component="first-provider-models"] + .provider-model-groups--dialog + .provider-model-group-models + > [data-component="settings-list"] { + background-color: transparent; +} + +@media (hover: hover) { + [data-component="first-provider-models"] + .provider-model-groups--dialog + .provider-model-group-trigger:not(:disabled):hover { + background-color: var(--v2-background-bg-layer-03); + } +} + +[data-component="first-provider-models"] .settings-section { + gap: 8px; +} + +[data-component="first-provider-models"] .settings-section[data-expanded] { + padding-bottom: 8px; +} diff --git a/packages/app/src/providers/connect/remote.test.ts b/packages/app/src/providers/connect/remote.test.ts new file mode 100644 index 000000000000..a34d72dce968 --- /dev/null +++ b/packages/app/src/providers/connect/remote.test.ts @@ -0,0 +1,30 @@ +import { expect, test } from "bun:test" +import { authServerName } from "./remote" + +test("SSH disclosure uses the remote identity even with a loopback proxy", () => { + expect(authServerName({ type: "ssh", host: "production.example", http: { url: "http://127.0.0.1:4096" } })).toBe( + "production.example", + ) + expect( + authServerName({ + type: "ssh", + host: "production.example", + displayName: "Production server", + http: { url: "http://127.0.0.1:4096" }, + }), + ).toBe("Production server") +}) + +test("local Desktop and loopback HTTP connections do not show remote disclosure", () => { + expect(authServerName({ type: "sidecar", variant: "base", http: { url: "http://127.0.0.1:4096" } })).toBeUndefined() + for (const host of ["localhost", "127.0.0.1", "[::1]"]) { + expect(authServerName({ type: "http", http: { url: `http://${host}:4096` } })).toBeUndefined() + } +}) + +test("WSL and remote HTTP connections show their server identity", () => { + expect( + authServerName({ type: "sidecar", variant: "wsl", distro: "Ubuntu", http: { url: "http://127.0.0.1:4096" } }), + ).toBe("Ubuntu") + expect(authServerName({ type: "http", http: { url: "https://production.example" } })).toBe("production.example") +}) diff --git a/packages/app/src/providers/connect/remote.tsx b/packages/app/src/providers/connect/remote.tsx new file mode 100644 index 000000000000..97133307808f --- /dev/null +++ b/packages/app/src/providers/connect/remote.tsx @@ -0,0 +1,30 @@ +import { Show } from "solid-js" +import { useLanguage } from "@/runtime/i18n/language" +import { ServerConnection, serverName } from "@/runtime/server/registry" + +export function authServerName(server: ServerConnection.Any) { + if (ServerConnection.builtin(server)) return undefined + if (server.type === "http" && ["localhost", "127.0.0.1", "[::1]"].includes(new URL(server.http.url).hostname)) + return undefined + if (server.type === "sidecar" && server.variant === "wsl") return server.displayName ?? server.distro + return serverName(server) +} + +export function RemoteAuthNotice(props: { server: ServerConnection.Any }) { + const language = useLanguage() + return ( + + {(name) => ( +
+

+ {language.t("provider.connect.remote.title", { server: name() })} +

+

{language.t("provider.connect.remote.description")}

+
+ )} +
+ ) +} diff --git a/packages/app/src/providers/credentials/dialog.tsx b/packages/app/src/providers/credentials/dialog.tsx index bb047439695b..1d1cda64b66d 100644 --- a/packages/app/src/providers/credentials/dialog.tsx +++ b/packages/app/src/providers/credentials/dialog.tsx @@ -2,7 +2,6 @@ import { Button } from "@opencode/ui/button" import { useDialog } from "@opencode/ui/context/dialog" import { Icon } from "@opencode/ui/icon" import { IconButton } from "@opencode/ui/icon-button" -import { ProviderIcon } from "@opencode/ui/provider-icon" import { useMutation } from "@tanstack/solid-query" import { TextField } from "@opencode/ui/text-field" import { showToast } from "@/shell/notifications/toast" @@ -12,6 +11,7 @@ import { ExternalLink } from "@/runtime/platform/external-link" import { useData } from "@/runtime/server/current" import { useLanguage } from "@/runtime/i18n/language" import { type FormState, headerRow, modelRow, validateCustomProvider } from "./form" +import { CustomManagedProviderIcon } from "@/providers/models/provider-group" export function CustomProviderForm(props: { autofocus?: boolean } = {}) { const dialog = useDialog() @@ -134,7 +134,7 @@ export function CustomProviderForm(props: { autofocus?: boolean } = {}) { return (
- +
{language.t("provider.custom.title")}
diff --git a/packages/app/src/providers/custom-managed-provider.svg b/packages/app/src/providers/custom-managed-provider.svg new file mode 100644 index 000000000000..5876403128cd --- /dev/null +++ b/packages/app/src/providers/custom-managed-provider.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + +
diff --git a/packages/app/src/providers/models/manage.tsx b/packages/app/src/providers/models/manage.tsx index d278ac759ea1..7141449fc4f0 100644 --- a/packages/app/src/providers/models/manage.tsx +++ b/packages/app/src/providers/models/manage.tsx @@ -2,11 +2,10 @@ import { Button } from "@opencode/ui/button" import { Dialog, DialogBody, DialogHeader, DialogTitleGroup } from "@opencode/ui/dialog" import { Icon } from "@opencode/ui/icon" import { IconButton } from "@opencode/ui/icon-button" -import { ProviderIcon } from "@opencode/ui/provider-icon" import { Switch } from "@opencode/ui/switch" import { TextInput } from "@opencode/ui/text-input" import { useFilteredList } from "@opencode/ui/hooks" -import { For, Show, type Component } from "solid-js" +import { createMemo, For, Show, type Component } from "solid-js" import { createStore } from "solid-js/store" import { useLocal } from "@/providers/models/selection" import { popularProviders } from "@/providers/catalog/providers" @@ -16,6 +15,7 @@ import { DialogConnectProvider } from "@/providers/connect/dialog" import { decode64 } from "@/runtime/persistence/base64" import { SettingsList } from "@/settings/list" import { SettingsRow } from "@/settings/row" +import { consoleModelGroup, ProviderModelSections } from "@/providers/models/provider-group" import "@/settings/settings.css" type ModelItem = ReturnType["model"]["list"]>[number] @@ -54,9 +54,35 @@ export const DialogManageModels: Component = () => { const bPopular = bRank >= 0 if (aPopular && !bPopular) return -1 if (!aPopular && bPopular) return 1 - return aRank - bRank + if (aPopular && bPopular) return aRank - bRank + return a.items[0].provider.name.localeCompare(b.items[0].provider.name) }, }) + const managed = createMemo(() => consoleModelGroup(local.model.list())) + const searching = () => list.filter().length > 0 + const expanded = (key: string) => searching() || !store.collapsed[key] + + function ModelRows(props: { items: ModelItem[] }) { + return ( + + + {(item) => ( + +
+ setModelVisibility(item, checked)} + hideLabel + > + {item.name} + +
+
+ )} +
+
+ ) + } return ( @@ -100,7 +126,7 @@ export const DialogManageModels: Component = () => {
-
+
{
} > - - {(group) => { - const searching = () => list.filter().length > 0 - const expanded = () => searching() || !store.collapsed[group.category] - - return ( -
-
- - setProviderVisibility(group.category, checked)} - hideLabel - > - {group.items[0].provider.name} - -
- - - - {(item) => ( - -
- setModelVisibility(item, checked)} - hideLabel - > - {item.name} - -
-
- )} -
-
-
-
- ) - }} -
+ setStore("collapsed", key, !value)} + onSetVisibility={setProviderVisibility} + action={(group) => ( + setProviderVisibility(group.category, checked)} + hideLabel + > + {group.items[0].provider.name} + + )} + rows={(items) => } + />
diff --git a/packages/app/src/providers/models/provider-group.tsx b/packages/app/src/providers/models/provider-group.tsx new file mode 100644 index 000000000000..cb407b27352d --- /dev/null +++ b/packages/app/src/providers/models/provider-group.tsx @@ -0,0 +1,248 @@ +import { Badge } from "@opencode/ui/badge" +import { Icon } from "@opencode/ui/icon" +import { IconButton } from "@opencode/ui/icon-button" +import { iconNames, type IconName } from "@opencode/ui/icons/provider" +import { Menu } from "@opencode/ui/menu" +import { ProviderIcon } from "@opencode/ui/provider-icon" +import type { JSX } from "solid-js" +import { createMemo, For, Match, Show, Switch } from "solid-js" +import { consoleProviderGroup, consoleProviderName } from "@/providers/catalog/console" +import { OpenCodeLogo } from "@/providers/opencode-logo" +import { useLanguage } from "@/runtime/i18n/language" +import customManagedProvider from "@/providers/custom-managed-provider.svg" +import "@/settings/settings.css" + +type ModelProvider = { id: string; canonical?: string; name: string } +type ModelItem = { provider: ModelProvider & { integrationID?: string }; cost?: { input: number } } +type ModelGroup = { category: string; items: T[] } + +export const CONSOLE_GROUP_KEY = "console:opencode" + +export function CustomManagedProviderIcon(props: { class?: string }) { + return +} + +export function ProviderModelIcon(props: { provider: ModelProvider; class?: string }) { + const icon = () => + [ + props.provider.canonical, + props.provider.canonical?.replace(/-token-plan$/, ""), + props.provider.id.replace(/^console-/, ""), + ].find((id): id is IconName => !!id && id !== "synthetic" && iconNames.includes(id as IconName)) + + return ( + + + + + + {(id) => } + + + + + + ) +} + +/** Detects the Console workspace from every listed model, so a search that hides some providers keeps the group. */ +export function consoleModelGroup(items: readonly T[]) { + return consoleProviderGroup([...new Map(items.map((item) => [item.provider.id, item.provider])).values()]) +} + +/** Provider sections for a model list, with Console workspace providers nested under one OpenCode Console section. */ +export function ProviderModelSections(props: { + groups: ModelGroup[] + managed: ReturnType> + expanded: (key: string) => boolean + disabled: boolean + onExpandedChange: (key: string, expanded: boolean) => void + rows: (items: T[]) => JSX.Element + /** Trailing control in a direct provider's header. */ + action?: (group: ModelGroup) => JSX.Element + onSetVisibility?: (providerID: string, visible: boolean) => void + ref?: (providerID: string, element: HTMLElement) => void +}) { + type Section = { + group?: ModelGroup + managed?: { group: NonNullable>>; providers: ModelGroup[] } + } + const language = useLanguage() + const sections = createMemo(() => { + const managed = props.managed + const ids = new Set(managed?.providers.map((provider) => provider.id)) + const nested = props.groups.filter((group) => ids.has(group.category)) + if (!managed || nested.length === 0) return props.groups.map((group) => ({ group })) + const first = props.groups.findIndex((group) => ids.has(group.category)) + return props.groups.flatMap
((group, index) => { + if (!ids.has(group.category)) return [{ group }] + if (index !== first) return [] + return [{ managed: { group: managed, providers: nested } }] + }) + }) + // Only the keyless catalog is free; a Zen key or Console account keeps the provider's own name. + const name = (group: ModelGroup) => + group.category === "opencode" && group.items.every((item) => !item.cost?.input) + ? language.t("provider.connect.opencode.freeName") + : group.items[0].provider.name + + function Header(input: { id: string; icon: JSX.Element; title: JSX.Element; badge?: string; action?: JSX.Element }) { + return ( +

+ + {input.action} +

+ ) + } + + return ( + + {(section) => ( + + {(group) => ( +
props.ref?.(group().category, element)} + class="settings-section" + data-component="settings-models-provider" + data-expanded={props.expanded(group().category) ? "" : undefined} + > +
} + title={name(group())} + action={props.action?.(group())} + /> + {props.rows(group().items)} +
+ )} +
+ } + > + {(managed) => ( +
+
} + title={language.t("provider.connect.opencode.name")} + badge={managed().group.workspace} + /> + +
+ + {(group) => ( + props.ref?.(group.category, element)} + provider={group.items[0].provider} + name={consoleProviderName(managed().group, group.items[0].provider.name)} + expanded={props.expanded(group.category)} + disabled={props.disabled} + onSetVisibility={ + props.onSetVisibility + ? (visible) => props.onSetVisibility?.(group.category, visible) + : undefined + } + onExpandedChange={(value) => props.onExpandedChange(group.category, value)} + > + {props.rows(group.items)} + + )} + +
+
+
+ )} + + )} +
+ ) +} + +export function ProviderModelGroup(props: { + provider: ModelProvider + name?: string + expanded: boolean + disabled?: boolean + onSetVisibility?: (visible: boolean) => void + children: JSX.Element + ref?: (element: HTMLElement) => void + onExpandedChange: (expanded: boolean) => void +}) { + const language = useLanguage() + return ( +
+

+ + + {(setVisibility) => ( +
+ + } + aria-label={language.t("common.moreOptions")} + /> + + + setVisibility(true)}>{language.t("settings.models.enableAll")} + setVisibility(false)}> + {language.t("settings.models.disableAll")} + + + + +
+ )} +
+

+ +
{props.children}
+
+
+ ) +} diff --git a/packages/app/src/providers/models/select-dialog.tsx b/packages/app/src/providers/models/select-dialog.tsx index 26f8789eeaee..524d37f9600c 100644 --- a/packages/app/src/providers/models/select-dialog.tsx +++ b/packages/app/src/providers/models/select-dialog.tsx @@ -6,14 +6,13 @@ import { useDialog } from "@opencode/ui/context/dialog" import { popularProviders } from "@/providers/catalog/providers" import { Button } from "@opencode/ui/button" import { Badge } from "@opencode/ui/badge" -import { Dialog, DialogBody, DialogHeader, DialogTitle } from "@opencode/ui/dialog" +import { Dialog, DialogBody, DialogHeader, DialogTitleGroup } from "@opencode/ui/dialog" import { Icon } from "@opencode/ui/icon" import { IconButton } from "@opencode/ui/icon-button" import { ScrollView } from "@opencode/ui/scroll-view" import { Tooltip } from "@opencode/ui/tooltip" import { Menu } from "@opencode/ui/menu" import { TextInput } from "@opencode/ui/text-input" -import { ProviderIcon } from "@opencode/ui/provider-icon" import { ModelTooltip } from "./tooltip" import { useLanguage } from "@/runtime/i18n/language" import { decode64 } from "@/runtime/persistence/base64" @@ -22,6 +21,7 @@ import { createMenuDismissController } from "@/shell/commands/menu-dismiss" import { createEventListener } from "@solid-primitives/event-listener" import { matchesModelSearch } from "./search" import { SettingsList } from "@/settings/list" +import { CONSOLE_GROUP_KEY, consoleModelGroup, ProviderModelSections } from "@/providers/models/provider-group" import "@/settings/settings.css" const isFree = (provider: string, cost: { input: number } | undefined) => @@ -62,9 +62,14 @@ const ModelList: Component<{ collapsed: {} as Record, }) const models = createMemo(() => controller.models(store.search)) - const groups = createMemo(() => controller.groups(models())) + const modelGroups = createMemo(() => controller.groups(models())) + const managed = createMemo(() => consoleModelGroup(controller.all())) const expanded = (provider: string) => store.search.length > 0 || !store.collapsed[provider] - const visibleModels = () => models().filter((item) => expanded(item.provider.id)) + const managedIDs = createMemo(() => new Set(managed()?.providers.map((provider) => provider.id) ?? [])) + const visibleModels = () => + models().filter( + (item) => expanded(item.provider.id) && (!managedIDs().has(item.provider.id) || expanded(CONSOLE_GROUP_KEY)), + ) let scrollRef: HTMLDivElement | undefined const setSearch = (value: string) => { @@ -88,6 +93,53 @@ const ModelList: Component<{ if (item) controller.select(item) } + function ModelRows(props: { items: ModelItem[] }) { + return ( + + + {(item) => ( + + )} + + + ) + } + return (
@@ -137,88 +189,19 @@ const ModelList: Component<{
-
(scrollRef = element)} class="settings-panel settings-models h-full px-4 pt-4 pb-4"> +
(scrollRef = element)} class="settings-panel settings-models h-full px-4 pt-1 pb-4"> 0} fallback={
{language.t("dialog.model.empty")}
} > - - {(group) => { - const searching = () => store.search.length > 0 - const open = () => expanded(group.category) - - return ( -
-

- -

- - - - {(item) => ( - - )} - - - -
- ) - }} -
+ 0} + onExpandedChange={(key, value) => setStore("collapsed", key, !value)} + rows={(items) => } + />
@@ -272,6 +255,7 @@ function createModelSelectorController(input: { ) return { + all: () => model.list().filter((item) => (input.provider() ? item.provider.id === input.provider() : true)), models: (search: string) => { const query = search.trim() const filtered = query @@ -548,7 +532,7 @@ export const DialogSelectModel: Component<{ provider?: string; model?: ModelStat return ( - {language.t("dialog.model.select.title")} + diff --git a/packages/app/src/providers/models/unpaid.tsx b/packages/app/src/providers/models/unpaid.tsx index 40ebc8152a1c..2e087fab0e0f 100644 --- a/packages/app/src/providers/models/unpaid.tsx +++ b/packages/app/src/providers/models/unpaid.tsx @@ -1,7 +1,7 @@ import { DialogBody, DialogHeader, DialogTitle, Dialog } from "@opencode/ui/dialog" import { Badge } from "@opencode/ui/badge" import { Icon } from "@opencode/ui/icon" -import { ProviderIcon } from "@opencode/ui/provider-icon" +import { ProviderModelIcon } from "@/providers/models/provider-group" import { Tooltip } from "@opencode/ui/tooltip" import { useDialog } from "@opencode/ui/context/dialog" import { useTheme } from "@opencode/ui/theme" @@ -31,6 +31,8 @@ export const DialogSelectModelUnpaid: Component<{ model?: ModelState }> = (props }) const isFree = (item: ReturnType[number]) => item.provider.id === "opencode" && (!item.cost || item.cost.input === 0) + const providerName = (provider: { id: string; name: string }) => + provider.id === "opencode" ? language.t("provider.connect.opencode.name") : provider.name const freeModels = createMemo(() => model.list().filter(isFree)) const openProviders = (provider?: string) => { @@ -144,9 +146,12 @@ export const DialogSelectModelUnpaid: Component<{ model?: ModelState }> = (props }} onClick={() => openProviders(provider.id)} > - + - {provider.name} + {providerName(provider)} {language.t( diff --git a/packages/app/src/providers/opencode-logo.tsx b/packages/app/src/providers/opencode-logo.tsx new file mode 100644 index 000000000000..227257fa91e5 --- /dev/null +++ b/packages/app/src/providers/opencode-logo.tsx @@ -0,0 +1,17 @@ +export function OpenCodeLogo(props: { class?: string }) { + return ( + + ) +} diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index 3a9f3da648cb..cb3bed0d0066 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -195,6 +195,43 @@ export const dict = { "dialog.provider.viewAll": "Show more providers", "provider.connect.title": "Connect {{provider}}", + "provider.connect.opencode.name": "OpenCode Console", + "provider.connect.opencode.freeName": "OpenCode Free", + "provider.connect.console.title": "Connecting to OpenCode Console", + "provider.connect.console.instructions": + "Continue in your browser. Confirm the code shown there matches the one below.", + "provider.connect.console.deviceCode": "Device code", + "provider.connect.console.deviceCode.label": "Device code: {{code}}", + "provider.connect.console.waiting": "Waiting for confirmation…", + "provider.connect.console.browserHint": "Browser didn't open?", + "provider.connect.console.copyLink": "Copy sign-in link", + "provider.connect.console.linkCopied": "Sign-in link copied", + "provider.connect.console.copyFailed": "Couldn't copy the sign-in link. Open Console again to continue.", + "provider.connect.console.openAgain": "Open Console again", + "provider.connect.console.browserFailed": + "We couldn't open your browser. Try again or copy the sign-in link to continue.", + "provider.connect.console.expired": "This sign-in request has expired. Start again to get a new device code.", + "provider.connect.console.denied": "Access was denied in Console. Try again when you're ready to connect.", + "provider.connect.console.statusFailed": "Couldn't check authorization. Check your server connection and try again.", + "provider.connect.console.startFailed": "Couldn't start sign-in. Check your server connection and try again.", + "provider.connect.models.title": "Connected to {{provider}}", + "provider.connect.models.description": "Choose a model to start with. You can switch models anytime.", + "provider.connect.models.available": "Available models", + "provider.connect.models.list": "Models available from {{provider}}", + "provider.connect.console.refreshFailed": + "Your account is connected, but we couldn't load your models. Try again to refresh them.", + "provider.connect.console.connected": "OpenCode connected", + "provider.connect.console.noModels": + "Your account is connected, but this Console workspace has no available models. Check its setup in Console, then refresh.", + "provider.connect.console.modelsLoading": "Your models are still loading. Refresh to check again.", + "provider.connect.console.refresh": "Refresh models", + "provider.connect.console.openingBrowser": "Opening browser…", + "provider.connect.console.serviceAccount": "Service account?", + "provider.connect.console.useApiKey": "Use API key", + "provider.connect.remote.title": "Connecting on “{{server}}”", + "provider.connect.remote.description": + "Your OpenCode credentials will be stored on this server. Models will be available through this server.", + "provider.connect.form.unsupported": "This authentication form contains unsupported fields", "provider.connect.title.anthropicProMax": "Login with Anthropic", "provider.connect.selectMethod": "Select login method for {{provider}}.", "provider.connect.method.apiKey": "API key", @@ -236,11 +273,6 @@ export const dict = { "Your browser opens so you can sign in to {{provider}}. Paste the authorization code it gives you below.", "provider.connect.oauth.openBrowser": "Open browser", "provider.connect.oauth.expired": "Authorization expired", - "provider.connect.console.description": - "Sign in with your OpenCode Console account. Your browser opens to the Console, where you pick a workspace and select Authorize.", - "provider.connect.console.opening": "Opening your browser…", - "provider.connect.console.code.placeholder": "Requesting a code…", - "provider.connect.console.apiKey.switch": "Connect with an API key or service account instead", "provider.connect.console.apiKey.description": "Paste an API key for a service account. You create service accounts in the OpenCode Console under Keys.", "provider.connect.console.apiKey.link": "Open the Console", @@ -1382,6 +1414,8 @@ export const dict = { "settings.providers.section.connected": "Connected providers", "settings.providers.connected.empty": "No connected providers", "settings.providers.connected.environmentDescription": "Connected from your environment variables", + "settings.providers.console.available.one": "{{count}} provider available", + "settings.providers.console.available.other": "{{count}} providers available", "settings.providers.section.popular": "Popular providers", "settings.providers.custom.description": "Add an OpenAI-compatible provider by base URL.", "settings.providers.tag.environment": "Environment", @@ -1391,6 +1425,8 @@ export const dict = { "settings.providers.tag.other": "Other", "settings.models.title": "Models", "settings.models.description": "Choose which models appear in model picker", + "settings.models.enableAll": "Enable all models", + "settings.models.disableAll": "Disable all models", "settings.agents.title": "Agents", "settings.agents.description": "Agent settings will be configurable here.", "settings.commands.title": "Commands", diff --git a/packages/app/src/runtime/platform/platform.tsx b/packages/app/src/runtime/platform/platform.tsx index 74b327ecca8d..f7a91a4b061c 100644 --- a/packages/app/src/runtime/platform/platform.tsx +++ b/packages/app/src/runtime/platform/platform.tsx @@ -43,6 +43,9 @@ type PlatformBase = { /** Open a web or mail URL in the default system application */ openExternal(url: string): void + /** Open an authentication page, reporting whether the browser could be launched. */ + openBrowser?(url: string): Promise + /** Open a local path in a local app (desktop only) */ openPath?(path: string, app?: string): Promise diff --git a/packages/app/src/runtime/server/global-sync/utils.ts b/packages/app/src/runtime/server/global-sync/utils.ts index 023e63449530..2a20ff0eafde 100644 --- a/packages/app/src/runtime/server/global-sync/utils.ts +++ b/packages/app/src/runtime/server/global-sync/utils.ts @@ -51,6 +51,7 @@ export function normalizeProviderList( for (const provider of providers) { all.set(provider.id, { id: provider.id, + canonical: provider.canonical, integrationID: provider.integrationID, name: provider.name, source: "custom", diff --git a/packages/app/src/runtime/server/types.ts b/packages/app/src/runtime/server/types.ts index 3f327626d43b..323f6b37c26d 100644 --- a/packages/app/src/runtime/server/types.ts +++ b/packages/app/src/runtime/server/types.ts @@ -129,6 +129,7 @@ export type Model = { export type Provider = { id: string + canonical?: string /** Integration that connects this provider; differs from `id` for Console-managed providers. */ integrationID?: string name: string diff --git a/packages/app/src/settings/models/models.tsx b/packages/app/src/settings/models/models.tsx index 1d1fc843b1d4..cc425ac1542d 100644 --- a/packages/app/src/settings/models/models.tsx +++ b/packages/app/src/settings/models/models.tsx @@ -1,10 +1,9 @@ import { useFilteredList } from "@opencode/ui/hooks" -import { ProviderIcon } from "@opencode/ui/provider-icon" 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, For, on, onCleanup, Show } from "solid-js" +import { type Component, createEffect, createMemo, For, on, onCleanup, Show } from "solid-js" import { Schema } from "effect" import { Persistence } from "@/runtime/persistence/schema" import { useLanguage } from "@/runtime/i18n/language" @@ -14,17 +13,21 @@ import { popularProviders } from "@/providers/catalog/providers" 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 "@/settings/settings.css" type ModelItem = ReturnType["list"]>[number] -const PROVIDER_ICON_SIZE = 16 - export const ModelProvidersSchema = Schema.Struct({ collapsed: Persistence.record(Persistence.fallback(Schema.Boolean, () => false)), }) -export const SettingsModels: Component<{ active?: boolean; autofocus?: boolean }> = (props) => { +export const SettingsModels: Component<{ + active?: boolean + autofocus?: boolean + provider?: string + onReveal?: () => void +}> = (props) => { const language = useLanguage() const models = useModels() const serverSdk = useServerSDK() @@ -47,6 +50,7 @@ export const SettingsModels: Component<{ active?: boolean; autofocus?: boolean } ModelProvidersSchema, { collapsed: {} }, ) + const sections = new Map() const list = useFilteredList({ items: (_filter) => models.list(), @@ -69,6 +73,69 @@ export const SettingsModels: Component<{ active?: boolean; autofocus?: boolean } return aName.localeCompare(bName) }, }) + const managed = createMemo(() => consoleModelGroup(models.list())) + const searching = () => list.filter().length > 0 + const expanded = (key: string) => searching() || !store.collapsed[key] + const setProviderVisibility = (providerID: string, visible: boolean) => + models + .list() + .filter((item) => item.provider.id === providerID) + .forEach((item) => models.setVisibility({ providerID, modelID: item.id }, visible)) + + function ModelRows(props: { items: ModelItem[] }) { + return ( + + + {(item) => { + const key = { providerID: item.provider.id, modelID: item.id } + return ( + +
+ models.setVisibility(key, checked)} + hideLabel + > + {item.name} + +
+
+ ) + }} +
+
+ ) + } + + createEffect(() => { + if (!props.active || !props.provider) return + const provider = props.provider + if (list.filter()) { + list.clear() + return + } + if (!list.grouped.latest.some((group) => group.category === provider)) return + const section = sections.get(provider) + if (!section?.isConnected) return + // Expand only the path to the target so the saved layout of other providers is kept. + if (managed()?.providers.some((item) => item.id === provider)) setStore("collapsed", CONSOLE_GROUP_KEY, false) + setStore("collapsed", provider, false) + requestAnimationFrame(() => { + const panel = section.closest(".settings-panel") + const header = panel?.querySelector(".settings-tab-header") + if (panel && header) { + panel.scrollTo({ + top: panel.scrollTop + section.getBoundingClientRect().top - header.getBoundingClientRect().bottom - 24, + }) + } else { + section.scrollIntoView({ block: "start" }) + } + section + .querySelector(".provider-model-group-trigger, .settings-models-group-trigger") + ?.focus({ preventScroll: true }) + props.onReveal?.() + }) + }) return ( <> @@ -127,84 +194,16 @@ export const SettingsModels: Component<{ active?: boolean; autofocus?: boolean }
} > - - {(group) => { - const searching = () => list.filter().length > 0 - const expanded = () => searching() || !store.collapsed[group.category] - - return ( -
-

- -

- - - - {(item) => { - const key = { providerID: item.provider.id, modelID: item.id } - return ( - -
- { - models.setVisibility(key, checked) - }} - hideLabel - > - {item.name} - -
-
- ) - }} -
-
-
-
- ) - }} -
+ setStore("collapsed", key, !value)} + onSetVisibility={setProviderVisibility} + ref={(providerID, element) => sections.set(providerID, element)} + rows={(items) => } + />
diff --git a/packages/app/src/settings/providers/providers.tsx b/packages/app/src/settings/providers/providers.tsx index 4a72f02c3713..682a2bc43586 100644 --- a/packages/app/src/settings/providers/providers.tsx +++ b/packages/app/src/settings/providers/providers.tsx @@ -1,15 +1,20 @@ import { Button } from "@opencode/ui/button" import { Badge } from "@opencode/ui/badge" import { useDialog } from "@opencode/ui/context/dialog" -import { ProviderIcon } from "@opencode/ui/provider-icon" +import { Icon } from "@opencode/ui/icon" +import { OpenCodeLogo } from "@/providers/opencode-logo" import { showToast } from "@/shell/notifications/toast" import { popularProviders, useProviders } from "@/providers/catalog/providers" +import { consoleProviderGroup } from "@/providers/catalog/console" import { useIntegrations } from "@/providers/catalog/integrations" -import { createMemo, type Component, For, Show } from "solid-js" +import { createEffect, createMemo, type Component, For, Show } from "solid-js" +import { createStore, reconcile } from "solid-js/store" import { useLanguage } from "@/runtime/i18n/language" import { useServerSDK } from "@/runtime/server/client" -import { CONSOLE_INTEGRATION } from "@/providers/connect/controller" +import { useData } from "@/runtime/server/current" +import { CONSOLE_INTEGRATION, CONSOLE_PROVIDERS } from "@/providers/connect/controller" import { DialogConnectProvider, useProviderConnectController } from "@/providers/connect/dialog" +import { ProviderModelIcon } from "@/providers/models/provider-group" import { SettingsList } from "@/settings/list" import "@/settings/settings.css" @@ -27,18 +32,27 @@ const PROVIDER_NOTES = [ { match: (id: string) => id === "vercel", key: "dialog.provider.vercel.note" }, ] as const -const PROVIDER_ICON_SIZE = 16 - export const SettingsProviders: Component<{ directory: string | undefined - onBack?: () => void + onSelectProvider?: (providerID: string) => void }> = (props) => { const dialog = useDialog() const language = useLanguage() const serverSdk = useServerSDK() + const data = useData() const providers = useProviders(() => props.directory) const integrations = useIntegrations(() => props.directory) - const providerConnect = useProviderConnectController({ onBack: props.onBack }) + const providerConnect = useProviderConnectController() + const [state, setState] = createStore({ + disconnecting: {} as Record, + consoleExpanded: false, + connecting: false, + }) + const updateDisconnecting = (ids: string[], status: "removing" | "removed" | "absent" | undefined) => + setState("disconnecting", (current) => ({ + ...current, + ...Object.fromEntries(ids.map((id) => [id, status])), + })) // Console-managed providers (`opencode-go`, `console-*`) connect through the `opencode` // integration, so the lookup must follow `integrationID` rather than the provider id. const integration = (item: ProviderItem) => { @@ -47,32 +61,97 @@ export const SettingsProviders: Component<{ } const connect = (provider?: string) => { + setState("connecting", true) providerConnect.select(provider) - void dialog.show(() => ) + void dialog.show( + () => ( + { + if (CONSOLE_PROVIDERS.has(providerID)) { + setState("disconnecting", reconcile({})) + return + } + setState("disconnecting", providerID, undefined) + }} + /> + ), + () => { + setState("connecting", false) + const location = props.directory ? { directory: props.directory } : undefined + data.location.integration.invalidate(location) + data.location.provider.invalidate(location) + data.location.model.invalidate(location) + void Promise.all([ + data.location.integration.sync(location), + data.location.provider.sync(location), + data.location.model.sync(location), + ]).catch(() => undefined) + }, + ) } - const connected = createMemo(() => { - return providers - .connected() + const available = createMemo(() => { + const connected = providers.connected() + const managedConsole = consoleProviderGroup(connected) + const consoleConnected = integrations + .list() + .find((item) => item.id === CONSOLE_INTEGRATION) + ?.connections.some((connection) => connection.type === "credential" || connection.type === "env") + // Hides the free `opencode` row while a new Console grant is still loading its workspace providers. + const consoleTransition = + state.connecting && + CONSOLE_PROVIDERS.has(providerConnect.selected() ?? "") && + consoleConnected && + managedConsole === undefined + return connected .filter( (provider) => - provider.id !== "opencode" || Object.values(provider.models).some((model) => model.cost.input > 0), + provider.id !== "opencode" || + (!consoleTransition && + (managedConsole !== undefined || + consoleConnected || + Object.values(provider.models).some((model) => model.cost.input > 0))), ) .toSorted((a, b) => Number(b.id === "opencode-go") - Number(a.id === "opencode-go")) }) + createEffect(() => { + const ids = new Set(available().map((item) => item.id)) + Object.entries(state.disconnecting).forEach(([id, status]) => { + if ((status === "removing" || status === "removed") && !ids.has(id)) { + setState("disconnecting", id, "absent") + return + } + if (status === "absent" && ids.has(id)) setState("disconnecting", id, undefined) + }) + }) + + const connected = createMemo(() => available().filter((item) => !state.disconnecting[item.id])) + + const consoleGroup = createMemo(() => consoleProviderGroup(available())) + + const displayed = createMemo(() => { + const group = consoleGroup() + if (!group) return connected() + const grouped = new Set(group.providers.filter((item) => item.id !== group.root.id).map((item) => item.id)) + return connected().filter((item) => !grouped.has(item.id)) + }) + const popular = createMemo(() => { const connectedIDs = new Set(connected().map((p) => p.id)) // The Console account (integration `opencode`) shares its id with the Zen provider. A stored API // key, including one imported from a v1 auth.json, makes Zen "connected" without any account, so // the Popular list keeps the sign-in row until the active credential is an OAuth grant. Until the // integration list arrives the row is still the models.dev Zen provider, so dedupe it as before. - const console = integrations.list().find((entry) => entry.id === CONSOLE_INTEGRATION) + const account = integrations.list().find((entry) => entry.id === CONSOLE_INTEGRATION) const items = providers .popular() .filter((p) => { - if (p.id !== CONSOLE_INTEGRATION || !console) return !connectedIDs.has(p.id) - return console.connections.find((connection) => connection.type === "credential")?.method !== "oauth" + if (p.id !== CONSOLE_INTEGRATION || !account) return !connectedIDs.has(p.id) + return account.connections.find((connection) => connection.type === "credential")?.method !== "oauth" }) .slice() items.sort((a, b) => popularProviders.indexOf(a.id) - popularProviders.indexOf(b.id)) @@ -113,8 +192,11 @@ export const SettingsProviders: Component<{ const note = (id: string) => PROVIDER_NOTES.find((item) => item.match(id))?.key - const disconnect = async (item: ProviderItem) => { - const name = item.name + const disconnect = async (item: ProviderItem, name: string) => { + if (state.disconnecting[item.id]) return + const group = consoleGroup() + const ids = group?.root.id === item.id ? group.providers.map((provider) => provider.id) : [item.id] + updateDisconnecting(ids, "removing") const location = props.directory ? { directory: props.directory } : undefined await serverSdk.api.integration .get({ integrationID: item.integrationID ?? item.id, location }) @@ -124,6 +206,7 @@ export const SettingsProviders: Component<{ await Promise.all( credentials.map((credential) => serverSdk.api.credential.remove({ credentialID: credential.id })), ) + updateDisconnecting(ids, "removed") showToast({ variant: "success", icon: "circle-check", @@ -132,6 +215,7 @@ export const SettingsProviders: Component<{ }) }) .catch((err: unknown) => { + updateDisconnecting(ids, undefined) const message = err instanceof Error ? err.message : String(err) showToast({ title: language.t("common.requestFailed"), description: message }) }) @@ -153,38 +237,120 @@ export const SettingsProviders: Component<{

{language.t("settings.providers.section.connected")}

0} + when={displayed().length > 0} fallback={
{language.t("settings.providers.connected.empty")}
} > - - {(item) => ( -
-
- -
- {item.name} - {type(item)} -
-
+ + {(item) => { + const managedGroup = () => (consoleGroup()?.root.id === item.id ? consoleGroup() : undefined) + return ( - {language.t("settings.providers.connected.environmentDescription")} - +
+
+ + +
+ + {item.name} + + {type(item)} +
+
+ + {language.t("settings.providers.connected.environmentDescription")} + + } + > + + +
} > - + {(group) => ( +
+
+
+ +
+
+ + {language.t("provider.connect.opencode.name")} + + {group().workspace} +
+ 1}> + + +
+
+ +
+ +
+ + +
+ )}
-
- )} + ) + }}
@@ -197,15 +363,13 @@ export const SettingsProviders: Component<{ {(item) => (
- + +
- {item.name} + + {item.name} + {language.t("dialog.provider.tag.recommended")} diff --git a/packages/app/src/settings/settings.css b/packages/app/src/settings/settings.css index c919fb00a635..61a37447f511 100644 --- a/packages/app/src/settings/settings.css +++ b/packages/app/src/settings/settings.css @@ -677,6 +677,134 @@ border-bottom: none; } +[data-component="connected-providers-section"] .settings-provider-row { + min-height: 48px; + padding-block: 10px; +} + +.settings-provider-console { + border-bottom: 0.5px solid var(--v2-border-border-base); +} + +.settings-provider-console:last-child { + border-bottom: none; +} + +.settings-provider-console-header { + display: flex; + align-items: center; + justify-content: space-between; + gap: 16px; + min-height: 48px; + padding-block: 10px; +} + +.settings-provider-console-summary { + display: flex; + min-width: 0; + flex-wrap: wrap; + align-items: center; + gap: 4px; +} + +.settings-provider-console-toggle { + display: flex; + height: 28px; + align-items: center; + gap: 2px; + padding-inline: 4px; + border: 0; + border-radius: 4px; + background: transparent; + color: var(--v2-text-text-muted); + font-size: 13px; + font-weight: 440; + line-height: var(--line-height-compact); + cursor: pointer; +} + +@media (hover: hover) { + .settings-provider-console-toggle:hover { + background: var(--v2-overlay-simple-overlay-hover); + color: var(--v2-text-text-base); + } +} + +.settings-provider-console-chevron { + color: var(--v2-icon-icon-muted); + transition: transform 150ms ease-out; +} + +.settings-provider-console-chevron.open { + transform: rotate(90deg); +} + +.settings-provider-console-list { + display: flex; + flex-direction: column; + gap: 2px; + padding-bottom: 10px; +} + +.settings-provider-console-separator { + height: 0.5px; + margin-bottom: 6px; + background: var(--v2-border-border-base); +} + +.settings-provider-console-item { + display: flex; + width: 100%; + min-height: 24px; + align-items: center; + gap: 2px; + padding-inline: 10px; + border: 0; + border-radius: 4px; + background: transparent; + color: var(--v2-text-text-base); + font-size: 13px; + font-weight: 440; + line-height: var(--line-height-compact); + text-align: start; + cursor: pointer; +} + +.settings-provider-console-item-chevron { + color: var(--v2-icon-icon-base); + opacity: 0; +} + +@media (hover: hover) { + .settings-provider-console-item:hover { + background: var(--v2-overlay-simple-overlay-hover); + } + + .settings-provider-console-item:hover .settings-provider-console-item-chevron { + opacity: 1; + } +} + +.settings-provider-console-item:focus-visible { + background: var(--v2-overlay-simple-overlay-hover); +} + +.settings-provider-console-item:focus-visible .settings-provider-console-item-chevron { + opacity: 1; +} + +@media (prefers-reduced-motion: reduce) { + .settings-provider-console-chevron { + transition: none; + } +} + +@container settings-panel (max-width: 520px) { + .settings-provider-console-header { + flex-wrap: wrap; + } +} + @media (min-width: 640px) { .settings-provider-row { flex-wrap: nowrap; @@ -938,6 +1066,18 @@ color: var(--v2-icon-icon-muted); } +.settings-models-group-chevron svg { + transition: transform 150ms ease; +} + +.settings-models-group-chevron svg.collapsed { + transform: rotate(-90deg); +} + +:dir(rtl) .settings-models-group-chevron svg.collapsed { + transform: rotate(90deg); +} + .settings-models-group-label { display: flex; align-items: center; @@ -950,6 +1090,153 @@ line-height: var(--line-height-compact); } +.provider-model-groups { + display: flex; + min-width: 0; + flex-direction: column; + gap: 12px; +} + +.settings-models-console-groups { + margin-inline-start: 14px; + padding-inline-start: 16px; + border-inline-start: 0.5px solid var(--v2-border-border-base); +} + +.provider-model-group { + min-width: 0; + overflow: hidden; + border-radius: 8px; + background-color: var(--v2-background-bg-layer-01); + box-shadow: inset 0 0 0 0.5px var(--v2-border-border-muted); +} + +.provider-model-group-header { + display: flex; + min-width: 0; + align-items: center; +} + +.provider-model-group-trigger { + display: flex; + min-width: 0; + flex: 1; + min-height: 48px; + align-items: center; + justify-content: flex-start; + gap: 16px; + padding: 12px 16px; + border: 0; + border-radius: 8px; + background: transparent; + color: var(--v2-text-text-base); + text-align: start; +} + +.provider-model-group-trigger:focus-visible { + outline: 2px solid var(--v2-border-border-focus); + outline-offset: -2px; +} + +@media (hover: hover) { + .provider-model-group-trigger:not(:disabled):hover { + background-color: var(--v2-background-bg-layer-02); + } +} + +.provider-model-group-trigger:disabled { + cursor: default; +} + +.provider-model-group-label { + display: flex; + min-width: 0; + align-items: center; + gap: 8px; +} + +.provider-model-group-title { + min-width: 0; + overflow: hidden; + font-size: 13px; + font-weight: 530; + line-height: var(--line-height-compact); + text-overflow: ellipsis; + white-space: nowrap; +} + +.provider-model-group-chevron { + flex-shrink: 0; + margin-inline-start: -2px; + color: var(--v2-icon-icon-muted); + transition: transform 150ms ease; +} + +.provider-model-group-chevron.collapsed { + transform: rotate(-90deg); +} + +:dir(rtl) .provider-model-group-chevron.collapsed { + transform: rotate(90deg); +} + +.provider-model-group-actions { + position: relative; + z-index: 1; + display: flex; + flex-shrink: 0; + align-items: center; + gap: 8px; + padding-inline-end: 12px; +} + +.provider-model-group-models { + padding-inline: 16px; +} + +.provider-model-group-models > [data-component="settings-list"] { + padding-inline: 0; + border-radius: 0; + background: transparent; + box-shadow: none; + border-top: 0.5px solid var(--v2-border-border-base); +} + +.provider-model-group:has(.provider-model-group-trigger:focus-visible) + .provider-model-group-models + > [data-component="settings-list"] { + border-top-color: transparent; +} + +.provider-model-group:has(.provider-model-group-trigger:focus-visible) { + outline: 0.5px solid var(--v2-border-border-muted); + outline-offset: -0.5px; +} + +@media (hover: hover) { + .provider-model-group:has(.provider-model-group-trigger:hover) { + outline: 0.5px solid var(--v2-border-border-muted); + outline-offset: -0.5px; + } + + .provider-model-group:has(.provider-model-group-trigger:hover) + .provider-model-group-models + > [data-component="settings-list"] { + border-top-color: transparent; + } +} + +.provider-model-groups--dialog { + padding-block: 2px; +} + +@media (prefers-reduced-motion: reduce) { + .settings-models-group-chevron svg, + .provider-model-group-chevron { + transition: none; + } +} + .settings-models [data-component="provider-icon"] { color: var(--v2-icon-icon-base); } diff --git a/packages/app/src/settings/shell.tsx b/packages/app/src/settings/shell.tsx index 4d0a267b2ff6..b394a71faf3f 100644 --- a/packages/app/src/settings/shell.tsx +++ b/packages/app/src/settings/shell.tsx @@ -191,7 +191,10 @@ function RootSettings() { const servers = useServerCollectionController() const inventory = useSettingsServers() const platform = usePlatform() - const [state, setState] = createStore({ worktreeFilterReset: 0 }) + const [state, setState] = createStore({ + worktreeFilterReset: 0, + modelProvider: undefined as string | undefined, + }) const list = servers.collection.items const singleEntry = createMemo(() => (inventory().length === 1 ? inventory()[0] : undefined)) const single = createMemo(() => singleEntry()?.connection) @@ -320,10 +323,21 @@ function RootSettings() { /> - surface.select("providers")} /> + { + setState("modelProvider", providerID) + surface.select("models") + }} + /> - + setState("modelProvider", undefined)} + /> surface.subtab(value)} /> @@ -347,7 +361,10 @@ function ServerSettings(props: { entry: SettingsServer }) { const surface = useSettingsSurface() const activeDirectory = useSettingsDirectory(() => props.entry.connection) const prefetchWorkspaces = useWorkspacesPrefetch(() => props.entry.connection) - const [state, setState] = createStore({ worktreeFilterReset: 0 }) + const [state, setState] = createStore({ + worktreeFilterReset: 0, + modelProvider: undefined as string | undefined, + }) const groups = createMemo(() => [ { items: nestedServerTabs.map((item) => ({ @@ -402,10 +419,20 @@ function ServerSettings(props: { entry: SettingsServer }) { /> - surface.select("providers")} /> + { + setState("modelProvider", providerID) + surface.select("models") + }} + /> - + setState("modelProvider", undefined)} + /> surface.subtab(value)} /> diff --git a/packages/desktop/src/main/files/index.ts b/packages/desktop/src/main/files/index.ts index 93480ccffaa4..1fb6e10d7d51 100644 --- a/packages/desktop/src/main/files/index.ts +++ b/packages/desktop/src/main/files/index.ts @@ -121,9 +121,14 @@ export const openExternalURL = Effect.fn("DesktopFiles.openExternalURL")(functio const url = resolveExternalURL(value) if (!url) { yield* scoped("window", Effect.logWarning("blocked external target", { url: value })) - return + return false } - yield* Effect.promise(() => shell.openExternal(url)) + return yield* Effect.tryPromise(() => shell.openExternal(url)).pipe( + Effect.as(true), + Effect.catch((error) => + scoped("window", Effect.logError("failed to open external target", { url, error })).pipe(Effect.as(false)), + ), + ) }) export const openLocalFileURL = Effect.fn("DesktopFiles.openLocalFileURL")(function* (value: string) { diff --git a/packages/desktop/src/main/ipc-handlers/files.ts b/packages/desktop/src/main/ipc-handlers/files.ts index 933f842b58d8..1be816a1570f 100644 --- a/packages/desktop/src/main/ipc-handlers/files.ts +++ b/packages/desktop/src/main/ipc-handlers/files.ts @@ -24,7 +24,8 @@ export const fileHandlers = FileRpcs.toLayer( FilesReleasePickedFiles: ({ token }, context) => Effect.sync(() => files.releasePickedFiles(sender(handoff, context).id, token)), FilesSaveFile: ({ options, content }) => files.saveFile(options, content).pipe(Effect.orDie), - FilesOpenExternal: ({ url }) => openExternalURL(url), + FilesOpenExternal: ({ url }) => openExternalURL(url).pipe(Effect.asVoid), + FilesOpenBrowser: ({ url }) => (/^https?:/i.test(url) ? openExternalURL(url) : Effect.succeed(false)), FilesOpenLocalFile: ({ url }) => openLocalFileURL(url), FilesOpenPath: ({ path, application }) => files.openPath(path, application).pipe( diff --git a/packages/desktop/src/main/lifecycle/deep-link.test.ts b/packages/desktop/src/main/lifecycle/deep-link.test.ts new file mode 100644 index 000000000000..c6e46239500c --- /dev/null +++ b/packages/desktop/src/main/lifecycle/deep-link.test.ts @@ -0,0 +1,17 @@ +import { describe, expect, test } from "bun:test" +import { consoleReturnWindow } from "./deep-link" + +describe("Console return deep links", () => { + test("reads the originating Desktop window", () => { + expect(consoleReturnWindow("opencode://console/authorized?window=window-a")).toBe("window-a") + expect(consoleReturnWindow("opencode://console/authorized?window=window%20b")).toBe("window b") + }) + + test("rejects unrelated and malformed links", () => { + expect(consoleReturnWindow("opencode://console/other?window=window-a")).toBeUndefined() + expect(consoleReturnWindow("opencode://other/authorized?window=window-a")).toBeUndefined() + expect(consoleReturnWindow("https://console/authorized?window=window-a")).toBeUndefined() + expect(consoleReturnWindow("not a url")).toBeUndefined() + expect(consoleReturnWindow("opencode://console/authorized")).toBeUndefined() + }) +}) diff --git a/packages/desktop/src/main/lifecycle/deep-link.ts b/packages/desktop/src/main/lifecycle/deep-link.ts new file mode 100644 index 000000000000..15089090e918 --- /dev/null +++ b/packages/desktop/src/main/lifecycle/deep-link.ts @@ -0,0 +1,11 @@ +export function consoleReturnWindow(value: string) { + try { + const url = new URL(value) + if (url.protocol !== "opencode:" || url.hostname !== "console" || url.pathname !== "/authorized") return + const id = url.searchParams.get("window") + if (!id || id.length > 256 || /[\u0000-\u001f\u007f]/.test(id)) return + return id + } catch { + return + } +} diff --git a/packages/desktop/src/main/lifecycle/index.ts b/packages/desktop/src/main/lifecycle/index.ts index c9cf1821aefe..24a856a197e0 100644 --- a/packages/desktop/src/main/lifecycle/index.ts +++ b/packages/desktop/src/main/lifecycle/index.ts @@ -8,10 +8,11 @@ import { emitIpcEvent } from "../ipc-events" import { DesktopLogging, scoped } from "../native/logging" import { DesktopStorage } from "../storage" import { safeWebContentsURL } from "../windows/state" -import { getLastFocusedWindow, makeMainWindows, setAppQuitting, setRelaunchHandler } from "../windows" +import { getLastFocusedWindow, getWindowByID, makeMainWindows, setAppQuitting, setRelaunchHandler } from "../windows" import { marks } from "./marks" import { initializeFirstLaunchOnboarding } from "./onboarding" import { Shutdown } from "./shutdown" +import { consoleReturnWindow } from "./deep-link" export interface Interface { readonly relaunch: () => void @@ -34,11 +35,23 @@ const runtime = Layer.effect( const pendingDeepLinks: string[] = [] let shutdownReady = false const prepareToRestart = shutdown.run.pipe(Effect.ensuring(Effect.sync(() => (shutdownReady = true)))) + const focusWindow = (win: BrowserWindow | null) => { + if (!win) return + if (win.isMinimized()) win.restore() + win.show() + win.focus() + } const emitDeepLinks = (urls: string[]) => { if (!urls.length) return pendingDeepLinks.push(...urls) - const win = getLastFocusedWindow() + const target = urls.flatMap((url) => { + const id = consoleReturnWindow(url) + const win = id ? getWindowByID(id) : null + return win ? [win] : [] + })[0] + const win = target ?? getLastFocusedWindow() if (win) emitIpcEvent(win.webContents, new DeepLinksOpened({ urls })) + return win } const relaunch = () => { setAppQuitting() @@ -57,17 +70,14 @@ const runtime = Layer.effect( const urls = argv.filter((arg) => arg.startsWith("opencode://")) if (urls.length) { runFork(Effect.logInfo("deep link received via second-instance", { urls })) - emitDeepLinks(urls) + focusWindow(emitDeepLinks(urls) ?? null) } - const win = getLastFocusedWindow() - if (!win) return - win.show() - win.focus() + if (!urls.length) focusWindow(getLastFocusedWindow()) } const openUrl = (event: Event, url: string) => { event.preventDefault() runFork(Effect.logInfo("deep link received via open-url", { url })) - emitDeepLinks([url]) + focusWindow(emitDeepLinks([url]) ?? null) } const beforeQuit = (event: Event) => { setAppQuitting() diff --git a/packages/desktop/src/main/windows/index.ts b/packages/desktop/src/main/windows/index.ts index a0fd38417ffe..1502a31b0bfc 100644 --- a/packages/desktop/src/main/windows/index.ts +++ b/packages/desktop/src/main/windows/index.ts @@ -79,6 +79,12 @@ export function getLastFocusedWindow() { return win } +export function getWindowByID(id: string) { + const win = registry.get(id) + if (!win || win.isDestroyed()) return null + return win +} + export function setWindowThemeReady(win: BrowserWindow) { themeReady.get(win)?.() } diff --git a/packages/desktop/src/main/windows/registry.test.ts b/packages/desktop/src/main/windows/registry.test.ts index cad9f63eca98..d47f7df53b6a 100644 --- a/packages/desktop/src/main/windows/registry.test.ts +++ b/packages/desktop/src/main/windows/registry.test.ts @@ -25,6 +25,8 @@ describe("window registry", () => { app.registry.register("a", { name: "a" }) app.registry.register("b", { name: "b" }) expect(app.state.stored).toEqual(["a", "b"]) + expect(app.registry.get("a")).toEqual({ name: "a" }) + expect(app.registry.get("missing")).toBeUndefined() }) test("forgets a deliberately closed window while others remain open", () => { diff --git a/packages/desktop/src/main/windows/registry.ts b/packages/desktop/src/main/windows/registry.ts index d5862daa3c13..90936f66c73e 100644 --- a/packages/desktop/src/main/windows/registry.ts +++ b/packages/desktop/src/main/windows/registry.ts @@ -31,6 +31,9 @@ export function createWindowRegistry(persistence: { if (!lastFocusedID) return return windows.get(lastFocusedID) }, + get(id: string) { + return windows.get(id) + }, closed(id: string) { windows.delete(id) if (lastFocusedID === id) lastFocusedID = windows.keys().next().value diff --git a/packages/desktop/src/renderer/api-types.ts b/packages/desktop/src/renderer/api-types.ts index 0277d4a8fcbe..29335dbe177a 100644 --- a/packages/desktop/src/renderer/api-types.ts +++ b/packages/desktop/src/renderer/api-types.ts @@ -66,6 +66,7 @@ export type ElectronAPI = { getPathForFile(file: File): string saveFile(opts: SaveFilePickerOptions, content: string): Promise openExternal(url: string): void + openBrowser(url: string): Promise openLocalFile(url: string): void openPath(path: string, app?: string): Promise revealPath(path: string): Promise diff --git a/packages/desktop/src/renderer/api.ts b/packages/desktop/src/renderer/api.ts index 63a019b55a68..ca09acb89418 100644 --- a/packages/desktop/src/renderer/api.ts +++ b/packages/desktop/src/renderer/api.ts @@ -134,6 +134,7 @@ export const api: ElectronAPI = { getPathForFile: (file) => window.electron.getPathForFile(file), saveFile: (opts, content) => invoke("FilesSaveFile", { options: opts, content }), openExternal: (url) => send("FilesOpenExternal", { url }), + openBrowser: (url) => invoke("FilesOpenBrowser", { url }), openLocalFile: (url) => send("FilesOpenLocalFile", { url }), openPath: (path, app) => invoke("FilesOpenPath", { path, application: app }).then((value) => value ?? undefined), revealPath: (path) => invoke("FilesRevealPath", { path }), diff --git a/packages/desktop/src/renderer/platform/files.test.ts b/packages/desktop/src/renderer/platform/files.test.ts index dd9711e8c25e..3d6ebf8f4fc2 100644 --- a/packages/desktop/src/renderer/platform/files.test.ts +++ b/packages/desktop/src/renderer/platform/files.test.ts @@ -21,6 +21,7 @@ function fileApi(events: string[]) { getPathForFile: () => "fallback", saveFile: async () => false, openExternal: () => {}, + openBrowser: async () => true, openLocalFile: () => {}, resolveAppPath: async () => null, openPath: async () => undefined, @@ -33,6 +34,10 @@ function fileApi(events: string[]) { } describe("desktop attachment files", () => { + test("reports native browser launch failure to the renderer", async () => { + const files = createDesktopFiles({ ...fileApi([]), openBrowser: async () => false }, "macos", []) + expect(await files.openBrowser("https://opencode.ai/console")).toBe(false) + }) test("reads selected files sequentially and releases the token", async () => { const events: string[] = [] const files = createDesktopFiles(fileApi(events), "windows") diff --git a/packages/desktop/src/renderer/platform/files.ts b/packages/desktop/src/renderer/platform/files.ts index 224bec84da3b..abb5c2914d1f 100644 --- a/packages/desktop/src/renderer/platform/files.ts +++ b/packages/desktop/src/renderer/platform/files.ts @@ -11,6 +11,7 @@ type DesktopFileAPI = Pick< | "getPathForFile" | "saveFile" | "openExternal" + | "openBrowser" | "openLocalFile" | "resolveAppPath" | "openPath" @@ -55,6 +56,7 @@ export function createDesktopFiles(api: DesktopFileAPI, os: DesktopOS) { saveFile: (options: { title?: string; defaultPath?: string }, content: string) => api.saveFile({ title: options.title, defaultPath: options.defaultPath }, content), openExternal: (url: string) => api.openExternal(url), + openBrowser: (url: string) => api.openBrowser(url), openLocalFile: (url: string) => api.openLocalFile(url), async openPath(path: string, app?: string) { if (os !== "windows") { diff --git a/packages/desktop/src/shared/ipc-rpc/files.ts b/packages/desktop/src/shared/ipc-rpc/files.ts index 1f4744e776a7..ca68ba5db5a0 100644 --- a/packages/desktop/src/shared/ipc-rpc/files.ts +++ b/packages/desktop/src/shared/ipc-rpc/files.ts @@ -43,6 +43,10 @@ export const FilesSaveFile = Rpc.make("FilesSaveFile", { export const FilesOpenExternal = Rpc.make("FilesOpenExternal", { payload: { url: Schema.String }, }) +export const FilesOpenBrowser = Rpc.make("FilesOpenBrowser", { + payload: { url: Schema.String }, + success: Schema.Boolean, +}) export const FilesOpenLocalFile = Rpc.make("FilesOpenLocalFile", { payload: { url: Schema.String }, }) @@ -68,6 +72,7 @@ export const FileRpcs = RpcGroup.make( FilesReleasePickedFiles, FilesSaveFile, FilesOpenExternal, + FilesOpenBrowser, FilesOpenLocalFile, FilesOpenPath, FilesRevealPath, diff --git a/packages/ui/src/context/dialog.tsx b/packages/ui/src/context/dialog.tsx index 70e6c1f40bf7..71b8317b6d99 100644 --- a/packages/ui/src/context/dialog.tsx +++ b/packages/ui/src/context/dialog.tsx @@ -28,6 +28,12 @@ type Active = { } const Context = createContext>() +// Lets the dialog rendered in a layer opt out of closing on a backdrop click. +const LayerContext = createContext<{ setBackdropDismiss: (value: boolean) => void }>() + +export function useDialogLayer() { + return useContext(LayerContext) +} function init() { const [stack, setStack] = createSignal([]) @@ -86,6 +92,7 @@ function init() { createRoot((d: () => void) => { dispose = d const [closing, setClosingSignal] = createSignal(false) + const [backdropDismiss, setBackdropDismiss] = createSignal(true) setClosing = setClosingSignal return ( close(id)} + onClick={() => { + if (backdropDismiss()) close(id) + }} />
- {element()} + {element()}
diff --git a/packages/ui/src/overlays/dialog/dialog.tsx b/packages/ui/src/overlays/dialog/dialog.tsx index 646e2e3c043e..e0f54dd9ce79 100644 --- a/packages/ui/src/overlays/dialog/dialog.tsx +++ b/packages/ui/src/overlays/dialog/dialog.tsx @@ -1,5 +1,6 @@ import { CloseButton, Content, Description, Title } from "@kobalte/core/dialog" -import { type ComponentProps, type JSXElement, type ParentProps, Show, children, splitProps } from "solid-js" +import { type ComponentProps, type JSXElement, type ParentProps, Show, children, createEffect, splitProps } from "solid-js" +import { useDialogLayer } from "../../context/dialog" import { useI18n } from "../../context/i18n" import "./dialog.css" @@ -10,6 +11,8 @@ export interface DialogProps extends ParentProps { containerClass?: ComponentProps<"div">["class"] classList?: ComponentProps<"div">["classList"] fit?: boolean + onCloseAutoFocus?: ComponentProps["onCloseAutoFocus"] + preventBackdropDismiss?: boolean } export interface DialogHeaderProps extends ParentProps { @@ -19,7 +22,7 @@ export interface DialogHeaderProps extends ParentProps { export interface DialogTitleGroupProps { title?: JSXElement - description: JSXElement + description?: JSXElement } export function DialogFooter(props: ParentProps) { @@ -46,7 +49,7 @@ export function DialogTitleGroup(props: DialogTitleGroupProps) { return (
{(t) => {t()}} - {description()} + {(value) => {value()}}
) } @@ -82,7 +85,19 @@ export function DialogHeader(props: DialogHeaderProps) { } export function Dialog(props: DialogProps) { - const [local] = splitProps(props, ["size", "variant", "class", "containerClass", "classList", "fit", "children"]) + const [local] = splitProps(props, [ + "size", + "variant", + "class", + "containerClass", + "classList", + "fit", + "children", + "onCloseAutoFocus", + "preventBackdropDismiss", + ]) + const layer = useDialogLayer() + createEffect(() => layer?.setBackdropDismiss(!local.preventBackdropDismiss)) return (
{ + if (local.preventBackdropDismiss) event.preventDefault() + }} classList={{ ...local.classList, [local.class ?? ""]: !!local.class,