diff --git a/packages/app/e2e/regression/tabs.spec.ts b/packages/app/e2e/regression/tabs.spec.ts index 7bedf7648c3..386d40189ed 100644 --- a/packages/app/e2e/regression/tabs.spec.ts +++ b/packages/app/e2e/regression/tabs.spec.ts @@ -121,6 +121,21 @@ test("inactive session attention dots share the close control without marking th await expectPath(page, sessionHref(a.id)) }) +test("the browser title names the open session and resets after leaving it", async ({ page }) => { + await mockWorkspace(page, { name: "Tabs", sessions: [a, b] }) + await page.goto(sessionHref(a.id)) + await expect(page).toHaveTitle(`${a.title} · OpenCode`) + + const tabB = page.locator(`[data-titlebar-tab-slot]:has(a[href="${sessionHref(b.id)}"])`) + await tabB.locator("[data-titlebar-tab-link]").click() + await expectPath(page, sessionHref(b.id)) + await expect(page).toHaveTitle(`${b.title} · OpenCode`) + + await page.getByRole("button", { name: "Home", exact: true }).click() + await expectPath(page, "/") + await expect(page).toHaveTitle("OpenCode") +}) + test("a tab does not reopen its title editor while a rename is saving", async ({ page }) => { await mockWorkspace(page, { name: "Tabs", sessions: [a, b] }) await page.goto(sessionHref(a.id)) diff --git a/packages/app/index.html b/packages/app/index.html index 336cf814efa..1cec152cd0e 100644 --- a/packages/app/index.html +++ b/packages/app/index.html @@ -6,7 +6,8 @@ name="viewport" content="width=device-width, initial-scale=1, interactive-widget=resizes-content, viewport-fit=cover" /> - OpenCode + + OpenCode diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx index 78d11175f81..ee9adbc8104 100644 --- a/packages/app/src/app.tsx +++ b/packages/app/src/app.tsx @@ -3,7 +3,7 @@ import { DialogProvider } from "@opencode/ui/context/dialog" import { FileComponentProvider } from "@opencode/ui/context/file" import { Font } from "@opencode/ui/font" import { ThemeProvider } from "@opencode/ui/theme/context" -import { MetaProvider } from "@solidjs/meta" +import { MetaProvider, Title } from "@solidjs/meta" import { type BaseRouterProps, Router } from "@solidjs/router" import { QueryClient, QueryClientProvider } from "@tanstack/solid-query" import { type Component, createRenderEffect, ErrorBoundary, type JSX, type ParentProps } from "solid-js" @@ -54,6 +54,7 @@ export function AppBaseProviders( ) { return ( + OpenCode { diff --git a/packages/app/src/session/route.tsx b/packages/app/src/session/route.tsx index ec8d008e868..3cbc7bc05d8 100644 --- a/packages/app/src/session/route.tsx +++ b/packages/app/src/session/route.tsx @@ -1,10 +1,12 @@ import { ErrorBoundary, createEffect, createMemo, Show, type ParentProps } from "solid-js" +import { Title } from "@solidjs/meta" import { useParams } from "@solidjs/router" import { createStore } from "solid-js/store" import { makeEventListener } from "@solid-primitives/event-listener" import { DataProvider } from "@opencode/session-ui/context" import { SessionUserMessage } from "@opencode/session-ui/message" import { TextShimmer } from "@opencode/ui/text-shimmer" +import { isFallbackTitle } from "@opencode/util/session-title-fallback" import { CommentsProvider } from "@/composer/comments" import { readPromptPresentation } from "@/composer/comment-note" import { FileProvider } from "@/workspaces/files/model" @@ -39,6 +41,7 @@ export function TargetSessionRouteContent() { return ( <> params.id} /> + params.id} /> @@ -207,3 +210,21 @@ function MarkSessionViewed(props: { sessionID: () => string | undefined }) { return null } + +// Browser tabs and desktop windows are otherwise indistinguishable, so name them after the open session. +function SessionDocumentTitle(props: { sessionID: () => string }) { + const data = useData() + + const title = createMemo(() => { + const value = data.session.get(props.sessionID())?.title + + return isFallbackTitle(value) ? undefined : value + }) + + // Keyed: reads its text inside a meta effect, which would hit a stale Show accessor once the session is deleted. + return ( + <Show when={title()} keyed> + {(value) => <Title>{`${value} · OpenCode`}} + + ) +} diff --git a/packages/desktop/src/renderer/index.html b/packages/desktop/src/renderer/index.html index b7c429fb648..e7031d31de9 100644 --- a/packages/desktop/src/renderer/index.html +++ b/packages/desktop/src/renderer/index.html @@ -3,7 +3,8 @@ - OpenCode + + OpenCode