forked from farhoodlabs/paperclip
4c4eeaba2b
Adds focused tests for every code path the agentId addition touches:
- environment-runtime.test.ts (4 new tests):
- plugin-driver acquireLease forwards agentId in RPC payload when present
- plugin-driver acquireLease omits agentId from RPC payload when null
- sandbox-provider acquireLease forwards agentId when present
- sandbox-provider resumeLease forwards agentId when reuseLease=true matches
- seedEnvironment helper now exposes the seeded agentId
- environment-run-orchestrator.test.ts (2 new tests):
- acquireForRun threads agentId through to runtime.acquireRunLease
- logActivity records the same agentId on environment.lease_acquired
- new vi.hoisted mocks for environmentService.getById + ensureLocalEnvironment
- agent-test-environment-routes.test.ts (1 new assertion):
- ad-hoc operator test-environment probe calls acquireRunLease with
agentId: null and heartbeatRunId: null (no agent context)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
315 lines
10 KiB
TypeScript
315 lines
10 KiB
TypeScript
import express from "express";
|
|
import request from "supertest";
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import type { ServerAdapterModule } from "../adapters/index.js";
|
|
|
|
const mockAgentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
getChainOfCommand: vi.fn(async () => []),
|
|
}));
|
|
|
|
const mockAccessService = vi.hoisted(() => ({
|
|
canUser: vi.fn(),
|
|
hasPermission: vi.fn(),
|
|
getMembership: vi.fn(async () => null),
|
|
listPrincipalGrants: vi.fn(async () => []),
|
|
}));
|
|
|
|
const mockSecretService = vi.hoisted(() => ({
|
|
normalizeAdapterConfigForPersistence: vi.fn(async (_companyId: string, config: Record<string, unknown>) => config),
|
|
resolveAdapterConfigForRuntime: vi.fn(async (_companyId: string, config: Record<string, unknown>) => ({ config })),
|
|
}));
|
|
|
|
const mockEnvironmentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
releaseLease: vi.fn(),
|
|
}));
|
|
|
|
const mockReleaseRunLease = vi.hoisted(() => vi.fn(async () => undefined));
|
|
const mockEnvironmentRuntime = vi.hoisted(() => ({
|
|
acquireRunLease: vi.fn(),
|
|
realizeWorkspace: vi.fn(),
|
|
getDriver: vi.fn(() => ({
|
|
releaseRunLease: mockReleaseRunLease,
|
|
})),
|
|
}));
|
|
|
|
const mockResolveEnvironmentExecutionTarget = vi.hoisted(() => vi.fn());
|
|
const mockInstanceSettingsService = vi.hoisted(() => ({
|
|
getGeneral: vi.fn(async () => ({ censorUsernameInLogs: false })),
|
|
}));
|
|
|
|
vi.mock("../services/index.js", () => ({
|
|
agentService: () => mockAgentService,
|
|
agentInstructionsService: () => ({}),
|
|
accessService: () => mockAccessService,
|
|
approvalService: () => ({}),
|
|
companySkillService: () => ({
|
|
listRuntimeSkillEntries: vi.fn(async () => []),
|
|
resolveRequestedSkillKeys: vi.fn(async () => []),
|
|
}),
|
|
budgetService: () => ({}),
|
|
heartbeatService: () => ({
|
|
wakeup: vi.fn(),
|
|
cancelActiveForAgent: vi.fn(),
|
|
}),
|
|
ISSUE_LIST_DEFAULT_LIMIT: 50,
|
|
issueApprovalService: () => ({}),
|
|
issueService: () => ({}),
|
|
logActivity: vi.fn(),
|
|
syncInstructionsBundleConfigFromFilePath: vi.fn((_agent, config) => config),
|
|
workspaceOperationService: () => ({}),
|
|
}));
|
|
|
|
vi.mock("../services/environments.js", () => ({
|
|
environmentService: () => mockEnvironmentService,
|
|
}));
|
|
|
|
vi.mock("../services/secrets.js", () => ({
|
|
secretService: () => mockSecretService,
|
|
}));
|
|
|
|
vi.mock("../services/environment-runtime.js", () => ({
|
|
environmentRuntimeService: () => mockEnvironmentRuntime,
|
|
}));
|
|
|
|
vi.mock("../services/environment-execution-target.js", () => ({
|
|
resolveEnvironmentExecutionTarget: mockResolveEnvironmentExecutionTarget,
|
|
}));
|
|
|
|
vi.mock("../services/instance-settings.js", () => ({
|
|
instanceSettingsService: () => mockInstanceSettingsService,
|
|
}));
|
|
|
|
const testEnvironmentSpy = vi.fn();
|
|
|
|
const externalAdapter: ServerAdapterModule = {
|
|
type: "external_test",
|
|
execute: async () => ({ exitCode: 0, signal: null, timedOut: false }),
|
|
testEnvironment: testEnvironmentSpy,
|
|
};
|
|
|
|
async function createApp() {
|
|
const [{ agentRoutes }, { errorHandler }] = await Promise.all([
|
|
vi.importActual<typeof import("../routes/agents.js")>("../routes/agents.js"),
|
|
vi.importActual<typeof import("../middleware/index.js")>("../middleware/index.js"),
|
|
]);
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = {
|
|
type: "board",
|
|
userId: "local-board",
|
|
companyIds: ["company-1"],
|
|
source: "local_implicit",
|
|
isInstanceAdmin: false,
|
|
};
|
|
next();
|
|
});
|
|
app.use("/api", agentRoutes({} as any));
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
async function unregisterTestAdapter(type: string) {
|
|
const { unregisterServerAdapter } = await import("../adapters/index.js");
|
|
unregisterServerAdapter(type);
|
|
}
|
|
|
|
describe("agent test-environment route", () => {
|
|
beforeEach(async () => {
|
|
vi.resetModules();
|
|
vi.clearAllMocks();
|
|
mockEnvironmentService.getById.mockResolvedValue({
|
|
id: "11111111-1111-4111-8111-111111111111",
|
|
companyId: "company-1",
|
|
name: "Sandbox QA",
|
|
driver: "sandbox",
|
|
config: { provider: "fake-plugin" },
|
|
});
|
|
mockEnvironmentRuntime.acquireRunLease.mockResolvedValue({
|
|
lease: {
|
|
id: "lease-1",
|
|
metadata: { remoteCwd: "/home/user/paperclip-workspace" },
|
|
},
|
|
leaseContext: {
|
|
executionWorkspaceId: null,
|
|
executionWorkspaceMode: null,
|
|
},
|
|
});
|
|
mockEnvironmentRuntime.realizeWorkspace.mockResolvedValue({
|
|
cwd: "/home/user/paperclip-workspace",
|
|
});
|
|
mockResolveEnvironmentExecutionTarget.mockResolvedValue(null);
|
|
testEnvironmentSpy.mockResolvedValue({
|
|
adapterType: "external_test",
|
|
status: "pass",
|
|
checks: [
|
|
{
|
|
code: "host_probe_ran",
|
|
level: "info",
|
|
message: "host probe should not run",
|
|
},
|
|
],
|
|
testedAt: new Date(0).toISOString(),
|
|
});
|
|
await unregisterTestAdapter("external_test");
|
|
const { registerServerAdapter } = await import("../adapters/index.js");
|
|
registerServerAdapter(externalAdapter);
|
|
});
|
|
|
|
afterEach(async () => {
|
|
await unregisterTestAdapter("external_test");
|
|
});
|
|
|
|
it("does not fall back to a host probe when a requested environment cannot produce an execution target", async () => {
|
|
const app = await createApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/adapters/external_test/test-environment")
|
|
.send({
|
|
adapterConfig: {},
|
|
environmentId: "11111111-1111-4111-8111-111111111111",
|
|
});
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(testEnvironmentSpy).not.toHaveBeenCalled();
|
|
expect(res.body).toMatchObject({
|
|
adapterType: "external_test",
|
|
status: "warn",
|
|
checks: [
|
|
{
|
|
code: "environment_target_unsupported",
|
|
level: "warn",
|
|
message: 'Adapter "external_test" is not allowed in "Sandbox QA" environments.',
|
|
},
|
|
],
|
|
});
|
|
expect(mockReleaseRunLease).toHaveBeenCalledWith({
|
|
environment: expect.objectContaining({
|
|
id: "11111111-1111-4111-8111-111111111111",
|
|
name: "Sandbox QA",
|
|
driver: "sandbox",
|
|
}),
|
|
lease: expect.objectContaining({
|
|
id: "lease-1",
|
|
}),
|
|
status: "failed",
|
|
});
|
|
// Ad-hoc operator probes have no agent context — the route must pass
|
|
// agentId: null so plugin-backed providers don't accidentally scope the
|
|
// probe lease against some leftover agentId from the heartbeat path.
|
|
expect(mockEnvironmentRuntime.acquireRunLease).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
agentId: null,
|
|
heartbeatRunId: null,
|
|
}),
|
|
);
|
|
});
|
|
|
|
it("returns a diagnostic result instead of probing the host when the requested environment is missing", async () => {
|
|
mockEnvironmentService.getById.mockResolvedValueOnce(null);
|
|
const app = await createApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/adapters/external_test/test-environment")
|
|
.send({
|
|
adapterConfig: {},
|
|
environmentId: "22222222-2222-4222-8222-222222222222",
|
|
});
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(testEnvironmentSpy).not.toHaveBeenCalled();
|
|
expect(mockEnvironmentRuntime.acquireRunLease).not.toHaveBeenCalled();
|
|
expect(res.body).toMatchObject({
|
|
adapterType: "external_test",
|
|
status: "warn",
|
|
checks: [
|
|
{
|
|
code: "environment_not_found",
|
|
level: "warn",
|
|
message: "Selected environment was not found. The test did not run.",
|
|
},
|
|
],
|
|
});
|
|
});
|
|
|
|
it("runs the adapter probe against the resolved sandbox target on the happy path and releases the lease on success", async () => {
|
|
mockResolveEnvironmentExecutionTarget.mockResolvedValueOnce({
|
|
kind: "remote",
|
|
transport: "sandbox",
|
|
remoteCwd: "/home/user/paperclip-workspace",
|
|
providerKey: "fake-plugin",
|
|
runner: { execute: vi.fn() },
|
|
});
|
|
testEnvironmentSpy.mockResolvedValueOnce({
|
|
adapterType: "external_test",
|
|
status: "pass",
|
|
checks: [
|
|
{
|
|
code: "external_test_hello_probe_passed",
|
|
level: "info",
|
|
message: "OK",
|
|
},
|
|
],
|
|
testedAt: new Date(0).toISOString(),
|
|
});
|
|
const app = await createApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/adapters/external_test/test-environment")
|
|
.send({
|
|
adapterConfig: {},
|
|
environmentId: "11111111-1111-4111-8111-111111111111",
|
|
});
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(testEnvironmentSpy).toHaveBeenCalledTimes(1);
|
|
expect(testEnvironmentSpy.mock.calls[0]?.[0]).toMatchObject({
|
|
executionTarget: expect.objectContaining({
|
|
kind: "remote",
|
|
transport: "sandbox",
|
|
}),
|
|
environmentName: "Sandbox QA",
|
|
});
|
|
expect(res.body).toMatchObject({ adapterType: "external_test", status: "pass" });
|
|
expect(mockReleaseRunLease).toHaveBeenCalledWith({
|
|
environment: expect.objectContaining({ id: "11111111-1111-4111-8111-111111111111" }),
|
|
lease: expect.objectContaining({ id: "lease-1" }),
|
|
status: "released",
|
|
});
|
|
});
|
|
|
|
it("releases the lease as failed and returns a diagnostic when realizeWorkspace throws", async () => {
|
|
mockEnvironmentRuntime.realizeWorkspace.mockRejectedValueOnce(
|
|
new Error("workspace realization failed"),
|
|
);
|
|
const app = await createApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/adapters/external_test/test-environment")
|
|
.send({
|
|
adapterConfig: {},
|
|
environmentId: "11111111-1111-4111-8111-111111111111",
|
|
});
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(testEnvironmentSpy).not.toHaveBeenCalled();
|
|
expect(res.body).toMatchObject({
|
|
adapterType: "external_test",
|
|
status: "fail",
|
|
checks: [
|
|
expect.objectContaining({
|
|
code: "environment_workspace_realize_failed",
|
|
level: "error",
|
|
}),
|
|
],
|
|
});
|
|
expect(mockReleaseRunLease).toHaveBeenCalledWith({
|
|
environment: expect.objectContaining({ id: "11111111-1111-4111-8111-111111111111" }),
|
|
lease: expect.objectContaining({ id: "lease-1" }),
|
|
status: "failed",
|
|
});
|
|
});
|
|
});
|