From be1b3a41db384324e81b1bc4ff652a045564097e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Flor=C3=AAncio?= Date: Mon, 30 Mar 2026 14:34:24 +0100 Subject: [PATCH] refactor(web): reorganize E2E tests into feature-based subdirectories (#499) --- .agents/skills/e2e/SKILL.md | 29 +- .../tests/{ => chat}/chat-status-bar.spec.ts | 6 +- .../tests/{ => chat}/clarification.spec.ts | 10 +- .../tests/{ => chat}/markdown-preview.spec.ts | 8 +- .../tests/{ => chat}/markdown-wrap.spec.ts | 6 +- apps/web/e2e/tests/chat/message-queue.spec.ts | 281 ++++++++++++++ .../e2e/tests/{ => chat}/quick-chat.spec.ts | 2 +- .../tests/{ => chat}/tool-completion.spec.ts | 4 +- .../tests/{ => chat}/toolbar-overflow.spec.ts | 8 +- .../e2e/tests/create-task-regression.spec.ts | 107 ----- .../e2e/tests/git-commit-pre-hooks.spec.ts | 168 -------- .../tests/{ => git}/diff-expansion.spec.ts | 8 +- .../e2e/tests/{ => git}/diff-update.spec.ts | 8 +- .../tests/{ => git}/git-changes-panel.spec.ts | 8 +- .../git-commit.spec.ts} | 118 +++++- .../e2e/tests/{ => git}/symlink-file.spec.ts | 8 +- .../tests/{ => kanban}/kanban-board.spec.ts | 4 +- .../tests/{ => kanban}/mobile-kanban.spec.ts | 4 +- .../preview-primary-session.spec.ts | 6 +- apps/web/e2e/tests/mcp-create-subtask.spec.ts | 168 -------- .../e2e/tests/mcp-subtask-executor.spec.ts | 131 ------- apps/web/e2e/tests/pr-auto-detection.spec.ts | 209 ---------- .../e2e/tests/pr-external-detection.spec.ts | 162 -------- apps/web/e2e/tests/pr/pr-detection.spec.ts | 335 ++++++++++++++++ .../{ => pr}/pr-switcher-changes.spec.ts | 6 +- .../pr-watcher-dockview-layout.spec.ts | 6 +- .../pr-watcher-merged-cleanup.spec.ts | 4 +- .../pr-watcher-missing-branch.spec.ts | 6 +- apps/web/e2e/tests/quick-chat-queue.spec.ts | 149 ------- .../review-cumulative-diff.spec.ts | 8 +- .../web/e2e/tests/session-tab-cleanup.spec.ts | 81 ---- .../{ => session}/auto-start-session.spec.ts | 4 +- .../{ => session}/executor-not-found.spec.ts | 6 +- .../{ => session}/multi-session-ux.spec.ts | 10 +- .../tests/{ => session}/multi-session.spec.ts | 6 +- .../{ => session}/new-session-dialog.spec.ts | 6 +- .../{ => session}/port-forward-dialog.spec.ts | 8 +- .../session-layout.spec.ts} | 77 +++- .../{ => session}/session-recovery.spec.ts | 8 +- .../{ => session}/session-resume-real.spec.ts | 2 +- .../{ => session}/session-resume.spec.ts | 8 +- .../agent-profile-delete.spec.ts | 2 +- .../config-chat-popover.spec.ts | 2 +- .../{ => settings}/config-management.spec.ts | 8 +- .../{ => settings}/vscode-open-file.spec.ts | 8 +- apps/web/e2e/tests/subtask.spec.ts | 85 ---- apps/web/e2e/tests/task-session-queue.spec.ts | 152 -------- .../{ => task}/archive-task-redirect.spec.ts | 6 +- .../{ => task}/create-task-github-url.spec.ts | 6 +- .../e2e/tests/{ => task}/create-task.spec.ts | 107 ++++- .../{ => task}/delete-task-redirect.spec.ts | 6 +- apps/web/e2e/tests/task/subtask.spec.ts | 367 ++++++++++++++++++ .../tests/{ => task}/task-environment.spec.ts | 2 +- .../e2e/tests/{ => task}/task-list.spec.ts | 2 +- .../{ => task}/task-switcher-status.spec.ts | 6 +- apps/web/e2e/tests/terminal-links.spec.ts | 66 ---- .../{ => terminal}/terminal-agent.spec.ts | 10 +- .../{ => terminal}/terminal-keyboard.spec.ts | 8 +- .../terminal-settings.spec.ts} | 69 +++- .../workflow-automation.spec.ts | 6 +- .../workflow-import-export.spec.ts | 73 +--- .../{ => workflow}/workflow-settings.spec.ts | 73 +++- .../workflow-start-step.spec.ts | 6 +- .../{ => workflow}/workflow-steps.spec.ts | 4 +- 64 files changed, 1565 insertions(+), 1702 deletions(-) rename apps/web/e2e/tests/{ => chat}/chat-status-bar.spec.ts (97%) rename apps/web/e2e/tests/{ => chat}/clarification.spec.ts (95%) rename apps/web/e2e/tests/{ => chat}/markdown-preview.spec.ts (97%) rename apps/web/e2e/tests/{ => chat}/markdown-wrap.spec.ts (94%) create mode 100644 apps/web/e2e/tests/chat/message-queue.spec.ts rename apps/web/e2e/tests/{ => chat}/quick-chat.spec.ts (98%) rename apps/web/e2e/tests/{ => chat}/tool-completion.spec.ts (91%) rename apps/web/e2e/tests/{ => chat}/toolbar-overflow.spec.ts (95%) delete mode 100644 apps/web/e2e/tests/create-task-regression.spec.ts delete mode 100644 apps/web/e2e/tests/git-commit-pre-hooks.spec.ts rename apps/web/e2e/tests/{ => git}/diff-expansion.spec.ts (96%) rename apps/web/e2e/tests/{ => git}/diff-update.spec.ts (97%) rename apps/web/e2e/tests/{ => git}/git-changes-panel.spec.ts (99%) rename apps/web/e2e/tests/{git-commit-body.spec.ts => git/git-commit.spec.ts} (57%) rename apps/web/e2e/tests/{ => git}/symlink-file.spec.ts (96%) rename apps/web/e2e/tests/{ => kanban}/kanban-board.spec.ts (93%) rename apps/web/e2e/tests/{ => kanban}/mobile-kanban.spec.ts (98%) rename apps/web/e2e/tests/{ => kanban}/preview-primary-session.spec.ts (96%) delete mode 100644 apps/web/e2e/tests/mcp-create-subtask.spec.ts delete mode 100644 apps/web/e2e/tests/mcp-subtask-executor.spec.ts delete mode 100644 apps/web/e2e/tests/pr-auto-detection.spec.ts delete mode 100644 apps/web/e2e/tests/pr-external-detection.spec.ts create mode 100644 apps/web/e2e/tests/pr/pr-detection.spec.ts rename apps/web/e2e/tests/{ => pr}/pr-switcher-changes.spec.ts (98%) rename apps/web/e2e/tests/{ => pr}/pr-watcher-dockview-layout.spec.ts (97%) rename apps/web/e2e/tests/{ => pr}/pr-watcher-merged-cleanup.spec.ts (98%) rename apps/web/e2e/tests/{ => pr}/pr-watcher-missing-branch.spec.ts (96%) delete mode 100644 apps/web/e2e/tests/quick-chat-queue.spec.ts rename apps/web/e2e/tests/{ => review}/review-cumulative-diff.spec.ts (93%) delete mode 100644 apps/web/e2e/tests/session-tab-cleanup.spec.ts rename apps/web/e2e/tests/{ => session}/auto-start-session.spec.ts (90%) rename apps/web/e2e/tests/{ => session}/executor-not-found.spec.ts (93%) rename apps/web/e2e/tests/{ => session}/multi-session-ux.spec.ts (97%) rename apps/web/e2e/tests/{ => session}/multi-session.spec.ts (96%) rename apps/web/e2e/tests/{ => session}/new-session-dialog.spec.ts (98%) rename apps/web/e2e/tests/{ => session}/port-forward-dialog.spec.ts (96%) rename apps/web/e2e/tests/{session-details-ux.spec.ts => session/session-layout.spec.ts} (67%) rename apps/web/e2e/tests/{ => session}/session-recovery.spec.ts (94%) rename apps/web/e2e/tests/{ => session}/session-resume-real.spec.ts (97%) rename apps/web/e2e/tests/{ => session}/session-resume.spec.ts (96%) rename apps/web/e2e/tests/{ => settings}/agent-profile-delete.spec.ts (98%) rename apps/web/e2e/tests/{ => settings}/config-chat-popover.spec.ts (98%) rename apps/web/e2e/tests/{ => settings}/config-management.spec.ts (99%) rename apps/web/e2e/tests/{ => settings}/vscode-open-file.spec.ts (95%) delete mode 100644 apps/web/e2e/tests/subtask.spec.ts delete mode 100644 apps/web/e2e/tests/task-session-queue.spec.ts rename apps/web/e2e/tests/{ => task}/archive-task-redirect.spec.ts (95%) rename apps/web/e2e/tests/{ => task}/create-task-github-url.spec.ts (99%) rename apps/web/e2e/tests/{ => task}/create-task.spec.ts (77%) rename apps/web/e2e/tests/{ => task}/delete-task-redirect.spec.ts (95%) create mode 100644 apps/web/e2e/tests/task/subtask.spec.ts rename apps/web/e2e/tests/{ => task}/task-environment.spec.ts (98%) rename apps/web/e2e/tests/{ => task}/task-list.spec.ts (90%) rename apps/web/e2e/tests/{ => task}/task-switcher-status.spec.ts (97%) delete mode 100644 apps/web/e2e/tests/terminal-links.spec.ts rename apps/web/e2e/tests/{ => terminal}/terminal-agent.spec.ts (97%) rename apps/web/e2e/tests/{ => terminal}/terminal-keyboard.spec.ts (96%) rename apps/web/e2e/tests/{terminal-font-settings.spec.ts => terminal/terminal-settings.spec.ts} (65%) rename apps/web/e2e/tests/{ => workflow}/workflow-automation.spec.ts (99%) rename apps/web/e2e/tests/{ => workflow}/workflow-import-export.spec.ts (71%) rename apps/web/e2e/tests/{ => workflow}/workflow-settings.spec.ts (71%) rename apps/web/e2e/tests/{ => workflow}/workflow-start-step.spec.ts (98%) rename apps/web/e2e/tests/{ => workflow}/workflow-steps.spec.ts (94%) diff --git a/.agents/skills/e2e/SKILL.md b/.agents/skills/e2e/SKILL.md index b4b5f5f6db..00f3dd62bf 100644 --- a/.agents/skills/e2e/SKILL.md +++ b/.agents/skills/e2e/SKILL.md @@ -17,7 +17,17 @@ apps/web/e2e/ ├── helpers/ │ └── api-client.ts # HTTP client for seeding data (read for available methods) ├── pages/ # Page objects (read for available pages and methods) -└── tests/ # Spec files (*.spec.ts) +└── tests/ # Spec files (*.spec.ts), grouped by feature + ├── task/ # Task creation, deletion, archiving, environment, subtasks + ├── kanban/ # Kanban board, mobile kanban, preview panel + ├── session/ # Session lifecycle, resume, recovery, multi-session, layout + ├── workflow/ # Workflow steps, settings, automation, import/export + ├── git/ # Git changes panel, commits, diffs, symlinks + ├── pr/ # PR detection, watchers, changes panel + ├── terminal/ # Terminal agent, keyboard, settings + ├── chat/ # Quick chat, message queue, clarification, markdown, toolbar + ├── settings/ # Config management, agent profiles, editor integration + └── review/ # Code review diffs ``` Each worker gets an isolated backend, frontend, database, and mock agent — no Docker, no API keys needed. @@ -28,7 +38,7 @@ Each worker gets an isolated backend, frontend, database, and mock agent — no make test-e2e # all tests, headless make test-e2e-headed # with visible browser make test-e2e-ui # Playwright UI mode -cd apps && pnpm --filter @kandev/web e2e -- tests/my-test.spec.ts # single file +cd apps && pnpm --filter @kandev/web e2e -- tests/task/my-test.spec.ts # single file cd apps && pnpm --filter @kandev/web e2e -- --grep "task creation" # by name ``` @@ -37,7 +47,7 @@ Prerequisites: `make build-backend build-web` (Make targets do this automaticall ## Writing a test 1. Read `helpers/api-client.ts` and `pages/` to discover available seed methods and page objects -2. Import fixtures from `../fixtures/test-base` — provides `testPage`, `apiClient`, and `seedData` (pre-created workspace with default workflow) +2. Import fixtures from `../../fixtures/test-base` — provides `testPage`, `apiClient`, and `seedData` (pre-created workspace with default workflow) 3. Use `data-testid` attributes for selectors — add them to components as needed 4. Use page objects for common interactions; create new ones for new pages 5. For GitHub features, use `apiClient.mockGitHub*()` methods to seed mock data @@ -45,8 +55,8 @@ Prerequisites: `make build-backend build-web` (Make targets do this automaticall Example: ```typescript -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; test.describe("my feature", () => { test("does something", async ({ testPage, seedData, apiClient }) => { @@ -58,6 +68,15 @@ test.describe("my feature", () => { }); ``` +## Test organization + +Tests are grouped by feature area in subdirectories under `tests/`. When creating a new test: + +- **Place it in the matching feature directory.** A test for PR detection goes in `pr/`, a test for session resume goes in `session/`, etc. +- **Merge related tests into the same file.** Tests covering the same feature (e.g., git commit body and pre-hooks) belong in one file with separate `test.describe` blocks. Don't create a new file for each narrow scenario. +- **Import paths from subdirectories** use `../../` (e.g., `from "../../fixtures/test-base"`). +- **Standalone root files** are allowed for truly cross-cutting tests that don't fit any group. + ## Test quality guidelines - **Test through the UI, not the API.** E2E tests verify user-facing behavior. Don't write tests that only call the API and assert the response -- those are integration tests. Instead, navigate to the page, interact with UI elements, and assert what the user sees. diff --git a/apps/web/e2e/tests/chat-status-bar.spec.ts b/apps/web/e2e/tests/chat/chat-status-bar.spec.ts similarity index 97% rename from apps/web/e2e/tests/chat-status-bar.spec.ts rename to apps/web/e2e/tests/chat/chat-status-bar.spec.ts index 98a7154312..9eae4f620f 100644 --- a/apps/web/e2e/tests/chat-status-bar.spec.ts +++ b/apps/web/e2e/tests/chat/chat-status-bar.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("Chat status bar", () => { test("shows todo indicator alone when no PR is associated", async ({ diff --git a/apps/web/e2e/tests/clarification.spec.ts b/apps/web/e2e/tests/chat/clarification.spec.ts similarity index 95% rename from apps/web/e2e/tests/clarification.spec.ts rename to apps/web/e2e/tests/chat/clarification.spec.ts index 6f122551dc..68e46af7ac 100644 --- a/apps/web/e2e/tests/clarification.spec.ts +++ b/apps/web/e2e/tests/chat/clarification.spec.ts @@ -1,9 +1,9 @@ import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; -import { KanbanPage } from "../pages/kanban-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; +import { KanbanPage } from "../../pages/kanban-page"; /** * Seed a task + session with a clarification scenario and navigate to the session page. diff --git a/apps/web/e2e/tests/markdown-preview.spec.ts b/apps/web/e2e/tests/chat/markdown-preview.spec.ts similarity index 97% rename from apps/web/e2e/tests/markdown-preview.spec.ts rename to apps/web/e2e/tests/chat/markdown-preview.spec.ts index b5b2184146..6b3a04c3e2 100644 --- a/apps/web/e2e/tests/markdown-preview.spec.ts +++ b/apps/web/e2e/tests/chat/markdown-preview.spec.ts @@ -1,10 +1,10 @@ import fs from "node:fs"; import path from "node:path"; import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; const MARKDOWN_CONTENT = `# Hello World diff --git a/apps/web/e2e/tests/markdown-wrap.spec.ts b/apps/web/e2e/tests/chat/markdown-wrap.spec.ts similarity index 94% rename from apps/web/e2e/tests/markdown-wrap.spec.ts rename to apps/web/e2e/tests/chat/markdown-wrap.spec.ts index 470a060124..7369431c90 100644 --- a/apps/web/e2e/tests/markdown-wrap.spec.ts +++ b/apps/web/e2e/tests/chat/markdown-wrap.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; const LONG_WORD = "abcdefghij".repeat(30); // 300 chars, no spaces diff --git a/apps/web/e2e/tests/chat/message-queue.spec.ts b/apps/web/e2e/tests/chat/message-queue.spec.ts new file mode 100644 index 0000000000..e565969e12 --- /dev/null +++ b/apps/web/e2e/tests/chat/message-queue.spec.ts @@ -0,0 +1,281 @@ +import { type Locator, type Page } from "@playwright/test"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; + +// --------------------------------------------------------------------------- +// Shared helpers +// --------------------------------------------------------------------------- + +/** + * Type text into the TipTap editor while the agent is busy. + * fill() silently fails on TipTap when the busy placeholder is shown, + * so we retry clicking and typing until text appears in the editor. + */ +async function typeWhileBusy(page: Page, editor: Locator, text: string): Promise { + const modifier = process.platform === "darwin" ? "Meta" : "Control"; + await editor.scrollIntoViewIfNeeded(); + for (let attempt = 0; attempt < 3; attempt++) { + const box = await editor.boundingBox(); + if (!box) throw new Error("Editor bounding box not found"); + await page.mouse.click(box.x + 20, box.y + box.height / 2); + await page.waitForTimeout(200); + await page.keyboard.type(text); + await page.waitForTimeout(100); + const content = await editor.textContent(); + if (content?.includes(text)) return; + // Text wasn't entered; select all and clear for retry + await page.keyboard.press(`${modifier}+a`); + await page.keyboard.press("Backspace"); + await page.waitForTimeout(200); + } + throw new Error(`Failed to type "${text}" into editor after 3 attempts`); +} + +// --------------------------------------------------------------------------- +// Quick Chat queue tests +// --------------------------------------------------------------------------- + +async function openQuickChatWithAgent(page: Page): Promise { + await page.goto("/"); + await page.waitForLoadState("networkidle"); + + const modifier = process.platform === "darwin" ? "Meta" : "Control"; + await page.keyboard.press(`${modifier}+Shift+q`); + + const dialog = page.getByRole("dialog", { name: "Quick Chat" }); + await expect(dialog).toBeVisible({ timeout: 10_000 }); + + const agentPicker = dialog.getByText("Choose an agent to start chatting"); + if (!(await agentPicker.isVisible({ timeout: 1_000 }).catch(() => false))) { + await dialog.getByLabel("Start new chat").click(); + } + await expect(agentPicker).toBeVisible({ timeout: 5_000 }); + + const agentCard = dialog + .locator("button") + .filter({ has: page.locator(".rounded-md.border") }) + .first(); + await expect(agentCard).toBeVisible({ timeout: 5_000 }); + await agentCard.click(); + + await expect(dialog.locator(".tiptap.ProseMirror")).toBeVisible({ timeout: 15_000 }); + return dialog; +} + +test.describe("Quick chat queue", () => { + // Allow 1 retry: the test can be flaky when a previous test cycle's agent process hasn't + // fully shut down, causing the new session to conflict with a stale execution. + test.describe.configure({ retries: 1 }); + + test("queued message indicator appears and message executes after agent turn", async ({ + testPage, + }) => { + test.setTimeout(60_000); + + const dialog = await openQuickChatWithAgent(testPage); + + // Send a slow command so the agent stays busy for 10 seconds. + const editor = dialog.locator(".tiptap.ProseMirror"); + await editor.click(); + await editor.fill("/slow 10s"); + const modifier = process.platform === "darwin" ? "Meta" : "Control"; + await editor.press(`${modifier}+Enter`); + + // Wait for agent to become busy. + await expect(testPage.getByRole("status", { name: /Agent is (starting|running)/ })).toBeVisible( + { + timeout: 15_000, + }, + ); + await testPage.waitForTimeout(500); + + await typeWhileBusy(testPage, editor, "hello world"); + await testPage.keyboard.press(`${modifier}+Enter`); + + // Verify the queued message indicator with cancel button appears. + const cancelBtn = dialog.getByTitle("Cancel queued message"); + await expect(cancelBtn).toBeVisible({ timeout: 10_000 }); + + // Wait for the first (slow) response to complete. + await expect(dialog.getByText("Slow response complete", { exact: false })).toBeVisible({ + timeout: 30_000, + }); + + // The queued message should auto-execute — wait for the agent turn to finish. + await expect( + dialog.locator('[data-placeholder="Continue working on the task..."]'), + ).toBeVisible({ + timeout: 30_000, + }); + }); + + test("queue message via submit button click", async ({ testPage }) => { + test.setTimeout(90_000); + + const dialog = await openQuickChatWithAgent(testPage); + + // Send a slow command so the agent stays busy for 10 seconds. + const editor = dialog.locator(".tiptap.ProseMirror"); + await editor.click(); + await editor.fill("/slow 10s"); + const modifier = process.platform === "darwin" ? "Meta" : "Control"; + await editor.press(`${modifier}+Enter`); + + // Wait for agent to become busy. + await expect(testPage.getByRole("status", { name: /Agent is (starting|running)/ })).toBeVisible( + { + timeout: 15_000, + }, + ); + await testPage.waitForTimeout(500); + + // Before typing, only the cancel button should be visible (no send button). + const submitBtn = dialog.getByTestId("submit-message-button"); + await expect(submitBtn).not.toBeVisible(); + await expect(dialog.getByTestId("cancel-agent-button")).toBeVisible(); + + // Type a queued message — the submit button should appear. + await typeWhileBusy(testPage, editor, "queued via button"); + await expect(submitBtn).toBeVisible({ timeout: 5_000 }); + + // Click the submit button (not keyboard shortcut) to queue the message. + await submitBtn.click(); + + // Verify the queued message indicator with cancel button appears. + const cancelBtn = dialog.getByTitle("Cancel queued message"); + await expect(cancelBtn).toBeVisible({ timeout: 10_000 }); + + // Verify the cancel-agent button is also visible alongside submit. + const cancelAgentBtn = dialog.getByTestId("cancel-agent-button"); + await expect(cancelAgentBtn).toBeVisible(); + + // Wait for the first (slow) response to complete and queued message to auto-execute. + await expect( + dialog.locator('[data-placeholder="Continue working on the task..."]'), + ).toBeVisible({ + timeout: 60_000, + }); + }); +}); + +// --------------------------------------------------------------------------- +// Task session queue tests +// --------------------------------------------------------------------------- + +async function seedTaskAndWaitForIdle( + testPage: Page, + apiClient: ApiClient, + seedData: SeedData, + title: string, + description = "/e2e:simple-message", +): Promise { + const task = await apiClient.createTaskWithAgent( + seedData.workspaceId, + title, + seedData.agentProfileId, + { + description, + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + repository_ids: [seedData.repositoryId], + }, + ); + + await testPage.goto(`/t/${task.id}`); + + const session = new SessionPage(testPage); + await session.waitForLoad(); + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + + return session; +} + +test.describe("Task session queue", () => { + test.describe.configure({ retries: 1 }); + + test("queue message via submit button on task session page", async ({ + testPage, + apiClient, + seedData, + }) => { + test.setTimeout(90_000); + + const session = await seedTaskAndWaitForIdle( + testPage, + apiClient, + seedData, + "Queue button test", + ); + + // Send a slow command to keep the agent busy. + await session.sendMessage("/slow 5s"); + await expect(session.agentStatus()).toBeVisible({ timeout: 15_000 }); + await testPage.waitForTimeout(500); + + // Type a message while agent is busy. + const editor = testPage.locator(".tiptap.ProseMirror").first(); + await typeWhileBusy(testPage, editor, "queued via button"); + + // Both submit and cancel-agent buttons should be visible. + const submitBtn = testPage.getByTestId("submit-message-button"); + const cancelAgentBtn = testPage.getByTestId("cancel-agent-button"); + await expect(submitBtn).toBeVisible({ timeout: 5_000 }); + await expect(cancelAgentBtn).toBeVisible(); + + // Click the submit button to queue the message. + await submitBtn.click(); + + // Verify the queued message indicator appears. + await expect(testPage.getByTitle("Cancel queued message")).toBeVisible({ timeout: 10_000 }); + + // Wait for the queued message to auto-execute and agent to become idle. + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + }); + + test("queue message with plan mode enabled via submit button", async ({ + testPage, + apiClient, + seedData, + }) => { + test.setTimeout(90_000); + + const session = await seedTaskAndWaitForIdle( + testPage, + apiClient, + seedData, + "Queue plan mode test", + ); + + // Enable plan mode. + await session.togglePlanMode(); + + // Send a slow command to keep the agent busy. + await session.sendMessage("/slow 5s"); + await expect(session.agentStatus()).toBeVisible({ timeout: 15_000 }); + await testPage.waitForTimeout(500); + + // In plan mode with no typed text, only the cancel button should be visible. + // The auto-added plan context should NOT cause the send button to appear. + const submitBtn = testPage.getByTestId("submit-message-button"); + await expect(submitBtn).not.toBeVisible(); + await expect(testPage.getByTestId("cancel-agent-button")).toBeVisible(); + + // Type a message while agent is busy — send button should appear. + const editor = testPage.locator(".tiptap.ProseMirror").first(); + await typeWhileBusy(testPage, editor, "plan queue test"); + await expect(submitBtn).toBeVisible({ timeout: 5_000 }); + + // Click the submit button to queue the message. + await submitBtn.click(); + + // Verify the queued message indicator shows clean text (no system tags). + const queueIndicator = testPage.getByTitle("Cancel queued message").locator(".."); + await expect(queueIndicator).toBeVisible({ timeout: 10_000 }); + await expect(queueIndicator).not.toContainText("kandev-system"); + + // Wait for agent to finish processing. + await expect(session.planModeInput()).toBeVisible({ timeout: 30_000 }); + }); +}); diff --git a/apps/web/e2e/tests/quick-chat.spec.ts b/apps/web/e2e/tests/chat/quick-chat.spec.ts similarity index 98% rename from apps/web/e2e/tests/quick-chat.spec.ts rename to apps/web/e2e/tests/chat/quick-chat.spec.ts index 495cda7792..3cf2de62b3 100644 --- a/apps/web/e2e/tests/quick-chat.spec.ts +++ b/apps/web/e2e/tests/chat/quick-chat.spec.ts @@ -1,5 +1,5 @@ import { type Locator, type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; /** * Quick Chat E2E tests: basic flow, enhance prompt, queued messages, multi-tab. diff --git a/apps/web/e2e/tests/tool-completion.spec.ts b/apps/web/e2e/tests/chat/tool-completion.spec.ts similarity index 91% rename from apps/web/e2e/tests/tool-completion.spec.ts rename to apps/web/e2e/tests/chat/tool-completion.spec.ts index 9d35e5770b..d031a37822 100644 --- a/apps/web/e2e/tests/tool-completion.spec.ts +++ b/apps/web/e2e/tests/chat/tool-completion.spec.ts @@ -1,5 +1,5 @@ -import { test, expect } from "../fixtures/test-base"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { SessionPage } from "../../pages/session-page"; test.describe("Tool completion on turn end", () => { test("tool groups have no spinner after turn completes with uncompleted tool calls", async ({ diff --git a/apps/web/e2e/tests/toolbar-overflow.spec.ts b/apps/web/e2e/tests/chat/toolbar-overflow.spec.ts similarity index 95% rename from apps/web/e2e/tests/toolbar-overflow.spec.ts rename to apps/web/e2e/tests/chat/toolbar-overflow.spec.ts index fd69860667..3722d205bc 100644 --- a/apps/web/e2e/tests/toolbar-overflow.spec.ts +++ b/apps/web/e2e/tests/chat/toolbar-overflow.spec.ts @@ -1,8 +1,8 @@ import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; /** * Seed a task + session and navigate to the session page. diff --git a/apps/web/e2e/tests/create-task-regression.spec.ts b/apps/web/e2e/tests/create-task-regression.spec.ts deleted file mode 100644 index 887ca6b906..0000000000 --- a/apps/web/e2e/tests/create-task-regression.spec.ts +++ /dev/null @@ -1,107 +0,0 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; - -const START_AGENT_TEST_ID = "submit-start-agent"; -const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; -const START_ENABLED_TIMEOUT = 30_000; - -/** - * Regression tests for the create-task flow after TaskEnvironment model changes. - * Ensures that task creation, agent launch, and session navigation still work - * correctly with the new per-task environment layer. - */ -test.describe("Create task regression", () => { - test("create and start agent: session completes with task environment created", async ({ - testPage, - apiClient, - }) => { - const kanban = new KanbanPage(testPage); - await kanban.goto(); - - await kanban.createTaskButton.first().click(); - const dialog = testPage.getByTestId("create-task-dialog"); - await expect(dialog).toBeVisible(); - - await testPage.getByTestId("task-title-input").fill("Regression Task"); - await testPage.getByTestId("task-description-input").fill("/e2e:simple-message"); - - const startBtn = testPage.getByTestId(START_AGENT_TEST_ID); - await expect(startBtn).toBeEnabled({ timeout: START_ENABLED_TIMEOUT }); - await startBtn.click(); - await expect(dialog).not.toBeVisible({ timeout: 10_000 }); - - // Navigate to the task session - const card = kanban.taskCardByTitle("Regression Task"); - await expect(card).toBeVisible({ timeout: 10_000 }); - await card.click(); - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - - const session = new SessionPage(testPage); - await session.waitForLoad(); - - // Wait for mock agent to complete its turn - await expect(session.chat.getByText("simple mock response", { exact: false })).toBeVisible({ - timeout: 30_000, - }); - await expect(session.idleInput()).toBeVisible({ timeout: 15_000 }); - - // Verify task has exactly one session - // Extract task ID from the URL: /t/ - const { sessions } = await apiClient.listTaskSessions(await getTaskIdFromPage(testPage)); - expect(sessions.length).toBe(1); - expect(DONE_STATES).toContain(sessions[0].state); - - // Verify task environment was created - const env = await apiClient.getTaskEnvironment(await getTaskIdFromPage(testPage)); - expect(env).not.toBeNull(); - expect(env!.task_id).toBeTruthy(); - expect(env!.status).toBe("ready"); - }); - - test("create task via API: session and environment link correctly", async ({ - apiClient, - seedData, - }) => { - // Create task with agent via REST API (bypasses UI) - const task = await apiClient.createTaskWithAgent( - seedData.workspaceId, - "API Regression Task", - seedData.agentProfileId, - { - description: "/e2e:simple-message", - workflow_id: seedData.workflowId, - workflow_step_id: seedData.startStepId, - repository_ids: [seedData.repositoryId], - }, - ); - - // Wait for agent to finish (poll session state) - await expect - .poll( - async () => { - const { sessions } = await apiClient.listTaskSessions(task.id); - return DONE_STATES.includes(sessions[0]?.state ?? ""); - }, - { timeout: 30_000, message: "Waiting for session to finish" }, - ) - .toBe(true); - - // Verify task environment was created and linked - const env = await apiClient.getTaskEnvironment(task.id); - expect(env).not.toBeNull(); - expect(env!.task_id).toBe(task.id); - - // Verify session has task_environment_id set - const { sessions } = await apiClient.listTaskSessions(task.id); - expect(sessions[0].task_environment_id).toBe(env!.id); - }); -}); - -/** Extract task ID from the current page URL (/t/). */ -async function getTaskIdFromPage(page: import("@playwright/test").Page): Promise { - const url = page.url(); - const match = url.match(/\/t\/([^/?]+)/); - if (!match) throw new Error(`Cannot extract task ID from URL: ${url}`); - return match[1]; -} diff --git a/apps/web/e2e/tests/git-commit-pre-hooks.spec.ts b/apps/web/e2e/tests/git-commit-pre-hooks.spec.ts deleted file mode 100644 index 9ae3daf180..0000000000 --- a/apps/web/e2e/tests/git-commit-pre-hooks.spec.ts +++ /dev/null @@ -1,168 +0,0 @@ -import { test, expect } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; -import type { Page } from "@playwright/test"; -import fs from "node:fs"; -import path from "node:path"; -import { execSync } from "node:child_process"; - -// --------------------------------------------------------------------------- -// Helpers (same patterns as git-changes-panel.spec.ts) -// --------------------------------------------------------------------------- - -class GitHelper { - constructor( - private repoDir: string, - private env: NodeJS.ProcessEnv, - ) {} - - exec(cmd: string): string { - return execSync(cmd, { cwd: this.repoDir, env: this.env, encoding: "utf8" }); - } - - createFile(name: string, content: string) { - fs.writeFileSync(path.join(this.repoDir, name), content); - } - - stageAll() { - this.exec("git add -A"); - } - - installFailingPreCommitHook(message: string) { - const hooksDir = path.join(this.repoDir, ".git", "hooks"); - fs.mkdirSync(hooksDir, { recursive: true }); - const hookPath = path.join(hooksDir, "pre-commit"); - fs.writeFileSync(hookPath, `#!/bin/sh\necho "${message}"\nexit 1\n`); - fs.chmodSync(hookPath, "755"); - } - - removePreCommitHook() { - const hookPath = path.join(this.repoDir, ".git", "hooks", "pre-commit"); - if (fs.existsSync(hookPath)) { - fs.unlinkSync(hookPath); - } - } -} - -async function createStandardProfile(apiClient: ApiClient, name: string) { - const { agents } = await apiClient.listAgents(); - const agentId = agents[0]?.id; - if (!agentId) { - throw new Error(`E2E setup failed: no agent available for profile "${name}"`); - } - return apiClient.createAgentProfile(agentId, name, { - model: "mock-fast", - auto_approve: true, - cli_passthrough: false, - }); -} - -async function openTaskSession(page: Page, title: string): Promise { - const kanban = new KanbanPage(page); - await kanban.goto(); - - const card = kanban.taskCardByTitle(title); - await expect(card).toBeVisible({ timeout: 15_000 }); - await card.click(); - await expect(page).toHaveURL(/\/t\//, { timeout: 15_000 }); - - const session = new SessionPage(page); - await session.waitForLoad(); - return session; -} - -// --------------------------------------------------------------------------- -// Tests -// --------------------------------------------------------------------------- - -test.describe("Git commit pre-hooks", () => { - test("failed commit shows error in chat with Fix button", async ({ - testPage, - apiClient, - seedData, - backend, - }) => { - const profile = await createStandardProfile(apiClient, "Git Hook Test Profile"); - - await apiClient.createTaskWithAgent(seedData.workspaceId, "Git Hook Test", profile.id, { - description: "/e2e:simple-message", - workflow_id: seedData.workflowId, - workflow_step_id: seedData.startStepId, - repository_ids: [seedData.repositoryId], - }); - - const session = await openTaskSession(testPage, "Git Hook Test"); - - // Wait for agent to finish initial turn - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - - // Set up git helper - const repoDir = path.join(backend.tmpDir, "repos", "e2e-repo"); - const gitEnv = { - ...process.env, - HOME: backend.tmpDir, - GIT_AUTHOR_NAME: "E2E Test", - GIT_AUTHOR_EMAIL: "e2e@test.local", - GIT_COMMITTER_NAME: "E2E Test", - GIT_COMMITTER_EMAIL: "e2e@test.local", - }; - const git = new GitHelper(repoDir, gitEnv); - - try { - // Install a pre-commit hook that always fails - git.installFailingPreCommitHook("lint check failed: missing semicolons"); - - // Open Changes tab first so WS subscription is active - await session.clickTab("Changes"); - await expect(session.changes).toBeVisible({ timeout: 10_000 }); - - // Create a file - it should appear as unstaged via git status polling - git.createFile("hook-test.txt", "test content"); - await expect(session.changes.getByText("hook-test.txt")).toBeVisible({ timeout: 30_000 }); - - // Stage the file via the UI "Stage all" button - await session.changes.getByRole("button", { name: "Stage all" }).click(); - - // Wait for the "Commit" button to appear (indicates staged section is ready) - // Use exact match to avoid matching the "Commits" section toggle - const commitButton = session.changes.getByRole("button", { name: "Commit", exact: true }); - await expect(commitButton).toBeVisible({ timeout: 15_000 }); - await commitButton.click(); - - // Fill commit message and submit - const dialog = testPage.getByRole("dialog"); - await expect(dialog).toBeVisible({ timeout: 10_000 }); - await dialog.getByTestId("commit-title-input").fill("test commit message"); - const dialogCommitBtn = dialog.getByRole("button", { name: "Commit", exact: true }); - await expect(dialogCommitBtn).toBeEnabled(); - await dialogCommitBtn.click(); - - // The error message should appear in the chat - await expect(session.gitOperationErrorMessage()).toBeVisible({ timeout: 30_000 }); - - // Verify the error output contains the pre-commit hook message - await expect( - session.gitOperationErrorMessage().getByText("lint check failed: missing semicolons"), - ).toBeVisible({ timeout: 15_000 }); - - // Click the Fix button - await session.gitFixButton().click(); - - // The fix prompt should appear in the chat as a user message - await expect( - session.chat.getByText("git commit command failed", { exact: false }).first(), - ).toBeVisible({ timeout: 10_000 }); - - // The agent should process the fix prompt and respond - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - - // Verify the agent responded (mock agent echoes back part of the prompt) - await expect(session.chat.getByText("completed the analysis", { exact: false })).toBeVisible({ - timeout: 5_000, - }); - } finally { - git.removePreCommitHook(); - } - }); -}); diff --git a/apps/web/e2e/tests/diff-expansion.spec.ts b/apps/web/e2e/tests/git/diff-expansion.spec.ts similarity index 96% rename from apps/web/e2e/tests/diff-expansion.spec.ts rename to apps/web/e2e/tests/git/diff-expansion.spec.ts index d23a00f20b..b1468f375d 100644 --- a/apps/web/e2e/tests/diff-expansion.spec.ts +++ b/apps/web/e2e/tests/git/diff-expansion.spec.ts @@ -1,7 +1,7 @@ -import { test, expect } from "../fixtures/test-base"; -import { SessionPage } from "../pages/session-page"; -import type { ApiClient } from "../helpers/api-client"; -import type { SeedData } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; +import { SessionPage } from "../../pages/session-page"; +import type { ApiClient } from "../../helpers/api-client"; +import type { SeedData } from "../../fixtures/test-base"; import type { Page } from "@playwright/test"; /** diff --git a/apps/web/e2e/tests/diff-update.spec.ts b/apps/web/e2e/tests/git/diff-update.spec.ts similarity index 97% rename from apps/web/e2e/tests/diff-update.spec.ts rename to apps/web/e2e/tests/git/diff-update.spec.ts index 41ffce61bb..1e32508b62 100644 --- a/apps/web/e2e/tests/diff-update.spec.ts +++ b/apps/web/e2e/tests/git/diff-update.spec.ts @@ -1,7 +1,7 @@ -import { test, expect } from "../fixtures/test-base"; -import { SessionPage } from "../pages/session-page"; -import type { ApiClient } from "../helpers/api-client"; -import type { SeedData } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; +import { SessionPage } from "../../pages/session-page"; +import type { ApiClient } from "../../helpers/api-client"; +import type { SeedData } from "../../fixtures/test-base"; import type { Page } from "@playwright/test"; // Shared selector constant for diff container diff --git a/apps/web/e2e/tests/git-changes-panel.spec.ts b/apps/web/e2e/tests/git/git-changes-panel.spec.ts similarity index 99% rename from apps/web/e2e/tests/git-changes-panel.spec.ts rename to apps/web/e2e/tests/git/git-changes-panel.spec.ts index ef6f4e6095..68305f304b 100644 --- a/apps/web/e2e/tests/git-changes-panel.spec.ts +++ b/apps/web/e2e/tests/git/git-changes-panel.spec.ts @@ -1,7 +1,7 @@ -import { test, expect } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; import type { Page } from "@playwright/test"; import fs from "node:fs"; import path from "node:path"; diff --git a/apps/web/e2e/tests/git-commit-body.spec.ts b/apps/web/e2e/tests/git/git-commit.spec.ts similarity index 57% rename from apps/web/e2e/tests/git-commit-body.spec.ts rename to apps/web/e2e/tests/git/git-commit.spec.ts index 7887d8d675..56e9c8d7a8 100644 --- a/apps/web/e2e/tests/git-commit-body.spec.ts +++ b/apps/web/e2e/tests/git/git-commit.spec.ts @@ -1,7 +1,7 @@ -import { test, expect } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; import type { Page } from "@playwright/test"; import fs from "node:fs"; import path from "node:path"; @@ -39,9 +39,28 @@ class GitHelper { fs.writeFileSync(path.join(this.repoDir, name), content); } + stageAll() { + this.exec("git add -A"); + } + getLastCommitMessage(): string { return this.exec("git log -1 --format=%B").trim(); } + + installFailingPreCommitHook(message: string) { + const hooksDir = path.join(this.repoDir, ".git", "hooks"); + fs.mkdirSync(hooksDir, { recursive: true }); + const hookPath = path.join(hooksDir, "pre-commit"); + fs.writeFileSync(hookPath, `#!/bin/sh\necho "${message}"\nexit 1\n`); + fs.chmodSync(hookPath, "755"); + } + + removePreCommitHook() { + const hookPath = path.join(this.repoDir, ".git", "hooks", "pre-commit"); + if (fs.existsSync(hookPath)) { + fs.unlinkSync(hookPath); + } + } } async function createStandardProfile(apiClient: ApiClient, name: string) { @@ -173,3 +192,94 @@ test.describe("Git commit body", () => { expect(lines[2]).toBe("Detailed description of the change"); }); }); + +test.describe("Git commit pre-hooks", () => { + test("failed commit shows error in chat with Fix button", async ({ + testPage, + apiClient, + seedData, + backend, + }) => { + const profile = await createStandardProfile(apiClient, "Git Hook Test Profile"); + + await apiClient.createTaskWithAgent(seedData.workspaceId, "Git Hook Test", profile.id, { + description: "/e2e:simple-message", + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + repository_ids: [seedData.repositoryId], + }); + + const session = await openTaskSession(testPage, "Git Hook Test"); + + // Wait for agent to finish initial turn + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + + // Set up git helper + const repoDir = path.join(backend.tmpDir, "repos", "e2e-repo"); + const gitEnv = { + ...process.env, + HOME: backend.tmpDir, + GIT_AUTHOR_NAME: "E2E Test", + GIT_AUTHOR_EMAIL: "e2e@test.local", + GIT_COMMITTER_NAME: "E2E Test", + GIT_COMMITTER_EMAIL: "e2e@test.local", + }; + const git = new GitHelper(repoDir, gitEnv); + + try { + // Install a pre-commit hook that always fails + git.installFailingPreCommitHook("lint check failed: missing semicolons"); + + // Open Changes tab first so WS subscription is active + await session.clickTab("Changes"); + await expect(session.changes).toBeVisible({ timeout: 10_000 }); + + // Create a file - it should appear as unstaged via git status polling + git.createFile("hook-test.txt", "test content"); + await expect(session.changes.getByText("hook-test.txt")).toBeVisible({ timeout: 30_000 }); + + // Stage the file via the UI "Stage all" button + await session.changes.getByRole("button", { name: "Stage all" }).click(); + + // Wait for the "Commit" button to appear (indicates staged section is ready) + // Use exact match to avoid matching the "Commits" section toggle + const commitButton = session.changes.getByRole("button", { name: "Commit", exact: true }); + await expect(commitButton).toBeVisible({ timeout: 15_000 }); + await commitButton.click(); + + // Fill commit message and submit + const dialog = testPage.getByRole("dialog"); + await expect(dialog).toBeVisible({ timeout: 10_000 }); + await dialog.getByTestId("commit-title-input").fill("test commit message"); + const dialogCommitBtn = dialog.getByRole("button", { name: "Commit", exact: true }); + await expect(dialogCommitBtn).toBeEnabled(); + await dialogCommitBtn.click(); + + // The error message should appear in the chat + await expect(session.gitOperationErrorMessage()).toBeVisible({ timeout: 30_000 }); + + // Verify the error output contains the pre-commit hook message + await expect( + session.gitOperationErrorMessage().getByText("lint check failed: missing semicolons"), + ).toBeVisible({ timeout: 15_000 }); + + // Click the Fix button + await session.gitFixButton().click(); + + // The fix prompt should appear in the chat as a user message + await expect( + session.chat.getByText("git commit command failed", { exact: false }).first(), + ).toBeVisible({ timeout: 10_000 }); + + // The agent should process the fix prompt and respond + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + + // Verify the agent responded (mock agent echoes back part of the prompt) + await expect(session.chat.getByText("completed the analysis", { exact: false })).toBeVisible({ + timeout: 5_000, + }); + } finally { + git.removePreCommitHook(); + } + }); +}); diff --git a/apps/web/e2e/tests/symlink-file.spec.ts b/apps/web/e2e/tests/git/symlink-file.spec.ts similarity index 96% rename from apps/web/e2e/tests/symlink-file.spec.ts rename to apps/web/e2e/tests/git/symlink-file.spec.ts index 26b3206b62..c3ca79cba3 100644 --- a/apps/web/e2e/tests/symlink-file.spec.ts +++ b/apps/web/e2e/tests/git/symlink-file.spec.ts @@ -1,10 +1,10 @@ import fs from "node:fs"; import path from "node:path"; import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; /** * Seed a task with the simple-message scenario and navigate to its session page. diff --git a/apps/web/e2e/tests/kanban-board.spec.ts b/apps/web/e2e/tests/kanban/kanban-board.spec.ts similarity index 93% rename from apps/web/e2e/tests/kanban-board.spec.ts rename to apps/web/e2e/tests/kanban/kanban-board.spec.ts index ad9edb85d2..04a4743b44 100644 --- a/apps/web/e2e/tests/kanban-board.spec.ts +++ b/apps/web/e2e/tests/kanban/kanban-board.spec.ts @@ -1,5 +1,5 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; test.describe("Kanban board", () => { test("displays a seeded task card", async ({ testPage, apiClient, seedData }) => { diff --git a/apps/web/e2e/tests/mobile-kanban.spec.ts b/apps/web/e2e/tests/kanban/mobile-kanban.spec.ts similarity index 98% rename from apps/web/e2e/tests/mobile-kanban.spec.ts rename to apps/web/e2e/tests/kanban/mobile-kanban.spec.ts index 03167ea720..b74741960c 100644 --- a/apps/web/e2e/tests/mobile-kanban.spec.ts +++ b/apps/web/e2e/tests/kanban/mobile-kanban.spec.ts @@ -1,5 +1,5 @@ -import { test, expect } from "../fixtures/test-base"; -import { MobileKanbanPage } from "../pages/mobile-kanban-page"; +import { test, expect } from "../../fixtures/test-base"; +import { MobileKanbanPage } from "../../pages/mobile-kanban-page"; test.describe("Mobile kanban view", () => { test("renders mobile layout with column tabs and swipeable columns", async ({ diff --git a/apps/web/e2e/tests/preview-primary-session.spec.ts b/apps/web/e2e/tests/kanban/preview-primary-session.spec.ts similarity index 96% rename from apps/web/e2e/tests/preview-primary-session.spec.ts rename to apps/web/e2e/tests/kanban/preview-primary-session.spec.ts index f9e503b1f7..1a60cf04fd 100644 --- a/apps/web/e2e/tests/preview-primary-session.spec.ts +++ b/apps/web/e2e/tests/kanban/preview-primary-session.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; diff --git a/apps/web/e2e/tests/mcp-create-subtask.spec.ts b/apps/web/e2e/tests/mcp-create-subtask.spec.ts deleted file mode 100644 index 79fb221e83..0000000000 --- a/apps/web/e2e/tests/mcp-create-subtask.spec.ts +++ /dev/null @@ -1,168 +0,0 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; - -type TaskWithRepos = { - id: string; - repositories?: Array<{ repository_id: string }>; -}; - -const START_AGENT_TEST_ID = "submit-start-agent"; -const START_ENABLED_TIMEOUT = 30_000; - -test.describe("MCP create_task subtask", () => { - test("agent creates subtask via MCP create_task with parent_id", async ({ testPage }) => { - const subtaskTitle = "MCP-subtask-e2e-verify"; - - const script = [ - 'e2e:thinking("Planning subtasks...")', - "e2e:delay(100)", - `e2e:mcp:kandev:create_task({"parent_id":"self","title":"${subtaskTitle}","description":"E2E subtask: verify MCP create_task with parent_id"})`, - "e2e:delay(100)", - 'e2e:message("Done.")', - ].join("\n"); - - // 1. Create parent task via UI dialog - const kanban = new KanbanPage(testPage); - await kanban.goto(); - - await kanban.createTaskButton.first().click(); - const dialog = testPage.getByTestId("create-task-dialog"); - await expect(dialog).toBeVisible(); - - await testPage.getByTestId("task-title-input").fill("MCP Subtask Parent"); - await testPage.getByTestId("task-description-input").fill(script); - - const startBtn = testPage.getByTestId(START_AGENT_TEST_ID); - await expect(startBtn).toBeEnabled({ timeout: START_ENABLED_TIMEOUT }); - await startBtn.click(); - await expect(dialog).not.toBeVisible({ timeout: 10_000 }); - - // 2. Click the parent task card to navigate to its session - const parentCard = kanban.taskCardByTitle("MCP Subtask Parent"); - await expect(parentCard).toBeVisible({ timeout: 10_000 }); - await parentCard.click(); - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - - // 3. Wait for the agent to complete — the MCP create_task call happens during execution - const session = new SessionPage(testPage); - await session.waitForLoad(); - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - - // 4. Go back to kanban — subtask card should be visible with parent badge - await kanban.goto(); - - const subtaskCard = kanban.taskCardByTitle(subtaskTitle); - await expect(subtaskCard).toBeVisible({ timeout: 10_000 }); - await expect(subtaskCard.getByText("MCP Subtask Parent")).toBeVisible(); - }); - - test("MCP-created subtask inherits parent task repositories", async ({ - testPage, - apiClient, - seedData, - }) => { - test.setTimeout(90_000); - - const subtaskTitle = "Repo-Inherit Subtask E2E"; - - const script = [ - 'e2e:thinking("Creating subtask...")', - "e2e:delay(100)", - `e2e:mcp:kandev:create_task({"parent_id":"self","title":"${subtaskTitle}","description":"E2E subtask: verify repository inheritance"})`, - "e2e:delay(100)", - 'e2e:message("Done.")', - ].join("\n"); - - // 1. Create parent task via API with an explicit repository. Without the - // fix, the MCP handler would not copy repositories to the subtask and - // it would run as a repository-less "quick chat" session. - const parentTask = await apiClient.createTaskWithAgent( - seedData.workspaceId, - "Repo Inherit Parent Task", - seedData.agentProfileId, - { - description: script, - workflow_id: seedData.workflowId, - workflow_step_id: seedData.startStepId, - repository_ids: [seedData.repositoryId], - }, - ); - expect(parentTask.id).toBeTruthy(); - - // 2. Navigate to parent task and wait for the agent to complete (which - // includes the MCP create_task call that creates the subtask). - await testPage.goto(`/t/${parentTask.id}`); - const session = new SessionPage(testPage); - await session.waitForLoad(); - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - - // 3. Locate the subtask created by the MCP call. - const allTasks = await apiClient.listTasks(seedData.workspaceId); - const subtask = allTasks.tasks.find((t) => t.title === subtaskTitle); - expect(subtask).toBeDefined(); - - // 4. Verify the subtask inherited the parent's repository. - const subtaskRaw = await apiClient.rawRequest("GET", `/api/v1/tasks/${subtask!.id}`); - const subtaskData = (await subtaskRaw.json()) as TaskWithRepos; - expect( - subtaskData.repositories?.length, - `subtask should have at least 1 repository; got: ${JSON.stringify(subtaskData.repositories)}`, - ).toBeGreaterThanOrEqual(1); - expect( - subtaskData.repositories?.[0]?.repository_id, - `subtask repository_id should match parent's (${seedData.repositoryId})`, - ).toBe(seedData.repositoryId); - }); - - test("user creates subtask via sidebar button", async ({ testPage }) => { - // 1. Create parent task via UI dialog with a simple agent script - const kanban = new KanbanPage(testPage); - await kanban.goto(); - - await kanban.createTaskButton.first().click(); - const dialog = testPage.getByTestId("create-task-dialog"); - await expect(dialog).toBeVisible(); - - await testPage.getByTestId("task-title-input").fill("Subtask Button Parent"); - await testPage.getByTestId("task-description-input").fill("/e2e:simple-message"); - - const startBtn = testPage.getByTestId(START_AGENT_TEST_ID); - await expect(startBtn).toBeEnabled({ timeout: START_ENABLED_TIMEOUT }); - await startBtn.click(); - await expect(dialog).not.toBeVisible({ timeout: 10_000 }); - - // 2. Click the parent card to navigate to its session - const parentCard = kanban.taskCardByTitle("Subtask Button Parent"); - await expect(parentCard).toBeVisible({ timeout: 10_000 }); - await parentCard.click(); - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - - // 3. Wait for the agent to finish - const session = new SessionPage(testPage); - await session.waitForLoad(); - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - - // 4. Open the Task split-button chevron and click "New Subtask" - await testPage.getByTestId("new-task-chevron").click(); - await testPage.getByTestId("new-subtask-button").click(); - const subtaskTitleInput = testPage.getByTestId("subtask-title-input"); - await expect(subtaskTitleInput).toBeVisible(); - - // Title should be pre-filled with "Parent / Subtask N" pattern - await expect(subtaskTitleInput).toHaveValue(/Subtask Button Parent \/ Subtask \d+/); - - // 5. Fill the prompt and submit - const parentUrl = testPage.url(); - await testPage.getByTestId("subtask-prompt-input").fill("/e2e:simple-message"); - await testPage.getByRole("button", { name: "Create Subtask" }).click(); - - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - await expect(testPage).not.toHaveURL(parentUrl); - - // 6. Go back to kanban — subtask card should be visible with parent badge - await kanban.goto(); - const subtaskCard = kanban.taskCardByTitle(/Subtask Button Parent \/ Subtask \d+/); - await expect(subtaskCard).toBeVisible({ timeout: 10_000 }); - }); -}); diff --git a/apps/web/e2e/tests/mcp-subtask-executor.spec.ts b/apps/web/e2e/tests/mcp-subtask-executor.spec.ts deleted file mode 100644 index f074195858..0000000000 --- a/apps/web/e2e/tests/mcp-subtask-executor.spec.ts +++ /dev/null @@ -1,131 +0,0 @@ -import { test, expect } from "../fixtures/test-base"; -import { SessionPage } from "../pages/session-page"; - -const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; - -type SessionInfo = { - id: string; - agent_profile_id: string; - executor_profile_id: string; - state: string; -}; - -/** - * Verifies that when an agent creates a subtask via the MCP create_task tool - * with parent_id="self", the subtask session inherits BOTH the parent session's - * agent_profile_id AND executor_profile_id. - * - * Key invariants tested: - * - agent_profile_id: copied from parent.AgentProfileID - * - executor_profile_id: copied from parent.ExecutorProfileID - * - * Before fix: autoStartTask had no agent profile (workspace has no default), - * so it skipped launching → subtask had zero sessions. - * After fix: autoStartTask inherits both IDs via inheritFromParentSession. - * - * To make executor_profile_id non-vacuous we set it explicitly on the parent - * session via createTaskWithAgent + executor_profile_id option. - */ -test.describe("MCP create_task subtask executor inheritance", () => { - test("MCP-created subtask inherits agent profile and executor profile", async ({ - testPage, - apiClient, - seedData, - }) => { - test.setTimeout(90_000); - - const subtaskTitle = "Inherited Profile Subtask E2E"; - - const script = [ - 'e2e:thinking("Creating subtask...")', - "e2e:delay(100)", - `e2e:mcp:kandev:create_task({"parent_id":"self","title":"${subtaskTitle}","description":"E2E subtask: verify executor and agent profile inheritance"})`, - "e2e:delay(100)", - 'e2e:message("Done.")', - ].join("\n"); - - // 1. Create an executor + profile so executor_profile_id is non-empty on - // the parent session — this makes the inheritance assertion meaningful. - const executor = await apiClient.createExecutor("E2E Inherit Executor", "local_pc"); - const executorProfile = await apiClient.createExecutorProfile( - executor.id, - "E2E Inherit Profile", - ); - - // 2. Create parent task via API with explicit executor_profile_id so the - // parent session records it. The mock agent runs the MCP script which - // creates the subtask with parent_id="self". - const parentTask = await apiClient.createTaskWithAgent( - seedData.workspaceId, - "Executor Inherit Parent Task", - seedData.agentProfileId, - { - description: script, - workflow_id: seedData.workflowId, - workflow_step_id: seedData.startStepId, - executor_profile_id: executorProfile.id, - }, - ); - expect(parentTask.id).toBeTruthy(); - - // 3. Navigate to the parent task page and wait for the agent to complete. - await testPage.goto(`/t/${parentTask.id}`); - const session = new SessionPage(testPage); - await session.waitForLoad(); - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - - // 4. Confirm the parent session has both profiles set as expected. - const parentRaw = await apiClient.rawRequest("GET", `/api/v1/tasks/${parentTask.id}/sessions`); - const parentData = (await parentRaw.json()) as { sessions: SessionInfo[] }; - const parentSession = parentData.sessions[0]; - expect( - parentSession?.agent_profile_id, - `agent_profile_id: got ${parentSession?.agent_profile_id}, want ${seedData.agentProfileId}`, - ).toBe(seedData.agentProfileId); - expect( - parentSession?.executor_profile_id, - `executor_profile_id: got ${parentSession?.executor_profile_id}, want ${executorProfile.id}; full session: ${JSON.stringify(parentSession)}`, - ).toBe(executorProfile.id); - - // 5. Locate the subtask created by the MCP call. - const allTasks = await apiClient.listTasks(seedData.workspaceId); - const subtask = allTasks.tasks.find((t) => t.title === subtaskTitle); - expect(subtask).toBeDefined(); - - // 6. Verify subtask was auto-started: must have at least one session. - // Without the fix, autoStartTask finds no agent profile and skips launch → - // the subtask remains sessionless. - await expect - .poll( - async () => { - const { sessions } = await apiClient.listTaskSessions(subtask!.id); - return sessions.length; - }, - { timeout: 30_000, message: "Subtask should be auto-started with an inherited session" }, - ) - .toBeGreaterThanOrEqual(1); - - // 7. Wait for the subtask session to reach a terminal state. - await expect - .poll( - async () => { - const { sessions } = await apiClient.listTaskSessions(subtask!.id); - return DONE_STATES.includes(sessions[0]?.state ?? ""); - }, - { timeout: 30_000, message: "Waiting for subtask session to complete" }, - ) - .toBe(true); - - // 8. Verify the subtask session inherited BOTH profiles from the parent — - // proving executor/agent profile inheritance worked correctly. - const subtaskRaw = await apiClient.rawRequest("GET", `/api/v1/tasks/${subtask!.id}/sessions`); - const subtaskData = (await subtaskRaw.json()) as { sessions: SessionInfo[] }; - const subtaskSession = subtaskData.sessions[0]; - - expect(subtaskSession?.agent_profile_id).toBe(parentSession?.agent_profile_id); - expect(subtaskSession?.executor_profile_id).toBe(parentSession?.executor_profile_id); - // Sanity: both are non-empty (so the assertions above are not vacuously true) - expect(subtaskSession?.agent_profile_id).toBeTruthy(); - expect(subtaskSession?.executor_profile_id).toBeTruthy(); - }); -}); diff --git a/apps/web/e2e/tests/pr-auto-detection.spec.ts b/apps/web/e2e/tests/pr-auto-detection.spec.ts deleted file mode 100644 index 9ba32df7cd..0000000000 --- a/apps/web/e2e/tests/pr-auto-detection.spec.ts +++ /dev/null @@ -1,209 +0,0 @@ -import path from "node:path"; -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; - -/** - * Tests the full PR auto-detection pipeline: the backend detects a PR on - * GitHub (mock) and associates it with the task — without manually calling - * mockGitHubAssociateTaskPR. - * - * Detection flow exercised: - * useTaskPRDetection (frontend, every 30s) - * → github.check_session_pr (WS action) - * → CheckSessionPR (backend) - * → resolveTaskRepo → resolvePRWatchBranch → FindPRByBranch (mock) - * → AssociatePRWithTask → github.task_pr.updated (WS event) - * → PR button appears in topbar - * - * Prerequisites for detection to work: - * - Repository has provider=github with owner/name set - * - TaskRepository has checkout_branch set - * - Mock GitHub has a PR matching the checkout branch - */ -test.describe("PR auto-detection pipeline", () => { - test("detects PR automatically via check_session_pr", async ({ - testPage, - apiClient, - seedData, - backend, - }) => { - test.setTimeout(180_000); - - // --- Seed workflow: Inbox → Working (auto_start → Done) → Done --- - const workflow = await apiClient.createWorkflow( - seedData.workspaceId, - "PR Auto-Detection Workflow", - ); - - const inboxStep = await apiClient.createWorkflowStep(workflow.id, "Inbox", 0); - const workingStep = await apiClient.createWorkflowStep(workflow.id, "Working", 1); - const doneStep = await apiClient.createWorkflowStep(workflow.id, "Done", 2); - - await apiClient.updateWorkflowStep(workingStep.id, { - prompt: 'e2e:message("done")\n{{task_prompt}}', - events: { - on_enter: [{ type: "auto_start_agent" }], - on_turn_complete: [{ type: "move_to_step", config: { step_id: doneStep.id } }], - }, - }); - - await apiClient.saveUserSettings({ - workspace_id: seedData.workspaceId, - workflow_filter_id: workflow.id, - enable_preview_on_click: false, - }); - - // --- Create repository with GitHub provider info --- - // The detection pipeline needs resolveTaskRepo to return a valid owner/repo, - // which requires provider=github with provider_owner and provider_name set. - const repoDir = path.join(backend.tmpDir, "repos", "e2e-repo"); - const githubRepo = await apiClient.createRepository(seedData.workspaceId, repoDir, "main", { - name: "GitHub Test Repo", - provider: "github", - provider_owner: "testorg", - provider_name: "testrepo", - }); - - // --- Setup mock GitHub --- - await apiClient.mockGitHubReset(); - await apiClient.mockGitHubSetUser("test-user"); - - // --- Create task with checkout_branch set --- - // Using `repositories` (not `repository_ids`) to set checkout_branch, - // which resolvePRWatchBranch uses to determine which branch to search. - const task = await apiClient.createTask(seedData.workspaceId, "Auto-Detect PR Task", { - workflow_id: workflow.id, - workflow_step_id: inboxStep.id, - agent_profile_id: seedData.agentProfileId, - repositories: [ - { - repository_id: githubRepo.id, - checkout_branch: "main", - }, - ], - }); - - // Navigate to kanban BEFORE moving tasks so the WebSocket is subscribed - // when task.updated events fire. - const kanban = new KanbanPage(testPage); - await kanban.goto(); - - // Move task to Working → auto_start → mock agent completes → Done - await apiClient.moveTask(task.id, workflow.id, workingStep.id); - - await expect(kanban.taskCardInColumn("Auto-Detect PR Task", doneStep.id)).toBeVisible({ - timeout: 45_000, - }); - - // --- Add PR to mock GitHub AFTER task completion --- - // Simulates the agent having created a PR via `gh pr create`. - // The PR's head_branch must match the task's checkout_branch ("main"). - await apiClient.mockGitHubAddPRs([ - { - number: 99, - title: "Agent-created PR", - state: "open", - head_branch: "main", - base_branch: "develop", - author_login: "test-user", - repo_owner: "testorg", - repo_name: "testrepo", - additions: 30, - deletions: 5, - }, - ]); - - // --- Open the task session --- - // This mounts the ChangesPanelContent which runs useTaskPRDetection. - // The hook calls github.check_session_pr immediately and every 30s. - // The backend's CheckSessionPR resolves the repo (testorg/testrepo) - // and branch ("main"), searches mock GitHub, and associates the PR. - await kanban.taskCardInColumn("Auto-Detect PR Task", doneStep.id).click(); - await expect(testPage).toHaveURL(/\/[st]\//, { timeout: 15_000 }); - - const session = new SessionPage(testPage); - await session.waitForLoad(); - - // --- Verify PR button appears in topbar --- - // The detection hook fires immediately on mount, then every 30s. - // Allow up to 60s for the check to succeed (accounts for git.branch - // availability delay and the 30s polling interval). - await expect(session.prTopbarButton()).toBeVisible({ timeout: 60_000 }); - await expect(session.prTopbarButton()).toContainText("#99"); - }); - - test("does not show PR for tasks without a matching PR", async ({ - testPage, - apiClient, - seedData, - backend, - }) => { - test.setTimeout(120_000); - - // --- Seed workflow --- - const workflow = await apiClient.createWorkflow(seedData.workspaceId, "PR Negative Workflow"); - - const inboxStep = await apiClient.createWorkflowStep(workflow.id, "Inbox", 0); - const workingStep = await apiClient.createWorkflowStep(workflow.id, "Working", 1); - const doneStep = await apiClient.createWorkflowStep(workflow.id, "Done", 2); - - await apiClient.updateWorkflowStep(workingStep.id, { - prompt: 'e2e:message("done")\n{{task_prompt}}', - events: { - on_enter: [{ type: "auto_start_agent" }], - on_turn_complete: [{ type: "move_to_step", config: { step_id: doneStep.id } }], - }, - }); - - await apiClient.saveUserSettings({ - workspace_id: seedData.workspaceId, - workflow_filter_id: workflow.id, - enable_preview_on_click: false, - }); - - const repoDir = path.join(backend.tmpDir, "repos", "e2e-repo"); - const githubRepo = await apiClient.createRepository(seedData.workspaceId, repoDir, "main", { - name: "GitHub No-PR Repo", - provider: "github", - provider_owner: "testorg", - provider_name: "testrepo", - }); - - await apiClient.mockGitHubReset(); - await apiClient.mockGitHubSetUser("test-user"); - // No PRs added to mock GitHub — detection should find nothing - - const task = await apiClient.createTask(seedData.workspaceId, "No PR Task", { - workflow_id: workflow.id, - workflow_step_id: inboxStep.id, - agent_profile_id: seedData.agentProfileId, - repositories: [ - { - repository_id: githubRepo.id, - checkout_branch: "main", - }, - ], - }); - - const kanban = new KanbanPage(testPage); - await kanban.goto(); - await apiClient.moveTask(task.id, workflow.id, workingStep.id); - await expect(kanban.taskCardInColumn("No PR Task", doneStep.id)).toBeVisible({ - timeout: 45_000, - }); - - // Open the session - await kanban.taskCardInColumn("No PR Task", doneStep.id).click(); - await expect(testPage).toHaveURL(/\/[st]\//, { timeout: 15_000 }); - - const session = new SessionPage(testPage); - await session.waitForLoad(); - - // The detection hook fires immediately on mount. Give it enough time - // for the check to complete (a few seconds), then verify no PR button. - // We don't need to wait a full 30s polling cycle — the immediate check - // on mount is sufficient to confirm no PR is found. - await expect(session.prTopbarButton()).not.toBeVisible({ timeout: 10_000 }); - }); -}); diff --git a/apps/web/e2e/tests/pr-external-detection.spec.ts b/apps/web/e2e/tests/pr-external-detection.spec.ts deleted file mode 100644 index f0d084baf9..0000000000 --- a/apps/web/e2e/tests/pr-external-detection.spec.ts +++ /dev/null @@ -1,162 +0,0 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; - -test.describe("PR external detection", () => { - /** - * Verifies that when a PR is created externally (e.g. via `gh pr create`) - * after a task session is already running, the PR button appears in the - * topbar and the Changes panel shows the PR files and commits. - * - * The frontend re-fetches PR data when switching between tasks, so we - * trigger detection by switching to another task and back rather than - * waiting for the 30-second polling interval. - * - * Setup: - * Inbox → Working (auto_start, on_turn_complete → Done) → Done - * 2 tasks: Feature Task (gets PR mid-session), Helper Task (switch target) - */ - test("shows PR button and changes after external PR creation", async ({ - testPage, - apiClient, - seedData, - }) => { - test.setTimeout(120_000); - - // --- Seed workflow --- - const workflow = await apiClient.createWorkflow(seedData.workspaceId, "PR Detection Workflow"); - - const inboxStep = await apiClient.createWorkflowStep(workflow.id, "Inbox", 0); - const workingStep = await apiClient.createWorkflowStep(workflow.id, "Working", 1); - const doneStep = await apiClient.createWorkflowStep(workflow.id, "Done", 2); - - await apiClient.updateWorkflowStep(workingStep.id, { - prompt: 'e2e:message("done")\n{{task_prompt}}', - events: { - on_enter: [{ type: "auto_start_agent" }], - on_turn_complete: [{ type: "move_to_step", config: { step_id: doneStep.id } }], - }, - }); - - await apiClient.saveUserSettings({ - workspace_id: seedData.workspaceId, - workflow_filter_id: workflow.id, - enable_preview_on_click: false, - }); - - // --- Setup mock GitHub --- - await apiClient.mockGitHubReset(); - await apiClient.mockGitHubSetUser("test-user"); - - // --- Create 2 tasks --- - const featureTask = await apiClient.createTask(seedData.workspaceId, "Feature Task", { - workflow_id: workflow.id, - workflow_step_id: inboxStep.id, - agent_profile_id: seedData.agentProfileId, - repository_ids: [seedData.repositoryId], - }); - const helperTask = await apiClient.createTask(seedData.workspaceId, "Helper Task", { - workflow_id: workflow.id, - workflow_step_id: inboxStep.id, - agent_profile_id: seedData.agentProfileId, - repository_ids: [seedData.repositoryId], - }); - - // Navigate to kanban BEFORE moving tasks so the WebSocket is already - // subscribed when task.updated events fire. The mock agent completes in - // <100ms; if we navigate after moveTask the events are emitted before - // the browser subscribes and the kanban never receives them. - const kanban = new KanbanPage(testPage); - await kanban.goto(); - - // Move tasks to Working → auto_start → mock agent completes → Done - await apiClient.moveTask(featureTask.id, workflow.id, workingStep.id); - await apiClient.moveTask(helperTask.id, workflow.id, workingStep.id); - - await expect(kanban.taskCardInColumn("Feature Task", doneStep.id)).toBeVisible({ - timeout: 45_000, - }); - await expect(kanban.taskCardInColumn("Helper Task", doneStep.id)).toBeVisible({ - timeout: 45_000, - }); - - // --- Open Feature Task session --- - await kanban.taskCardInColumn("Feature Task", doneStep.id).click(); - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - - const session = new SessionPage(testPage); - await session.waitForLoad(); - - // --- Verify NO PR button initially --- - await expect(session.prTopbarButton()).not.toBeVisible({ timeout: 5_000 }); - - // --- Simulate external PR creation --- - // (e.g. developer runs `gh pr create` from the session's branch) - await apiClient.mockGitHubAddPRs([ - { - number: 42, - title: "Add feature X", - state: "open", - head_branch: "feat/feature-x", - base_branch: "main", - author_login: "test-user", - repo_owner: "testorg", - repo_name: "testrepo", - additions: 50, - deletions: 10, - }, - ]); - - await apiClient.mockGitHubAddPRFiles("testorg", "testrepo", 42, [ - { filename: "feature.ts", status: "added", additions: 40, deletions: 0 }, - { filename: "index.ts", status: "modified", additions: 10, deletions: 10 }, - ]); - await apiClient.mockGitHubAddPRCommits("testorg", "testrepo", 42, [ - { - sha: "abc1111222233334444555566667777aaaabbbb", - message: "implement feature X", - author_login: "test-user", - author_date: "2026-03-03T12:00:00Z", - }, - ]); - - // Associate PR with task (simulates what the backend poller/watcher would do - // when it detects a PR on the session's branch) - await apiClient.mockGitHubAssociateTaskPR({ - task_id: featureTask.id, - owner: "testorg", - repo: "testrepo", - pr_number: 42, - pr_url: "https://github.com/testorg/testrepo/pull/42", - pr_title: "Add feature X", - head_branch: "feat/feature-x", - base_branch: "main", - author_login: "test-user", - additions: 50, - deletions: 10, - }); - - // --- Switch to Helper Task and back to trigger PR re-fetch --- - // The useTaskPR hook fetches on mount when no PR is in the store. - // Switching tasks changes activeTaskId, so switching back triggers a fresh fetch. - await session.taskInSidebar("Helper Task").click(); - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - - await session.taskInSidebar("Feature Task").click(); - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - - // --- Verify PR button appears in topbar --- - await expect(session.prTopbarButton()).toBeVisible({ timeout: 15_000 }); - await expect(session.prTopbarButton()).toContainText("#42"); - - // --- Verify PR data in Changes panel --- - await session.clickTab("Changes"); - - await expect(session.prFilesSection()).toBeVisible({ timeout: 15_000 }); - await expect(session.prFilesSection().getByText("feature.ts")).toBeVisible(); - await expect(session.prFilesSection().getByText("index.ts")).toBeVisible(); - - await expect(session.prCommitsSection()).toBeVisible(); - await expect(session.prCommitsSection().getByText("implement feature X")).toBeVisible(); - }); -}); diff --git a/apps/web/e2e/tests/pr/pr-detection.spec.ts b/apps/web/e2e/tests/pr/pr-detection.spec.ts new file mode 100644 index 0000000000..96ddb40f66 --- /dev/null +++ b/apps/web/e2e/tests/pr/pr-detection.spec.ts @@ -0,0 +1,335 @@ +import path from "node:path"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; + +test.describe("PR auto-detection", () => { + /** + * Tests the full PR auto-detection pipeline: the backend detects a PR on + * GitHub (mock) and associates it with the task — without manually calling + * mockGitHubAssociateTaskPR. + * + * Detection flow exercised: + * useTaskPRDetection (frontend, every 30s) + * -> github.check_session_pr (WS action) + * -> CheckSessionPR (backend) + * -> resolveTaskRepo -> resolvePRWatchBranch -> FindPRByBranch (mock) + * -> AssociatePRWithTask -> github.task_pr.updated (WS event) + * -> PR button appears in topbar + * + * Prerequisites for detection to work: + * - Repository has provider=github with owner/name set + * - TaskRepository has checkout_branch set + * - Mock GitHub has a PR matching the checkout branch + */ + test("detects PR automatically via check_session_pr", async ({ + testPage, + apiClient, + seedData, + backend, + }) => { + test.setTimeout(180_000); + + // --- Seed workflow: Inbox -> Working (auto_start -> Done) -> Done --- + const workflow = await apiClient.createWorkflow( + seedData.workspaceId, + "PR Auto-Detection Workflow", + ); + + const inboxStep = await apiClient.createWorkflowStep(workflow.id, "Inbox", 0); + const workingStep = await apiClient.createWorkflowStep(workflow.id, "Working", 1); + const doneStep = await apiClient.createWorkflowStep(workflow.id, "Done", 2); + + await apiClient.updateWorkflowStep(workingStep.id, { + prompt: 'e2e:message("done")\n{{task_prompt}}', + events: { + on_enter: [{ type: "auto_start_agent" }], + on_turn_complete: [{ type: "move_to_step", config: { step_id: doneStep.id } }], + }, + }); + + await apiClient.saveUserSettings({ + workspace_id: seedData.workspaceId, + workflow_filter_id: workflow.id, + enable_preview_on_click: false, + }); + + // --- Create repository with GitHub provider info --- + const repoDir = path.join(backend.tmpDir, "repos", "e2e-repo"); + const githubRepo = await apiClient.createRepository(seedData.workspaceId, repoDir, "main", { + name: "GitHub Test Repo", + provider: "github", + provider_owner: "testorg", + provider_name: "testrepo", + }); + + // --- Setup mock GitHub --- + await apiClient.mockGitHubReset(); + await apiClient.mockGitHubSetUser("test-user"); + + // --- Create task with checkout_branch set --- + const task = await apiClient.createTask(seedData.workspaceId, "Auto-Detect PR Task", { + workflow_id: workflow.id, + workflow_step_id: inboxStep.id, + agent_profile_id: seedData.agentProfileId, + repositories: [ + { + repository_id: githubRepo.id, + checkout_branch: "main", + }, + ], + }); + + // Navigate to kanban BEFORE moving tasks so the WebSocket is subscribed + const kanban = new KanbanPage(testPage); + await kanban.goto(); + + // Move task to Working -> auto_start -> mock agent completes -> Done + await apiClient.moveTask(task.id, workflow.id, workingStep.id); + + await expect(kanban.taskCardInColumn("Auto-Detect PR Task", doneStep.id)).toBeVisible({ + timeout: 45_000, + }); + + // --- Add PR to mock GitHub AFTER task completion --- + await apiClient.mockGitHubAddPRs([ + { + number: 99, + title: "Agent-created PR", + state: "open", + head_branch: "main", + base_branch: "develop", + author_login: "test-user", + repo_owner: "testorg", + repo_name: "testrepo", + additions: 30, + deletions: 5, + }, + ]); + + // --- Open the task session --- + await kanban.taskCardInColumn("Auto-Detect PR Task", doneStep.id).click(); + await expect(testPage).toHaveURL(/\/[st]\//, { timeout: 15_000 }); + + const session = new SessionPage(testPage); + await session.waitForLoad(); + + // --- Verify PR button appears in topbar --- + await expect(session.prTopbarButton()).toBeVisible({ timeout: 60_000 }); + await expect(session.prTopbarButton()).toContainText("#99"); + }); + + test("does not show PR for tasks without a matching PR", async ({ + testPage, + apiClient, + seedData, + backend, + }) => { + test.setTimeout(120_000); + + // --- Seed workflow --- + const workflow = await apiClient.createWorkflow(seedData.workspaceId, "PR Negative Workflow"); + + const inboxStep = await apiClient.createWorkflowStep(workflow.id, "Inbox", 0); + const workingStep = await apiClient.createWorkflowStep(workflow.id, "Working", 1); + const doneStep = await apiClient.createWorkflowStep(workflow.id, "Done", 2); + + await apiClient.updateWorkflowStep(workingStep.id, { + prompt: 'e2e:message("done")\n{{task_prompt}}', + events: { + on_enter: [{ type: "auto_start_agent" }], + on_turn_complete: [{ type: "move_to_step", config: { step_id: doneStep.id } }], + }, + }); + + await apiClient.saveUserSettings({ + workspace_id: seedData.workspaceId, + workflow_filter_id: workflow.id, + enable_preview_on_click: false, + }); + + const repoDir = path.join(backend.tmpDir, "repos", "e2e-repo"); + const githubRepo = await apiClient.createRepository(seedData.workspaceId, repoDir, "main", { + name: "GitHub No-PR Repo", + provider: "github", + provider_owner: "testorg", + provider_name: "testrepo", + }); + + await apiClient.mockGitHubReset(); + await apiClient.mockGitHubSetUser("test-user"); + // No PRs added to mock GitHub — detection should find nothing + + const task = await apiClient.createTask(seedData.workspaceId, "No PR Task", { + workflow_id: workflow.id, + workflow_step_id: inboxStep.id, + agent_profile_id: seedData.agentProfileId, + repositories: [ + { + repository_id: githubRepo.id, + checkout_branch: "main", + }, + ], + }); + + const kanban = new KanbanPage(testPage); + await kanban.goto(); + await apiClient.moveTask(task.id, workflow.id, workingStep.id); + await expect(kanban.taskCardInColumn("No PR Task", doneStep.id)).toBeVisible({ + timeout: 45_000, + }); + + // Open the session + await kanban.taskCardInColumn("No PR Task", doneStep.id).click(); + await expect(testPage).toHaveURL(/\/[st]\//, { timeout: 15_000 }); + + const session = new SessionPage(testPage); + await session.waitForLoad(); + + // Verify no PR button + await expect(session.prTopbarButton()).not.toBeVisible({ timeout: 10_000 }); + }); +}); + +test.describe("PR external detection", () => { + /** + * Verifies that when a PR is created externally (e.g. via `gh pr create`) + * after a task session is already running, the PR button appears in the + * topbar and the Changes panel shows the PR files and commits. + */ + test("shows PR button and changes after external PR creation", async ({ + testPage, + apiClient, + seedData, + }) => { + test.setTimeout(120_000); + + // --- Seed workflow --- + const workflow = await apiClient.createWorkflow(seedData.workspaceId, "PR Detection Workflow"); + + const inboxStep = await apiClient.createWorkflowStep(workflow.id, "Inbox", 0); + const workingStep = await apiClient.createWorkflowStep(workflow.id, "Working", 1); + const doneStep = await apiClient.createWorkflowStep(workflow.id, "Done", 2); + + await apiClient.updateWorkflowStep(workingStep.id, { + prompt: 'e2e:message("done")\n{{task_prompt}}', + events: { + on_enter: [{ type: "auto_start_agent" }], + on_turn_complete: [{ type: "move_to_step", config: { step_id: doneStep.id } }], + }, + }); + + await apiClient.saveUserSettings({ + workspace_id: seedData.workspaceId, + workflow_filter_id: workflow.id, + enable_preview_on_click: false, + }); + + // --- Setup mock GitHub --- + await apiClient.mockGitHubReset(); + await apiClient.mockGitHubSetUser("test-user"); + + // --- Create 2 tasks --- + const featureTask = await apiClient.createTask(seedData.workspaceId, "Feature Task", { + workflow_id: workflow.id, + workflow_step_id: inboxStep.id, + agent_profile_id: seedData.agentProfileId, + repository_ids: [seedData.repositoryId], + }); + const helperTask = await apiClient.createTask(seedData.workspaceId, "Helper Task", { + workflow_id: workflow.id, + workflow_step_id: inboxStep.id, + agent_profile_id: seedData.agentProfileId, + repository_ids: [seedData.repositoryId], + }); + + const kanban = new KanbanPage(testPage); + await kanban.goto(); + + // Move tasks to Working -> auto_start -> mock agent completes -> Done + await apiClient.moveTask(featureTask.id, workflow.id, workingStep.id); + await apiClient.moveTask(helperTask.id, workflow.id, workingStep.id); + + await expect(kanban.taskCardInColumn("Feature Task", doneStep.id)).toBeVisible({ + timeout: 45_000, + }); + await expect(kanban.taskCardInColumn("Helper Task", doneStep.id)).toBeVisible({ + timeout: 45_000, + }); + + // --- Open Feature Task session --- + await kanban.taskCardInColumn("Feature Task", doneStep.id).click(); + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + + const session = new SessionPage(testPage); + await session.waitForLoad(); + + // --- Verify NO PR button initially --- + await expect(session.prTopbarButton()).not.toBeVisible({ timeout: 5_000 }); + + // --- Simulate external PR creation --- + await apiClient.mockGitHubAddPRs([ + { + number: 42, + title: "Add feature X", + state: "open", + head_branch: "feat/feature-x", + base_branch: "main", + author_login: "test-user", + repo_owner: "testorg", + repo_name: "testrepo", + additions: 50, + deletions: 10, + }, + ]); + + await apiClient.mockGitHubAddPRFiles("testorg", "testrepo", 42, [ + { filename: "feature.ts", status: "added", additions: 40, deletions: 0 }, + { filename: "index.ts", status: "modified", additions: 10, deletions: 10 }, + ]); + await apiClient.mockGitHubAddPRCommits("testorg", "testrepo", 42, [ + { + sha: "abc1111222233334444555566667777aaaabbbb", + message: "implement feature X", + author_login: "test-user", + author_date: "2026-03-03T12:00:00Z", + }, + ]); + + // Associate PR with task + await apiClient.mockGitHubAssociateTaskPR({ + task_id: featureTask.id, + owner: "testorg", + repo: "testrepo", + pr_number: 42, + pr_url: "https://github.com/testorg/testrepo/pull/42", + pr_title: "Add feature X", + head_branch: "feat/feature-x", + base_branch: "main", + author_login: "test-user", + additions: 50, + deletions: 10, + }); + + // --- Switch to Helper Task and back to trigger PR re-fetch --- + await session.taskInSidebar("Helper Task").click(); + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + + await session.taskInSidebar("Feature Task").click(); + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + + // --- Verify PR button appears in topbar --- + await expect(session.prTopbarButton()).toBeVisible({ timeout: 15_000 }); + await expect(session.prTopbarButton()).toContainText("#42"); + + // --- Verify PR data in Changes panel --- + await session.clickTab("Changes"); + + await expect(session.prFilesSection()).toBeVisible({ timeout: 15_000 }); + await expect(session.prFilesSection().getByText("feature.ts")).toBeVisible(); + await expect(session.prFilesSection().getByText("index.ts")).toBeVisible(); + + await expect(session.prCommitsSection()).toBeVisible(); + await expect(session.prCommitsSection().getByText("implement feature X")).toBeVisible(); + }); +}); diff --git a/apps/web/e2e/tests/pr-switcher-changes.spec.ts b/apps/web/e2e/tests/pr/pr-switcher-changes.spec.ts similarity index 98% rename from apps/web/e2e/tests/pr-switcher-changes.spec.ts rename to apps/web/e2e/tests/pr/pr-switcher-changes.spec.ts index 8495149a91..ab9bdc684e 100644 --- a/apps/web/e2e/tests/pr-switcher-changes.spec.ts +++ b/apps/web/e2e/tests/pr/pr-switcher-changes.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("PR switcher changes panel", () => { /** diff --git a/apps/web/e2e/tests/pr-watcher-dockview-layout.spec.ts b/apps/web/e2e/tests/pr/pr-watcher-dockview-layout.spec.ts similarity index 97% rename from apps/web/e2e/tests/pr-watcher-dockview-layout.spec.ts rename to apps/web/e2e/tests/pr/pr-watcher-dockview-layout.spec.ts index 8555ab0778..bbe6bc9288 100644 --- a/apps/web/e2e/tests/pr-watcher-dockview-layout.spec.ts +++ b/apps/web/e2e/tests/pr/pr-watcher-dockview-layout.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("PR watcher dockview layout stability", () => { /** diff --git a/apps/web/e2e/tests/pr-watcher-merged-cleanup.spec.ts b/apps/web/e2e/tests/pr/pr-watcher-merged-cleanup.spec.ts similarity index 98% rename from apps/web/e2e/tests/pr-watcher-merged-cleanup.spec.ts rename to apps/web/e2e/tests/pr/pr-watcher-merged-cleanup.spec.ts index 4cf283cafd..d7e0906d8e 100644 --- a/apps/web/e2e/tests/pr-watcher-merged-cleanup.spec.ts +++ b/apps/web/e2e/tests/pr/pr-watcher-merged-cleanup.spec.ts @@ -1,5 +1,5 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; test.describe("PR watcher merged cleanup", () => { /** diff --git a/apps/web/e2e/tests/pr-watcher-missing-branch.spec.ts b/apps/web/e2e/tests/pr/pr-watcher-missing-branch.spec.ts similarity index 96% rename from apps/web/e2e/tests/pr-watcher-missing-branch.spec.ts rename to apps/web/e2e/tests/pr/pr-watcher-missing-branch.spec.ts index d8d92e1815..defb86eac3 100644 --- a/apps/web/e2e/tests/pr-watcher-missing-branch.spec.ts +++ b/apps/web/e2e/tests/pr/pr-watcher-missing-branch.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("PR watcher missing branch", () => { /** diff --git a/apps/web/e2e/tests/quick-chat-queue.spec.ts b/apps/web/e2e/tests/quick-chat-queue.spec.ts deleted file mode 100644 index 8bfa59e346..0000000000 --- a/apps/web/e2e/tests/quick-chat-queue.spec.ts +++ /dev/null @@ -1,149 +0,0 @@ -import { type Locator, type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; - -/** - * Quick Chat queued message E2E tests. - * - * Isolated into their own file because the agent stays busy for 10s during the test, - * which can interfere with other quick chat tests sharing the same backend worker. - */ - -async function openQuickChatWithAgent(page: Page): Promise { - await page.goto("/"); - await page.waitForLoadState("networkidle"); - - const modifier = process.platform === "darwin" ? "Meta" : "Control"; - await page.keyboard.press(`${modifier}+Shift+q`); - - const dialog = page.getByRole("dialog", { name: "Quick Chat" }); - await expect(dialog).toBeVisible({ timeout: 10_000 }); - - const agentPicker = dialog.getByText("Choose an agent to start chatting"); - if (!(await agentPicker.isVisible({ timeout: 1_000 }).catch(() => false))) { - await dialog.getByLabel("Start new chat").click(); - } - await expect(agentPicker).toBeVisible({ timeout: 5_000 }); - - const agentCard = dialog - .locator("button") - .filter({ has: page.locator(".rounded-md.border") }) - .first(); - await expect(agentCard).toBeVisible({ timeout: 5_000 }); - await agentCard.click(); - - await expect(dialog.locator(".tiptap.ProseMirror")).toBeVisible({ timeout: 15_000 }); - return dialog; -} - -/** - * Type text into the TipTap editor while the agent is busy. - * fill() silently fails on TipTap when the busy placeholder is shown, - * so we retry clicking and typing until text appears in the editor. - */ -async function typeWhileBusy(page: Page, editor: Locator, text: string): Promise { - const modifier = process.platform === "darwin" ? "Meta" : "Control"; - await editor.scrollIntoViewIfNeeded(); - for (let attempt = 0; attempt < 3; attempt++) { - const box = await editor.boundingBox(); - if (!box) throw new Error("Editor bounding box not found"); - await page.mouse.click(box.x + 20, box.y + box.height / 2); - await page.waitForTimeout(200); - await page.keyboard.type(text); - await page.waitForTimeout(100); - const content = await editor.textContent(); - if (content?.includes(text)) return; - // Text wasn't entered; select all and clear for retry - await page.keyboard.press(`${modifier}+a`); - await page.keyboard.press("Backspace"); - await page.waitForTimeout(200); - } - throw new Error(`Failed to type "${text}" into editor after 3 attempts`); -} - -// Allow 1 retry: the test can be flaky when a previous test cycle's agent process hasn't -// fully shut down, causing the new session to conflict with a stale execution. -test.describe.configure({ retries: 1 }); - -test("quick chat queued message indicator appears and message executes after agent turn", async ({ - testPage, -}) => { - test.setTimeout(60_000); - - const dialog = await openQuickChatWithAgent(testPage); - - // Send a slow command so the agent stays busy for 10 seconds. - const editor = dialog.locator(".tiptap.ProseMirror"); - await editor.click(); - await editor.fill("/slow 10s"); - const modifier = process.platform === "darwin" ? "Meta" : "Control"; - await editor.press(`${modifier}+Enter`); - - // Wait for agent to become busy. - await expect(testPage.getByRole("status", { name: /Agent is (starting|running)/ })).toBeVisible({ - timeout: 15_000, - }); - await testPage.waitForTimeout(500); - - await typeWhileBusy(testPage, editor, "hello world"); - await testPage.keyboard.press(`${modifier}+Enter`); - - // Verify the queued message indicator with cancel button appears. - const cancelBtn = dialog.getByTitle("Cancel queued message"); - await expect(cancelBtn).toBeVisible({ timeout: 10_000 }); - - // Wait for the first (slow) response to complete. - await expect(dialog.getByText("Slow response complete", { exact: false })).toBeVisible({ - timeout: 30_000, - }); - - // The queued message should auto-execute — wait for the agent turn to finish. - // The idle placeholder confirms the agent completed processing the queued message. - await expect(dialog.locator('[data-placeholder="Continue working on the task..."]')).toBeVisible({ - timeout: 30_000, - }); -}); - -test("quick chat queue message via submit button click", async ({ testPage }) => { - test.setTimeout(90_000); - - const dialog = await openQuickChatWithAgent(testPage); - - // Send a slow command so the agent stays busy for 10 seconds. - const editor = dialog.locator(".tiptap.ProseMirror"); - await editor.click(); - await editor.fill("/slow 10s"); - const modifier = process.platform === "darwin" ? "Meta" : "Control"; - await editor.press(`${modifier}+Enter`); - - // Wait for agent to become busy. - await expect(testPage.getByRole("status", { name: /Agent is (starting|running)/ })).toBeVisible({ - timeout: 15_000, - }); - await testPage.waitForTimeout(500); - - // Before typing, only the cancel button should be visible (no send button). - const submitBtn = dialog.getByTestId("submit-message-button"); - await expect(submitBtn).not.toBeVisible(); - await expect(dialog.getByTestId("cancel-agent-button")).toBeVisible(); - - // Type a queued message — the submit button should appear. - await typeWhileBusy(testPage, editor, "queued via button"); - await expect(submitBtn).toBeVisible({ timeout: 5_000 }); - - // Click the submit button (not keyboard shortcut) to queue the message. - await submitBtn.click(); - - // Verify the queued message indicator with cancel button appears. - const cancelBtn = dialog.getByTitle("Cancel queued message"); - await expect(cancelBtn).toBeVisible({ timeout: 10_000 }); - - // Verify the cancel-agent button is also visible alongside submit. - const cancelAgentBtn = dialog.getByTestId("cancel-agent-button"); - await expect(cancelAgentBtn).toBeVisible(); - - // Wait for the first (slow) response to complete and queued message to auto-execute. - // Allow extra time: 10s slow + agent turn overhead + queue execution. - await expect(dialog.locator('[data-placeholder="Continue working on the task..."]')).toBeVisible({ - timeout: 60_000, - }); -}); diff --git a/apps/web/e2e/tests/review-cumulative-diff.spec.ts b/apps/web/e2e/tests/review/review-cumulative-diff.spec.ts similarity index 93% rename from apps/web/e2e/tests/review-cumulative-diff.spec.ts rename to apps/web/e2e/tests/review/review-cumulative-diff.spec.ts index 9e5e20396e..2ab2738a4d 100644 --- a/apps/web/e2e/tests/review-cumulative-diff.spec.ts +++ b/apps/web/e2e/tests/review/review-cumulative-diff.spec.ts @@ -1,7 +1,7 @@ -import { test, expect } from "../fixtures/test-base"; -import { SessionPage } from "../pages/session-page"; -import type { ApiClient } from "../helpers/api-client"; -import type { SeedData } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; +import { SessionPage } from "../../pages/session-page"; +import type { ApiClient } from "../../helpers/api-client"; +import type { SeedData } from "../../fixtures/test-base"; import type { Page } from "@playwright/test"; /** diff --git a/apps/web/e2e/tests/session-tab-cleanup.spec.ts b/apps/web/e2e/tests/session-tab-cleanup.spec.ts deleted file mode 100644 index 6f3f01b292..0000000000 --- a/apps/web/e2e/tests/session-tab-cleanup.spec.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; - -const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; - -async function createTaskAndNavigate( - testPage: import("@playwright/test").Page, - apiClient: import("../helpers/api-client").ApiClient, - seedData: import("../fixtures/test-base").SeedData, - title: string, -) { - const task = await apiClient.createTaskWithAgent( - seedData.workspaceId, - title, - seedData.agentProfileId, - { - description: "/e2e:simple-message", - workflow_id: seedData.workflowId, - workflow_step_id: seedData.startStepId, - repository_ids: [seedData.repositoryId], - }, - ); - - await expect - .poll( - async () => { - const { sessions } = await apiClient.listTaskSessions(task.id); - return DONE_STATES.includes(sessions[0]?.state ?? ""); - }, - { timeout: 30_000, message: "Waiting for session to finish" }, - ) - .toBe(true); - - const kanban = new KanbanPage(testPage); - await kanban.goto(); - const card = kanban.taskCardByTitle(title); - await expect(card).toBeVisible({ timeout: 10_000 }); - await card.click(); - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - - const session = new SessionPage(testPage); - await session.waitForLoad(); - await expect(session.chat.getByText("simple mock response", { exact: false })).toBeVisible({ - timeout: 15_000, - }); - - return { task, session }; -} - -test.describe("Session tab cleanup", () => { - test("single-session task shows only named agent tab without star or number", async ({ - testPage, - apiClient, - seedData, - }) => { - test.setTimeout(90_000); - - await createTaskAndNavigate(testPage, apiClient, seedData, "Single Session Tab Task"); - - // Should have exactly one session tab (the named agent tab) - const sessionTabs = testPage.locator("[data-testid^='session-tab-']"); - await expect(sessionTabs).toHaveCount(1, { timeout: 10_000 }); - - // The generic "Agent" permanent tab should NOT exist - // (it uses permanentTab tabComponent which has no data-testid, identified by text) - const permanentAgentTab = testPage.locator( - ".dv-default-tab:not(:has([data-testid^='session-tab-'])):has-text('Agent')", - ); - await expect(permanentAgentTab).toHaveCount(0); - - // The single session tab should NOT show a star icon - const star = sessionTabs.first().locator(".tabler-icon-star"); - await expect(star).toHaveCount(0); - - // The single session tab should NOT show a number badge - // (number badges are small spans with bg-foreground/10 containing a digit) - const numberBadge = sessionTabs.first().locator("span.rounded"); - await expect(numberBadge).toHaveCount(0); - }); -}); diff --git a/apps/web/e2e/tests/auto-start-session.spec.ts b/apps/web/e2e/tests/session/auto-start-session.spec.ts similarity index 90% rename from apps/web/e2e/tests/auto-start-session.spec.ts rename to apps/web/e2e/tests/session/auto-start-session.spec.ts index c218b4871e..1f2ce090c5 100644 --- a/apps/web/e2e/tests/auto-start-session.spec.ts +++ b/apps/web/e2e/tests/session/auto-start-session.spec.ts @@ -1,5 +1,5 @@ -import { test, expect } from "../fixtures/test-base"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { SessionPage } from "../../pages/session-page"; test.describe("Auto-start session on task page", () => { test("navigating to a task with no session auto-starts one", async ({ diff --git a/apps/web/e2e/tests/executor-not-found.spec.ts b/apps/web/e2e/tests/session/executor-not-found.spec.ts similarity index 93% rename from apps/web/e2e/tests/executor-not-found.spec.ts rename to apps/web/e2e/tests/session/executor-not-found.spec.ts index 0d1eca6281..e71dc43e2a 100644 --- a/apps/web/e2e/tests/executor-not-found.spec.ts +++ b/apps/web/e2e/tests/session/executor-not-found.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; import type { Page } from "@playwright/test"; /** Navigate to a kanban card by title and open its session page. */ diff --git a/apps/web/e2e/tests/multi-session-ux.spec.ts b/apps/web/e2e/tests/session/multi-session-ux.spec.ts similarity index 97% rename from apps/web/e2e/tests/multi-session-ux.spec.ts rename to apps/web/e2e/tests/session/multi-session-ux.spec.ts index a7dc7b12de..dd188bca50 100644 --- a/apps/web/e2e/tests/multi-session-ux.spec.ts +++ b/apps/web/e2e/tests/session/multi-session-ux.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; @@ -10,8 +10,8 @@ const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; */ async function createTaskAndNavigate( testPage: import("@playwright/test").Page, - apiClient: import("../helpers/api-client").ApiClient, - seedData: import("../fixtures/test-base").SeedData, + apiClient: import("../../helpers/api-client").ApiClient, + seedData: import("../../fixtures/test-base").SeedData, title: string, ) { const task = await apiClient.createTaskWithAgent( diff --git a/apps/web/e2e/tests/multi-session.spec.ts b/apps/web/e2e/tests/session/multi-session.spec.ts similarity index 96% rename from apps/web/e2e/tests/multi-session.spec.ts rename to apps/web/e2e/tests/session/multi-session.spec.ts index f53611feab..976a15602c 100644 --- a/apps/web/e2e/tests/multi-session.spec.ts +++ b/apps/web/e2e/tests/session/multi-session.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; diff --git a/apps/web/e2e/tests/new-session-dialog.spec.ts b/apps/web/e2e/tests/session/new-session-dialog.spec.ts similarity index 98% rename from apps/web/e2e/tests/new-session-dialog.spec.ts rename to apps/web/e2e/tests/session/new-session-dialog.spec.ts index ac2b7309e7..28a4f54d5a 100644 --- a/apps/web/e2e/tests/new-session-dialog.spec.ts +++ b/apps/web/e2e/tests/session/new-session-dialog.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; diff --git a/apps/web/e2e/tests/port-forward-dialog.spec.ts b/apps/web/e2e/tests/session/port-forward-dialog.spec.ts similarity index 96% rename from apps/web/e2e/tests/port-forward-dialog.spec.ts rename to apps/web/e2e/tests/session/port-forward-dialog.spec.ts index 5b1c68237a..bfd7ebdbaf 100644 --- a/apps/web/e2e/tests/port-forward-dialog.spec.ts +++ b/apps/web/e2e/tests/session/port-forward-dialog.spec.ts @@ -1,8 +1,8 @@ import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; /** * Seed a task + session with a mock_remote executor and navigate to the session page. diff --git a/apps/web/e2e/tests/session-details-ux.spec.ts b/apps/web/e2e/tests/session/session-layout.spec.ts similarity index 67% rename from apps/web/e2e/tests/session-details-ux.spec.ts rename to apps/web/e2e/tests/session/session-layout.spec.ts index 605d62dc67..f71b52d6a4 100644 --- a/apps/web/e2e/tests/session-details-ux.spec.ts +++ b/apps/web/e2e/tests/session/session-layout.spec.ts @@ -1,8 +1,9 @@ import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; /** * Seed a task + session via the API and navigate directly to the session page. @@ -39,8 +40,9 @@ async function seedTaskWithSession( } const TERMINAL_MARKER = "KANDEV_E2E_MARKER_12345"; +const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; -test.describe("Session details UX", () => { +test.describe("Session layout", () => { // The standalone executor can fail to allocate a port on cold start; // retry once so a transient backend hiccup doesn't fail the suite. test.describe.configure({ retries: 1 }); @@ -157,3 +159,68 @@ test.describe("Session details UX", () => { await expect(session.terminal).not.toBeVisible({ timeout: 5_000 }); }); }); + +test.describe("Session tab cleanup", () => { + test("single-session task shows only named agent tab without star or number", async ({ + testPage, + apiClient, + seedData, + }) => { + test.setTimeout(90_000); + + const task = await apiClient.createTaskWithAgent( + seedData.workspaceId, + "Single Session Tab Task", + seedData.agentProfileId, + { + description: "/e2e:simple-message", + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + repository_ids: [seedData.repositoryId], + }, + ); + + await expect + .poll( + async () => { + const { sessions } = await apiClient.listTaskSessions(task.id); + return DONE_STATES.includes(sessions[0]?.state ?? ""); + }, + { timeout: 30_000, message: "Waiting for session to finish" }, + ) + .toBe(true); + + const kanban = new KanbanPage(testPage); + await kanban.goto(); + const card = kanban.taskCardByTitle("Single Session Tab Task"); + await expect(card).toBeVisible({ timeout: 10_000 }); + await card.click(); + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + + const session = new SessionPage(testPage); + await session.waitForLoad(); + await expect(session.chat.getByText("simple mock response", { exact: false })).toBeVisible({ + timeout: 15_000, + }); + + // Should have exactly one session tab (the named agent tab) + const sessionTabs = testPage.locator("[data-testid^='session-tab-']"); + await expect(sessionTabs).toHaveCount(1, { timeout: 10_000 }); + + // The generic "Agent" permanent tab should NOT exist + // (it uses permanentTab tabComponent which has no data-testid, identified by text) + const permanentAgentTab = testPage.locator( + ".dv-default-tab:not(:has([data-testid^='session-tab-'])):has-text('Agent')", + ); + await expect(permanentAgentTab).toHaveCount(0); + + // The single session tab should NOT show a star icon + const star = sessionTabs.first().locator(".tabler-icon-star"); + await expect(star).toHaveCount(0); + + // The single session tab should NOT show a number badge + // (number badges are small spans with bg-foreground/10 containing a digit) + const numberBadge = sessionTabs.first().locator("span.rounded"); + await expect(numberBadge).toHaveCount(0); + }); +}); diff --git a/apps/web/e2e/tests/session-recovery.spec.ts b/apps/web/e2e/tests/session/session-recovery.spec.ts similarity index 94% rename from apps/web/e2e/tests/session-recovery.spec.ts rename to apps/web/e2e/tests/session/session-recovery.spec.ts index 5abbd1df6a..2886f9944d 100644 --- a/apps/web/e2e/tests/session-recovery.spec.ts +++ b/apps/web/e2e/tests/session/session-recovery.spec.ts @@ -1,8 +1,8 @@ import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; /** * Seed a task + session via the API and navigate directly to the session page. diff --git a/apps/web/e2e/tests/session-resume-real.spec.ts b/apps/web/e2e/tests/session/session-resume-real.spec.ts similarity index 97% rename from apps/web/e2e/tests/session-resume-real.spec.ts rename to apps/web/e2e/tests/session/session-resume-real.spec.ts index af7e5d4346..4079476f85 100644 --- a/apps/web/e2e/tests/session-resume-real.spec.ts +++ b/apps/web/e2e/tests/session/session-resume-real.spec.ts @@ -1,4 +1,4 @@ -import { test } from "../fixtures/test-base"; +import { test } from "../../fixtures/test-base"; /** * Real agent session resume tests. diff --git a/apps/web/e2e/tests/session-resume.spec.ts b/apps/web/e2e/tests/session/session-resume.spec.ts similarity index 96% rename from apps/web/e2e/tests/session-resume.spec.ts rename to apps/web/e2e/tests/session/session-resume.spec.ts index edd3825441..2ac0f2a6f6 100644 --- a/apps/web/e2e/tests/session-resume.spec.ts +++ b/apps/web/e2e/tests/session/session-resume.spec.ts @@ -1,7 +1,7 @@ -import { test, expect } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; import type { Page } from "@playwright/test"; // --------------------------------------------------------------------------- diff --git a/apps/web/e2e/tests/agent-profile-delete.spec.ts b/apps/web/e2e/tests/settings/agent-profile-delete.spec.ts similarity index 98% rename from apps/web/e2e/tests/agent-profile-delete.spec.ts rename to apps/web/e2e/tests/settings/agent-profile-delete.spec.ts index 8d6b6ab6af..4186820e7e 100644 --- a/apps/web/e2e/tests/agent-profile-delete.spec.ts +++ b/apps/web/e2e/tests/settings/agent-profile-delete.spec.ts @@ -1,4 +1,4 @@ -import { test, expect } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; test.describe("Agent profile deletion", () => { test("deleting profile with no active sessions succeeds immediately", async ({ diff --git a/apps/web/e2e/tests/config-chat-popover.spec.ts b/apps/web/e2e/tests/settings/config-chat-popover.spec.ts similarity index 98% rename from apps/web/e2e/tests/config-chat-popover.spec.ts rename to apps/web/e2e/tests/settings/config-chat-popover.spec.ts index 39eb085e5a..608dbf868b 100644 --- a/apps/web/e2e/tests/config-chat-popover.spec.ts +++ b/apps/web/e2e/tests/settings/config-chat-popover.spec.ts @@ -1,4 +1,4 @@ -import { test, expect } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; /** * Config chat popover UI tests. diff --git a/apps/web/e2e/tests/config-management.spec.ts b/apps/web/e2e/tests/settings/config-management.spec.ts similarity index 99% rename from apps/web/e2e/tests/config-management.spec.ts rename to apps/web/e2e/tests/settings/config-management.spec.ts index c28d8abf20..a903e1d0f6 100644 --- a/apps/web/e2e/tests/config-management.spec.ts +++ b/apps/web/e2e/tests/settings/config-management.spec.ts @@ -1,7 +1,7 @@ -import { test, expect } from "../fixtures/test-base"; -import { SessionPage } from "../pages/session-page"; -import type { ApiClient } from "../helpers/api-client"; -import type { SeedData } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; +import { SessionPage } from "../../pages/session-page"; +import type { ApiClient } from "../../helpers/api-client"; +import type { SeedData } from "../../fixtures/test-base"; /** * Config management via the dedicated config-chat endpoint. diff --git a/apps/web/e2e/tests/vscode-open-file.spec.ts b/apps/web/e2e/tests/settings/vscode-open-file.spec.ts similarity index 95% rename from apps/web/e2e/tests/vscode-open-file.spec.ts rename to apps/web/e2e/tests/settings/vscode-open-file.spec.ts index 7b208d51ce..dbbb087763 100644 --- a/apps/web/e2e/tests/vscode-open-file.spec.ts +++ b/apps/web/e2e/tests/settings/vscode-open-file.spec.ts @@ -2,10 +2,10 @@ import fs from "node:fs"; import os from "node:os"; import path from "node:path"; import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; /** * Resolve the code-server install directory. Checks the default kandev install diff --git a/apps/web/e2e/tests/subtask.spec.ts b/apps/web/e2e/tests/subtask.spec.ts deleted file mode 100644 index fe7b1ed55f..0000000000 --- a/apps/web/e2e/tests/subtask.spec.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; - -test.describe("Subtask support", () => { - test("subtask badge visible on kanban card", async ({ testPage, apiClient, seedData }) => { - // Create parent task via API - const parent = await apiClient.createTask(seedData.workspaceId, "Parent Task", { - workflow_id: seedData.workflowId, - workflow_step_id: seedData.startStepId, - }); - - // Create subtask via API with parent_id - await apiClient.createTask(seedData.workspaceId, "Child Subtask", { - workflow_id: seedData.workflowId, - workflow_step_id: seedData.startStepId, - parent_id: parent.id, - }); - - const kanban = new KanbanPage(testPage); - await kanban.goto(); - - // Parent card is visible but does NOT have subtask badge - const parentCard = kanban.taskCardByTitle("Parent Task"); - await expect(parentCard).toBeVisible({ timeout: 10_000 }); - await expect(parentCard.getByText("Parent Task", { exact: true }).first()).toBeVisible(); - - // Subtask card is visible and HAS badge showing parent title - const subtaskCard = kanban.taskCardByTitle("Child Subtask"); - await expect(subtaskCard).toBeVisible({ timeout: 10_000 }); - // Badge now shows parent task title instead of generic "Subtask" - await expect(subtaskCard.getByText("Parent Task")).toBeVisible(); - }); - - test("create subtask from sidebar header button", async ({ testPage, apiClient, seedData }) => { - // Create a task with an agent so we have a session to navigate to - const task = await apiClient.createTaskWithAgent( - seedData.workspaceId, - "Subtask Parent", - seedData.agentProfileId, - { - description: "/e2e:simple-message", - workflow_id: seedData.workflowId, - repository_ids: [seedData.repositoryId], - }, - ); - - // Navigate to the session page - await testPage.goto(`/t/${task.id}`); - const session = new SessionPage(testPage); - await session.waitForLoad(); - - // Wait for agent to complete - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - - // Open the Task split-button chevron and click "New Subtask" - const chevron = testPage.getByTestId("new-task-chevron"); - await expect(chevron).toBeVisible({ timeout: 5_000 }); - await chevron.click(); - await testPage.getByTestId("new-subtask-button").click(); - - // The compact NewSubtaskDialog should open with pre-filled title containing numeric suffix - const titleInput = testPage.getByTestId("subtask-title-input"); - await expect(titleInput).toBeVisible({ timeout: 5_000 }); - await expect(titleInput).toHaveValue(/Subtask Parent \/ Subtask \d+/); - - // Fill prompt and submit - const promptInput = testPage.getByTestId("subtask-prompt-input"); - await expect(promptInput).toBeVisible(); - await promptInput.fill("/e2e:simple-message"); - - const submitBtn = testPage.getByRole("button", { name: "Create Subtask" }); - await submitBtn.click(); - await expect(titleInput).not.toBeVisible({ timeout: 10_000 }); - - // After creation, we navigate to the new subtask's session - await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); - - // Verify the subtask card appears on the kanban board with "Subtask" badge - const kanban = new KanbanPage(testPage); - await kanban.goto(); - const subtaskCard = kanban.taskCardByTitle(/Subtask Parent \/ Subtask \d+/); - await expect(subtaskCard).toBeVisible({ timeout: 10_000 }); - }); -}); diff --git a/apps/web/e2e/tests/task-session-queue.spec.ts b/apps/web/e2e/tests/task-session-queue.spec.ts deleted file mode 100644 index 4a540263e0..0000000000 --- a/apps/web/e2e/tests/task-session-queue.spec.ts +++ /dev/null @@ -1,152 +0,0 @@ -import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; - -/** - * Task session detail page — queued message tests. - * - * Verifies that users can queue messages via button click while the agent is - * busy, including with plan mode enabled. Uses /slow to keep the agent running. - */ - -async function seedTaskAndWaitForIdle( - testPage: Page, - apiClient: ApiClient, - seedData: SeedData, - title: string, - description = "/e2e:simple-message", -): Promise { - const task = await apiClient.createTaskWithAgent( - seedData.workspaceId, - title, - seedData.agentProfileId, - { - description, - workflow_id: seedData.workflowId, - workflow_step_id: seedData.startStepId, - repository_ids: [seedData.repositoryId], - }, - ); - - await testPage.goto(`/t/${task.id}`); - - const session = new SessionPage(testPage); - await session.waitForLoad(); - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - - return session; -} - -/** - * Type text into the TipTap editor while the agent is busy. - * fill() silently fails on TipTap when the busy placeholder is shown, - * so we retry clicking and typing until text appears in the editor. - */ -async function typeWhileBusy(page: Page, editor: import("@playwright/test").Locator, text: string) { - const modifier = process.platform === "darwin" ? "Meta" : "Control"; - await editor.scrollIntoViewIfNeeded(); - for (let attempt = 0; attempt < 3; attempt++) { - const box = await editor.boundingBox(); - if (!box) throw new Error("Editor bounding box not found"); - await page.mouse.click(box.x + 20, box.y + box.height / 2); - await page.waitForTimeout(200); - await page.keyboard.type(text); - await page.waitForTimeout(100); - const content = await editor.textContent(); - if (content?.includes(text)) return; - await page.keyboard.press(`${modifier}+a`); - await page.keyboard.press("Backspace"); - await page.waitForTimeout(200); - } - throw new Error(`Failed to type "${text}" into editor after 3 attempts`); -} - -test.describe("Task session queue", () => { - test.describe.configure({ retries: 1 }); - - test("queue message via submit button on task session page", async ({ - testPage, - apiClient, - seedData, - }) => { - test.setTimeout(90_000); - - const session = await seedTaskAndWaitForIdle( - testPage, - apiClient, - seedData, - "Queue button test", - ); - - // Send a slow command to keep the agent busy. - await session.sendMessage("/slow 5s"); - await expect(session.agentStatus()).toBeVisible({ timeout: 15_000 }); - await testPage.waitForTimeout(500); - - // Type a message while agent is busy. - const editor = testPage.locator(".tiptap.ProseMirror").first(); - await typeWhileBusy(testPage, editor, "queued via button"); - - // Both submit and cancel-agent buttons should be visible. - const submitBtn = testPage.getByTestId("submit-message-button"); - const cancelAgentBtn = testPage.getByTestId("cancel-agent-button"); - await expect(submitBtn).toBeVisible({ timeout: 5_000 }); - await expect(cancelAgentBtn).toBeVisible(); - - // Click the submit button to queue the message. - await submitBtn.click(); - - // Verify the queued message indicator appears. - await expect(testPage.getByTitle("Cancel queued message")).toBeVisible({ timeout: 10_000 }); - - // Wait for the queued message to auto-execute and agent to become idle. - await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); - }); - - test("queue message with plan mode enabled via submit button", async ({ - testPage, - apiClient, - seedData, - }) => { - test.setTimeout(90_000); - - const session = await seedTaskAndWaitForIdle( - testPage, - apiClient, - seedData, - "Queue plan mode test", - ); - - // Enable plan mode. - await session.togglePlanMode(); - - // Send a slow command to keep the agent busy. - await session.sendMessage("/slow 5s"); - await expect(session.agentStatus()).toBeVisible({ timeout: 15_000 }); - await testPage.waitForTimeout(500); - - // In plan mode with no typed text, only the cancel button should be visible. - // The auto-added plan context should NOT cause the send button to appear. - const submitBtn = testPage.getByTestId("submit-message-button"); - await expect(submitBtn).not.toBeVisible(); - await expect(testPage.getByTestId("cancel-agent-button")).toBeVisible(); - - // Type a message while agent is busy — send button should appear. - const editor = testPage.locator(".tiptap.ProseMirror").first(); - await typeWhileBusy(testPage, editor, "plan queue test"); - await expect(submitBtn).toBeVisible({ timeout: 5_000 }); - - // Click the submit button to queue the message. - await submitBtn.click(); - - // Verify the queued message indicator shows clean text (no system tags). - const queueIndicator = testPage.getByTitle("Cancel queued message").locator(".."); - await expect(queueIndicator).toBeVisible({ timeout: 10_000 }); - await expect(queueIndicator).not.toContainText("kandev-system"); - - // Wait for agent to finish processing. - await expect(session.planModeInput()).toBeVisible({ timeout: 30_000 }); - }); -}); diff --git a/apps/web/e2e/tests/archive-task-redirect.spec.ts b/apps/web/e2e/tests/task/archive-task-redirect.spec.ts similarity index 95% rename from apps/web/e2e/tests/archive-task-redirect.spec.ts rename to apps/web/e2e/tests/task/archive-task-redirect.spec.ts index d85d140cec..c4e66dd8ac 100644 --- a/apps/web/e2e/tests/archive-task-redirect.spec.ts +++ b/apps/web/e2e/tests/task/archive-task-redirect.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("Archive task redirect", () => { /** diff --git a/apps/web/e2e/tests/create-task-github-url.spec.ts b/apps/web/e2e/tests/task/create-task-github-url.spec.ts similarity index 99% rename from apps/web/e2e/tests/create-task-github-url.spec.ts rename to apps/web/e2e/tests/task/create-task-github-url.spec.ts index 64b18f5911..db1b66c553 100644 --- a/apps/web/e2e/tests/create-task-github-url.spec.ts +++ b/apps/web/e2e/tests/task/create-task-github-url.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("Task creation from GitHub URL", () => { // Allow one retry for transient backend port-allocation issues on cold start. diff --git a/apps/web/e2e/tests/create-task.spec.ts b/apps/web/e2e/tests/task/create-task.spec.ts similarity index 77% rename from apps/web/e2e/tests/create-task.spec.ts rename to apps/web/e2e/tests/task/create-task.spec.ts index 2d06354d64..60dd75faff 100644 --- a/apps/web/e2e/tests/create-task.spec.ts +++ b/apps/web/e2e/tests/task/create-task.spec.ts @@ -1,9 +1,10 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; const START_AGENT_TEST_ID = "submit-start-agent"; const START_ENABLED_TIMEOUT = 30_000; +const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; test.describe("Task creation", () => { test("dialog pre-selects repository, branch, and agent profile from seed data", async ({ @@ -287,3 +288,103 @@ test.describe("Task creation", () => { await expect(session.sidebarSection("Review")).toBeVisible(); }); }); + +/** + * Regression tests for the create-task flow after TaskEnvironment model changes. + * Ensures that task creation, agent launch, and session navigation still work + * correctly with the new per-task environment layer. + */ +test.describe("Create task regression", () => { + test("create and start agent: session completes with task environment created", async ({ + testPage, + apiClient, + }) => { + const kanban = new KanbanPage(testPage); + await kanban.goto(); + + await kanban.createTaskButton.first().click(); + const dialog = testPage.getByTestId("create-task-dialog"); + await expect(dialog).toBeVisible(); + + await testPage.getByTestId("task-title-input").fill("Regression Task"); + await testPage.getByTestId("task-description-input").fill("/e2e:simple-message"); + + const startBtn = testPage.getByTestId(START_AGENT_TEST_ID); + await expect(startBtn).toBeEnabled({ timeout: START_ENABLED_TIMEOUT }); + await startBtn.click(); + await expect(dialog).not.toBeVisible({ timeout: 10_000 }); + + // Navigate to the task session + const card = kanban.taskCardByTitle("Regression Task"); + await expect(card).toBeVisible({ timeout: 10_000 }); + await card.click(); + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + + const session = new SessionPage(testPage); + await session.waitForLoad(); + + // Wait for mock agent to complete its turn + await expect(session.chat.getByText("simple mock response", { exact: false })).toBeVisible({ + timeout: 30_000, + }); + await expect(session.idleInput()).toBeVisible({ timeout: 15_000 }); + + // Verify task has exactly one session + const taskId = await getTaskIdFromPage(testPage); + const { sessions } = await apiClient.listTaskSessions(taskId); + expect(sessions.length).toBe(1); + expect(DONE_STATES).toContain(sessions[0].state); + + // Verify task environment was created + const env = await apiClient.getTaskEnvironment(taskId); + expect(env).not.toBeNull(); + expect(env!.task_id).toBe(taskId); + expect(env!.status).toBe("ready"); + }); + + test("create task via API: session and environment link correctly", async ({ + apiClient, + seedData, + }) => { + // Create task with agent via REST API (bypasses UI) + const task = await apiClient.createTaskWithAgent( + seedData.workspaceId, + "API Regression Task", + seedData.agentProfileId, + { + description: "/e2e:simple-message", + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + repository_ids: [seedData.repositoryId], + }, + ); + + // Wait for agent to finish (poll session state) + await expect + .poll( + async () => { + const { sessions } = await apiClient.listTaskSessions(task.id); + return DONE_STATES.includes(sessions[0]?.state ?? ""); + }, + { timeout: 30_000, message: "Waiting for session to finish" }, + ) + .toBe(true); + + // Verify task environment was created and linked + const env = await apiClient.getTaskEnvironment(task.id); + expect(env).not.toBeNull(); + expect(env!.task_id).toBe(task.id); + + // Verify session has task_environment_id set + const { sessions } = await apiClient.listTaskSessions(task.id); + expect(sessions[0].task_environment_id).toBe(env!.id); + }); +}); + +/** Extract task ID from the current page URL (/t/). */ +async function getTaskIdFromPage(page: import("@playwright/test").Page): Promise { + const url = page.url(); + const match = url.match(/\/t\/([^/?]+)/); + if (!match) throw new Error(`Cannot extract task ID from URL: ${url}`); + return match[1]; +} diff --git a/apps/web/e2e/tests/delete-task-redirect.spec.ts b/apps/web/e2e/tests/task/delete-task-redirect.spec.ts similarity index 95% rename from apps/web/e2e/tests/delete-task-redirect.spec.ts rename to apps/web/e2e/tests/task/delete-task-redirect.spec.ts index 9809844928..ecac413f71 100644 --- a/apps/web/e2e/tests/delete-task-redirect.spec.ts +++ b/apps/web/e2e/tests/task/delete-task-redirect.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("Delete task redirect", () => { /** diff --git a/apps/web/e2e/tests/task/subtask.spec.ts b/apps/web/e2e/tests/task/subtask.spec.ts new file mode 100644 index 0000000000..9db192cd19 --- /dev/null +++ b/apps/web/e2e/tests/task/subtask.spec.ts @@ -0,0 +1,367 @@ +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; + +const START_AGENT_TEST_ID = "submit-start-agent"; +const START_ENABLED_TIMEOUT = 30_000; +const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; + +type TaskWithRepos = { + id: string; + repositories?: Array<{ repository_id: string }>; +}; + +type SessionInfo = { + id: string; + agent_profile_id: string; + executor_profile_id: string; + state: string; +}; + +test.describe("Subtask basics", () => { + test("subtask badge visible on kanban card", async ({ testPage, apiClient, seedData }) => { + // Create parent task via API + const parent = await apiClient.createTask(seedData.workspaceId, "Parent Task", { + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + }); + + // Create subtask via API with parent_id + await apiClient.createTask(seedData.workspaceId, "Child Subtask", { + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + parent_id: parent.id, + }); + + const kanban = new KanbanPage(testPage); + await kanban.goto(); + + // Parent card is visible but does NOT have subtask badge + const parentCard = kanban.taskCardByTitle("Parent Task"); + await expect(parentCard).toBeVisible({ timeout: 10_000 }); + await expect(parentCard.getByText("Parent Task", { exact: true }).first()).toBeVisible(); + + // Subtask card is visible and HAS badge showing parent title + const subtaskCard = kanban.taskCardByTitle("Child Subtask"); + await expect(subtaskCard).toBeVisible({ timeout: 10_000 }); + // Badge now shows parent task title instead of generic "Subtask" + await expect(subtaskCard.getByText("Parent Task")).toBeVisible(); + }); + + test("create subtask from sidebar header button", async ({ testPage, apiClient, seedData }) => { + // Create a task with an agent so we have a session to navigate to + const task = await apiClient.createTaskWithAgent( + seedData.workspaceId, + "Subtask Parent", + seedData.agentProfileId, + { + description: "/e2e:simple-message", + workflow_id: seedData.workflowId, + repository_ids: [seedData.repositoryId], + }, + ); + + // Navigate to the session page + await testPage.goto(`/t/${task.id}`); + const session = new SessionPage(testPage); + await session.waitForLoad(); + + // Wait for agent to complete + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + + // Open the Task split-button chevron and click "New Subtask" + const chevron = testPage.getByTestId("new-task-chevron"); + await expect(chevron).toBeVisible({ timeout: 5_000 }); + await chevron.click(); + await testPage.getByTestId("new-subtask-button").click(); + + // The compact NewSubtaskDialog should open with pre-filled title containing numeric suffix + const titleInput = testPage.getByTestId("subtask-title-input"); + await expect(titleInput).toBeVisible({ timeout: 5_000 }); + await expect(titleInput).toHaveValue(/Subtask Parent \/ Subtask \d+/); + + // Fill prompt and submit + const promptInput = testPage.getByTestId("subtask-prompt-input"); + await expect(promptInput).toBeVisible(); + await promptInput.fill("/e2e:simple-message"); + + const submitBtn = testPage.getByRole("button", { name: "Create Subtask" }); + await submitBtn.click(); + await expect(titleInput).not.toBeVisible({ timeout: 10_000 }); + + // After creation, we navigate to the new subtask's session + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + + // Verify the subtask card appears on the kanban board with "Subtask" badge + const kanban = new KanbanPage(testPage); + await kanban.goto(); + const subtaskCard = kanban.taskCardByTitle(/Subtask Parent \/ Subtask \d+/); + await expect(subtaskCard).toBeVisible({ timeout: 10_000 }); + }); +}); + +test.describe("MCP subtask creation", () => { + test("agent creates subtask via MCP create_task with parent_id", async ({ testPage }) => { + const subtaskTitle = "MCP-subtask-e2e-verify"; + + const script = [ + 'e2e:thinking("Planning subtasks...")', + "e2e:delay(100)", + `e2e:mcp:kandev:create_task({"parent_id":"self","title":"${subtaskTitle}","description":"E2E subtask: verify MCP create_task with parent_id"})`, + "e2e:delay(100)", + 'e2e:message("Done.")', + ].join("\n"); + + // 1. Create parent task via UI dialog + const kanban = new KanbanPage(testPage); + await kanban.goto(); + + await kanban.createTaskButton.first().click(); + const dialog = testPage.getByTestId("create-task-dialog"); + await expect(dialog).toBeVisible(); + + await testPage.getByTestId("task-title-input").fill("MCP Subtask Parent"); + await testPage.getByTestId("task-description-input").fill(script); + + const startBtn = testPage.getByTestId(START_AGENT_TEST_ID); + await expect(startBtn).toBeEnabled({ timeout: START_ENABLED_TIMEOUT }); + await startBtn.click(); + await expect(dialog).not.toBeVisible({ timeout: 10_000 }); + + // 2. Click the parent task card to navigate to its session + const parentCard = kanban.taskCardByTitle("MCP Subtask Parent"); + await expect(parentCard).toBeVisible({ timeout: 10_000 }); + await parentCard.click(); + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + + // 3. Wait for the agent to complete — the MCP create_task call happens during execution + const session = new SessionPage(testPage); + await session.waitForLoad(); + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + + // 4. Go back to kanban — subtask card should be visible with parent badge + await kanban.goto(); + + const subtaskCard = kanban.taskCardByTitle(subtaskTitle); + await expect(subtaskCard).toBeVisible({ timeout: 10_000 }); + await expect(subtaskCard.getByText("MCP Subtask Parent")).toBeVisible(); + }); + + test("MCP-created subtask inherits parent task repositories", async ({ + testPage, + apiClient, + seedData, + }) => { + test.setTimeout(90_000); + + const subtaskTitle = "Repo-Inherit Subtask E2E"; + + const script = [ + 'e2e:thinking("Creating subtask...")', + "e2e:delay(100)", + `e2e:mcp:kandev:create_task({"parent_id":"self","title":"${subtaskTitle}","description":"E2E subtask: verify repository inheritance"})`, + "e2e:delay(100)", + 'e2e:message("Done.")', + ].join("\n"); + + // 1. Create parent task via API with an explicit repository. Without the + // fix, the MCP handler would not copy repositories to the subtask and + // it would run as a repository-less "quick chat" session. + const parentTask = await apiClient.createTaskWithAgent( + seedData.workspaceId, + "Repo Inherit Parent Task", + seedData.agentProfileId, + { + description: script, + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + repository_ids: [seedData.repositoryId], + }, + ); + expect(parentTask.id).toBeTruthy(); + + // 2. Navigate to parent task and wait for the agent to complete (which + // includes the MCP create_task call that creates the subtask). + await testPage.goto(`/t/${parentTask.id}`); + const session = new SessionPage(testPage); + await session.waitForLoad(); + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + + // 3. Locate the subtask created by the MCP call. + const allTasks = await apiClient.listTasks(seedData.workspaceId); + const subtask = allTasks.tasks.find((t) => t.title === subtaskTitle); + expect(subtask).toBeDefined(); + + // 4. Verify the subtask inherited the parent's repository. + const subtaskRaw = await apiClient.rawRequest("GET", `/api/v1/tasks/${subtask!.id}`); + const subtaskData = (await subtaskRaw.json()) as TaskWithRepos; + expect( + subtaskData.repositories?.length, + `subtask should have at least 1 repository; got: ${JSON.stringify(subtaskData.repositories)}`, + ).toBeGreaterThanOrEqual(1); + expect( + subtaskData.repositories?.[0]?.repository_id, + `subtask repository_id should match parent's (${seedData.repositoryId})`, + ).toBe(seedData.repositoryId); + }); + + test("user creates subtask via sidebar button", async ({ testPage }) => { + // 1. Create parent task via UI dialog with a simple agent script + const kanban = new KanbanPage(testPage); + await kanban.goto(); + + await kanban.createTaskButton.first().click(); + const dialog = testPage.getByTestId("create-task-dialog"); + await expect(dialog).toBeVisible(); + + await testPage.getByTestId("task-title-input").fill("Subtask Button Parent"); + await testPage.getByTestId("task-description-input").fill("/e2e:simple-message"); + + const startBtn = testPage.getByTestId(START_AGENT_TEST_ID); + await expect(startBtn).toBeEnabled({ timeout: START_ENABLED_TIMEOUT }); + await startBtn.click(); + await expect(dialog).not.toBeVisible({ timeout: 10_000 }); + + // 2. Click the parent card to navigate to its session + const parentCard = kanban.taskCardByTitle("Subtask Button Parent"); + await expect(parentCard).toBeVisible({ timeout: 10_000 }); + await parentCard.click(); + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + + // 3. Wait for the agent to finish + const session = new SessionPage(testPage); + await session.waitForLoad(); + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + + // 4. Open the Task split-button chevron and click "New Subtask" + await testPage.getByTestId("new-task-chevron").click(); + await testPage.getByTestId("new-subtask-button").click(); + const subtaskTitleInput = testPage.getByTestId("subtask-title-input"); + await expect(subtaskTitleInput).toBeVisible(); + + // Title should be pre-filled with "Parent / Subtask N" pattern + await expect(subtaskTitleInput).toHaveValue(/Subtask Button Parent \/ Subtask \d+/); + + // 5. Fill the prompt and submit + const parentUrl = testPage.url(); + await testPage.getByTestId("subtask-prompt-input").fill("/e2e:simple-message"); + await testPage.getByRole("button", { name: "Create Subtask" }).click(); + + await expect(testPage).toHaveURL(/\/t\//, { timeout: 15_000 }); + await expect(testPage).not.toHaveURL(parentUrl); + + // 6. Go back to kanban — subtask card should be visible with parent badge + await kanban.goto(); + const subtaskCard = kanban.taskCardByTitle(/Subtask Button Parent \/ Subtask \d+/); + await expect(subtaskCard).toBeVisible({ timeout: 10_000 }); + }); +}); + +/** + * Verifies that when an agent creates a subtask via the MCP create_task tool + * with parent_id="self", the subtask session inherits BOTH the parent session's + * agent_profile_id AND executor_profile_id. + */ +test.describe("Subtask inheritance", () => { + test("MCP-created subtask inherits agent profile and executor profile", async ({ + testPage, + apiClient, + seedData, + }) => { + test.setTimeout(90_000); + + const subtaskTitle = "Inherited Profile Subtask E2E"; + + const script = [ + 'e2e:thinking("Creating subtask...")', + "e2e:delay(100)", + `e2e:mcp:kandev:create_task({"parent_id":"self","title":"${subtaskTitle}","description":"E2E subtask: verify executor and agent profile inheritance"})`, + "e2e:delay(100)", + 'e2e:message("Done.")', + ].join("\n"); + + // 1. Create an executor + profile so executor_profile_id is non-empty on + // the parent session — this makes the inheritance assertion meaningful. + const executor = await apiClient.createExecutor("E2E Inherit Executor", "local_pc"); + const executorProfile = await apiClient.createExecutorProfile( + executor.id, + "E2E Inherit Profile", + ); + + // 2. Create parent task via API with explicit executor_profile_id so the + // parent session records it. The mock agent runs the MCP script which + // creates the subtask with parent_id="self". + const parentTask = await apiClient.createTaskWithAgent( + seedData.workspaceId, + "Executor Inherit Parent Task", + seedData.agentProfileId, + { + description: script, + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + executor_profile_id: executorProfile.id, + }, + ); + expect(parentTask.id).toBeTruthy(); + + // 3. Navigate to the parent task page and wait for the agent to complete. + await testPage.goto(`/t/${parentTask.id}`); + const session = new SessionPage(testPage); + await session.waitForLoad(); + await expect(session.idleInput()).toBeVisible({ timeout: 30_000 }); + + // 4. Confirm the parent session has both profiles set as expected. + const parentRaw = await apiClient.rawRequest("GET", `/api/v1/tasks/${parentTask.id}/sessions`); + const parentData = (await parentRaw.json()) as { sessions: SessionInfo[] }; + const parentSession = parentData.sessions[0]; + expect( + parentSession?.agent_profile_id, + `agent_profile_id: got ${parentSession?.agent_profile_id}, want ${seedData.agentProfileId}`, + ).toBe(seedData.agentProfileId); + expect( + parentSession?.executor_profile_id, + `executor_profile_id: got ${parentSession?.executor_profile_id}, want ${executorProfile.id}; full session: ${JSON.stringify(parentSession)}`, + ).toBe(executorProfile.id); + + // 5. Locate the subtask created by the MCP call. + const allTasks = await apiClient.listTasks(seedData.workspaceId); + const subtask = allTasks.tasks.find((t) => t.title === subtaskTitle); + expect(subtask).toBeDefined(); + + // 6. Verify subtask was auto-started: must have at least one session. + // Without the fix, autoStartTask finds no agent profile and skips launch → + // the subtask remains sessionless. + await expect + .poll( + async () => { + const { sessions } = await apiClient.listTaskSessions(subtask!.id); + return sessions.length; + }, + { timeout: 30_000, message: "Subtask should be auto-started with an inherited session" }, + ) + .toBeGreaterThanOrEqual(1); + + // 7. Wait for the subtask session to reach a terminal state. + await expect + .poll( + async () => { + const { sessions } = await apiClient.listTaskSessions(subtask!.id); + return DONE_STATES.includes(sessions[0]?.state ?? ""); + }, + { timeout: 30_000, message: "Waiting for subtask session to complete" }, + ) + .toBe(true); + + // 8. Verify the subtask session inherited BOTH profiles from the parent — + // proving executor/agent profile inheritance worked correctly. + const subtaskRaw = await apiClient.rawRequest("GET", `/api/v1/tasks/${subtask!.id}/sessions`); + const subtaskData = (await subtaskRaw.json()) as { sessions: SessionInfo[] }; + const subtaskSession = subtaskData.sessions[0]; + + expect(subtaskSession?.agent_profile_id).toBe(parentSession?.agent_profile_id); + expect(subtaskSession?.executor_profile_id).toBe(parentSession?.executor_profile_id); + // Sanity: both are non-empty (so the assertions above are not vacuously true) + expect(subtaskSession?.agent_profile_id).toBeTruthy(); + expect(subtaskSession?.executor_profile_id).toBeTruthy(); + }); +}); diff --git a/apps/web/e2e/tests/task-environment.spec.ts b/apps/web/e2e/tests/task/task-environment.spec.ts similarity index 98% rename from apps/web/e2e/tests/task-environment.spec.ts rename to apps/web/e2e/tests/task/task-environment.spec.ts index 67a4c5046d..69219d9c4b 100644 --- a/apps/web/e2e/tests/task-environment.spec.ts +++ b/apps/web/e2e/tests/task/task-environment.spec.ts @@ -1,4 +1,4 @@ -import { test, expect } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; const DONE_STATES = ["COMPLETED", "WAITING_FOR_INPUT"]; diff --git a/apps/web/e2e/tests/task-list.spec.ts b/apps/web/e2e/tests/task/task-list.spec.ts similarity index 90% rename from apps/web/e2e/tests/task-list.spec.ts rename to apps/web/e2e/tests/task/task-list.spec.ts index 3c41e82c06..acbae09202 100644 --- a/apps/web/e2e/tests/task-list.spec.ts +++ b/apps/web/e2e/tests/task/task-list.spec.ts @@ -1,4 +1,4 @@ -import { test, expect } from "../fixtures/test-base"; +import { test, expect } from "../../fixtures/test-base"; test.describe("Task List", () => { test("seeded task appears in task list", async ({ testPage, apiClient, seedData }) => { diff --git a/apps/web/e2e/tests/task-switcher-status.spec.ts b/apps/web/e2e/tests/task/task-switcher-status.spec.ts similarity index 97% rename from apps/web/e2e/tests/task-switcher-status.spec.ts rename to apps/web/e2e/tests/task/task-switcher-status.spec.ts index 7100783159..6ab1f044eb 100644 --- a/apps/web/e2e/tests/task-switcher-status.spec.ts +++ b/apps/web/e2e/tests/task/task-switcher-status.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("Task switcher sidebar status", () => { /** diff --git a/apps/web/e2e/tests/terminal-links.spec.ts b/apps/web/e2e/tests/terminal-links.spec.ts deleted file mode 100644 index 9d61644a81..0000000000 --- a/apps/web/e2e/tests/terminal-links.spec.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { test, expect } from "../fixtures/test-base"; - -// --------------------------------------------------------------------------- -// Terminal clickable links — settings persistence and UI -// --------------------------------------------------------------------------- - -test.describe("terminal clickable links", () => { - test.beforeEach(async ({ apiClient }) => { - await apiClient.saveUserSettings({ terminal_link_behavior: "new_tab" }); - }); - - test("terminal_link_behavior defaults to new_tab and can be updated via API", async ({ - apiClient, - }) => { - // Default value - const initial = await apiClient.getUserSettings(); - expect(initial.settings.terminal_link_behavior).toBe("new_tab"); - - // Switch to browser_panel - await apiClient.saveUserSettings({ terminal_link_behavior: "browser_panel" }); - const updated = await apiClient.getUserSettings(); - expect(updated.settings.terminal_link_behavior).toBe("browser_panel"); - - // Revert to new_tab - await apiClient.saveUserSettings({ terminal_link_behavior: "new_tab" }); - const reverted = await apiClient.getUserSettings(); - expect(reverted.settings.terminal_link_behavior).toBe("new_tab"); - }); - - test("rejects invalid terminal_link_behavior values", async ({ apiClient }) => { - const res = await apiClient.rawRequest("PATCH", "/api/v1/user/settings", { - terminal_link_behavior: "invalid_value", - }); - expect(res.status).toBeGreaterThanOrEqual(400); - expect(res.status).toBeLessThan(500); - - // Setting should remain unchanged - const current = await apiClient.getUserSettings(); - expect(current.settings.terminal_link_behavior).toBe("new_tab"); - }); - - test("settings page shows terminal links card and allows toggling", async ({ testPage }) => { - await testPage.goto("/settings"); - - // Terminal Links section visible - await expect(testPage.locator("text=Terminal Links").first()).toBeVisible({ timeout: 10_000 }); - - // Select trigger is visible - const trigger = testPage.locator("#terminal-link-behavior"); - await expect(trigger).toBeVisible(); - - // Switch to "Built-in browser panel" - await trigger.click(); - const browserOption = testPage.getByRole("option", { name: "Built-in browser panel" }); - await expect(browserOption).toBeVisible(); - await browserOption.click(); - await expect(trigger).toHaveText(/Built-in browser panel/); - - // Switch back to "New browser tab" - await trigger.click(); - const tabOption = testPage.getByRole("option", { name: "New browser tab" }); - await expect(tabOption).toBeVisible(); - await tabOption.click(); - await expect(trigger).toHaveText(/New browser tab/); - }); -}); diff --git a/apps/web/e2e/tests/terminal-agent.spec.ts b/apps/web/e2e/tests/terminal/terminal-agent.spec.ts similarity index 97% rename from apps/web/e2e/tests/terminal-agent.spec.ts rename to apps/web/e2e/tests/terminal/terminal-agent.spec.ts index a169251ad8..995bf9f685 100644 --- a/apps/web/e2e/tests/terminal-agent.spec.ts +++ b/apps/web/e2e/tests/terminal/terminal-agent.spec.ts @@ -1,8 +1,8 @@ -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; import type { Page } from "@playwright/test"; // --------------------------------------------------------------------------- diff --git a/apps/web/e2e/tests/terminal-keyboard.spec.ts b/apps/web/e2e/tests/terminal/terminal-keyboard.spec.ts similarity index 96% rename from apps/web/e2e/tests/terminal-keyboard.spec.ts rename to apps/web/e2e/tests/terminal/terminal-keyboard.spec.ts index a1b66510c1..200b7b477b 100644 --- a/apps/web/e2e/tests/terminal-keyboard.spec.ts +++ b/apps/web/e2e/tests/terminal/terminal-keyboard.spec.ts @@ -1,9 +1,9 @@ // Routing: /t/{taskId} (task-keyed, not /s/{sessionId}) import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; // --------------------------------------------------------------------------- // Helpers diff --git a/apps/web/e2e/tests/terminal-font-settings.spec.ts b/apps/web/e2e/tests/terminal/terminal-settings.spec.ts similarity index 65% rename from apps/web/e2e/tests/terminal-font-settings.spec.ts rename to apps/web/e2e/tests/terminal/terminal-settings.spec.ts index cdb67e70b5..d49a7de562 100644 --- a/apps/web/e2e/tests/terminal-font-settings.spec.ts +++ b/apps/web/e2e/tests/terminal/terminal-settings.spec.ts @@ -1,8 +1,8 @@ import { type Page } from "@playwright/test"; -import { test, expect } from "../fixtures/test-base"; -import type { SeedData } from "../fixtures/test-base"; -import type { ApiClient } from "../helpers/api-client"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import type { SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { SessionPage } from "../../pages/session-page"; // The full font stack value for "JetBrains Mono" preset const JB_MONO_STACK = '"JetBrains Mono", "Fira Code", Menlo, Consolas, monospace'; @@ -132,3 +132,64 @@ test.describe("Terminal font settings", () => { await expect(fontSizeInput).toBeVisible(); }); }); + +test.describe("Terminal link settings", () => { + test.beforeEach(async ({ apiClient }) => { + await apiClient.saveUserSettings({ terminal_link_behavior: "new_tab" }); + }); + + test("terminal_link_behavior defaults to new_tab and can be updated via API", async ({ + apiClient, + }) => { + // Default value + const initial = await apiClient.getUserSettings(); + expect(initial.settings.terminal_link_behavior).toBe("new_tab"); + + // Switch to browser_panel + await apiClient.saveUserSettings({ terminal_link_behavior: "browser_panel" }); + const updated = await apiClient.getUserSettings(); + expect(updated.settings.terminal_link_behavior).toBe("browser_panel"); + + // Revert to new_tab + await apiClient.saveUserSettings({ terminal_link_behavior: "new_tab" }); + const reverted = await apiClient.getUserSettings(); + expect(reverted.settings.terminal_link_behavior).toBe("new_tab"); + }); + + test("rejects invalid terminal_link_behavior values", async ({ apiClient }) => { + const res = await apiClient.rawRequest("PATCH", "/api/v1/user/settings", { + terminal_link_behavior: "invalid_value", + }); + expect(res.status).toBeGreaterThanOrEqual(400); + expect(res.status).toBeLessThan(500); + + // Setting should remain unchanged + const current = await apiClient.getUserSettings(); + expect(current.settings.terminal_link_behavior).toBe("new_tab"); + }); + + test("settings page shows terminal links card and allows toggling", async ({ testPage }) => { + await testPage.goto("/settings"); + + // Terminal Links section visible + await expect(testPage.locator("text=Terminal Links").first()).toBeVisible({ timeout: 10_000 }); + + // Select trigger is visible + const trigger = testPage.locator("#terminal-link-behavior"); + await expect(trigger).toBeVisible(); + + // Switch to "Built-in browser panel" + await trigger.click(); + const browserOption = testPage.getByRole("option", { name: "Built-in browser panel" }); + await expect(browserOption).toBeVisible(); + await browserOption.click(); + await expect(trigger).toHaveText(/Built-in browser panel/); + + // Switch back to "New browser tab" + await trigger.click(); + const tabOption = testPage.getByRole("option", { name: "New browser tab" }); + await expect(tabOption).toBeVisible(); + await tabOption.click(); + await expect(trigger).toHaveText(/New browser tab/); + }); +}); diff --git a/apps/web/e2e/tests/workflow-automation.spec.ts b/apps/web/e2e/tests/workflow/workflow-automation.spec.ts similarity index 99% rename from apps/web/e2e/tests/workflow-automation.spec.ts rename to apps/web/e2e/tests/workflow/workflow-automation.spec.ts index 18785dfd07..bf7285ec5e 100644 --- a/apps/web/e2e/tests/workflow-automation.spec.ts +++ b/apps/web/e2e/tests/workflow/workflow-automation.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("Workflow automation", () => { /** diff --git a/apps/web/e2e/tests/workflow-import-export.spec.ts b/apps/web/e2e/tests/workflow/workflow-import-export.spec.ts similarity index 71% rename from apps/web/e2e/tests/workflow-import-export.spec.ts rename to apps/web/e2e/tests/workflow/workflow-import-export.spec.ts index 2c51048ce0..d2a395113a 100644 --- a/apps/web/e2e/tests/workflow-import-export.spec.ts +++ b/apps/web/e2e/tests/workflow/workflow-import-export.spec.ts @@ -1,5 +1,5 @@ -import { test, expect } from "../fixtures/test-base"; -import { WorkflowSettingsPage } from "../pages/workflow-settings-page"; +import { test, expect } from "../../fixtures/test-base"; +import { WorkflowSettingsPage } from "../../pages/workflow-settings-page"; test.describe("Workflow import/export", () => { test("export all button opens dialog with valid YAML", async ({ testPage, seedData }) => { @@ -190,72 +190,3 @@ workflows: }); }); }); - -test.describe("Seed protection", () => { - // Backend restart can be flaky - test.describe.configure({ retries: 1 }); - - test("backend restart preserves user-customized workflows visible in UI", async ({ - testPage, - apiClient, - seedData, - backend, - }) => { - // 1. Create workflows from templates via API - const kanbanWf = await apiClient.createWorkflow(seedData.workspaceId, "My Kanban", "simple"); - const prReviewWf = await apiClient.createWorkflow( - seedData.workspaceId, - "My PR Review", - "pr-review", - ); - - // 2. Customize via API — set custom prompts - const { steps: kanbanSteps } = await apiClient.listWorkflowSteps(kanbanWf.id); - const reviewStep = kanbanSteps.find((s) => s.name === "Review"); - expect(reviewStep).toBeDefined(); - await apiClient.updateWorkflowStep(reviewStep!.id, { - prompt: "Custom QA review prompt", - }); - - const { steps: prSteps } = await apiClient.listWorkflowSteps(prReviewWf.id); - const prReviewStep = prSteps.find((s) => s.name === "Review"); - expect(prReviewStep).toBeDefined(); - await apiClient.updateWorkflowStep(prReviewStep!.id, { - prompt: "My custom PR review instructions", - }); - - // 3. Verify workflows are visible in UI before restart - const page = new WorkflowSettingsPage(testPage); - await page.goto(seedData.workspaceId); - await expect(await page.findWorkflowCard("My Kanban")).toBeVisible(); - await expect(await page.findWorkflowCard("My PR Review")).toBeVisible(); - - // 4. Restart the backend — triggers seed/init again - await backend.restart(); - - // 5. Reload the page and verify workflows still visible with correct steps - await page.goto(seedData.workspaceId); - const kanbanCard = await page.findWorkflowCard("My Kanban"); - await expect(kanbanCard).toBeVisible(); - await expect(kanbanCard.getByText("Backlog")).toBeVisible(); - await expect(kanbanCard.getByText("Review")).toBeVisible(); - - const prCard = await page.findWorkflowCard("My PR Review"); - await expect(prCard).toBeVisible(); - - // 6. Verify customizations survived via API - const { steps: postKanban } = await apiClient.listWorkflowSteps(kanbanWf.id); - const postReview = postKanban.find((s) => s.id === reviewStep!.id); - expect(postReview).toBeDefined(); - expect(postReview!.prompt).toBe("Custom QA review prompt"); - - const { steps: postPR } = await apiClient.listWorkflowSteps(prReviewWf.id); - const postPRReview = postPR.find((s) => s.id === prReviewStep!.id); - expect(postPRReview).toBeDefined(); - expect(postPRReview!.prompt).toBe("My custom PR review instructions"); - - // 7. Same number of steps (no duplication or loss) - expect(postKanban).toHaveLength(kanbanSteps.length); - expect(postPR).toHaveLength(prSteps.length); - }); -}); diff --git a/apps/web/e2e/tests/workflow-settings.spec.ts b/apps/web/e2e/tests/workflow/workflow-settings.spec.ts similarity index 71% rename from apps/web/e2e/tests/workflow-settings.spec.ts rename to apps/web/e2e/tests/workflow/workflow-settings.spec.ts index 4963f01987..587e78d37c 100644 --- a/apps/web/e2e/tests/workflow-settings.spec.ts +++ b/apps/web/e2e/tests/workflow/workflow-settings.spec.ts @@ -1,5 +1,5 @@ -import { test, expect } from "../fixtures/test-base"; -import { WorkflowSettingsPage } from "../pages/workflow-settings-page"; +import { test, expect } from "../../fixtures/test-base"; +import { WorkflowSettingsPage } from "../../pages/workflow-settings-page"; test.describe("Workflow settings", () => { test("displays existing workflows on the settings page", async ({ testPage, seedData }) => { @@ -205,3 +205,72 @@ test.describe("Workflow settings", () => { await expect(deletedCard).not.toBeVisible(); }); }); + +test.describe("Seed protection", () => { + // Backend restart can be flaky + test.describe.configure({ retries: 1 }); + + test("backend restart preserves user-customized workflows visible in UI", async ({ + testPage, + apiClient, + seedData, + backend, + }) => { + // 1. Create workflows from templates via API + const kanbanWf = await apiClient.createWorkflow(seedData.workspaceId, "My Kanban", "simple"); + const prReviewWf = await apiClient.createWorkflow( + seedData.workspaceId, + "My PR Review", + "pr-review", + ); + + // 2. Customize via API — set custom prompts + const { steps: kanbanSteps } = await apiClient.listWorkflowSteps(kanbanWf.id); + const reviewStep = kanbanSteps.find((s) => s.name === "Review"); + expect(reviewStep).toBeDefined(); + await apiClient.updateWorkflowStep(reviewStep!.id, { + prompt: "Custom QA review prompt", + }); + + const { steps: prSteps } = await apiClient.listWorkflowSteps(prReviewWf.id); + const prReviewStep = prSteps.find((s) => s.name === "Review"); + expect(prReviewStep).toBeDefined(); + await apiClient.updateWorkflowStep(prReviewStep!.id, { + prompt: "My custom PR review instructions", + }); + + // 3. Verify workflows are visible in UI before restart + const page = new WorkflowSettingsPage(testPage); + await page.goto(seedData.workspaceId); + await expect(await page.findWorkflowCard("My Kanban")).toBeVisible(); + await expect(await page.findWorkflowCard("My PR Review")).toBeVisible(); + + // 4. Restart the backend — triggers seed/init again + await backend.restart(); + + // 5. Reload the page and verify workflows still visible with correct steps + await page.goto(seedData.workspaceId); + const kanbanCard = await page.findWorkflowCard("My Kanban"); + await expect(kanbanCard).toBeVisible(); + await expect(kanbanCard.getByText("Backlog")).toBeVisible(); + await expect(kanbanCard.getByText("Review")).toBeVisible(); + + const prCard = await page.findWorkflowCard("My PR Review"); + await expect(prCard).toBeVisible(); + + // 6. Verify customizations survived via API + const { steps: postKanban } = await apiClient.listWorkflowSteps(kanbanWf.id); + const postReview = postKanban.find((s) => s.id === reviewStep!.id); + expect(postReview).toBeDefined(); + expect(postReview!.prompt).toBe("Custom QA review prompt"); + + const { steps: postPR } = await apiClient.listWorkflowSteps(prReviewWf.id); + const postPRReview = postPR.find((s) => s.id === prReviewStep!.id); + expect(postPRReview).toBeDefined(); + expect(postPRReview!.prompt).toBe("My custom PR review instructions"); + + // 7. Same number of steps (no duplication or loss) + expect(postKanban).toHaveLength(kanbanSteps.length); + expect(postPR).toHaveLength(prSteps.length); + }); +}); diff --git a/apps/web/e2e/tests/workflow-start-step.spec.ts b/apps/web/e2e/tests/workflow/workflow-start-step.spec.ts similarity index 98% rename from apps/web/e2e/tests/workflow-start-step.spec.ts rename to apps/web/e2e/tests/workflow/workflow-start-step.spec.ts index fb1135dff3..f5df5b5c11 100644 --- a/apps/web/e2e/tests/workflow-start-step.spec.ts +++ b/apps/web/e2e/tests/workflow/workflow-start-step.spec.ts @@ -1,6 +1,6 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; -import { SessionPage } from "../pages/session-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; +import { SessionPage } from "../../pages/session-page"; test.describe("Workflow start step placement", () => { test.describe("without explicit start step (Todo -> In Progress -> Done)", () => { diff --git a/apps/web/e2e/tests/workflow-steps.spec.ts b/apps/web/e2e/tests/workflow/workflow-steps.spec.ts similarity index 94% rename from apps/web/e2e/tests/workflow-steps.spec.ts rename to apps/web/e2e/tests/workflow/workflow-steps.spec.ts index e8b315a793..6970368390 100644 --- a/apps/web/e2e/tests/workflow-steps.spec.ts +++ b/apps/web/e2e/tests/workflow/workflow-steps.spec.ts @@ -1,5 +1,5 @@ -import { test, expect } from "../fixtures/test-base"; -import { KanbanPage } from "../pages/kanban-page"; +import { test, expect } from "../../fixtures/test-base"; +import { KanbanPage } from "../../pages/kanban-page"; test.describe("Workflow steps", () => { test("task appears in correct column after API move", async ({