## Problem Reported: planning gets stuck in a cycle of retrying and regenerating after a response was already supplied. After the user answers a planning question, `submitResponse` pushed the answer to history but left `session.currentQuestion` pointing at the just-answered question for the whole next generation. The planning SSE route's catch-up path re-emits `currentQuestion` to every fresh connection — and each FN-7946 auto-retry (#2073) opens a fresh connection. So after any generation error: 1. Auto-retry connects a fresh stream → the server re-emits the **already-answered** question. 2. The client treats any question event as progress: it **resets the 3-attempt auto-retry budget** and re-shows the answered question. 3. The retry regenerates; if it errors again the cycle repeats with a fresh budget — an unbounded retry/regenerate loop. Re-answering the stale question also 409-collided with the in-flight generation, feeding the same loop. ## Fix Invariant: `currentQuestion` is only set while the session is genuinely awaiting user input. - `submitResponse` clears it the moment an answer is accepted (normal turns and the deepening checkpoint), while preserving the legacy 200 respond contract on generation failure (the modal ignores the body and lets the SSE error drive recovery). - `retrySession` scrubs stale questions persisted by pre-fix builds before regenerating. - `buildSessionFromRow` only restores a question when the persisted row is `awaiting_input`. - `didSubmitSameAnswer` now compares against the last history entry so the duplicate-submit 409 message survives. - Agent onboarding gets the same fix (its SSE route also re-emits `currentQuestion` on connect); retry now asks the next question instead of re-asking the answered one. Surface enumeration: mission and milestone interviews keep questions the same way but their SSE routes never re-emit on connect, and the auto-retry budget machinery is Planning-Mode-only — planning + onboarding were the two affected surfaces. ## Symptom Verification - **Original symptom:** after answering a question, Planning Mode loops between "Retrying…" and regenerating, re-showing the already-answered question, with the auto-retry budget never exhausting. - **Exact reproduction:** answer a question, have the next generation fail (stuck watchdog/provider error), let the client auto-retry open a fresh SSE connection. - **Assertion it is gone:** new regression suite `planning-answered-question-reemit.test.ts` asserts `currentQuestion` is cleared mid-generation, on generation failure, on retry, and on restore from non-`awaiting_input` rows — so the SSE catch-up path has nothing stale to re-emit. All 5 tests fail against pre-fix code and pass with the fix; an onboarding regression test covers the sibling surface. ## Verification - New regression tests: 5/5 fail on pre-fix code, pass with the fix (plus 1 onboarding test). - Existing suites: 137 planning server tests pass (3 failures in `routes-planning.test.ts` fail identically without this change — pre-existing on the branch); all 69 `PlanningModeModal.planning-flow` client tests pass; `tsc --noEmit` clean; `pnpm check:changesets` passes. 🤖 Generated with [Claude Code](https://claude.com/claude-code) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Made Planning Mode (and related planning controls) lock-free and multi-tab—no more take-over/active-in-another-tab lock overlays. * **Bug Fixes** * Fixed Planning Mode retry/generation flows where already-answered questions could reappear. * Ensured answered questions clear immediately and aren’t re-emitted during session recovery/SSE catch-up. * Improved session restoration and preserved legacy recovery behavior when generation fails after an answer. * **Tests** * Added regression coverage for the answered-question invariant and updated existing tests to reflect lock-free behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --- ## Follow-up: Planning Mode is now multi-tab via DB state (lock-free) Second commit removes all cross-tab coordination from planning — the persisted session row is the single source of truth and multiple tabs can read and interact with the same session: - **Server:** `/planning/*` routes no longer run `checkSessionLock` or parse `tabId`; a stale `tabId` from an older client is ignored instead of 409'd. Subtask/mission interview routes keep their existing lock behavior. - **Client:** `PlanningModeModal` drops `useSessionLock`, the `useAiSessionSync` BroadcastChannel broadcasts, `sessionTabId`/`lockSessionId` state, and the "Take Control" overlay. Tabs stay current via the per-session SSE stream plus the global `ai_session:updated` events `useBackgroundSessions` already consumes; concurrent writes resolve via the server's generation-in-progress guard (409). - **API client:** planning functions lose their `tabId` params. - **Fix uncovered by the refactor:** the 8s stuck-poll now resolves the session id inside each tick — the removed lock state was what previously re-armed the poll after Start Planning resolved the session id. - Also fixes a pre-existing PG-cutover break in `planning-generation-cancellation.test.ts` (`getSession` is async). Verification: 144 client planning tests and 137 server planning tests pass (the 3 remaining `routes-planning.test.ts` failures are pre-existing on the branch and fail identically without these changes); `tsc --noEmit` and eslint clean on changed files; `pnpm check:changesets` passes. Lock-conflict route tests were rewritten to assert lock-free semantics, plus a new modal test proving a session stays fully interactive with no lock acquisition even when another tab is active. --- ## Follow-up 2: the per-tab session lock is gone entirely Third commit extends the multi-tab model from planning to **every** AI interview surface (planning, subtask breakdown, mission interview, milestone/slice interview) and deletes the lock machinery root and branch. **Server** - Deleted the `/ai-sessions/:id/lock`, `/lock/force`, and `/lock/beacon` routes. - Dropped `checkSessionLock` from every planning/subtask/mission/milestone route (both copies — `routes.ts` and `mission-routes.ts`). A `tabId` from an older client is ignored, never 409'd; all `tabId` body parsing is gone. - Dropped `acquireLock` / `releaseLock` / `forceAcquireLock` / `getLockHolder` / `releaseStaleLocks` from `AiSessionStore`, plus the `@fusion/core` async helpers (`acquireAiSessionLock` et al) and core's re-exports. - Removed `lockedByTab`/`lockedAt` from `AiSessionRow`/`AiSessionSummary`, the upsert SQL, and all four session producers. **Client** - Deleted `useSessionLock` and the now-orphaned `getSessionTabId` util. - Removed the Take Control overlay, the "active in another tab" banners, and `BackgroundTasksIndicator`'s active-elsewhere gate (the confirm prompt and lock badge — sessions now just open). - Reduced `useAiSessionSync` to what its own comments already called it — a low-latency *status* supplement to SSE: no `activeTabMap`, `broadcastLock/Unlock/Heartbeat`, `owningTabId`, `tab:*` messages, or stale-heartbeat sweep. - Dropped `tabId` from every session API client function; removed the lock CSS. **Deliberately kept: the two DB columns.** `ai_sessions.locked_by_tab` / `locked_at` remain as dead, always-NULL columns with a deprecation note. Dropping them is an irreversible migration, and released binaries still name those columns explicitly in their upsert — an older install pointed at the same database would fail every session write. They can be dropped once no such binary can reach it. No code reads or writes them. **Verification**: 397 client tests and 137 server planning tests pass (the same 3 `routes-planning.test.ts` failures are pre-existing — verified identical on a clean stash); `tsc --noEmit` clean for `@fusion/core` and `@fusion/dashboard`; eslint clean on all changed files; the 30 PG `schema-applier` tests pass (they exercise the retained columns); `pnpm check:changesets` passes. The lock-conflict route tests and both modal lock tests were rewritten to assert the inverse: routes and modals stay fully interactive while another tab "holds" a lock, and the lock API is never called. --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
880 lines
34 KiB
TypeScript
880 lines
34 KiB
TypeScript
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
import { act, render, screen, fireEvent, waitFor } from "@testing-library/react";
|
|
import { SubtaskBreakdownModal } from "../SubtaskBreakdownModal";
|
|
|
|
const mockStartSubtaskBreakdown = vi.fn();
|
|
const mockRetrySubtaskSession = vi.fn();
|
|
const mockConnectSubtaskStream = vi.fn();
|
|
const mockCreateTasksFromBreakdown = vi.fn();
|
|
const mockCancelSubtaskBreakdown = vi.fn();
|
|
const mockFetchAiSession = vi.fn();
|
|
const mockParseConversationHistory = vi.fn();
|
|
const mockAcquireSessionLock = vi.fn();
|
|
const mockReleaseSessionLock = vi.fn();
|
|
const mockForceAcquireSessionLock = vi.fn();
|
|
|
|
vi.mock("../../api", () => ({
|
|
startSubtaskBreakdown: (...args: any[]) => mockStartSubtaskBreakdown(...args),
|
|
retrySubtaskSession: (...args: any[]) => mockRetrySubtaskSession(...args),
|
|
connectSubtaskStream: (...args: any[]) => mockConnectSubtaskStream(...args),
|
|
createTasksFromBreakdown: (...args: any[]) => mockCreateTasksFromBreakdown(...args),
|
|
cancelSubtaskBreakdown: (...args: any[]) => mockCancelSubtaskBreakdown(...args),
|
|
fetchAiSession: (...args: any[]) => mockFetchAiSession(...args),
|
|
parseConversationHistory: (...args: any[]) => mockParseConversationHistory(...args),
|
|
acquireSessionLock: (...args: any[]) => mockAcquireSessionLock(...args),
|
|
releaseSessionLock: (...args: any[]) => mockReleaseSessionLock(...args),
|
|
forceAcquireSessionLock: (...args: any[]) => mockForceAcquireSessionLock(...args),
|
|
}));
|
|
|
|
vi.mock("../../hooks/modalPersistence", () => ({
|
|
saveSubtaskDescription: vi.fn(),
|
|
getSubtaskDescription: vi.fn(() => ""),
|
|
clearSubtaskDescription: vi.fn(),
|
|
}));
|
|
|
|
const mockConfirm = vi.fn();
|
|
|
|
vi.mock("../../hooks/useConfirm", () => ({
|
|
useConfirm: () => ({ confirm: mockConfirm }),
|
|
}));
|
|
|
|
const mockUseMobileKeyboard = vi.fn();
|
|
const mockViewportMode = vi.hoisted(() => ({ value: "mobile" }));
|
|
vi.mock("../../hooks/useMobileKeyboard", () => ({
|
|
useMobileKeyboard: (...args: unknown[]) => mockUseMobileKeyboard(...args),
|
|
}));
|
|
|
|
vi.mock("../../hooks/useViewportMode", () => ({
|
|
MOBILE_MEDIA_QUERY: "(max-width: 768px), (max-height: 480px)",
|
|
getViewportMode: () => mockViewportMode.value,
|
|
isMobileViewport: () => mockViewportMode.value === "mobile",
|
|
useViewportMode: () => mockViewportMode.value,
|
|
}));
|
|
|
|
const SAMPLE_SUBTASKS = [
|
|
{ id: "subtask-1", title: "First", description: "Do first", suggestedSize: "S" as const, dependsOn: [] },
|
|
{ id: "subtask-2", title: "Second", description: "Do second", suggestedSize: "M" as const, dependsOn: ["subtask-1"] },
|
|
];
|
|
|
|
const THREE_SUBTASKS = [
|
|
{ id: "subtask-A", title: "Task A", description: "Do A", suggestedSize: "S" as const, dependsOn: [] },
|
|
{ id: "subtask-B", title: "Task B", description: "Do B", suggestedSize: "M" as const, dependsOn: [] },
|
|
{ id: "subtask-C", title: "Task C", description: "Do C", suggestedSize: "L" as const, dependsOn: [] },
|
|
];
|
|
|
|
describe("SubtaskBreakdownModal", () => {
|
|
const onClose = vi.fn();
|
|
const onTasksCreated = vi.fn();
|
|
let streamHandlers: any;
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
streamHandlers = undefined;
|
|
mockStartSubtaskBreakdown.mockResolvedValue({ sessionId: "session-123" });
|
|
mockRetrySubtaskSession.mockResolvedValue({ success: true, sessionId: "session-123" });
|
|
mockConnectSubtaskStream.mockImplementation((_sessionId, _projectId, handlers) => {
|
|
streamHandlers = handlers;
|
|
return { close: vi.fn(), isConnected: () => true };
|
|
});
|
|
mockCreateTasksFromBreakdown.mockResolvedValue({ tasks: [{ id: "FN-101" }, { id: "FN-102" }] });
|
|
mockCancelSubtaskBreakdown.mockResolvedValue(undefined);
|
|
mockFetchAiSession.mockResolvedValue(null);
|
|
mockParseConversationHistory.mockImplementation((raw: string) => {
|
|
if (!raw) return [];
|
|
try {
|
|
const parsed = JSON.parse(raw);
|
|
return Array.isArray(parsed) ? parsed : [];
|
|
} catch {
|
|
return [];
|
|
}
|
|
});
|
|
mockAcquireSessionLock.mockResolvedValue({ acquired: true, currentHolder: null });
|
|
mockReleaseSessionLock.mockResolvedValue(undefined);
|
|
mockForceAcquireSessionLock.mockResolvedValue({ acquired: true, currentHolder: null });
|
|
mockConfirm.mockReset();
|
|
mockConfirm.mockResolvedValue(true);
|
|
mockViewportMode.value = "mobile";
|
|
mockUseMobileKeyboard.mockReturnValue({
|
|
keyboardOpen: false,
|
|
keyboardOverlap: 0,
|
|
viewportHeight: null,
|
|
viewportOffsetTop: 0,
|
|
});
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.unstubAllGlobals();
|
|
});
|
|
|
|
function renderModal() {
|
|
return render(
|
|
<SubtaskBreakdownModal
|
|
isOpen={true}
|
|
onClose={onClose}
|
|
initialDescription="Build a complex feature"
|
|
onTasksCreated={onTasksCreated}
|
|
/>,
|
|
);
|
|
}
|
|
|
|
it("applies keyboard CSS variables to planning modal when keyboard is open", async () => {
|
|
mockUseMobileKeyboard.mockReturnValue({
|
|
keyboardOpen: true,
|
|
keyboardOverlap: 250,
|
|
viewportHeight: 400,
|
|
viewportOffsetTop: 50,
|
|
});
|
|
|
|
const { container } = renderModal();
|
|
await waitFor(() => expect(mockStartSubtaskBreakdown).toHaveBeenCalled());
|
|
const modal = container.querySelector(".planning-modal");
|
|
|
|
expect(mockUseMobileKeyboard).toHaveBeenCalledWith({ enabled: true });
|
|
expect(modal?.getAttribute("style")).toContain("--keyboard-overlap: 250px");
|
|
expect(modal?.getAttribute("style")).toContain("--vv-height: 400px");
|
|
});
|
|
|
|
it("shows immediate progress while auto-start waits for a session", async () => {
|
|
let resolveStart: (value: { sessionId: string }) => void = () => {};
|
|
mockStartSubtaskBreakdown.mockReturnValueOnce(new Promise((resolve) => {
|
|
resolveStart = resolve;
|
|
}));
|
|
|
|
renderModal();
|
|
|
|
expect(await screen.findByTestId("subtask-progress-state")).toBeInTheDocument();
|
|
expect(screen.getByText("Starting subtask breakdown...")).toBeInTheDocument();
|
|
expect(screen.getByText("Fusion will keep working while the AI prepares subtasks.")).toBeInTheDocument();
|
|
expect(screen.getByText("Build a complex feature")).toBeInTheDocument();
|
|
expect(screen.queryByText("AI is generating subtasks...")).not.toBeInTheDocument();
|
|
|
|
await act(async () => {
|
|
resolveStart({ sessionId: "session-123" });
|
|
});
|
|
expect(await screen.findByText("AI is generating subtasks...")).toBeInTheDocument();
|
|
});
|
|
|
|
it("shows generating state and empty thinking progress after auto-start", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(mockStartSubtaskBreakdown).toHaveBeenCalledWith("Build a complex feature", undefined));
|
|
expect(await screen.findByText("AI is generating subtasks...")).toBeInTheDocument();
|
|
expect(screen.getByText("Waiting for AI progress updates...")).toBeInTheDocument();
|
|
});
|
|
|
|
it("shows immediate progress in desktop viewport without mobile keyboard scaffolding", async () => {
|
|
mockViewportMode.value = "desktop";
|
|
let resolveStart: (value: { sessionId: string }) => void = () => {};
|
|
mockStartSubtaskBreakdown.mockReturnValueOnce(new Promise((resolve) => {
|
|
resolveStart = resolve;
|
|
}));
|
|
|
|
renderModal();
|
|
|
|
expect(await screen.findByTestId("subtask-progress-state")).toBeInTheDocument();
|
|
expect(screen.getByText("Starting subtask breakdown...")).toBeInTheDocument();
|
|
expect(mockUseMobileKeyboard).toHaveBeenCalledWith({ enabled: false });
|
|
|
|
await act(async () => {
|
|
resolveStart({ sessionId: "session-123" });
|
|
});
|
|
await waitFor(() => expect(screen.getByText("AI is generating subtasks...")).toBeInTheDocument());
|
|
});
|
|
|
|
it("resumes a running subtask session with progress visible", async () => {
|
|
mockFetchAiSession.mockResolvedValueOnce({
|
|
id: "session-running",
|
|
status: "generating",
|
|
thinkingOutput: "",
|
|
conversationHistory: "[]",
|
|
result: null,
|
|
error: null,
|
|
});
|
|
|
|
render(
|
|
<SubtaskBreakdownModal
|
|
isOpen={true}
|
|
onClose={onClose}
|
|
initialDescription=""
|
|
resumeSessionId="session-running"
|
|
onTasksCreated={onTasksCreated}
|
|
/>,
|
|
);
|
|
|
|
await waitFor(() => expect(mockFetchAiSession).toHaveBeenCalledWith("session-running"));
|
|
expect(mockStartSubtaskBreakdown).not.toHaveBeenCalled();
|
|
expect(await screen.findByText("AI is generating subtasks...")).toBeInTheDocument();
|
|
expect(screen.getByText("Waiting for AI progress updates...")).toBeInTheDocument();
|
|
expect(mockConnectSubtaskStream).toHaveBeenCalledWith("session-running", undefined, expect.any(Object));
|
|
});
|
|
|
|
it("resumes an awaiting-input subtask session as running progress", async () => {
|
|
mockFetchAiSession.mockResolvedValueOnce({
|
|
id: "session-awaiting",
|
|
status: "awaiting_input",
|
|
thinkingOutput: "Review the proposed subtasks.",
|
|
conversationHistory: "[]",
|
|
result: null,
|
|
error: null,
|
|
});
|
|
|
|
render(
|
|
<SubtaskBreakdownModal
|
|
isOpen={true}
|
|
onClose={onClose}
|
|
initialDescription=""
|
|
resumeSessionId="session-awaiting"
|
|
onTasksCreated={onTasksCreated}
|
|
/>,
|
|
);
|
|
|
|
expect(await screen.findByText("Review the proposed subtasks.")).toBeInTheDocument();
|
|
expect(screen.getByText("AI is generating subtasks...")).toBeInTheDocument();
|
|
expect(mockConnectSubtaskStream).toHaveBeenCalledWith("session-awaiting", undefined, expect.any(Object));
|
|
});
|
|
|
|
it("resumes a completed subtask session into editable subtasks", async () => {
|
|
mockFetchAiSession.mockResolvedValueOnce({
|
|
id: "session-complete",
|
|
status: "complete",
|
|
thinkingOutput: "Done",
|
|
conversationHistory: "[]",
|
|
result: JSON.stringify(SAMPLE_SUBTASKS),
|
|
error: null,
|
|
});
|
|
|
|
render(
|
|
<SubtaskBreakdownModal
|
|
isOpen={true}
|
|
onClose={onClose}
|
|
initialDescription=""
|
|
resumeSessionId="session-complete"
|
|
onTasksCreated={onTasksCreated}
|
|
/>,
|
|
);
|
|
|
|
await waitFor(() => expect(mockFetchAiSession).toHaveBeenCalledWith("session-complete"));
|
|
expect(await screen.findByDisplayValue("First")).toBeInTheDocument();
|
|
expect(screen.getByDisplayValue("Do second")).toBeInTheDocument();
|
|
expect(mockStartSubtaskBreakdown).not.toHaveBeenCalled();
|
|
});
|
|
|
|
/*
|
|
FNXC:PlanningMultiTab 2026-07-14-00:00:
|
|
Subtask breakdowns are multi-tab: this tab must never acquire a lock, never render a lock
|
|
overlay or "active in another tab" banner, and must stay interactive even when another tab
|
|
is using the same session.
|
|
*/
|
|
it("never acquires a tab lock and renders no lock overlay", async () => {
|
|
// A rejecting lock API would surface an overlay if any legacy lock path survived.
|
|
mockAcquireSessionLock.mockResolvedValue({ acquired: false, currentHolder: "tab-other" });
|
|
|
|
renderModal();
|
|
|
|
await waitFor(() => {
|
|
expect(mockStartSubtaskBreakdown).toHaveBeenCalled();
|
|
});
|
|
|
|
expect(screen.queryByTestId("session-lock-overlay")).not.toBeInTheDocument();
|
|
expect(screen.queryByTestId("session-active-another-tab-banner")).not.toBeInTheDocument();
|
|
expect(screen.queryByText("Take Control")).not.toBeInTheDocument();
|
|
expect(mockAcquireSessionLock).not.toHaveBeenCalled();
|
|
expect(mockForceAcquireSessionLock).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("hides send to background button in initial state", () => {
|
|
render(
|
|
<SubtaskBreakdownModal
|
|
isOpen={true}
|
|
onClose={onClose}
|
|
initialDescription=""
|
|
onTasksCreated={onTasksCreated}
|
|
/>,
|
|
);
|
|
|
|
expect(screen.queryByLabelText("Send to background")).not.toBeInTheDocument();
|
|
});
|
|
|
|
it("renders editable subtasks when stream returns items", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
expect(await screen.findByDisplayValue("First")).toBeInTheDocument();
|
|
expect(screen.getByDisplayValue("Do second")).toBeInTheDocument();
|
|
});
|
|
|
|
it("shows reconnecting indicator without clearing subtask state", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
expect(await screen.findByDisplayValue("First")).toBeInTheDocument();
|
|
|
|
act(() => {
|
|
streamHandlers.onConnectionStateChange?.("reconnecting");
|
|
});
|
|
await waitFor(() => {
|
|
expect(screen.getByText("Reconnecting…")).toBeInTheDocument();
|
|
});
|
|
expect(screen.getByDisplayValue("First")).toBeInTheDocument();
|
|
|
|
act(() => {
|
|
streamHandlers.onConnectionStateChange?.("connected");
|
|
});
|
|
await waitFor(() => {
|
|
expect(screen.queryByText("Reconnecting…")).not.toBeInTheDocument();
|
|
});
|
|
expect(screen.getByDisplayValue("First")).toBeInTheDocument();
|
|
});
|
|
|
|
it("preserves thinking output while reconnecting in generating state", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
expect(await screen.findByText("Waiting for AI progress updates...")).toBeInTheDocument();
|
|
|
|
act(() => {
|
|
streamHandlers.onThinking?.("Generating subtasks...");
|
|
});
|
|
expect(await screen.findByText("Generating subtasks...")).toBeInTheDocument();
|
|
expect(screen.queryByText("Waiting for AI progress updates...")).not.toBeInTheDocument();
|
|
|
|
act(() => {
|
|
streamHandlers.onConnectionStateChange?.("reconnecting");
|
|
});
|
|
await waitFor(() => {
|
|
expect(screen.getAllByText("Reconnecting…").length).toBeGreaterThan(0);
|
|
});
|
|
expect(screen.getByText("Generating subtasks...")).toBeInTheDocument();
|
|
});
|
|
|
|
it("adds and removes subtasks", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks([SAMPLE_SUBTASKS[0]]);
|
|
|
|
fireEvent.click(await screen.findByText("Add subtask"));
|
|
expect(screen.getAllByText(/subtask-/i).length).toBeGreaterThan(1);
|
|
|
|
// Use getAllByText and click the first Remove button
|
|
const removeButtons = screen.getAllByText(/Remove/);
|
|
fireEvent.click(removeButtons[0]);
|
|
await waitFor(() => expect(screen.queryByDisplayValue("First")).not.toBeInTheDocument());
|
|
});
|
|
|
|
it("renders description textarea with 8 rows", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
const textareas = await screen.findAllByRole("textbox");
|
|
const descriptionTextarea = textareas.find((t) => t.tagName === "TEXTAREA");
|
|
expect(descriptionTextarea).toHaveAttribute("rows", "8");
|
|
});
|
|
|
|
it("changes size and dependency selection", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
|
|
const selects = await screen.findAllByRole("combobox");
|
|
fireEvent.change(selects[0], { target: { value: "L" } });
|
|
// Use findAllByText to get all occurrences of subtask-1 and check the first one
|
|
const subtaskLabels = await screen.findAllByText("subtask-1");
|
|
expect(subtaskLabels.length).toBeGreaterThan(0);
|
|
});
|
|
|
|
it("changes size via dropdown selection", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
const selects = await screen.findAllByRole("combobox");
|
|
expect(selects.length).toBeGreaterThan(0);
|
|
fireEvent.change(selects[0], { target: { value: "L" } });
|
|
// Verify state was updated (the API call will receive the updated value)
|
|
fireEvent.click(screen.getByText("Create Tasks"));
|
|
await waitFor(() => expect(mockCreateTasksFromBreakdown).toHaveBeenCalled());
|
|
});
|
|
|
|
it("saves via API with edited data", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
|
|
const titleInputs = await screen.findAllByRole("textbox");
|
|
fireEvent.change(titleInputs[0], { target: { value: "Updated first" } });
|
|
fireEvent.click(screen.getByText("Create Tasks"));
|
|
|
|
await waitFor(() => expect(mockCreateTasksFromBreakdown).toHaveBeenCalled());
|
|
expect(onTasksCreated).toHaveBeenCalled();
|
|
expect(onClose).toHaveBeenCalled();
|
|
});
|
|
|
|
it("submits shared branch selection and merge target settings", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
act(() => {
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
});
|
|
|
|
await screen.findByText("Branch strategy");
|
|
|
|
const branchStrategySelect = screen.getByText("Branch strategy").closest("div")?.querySelector("select") as HTMLSelectElement;
|
|
fireEvent.change(branchStrategySelect, { target: { value: "custom-new" } });
|
|
|
|
const branchNameInput = await waitFor(() => {
|
|
const input = screen.getByText("Branch name").closest("div")?.querySelector("input") as HTMLInputElement | null;
|
|
expect(input).toBeTruthy();
|
|
return input as HTMLInputElement;
|
|
});
|
|
|
|
const mergeTargetInput = screen.getByText("Merge target / base branch (optional)").closest("div")?.querySelector("input") as HTMLInputElement;
|
|
const branchModeSelect = screen.getByText("Planning branch mode").closest("div")?.querySelector("select") as HTMLSelectElement;
|
|
|
|
fireEvent.change(branchNameInput, { target: { value: "feature/planning-shared" } });
|
|
fireEvent.change(mergeTargetInput, { target: { value: "develop" } });
|
|
fireEvent.change(branchModeSelect, { target: { value: "shared" } });
|
|
expect(await screen.findByText("Grouped on shared branch")).toBeInTheDocument();
|
|
|
|
fireEvent.click(screen.getByText("Create Tasks"));
|
|
|
|
await waitFor(() => {
|
|
expect(mockCreateTasksFromBreakdown).toHaveBeenCalledWith(
|
|
"session-123",
|
|
expect.any(Array),
|
|
undefined,
|
|
undefined,
|
|
{
|
|
branchSelection: {
|
|
mode: "custom-new",
|
|
branchName: "feature/planning-shared",
|
|
baseBranch: "develop",
|
|
},
|
|
branchAssignment: { mode: "shared" },
|
|
},
|
|
);
|
|
});
|
|
});
|
|
|
|
it("submits per-task-derived assignment mode", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
act(() => {
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
});
|
|
|
|
await screen.findByText("Branch strategy");
|
|
|
|
const branchStrategySelect = screen.getByText("Branch strategy").closest("div")?.querySelector("select") as HTMLSelectElement;
|
|
fireEvent.change(branchStrategySelect, { target: { value: "custom-new" } });
|
|
|
|
const branchNameInput = screen.getByText("Branch name").closest("div")?.querySelector("input") as HTMLInputElement;
|
|
fireEvent.change(branchNameInput, { target: { value: "feature/planning-derived" } });
|
|
|
|
const branchModeSelect = screen.getByText("Planning branch mode").closest("div")?.querySelector("select") as HTMLSelectElement;
|
|
fireEvent.change(branchModeSelect, { target: { value: "per-task-derived" } });
|
|
|
|
fireEvent.click(screen.getByText("Create Tasks"));
|
|
|
|
await waitFor(() => {
|
|
expect(mockCreateTasksFromBreakdown).toHaveBeenCalledWith(
|
|
"session-123",
|
|
expect.any(Array),
|
|
undefined,
|
|
undefined,
|
|
expect.objectContaining({
|
|
branchSelection: expect.objectContaining({
|
|
mode: "custom-new",
|
|
branchName: "feature/planning-derived",
|
|
}),
|
|
branchAssignment: { mode: "per-task-derived" },
|
|
}),
|
|
);
|
|
});
|
|
});
|
|
|
|
it("sends active breakdown session to background without canceling", async () => {
|
|
const closeSpy = vi.fn();
|
|
mockConnectSubtaskStream.mockImplementationOnce((_sessionId, _projectId, handlers) => {
|
|
streamHandlers = handlers;
|
|
return { close: closeSpy, isConnected: () => true };
|
|
});
|
|
|
|
renderModal();
|
|
await waitFor(() => expect(mockStartSubtaskBreakdown).toHaveBeenCalled());
|
|
await screen.findByText("AI is generating subtasks...");
|
|
|
|
fireEvent.click(screen.getByLabelText("Send to background"));
|
|
|
|
expect(closeSpy).toHaveBeenCalledTimes(1);
|
|
expect(mockCancelSubtaskBreakdown).not.toHaveBeenCalled();
|
|
expect(onClose).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("cancel closes modal", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(mockStartSubtaskBreakdown).toHaveBeenCalled());
|
|
fireEvent.click(await screen.findByLabelText("Close"));
|
|
await waitFor(() => expect(onClose).toHaveBeenCalled());
|
|
});
|
|
|
|
it("close button leaves a generating session resumable instead of canceling", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(mockStartSubtaskBreakdown).toHaveBeenCalled());
|
|
|
|
fireEvent.click(await screen.findByLabelText("Close"));
|
|
|
|
await waitFor(() => expect(onClose).toHaveBeenCalled());
|
|
expect(mockCancelSubtaskBreakdown).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("escape keeps an editing session available for resume", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(mockStartSubtaskBreakdown).toHaveBeenCalled());
|
|
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
act(() => {
|
|
streamHandlers.onSubtasks(SAMPLE_SUBTASKS);
|
|
});
|
|
await screen.findByDisplayValue("First");
|
|
|
|
fireEvent.keyDown(document, { key: "Escape" });
|
|
|
|
await waitFor(() => expect(mockConfirm).toHaveBeenCalledWith(expect.objectContaining({
|
|
title: "Keep subtask session available?",
|
|
})));
|
|
expect(mockCancelSubtaskBreakdown).not.toHaveBeenCalled();
|
|
expect(onClose).toHaveBeenCalled();
|
|
});
|
|
|
|
it("escape closes modal", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(mockStartSubtaskBreakdown).toHaveBeenCalled());
|
|
fireEvent.keyDown(document, { key: "Escape" });
|
|
await waitFor(() => expect(onClose).toHaveBeenCalled());
|
|
});
|
|
|
|
describe("drag-and-drop reordering", () => {
|
|
it("drag start sets correct state and dataTransfer", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(THREE_SUBTASKS);
|
|
|
|
const firstSubtask = await screen.findByTestId("subtask-item-0");
|
|
const dataTransfer = { setData: vi.fn(), effectAllowed: "" };
|
|
|
|
fireEvent.dragStart(firstSubtask, { dataTransfer });
|
|
|
|
expect(dataTransfer.setData).toHaveBeenCalledWith("text/plain", "subtask-A");
|
|
expect(dataTransfer.effectAllowed).toBe("move");
|
|
});
|
|
|
|
it("drag over sets position based on mouse location", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(THREE_SUBTASKS);
|
|
|
|
const firstSubtask = await screen.findByTestId("subtask-item-0");
|
|
const secondSubtask = await screen.findByTestId("subtask-item-1");
|
|
|
|
// Start dragging first subtask with dataTransfer mock
|
|
const dataTransferStart = { setData: vi.fn(), effectAllowed: "" };
|
|
fireEvent.dragStart(firstSubtask, { dataTransfer: dataTransferStart });
|
|
|
|
// Drag over second subtask (below midpoint = after)
|
|
const rect = { top: 100, height: 100, left: 0, right: 200 };
|
|
vi.spyOn(secondSubtask, "getBoundingClientRect").mockReturnValue(rect as DOMRect);
|
|
|
|
fireEvent.dragOver(secondSubtask, { clientY: 160 }); // Below midpoint (150)
|
|
|
|
// The subtask should show as drop target
|
|
expect(secondSubtask.classList.contains("subtask-item-drop-target")).toBe(true);
|
|
});
|
|
|
|
it("drop reorders subtasks correctly - move first to after last", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks([...THREE_SUBTASKS]);
|
|
|
|
const items = await screen.findAllByTestId(/subtask-item-/);
|
|
expect(items).toHaveLength(3);
|
|
|
|
// Verify initial order
|
|
expect(items[0]).toHaveAttribute("data-testid", "subtask-item-0");
|
|
expect(items[1]).toHaveAttribute("data-testid", "subtask-item-1");
|
|
expect(items[2]).toHaveAttribute("data-testid", "subtask-item-2");
|
|
|
|
// Simulate drag and drop: drag first (A), drop on last (C) with position 'after'
|
|
const firstItem = items[0];
|
|
const lastItem = items[2];
|
|
|
|
const dragStartDataTransfer = { setData: vi.fn(), effectAllowed: "" };
|
|
fireEvent.dragStart(firstItem, { dataTransfer: dragStartDataTransfer });
|
|
|
|
const dataTransfer = { getData: vi.fn(() => "subtask-A") };
|
|
fireEvent.dragOver(lastItem, { clientY: 200 });
|
|
fireEvent.drop(lastItem, { dataTransfer });
|
|
fireEvent.dragEnd(firstItem);
|
|
|
|
// After drag end, verify items still exist
|
|
await waitFor(() => {
|
|
const updatedItems = screen.getAllByTestId(/subtask-item-/);
|
|
expect(updatedItems).toHaveLength(3);
|
|
});
|
|
});
|
|
|
|
it("dropping on self does nothing", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks([...THREE_SUBTASKS]);
|
|
|
|
const items = await screen.findAllByTestId(/subtask-item-/);
|
|
const firstItem = items[0];
|
|
|
|
const dragStartDataTransfer = { setData: vi.fn(), effectAllowed: "" };
|
|
fireEvent.dragStart(firstItem, { dataTransfer: dragStartDataTransfer });
|
|
|
|
const dataTransfer = { getData: vi.fn(() => "subtask-A") };
|
|
fireEvent.drop(firstItem, { dataTransfer });
|
|
fireEvent.dragEnd(firstItem);
|
|
|
|
// Should still have 3 items
|
|
const remainingItems = screen.getAllByTestId(/subtask-item-/);
|
|
expect(remainingItems).toHaveLength(3);
|
|
});
|
|
|
|
it("drag end clears drag state", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks([...THREE_SUBTASKS]);
|
|
|
|
const firstItem = await screen.findByTestId("subtask-item-0");
|
|
|
|
const dragStartDataTransfer = { setData: vi.fn(), effectAllowed: "" };
|
|
fireEvent.dragStart(firstItem, { dataTransfer: dragStartDataTransfer });
|
|
expect(firstItem.classList.contains("subtask-item-dragging")).toBe(true);
|
|
|
|
fireEvent.dragEnd(firstItem);
|
|
expect(firstItem.classList.contains("subtask-item-dragging")).toBe(false);
|
|
});
|
|
|
|
it("drag handle is visible on each subtask row", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(THREE_SUBTASKS);
|
|
|
|
// Wait for subtasks to be rendered
|
|
await screen.findAllByTestId(/subtask-item-/);
|
|
|
|
// Should have drag handles (subtask-drag-handle elements)
|
|
const dragHandles = document.querySelectorAll(".subtask-drag-handle");
|
|
expect(dragHandles.length).toBe(3);
|
|
});
|
|
});
|
|
|
|
describe("keyboard reordering", () => {
|
|
it("move up button moves subtask up one position", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks([...THREE_SUBTASKS]);
|
|
|
|
// Wait for subtasks to be rendered
|
|
await screen.findAllByTestId(/subtask-item-/);
|
|
|
|
const itemsBefore = screen.getAllByTestId(/subtask-item-/);
|
|
expect(itemsBefore[0]).toContainHTML("Task A");
|
|
expect(itemsBefore[1]).toContainHTML("Task B");
|
|
|
|
// Find the move up button for the second subtask (index 1)
|
|
const moveUpButtons = screen.getAllByLabelText("Move subtask up");
|
|
expect(moveUpButtons.length).toBe(3);
|
|
|
|
// Click move up on the second subtask (B moves before A)
|
|
fireEvent.click(moveUpButtons[1]!);
|
|
|
|
// Verify order changed - now we need to check the actual content
|
|
await waitFor(() => {
|
|
const titleInputs = screen.getAllByDisplayValue(/Task/);
|
|
expect(titleInputs[0]).toHaveValue("Task B");
|
|
expect(titleInputs[1]).toHaveValue("Task A");
|
|
});
|
|
});
|
|
|
|
it("move down button moves subtask down one position", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks([...THREE_SUBTASKS]);
|
|
|
|
// Wait for subtasks to be rendered
|
|
await screen.findAllByTestId(/subtask-item-/);
|
|
|
|
// Find the move down button for the first subtask
|
|
const moveDownButtons = screen.getAllByLabelText("Move subtask down");
|
|
expect(moveDownButtons.length).toBe(3);
|
|
|
|
// Click move down on the first subtask (A moves after B)
|
|
fireEvent.click(moveDownButtons[0]!);
|
|
|
|
// Verify order changed
|
|
await waitFor(() => {
|
|
const titleInputs = screen.getAllByDisplayValue(/Task/);
|
|
expect(titleInputs[0]).toHaveValue("Task B");
|
|
expect(titleInputs[1]).toHaveValue("Task A");
|
|
});
|
|
});
|
|
|
|
it("move up button is disabled for first subtask", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(THREE_SUBTASKS);
|
|
|
|
// Wait for subtasks to be rendered
|
|
await screen.findAllByTestId(/subtask-item-/);
|
|
|
|
const moveUpButtons = screen.getAllByLabelText("Move subtask up");
|
|
expect(moveUpButtons[0]!).toBeDisabled();
|
|
expect(moveUpButtons[1]!).not.toBeDisabled();
|
|
});
|
|
|
|
it("move down button is disabled for last subtask", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks(THREE_SUBTASKS);
|
|
|
|
// Wait for subtasks to be rendered
|
|
await screen.findAllByTestId(/subtask-item-/);
|
|
|
|
const moveDownButtons = screen.getAllByLabelText("Move subtask down");
|
|
expect(moveDownButtons[2]!).toBeDisabled();
|
|
expect(moveDownButtons[0]!).not.toBeDisabled();
|
|
});
|
|
});
|
|
|
|
describe("dependency validation with reordering", () => {
|
|
it("only shows earlier subtasks as dependency options", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onSubtasks([...THREE_SUBTASKS]);
|
|
|
|
// First subtask should not have any dependency options
|
|
const firstItem = await screen.findByTestId("subtask-item-0");
|
|
const firstDepsSection = firstItem.querySelector(".planning-deps-list");
|
|
expect(firstDepsSection).toHaveTextContent("First subtask cannot have dependencies");
|
|
|
|
// Second subtask should only show first as dependency option
|
|
const secondItem = await screen.findByTestId("subtask-item-1");
|
|
const secondDepLabels = secondItem.querySelectorAll(".planning-dep-chip");
|
|
expect(secondDepLabels.length).toBe(1);
|
|
expect(secondDepLabels[0]).toHaveTextContent("subtask-A");
|
|
|
|
// Third subtask should show first and second as options
|
|
const thirdItem = await screen.findByTestId("subtask-item-2");
|
|
const thirdDepLabels = thirdItem.querySelectorAll(".planning-dep-chip");
|
|
expect(thirdDepLabels.length).toBe(2);
|
|
});
|
|
|
|
it("dependencies are cleared when a subtask is moved before its dependency", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
|
|
// Setup: B depends on A
|
|
const subtasksWithDep = [
|
|
{ id: "subtask-A", title: "Task A", description: "Do A", suggestedSize: "S" as const, dependsOn: [] },
|
|
{ id: "subtask-B", title: "Task B", description: "Do B", suggestedSize: "M" as const, dependsOn: ["subtask-A"] },
|
|
];
|
|
streamHandlers.onSubtasks(subtasksWithDep);
|
|
|
|
// Verify dependency checkbox is present for subtask B
|
|
const secondItem = await screen.findByTestId("subtask-item-1");
|
|
const depCheckbox = secondItem.querySelector('input[type="checkbox"]');
|
|
expect(depCheckbox).toBeChecked();
|
|
|
|
// Move B before A using keyboard
|
|
const moveUpButtons = screen.getAllByLabelText("Move subtask up");
|
|
fireEvent.click(moveUpButtons[1]!);
|
|
|
|
// After reordering, the dependency on A should not be visible in the new first position
|
|
await waitFor(() => {
|
|
const items = screen.getAllByTestId(/subtask-item-/);
|
|
// The new first item (previously B) should not show dependency options
|
|
const firstDepsList = items[0].querySelector(".planning-deps-list");
|
|
expect(firstDepsList).toHaveTextContent("First subtask cannot have dependencies");
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("error handling", () => {
|
|
it("displays error message when stream returns error event", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onError("Something went wrong");
|
|
expect(await screen.findByText("Something went wrong")).toBeInTheDocument();
|
|
});
|
|
|
|
it("retries after an error and reconnects stream", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
streamHandlers.onError("Something went wrong");
|
|
|
|
const retryButton = await screen.findByRole("button", { name: "Retry" });
|
|
fireEvent.click(retryButton);
|
|
|
|
await waitFor(() => {
|
|
expect(mockRetrySubtaskSession).toHaveBeenCalledWith("session-123", undefined);
|
|
});
|
|
expect(mockConnectSubtaskStream).toHaveBeenCalledTimes(2);
|
|
});
|
|
|
|
it("recovers retry from connection-loss when session is still generating", async () => {
|
|
let streamAttempt = 0;
|
|
mockConnectSubtaskStream.mockImplementation((_sessionId, _projectId, handlers) => {
|
|
streamHandlers = handlers;
|
|
streamAttempt += 1;
|
|
if (streamAttempt === 1) {
|
|
setTimeout(() => handlers.onError?.("Connection lost"), 10);
|
|
}
|
|
return { close: vi.fn(), isConnected: vi.fn().mockReturnValue(true) };
|
|
});
|
|
|
|
mockRetrySubtaskSession.mockRejectedValueOnce(new Error("Subtask session session-123 is not in an error state"));
|
|
mockFetchAiSession.mockResolvedValueOnce({
|
|
id: "session-123",
|
|
type: "subtask",
|
|
status: "generating",
|
|
title: "Build a complex feature",
|
|
inputPayload: JSON.stringify({ description: "Build a complex feature" }),
|
|
conversationHistory: "[]",
|
|
currentQuestion: null,
|
|
result: null,
|
|
thinkingOutput: "Still generating...",
|
|
error: null,
|
|
projectId: null,
|
|
createdAt: "2026-01-01T00:00:00.000Z",
|
|
updatedAt: "2026-01-01T00:00:00.000Z",
|
|
});
|
|
|
|
renderModal();
|
|
|
|
await waitFor(() => {
|
|
expect(screen.getByText("Connection lost")).toBeInTheDocument();
|
|
});
|
|
|
|
const retryButton = await screen.findByRole("button", { name: "Retry" });
|
|
fireEvent.click(retryButton);
|
|
|
|
await waitFor(() => {
|
|
expect(mockRetrySubtaskSession).toHaveBeenCalledWith("session-123", undefined);
|
|
expect(mockFetchAiSession).toHaveBeenCalledWith("session-123");
|
|
});
|
|
expect(await screen.findByText("AI is generating subtasks...")).toBeInTheDocument();
|
|
expect(screen.getByText("Still generating...")).toBeInTheDocument();
|
|
expect(mockConnectSubtaskStream).toHaveBeenCalledTimes(2);
|
|
});
|
|
|
|
it("shows Stream error fallback when receiving empty error", async () => {
|
|
renderModal();
|
|
await waitFor(() => expect(streamHandlers).toBeDefined());
|
|
// In real flow, api.ts converts empty string to "Stream error" before calling onError
|
|
streamHandlers.onError("Stream error");
|
|
expect(await screen.findByText("Stream error")).toBeInTheDocument();
|
|
});
|
|
});
|
|
});
|