diff --git a/packages/app/src/servers/registry/row-menu.tsx b/packages/app/src/servers/registry/row-menu.tsx index e8b01f57d4b..99df529f9f6 100644 --- a/packages/app/src/servers/registry/row-menu.tsx +++ b/packages/app/src/servers/registry/row-menu.tsx @@ -1,15 +1,19 @@ import { Icon } from "@opencode/ui/icon" import { IconButton } from "@opencode/ui/icon-button" import { Menu } from "@opencode/ui/menu" -import { type Component, Show } from "solid-js" +import { type Component, createMemo, For, Show } from "solid-js" import type { ServerActionsController } from "@/servers/registry/controller" import { useLanguage } from "@/runtime/i18n/language" import { ServerConnection } from "@/runtime/server/registry" +import { createShellOptions } from "@/settings/general/behavior" +import type { ShellSettingsController } from "@/settings/general/controllers" export const ServerRowMenu: Component<{ server: ServerConnection.Any domain: ServerActionsController onEdit: (server: ServerConnection.Http) => void + shell?: ShellSettingsController + action?: string open?: boolean onOpenChange?: (open: boolean) => void }> = (props) => { @@ -23,6 +27,8 @@ export const ServerRowMenu: Component<{ canRemove={props.domain.connection.canRemove(key)} canHide={props.domain.connection.canHide(key)} hidden={props.domain.connection.isHidden(key)} + shell={props.shell} + action={props.action} onEdit={props.onEdit} onRemove={() => props.domain.connection.remove(key)} onHide={() => props.domain.connection.setHidden(key, true)} @@ -41,6 +47,9 @@ export function serverMenuLabels(language: ReturnType) { remove: language.t("dialog.server.menu.remove"), hide: language.t("dialog.server.menu.hide"), show: language.t("dialog.server.menu.show"), + shell: language.t("settings.general.row.shell.title"), + shellAuto: language.t("settings.general.row.shell.autoDefault"), + shellTerminalOnly: language.t("settings.general.row.shell.terminalOnly"), } } @@ -50,6 +59,8 @@ export const ServerRowMenuView: Component<{ canRemove: boolean canHide?: boolean hidden?: boolean + shell?: ShellSettingsController + action?: string onEdit: (server: ServerConnection.Http) => void onRemove: () => void onHide?: () => void @@ -68,6 +79,7 @@ export const ServerRowMenuView: Component<{ size="small" icon={} aria-label={props.labels.more} + data-action={props.action} /> @@ -83,6 +95,7 @@ export const ServerRowMenuView: Component<{ > {props.labels.edit} + {(shell) => } {props.labels.show} @@ -99,3 +112,41 @@ export const ServerRowMenuView: Component<{ ) } + +function ShellSubmenu(props: { shell: ShellSettingsController; labels: ReturnType }) { + const options = createMemo(() => + createShellOptions({ shells: props.shell.shells(), current: props.shell.current() }), + ) + + const current = () => options().find((option) => option.value === props.shell.current())?.id ?? "auto" + + return ( + + {props.labels.shell} + + + { + const option = options().find((item) => item.id === id) + + if (option) props.shell.select(option.value) + }} + > + + {(option) => ( + + {option.id === "auto" + ? props.labels.shellAuto + : option.terminalOnly + ? `${option.name} (${props.labels.shellTerminalOnly})` + : option.name} + + )} + + + + + + ) +} diff --git a/packages/app/src/settings/general/general.tsx b/packages/app/src/settings/general/general.tsx index e5b72a2ea81..d0631eeca24 100644 --- a/packages/app/src/settings/general/general.tsx +++ b/packages/app/src/settings/general/general.tsx @@ -69,11 +69,7 @@ const WorkspaceDestinationSetting: Component = () => { ) } -export const ShellSetting: Component<{ - controller: ShellSettingsController - /** Search reveals the row with the default action; the Servers page names the other servers' rows apart. */ - action?: string -}> = (props) => { +export const ShellSetting: Component<{ controller: ShellSettingsController }> = (props) => { const language = useLanguage() const options = createMemo(() => @@ -89,7 +85,7 @@ export const ShellSetting: Component<{ description={language.t("settings.general.row.shell.description")} >