Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Aarav Sareen <96787824+arvsrn@users.noreply.github.com> Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com> Co-authored-by: opencode <opencode@sst.dev> Co-authored-by: Jay <53023+jayair@users.noreply.github.com> Co-authored-by: David Hill <1879069+iamdavidhill@users.noreply.github.com> Co-authored-by: BB84 <110078428+BB-84C@users.noreply.github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com> Co-authored-by: Dax <mail@thdxr.com> Co-authored-by: Brendan Allan <git@brendonovich.dev> Co-authored-by: Jay V <air@live.ca> Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Dustin Deus <deusdustin@gmail.com> Co-authored-by: Frank <frank@anoma.ly> Co-authored-by: usrnk1 <7547651+usrnk1@users.noreply.github.com> Co-authored-by: Jack <jack@anoma.ly> Co-authored-by: Sebastian <hasta84@gmail.com> Co-authored-by: Jérôme Benoit <jerome.benoit@sap.com> Co-authored-by: Test User <test@test.com> Co-authored-by: Simon Klee <hello@simonklee.dk> Co-authored-by: Rahul A Mistry <149420892+ProdigyRahul@users.noreply.github.com> Co-authored-by: Qiping Li <liqiping1991@gmail.com> Co-authored-by: liqiping <liqiping@msh.team> Co-authored-by: OpeOginni <107570612+OpeOginni@users.noreply.github.com> Co-authored-by: Matthias Reso <13337103+mreso@users.noreply.github.com> Co-authored-by: tobwen <1864057+tobwen@users.noreply.github.com> Co-authored-by: Daniel Polito <danielbpolito@gmail.com> Co-authored-by: opencode <noreply@opencode.ai> Co-authored-by: Devin R Leopold <devin.leopold@gmail.com> Co-authored-by: Zach Bruggeman <mail@bruggie.com> Co-authored-by: Zach Bruggeman <zbruggeman@ramp.com> Co-authored-by: Kit Langton <kit.langton@gmail.com> Co-authored-by: David Siewert <david1gruppenplan@gmail.com> Co-authored-by: Andrei Dziahel <develop7@develop7.info> Co-authored-by: adityachaudhary99 <adityaachaudhary2003@gmail.com> Co-authored-by: Vladimir Glafirov <vglafirov@gitlab.com> Co-authored-by: Matt Carey <mcarey@cloudflare.com>
227 lines
8 KiB
TypeScript
227 lines
8 KiB
TypeScript
import { base64Encode } from "@opencode-ai/core/util/encode"
|
|
import { expect, test, type Page } from "@playwright/test"
|
|
import { mockOpenCodeServer } from "../utils/mock-server"
|
|
import { expectSessionTitle } from "../utils/waits"
|
|
|
|
const directory = "C:/OpenCode/TerminalComposerFocus"
|
|
const projectID = "proj_terminal_composer_focus"
|
|
const sessionID = "ses_terminal_composer_focus"
|
|
const ptyID = "pty_terminal_composer_focus"
|
|
const newPtyID = "pty_terminal_composer_focus_new"
|
|
|
|
test.use({ viewport: { width: 1440, height: 900 } })
|
|
|
|
test.beforeEach(async ({ page }) => {
|
|
await mockOpenCodeServer(page, {
|
|
protocol: "v2",
|
|
directory,
|
|
project: {
|
|
id: projectID,
|
|
worktree: directory,
|
|
vcs: "git",
|
|
name: "terminal-composer-focus",
|
|
time: { created: 1700000000000, updated: 1700000000000 },
|
|
sandboxes: [],
|
|
},
|
|
provider: {
|
|
all: [
|
|
{
|
|
id: "opencode",
|
|
name: "OpenCode",
|
|
models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
|
|
},
|
|
],
|
|
connected: ["opencode"],
|
|
default: { providerID: "opencode", modelID: "test" },
|
|
},
|
|
sessions: [
|
|
{
|
|
id: sessionID,
|
|
slug: "terminal-composer-focus",
|
|
projectID,
|
|
directory,
|
|
title: "Terminal composer focus",
|
|
version: "dev",
|
|
time: { created: 1700000000000, updated: 1700000000000 },
|
|
},
|
|
],
|
|
pageMessages: () => ({ items: [] }),
|
|
})
|
|
await page.route("**/api/pty*", (route) => {
|
|
expect(new URL(route.request().url()).searchParams.get("location[directory]")).toBe(directory)
|
|
return route.fulfill({
|
|
status: 200,
|
|
contentType: "application/json",
|
|
body: JSON.stringify({ location: ptyLocation(), data: ptyInfo(ptyID, "Terminal 1") }),
|
|
})
|
|
})
|
|
await page.route(`**/api/pty/${ptyID}*`, (route) =>
|
|
route.fulfill({
|
|
status: 200,
|
|
contentType: "application/json",
|
|
body: JSON.stringify({ location: ptyLocation(), data: ptyInfo(ptyID, "Terminal 1") }),
|
|
}),
|
|
)
|
|
await page.route(`**/api/pty/${ptyID}/connect-token*`, (route) =>
|
|
route.fulfill({
|
|
status: 200,
|
|
contentType: "application/json",
|
|
headers: { "access-control-allow-origin": "*" },
|
|
body: JSON.stringify({ location: ptyLocation(), data: { ticket: "e2e-ticket", expires_in: 60 } }),
|
|
}),
|
|
)
|
|
await page.routeWebSocket(new RegExp(`/api/pty/${ptyID}/connect`), () => undefined)
|
|
await page.addInitScript(() => {
|
|
localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
|
|
})
|
|
})
|
|
|
|
test("routes typing to the composer unless the open terminal is focused", async ({ page }) => {
|
|
await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
|
|
await expectSessionTitle(page, "Terminal composer focus")
|
|
|
|
const composer = page.locator('[data-component="prompt-input"]')
|
|
const terminal = page.locator('[data-component="terminal"]')
|
|
await page.keyboard.press("Control+Backquote")
|
|
await expect(terminal).toBeVisible()
|
|
await expect.poll(() => terminal.evaluate((element) => element.contains(document.activeElement))).toBe(true)
|
|
|
|
await page.keyboard.type("x")
|
|
await expect(composer).toHaveText("")
|
|
|
|
await page.waitForTimeout(300)
|
|
await page.evaluate(() => (document.activeElement as HTMLElement | null)?.blur())
|
|
await page.keyboard.type("a")
|
|
|
|
await expect(composer).toBeFocused()
|
|
await expect(composer).toHaveText("a")
|
|
})
|
|
|
|
test("keeps composer focus when a cached terminal finishes mounting", async ({ page }) => {
|
|
const ghostty = Promise.withResolvers<void>()
|
|
const release = Promise.withResolvers<void>()
|
|
const created = { count: 0 }
|
|
await page.route("**/api/pty*", (route) => {
|
|
created.count += 1
|
|
return route.fulfill({
|
|
status: 200,
|
|
contentType: "application/json",
|
|
body: JSON.stringify({ location: ptyLocation(), data: ptyInfo(ptyID, "Terminal 1") }),
|
|
})
|
|
})
|
|
await page.route(/ghostty-web/, async (route) => {
|
|
ghostty.resolve()
|
|
await release.promise
|
|
await route.continue()
|
|
})
|
|
await seedCachedTerminal(page)
|
|
|
|
await page.goto(`/${base64Encode(directory)}/session/${sessionID}`, { waitUntil: "commit" })
|
|
await expectSessionTitle(page, "Terminal composer focus")
|
|
|
|
const composer = page.locator('[data-component="prompt-input"]')
|
|
const terminal = page.locator('[data-component="terminal"]')
|
|
await expect(terminal).toBeVisible()
|
|
expect(created.count).toBe(0)
|
|
await ghostty.promise
|
|
await composer.click()
|
|
await expect(composer).toBeFocused()
|
|
|
|
release.resolve()
|
|
await expect(terminal.locator("textarea")).toHaveCount(1)
|
|
await page.waitForTimeout(300)
|
|
await expect(composer).toBeFocused()
|
|
})
|
|
|
|
test("keeps newer composer focus while an explicit terminal open finishes", async ({ page }) => {
|
|
const ghostty = Promise.withResolvers<void>()
|
|
const release = Promise.withResolvers<void>()
|
|
await page.route(/ghostty-web/, async (route) => {
|
|
ghostty.resolve()
|
|
await release.promise
|
|
await route.continue()
|
|
})
|
|
|
|
await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
|
|
await expectSessionTitle(page, "Terminal composer focus")
|
|
|
|
const composer = page.locator('[data-component="prompt-input"]')
|
|
const terminal = page.locator('[data-component="terminal"]')
|
|
await page.keyboard.press("Control+Backquote")
|
|
await expect(terminal).toBeVisible()
|
|
await ghostty.promise
|
|
await composer.click()
|
|
await expect(composer).toBeFocused()
|
|
|
|
release.resolve()
|
|
await expect(terminal.locator("textarea")).toHaveCount(1)
|
|
await page.waitForTimeout(50)
|
|
await expect(composer).toBeFocused()
|
|
})
|
|
|
|
test("focuses a terminal created from the new-terminal button", async ({ page }) => {
|
|
const created = { count: 0 }
|
|
await page.route("**/api/pty*", (route) => {
|
|
created.count += 1
|
|
const next = created.count === 1 ? ptyInfo(ptyID, "Terminal 1") : ptyInfo(newPtyID, "Terminal 2")
|
|
return route.fulfill({
|
|
status: 200,
|
|
contentType: "application/json",
|
|
body: JSON.stringify({ location: ptyLocation(), data: next }),
|
|
})
|
|
})
|
|
await page.route(`**/api/pty/${newPtyID}*`, (route) =>
|
|
route.fulfill({
|
|
status: 200,
|
|
contentType: "application/json",
|
|
body: JSON.stringify({ location: ptyLocation(), data: ptyInfo(newPtyID, "Terminal 2") }),
|
|
}),
|
|
)
|
|
await page.route(`**/api/pty/${newPtyID}/connect-token*`, (route) =>
|
|
route.fulfill({
|
|
status: 200,
|
|
contentType: "application/json",
|
|
headers: { "access-control-allow-origin": "*" },
|
|
body: JSON.stringify({ location: ptyLocation(), data: { ticket: "e2e-ticket", expires_in: 60 } }),
|
|
}),
|
|
)
|
|
await page.routeWebSocket(new RegExp(`/api/pty/${newPtyID}/connect`), () => undefined)
|
|
|
|
await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
|
|
await expectSessionTitle(page, "Terminal composer focus")
|
|
|
|
const composer = page.locator('[data-component="prompt-input"]')
|
|
const terminal = page.locator('[data-component="terminal"]')
|
|
await page.keyboard.press("Control+Backquote")
|
|
await expect(terminal.locator("textarea")).toHaveCount(1)
|
|
await composer.click()
|
|
await expect(composer).toBeFocused()
|
|
|
|
await page.getByRole("button", { name: "New terminal" }).click()
|
|
await expect(page.getByRole("tab", { name: "Terminal 2" })).toHaveAttribute("aria-selected", "true")
|
|
await expect.poll(() => terminal.evaluate((element) => element.contains(document.activeElement))).toBe(true)
|
|
})
|
|
|
|
function seedCachedTerminal(page: Page) {
|
|
return page.addInitScript(
|
|
({ terminalKey, ptyID }) => {
|
|
localStorage.setItem("opencode.global.dat:layout", JSON.stringify({ terminal: { height: 320, opened: true } }))
|
|
localStorage.setItem(
|
|
terminalKey,
|
|
JSON.stringify({
|
|
active: ptyID,
|
|
all: [{ id: ptyID, title: "Terminal 1", titleNumber: 1 }],
|
|
}),
|
|
)
|
|
},
|
|
{ terminalKey: `${base64Encode(directory)}/terminal.v1`, ptyID },
|
|
)
|
|
}
|
|
|
|
function ptyLocation() {
|
|
return { directory, project: { id: projectID, directory } }
|
|
}
|
|
|
|
function ptyInfo(id: string, title: string) {
|
|
return { id, title, command: "cmd.exe", args: [], cwd: directory, status: "running", pid: 1 }
|
|
}
|