b7545823be
## Thinking Path > - Paperclip orchestrates AI-agent companies through issues, documents, runs, and durable company-scoped state. > - Issue documents are where agents and operators capture plans, handoffs, and work products. > - Before this change, document collaboration could only happen through whole-document edits and detached issue comments. > - Inline document annotations need stable anchors, revision-aware persistence, and UI affordances that do not break existing document editing. > - This pull request adds company-scoped document annotation threads, comments, anchor snapshots, API routes, and board UI. > - The benefit is that operators and agents can discuss specific document passages without losing context as documents evolve. ## What Changed - Added document annotation tables, schema exports, shared types, validators, anchor hashing, and text-anchor helpers. - Added server-side document annotation services and issue routes for listing, creating, commenting, resolving, and reopening annotation threads. - Included annotation summaries in relevant issue document reads and backup/recovery document workspace behavior. - Added React UI for inline document highlights, comment panels, mobile sheet behavior, deep-link focus, and resolved/open filtering. - Added annotation design artifacts, Storybook coverage, screenshots, and a screenshot helper script. - Rebased the branch onto current `paperclipai/paperclip` `master` and renumbered the annotation migration from `0085_old_swarm` to `0091_old_swarm`; the SQL uses `IF NOT EXISTS` guards so environments that previously applied the old migration number can safely apply the new one. - Adjusted the new annotation UI tests to use a local async flush helper because this workspace's React 19.2.4 export does not expose `React.act`. ## Verification - `pnpm run preflight:workspace-links && pnpm exec vitest run packages/shared/src/document-anchors.test.ts server/src/__tests__/document-annotation-routes.test.ts server/src/__tests__/document-annotations-service.test.ts ui/src/components/DocumentAnnotationLayer.test.tsx ui/src/components/IssueDocumentAnnotations.test.tsx ui/src/lib/document-annotation-hash.test.ts ui/src/lib/document-annotation-selection.test.ts` - Confirmed `git diff --check` passes. - Confirmed no `pnpm-lock.yaml` or `.github/workflows/*` files are included in the PR diff. ## Risks - Medium risk: this adds new persisted annotation tables and routes across db/shared/server/ui. - Migration risk is reduced by moving the branch migration to `0091_old_swarm` after upstream `0090_resource_memberships` and keeping the SQL idempotent for old `0085_old_swarm` adopters. - UI risk is mostly around text range anchoring and panel positioning across long documents, folded content, and mobile layouts; the PR includes focused unit coverage and design screenshots. > 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 coding agent, tool-using software engineering mode. Context window size is not exposed in this Paperclip runtime. ## 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 --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
397 lines
12 KiB
TypeScript
397 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: () => ({}),
|
|
documentAnnotationService: () => ({ remapOpenThreadsForDocument: async () => [] }),
|
|
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();
|
|
});
|
|
});
|