test(app): fix isolated backend follow-ups (#20513)

Author: kitlangton

packages/app/e2e/backend.ts

@@ -44,6 +44,14 @@ async function waitForHealth(url: string, probe = "/global/health") {
   throw new Error(`Timed out waiting for backend health at ${url}${probe}${last ? ` (${last})` : ""}`)
 }
 
+async function waitExit(proc: ReturnType<typeof spawn>, timeout = 10_000) {
+  if (proc.exitCode !== null) return
+  await Promise.race([
+    new Promise<void>((resolve) => proc.once("exit", () => resolve())),
+    new Promise<void>((resolve) => setTimeout(resolve, timeout)),
+  ])
+}
+
 const LOG_CAP = 100
 
 function cap(input: string[]) {
@@ -62,7 +70,6 @@ export async function startBackend(label: string): Promise<Handle> {
   const opencodeDir = path.join(repoDir, "packages", "opencode")
   const env = {
     ...process.env,
-    OPENCODE_DISABLE_SHARE: process.env.OPENCODE_DISABLE_SHARE ?? "true",
     OPENCODE_DISABLE_LSP_DOWNLOAD: "true",
     OPENCODE_DISABLE_DEFAULT_PLUGINS: "true",
     OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER: "true",
@@ -117,7 +124,11 @@ export async function startBackend(label: string): Promise<Handle> {
     async stop() {
       if (proc.exitCode === null) {
         proc.kill("SIGTERM")
-        await new Promise((resolve) => proc.once("exit", () => resolve(undefined))).catch(() => undefined)
+        await waitExit(proc)
+      }
+      if (proc.exitCode === null) {
+        proc.kill("SIGKILL")
+        await waitExit(proc)
       }
       await fs.rm(sandbox, { recursive: true, force: true }).catch(() => undefined)
     },

packages/app/e2e/prompt/prompt-history.spec.ts

@@ -3,9 +3,11 @@ import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
 import { assistantText, sessionIDFromUrl } from "../actions"
 import { promptSelector } from "../selectors"
+import { createSdk } from "../utils"
 import { openaiModel, promptMatch, titleMatch, withMockOpenAI } from "./mock"
 
 const text = (value: string | null) => (value ?? "").replace(/\u200B/g, "").trim()
+type Sdk = ReturnType<typeof createSdk>
 
 const isBash = (part: unknown): part is ToolPart => {
   if (!part || typeof part !== "object") return false
@@ -14,47 +16,15 @@ const isBash = (part: unknown): part is ToolPart => {
   return "state" in part
 }
 
-async function edge(page: Page, pos: "start" | "end") {
-  await page.locator(promptSelector).evaluate((el: HTMLDivElement, pos: "start" | "end") => {
-    const selection = window.getSelection()
-    if (!selection) return
-
-    const walk = document.createTreeWalker(el, NodeFilter.SHOW_TEXT)
-    const nodes: Text[] = []
-    for (let node = walk.nextNode(); node; node = walk.nextNode()) {
-      nodes.push(node as Text)
-    }
-
-    if (nodes.length === 0) {
-      const node = document.createTextNode("")
-      el.appendChild(node)
-      nodes.push(node)
-    }
-
-    const node = pos === "start" ? nodes[0]! : nodes[nodes.length - 1]!
-    const range = document.createRange()
-    range.setStart(node, pos === "start" ? 0 : (node.textContent ?? "").length)
-    range.collapse(true)
-    selection.removeAllRanges()
-    selection.addRange(range)
-  }, pos)
-}
-
 async function wait(page: Page, value: string) {
   await expect.poll(async () => text(await page.locator(promptSelector).textContent())).toBe(value)
 }
 
-async function reply(
-  sdk: { session: { messages: Parameters<typeof assistantText>[0]["session"] } },
-  sessionID: string,
-  token: string,
-) {
-  await expect
-    .poll(() => assistantText(sdk as Parameters<typeof assistantText>[0], sessionID), { timeout: 90_000 })
-    .toContain(token)
+async function reply(sdk: Sdk, sessionID: string, token: string) {
+  await expect.poll(() => assistantText(sdk, sessionID), { timeout: 90_000 }).toContain(token)
 }
 
-async function shell(sdk: Parameters<typeof withSession>[0], sessionID: string, cmd: string, token: string) {
+async function shell(sdk: Sdk, sessionID: string, cmd: string, token: string) {
   await expect
     .poll(
       async () => {
@@ -142,76 +112,64 @@ test("prompt history restores unsent draft with arrow navigation", async ({
   })
 })
 
-test("shell history stays separate from normal prompt history", async ({ page, llm, backend, withBackendProject }) => {
+test.fixme("shell history stays separate from normal prompt history", async ({ page, sdk, gotoSession }) => {
   test.setTimeout(120_000)
 
-  await withMockOpenAI({
-    serverUrl: backend.url,
-    llmUrl: llm.url,
-    fn: async () => {
-      const firstToken = `E2E_SHELL_ONE_${Date.now()}`
-      const secondToken = `E2E_SHELL_TWO_${Date.now()}`
-      const normalToken = `E2E_NORMAL_${Date.now()}`
-      const first = `echo ${firstToken}`
-      const second = `echo ${secondToken}`
-      const normal = `Reply with exactly: ${normalToken}`
+  const firstToken = `E2E_SHELL_ONE_${Date.now()}`
+  const secondToken = `E2E_SHELL_TWO_${Date.now()}`
+  const normalToken = `E2E_NORMAL_${Date.now()}`
+  const first = `echo ${firstToken}`
+  const second = `echo ${secondToken}`
+  const normal = `Reply with exactly: ${normalToken}`
 
-      await llm.textMatch(titleMatch, "E2E Title")
-      await llm.textMatch(promptMatch(normalToken), normalToken)
+  await gotoSession()
 
-      await withBackendProject(
-        async (project) => {
-          const prompt = page.locator(promptSelector)
+  const prompt = page.locator(promptSelector)
 
-          await prompt.click()
-          await page.keyboard.type("!")
-          await page.keyboard.type(first)
-          await page.keyboard.press("Enter")
-          await wait(page, "")
+  await prompt.click()
+  await page.keyboard.type("!")
+  await page.keyboard.type(first)
+  await page.keyboard.press("Enter")
+  await wait(page, "")
 
-          await expect(page).toHaveURL(/\/session\/[^/?#]+/, { timeout: 30_000 })
-          const sessionID = sessionIDFromUrl(page.url())!
-          project.trackSession(sessionID)
-          await shell(project.sdk, sessionID, first, firstToken)
+  await expect(page).toHaveURL(/\/session\/[^/?#]+/, { timeout: 30_000 })
+  const sessionID = sessionIDFromUrl(page.url())!
+  await shell(sdk, sessionID, first, firstToken)
 
-          await prompt.click()
-          await page.keyboard.type("!")
-          await page.keyboard.type(second)
-          await page.keyboard.press("Enter")
-          await wait(page, "")
-          await shell(project.sdk, sessionID, second, secondToken)
+  await prompt.click()
+  await page.keyboard.type("!")
+  await page.keyboard.type(second)
+  await page.keyboard.press("Enter")
+  await wait(page, "")
+  await shell(sdk, sessionID, second, secondToken)
 
-          await prompt.click()
-          await page.keyboard.type("!")
-          await page.keyboard.press("ArrowUp")
-          await wait(page, second)
+  await page.keyboard.press("Escape")
+  await wait(page, "")
 
-          await page.keyboard.press("ArrowUp")
-          await wait(page, first)
+  await prompt.click()
+  await page.keyboard.type("!")
+  await page.keyboard.press("ArrowUp")
+  await wait(page, second)
 
-          await page.keyboard.press("ArrowDown")
-          await wait(page, second)
+  await page.keyboard.press("ArrowUp")
+  await wait(page, first)
 
-          await page.keyboard.press("ArrowDown")
-          await wait(page, "")
+  await page.keyboard.press("ArrowDown")
+  await wait(page, second)
 
-          await page.keyboard.press("Escape")
-          await wait(page, "")
+  await page.keyboard.press("ArrowDown")
+  await wait(page, "")
 
-          await prompt.click()
-          await page.keyboard.type(normal)
-          await page.keyboard.press("Enter")
-          await wait(page, "")
-          await reply(project.sdk, sessionID, normalToken)
+  await page.keyboard.press("Escape")
+  await wait(page, "")
 
-          await prompt.click()
-          await page.keyboard.press("ArrowUp")
-          await wait(page, normal)
-        },
-        {
-          model: openaiModel,
-        },
-      )
-    },
-  })
+  await prompt.click()
+  await page.keyboard.type(normal)
+  await page.keyboard.press("Enter")
+  await wait(page, "")
+  await reply(sdk, sessionID, normalToken)
+
+  await prompt.click()
+  await page.keyboard.press("ArrowUp")
+  await wait(page, normal)
 })

packages/app/e2e/prompt/prompt-slash-share.spec.ts

@@ -27,6 +27,7 @@ test("/share and /unshare update session share state", async ({ page, withBacken
 
   await withBackendProject(async (project) => {
     await withSession(project.sdk, `e2e slash share ${Date.now()}`, async (session) => {
+      project.trackSession(session.id)
       const prompt = page.locator(promptSelector)
 
       await seed(project.sdk, session.id)

packages/app/e2e/session/session-child-navigation.spec.ts

@@ -1,5 +1,6 @@
 import { seedSessionTask, withSession } from "../actions"
 import { test, expect } from "../fixtures"
+import { promptSelector } from "../selectors"
 
 test("task tool child-session link does not trigger stale show errors", async ({ page, withBackendProject }) => {
   test.setTimeout(120_000)
@@ -10,17 +11,16 @@ test("task tool child-session link does not trigger stale show errors", async ({
   }
   page.on("pageerror", onError)
 
-  await withBackendProject(async ({ gotoSession, trackSession, sdk }) => {
-    await withSession(sdk, `e2e child nav ${Date.now()}`, async (session) => {
-      trackSession(session.id)
-      const child = await seedSessionTask(sdk, {
-        sessionID: session.id,
-        description: "Open child session",
-        prompt: "Search the repository for AssistantParts and then reply with exactly CHILD_OK.",
-      })
-      trackSession(child.sessionID)
+  try {
+    await withBackendProject(async ({ gotoSession, trackSession, sdk }) => {
+      await withSession(sdk, `e2e child nav ${Date.now()}`, async (session) => {
+        const child = await seedSessionTask(sdk, {
+          sessionID: session.id,
+          description: "Open child session",
+          prompt: "Search the repository for AssistantParts and then reply with exactly CHILD_OK.",
+        })
+        trackSession(child.sessionID)
 
-      try {
         await gotoSession(session.id)
 
         const link = page
@@ -31,11 +31,11 @@ test("task tool child-session link does not trigger stale show errors", async ({
         await link.click()
 
         await expect(page).toHaveURL(new RegExp(`/session/${child.sessionID}(?:[/?#]|$)`), { timeout: 30_000 })
-        await page.waitForTimeout(1000)
-        expect(errs).toEqual([])
-      } finally {
-        page.off("pageerror", onError)
-      }
+        await expect(page.locator(promptSelector)).toBeVisible({ timeout: 30_000 })
+        await expect.poll(() => errs, { timeout: 5_000 }).toEqual([])
+      })
     })
-  })
+  } finally {
+    page.off("pageerror", onError)
+  }
 })