diff --git a/V2_HTTP_API_AUDIT.md b/V2_HTTP_API_AUDIT.md index ba1d3bab223..41d87f221a2 100644 --- a/V2_HTTP_API_AUDIT.md +++ b/V2_HTTP_API_AUDIT.md @@ -101,6 +101,7 @@ Review endpoints in document order. For each endpoint, select one disposition an | [x] 022 | `GET` | `/api/config/preferences` | `config.preferences` | Remove | Redundant special projection of global config. | | [x] 023 | `PATCH` | `/api/config/preferences` | `config.updatePreferences` | Remove | Redundant field-specific config mutation API. | | [ ] 024 | `GET` | `/api/config/shell` | `config.shells` | | | +| [x] 024a | `PATCH` | `/api/experimental/config` | `experimental.config.update` | Change | Experimental global config mutation; initially accepts only `shell`. | ## Group 3: Credentials, integrations, MCP, and web search diff --git a/packages/app/e2e/regression/settings-loading.spec.ts b/packages/app/e2e/regression/settings-loading.spec.ts index 498a4bef8f6..7a312371d99 100644 --- a/packages/app/e2e/regression/settings-loading.spec.ts +++ b/packages/app/e2e/regression/settings-loading.spec.ts @@ -24,6 +24,14 @@ test.beforeEach(async ({ page }) => { sandboxes, }, provider: { all: [], connected: [], default: {} }, + configEntries: [ + { type: "document", path: "/home/test/.config/opencode/opencode.jsonc", info: { shell: "/bin/zsh" } }, + { type: "directory", path: "/home/test/.config/opencode" }, + ], + shells: [ + { path: "/bin/zsh", name: "zsh", acceptable: true }, + { path: "/bin/bash", name: "bash", acceptable: true }, + ], sessions: sandboxes.map((directory, index) => ({ id: `ses_settings_${index + 1}`, title: `Workspace ${index + 1} session`, @@ -81,6 +89,14 @@ test("single-server settings expose scoped pages without a server picker", async await expect(connection.locator(".settings-servers-row")).toHaveCSS("padding-top", "20px") await expect(connection.locator(".settings-servers-lead")).toHaveCSS("column-gap", "4px") await expect(connection.locator(".settings-servers-copy")).toHaveCSS("row-gap", "6px") + await expect(settings.getByRole("heading", { name: "Preferences", exact: true })).toBeVisible() + await expect(settings.getByText("Terminal shell", { exact: true })).toBeVisible() + await settings.getByText("zsh", { exact: true }).click() + const updated = page.waitForRequest( + (request) => request.method() === "PATCH" && new URL(request.url()).pathname === "/api/experimental/config", + ) + await page.getByRole("option", { name: "bash", exact: true }).click() + expect((await updated).postDataJSON()).toEqual({ shell: "/bin/bash" }) }) test("project settings open as a nested autosaving view", async ({ page }) => { diff --git a/packages/app/e2e/utils/mock-api.ts b/packages/app/e2e/utils/mock-api.ts index 4a3a3cc6481..c0960fa1ded 100644 --- a/packages/app/e2e/utils/mock-api.ts +++ b/packages/app/e2e/utils/mock-api.ts @@ -78,6 +78,12 @@ const Group = HttpApiGroup.make("mock") }), ) .add(HttpApiEndpoint.get("configShells", "/api/config/shell", { success: Json })) + .add( + HttpApiEndpoint.patch("configUpdate", "/api/experimental/config", { + payload: Schema.Struct({ shell: Schema.NullOr(Schema.String) }), + success: HttpApiSchema.NoContent, + }), + ) .add(HttpApiEndpoint.get("websearchProviders", "/api/websearch/provider", { success: Json })) .add( HttpApiEndpoint.get("worktreeList", "/api/worktree", { diff --git a/packages/app/e2e/utils/mock-server.ts b/packages/app/e2e/utils/mock-server.ts index 9254a959753..208c051266b 100644 --- a/packages/app/e2e/utils/mock-server.ts +++ b/packages/app/e2e/utils/mock-server.ts @@ -11,6 +11,7 @@ export interface MockServerConfig { integrationMethods?: Record onConnectKey?: (input: { integrationID: string; body: unknown }) => void shells?: unknown[] + configEntries?: unknown[] websearchProviders?: unknown[] directory: string project: unknown @@ -197,6 +198,7 @@ const corsHeaders = { function mockHandlers(config: MockServerConfig, state: { cursors: Map; nextCursor: number }) { const noContent = Effect.succeed(HttpApiSchema.NoContent.make()) const delay = config.messageDelay === undefined ? Effect.void : Effect.sleep(Duration.millis(config.messageDelay)) + const configEntries = config.configEntries ?? [] return HttpApiBuilder.group(MockApi, "mock", (handlers) => handlers .handleRaw("event", () => { @@ -218,7 +220,7 @@ function mockHandlers(config: MockServerConfig, state: { cursors: Map Effect.succeed({ version: "2.0.0", pid: 1, urls: config.server ? [config.server] : [] }), - config: () => Effect.succeed([]), + config: () => Effect.succeed(configEntries), reference: () => Effect.succeed({ location: { @@ -284,6 +286,7 @@ function mockHandlers(config: MockServerConfig, state: { cursors: Map Effect.succeed(config.shells ?? []), + configUpdate: () => noContent, websearchProviders: () => Effect.succeed({ location: location(config), data: config.websearchProviders ?? [] }), worktreeList: () => Effect.succeed([ diff --git a/packages/app/src/settings/general/controllers.ts b/packages/app/src/settings/general/controllers.ts index 5f484f9f850..77097be3f24 100644 --- a/packages/app/src/settings/general/controllers.ts +++ b/packages/app/src/settings/general/controllers.ts @@ -1,4 +1,4 @@ -import { createMemo, onMount, type Accessor } from "solid-js" +import { createMemo, createResource, onMount, type Accessor } from "solid-js" import type { ColorScheme } from "@opencode/ui/theme/context" import { useTheme } from "@opencode/ui/theme/context" import { @@ -15,10 +15,59 @@ import { } from "@/settings/model" import { playSoundById, SOUND_OPTIONS } from "@/shell/notifications/sound" import { createSoundPreviewController } from "./behavior" +import { ServerConnection } from "@/runtime/server/registry" +import { useServerCtx } from "@/runtime/server/runtime" +import { useLanguage } from "@/runtime/i18n/language" +import { showToast } from "@/shell/notifications/toast" export { createShellOptions, createSoundPreviewController } from "./behavior" export type { ShellOption, ShellSelectOption } from "./behavior" +export function createServerShellController(server: Accessor) { + const language = useLanguage() + const serverCtx = useServerCtx(server) + const source = () => ServerConnection.key(server()) + const [state, actions] = createResource( + source, + async () => { + const context = serverCtx() + const [entries, shells] = await Promise.all([ + context.sdk.api.config.get().catch(() => []), + context.sdk.api.config.shells().catch(() => []), + ]) + const boundary = entries.findIndex((entry) => entry.type === "directory") + const global = boundary === -1 ? entries : entries.slice(0, boundary) + return { + shells, + shell: global + .flatMap((entry) => (entry.type === "document" && entry.info.shell !== undefined ? [entry.info.shell] : [])) + .at(-1), + } + }, + { initialValue: { shells: [], shell: undefined } }, + ) + + return { + shells: () => state.latest.shells, + current: () => state.latest.shell ?? "", + select: (value: string) => { + if (value === (state.latest.shell ?? "")) return + const previous = state.latest + actions.mutate({ ...previous, shell: value || undefined }) + void serverCtx() + .sdk.api.config.update({ shell: value || null }) + .catch((error: unknown) => { + actions.mutate(previous) + showToast({ + variant: "error", + title: language.t("common.requestFailed"), + description: error instanceof Error ? error.message : language.t("common.requestFailed"), + }) + }) + }, + } +} + export function createAppearanceSettingsController() { const settings = useSettings() const theme = useTheme() @@ -114,5 +163,7 @@ export function createSoundSettingsController() { } } +export type ShellSettingsController = ReturnType + export type AppearanceSettingsController = ReturnType export type SoundSettingsController = ReturnType diff --git a/packages/app/src/settings/general/general.tsx b/packages/app/src/settings/general/general.tsx index 53114fdebb9..10b2aa001a1 100644 --- a/packages/app/src/settings/general/general.tsx +++ b/packages/app/src/settings/general/general.tsx @@ -18,7 +18,12 @@ import { formatKeybind } from "@/shell/commands/command" import { ExternalLink } from "@/runtime/platform/external-link" import { SettingsList } from "@/settings/list" import { SettingsRow } from "@/settings/row" -import { createAppearanceSettingsController, type AppearanceSettingsController } from "./controllers" +import { + createAppearanceSettingsController, + createShellOptions, + type AppearanceSettingsController, + type ShellSettingsController, +} from "./controllers" import "@/settings/settings.css" const schemeOptions: ("system" | "light" | "dark")[] = ["system", "light", "dark"] @@ -91,6 +96,37 @@ const WorkspaceDestinationSetting: Component = () => { ) } +export const ShellSetting: Component<{ controller: ShellSettingsController }> = (props) => { + const language = useLanguage() + const options = createMemo(() => + createShellOptions({ + shells: props.controller.shells(), + current: props.controller.current(), + }), + ) + return ( + +