mirror of
https://github.com/anomalyco/opencode.git
synced 2026-11-18 07:12:47 +03:00
feat(app): name the current server by its hostname
The server reports its hostname in /api/info. The current server (the desktop sidecar or the server that served the web app) now shows its hostname instead of "Local Server" or its address; a custom name still wins and "This computer" is the fallback when no hostname is known. Lists omit the current server, and the "This computer" hint appears only in pickers that choose a server. Remotes on localhost addresses no longer lose their tags in the new-session project picker.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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<MockProviderCatalog>
|
||||
integrations?: Resolvable<unknown[]>
|
||||
// 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" },
|
||||
}),
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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) => {
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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) {
|
||||
<Show when={props.servers.length > 1 && server()}>
|
||||
{(server) => (
|
||||
<bdi class="truncate text-v2-text-text-muted opacity-70">
|
||||
{server().displayName ?? new URL(server().http.url).host}
|
||||
{props.serverLabel(server())}
|
||||
</bdi>
|
||||
)}
|
||||
</Show>
|
||||
@@ -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() }}
|
||||
>
|
||||
<span class="min-w-0 overflow-hidden text-ellipsis whitespace-nowrap">
|
||||
{props.server.displayName ?? new URL(props.server.http.url).host}
|
||||
</span>
|
||||
<span class="min-w-0 overflow-hidden text-ellipsis whitespace-nowrap">{props.serverLabel(props.server)}</span>
|
||||
<Show when={props.server.label}>
|
||||
{(label) => (
|
||||
<span
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useCommand } from "@/shell/commands/command"
|
||||
import { useLayout } from "@/shell/state/layout"
|
||||
import { useLanguage } from "@/runtime/i18n/language"
|
||||
import { serverName } from "@/runtime/server/registry"
|
||||
import { useServers } from "@/runtime/server/registry"
|
||||
import { displayName } from "@opencode/ui/project-avatar"
|
||||
import { sessionLabel } from "@/session/title"
|
||||
import { makeEventListener } from "@solid-primitives/event-listener"
|
||||
@@ -17,6 +17,7 @@ export function createHomeSessionSearchController(home: HomeController, sessions
|
||||
const command = useCommand()
|
||||
const language = useLanguage()
|
||||
const layout = useLayout()
|
||||
const servers = useServers()
|
||||
|
||||
const [state, setState] = createStore<{
|
||||
value: string
|
||||
@@ -70,7 +71,7 @@ export function createHomeSessionSearchController(home: HomeController, sessions
|
||||
if (home.server.list().length > 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")
|
||||
|
||||
@@ -414,6 +414,9 @@ function NewSessionLocationDialog(props: {
|
||||
<Icon name={serverIcon(item().server)} class="command-palette-row-icon" />
|
||||
<div class="command-palette-row-text">
|
||||
<span class="command-palette-title">{item().server.name}</span>
|
||||
<Show when={item().server.hint}>
|
||||
{(hint) => <span class="command-palette-description">{hint()}</span>}
|
||||
</Show>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
@@ -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 (
|
||||
<Show when={tagged(props.server)}>
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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": "የሚመከር",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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": "Предложено",
|
||||
|
||||
@@ -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": "প্রস্তাবিত",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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": "ލަފާދީފިއެވެ",
|
||||
|
||||
@@ -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": "བསམ་འཆར།",
|
||||
|
||||
@@ -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": "Προτεινόμενο",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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": "پیشنهاد شده است",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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ð",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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": "מוצע",
|
||||
|
||||
@@ -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 की सीमा से अधिक हैं",
|
||||
|
||||
@@ -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": "Առաջարկված",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
|
||||
@@ -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を超えています",
|
||||
|
||||
@@ -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": "შემოთავაზებულია",
|
||||
|
||||
@@ -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": "បានស្នើ",
|
||||
|
||||
@@ -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 제한을 초과합니다",
|
||||
|
||||
@@ -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": "ແນະນຳ",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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": "Предложено",
|
||||
|
||||
@@ -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": "Санал болгосон",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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": "အကြံပြုထားသည်။",
|
||||
|
||||
@@ -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": "सिफारिस गर्नुभयो",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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 دی حد توں ودھ نیں",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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}} МБ",
|
||||
|
||||
@@ -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": "යෝජනා කර ඇත",
|
||||
|
||||
@@ -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é",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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": "Предложено",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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": "Тавсия дода мешавад",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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}} МБ",
|
||||
|
||||
@@ -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 کی حد سے زیادہ ہیں",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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 的限制",
|
||||
|
||||
@@ -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 的限制",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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 }))),
|
||||
})
|
||||
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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<ServerConnection.Any> => {
|
||||
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,
|
||||
},
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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 (
|
||||
<span data-component="server-label" class={`flex min-w-0 items-center gap-1 ${props.class ?? ""}`}>
|
||||
<bdi dir="auto" class="min-w-0 truncate">
|
||||
{props.name ?? (props.server ? servers.label(props.server) : "")}
|
||||
</bdi>
|
||||
<Show when={props.hint && props.server && servers.hint(props.server)}>
|
||||
{(hint) => (
|
||||
<span data-slot="server-label-hint" class="shrink-0 whitespace-nowrap text-v2-text-text-muted">
|
||||
<span aria-hidden="true">· </span>
|
||||
{hint()}
|
||||
</span>
|
||||
)}
|
||||
</Show>
|
||||
</span>
|
||||
)
|
||||
}
|
||||
@@ -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 = () => {
|
||||
|
||||
@@ -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 (
|
||||
<div class="flex-1 min-h-0 overflow-hidden">
|
||||
@@ -22,10 +23,10 @@ export function ServerUnavailablePanel(props: { reason: "incompatible" | "unreac
|
||||
<div class="text-13-regular text-text-weak max-w-md">
|
||||
{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) })}
|
||||
</div>
|
||||
</div>
|
||||
<Show when={props.onClose}>
|
||||
|
||||
@@ -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()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -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<string>(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. */
|
||||
|
||||
@@ -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
|
||||
<ServerHealthIndicator health={health()} authenticationRequired={!!health()?.unauthorized} />
|
||||
<div class="settings-servers-copy">
|
||||
<bdi class="settings-servers-name" dir="auto">
|
||||
{serverName(server()) || props.entry.key}
|
||||
{props.entry.name}
|
||||
</bdi>
|
||||
<bdi class="settings-servers-meta" dir="ltr">
|
||||
{server().http.url}
|
||||
|
||||
@@ -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() {
|
||||
>
|
||||
<ServerDot health={health(selected())} unreachable={unreachable(selected())} />
|
||||
<span class="settings-server-switcher-label">{language.t("settings.server.switcher.label")}</span>
|
||||
<span class="settings-server-switcher-name">{selected().name}</span>
|
||||
<ServerLabel
|
||||
class="settings-server-switcher-name"
|
||||
server={selected().connection}
|
||||
name={selected().name}
|
||||
/>
|
||||
<Icon name="chevron-down" class="settings-server-switcher-chevron" />
|
||||
</Menu.Trigger>
|
||||
<Menu.Portal>
|
||||
@@ -41,7 +46,7 @@ export function SettingsServerSwitcher() {
|
||||
{(server) => (
|
||||
<Menu.RadioItem value={server.key} closeOnSelect>
|
||||
<ServerDot health={health(server)} unreachable={unreachable(server)} />
|
||||
<span class="settings-server-switcher-option">{server.name}</span>
|
||||
<ServerLabel class="settings-server-switcher-option" server={server.connection} name={server.name} hint />
|
||||
<Show when={unreachable(server)}>
|
||||
<span class="settings-server-switcher-status">
|
||||
{language.t("settings.server.switcher.unreachable")}
|
||||
|
||||
@@ -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<{
|
||||
</h2>
|
||||
<Show when={servers().length > 1}>
|
||||
<button type="button" class="project-settings-server-link" onClick={() => props.onOpenServer()}>
|
||||
<bdi dir="auto">{serverName(props.server) || ServerConnection.key(props.server)}</bdi>
|
||||
<bdi dir="auto">{registry.label(props.server)}</bdi>
|
||||
</button>
|
||||
</Show>
|
||||
</div>
|
||||
|
||||
@@ -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 }),
|
||||
})),
|
||||
)
|
||||
})
|
||||
|
||||
@@ -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"))}
|
||||
</span>
|
||||
<Show when={props.branchLoading || branch() || worktree() || remote()}>
|
||||
<Show when={props.branchLoading || branch() || worktree() || tag()}>
|
||||
<span class="flex h-4 w-full min-w-0 items-center gap-1 text-[12px] leading-4 text-v2-text-text-faint">
|
||||
<Show when={props.branchLoading}>
|
||||
<span
|
||||
@@ -608,10 +609,12 @@ function InboxRow(props: {
|
||||
</Show>
|
||||
</span>
|
||||
</Show>
|
||||
<Show when={remote()}>
|
||||
<Tooltip placement="right" value={serverName(props.entry.conn)} class="ms-auto flex shrink-0">
|
||||
<Icon name="server" size="small" aria-label={serverName(props.entry.conn)} />
|
||||
</Tooltip>
|
||||
<Show when={tag()}>
|
||||
{(name) => (
|
||||
<Tooltip placement="right" value={name()} class="ms-auto flex shrink-0">
|
||||
<Icon name="server" size="small" aria-label={name()} />
|
||||
</Tooltip>
|
||||
)}
|
||||
</Show>
|
||||
</span>
|
||||
</Show>
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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<string>
|
||||
readonly paths: { readonly tmp: string }
|
||||
readonly capabilities?: { readonly persistentPty?: boolean | undefined } | undefined
|
||||
|
||||
@@ -3,6 +3,7 @@ export type JsonValue = null | boolean | number | string | Array<JsonValue> | {
|
||||
export type ServerInfo = {
|
||||
version: string
|
||||
pid: number
|
||||
hostname?: string | undefined
|
||||
urls: Array<string>
|
||||
paths: { tmp: string }
|
||||
capabilities?: { persistentPty?: boolean | undefined } | undefined
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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": {
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 },
|
||||
|
||||
Reference in New Issue
Block a user