a957394420
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies. > - Operators supervise that work through issues, comments, approvals, and the board UI. > - Some agent proposals need structured board/user decisions, not hidden markdown conventions or heavyweight governed approvals. > - Issue-thread interactions already provide a natural thread-native surface for proposed tasks and questions. > - This pull request extends that surface with request confirmations, richer interaction cards, and agent/plugin/MCP helpers. > - The benefit is that plan approvals and yes/no decisions become explicit, auditable, and resumable without losing the single-issue workflow. ## What Changed - Added persisted issue-thread interactions for suggested tasks, structured questions, and request confirmations. - Added board UI cards for interaction review, selection, question answers, and accept/reject confirmation flows. - Added MCP and plugin SDK helpers for creating interaction cards from agents/plugins. - Updated agent wake instructions, onboarding assets, Paperclip skill docs, and public docs to prefer structured confirmations for issue-scoped decisions. - Rebased the branch onto `public-gh/master` and renumbered branch migrations to `0063` and `0064`; the idempotency migration uses `ADD COLUMN IF NOT EXISTS` for old branch users. ## Verification - `git diff --check public-gh/master..HEAD` - `pnpm exec vitest run packages/adapter-utils/src/server-utils.test.ts packages/mcp-server/src/tools.test.ts packages/shared/src/issue-thread-interactions.test.ts ui/src/lib/issue-thread-interactions.test.ts ui/src/lib/issue-chat-messages.test.ts ui/src/components/IssueThreadInteractionCard.test.tsx ui/src/components/IssueChatThread.test.tsx server/src/__tests__/issue-thread-interaction-routes.test.ts server/src/__tests__/issue-thread-interactions-service.test.ts server/src/services/issue-thread-interactions.test.ts` -> 9 files / 79 tests passed - `pnpm -r typecheck` -> passed, including `packages/db` migration numbering check ## Risks - Medium: this adds a new issue-thread interaction model across db/shared/server/ui/plugin surfaces. - Migration risk is reduced by placing this branch after current master migrations (`0063`, `0064`) and making the idempotency column add idempotent for users who applied the old branch numbering. - UI interaction behavior is covered by component tests, but this PR does not include browser 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-class coding agent runtime. Exact model ID and context window are not exposed in this Paperclip run; tool use and local shell/code execution were enabled. ## 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>
340 lines
10 KiB
TypeScript
340 lines
10 KiB
TypeScript
import express from "express";
|
|
import request from "supertest";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const mockApprovalService = vi.hoisted(() => ({
|
|
list: vi.fn(),
|
|
getById: vi.fn(),
|
|
create: vi.fn(),
|
|
approve: vi.fn(),
|
|
reject: vi.fn(),
|
|
requestRevision: vi.fn(),
|
|
resubmit: vi.fn(),
|
|
listComments: vi.fn(),
|
|
addComment: vi.fn(),
|
|
}));
|
|
|
|
const mockHeartbeatService = vi.hoisted(() => ({
|
|
wakeup: vi.fn(),
|
|
}));
|
|
|
|
const mockIssueApprovalService = vi.hoisted(() => ({
|
|
listIssuesForApproval: vi.fn(),
|
|
linkManyForApproval: vi.fn(),
|
|
}));
|
|
|
|
const mockSecretService = vi.hoisted(() => ({
|
|
normalizeHireApprovalPayloadForPersistence: vi.fn(),
|
|
}));
|
|
|
|
const mockLogActivity = vi.hoisted(() => vi.fn());
|
|
|
|
function registerModuleMocks() {
|
|
vi.doMock("../services/index.js", () => ({
|
|
approvalService: () => mockApprovalService,
|
|
heartbeatService: () => mockHeartbeatService,
|
|
issueApprovalService: () => mockIssueApprovalService,
|
|
logActivity: mockLogActivity,
|
|
secretService: () => mockSecretService,
|
|
}));
|
|
}
|
|
|
|
async function createApp(actorOverrides: Record<string, unknown> = {}) {
|
|
const [{ errorHandler }, { approvalRoutes }] = await Promise.all([
|
|
import("../middleware/index.js"),
|
|
import("../routes/approvals.js"),
|
|
]);
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = {
|
|
type: "board",
|
|
userId: "user-1",
|
|
companyIds: ["company-1"],
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
...actorOverrides,
|
|
};
|
|
next();
|
|
});
|
|
app.use("/api", approvalRoutes({} as any));
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
async function createAgentApp() {
|
|
const [{ errorHandler }, { approvalRoutes }] = await Promise.all([
|
|
import("../middleware/index.js"),
|
|
import("../routes/approvals.js"),
|
|
]);
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = {
|
|
type: "agent",
|
|
agentId: "agent-1",
|
|
companyId: "company-1",
|
|
source: "api_key",
|
|
isInstanceAdmin: false,
|
|
};
|
|
next();
|
|
});
|
|
app.use("/api", approvalRoutes({} as any));
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
describe("approval routes idempotent retries", () => {
|
|
beforeEach(() => {
|
|
vi.resetModules();
|
|
vi.doUnmock("../services/index.js");
|
|
vi.doUnmock("../routes/approvals.js");
|
|
vi.doUnmock("../routes/authz.js");
|
|
vi.doUnmock("../middleware/index.js");
|
|
registerModuleMocks();
|
|
vi.resetAllMocks();
|
|
mockApprovalService.list.mockReset();
|
|
mockApprovalService.getById.mockReset();
|
|
mockApprovalService.create.mockReset();
|
|
mockApprovalService.approve.mockReset();
|
|
mockApprovalService.reject.mockReset();
|
|
mockApprovalService.requestRevision.mockReset();
|
|
mockApprovalService.resubmit.mockReset();
|
|
mockApprovalService.listComments.mockReset();
|
|
mockApprovalService.addComment.mockReset();
|
|
mockHeartbeatService.wakeup.mockReset();
|
|
mockIssueApprovalService.listIssuesForApproval.mockReset();
|
|
mockIssueApprovalService.linkManyForApproval.mockReset();
|
|
mockSecretService.normalizeHireApprovalPayloadForPersistence.mockReset();
|
|
mockLogActivity.mockReset();
|
|
mockHeartbeatService.wakeup.mockResolvedValue({ id: "wake-1" });
|
|
mockIssueApprovalService.listIssuesForApproval.mockResolvedValue([{ id: "issue-1" }]);
|
|
mockLogActivity.mockResolvedValue(undefined);
|
|
});
|
|
|
|
it("does not emit duplicate approval side effects when approve is already resolved", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "approved",
|
|
payload: {},
|
|
requestedByAgentId: "agent-1",
|
|
});
|
|
mockApprovalService.approve.mockResolvedValue({
|
|
approval: {
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "approved",
|
|
payload: {},
|
|
requestedByAgentId: "agent-1",
|
|
},
|
|
applied: false,
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-1/approve")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockIssueApprovalService.listIssuesForApproval).not.toHaveBeenCalled();
|
|
expect(mockHeartbeatService.wakeup).not.toHaveBeenCalled();
|
|
expect(mockLogActivity).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("does not emit duplicate rejection logs when reject is already resolved", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "rejected",
|
|
payload: {},
|
|
});
|
|
mockApprovalService.reject.mockResolvedValue({
|
|
approval: {
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "rejected",
|
|
payload: {},
|
|
},
|
|
applied: false,
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-1/reject")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockLogActivity).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects approval decisions for companies outside the caller scope", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-2",
|
|
companyId: "company-2",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-2/approve")
|
|
.send({});
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(mockApprovalService.approve).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects approval revision requests for companies outside the caller scope", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-3",
|
|
companyId: "company-2",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-3/request-revision")
|
|
.send({ decisionNote: "Need changes" });
|
|
|
|
expect(res.status).toBe(403);
|
|
expect(mockApprovalService.requestRevision).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("derives approval attribution from the authenticated actor on approve", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-4",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
requestedByAgentId: null,
|
|
});
|
|
mockApprovalService.approve.mockResolvedValue({
|
|
approval: {
|
|
id: "approval-4",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "approved",
|
|
payload: {},
|
|
requestedByAgentId: null,
|
|
},
|
|
applied: true,
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-4/approve")
|
|
.send({ decidedByUserId: "forged-user", decisionNote: "ship it" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockApprovalService.approve).toHaveBeenCalledWith("approval-4", "user-1", "ship it");
|
|
});
|
|
|
|
it("derives approval attribution from the authenticated actor on reject", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-5",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
});
|
|
mockApprovalService.reject.mockResolvedValue({
|
|
approval: {
|
|
id: "approval-5",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "rejected",
|
|
payload: {},
|
|
},
|
|
applied: true,
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-5/reject")
|
|
.send({ decidedByUserId: "forged-user", decisionNote: "not now" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockApprovalService.reject).toHaveBeenCalledWith("approval-5", "user-1", "not now");
|
|
});
|
|
|
|
it("derives approval attribution from the authenticated actor on request revision", async () => {
|
|
mockApprovalService.getById.mockResolvedValue({
|
|
id: "approval-6",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "pending",
|
|
payload: {},
|
|
});
|
|
mockApprovalService.requestRevision.mockResolvedValue({
|
|
id: "approval-6",
|
|
companyId: "company-1",
|
|
type: "hire_agent",
|
|
status: "revision_requested",
|
|
payload: {},
|
|
});
|
|
|
|
const res = await request(await createApp())
|
|
.post("/api/approvals/approval-6/request-revision")
|
|
.send({ decidedByUserId: "forged-user", decisionNote: "Need changes" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockApprovalService.requestRevision).toHaveBeenCalledWith(
|
|
"approval-6",
|
|
"user-1",
|
|
"Need changes",
|
|
);
|
|
});
|
|
|
|
it("lets agents create generic issue-linked board approval requests", async () => {
|
|
mockApprovalService.create.mockResolvedValue({
|
|
id: "approval-1",
|
|
companyId: "company-1",
|
|
type: "request_board_approval",
|
|
requestedByAgentId: "agent-1",
|
|
requestedByUserId: null,
|
|
status: "pending",
|
|
payload: { title: "Approve hosting spend" },
|
|
decisionNote: null,
|
|
decidedByUserId: null,
|
|
decidedAt: null,
|
|
createdAt: new Date("2026-04-06T00:00:00.000Z"),
|
|
updatedAt: new Date("2026-04-06T00:00:00.000Z"),
|
|
});
|
|
|
|
const res = await request(await createAgentApp())
|
|
.post("/api/companies/company-1/approvals")
|
|
.send({
|
|
type: "request_board_approval",
|
|
issueIds: ["00000000-0000-0000-0000-000000000001"],
|
|
payload: { title: "Approve hosting spend" },
|
|
});
|
|
|
|
expect([200, 201], JSON.stringify(res.body)).toContain(res.status);
|
|
expect(res.body).toMatchObject({
|
|
companyId: "company-1",
|
|
type: "request_board_approval",
|
|
requestedByAgentId: "agent-1",
|
|
requestedByUserId: null,
|
|
status: "pending",
|
|
});
|
|
expect(mockSecretService.normalizeHireApprovalPayloadForPersistence).not.toHaveBeenCalled();
|
|
expect(mockIssueApprovalService.linkManyForApproval).toHaveBeenCalledWith(
|
|
"approval-1",
|
|
["00000000-0000-0000-0000-000000000001"],
|
|
{ agentId: "agent-1", userId: null },
|
|
);
|
|
expect(mockLogActivity).toHaveBeenCalledWith(
|
|
expect.anything(),
|
|
expect.objectContaining({
|
|
companyId: "company-1",
|
|
actorType: "agent",
|
|
actorId: "agent-1",
|
|
action: "approval.created",
|
|
}),
|
|
);
|
|
});
|
|
});
|