mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-25 09:41:04 +01:00
## Thinking Path > - Paperclip coordinates AI agents and retains their work across failures. > - A retry can require a new workspace while preserving the failed attempt. > - Core rejects this recovery strategy for provider-owned storage. > - Providers should implement the required outcome using their own storage design. > - This pull request adds a semantic fresh-preparation contract and delegates recovery preparation. > - The benefit is that a supported provider can run a fresh retry without losing prior work. ## Linked Issues or Issue Description **What happened?** A retry that selects `fresh_isolated_workspace` fails with `fresh_workspace_storage_unsupported` for provider-owned storage. **Expected behavior** Core asks a capable provider to prepare new storage and attach verified recovery files. The failed workspace remains intact. **Steps to reproduce** Run a task in a task-capable plugin environment. Let the task fail without a verified workspace preservation receipt. Retry the task so Core selects a fresh attempt. **Paperclip version or commit**6204239cf(rebased on current master). **Deployment mode** Self-hosted server with a plugin task environment and managed workspace provider. Search found no duplicate implementation. This branch includes the default-provider changes from #17247 and preserves their source selection behavior. ## What Changed - Define an opt-in fresh-preparation contract with a stable attempt identity and verified recovery file descriptors. - Describe retained-storage and recovery-attachment guarantees without requiring a Git storage layout. - Reserve replacement task bindings with revision checks and keep the failed workspace intact. Projectless and project-backed task environments both replay their stable attempt reservation. - Reconcile an interrupted preparation against its reserved workspace and stable operation identity. - Stage verified recovery archives at stable transfer paths. Delegate attachment materialization to the provider. - Preserve projectless attempt directory identities through later turns and pin the intent into each execution lease. - Protect fresh intent and projectless ownership from caller metadata replacement or injection. ## Verification - SDK workspace-provider tests: 4 passed. - Targeted reservation and task-dispatch tests: 31 passed. - Recovery transfer staging and lifecycle focus: 7 passed. The separate cache-cleanup failure reconciliation case also passed. - After rebasing on current master, 7 focused preparation and ownership cases passed. These cover inherited provider defaults, fresh preparation, stable projectless identity, and authorization denial. - The focused metadata authority regression passed, including forged intent, replacement, and null metadata patches. - Three assembled interrupted task-reservation cases passed: projectless, project with a saved source, and project with a newly selected default source. - Targeted tests use worktree SDK sources. No full local build or typecheck ran. - Local checks remain targeted as requested. Latest-head GitHub CI passed: 54 successful checks, including typecheck, build, server suites, Runner validation, and E2E shards; 2 unrelated Storybook checks were skipped. - Greptile reviewed commit73595b0c61at 5/5 with zero unresolved threads. - Live VM E2E has not run. ## Risks - Existing providers retain their existing behavior. Fresh attempts require explicit version support. - The companion provider implementation must materialize recovery snapshots safely and preserve the old workspace. - Fresh retries require the companion provider implementation. Providers without the version marker fail closed. ## Model Used - OpenAI GPT-6.1 (`gpt-6.1-sol`), reasoning and coding tools. The runtime does not expose the context-window limit. ## 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 searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
125 lines
8.8 KiB
TypeScript
125 lines
8.8 KiB
TypeScript
import { randomUUID } from "node:crypto";
|
|
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { eq, sql } from "drizzle-orm";
|
|
import { createDb, executionWorkspaces, heartbeatRuns, issues, plugins } from "@paperclipai/db";
|
|
import { preparePluginWorkspace, removePluginWorkspace } from "../services/plugin-workspaces.js";
|
|
import { executionWorkspaceService } from "../services/execution-workspaces.js";
|
|
import { reserveFreshPluginTaskWorkspace } from "../services/provider-fresh-workspace.js";
|
|
import { createPluginWorkspaceFixture } from "./helpers/plugin-workspaces.js";
|
|
import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase } from "./helpers/embedded-postgres.js";
|
|
|
|
const cache = vi.hoisted(() => ({ release: vi.fn() }));
|
|
vi.mock("../services/provider-fresh-workspace.js", async importOriginal => ({
|
|
...await importOriginal<typeof import("../services/provider-fresh-workspace.js")>(),
|
|
releaseProviderRecoveryTransfers: cache.release,
|
|
}));
|
|
const support = await getEmbeddedPostgresTestSupport();
|
|
describe.skipIf(!support.supported)("provider-owned fresh retry reservations", () => {
|
|
let db: ReturnType<typeof createDb>, stopDb: (() => Promise<void>) | undefined;
|
|
beforeAll(async () => {
|
|
const started = await startEmbeddedPostgresTestDatabase("plugin-fresh-workspaces");
|
|
db = createDb(started.connectionString); stopDb = started.stop;
|
|
});
|
|
afterAll(async () => { await db?.$client.end(); await stopDb?.(); });
|
|
beforeEach(() => { cache.release.mockReset().mockResolvedValue(undefined); });
|
|
async function fixture() {
|
|
const f = await createPluginWorkspaceFixture(db);
|
|
const previous = await preparePluginWorkspace(db, f.workers, f.input);
|
|
await db.update(heartbeatRuns).set({ status: "failed" }).where(eq(heartbeatRuns.id, f.runId));
|
|
const [run] = await db.insert(heartbeatRuns).values({ companyId: f.companyId, agentId: f.input.agentId,
|
|
issueId: f.issueId, status: "running" }).returning();
|
|
const fresh = { attemptId: randomUUID(), sourceRunId: f.runId, previousWorkspaceId: previous!.id, recoverySnapshots: [] };
|
|
const input = { ...f.input, runId: run.id, existingWorkspaceId: previous!.id, fresh, expectedBindingRevision: 1 };
|
|
return { ...f, previous: previous!, fresh, input };
|
|
}
|
|
const enable = async (id: string) => db.update(plugins).set({ manifestJson:
|
|
sql`jsonb_set(${plugins.manifestJson}, '{workspaceProvider,freshWorkspaceVersion}', '1')` }).where(eq(plugins.id, id));
|
|
it("fails closed for an older provider without replacing the old task binding", async () => {
|
|
const f = await fixture();
|
|
await expect(preparePluginWorkspace(db, f.workers, f.input)).rejects.toThrow("fresh attempt is unavailable");
|
|
const [task] = await db.select().from(issues).where(eq(issues.id, f.issueId));
|
|
expect(task.executionWorkspaceId).toBe(f.previous.id);
|
|
expect(f.calls).toHaveLength(1);
|
|
});
|
|
it("reserves a new binding once and reconciles the same operation after a lost provider reply", async () => {
|
|
const f = await fixture(); await enable(f.pluginId);
|
|
f.lose();
|
|
await expect(preparePluginWorkspace(db, f.workers, f.input)).rejects.toThrow("incomplete");
|
|
const ambiguous = f.calls.at(-1);
|
|
const workspace = await preparePluginWorkspace(db, f.workers, f.input);
|
|
expect(workspace!.id).not.toBe(f.previous.id);
|
|
expect(f.calls.at(-1).executionWorkspaceId).toBe(ambiguous.executionWorkspaceId);
|
|
expect(f.calls.at(-1).operationId).toBe(ambiguous.operationId);
|
|
expect(f.calls.at(-1).operation).toMatchObject({ fresh: f.fresh, branchMode: "create", branchName: null, existing: null });
|
|
const [retained] = await db.select().from(executionWorkspaces).where(eq(executionWorkspaces.id, f.previous.id));
|
|
expect(retained.providerRef).toBe(f.previous.providerRef);
|
|
expect(retained.metadata).toEqual(f.previous.metadata);
|
|
const rows = await db.select().from(executionWorkspaces).where(eq(executionWorkspaces.companyId, f.companyId));
|
|
expect(rows).toHaveLength(2);
|
|
});
|
|
it("keeps fresh directory authority server-owned through metadata updates", async () => {
|
|
const f = await fixture(); await enable(f.pluginId);
|
|
const service = executionWorkspaceService(db);
|
|
const original = await service.update(f.previous.id, { metadata: {
|
|
note: "ordinary metadata", workspaceProviderFresh: f.fresh, runnerTaskFreshWorkspace: f.fresh,
|
|
runnerTaskWorkspaceOwner: { pluginKey: "forged" },
|
|
} });
|
|
expect(original!.metadata).toMatchObject({ note: "ordinary metadata" });
|
|
for (const key of ["workspaceProviderFresh", "runnerTaskFreshWorkspace", "runnerTaskWorkspaceOwner"]) {
|
|
expect(original!.metadata?.[key]).toBeUndefined();
|
|
}
|
|
const prepared = await preparePluginWorkspace(db, f.workers, f.input);
|
|
const updated = await service.update(prepared!.id, { metadata: { note: "caller edit", workspaceProviderFresh: null } });
|
|
expect(updated!.metadata).toMatchObject({ note: "caller edit", workspaceProviderFresh: f.fresh });
|
|
await db.update(issues).set({ projectId: null, projectWorkspaceId: null }).where(eq(issues.id, f.issueId));
|
|
const owner = { agentId: f.input.agentId, environmentId: randomUUID(), pluginKey: "test.tasks", driverKey: "tasks" };
|
|
const next = { ...f.fresh, attemptId: randomUUID(), previousWorkspaceId: prepared!.id };
|
|
const id = await reserveFreshPluginTaskWorkspace({ db, companyId: f.companyId, issueId: f.issueId,
|
|
runId: f.input.runId, agentId: f.input.agentId, responsibleUserId: null, fresh: next, owner,
|
|
expectedBindingRevision: 2 });
|
|
const directory = await service.update(id, { metadata: { runnerTaskFreshWorkspace: f.fresh,
|
|
runnerTaskWorkspaceOwner: { pluginKey: "forged" } } });
|
|
expect(directory!.metadata).toMatchObject({ runnerTaskFreshWorkspace: next, runnerTaskWorkspaceOwner: owner });
|
|
const cleared = await service.update(id, { metadata: null });
|
|
expect(cleared!.metadata).toMatchObject({ runnerTaskFreshWorkspace: next, runnerTaskWorkspaceOwner: owner });
|
|
});
|
|
it("retains the durable removal intent if transfer cache cleanup fails", async () => {
|
|
const f = await fixture(); await enable(f.pluginId);
|
|
const workspace = await preparePluginWorkspace(db, f.workers, f.input);
|
|
const [closed] = await db.update(executionWorkspaces).set({ status: "archived" })
|
|
.where(eq(executionWorkspaces.id, workspace!.id)).returning();
|
|
cache.release.mockRejectedValueOnce(new Error("temporary cache cleanup failure"));
|
|
await expect(removePluginWorkspace(db, f.workers, closed, "a".repeat(40))).rejects.toThrow("cache cleanup failure");
|
|
const [pending] = await db.select().from(executionWorkspaces).where(eq(executionWorkspaces.id, workspace!.id));
|
|
expect(pending.metadata?.workspaceProviderRemoval).toBeTruthy();
|
|
expect(pending.metadata?.workspaceProviderRemoved).not.toBe(true);
|
|
await removePluginWorkspace(db, f.workers, pending, "a".repeat(40));
|
|
const [settled] = await db.select().from(executionWorkspaces).where(eq(executionWorkspaces.id, workspace!.id));
|
|
expect(settled.metadata?.workspaceProviderRemoved).toBe(true);
|
|
expect(cache.release).toHaveBeenCalledTimes(2);
|
|
});
|
|
it("rejects a changed task revision before calling the provider", async () => {
|
|
const f = await fixture(); await enable(f.pluginId);
|
|
await db.update(issues).set({ workspaceBindingRevision: 2 }).where(eq(issues.id, f.issueId));
|
|
await expect(preparePluginWorkspace(db, f.workers, f.input)).rejects.toThrow("binding changed");
|
|
expect(f.calls).toHaveLength(1);
|
|
});
|
|
it("keeps one projectless attempt directory identity across reconciliation and later reuse", async () => {
|
|
const f = await fixture();
|
|
await db.update(issues).set({ projectId: null, projectWorkspaceId: null }).where(eq(issues.id, f.issueId));
|
|
const owner = { agentId: f.input.agentId, environmentId: randomUUID(), pluginKey: "test.tasks", driverKey: "tasks" };
|
|
const input = { db, companyId: f.companyId, issueId: f.issueId, runId: f.input.runId,
|
|
agentId: f.input.agentId, responsibleUserId: null, fresh: f.fresh, owner, expectedBindingRevision: 1 };
|
|
const id = await reserveFreshPluginTaskWorkspace(input);
|
|
expect(await reserveFreshPluginTaskWorkspace(input)).toBe(id);
|
|
const [workspace] = await db.select().from(executionWorkspaces).where(eq(executionWorkspaces.id, id));
|
|
expect(workspace.metadata).toMatchObject({ runnerTaskFreshWorkspace: f.fresh, runnerTaskWorkspaceOwner: owner });
|
|
expect(workspace.cwd).toBe(`/workspaces/${f.fresh.attemptId}`);
|
|
const [task] = await db.select().from(issues).where(eq(issues.id, f.issueId));
|
|
expect(task.executionWorkspaceId).toBe(id);
|
|
expect(task.workspaceBindingRevision).toBe(2);
|
|
await db.update(heartbeatRuns).set({ responsibleUserId: "changed-user" }).where(eq(heartbeatRuns.id, f.input.runId));
|
|
await expect(reserveFreshPluginTaskWorkspace(input)).rejects.toThrow("responsible user changed");
|
|
});
|
|
});
|