refactor(app): remove configurable default server (#53731)

Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
This commit is contained in:
opencode-agent[bot]
2026-10-07 20:46:51 +08:00
committed by GitHub
Unverified
parent e1b7299bc9
commit 119cb15d1d
222 changed files with 49 additions and 891 deletions
@@ -56,7 +56,6 @@ export function mount(input: { server: string; route: string; direction: Directi
return (
<AppInterface
servers={[server]}
defaultServer={ServerConnection.key(server)}
canonicalLocalServer={ServerConnection.key(server)}
router={(props) => <MemoryRouter {...props} history={history} />}
>
@@ -241,11 +241,7 @@ export function mount(input: {
return (
<Show when={extensions.ready()}>
<AppInterface
servers={servers()}
defaultServer={ServerConnection.Key.make("sidecar")}
router={(props) => <MemoryRouter {...props} history={history} />}
/>
<AppInterface servers={servers()} router={(props) => <MemoryRouter {...props} history={history} />} />
</Show>
)
}
@@ -4,7 +4,6 @@ import { render } from "solid-js/web"
import type { Bridge } from "@opencode/gui-extensions/sdk/bridge"
import { AppBaseProviders, AppInterface } from "../../src/app"
import { PlatformProvider, type Platform } from "../../src/runtime/platform/platform"
import { ServerConnection } from "../../src/runtime/server/registry"
// The app on a Windows desktop platform, so the titlebar shows the app menu. Menu actions are listed in an output.
export function mount(input: { server: string }) {
@@ -59,7 +58,6 @@ export function mount(input: { server: string }) {
<output aria-label="Desktop menu actions">{store.actions.join(",")}</output>
<AppInterface
servers={[{ type: "sidecar", variant: "base", displayName: "Local Server", http: { url: input.server } }]}
defaultServer={ServerConnection.Key.make("sidecar")}
router={(props) => <MemoryRouter {...props} history={history} />}
/>
</AppBaseProviders>
+1 -6
View File
@@ -86,7 +86,6 @@ export function AppBaseProviders(
export function AppInterface(props: {
children?: JSX.Element
defaultServer?: ServerConnection.Key
canonicalLocalServer?: ServerConnection.Key
servers?: Array<ServerConnection.Any>
router?: Component<BaseRouterProps>
@@ -108,11 +107,7 @@ export function AppInterface(props: {
)
return (
<ServersProvider
defaultServer={props.defaultServer}
canonicalLocalServer={props.canonicalLocalServer}
servers={props.servers}
>
<ServersProvider canonicalLocalServer={props.canonicalLocalServer} servers={props.servers}>
<SettingsProvider>
<Dynamic component={props.router ?? Router} root={Root}>
<AppRoutes />
+1 -2
View File
@@ -16,7 +16,7 @@ import pkg from "../package.json"
import { ServerConnection } from "@/runtime/server/registry"
const getLocale = () => {
if (typeof navigator !== "object") return "en" as const
if (typeof navigator === "undefined") return "en" as const
const languages = navigator.languages?.length ? navigator.languages : [navigator.language]
for (const language of languages) {
@@ -101,7 +101,6 @@ if (root instanceof HTMLElement && root.dataset.opencodeMounted === undefined) {
<PlatformProvider value={web.platform}>
<AppBaseProviders locale={locale}>
<AppInterface
defaultServer={web.defaultServerUrl ? ServerConnection.Key.make(web.defaultServerUrl) : undefined}
canonicalLocalServer={server ? ServerConnection.key(server) : undefined}
servers={server ? [server] : []}
>
@@ -86,10 +86,6 @@ export function createHomeProjectsController(home: HomeController) {
const key = ServerConnection.key(conn)
setState("collapsed", key, !state().collapsed[key])
},
canDefault: serverManagement.defaults.available,
defaultKey: serverManagement.defaults.key,
setDefault: (conn: ServerConnection.Any | undefined) =>
serverManagement.defaults.set(conn ? ServerConnection.key(conn) : null),
canRemove: (conn: ServerConnection.Any) => serverManagement.connection.canRemove(ServerConnection.key(conn)),
remove: (conn: ServerConnection.Any) => serverManagement.connection.remove(ServerConnection.key(conn)),
canHide: (conn: ServerConnection.Any) => serverManagement.connection.canHide(ServerConnection.key(conn)),
@@ -19,8 +19,6 @@ export function HomeProjects(props: {
serverHealth={props.projects.server.health}
projectsForServer={props.projects.server.projects}
collapsed={props.projects.server.collapsed}
canDefaultServer={props.projects.server.canDefault()}
defaultServerKey={props.projects.server.defaultKey()}
canRevealProject={props.projects.project.canReveal}
unseenCount={props.projects.project.unseenCount}
onWheel={props.scroll.viewport.containWheel}
@@ -29,7 +27,6 @@ export function HomeProjects(props: {
onAuthenticateServer={props.projects.server.authenticate}
onToggleCollapsed={props.projects.server.toggleCollapsed}
onEditServer={props.projects.server.edit}
onSetDefaultServer={props.projects.server.setDefault}
canRemoveServer={props.projects.server.canRemove}
onRemoveServer={props.projects.server.remove}
canHideServer={props.projects.server.canHide}
-10
View File
@@ -52,8 +52,6 @@ export type HomeProjectsViewProps = {
serverHealth: (server: ServerConnection.Any) => ServerHealth | undefined
projectsForServer: (server: ServerConnection.Any) => LocalProject[]
collapsed: (server: ServerConnection.Any) => boolean
canDefaultServer: boolean
defaultServerKey: ServerConnection.Key | null | undefined
canRevealProject: (server: ServerConnection.Any) => boolean
unseenCount: (server: ServerConnection.Any, project: LocalProject) => number
onWheel: (event: WheelEvent) => void
@@ -62,7 +60,6 @@ export type HomeProjectsViewProps = {
onAuthenticateServer?: (server: ServerConnection.Any) => void
onToggleCollapsed: (server: ServerConnection.Any) => void
onEditServer: (server: ServerConnection.Http) => void
onSetDefaultServer: (server: ServerConnection.Any | undefined) => void
canRemoveServer: (server: ServerConnection.Any) => boolean
onRemoveServer: (server: ServerConnection.Any) => void
canHideServer: (server: ServerConnection.Any) => boolean
@@ -347,12 +344,9 @@ function HomeServerRow(props: {
language: HomeProjectsViewProps["language"]
projectsForServer: HomeProjectsViewProps["projectsForServer"]
contextMenuOpen: HomeProjectsContextMenuProps["contextMenuOpen"]
canDefaultServer: HomeProjectsViewProps["canDefaultServer"]
defaultServerKey: HomeProjectsViewProps["defaultServerKey"]
onFocusServer: HomeProjectsViewProps["onFocusServer"]
onToggleCollapsed: HomeProjectsViewProps["onToggleCollapsed"]
onEditServer: HomeProjectsViewProps["onEditServer"]
onSetDefaultServer: HomeProjectsViewProps["onSetDefaultServer"]
canRemoveServer: HomeProjectsViewProps["canRemoveServer"]
onRemoveServer: HomeProjectsViewProps["onRemoveServer"]
canHideServer: HomeProjectsViewProps["canHideServer"]
@@ -470,13 +464,9 @@ function HomeServerRow(props: {
<ServerRowMenuView
server={props.server}
labels={serverMenuLabels(props.language)}
canDefault={props.canDefaultServer}
isDefault={props.defaultServerKey === ServerConnection.key(props.server)}
canRemove={props.canRemoveServer(props.server)}
canHide={props.canHideServer(props.server)}
onEdit={props.onEditServer}
onSetDefault={() => props.onSetDefaultServer(props.server)}
onRemoveDefault={() => props.onSetDefaultServer(undefined)}
onRemove={() => props.onRemoveServer(props.server)}
onHide={() => props.onHideServer(props.server)}
open={props.contextMenuOpen(contextMenuID())}
-3
View File
@@ -285,9 +285,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "የይለፍ ቃል",
"dialog.server.edit.title": "አገልጋይ አርትዕ",
"dialog.server.menu.edit": "አርትዕ",
"dialog.server.menu.default": "ነባሪ አዘጋጅ",
"dialog.server.menu.defaultRemove": "ነባሪውን አስወግድ",
"dialog.server.status.default": "ነባሪ",
"dialog.project.edit.title": "ፕሮጀክት አርትዕ",
"dialog.project.edit.icon": "አዶ",
"dialog.project.edit.icon.alt": "የፕሮጀክት አዶ",
-3
View File
@@ -297,9 +297,6 @@ export const dict = {
"dialog.server.add.password": "كلمة المرور (اختياري)",
"dialog.server.edit.title": "تحرير الخادم",
"dialog.server.menu.edit": "تعديل",
"dialog.server.menu.default": "تعيين كافتراضي",
"dialog.server.menu.defaultRemove": "إزالة الافتراضي",
"dialog.server.status.default": "افتراضي",
"dialog.project.edit.title": "تحرير المشروع",
"dialog.project.edit.icon": "أيقونة",
"dialog.project.edit.icon.alt": "أيقونة المشروع",
-3
View File
@@ -288,9 +288,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "parol",
"dialog.server.edit.title": "Serveri redaktə et",
"dialog.server.menu.edit": "Redaktə et",
"dialog.server.menu.default": "Standart olaraq təyin et",
"dialog.server.menu.defaultRemove": "Standartı sil",
"dialog.server.status.default": "Standart",
"dialog.project.edit.title": "Layihəni redaktə et",
"dialog.project.edit.icon": "İkon",
"dialog.project.edit.icon.alt": "Layihə ikonu",
-3
View File
@@ -287,9 +287,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "парола",
"dialog.server.edit.title": "Редактиране на сървъра",
"dialog.server.menu.edit": "Редактиране",
"dialog.server.menu.default": "Задайте по подразбиране",
"dialog.server.menu.defaultRemove": "Премахване на подразбиране",
"dialog.server.status.default": "По подразбиране",
"dialog.project.edit.title": "Редактиране на проекта",
"dialog.project.edit.icon": "Икона",
"dialog.project.edit.icon.alt": "Икона на проекта",
-3
View File
@@ -290,9 +290,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "পাসওয়ার্ড",
"dialog.server.edit.title": "সার্ভার সম্পাদনা করুন",
"dialog.server.menu.edit": "সম্পাদনা করুন",
"dialog.server.menu.default": "ডিফল্ট হিসেবে সেট করুন",
"dialog.server.menu.defaultRemove": "ডিফল্ট সরান",
"dialog.server.status.default": "ডিফল্ট",
"dialog.project.edit.title": "প্রকল্প সম্পাদনা করুন",
"dialog.project.edit.icon": "আইকন",
"dialog.project.edit.icon.alt": "প্রকল্প আইকন",
-3
View File
@@ -508,9 +508,6 @@ export const dict = {
"dialog.server.add.password": "Senha (opcional)",
"dialog.server.edit.title": "Editar servidor",
"dialog.server.menu.edit": "Editar",
"dialog.server.menu.default": "Definir como padrão",
"dialog.server.menu.defaultRemove": "Remover padrão",
"dialog.server.status.default": "Padrão",
"dialog.project.edit.title": "Editar projeto",
"dialog.project.edit.icon": "Ícone",
"dialog.project.edit.icon.alt": "Ícone do projeto",
-3
View File
@@ -312,9 +312,6 @@ export const dict = {
"dialog.server.edit.title": "Uredi server",
"dialog.server.menu.edit": "Uredi",
"dialog.server.menu.default": "Postavi kao podrazumijevano",
"dialog.server.menu.defaultRemove": "Ukloni podrazumijevano",
"dialog.server.status.default": "Podrazumijevano",
"dialog.project.edit.title": "Uredi projekat",
"dialog.project.edit.icon": "Ikonica",
-3
View File
@@ -286,9 +286,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "contrasenya",
"dialog.server.edit.title": "Edita el servidor",
"dialog.server.menu.edit": "Edita",
"dialog.server.menu.default": "Estableix com a predeterminat",
"dialog.server.menu.defaultRemove": "Elimina el valor predeterminat",
"dialog.server.status.default": "Per defecte",
"dialog.project.edit.title": "Edita el projecte",
"dialog.project.edit.icon": "Icona",
"dialog.project.edit.icon.alt": "Icona del projecte",
-3
View File
@@ -286,9 +286,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "heslo",
"dialog.server.edit.title": "Upravit server",
"dialog.server.menu.edit": "Upravit",
"dialog.server.menu.default": "Nastavit jako výchozí",
"dialog.server.menu.defaultRemove": "Odebrat výchozí",
"dialog.server.status.default": "Výchozí",
"dialog.project.edit.title": "Upravit projekt",
"dialog.project.edit.icon": "ikona",
"dialog.project.edit.icon.alt": "Ikona projektu",
-3
View File
@@ -446,9 +446,6 @@ export const dict = {
"dialog.server.edit.title": "Rediger server",
"dialog.server.menu.edit": "Rediger",
"dialog.server.menu.default": "Sæt som standard",
"dialog.server.menu.defaultRemove": "Fjern som standard",
"dialog.server.status.default": "Standard",
"dialog.project.edit.title": "Rediger projekt",
"dialog.project.edit.icon": "Ikon",
-3
View File
@@ -442,9 +442,6 @@ export const dict = {
"dialog.server.add.password": "Passwort (optional)",
"dialog.server.edit.title": "Server bearbeiten",
"dialog.server.menu.edit": "Bearbeiten",
"dialog.server.menu.default": "Als Standard festlegen",
"dialog.server.menu.defaultRemove": "Standard entfernen",
"dialog.server.status.default": "Standard",
"dialog.project.edit.title": "Projekt bearbeiten",
"dialog.project.edit.icon": "Symbol",
"dialog.project.edit.icon.alt": "Projektsymbol",
-3
View File
@@ -292,9 +292,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "ޕާސްވަރޑް",
"dialog.server.edit.title": "އެޑިޓް ސަރވަރ",
"dialog.server.menu.edit": "ބަދަލު ގެނައުން",
"dialog.server.menu.default": "ޑިފޯލްޓް ގޮތުގައި ސެޓްކުރުން",
"dialog.server.menu.defaultRemove": "ޑިފޯލްޓް ނައްތާލާށެވެ",
"dialog.server.status.default": "ޑީފޯލްޓް",
"dialog.project.edit.title": "އެޑިޓް ޕްރޮޖެކްޓް",
"dialog.project.edit.icon": "އައިކޮން",
"dialog.project.edit.icon.alt": "ޕްރޮޖެކްޓް އައިކޮން",
-3
View File
@@ -298,9 +298,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "གསང༌ཨང",
"dialog.server.edit.title": "སར་བར་ཞུན་དག་འབད།",
"dialog.server.menu.edit": "ཞུན༌དག",
"dialog.server.menu.default": "སྔོན་སྒྲིག་སྦེ་གཞི་སྒྲིག་འབད།",
"dialog.server.menu.defaultRemove": "སྔོན་སྒྲིག་རྩ་བསྐྲད་གཏང་།",
"dialog.server.status.default": "འཐུས་ཤོར",
"dialog.project.edit.title": "ཞུན་དག་ལས་གཞི།",
"dialog.project.edit.icon": "ངོས་དཔར།",
"dialog.project.edit.icon.alt": "ལས་འགུལ་ངོས་དཔར།",
-3
View File
@@ -288,9 +288,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "κωδικός πρόσβασης",
"dialog.server.edit.title": "Επεξεργασία διακομιστή",
"dialog.server.menu.edit": "Επεξεργασία",
"dialog.server.menu.default": "Ορισμός ως προεπιλογή",
"dialog.server.menu.defaultRemove": "Κατάργηση προεπιλογής",
"dialog.server.status.default": "Προεπιλογή",
"dialog.project.edit.title": "Επεξεργασία έργου",
"dialog.project.edit.icon": "Εικονίδιο",
"dialog.project.edit.icon.alt": "Εικονίδιο έργου",
-3
View File
@@ -378,12 +378,9 @@ export const dict = {
"Your sign-in for this server is no longer valid. Paste a new pairing link, or enter the server password.",
"dialog.server.menu.edit": "Edit",
"dialog.server.menu.default": "Set as default",
"dialog.server.menu.defaultRemove": "Remove default",
"dialog.server.menu.remove": "Remove",
"dialog.server.menu.hide": "Hide from project list",
"dialog.server.menu.show": "Show in project list",
"dialog.server.status.default": "Default",
"server.row.incompatible":
"This server is running OpenCode {{version}}, which isn't compatible with this app. Upgrade it to OpenCode V2 to continue.",
-3
View File
@@ -535,9 +535,6 @@ export const dict = {
"dialog.server.edit.title": "Editar servidor",
"dialog.server.menu.edit": "Editar",
"dialog.server.menu.default": "Establecer como predeterminado",
"dialog.server.menu.defaultRemove": "Quitar como predeterminado",
"dialog.server.status.default": "Predeterminado",
"dialog.project.edit.title": "Editar proyecto",
"dialog.project.edit.icon": "Icono",
-3
View File
@@ -285,9 +285,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "parool",
"dialog.server.edit.title": "Muuda serverit",
"dialog.server.menu.edit": "Muuda",
"dialog.server.menu.default": "Määra vaikeväärtuseks",
"dialog.server.menu.defaultRemove": "Eemalda vaikeseade",
"dialog.server.status.default": "Vaikimisi",
"dialog.project.edit.title": "Redigeeri projekti",
"dialog.project.edit.icon": "Ikoon",
"dialog.project.edit.icon.alt": "Projekti ikoon",
-3
View File
@@ -295,9 +295,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "رمز عبور",
"dialog.server.edit.title": "ویرایش سرور",
"dialog.server.menu.edit": "ویرایش کنید",
"dialog.server.menu.default": "به عنوان پیش فرض تنظیم کنید",
"dialog.server.menu.defaultRemove": "حذف پیش فرض",
"dialog.server.status.default": "پیش فرض",
"dialog.project.edit.title": "ویرایش پروژه",
"dialog.project.edit.icon": "نماد",
"dialog.project.edit.icon.alt": "نماد پروژه",
-3
View File
@@ -424,9 +424,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "salasana",
"dialog.server.edit.title": "Muokkaa palvelinta",
"dialog.server.menu.edit": "Muokkaa",
"dialog.server.menu.default": "Aseta oletukseksi",
"dialog.server.menu.defaultRemove": "Poista oletuspalvelin",
"dialog.server.status.default": "Oletus",
"dialog.project.edit.title": "Muokkaa projektia",
"dialog.project.edit.icon": "Kuvake",
"dialog.project.edit.icon.alt": "Projektikuvake",
-3
View File
@@ -285,9 +285,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "loyniorð",
"dialog.server.edit.title": "Rætta ambætara",
"dialog.server.menu.edit": "Rætta",
"dialog.server.menu.default": "Set sum forsett",
"dialog.server.menu.defaultRemove": "Strika forsett",
"dialog.server.status.default": "Forsett",
"dialog.project.edit.title": "Rætta verkætlan",
"dialog.project.edit.icon": "Ikon",
"dialog.project.edit.icon.alt": "Verkætlanarmerki",
-3
View File
@@ -516,9 +516,6 @@ export const dict = {
"dialog.server.add.password": "Mot de passe (optionnel)",
"dialog.server.edit.title": "Modifier le serveur",
"dialog.server.menu.edit": "Modifier",
"dialog.server.menu.default": "Définir par défaut",
"dialog.server.menu.defaultRemove": "Ne plus utiliser par défaut",
"dialog.server.status.default": "Défaut",
"dialog.project.edit.title": "Modifier le projet",
"dialog.project.edit.icon": "Icône",
"dialog.project.edit.icon.alt": "Icône du projet",
-3
View File
@@ -294,9 +294,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "סיסמה",
"dialog.server.edit.title": "ערוך שרת",
"dialog.server.menu.edit": "ערוך",
"dialog.server.menu.default": "הגדר כברירת מחדל",
"dialog.server.menu.defaultRemove": "הסר את ברירת המחדל",
"dialog.server.status.default": "ברירת מחדל",
"dialog.project.edit.title": "ערוך פרויקט",
"dialog.project.edit.icon": "סמל",
"dialog.project.edit.icon.alt": "סמל פרויקט",
-3
View File
@@ -292,9 +292,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "पासवर्ड",
"dialog.server.edit.title": "सर्वर संपादित करें",
"dialog.server.menu.edit": "संपादित करें",
"dialog.server.menu.default": "डिफाल्ट के रूप में सेट",
"dialog.server.menu.defaultRemove": "डिफ़ॉल्ट हटाएँ",
"dialog.server.status.default": "डिफ़ॉल्ट",
"dialog.project.edit.title": "प्रोजेक्ट संपादित करें",
"dialog.project.edit.icon": "आइकन",
"dialog.project.edit.icon.alt": "प्रोजेक्ट आइकन",
-3
View File
@@ -298,9 +298,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "lozinka",
"dialog.server.edit.title": "Uredi poslužitelj",
"dialog.server.menu.edit": "Uredi",
"dialog.server.menu.default": "Postavi kao zadano",
"dialog.server.menu.defaultRemove": "Ukloni zadano",
"dialog.server.status.default": "Zadano",
"dialog.project.edit.title": "Uredi projekt",
"dialog.project.edit.icon": "Ikona",
"dialog.project.edit.icon.alt": "Ikona projekta",
-3
View File
@@ -298,9 +298,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "jelszó",
"dialog.server.edit.title": "Szerver szerkesztése",
"dialog.server.menu.edit": "Szerkesztés",
"dialog.server.menu.default": "Beállítás alapértelmezettként",
"dialog.server.menu.defaultRemove": "Alapértelmezés eltávolítása",
"dialog.server.status.default": "Alapértelmezett",
"dialog.project.edit.title": "Projekt szerkesztése",
"dialog.project.edit.icon": "Ikon",
"dialog.project.edit.icon.alt": "Projekt ikonra",
-3
View File
@@ -287,9 +287,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "գաղտնաբառ",
"dialog.server.edit.title": "Խմբագրել սերվերը",
"dialog.server.menu.edit": "Խմբագրել",
"dialog.server.menu.default": "Սահմանել որպես լռելյայն",
"dialog.server.menu.defaultRemove": "Հեռացնել լռելյայն",
"dialog.server.status.default": "Լռելյայն",
"dialog.project.edit.title": "Խմբագրել նախագիծը",
"dialog.project.edit.icon": "Պատկերակ",
"dialog.project.edit.icon.alt": "Նախագծի պատկերակ",
-3
View File
@@ -323,9 +323,6 @@ export const dict = {
"dialog.server.edit.title": "Sunting server",
"dialog.server.menu.edit": "Sunting",
"dialog.server.menu.default": "Tetapkan sebagai bawaan",
"dialog.server.menu.defaultRemove": "Hapus bawaan",
"dialog.server.status.default": "Bawaan",
"dialog.project.edit.title": "Sunting proyek",
"dialog.project.edit.icon": "Ikon",
-3
View File
@@ -298,9 +298,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "lykilorð",
"dialog.server.edit.title": "Breyta miðlara",
"dialog.server.menu.edit": "Breyta",
"dialog.server.menu.default": "Stillt sem sjálfgefið",
"dialog.server.menu.defaultRemove": "Fjarlægja sjálfgefið",
"dialog.server.status.default": "Sjálfgefið",
"dialog.project.edit.title": "Breyta verkefni",
"dialog.project.edit.icon": "Táknmynd",
"dialog.project.edit.icon.alt": "Verkefnistákn",
-3
View File
@@ -446,9 +446,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "password",
"dialog.server.edit.title": "Modifica server",
"dialog.server.menu.edit": "Modifica",
"dialog.server.menu.default": "Imposta come predefinito",
"dialog.server.menu.defaultRemove": "Rimuovi predefinito",
"dialog.server.status.default": "Predefinito",
"dialog.project.edit.title": "Modifica progetto",
"dialog.project.edit.icon": "Icona",
"dialog.project.edit.icon.alt": "Icona del progetto",
-3
View File
@@ -296,9 +296,6 @@ export const dict = {
"dialog.server.add.password": "パスワード (オプション)",
"dialog.server.edit.title": "サーバーを編集",
"dialog.server.menu.edit": "編集",
"dialog.server.menu.default": "デフォルトに設定",
"dialog.server.menu.defaultRemove": "デフォルト設定を解除",
"dialog.server.status.default": "デフォルト",
"dialog.project.edit.title": "プロジェクトを編集",
"dialog.project.edit.icon": "アイコン",
-3
View File
@@ -286,9 +286,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "პაროლი",
"dialog.server.edit.title": "სერვერის რედაქტირება",
"dialog.server.menu.edit": "რედაქტირება",
"dialog.server.menu.default": "დაყენება ნაგულისხმევად",
"dialog.server.menu.defaultRemove": "ნაგულისხმევის ამოღება",
"dialog.server.status.default": "ნაგულისხმევი",
"dialog.project.edit.title": "პროექტის რედაქტირება",
"dialog.project.edit.icon": "ხატულა",
"dialog.project.edit.icon.alt": "პროექტის ხატულა",
-3
View File
@@ -293,9 +293,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "ពាក្យសម្ងាត់",
"dialog.server.edit.title": "កែសម្រួលម៉ាស៊ីនមេ",
"dialog.server.menu.edit": "កែសម្រួល",
"dialog.server.menu.default": "កំណត់ជាលំនាំដើម",
"dialog.server.menu.defaultRemove": "លុបលំនាំដើមចេញ",
"dialog.server.status.default": "លំនាំដើម",
"dialog.project.edit.title": "កែសម្រួលគម្រោង",
"dialog.project.edit.icon": "រូបតំណាង",
"dialog.project.edit.icon.alt": "រូបតំណាងគម្រោង",
-3
View File
@@ -218,9 +218,6 @@ export const dict = {
"dialog.server.add.password": "비밀번호 (선택 사항)",
"dialog.server.edit.title": "서버 편집",
"dialog.server.menu.edit": "편집",
"dialog.server.menu.default": "기본값으로 설정",
"dialog.server.menu.defaultRemove": "기본값 제거",
"dialog.server.status.default": "기본값",
"dialog.project.edit.title": "프로젝트 편집",
"dialog.project.edit.icon": "아이콘",
"dialog.project.edit.icon.alt": "프로젝트 아이콘",
-3
View File
@@ -293,9 +293,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "ລະຫັດຜ່ານ",
"dialog.server.edit.title": "ແກ້ໄຂເຊີບເວີ",
"dialog.server.menu.edit": "ແກ້ໄຂ",
"dialog.server.menu.default": "ຕັ້ງເປັນຄ່າເລີ່ມຕົ້ນ",
"dialog.server.menu.defaultRemove": "ເອົາຄ່າເລີ່ມຕົ້ນ",
"dialog.server.status.default": "ຄ່າເລີ່ມຕົ້ນ",
"dialog.project.edit.title": "ແກ້ໄຂໂຄງການ",
"dialog.project.edit.icon": "ໄອຄອນ",
"dialog.project.edit.icon.alt": "ໄອຄອນໂຄງການ",
-3
View File
@@ -299,9 +299,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "slaptažodis",
"dialog.server.edit.title": "Redaguoti serverį",
"dialog.server.menu.edit": "Redaguoti",
"dialog.server.menu.default": "Nustatyti kaip numatytąjį",
"dialog.server.menu.defaultRemove": "Pašalinti numatytąjį",
"dialog.server.status.default": "Numatytoji",
"dialog.project.edit.title": "Redaguoti projektą",
"dialog.project.edit.icon": "Piktograma",
"dialog.project.edit.icon.alt": "Projekto piktograma",
-3
View File
@@ -286,9 +286,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "parole",
"dialog.server.edit.title": "Rediģēt serveri",
"dialog.server.menu.edit": "Rediģēt",
"dialog.server.menu.default": "Iestatīt kā noklusējumu",
"dialog.server.menu.defaultRemove": "Noņemt noklusējumu",
"dialog.server.status.default": "Noklusējuma",
"dialog.project.edit.title": "Rediģēt projektu",
"dialog.project.edit.icon": "Ikona",
"dialog.project.edit.icon.alt": "Projekta ikona",
-3
View File
@@ -287,9 +287,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "лозинка",
"dialog.server.edit.title": "Уреди сервер",
"dialog.server.menu.edit": "Уреди",
"dialog.server.menu.default": "Поставете како стандардно",
"dialog.server.menu.defaultRemove": "Отстрани стандардно",
"dialog.server.status.default": "Стандардно",
"dialog.project.edit.title": "Уреди проект",
"dialog.project.edit.icon": "Икона",
"dialog.project.edit.icon.alt": "Икона на проектот",
-3
View File
@@ -287,9 +287,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "нууц үг",
"dialog.server.edit.title": "Сервер засах",
"dialog.server.menu.edit": "Засварлах",
"dialog.server.menu.default": "Өгөгдмөл болгож тохируулах",
"dialog.server.menu.defaultRemove": "Өгөгдмөлийг арилгах",
"dialog.server.status.default": "Өгөгдмөл",
"dialog.project.edit.title": "Төслийг засварлах",
"dialog.project.edit.icon": "Дүрс",
"dialog.project.edit.icon.alt": "Төслийн дүрс тэмдэг",
-3
View File
@@ -295,9 +295,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "kata laluan",
"dialog.server.edit.title": "Edit pelayan",
"dialog.server.menu.edit": "Sunting",
"dialog.server.menu.default": "Tetapkan sebagai lalai",
"dialog.server.menu.defaultRemove": "Buang lalai",
"dialog.server.status.default": "Lalai",
"dialog.project.edit.title": "Edit projek",
"dialog.project.edit.icon": "Ikon",
"dialog.project.edit.icon.alt": "Ikon projek",
-3
View File
@@ -296,9 +296,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "စကားဝှက်",
"dialog.server.edit.title": "ဆာဗာကို တည်းဖြတ်ပါ။",
"dialog.server.menu.edit": "တည်းဖြတ်ရန်",
"dialog.server.menu.default": "မူရင်းအဖြစ် သတ်မှတ်ပါ။",
"dialog.server.menu.defaultRemove": "မူရင်းကို ဖယ်ရှားပါ။",
"dialog.server.status.default": "မူရင်း",
"dialog.project.edit.title": "ပရောဂျက်ကို တည်းဖြတ်ပါ။",
"dialog.project.edit.icon": "သင်္ကေတ",
"dialog.project.edit.icon.alt": "ပရောဂျက် သင်္ကေတ",
-3
View File
@@ -291,9 +291,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "पासवर्ड",
"dialog.server.edit.title": "सर्भर सम्पादन गर्नुहोस्",
"dialog.server.menu.edit": "सम्पादन गर्नुहोस्",
"dialog.server.menu.default": "पूर्वनिर्धारित रूपमा सेट गर्नुहोस्",
"dialog.server.menu.defaultRemove": "पूर्वनिर्धारित हटाउनुहोस्",
"dialog.server.status.default": "पूर्वनिर्धारित",
"dialog.project.edit.title": "परियोजना सम्पादन गर्नुहोस्",
"dialog.project.edit.icon": "आइकन",
"dialog.project.edit.icon.alt": "परियोजना आइकन",
-3
View File
@@ -498,9 +498,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "wachtwoord",
"dialog.server.edit.title": "Server bewerken",
"dialog.server.menu.edit": "Bewerken",
"dialog.server.menu.default": "Als standaard instellen",
"dialog.server.menu.defaultRemove": "Standaard verwijderen",
"dialog.server.status.default": "Standaard",
"dialog.project.edit.title": "Project bewerken",
"dialog.project.edit.icon": "Pictogram",
"dialog.project.edit.icon.alt": "Projectpictogram",
-3
View File
@@ -507,9 +507,6 @@ export const dict = {
"dialog.server.edit.title": "Rediger server",
"dialog.server.menu.edit": "Rediger",
"dialog.server.menu.default": "Sett som standard",
"dialog.server.menu.defaultRemove": "Fjern standard",
"dialog.server.status.default": "Standard",
"dialog.project.edit.title": "Rediger prosjekt",
"dialog.project.edit.icon": "Ikon",
-3
View File
@@ -293,9 +293,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "پاس ورڈ",
"dialog.server.edit.title": "سرور وچ ترمیم کرو",
"dialog.server.menu.edit": "ترمیم کرو",
"dialog.server.menu.default": "ڈیفالٹ دے طور تے سیٹ کرو",
"dialog.server.menu.defaultRemove": "ڈیفالٹ ہٹاؤ",
"dialog.server.status.default": "طے شدہ",
"dialog.project.edit.title": "پروجیکٹ وچ ترمیم کرو",
"dialog.project.edit.icon": "آئکن",
"dialog.project.edit.icon.alt": "پروجیکٹ آئیکن",
-3
View File
@@ -289,9 +289,6 @@ export const dict = {
"dialog.server.add.password": "Hasło (opcjonalnie)",
"dialog.server.edit.title": "Edytuj serwer",
"dialog.server.menu.edit": "Edytuj",
"dialog.server.menu.default": "Ustaw jako domyślny",
"dialog.server.menu.defaultRemove": "Usuń domyślny",
"dialog.server.status.default": "Domyślny",
"dialog.project.edit.title": "Edytuj projekt",
"dialog.project.edit.icon": "Ikona",
"dialog.project.edit.icon.alt": "Ikona projektu",
-3
View File
@@ -285,9 +285,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "parolă",
"dialog.server.edit.title": "Editează server",
"dialog.server.menu.edit": "Editează",
"dialog.server.menu.default": "Setează ca implicit",
"dialog.server.menu.defaultRemove": "Elimină implicitul",
"dialog.server.status.default": "Implicit",
"dialog.project.edit.title": "Editează proiectul",
"dialog.project.edit.icon": "Pictogramă",
"dialog.project.edit.icon.alt": "Pictograma proiectului",
-3
View File
@@ -311,9 +311,6 @@ export const dict = {
"dialog.server.edit.title": "Редактировать сервер",
"dialog.server.menu.edit": "Редактировать",
"dialog.server.menu.default": "Сделать по умолчанию",
"dialog.server.menu.defaultRemove": "Отменить выбор по умолчанию",
"dialog.server.status.default": "По умолч.",
"dialog.project.edit.title": "Редактировать проект",
"dialog.project.edit.icon": "Значок",
-3
View File
@@ -289,9 +289,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "මුරපදය",
"dialog.server.edit.title": "සේවාදායකය සංස්කරණය කරන්න",
"dialog.server.menu.edit": "සංස්කරණය කරන්න",
"dialog.server.menu.default": "පෙරනිමිය ලෙස සකසන්න",
"dialog.server.menu.defaultRemove": "පෙරනිමිය ඉවත් කරන්න",
"dialog.server.status.default": "පෙරනිමිය",
"dialog.project.edit.title": "ව්‍යාපෘතිය සංස්කරණය කරන්න",
"dialog.project.edit.icon": "නිරූපකය",
"dialog.project.edit.icon.alt": "ව්යාපෘති නිරූපකය",
-3
View File
@@ -311,9 +311,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "heslo",
"dialog.server.edit.title": "Upraviť server",
"dialog.server.menu.edit": "Upraviť",
"dialog.server.menu.default": "Nastaviť ako predvolený",
"dialog.server.menu.defaultRemove": "Odstrániť predvolený",
"dialog.server.status.default": "Predvolený",
"dialog.project.edit.title": "Upraviť projekt",
"dialog.project.edit.icon": "Ikona",
"dialog.project.edit.icon.alt": "Ikona projektu",
-3
View File
@@ -311,9 +311,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "geslo",
"dialog.server.edit.title": "Uredi strežnik",
"dialog.server.menu.edit": "Uredi",
"dialog.server.menu.default": "Nastavi kot privzeto",
"dialog.server.menu.defaultRemove": "Odstrani privzeto",
"dialog.server.status.default": "Privzeto",
"dialog.project.edit.title": "Uredi projekt",
"dialog.project.edit.icon": "Ikona",
"dialog.project.edit.icon.alt": "Ikona projekta",
-3
View File
@@ -286,9 +286,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "fjalëkalimin",
"dialog.server.edit.title": "Redakto serverin",
"dialog.server.menu.edit": "Redakto",
"dialog.server.menu.default": "Cakto si parazgjedhje",
"dialog.server.menu.defaultRemove": "Hiq parazgjedhjen",
"dialog.server.status.default": "E paracaktuar",
"dialog.project.edit.title": "Redakto projektin",
"dialog.project.edit.icon": "Ikona",
"dialog.project.edit.icon.alt": "Ikona e projektit",
-3
View File
@@ -299,9 +299,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "лозинка",
"dialog.server.edit.title": "Уреди сервер",
"dialog.server.menu.edit": "Уреди",
"dialog.server.menu.default": "Подесите као подразумевано",
"dialog.server.menu.defaultRemove": "Уклони подразумевано",
"dialog.server.status.default": "подразумевано",
"dialog.project.edit.title": "Уреди пројекат",
"dialog.project.edit.icon": "Икона",
"dialog.project.edit.icon.alt": "икона пројекта",
-3
View File
@@ -491,9 +491,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "lösenord",
"dialog.server.edit.title": "Redigera server",
"dialog.server.menu.edit": "Redigera",
"dialog.server.menu.default": "Ställ in som standard",
"dialog.server.menu.defaultRemove": "Ta bort standard",
"dialog.server.status.default": "Standard",
"dialog.project.edit.title": "Redigera projekt",
"dialog.project.edit.icon": "Ikon",
"dialog.project.edit.icon.alt": "Projektikonen",
-3
View File
@@ -287,9 +287,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "парол",
"dialog.server.edit.title": "Серверро таҳрир кунед",
"dialog.server.menu.edit": "Таҳрир",
"dialog.server.menu.default": "Ҳамчун пешфарз таъин кунед",
"dialog.server.menu.defaultRemove": "Пешфарзро хориҷ кунед",
"dialog.server.status.default": "Пешфарз",
"dialog.project.edit.title": "Таҳрири лоиҳа",
"dialog.project.edit.icon": "Нишона",
"dialog.project.edit.icon.alt": "Нишонаи лоиҳа",
-3
View File
@@ -319,9 +319,6 @@ export const dict = {
"dialog.server.edit.title": "แก้ไขเซิร์ฟเวอร์",
"dialog.server.menu.edit": "แก้ไข",
"dialog.server.menu.default": "ตั้งเป็นค่าเริ่มต้น",
"dialog.server.menu.defaultRemove": "เอาค่าเริ่มต้นออก",
"dialog.server.status.default": "ค่าเริ่มต้น",
"dialog.project.edit.title": "แก้ไขโปรเจกต์",
"dialog.project.edit.icon": "ไอคอน",
-3
View File
@@ -286,9 +286,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "parol",
"dialog.server.edit.title": "Serweri redaktirläň",
"dialog.server.menu.edit": "Redaktirläň",
"dialog.server.menu.default": "Dymmaklyk hökmünde düzüň",
"dialog.server.menu.defaultRemove": "Dymmaklygy aýyryň",
"dialog.server.status.default": "Bellenen",
"dialog.project.edit.title": "Taslamany redaktirläň",
"dialog.project.edit.icon": "Nyşan",
"dialog.project.edit.icon.alt": "Taslamanyň nyşany",
-3
View File
@@ -324,9 +324,6 @@ export const dict = {
"dialog.server.edit.title": "Sunucuyu düzenle",
"dialog.server.menu.edit": "Düzenle",
"dialog.server.menu.default": "Varsayılan olarak ayarla",
"dialog.server.menu.defaultRemove": "Varsayılanı kaldır",
"dialog.server.status.default": "Varsayılan",
"dialog.project.edit.title": "Projeyi düzenle",
"dialog.project.edit.icon": "Simge",
-3
View File
@@ -341,9 +341,6 @@ export const dict = {
"dialog.server.edit.title": "Редагувати сервер",
"dialog.server.menu.edit": "Редагувати",
"dialog.server.menu.default": "Встановити за замовчуванням",
"dialog.server.menu.defaultRemove": "Скасувати використання за замовчуванням",
"dialog.server.status.default": "За замовчуванням",
"dialog.project.edit.title": "Редагувати проєкт",
"dialog.project.edit.icon": "Іконка",
-3
View File
@@ -295,9 +295,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "پاس ورڈ",
"dialog.server.edit.title": "سرور میں ترمیم کریں۔",
"dialog.server.menu.edit": "ترمیم کریں۔",
"dialog.server.menu.default": "بطور ڈیفالٹ سیٹ کریں۔",
"dialog.server.menu.defaultRemove": "ڈیفالٹ کو ہٹا دیں۔",
"dialog.server.status.default": "طے شدہ",
"dialog.project.edit.title": "پروجیکٹ میں ترمیم کریں۔",
"dialog.project.edit.icon": "آئیکن",
"dialog.project.edit.icon.alt": "پروجیکٹ کا آئیکن",
-3
View File
@@ -287,9 +287,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "parol",
"dialog.server.edit.title": "Serverni tahrirlash",
"dialog.server.menu.edit": "Tahrirlash",
"dialog.server.menu.default": "Standart sifatida o'rnating",
"dialog.server.menu.defaultRemove": "Standartni olib tashlang",
"dialog.server.status.default": "Standart",
"dialog.project.edit.title": "Loyihani tahrirlash",
"dialog.project.edit.icon": "Belgi",
"dialog.project.edit.icon.alt": "Loyiha belgisi",
-3
View File
@@ -299,9 +299,6 @@ export const dict = {
"dialog.server.add.passwordPlaceholder": "mật khẩu",
"dialog.server.edit.title": "Chỉnh sửa máy chủ",
"dialog.server.menu.edit": "Chỉnh sửa",
"dialog.server.menu.default": "Đặt làm mặc định",
"dialog.server.menu.defaultRemove": "Xóa mặc định",
"dialog.server.status.default": "Mặc định",
"dialog.project.edit.title": "Chỉnh sửa dự án",
"dialog.project.edit.icon": "Biểu tượng",
"dialog.project.edit.icon.alt": "Biểu tượng dự án",
-3
View File
@@ -336,9 +336,6 @@ export const dict = {
"dialog.server.add.password": "密码(可选)",
"dialog.server.edit.title": "编辑服务器",
"dialog.server.menu.edit": "编辑",
"dialog.server.menu.default": "设为默认",
"dialog.server.menu.defaultRemove": "取消默认",
"dialog.server.status.default": "默认",
"dialog.project.edit.title": "编辑项目",
"dialog.project.edit.icon": "图标",
-3
View File
@@ -321,9 +321,6 @@ export const dict = {
"dialog.server.edit.title": "編輯伺服器",
"dialog.server.menu.edit": "編輯",
"dialog.server.menu.default": "設為預設",
"dialog.server.menu.defaultRemove": "取消預設",
"dialog.server.status.default": "預設",
"dialog.project.edit.title": "編輯專案",
"dialog.project.edit.icon": "圖示",
@@ -2,7 +2,6 @@ import { createSimpleContext } from "@opencode/ui/context"
import type { AsyncStorage, SyncStorage } from "@solid-primitives/storage"
import type { Accessor } from "solid-js"
import type { DesktopMenuAction } from "@/shell/commands/desktop-menu"
import { ServerConnection } from "@/runtime/server/registry"
import type { DraftStore } from "@/runtime/persistence/drafts"
import type { Bridge } from "@opencode/gui-extensions/sdk/bridge"
@@ -81,12 +80,6 @@ type PlatformBase = {
/** Fetch override */
fetch?: typeof fetch
/** Get the configured default server URL (platform-specific) */
getDefaultServer?(): Promise<ServerConnection.Key | null>
/** Set the default server URL to use on app startup (platform-specific) */
setDefaultServer?(url: ServerConnection.Key | null): Promise<void> | void
/** Webview zoom level (desktop only) */
webviewZoom?: Accessor<number>
+1 -40
View File
@@ -1,13 +1,7 @@
import { createBrowserDraftStore } from "@/runtime/persistence/drafts"
import { ServerConnection } from "@/runtime/server/registry"
import type { Platform } from "./platform"
const DEFAULT_SERVER_URL_KEY = "opencode.settings.dat:defaultServerUrl"
export function createWebPlatform(version: string) {
const currentServerUrl = getCurrentServerUrl()
const storedServerUrl = readDefaultServerUrl()
const platform: Platform = {
platform: "web",
draftStore: createBrowserDraftStore(),
@@ -43,18 +37,11 @@ export function createWebPlatform(version: string) {
notification.close()
}
},
getDefaultServer: async () => {
const stored = readDefaultServerUrl()
return stored ? ServerConnection.Key.make(stored) : null
},
setDefaultServer: writeDefaultServerUrl,
}
return {
platform,
currentServerUrl,
defaultServerUrl: storedServerUrl ?? currentServerUrl,
currentServerUrl: getCurrentServerUrl(),
}
}
@@ -72,29 +59,3 @@ function getCurrentServerUrl() {
return location.origin
}
function readDefaultServerUrl() {
if (typeof localStorage === "undefined") return null
try {
return localStorage.getItem(DEFAULT_SERVER_URL_KEY)
} catch {
return null
}
}
function writeDefaultServerUrl(value: string | null) {
if (typeof localStorage === "undefined") return
try {
if (value !== null) {
localStorage.setItem(DEFAULT_SERVER_URL_KEY, value)
return
}
localStorage.removeItem(DEFAULT_SERVER_URL_KEY)
} catch {
return
}
}
+1 -5
View File
@@ -214,11 +214,7 @@ export namespace ServerConnection {
export const { use: useServers, provider: ServersProvider } = createSimpleContext({
name: "Server",
gate: true,
init: (props: {
defaultServer?: ServerConnection.Key
canonicalLocalServer?: ServerConnection.Key
servers?: Array<ServerConnection.Any>
}) => {
init: (props: { canonicalLocalServer?: ServerConnection.Key; servers?: Array<ServerConnection.Any> }) => {
const [store, setStore, _, hydrated] = persisted(
{
...Persist.global("server"),
@@ -5,21 +5,19 @@ import { sortServerConnections } from "./controller"
const server = (url: string): ServerConnection.Http => ({ type: "http", http: { url } })
describe("sortServerConnections", () => {
test("places the default first and preserves health and insertion ordering", () => {
test("orders by health and preserves insertion ordering", () => {
const first = server("http://first")
const offline = server("http://offline")
const preferred = server("http://preferred")
const unknown = server("http://unknown")
const result = sortServerConnections({
servers: [first, offline, preferred, unknown],
servers: [first, offline, unknown],
health: {
[ServerConnection.key(first)]: { healthy: true },
[ServerConnection.key(offline)]: { healthy: false },
},
defaultKey: ServerConnection.key(preferred),
})
expect(result).toEqual([preferred, first, unknown, offline])
expect(result).toEqual([first, unknown, offline])
})
})
@@ -1,58 +1,15 @@
import { createMemo, createResource } from "solid-js"
import { createMemo } from "solid-js"
import { useGlobal } from "@/runtime/server/runtime"
import { useLanguage } from "@/runtime/i18n/language"
import { usePlatform } from "@/runtime/platform/platform"
import { ServerConnection, useServers } from "@/runtime/server/registry"
import { useTabs } from "@/shell/tabs/tabs"
import { type ServerHealth } from "@/runtime/server/health"
import { showToast } from "@/shell/notifications/toast"
import { useExtensionServers } from "@/runtime/extension/servers"
function showRequestError(language: ReturnType<typeof useLanguage>, err: unknown) {
showToast({
variant: "error",
title: language.t("common.requestFailed"),
description: err instanceof Error ? err.message : String(err),
})
}
function useDefaultServer() {
const language = useLanguage()
const platform = usePlatform()
const [defaultKey, defaultKeyActions] = createResource(
async () => {
try {
return (await platform.getDefaultServer?.()) ?? null
} catch (err) {
showRequestError(language, err)
return null
}
},
{ initialValue: null },
)
const set = async (key: ServerConnection.Key | null) => {
try {
await platform.setDefaultServer?.(key)
defaultKeyActions.mutate(key)
} catch (err) {
showRequestError(language, err)
}
}
return {
key: () => defaultKey.latest,
available: createMemo(() => !!platform.getDefaultServer && !!platform.setDefaultServer),
set,
}
}
export function sortServerConnections(input: {
servers: ServerConnection.Any[]
health: Record<string, ServerHealth | undefined>
defaultKey: ServerConnection.Key | null
}) {
const order = new Map(input.servers.map((item, index) => [item, index] as const))
@@ -65,10 +22,6 @@ export function sortServerConnections(input: {
}
return input.servers.slice().sort((a, b) => {
const preferred =
Number(ServerConnection.key(b) === input.defaultKey) - Number(ServerConnection.key(a) === input.defaultKey)
if (preferred !== 0) return preferred
const health = rank(input.health[ServerConnection.key(a)]) - rank(input.health[ServerConnection.key(b)])
if (health !== 0) return health
@@ -81,24 +34,23 @@ export function useServerActionsController() {
const server = useServers()
const extensions = useExtensionServers()
const tabs = useTabs()
const platform = usePlatform()
const language = useLanguage()
const defaults = useDefaultServer()
const remove = async (key: ServerConnection.Key) => {
try {
await extensions.entry(key)?.entry.remove?.()
tabs.removeServer(key)
server.remove(key)
if ((await platform.getDefaultServer?.()) === key) await defaults.set(null)
} catch (err) {
showRequestError(language, err)
showToast({
variant: "error",
title: language.t("common.requestFailed"),
description: err instanceof Error ? err.message : String(err),
})
}
}
return {
defaults,
connection: {
canRemove: server.canRemove,
remove,
@@ -126,7 +78,6 @@ export function useServerCollectionController() {
sortServerConnections({
servers: items(),
health: global.servers.health,
defaultKey: actions.defaults.key(),
}),
)
@@ -23,11 +23,6 @@ export function ExtensionServerRow(props: { server: ServerConnection.Key; contro
authenticationRequired={indicator.auth}
/>
),
default: {
available: () => props.controller.defaults.available(),
current: () => props.controller.defaults.key() === props.server,
set: (value) => void props.controller.defaults.set(value ? props.server : null),
},
remove: () => props.controller.connection.remove(props.server),
Items: () => <ServerRowItems server={props.server} />,
}
@@ -20,14 +20,10 @@ export const ServerRowMenu: Component<{
<ServerRowMenuView
server={props.server}
labels={serverMenuLabels(language)}
canDefault={props.domain.defaults.available()}
isDefault={props.domain.defaults.key() === key}
canRemove={props.domain.connection.canRemove(key)}
canHide={props.domain.connection.canHide(key)}
hidden={props.domain.connection.isHidden(key)}
onEdit={props.onEdit}
onSetDefault={() => props.domain.defaults.set(key)}
onRemoveDefault={() => props.domain.defaults.set(null)}
onRemove={() => props.domain.connection.remove(key)}
onHide={() => props.domain.connection.setHidden(key, true)}
onShow={() => props.domain.connection.setHidden(key, false)}
@@ -42,8 +38,6 @@ export function serverMenuLabels(language: ReturnType<typeof useLanguage>) {
more: language.t("common.moreOptions"),
server: language.t("settings.section.server"),
edit: language.t("dialog.server.menu.edit"),
default: language.t("dialog.server.menu.default"),
defaultRemove: language.t("dialog.server.menu.defaultRemove"),
remove: language.t("dialog.server.menu.remove"),
hide: language.t("dialog.server.menu.hide"),
show: language.t("dialog.server.menu.show"),
@@ -53,14 +47,10 @@ export function serverMenuLabels(language: ReturnType<typeof useLanguage>) {
export const ServerRowMenuView: Component<{
server: ServerConnection.Any
labels: ReturnType<typeof serverMenuLabels>
canDefault: boolean
isDefault: boolean
canRemove: boolean
canHide?: boolean
hidden?: boolean
onEdit: (server: ServerConnection.Http) => void
onSetDefault: () => void
onRemoveDefault: () => void
onRemove: () => void
onHide?: () => void
onShow?: () => void
@@ -93,12 +83,6 @@ export const ServerRowMenuView: Component<{
>
{props.labels.edit}
</Menu.Item>
<Show when={props.canDefault && !props.isDefault}>
<Menu.Item onSelect={props.onSetDefault}>{props.labels.default}</Menu.Item>
</Show>
<Show when={props.canDefault && props.isDefault}>
<Menu.Item onSelect={props.onRemoveDefault}>{props.labels.defaultRemove}</Menu.Item>
</Show>
<Show when={props.hidden}>
<Menu.Item onSelect={props.onShow}>{props.labels.show}</Menu.Item>
</Show>
@@ -1,4 +1,3 @@
import { Badge } from "@opencode/ui/badge"
import { Button } from "@opencode/ui/button"
import { useDialog } from "@opencode/ui/context/dialog"
import { createMemo, Show, type Component } from "solid-js"
@@ -82,9 +81,6 @@ export const SettingsServerGeneral: Component<{
</Button>
)}
</Show>
<Show when={controller.defaults.available() && controller.defaults.key() === props.entry.key}>
<Badge>{language.t("dialog.server.status.default")}</Badge>
</Show>
<ServerRowMenu server={server()} domain={controller} onEdit={edit} />
</div>
</div>
+1 -7
View File
@@ -248,13 +248,7 @@ function RootSettings() {
const ordered = createMemo(() => {
const order = new Map(list().map((server, index) => [ServerConnection.key(server), index]))
return inventory().toSorted((a, b) => {
const preferred = Number(b.key === servers.defaults.key()) - Number(a.key === servers.defaults.key())
if (preferred) return preferred
return (order.get(a.key) ?? list().length) - (order.get(b.key) ?? list().length)
})
return inventory().toSorted((a, b) => (order.get(a.key) ?? list().length) - (order.get(b.key) ?? list().length))
})
const sourceServer = createMemo(() => {
@@ -15,7 +15,6 @@ import { finishFirstLaunchOnboarding, isFirstLaunchOnboardingPending } from "../
import { BackgroundService } from "../service/background-service"
import { DesktopCli } from "../service/desktop-cli"
import { SidecarCredentials } from "../service/sidecar-credentials"
import { getDefaultServerUrl, setDefaultServerUrl } from "../service/server-settings"
import { getLastFocusedWindow, setBackgroundColor } from "../windows"
import { sender } from "./context"
@@ -32,8 +31,6 @@ export const appHandlers = AppRpcs.toLayer(
AppAwaitInitialization: () => background.connection.pipe(Effect.map(SidecarCredentials.ready)),
AppReconnectService: () => background.reconnect.pipe(Effect.map(SidecarCredentials.ready)),
AppConsumeInitialDeepLinks: () => Effect.sync(lifecycle.consumeInitialDeepLinks),
AppGetDefaultServerUrl: () => Effect.sync(getDefaultServerUrl),
AppSetDefaultServerUrl: ({ url }) => Effect.sync(() => setDefaultServerUrl(url)),
AppIsFirstLaunchOnboardingPending: isFirstLaunchOnboardingPending,
AppFinishFirstLaunchOnboarding: ({ createDefaultProject }) =>
finishFirstLaunchOnboarding(createDefaultProject).pipe(Effect.orDie),
@@ -1,18 +0,0 @@
import { DEFAULT_SERVER_URL_KEY } from "../storage/keys"
import { getStore } from "../storage/store"
export function getDefaultServerUrl(): string | null {
const value = getStore().get(DEFAULT_SERVER_URL_KEY)
return typeof value === "string" ? value : null
}
export function setDefaultServerUrl(url: string | null) {
if (url) {
getStore().set(DEFAULT_SERVER_URL_KEY, url)
return
}
getStore().delete(DEFAULT_SERVER_URL_KEY)
}
@@ -1,7 +1,5 @@
export const SETTINGS_STORE = "opencode.settings"
export const DEFAULT_SERVER_URL_KEY = "defaultServerUrl"
export const FIRST_LAUNCH_ONBOARDING_COMPLETE_KEY = "firstLaunchOnboardingComplete"
export const PINCH_ZOOM_ENABLED_KEY = "pinchZoomEnabled"
@@ -1,7 +1,6 @@
import { app } from "electron"
import { Predicate } from "effect"
import { windowBootstrapArgument, type WindowBootstrap } from "../../shared/window-bootstrap"
import { getDefaultServerUrl } from "../service/server-settings"
import { FIRST_LAUNCH_ONBOARDING_COMPLETE_KEY } from "../storage/keys"
import { getStore } from "../storage/store"
@@ -14,7 +13,6 @@ export function windowBootstrap(id: string): WindowBootstrap {
return {
id,
firstLaunchPending: Predicate.isBoolean(complete) ? !complete : undefined,
defaultServerUrl: getDefaultServerUrl(),
packaged: app.isPackaged,
}
}
@@ -16,8 +16,6 @@ export type ElectronAPI = {
awaitInitialization(): Promise<ServerReadyData>
reconnectService(): Promise<ServerReadyData>
consumeInitialDeepLinks(): Promise<string[]>
getDefaultServerUrl(): Promise<string | null>
setDefaultServerUrl(url: string | null): Promise<void>
isFirstLaunchOnboardingPending(): Promise<boolean>
finishFirstLaunchOnboarding(createDefaultProject: boolean): Promise<string | null>
checkAppExists(appName: string): Promise<boolean>
+4 -2
View File
@@ -8,8 +8,12 @@ type Mutable<Value> =
? { -readonly [Key in keyof Value]: Mutable<Value[Key]> }
: Value
// SAFETY: IPC replies are fresh structured clones owned by the caller, so dropping the schema's readonly markers
// cannot alias shared state.
const mutable = <Value>(value: Value) => value as Mutable<Value>
// SAFETY: IPC bytes arrive in a structured-cloned Uint8Array over an ordinary ArrayBuffer, never a
// SharedArrayBuffer, so slicing its buffer yields an ArrayBuffer.
const toArrayBuffer = (value: Uint8Array) =>
value.buffer.slice(value.byteOffset, value.byteOffset + value.byteLength) as ArrayBuffer
@@ -20,8 +24,6 @@ export const api: ElectronAPI = {
awaitInitialization: () => invoke("AppAwaitInitialization"),
reconnectService: () => invoke("AppReconnectService"),
consumeInitialDeepLinks: () => invoke("AppConsumeInitialDeepLinks").then(mutable),
getDefaultServerUrl: () => invoke("AppGetDefaultServerUrl"),
setDefaultServerUrl: (url) => invoke("AppSetDefaultServerUrl", { url }),
isFirstLaunchOnboardingPending: () => invoke("AppIsFirstLaunchOnboardingPending"),
finishFirstLaunchOnboarding: (createDefaultProject) =>
invoke("AppFinishFirstLaunchOnboarding", { createDefaultProject }),
+20 -47
View File
@@ -63,12 +63,6 @@ export function DesktopApp(props: { api: ElectronAPI; version: string }) {
const platform = createDesktopPlatform(props.api, windowState)
const [sidecar, { mutate: setSidecar }] = createResource(() => props.api.awaitInitialization())
const [defaultServer] = createResource(async () => {
if (bootstrap.defaultServerUrl === undefined) return platform.getDefaultServer?.()
return bootstrap.defaultServerUrl ? ServerConnection.Key.make(bootstrap.defaultServerUrl) : null
})
const [locale] = createResource(() => preloadStoredLocale(platform))
const [initialRoute] = createResource(
@@ -92,9 +86,7 @@ export function DesktopApp(props: { api: ElectronAPI; version: string }) {
const extensions = useExtensionServers()
const language = useLanguage()
const ready = createMemo(
() => !firstLaunch.loading && !defaultServer.loading && !sidecar.loading && !locale.loading && extensions.ready(),
)
const ready = createMemo(() => !firstLaunch.loading && !sidecar.loading && !locale.loading && extensions.ready())
const servers = createMemo(() => {
const data = initializationData(sidecar)
@@ -115,46 +107,27 @@ export function DesktopApp(props: { api: ElectronAPI; version: string }) {
return list
})
// Resolved once, when the window first becomes ready, so the app's lifetime never follows live server
// availability: an extension reloading its server would otherwise remount the whole app. A default that
// disappears later reads like any unavailable server.
const startupServer = createMemo<ServerConnection.Key | undefined>((resolved) => {
if (resolved || !ready()) return resolved
const key = defaultServer.latest ?? "sidecar"
// An extension's server that is not listed yet (e.g. a WSL distro still starting) cannot open the window.
if (key === "sidecar" || /^https?:\/\//.test(key) || extensions.list().some((conn) => conn.key === key))
return ServerConnection.Key.make(key)
return ServerConnection.Key.make("sidecar")
})
return (
<Show when={ready()}>
<Show when={startupServer()} keyed>
{(key) => (
<AppInterface defaultServer={key} servers={servers()} router={router}>
<DesktopStartupReady
routeReady={!initialRoute.loading && startup.onboardingReady}
onReady={() => setStartup("ready", true)}
onRoute={(route) => setStartup("route", route)}
/>
<DesktopFirstLaunchOnboarding
api={props.api}
initialUrl={initialUrl}
serverKey={key}
pending={firstLaunch() ?? false}
onReady={() => setStartup("onboardingReady", true)}
/>
<DesktopEffects api={props.api} />
<Suspense fallback={null}>
<Show when={initializationData(sidecar)} keyed>
{(server) => <MigrationStatus server={server} />}
</Show>
</Suspense>
</AppInterface>
)}
</Show>
<AppInterface servers={servers()} router={router}>
<DesktopStartupReady
routeReady={!initialRoute.loading && startup.onboardingReady}
onReady={() => setStartup("ready", true)}
onRoute={(route) => setStartup("route", route)}
/>
<DesktopFirstLaunchOnboarding
api={props.api}
initialUrl={initialUrl}
pending={firstLaunch() ?? false}
onReady={() => setStartup("onboardingReady", true)}
/>
<DesktopEffects api={props.api} />
<Suspense fallback={null}>
<Show when={initializationData(sidecar)} keyed>
{(server) => <MigrationStatus server={server} />}
</Show>
</Suspense>
</AppInterface>
</Show>
)
}
@@ -4,7 +4,6 @@ import type { ElectronAPI } from "../api-types"
export function DesktopFirstLaunchOnboarding(props: {
api: ElectronAPI
serverKey: ServerConnection.Key
initialUrl: string
pending: boolean
onReady: () => void
@@ -45,10 +44,11 @@ export function DesktopFirstLaunchOnboarding(props: {
if (!shouldTrigger || !directory) return
console.info("[desktop-onboarding] starting first launch draft", { directory })
const projects = server.projects.forServer(props.serverKey)
const sidecar = ServerConnection.Key.make("sidecar")
const projects = server.projects.forServer(sidecar)
projects.open(directory)
projects.touch(directory)
const connection = server.list.find((connection) => ServerConnection.key(connection) === props.serverKey)
const connection = server.list.find((connection) => ServerConnection.key(connection) === sidecar)
if (connection) {
const data = global.ensureServerCtx(connection).data
@@ -56,7 +56,7 @@ export function DesktopFirstLaunchOnboarding(props: {
await Promise.all([data.location.provider.sync({ directory }), data.location.model.sync({ directory })])
}
tabs.select(await tabs.newDraft({ server: props.serverKey, directory }))
tabs.select(await tabs.newDraft({ server: sidecar, directory }))
} finally {
props.onReady()
}
@@ -1,4 +1,4 @@
import { ServerConnection, type Platform } from "@opencode/app/desktop"
import type { Platform } from "@opencode/app/desktop"
import type { ElectronAPI } from "../api-types"
import { setPinchZoomEnabled, webviewZoom } from "../window/zoom"
import { windowFullscreen } from "../window/fullscreen"
@@ -34,16 +34,6 @@ export function createDesktopPlatform(api: ElectronAPI, windowState: DesktopWind
return fetch(input, init)
},
getDefaultServer: async () => {
const url = await api.getDefaultServerUrl().catch(() => null)
if (!url) return null
return ServerConnection.Key.make(url)
},
setDefaultServer: async (url) => {
await api.setDefaultServerUrl(url)
},
webviewZoom,
windowFullscreen,
getPinchZoomEnabled: () => api.getPinchZoomEnabled(),
@@ -13,14 +13,6 @@ export const AppConsumeInitialDeepLinks = Rpc.make("AppConsumeInitialDeepLinks",
success: Schema.Array(Schema.String),
})
export const AppGetDefaultServerUrl = Rpc.make("AppGetDefaultServerUrl", {
success: Schema.NullOr(Schema.String),
})
export const AppSetDefaultServerUrl = Rpc.make("AppSetDefaultServerUrl", {
payload: { url: Schema.NullOr(Schema.String) },
})
export const AppIsFirstLaunchOnboardingPending = Rpc.make("AppIsFirstLaunchOnboardingPending", {
success: Schema.Boolean,
})
@@ -72,8 +64,6 @@ export const AppRpcs = RpcGroup.make(
AppAwaitInitialization,
AppReconnectService,
AppConsumeInitialDeepLinks,
AppGetDefaultServerUrl,
AppSetDefaultServerUrl,
AppIsFirstLaunchOnboardingPending,
AppFinishFirstLaunchOnboarding,
AppCheckAppExists,
@@ -3,7 +3,7 @@ import { windowBootstrapArgument, windowBootstrapFromArguments } from "./window-
describe("window bootstrap", () => {
test("round-trips through argv and keeps unknown values absent", () => {
const bootstrap = { id: "win a/b ü", firstLaunchPending: false, defaultServerUrl: "http://127.0.0.1:1234" }
const bootstrap = { id: "win a/b ü", firstLaunchPending: false, packaged: true }
expect(windowBootstrapFromArguments(["electron", windowBootstrapArgument(bootstrap)])).toEqual(bootstrap)
// Absent means "ask over IPC", so a value must not appear on the way through.
expect(windowBootstrapFromArguments([windowBootstrapArgument({ id: "x" })])).toEqual({ id: "x" })
@@ -3,7 +3,6 @@
export type WindowBootstrap = {
id: string
firstLaunchPending?: boolean
defaultServerUrl?: string | null
/** The app runs packaged (`app.isPackaged`), as extensions' `Build.packaged` reports in both processes. */
packaged?: boolean
}
+1 -14
View File
@@ -398,20 +398,7 @@ export interface ServerRow {
/** Shows the lock. */
readonly auth?: boolean
}) => JSX.Element
/** The default server. `available` is false where the platform keeps no default. */
readonly default: {
/** The platform keeps a default server. */
available(): boolean
/** This server is the default. Reactive. */
current(): boolean
/**
* Makes this server the default, or clears it.
*
* @param value - True to make it the default.
*/
set(value: boolean): void
}
/** Runs the entry's `remove`, then closes the server's tabs and clears it as the default. */
/** Runs the entry's `remove`, then closes the server's tabs. */
remove(): Promise<void>
/** MenuItem "server.row" items for this server, rendered as items of the row's own menu. */
readonly Items: () => JSX.Element
@@ -18,6 +18,8 @@ import {
type SshState,
} from "../../../storybook/.storybook/mocks/gui-extensions/ssh"
type FixtureState = { item?: SshItem; before?: SshItem; step: number; timer?: ReturnType<typeof setTimeout> }
function Fixture(props: {
session?: boolean
settings?: boolean
@@ -27,7 +29,7 @@ function Fixture(props: {
initial?: "connecting" | "password" | "confirmation" | "failure" | "required"
responseDelay?: number
}) {
const state: { item?: SshItem; before?: SshItem; step: number; timer?: ReturnType<typeof setTimeout> } = {
const state: FixtureState = {
step: 0,
item:
props.initial === "required"
@@ -246,8 +248,6 @@ function AuthenticationHome() {
serverHealth={() => ({ healthy: ssh.servers[0]?.stage === "ready" })}
projectsForServer={() => projects}
collapsed={() => false}
canDefaultServer={false}
defaultServerKey={null}
canRevealProject={() => false}
unseenCount={() => 0}
onWheel={() => {}}
@@ -262,7 +262,6 @@ function AuthenticationHome() {
}}
onToggleCollapsed={() => {}}
onEditServer={() => {}}
onSetDefaultServer={() => {}}
canRemoveServer={() => false}
onRemoveServer={() => {}}
canHideServer={() => false}
@@ -32,8 +32,5 @@ export default {
"form.name": "የአገልጋይ ስም (አማራጭ)",
"form.namePlaceholder": "Localhost",
"form.add": "አገልጋይ አክል",
"server.default": "ነባሪ",
"menu.default": "ነባሪ አዘጋጅ",
"menu.defaultRemove": "ነባሪውን አስወግድ",
"menu.delete": "ሰርዝ",
}
@@ -33,8 +33,5 @@ export default {
"form.name": "اسم الخادم (اختياري)",
"form.namePlaceholder": "Localhost",
"form.add": "إضافة خادم",
"server.default": "افتراضي",
"menu.default": "تعيين كافتراضي",
"menu.defaultRemove": "إزالة الافتراضي",
"menu.delete": "حذف",
}
@@ -38,8 +38,5 @@ export default {
"form.name": "Server adı (istəyə bağlı)",
"form.namePlaceholder": "Localhost",
"form.add": "Server əlavə et",
"server.default": "Standart",
"menu.default": "Standart olaraq təyin et",
"menu.defaultRemove": "Standartı sil",
"menu.delete": "Sil",
}
@@ -37,8 +37,5 @@ export default {
"form.name": "Име на сървъра (по избор)",
"form.namePlaceholder": "Localhost",
"form.add": "Добавете сървър",
"server.default": "По подразбиране",
"menu.default": "Задайте по подразбиране",
"menu.defaultRemove": "Премахване на подразбиране",
"menu.delete": "Изтриване",
}
@@ -36,8 +36,5 @@ export default {
"form.name": "সার্ভারের নাম (ঐচ্ছিক)",
"form.namePlaceholder": "Localhost",
"form.add": "সার্ভার যোগ করুন",
"server.default": "ডিফল্ট",
"menu.default": "ডিফল্ট হিসেবে সেট করুন",
"menu.defaultRemove": "ডিফল্ট সরান",
"menu.delete": "মুছে দিন",
}
@@ -38,8 +38,5 @@ export default {
"form.name": "Nome do servidor (opcional)",
"form.namePlaceholder": "Localhost",
"form.add": "Adicionar servidor",
"server.default": "Padrão",
"menu.default": "Definir como padrão",
"menu.defaultRemove": "Remover padrão",
"menu.delete": "Excluir",
}

Some files were not shown because too many files have changed in this diff Show More