mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-08 11:23:40 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - Native runs copy their sandbox workspace back after the provider finishes. A failed copy-back saves a retry 30 seconds later, with a bound of 3 attempts. > - One shared delivery queue runs these retries. A pass of that queue ends only when its slowest check ends. > - A legitimate sandbox export can take 10+ minutes. While it runs, all other due retries wait. > - On staging, a run active across a deploy showed "Reconnecting" with an overdue retry for about 24 minutes. Its retries ran at +24 min and +3.5 min instead of +30 s. It settled only after about 32 minutes. > - This pull request lets idle check slots admit entries that come due during a pass. It does not overlap a running check's resource and does not start work after abort or drain. > - The benefit is that the existing 3-attempt bound settles a failing copy-back in about 1 minute, not after the slowest unrelated export. ## Linked Issues or Issue Description **What happened?** A native run whose result is durable but whose workspace copy-back failed stays in `running` with the label "Reconnecting" for a long time. Its saved retry time is in the past. The retry does not run until an unrelated slow copy-back in the same queue pass finishes. **Steps to reproduce** 1. Start two native runs on different tasks with accepted results. 2. Let the copy-back of run A take many minutes. 3. Let the copy-back of run B fail. It saves a retry 30 seconds later. 4. Watch run B. Its retry does not run until run A's copy-back ends. **Expected behavior** Run B retries on its saved schedule. After 3 failed attempts it settles with `native_workspace_sync_out_retry_exhausted` and a recovery action, while run A continues. **Paperclip version or commit** master ata0c0851766. Observed on a staging deployment of69dea878. **Agent adapter(s) involved** Not adapter-specific (core bug). Observed with the Paperclip runner. **Relevant logs or output** In-run copy-back failed at 23:44:57 (retry saved for 23:45:28). The deploy restarted the server at 23:49:45. One queue check exported another task's workspace from 23:53:54 to 00:06:15. The overdue retry ran at 00:09:06, then 00:12:39, and the run settled at 00:12:40 with `native_workspace_sync_out_retry_exhausted`. About 20 other runs followed the same timeline. Their failures at 00:12–00:13 are this same retry exhaustion. They do not come from a reattach sweep. ## What Changed - `registerScopedDeadlineWork` has a new opt-in `concurrentChecks.admitDueWhileActive` option. While a pass still has a running check, idle slots admit entries that are due (saved deadline, failure backoff, and minimum spacing). They wait for the next deadline or the next check completion. - Admission skips entries owned by the pass and entries whose resource keys a running check holds. It stops on abort or when `canRun()` is false. The pass still ends only when all running checks end. - The native workspace finalization queue opts in. Its `check` already rereads the durable coordinator row before it acts. - Regression tests: a real-database test in `native-workspace-finalization-work.test.ts`, plus two helper tests (resource-key safety and shutdown). ## Verification - `cd server && npx vitest run src/__tests__/native-workspace-finalization-work.test.ts src/__tests__/scoped-deadline-work.test.ts src/__tests__/delivery-work-coordinator.test.ts` passes (68 tests). - Red before the fix: "keeps another task's saved retries on schedule and settles it while a slow copy-back is running" failed because `onWorkspaceSettled` was never called for the failing run. "admits saved deadlines that come due behind a slow check without overlapping its resource" failed too. - Green after the fix: the failing run makes exactly 3 attempts, settles as `terminal_failure` / `native_workspace_sync_out_retry_exhausted`, and the slow copy-back is admitted once and then succeeds. - `tsc --noEmit` shows no errors in the changed files. - Not done: a live staging check. This change is not deployed. ## Risks - Low to medium. Only the workspace finalization queue opts in. Other queues keep the current behavior. - An admitted entry is not reconstructed first. The finalization `check` rereads durable state, so a stale in-memory entry cannot start a second export. The advisory lock and owner receipt still prevent two copy-backs for one run. - This change does not fix the cause of the copy-back failures on staging (`native_session_lease_lost` in-run, then `workspace_sync_out_failed` with no detail). That needs a separate change. ## Model Used - Claude Opus 5.5 (`claude-opus-5-5`), Anthropic, with tool use and code execution in Claude Code. ## 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 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
120 lines
7.8 KiB
TypeScript
120 lines
7.8 KiB
TypeScript
import { and, asc, eq, gt, ne, notExists } from "drizzle-orm";
|
|
import { heartbeatRuns, issues, nativeRunFinalizations, nativeRunResults, workspaceOperations, type Db } from "@paperclipai/db";
|
|
import type { createDeliveryWorkCoordinator } from "../delivery-work-coordinator.js";
|
|
import { DELIVERY_QUEUES } from "../delivery-work-notifications.js";
|
|
import { onNativeWorkspaceFinalizationRelease, type NativeWorkspaceFinalizationScope } from "../native-workspace-finalization-notifications.js";
|
|
import { registerScopedDeadlineWork } from "../scoped-deadline-work.js";
|
|
import { measureRunPhase, withRunWorkspaceFinalizationTiming } from "../execution-preparation-timing.js";
|
|
import { nativeRunnerOwnershipNotHeldCondition } from "./native-runner-ownership.js";
|
|
import { attemptNativeWorkspaceFinalization, recordNativeWorkspaceFinalizationFailure } from "./native-workspace-finalizer.js";
|
|
|
|
type Entry = { id: string; companyId: string; issueId: string; agentId: string; dueAt: number };
|
|
type AttemptInput = Parameters<typeof attemptNativeWorkspaceFinalization>[0];
|
|
|
|
|
|
const OWNERSHIP_RECHECK_MS = 30_000;
|
|
|
|
export function nativeWorkspaceFinalizationWork(db: Db, options: {
|
|
environmentRuntime?: AttemptInput["environmentRuntime"];
|
|
pluginWorkerManager?: AttemptInput["pluginWorkerManager"];
|
|
attempt?: typeof attemptNativeWorkspaceFinalization;
|
|
onWorkspaceSettled(input: { runId: string; companyId: string; agentId: string; succeeded: boolean }): Promise<void>;
|
|
}) {
|
|
function candidates(scope?: NativeWorkspaceFinalizationScope, after?: string) {
|
|
return db.select({ id: heartbeatRuns.id, companyId: heartbeatRuns.companyId, agentId: heartbeatRuns.agentId,
|
|
issueId: nativeRunFinalizations.issueId, nextAttemptAt: nativeRunFinalizations.nextAttemptAt,
|
|
leaseOwner: nativeRunFinalizations.leaseOwner, leaseExpiresAt: nativeRunFinalizations.leaseExpiresAt,
|
|
updatedAt: nativeRunFinalizations.updatedAt,
|
|
}).from(nativeRunFinalizations)
|
|
.innerJoin(heartbeatRuns, and(eq(heartbeatRuns.id, nativeRunFinalizations.runId),
|
|
eq(heartbeatRuns.companyId, nativeRunFinalizations.companyId)))
|
|
.innerJoin(issues, and(eq(issues.id, nativeRunFinalizations.issueId), eq(issues.companyId, nativeRunFinalizations.companyId)))
|
|
.innerJoin(nativeRunResults, and(eq(nativeRunResults.id, nativeRunFinalizations.resultId),
|
|
eq(nativeRunResults.runId, nativeRunFinalizations.runId), eq(nativeRunResults.companyId, nativeRunFinalizations.companyId),
|
|
eq(nativeRunResults.issueId, nativeRunFinalizations.issueId), eq(nativeRunResults.schemaStatus, "accepted")))
|
|
.where(and(eq(heartbeatRuns.runtimeMode, "native"), nativeRunnerOwnershipNotHeldCondition(),
|
|
ne(nativeRunFinalizations.phase, "terminal_failure"),
|
|
notExists(db.select({ id: workspaceOperations.id }).from(workspaceOperations).where(and(
|
|
eq(workspaceOperations.companyId, nativeRunFinalizations.companyId),
|
|
eq(workspaceOperations.heartbeatRunId, nativeRunFinalizations.runId), eq(workspaceOperations.issueId, nativeRunFinalizations.issueId),
|
|
eq(workspaceOperations.phase, "workspace_finalize"), eq(workspaceOperations.status, "succeeded"),
|
|
))),
|
|
scope ? eq(nativeRunFinalizations.companyId, scope.companyId) : undefined,
|
|
scope?.issueId ? eq(nativeRunFinalizations.issueId, scope.issueId) : undefined,
|
|
scope?.runId ? eq(nativeRunFinalizations.runId, scope.runId) : undefined,
|
|
after ? gt(nativeRunFinalizations.runId, after) : undefined,
|
|
)).orderBy(asc(nativeRunFinalizations.runId)).limit(100);
|
|
}
|
|
function entry(row: Awaited<ReturnType<typeof candidates>>[number]): Entry {
|
|
// Work without a saved retry is due now. Order it by when it became pending,
|
|
// so copy-backs interrupted by a later restart cannot starve older retries.
|
|
// The database clock may lead this process slightly; never defer such work.
|
|
const pendingSince = Math.min(row.updatedAt.getTime(), Date.now());
|
|
return { id: row.id, companyId: row.companyId, issueId: row.issueId, agentId: row.agentId,
|
|
dueAt: Math.max(row.nextAttemptAt?.getTime() ?? pendingSince,
|
|
row.leaseOwner ? row.leaseExpiresAt?.getTime() ?? 0 : 0) };
|
|
}
|
|
async function load(scope?: NativeWorkspaceFinalizationScope, signal?: AbortSignal, canRun = () => true): Promise<Entry[]> {
|
|
const entries: Entry[] = [];
|
|
let after: string | undefined;
|
|
while (!signal?.aborted && canRun()) {
|
|
const rows = await candidates(scope, after);
|
|
entries.push(...rows.map(entry));
|
|
if (rows.length < 100) return entries;
|
|
after = rows[rows.length - 1].id;
|
|
}
|
|
throw new Error("Native workspace finalization discovery stopped");
|
|
}
|
|
function check(current: Entry, signal?: AbortSignal): Promise<Entry | null> {
|
|
return withRunWorkspaceFinalizationTiming(current.id, () => checkWithinTrace(current, signal));
|
|
}
|
|
async function checkWithinTrace(current: Entry, signal?: AbortSignal): Promise<Entry | null> {
|
|
if (signal?.aborted) throw new Error("Native workspace finalization stopped");
|
|
const scope = { companyId: current.companyId, runId: current.id };
|
|
const [row] = await candidates(scope);
|
|
if (!row) return null;
|
|
const due = entry(row);
|
|
if (due.dueAt > Date.now()) return due;
|
|
if (signal?.aborted) throw new Error("Native workspace finalization stopped");
|
|
const outcome = await measureRunPhase("execution.workspace_finalize", () => (options.attempt ?? attemptNativeWorkspaceFinalization)({
|
|
db, runId: current.id, environmentRuntime: options.environmentRuntime, pluginWorkerManager: options.pluginWorkerManager,
|
|
}));
|
|
if (outcome.kind === "retry") return { ...due, dueAt: outcome.retryAt.getTime() };
|
|
if (outcome.kind === "waiting") {
|
|
return outcome.reason === "busy" || outcome.reason === "platform_stop_pending"
|
|
? { ...due, dueAt: Date.now() + OWNERSHIP_RECHECK_MS } : null;
|
|
}
|
|
if (outcome.kind !== "completed" || outcome.operation.status === "succeeded") return null;
|
|
const failure = await recordNativeWorkspaceFinalizationFailure(db, current.id, outcome.operation);
|
|
if (failure.phase === "terminal_failure") {
|
|
await options.onWorkspaceSettled({ runId: row.id, companyId: row.companyId, agentId: row.agentId, succeeded: false });
|
|
return null;
|
|
}
|
|
const [remaining] = await candidates(scope);
|
|
return remaining ? entry(remaining) : null;
|
|
}
|
|
function register(coordinator: ReturnType<typeof createDeliveryWorkCoordinator>, canRun: () => boolean,
|
|
canRecover: () => Promise<boolean> = async () => true) {
|
|
const worker = registerScopedDeadlineWork(coordinator, {
|
|
queue: DELIVERY_QUEUES.nativeWorkspaceFinalization,
|
|
// A slow sandbox export can take many minutes. Independent tasks proceed
|
|
// in parallel; runs that share a task keep their copy-backs serialized.
|
|
// Retries saved while another copy-back is still exporting are admitted
|
|
// on schedule instead of waiting for that export to finish.
|
|
concurrentChecks: { limit: 4, key: (item: Entry) => `issue:${item.companyId}:${item.issueId}`, admitDueWhileActive: true },
|
|
decodeScope: (hint: string): NativeWorkspaceFinalizationScope | undefined => hint === "*" ? undefined : JSON.parse(hint),
|
|
matches: (item: Entry, scope?: NativeWorkspaceFinalizationScope) => !scope || item.companyId === scope.companyId
|
|
&& (!scope.issueId || item.issueId === scope.issueId) && (!scope.runId || item.id === scope.runId),
|
|
load: async (scope, signal) => await canRecover() ? load(scope, signal, canRun) : [],
|
|
check: async (item, signal) => {
|
|
if (!canRun()) throw new Error("Native workspace finalization paused");
|
|
if (!await canRecover()) return null;
|
|
return check(item, signal);
|
|
},
|
|
}, canRun);
|
|
const stop = onNativeWorkspaceFinalizationRelease(db, scope => worker.invalidate(JSON.stringify(scope)));
|
|
return { ...worker, stop };
|
|
}
|
|
return { load, check, register };
|
|
}
|