The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
fix(server): load the mocked module graph once in the closed-workspace issue route suite (#12470)
Nicky Leachad474abece70
diff --git a/server/src/__tests__/issue-closed-workspace-routes.test.ts b/server/src/__tests__/issue-closed-workspace-routes.test.tsindex 993176948c..faba62ae3f 100644--- a/server/src/__tests__/issue-closed-workspace-routes.test.ts+++ b/server/src/__tests__/issue-closed-workspace-routes.test.ts@@ -1,12 +1,18 @@import express from "express";import request from "supertest";import { beforeEach, describe, expect, it, vi } from "vitest";+import { hoistModuleGraph } from "./helpers/hoist-module-graph.js";const issueId = "11111111-1111-4111-8111-111111111111";const closedWorkspaceId = "33333333-3333-4333-8333-333333333333";const nextWorkspaceId = "44444444-4444-4444-8444-444444444444";const agentId = "22222222-2222-4222-8222-222222222222";+// vi.waitFor's own default budget is 1000ms. A run under CPU contention+// measured a 1471ms wait for a background retry, so every waitFor call in+// this file uses this larger, named budget instead of the default.+const REOPEN_PENDING_WAIT_TIMEOUT_MS = 5_000;+const mockIssueService = vi.hoisted(() => ({getById: vi.fn(),update: vi.fn(),@@ -18,6 +24,7 @@ const mockExecutionWorkspaceService = vi.hoisted(() => ({getById: vi.fn(),reopenClosedIsolatedExecutionWorkspaceForIssue: vi.fn(),clearReopenPendingConsumptionForUnconsumedReopen: vi.fn(async () => ({ cleared: true })),+ refreshReopenPendingConsumption: vi.fn(async () => ({ refreshed: true })),}));const mockAccessService = vi.hoisted(() => ({@@ -142,28 +149,6 @@ function registerServiceMocks() {}));}-async function createApp(actor?: Record<string, unknown>) {- const [{ issueRoutes }, { errorHandler }] = await Promise.all([- import("../routes/issues.js"),- import("../middleware/index.js"),- ]);- const app = express();- app.use(express.json());- app.use((req, _res, next) => {- (req as any).actor = actor ?? {- type: "board",- userId: "local-board",- companyIds: ["company-1"],- source: "local_implicit",- isInstanceAdmin: false,- };- next();- });- app.use("/api", issueRoutes({} as any, {} as any));- app.use(errorHandler);- return app;-}-function makeIssue() {return {id: issueId,@@ -192,25 +177,56 @@ function makeClosedWorkspace() {};}+// A fake-timer advance flushes the microtask queue and every pending timer up+// to the given simulated duration in one deterministic step. A real-clock wait+// (a single setImmediate, or a fixed setTimeout) races the response's+// "finish" listener under CPU load and can resolve before a background retry+// chain schedules its next attempt. Advancing simulated time removes that+// race: it proves nothing fires within the window, independent of how fast+// the machine actually runs.+async function assertNoBackgroundClearWithinRetryWindow() {+ vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });+ try {+ await vi.advanceTimersByTimeAsync(REOPEN_PENDING_WAIT_TIMEOUT_MS);+ } finally {+ vi.useRealTimers();+ }+ expect(mockExecutionWorkspaceService.clearReopenPendingConsumptionForUnconsumedReopen).not.toHaveBeenCalled();+}+describe.sequential("closed isolated workspace issue routes", () => {+ const routeModules = hoistModuleGraph(registerServiceMocks, async () => {+ const [{ issueRoutes }, { errorHandler }] = await Promise.all([+ vi.importActual<typeof import("../routes/issues.js")>("../routes/issues.js"),+ vi.importActual<typeof import("../middleware/index.js")>("../middleware/index.js"),+ ]);+ return { issueRoutes, errorHandler };+ });++ function createApp(actor?: Record<string, unknown>) {+ const { issueRoutes, errorHandler } = routeModules.value;+ const app = express();+ app.use(express.json());+ app.use((req, _res, next) => {+ (req as any).actor = actor ?? {+ type: "board",+ userId: "local-board",+ companyIds: ["company-1"],+ source: "local_implicit",+ isInstanceAdmin: false,+ };+ next();+ });+ app.use("/api", issueRoutes({} as any, {} as any));+ app.use(errorHandler);+ return app;+ }+beforeEach(() => {- vi.resetModules();- vi.doUnmock("@paperclipai/shared/telemetry");- vi.doUnmock("../telemetry.js");- vi.doUnmock("../services/access.js");- vi.doUnmock("../services/activity-log.js");- vi.doUnmock("../services/execution-workspaces.js");- vi.doUnmock("../services/heartbeat.js");- vi.doUnmock("../services/index.js");- vi.doUnmock("../services/issues.js");- vi.doUnmock("../services/projects.js");- vi.doUnmock("../routes/issues.js");- vi.doUnmock("../routes/authz.js");- vi.doUnmock("../middleware/index.js");- registerServiceMocks();vi.clearAllMocks();mockIssueService.getById.mockResolvedValue(makeIssue());mockExecutionWorkspaceService.getById.mockResolvedValue(makeClosedWorkspace());+ mockExecutionWorkspaceService.refreshReopenPendingConsumption.mockResolvedValue({ refreshed: true });// The guard reopens a closed isolated workspace and lets the request// continue. The default is a successful reopen.mockExecutionWorkspaceService.reopenClosedIsolatedExecutionWorkspaceForIssue.mockResolvedValue({@@ -222,7 +238,12 @@ describe.sequential("closed isolated workspace issue routes", () => {});it("reopens the closed isolated workspace and accepts a new comment", async () => {- const res = await request(await createApp())+ mockIssueService.addComment.mockResolvedValue({+ id: "comment-1",+ body: "hello",+ });++ const res = await request(createApp()).post(`/api/issues/${issueId}/comments`).send({ body: "hello" });@@ -231,21 +252,26 @@ describe.sequential("closed isolated workspace issue routes", () => {issue: { id: issueId, companyId: "company-1", projectId: null },actor: expect.objectContaining({ actorType: "user" }),});- // The closed-workspace dead end is gone.- expect(res.status).not.toBe(409);+ // The closed-workspace dead end is gone: the comment is accepted.+ expect(res.status).toBe(201);});it("reopens the closed isolated workspace and accepts a comment update", async () => {- const res = await request(await createApp())+ mockIssueService.update.mockResolvedValue({ ...makeIssue(), status: "todo" });++ const res = await request(createApp()).patch(`/api/issues/${issueId}`).send({ comment: "hello" });expect(mockExecutionWorkspaceService.reopenClosedIsolatedExecutionWorkspaceForIssue).toHaveBeenCalledTimes(1);- expect(res.status).not.toBe(409);+ // The closed-workspace dead end is gone: the update is accepted.+ expect(res.status).toBe(200);});it("reopens the closed isolated workspace and accepts a checkout", async () => {- const res = await request(await createApp())+ mockIssueService.checkout.mockResolvedValue({ ...makeIssue(), status: "in_progress" });++ const res = await request(createApp()).post(`/api/issues/${issueId}/checkout`).send({agentId,@@ -253,7 +279,8 @@ describe.sequential("closed isolated workspace issue routes", () => {});expect(mockExecutionWorkspaceService.reopenClosedIsolatedExecutionWorkspaceForIssue).toHaveBeenCalledTimes(1);- expect(res.status).not.toBe(409);+ // The closed-workspace dead end is gone: the checkout is accepted.+ expect(res.status).toBe(200);});it("returns 409 and blocks the comment when the workspace cannot be reopened", async () => {@@ -263,7 +290,7 @@ describe.sequential("closed isolated workspace issue routes", () => {message: "Execution workspace is not reopenable",});- const res = await request(await createApp())+ const res = await request(createApp()).post(`/api/issues/${issueId}/comments`).send({ body: "hello" });@@ -278,7 +305,7 @@ describe.sequential("closed isolated workspace issue routes", () => {message: "Failed to rebuild the execution workspace",});- const res = await request(await createApp())+ const res = await request(createApp()).post(`/api/issues/${issueId}/checkout`).send({agentId,@@ -301,7 +328,7 @@ describe.sequential("closed isolated workspace issue routes", () => {source: "agent_key",};- const res = await request(await createApp(agentActorWithoutRunId))+ const res = await request(createApp(agentActorWithoutRunId)).post(`/api/issues/${issueId}/checkout`).send({agentId,@@ -322,7 +349,7 @@ describe.sequential("closed isolated workspace issue routes", () => {mockIssueService.getById.mockResolvedValue({ ...makeIssue(), status: "done" });mockIssueService.update.mockResolvedValue(null);- const res = await request(await createApp())+ const res = await request(createApp()).patch(`/api/issues/${issueId}`).send({ comment: "hello" });@@ -337,14 +364,14 @@ describe.sequential("closed isolated workspace issue routes", () => {expectedGeneration: 4,}),);- });+ }, { timeout: REOPEN_PENDING_WAIT_TIMEOUT_MS });});it("clears the reopen-pending flag when the checkout throws after a reopen", async () => {mockIssueService.getById.mockResolvedValue({ ...makeIssue(), status: "done" });mockIssueService.checkout.mockRejectedValue(new Error("checkout failed"));- const res = await request(await createApp())+ const res = await request(createApp()).post(`/api/issues/${issueId}/checkout`).send({agentId,@@ -362,7 +389,7 @@ describe.sequential("closed isolated workspace issue routes", () => {expectedGeneration: 4,}),);- });+ }, { timeout: REOPEN_PENDING_WAIT_TIMEOUT_MS });});it("does not clear the reopen-pending flag when the checkout resumes the issue", async () => {@@ -371,7 +398,7 @@ describe.sequential("closed isolated workspace issue routes", () => {mockIssueService.getById.mockResolvedValue({ ...makeIssue(), status: "done" });mockIssueService.checkout.mockResolvedValue({ ...makeIssue(), status: "in_progress" });- const res = await request(await createApp())+ const res = await request(createApp()).post(`/api/issues/${issueId}/checkout`).send({agentId,@@ -379,10 +406,7 @@ describe.sequential("closed isolated workspace issue routes", () => {});expect(res.status).toBe(200);- await new Promise((resolve) => setImmediate(resolve));- expect(- mockExecutionWorkspaceService.clearReopenPendingConsumptionForUnconsumedReopen,- ).not.toHaveBeenCalled();+ await assertNoBackgroundClearWithinRetryWindow();});it("does not clear the reopen-pending flag when a concurrent request already reopened the workspace", async () => {@@ -400,7 +424,7 @@ describe.sequential("closed isolated workspace issue routes", () => {});mockIssueService.checkout.mockResolvedValue(null);- const res = await request(await createApp())+ const res = await request(createApp()).post(`/api/issues/${issueId}/checkout`).send({agentId,@@ -408,10 +432,7 @@ describe.sequential("closed isolated workspace issue routes", () => {});expect(res.status).toBe(200);- await new Promise((resolve) => setImmediate(resolve));- expect(- mockExecutionWorkspaceService.clearReopenPendingConsumptionForUnconsumedReopen,- ).not.toHaveBeenCalled();+ await assertNoBackgroundClearWithinRetryWindow();});it("retries the reopen-pending clear when the first attempt fails transiently", async () => {@@ -424,7 +445,7 @@ describe.sequential("closed isolated workspace issue routes", () => {.mockRejectedValueOnce(new Error("transient database error")).mockResolvedValue({ cleared: true });- const res = await request(await createApp())+ const res = await request(createApp()).patch(`/api/issues/${issueId}`).send({ comment: "hello" });@@ -433,7 +454,7 @@ describe.sequential("closed isolated workspace issue routes", () => {expect(mockExecutionWorkspaceService.clearReopenPendingConsumptionForUnconsumedReopen.mock.calls.length,).toBeGreaterThanOrEqual(2);- });+ }, { timeout: REOPEN_PENDING_WAIT_TIMEOUT_MS });});it("still allows non-comment board updates so the issue can be moved to a new workspace", async () => {@@ -442,7 +463,7 @@ describe.sequential("closed isolated workspace issue routes", () => {executionWorkspaceId: nextWorkspaceId,});- const res = await request(await createApp())+ const res = await request(createApp()).patch(`/api/issues/${issueId}`).send({ executionWorkspaceId: nextWorkspaceId });