mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-19 04:00:38 +09:00
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - The control plane depends on authenticated routes enforcing company boundaries and role permissions correctly > - This branch also touches the issue detail and markdown editing flows operators use while handling advisory and triage work > - Partial issue cache seeds and fragile rich-editor parsing could leave important issue content missing or blank at the moment an operator needed it > - Blocked issues becoming actionable again should wake their assignee automatically instead of silently staying idle > - This pull request rebases the advisory follow-up branch onto current `master`, hardens authenticated route authorization, and carries the issue-detail/editor reliability fixes forward with regression tests > - The benefit is tighter authz on sensitive routes plus more reliable issue/advisory editing and wakeup behavior on top of the latest base ## What Changed - Hardened authenticated route authorization across agent, activity, approval, access, project, plugin, health, execution-workspace, portability, and related server paths, with new cross-tenant and runtime-authz regression coverage. - Switched issue detail queries from `initialData` to placeholder-based hydration so list/quicklook seeds still refetch full issue bodies. - Normalized advisory-style HTML images before mounting the markdown editor and strengthened fallback behavior when the rich editor silently fails or rejects the content. - Woke assigned agents when blocked issues move back to `todo`, with route coverage for reopen and unblock transitions. - Rebasing note: this branch now sits cleanly on top of the latest `master` tip used for the PR base. ## Verification - `pnpm exec vitest run ui/src/lib/issueDetailQuery.test.tsx ui/src/components/MarkdownEditor.test.tsx server/src/__tests__/issue-comment-reopen-routes.test.ts server/src/__tests__/activity-routes.test.ts server/src/__tests__/agent-cross-tenant-authz-routes.test.ts` - Confirmed `pnpm-lock.yaml` is not part of the PR diff. - Rebased the branch onto current `public-gh/master` before publishing. ## Risks - Broad authz tightening may expose existing flows that were relying on permissive board or agent access and now need explicit grants. - Markdown editor fallback changes could affect focus or rendering in edge-case content that mixes HTML-like advisory markup with normal markdown. - This verification was intentionally scoped to touched regressions and did not run the full repository suite. ## Model Used - OpenAI Codex, GPT-5-based coding agent in the Codex CLI environment with tool use for terminal, git, and GitHub operations. The exact runtime model identifier is not exposed inside this session. ## 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 run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, it is behavior-only and does not need before/after screenshots - [x] I have updated relevant documentation to reflect my changes, or no documentation changes were needed for these internal fixes - [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>
357 lines
12 KiB
TypeScript
357 lines
12 KiB
TypeScript
import { Router, type Request } from "express";
|
|
import type { Db } from "@paperclipai/db";
|
|
import {
|
|
addApprovalCommentSchema,
|
|
createApprovalSchema,
|
|
requestApprovalRevisionSchema,
|
|
resolveApprovalSchema,
|
|
resubmitApprovalSchema,
|
|
} from "@paperclipai/shared";
|
|
import { validate } from "../middleware/validate.js";
|
|
import { logger } from "../middleware/logger.js";
|
|
import {
|
|
approvalService,
|
|
heartbeatService,
|
|
issueApprovalService,
|
|
logActivity,
|
|
secretService,
|
|
} from "../services/index.js";
|
|
import { assertBoard, assertCompanyAccess, getActorInfo } from "./authz.js";
|
|
import { redactEventPayload } from "../redaction.js";
|
|
|
|
function redactApprovalPayload<T extends { payload: Record<string, unknown> }>(approval: T): T {
|
|
return {
|
|
...approval,
|
|
payload: redactEventPayload(approval.payload) ?? {},
|
|
};
|
|
}
|
|
|
|
export function approvalRoutes(db: Db) {
|
|
const router = Router();
|
|
const svc = approvalService(db);
|
|
const heartbeat = heartbeatService(db);
|
|
const issueApprovalsSvc = issueApprovalService(db);
|
|
const secretsSvc = secretService(db);
|
|
const strictSecretsMode = process.env.PAPERCLIP_SECRETS_STRICT_MODE === "true";
|
|
|
|
async function requireApprovalAccess(req: Request, id: string) {
|
|
const approval = await svc.getById(id);
|
|
if (!approval) {
|
|
return null;
|
|
}
|
|
assertCompanyAccess(req, approval.companyId);
|
|
return approval;
|
|
}
|
|
|
|
router.get("/companies/:companyId/approvals", async (req, res) => {
|
|
const companyId = req.params.companyId as string;
|
|
assertCompanyAccess(req, companyId);
|
|
const status = req.query.status as string | undefined;
|
|
const result = await svc.list(companyId, status);
|
|
res.json(result.map((approval) => redactApprovalPayload(approval)));
|
|
});
|
|
|
|
router.get("/approvals/:id", async (req, res) => {
|
|
const id = req.params.id as string;
|
|
const approval = await svc.getById(id);
|
|
if (!approval) {
|
|
res.status(404).json({ error: "Approval not found" });
|
|
return;
|
|
}
|
|
assertCompanyAccess(req, approval.companyId);
|
|
res.json(redactApprovalPayload(approval));
|
|
});
|
|
|
|
router.post("/companies/:companyId/approvals", validate(createApprovalSchema), async (req, res) => {
|
|
const companyId = req.params.companyId as string;
|
|
assertCompanyAccess(req, companyId);
|
|
const rawIssueIds = req.body.issueIds;
|
|
const issueIds = Array.isArray(rawIssueIds)
|
|
? rawIssueIds.filter((value: unknown): value is string => typeof value === "string")
|
|
: [];
|
|
const uniqueIssueIds = Array.from(new Set(issueIds));
|
|
const { issueIds: _issueIds, ...approvalInput } = req.body;
|
|
const normalizedPayload =
|
|
approvalInput.type === "hire_agent"
|
|
? await secretsSvc.normalizeHireApprovalPayloadForPersistence(
|
|
companyId,
|
|
approvalInput.payload,
|
|
{ strictMode: strictSecretsMode },
|
|
)
|
|
: approvalInput.payload;
|
|
|
|
const actor = getActorInfo(req);
|
|
const approval = await svc.create(companyId, {
|
|
...approvalInput,
|
|
payload: normalizedPayload,
|
|
requestedByUserId: actor.actorType === "user" ? actor.actorId : null,
|
|
requestedByAgentId:
|
|
approvalInput.requestedByAgentId ?? (actor.actorType === "agent" ? actor.actorId : null),
|
|
status: "pending",
|
|
decisionNote: null,
|
|
decidedByUserId: null,
|
|
decidedAt: null,
|
|
updatedAt: new Date(),
|
|
});
|
|
|
|
if (uniqueIssueIds.length > 0) {
|
|
await issueApprovalsSvc.linkManyForApproval(approval.id, uniqueIssueIds, {
|
|
agentId: actor.agentId,
|
|
userId: actor.actorType === "user" ? actor.actorId : null,
|
|
});
|
|
}
|
|
|
|
await logActivity(db, {
|
|
companyId,
|
|
actorType: actor.actorType,
|
|
actorId: actor.actorId,
|
|
agentId: actor.agentId,
|
|
action: "approval.created",
|
|
entityType: "approval",
|
|
entityId: approval.id,
|
|
details: { type: approval.type, issueIds: uniqueIssueIds },
|
|
});
|
|
|
|
res.status(201).json(redactApprovalPayload(approval));
|
|
});
|
|
|
|
router.get("/approvals/:id/issues", async (req, res) => {
|
|
const id = req.params.id as string;
|
|
const approval = await svc.getById(id);
|
|
if (!approval) {
|
|
res.status(404).json({ error: "Approval not found" });
|
|
return;
|
|
}
|
|
assertCompanyAccess(req, approval.companyId);
|
|
const issues = await issueApprovalsSvc.listIssuesForApproval(id);
|
|
res.json(issues);
|
|
});
|
|
|
|
router.post("/approvals/:id/approve", validate(resolveApprovalSchema), async (req, res) => {
|
|
assertBoard(req);
|
|
const id = req.params.id as string;
|
|
if (!(await requireApprovalAccess(req, id))) {
|
|
res.status(404).json({ error: "Approval not found" });
|
|
return;
|
|
}
|
|
const decidedByUserId = req.actor.userId ?? "board";
|
|
const { approval, applied } = await svc.approve(id, decidedByUserId, req.body.decisionNote);
|
|
|
|
if (applied) {
|
|
const linkedIssues = await issueApprovalsSvc.listIssuesForApproval(approval.id);
|
|
const linkedIssueIds = linkedIssues.map((issue) => issue.id);
|
|
const primaryIssueId = linkedIssueIds[0] ?? null;
|
|
|
|
await logActivity(db, {
|
|
companyId: approval.companyId,
|
|
actorType: "user",
|
|
actorId: req.actor.userId ?? "board",
|
|
action: "approval.approved",
|
|
entityType: "approval",
|
|
entityId: approval.id,
|
|
details: {
|
|
type: approval.type,
|
|
requestedByAgentId: approval.requestedByAgentId,
|
|
linkedIssueIds,
|
|
},
|
|
});
|
|
|
|
if (approval.requestedByAgentId) {
|
|
try {
|
|
const wakeRun = await heartbeat.wakeup(approval.requestedByAgentId, {
|
|
source: "automation",
|
|
triggerDetail: "system",
|
|
reason: "approval_approved",
|
|
payload: {
|
|
approvalId: approval.id,
|
|
approvalStatus: approval.status,
|
|
issueId: primaryIssueId,
|
|
issueIds: linkedIssueIds,
|
|
},
|
|
requestedByActorType: "user",
|
|
requestedByActorId: req.actor.userId ?? "board",
|
|
contextSnapshot: {
|
|
source: "approval.approved",
|
|
approvalId: approval.id,
|
|
approvalStatus: approval.status,
|
|
issueId: primaryIssueId,
|
|
issueIds: linkedIssueIds,
|
|
taskId: primaryIssueId,
|
|
wakeReason: "approval_approved",
|
|
},
|
|
});
|
|
|
|
await logActivity(db, {
|
|
companyId: approval.companyId,
|
|
actorType: "user",
|
|
actorId: req.actor.userId ?? "board",
|
|
action: "approval.requester_wakeup_queued",
|
|
entityType: "approval",
|
|
entityId: approval.id,
|
|
details: {
|
|
requesterAgentId: approval.requestedByAgentId,
|
|
wakeRunId: wakeRun?.id ?? null,
|
|
linkedIssueIds,
|
|
},
|
|
});
|
|
} catch (err) {
|
|
logger.warn(
|
|
{
|
|
err,
|
|
approvalId: approval.id,
|
|
requestedByAgentId: approval.requestedByAgentId,
|
|
},
|
|
"failed to queue requester wakeup after approval",
|
|
);
|
|
await logActivity(db, {
|
|
companyId: approval.companyId,
|
|
actorType: "user",
|
|
actorId: req.actor.userId ?? "board",
|
|
action: "approval.requester_wakeup_failed",
|
|
entityType: "approval",
|
|
entityId: approval.id,
|
|
details: {
|
|
requesterAgentId: approval.requestedByAgentId,
|
|
linkedIssueIds,
|
|
error: err instanceof Error ? err.message : String(err),
|
|
},
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
res.json(redactApprovalPayload(approval));
|
|
});
|
|
|
|
router.post("/approvals/:id/reject", validate(resolveApprovalSchema), async (req, res) => {
|
|
assertBoard(req);
|
|
const id = req.params.id as string;
|
|
if (!(await requireApprovalAccess(req, id))) {
|
|
res.status(404).json({ error: "Approval not found" });
|
|
return;
|
|
}
|
|
const decidedByUserId = req.actor.userId ?? "board";
|
|
const { approval, applied } = await svc.reject(id, decidedByUserId, req.body.decisionNote);
|
|
|
|
if (applied) {
|
|
await logActivity(db, {
|
|
companyId: approval.companyId,
|
|
actorType: "user",
|
|
actorId: req.actor.userId ?? "board",
|
|
action: "approval.rejected",
|
|
entityType: "approval",
|
|
entityId: approval.id,
|
|
details: { type: approval.type },
|
|
});
|
|
}
|
|
|
|
res.json(redactApprovalPayload(approval));
|
|
});
|
|
|
|
router.post(
|
|
"/approvals/:id/request-revision",
|
|
validate(requestApprovalRevisionSchema),
|
|
async (req, res) => {
|
|
assertBoard(req);
|
|
const id = req.params.id as string;
|
|
if (!(await requireApprovalAccess(req, id))) {
|
|
res.status(404).json({ error: "Approval not found" });
|
|
return;
|
|
}
|
|
const decidedByUserId = req.actor.userId ?? "board";
|
|
const approval = await svc.requestRevision(id, decidedByUserId, req.body.decisionNote);
|
|
|
|
await logActivity(db, {
|
|
companyId: approval.companyId,
|
|
actorType: "user",
|
|
actorId: req.actor.userId ?? "board",
|
|
action: "approval.revision_requested",
|
|
entityType: "approval",
|
|
entityId: approval.id,
|
|
details: { type: approval.type },
|
|
});
|
|
|
|
res.json(redactApprovalPayload(approval));
|
|
},
|
|
);
|
|
|
|
router.post("/approvals/:id/resubmit", validate(resubmitApprovalSchema), async (req, res) => {
|
|
const id = req.params.id as string;
|
|
const existing = await svc.getById(id);
|
|
if (!existing) {
|
|
res.status(404).json({ error: "Approval not found" });
|
|
return;
|
|
}
|
|
assertCompanyAccess(req, existing.companyId);
|
|
|
|
if (req.actor.type === "agent" && req.actor.agentId !== existing.requestedByAgentId) {
|
|
res.status(403).json({ error: "Only requesting agent can resubmit this approval" });
|
|
return;
|
|
}
|
|
|
|
const normalizedPayload = req.body.payload
|
|
? existing.type === "hire_agent"
|
|
? await secretsSvc.normalizeHireApprovalPayloadForPersistence(
|
|
existing.companyId,
|
|
req.body.payload,
|
|
{ strictMode: strictSecretsMode },
|
|
)
|
|
: req.body.payload
|
|
: undefined;
|
|
const approval = await svc.resubmit(id, normalizedPayload);
|
|
const actor = getActorInfo(req);
|
|
await logActivity(db, {
|
|
companyId: approval.companyId,
|
|
actorType: actor.actorType,
|
|
actorId: actor.actorId,
|
|
agentId: actor.agentId,
|
|
action: "approval.resubmitted",
|
|
entityType: "approval",
|
|
entityId: approval.id,
|
|
details: { type: approval.type },
|
|
});
|
|
res.json(redactApprovalPayload(approval));
|
|
});
|
|
|
|
router.get("/approvals/:id/comments", async (req, res) => {
|
|
const id = req.params.id as string;
|
|
const approval = await svc.getById(id);
|
|
if (!approval) {
|
|
res.status(404).json({ error: "Approval not found" });
|
|
return;
|
|
}
|
|
assertCompanyAccess(req, approval.companyId);
|
|
const comments = await svc.listComments(id);
|
|
res.json(comments);
|
|
});
|
|
|
|
router.post("/approvals/:id/comments", validate(addApprovalCommentSchema), async (req, res) => {
|
|
const id = req.params.id as string;
|
|
const approval = await svc.getById(id);
|
|
if (!approval) {
|
|
res.status(404).json({ error: "Approval not found" });
|
|
return;
|
|
}
|
|
assertCompanyAccess(req, approval.companyId);
|
|
const actor = getActorInfo(req);
|
|
const comment = await svc.addComment(id, req.body.body, {
|
|
agentId: actor.agentId ?? undefined,
|
|
userId: actor.actorType === "user" ? actor.actorId : undefined,
|
|
});
|
|
|
|
await logActivity(db, {
|
|
companyId: approval.companyId,
|
|
actorType: actor.actorType,
|
|
actorId: actor.actorId,
|
|
agentId: actor.agentId,
|
|
action: "approval.comment_added",
|
|
entityType: "approval",
|
|
entityId: approval.id,
|
|
details: { commentId: comment.id },
|
|
});
|
|
|
|
res.status(201).json(comment);
|
|
});
|
|
|
|
return router;
|
|
}
|