Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 49 additions & 3 deletions packages/app/e2e/session/session-composer-dock.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async function setAutoAccept(page: any, enabled: boolean) {

async function expectQuestionBlocked(page: any) {
await expect(page.locator(questionDockSelector)).toBeVisible()
await expect(page.locator(promptSelector)).toHaveCount(0)
await expect(page.locator(promptSelector)).toBeHidden()
}

async function expectQuestionOpen(page: any) {
Expand All @@ -87,7 +87,7 @@ async function expectQuestionOpen(page: any) {

async function expectPermissionBlocked(page: any) {
await expect(page.locator(permissionDockSelector)).toBeVisible()
await expect(page.locator(promptSelector)).toHaveCount(0)
await expect(page.locator(promptSelector)).toBeHidden()
}

async function expectPermissionOpen(page: any) {
Expand Down Expand Up @@ -269,6 +269,9 @@ async function withMockPermission<T>(
}
}

const promptText = async (page: any) =>
((await page.locator(promptSelector).textContent()) ?? "").replace(/\u200B/g, "").trim()

test("default dock shows prompt input", async ({ page, project }) => {
await project.open()
await withDockSession(
Expand Down Expand Up @@ -486,6 +489,49 @@ test("blocked permission flow supports allow always", async ({ page, project })
)
})

test("blocked permission flow preserves typed draft", async ({ page, project }) => {
await project.open()
await withDockSession(
project.sdk,
"e2e composer dock permission preserves draft",
async (session) => {
await project.gotoSession(session.id)
await setAutoAccept(page, false)

const value = `followup ${Date.now()}`
const prompt = page.locator(promptSelector)

await prompt.click()
await page.keyboard.type(value)
await expect.poll(() => promptText(page)).toBe(value)

await withMockPermission(
page,
{
id: "per_e2e_preserve_draft",
sessionID: session.id,
permission: "bash",
patterns: ["/tmp/opencode-e2e-preserve-draft"],
metadata: { description: "Need permission while draft exists" },
},
undefined,
async (state) => {
await page.goto(page.url())
await expectPermissionBlocked(page)

await clearPermissionDock(page, /allow once/i)
await state.resolved()
await page.goto(page.url())

await expectPermissionOpen(page)
await expect.poll(() => promptText(page)).toBe(value)
},
)
},
{ trackSession: project.trackSession },
)
})

test("child session question request blocks parent dock and unblocks after submit", async ({ page, llm, project }) => {
const questions = [
{
Expand Down Expand Up @@ -647,7 +693,7 @@ test("keyboard focus stays off prompt while blocked", async ({ page, llm, projec

await page.locator("main").click({ position: { x: 5, y: 5 } })
await page.keyboard.type("abc")
await expect(page.locator(promptSelector)).toHaveCount(0)
await expect(page.locator(promptSelector)).toBeHidden()
})
},
{ trackSession: project.trackSession },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,12 @@ export function SessionComposerRegion(props: {
<Show
when={child()}
fallback={
<Show when={!props.state.blocked()}>
<div
aria-hidden={props.state.blocked() ? "true" : undefined}
classList={{
hidden: props.state.blocked(),
}}
>
<PromptInput
ref={props.inputRef}
newSessionWorktree={props.newSessionWorktree}
Expand All @@ -261,7 +266,7 @@ export function SessionComposerRegion(props: {
onAbort={props.followup?.onAbort}
onSubmit={props.onSubmit}
/>
</Show>
</div>
}
>
<div
Expand Down
Loading