From 21bbcc33a10a3c939d0c1dacdd0731061773814d Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" <219766164+opencode-agent[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2026 08:01:11 +0800 Subject: [PATCH] fix(app): restore uniform new session tab width (#46919) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com> --- .../regression/tab-navigate-mousedown.spec.ts | 36 +++++++++------ packages/app/src/shell/titlebar/tab-nav.tsx | 13 ++---- packages/app/src/shell/titlebar/tab-strip.tsx | 2 +- packages/desktop/src/main/wsl/servers.ts | 45 +++---------------- packages/desktop/src/main/wsl/start.ts | 19 +++++++- 5 files changed, 52 insertions(+), 63 deletions(-) diff --git a/packages/app/e2e/regression/tab-navigate-mousedown.spec.ts b/packages/app/e2e/regression/tab-navigate-mousedown.spec.ts index 1ab53b8515a..d12e0bfc92d 100644 --- a/packages/app/e2e/regression/tab-navigate-mousedown.spec.ts +++ b/packages/app/e2e/regression/tab-navigate-mousedown.spec.ts @@ -9,30 +9,42 @@ const sessionB = session("ses_tab_b", "Tab B session") const sessionC = session("ses_tab_c", "Tab C session") const unresolvedSessionID = "ses_tab_unresolved" -test("new session tab hugs its content", async ({ page }) => { +test("new session tab matches neighboring session widths", async ({ page }, testInfo) => { await mockServer(page) await page.addInitScript( - ({ server, sessionID, directory }) => { + ({ server, sessionA, sessionB, directory }) => { localStorage.setItem( "opencode.window.browser.dat:tabs", JSON.stringify([ - { type: "session", server, sessionId: sessionID }, + { type: "session", server, sessionId: sessionA }, { type: "draft", server, directory, draftID: "draft_tab_width" }, + { type: "session", server, sessionId: sessionB }, ]), ) }, - { server, sessionID: sessionA.id, directory: sessionA.directory }, + { server, sessionA: sessionA.id, sessionB: sessionB.id, directory: sessionA.directory }, ) const href = `/server/${base64Encode(server)}/session/${sessionA.id}` await page.goto(href) - const sessionTab = page.locator(`[data-titlebar-tab-slot]:has(a[href="${href}"])`) - const draftTab = page.locator('[data-titlebar-tab-slot]:has(a[href^="/new-session?draftId="])') - await expect(draftTab).toContainText("New session") - const width = (await draftTab.boundingBox())?.width ?? 0 - expect(width).toBeGreaterThan(100) - expect(width).toBeLessThan((await sessionTab.boundingBox())?.width ?? 0) + const tabs = page.locator("[data-titlebar-tab-slot]") + await expect(tabs.locator("[data-titlebar-tab-title]")).toHaveText([sessionA.title, "New session", sessionB.title]) + await testInfo.attach("new-session-between-tabs", { + body: await page.locator('[data-slot="titlebar-v2"]').screenshot(), + contentType: "image/png", + }) + for (const width of [1280, 800]) { + await page.setViewportSize({ width, height: 720 }) + await expect + .poll(() => + tabs.evaluateAll((tabs) => { + const widths = tabs.map((tab) => tab.getBoundingClientRect().width) + return Math.max(...widths) - Math.min(...widths) + }), + ) + .toBeLessThan(1) + } }) test("pressing mouse down on a tab navigates before mouse up", async ({ page }) => { @@ -280,9 +292,7 @@ test("appearance experimental settings control vertical tab details", async ({ p await page.reload() const href = `/server/${base64Encode(server)}/session/${sessionA.id}` await page.getByRole("button", { name: "Tabs", exact: true }).click() - await expect(page.locator('[data-slot="mobile-tabs-drawer"] [data-slot="tab-project"]')).toHaveText([ - "tab-project", - ]) + await expect(page.locator('[data-slot="mobile-tabs-drawer"] [data-slot="tab-project"]')).toHaveText(["tab-project"]) await expect( page .locator('[data-slot="mobile-tabs-drawer"]') diff --git a/packages/app/src/shell/titlebar/tab-nav.tsx b/packages/app/src/shell/titlebar/tab-nav.tsx index 2fe162ac206..2f420b39762 100644 --- a/packages/app/src/shell/titlebar/tab-nav.tsx +++ b/packages/app/src/shell/titlebar/tab-nav.tsx @@ -395,11 +395,8 @@ export function DraftTabItem(props: { data-active={props.active} data-dragging={props.dragging} data-state={props.active || props.pressed ? "pressed" : undefined} - class="group relative flex h-7 min-w-0 flex-row items-center gap-1.5 overflow-hidden rounded-[6px] px-1.5 whitespace-nowrap" - classList={{ - invisible: props.hidden, - "w-full [container-type:inline-size]": props.orientation === "vertical", - }} + class="group relative flex h-7 w-full min-w-0 flex-row items-center gap-1.5 overflow-hidden rounded-[6px] px-1.5 [container-type:inline-size] whitespace-nowrap" + classList={{ invisible: props.hidden }} onMouseDown={(event) => { if (event.button !== MIDDLE_MOUSE_BUTTON) return event.preventDefault() @@ -432,16 +429,14 @@ export function DraftTabItem(props: { if (props.suppressNavigation) return props.onNavigate() }} - class="flex h-full min-w-0 flex-row items-center gap-1.5 text-[13px] font-medium text-v2-text-text-faint group-data-[active='true']:text-v2-text-text-base [-webkit-user-drag:none]" - classList={{ "flex-1": props.orientation === "vertical", "flex-none pe-10": props.orientation !== "vertical" }} + class="flex h-full min-w-0 flex-1 flex-row items-center gap-1.5 text-[13px] font-medium text-v2-text-text-faint group-data-[active='true']:text-v2-text-text-base [-webkit-user-drag:none]" > {props.title} diff --git a/packages/app/src/shell/titlebar/tab-strip.tsx b/packages/app/src/shell/titlebar/tab-strip.tsx index d82205e3ade..c5934f94c41 100644 --- a/packages/app/src/shell/titlebar/tab-strip.tsx +++ b/packages/app/src/shell/titlebar/tab-strip.tsx @@ -211,7 +211,7 @@ function DraftTabSlot(props: { data-orientation={props.orientation} class="relative flex" classList={{ - "w-max min-w-7 max-w-56 shrink-0": props.orientation === "horizontal", + "w-56 min-w-7 max-w-56 flex-shrink": props.orientation === "horizontal", "w-full shrink-0": props.orientation === "vertical", }} > diff --git a/packages/desktop/src/main/wsl/servers.ts b/packages/desktop/src/main/wsl/servers.ts index 23c849edba5..259e2267373 100644 --- a/packages/desktop/src/main/wsl/servers.ts +++ b/packages/desktop/src/main/wsl/servers.ts @@ -10,8 +10,6 @@ import type { } from "@opencode-ai/app/wsl/types" import { Effect } from "effect" import { nativeT } from "../native/translations" -import { WSL_SERVERS_KEY } from "../storage/keys" -import { getStore } from "../storage/store" import { installWslRuntimeElevated, listInstalledWslDistros, @@ -38,8 +36,8 @@ type WslServersControllerOptions = { spawnSidecar: SpawnSidecar installCli: (distro: string, cli: WslCliBuild) => Promise installDistro: (distro: string) => Promise - readServers?: () => WslServerConfig[] - writeServers?: (servers: WslServerConfig[]) => void + readServers: () => WslServerConfig[] + writeServers: (servers: WslServerConfig[]) => void probeDistro?: typeof probeWslDistro resolveCli?: typeof resolveWslCli readCliVersion?: typeof readWslCliVersion @@ -60,8 +58,6 @@ export const createWslServersController = Effect.fn("WslServers.make")(function* const sidecars = new Map() const starts = new Map() let closed = false - const readServers = options.readServers ?? readPersistedServers - const writeServers = options.writeServers ?? writePersistedServers const probeDistro = options.probeDistro ?? probeWslDistro const emit = () => { @@ -79,7 +75,7 @@ export const createWslServersController = Effect.fn("WslServers.make")(function* } const refreshFromStore = () => { - const persisted = readServers() + const persisted = options.readServers() const items: WslServerItem[] = persisted.map((config) => { const existing = state.servers.find((item) => item.config.id === config.id) return { @@ -291,7 +287,7 @@ export const createWslServersController = Effect.fn("WslServers.make")(function* id, distro, } - writeServers([...readServers(), config]) + options.writeServers([...options.readServers(), config]) setState({ servers: [...state.servers, { config, runtime: { kind: "starting" } }], }) @@ -302,8 +298,8 @@ export const createWslServersController = Effect.fn("WslServers.make")(function* async removeServer(id: string) { const distro = state.servers.find((item) => item.config.id === id)?.config.distro await stopServer(id) - const remaining = readServers().filter((item) => item.id !== id) - writeServers(remaining) + const remaining = options.readServers().filter((item) => item.id !== id) + options.writeServers(remaining) setState({ servers: state.servers.filter((item) => item.config.id !== id), ...(distro ? removeDistroState(state, distro) : {}), @@ -334,35 +330,6 @@ function initialState(): WslServersState { } } -function readPersistedServers(): WslServerConfig[] { - const store = getStore() - const existing = store.get(WSL_SERVERS_KEY) - if (existing && typeof existing === "object") { - const record = existing as { servers?: unknown } - const list = Array.isArray(record.servers) ? record.servers : [] - return list.flatMap(normalizePersistedServer) - } - return [] -} - -function writePersistedServers(servers: WslServerConfig[]) { - getStore().set(WSL_SERVERS_KEY, { servers }) -} - -function normalizePersistedServer(value: unknown): WslServerConfig[] { - if (!value || typeof value !== "object") return [] - const record = value as Record - const distro = typeof record.distro === "string" && record.distro.length > 0 ? record.distro : null - if (!distro) return [] - const id = typeof record.id === "string" && record.id.length > 0 ? record.id : wslServerIdForDistro(distro) - return [ - { - id, - distro, - }, - ] -} - function cliCheck( distro: string, resolvedPath: string | null, diff --git a/packages/desktop/src/main/wsl/start.ts b/packages/desktop/src/main/wsl/start.ts index d47178960b2..5eae19de7c4 100644 --- a/packages/desktop/src/main/wsl/start.ts +++ b/packages/desktop/src/main/wsl/start.ts @@ -3,6 +3,7 @@ export * as Wsl from "./start" import { Context, Effect, Exit, FileSystem, Layer, Path } from "effect" import { Shutdown } from "../lifecycle/shutdown" import { DesktopCli } from "../service/desktop-cli" +import { WSL_SERVERS_KEY } from "../storage/keys" import { WslIpc } from "./ipc" export interface Interface extends WslIpc.Interface { @@ -27,7 +28,8 @@ export const layer = Layer.effect( const makeWsl = Effect.fn("Wsl.make")(function* (cli: DesktopCli.Resolved) { if (process.platform !== "win32") return { ...WslIpc.create(), stop: Effect.void } - const { createWslServersController } = yield* Effect.promise(() => import("./servers")) + const { createWslServersController, wslServerIdForDistro } = yield* Effect.promise(() => import("./servers")) + const { getStore } = yield* Effect.promise(() => import("../storage/store")) const { spawnWslSidecar } = yield* Effect.promise(() => import("./sidecar")) const { installWslCli, installWslDistro } = yield* Effect.promise(() => import("./runtime")) const context = yield* Effect.context() @@ -36,6 +38,21 @@ const makeWsl = Effect.fn("Wsl.make")(function* (cli: DesktopCli.Resolved) { const local = cli.wslBuild const controller = yield* createWslServersController({ cli: { version: cli.version }, + readServers: () => { + const existing = getStore().get(WSL_SERVERS_KEY) + if (!existing || typeof existing !== "object") return [] + const record = existing as { servers?: unknown } + const list = Array.isArray(record.servers) ? record.servers : [] + return list.flatMap((value: unknown) => { + if (!value || typeof value !== "object") return [] + const record = value as Record + const distro = typeof record.distro === "string" && record.distro.length > 0 ? record.distro : null + if (!distro) return [] + const id = typeof record.id === "string" && record.id.length > 0 ? record.id : wslServerIdForDistro(distro) + return [{ id, distro }] + }) + }, + writeServers: (servers) => getStore().set(WSL_SERVERS_KEY, { servers }), installDistro: (distro) => run(installWslDistro(distro)), installCli: local ? async (distro) => {