9a8d219949
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - A fast-moving control plane needs stable local tests and repeatable local maintenance tools so contributors can safely split and review work > - Several route suites needed stronger isolation, Codex manual model selection needed a faster-mode option, and local browser cleanup missed Playwright's headless shell binary > - Storybook static output also needed to be preserved as a generated review artifact from the working branch > - This pull request groups the test/local-dev maintenance pieces so they can be reviewed separately from product runtime changes > - The benefit is more predictable contributor verification and cleaner local maintenance without mixing these changes into feature PRs ## What Changed - Added stable Vitest runner support and serialized route/authz test isolation. - Fixed workspace runtime authz route mocks and stabilized Claude/company-import related assertions. - Allowed Codex fast mode for manually selected models. - Broadened the agent browser cleanup script to detect `chrome-headless-shell` as well as Chrome for Testing. - Preserved generated Storybook static output from the source branch. ## Verification - `pnpm exec vitest run src/__tests__/workspace-runtime-routes-authz.test.ts src/__tests__/claude-local-execute.test.ts --config vitest.config.ts` from `server/` passed: 2 files, 19 tests. - `pnpm exec vitest run src/server/codex-args.test.ts --config vitest.config.ts` from `packages/adapters/codex-local/` passed: 1 file, 3 tests. - `bash -n scripts/kill-agent-browsers.sh && scripts/kill-agent-browsers.sh --dry` passed; dry-run detected `chrome-headless-shell` processes without killing them. - `test -f ui/storybook-static/index.html && test -f ui/storybook-static/assets/forms-editors.stories-Dry7qwx2.js` passed. - `git diff --check public-gh/master..pap-2228-test-local-maintenance -- . ':(exclude)ui/storybook-static'` passed. - `pnpm exec vitest run cli/src/__tests__/company-import-export-e2e.test.ts --config cli/vitest.config.ts` did not complete in the isolated split worktree because `paperclipai run` exited during build prep with `TS2688: Cannot find type definition file for 'react'`; this appears to be caused by the worktree dependency symlink setup, not the code under test. - Confirmed this PR does not include `pnpm-lock.yaml`. ## Risks - Medium risk: the stable Vitest runner changes how route/authz tests are scheduled. - Generated `ui/storybook-static` files are large and contain minified third-party output; `git diff --check` reports whitespace inside those generated assets, so reviewers may choose to drop or regenerate that artifact before merge. - No database migrations. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex coding agent based on GPT-5, with shell, git, Paperclip API, and GitHub CLI tool use in the local Paperclip workspace. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge Note: screenshot checklist item is not applicable to source UI behavior; the included Storybook static output is generated artifact preservation from the source branch. --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
379 lines
12 KiB
TypeScript
379 lines
12 KiB
TypeScript
import express from "express";
|
|
import request from "supertest";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const mockAgentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
update: vi.fn(),
|
|
resolveByReference: vi.fn(),
|
|
}));
|
|
|
|
const mockAgentInstructionsService = vi.hoisted(() => ({
|
|
getBundle: vi.fn(),
|
|
readFile: vi.fn(),
|
|
updateBundle: vi.fn(),
|
|
writeFile: vi.fn(),
|
|
deleteFile: vi.fn(),
|
|
exportFiles: vi.fn(),
|
|
ensureManagedBundle: vi.fn(),
|
|
materializeManagedBundle: vi.fn(),
|
|
}));
|
|
|
|
const mockAccessService = vi.hoisted(() => ({
|
|
canUser: vi.fn(),
|
|
hasPermission: vi.fn(),
|
|
}));
|
|
|
|
const mockSecretService = vi.hoisted(() => ({
|
|
resolveAdapterConfigForRuntime: vi.fn(),
|
|
normalizeAdapterConfigForPersistence: vi.fn(async (_companyId: string, config: Record<string, unknown>) => config),
|
|
}));
|
|
const mockEnvironmentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
}));
|
|
|
|
const mockLogActivity = vi.hoisted(() => vi.fn());
|
|
const mockSyncInstructionsBundleConfigFromFilePath = vi.hoisted(() => vi.fn());
|
|
const mockFindServerAdapter = vi.hoisted(() => vi.fn());
|
|
|
|
vi.mock("../services/index.js", () => ({
|
|
agentService: () => mockAgentService,
|
|
agentInstructionsService: () => mockAgentInstructionsService,
|
|
accessService: () => mockAccessService,
|
|
approvalService: () => ({}),
|
|
companySkillService: () => ({ listRuntimeSkillEntries: vi.fn() }),
|
|
budgetService: () => ({}),
|
|
environmentService: () => mockEnvironmentService,
|
|
heartbeatService: () => ({}),
|
|
issueApprovalService: () => ({}),
|
|
issueService: () => ({}),
|
|
logActivity: mockLogActivity,
|
|
secretService: () => mockSecretService,
|
|
syncInstructionsBundleConfigFromFilePath: mockSyncInstructionsBundleConfigFromFilePath,
|
|
workspaceOperationService: () => ({}),
|
|
}));
|
|
|
|
vi.mock("../adapters/index.js", () => ({
|
|
findServerAdapter: mockFindServerAdapter,
|
|
listAdapterModels: vi.fn(),
|
|
}));
|
|
|
|
function registerModuleMocks() {
|
|
vi.doMock("../services/index.js", () => ({
|
|
agentService: () => mockAgentService,
|
|
agentInstructionsService: () => mockAgentInstructionsService,
|
|
accessService: () => mockAccessService,
|
|
approvalService: () => ({}),
|
|
companySkillService: () => ({ listRuntimeSkillEntries: vi.fn() }),
|
|
budgetService: () => ({}),
|
|
heartbeatService: () => ({}),
|
|
issueApprovalService: () => ({}),
|
|
issueService: () => ({}),
|
|
logActivity: mockLogActivity,
|
|
secretService: () => mockSecretService,
|
|
syncInstructionsBundleConfigFromFilePath: mockSyncInstructionsBundleConfigFromFilePath,
|
|
workspaceOperationService: () => ({}),
|
|
}));
|
|
|
|
vi.doMock("../adapters/index.js", () => ({
|
|
findServerAdapter: mockFindServerAdapter,
|
|
listAdapterModels: vi.fn(),
|
|
}));
|
|
}
|
|
|
|
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 requestApp(
|
|
app: express.Express,
|
|
buildRequest: (baseUrl: string) => request.Test,
|
|
) {
|
|
const { createServer } = await vi.importActual<typeof import("node:http")>("node:http");
|
|
const server = createServer(app);
|
|
try {
|
|
await new Promise<void>((resolve) => {
|
|
server.listen(0, "127.0.0.1", resolve);
|
|
});
|
|
const address = server.address();
|
|
if (!address || typeof address === "string") {
|
|
throw new Error("Expected HTTP server to listen on a TCP port");
|
|
}
|
|
return await buildRequest(`http://127.0.0.1:${address.port}`);
|
|
} finally {
|
|
if (server.listening) {
|
|
await new Promise<void>((resolve, reject) => {
|
|
server.close((error) => {
|
|
if (error) reject(error);
|
|
else resolve();
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
function makeAgent() {
|
|
return {
|
|
id: "11111111-1111-4111-8111-111111111111",
|
|
companyId: "company-1",
|
|
name: "Agent",
|
|
role: "engineer",
|
|
title: "Engineer",
|
|
status: "active",
|
|
reportsTo: null,
|
|
capabilities: null,
|
|
adapterType: "codex_local",
|
|
adapterConfig: {},
|
|
runtimeConfig: {},
|
|
defaultEnvironmentId: null,
|
|
permissions: null,
|
|
updatedAt: new Date(),
|
|
};
|
|
}
|
|
|
|
describe("agent instructions bundle routes", () => {
|
|
beforeEach(() => {
|
|
vi.resetModules();
|
|
vi.doUnmock("../routes/agents.js");
|
|
vi.doUnmock("../routes/authz.js");
|
|
vi.doUnmock("../middleware/index.js");
|
|
registerModuleMocks();
|
|
vi.clearAllMocks();
|
|
mockSyncInstructionsBundleConfigFromFilePath.mockImplementation((_agent, config) => config);
|
|
mockFindServerAdapter.mockImplementation((_type: string) => ({ type: _type }));
|
|
mockAgentService.getById.mockResolvedValue(makeAgent());
|
|
mockAgentService.update.mockImplementation(async (_id: string, patch: Record<string, unknown>) => ({
|
|
...makeAgent(),
|
|
adapterConfig: patch.adapterConfig ?? {},
|
|
}));
|
|
mockAgentInstructionsService.getBundle.mockResolvedValue({
|
|
agentId: "11111111-1111-4111-8111-111111111111",
|
|
companyId: "company-1",
|
|
mode: "managed",
|
|
rootPath: "/tmp/agent-1",
|
|
managedRootPath: "/tmp/agent-1",
|
|
entryFile: "AGENTS.md",
|
|
resolvedEntryPath: "/tmp/agent-1/AGENTS.md",
|
|
editable: true,
|
|
warnings: [],
|
|
legacyPromptTemplateActive: false,
|
|
legacyBootstrapPromptTemplateActive: false,
|
|
files: [{
|
|
path: "AGENTS.md",
|
|
size: 12,
|
|
language: "markdown",
|
|
markdown: true,
|
|
isEntryFile: true,
|
|
editable: true,
|
|
deprecated: false,
|
|
virtual: false,
|
|
}],
|
|
});
|
|
mockAgentInstructionsService.readFile.mockResolvedValue({
|
|
path: "AGENTS.md",
|
|
size: 12,
|
|
language: "markdown",
|
|
markdown: true,
|
|
isEntryFile: true,
|
|
editable: true,
|
|
deprecated: false,
|
|
virtual: false,
|
|
content: "# Agent\n",
|
|
});
|
|
mockAgentInstructionsService.writeFile.mockResolvedValue({
|
|
bundle: null,
|
|
file: {
|
|
path: "AGENTS.md",
|
|
size: 18,
|
|
language: "markdown",
|
|
markdown: true,
|
|
isEntryFile: true,
|
|
editable: true,
|
|
deprecated: false,
|
|
virtual: false,
|
|
content: "# Updated Agent\n",
|
|
},
|
|
adapterConfig: {
|
|
instructionsBundleMode: "managed",
|
|
instructionsRootPath: "/tmp/agent-1",
|
|
instructionsEntryFile: "AGENTS.md",
|
|
instructionsFilePath: "/tmp/agent-1/AGENTS.md",
|
|
},
|
|
});
|
|
});
|
|
|
|
it("returns bundle metadata", async () => {
|
|
const res = await requestApp(
|
|
await createApp(),
|
|
(baseUrl) => request(baseUrl)
|
|
.get("/api/agents/11111111-1111-4111-8111-111111111111/instructions-bundle?companyId=company-1"),
|
|
);
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(res.body).toMatchObject({
|
|
mode: "managed",
|
|
rootPath: "/tmp/agent-1",
|
|
managedRootPath: "/tmp/agent-1",
|
|
entryFile: "AGENTS.md",
|
|
});
|
|
expect(mockAgentInstructionsService.getBundle).toHaveBeenCalled();
|
|
});
|
|
|
|
it("writes a bundle file and persists compatibility config", async () => {
|
|
const res = await requestApp(await createApp(), (baseUrl) => request(baseUrl)
|
|
.put("/api/agents/11111111-1111-4111-8111-111111111111/instructions-bundle/file?companyId=company-1")
|
|
.send({
|
|
path: "AGENTS.md",
|
|
content: "# Updated Agent\n",
|
|
clearLegacyPromptTemplate: true,
|
|
}));
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(mockAgentInstructionsService.writeFile).toHaveBeenCalledWith(
|
|
expect.objectContaining({ id: "11111111-1111-4111-8111-111111111111" }),
|
|
"AGENTS.md",
|
|
"# Updated Agent\n",
|
|
{ clearLegacyPromptTemplate: true },
|
|
);
|
|
expect(mockAgentService.update).toHaveBeenCalledWith(
|
|
"11111111-1111-4111-8111-111111111111",
|
|
expect.objectContaining({
|
|
adapterConfig: expect.objectContaining({
|
|
instructionsBundleMode: "managed",
|
|
instructionsRootPath: "/tmp/agent-1",
|
|
instructionsEntryFile: "AGENTS.md",
|
|
instructionsFilePath: "/tmp/agent-1/AGENTS.md",
|
|
}),
|
|
}),
|
|
expect.any(Object),
|
|
);
|
|
});
|
|
|
|
it("preserves managed instructions config when switching adapters", async () => {
|
|
mockAgentService.getById.mockResolvedValue({
|
|
...makeAgent(),
|
|
adapterType: "codex_local",
|
|
adapterConfig: {
|
|
instructionsBundleMode: "managed",
|
|
instructionsRootPath: "/tmp/agent-1",
|
|
instructionsEntryFile: "AGENTS.md",
|
|
instructionsFilePath: "/tmp/agent-1/AGENTS.md",
|
|
model: "gpt-5.4",
|
|
},
|
|
});
|
|
|
|
const res = await requestApp(await createApp(), (baseUrl) => request(baseUrl)
|
|
.patch("/api/agents/11111111-1111-4111-8111-111111111111?companyId=company-1")
|
|
.send({
|
|
adapterType: "claude_local",
|
|
adapterConfig: {
|
|
model: "claude-sonnet-4",
|
|
},
|
|
}));
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(mockAgentService.update).toHaveBeenCalledWith(
|
|
"11111111-1111-4111-8111-111111111111",
|
|
expect.objectContaining({
|
|
adapterType: "claude_local",
|
|
adapterConfig: expect.objectContaining({
|
|
model: "claude-sonnet-4",
|
|
instructionsBundleMode: "managed",
|
|
instructionsRootPath: "/tmp/agent-1",
|
|
instructionsEntryFile: "AGENTS.md",
|
|
instructionsFilePath: "/tmp/agent-1/AGENTS.md",
|
|
}),
|
|
}),
|
|
expect.any(Object),
|
|
);
|
|
});
|
|
|
|
it("merges same-adapter config patches so instructions metadata is not dropped", async () => {
|
|
mockAgentService.getById.mockResolvedValue({
|
|
...makeAgent(),
|
|
adapterType: "codex_local",
|
|
adapterConfig: {
|
|
instructionsBundleMode: "managed",
|
|
instructionsRootPath: "/tmp/agent-1",
|
|
instructionsEntryFile: "AGENTS.md",
|
|
instructionsFilePath: "/tmp/agent-1/AGENTS.md",
|
|
model: "gpt-5.4",
|
|
},
|
|
});
|
|
|
|
const res = await requestApp(await createApp(), (baseUrl) => request(baseUrl)
|
|
.patch("/api/agents/11111111-1111-4111-8111-111111111111?companyId=company-1")
|
|
.send({
|
|
adapterConfig: {
|
|
command: "codex --profile engineer",
|
|
},
|
|
}));
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(mockAgentService.update).toHaveBeenCalledWith(
|
|
"11111111-1111-4111-8111-111111111111",
|
|
expect.objectContaining({
|
|
adapterConfig: expect.objectContaining({
|
|
command: "codex --profile engineer",
|
|
model: "gpt-5.4",
|
|
instructionsBundleMode: "managed",
|
|
instructionsRootPath: "/tmp/agent-1",
|
|
instructionsEntryFile: "AGENTS.md",
|
|
instructionsFilePath: "/tmp/agent-1/AGENTS.md",
|
|
}),
|
|
}),
|
|
expect.any(Object),
|
|
);
|
|
});
|
|
|
|
it("replaces adapter config when replaceAdapterConfig is true", async () => {
|
|
mockAgentService.getById.mockResolvedValue({
|
|
...makeAgent(),
|
|
adapterType: "codex_local",
|
|
adapterConfig: {
|
|
instructionsBundleMode: "managed",
|
|
instructionsRootPath: "/tmp/agent-1",
|
|
instructionsEntryFile: "AGENTS.md",
|
|
instructionsFilePath: "/tmp/agent-1/AGENTS.md",
|
|
model: "gpt-5.4",
|
|
},
|
|
});
|
|
|
|
const res = await requestApp(await createApp(), (baseUrl) => request(baseUrl)
|
|
.patch("/api/agents/11111111-1111-4111-8111-111111111111?companyId=company-1")
|
|
.send({
|
|
replaceAdapterConfig: true,
|
|
adapterConfig: {
|
|
command: "codex --profile engineer",
|
|
},
|
|
}));
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(res.body.adapterConfig).toMatchObject({
|
|
command: "codex --profile engineer",
|
|
});
|
|
expect(res.body.adapterConfig.instructionsBundleMode).toBeUndefined();
|
|
expect(res.body.adapterConfig.instructionsRootPath).toBeUndefined();
|
|
expect(res.body.adapterConfig.instructionsEntryFile).toBeUndefined();
|
|
expect(res.body.adapterConfig.instructionsFilePath).toBeUndefined();
|
|
});
|
|
});
|