mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-17 11:20:37 +09:00
[codex] Improve agent runtime recovery and governance (#4086)
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies. > - The heartbeat runtime, agent import path, and agent configuration defaults determine whether work is dispatched safely and predictably. > - Several accumulated fixes all touched agent execution recovery, wake routing, import behavior, and runtime concurrency defaults. > - Those changes need to land together so the heartbeat service and agent creation defaults stay internally consistent. > - This pull request groups the runtime/governance changes from the split branch into one standalone branch. > - The benefit is safer recovery for stranded runs, bounded high-volume reads, imported-agent approval correctness, skill-template support, and a clearer default concurrency policy. ## What Changed - Fixed stranded continuation recovery so successful automatic retries are requeued instead of incorrectly blocking the issue. - Bounded high-volume issue/log reads across issue, heartbeat, agent, project, and workspace paths. - Fixed imported-agent approval and instruction-path permission handling. - Quarantined seeded worktree execution state during worktree provisioning. - Queued approval follow-up wakes and hardened SQL_ASCII heartbeat output handling. - Added reusable agent instruction templates for hiring flows. - Set the default max concurrent agent runs to five and updated related UI/tests/docs. ## Verification - `pnpm install --frozen-lockfile` - `pnpm exec vitest run server/src/__tests__/company-portability.test.ts server/src/__tests__/heartbeat-process-recovery.test.ts server/src/__tests__/heartbeat-comment-wake-batching.test.ts server/src/__tests__/heartbeat-list.test.ts server/src/__tests__/issues-service.test.ts server/src/__tests__/agent-permissions-routes.test.ts packages/adapter-utils/src/server-utils.test.ts ui/src/lib/new-agent-runtime-config.test.ts` - Split integration check: merged this branch first, followed by the other [PAP-1614](/PAP/issues/PAP-1614) branches, with no merge conflicts. - Confirmed this branch does not include `pnpm-lock.yaml`. ## Risks - Medium risk: touches heartbeat recovery, queueing, and issue list bounds in central runtime paths. - Imported-agent and concurrency default behavior changes may affect existing automation that assumes one-at-a-time default runs. - No database migrations are included. > 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.4 tool-enabled coding model, agentic code-editing/runtime with local shell and GitHub CLI access; exact context window and reasoning mode are not exposed by the Paperclip harness. ## 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>
This commit is contained in:
Dotta
GitHub
parent
057fee4836
commit
16b2b84d84
38 changed files with 1569 additions and 240 deletions
|
|
@ -1539,13 +1539,13 @@ describe("company portability", () => {
|
|||
expect(routineSvc.create).toHaveBeenCalledWith("company-imported", expect.objectContaining({
|
||||
projectId: "project-created",
|
||||
title: "Monday Review",
|
||||
assigneeAgentId: null,
|
||||
assigneeAgentId: "agent-created",
|
||||
priority: "high",
|
||||
status: "paused",
|
||||
concurrencyPolicy: "always_enqueue",
|
||||
catchUpPolicy: "enqueue_missed_with_cap",
|
||||
}), expect.any(Object));
|
||||
expect(result.warnings).toContain(
|
||||
expect(result.warnings).not.toContain(
|
||||
"Task monday-review assignee claudecoder is pending_approval; imported work was left unassigned.",
|
||||
);
|
||||
expect(routineSvc.createTrigger).toHaveBeenCalledTimes(2);
|
||||
|
|
@ -2132,6 +2132,7 @@ describe("company portability", () => {
|
|||
runtimeConfig: {
|
||||
heartbeat: {
|
||||
enabled: false,
|
||||
maxConcurrentRuns: 5,
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
@ -2210,6 +2211,7 @@ describe("company portability", () => {
|
|||
runtimeConfig: {
|
||||
heartbeat: {
|
||||
enabled: false,
|
||||
maxConcurrentRuns: 5,
|
||||
},
|
||||
},
|
||||
}));
|
||||
|
|
@ -2489,7 +2491,7 @@ describe("company portability", () => {
|
|||
expect(agentSvc.create).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("imports new agents through approval and adapter-config normalization", async () => {
|
||||
it("imports new agents as active while preserving future hire approval settings", async () => {
|
||||
const portability = companyPortabilityService({} as any);
|
||||
const exported = await portability.exportBundle("company-1", {
|
||||
include: {
|
||||
|
|
@ -2549,7 +2551,10 @@ describe("company portability", () => {
|
|||
adapterConfig: expect.objectContaining({
|
||||
normalized: true,
|
||||
}),
|
||||
status: "pending_approval",
|
||||
status: "idle",
|
||||
}));
|
||||
expect(companySvc.create).toHaveBeenCalledWith(expect.objectContaining({
|
||||
requireBoardApprovalForNewAgents: true,
|
||||
}));
|
||||
});
|
||||
|
||||
|
|
@ -2614,4 +2619,154 @@ describe("company portability", () => {
|
|||
},
|
||||
}));
|
||||
});
|
||||
|
||||
it("nameOverrides applied after collision detection do not re-validate uniqueness", async () => {
|
||||
const portability = companyPortabilityService({} as any);
|
||||
|
||||
const exported = await portability.exportBundle("company-1", {
|
||||
include: { company: false, agents: true, projects: false, issues: false },
|
||||
});
|
||||
|
||||
// Simulate existing agents so collision detection triggers rename
|
||||
agentSvc.list.mockResolvedValue([
|
||||
{ id: "existing-1", name: "ClaudeCoder", status: "idle", role: "engineer", adapterType: "claude_local", adapterConfig: {}, runtimeConfig: {}, budgetMonthlyCents: 0, permissions: {}, metadata: null },
|
||||
]);
|
||||
|
||||
const preview = await portability.previewImport({
|
||||
source: { type: "inline", rootPath: exported.rootPath, files: exported.files },
|
||||
include: { company: false, agents: true, projects: false, issues: false },
|
||||
target: { mode: "existing_company", companyId: "company-1" },
|
||||
agents: ["claudecoder"],
|
||||
collisionStrategy: "rename",
|
||||
nameOverrides: { claudecoder: "ClaudeCoder" },
|
||||
});
|
||||
|
||||
// The override reverts the renamed agent back to its original collision name.
|
||||
// This is a known limitation: nameOverrides bypass collision checks.
|
||||
const plan = preview.plan.agentPlans.find((p) => p.slug === "claudecoder");
|
||||
expect(plan).toBeDefined();
|
||||
expect(plan!.action).toBe("create");
|
||||
expect(plan!.plannedName).toBe("ClaudeCoder");
|
||||
});
|
||||
|
||||
it("handles circular reportsTo chains without infinite recursion during export", async () => {
|
||||
const portability = companyPortabilityService({} as any);
|
||||
|
||||
agentSvc.list.mockResolvedValue([
|
||||
{
|
||||
id: "agent-a", name: "AgentA", status: "idle", role: "engineer", title: null, icon: null,
|
||||
reportsTo: "agent-b", capabilities: null, adapterType: "claude_local",
|
||||
adapterConfig: {}, runtimeConfig: {}, budgetMonthlyCents: 0, permissions: {}, metadata: null,
|
||||
},
|
||||
{
|
||||
id: "agent-b", name: "AgentB", status: "idle", role: "manager", title: null, icon: null,
|
||||
reportsTo: "agent-a", capabilities: null, adapterType: "claude_local",
|
||||
adapterConfig: {}, runtimeConfig: {}, budgetMonthlyCents: 0, permissions: {}, metadata: null,
|
||||
},
|
||||
]);
|
||||
agentInstructionsSvc.exportFiles.mockResolvedValue({
|
||||
files: { "AGENTS.md": "Instructions" }, entryFile: "AGENTS.md", warnings: [],
|
||||
});
|
||||
|
||||
// Export should complete without infinite recursion in org chart building
|
||||
const exported = await portability.exportBundle("company-1", {
|
||||
include: { company: true, agents: true, projects: false, issues: false },
|
||||
});
|
||||
|
||||
expect(exported.manifest.agents).toHaveLength(2);
|
||||
// Both agents should appear in the export
|
||||
const slugs = exported.manifest.agents.map((a) => a.slug);
|
||||
expect(slugs).toContain("agenta");
|
||||
expect(slugs).toContain("agentb");
|
||||
});
|
||||
|
||||
it("resolves issue assignee to existing agent when agent is skipped", async () => {
|
||||
const portability = companyPortabilityService({} as any);
|
||||
|
||||
projectSvc.list.mockResolvedValue([{
|
||||
id: "project-1", companyId: "company-1", name: "TestProject", urlKey: "testproject",
|
||||
description: null, leadAgentId: null, targetDate: null, color: null, status: "planned",
|
||||
executionWorkspacePolicy: null, archivedAt: null, workspaces: [],
|
||||
}]);
|
||||
issueSvc.list.mockResolvedValue([{
|
||||
id: "issue-1", companyId: "company-1", title: "Test task", identifier: "PAP-1",
|
||||
description: "A test task", status: "todo", priority: "medium",
|
||||
assigneeAgentId: "agent-1", projectId: "project-1", projectWorkspaceId: null,
|
||||
goalId: null, parentId: null, billingCode: null, labelIds: [],
|
||||
executionWorkspaceSettings: null, assigneeAdapterOverrides: null, metadata: null,
|
||||
}]);
|
||||
|
||||
const exported = await portability.exportBundle("company-1", {
|
||||
include: { company: false, agents: true, projects: true, issues: true },
|
||||
});
|
||||
|
||||
// Re-import into same company with skip collision strategy
|
||||
// Both agents exist so both will be skipped; the existing agent should resolve for issue assignment
|
||||
agentSvc.list.mockResolvedValue([
|
||||
{ id: "agent-1", name: "ClaudeCoder", status: "idle", role: "engineer", adapterType: "claude_local", adapterConfig: {}, runtimeConfig: {}, budgetMonthlyCents: 0, permissions: {}, metadata: null },
|
||||
{ id: "agent-2", name: "CMO", status: "idle", role: "cmo", adapterType: "claude_local", adapterConfig: {}, runtimeConfig: {}, budgetMonthlyCents: 0, permissions: {}, metadata: null },
|
||||
]);
|
||||
projectSvc.list.mockResolvedValue([]);
|
||||
issueSvc.list.mockResolvedValue([]);
|
||||
projectSvc.create.mockResolvedValue({ id: "project-new", companyId: "company-1", urlKey: "testproject" });
|
||||
issueSvc.create.mockResolvedValue({ id: "issue-new", identifier: "PAP-100" });
|
||||
|
||||
const result = await portability.importBundle({
|
||||
source: { type: "inline", rootPath: exported.rootPath, files: exported.files },
|
||||
include: { company: false, agents: true, projects: true, issues: true },
|
||||
target: { mode: "existing_company", companyId: "company-1" },
|
||||
agents: "all",
|
||||
collisionStrategy: "skip",
|
||||
}, "user-1");
|
||||
|
||||
// Both agents should be skipped (already exist)
|
||||
const agentResult = result.agents.find((a) => a.slug === "claudecoder");
|
||||
expect(agentResult).toBeDefined();
|
||||
expect(agentResult!.action).toBe("skipped");
|
||||
|
||||
// Issue should still be created and reference the existing agent
|
||||
expect(issueSvc.create).toHaveBeenCalled();
|
||||
const issueCreateCall = issueSvc.create.mock.calls[0];
|
||||
// The assigneeAgentId should resolve to the existing agent via existingSlugToAgentId
|
||||
expect(issueCreateCall[1]).toEqual(expect.objectContaining({
|
||||
assigneeAgentId: "agent-1",
|
||||
}));
|
||||
});
|
||||
|
||||
it("handles a package with only skills (no agents or projects)", async () => {
|
||||
const portability = companyPortabilityService({} as any);
|
||||
|
||||
const exported = await portability.exportBundle("company-1", {
|
||||
include: { company: false, agents: false, projects: false, issues: false, skills: true },
|
||||
expandReferencedSkills: true,
|
||||
});
|
||||
|
||||
expect(exported.manifest.agents).toHaveLength(0);
|
||||
expect(exported.manifest.projects).toHaveLength(0);
|
||||
expect(exported.manifest.issues).toHaveLength(0);
|
||||
// Skills should still be exported
|
||||
expect(exported.manifest.skills.length).toBeGreaterThanOrEqual(0);
|
||||
});
|
||||
|
||||
it("preview import detects no agents to import when agents are excluded", async () => {
|
||||
const portability = companyPortabilityService({} as any);
|
||||
|
||||
const exported = await portability.exportBundle("company-1", {
|
||||
include: { company: true, agents: true, projects: false, issues: false },
|
||||
});
|
||||
|
||||
agentSvc.list.mockResolvedValue([]);
|
||||
|
||||
const preview = await portability.previewImport({
|
||||
source: { type: "inline", rootPath: exported.rootPath, files: exported.files },
|
||||
include: { company: false, agents: false, projects: false, issues: false },
|
||||
target: { mode: "existing_company", companyId: "company-1" },
|
||||
agents: "all",
|
||||
collisionStrategy: "rename",
|
||||
});
|
||||
|
||||
expect(preview.plan.agentPlans).toHaveLength(0);
|
||||
expect(preview.plan.projectPlans).toHaveLength(0);
|
||||
expect(preview.plan.issuePlans).toHaveLength(0);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue