d734bd43d1
## Thinking Path > - Paperclip is the control plane for autonomous AI companies, so agent work needs visible ownership, recovery, and operator controls. > - This local branch had accumulated several related control-plane reliability and operator-experience fixes across recovery actions, watchdog folding, model-profile defaults, mentions, markdown editing, plugin launchers, and small UI polish. > - The branch needed to be converted into a PR against the current `origin/master` without losing dirty work or including lockfile/workflow churn. > - The safest standalone shape is a single rollup PR because the recovery/server/UI files overlap heavily across the local commits and splitting would create avoidable conflicts. > - This pull request replays the local branch onto latest `origin/master`, preserves the uncommitted work as logical commits, and adds a Zod 4 validator compatibility fix found during verification. > - The benefit is that the May 17 local branch can be reviewed and merged as one coherent, conflict-free branch under the 100-file Greptile limit. ## What Changed - Rebased the local May 17 branch work onto current `origin/master` in a dedicated worktree. - Preserved and committed previously dirty changes for recovery retry handling, plugin/sidebar launcher polish, and `.herenow` ignores. - Added recovery-action behavior for returning source issues to `todo` when retrying source-scoped recovery. - Included the existing local recovery/liveness/watchdog fold, Codex cheap-profile, markdown/mention, duplicate-agent, and UI polish commits from the branch. - Normalized shared validator `z.record(...)` schemas to explicit string-key records for Zod 4 compatibility. - Confirmed the PR has no `pnpm-lock.yaml` or `.github/workflows/*` changes and stays below the 100-file Greptile limit. ## Verification - `pnpm install --frozen-lockfile --ignore-scripts` - `npm run install` in `node_modules/.pnpm/sqlite3@5.1.7/node_modules/sqlite3` to build the local native sqlite3 binding after installing with scripts disabled - `pnpm exec vitest run packages/shared/src/validators/issue.test.ts packages/shared/src/project-mentions.test.ts packages/adapter-utils/src/server-utils.test.ts server/src/__tests__/heartbeat-model-profile.test.ts server/src/__tests__/issue-recovery-actions.test.ts server/src/__tests__/issue-agent-mutation-ownership-routes.test.ts server/src/__tests__/heartbeat-active-run-output-watchdog.test.ts server/src/__tests__/plugin-local-folders.test.ts ui/src/components/IssueRecoveryActionCard.test.tsx ui/src/components/Sidebar.test.tsx ui/src/components/SidebarAccountMenu.test.tsx ui/src/components/IssueProperties.test.tsx ui/src/components/MarkdownEditor.test.tsx ui/src/components/MarkdownBody.test.tsx ui/src/lib/duplicate-agent-payload.test.ts ui/src/pages/Routines.test.tsx` - First pass: 13 files passed with 201 passing tests; 3 server files failed before sqlite3 native binding was built. - After rebuilding sqlite3: `server/src/__tests__/heartbeat-model-profile.test.ts`, `server/src/__tests__/issue-recovery-actions.test.ts`, and `server/src/__tests__/heartbeat-active-run-output-watchdog.test.ts` passed/loaded; embedded Postgres tests were skipped by the local host guard. - `pnpm --filter @paperclipai/shared typecheck` - `pnpm --filter @paperclipai/adapter-utils typecheck` - `pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/ui typecheck` ## Risks - Medium risk: this is a broad rollup PR across recovery semantics, server tests, shared validators, and UI surfaces. - Some embedded Postgres tests skipped locally due the host guard, so CI should provide the stronger database-backed signal. - UI changes were covered by component tests, but no browser screenshot was captured in this PR creation pass. - This branch may overlap with existing recovery/liveness PR work; merge this PR independently or restack/close overlapping branches rather than merging duplicate implementations together. > 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, GPT-5-based coding agent, tool-enabled local repository and GitHub workflow, medium reasoning effort. ## 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 - [ ] 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 --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
396 lines
12 KiB
TypeScript
396 lines
12 KiB
TypeScript
import type { Server } from "node:http";
|
|
import express from "express";
|
|
import request from "supertest";
|
|
import { afterAll, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { errorHandler } from "../middleware/index.js";
|
|
import { projectRoutes } from "../routes/projects.js";
|
|
import { issueRoutes } from "../routes/issues.js";
|
|
|
|
const mockProjectService = vi.hoisted(() => ({
|
|
create: vi.fn(),
|
|
getById: vi.fn(),
|
|
update: vi.fn(),
|
|
createWorkspace: vi.fn(),
|
|
remove: vi.fn(),
|
|
resolveByReference: vi.fn(),
|
|
listWorkspaces: vi.fn(),
|
|
}));
|
|
|
|
const mockIssueService = vi.hoisted(() => ({
|
|
create: vi.fn(),
|
|
getById: vi.fn(),
|
|
update: vi.fn(),
|
|
getByIdentifier: vi.fn(),
|
|
assertCheckoutOwner: vi.fn(),
|
|
}));
|
|
|
|
const mockEnvironmentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
}));
|
|
|
|
const mockCompanyService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
}));
|
|
|
|
const mockIssueReferenceService = vi.hoisted(() => ({
|
|
deleteDocumentSource: vi.fn(async () => undefined),
|
|
diffIssueReferenceSummary: vi.fn(() => ({
|
|
addedReferencedIssues: [],
|
|
removedReferencedIssues: [],
|
|
currentReferencedIssues: [],
|
|
})),
|
|
emptySummary: vi.fn(() => ({ outbound: [], inbound: [] })),
|
|
listIssueReferenceSummary: vi.fn(async () => ({ outbound: [], inbound: [] })),
|
|
syncComment: vi.fn(async () => undefined),
|
|
syncDocument: vi.fn(async () => undefined),
|
|
syncIssue: vi.fn(async () => undefined),
|
|
}));
|
|
|
|
const mockSecretService = vi.hoisted(() => ({
|
|
normalizeEnvBindingsForPersistence: vi.fn(async (_companyId: string, env: Record<string, unknown>) => env),
|
|
}));
|
|
|
|
const mockLogActivity = vi.hoisted(() => vi.fn());
|
|
|
|
vi.mock("../services/index.js", () => ({
|
|
projectService: () => mockProjectService,
|
|
issueService: () => mockIssueService,
|
|
companyService: () => mockCompanyService,
|
|
environmentService: () => mockEnvironmentService,
|
|
issueReferenceService: () => mockIssueReferenceService,
|
|
logActivity: mockLogActivity,
|
|
workspaceOperationService: () => ({}),
|
|
accessService: () => ({
|
|
canUser: vi.fn(),
|
|
hasPermission: vi.fn(),
|
|
}),
|
|
agentService: () => ({
|
|
getById: vi.fn(),
|
|
}),
|
|
executionWorkspaceService: () => ({}),
|
|
goalService: () => ({
|
|
getById: vi.fn(),
|
|
getDefaultCompanyGoal: vi.fn(),
|
|
}),
|
|
heartbeatService: () => ({
|
|
getRun: vi.fn(),
|
|
getActiveRunForAgent: vi.fn(),
|
|
}),
|
|
issueApprovalService: () => ({
|
|
listApprovalsForIssue: vi.fn(),
|
|
unlink: vi.fn(),
|
|
}),
|
|
issueRecoveryActionService: () => ({
|
|
getActiveForIssue: vi.fn(async () => null),
|
|
listActiveForIssues: vi.fn(async () => new Map()),
|
|
}),
|
|
issueThreadInteractionService: () => ({
|
|
listForIssue: vi.fn(async () => []),
|
|
expireRequestConfirmationsSupersededByComment: vi.fn(async () => []),
|
|
expireStaleRequestConfirmationsForIssueDocument: vi.fn(async () => []),
|
|
}),
|
|
documentService: () => ({}),
|
|
routineService: () => ({}),
|
|
workProductService: () => ({}),
|
|
}));
|
|
|
|
vi.mock("../services/environments.js", () => ({
|
|
environmentService: () => mockEnvironmentService,
|
|
}));
|
|
|
|
vi.mock("../services/secrets.js", () => ({
|
|
secretService: () => mockSecretService,
|
|
}));
|
|
|
|
vi.mock("../services/issue-assignment-wakeup.js", () => ({
|
|
queueIssueAssignmentWakeup: vi.fn(),
|
|
}));
|
|
|
|
function buildApp(routerFactory: (app: express.Express) => void) {
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = {
|
|
type: "board",
|
|
userId: "user-1",
|
|
source: "local_implicit",
|
|
};
|
|
next();
|
|
});
|
|
routerFactory(app);
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
let projectServer: Server | null = null;
|
|
let issueServer: Server | null = null;
|
|
|
|
function createProjectApp() {
|
|
projectServer ??= buildApp((expressApp) => {
|
|
expressApp.use("/api", projectRoutes({} as any));
|
|
}).listen(0);
|
|
return projectServer;
|
|
}
|
|
|
|
function createIssueApp() {
|
|
issueServer ??= buildApp((expressApp) => {
|
|
expressApp.use("/api", issueRoutes({} as any, {} as any));
|
|
}).listen(0);
|
|
return issueServer;
|
|
}
|
|
|
|
const sandboxEnvironmentId = "11111111-1111-4111-8111-111111111111";
|
|
|
|
async function closeServer(server: Server | null) {
|
|
if (!server) return;
|
|
await new Promise<void>((resolve, reject) => {
|
|
server.close((err) => {
|
|
if (err) reject(err);
|
|
else resolve();
|
|
});
|
|
});
|
|
}
|
|
|
|
describe.sequential("execution environment route guards", () => {
|
|
afterAll(async () => {
|
|
await closeServer(projectServer);
|
|
await closeServer(issueServer);
|
|
projectServer = null;
|
|
issueServer = null;
|
|
});
|
|
|
|
beforeEach(() => {
|
|
mockProjectService.create.mockReset();
|
|
mockProjectService.getById.mockReset();
|
|
mockProjectService.update.mockReset();
|
|
mockProjectService.createWorkspace.mockReset();
|
|
mockProjectService.remove.mockReset();
|
|
mockProjectService.resolveByReference.mockReset();
|
|
mockProjectService.listWorkspaces.mockReset();
|
|
mockIssueService.create.mockReset();
|
|
mockIssueService.getById.mockReset();
|
|
mockIssueService.update.mockReset();
|
|
mockIssueService.getByIdentifier.mockReset();
|
|
mockIssueService.assertCheckoutOwner.mockReset();
|
|
mockCompanyService.getById.mockReset();
|
|
mockCompanyService.getById.mockResolvedValue({
|
|
id: "company-1",
|
|
attachmentMaxBytes: 10 * 1024 * 1024,
|
|
});
|
|
mockEnvironmentService.getById.mockReset();
|
|
mockIssueReferenceService.deleteDocumentSource.mockClear();
|
|
mockIssueReferenceService.diffIssueReferenceSummary.mockClear();
|
|
mockIssueReferenceService.emptySummary.mockClear();
|
|
mockIssueReferenceService.listIssueReferenceSummary.mockClear();
|
|
mockIssueReferenceService.syncComment.mockClear();
|
|
mockIssueReferenceService.syncDocument.mockClear();
|
|
mockIssueReferenceService.syncIssue.mockClear();
|
|
mockSecretService.normalizeEnvBindingsForPersistence.mockClear();
|
|
mockLogActivity.mockReset();
|
|
});
|
|
|
|
it("accepts sandbox environments on project create", async () => {
|
|
mockEnvironmentService.getById.mockResolvedValue({
|
|
id: sandboxEnvironmentId,
|
|
companyId: "company-1",
|
|
driver: "sandbox",
|
|
config: { provider: "fake-plugin" },
|
|
});
|
|
mockProjectService.create.mockResolvedValue({
|
|
id: "project-1",
|
|
companyId: "company-1",
|
|
name: "Sandboxed Project",
|
|
status: "backlog",
|
|
});
|
|
const app = createProjectApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/projects")
|
|
.send({
|
|
name: "Sandboxed Project",
|
|
executionWorkspacePolicy: {
|
|
enabled: true,
|
|
environmentId: sandboxEnvironmentId,
|
|
},
|
|
});
|
|
|
|
expect(res.status).not.toBe(422);
|
|
expect(mockProjectService.create).toHaveBeenCalled();
|
|
});
|
|
|
|
it("accepts sandbox environments on project update", async () => {
|
|
mockProjectService.getById.mockResolvedValue({
|
|
id: "project-1",
|
|
companyId: "company-1",
|
|
name: "Sandboxed Project",
|
|
status: "backlog",
|
|
archivedAt: null,
|
|
});
|
|
mockEnvironmentService.getById.mockResolvedValue({
|
|
id: sandboxEnvironmentId,
|
|
companyId: "company-1",
|
|
driver: "sandbox",
|
|
config: { provider: "fake-plugin" },
|
|
});
|
|
mockProjectService.update.mockResolvedValue({
|
|
id: "project-1",
|
|
companyId: "company-1",
|
|
name: "Sandboxed Project",
|
|
status: "backlog",
|
|
});
|
|
const app = createProjectApp();
|
|
|
|
const res = await request(app)
|
|
.patch("/api/projects/project-1")
|
|
.send({
|
|
executionWorkspacePolicy: {
|
|
enabled: true,
|
|
environmentId: sandboxEnvironmentId,
|
|
},
|
|
});
|
|
|
|
expect(res.status).not.toBe(422);
|
|
expect(mockProjectService.update).toHaveBeenCalled();
|
|
});
|
|
|
|
it("accepts sandbox environments on issue create", async () => {
|
|
mockEnvironmentService.getById.mockResolvedValue({
|
|
id: sandboxEnvironmentId,
|
|
companyId: "company-1",
|
|
driver: "sandbox",
|
|
config: { provider: "fake-plugin" },
|
|
});
|
|
mockIssueService.create.mockResolvedValue({
|
|
id: "issue-1",
|
|
companyId: "company-1",
|
|
title: "Sandboxed Issue",
|
|
status: "todo",
|
|
identifier: "PAPA-999",
|
|
});
|
|
const app = createIssueApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/issues")
|
|
.send({
|
|
title: "Sandboxed Issue",
|
|
executionWorkspaceSettings: {
|
|
environmentId: sandboxEnvironmentId,
|
|
},
|
|
});
|
|
|
|
expect(res.status).not.toBe(422);
|
|
expect(mockIssueService.create).toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects unsupported driver environments on issue create", async () => {
|
|
mockEnvironmentService.getById.mockResolvedValue({
|
|
id: sandboxEnvironmentId,
|
|
companyId: "company-1",
|
|
driver: "unsupported_driver",
|
|
config: {},
|
|
});
|
|
const app = createIssueApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/issues")
|
|
.send({
|
|
title: "Unsupported Driver Issue",
|
|
executionWorkspaceSettings: {
|
|
environmentId: sandboxEnvironmentId,
|
|
},
|
|
});
|
|
|
|
expect(res.status).toBe(422);
|
|
expect(res.body.error).toContain('Environment driver "unsupported_driver" is not allowed here');
|
|
expect(mockIssueService.create).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects built-in fake sandbox environments on issue create", async () => {
|
|
mockEnvironmentService.getById.mockResolvedValue({
|
|
id: sandboxEnvironmentId,
|
|
companyId: "company-1",
|
|
driver: "sandbox",
|
|
config: { provider: "fake" },
|
|
});
|
|
const app = createIssueApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/issues")
|
|
.send({
|
|
title: "Fake Sandbox Issue",
|
|
executionWorkspaceSettings: {
|
|
environmentId: sandboxEnvironmentId,
|
|
},
|
|
});
|
|
|
|
expect(res.status).toBe(422);
|
|
expect(res.body.error).toContain('Environment sandbox provider "fake" is not allowed here');
|
|
expect(mockIssueService.create).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("accepts plugin-backed sandbox environments on issue create", async () => {
|
|
mockEnvironmentService.getById.mockResolvedValue({
|
|
id: sandboxEnvironmentId,
|
|
companyId: "company-1",
|
|
driver: "sandbox",
|
|
config: { provider: "fake-plugin" },
|
|
});
|
|
mockIssueService.create.mockResolvedValue({
|
|
id: "issue-1",
|
|
companyId: "company-1",
|
|
title: "Plugin Sandbox Issue",
|
|
status: "todo",
|
|
identifier: "PAPA-999",
|
|
});
|
|
const app = createIssueApp();
|
|
|
|
const res = await request(app)
|
|
.post("/api/companies/company-1/issues")
|
|
.send({
|
|
title: "Plugin Sandbox Issue",
|
|
executionWorkspaceSettings: {
|
|
environmentId: sandboxEnvironmentId,
|
|
},
|
|
});
|
|
|
|
expect(res.status).not.toBe(422);
|
|
expect(mockIssueService.create).toHaveBeenCalled();
|
|
});
|
|
|
|
it("accepts sandbox environments on issue update", async () => {
|
|
mockIssueService.getById.mockResolvedValue({
|
|
id: "issue-1",
|
|
companyId: "company-1",
|
|
status: "todo",
|
|
assigneeAgentId: null,
|
|
assigneeUserId: null,
|
|
createdByUserId: null,
|
|
identifier: "PAPA-999",
|
|
});
|
|
mockEnvironmentService.getById.mockResolvedValue({
|
|
id: sandboxEnvironmentId,
|
|
companyId: "company-1",
|
|
driver: "sandbox",
|
|
config: { provider: "fake-plugin" },
|
|
});
|
|
mockIssueService.update.mockResolvedValue({
|
|
id: "issue-1",
|
|
companyId: "company-1",
|
|
status: "todo",
|
|
identifier: "PAPA-999",
|
|
});
|
|
const app = createIssueApp();
|
|
|
|
const res = await request(app)
|
|
.patch("/api/issues/issue-1")
|
|
.send({
|
|
executionWorkspaceSettings: {
|
|
environmentId: sandboxEnvironmentId,
|
|
},
|
|
});
|
|
|
|
expect(res.status).not.toBe(422);
|
|
expect(mockIssueService.update).toHaveBeenCalled();
|
|
});
|
|
});
|