@@ -586,7 +794,7 @@ function ProviderConnection(props: {
-
{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 (
-
-
+
)
}
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 (