forked from farhoodlabs/paperclip
1bd44c8a0d
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies. > - Remote-managed adapters need sandbox/environment execution to behave like real agent runs, not just local host probes. > - The Cloudflare sandbox path was the weakest leg in the SSH + Cloudflare QA matrix because bridge execution could truncate output, time out long-running installs, and under-provision the worker instance. > - That made several adapters fail for reasons unrelated to their actual business logic, which blocks confidence in Paperclip's non-local environment model. > - This pull request hardens the Cloudflare bridge/runtime path and adjusts sandbox probe budgets so adapter verification matches the measured behavior of the fixed environment. > - It also corrects the Pi sandbox install command so the QA matrix exercises a real, supported install path. > - The benefit is a materially more reliable SSH + Cloudflare adapter matrix with fewer false negatives and clearer failure boundaries. ## What Changed - Switched the Cloudflare bridge worker instance type to `standard-2` for the QA-matrix execution path. - Raised Cloudflare bridge/plugin-worker timeout budgets and added SSE keepalives so long-running install/exec calls can complete instead of dying at the transport layer. - Fixed Cloudflare bridge-channel command handling to avoid dropped final stdout chunks on short-lived execs. - Made Claude, OpenCode, and Cursor sandbox probe timeouts configurable/sandbox-aware, then tightened the defaults to the measured post-fix range. - Updated the Pi sandbox install command to use the package currently installed by the official `pi.dev` installer, pinned to a specific npm version. - Added/updated tests around Cloudflare bridge behavior and adapter sandbox probe paths. ## Verification - `pnpm --filter @paperclipai/adapter-claude-local typecheck` - `pnpm --filter @paperclipai/adapter-opencode-local typecheck` - `pnpm --filter @paperclipai/adapter-cursor-local typecheck` - `pnpm vitest run packages/adapters/cursor-local packages/adapters/claude-local packages/adapters/opencode-local packages/adapters/pi-local packages/plugins/sandbox-providers/cloudflare server/src/services/__tests__/plugin-worker-manager.test.ts` - Manual QA on the dedicated dev instance using the SSH + Cloudflare environment matrix (`ENV-29` through `ENV-40`). Clean end-to-end passes: SSH `claude_local`, `codex_local`, `cursor`, `gemini_local`; Cloudflare `claude_local`, `codex_local`, `cursor`, `gemini_local`. ## Risks - Cloudflare sandbox cost increases because the bridge worker now runs on `standard-2` instead of `lite`. - Higher timeout ceilings can delay surfacing truly hung Cloudflare bridge calls, even though they remove transport-level false negatives. - The manual heartbeat matrix still exposed follow-on execution/sync/disposition bugs in `opencode_local` and `pi_local`; those are not fixed by this PR. ## Model Used - OpenAI `gpt-5.4` via Paperclip `codex_local`, reasoning effort `high`, tool use enabled, repo search enabled. ## 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 (not applicable) - [x] I have updated relevant documentation to reflect my changes (not applicable) - [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>
481 lines
16 KiB
TypeScript
481 lines
16 KiB
TypeScript
import type { Sandbox as CloudflareSandbox } from "@cloudflare/sandbox";
|
|
import { isAuthorizedRequest } from "./auth.js";
|
|
import { executeInSandbox } from "./exec.js";
|
|
import { shellQuote } from "./helpers.js";
|
|
import {
|
|
buildLeaseSandboxId,
|
|
buildSentinelPath,
|
|
DEFAULT_REMOTE_CWD,
|
|
DEFAULT_SESSION_ID,
|
|
DEFAULT_TIMEOUT_MS,
|
|
resolveSandbox,
|
|
applySandboxKeepAlive,
|
|
toErrorResponse,
|
|
toJsonResponse,
|
|
type BridgeEnv,
|
|
} from "./sandboxes.js";
|
|
import type { SessionStrategy } from "./sessions.js";
|
|
|
|
interface ProbeRequestBody {
|
|
requestedCwd?: string;
|
|
keepAlive?: boolean;
|
|
sleepAfter?: string;
|
|
normalizeId?: boolean;
|
|
sessionStrategy?: SessionStrategy;
|
|
sessionId?: string;
|
|
timeoutMs?: number;
|
|
}
|
|
|
|
interface AcquireLeaseRequestBody extends ProbeRequestBody {
|
|
environmentId?: string;
|
|
runId?: string;
|
|
issueId?: string | null;
|
|
reuseLease?: boolean;
|
|
}
|
|
|
|
interface ResumeLeaseRequestBody extends ProbeRequestBody {
|
|
providerLeaseId?: string;
|
|
}
|
|
|
|
interface ReleaseLeaseRequestBody {
|
|
providerLeaseId?: string;
|
|
reuseLease?: boolean;
|
|
keepAlive?: boolean;
|
|
}
|
|
|
|
interface ExecuteRequestBody {
|
|
providerLeaseId?: string;
|
|
command?: string;
|
|
args?: string[];
|
|
cwd?: string;
|
|
env?: Record<string, string>;
|
|
stdin?: string | null;
|
|
timeoutMs?: number;
|
|
streamOutput?: boolean;
|
|
sessionStrategy?: SessionStrategy;
|
|
sessionId?: string;
|
|
}
|
|
|
|
function readBoolean(value: unknown, fallback: boolean): boolean {
|
|
return value === undefined ? fallback : value === true;
|
|
}
|
|
|
|
function readString(value: unknown, fallback: string): string {
|
|
return typeof value === "string" && value.trim().length > 0 ? value.trim() : fallback;
|
|
}
|
|
|
|
function readInteger(value: unknown, fallback: number): number {
|
|
const parsed = Number(value);
|
|
return Number.isFinite(parsed) ? Math.trunc(parsed) : fallback;
|
|
}
|
|
|
|
function readSessionStrategy(value: unknown): SessionStrategy {
|
|
return value === "default" ? "default" : "named";
|
|
}
|
|
|
|
async function readJson<T>(request: Request): Promise<T> {
|
|
return await request.json() as T;
|
|
}
|
|
|
|
function encodeSseEvent(type: string, payload: unknown): string {
|
|
return `event: ${type}\ndata: ${JSON.stringify(payload)}\n\n`;
|
|
}
|
|
|
|
function toSseResponse(stream: ReadableStream<Uint8Array>): Response {
|
|
return new Response(stream, {
|
|
headers: {
|
|
"Content-Type": "text/event-stream",
|
|
"Cache-Control": "no-cache",
|
|
},
|
|
});
|
|
}
|
|
|
|
async function execLeaseUtility(
|
|
sandbox: CloudflareSandbox,
|
|
options: {
|
|
remoteCwd: string;
|
|
sessionStrategy: SessionStrategy;
|
|
sessionId: string;
|
|
timeoutMs: number;
|
|
},
|
|
command: string,
|
|
args: string[],
|
|
cwd = "/",
|
|
) {
|
|
return await executeInSandbox({
|
|
sandbox,
|
|
command,
|
|
args,
|
|
cwd,
|
|
timeoutMs: options.timeoutMs,
|
|
sessionStrategy: options.sessionStrategy,
|
|
sessionId: options.sessionId,
|
|
});
|
|
}
|
|
|
|
function requireZeroExit(action: string, result: { exitCode: number | null; timedOut: boolean; stderr: string }) {
|
|
if (result.timedOut) {
|
|
throw new Error(`${action} timed out: ${result.stderr.trim()}`);
|
|
}
|
|
if (result.exitCode !== 0) {
|
|
throw new Error(
|
|
`${action} failed with exit code ${result.exitCode ?? "null"}${result.stderr.trim() ? `: ${result.stderr.trim()}` : ""}`,
|
|
);
|
|
}
|
|
}
|
|
|
|
async function ensureWorkspace(
|
|
sandbox: CloudflareSandbox,
|
|
options: {
|
|
remoteCwd: string;
|
|
sessionStrategy: SessionStrategy;
|
|
sessionId: string;
|
|
timeoutMs: number;
|
|
},
|
|
) {
|
|
const result = await execLeaseUtility(sandbox, options, "mkdir", ["-p", options.remoteCwd], "/");
|
|
requireZeroExit(`ensure workspace ${options.remoteCwd}`, result);
|
|
}
|
|
|
|
async function writeSentinel(
|
|
sandbox: CloudflareSandbox,
|
|
input: {
|
|
providerLeaseId: string;
|
|
remoteCwd: string;
|
|
sessionStrategy: SessionStrategy;
|
|
sessionId: string;
|
|
keepAlive: boolean;
|
|
sleepAfter: string;
|
|
normalizeId: boolean;
|
|
resumedLease: boolean;
|
|
timeoutMs: number;
|
|
},
|
|
) {
|
|
const sentinelPayload = JSON.stringify({
|
|
provider: "cloudflare",
|
|
providerLeaseId: input.providerLeaseId,
|
|
remoteCwd: input.remoteCwd,
|
|
sessionStrategy: input.sessionStrategy,
|
|
sessionId: input.sessionId,
|
|
keepAlive: input.keepAlive,
|
|
sleepAfter: input.sleepAfter,
|
|
normalizeId: input.normalizeId,
|
|
resumedLease: input.resumedLease,
|
|
updatedAt: new Date().toISOString(),
|
|
}, null, 2);
|
|
const sentinelPath = buildSentinelPath(input.remoteCwd);
|
|
const result = await execLeaseUtility(
|
|
sandbox,
|
|
input,
|
|
"sh",
|
|
[
|
|
"-c",
|
|
`mkdir -p ${shellQuote(input.remoteCwd)} && printf '%s\\n' ${shellQuote(sentinelPayload)} > ${shellQuote(sentinelPath)}`,
|
|
],
|
|
"/",
|
|
);
|
|
requireZeroExit(`write sentinel ${sentinelPath}`, result);
|
|
}
|
|
|
|
async function verifySentinel(
|
|
sandbox: CloudflareSandbox,
|
|
input: {
|
|
remoteCwd: string;
|
|
sessionStrategy: SessionStrategy;
|
|
sessionId: string;
|
|
timeoutMs: number;
|
|
},
|
|
): Promise<boolean> {
|
|
const result = await execLeaseUtility(
|
|
sandbox,
|
|
input,
|
|
"sh",
|
|
["-c", `test -s ${shellQuote(buildSentinelPath(input.remoteCwd))}`],
|
|
"/",
|
|
);
|
|
return !result.timedOut && (result.exitCode ?? 0) === 0;
|
|
}
|
|
|
|
export async function handleBridgeRequest(request: Request, env: BridgeEnv): Promise<Response> {
|
|
if (!(await isAuthorizedRequest(request, env.BRIDGE_AUTH_TOKEN))) {
|
|
return toErrorResponse(401, "unauthorized", "Missing or invalid bridge bearer token.");
|
|
}
|
|
|
|
const url = new URL(request.url);
|
|
const pathname = url.pathname.replace(/\/+$/, "");
|
|
|
|
if (request.method === "GET" && pathname === "/api/paperclip-sandbox/v1/health") {
|
|
return toJsonResponse({
|
|
ok: true,
|
|
provider: "cloudflare",
|
|
bridgeVersion: "0.1.0",
|
|
capabilities: {
|
|
reuseLease: true,
|
|
namedSessions: true,
|
|
previewUrls: false,
|
|
},
|
|
});
|
|
}
|
|
|
|
if (request.method === "POST" && pathname === "/api/paperclip-sandbox/v1/probe") {
|
|
const body = await readJson<ProbeRequestBody>(request);
|
|
const remoteCwd = readString(body.requestedCwd, DEFAULT_REMOTE_CWD);
|
|
const keepAlive = readBoolean(body.keepAlive, false);
|
|
const sleepAfter = readString(body.sleepAfter, "10m");
|
|
const normalizeId = readBoolean(body.normalizeId, true);
|
|
const sessionStrategy = readSessionStrategy(body.sessionStrategy);
|
|
const sessionId = readString(body.sessionId, DEFAULT_SESSION_ID);
|
|
const timeoutMs = readInteger(body.timeoutMs, DEFAULT_TIMEOUT_MS);
|
|
const sandboxId = buildLeaseSandboxId({
|
|
environmentId: "probe",
|
|
runId: `probe-${Date.now()}`,
|
|
reuseLease: false,
|
|
normalizeId,
|
|
});
|
|
|
|
const sandbox = await resolveSandbox(env, sandboxId, { keepAlive, sleepAfter, normalizeId });
|
|
await applySandboxKeepAlive(sandbox, keepAlive);
|
|
try {
|
|
await ensureWorkspace(sandbox, { remoteCwd, sessionStrategy, sessionId, timeoutMs });
|
|
const result = await executeInSandbox({
|
|
sandbox,
|
|
command: "pwd",
|
|
cwd: remoteCwd,
|
|
timeoutMs,
|
|
sessionStrategy,
|
|
sessionId,
|
|
});
|
|
return toJsonResponse({
|
|
ok: true,
|
|
summary: "Connected to Cloudflare sandbox bridge.",
|
|
metadata: {
|
|
provider: "cloudflare",
|
|
remoteCwd,
|
|
namedSessions: sessionStrategy === "named",
|
|
stdout: result.stdout,
|
|
},
|
|
});
|
|
} finally {
|
|
await sandbox.destroy().catch(() => undefined);
|
|
}
|
|
}
|
|
|
|
if (request.method === "POST" && pathname === "/api/paperclip-sandbox/v1/leases/acquire") {
|
|
const body = await readJson<AcquireLeaseRequestBody>(request);
|
|
if (!body.environmentId || !body.runId) {
|
|
return toErrorResponse(400, "invalid_request", "environmentId and runId are required.");
|
|
}
|
|
|
|
const reuseLease = readBoolean(body.reuseLease, false);
|
|
const keepAlive = readBoolean(body.keepAlive, false);
|
|
const sleepAfter = readString(body.sleepAfter, "10m");
|
|
const normalizeId = readBoolean(body.normalizeId, true);
|
|
const remoteCwd = readString(body.requestedCwd, DEFAULT_REMOTE_CWD);
|
|
const sessionStrategy = readSessionStrategy(body.sessionStrategy);
|
|
const sessionId = readString(body.sessionId, DEFAULT_SESSION_ID);
|
|
const timeoutMs = readInteger(body.timeoutMs, DEFAULT_TIMEOUT_MS);
|
|
const providerLeaseId = buildLeaseSandboxId({
|
|
environmentId: body.environmentId,
|
|
runId: body.runId,
|
|
reuseLease,
|
|
normalizeId,
|
|
});
|
|
const sandbox = await resolveSandbox(env, providerLeaseId, { keepAlive, sleepAfter, normalizeId });
|
|
// Guard against orphaning a keepAlive sandbox if workspace setup throws
|
|
// after creation: Paperclip never sees the lease ID in that case, so it
|
|
// can't clean up. Destroy here unless this is a reuseLease handshake
|
|
// (where the sandbox may have been created by a prior acquire and we
|
|
// shouldn't destroy it on a transient setup failure during reattachment).
|
|
try {
|
|
await applySandboxKeepAlive(sandbox, keepAlive);
|
|
await ensureWorkspace(sandbox, { remoteCwd, sessionStrategy, sessionId, timeoutMs });
|
|
await writeSentinel(sandbox, {
|
|
providerLeaseId,
|
|
remoteCwd,
|
|
sessionStrategy,
|
|
sessionId,
|
|
keepAlive,
|
|
sleepAfter,
|
|
normalizeId,
|
|
resumedLease: false,
|
|
timeoutMs,
|
|
});
|
|
} catch (err) {
|
|
if (!reuseLease) {
|
|
await sandbox.destroy().catch(() => undefined);
|
|
}
|
|
throw err;
|
|
}
|
|
|
|
return toJsonResponse({
|
|
providerLeaseId,
|
|
metadata: {
|
|
provider: "cloudflare",
|
|
remoteCwd,
|
|
sandboxId: providerLeaseId,
|
|
sessionStrategy,
|
|
sessionId,
|
|
keepAlive,
|
|
sleepAfter,
|
|
normalizeId,
|
|
resumedLease: false,
|
|
},
|
|
});
|
|
}
|
|
|
|
if (request.method === "POST" && pathname === "/api/paperclip-sandbox/v1/leases/resume") {
|
|
const body = await readJson<ResumeLeaseRequestBody>(request);
|
|
if (!body.providerLeaseId) {
|
|
return toErrorResponse(400, "invalid_request", "providerLeaseId is required.");
|
|
}
|
|
const keepAlive = readBoolean(body.keepAlive, false);
|
|
const sleepAfter = readString(body.sleepAfter, "10m");
|
|
const normalizeId = readBoolean(body.normalizeId, true);
|
|
const remoteCwd = readString(body.requestedCwd, DEFAULT_REMOTE_CWD);
|
|
const sessionStrategy = readSessionStrategy(body.sessionStrategy);
|
|
const sessionId = readString(body.sessionId, DEFAULT_SESSION_ID);
|
|
const timeoutMs = readInteger(body.timeoutMs, DEFAULT_TIMEOUT_MS);
|
|
const sandbox = await resolveSandbox(env, body.providerLeaseId, { keepAlive, sleepAfter, normalizeId });
|
|
// Resume always reattaches to a providerLeaseId the operator already
|
|
// owns, so we deliberately do NOT destroy on failure here — the operator
|
|
// has the ID and can issue an explicit release/destroy. Calling
|
|
// `getSandbox` is idempotent on the Sandbox SDK side (no new sandbox is
|
|
// created), so a failed resume doesn't leak a *new* sandbox.
|
|
await applySandboxKeepAlive(sandbox, keepAlive);
|
|
|
|
if (!(await verifySentinel(sandbox, { remoteCwd, sessionStrategy, sessionId, timeoutMs }))) {
|
|
return toErrorResponse(409, "sandbox_state_lost", "Cloudflare sandbox state is no longer available.");
|
|
}
|
|
|
|
await ensureWorkspace(sandbox, { remoteCwd, sessionStrategy, sessionId, timeoutMs });
|
|
await writeSentinel(sandbox, {
|
|
providerLeaseId: body.providerLeaseId,
|
|
remoteCwd,
|
|
sessionStrategy,
|
|
sessionId,
|
|
keepAlive,
|
|
sleepAfter,
|
|
normalizeId,
|
|
resumedLease: true,
|
|
timeoutMs,
|
|
});
|
|
|
|
return toJsonResponse({
|
|
providerLeaseId: body.providerLeaseId,
|
|
metadata: {
|
|
provider: "cloudflare",
|
|
remoteCwd,
|
|
sandboxId: body.providerLeaseId,
|
|
sessionStrategy,
|
|
sessionId,
|
|
keepAlive,
|
|
sleepAfter,
|
|
normalizeId,
|
|
resumedLease: true,
|
|
},
|
|
});
|
|
}
|
|
|
|
if (request.method === "POST" && pathname === "/api/paperclip-sandbox/v1/leases/release") {
|
|
const body = await readJson<ReleaseLeaseRequestBody>(request);
|
|
if (!body.providerLeaseId) {
|
|
return toJsonResponse({ ok: true });
|
|
}
|
|
if (readBoolean(body.reuseLease, false)) {
|
|
return toJsonResponse({ ok: true });
|
|
}
|
|
const sandbox = await resolveSandbox(env, body.providerLeaseId, {
|
|
keepAlive: readBoolean(body.keepAlive, false),
|
|
sleepAfter: "10m",
|
|
normalizeId: true,
|
|
});
|
|
await sandbox.destroy().catch(() => undefined);
|
|
return toJsonResponse({ ok: true });
|
|
}
|
|
|
|
if (request.method === "DELETE" && pathname.startsWith("/api/paperclip-sandbox/v1/leases/")) {
|
|
const providerLeaseId = decodeURIComponent(pathname.split("/").pop() ?? "");
|
|
if (providerLeaseId.length === 0) {
|
|
return toErrorResponse(400, "invalid_request", "providerLeaseId path parameter is required.");
|
|
}
|
|
const sandbox = await resolveSandbox(env, providerLeaseId, {
|
|
keepAlive: false,
|
|
sleepAfter: "10m",
|
|
normalizeId: true,
|
|
});
|
|
await sandbox.destroy().catch(() => undefined);
|
|
return toJsonResponse({ ok: true });
|
|
}
|
|
|
|
if (request.method === "POST" && pathname === "/api/paperclip-sandbox/v1/exec") {
|
|
const body = await readJson<ExecuteRequestBody>(request);
|
|
if (!body.providerLeaseId || !body.command) {
|
|
return toErrorResponse(400, "invalid_request", "providerLeaseId and command are required.");
|
|
}
|
|
const sessionStrategy = readSessionStrategy(body.sessionStrategy);
|
|
const sessionId = readString(body.sessionId, DEFAULT_SESSION_ID);
|
|
const sandbox = await resolveSandbox(env, body.providerLeaseId, {
|
|
keepAlive: false,
|
|
sleepAfter: "10m",
|
|
normalizeId: true,
|
|
});
|
|
if (body.streamOutput === true) {
|
|
const encoder = new TextEncoder();
|
|
const stream = new ReadableStream<Uint8Array>({
|
|
async start(controller) {
|
|
// Heartbeat keeps the SSE response alive during silent stretches
|
|
// (e.g. npm install downloading silently). SSE comment lines (`:`)
|
|
// are ignored by the client parser but keep the underlying HTTP
|
|
// connection from idling out at the Cloudflare edge.
|
|
const heartbeat = setInterval(() => {
|
|
try {
|
|
controller.enqueue(encoder.encode(": keepalive\n\n"));
|
|
} catch {
|
|
// Controller may already be closed; ignore.
|
|
}
|
|
}, 15_000);
|
|
try {
|
|
const result = await executeInSandbox({
|
|
sandbox,
|
|
command: body.command!,
|
|
args: Array.isArray(body.args) ? body.args.filter((value): value is string => typeof value === "string") : [],
|
|
cwd: typeof body.cwd === "string" ? body.cwd : undefined,
|
|
env: body.env,
|
|
stdin: body.stdin ?? null,
|
|
timeoutMs: readInteger(body.timeoutMs, DEFAULT_TIMEOUT_MS),
|
|
sessionStrategy,
|
|
sessionId,
|
|
onOutput: async (streamName, data) => {
|
|
controller.enqueue(encoder.encode(encodeSseEvent(streamName, { data })));
|
|
},
|
|
});
|
|
controller.enqueue(encoder.encode(encodeSseEvent("complete", result)));
|
|
} catch (error) {
|
|
controller.enqueue(encoder.encode(encodeSseEvent("error", {
|
|
error: error instanceof Error ? error.message : String(error),
|
|
})));
|
|
} finally {
|
|
clearInterval(heartbeat);
|
|
controller.close();
|
|
}
|
|
},
|
|
});
|
|
return toSseResponse(stream);
|
|
}
|
|
const result = await executeInSandbox({
|
|
sandbox,
|
|
command: body.command,
|
|
args: Array.isArray(body.args) ? body.args.filter((value): value is string => typeof value === "string") : [],
|
|
cwd: typeof body.cwd === "string" ? body.cwd : undefined,
|
|
env: body.env,
|
|
stdin: body.stdin ?? null,
|
|
timeoutMs: readInteger(body.timeoutMs, DEFAULT_TIMEOUT_MS),
|
|
sessionStrategy,
|
|
sessionId,
|
|
});
|
|
return toJsonResponse(result);
|
|
}
|
|
|
|
return toErrorResponse(404, "not_found", `No bridge route matched ${request.method} ${pathname}.`);
|
|
}
|