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>
666 lines
24 KiB
TypeScript
666 lines
24 KiB
TypeScript
import { Readable } from "node:stream";
|
|
import express from "express";
|
|
import request from "supertest";
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const issueId = "11111111-1111-4111-8111-111111111111";
|
|
const companyId = "22222222-2222-4222-8222-222222222222";
|
|
const ownerAgentId = "33333333-3333-4333-8333-333333333333";
|
|
const peerAgentId = "44444444-4444-4444-8444-444444444444";
|
|
const ownerRunId = "55555555-5555-4555-8555-555555555555";
|
|
const recoveryActionId = "77777777-7777-4777-8777-777777777777";
|
|
|
|
const mockIssueService = vi.hoisted(() => ({
|
|
addComment: vi.fn(),
|
|
assertCheckoutOwner: vi.fn(),
|
|
getAttachmentById: vi.fn(),
|
|
getByIdentifier: vi.fn(),
|
|
getById: vi.fn(),
|
|
getRelationSummaries: vi.fn(),
|
|
getWakeableParentAfterChildCompletion: vi.fn(),
|
|
listAttachments: vi.fn(),
|
|
listWakeableBlockedDependents: vi.fn(),
|
|
remove: vi.fn(),
|
|
removeAttachment: vi.fn(),
|
|
update: vi.fn(),
|
|
findMentionedAgents: vi.fn(),
|
|
}));
|
|
|
|
const mockAccessService = vi.hoisted(() => ({
|
|
canUser: vi.fn(),
|
|
hasPermission: vi.fn(),
|
|
}));
|
|
|
|
const mockAgentService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
list: vi.fn(),
|
|
resolveByReference: vi.fn(),
|
|
}));
|
|
|
|
const mockCompanyService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
}));
|
|
|
|
const mockDocumentService = vi.hoisted(() => ({
|
|
upsertIssueDocument: vi.fn(),
|
|
}));
|
|
|
|
const mockWorkProductService = vi.hoisted(() => ({
|
|
getById: vi.fn(),
|
|
update: vi.fn(),
|
|
}));
|
|
|
|
const mockStorageService = vi.hoisted(() => ({
|
|
provider: "local_disk",
|
|
putFile: vi.fn(),
|
|
getObject: vi.fn(),
|
|
headObject: vi.fn(),
|
|
deleteObject: vi.fn(),
|
|
}));
|
|
const mockIssueThreadInteractionService = vi.hoisted(() => ({
|
|
expireRequestConfirmationsSupersededByComment: vi.fn(async () => []),
|
|
expireStaleRequestConfirmationsForIssueDocument: vi.fn(async () => []),
|
|
}));
|
|
const mockIssueRecoveryActionService = vi.hoisted(() => ({
|
|
getActiveForIssue: vi.fn(async () => null),
|
|
resolveActiveForIssue: vi.fn(async () => null),
|
|
}));
|
|
const mockHeartbeatService = vi.hoisted(() => ({
|
|
wakeup: vi.fn(async () => undefined),
|
|
reportRunActivity: vi.fn(async () => undefined),
|
|
getRun: vi.fn(async () => null),
|
|
getActiveRunForAgent: vi.fn(async () => null),
|
|
cancelRun: vi.fn(async () => null),
|
|
}));
|
|
|
|
function registerRouteMocks() {
|
|
vi.doMock("@paperclipai/shared/telemetry", () => ({
|
|
trackAgentTaskCompleted: vi.fn(),
|
|
trackErrorHandlerCrash: vi.fn(),
|
|
}));
|
|
|
|
vi.doMock("../telemetry.js", () => ({
|
|
getTelemetryClient: vi.fn(() => ({ track: vi.fn() })),
|
|
}));
|
|
|
|
vi.doMock("../services/access.js", () => ({
|
|
accessService: () => mockAccessService,
|
|
}));
|
|
|
|
vi.doMock("../services/agents.js", () => ({
|
|
agentService: () => mockAgentService,
|
|
}));
|
|
|
|
vi.doMock("../services/documents.js", () => ({
|
|
documentService: () => mockDocumentService,
|
|
}));
|
|
|
|
vi.doMock("../services/issues.js", () => ({
|
|
issueService: () => mockIssueService,
|
|
}));
|
|
|
|
vi.doMock("../services/work-products.js", () => ({
|
|
workProductService: () => mockWorkProductService,
|
|
}));
|
|
|
|
vi.doMock("../services/activity-log.js", () => ({
|
|
logActivity: vi.fn(async () => undefined),
|
|
}));
|
|
|
|
vi.doMock("../services/index.js", () => ({
|
|
accessService: () => mockAccessService,
|
|
agentService: () => mockAgentService,
|
|
companyService: () => mockCompanyService,
|
|
documentService: () => mockDocumentService,
|
|
executionWorkspaceService: () => ({}),
|
|
feedbackService: () => ({
|
|
listIssueVotesForUser: vi.fn(async () => []),
|
|
saveIssueVote: vi.fn(async () => ({ vote: null, consentEnabledNow: false, sharingEnabled: false })),
|
|
}),
|
|
goalService: () => ({}),
|
|
heartbeatService: () => mockHeartbeatService,
|
|
instanceSettingsService: () => ({
|
|
get: vi.fn(async () => ({
|
|
id: "instance-settings-1",
|
|
general: {
|
|
censorUsernameInLogs: false,
|
|
feedbackDataSharingPreference: "prompt",
|
|
},
|
|
})),
|
|
listCompanyIds: vi.fn(async () => [companyId]),
|
|
}),
|
|
issueApprovalService: () => ({}),
|
|
issueRecoveryActionService: () => mockIssueRecoveryActionService,
|
|
issueReferenceService: () => ({
|
|
deleteDocumentSource: async () => undefined,
|
|
diffIssueReferenceSummary: () => ({
|
|
addedReferencedIssues: [],
|
|
removedReferencedIssues: [],
|
|
currentReferencedIssues: [],
|
|
}),
|
|
emptySummary: () => ({ outbound: [], inbound: [] }),
|
|
listIssueReferenceSummary: async () => ({ outbound: [], inbound: [] }),
|
|
syncComment: async () => undefined,
|
|
syncDocument: async () => undefined,
|
|
syncIssue: async () => undefined,
|
|
}),
|
|
issueService: () => mockIssueService,
|
|
issueThreadInteractionService: () => mockIssueThreadInteractionService,
|
|
logActivity: vi.fn(async () => undefined),
|
|
projectService: () => ({}),
|
|
routineService: () => ({
|
|
syncRunStatusForIssue: vi.fn(async () => undefined),
|
|
}),
|
|
workProductService: () => mockWorkProductService,
|
|
}));
|
|
}
|
|
|
|
function makeIssue(overrides: Record<string, unknown> = {}) {
|
|
return {
|
|
id: issueId,
|
|
companyId,
|
|
status: "in_progress",
|
|
priority: "high",
|
|
projectId: null,
|
|
goalId: null,
|
|
parentId: null,
|
|
assigneeAgentId: ownerAgentId,
|
|
assigneeUserId: null,
|
|
createdByUserId: "board-user",
|
|
identifier: "PAP-1649",
|
|
title: "Owned active issue",
|
|
executionPolicy: null,
|
|
executionState: null,
|
|
hiddenAt: null,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function makeAgent(id: string, overrides: Record<string, unknown> = {}) {
|
|
return {
|
|
id,
|
|
companyId,
|
|
role: "engineer",
|
|
reportsTo: null,
|
|
permissions: { canCreateAgents: false },
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
async function createApp(actor: Record<string, unknown>) {
|
|
const [{ errorHandler }, { issueRoutes }] = await Promise.all([
|
|
vi.importActual<typeof import("../middleware/index.js")>("../middleware/index.js"),
|
|
vi.importActual<typeof import("../routes/issues.js")>("../routes/issues.js"),
|
|
]);
|
|
const fakeDb = {
|
|
transaction: async (callback: (tx: Record<string, never>) => Promise<unknown>) => callback({}),
|
|
};
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = actor;
|
|
next();
|
|
});
|
|
app.use("/api", issueRoutes(fakeDb as any, mockStorageService as any));
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
function peerActor(overrides: Record<string, unknown> = {}) {
|
|
return {
|
|
type: "agent",
|
|
agentId: peerAgentId,
|
|
companyId,
|
|
source: "agent_key",
|
|
runId: "66666666-6666-4666-8666-666666666666",
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function ownerActor() {
|
|
return {
|
|
type: "agent",
|
|
agentId: ownerAgentId,
|
|
companyId,
|
|
source: "agent_key",
|
|
runId: ownerRunId,
|
|
};
|
|
}
|
|
|
|
function boardActor() {
|
|
return {
|
|
type: "board",
|
|
userId: "board-user",
|
|
companyIds: [companyId],
|
|
source: "local_implicit",
|
|
isInstanceAdmin: false,
|
|
};
|
|
}
|
|
|
|
describe("agent issue mutation checkout ownership", () => {
|
|
beforeEach(() => {
|
|
vi.resetModules();
|
|
vi.doUnmock("@paperclipai/shared/telemetry");
|
|
vi.doUnmock("../telemetry.js");
|
|
vi.doUnmock("../services/access.js");
|
|
vi.doUnmock("../services/activity-log.js");
|
|
vi.doUnmock("../services/agents.js");
|
|
vi.doUnmock("../services/documents.js");
|
|
vi.doUnmock("../services/index.js");
|
|
vi.doUnmock("../services/issues.js");
|
|
vi.doUnmock("../services/work-products.js");
|
|
vi.doUnmock("../routes/issues.js");
|
|
vi.doUnmock("../routes/authz.js");
|
|
vi.doUnmock("../middleware/index.js");
|
|
registerRouteMocks();
|
|
vi.clearAllMocks();
|
|
mockAccessService.canUser.mockReset();
|
|
mockAccessService.hasPermission.mockReset();
|
|
mockAgentService.getById.mockReset();
|
|
mockAgentService.list.mockReset();
|
|
mockAgentService.resolveByReference.mockReset();
|
|
mockCompanyService.getById.mockReset();
|
|
mockIssueService.addComment.mockReset();
|
|
mockIssueService.assertCheckoutOwner.mockReset();
|
|
mockIssueService.getAttachmentById.mockReset();
|
|
mockIssueService.getByIdentifier.mockReset();
|
|
mockIssueService.getById.mockReset();
|
|
mockIssueService.getRelationSummaries.mockReset();
|
|
mockIssueService.getWakeableParentAfterChildCompletion.mockReset();
|
|
mockIssueService.listAttachments.mockReset();
|
|
mockIssueService.listWakeableBlockedDependents.mockReset();
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockReset();
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockResolvedValue(null);
|
|
mockIssueRecoveryActionService.resolveActiveForIssue.mockReset();
|
|
mockIssueRecoveryActionService.resolveActiveForIssue.mockResolvedValue({
|
|
id: recoveryActionId,
|
|
companyId,
|
|
sourceIssueId: issueId,
|
|
recoveryIssueId: null,
|
|
kind: "issue_graph_liveness",
|
|
status: "resolved",
|
|
ownerType: "agent",
|
|
ownerAgentId,
|
|
ownerUserId: null,
|
|
previousOwnerAgentId: null,
|
|
returnOwnerAgentId: null,
|
|
cause: "issue_graph_liveness",
|
|
fingerprint: "graph-liveness:test",
|
|
evidence: {},
|
|
nextAction: "Restore a live execution path.",
|
|
wakePolicy: null,
|
|
monitorPolicy: null,
|
|
attemptCount: 1,
|
|
maxAttempts: null,
|
|
timeoutAt: null,
|
|
lastAttemptAt: new Date("2026-05-13T18:00:00.000Z"),
|
|
outcome: "restored",
|
|
resolutionNote: "Resolved by recovery owner",
|
|
resolvedAt: new Date("2026-05-13T18:05:00.000Z"),
|
|
createdAt: new Date("2026-05-13T17:55:00.000Z"),
|
|
updatedAt: new Date("2026-05-13T18:05:00.000Z"),
|
|
});
|
|
mockHeartbeatService.wakeup.mockReset();
|
|
mockHeartbeatService.wakeup.mockResolvedValue(undefined);
|
|
mockHeartbeatService.reportRunActivity.mockReset();
|
|
mockHeartbeatService.reportRunActivity.mockResolvedValue(undefined);
|
|
mockHeartbeatService.getRun.mockReset();
|
|
mockHeartbeatService.getRun.mockResolvedValue(null);
|
|
mockHeartbeatService.getActiveRunForAgent.mockReset();
|
|
mockHeartbeatService.getActiveRunForAgent.mockResolvedValue(null);
|
|
mockHeartbeatService.cancelRun.mockReset();
|
|
mockHeartbeatService.cancelRun.mockResolvedValue(null);
|
|
mockIssueService.remove.mockReset();
|
|
mockIssueService.removeAttachment.mockReset();
|
|
mockIssueService.update.mockReset();
|
|
mockIssueService.findMentionedAgents.mockReset();
|
|
mockDocumentService.upsertIssueDocument.mockReset();
|
|
mockWorkProductService.getById.mockReset();
|
|
mockWorkProductService.update.mockReset();
|
|
mockStorageService.putFile.mockReset();
|
|
mockStorageService.getObject.mockReset();
|
|
mockStorageService.headObject.mockReset();
|
|
mockStorageService.deleteObject.mockReset();
|
|
mockAccessService.canUser.mockResolvedValue(true);
|
|
mockAccessService.hasPermission.mockResolvedValue(false);
|
|
mockAgentService.getById.mockImplementation(async (id: string) => {
|
|
if (id === ownerAgentId) return makeAgent(ownerAgentId);
|
|
if (id === peerAgentId) return makeAgent(peerAgentId);
|
|
return null;
|
|
});
|
|
mockAgentService.list.mockResolvedValue([
|
|
makeAgent(ownerAgentId),
|
|
makeAgent(peerAgentId),
|
|
]);
|
|
mockAgentService.resolveByReference.mockResolvedValue({ ambiguous: false, agent: null });
|
|
mockCompanyService.getById.mockResolvedValue({ id: companyId, issuePrefix: "PAP" });
|
|
mockIssueService.getById.mockResolvedValue(makeIssue());
|
|
mockIssueService.getByIdentifier.mockResolvedValue(null);
|
|
mockIssueService.assertCheckoutOwner.mockResolvedValue({ adoptedFromRunId: null });
|
|
mockIssueService.getRelationSummaries.mockResolvedValue({ blockedBy: [], blocks: [] });
|
|
mockIssueService.listWakeableBlockedDependents.mockResolvedValue([]);
|
|
mockIssueService.getWakeableParentAfterChildCompletion.mockResolvedValue(null);
|
|
mockIssueService.findMentionedAgents.mockResolvedValue([]);
|
|
mockIssueService.update.mockImplementation(async (_id: string, patch: Record<string, unknown>) => ({
|
|
...makeIssue(),
|
|
...patch,
|
|
}));
|
|
mockIssueService.addComment.mockResolvedValue({
|
|
id: "77777777-7777-4777-8777-777777777777",
|
|
issueId,
|
|
companyId,
|
|
body: "comment",
|
|
});
|
|
mockIssueService.listAttachments.mockResolvedValue([]);
|
|
mockIssueService.remove.mockResolvedValue(makeIssue({ status: "cancelled" }));
|
|
mockIssueService.getAttachmentById.mockResolvedValue({
|
|
id: "attachment-1",
|
|
issueId,
|
|
companyId,
|
|
objectKey: "issues/attachment-1/report.txt",
|
|
contentType: "text/plain",
|
|
byteSize: 6,
|
|
originalFilename: "report.txt",
|
|
});
|
|
mockIssueService.removeAttachment.mockResolvedValue({
|
|
id: "attachment-1",
|
|
issueId,
|
|
companyId,
|
|
objectKey: "issues/attachment-1/report.txt",
|
|
});
|
|
mockDocumentService.upsertIssueDocument.mockResolvedValue({
|
|
created: false,
|
|
document: {
|
|
id: "document-1",
|
|
key: "plan",
|
|
title: "Plan",
|
|
format: "markdown",
|
|
latestRevisionNumber: 2,
|
|
},
|
|
});
|
|
mockWorkProductService.getById.mockResolvedValue({
|
|
id: "product-1",
|
|
issueId,
|
|
companyId,
|
|
type: "artifact",
|
|
});
|
|
mockWorkProductService.update.mockResolvedValue({
|
|
id: "product-1",
|
|
issueId,
|
|
companyId,
|
|
type: "artifact",
|
|
title: "Updated",
|
|
});
|
|
mockStorageService.putFile.mockResolvedValue({
|
|
provider: "local_disk",
|
|
objectKey: "issues/upload.txt",
|
|
contentType: "text/plain",
|
|
byteSize: 6,
|
|
sha256: "sha256",
|
|
originalFilename: "upload.txt",
|
|
});
|
|
mockStorageService.getObject.mockResolvedValue({
|
|
stream: Readable.from(Buffer.from("report")),
|
|
contentLength: 6,
|
|
});
|
|
mockStorageService.deleteObject.mockResolvedValue(undefined);
|
|
});
|
|
|
|
it.each([
|
|
["patch", (app: express.Express) => request(app).patch(`/api/issues/${issueId}`).send({ title: "Blocked" })],
|
|
["delete", (app: express.Express) => request(app).delete(`/api/issues/${issueId}`)],
|
|
["comment", (app: express.Express) => request(app).post(`/api/issues/${issueId}/comments`).send({ body: "blocked" })],
|
|
[
|
|
"document upsert",
|
|
(app: express.Express) =>
|
|
request(app).put(`/api/issues/${issueId}/documents/plan`).send({ format: "markdown", body: "# blocked" }),
|
|
],
|
|
["work product update", (app: express.Express) => request(app).patch("/api/work-products/product-1").send({ title: "Blocked" })],
|
|
[
|
|
"attachment upload",
|
|
(app: express.Express) =>
|
|
request(app)
|
|
.post(`/api/companies/${companyId}/issues/${issueId}/attachments`)
|
|
.attach("file", Buffer.from("report"), { filename: "report.txt", contentType: "text/plain" }),
|
|
],
|
|
["attachment delete", (app: express.Express) => request(app).delete("/api/attachments/attachment-1")],
|
|
])("rejects peer agent %s on another agent's active checkout", async (_name, sendRequest) => {
|
|
const res = await sendRequest(await createApp(peerActor()));
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(409);
|
|
expect(res.body.error).toBe("Issue is checked out by another agent");
|
|
expect(mockIssueService.assertCheckoutOwner).not.toHaveBeenCalled();
|
|
expect(mockIssueService.update).not.toHaveBeenCalled();
|
|
expect(mockIssueService.addComment).not.toHaveBeenCalled();
|
|
expect(mockDocumentService.upsertIssueDocument).not.toHaveBeenCalled();
|
|
expect(mockWorkProductService.update).not.toHaveBeenCalled();
|
|
expect(mockStorageService.putFile).not.toHaveBeenCalled();
|
|
expect(mockStorageService.deleteObject).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("allows the checked-out owner with the matching run id to patch and update documents", async () => {
|
|
const app = await createApp(ownerActor());
|
|
|
|
await request(app).patch(`/api/issues/${issueId}`).send({ title: "Updated" }).expect(200);
|
|
await request(app)
|
|
.put(`/api/issues/${issueId}/documents/plan`)
|
|
.send({ format: "markdown", body: "# updated" })
|
|
.expect(200);
|
|
|
|
expect(mockIssueService.assertCheckoutOwner).toHaveBeenCalledWith(issueId, ownerAgentId, ownerRunId);
|
|
expect(mockIssueService.update).toHaveBeenCalled();
|
|
expect(mockDocumentService.upsertIssueDocument).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
issueId,
|
|
key: "plan",
|
|
createdByAgentId: ownerAgentId,
|
|
createdByRunId: ownerRunId,
|
|
lockedDocumentStrategy: "create_new_document",
|
|
}),
|
|
);
|
|
});
|
|
|
|
it("preserves committed issue updates, comments, documents, and work product writes when recovery revalidation fails", async () => {
|
|
const app = await createApp(ownerActor());
|
|
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockRejectedValueOnce(new Error("revalidation read failed"));
|
|
await request(app)
|
|
.patch(`/api/issues/${issueId}`)
|
|
.send({ title: "Updated after commit" })
|
|
.expect(200);
|
|
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockRejectedValueOnce(new Error("revalidation read failed"));
|
|
await request(app)
|
|
.post(`/api/issues/${issueId}/comments`)
|
|
.send({ body: "progress update" })
|
|
.expect(201);
|
|
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockRejectedValueOnce(new Error("revalidation read failed"));
|
|
await request(app)
|
|
.put(`/api/issues/${issueId}/documents/plan`)
|
|
.send({ format: "markdown", body: "# updated" })
|
|
.expect(200);
|
|
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockRejectedValueOnce(new Error("revalidation read failed"));
|
|
await request(app)
|
|
.patch("/api/work-products/product-1")
|
|
.send({ title: "Updated product" })
|
|
.expect(200);
|
|
|
|
expect(mockIssueService.update).toHaveBeenCalledWith(
|
|
issueId,
|
|
expect.objectContaining({ title: "Updated after commit" }),
|
|
);
|
|
expect(mockIssueService.addComment).toHaveBeenCalledWith(
|
|
issueId,
|
|
"progress update",
|
|
expect.any(Object),
|
|
expect.any(Object),
|
|
);
|
|
expect(mockDocumentService.upsertIssueDocument).toHaveBeenCalled();
|
|
expect(mockWorkProductService.update).toHaveBeenCalledWith("product-1", { title: "Updated product" });
|
|
});
|
|
|
|
it("preserves board mutations on active checkouts", async () => {
|
|
const app = await createApp(boardActor());
|
|
|
|
await request(app).patch(`/api/issues/${issueId}`).send({ title: "Board update" }).expect(200);
|
|
await request(app)
|
|
.put(`/api/issues/${issueId}/documents/plan`)
|
|
.send({ format: "markdown", body: "# board" })
|
|
.expect(200);
|
|
|
|
expect(mockIssueService.assertCheckoutOwner).not.toHaveBeenCalled();
|
|
expect(mockIssueService.update).toHaveBeenCalled();
|
|
expect(mockDocumentService.upsertIssueDocument).toHaveBeenCalled();
|
|
});
|
|
|
|
it("allows agents with the active-checkout management grant to mutate active checkouts", async () => {
|
|
mockAccessService.hasPermission.mockImplementation(async (
|
|
_companyId: string,
|
|
_principalType: string,
|
|
principalId: string,
|
|
permissionKey: string,
|
|
) => principalId === peerAgentId && permissionKey === "tasks:manage_active_checkouts");
|
|
|
|
const res = await request(await createApp(peerActor())).patch(`/api/issues/${issueId}`).send({ title: "Managed update" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockIssueService.assertCheckoutOwner).not.toHaveBeenCalled();
|
|
expect(mockIssueService.update).toHaveBeenCalled();
|
|
});
|
|
|
|
it.each([
|
|
["todo", "patch", (app: express.Express) => request(app).patch(`/api/issues/${issueId}`).send({ title: "Todo update" })],
|
|
["todo", "comment", (app: express.Express) => request(app).post(`/api/issues/${issueId}/comments`).send({ body: "Todo noise" })],
|
|
["blocked", "patch", (app: express.Express) => request(app).patch(`/api/issues/${issueId}`).send({ title: "Blocked update" })],
|
|
])("rejects peer agent %s issue %s mutations outside active checkout ownership", async (status, _kind, sendRequest) => {
|
|
mockIssueService.getById.mockResolvedValue(makeIssue({ status: status as "todo" | "blocked", assigneeAgentId: ownerAgentId }));
|
|
|
|
const res = await sendRequest(await createApp(peerActor()));
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(403);
|
|
expect(res.body.error).toBe("Agent cannot mutate another agent's issue");
|
|
expect(mockIssueService.assertCheckoutOwner).not.toHaveBeenCalled();
|
|
expect(mockIssueService.update).not.toHaveBeenCalled();
|
|
expect(mockIssueService.addComment).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("allows same-company agent mutations on unassigned in-progress issues", async () => {
|
|
mockIssueService.getById.mockResolvedValue(makeIssue({ assigneeAgentId: null }));
|
|
mockIssueService.update.mockImplementation(async (_id: string, patch: Record<string, unknown>) => ({
|
|
...makeIssue({ assigneeAgentId: null }),
|
|
...patch,
|
|
}));
|
|
|
|
const res = await request(await createApp(peerActor())).patch(`/api/issues/${issueId}`).send({ title: "Claimable update" });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(mockIssueService.assertCheckoutOwner).not.toHaveBeenCalled();
|
|
expect(res.body).toMatchObject({
|
|
id: issueId,
|
|
assigneeAgentId: null,
|
|
title: "Claimable update",
|
|
});
|
|
});
|
|
|
|
it("rejects peer-agent status updates that would clear a recovery action they do not own", async () => {
|
|
mockIssueService.getById.mockResolvedValue(
|
|
makeIssue({ status: "blocked", assigneeAgentId: null, assigneeUserId: "board-user" }),
|
|
);
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockResolvedValue({
|
|
id: recoveryActionId,
|
|
ownerAgentId,
|
|
});
|
|
|
|
const res = await request(await createApp(peerActor())).patch(`/api/issues/${issueId}`).send({ status: "todo" });
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(403);
|
|
expect(res.body.error).toBe("Agent cannot resolve another owner's recovery action");
|
|
expect(mockIssueService.update).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects peer-agent recovery resolution on a board-owned source issue", async () => {
|
|
mockIssueService.getById.mockResolvedValue(
|
|
makeIssue({ status: "blocked", assigneeAgentId: null, assigneeUserId: "board-user" }),
|
|
);
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockResolvedValue({
|
|
id: recoveryActionId,
|
|
ownerAgentId,
|
|
});
|
|
|
|
const res = await request(await createApp(peerActor()))
|
|
.post(`/api/issues/${issueId}/recovery-actions/resolve`)
|
|
.send({
|
|
actionId: recoveryActionId,
|
|
outcome: "restored",
|
|
sourceIssueStatus: "done",
|
|
});
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(403);
|
|
expect(res.body.error).toBe("Agent cannot resolve another owner's recovery action");
|
|
expect(mockIssueRecoveryActionService.resolveActiveForIssue).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("allows the named recovery owner to resolve a board-owned source issue", async () => {
|
|
mockIssueService.getById.mockResolvedValue(
|
|
makeIssue({ status: "blocked", assigneeAgentId: null, assigneeUserId: "board-user" }),
|
|
);
|
|
mockIssueService.update.mockImplementation(async (_id: string, patch: Record<string, unknown>) => ({
|
|
...makeIssue({ status: "blocked", assigneeAgentId: null, assigneeUserId: "board-user" }),
|
|
...patch,
|
|
}));
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockResolvedValue({
|
|
id: recoveryActionId,
|
|
ownerAgentId,
|
|
});
|
|
|
|
const res = await request(await createApp(ownerActor()))
|
|
.post(`/api/issues/${issueId}/recovery-actions/resolve`)
|
|
.send({
|
|
actionId: recoveryActionId,
|
|
outcome: "restored",
|
|
sourceIssueStatus: "done",
|
|
});
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(mockIssueService.update).toHaveBeenCalled();
|
|
expect(mockIssueRecoveryActionService.resolveActiveForIssue).toHaveBeenCalled();
|
|
});
|
|
|
|
it("wakes the assigned agent when recovery resolution restores a source issue to todo", async () => {
|
|
mockIssueService.getById.mockResolvedValue(
|
|
makeIssue({ status: "blocked", assigneeAgentId: ownerAgentId }),
|
|
);
|
|
mockIssueService.update.mockImplementation(async (_id: string, patch: Record<string, unknown>) => ({
|
|
...makeIssue({ status: "blocked", assigneeAgentId: ownerAgentId }),
|
|
...patch,
|
|
}));
|
|
mockIssueRecoveryActionService.getActiveForIssue.mockResolvedValue({
|
|
id: recoveryActionId,
|
|
ownerAgentId,
|
|
});
|
|
|
|
const res = await request(await createApp(ownerActor()))
|
|
.post(`/api/issues/${issueId}/recovery-actions/resolve`)
|
|
.send({
|
|
actionId: recoveryActionId,
|
|
outcome: "restored",
|
|
sourceIssueStatus: "todo",
|
|
});
|
|
|
|
expect(res.status, JSON.stringify(res.body)).toBe(200);
|
|
expect(mockHeartbeatService.wakeup).toHaveBeenCalledWith(
|
|
ownerAgentId,
|
|
expect.objectContaining({
|
|
reason: "issue_recovery_action_restored",
|
|
payload: expect.objectContaining({
|
|
issueId,
|
|
recoveryActionId,
|
|
mutation: "recovery_action_resolution",
|
|
}),
|
|
}),
|
|
);
|
|
});
|
|
});
|