mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-05 21:02:34 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - The web server owns request handling and remote execution coordination. > - Deployment must start a ready replacement while the old server still serves. > - An outage test does not prove that two live servers can overlap safely. > - This pull request adds a separate Product E2E cell for that boundary. > - The existing run, file, recovery, and retained-session checks still apply. ## Linked Issues or Issue Description Refs #18518. The runtime prerequisite is merged; this PR qualifies its ephemeral server and deployment contracts. ## What Changed - Add the explicit `rolling-web-deployment` Codex Daytona workflow. - Start independent A/B/C homes and compiled builds behind a test ingress. - Wait for readiness before routing, then drain and delete the old home. - Observe active authority before handoff and use the existing read-only recovery oracle. - Require ordinary reads and saves to succeed throughout replacement. Read back every accepted save exactly once. - Preserve the five-minute outage suites and their existing validators. - Add a model-free supervisor smoke and an unready replacement control. - Require graceful exit before deleting an old home; forced cleanup cannot satisfy the oracle. - Preserve a durable Stop through lease release/expiry until the recovered execution owner acknowledges it. Permit only fenced reattachment of the original execution for Stop cleanup; submit no new turn. - Exclude events saved by A during shutdown from evidence of B making progress. ## Verification - E2E TypeScript check passed. - Affected harness checks: 143 passed. Catalog, fixture and report checks: 120 passed. - Actual supervisor smoke passed two replacements: 436 reads, 45 saves, zero request failures, and confirmed owned resource cleanup. - B became ready in 18.7 seconds; C became ready in 109.2 seconds. A prior C timeout remains failed evidence. - Fresh browser proof: 11 checks passed, 246 reads, 50 acknowledged saves, zero failures, 1,058ms reconnect, both old homes deleted and cleanup confirmed. - Stop lease-gap regression: three PostgreSQL delivery tests passed with a simulated provider edge. Current server TypeScript build/vendoring passed. - Full harness: 5,814 passed, 17 failed, four skipped. Two shutdown races passed the focused file; two report timeouts passed an isolated 42-test rerun. Onboarding/workflow-security/Pi/date-expired fixtures are unchanged on inspected master; the host embedded PostgreSQL fixture remains a setup limitation. This is not a green full local suite. - CI at `172509b8be` passed all gates. Greptile is 5/5 with every review thread resolved. The earlier access-service race failure passed its isolated regression and the subsequent full CI. - Final review corrections: six focused executor cases, three PostgreSQL command-delivery cases, 19 harness cases and server/E2E typechecks passed. - Three live attempts failed before agent creation: two harness setup gaps were fixed, then provider authentication failed. The saved OpenAI key returns 401; a refresh is pending. The Daytona probe reported cleanup uncertain, and no sandbox with that attempt label was found through the authenticated staging manager. No live model execution is claimed. - Live Runner overlap, released-container qualification and hosted deployment proof remain pending. Merging this opt-in qualification lane does not claim those results. ## Risks - The source lane shares workspace dependencies and does not establish container packaging correctness. - The live workflow needs an explicitly owned S3 bucket, PostgreSQL, pinned remote image and provider credentials. - Qualification cleanup stops all owned processes after failure. A failed replacement must not be reported as a pass. ## Model Used OpenAI Codex, GPT-6. Tool use, code execution and repository review. The runtime does not expose a more specific model ID or context-window size. ## 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>
94 lines
5.9 KiB
TypeScript
94 lines
5.9 KiB
TypeScript
import { and, eq, gt, inArray, isNull, sql } from "drizzle-orm";
|
|
import { heartbeatRuns, nativeRunFinalizations, type Db } from "@paperclipai/db";
|
|
import { subscribeDatabaseWork } from "@paperclipai/db/work-signals";
|
|
import { DELIVERY_QUEUES, notifyDeliveryWork } from "../delivery-work-notifications.js";
|
|
import type { createDeliveryWorkCoordinator } from "../delivery-work-coordinator.js";
|
|
import { activeNativeExecutionRunIds, subscribeActiveNativeExecutions } from "./native-active-runs.js";
|
|
import { currentNativeControllerIdentity } from "./native-restart-recovery.js";
|
|
|
|
const object = (value: unknown): Record<string, unknown> => value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : {};
|
|
export const notifyNativeCancellation = (tx: object) => notifyDeliveryWork(tx, DELIVERY_QUEUES.nativeCancellation);
|
|
|
|
/** Called only when this process has neither an active handle nor a startup.
|
|
* Expiry/release authorizes recovery, not a no-op acknowledgement: the remote
|
|
* execution can still be alive while its next controller is attaching. */
|
|
export async function nativeCancellationHasUnsettledOwner(db: Db, runId: string): Promise<boolean> {
|
|
if (process.env.PAPERCLIP_EPHEMERAL_SERVER !== "true") return false;
|
|
const [owner] = await db.select({ runId: nativeRunFinalizations.runId }).from(nativeRunFinalizations)
|
|
.innerJoin(heartbeatRuns, and(eq(heartbeatRuns.id, nativeRunFinalizations.runId),
|
|
eq(heartbeatRuns.companyId, nativeRunFinalizations.companyId)))
|
|
.where(and(eq(nativeRunFinalizations.runId, runId), isNull(nativeRunFinalizations.resultId),
|
|
inArray(heartbeatRuns.status, ["running", "queued"]))).limit(1);
|
|
return Boolean(owner);
|
|
}
|
|
|
|
/** The accepting HTTP server waits for the real owner's audited ACK. Subscribe
|
|
* before reading so a commit between admission and subscription cannot be lost.
|
|
* The existing intent remains recoverable after timeout or process replacement. */
|
|
export function waitForNativeCancellation(db: Db, input: { companyId: string; runId: string; intentId: string }, timeoutMs = 20_000) {
|
|
return new Promise<{ dispatched: true; decisionId: string | null; auditId: string }>((resolve, reject) => {
|
|
let settled = false, reading = false, dirty = false;
|
|
const finish = (error?: unknown, result?: { dispatched: true; decisionId: string | null; auditId: string }) => {
|
|
if (settled) return;
|
|
settled = true; clearTimeout(timeout); unsubscribe();
|
|
if (error) reject(error); else resolve(result!);
|
|
};
|
|
const check = async () => {
|
|
dirty = true;
|
|
if (reading || settled) return;
|
|
reading = true;
|
|
try {
|
|
do {
|
|
dirty = false;
|
|
const [run] = await db.select({ result: heartbeatRuns.resultJson }).from(heartbeatRuns)
|
|
.where(and(eq(heartbeatRuns.id, input.runId), eq(heartbeatRuns.companyId, input.companyId))).limit(1);
|
|
const intent = object(run?.result?.nativeCancellation);
|
|
if (intent.intentId !== input.intentId) throw new Error("native_cancellation_intent_conflict");
|
|
if (intent.dispatchState === "acknowledged" && intent.dispatched === true && typeof intent.acknowledgementAuditId === "string") {
|
|
finish(undefined, { dispatched: true, decisionId: typeof intent.decisionId === "string" ? intent.decisionId : null,
|
|
auditId: intent.acknowledgementAuditId });
|
|
}
|
|
} while (dirty && !settled);
|
|
} catch (error) { finish(error); }
|
|
finally { reading = false; }
|
|
};
|
|
const unsubscribe = subscribeDatabaseWork(db, DELIVERY_QUEUES.nativeCancellation, event => { if (event === "settled") void check(); });
|
|
const timeout = setTimeout(() => finish(new Error("native_cancellation_pending_recovery")), timeoutMs);
|
|
void check();
|
|
});
|
|
}
|
|
|
|
/** Reconcile only this controller's live executions. Intent lives on the run;
|
|
* no idle scan, new command table, or competing execution claim is introduced. */
|
|
export function registerNativeCancellationDelivery(db: Db, coordinator: ReturnType<typeof createDeliveryWorkCoordinator>) {
|
|
const worker = coordinator.register(DELIVERY_QUEUES.nativeCancellation, {
|
|
retryMs: 1000, runDuringDrain: true,
|
|
async run(signal) {
|
|
const ids = [...activeNativeExecutionRunIds];
|
|
if (!ids.length) return;
|
|
const identity = await currentNativeControllerIdentity();
|
|
const rows = await db.select({ id: heartbeatRuns.id, result: heartbeatRuns.resultJson }).from(heartbeatRuns)
|
|
.innerJoin(nativeRunFinalizations, eq(nativeRunFinalizations.runId, heartbeatRuns.id)).where(and(
|
|
inArray(heartbeatRuns.id, ids), eq(nativeRunFinalizations.controllerBootId, identity.bootId),
|
|
gt(nativeRunFinalizations.leaseExpiresAt, sql`clock_timestamp()`),
|
|
sql`${heartbeatRuns.resultJson}->'nativeCancellation'->>'dispatchState' = 'pending'`,
|
|
));
|
|
for (const row of rows) {
|
|
signal.throwIfAborted();
|
|
if (!activeNativeExecutionRunIds.has(row.id)) continue;
|
|
const intent = object(row.result?.nativeCancellation), startup = object(row.result?.startupCancellation);
|
|
if (intent.schema !== "paperclip.native-cancellation.v1" || !["run", "issue", "turn"].includes(String(intent.scope))) continue;
|
|
const { cancelNativeSession } = await import("./native-session-executor.js");
|
|
await cancelNativeSession(row.id, typeof intent.reason === "string" ? intent.reason : "Operator requested Stop", {
|
|
db, scope: intent.scope as "run" | "issue" | "turn",
|
|
replacementAccepted: Array.isArray(intent.effects) && intent.effects.includes("accept_replacement_turn"),
|
|
...(typeof startup.cancellationRequestId === "string" ? { cancellationRequestId: startup.cancellationRequestId } : {}),
|
|
});
|
|
}
|
|
},
|
|
hasPending: async () => false,
|
|
});
|
|
const unsubscribe = subscribeActiveNativeExecutions(worker.wake);
|
|
return { ready: worker.ready, async stop() { unsubscribe(); await worker.stop(); } };
|
|
}
|