From f24fdeca7037804af8c30f21c9ddf65db1562b97 Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" <219766164+opencode-agent[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2026 15:38:06 +1000 Subject: [PATCH] fix(app): keep session summary as an overlay (#50386) Co-authored-by: jayair <53023+jayair@users.noreply.github.com> --- .../regression/new-session-summary.spec.ts | 503 ++---------------- .../regression/session-summary-layout.spec.ts | 86 +-- packages/app/src/index.css | 51 -- packages/app/src/new-session/screen.tsx | 2 +- packages/app/src/new-session/summary.tsx | 64 --- packages/app/src/new-session/view.tsx | 56 +- packages/app/src/session/screen.tsx | 24 +- 7 files changed, 50 insertions(+), 736 deletions(-) delete mode 100644 packages/app/src/new-session/summary.tsx diff --git a/packages/app/e2e/regression/new-session-summary.spec.ts b/packages/app/e2e/regression/new-session-summary.spec.ts index f2c6d49d7bc..58c64266720 100644 --- a/packages/app/e2e/regression/new-session-summary.spec.ts +++ b/packages/app/e2e/regression/new-session-summary.spec.ts @@ -1,337 +1,22 @@ -import { expect, test, type Page } from "@playwright/test" -import { mockOpenCodeServer, currentSession } from "../utils/mock-server" -import { openWithDirection } from "../utils/direction" +import { expect, test } from "@playwright/test" +import { mockOpenCodeServer } from "../utils/mock-server" +import { expectAppVisible } from "../utils/waits" -const directory = "/workspace/summary-project" -const workspace = "/workspace/existing-worktree" -const createdWorkspace = "/workspace/created-worktree" const draftID = "draft_summary" -const secondDraftID = "draft_summary_other" +const directory = "/workspace/summary-project" const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}` -const draftPath = `/new-session?draftId=${draftID}` -for (const rtl of [false, true]) { - test(`new session summary shows project extensions and follows workspace selection in ${rtl ? "rtl" : "ltr"}`, async ({ - page, - }, testInfo) => { - const mock = await openDraft(page, "main", { direction: rtl ? "rtl" : "ltr" }) - await expect(page.locator("html")).toHaveAttribute("dir", rtl ? "rtl" : "ltr") - await expect(page.locator("html")).toHaveAttribute("lang", "en") - const trigger = page.getByRole("button", { name: "Session details", exact: true }) - await expect - .poll(async () => { - const button = await trigger.boundingBox() - const view = await page.locator('[data-component="new-session"]').boundingBox() - if (!button || !view) return false - const gap = rtl ? button.x - view.x : view.x + view.width - button.x - button.width - return Math.abs(gap - 12) <= 1 && Math.abs(button.y + button.height / 2 - view.y - 24) <= 1 - }) - .toBe(true) - await trigger.click() - const summary = page.getByRole("dialog", { name: "Session details", exact: true }) - await expect(summary.getByRole("button", { name: "summary-project", exact: true })).toHaveAttribute( - "aria-expanded", - "true", - ) - await expect(summary.getByRole("button", { name: "Extensions", exact: true })).toHaveAttribute( - "aria-expanded", - "true", - ) - await expect - .poll(async () => { - const button = await trigger.boundingBox() - const project = await summary.locator('[data-section="project"]').boundingBox() - const server = await summary.locator('[data-section="server"]').boundingBox() - if (!button || !project || !server) return - return { - top: project.y - button.y - button.height, - cards: server.y - project.y - project.height, - } - }) - .toEqual({ top: 12, cards: 8 }) - await testInfo.attach(`new-session-summary-${rtl ? "rtl" : "ltr"}`, { - body: await page.screenshot(), - contentType: "image/png", - }) - for (const [name, item] of [ - ["MCP", "summary-mcp"], - ["Plugins", "project-plugin"], - ["Skills", "summary-skill"], - ["LSP", "typescript"], - ]) { - await summary.getByRole("button", { name, exact: true }).click() - await expect(page.getByRole("dialog", { name, exact: true }).getByText(item, { exact: true })).toBeVisible() - } - await page.keyboard.press("Escape") - await summary.getByRole("button", { name: "Local repository", exact: true }).click() - const worktreeMenu = page.getByRole("menu", { name: "Local repository", exact: true }) - await expect - .poll(async () => { - const menu = await worktreeMenu.boundingBox() - const panel = await summary.locator('[data-component="session-summary-panel"]').boundingBox() - if (!menu || !panel) return false - return rtl ? menu.x >= panel.x + panel.width : menu.x + menu.width <= panel.x - }) - .toBe(true) - await expect(page.getByRole("menuitem", { name: "existing-worktree", exact: true })).toBeHidden() - await worktreeMenu.getByRole("menuitem", { name: "Worktree", exact: true }).press(rtl ? "ArrowLeft" : "ArrowRight") - await expect(page.getByRole("menu", { name: "Worktree", exact: true })).toBeVisible() - await page.keyboard.press("Enter") - await expect(summary.getByRole("button", { name: "existing-worktree", exact: true })).toBeVisible() - await summary.getByRole("button", { name: "MCP", exact: true }).click() - const mcp = page.getByRole("dialog", { name: "MCP", exact: true }) - const toggle = mcp.getByRole("switch", { name: "summary-mcp", exact: true }) - await expect(toggle).not.toBeChecked() - await expect(toggle).toBeEnabled() - await mcp.getByText("summary-mcp", { exact: true }).click() - await expect(toggle).toBeChecked() - await expect(toggle).toBeEnabled() - expect(mock.calls).toEqual([{ type: "mcp", directory: workspace, enabled: true }]) - expect(mock.status.get(directory)).toBe("connected") - await summary.getByRole("button", { name: "Plugins", exact: true }).click() - await expect( - page.getByRole("dialog", { name: "Plugins", exact: true }).getByText("workspace-plugin", { exact: true }), - ).toBeVisible() - }) -} - -test("non-Git folders show their status without offering worktree actions", async ({ page }) => { - await openDraft(page, "main", { git: false }) - await page.getByRole("button", { name: "Session details", exact: true }).click() - const summary = page.getByRole("dialog", { name: "Session details", exact: true }) - await expect(summary.getByText("No Git", { exact: true })).toBeVisible() - await expect(summary.getByRole("button", { name: "Local repository", exact: true })).toHaveCount(0) - await expect(summary.getByRole("button", { name: "New worktree", exact: true })).toHaveCount(0) - await summary.getByRole("button", { name: "MCP", exact: true }).click() - await expect( - page.getByRole("dialog", { name: "MCP", exact: true }).getByRole("switch", { name: "summary-mcp", exact: true }), - ).toBeEnabled() -}) - -test("submits locally after changing a new worktree draft to Local", async ({ page }) => { - const mock = await openDraft(page, "create", { currentDirectory: workspace }) - await page.getByRole("button", { name: "New worktree", exact: true }).click() - await page.getByRole("menuitem", { name: "Local repository", exact: true }).click() - await page.locator('[data-component="composer-editor"]').fill("Run locally") - await page.locator('[data-action="composer-submit"]').click() - await expect.poll(() => mock.calls.find((call) => call.type === "session")?.directory).toBe(directory) -}) - -test("new worktree MCP choices persist per draft and apply before the first prompt", async ({ page }, testInfo) => { - const mock = await openDraft(page, "create") - await page.locator('[data-component="composer-editor"]').fill("Use my selected MCPs") - await page.getByRole("button", { name: "Session details", exact: true }).click() - await page.getByRole("button", { name: "MCP", exact: true }).click() - const menu = page.getByRole("dialog", { name: "MCP", exact: true }) - await expect(menu.locator('[data-slot="mcp-preview-hint"]')).toHaveText("Applies when the worktree is created") - await expect(menu).toHaveCSS("opacity", "1") - await testInfo.attach("new-worktree-mcp-preview", { body: await page.screenshot(), contentType: "image/png" }) - const toggle = menu.getByRole("switch", { name: "summary-mcp", exact: true }) - await expect(toggle).toBeChecked() - await menu.getByText("summary-mcp", { exact: true }).click() - await expect(toggle).not.toBeChecked() - expect(mock.calls).toEqual([]) - await expect - .poll(() => - page.evaluate( - () => - JSON.parse(localStorage.getItem("opencode.window.browser.dat:tabs") ?? "[]").find( - (tab: { draftID?: string }) => tab.draftID === "draft_summary", - )?.mcp?.states, - ), - ) - .toEqual({ "summary-mcp": false }) - - await page.goto(`/new-session?draftId=${secondDraftID}`) - await page.getByRole("button", { name: "Session details", exact: true }).click() - await page.getByRole("button", { name: "MCP", exact: true }).click() - await expect(toggle).toBeChecked() - await page.goto(draftPath) - await page.getByRole("button", { name: "Session details", exact: true }).click() - await page.getByRole("button", { name: "MCP", exact: true }).click() - await expect(toggle).not.toBeChecked() - expect(mock.calls).toEqual([]) - await page.keyboard.press("Escape") - await page.keyboard.press("Escape") - await expect(page.locator('[data-component="composer-editor"]')).toHaveText("Use my selected MCPs") - await page.locator('[data-action="composer-submit"]').click() - await expect.poll(() => mock.prompts.length).toBe(1) - expect(mock.calls).toEqual([ - { type: "worktree", directory }, - { type: "mcp", directory: createdWorkspace, enabled: false }, - { type: "session", directory: createdWorkspace }, - { type: "prompt", directory: createdWorkspace }, - ]) - expect(mock.prompts[0].body.text).toBe("Use my selected MCPs") - expect(mock.status.get(directory)).toBe("connected") -}) - -test("the first prompt waits for a live MCP toggle", async ({ page }) => { - const mock = await openDraft(page) - const release = Promise.withResolvers() - mock.state.hold = release.promise - await page.locator('[data-component="composer-editor"]').fill("Wait for the MCP update") - await page.getByRole("button", { name: "Session details", exact: true }).click() - await page.getByRole("button", { name: "MCP", exact: true }).click() - const menu = page.getByRole("dialog", { name: "MCP", exact: true }) - await expect(menu.getByRole("switch", { name: "summary-mcp", exact: true })).toBeEnabled() - try { - await menu.getByText("summary-mcp", { exact: true }).click() - await expect.poll(() => mock.calls.length).toBe(1) - await page.keyboard.press("Escape") - await page.keyboard.press("Escape") - await page.locator('[data-action="composer-submit"]').click() - await expect(page).toHaveURL(draftPath) - expect(mock.calls).toEqual([{ type: "mcp", directory, enabled: false }]) - expect(mock.prompts).toEqual([]) - } finally { - release.resolve() - } - await expect.poll(() => mock.prompts.length).toBe(1) - expect(mock.calls).toEqual([ - { type: "mcp", directory, enabled: false }, - { type: "session", directory }, - { type: "prompt", directory }, - ]) -}) - -test("changing worktrees does not wait for another directory's pending MCP update", async ({ page }) => { - const mock = await openDraft(page) - const release = Promise.withResolvers() - mock.state.hold = release.promise - mock.state.holdDirectory = directory - await page.locator('[data-component="composer-editor"]').fill("Run in the selected worktree") - await page.getByRole("button", { name: "Session details", exact: true }).click() - const summary = page.getByRole("dialog", { name: "Session details", exact: true }) - await summary.getByRole("button", { name: "MCP", exact: true }).click() - const menu = page.getByRole("dialog", { name: "MCP", exact: true }) - try { - await expect(menu.getByRole("switch", { name: "summary-mcp", exact: true })).toBeEnabled() - await menu.getByText("summary-mcp", { exact: true }).click() - await expect.poll(() => mock.calls.length).toBe(1) - await page.keyboard.press("Escape") - await summary.getByRole("button", { name: "Local repository", exact: true }).click() - await page.getByRole("menuitem", { name: "Worktree", exact: true }).click() - await page.getByRole("menuitem", { name: "existing-worktree", exact: true }).click() - await summary.getByRole("button", { name: "MCP", exact: true }).click() - const toggle = menu.getByRole("switch", { name: "summary-mcp", exact: true }) - await expect(toggle).toBeEnabled() - await expect(toggle).not.toBeChecked() - await menu.getByText("summary-mcp", { exact: true }).click() - await expect(toggle).toBeChecked() - await expect(toggle).toBeEnabled() - await page.keyboard.press("Escape") - await page.keyboard.press("Escape") - await page.locator('[data-action="composer-submit"]').click() - await expect.poll(() => mock.prompts.length).toBe(1) - expect(mock.calls.find((call) => call.type === "session")?.directory).toBe(workspace) - expect(mock.status.get(directory)).toBe("connected") - } finally { - release.resolve() - } -}) - -test("failed MCP preparation restores the draft and reuses the created worktree", async ({ page }) => { - const mock = await openDraft(page, "create") - mock.state.fail = true - await page.locator('[data-component="composer-editor"]').fill("Keep this prompt on failure") - await page.getByRole("button", { name: "Session details", exact: true }).click() - await page.getByRole("button", { name: "MCP", exact: true }).click() - await page.getByRole("dialog", { name: "MCP", exact: true }).getByText("summary-mcp", { exact: true }).click() - await page.keyboard.press("Escape") - await page.keyboard.press("Escape") - await page.locator('[data-action="composer-submit"]').click() - await expect(page.getByText("Request failed", { exact: true })).toBeVisible() - await expect(page).toHaveURL(draftPath) - await expect(page.locator('[data-component="composer-editor"]')).toHaveText("Keep this prompt on failure") - await expect(page.getByRole("button", { name: "created-worktree", exact: true })).toBeVisible() - expect(mock.prompts).toEqual([]) - expect(mock.calls.map((call) => call.type)).toEqual(["worktree", "mcp"]) - mock.state.fail = false - await expect(page.locator('[data-action="composer-submit"]')).toBeEnabled() - await page.locator('[data-action="composer-submit"]').click() - await expect.poll(() => mock.prompts.length).toBe(1) - expect(mock.calls.filter((call) => call.type === "worktree")).toHaveLength(1) - expect(mock.status.get(createdWorkspace)).toBe("disabled") - expect(mock.prompts[0].body.text).toBe("Keep this prompt on failure") -}) - -test("new worktree sign-in completes before the draft can send", async ({ page, context }) => { - const mock = await openDraft(page, "create") - mock.status.set(createdWorkspace, "needs_auth") - const attempts: string[] = [] - await context.route("https://auth.example.test/**", (route) => route.fulfill({ body: "Sign in" })) - await page.route("**/api/integration/**", (route) => { - if (route.request().method() === "OPTIONS") return route.fallback() - if (route.request().method() === "POST") { - attempts.push(new URL(route.request().url()).searchParams.get("location[directory]") ?? "") - return route.fulfill({ - json: { location: { directory: createdWorkspace }, data: { url: "https://auth.example.test/authorize" } }, - }) - } - return route.fulfill({ - json: { - location: { directory: createdWorkspace }, - data: { - id: "summary-oauth", - methods: [{ id: "oauth", type: "oauth" }], - }, - }, - }) - }) - await page.locator('[data-component="composer-editor"]').fill("Wait for my sign-in") - await page.getByRole("button", { name: "Session details", exact: true }).click() - await page.getByRole("button", { name: "MCP", exact: true }).click() - const menu = page.getByRole("dialog", { name: "MCP", exact: true }) - const toggle = menu.getByRole("switch", { name: "summary-mcp", exact: true }) - await expect(toggle).toBeChecked() - await menu.getByText("summary-mcp", { exact: true }).click() - await expect(toggle).not.toBeChecked() - await menu.getByText("summary-mcp", { exact: true }).click() - await expect(toggle).toBeChecked() - await page.keyboard.press("Escape") - await page.keyboard.press("Escape") - const popup = page.waitForEvent("popup") - await page.locator('[data-action="composer-submit"]').click() - await expect(await popup).toHaveURL("https://auth.example.test/authorize") - await expect(page).toHaveURL(draftPath) - await expect(page.locator('[data-component="composer-editor"]')).toHaveText("Wait for my sign-in") - expect(attempts).toEqual([createdWorkspace]) - expect(mock.prompts).toEqual([]) - mock.status.set(createdWorkspace, "connected") - await page.locator('[data-action="composer-submit"]').click() - await expect.poll(() => mock.prompts.length).toBe(1) - expect(mock.calls.filter((call) => call.type === "worktree")).toHaveLength(1) - expect(attempts).toHaveLength(1) -}) - -async function openDraft( - page: Page, - worktree = "main", - options: { git?: boolean; direction?: "ltr" | "rtl"; currentDirectory?: string } = {}, -) { - const currentDirectory = options.currentDirectory ?? directory - const project = { - id: "proj_new_summary", - worktree: directory, - name: "summary-project", - vcs: options.git === false ? undefined : "git", - time: { created: 1, updated: 1 }, - sandboxes: [workspace], - } - const sessions: ReturnType[] = [] - const status = new Map([ - [directory, "connected"], - [workspace, "disabled"], - [createdWorkspace, "connected"], - ]) - const calls: { type: string; directory: string; enabled?: boolean }[] = [] - const prompts: { sessionID: string; body: Record }[] = [] - const state: { fail: boolean; hold?: Promise; holdDirectory?: string } = { fail: false } +test("does not show session details on the new session screen", async ({ page }, testInfo) => { await mockOpenCodeServer(page, { - directory: currentDirectory, - project, - sessions, + directory, + project: { + id: "proj_new_summary", + worktree: directory, + vcs: "git", + name: "summary-project", + time: { created: 1, updated: 1 }, + sandboxes: [], + }, provider: { all: [ { @@ -343,148 +28,28 @@ async function openDraft( connected: ["opencode"], default: { providerID: "opencode", modelID: "summary-model" }, }, + sessions: [], pageMessages: () => ({ items: [] }), - onPrompt(input) { - const session = sessions.find((session) => session.id === input.sessionID) - if (!session?.location.directory) throw new Error("Prompt arrived before session creation") - calls.push({ type: "prompt", directory: session.location.directory }) - prompts.push(input) - }, }) - if (options.git === false) { - await page.route( - (url) => url.pathname === "/api/vcs", - (route) => route.fulfill({ json: { location: { directory }, data: { branch: {} } } }), - ) - } - await page.route(/\/api\/(?:experimental\/)?mcp(?:[/?]|$)/, async (route) => { - if (route.request().method() === "OPTIONS") return route.fallback() - const url = new URL(route.request().url()) - const target = url.searchParams.get("location[directory]") ?? directory - if (route.request().method() === "POST") { - const enabled = url.pathname.endsWith("/connect") - calls.push({ type: "mcp", directory: target, enabled }) - if (!state.holdDirectory || state.holdDirectory === target) await state.hold - if (state.fail) return route.fulfill({ status: 500, json: { message: "MCP fixture failed" } }) - status.set(target, enabled ? "connected" : "disabled") - return route.fulfill({ status: 204 }) - } - return route.fulfill({ - json: { - location: { directory: target }, - data: - url.pathname === "/api/mcp/resource" - ? { resources: [], templates: [] } - : [ - { - name: "summary-mcp", - integrationID: "summary-oauth", - status: { status: status.get(target) ?? "connected" }, - }, - ], - }, - }) - }) - await page.route( - (url) => url.pathname === "/api/location", - (route) => - route.fulfill({ - json: { - directory: new URL(route.request().url()).searchParams.get("location[directory]") ?? directory, - project: { id: project.id, directory, canonical: directory }, - }, - }), - ) - await page.route( - (url) => url.pathname === "/api/plugin", - (route) => { - const target = new URL(route.request().url()).searchParams.get("location[directory]") ?? directory - const id = target === directory ? "project-plugin" : "workspace-plugin" - return route.fulfill({ - json: { - location: { directory: target }, - data: [{ id, source: { type: "package", target: id }, features: {}, state: { status: "active" } }], - }, - }) - }, - ) - await page.route( - (url) => url.pathname === "/api/skill", - (route) => - route.fulfill({ - json: { - location: { directory: new URL(route.request().url()).searchParams.get("location[directory]") ?? directory }, - data: [ - { - id: "summary-skill", - name: "summary-skill", - path: "/skills/summary/SKILL.md", - content: "Summary skill", - }, - ], - }, - }), - ) - await page.route( - (url) => url.pathname === "/api/config", - (route) => - route.fulfill({ - json: [{ type: "document", info: { lsp: { typescript: { command: ["typescript-language-server"] } } } }], - }), - ) - await page.route( - (url) => url.pathname === "/api/worktree", - (route) => { - if (route.request().method() !== "POST") return route.fallback() - calls.push({ type: "worktree", directory }) - project.sandboxes.push(createdWorkspace) - return route.fulfill({ json: { directory: createdWorkspace } }) - }, - ) - await page.route( - (url) => url.pathname === "/api/session", - (route) => { - if (route.request().method() !== "POST") return route.fallback() - const body: { id: string; location: { directory: string } } = route.request().postDataJSON() - calls.push({ type: "session", directory: body.location.directory }) - const session = currentSession( - { ...body, projectID: project.id, title: "Created summary session" }, - body.location.directory, - ) - sessions.push(session) - return route.fulfill({ json: { data: session } }) - }, - ) await page.addInitScript( - ({ directory, currentDirectory, server, draftID, secondDraftID, worktree }) => { - if (!localStorage.getItem("opencode.global.dat:server")) - localStorage.setItem( - "opencode.global.dat:server", - JSON.stringify({ - projects: { local: [{ worktree: directory, expanded: true }] }, - lastProject: { local: directory }, - }), - ) - if (!localStorage.getItem("opencode.window.browser.dat:tabs")) - localStorage.setItem( - "opencode.window.browser.dat:tabs", - JSON.stringify([ - { type: "draft", draftID, server, directory: currentDirectory, worktree }, - { type: "draft", draftID: secondDraftID, server, directory: currentDirectory, worktree }, - ]), - ) + ({ directory, draftID, server }) => { + localStorage.setItem( + "opencode.global.dat:server", + JSON.stringify({ + projects: { local: [{ worktree: directory, expanded: true }] }, + lastProject: { local: directory }, + }), + ) + localStorage.setItem( + "opencode.window.browser.dat:tabs", + JSON.stringify([{ type: "draft", draftID, server, directory }]), + ) }, - { directory, currentDirectory, server, draftID, secondDraftID, worktree }, + { directory, draftID, server }, ) - if (options.direction) await openWithDirection(page, draftPath, options.direction) - if (!options.direction) await page.goto(draftPath) - await expect(page.locator('[data-component="composer-editor"]')).toBeEditable() - await expect(page.locator('[data-action="composer-model"]')).toContainText("Summary Model") - if (options.git === false) await expect(page.getByText("No Git", { exact: true })).toBeVisible() - if (options.git !== false) { - await expect( - page.getByRole("button", { name: worktree === "create" ? "New worktree" : "Local", exact: true }), - ).toBeVisible() - } - return { calls, prompts, status, state } -} + + await page.goto(`/new-session?draftId=${draftID}`) + await expectAppVisible(page.locator('[data-component="composer-editor"]')) + await expect(page.getByRole("button", { name: "Session details", exact: true })).toHaveCount(0) + await testInfo.attach("new-session-without-summary", { body: await page.screenshot(), contentType: "image/png" }) +}) diff --git a/packages/app/e2e/regression/session-summary-layout.spec.ts b/packages/app/e2e/regression/session-summary-layout.spec.ts index 404d95f2d57..d2ea644fb72 100644 --- a/packages/app/e2e/regression/session-summary-layout.spec.ts +++ b/packages/app/e2e/regression/session-summary-layout.spec.ts @@ -4,8 +4,7 @@ import { mockStressTimeline, stressSessionHref } from "../performance/timeline/t import { openWithDirection } from "../utils/direction" for (const direction of ["ltr", "rtl"] as const) { - test(`summary slides the conversation into spare space and back in ${direction}`, async ({ page }, testInfo) => { - await page.clock.install({ time: new Date("2026-09-10T12:00:00Z") }) + test(`summary overlays the conversation without shifting it in ${direction}`, async ({ page }, testInfo) => { await page.setViewportSize({ width: 1440, height: 900 }) await mockStressTimeline(page) await openWithDirection(page, stressSessionHref(fixture.targetID), direction) @@ -18,7 +17,6 @@ for (const direction of ["ltr", "rtl"] as const) { ) const content = page.locator("[data-timeline-virtual-content]") const composer = page.locator('[data-component="session-composer-dock"] > div') - const panel = page.locator('[data-slot="session-chat-panel"]') const summary = page.getByRole("dialog", { name: "Session details", exact: true }) await expect(row).toBeInViewport() await expect(row).toHaveCSS("width", "1000px") @@ -26,103 +24,43 @@ for (const direction of ["ltr", "rtl"] as const) { const dock = await composer.boundingBox() expect(before).not.toBeNull() expect(dock).not.toBeNull() - await content.evaluate((element) => { - element.setAttribute("data-summary-motion", "") - for (const type of ["transitionrun", "transitionend"]) { - element.addEventListener(type, (event) => { - if (event.target !== element || (event as TransitionEvent).propertyName !== "translate") return - element.setAttribute("data-summary-motion", `${element.getAttribute("data-summary-motion")}${type},`) - }) - } - }) + await expect(content).toHaveCSS("translate", "none") + await expect(composer).toHaveCSS("translate", "none") await testInfo.attach(`summary-${direction}-centered`, { body: await page.screenshot(), contentType: "image/png" }) await trigger.click() - await expect(content).toHaveAttribute("data-summary-motion", "transitionrun,transitionend,") + await expect(summary).toBeVisible() await expect .poll(async () => { const message = await row.boundingBox() const details = await summary.boundingBox() - const chat = await panel.boundingBox() - if (!message || !details || !chat) return false - return ( - message.x >= chat.x && - message.x + message.width <= chat.x + chat.width && - (direction === "ltr" ? message.x + message.width < details.x : message.x > details.x + details.width) - ) + if (!message || !details) return 0 + return Math.min(message.x + message.width, details.x + details.width) - Math.max(message.x, details.x) }) - .toBe(true) + .toBeGreaterThan(0) await expect(row).toHaveCSS("width", "1000px") await expect .poll(async () => { const message = await row.boundingBox() const input = await composer.boundingBox() if (!message || !input || !before || !dock) return Infinity - return Math.abs(message.x - before.x - (input.x - dock.x)) + return Math.max(Math.abs(message.x - before.x), Math.abs(input.x - dock.x)) }) .toBeLessThan(1) - await expect - .poll(() => - content.evaluate((element) => element.parentElement!.scrollWidth - element.parentElement!.clientWidth), - ) - .toBe(0) - await testInfo.attach(`summary-${direction}-shifted`, { body: await page.screenshot(), contentType: "image/png" }) + await expect(content).toHaveCSS("translate", "none") + await expect(composer).toHaveCSS("translate", "none") + await testInfo.attach(`summary-${direction}-overlay`, { body: await page.screenshot(), contentType: "image/png" }) - await page.clock.pauseAt(new Date("2026-09-10T12:01:00Z")) - const shifted = await content.evaluate((element) => getComputedStyle(element).translate) - await content.evaluate((element) => element.setAttribute("data-summary-motion", "")) - // Keep issuing resize events before the idle timer expires, including crossing the width cutoff. - for (const width of [1520, 1280, 1800]) { - await page.setViewportSize({ width, height: 900 }) - await expect(panel).toHaveAttribute("data-summary-resizing", "true") - await page.clock.runFor(100) - await expect(content).toHaveCSS("translate", shifted) - await expect(composer).toHaveCSS("translate", shifted) - await expect(content).toHaveAttribute("data-summary-motion", "") - } - await page.clock.resume() - await expect(panel).toHaveAttribute("data-summary-resizing", "false") - await expect(content).toHaveAttribute("data-summary-motion", "transitionrun,transitionend,") - await expect(content).not.toHaveCSS("translate", shifted) - await page.setViewportSize({ width: 1440, height: 900 }) - await expect(panel).toHaveAttribute("data-summary-resizing", "false") - await expect(content).toHaveCSS("translate", shifted) - - await content.evaluate((element) => element.setAttribute("data-summary-motion", "")) await page.keyboard.press("Escape") await expect(summary).toBeHidden() - await expect(content).toHaveAttribute("data-summary-motion", "transitionrun,transitionend,") await expect.poll(async () => Math.abs((await row.boundingBox())!.x - before!.x)).toBeLessThan(1) await expect(trigger).toBeFocused() await trigger.click() await expect(summary.getByRole("button", { name: "Extensions", exact: true })).toBeVisible() - // Cross the actual chat-panel breakpoint, including any surrounding shell width. - const shell = 1440 - (await panel.boundingBox())!.width - await page.setViewportSize({ width: 1320 + shell, height: 900 }) - await expect.poll(async () => (await panel.boundingBox())!.width).toBe(1320) - await expect - .poll(async () => { - const message = (await row.boundingBox())! - const details = (await summary.boundingBox())! - return direction === "ltr" ? details.x - message.x - message.width : message.x - details.x - details.width - }) - .toBeGreaterThan(0) - await page.setViewportSize({ width: 1319 + shell, height: 900 }) - await expect(content).toHaveCSS("translate", "none") - await expect(row).toHaveCSS("width", "1000px") - await expect(summary).toBeVisible() - await page.setViewportSize({ width: 1800, height: 900 }) - await expect(panel).toHaveAttribute("data-summary-resizing", "false") await expect(content).toHaveCSS("translate", "none") + await expect(composer).toHaveCSS("translate", "none") await expect(summary).toBeVisible() - - await page.emulateMedia({ reducedMotion: "reduce" }) - await page.setViewportSize({ width: 1440, height: 900 }) - await expect(content).toHaveCSS("transition-duration", "0s") - await page.keyboard.press("Escape") - await expect(content).toHaveCSS("translate", "none") - await expect.poll(async () => Math.abs((await row.boundingBox())!.x - before!.x)).toBeLessThan(1) }) } diff --git a/packages/app/src/index.css b/packages/app/src/index.css index a80574f6f48..05e0ab19ef2 100644 --- a/packages/app/src/index.css +++ b/packages/app/src/index.css @@ -38,57 +38,6 @@ } @layer components { - [data-slot="session-chat-panel"] { - container-name: session-chat; - } - - [data-component="new-session"] { - container-type: inline-size; - container-name: new-session; - } - - [data-slot="session-chat-panel"] - :is([data-timeline-virtual-content], [data-component="session-composer-dock"] > div), - [data-slot="new-session-content"] { - translate: var(--session-summary-resize-translate, var(--session-summary-translate, none)); - transition: translate 240ms cubic-bezier(0.4, 0, 0.2, 1); - - @media (prefers-reduced-motion: reduce) { - transition: none; - } - } - - [data-slot="session-chat-panel"][data-summary-resizing="true"] - :is([data-timeline-virtual-content], [data-component="session-composer-dock"] > div), - [data-component="new-session"][data-summary-resizing="true"] [data-slot="new-session-content"] { - transition: none; - } - - /* Keep the 1000px conversation intact, with 320px for the summary and its gutters. - When they overlap, center the conversation in the space that remains beside the summary. */ - @container session-chat (min-width: 1320px) and (width < 1640px) { - [data-slot="session-chat-panel"][data-summary-open="true"] - :is([data-timeline-virtual-content], [data-component="session-composer-dock"] > div) { - --session-summary-translate: -160px; - - &:dir(rtl) { - --session-summary-translate: 160px; - } - } - } - - /* Shift only while centered content overlaps the 280px summary cards and their 16px edge inset: - 880px + 2 * (280px + 16px) = 1472px. Center it in the remaining space, reserving 320px. */ - @container new-session (min-width: 1200px) and (width < 1472px) { - [data-component="new-session"][data-summary-open="true"] [data-slot="new-session-content"] { - --session-summary-translate: -160px; - - &:dir(rtl) { - --session-summary-translate: 160px; - } - } - } - [data-slot="session-chat-panel"][data-scrollbar-hidden="true"] [data-slot="session-timeline-scroll"] > .scroll-view__thumb { diff --git a/packages/app/src/new-session/screen.tsx b/packages/app/src/new-session/screen.tsx index 1a5ff56df85..259752908f5 100644 --- a/packages/app/src/new-session/screen.tsx +++ b/packages/app/src/new-session/screen.tsx @@ -88,7 +88,7 @@ export default function NewSessionPage(props: { draftId: string }) {
{suspendUntilPromptReady()}
- +
) diff --git a/packages/app/src/new-session/summary.tsx b/packages/app/src/new-session/summary.tsx deleted file mode 100644 index 1a9f10143d6..00000000000 --- a/packages/app/src/new-session/summary.tsx +++ /dev/null @@ -1,64 +0,0 @@ -import { Icon } from "@opencode/ui/icon" -import { Show } from "solid-js" -import { useLanguage } from "@/runtime/i18n/language" -import { ProjectSummaryCard } from "@/session/summary/project-card" -import { SessionServerPanel } from "@/session/summary/server-panel" -import type { PromptProject } from "./project/selector" -import type { DraftMcpControls } from "./mcp" -import type { NewSessionWorkspaceController } from "./workspace/controller" -import { PromptWorkspaceSelector } from "./workspace/selector" - -export function NewSessionSummary(props: { - project?: PromptProject - workspace: NewSessionWorkspaceController - mcp: DraftMcpControls - shown: boolean - onChooseProject: () => void -}) { - const language = useLanguage() - return ( -
- - -
- } - > - {(project) => ( - <> - - - - {language.t("session.new.git.none")} - - } - > - - - - - - )} - - - ) -} diff --git a/packages/app/src/new-session/view.tsx b/packages/app/src/new-session/view.tsx index add373c25d7..d04f8126e0f 100644 --- a/packages/app/src/new-session/view.tsx +++ b/packages/app/src/new-session/view.tsx @@ -1,10 +1,7 @@ import { useDialog } from "@opencode/ui/context/dialog" import { Tooltip } from "@opencode/ui/tooltip" import { Icon } from "@opencode/ui/icon" -import { Show, Suspense, createMemo, createSignal, lazy, onMount } from "solid-js" -import { createStore } from "solid-js/store" -import { makeEventListener } from "@solid-primitives/event-listener" -import { debounce } from "@solid-primitives/scheduled" +import { Show, createMemo, createSignal } from "solid-js" import { Schema } from "effect" import createPresence from "solid-presence" import { Composer } from "@/composer/composer" @@ -24,13 +21,6 @@ import { Persist, persisted } from "@/runtime/persistence/storage" import { Persistence } from "@/runtime/persistence/schema" import type { NewSessionWorkspaceController } from "./workspace/controller" import { NewSessionWordmark } from "./wordmark" -import { SummaryPopover } from "@/session/summary/popover" -import type { DraftMcpControls } from "./mcp" - -const NewSessionSummary = lazy(async () => { - const { NewSessionSummary } = await import("./summary") - return { default: NewSessionSummary } -}) const providerTipDismissalDuration = 30 * 24 * 60 * 60 * 1000 @@ -48,23 +38,7 @@ export function NewSessionView(props: { composer: ComposerModel project: PromptProjectController workspace: NewSessionWorkspaceController - mcp: DraftMcpControls }) { - const [store, setStore] = createStore({ - summary: false, - content: undefined as HTMLDivElement | undefined, - summaryResizeTranslate: undefined as string | undefined, - }) - const finishWindowResize = debounce(() => setStore("summaryResizeTranslate", undefined), 150) - onMount(() => { - makeEventListener(window, "resize", () => { - if (store.summaryResizeTranslate === undefined) { - // Freeze the painted offset, including an in-flight slide, until resizing settles. - setStore("summaryResizeTranslate", store.content ? getComputedStyle(store.content).translate : "none") - } - finishWindowResize() - }) - }) const [onboarding, setOnboarding, , onboardingReady] = persisted( Persist.global("workspace-onboarding"), WorkspaceOnboardingSchema, @@ -79,40 +53,14 @@ export function NewSessionView(props: {
-
- setStore("summary", open)}> - - { - setStore("summary", false) - props.project.add() - }} - /> - - -
-
setStore("content", element)} - data-slot="new-session-content" - class={NEW_SESSION_CONTENT_WIDTH} - > +
diff --git a/packages/app/src/session/screen.tsx b/packages/app/src/session/screen.tsx index b0d548e2219..71fe3a9a251 100644 --- a/packages/app/src/session/screen.tsx +++ b/packages/app/src/session/screen.tsx @@ -9,11 +9,8 @@ import { createEffect, createComputed, on, - onMount, } from "solid-js" import { createStore } from "solid-js/store" -import { makeEventListener } from "@solid-primitives/event-listener" -import { debounce } from "@solid-primitives/scheduled" import { ResizeHandle } from "@opencode/ui/resize-handle" import { MessageTimeline } from "@/session/timeline/message-timeline" import { useServer } from "@/runtime/server/current" @@ -93,24 +90,11 @@ function SessionScreenContent(props: { session: SessionModel; browser: ReturnTyp sideTerminalPresent: false, mobileTerminalCached: false, mobileMoveDismissed: false, - summaryResizeTranslate: undefined as string | undefined, }) const [elements, setElements] = createStore<{ - chat?: HTMLDivElement side?: HTMLDivElement bottomTerminal?: HTMLDivElement }>({}) - const finishWindowResize = debounce(() => setStore("summaryResizeTranslate", undefined), 150) - onMount(() => { - makeEventListener(window, "resize", () => { - if (store.summaryResizeTranslate === undefined) { - const content = elements.chat?.querySelector("[data-timeline-virtual-content]") - // Freeze the painted offset, including an in-flight slide, until resizing settles. - setStore("summaryResizeTranslate", content ? getComputedStyle(content).translate : "none") - } - finishWindowResize() - }) - }) const sideVisible = createMemo(() => isDesktop() && screen.side.layout().visible) const sideTerminalVisible = createMemo(() => isDesktop() && screen.terminal.side() && screen.terminal.open()) const bottomTerminalVisible = createMemo(() => isDesktop() && screen.terminal.open() && screen.terminal.bottom()) @@ -369,9 +353,6 @@ function SessionScreenContent(props: { session: SessionModel; browser: ReturnTyp "transition-none": screen.size.active() || !sidePresence.animate(), }} data-slot="session-chat-panel" - ref={(element) => setElements("chat", element)} - data-summary-open={isDesktop() && review.details.open()} - data-summary-resizing={store.summaryResizeTranslate !== undefined} data-width-animating={store.sideWidthMotion} data-scrollbar-hidden={store.timelineScrollbarHidden || store.sideWidthMotion} onPointerMove={revealTimelineScrollbar} @@ -381,10 +362,7 @@ function SessionScreenContent(props: { session: SessionModel; browser: ReturnTyp onTransitionRun={trackSideWidthMotion} onTransitionEnd={trackSideWidthMotion} onTransitionCancel={trackSideWidthMotion} - style={{ - width: screen.panel.width(), - "--session-summary-resize-translate": store.summaryResizeTranslate, - }} + style={{ width: screen.panel.width() }} >