mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-04 02:32:07 +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>
197 lines
12 KiB
TypeScript
197 lines
12 KiB
TypeScript
import { z } from "zod";
|
|
import { createReadStream, createWriteStream } from "node:fs";
|
|
import { lstat, mkdir, mkdtemp, readFile, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
|
|
import { createHash } from "node:crypto";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { Readable } from "node:stream";
|
|
import { pipeline } from "node:stream/promises";
|
|
import { and, desc, eq, sql } from "drizzle-orm";
|
|
import { workspaceOperations, type Db } from "@paperclipai/db";
|
|
import type { AdapterSandboxExecutionTarget } from "@paperclipai/adapter-utils/execution-target";
|
|
import { createCommandManagedRuntimeClient } from "@paperclipai/adapter-utils/command-managed-runtime";
|
|
import { createTarballFromDirectory, exportSandboxWorkspaceSnapshot, restoreVerifiedSnapshotArchive } from "@paperclipai/adapter-utils/sandbox-managed-runtime";
|
|
import { captureDirectorySnapshotOffThread, disposeDirectorySnapshot } from "@paperclipai/adapter-utils/workspace-restore-merge";
|
|
import { getStorageService, type StorageService } from "../storage/index.js";
|
|
import { SystemRecoveryFailure } from "./system-recovery-state.js";
|
|
import { recoveryRunAncestry } from "./recovery-run-ancestry.js";
|
|
|
|
const storedFileSchema = z.object({ objectKey: z.string().min(1), sha256: z.string().regex(/^[a-f0-9]{64}$/), byteSize: z.number().int().positive() });
|
|
type StoredFile = z.infer<typeof storedFileSchema>;
|
|
const snapshotSchema = z.object({
|
|
schema: z.literal("paperclip.workspace-recovery-snapshot.v1"), recoveryActionId: z.string().uuid(),
|
|
leaseId: z.string().uuid(), providerLeaseId: z.string().min(1), archive: storedFileSchema, manifest: storedFileSchema,
|
|
});
|
|
export type PreservedWorkspaceSnapshot = z.infer<typeof snapshotSchema>;
|
|
export function readSnapshot(value: unknown, companyId: string, runId: string) {
|
|
const parsed = snapshotSchema.safeParse(value);
|
|
if (!parsed.success) throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
const s = parsed.data;
|
|
const prefix = `${companyId}/workspace-recovery/${runId}/${s.leaseId}/`;
|
|
if (s.archive.objectKey !== `${prefix}${s.archive.sha256}.tar` || s.manifest.objectKey !== `${prefix}${s.manifest.sha256}.jsonl`)
|
|
throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
return s;
|
|
}
|
|
|
|
async function digest(stream: AsyncIterable<Buffer | string>, limit = Number.MAX_SAFE_INTEGER) {
|
|
const hash = createHash("sha256");
|
|
let byteSize = 0;
|
|
for await (const chunk of stream) {
|
|
byteSize += Buffer.byteLength(chunk);
|
|
if (byteSize > limit) throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
hash.update(chunk);
|
|
}
|
|
return { sha256: hash.digest("hex"), byteSize };
|
|
}
|
|
|
|
export async function verifyStoredRecoveryFile(storage: StorageService, companyId: string, file: StoredFile) {
|
|
const object = await storage.getObject(companyId, file.objectKey);
|
|
try {
|
|
const actual = await digest(object.stream, file.byteSize);
|
|
if (actual.sha256 !== file.sha256 || actual.byteSize !== file.byteSize)
|
|
throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
} finally { object.stream.destroy(); }
|
|
}
|
|
|
|
/** The durable operation is written before uploading. A lost upload reply or
|
|
* DB commit is reconciled against that same object identity on the next pass. */
|
|
export async function preserveWorkspaceSnapshot(input: {
|
|
db: Db; companyId: string; issueId: string; runId: string; actionId: string;
|
|
leaseId: string; providerLeaseId: string; target: AdapterSandboxExecutionTarget;
|
|
assertHeld(): Promise<void>;
|
|
}) {
|
|
if (!input.target.runner) throw new SystemRecoveryFailure("source_unavailable", "service_required");
|
|
const storage = getStorageService();
|
|
const scope = and(eq(workspaceOperations.companyId, input.companyId),
|
|
eq(workspaceOperations.heartbeatRunId, input.runId), eq(workspaceOperations.phase, "workspace_recovery_snapshot"),
|
|
sql`${workspaceOperations.metadata}->>'leaseId' = ${input.leaseId}`,
|
|
sql`${workspaceOperations.metadata}->>'providerLeaseId' = ${input.providerLeaseId}`,
|
|
sql`${workspaceOperations.metadata}->>'recoveryActionId' = ${input.actionId}`);
|
|
const [existing] = await input.db.select().from(workspaceOperations).where(scope)
|
|
.orderBy(desc(workspaceOperations.createdAt)).limit(1);
|
|
if (existing?.metadata?.schema === "paperclip.workspace-recovery-snapshot.v1") {
|
|
const saved = readSnapshot(existing.metadata, input.companyId, input.runId);
|
|
const heads = await Promise.all([storage.headObject(input.companyId, saved.archive.objectKey),
|
|
storage.headObject(input.companyId, saved.manifest.objectKey)]);
|
|
if (heads.every(head => head.exists)) {
|
|
await verifyStoredRecoveryFile(storage, input.companyId, saved.archive);
|
|
await verifyStoredRecoveryFile(storage, input.companyId, saved.manifest);
|
|
await input.assertHeld();
|
|
await input.db.update(workspaceOperations).set({ status: "succeeded", finishedAt: new Date(), updatedAt: new Date() })
|
|
.where(eq(workspaceOperations.id, existing.id));
|
|
return existing.id;
|
|
}
|
|
if (existing.status === "succeeded") throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
}
|
|
const root = await mkdtemp(path.join(os.tmpdir(), "paperclip-preserve-"));
|
|
try {
|
|
await input.assertHeld();
|
|
const client = createCommandManagedRuntimeClient({ runner: input.target.runner,
|
|
commandCwd: input.target.remoteCwd, timeoutMs: input.target.timeoutMs ?? 120_000 });
|
|
const directory = path.join(root, "files");
|
|
await exportSandboxWorkspaceSnapshot({ client, remoteDir: input.target.remoteCwd,
|
|
stagingDir: directory, operationId: `preserve:${input.actionId}:${input.leaseId}` }).catch(error => {
|
|
if (error?.code === "WORKSPACE_SNAPSHOT_EXPORT_UNSUPPORTED")
|
|
throw new SystemRecoveryFailure("source_unavailable", "use_alternative_strategy");
|
|
throw error;
|
|
});
|
|
await input.assertHeld();
|
|
const manifestPath = path.join(root, "manifest.jsonl");
|
|
const snapshot = await captureDirectorySnapshotOffThread(directory, { exclude: [], diskBacked: true });
|
|
try {
|
|
await pipeline(Readable.from((function* () {
|
|
yield `${JSON.stringify({ schema: "paperclip.workspace-file-manifest.v1" })}\n`;
|
|
for (const entry of snapshot.entries) yield `${JSON.stringify(entry)}\n`;
|
|
})()), createWriteStream(manifestPath, { flags: "wx", mode: 0o600 }));
|
|
} finally { await disposeDirectorySnapshot(snapshot); }
|
|
const archivePath = path.join(root, "workspace.tar");
|
|
await createTarballFromDirectory({ localDir: directory, archivePath });
|
|
const files = await Promise.all([archivePath, manifestPath].map(async file => ({
|
|
...await digest(createReadStream(file)), file,
|
|
})));
|
|
const prefix = `${input.companyId}/workspace-recovery/${input.runId}/${input.leaseId}`;
|
|
const stored = files.map((file, index) => ({ objectKey: `${prefix}/${file.sha256}.${index === 0 ? "tar" : "jsonl"}`,
|
|
sha256: file.sha256, byteSize: file.byteSize }));
|
|
const metadata: PreservedWorkspaceSnapshot = { schema: "paperclip.workspace-recovery-snapshot.v1",
|
|
recoveryActionId: input.actionId, leaseId: input.leaseId, providerLeaseId: input.providerLeaseId,
|
|
archive: stored[0], manifest: stored[1] };
|
|
await input.assertHeld();
|
|
const [operation] = existing
|
|
? await input.db.update(workspaceOperations).set({ metadata, status: "running", updatedAt: new Date() })
|
|
.where(eq(workspaceOperations.id, existing.id)).returning()
|
|
: await input.db.insert(workspaceOperations).values({ companyId: input.companyId, issueId: input.issueId,
|
|
heartbeatRunId: input.runId, phase: "workspace_recovery_snapshot", status: "running", metadata }).returning();
|
|
for (const [index, file] of files.entries()) {
|
|
if (!(await storage.headObject(input.companyId, stored[index].objectKey)).exists) {
|
|
if ((await stat(file.file)).size === 0) {
|
|
throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
}
|
|
await storage.putFile({ companyId: input.companyId, namespace: "workspace-recovery",
|
|
originalFilename: path.basename(file.file), contentType: index === 0 ? "application/x-tar" : "application/x-ndjson",
|
|
objectKey: stored[index].objectKey, body: createReadStream(file.file), sha256: file.sha256, byteSize: file.byteSize });
|
|
}
|
|
await verifyStoredRecoveryFile(storage, input.companyId, stored[index]);
|
|
}
|
|
await input.assertHeld();
|
|
await input.db.update(workspaceOperations).set({ status: "succeeded", finishedAt: new Date(), updatedAt: new Date() })
|
|
.where(eq(workspaceOperations.id, operation.id));
|
|
return operation.id;
|
|
} finally { await rm(root, { recursive: true, force: true }); }
|
|
}
|
|
|
|
/** Recovered files are an attachment to a fresh attempt, never an overlay.
|
|
* Atomically publish each immutable snapshot directory after verification. */
|
|
export async function attachPreservedWorkspaceSnapshots(input: {
|
|
db: Db; companyId: string; issueId: string; sourceRunIds: string[]; cwd: string;
|
|
}) {
|
|
const storage = getStorageService();
|
|
const results: Array<{ operationId: string; path: string; sourceRunId: string }> = [];
|
|
const sources = await recoveryRunAncestry(input);
|
|
for (const { id: sourceRunId } of sources) {
|
|
const rows = await input.db.select().from(workspaceOperations).where(and(
|
|
eq(workspaceOperations.companyId, input.companyId), eq(workspaceOperations.issueId, input.issueId),
|
|
eq(workspaceOperations.heartbeatRunId, sourceRunId), eq(workspaceOperations.phase, "workspace_recovery_snapshot"),
|
|
eq(workspaceOperations.status, "succeeded")));
|
|
for (const operation of rows) {
|
|
const saved = readSnapshot(operation.metadata, input.companyId, sourceRunId);
|
|
const parent = path.join(await realpath(input.cwd), ".paperclip-recovered");
|
|
await mkdir(parent, { mode: 0o700 }).catch((error: NodeJS.ErrnoException) => { if (error.code !== "EEXIST") throw error; });
|
|
if ((await lstat(parent)).isSymbolicLink() || await realpath(parent) !== parent)
|
|
throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
const destination = path.join(parent, operation.id);
|
|
const provenance = { schema: saved.schema, operationId: operation.id, sourceRunId,
|
|
leaseId: saved.leaseId, sha256: saved.archive.sha256 };
|
|
const priorStat = await lstat(destination).catch((error: NodeJS.ErrnoException) => { if (error.code !== "ENOENT") throw error; return null; });
|
|
if (priorStat && (!priorStat.isDirectory() || priorStat.isSymbolicLink() || await realpath(destination) !== destination))
|
|
throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
const provenancePath = path.join(destination, "provenance.json");
|
|
if (priorStat) {
|
|
const proof = await lstat(provenancePath).catch(() => null);
|
|
if (!proof?.isFile() || proof.isSymbolicLink())
|
|
throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
}
|
|
const prior = priorStat ? await readFile(provenancePath, "utf8").catch(() => null) : null;
|
|
if (prior === JSON.stringify(provenance)) {
|
|
results.push({ operationId: operation.id, path: destination, sourceRunId });
|
|
continue;
|
|
}
|
|
if (priorStat) throw new SystemRecoveryFailure("snapshot_verification_failed", "service_required");
|
|
await verifyStoredRecoveryFile(storage, input.companyId, saved.manifest);
|
|
const staging = await mkdtemp(path.join(parent, ".preparing-"));
|
|
try {
|
|
const archivePath = path.join(staging, "snapshot.tar");
|
|
const object = await storage.getObject(input.companyId, saved.archive.objectKey);
|
|
try { await pipeline(object.stream, createWriteStream(archivePath, { flags: "wx", mode: 0o600 })); }
|
|
finally { object.stream.destroy(); }
|
|
await restoreVerifiedSnapshotArchive({ archivePath, localDir: path.join(staging, "files"), ...saved.archive });
|
|
await rm(archivePath);
|
|
await writeFile(path.join(staging, "provenance.json"), JSON.stringify(provenance), { flag: "wx", mode: 0o600 });
|
|
// Never replace an earlier attachment or user edits on a restart.
|
|
await rename(staging, destination);
|
|
results.push({ operationId: operation.id, path: destination, sourceRunId });
|
|
} finally { await rm(staging, { recursive: true, force: true }); }
|
|
}
|
|
}
|
|
return results;
|
|
}
|