diff --git a/packages/app/e2e/regression/new-session.spec.ts b/packages/app/e2e/regression/new-session.spec.ts index 339116a1d95..50fa3691a7c 100644 --- a/packages/app/e2e/regression/new-session.spec.ts +++ b/packages/app/e2e/regression/new-session.spec.ts @@ -430,17 +430,18 @@ test("the location dialog lists every ready server's projects in one list and ta pageMessages: () => ({ items: [] }), fileList: () => [], }) - // hailmary is listed but unreachable, so it contributes no projects and cannot take a new one. + // romulus is listed but unreachable, so it contributes no projects and cannot take a new one. await seed(page, { servers: [ { url: apollo, name: "apollo" }, - { url: "http://127.0.0.1:4999", name: "hailmary" }, + { url: "http://127.0.0.1:4999", name: "romulus" }, ], usedProjects: { [apollo]: [remote.id] }, }) const local = entry("proj_opencode", "C:/work/opencode", 2) await openDraft(page, { name: "opencode", + hostname: "hailmary", directory: local.worktree, project: { time: local.time }, projects: () => [local, entry("proj_console", "C:/work/console", 9)], @@ -484,7 +485,8 @@ test("the location dialog lists every ready server's projects in one list and ta await expect(options.nth(4)).toHaveAttribute("aria-selected", "true") await page.keyboard.press("ArrowRight") await expect(chip).toHaveText("Add project") - await expect(options).toHaveText([/^127\.0\.0\.1:\d+$/, "apollo"]) + // The server the app runs beside shows its hostname and "This computer" instead of its address. + await expect(options).toHaveText(["hailmaryThis computer", "apollo"]) await options.filter({ hasText: "apollo" }).click() await expect(page.getByRole("button", { name: "Select folder", exact: true })).toBeEnabled() await expect.poll(() => files.length).toBeGreaterThan(0) diff --git a/packages/app/e2e/regression/settings-search.spec.ts b/packages/app/e2e/regression/settings-search.spec.ts index 7d9bbcf11b5..184a84440eb 100644 --- a/packages/app/e2e/regression/settings-search.spec.ts +++ b/packages/app/e2e/regression/settings-search.spec.ts @@ -354,7 +354,7 @@ test("multi-server results follow the selected server and keep the query on retu await expect(view.results.getByRole("option")).toHaveCount(1) await view.search.clear() await view.settings.getByRole("tab", { name: "Providers", exact: true }).click() - await view.settings.getByRole("button", { name: "Server 127.0.0.1:4096", exact: true }).click() + await view.settings.getByRole("button", { name: "Server This computer", exact: true }).click() await page.getByRole("menuitemradio", { name: "Build server", exact: true }).click() await view.search.fill("MCPs") diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts index 49f1e436a82..4459e7783c4 100644 --- a/packages/app/e2e/regression/settings.spec.ts +++ b/packages/app/e2e/regression/settings.spec.ts @@ -112,7 +112,7 @@ test("another server's settings page survives refresh", async ({ page }) => { }) test("single-server settings expose scoped pages without a server picker", async ({ page }) => { - const { settings } = await open(page) + const { settings } = await open(page, { hostname: "hailmary" }) await expect(settings.getByRole("tab", { name: "Server", exact: true })).toBeVisible() await expect(settings.getByRole("tab", { name: "Servers", exact: true })).toHaveCount(0) @@ -120,6 +120,7 @@ test("single-server settings expose scoped pages without a server picker", async await settings.getByRole("tab", { name, exact: true }).click() await expect(settings.getByRole("tab", { name, exact: true })).toHaveAttribute("aria-selected", "true") await expect(settings.locator('[data-action="settings-server-select"]')).toHaveCount(0) + await expect(settings.getByText(/hailmary|This computer|Local server/i)).toHaveCount(0) } await settings.getByRole("tab", { name: "Server", exact: true }).click() @@ -153,14 +154,16 @@ test("several servers share one selected server across per-server pages", async { url: offline, name: "Offline box" }, ], }) - const { settings } = await open(page) + const { settings } = await open(page, { hostname: "hailmary" }) const switcher = settings.locator('[data-action="settings-server-select"]:visible') const connected = settings.locator('[data-component="connected-providers-section"]') await settings.getByRole("tab", { name: "Providers", exact: true }).click() - await expect(switcher).toHaveText("Server127.0.0.1:4096") + // The server the app runs beside is named by its hostname; only the menu that chooses a server adds "This computer". + await expect(switcher).toHaveText("Serverhailmary") await expect(connected.getByText("No connected providers")).toBeVisible() await switcher.click() + await expect(page.getByRole("menuitemradio")).toHaveText(["hailmary· This computer", "Build server", /^Offline box/]) await page.getByRole("menuitemradio", { name: "Build server", exact: true }).click() await expect(connected.getByText("OpenRouter", { exact: true })).toBeVisible() await expect(page).toHaveURL( diff --git a/packages/app/e2e/utils/mock-server.ts b/packages/app/e2e/utils/mock-server.ts index fc2a1dc84e9..b31aa57aa41 100644 --- a/packages/app/e2e/utils/mock-server.ts +++ b/packages/app/e2e/utils/mock-server.ts @@ -44,6 +44,8 @@ export type MockFileContent = export interface MockServerConfig { server?: string + // The machine name `/api/info` reports; omitted like a server that predates it. + hostname?: string provider: Resolvable integrations?: Resolvable // Runs on POST /api/credential/:id/activate; the fixture swaps its integrations and catalog to the new account. @@ -852,6 +854,7 @@ function mockHandlers( Effect.succeed({ version: "2.0.0", pid: 1, + hostname: config.hostname, urls: config.server ? [config.server] : [], paths: { tmp: "/tmp/opencode" }, }), diff --git a/packages/app/src/home/model.ts b/packages/app/src/home/model.ts index f599d2e5e67..e578b63d5b2 100644 --- a/packages/app/src/home/model.ts +++ b/packages/app/src/home/model.ts @@ -91,6 +91,7 @@ export function createHomeController() { server: { list: () => servers.visible, health: (conn: ServerConnection.Any) => global.servers.health[ServerConnection.key(conn)], + label: servers.label, context: (conn: ServerConnection.Any) => global.ensureServerCtx(conn), focused: focusedServer, focusedContext: focusedServerCtx, diff --git a/packages/app/src/home/projects/controller.tsx b/packages/app/src/home/projects/controller.tsx index 996aafbf2c3..062d9cae58b 100644 --- a/packages/app/src/home/projects/controller.tsx +++ b/packages/app/src/home/projects/controller.tsx @@ -80,6 +80,7 @@ export function createHomeProjectsController(home: HomeController) { server: { list: home.server.list, health: home.server.health, + label: home.server.label, projects: home.project.forServer, collapsed: (conn: ServerConnection.Any) => state().collapsed[ServerConnection.key(conn)] ?? false, toggleCollapsed: (conn: ServerConnection.Any) => { diff --git a/packages/app/src/home/projects/region.tsx b/packages/app/src/home/projects/region.tsx index 7c32a6462eb..998063d37f3 100644 --- a/packages/app/src/home/projects/region.tsx +++ b/packages/app/src/home/projects/region.tsx @@ -15,6 +15,7 @@ export function HomeProjects(props: { projects={props.projects.project.list()} selection={props.projects.selection.value()} serverHealth={props.projects.server.health} + serverLabel={props.projects.server.label} projectsForServer={props.projects.server.projects} collapsed={props.projects.server.collapsed} canRevealProject={props.projects.project.canReveal} diff --git a/packages/app/src/home/projects/view.tsx b/packages/app/src/home/projects/view.tsx index 21ce35e39df..bfb2f4821d9 100644 --- a/packages/app/src/home/projects/view.tsx +++ b/packages/app/src/home/projects/view.tsx @@ -44,6 +44,7 @@ export type HomeProjectsViewProps = { projects: LocalProject[] selection: HomeProjectSelection serverHealth: (server: ServerConnection.Any) => ServerHealth | undefined + serverLabel: (server: ServerConnection.Any) => string projectsForServer: (server: ServerConnection.Any) => LocalProject[] collapsed: (server: ServerConnection.Any) => boolean canRevealProject: (server: ServerConnection.Any) => boolean @@ -104,7 +105,7 @@ export function HomeProjectsView(props: HomeProjectsViewProps) { 1 && server()}> {(server) => ( - {server().displayName ?? new URL(server().http.url).host} + {props.serverLabel(server())} )} @@ -333,6 +334,7 @@ export function HomeUtilityNav(props: { function HomeServerRow(props: { language: HomeProjectsViewProps["language"] + serverLabel: HomeProjectsViewProps["serverLabel"] projectsForServer: HomeProjectsViewProps["projectsForServer"] contextMenuOpen: HomeProjectsContextMenuProps["contextMenuOpen"] onFocusServer: HomeProjectsViewProps["onFocusServer"] @@ -427,9 +429,7 @@ function HomeServerRow(props: { class="flex min-w-0 flex-1 items-center gap-1" classList={{ "opacity-60": !healthy() && !incompatible() }} > - - {props.server.displayName ?? new URL(props.server.http.url).host} - + {props.serverLabel(props.server)} {(label) => ( 1) { const conn = home.server.focused() - if (conn) return language.t("home.sessions.search.placeholder.scoped", { scope: serverName(conn) }) + if (conn) return language.t("home.sessions.search.placeholder.scoped", { scope: servers.label(conn) }) } return language.t("home.sessions.search.placeholder") diff --git a/packages/app/src/new-session/location/dialog.tsx b/packages/app/src/new-session/location/dialog.tsx index fda63062b06..f8f59f5a51e 100644 --- a/packages/app/src/new-session/location/dialog.tsx +++ b/packages/app/src/new-session/location/dialog.tsx @@ -414,6 +414,9 @@ function NewSessionLocationDialog(props: {
{item().server.name} + + {(hint) => {hint()}} +
)} @@ -521,7 +524,7 @@ function BackChip(props: { label: string; onBack: () => void; children: JSX.Elem ) } -/** The server a remote project lives on; local projects have none. */ +/** The server a project lives on; projects on the current server have none. */ function ServerTag(props: { server?: PromptServer }) { return ( @@ -564,11 +567,11 @@ function projectEntryID(project: PromptProject) { } function tagged(server?: PromptServer) { - return server?.kind === "local" ? undefined : server + return server?.kind === "current" ? undefined : server } function serverIcon(server: PromptServer) { - if (server.kind === "local") return "monitor" + if (server.kind === "current") return "monitor" return server.kind === "extension" ? "terminal" : "globe" } diff --git a/packages/app/src/new-session/project/controller.ts b/packages/app/src/new-session/project/controller.ts index 8b07cd1f81a..81df63453c2 100644 --- a/packages/app/src/new-session/project/controller.ts +++ b/packages/app/src/new-session/project/controller.ts @@ -2,7 +2,7 @@ import { createMemo } from "solid-js" import { useDirectoryPicker } from "@/workspaces/selection/picker" import { type ServerCtx, useGlobal, useServerCtx } from "@/runtime/server/runtime" import { useServerSDK } from "@/runtime/server/client" -import { serverName, ServerConnection, useServers } from "@/runtime/server/registry" +import { ServerConnection, useServers } from "@/runtime/server/registry" import { useWorkspaceLocation } from "@/workspaces/location" import { workspaceSelectionDestination } from "@/workspaces/paths" import { useTabs } from "@/shell/tabs/tabs" @@ -32,6 +32,16 @@ export function createComposerProjectControls(props: { draftId: string; worktree ] } + function promptServer(connection: ServerConnection.Any): PromptServer { + return { + key: ServerConnection.key(connection), + name: servers.label(connection), + hint: servers.hint(connection), + kind: servers.current(connection) ? "current" : connection.type === "extension" ? "extension" : "remote", + label: connection.label, + } + } + // Servers that are down or still connecting contribute nothing. const ready = createMemo(() => servers.list.filter((connection) => { @@ -93,12 +103,3 @@ export function createComposerProjectControls(props: { draftId: string; worktree add: addProject, })) } - -function promptServer(connection: ServerConnection.Any): PromptServer { - return { - key: ServerConnection.key(connection), - name: serverName(connection), - kind: ServerConnection.local(connection) ? "local" : connection.type === "extension" ? "extension" : "remote", - label: connection.label, - } -} diff --git a/packages/app/src/new-session/project/selector.test.tsx b/packages/app/src/new-session/project/selector.test.tsx index 3e3bc280d9f..ec16e78a2ab 100644 --- a/packages/app/src/new-session/project/selector.test.tsx +++ b/packages/app/src/new-session/project/selector.test.tsx @@ -38,13 +38,17 @@ describe("new session project selection", () => { worktree: "/remote", server: { key: "remote", name: "Remote", kind: "remote" as const }, } - const local = { id: "shared", worktree: "/local", server: { key: "local", name: "Local", kind: "local" as const } } + const local = { + id: "shared", + worktree: "/local", + server: { key: "sidecar", name: "hailmary", kind: "current" as const }, + } const controls: PromptProjectControls = { available: [remote, local], directory: "/local/feature", projectID: "shared", - server: "local", + server: "sidecar", select() {}, add() {}, } @@ -57,7 +61,7 @@ describe("new session project selection", () => { }) test("lists every server's projects in one list: used first, then the rest, each by recent activity", () => { - const local = { key: "local", name: "Local Server", kind: "local" as const } + const local = { key: "sidecar", name: "hailmary", kind: "current" as const } const apollo = { key: "http://apollo:4096", name: "apollo", kind: "remote" as const } const entry = (id: string, server: typeof local | typeof apollo, active: number, used: boolean) => ({ id, @@ -77,7 +81,7 @@ describe("new session project selection", () => { entry("opencode", apollo, 3, true), ], directory: "/elsewhere", - server: "local", + server: "sidecar", select() {}, add() {}, } @@ -86,9 +90,9 @@ describe("new session project selection", () => { const controller = createPromptProjectController({ controls: () => controls }) expect(controller.projects().map((project) => `${project.server?.name}:${project.id}`)).toEqual([ "apollo:opencode", - "Local Server:local-used", - "Local Server:opencode", - "Local Server:local-unused", + "hailmary:local-used", + "hailmary:opencode", + "hailmary:local-unused", "apollo:apollo-unused", ]) dispose() diff --git a/packages/app/src/new-session/project/selector.tsx b/packages/app/src/new-session/project/selector.tsx index a3242e301dd..975cabd0c96 100644 --- a/packages/app/src/new-session/project/selector.tsx +++ b/packages/app/src/new-session/project/selector.tsx @@ -3,11 +3,13 @@ import { Icon } from "@opencode/ui/icon" import { useLanguage } from "@/runtime/i18n/language" import { pathKey } from "@/workspaces/path-key" -/** A server listed in the location dialog; "local" servers get no tag. */ +/** A server listed in the location dialog; the current server gets no tag. */ export type PromptServer = { key: string name: string - kind: "local" | "remote" | "extension" + /** "This computer" beside the current server's name in the server picker. */ + hint?: string + kind: "current" | "remote" | "extension" /** The extension's short badge, e.g. "SSH". */ label?: string } diff --git a/packages/app/src/runtime/extension/host-apis.tsx b/packages/app/src/runtime/extension/host-apis.tsx index 1425fd8736f..c75a8c914db 100644 --- a/packages/app/src/runtime/extension/host-apis.tsx +++ b/packages/app/src/runtime/extension/host-apis.tsx @@ -34,7 +34,7 @@ import { usePlatform } from "@/runtime/platform/platform" import { same } from "@/runtime/persistence/equality" import { Persist, persisted, removePersisted } from "@/runtime/persistence/storage" import { useGlobal, type ServerCtx } from "@/runtime/server/runtime" -import { ServerConnection, serverName, useServers } from "@/runtime/server/registry" +import { ServerConnection, useServers } from "@/runtime/server/registry" import { useDirectoryPicker } from "@/workspaces/selection/picker" import { SessionRouteKey, SessionStateKey, type ServerScope } from "@/runtime/server/scope" import { findSessionTab, tabKey, useTabs } from "@/shell/tabs/tabs" @@ -413,7 +413,7 @@ export function createExtensionAttachment(apis: HostApis) { const ref: ServerRef = { id, get name() { - return serverName(listed()) || id + return servers.label(listed()) || id }, get url() { return live().sdk.url diff --git a/packages/app/src/runtime/extension/mounted-session.ts b/packages/app/src/runtime/extension/mounted-session.ts index 12272ceac54..38254aacf60 100644 --- a/packages/app/src/runtime/extension/mounted-session.ts +++ b/packages/app/src/runtime/extension/mounted-session.ts @@ -24,7 +24,7 @@ import type { import { useComments } from "@/composer/comments" import { useComposerState } from "@/composer/persistence" import { useServer } from "@/runtime/server/current" -import { ServerConnection, serverName } from "@/runtime/server/registry" +import { ServerConnection, useServers } from "@/runtime/server/registry" import { sessionInWorkspace, sessionProject, type SessionModel } from "@/session/model" import { useFile } from "@/workspaces/files/model" import { useWorkspaceLocation } from "@/workspaces/location" @@ -45,6 +45,7 @@ export function createMountedSession(session: SessionModel) { const comments = useComments() const composer = useComposerState() const server = useServer() + const servers = useServers() const location = useWorkspaceLocation() const attachment = useExtensionAttachment() // The composer region owns background tasks and is created after the view. @@ -55,7 +56,7 @@ export function createMountedSession(session: SessionModel) { return server.key }, get name() { - return serverName(server.conn) || server.key + return servers.label(server.conn) || server.key }, get url() { return server.ctx.sdk.url diff --git a/packages/app/src/runtime/i18n/am.ts b/packages/app/src/runtime/i18n/am.ts index 502cb8f121b..2c136447d89 100644 --- a/packages/app/src/runtime/i18n/am.ts +++ b/packages/app/src/runtime/i18n/am.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "ፋይል ምረጥ", "desktop.dialog.saveFile": "ፋይሉን አስቀምጥ", "desktop.dialog.files": "ፋይሎች", - "desktop.server.local": "አካባቢያዊ አገልጋይ", "desktop.picker.error.notSelected": "ፋይሉ በመራጭው አልተመረጠም", "desktop.picker.error.sizeLimit": "የተመረጡት ዓባሪዎች ከ{{limit}}ሜባ ገደቡ በላይ", "command.category.suggested": "የሚመከር", diff --git a/packages/app/src/runtime/i18n/ar.ts b/packages/app/src/runtime/i18n/ar.ts index df7ef511327..4211c58a70c 100644 --- a/packages/app/src/runtime/i18n/ar.ts +++ b/packages/app/src/runtime/i18n/ar.ts @@ -60,7 +60,6 @@ export const dict = { "desktop.dialog.chooseFile": "اختيار ملف", "desktop.dialog.saveFile": "حفظ الملف", "desktop.dialog.files": "الملفات", - "desktop.server.local": "الخادم المحلي", "desktop.picker.error.notSelected": "لم يحدد منتقي الملفات ملفًا", "desktop.picker.error.sizeLimit": "تتجاوز المرفقات المحددة الحد البالغ {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/az.ts b/packages/app/src/runtime/i18n/az.ts index a51c65d531b..edee160ec3d 100644 --- a/packages/app/src/runtime/i18n/az.ts +++ b/packages/app/src/runtime/i18n/az.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Fayl seçin", "desktop.dialog.saveFile": "Faylı saxla", "desktop.dialog.files": "Fayllar", - "desktop.server.local": "Yerli server", "desktop.picker.error.notSelected": "Seçim vasitəsində fayl seçilməyib", "desktop.picker.error.sizeLimit": "Seçilmiş əlavələr {{limit}} MB limitini aşır", "command.category.suggested": "Təklif olunan", diff --git a/packages/app/src/runtime/i18n/bg.ts b/packages/app/src/runtime/i18n/bg.ts index cfdbfb8ccc1..a41308d2d03 100644 --- a/packages/app/src/runtime/i18n/bg.ts +++ b/packages/app/src/runtime/i18n/bg.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Изберете файл", "desktop.dialog.saveFile": "Запазете файла", "desktop.dialog.files": "файлове", - "desktop.server.local": "Локален сървър", "desktop.picker.error.notSelected": "Файлът не е избран от инструмента за избор", "desktop.picker.error.sizeLimit": "Избраните прикачени файлове надхвърлят ограничението от {{limit}} MB", "command.category.suggested": "Предложено", diff --git a/packages/app/src/runtime/i18n/bn.ts b/packages/app/src/runtime/i18n/bn.ts index 8c2d1f96143..c3bd7f34d30 100644 --- a/packages/app/src/runtime/i18n/bn.ts +++ b/packages/app/src/runtime/i18n/bn.ts @@ -63,7 +63,6 @@ export const dict = { "desktop.dialog.chooseFile": "একটি ফাইল নির্বাচন করুন", "desktop.dialog.saveFile": "ফাইল সংরক্ষণ করুন", "desktop.dialog.files": "ফাইল", - "desktop.server.local": "স্থানীয় সার্ভার", "desktop.picker.error.notSelected": "ফাইল পিকার দ্বারা নির্বাচন করা হয়নি", "desktop.picker.error.sizeLimit": "নির্বাচিত সংযুক্তিগুলি {{limit}} MB সীমা অতিক্রম করেছে৷", "command.category.suggested": "প্রস্তাবিত", diff --git a/packages/app/src/runtime/i18n/br.ts b/packages/app/src/runtime/i18n/br.ts index ecc4be7f96f..b39c2555da1 100644 --- a/packages/app/src/runtime/i18n/br.ts +++ b/packages/app/src/runtime/i18n/br.ts @@ -276,7 +276,6 @@ export const dict = { "desktop.dialog.chooseFile": "Escolher um arquivo", "desktop.dialog.saveFile": "Salvar arquivo", "desktop.dialog.files": "Arquivos", - "desktop.server.local": "Servidor local", "desktop.picker.error.notSelected": "O arquivo não foi selecionado pelo seletor", "desktop.picker.error.sizeLimit": "Os anexos selecionados excedem o limite de {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/bs.ts b/packages/app/src/runtime/i18n/bs.ts index 9078e9a61ac..6479f348161 100644 --- a/packages/app/src/runtime/i18n/bs.ts +++ b/packages/app/src/runtime/i18n/bs.ts @@ -60,7 +60,6 @@ export const dict = { "desktop.dialog.chooseFile": "Odaberi datoteku", "desktop.dialog.saveFile": "Sačuvaj datoteku", "desktop.dialog.files": "Datoteke", - "desktop.server.local": "Lokalni server", "desktop.picker.error.notSelected": "Datoteka nije odabrana u izborniku", "desktop.picker.error.sizeLimit": "Odabrani prilozi premašuju ograničenje od {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/ca.ts b/packages/app/src/runtime/i18n/ca.ts index 89ac904664d..56b572c9f53 100644 --- a/packages/app/src/runtime/i18n/ca.ts +++ b/packages/app/src/runtime/i18n/ca.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "Trieu un fitxer", "desktop.dialog.saveFile": "Desa el fitxer", "desktop.dialog.files": "Fitxers", - "desktop.server.local": "Servidor local", "desktop.picker.error.notSelected": "El selector no ha seleccionat el fitxer", "desktop.picker.error.sizeLimit": "Els fitxers adjunts seleccionats superen el límit de {{limit}} MB", "command.category.suggested": "Suggerit", diff --git a/packages/app/src/runtime/i18n/cs.ts b/packages/app/src/runtime/i18n/cs.ts index 1279dab3d3d..070f831938f 100644 --- a/packages/app/src/runtime/i18n/cs.ts +++ b/packages/app/src/runtime/i18n/cs.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "Vyberte soubor", "desktop.dialog.saveFile": "Uložit soubor", "desktop.dialog.files": "Soubory", - "desktop.server.local": "Místní server", "desktop.picker.error.notSelected": "Soubor nebyl vybrán nástrojem pro výběr", "desktop.picker.error.sizeLimit": "Vybrané přílohy překračují limit {{limit}} MB", "command.category.suggested": "Doporučeno", diff --git a/packages/app/src/runtime/i18n/da.ts b/packages/app/src/runtime/i18n/da.ts index d37d26a4625..c7274299701 100644 --- a/packages/app/src/runtime/i18n/da.ts +++ b/packages/app/src/runtime/i18n/da.ts @@ -802,7 +802,6 @@ export const dict = { "desktop.dialog.chooseFile": "Vælg en fil", "desktop.dialog.saveFile": "Gem fil", "desktop.dialog.files": "Filer", - "desktop.server.local": "Lokal server", "desktop.picker.error.notSelected": "Filen blev ikke valgt i filvælgeren", "desktop.picker.error.sizeLimit": "De valgte vedhæftede filer overskrider grænsen på {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/de.ts b/packages/app/src/runtime/i18n/de.ts index 4c8d96561fd..4185b5e73dd 100644 --- a/packages/app/src/runtime/i18n/de.ts +++ b/packages/app/src/runtime/i18n/de.ts @@ -768,7 +768,6 @@ export const dict = { "desktop.dialog.chooseFile": "Datei auswählen", "desktop.dialog.saveFile": "Datei speichern", "desktop.dialog.files": "Dateien", - "desktop.server.local": "Lokaler Server", "desktop.picker.error.notSelected": "Im Auswahldialog wurde keine Datei ausgewählt", "desktop.picker.error.sizeLimit": "Die ausgewählten Anhänge überschreiten das Limit von {{limit}} MB", "command.logs.export": "Protokolle exportieren", diff --git a/packages/app/src/runtime/i18n/desktop-native.ts b/packages/app/src/runtime/i18n/desktop-native.ts index 7fb1d7d49e7..35c7b5f97eb 100644 --- a/packages/app/src/runtime/i18n/desktop-native.ts +++ b/packages/app/src/runtime/i18n/desktop-native.ts @@ -301,7 +301,6 @@ export const DESKTOP_NATIVE_ENGLISH = { "desktop.dialog.chooseFile": "Choose a file", "desktop.dialog.saveFile": "Save file", "desktop.dialog.files": "Files", - "desktop.server.local": "Local Server", "desktop.onboarding.defaultProject": "Default Project", "desktop.picker.error.notSelected": "File was not selected by the picker", diff --git a/packages/app/src/runtime/i18n/dv.ts b/packages/app/src/runtime/i18n/dv.ts index 91e8b69a818..a6d98f7a23f 100644 --- a/packages/app/src/runtime/i18n/dv.ts +++ b/packages/app/src/runtime/i18n/dv.ts @@ -61,7 +61,6 @@ export const dict = { "desktop.dialog.chooseFile": "ފައިލެއް ހޮވާށެވެ", "desktop.dialog.saveFile": "ފައިލް ސޭވްކުރުން", "desktop.dialog.files": "ފައިލްތައް", - "desktop.server.local": "ލޯކަލް ސަރވަރ އެވެ", "desktop.picker.error.notSelected": "ފައިލް ހޮވާފައިވަނީ ޕިކަރ އިން ނޫނެވެ", "desktop.picker.error.sizeLimit": "ހޮވާލެވޭ އެޓޭޗްމަންޓްތައް \u2068{{limit}}\u2069 MB ލިމިޓަށްވުރެ މަތިވެއެވެ", "command.category.suggested": "ލަފާދީފިއެވެ", diff --git a/packages/app/src/runtime/i18n/dz.ts b/packages/app/src/runtime/i18n/dz.ts index 8eb00fd5363..a3e32bfdf4a 100644 --- a/packages/app/src/runtime/i18n/dz.ts +++ b/packages/app/src/runtime/i18n/dz.ts @@ -69,7 +69,6 @@ export const dict = { "desktop.dialog.chooseFile": "ཡིག་སྣོད་གདམ་ཁ་རྐྱབས།", "desktop.dialog.saveFile": "ཡིག་སྣོད་སྲུངས།", "desktop.dialog.files": "ཡིག་སྣོད་ཚུ།", - "desktop.server.local": "ཉེ་གནས་སར་བར།", "desktop.picker.error.notSelected": "ཡིག་སྣོད་འདི་ སེལ་འཐུ་འབད་མི་གིས་ སེལ་འཐུ་མ་འབད་བས།", "desktop.picker.error.sizeLimit": "སེལ་འཐུ་འབད་ཡོད་པའི་མཉམ་སྦྲགས་ཚུ་གིས་ {{limit}} ཨེམ་བི་ཚད་ལས་བརྒལཝ་ཨིན།", "command.category.suggested": "བསམ་འཆར།", diff --git a/packages/app/src/runtime/i18n/el.ts b/packages/app/src/runtime/i18n/el.ts index 92a3f6fb6c8..59c1bc44180 100644 --- a/packages/app/src/runtime/i18n/el.ts +++ b/packages/app/src/runtime/i18n/el.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Επιλογή αρχείου", "desktop.dialog.saveFile": "Αποθήκευση αρχείου", "desktop.dialog.files": "Αρχεία", - "desktop.server.local": "Τοπικός διακομιστής", "desktop.picker.error.notSelected": "Το αρχείο δεν επιλέχθηκε από τον επιλογέα", "desktop.picker.error.sizeLimit": "Τα επιλεγμένα συνημμένα υπερβαίνουν το όριο των {{limit}} MB", "command.category.suggested": "Προτεινόμενο", diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index f8fd49bbf46..46d8220c206 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -11,6 +11,7 @@ export const dict = { "session.location.moveFailed": "Failed to move session", "server.action.authenticate": "Authenticate", "server.status.connecting": "Connecting over SSH…", + "server.thisComputer": "This computer", "server.status.authentication": "Authentication required", "command.category.suggested": "Suggested", "command.category.view": "View", diff --git a/packages/app/src/runtime/i18n/es.ts b/packages/app/src/runtime/i18n/es.ts index c29f6d60db7..2de46d53fed 100644 --- a/packages/app/src/runtime/i18n/es.ts +++ b/packages/app/src/runtime/i18n/es.ts @@ -278,7 +278,6 @@ export const dict = { "desktop.dialog.chooseFile": "Elegir un archivo", "desktop.dialog.saveFile": "Guardar archivo", "desktop.dialog.files": "Archivos", - "desktop.server.local": "Servidor local", "desktop.picker.error.notSelected": "No se seleccionó ningún archivo en el selector", "desktop.picker.error.sizeLimit": "Los adjuntos seleccionados superan el límite de {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/et.ts b/packages/app/src/runtime/i18n/et.ts index 8773b142773..07b1b33dd05 100644 --- a/packages/app/src/runtime/i18n/et.ts +++ b/packages/app/src/runtime/i18n/et.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "Valige fail", "desktop.dialog.saveFile": "Salvesta fail", "desktop.dialog.files": "Failid", - "desktop.server.local": "Kohalik server", "desktop.picker.error.notSelected": "Valija ei valinud faili", "desktop.picker.error.sizeLimit": "Valitud manused ületavad {{limit}} MB piirangut", "command.category.suggested": "Soovitatud", diff --git a/packages/app/src/runtime/i18n/fa.ts b/packages/app/src/runtime/i18n/fa.ts index a29ebf6fc48..d013d4def5b 100644 --- a/packages/app/src/runtime/i18n/fa.ts +++ b/packages/app/src/runtime/i18n/fa.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "یک فایل را انتخاب کنید", "desktop.dialog.saveFile": "ذخیره فایل", "desktop.dialog.files": "فایل ها", - "desktop.server.local": "سرور محلی", "desktop.picker.error.notSelected": "فایل توسط انتخاب کننده انتخاب نشده است", "desktop.picker.error.sizeLimit": "پیوست های انتخابی بیش از حد مجاز {{limit}} مگابایت است", "command.category.suggested": "پیشنهاد شده است", diff --git a/packages/app/src/runtime/i18n/fi.ts b/packages/app/src/runtime/i18n/fi.ts index 1de3cfe559b..ef3848d0537 100644 --- a/packages/app/src/runtime/i18n/fi.ts +++ b/packages/app/src/runtime/i18n/fi.ts @@ -744,7 +744,6 @@ export const dict = { "desktop.dialog.chooseFile": "Valitse tiedosto", "desktop.dialog.saveFile": "Tallenna tiedosto", "desktop.dialog.files": "Tiedostot", - "desktop.server.local": "Paikallinen palvelin", "desktop.picker.error.notSelected": "Tiedostovalitsimessa ei valittu tiedostoa", "desktop.picker.error.sizeLimit": "Valitut liitteet ylittävät {{limit}} Mt:n rajan", "command.logs.export": "Vie lokit", diff --git a/packages/app/src/runtime/i18n/fo.ts b/packages/app/src/runtime/i18n/fo.ts index ae8c92e5e12..2faaf32f146 100644 --- a/packages/app/src/runtime/i18n/fo.ts +++ b/packages/app/src/runtime/i18n/fo.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "Vel eina fílu", "desktop.dialog.saveFile": "Goym fílu", "desktop.dialog.files": "Fílur", - "desktop.server.local": "Lokal ambætari", "desktop.picker.error.notSelected": "Fíla varð ikki vald av veljaranum", "desktop.picker.error.sizeLimit": "Valdar viðheftir fara upp um {{limit}} MB markið", "command.category.suggested": "Tillagað", diff --git a/packages/app/src/runtime/i18n/fr.ts b/packages/app/src/runtime/i18n/fr.ts index e8d1bfc79c8..a6bf7477303 100644 --- a/packages/app/src/runtime/i18n/fr.ts +++ b/packages/app/src/runtime/i18n/fr.ts @@ -280,7 +280,6 @@ export const dict = { "desktop.dialog.chooseFile": "Sélectionner un fichier", "desktop.dialog.saveFile": "Enregistrer le fichier", "desktop.dialog.files": "Fichiers", - "desktop.server.local": "Serveur local", "desktop.picker.error.notSelected": "Aucun fichier n'a été sélectionné dans le sélecteur", "desktop.picker.error.sizeLimit": "Les pièces jointes sélectionnées dépassent la limite de {{limit}} Mo", diff --git a/packages/app/src/runtime/i18n/he.ts b/packages/app/src/runtime/i18n/he.ts index ddcdc3a4e0d..25dc3a843e6 100644 --- a/packages/app/src/runtime/i18n/he.ts +++ b/packages/app/src/runtime/i18n/he.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "בחר קובץ", "desktop.dialog.saveFile": "שמור קובץ", "desktop.dialog.files": "קבצים", - "desktop.server.local": "שרת מקומי", "desktop.picker.error.notSelected": "לא נבחר קובץ", "desktop.picker.error.sizeLimit": "הקבצים המצורפים שנבחרו חורגים ממגבלת ה-{{limit}} MB", "command.category.suggested": "מוצע", diff --git a/packages/app/src/runtime/i18n/hi.ts b/packages/app/src/runtime/i18n/hi.ts index 9a1ca77d620..61dc60af45c 100644 --- a/packages/app/src/runtime/i18n/hi.ts +++ b/packages/app/src/runtime/i18n/hi.ts @@ -61,7 +61,6 @@ export const dict = { "desktop.dialog.chooseFile": "फ़ाइल चुनें", "desktop.dialog.saveFile": "फ़ाइल सहेजें", "desktop.dialog.files": "फ़ाइलें", - "desktop.server.local": "स्थानीय सर्वर", "desktop.picker.error.notSelected": "पिकर में फ़ाइल नहीं चुनी गई", "desktop.picker.error.sizeLimit": "चुने गए अटैचमेंट {{limit}} MB की सीमा से अधिक हैं", diff --git a/packages/app/src/runtime/i18n/hy.ts b/packages/app/src/runtime/i18n/hy.ts index 7a7411db680..21db11eec3b 100644 --- a/packages/app/src/runtime/i18n/hy.ts +++ b/packages/app/src/runtime/i18n/hy.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Ընտրեք ֆայլ", "desktop.dialog.saveFile": "Պահպանել ֆայլը", "desktop.dialog.files": "Ֆայլեր", - "desktop.server.local": "Տեղական սերվեր", "desktop.picker.error.notSelected": "Ֆայլը ընտրողի կողմից ընտրված չէ", "desktop.picker.error.sizeLimit": "Ընտրված հավելվածները գերազանցում են {{limit}} ՄԲ սահմանաչափը", "command.category.suggested": "Առաջարկված", diff --git a/packages/app/src/runtime/i18n/id.ts b/packages/app/src/runtime/i18n/id.ts index af1ce59bc29..7fbb9c344e1 100644 --- a/packages/app/src/runtime/i18n/id.ts +++ b/packages/app/src/runtime/i18n/id.ts @@ -61,7 +61,6 @@ export const dict = { "desktop.dialog.saveFile": "Simpan berkas", "desktop.dialog.files": "Berkas", - "desktop.server.local": "Server lokal", "desktop.picker.error.notSelected": "Berkas tidak dipilih melalui pemilih", "desktop.picker.error.sizeLimit": "Lampiran yang dipilih melebihi batas {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/it.ts b/packages/app/src/runtime/i18n/it.ts index 7d64484987d..d4c28708c76 100644 --- a/packages/app/src/runtime/i18n/it.ts +++ b/packages/app/src/runtime/i18n/it.ts @@ -766,7 +766,6 @@ export const dict = { "desktop.dialog.chooseFile": "Scegli un file", "desktop.dialog.saveFile": "Salva file", "desktop.dialog.files": "File", - "desktop.server.local": "Server locale", "desktop.picker.error.notSelected": "Il file non è stato selezionato nella finestra di selezione", "desktop.picker.error.sizeLimit": "Gli allegati selezionati superano il limite di {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/ja.ts b/packages/app/src/runtime/i18n/ja.ts index 9fd19c03de0..eef2efda819 100644 --- a/packages/app/src/runtime/i18n/ja.ts +++ b/packages/app/src/runtime/i18n/ja.ts @@ -60,7 +60,6 @@ export const dict = { "desktop.dialog.chooseFile": "ファイルを選択", "desktop.dialog.saveFile": "ファイルを保存", "desktop.dialog.files": "ファイル", - "desktop.server.local": "ローカルサーバー", "desktop.picker.error.notSelected": "ピッカーでファイルが選択されませんでした", "desktop.picker.error.sizeLimit": "選択した添付ファイルが上限の{{limit}} MBを超えています", diff --git a/packages/app/src/runtime/i18n/ka.ts b/packages/app/src/runtime/i18n/ka.ts index 6bfaf16dccd..a440d4346ef 100644 --- a/packages/app/src/runtime/i18n/ka.ts +++ b/packages/app/src/runtime/i18n/ka.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "აირჩიე ფაილი", "desktop.dialog.saveFile": "ფაილის შენახვა", "desktop.dialog.files": "ფაილები", - "desktop.server.local": "ლოკალური სერვერი", "desktop.picker.error.notSelected": "ფაილი არ იყო არჩეული ამომრჩევლის მიერ", "desktop.picker.error.sizeLimit": "არჩეული დანართები აღემატება {{limit}} MB ლიმიტს", "command.category.suggested": "შემოთავაზებულია", diff --git a/packages/app/src/runtime/i18n/km.ts b/packages/app/src/runtime/i18n/km.ts index 308b46aeba5..f6fb0c70dc1 100644 --- a/packages/app/src/runtime/i18n/km.ts +++ b/packages/app/src/runtime/i18n/km.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "ជ្រើសរើសឯកសារ", "desktop.dialog.saveFile": "រក្សាទុកឯកសារ", "desktop.dialog.files": "ឯកសារ", - "desktop.server.local": "ម៉ាស៊ីនមេក្នុងស្រុក", "desktop.picker.error.notSelected": "ឯកសារមិនត្រូវបានជ្រើសរើសដោយអ្នកជ្រើសរើសទេ។", "desktop.picker.error.sizeLimit": "ឯកសារភ្ជាប់ដែលបានជ្រើសរើសលើសពីដែនកំណត់ {{limit}} MB", "command.category.suggested": "បានស្នើ", diff --git a/packages/app/src/runtime/i18n/ko.ts b/packages/app/src/runtime/i18n/ko.ts index 9162d55c2e1..a1df033440b 100644 --- a/packages/app/src/runtime/i18n/ko.ts +++ b/packages/app/src/runtime/i18n/ko.ts @@ -557,7 +557,6 @@ export const dict = { "desktop.dialog.chooseFile": "파일 선택", "desktop.dialog.saveFile": "파일 저장", "desktop.dialog.files": "파일", - "desktop.server.local": "로컬 서버", "desktop.picker.error.notSelected": "선택기에서 파일을 선택하지 않았습니다", "desktop.picker.error.sizeLimit": "선택한 첨부 파일이 {{limit}} MB 제한을 초과합니다", diff --git a/packages/app/src/runtime/i18n/lo.ts b/packages/app/src/runtime/i18n/lo.ts index b1ff42f697c..46f962502ed 100644 --- a/packages/app/src/runtime/i18n/lo.ts +++ b/packages/app/src/runtime/i18n/lo.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "ເລືອກໄຟລ໌", "desktop.dialog.saveFile": "ບັນທຶກໄຟລ໌", "desktop.dialog.files": "ໄຟລ໌", - "desktop.server.local": "ເຊີບເວີທ້ອງຖິ່ນ", "desktop.picker.error.notSelected": "ໄຟລ໌ບໍ່ໄດ້ຖືກເລືອກໂດຍຕົວເລືອກ", "desktop.picker.error.sizeLimit": "ໄຟລ໌ແນບທີ່ເລືອກເກີນຂີດຈຳກັດ {{limit}} MB", "command.category.suggested": "ແນະນຳ", diff --git a/packages/app/src/runtime/i18n/lv.ts b/packages/app/src/runtime/i18n/lv.ts index e7d4a0cf189..6efac3d5383 100644 --- a/packages/app/src/runtime/i18n/lv.ts +++ b/packages/app/src/runtime/i18n/lv.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "Izvēlieties failu", "desktop.dialog.saveFile": "Saglabāt failu", "desktop.dialog.files": "Faili", - "desktop.server.local": "Lokālais serveris", "desktop.picker.error.notSelected": "Fails netika izvēlēts ar atlasītāju", "desktop.picker.error.sizeLimit": "Izvēlētie pielikumi pārsniedz {{limit}} MB ierobežojumu", "command.category.suggested": "Ieteikts", diff --git a/packages/app/src/runtime/i18n/mk.ts b/packages/app/src/runtime/i18n/mk.ts index 90102dd03bb..b0fd5ddad8c 100644 --- a/packages/app/src/runtime/i18n/mk.ts +++ b/packages/app/src/runtime/i18n/mk.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Изберете датотека", "desktop.dialog.saveFile": "Зачувај датотека", "desktop.dialog.files": "Датотеки", - "desktop.server.local": "Локален сервер", "desktop.picker.error.notSelected": "Датотеката не беше избрана од избирачот", "desktop.picker.error.sizeLimit": "Избраните прилози ја надминуваат границата {{limit}} MB", "command.category.suggested": "Предложено", diff --git a/packages/app/src/runtime/i18n/mn.ts b/packages/app/src/runtime/i18n/mn.ts index 671a8eadf08..52076b64d8f 100644 --- a/packages/app/src/runtime/i18n/mn.ts +++ b/packages/app/src/runtime/i18n/mn.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Файл сонгоно уу", "desktop.dialog.saveFile": "Файлыг хадгалах", "desktop.dialog.files": "Файлууд", - "desktop.server.local": "Орон нутгийн сервер", "desktop.picker.error.notSelected": "Файлыг сонгогч сонгоогүй", "desktop.picker.error.sizeLimit": "Сонгосон хавсралтууд {{limit}} МБ хязгаараас хэтэрсэн", "command.category.suggested": "Санал болгосон", diff --git a/packages/app/src/runtime/i18n/ms.ts b/packages/app/src/runtime/i18n/ms.ts index 324a03b7dc2..cae07ddcc43 100644 --- a/packages/app/src/runtime/i18n/ms.ts +++ b/packages/app/src/runtime/i18n/ms.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "Pilih fail", "desktop.dialog.saveFile": "Simpan fail", "desktop.dialog.files": "Fail", - "desktop.server.local": "Pelayan Tempatan", "desktop.picker.error.notSelected": "Fail tidak dipilih oleh pemilih", "desktop.picker.error.sizeLimit": "Lampiran yang dipilih melebihi had {{limit}} MB", "command.category.suggested": "Dicadangkan", diff --git a/packages/app/src/runtime/i18n/my.ts b/packages/app/src/runtime/i18n/my.ts index 3c9059aff77..167cf1b6270 100644 --- a/packages/app/src/runtime/i18n/my.ts +++ b/packages/app/src/runtime/i18n/my.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "ဖိုင်တစ်ခုကို ရွေးပါ။", "desktop.dialog.saveFile": "ဖိုင်ကို သိမ်းဆည်းပါ။", "desktop.dialog.files": "ဖိုင်များ", - "desktop.server.local": "ပြည်တွင်းဆာဗာ", "desktop.picker.error.notSelected": "ဖိုင်ကို ရွေးချယ်သူမှ ရွေးချယ်မထားပါ။", "desktop.picker.error.sizeLimit": "ရွေးချယ်ထားသော ပူးတွဲပါဖိုင်များသည် {{limit}} MB ကန့်သတ်ချက်ထက် ကျော်လွန်ပါသည်။", "command.category.suggested": "အကြံပြုထားသည်။", diff --git a/packages/app/src/runtime/i18n/ne.ts b/packages/app/src/runtime/i18n/ne.ts index 8236d78a86d..e6a94c4494d 100644 --- a/packages/app/src/runtime/i18n/ne.ts +++ b/packages/app/src/runtime/i18n/ne.ts @@ -63,7 +63,6 @@ export const dict = { "desktop.dialog.chooseFile": "एउटा फाइल छान्नुहोस्", "desktop.dialog.saveFile": "फाइल बचत गर्नुहोस्", "desktop.dialog.files": "फाइलहरू", - "desktop.server.local": "स्थानीय सर्भर", "desktop.picker.error.notSelected": "फाइल चयनकर्ता द्वारा चयन गरिएको थिएन", "desktop.picker.error.sizeLimit": "चयन गरिएका संलग्नहरू {{limit}} MB सीमा नाघ्छन्", "command.category.suggested": "सिफारिस गर्नुभयो", diff --git a/packages/app/src/runtime/i18n/nl.ts b/packages/app/src/runtime/i18n/nl.ts index 31c25d946cd..912e890bacc 100644 --- a/packages/app/src/runtime/i18n/nl.ts +++ b/packages/app/src/runtime/i18n/nl.ts @@ -265,7 +265,6 @@ export const dict = { "desktop.dialog.chooseFile": "Kies een bestand", "desktop.dialog.saveFile": "Bestand opslaan", "desktop.dialog.files": "Bestanden", - "desktop.server.local": "Lokale server", "desktop.picker.error.notSelected": "Er is geen bestand geselecteerd in de bestandskiezer", "desktop.picker.error.sizeLimit": "De geselecteerde bijlagen overschrijden de limiet van {{limit}} MB", "command.category.suggested": "Voorgesteld", diff --git a/packages/app/src/runtime/i18n/no.ts b/packages/app/src/runtime/i18n/no.ts index b81d67e30e8..731b248421e 100644 --- a/packages/app/src/runtime/i18n/no.ts +++ b/packages/app/src/runtime/i18n/no.ts @@ -260,7 +260,6 @@ export const dict = { "desktop.dialog.chooseFile": "Velg en fil", "desktop.dialog.saveFile": "Lagre fil", "desktop.dialog.files": "Filer", - "desktop.server.local": "Lokal server", "desktop.picker.error.notSelected": "Ingen fil ble valgt i filvelgeren", "desktop.picker.error.sizeLimit": "De valgte vedleggene overskrider grensen på {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/pa.ts b/packages/app/src/runtime/i18n/pa.ts index b44d36882bc..53b5bc63b77 100644 --- a/packages/app/src/runtime/i18n/pa.ts +++ b/packages/app/src/runtime/i18n/pa.ts @@ -62,7 +62,6 @@ export const dict = { "desktop.dialog.chooseFile": "فائل چنو", "desktop.dialog.saveFile": "فائل محفوظ کرو", "desktop.dialog.files": "فائلاں", - "desktop.server.local": "مقامی سرور", "desktop.picker.error.notSelected": "چونکار ولوں فائل نئیں چنی گئی", "desktop.picker.error.sizeLimit": "چنیاں منسلک فائلاں \u2068{{limit}}\u2069 MB دی حد توں ودھ نیں", diff --git a/packages/app/src/runtime/i18n/pl.ts b/packages/app/src/runtime/i18n/pl.ts index a640588bb28..1ce336a9bd4 100644 --- a/packages/app/src/runtime/i18n/pl.ts +++ b/packages/app/src/runtime/i18n/pl.ts @@ -60,7 +60,6 @@ export const dict = { "desktop.dialog.chooseFile": "Wybierz plik", "desktop.dialog.saveFile": "Zapisz plik", "desktop.dialog.files": "Pliki", - "desktop.server.local": "Serwer lokalny", "desktop.picker.error.notSelected": "Nie wybrano pliku w oknie wyboru", "desktop.picker.error.sizeLimit": "Wybrane załączniki przekraczają limit {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/ro.ts b/packages/app/src/runtime/i18n/ro.ts index b39808607e7..6d3eada4e7b 100644 --- a/packages/app/src/runtime/i18n/ro.ts +++ b/packages/app/src/runtime/i18n/ro.ts @@ -58,7 +58,6 @@ export const dict = { "desktop.dialog.chooseFile": "Alege un fișier", "desktop.dialog.saveFile": "Salvează fișierul", "desktop.dialog.files": "Fișiere", - "desktop.server.local": "Server local", "desktop.picker.error.notSelected": "Fișierul nu a fost selectat din selector", "desktop.picker.error.sizeLimit": "Atașamentele selectate depășesc limita de {{limit}} MB", "command.category.suggested": "Sugerat", diff --git a/packages/app/src/runtime/i18n/ru.ts b/packages/app/src/runtime/i18n/ru.ts index 3a1a5730633..f114f4c4ef6 100644 --- a/packages/app/src/runtime/i18n/ru.ts +++ b/packages/app/src/runtime/i18n/ru.ts @@ -60,7 +60,6 @@ export const dict = { "desktop.dialog.chooseFile": "Выберите файл", "desktop.dialog.saveFile": "Сохранить файл", "desktop.dialog.files": "Файлы", - "desktop.server.local": "Локальный сервер", "desktop.picker.error.notSelected": "В средстве выбора не выбран файл", "desktop.picker.error.sizeLimit": "Размер выбранных вложений превышает лимит {{limit}} МБ", diff --git a/packages/app/src/runtime/i18n/si.ts b/packages/app/src/runtime/i18n/si.ts index 3184879fb02..e9e9a3216ae 100644 --- a/packages/app/src/runtime/i18n/si.ts +++ b/packages/app/src/runtime/i18n/si.ts @@ -62,7 +62,6 @@ export const dict = { "desktop.dialog.chooseFile": "ගොනුවක් තෝරන්න", "desktop.dialog.saveFile": "ගොනුව සුරකින්න", "desktop.dialog.files": "ගොනු", - "desktop.server.local": "දේශීය සේවාදායකය", "desktop.picker.error.notSelected": "ගොනුව තෝරන්නා විසින් තෝරාගෙන නොමැත", "desktop.picker.error.sizeLimit": "තෝරාගත් ඇමුණුම් {{limit}} MB සීමාව ඉක්මවයි", "command.category.suggested": "යෝජනා කර ඇත", diff --git a/packages/app/src/runtime/i18n/sk.ts b/packages/app/src/runtime/i18n/sk.ts index 6b3dfc97db5..8cecde766b4 100644 --- a/packages/app/src/runtime/i18n/sk.ts +++ b/packages/app/src/runtime/i18n/sk.ts @@ -84,7 +84,6 @@ export const dict = { "desktop.dialog.chooseFile": "Vyberte súbor", "desktop.dialog.saveFile": "Uložiť súbor", "desktop.dialog.files": "Súbory", - "desktop.server.local": "Lokálny server", "desktop.picker.error.notSelected": "Súbor nebol vybraný v dialógu", "desktop.picker.error.sizeLimit": "Vybrané prílohy presahujú limit {{limit}} MB", "command.category.suggested": "Navrhované", diff --git a/packages/app/src/runtime/i18n/sl.ts b/packages/app/src/runtime/i18n/sl.ts index 483c2039c2d..ba12f69fb4f 100644 --- a/packages/app/src/runtime/i18n/sl.ts +++ b/packages/app/src/runtime/i18n/sl.ts @@ -84,7 +84,6 @@ export const dict = { "desktop.dialog.chooseFile": "Izberite datoteko", "desktop.dialog.saveFile": "Shrani datoteko", "desktop.dialog.files": "Datoteke", - "desktop.server.local": "Lokalni strežnik", "desktop.picker.error.notSelected": "Izbirnik ni izbral datoteke", "desktop.picker.error.sizeLimit": "Izbrane priloge presegajo omejitev {{limit}} MB", "command.category.suggested": "Predlagano", diff --git a/packages/app/src/runtime/i18n/sq.ts b/packages/app/src/runtime/i18n/sq.ts index aba2130f26b..4e4cdb4e19b 100644 --- a/packages/app/src/runtime/i18n/sq.ts +++ b/packages/app/src/runtime/i18n/sq.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Zgjidhni një skedar", "desktop.dialog.saveFile": "Ruaj skedarin", "desktop.dialog.files": "Skedarët", - "desktop.server.local": "Server lokal", "desktop.picker.error.notSelected": "Skedari nuk u zgjodh nga zgjedhësi", "desktop.picker.error.sizeLimit": "Bashkëngjitjet e zgjedhura tejkalojnë kufirin {{limit}} MB", "command.category.suggested": "Sugjeruar", diff --git a/packages/app/src/runtime/i18n/sr.ts b/packages/app/src/runtime/i18n/sr.ts index 2ebccafdde1..c9978ae3923 100644 --- a/packages/app/src/runtime/i18n/sr.ts +++ b/packages/app/src/runtime/i18n/sr.ts @@ -72,7 +72,6 @@ export const dict = { "desktop.dialog.chooseFile": "Изаберите датотеку", "desktop.dialog.saveFile": "Сачувај датотеку", "desktop.dialog.files": "датотеке", - "desktop.server.local": "Локални сервер", "desktop.picker.error.notSelected": "Бирач није изабрао датотеку", "desktop.picker.error.sizeLimit": "Изабрани прилози премашују ограничење од {{limit}} МБ", "command.category.suggested": "Предложено", diff --git a/packages/app/src/runtime/i18n/sv.ts b/packages/app/src/runtime/i18n/sv.ts index d271c2ab811..2a36f5010b4 100644 --- a/packages/app/src/runtime/i18n/sv.ts +++ b/packages/app/src/runtime/i18n/sv.ts @@ -259,7 +259,6 @@ export const dict = { "desktop.dialog.chooseFile": "Välj en fil", "desktop.dialog.saveFile": "Spara fil", "desktop.dialog.files": "Filer", - "desktop.server.local": "Lokal server", "desktop.picker.error.notSelected": "Ingen fil valdes i filväljaren", "desktop.picker.error.sizeLimit": "De valda bilagorna överskrider gränsen på {{limit}} MB", "command.category.suggested": "Föreslagna", diff --git a/packages/app/src/runtime/i18n/tg.ts b/packages/app/src/runtime/i18n/tg.ts index 5429030763c..b57443c8e2a 100644 --- a/packages/app/src/runtime/i18n/tg.ts +++ b/packages/app/src/runtime/i18n/tg.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Файлро интихоб кунед", "desktop.dialog.saveFile": "Файлро захира кунед", "desktop.dialog.files": "Файлҳо", - "desktop.server.local": "Сервери маҳаллӣ", "desktop.picker.error.notSelected": "Файлро интихобкунанда интихоб накардааст", "desktop.picker.error.sizeLimit": "Замимаҳои интихобшуда аз ҳадди {{limit}} МБ зиёданд", "command.category.suggested": "Тавсия дода мешавад", diff --git a/packages/app/src/runtime/i18n/th.ts b/packages/app/src/runtime/i18n/th.ts index 78ae9b32c98..cd492d237fa 100644 --- a/packages/app/src/runtime/i18n/th.ts +++ b/packages/app/src/runtime/i18n/th.ts @@ -60,7 +60,6 @@ export const dict = { "desktop.dialog.chooseFile": "เลือกไฟล์", "desktop.dialog.saveFile": "บันทึกไฟล์", "desktop.dialog.files": "ไฟล์", - "desktop.server.local": "เซิร์ฟเวอร์ภายในเครื่อง", "desktop.picker.error.notSelected": "ไม่ได้เลือกไฟล์จากตัวเลือกไฟล์", "desktop.picker.error.sizeLimit": "ไฟล์แนบที่เลือกมีขนาดเกินขีดจำกัด {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/tk.ts b/packages/app/src/runtime/i18n/tk.ts index 020ed2013fc..a87be159e9d 100644 --- a/packages/app/src/runtime/i18n/tk.ts +++ b/packages/app/src/runtime/i18n/tk.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Faýl saýlaň", "desktop.dialog.saveFile": "Faýly ýazdyryň", "desktop.dialog.files": "Faýllar", - "desktop.server.local": "Serli serwer", "desktop.picker.error.notSelected": "Faýl saýlaýjy tarapyndan saýlanmady", "desktop.picker.error.sizeLimit": "Saýlanan goşundylar {{limit}} MB çäginden ýokary", "command.category.suggested": "Teklip edilýär", diff --git a/packages/app/src/runtime/i18n/tr.ts b/packages/app/src/runtime/i18n/tr.ts index 6e66f3d3abf..1c18b7da997 100644 --- a/packages/app/src/runtime/i18n/tr.ts +++ b/packages/app/src/runtime/i18n/tr.ts @@ -72,7 +72,6 @@ export const dict = { "desktop.dialog.chooseFile": "Bir dosya seçin", "desktop.dialog.saveFile": "Dosyayı kaydedin", "desktop.dialog.files": "Dosyalar", - "desktop.server.local": "Yerel sunucu", "desktop.picker.error.notSelected": "Dosya seçici tarafından dosya seçilmedi", "desktop.picker.error.sizeLimit": "Seçilen ekler {{limit}} MB sınırını aşıyor", diff --git a/packages/app/src/runtime/i18n/uk.ts b/packages/app/src/runtime/i18n/uk.ts index 180a8208b11..915ad98ad11 100644 --- a/packages/app/src/runtime/i18n/uk.ts +++ b/packages/app/src/runtime/i18n/uk.ts @@ -87,7 +87,6 @@ export const dict = { "desktop.dialog.chooseFile": "Виберіть файл", "desktop.dialog.saveFile": "Зберегти файл", "desktop.dialog.files": "Файли", - "desktop.server.local": "Локальний сервер", "desktop.picker.error.notSelected": "Засіб вибору не повернув вибраний файл", "desktop.picker.error.sizeLimit": "Вибрані вкладення перевищують обмеження в {{limit}} МБ", diff --git a/packages/app/src/runtime/i18n/ur.ts b/packages/app/src/runtime/i18n/ur.ts index 84c9c205ee9..f8f44aed425 100644 --- a/packages/app/src/runtime/i18n/ur.ts +++ b/packages/app/src/runtime/i18n/ur.ts @@ -63,7 +63,6 @@ export const dict = { "desktop.dialog.chooseFile": "فائل منتخب کریں", "desktop.dialog.saveFile": "فائل محفوظ کریں", "desktop.dialog.files": "فائلیں", - "desktop.server.local": "مقامی سرور", "desktop.picker.error.notSelected": "فائل چنندہ میں کوئی فائل منتخب نہیں کی گئی", "desktop.picker.error.sizeLimit": "منتخب منسلکات \u2068{{limit}}\u2069 MB کی حد سے زیادہ ہیں", diff --git a/packages/app/src/runtime/i18n/uz.ts b/packages/app/src/runtime/i18n/uz.ts index b426f806907..13a7cc14007 100644 --- a/packages/app/src/runtime/i18n/uz.ts +++ b/packages/app/src/runtime/i18n/uz.ts @@ -59,7 +59,6 @@ export const dict = { "desktop.dialog.chooseFile": "Faylni tanlang", "desktop.dialog.saveFile": "Faylni saqlash", "desktop.dialog.files": "Fayllar", - "desktop.server.local": "Mahalliy server", "desktop.picker.error.notSelected": "Fayl tanlovchi tomonidan tanlanmagan", "desktop.picker.error.sizeLimit": "Tanlangan biriktirmalar {{limit}} MB chegarasidan oshib ketadi", "command.category.suggested": "Tavsiya etilgan", diff --git a/packages/app/src/runtime/i18n/vi.ts b/packages/app/src/runtime/i18n/vi.ts index 4a2d5d257db..a05534744a5 100644 --- a/packages/app/src/runtime/i18n/vi.ts +++ b/packages/app/src/runtime/i18n/vi.ts @@ -60,7 +60,6 @@ export const dict = { "desktop.dialog.chooseFile": "Chọn tệp", "desktop.dialog.saveFile": "Lưu tệp", "desktop.dialog.files": "Tệp", - "desktop.server.local": "Máy chủ cục bộ", "desktop.picker.error.notSelected": "Không có tệp nào được chọn trong bộ chọn tệp", "desktop.picker.error.sizeLimit": "Các tệp đính kèm đã chọn vượt quá giới hạn {{limit}} MB", diff --git a/packages/app/src/runtime/i18n/zh.ts b/packages/app/src/runtime/i18n/zh.ts index 2499e129c92..74d2de70066 100644 --- a/packages/app/src/runtime/i18n/zh.ts +++ b/packages/app/src/runtime/i18n/zh.ts @@ -64,7 +64,6 @@ export const dict = { "desktop.dialog.chooseFile": "选择文件", "desktop.dialog.saveFile": "保存文件", "desktop.dialog.files": "文件", - "desktop.server.local": "本地服务器", "desktop.picker.error.notSelected": "文件选择器未选择文件", "desktop.picker.error.sizeLimit": "所选附件超过 {{limit}} MB 的限制", diff --git a/packages/app/src/runtime/i18n/zht.ts b/packages/app/src/runtime/i18n/zht.ts index 370d68c100d..47284245530 100644 --- a/packages/app/src/runtime/i18n/zht.ts +++ b/packages/app/src/runtime/i18n/zht.ts @@ -64,7 +64,6 @@ export const dict = { "desktop.dialog.chooseFile": "選擇檔案", "desktop.dialog.saveFile": "儲存檔案", "desktop.dialog.files": "檔案", - "desktop.server.local": "本機伺服器", "desktop.picker.error.notSelected": "檔案選擇器未選取檔案", "desktop.picker.error.sizeLimit": "所選附件超過 {{limit}} MB 的限制", diff --git a/packages/app/src/runtime/server/health.ts b/packages/app/src/runtime/server/health.ts index 1a8f619d041..94b17c23f37 100644 --- a/packages/app/src/runtime/server/health.ts +++ b/packages/app/src/runtime/server/health.ts @@ -8,6 +8,8 @@ import { createStore, reconcile } from "solid-js/store" export type ServerHealth = { healthy: boolean version?: string + /** The server machine's name, when the server reports one. */ + hostname?: string incompatible?: boolean checking?: boolean unauthorized?: boolean @@ -122,7 +124,7 @@ export async function checkServerHealth( headers, }) .server.info({ signal }) - .then((status) => ({ data: { healthy: true as const, version: status.version } })) + .then((status) => ({ data: { healthy: true as const, version: status.version, hostname: status.hostname } })) .catch((error) => ({ error })) if ("data" in current) return current.data diff --git a/packages/app/src/runtime/server/persistence.test.ts b/packages/app/src/runtime/server/persistence.test.ts index 78934a506d9..10ed3af86e6 100644 --- a/packages/app/src/runtime/server/persistence.test.ts +++ b/packages/app/src/runtime/server/persistence.test.ts @@ -3,7 +3,7 @@ import { Schema } from "effect" import { ModelState, ServerState } from "./persistence" import { Persistence } from "@/runtime/persistence/schema" -const initial = { list: [], hidden: {}, lastProjectID: {}, usedProjectIDs: {}, projects: {} } +const initial = { list: [], hidden: {}, lastProjectID: {}, usedProjectIDs: {}, hostnames: {}, projects: {} } function serverSchema() { return Persistence.withInitial(ServerState, initial) @@ -47,6 +47,7 @@ describe("server persistence schema", () => { hidden: {}, lastProjectID: { local: "project" }, usedProjectIDs: {}, + hostnames: {}, projects: { local: [{ worktree: "/project" }] }, }) expect(input.list[1]).toHaveProperty("username", "legacy") diff --git a/packages/app/src/runtime/server/persistence.ts b/packages/app/src/runtime/server/persistence.ts index 33fd86b2065..ec87717c524 100644 --- a/packages/app/src/runtime/server/persistence.ts +++ b/packages/app/src/runtime/server/persistence.ts @@ -44,6 +44,11 @@ export const ServerState = Persistence.struct({ Schema.mutableKey(Schema.String.pipe(Schema.catchDecoding(() => Effect.succeed(Option.none())))), ), usedProjectIDs: Persistence.record(Persistence.array(Schema.String)), + // The last hostname each server reported, so its name shows before the first health check answers. + hostnames: Schema.Record( + Schema.String, + Schema.mutableKey(Schema.String.pipe(Schema.catchDecoding(() => Effect.succeed(Option.none())))), + ), projects: Persistence.record(Persistence.array(Persistence.struct({ worktree: Schema.String }))), }) diff --git a/packages/app/src/runtime/server/registry.test.ts b/packages/app/src/runtime/server/registry.test.ts index 2bca28c8247..e7b4fa286df 100644 --- a/packages/app/src/runtime/server/registry.test.ts +++ b/packages/app/src/runtime/server/registry.test.ts @@ -1,5 +1,5 @@ import { expect, test } from "bun:test" -import { canRemoveServer, createServerProjects, resolveServerList, ServerConnection } from "./registry" +import { canRemoveServer, createServerProjects, resolveServerList, ServerConnection, serverLabel } from "./registry" import { Schema } from "effect" import { ServerState } from "./persistence" import { createStore } from "solid-js/store" @@ -12,10 +12,24 @@ function serverSchema() { hidden: {}, lastProjectID: {}, usedProjectIDs: {}, + hostnames: {}, projects: {}, }) } +test("the current server is named by its hostname, a custom name wins, and other servers show their address", () => { + const sidecar: ServerConnection.Sidecar = { type: "sidecar", variant: "base", http: { url: "http://127.0.0.1:4096" } } + const remote: ServerConnection.Http = { type: "http", http: { url: "https://apollo.example.test:4096/" } } + const current = { hostname: "hailmary", fallback: "This computer" } + + expect(serverLabel(sidecar, current)).toBe("hailmary") + expect(serverLabel(sidecar, { fallback: "This computer" })).toBe("This computer") + expect(serverLabel(sidecar, { hostname: "", fallback: "This computer" })).toBe("This computer") + expect(serverLabel({ ...sidecar, displayName: "Studio" }, current)).toBe("Studio") + expect(serverLabel(remote)).toBe("apollo.example.test:4096") + expect(serverLabel({ ...remote, displayName: "apollo" })).toBe("apollo") +}) + test("startup auth_token credentials override a persisted same-url server; without one the persisted password stays", () => { const url = "https://server.example.test" const decode = Schema.decodeUnknownSync(serverSchema()) diff --git a/packages/app/src/runtime/server/registry.tsx b/packages/app/src/runtime/server/registry.tsx index f670156b3c9..559ae4bbcc0 100644 --- a/packages/app/src/runtime/server/registry.tsx +++ b/packages/app/src/runtime/server/registry.tsx @@ -1,4 +1,5 @@ import { createSimpleContext } from "@opencode/ui/context" +import { useLanguage } from "@/runtime/i18n/language" import { batch, createMemo } from "solid-js" import { reconcile, type SetStoreFunction, type Store } from "solid-js/store" import { Persist, persisted } from "@/runtime/persistence/storage" @@ -25,6 +26,18 @@ export function serverName(conn?: ServerConnection.Any, ignoreDisplayName = fals return conn.http.url.replace(/^https?:\/\//, "").replace(/\/+$/, "") } +/** + * What switchers and titles call a server: a custom name wins, then, for the server the app runs beside, its + * hostname or the fallback; other servers show their address. + */ +export function serverLabel(conn: ServerConnection.Any, current?: { hostname?: string; fallback: string }) { + if (conn.displayName) return conn.displayName + + if (current) return current.hostname || current.fallback + + return serverName(conn) +} + function isLocalHost(url: string) { const host = url.replace(/^https?:\/\//, "").split(":")[0] @@ -194,8 +207,9 @@ export const { use: useServers, provider: ServersProvider } = createSimpleContex previousKey: "server.v3", }, ServerState, - { list: [], hidden: {}, lastProjectID: {}, usedProjectIDs: {}, projects: {} }, + { list: [], hidden: {}, lastProjectID: {}, usedProjectIDs: {}, hostnames: {}, projects: {} }, ) + const language = useLanguage() const allServers = createMemo((): Array => { return resolveServerList({ stored: store.list, props: props.servers }) @@ -246,6 +260,18 @@ export const { use: useServers, provider: ServersProvider } = createSimpleContex return next } + // The desktop sidecar, or the server that served the web app. + const current = (conn: ServerConnection.Any) => + ServerConnection.builtin(conn) || ServerConnection.key(conn) === props.canonicalLocalServer + + const label = (conn: ServerConnection.Any) => + serverLabel( + conn, + current(conn) + ? { hostname: store.hostnames[ServerConnection.key(conn)], fallback: language.t("server.thisComputer") } + : undefined, + ) + return { get list() { return allServers() @@ -266,6 +292,22 @@ export const { use: useServers, provider: ServersProvider } = createSimpleContex remove, canRemove, scope, + current, + /** The name switchers, menus and titles show. */ + label, + /** The name a list row shows next to its item: nothing for the current server or when it is the only one. */ + tag(conn: ServerConnection.Any) { + return allServers().length < 2 || current(conn) ? undefined : label(conn) + }, + /** "This computer" beside the current server's name, unless the name already says it. */ + hint(conn: ServerConnection.Any) { + const text = language.t("server.thisComputer") + + return current(conn) && label(conn) !== text ? text : undefined + }, + setHostname(key: ServerConnection.Key, hostname: string) { + if (store.hostnames[key] !== hostname) setStore("hostnames", key, hostname) + }, projects: { forServer: projectsForServer, }, diff --git a/packages/app/src/runtime/server/runtime.tsx b/packages/app/src/runtime/server/runtime.tsx index 69c148ac125..296cd7889d6 100644 --- a/packages/app/src/runtime/server/runtime.tsx +++ b/packages/app/src/runtime/server/runtime.tsx @@ -86,6 +86,15 @@ export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext( } }) + createEffect(() => { + for (const conn of server.list) { + const key = ServerConnection.key(conn) + const hostname = serverHealth.status[key]?.hostname + + if (hostname) server.setHostname(key, hostname) + } + }) + createEffect(() => { for (const [key] of serverCtxs) { if (serverHealth.status[key]?.unauthorized || !server.list.find((conn) => ServerConnection.key(conn) === key)) diff --git a/packages/app/src/servers/registry/label.tsx b/packages/app/src/servers/registry/label.tsx new file mode 100644 index 00000000000..b103dd046b9 --- /dev/null +++ b/packages/app/src/servers/registry/label.tsx @@ -0,0 +1,23 @@ +import { Show } from "solid-js" +import { type ServerConnection, useServers } from "@/runtime/server/registry" + +/** A server's name; menu rows that choose a server pass `hint` to add a muted "This computer" beside the current one. */ +export function ServerLabel(props: { server?: ServerConnection.Any; name?: string; hint?: boolean; class?: string }) { + const servers = useServers() + + return ( + + + {props.name ?? (props.server ? servers.label(props.server) : "")} + + + {(hint) => ( + + + {hint()} + + )} + + + ) +} diff --git a/packages/app/src/session/route-error.tsx b/packages/app/src/session/route-error.tsx index 59e91a0f3c1..35c2ae741e8 100644 --- a/packages/app/src/session/route-error.tsx +++ b/packages/app/src/session/route-error.tsx @@ -3,7 +3,7 @@ import { createMemo, Show } from "solid-js" import { ErrorPage } from "@/shell/errors/error" import { useLanguage } from "@/runtime/i18n/language" import { useServer } from "@/runtime/server/current" -import { ServerConnection, serverName, useServers } from "@/runtime/server/registry" +import { ServerConnection, useServers } from "@/runtime/server/registry" import { useTabs } from "@/shell/tabs/tabs" import { isLocalSessionNotFoundError, isSessionNotFoundError } from "@/runtime/server/errors" import { ServerUnavailablePanel } from "./server-unavailable-panel" @@ -17,7 +17,7 @@ export function SessionErrorFallback(props: { error: unknown; sessionID?: string const displayServer = createMemo(() => { const conn = server.list.find((item) => ServerConnection.key(item) === props.serverKey) - return conn ? serverName(conn) : props.serverKey + return conn ? server.label(conn) : props.serverKey }) const closeSession = () => { diff --git a/packages/app/src/session/server-unavailable-panel.tsx b/packages/app/src/session/server-unavailable-panel.tsx index 05d5097e6a1..efd79641586 100644 --- a/packages/app/src/session/server-unavailable-panel.tsx +++ b/packages/app/src/session/server-unavailable-panel.tsx @@ -3,11 +3,12 @@ import { Icon } from "@opencode/ui/icon" import { Show } from "solid-js" import { useLanguage } from "@/runtime/i18n/language" import { useServer } from "@/runtime/server/current" -import { serverName } from "@/runtime/server/registry" +import { useServers } from "@/runtime/server/registry" export function ServerUnavailablePanel(props: { reason: "incompatible" | "unreachable"; onClose?: () => void }) { const language = useLanguage() const server = useServer() + const servers = useServers() return (
@@ -22,10 +23,10 @@ export function ServerUnavailablePanel(props: { reason: "incompatible" | "unreac
{props.reason === "incompatible" ? language.t("session.error.incompatible.description", { - server: serverName(server.conn), + server: servers.label(server.conn), version: server.health?.version ?? "1", }) - : language.t("session.error.unreachable.description", { server: serverName(server.conn) })} + : language.t("session.error.unreachable.description", { server: servers.label(server.conn) })}
diff --git a/packages/app/src/settings/servers/inventory.test.ts b/packages/app/src/settings/servers/inventory.test.ts index 6c8bc177188..a8b93f04ec4 100644 --- a/packages/app/src/settings/servers/inventory.test.ts +++ b/packages/app/src/settings/servers/inventory.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test" -import { ServerConnection } from "@/runtime/server/registry" +import { ServerConnection, serverName } from "@/runtime/server/registry" import type { ExtensionServer } from "@/runtime/extension/servers" import { settingsServers } from "./inventory" @@ -23,7 +23,7 @@ const connection: ServerConnection.Extension = { describe("settings server inventory", () => { test("includes contributed servers before they connect", () => { - expect(settingsServers([], [ssh])).toEqual([ + expect(settingsServers([], [ssh], serverName)).toEqual([ { key: ServerConnection.Key.make("ssh:build"), name: "Build server", @@ -34,7 +34,7 @@ describe("settings server inventory", () => { test("joins a ready contributed server to its live connection and withholds it while disconnected", () => { const ready = { ...ssh, entry: { ...ssh.entry, state: "ready" as const } } - expect(settingsServers([connection], [ready])).toEqual([ + expect(settingsServers([connection], [ready], serverName)).toEqual([ { key: ServerConnection.Key.make("ssh:build"), name: "Build server", @@ -42,6 +42,6 @@ describe("settings server inventory", () => { source: ready, }, ]) - expect(settingsServers([connection], [ssh])[0].connection).toBeUndefined() + expect(settingsServers([connection], [ssh], serverName)[0].connection).toBeUndefined() }) }) diff --git a/packages/app/src/settings/servers/inventory.ts b/packages/app/src/settings/servers/inventory.ts index e86a7c4b44c..a712b7b2f11 100644 --- a/packages/app/src/settings/servers/inventory.ts +++ b/packages/app/src/settings/servers/inventory.ts @@ -1,5 +1,5 @@ import { createMemo } from "solid-js" -import { ServerConnection, serverName, useServers } from "@/runtime/server/registry" +import { ServerConnection, useServers } from "@/runtime/server/registry" import { useExtensionServers, type ExtensionServer } from "@/runtime/extension/servers" import type { ServerHealth } from "@/runtime/server/health" @@ -11,7 +11,11 @@ export type SettingsServer = { source?: ExtensionServer } -export function settingsServers(connections: readonly ServerConnection.Any[], sources: readonly ExtensionServer[]) { +export function settingsServers( + connections: readonly ServerConnection.Any[], + sources: readonly ExtensionServer[], + label: (connection: ServerConnection.Any) => string, +) { const byKey = new Map(sources.map((item) => [item.key, item])) const connected = new Set(connections.map(ServerConnection.key)) @@ -22,7 +26,7 @@ export function settingsServers(connections: readonly ServerConnection.Any[], so return { key, - name: source?.entry.name ?? (serverName(connection) || key), + name: source?.entry.name ?? (label(connection) || key), connection: source && source.entry.state !== "ready" ? undefined : connection, source, } @@ -51,7 +55,7 @@ export function useSettingsServers() { const servers = useServers() const extensions = useExtensionServers() - return createMemo(() => settingsServers(servers.list, extensions.entries())) + return createMemo(() => settingsServers(servers.list, extensions.entries(), servers.label)) } /** Whether a server's pages can load: it runs and its last health check did not fail. */ diff --git a/packages/app/src/settings/servers/servers.tsx b/packages/app/src/settings/servers/servers.tsx index dd3af417ec9..2bbb8abf192 100644 --- a/packages/app/src/settings/servers/servers.tsx +++ b/packages/app/src/settings/servers/servers.tsx @@ -6,7 +6,7 @@ import { ServerHealthIndicator } from "@/servers/registry/row" import { ExtensionServerRow } from "@/servers/registry/extension-row" import { AddServerMenu } from "@/servers/registry/add-menu" import { useLanguage } from "@/runtime/i18n/language" -import { ServerConnection, serverName } from "@/runtime/server/registry" +import { ServerConnection } from "@/runtime/server/registry" import { useServerCollectionController } from "@/servers/registry/controller" import { DialogServer } from "@/servers/connect/dialog" import { SettingsList } from "@/settings/list" @@ -140,7 +140,7 @@ function ServerConnectionRow(props: { entry: SettingsServer; onServerChange?: (s
- {serverName(server()) || props.entry.key} + {props.entry.name} {server().http.url} diff --git a/packages/app/src/settings/servers/switcher.tsx b/packages/app/src/settings/servers/switcher.tsx index e4932190caf..336d691882c 100644 --- a/packages/app/src/settings/servers/switcher.tsx +++ b/packages/app/src/settings/servers/switcher.tsx @@ -6,6 +6,7 @@ import { useLanguage } from "@/runtime/i18n/language" import { useGlobal } from "@/runtime/server/runtime" import type { ServerHealth } from "@/runtime/server/health" import { ServerHealthIndicator } from "@/servers/registry/row" +import { ServerLabel } from "@/servers/registry/label" import { useSettingsSurface } from "@/settings/surface" import { settingsServerReachable, useSettingsServers, type SettingsServer } from "./inventory" @@ -31,7 +32,11 @@ export function SettingsServerSwitcher() { > {language.t("settings.server.switcher.label")} - {selected().name} + @@ -41,7 +46,7 @@ export function SettingsServerSwitcher() { {(server) => ( - {server.name} + {language.t("settings.server.switcher.unreachable")} diff --git a/packages/app/src/settings/workspaces/project.tsx b/packages/app/src/settings/workspaces/project.tsx index 0c129c09b39..8a16dc55f3e 100644 --- a/packages/app/src/settings/workspaces/project.tsx +++ b/packages/app/src/settings/workspaces/project.tsx @@ -11,7 +11,7 @@ import { TextInput } from "@opencode/ui/text-input" import { For, Show, createMemo, type Component } from "solid-js" import { useLanguage } from "@/runtime/i18n/language" import type { LocalProject } from "@/shell/state/layout" -import { ServerConnection, serverName } from "@/runtime/server/registry" +import { type ServerConnection, useServers } from "@/runtime/server/registry" import { useSettingsServers } from "@/settings/servers/inventory" import { useServerCtx } from "@/runtime/server/runtime" import { projectSettingsKey, useSettings } from "@/settings/model" @@ -31,6 +31,7 @@ export const SettingsProjectGeneral: Component<{ const language = useLanguage() const model = createEditProjectModel(props) const servers = useSettingsServers() + const registry = useServers() return ( <> @@ -53,7 +54,7 @@ export const SettingsProjectGeneral: Component<{ 1}>
diff --git a/packages/app/src/shell/commands/session-search.tsx b/packages/app/src/shell/commands/session-search.tsx index 4c98bba8cda..71a7062682a 100644 --- a/packages/app/src/shell/commands/session-search.tsx +++ b/packages/app/src/shell/commands/session-search.tsx @@ -2,7 +2,7 @@ import { useDialog } from "@opencode/ui/context/dialog" import { startTransition } from "solid-js" import { useGlobal } from "@/runtime/server/runtime" import { useLanguage } from "@/runtime/i18n/language" -import { ServerConnection, serverName, useServers } from "@/runtime/server/registry" +import { ServerConnection, useServers } from "@/runtime/server/registry" import { useTabs } from "@/shell/tabs/tabs" import { createServerSessionEntries, type CommandPaletteEntry } from "./palette" import { CommandPaletteView } from "./dialog" @@ -14,7 +14,8 @@ export function DialogSessionSearch() { const global = useGlobal() const language = useLanguage() const tabs = useTabs() - const servers = useServers().visible.filter( + const registry = useServers() + const servers = registry.visible.filter( (conn) => global.servers.health[ServerConnection.key(conn)]?.healthy !== false, ) @@ -31,16 +32,15 @@ export function DialogSessionSearch() { recentLimit: RECENT_LIMIT, }) - if (servers.length < 2) return load + const tag = registry.tag(conn) + + if (servers.length < 2 || !tag) return load return (query: string) => load(query).then((entries) => entries.map((entry) => ({ ...entry, - description: language.t("palette.session.location", { - project: entry.description ?? "", - server: serverName(conn), - }), + description: language.t("palette.session.location", { project: entry.description ?? "", server: tag }), })), ) }) diff --git a/packages/app/src/shell/titlebar/inbox.tsx b/packages/app/src/shell/titlebar/inbox.tsx index 59a43c02aaf..239cb0252d9 100644 --- a/packages/app/src/shell/titlebar/inbox.tsx +++ b/packages/app/src/shell/titlebar/inbox.tsx @@ -13,7 +13,7 @@ import { TextShimmer } from "@opencode/ui/text-shimmer" import { Tooltip } from "@opencode/ui/tooltip" import { displayName } from "@opencode/ui/project-avatar" import { useGlobal } from "@/runtime/server/runtime" -import { ServerConnection, serverName, useServers } from "@/runtime/server/registry" +import { ServerConnection, useServers } from "@/runtime/server/registry" import { useLanguage } from "@/runtime/i18n/language" import { Persist, persisted } from "@/runtime/persistence/storage" import { projectSettingsKey, useSettings } from "@/settings/model" @@ -486,6 +486,7 @@ function InboxRow(props: { onDelete: () => void }) { const language = useLanguage() + const servers = useServers() const project = createMemo(() => props.entry.ctx.projects.forSession(props.entry.session)) const status = () => props.entry.status const unread = () => status() !== "ready" && status() !== "working" @@ -494,8 +495,8 @@ function InboxRow(props: { const branch = () => props.entry.ctx.data.location.vcs.info(props.entry.session.location)?.branch.current ?? undefined - // Only sessions on a remote server are marked. - const remote = () => !props.entry.ctx.isLocal + // Sessions on the current server are not marked. + const tag = () => servers.tag(props.entry.conn) const compact = (seconds: number) => { if (seconds < 3600) return language.plural("sidebar.inbox.elapsed.minutes", Math.floor(seconds / 60)) @@ -587,7 +588,7 @@ function InboxRow(props: { > {sessionTabTitle(props.entry.session.title, language.t("session.tab.session"))}
- + - - - - + + {(name) => ( + + + + )} diff --git a/packages/app/src/shell/titlebar/tab-nav.tsx b/packages/app/src/shell/titlebar/tab-nav.tsx index ce3905553b0..5384e301a2c 100644 --- a/packages/app/src/shell/titlebar/tab-nav.tsx +++ b/packages/app/src/shell/titlebar/tab-nav.tsx @@ -9,7 +9,7 @@ import { Icon } from "@opencode/ui/icon" import { Menu } from "@opencode/ui/menu" import { useServerCtx } from "@/runtime/server/runtime" import { useLanguage } from "@/runtime/i18n/language" -import { ServerConnection, serverName, useServers } from "@/runtime/server/registry" +import { ServerConnection, useServers } from "@/runtime/server/registry" import { displayName } from "@opencode/ui/project-avatar" import { SessionTabAvatarView } from "@/shell/layout/session-tab-avatar" import { SessionProgressIndicatorV2 } from "@opencode/session-ui/v2/session-progress-indicator-v2" @@ -94,12 +94,12 @@ export function TabNavItem(props: { return home ? session.location.directory.replace(home, "~") : session.location.directory }) - // Only label the server when multiple servers are connected. + // Only label the server when multiple servers are connected, and never the current one. const serverLabel = createMemo(() => { if (servers.list.length <= 1) return const conn = servers.list.find((item) => ServerConnection.key(item) === props.server) - return conn ? serverName(conn) : undefined + return conn ? servers.tag(conn) : undefined }) // Like the TUI, a prompt sent to a background tab's session pulses the tab once. diff --git a/packages/client/src/effect/api/api.ts b/packages/client/src/effect/api/api.ts index d224fa4aa78..911ee1a0819 100644 --- a/packages/client/src/effect/api/api.ts +++ b/packages/client/src/effect/api/api.ts @@ -45,6 +45,7 @@ import type { Config } from "@opencode/schema/config" export type ServerInfoOutput = { readonly version: string readonly pid: number + readonly hostname?: string | undefined readonly urls: ReadonlyArray readonly paths: { readonly tmp: string } readonly capabilities?: { readonly persistentPty?: boolean | undefined } | undefined diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts index 02c038b8ae7..050b3d4ab24 100644 --- a/packages/client/src/promise/generated/types.ts +++ b/packages/client/src/promise/generated/types.ts @@ -3,6 +3,7 @@ export type JsonValue = null | boolean | number | string | Array | { export type ServerInfo = { version: string pid: number + hostname?: string | undefined urls: Array paths: { tmp: string } capabilities?: { persistentPty?: boolean | undefined } | undefined diff --git a/packages/desktop/src/renderer/desktop-app.tsx b/packages/desktop/src/renderer/desktop-app.tsx index 5bbe0548d9c..93becc8ea12 100644 --- a/packages/desktop/src/renderer/desktop-app.tsx +++ b/packages/desktop/src/renderer/desktop-app.tsx @@ -10,7 +10,6 @@ import { ServerConnection, useCommand, useCurrentRoute, - useLanguage, useExtensionServers, useTabs, type LayoutRoute, @@ -84,8 +83,6 @@ export function DesktopApp(props: { api: ElectronAPI; version: string }) { function ReadyApp() { const extensions = useExtensionServers() - const language = useLanguage() - const ready = createMemo(() => !firstLaunch.loading && !sidecar.loading && !locale.loading && extensions.ready()) const servers = createMemo(() => { @@ -94,7 +91,6 @@ export function DesktopApp(props: { api: ElectronAPI; version: string }) { if (data) { list.push({ - displayName: language.t("desktop.server.local"), type: "sidecar", variant: "base", http: sidecarHttp(data), diff --git a/packages/gui-extensions/src/ssh/dialog.stories.tsx b/packages/gui-extensions/src/ssh/dialog.stories.tsx index 1d706e85061..ca8c7be3787 100644 --- a/packages/gui-extensions/src/ssh/dialog.stories.tsx +++ b/packages/gui-extensions/src/ssh/dialog.stories.tsx @@ -246,6 +246,7 @@ function AuthenticationHome() { selection={{ server: ServerConnection.key(server) }} homedir="/home/user" serverHealth={() => ({ healthy: ssh.servers[0]?.stage === "ready" })} + serverLabel={(server) => server.displayName ?? server.http.url} projectsForServer={() => projects} collapsed={() => false} canRevealProject={() => false} diff --git a/packages/protocol/openapi.json b/packages/protocol/openapi.json index bf4727d04d8..a99dbd8a553 100644 --- a/packages/protocol/openapi.json +++ b/packages/protocol/openapi.json @@ -871,6 +871,23 @@ }, "required": false }, + { + "name": "archived", + "in": "query", + "schema": { + "anyOf": [ + { + "type": "string", + "enum": ["true", "false"] + }, + { + "type": "null" + } + ], + "description": "Filter by archive state. Use true to return only archived sessions or false to exclude them. Omit to include both." + }, + "required": false + }, { "name": "directory", "in": "query", @@ -1715,6 +1732,17 @@ "type": "null" } ] + }, + "archived": { + "anyOf": [ + { + "type": "boolean" + }, + { + "type": "null" + } + ], + "description": "Archive the session with true or restore it with false. Repeating the current state is a no-op." } }, "additionalProperties": false @@ -18293,6 +18321,16 @@ "type": "integer", "minimum": 0 }, + "hostname": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ] + }, "urls": { "type": "array", "items": { diff --git a/packages/protocol/src/groups/server.ts b/packages/protocol/src/groups/server.ts index 4b4cab189bf..d78813bfc8b 100644 --- a/packages/protocol/src/groups/server.ts +++ b/packages/protocol/src/groups/server.ts @@ -6,6 +6,8 @@ export const ServerInfo = Schema.Struct({ version: Schema.String, // 0 means the runtime has no OS process identity (e.g. workerd). pid: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)), + // The machine's name, absent where the runtime has none (e.g. workerd). + hostname: Schema.optional(Schema.String), urls: Schema.Array(Schema.String), paths: Schema.Struct({ tmp: Schema.String, diff --git a/packages/server/src/handlers/server.ts b/packages/server/src/handlers/server.ts index d85594b38d4..7487581e70d 100644 --- a/packages/server/src/handlers/server.ts +++ b/packages/server/src/handlers/server.ts @@ -1,3 +1,4 @@ +import { hostname } from "node:os" import { Duration, Effect } from "effect" import { HttpServerRequest, HttpServerResponse } from "effect/http" import { HttpApiBuilder } from "effect/http-api" @@ -20,6 +21,7 @@ export const ServerHandler = HttpApiBuilder.group(Api, "server.server", (handler return { version: info.app.version ?? "unknown", pid: process.pid ?? 0, + hostname: hostname() || undefined, urls: info.urls(), paths: info.paths, capabilities: { persistentPty: PersistentPty.available },