af9386f879
> **Stacked PR.** Sits on top of #5278 (`e2b/stage-stdin-to-temp-file`) which ships the stdin-staging fix this builds on. The cumulative diff against `master` includes that PR's content; the files touched by *this* PR's commit are `packages/adapter-utils/src/execution-target.ts`, `packages/plugins/sandbox-providers/e2b/src/plugin.ts`, and `packages/plugins/sandbox-providers/e2b/src/plugin.test.ts`. ## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - The adapter Test flow does an "is the command resolvable?" probe before running the hello probe so the report distinguishes "binary not installed" from "binary errored" > - For sandbox targets, that resolvability check was a no-op early-return — every sandboxed adapter test reported "Command is executable" regardless of whether the binary existed > - That made the resolvability check disagree with the hello probe in a way that looked like a PATH bug, when it was actually a missing CLI > - Separately, the e2b spawn used `sandbox.commands.run` with a non-login non-interactive shell whose PATH did not include npm-globals, nvm shims, or anything else the template installs via `.profile`/`.bashrc` > - This pull request makes the resolvability check honest by running a real `command -v` invocation through the sandbox runner, and aligns the e2b spawn with SSH by sourcing login profiles before `exec env KEY=val <cmd>` > - The benefit is the e2b sandbox spawn agrees with the hello probe and finds CLIs at template-installed paths ## What Changed - `packages/adapter-utils/src/execution-target.ts`: add `ensureSandboxCommandResolvable` that runs `command -v <cli>` through the sandbox runner; replace the early-return in `ensureAdapterExecutionTargetCommandResolvable` for sandbox targets - `packages/plugins/sandbox-providers/e2b/src/plugin.ts`: replace `buildCommandLine` with `buildLoginShellScript` (sources `/etc/profile`, `~/.profile`, `~/.bash_profile`, `~/.bashrc`, `~/.zprofile`, and nvm.sh before `exec env KEY=val <cmd>`); env vars are interpolated inline so user-configured adapter env always wins over profile-exported values; drop the now-unused `envs:` SDK option - `plugin.test.ts` updated for the login-shell wrapping ## Verification - `pnpm vitest run --no-coverage --project @paperclipai/sandbox-e2b` — 17/17 plugin tests pass - `pnpm vitest run --no-coverage --project @paperclipai/adapter-utils` clean - `pnpm typecheck` clean - Manual: previously every sandboxed adapter said "Command is executable" then the hello probe failed with "exec: not found". After this change, missing CLIs surface honestly at the resolvability step. SSH no-regression: SSH Claude probe still passes. ## Risks Medium — sandbox adapter Test reports will start failing at the resolvability step for environments where the CLI was never actually installed. This was always the real state; the previous "Command is executable" message was incorrect. Operators should expect previously-green-but-broken sandbox environments to report accurately. ## Model Used Claude Opus 4.7 (1M context) ## 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 — `plugin.test.ts` updated for the login-shell wrapping - [x] If this change affects the UI, I have included before/after screenshots — N/A (no UI) - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge
465 lines
15 KiB
TypeScript
465 lines
15 KiB
TypeScript
import path from "node:path";
|
|
import { randomUUID } from "node:crypto";
|
|
import {
|
|
CommandExitError,
|
|
Sandbox,
|
|
SandboxNotFoundError,
|
|
TimeoutError,
|
|
} from "e2b";
|
|
import { definePlugin } from "@paperclipai/plugin-sdk";
|
|
import type {
|
|
PluginEnvironmentAcquireLeaseParams,
|
|
PluginEnvironmentDestroyLeaseParams,
|
|
PluginEnvironmentExecuteParams,
|
|
PluginEnvironmentExecuteResult,
|
|
PluginEnvironmentLease,
|
|
PluginEnvironmentProbeParams,
|
|
PluginEnvironmentProbeResult,
|
|
PluginEnvironmentRealizeWorkspaceParams,
|
|
PluginEnvironmentRealizeWorkspaceResult,
|
|
PluginEnvironmentReleaseLeaseParams,
|
|
PluginEnvironmentResumeLeaseParams,
|
|
PluginEnvironmentValidateConfigParams,
|
|
PluginEnvironmentValidationResult,
|
|
} from "@paperclipai/plugin-sdk";
|
|
|
|
interface E2bDriverConfig {
|
|
template: string;
|
|
apiKey: string | null;
|
|
timeoutMs: number;
|
|
reuseLease: boolean;
|
|
}
|
|
|
|
function parseDriverConfig(raw: Record<string, unknown>): E2bDriverConfig {
|
|
const template = typeof raw.template === "string" && raw.template.trim().length > 0
|
|
? raw.template.trim()
|
|
: "base";
|
|
const timeoutMs = Number(raw.timeoutMs ?? 300_000);
|
|
return {
|
|
template,
|
|
apiKey: typeof raw.apiKey === "string" && raw.apiKey.trim().length > 0 ? raw.apiKey.trim() : null,
|
|
timeoutMs: Number.isFinite(timeoutMs) ? Math.trunc(timeoutMs) : 300_000,
|
|
reuseLease: raw.reuseLease === true,
|
|
};
|
|
}
|
|
|
|
function resolveApiKey(config: E2bDriverConfig): string {
|
|
if (config.apiKey) {
|
|
return config.apiKey;
|
|
}
|
|
const envApiKey = process.env.E2B_API_KEY?.trim() ?? "";
|
|
if (!envApiKey) {
|
|
throw new Error("E2B sandbox environments require an API key in config or E2B_API_KEY.");
|
|
}
|
|
return envApiKey;
|
|
}
|
|
|
|
async function createSandbox(config: E2bDriverConfig): Promise<Sandbox> {
|
|
const options = {
|
|
apiKey: resolveApiKey(config),
|
|
timeoutMs: config.timeoutMs,
|
|
metadata: {
|
|
paperclipProvider: "e2b",
|
|
},
|
|
};
|
|
return await Sandbox.create(config.template, options);
|
|
}
|
|
|
|
function formatErrorMessage(error: unknown): string {
|
|
return error instanceof Error ? error.message : String(error);
|
|
}
|
|
|
|
function readTimeoutStream(error: TimeoutError, key: "stdout" | "stderr"): string {
|
|
const record = error as unknown as Record<string, unknown>;
|
|
const direct = record[key];
|
|
if (typeof direct === "string" && direct.length > 0) return direct;
|
|
const nested = (record as { result?: Record<string, unknown> }).result?.[key];
|
|
if (typeof nested === "string") return nested;
|
|
return typeof direct === "string" ? direct : "";
|
|
}
|
|
|
|
function buildTimeoutExecuteResult(error: TimeoutError): PluginEnvironmentExecuteResult {
|
|
const stdout = readTimeoutStream(error, "stdout");
|
|
const stderrOutput = readTimeoutStream(error, "stderr");
|
|
const message = error.message.trim();
|
|
const stderr = stderrOutput.length > 0
|
|
? message.length > 0 && !stderrOutput.includes(message)
|
|
? `${stderrOutput}${stderrOutput.endsWith("\n") ? "" : "\n"}${message}\n`
|
|
: stderrOutput
|
|
: message.length > 0
|
|
? `${message}\n`
|
|
: "";
|
|
return {
|
|
exitCode: null,
|
|
timedOut: true,
|
|
stdout,
|
|
stderr,
|
|
};
|
|
}
|
|
|
|
async function ensureSandboxWorkspace(sandbox: Sandbox, remoteCwd: string): Promise<void> {
|
|
await sandbox.commands.run(`mkdir -p ${shellQuote(remoteCwd)}`);
|
|
}
|
|
|
|
async function resolveSandboxWorkingDirectory(sandbox: Sandbox): Promise<string> {
|
|
const result = await sandbox.commands.run("pwd");
|
|
const cwd = result.stdout.trim();
|
|
const remoteCwd = path.posix.join(cwd.length > 0 ? cwd : "/", "paperclip-workspace");
|
|
await ensureSandboxWorkspace(sandbox, remoteCwd);
|
|
return remoteCwd;
|
|
}
|
|
|
|
async function connectSandbox(config: E2bDriverConfig, providerLeaseId: string): Promise<Sandbox> {
|
|
return await Sandbox.connect(providerLeaseId, {
|
|
apiKey: resolveApiKey(config),
|
|
timeoutMs: config.timeoutMs,
|
|
});
|
|
}
|
|
|
|
async function connectForCleanup(config: E2bDriverConfig, providerLeaseId: string): Promise<Sandbox | null> {
|
|
try {
|
|
return await connectSandbox(config, providerLeaseId);
|
|
} catch (error) {
|
|
if (error instanceof SandboxNotFoundError) return null;
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
function leaseMetadata(input: {
|
|
config: E2bDriverConfig;
|
|
sandbox: Sandbox;
|
|
remoteCwd: string;
|
|
resumedLease: boolean;
|
|
}) {
|
|
return {
|
|
provider: "e2b",
|
|
shellCommand: "bash",
|
|
template: input.config.template,
|
|
timeoutMs: input.config.timeoutMs,
|
|
reuseLease: input.config.reuseLease,
|
|
sandboxId: input.sandbox.sandboxId,
|
|
sandboxDomain: input.sandbox.sandboxDomain,
|
|
remoteCwd: input.remoteCwd,
|
|
resumedLease: input.resumedLease,
|
|
};
|
|
}
|
|
|
|
function shellQuote(value: string) {
|
|
return `'${value.replace(/'/g, `'"'"'`)}'`;
|
|
}
|
|
|
|
function isValidShellEnvKey(value: string) {
|
|
return /^[A-Za-z_][A-Za-z0-9_]*$/.test(value);
|
|
}
|
|
|
|
// Mirror SSH's buildSshSpawnTarget: source the user's login profiles (and nvm)
|
|
// before exec so commands run with the same PATH the user sees in an
|
|
// interactive shell. e2b's `sandbox.commands.run` otherwise spawns a
|
|
// non-login, non-interactive shell whose PATH does not include npm-globals,
|
|
// nvm shims, or anything else the template installs via .profile/.bashrc —
|
|
// which makes the hello probe fail with `exec: <cli>: not found` even when
|
|
// the binary is on disk.
|
|
function buildLoginShellScript(input: {
|
|
command: string;
|
|
args: string[];
|
|
env?: Record<string, string>;
|
|
}): string {
|
|
const env = input.env ?? {};
|
|
for (const key of Object.keys(env)) {
|
|
if (!isValidShellEnvKey(key)) {
|
|
throw new Error(`Invalid sandbox environment variable key: ${key}`);
|
|
}
|
|
}
|
|
const envArgs = Object.entries(env)
|
|
.filter((entry): entry is [string, string] => typeof entry[1] === "string")
|
|
.map(([key, value]) => `${key}=${shellQuote(value)}`);
|
|
const commandParts = [shellQuote(input.command), ...input.args.map(shellQuote)].join(" ");
|
|
const execLine = envArgs.length > 0
|
|
? `exec env ${envArgs.join(" ")} ${commandParts}`
|
|
: `exec ${commandParts}`;
|
|
return [
|
|
'if [ -f /etc/profile ]; then . /etc/profile >/dev/null 2>&1 || true; fi',
|
|
'if [ -f "$HOME/.profile" ]; then . "$HOME/.profile" >/dev/null 2>&1 || true; fi',
|
|
// .bash_profile typically sources .bashrc itself; only source .bashrc
|
|
// directly when no .bash_profile exists to avoid re-running idempotency-
|
|
// sensitive setup (nvm, PATH prepends) twice on templates that wire
|
|
// .bash_profile -> .bashrc.
|
|
'if [ -f "$HOME/.bash_profile" ]; then . "$HOME/.bash_profile" >/dev/null 2>&1 || true; elif [ -f "$HOME/.bashrc" ]; then . "$HOME/.bashrc" >/dev/null 2>&1 || true; fi',
|
|
'if [ -f "$HOME/.zprofile" ]; then . "$HOME/.zprofile" >/dev/null 2>&1 || true; fi',
|
|
'export NVM_DIR="${NVM_DIR:-$HOME/.nvm}"',
|
|
'[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" >/dev/null 2>&1 || true',
|
|
execLine,
|
|
].join(" && ");
|
|
}
|
|
|
|
async function killSandboxBestEffort(sandbox: Sandbox, reason: string): Promise<void> {
|
|
await sandbox.kill().catch((error) => {
|
|
console.warn(`Failed to kill E2B sandbox during ${reason}: ${formatErrorMessage(error)}`);
|
|
});
|
|
}
|
|
|
|
async function releaseSandboxBestEffort(sandbox: Sandbox, reuseLease: boolean): Promise<void> {
|
|
if (!reuseLease) {
|
|
await killSandboxBestEffort(sandbox, "lease release");
|
|
return;
|
|
}
|
|
|
|
try {
|
|
await sandbox.pause();
|
|
} catch (error) {
|
|
console.warn(
|
|
`Failed to pause E2B sandbox during lease release: ${formatErrorMessage(error)}. Attempting kill instead.`,
|
|
);
|
|
await killSandboxBestEffort(sandbox, "lease release fallback cleanup");
|
|
}
|
|
}
|
|
|
|
const plugin = definePlugin({
|
|
async setup(ctx) {
|
|
ctx.logger.info("E2B sandbox provider plugin ready");
|
|
},
|
|
|
|
async onHealth() {
|
|
return { status: "ok", message: "E2B sandbox provider plugin healthy" };
|
|
},
|
|
|
|
async onEnvironmentValidateConfig(
|
|
params: PluginEnvironmentValidateConfigParams,
|
|
): Promise<PluginEnvironmentValidationResult> {
|
|
const config = parseDriverConfig(params.config);
|
|
const errors: string[] = [];
|
|
|
|
if (typeof params.config.template === "string" && params.config.template.trim().length === 0) {
|
|
errors.push("E2B sandbox environments require a template.");
|
|
}
|
|
if (config.timeoutMs < 1 || config.timeoutMs > 86_400_000) {
|
|
errors.push("timeoutMs must be between 1 and 86400000.");
|
|
}
|
|
|
|
if (errors.length > 0) {
|
|
return { ok: false, errors };
|
|
}
|
|
|
|
return {
|
|
ok: true,
|
|
normalizedConfig: { ...config },
|
|
};
|
|
},
|
|
|
|
async onEnvironmentProbe(
|
|
params: PluginEnvironmentProbeParams,
|
|
): Promise<PluginEnvironmentProbeResult> {
|
|
const config = parseDriverConfig(params.config);
|
|
try {
|
|
const sandbox = await createSandbox(config);
|
|
try {
|
|
await sandbox.setTimeout(config.timeoutMs);
|
|
const remoteCwd = await resolveSandboxWorkingDirectory(sandbox);
|
|
return {
|
|
ok: true,
|
|
summary: `Connected to E2B sandbox template ${config.template}.`,
|
|
metadata: {
|
|
provider: "e2b",
|
|
template: config.template,
|
|
timeoutMs: config.timeoutMs,
|
|
reuseLease: config.reuseLease,
|
|
sandboxId: sandbox.sandboxId,
|
|
sandboxDomain: sandbox.sandboxDomain,
|
|
remoteCwd,
|
|
},
|
|
};
|
|
} finally {
|
|
await sandbox.kill().catch(() => undefined);
|
|
}
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : String(error);
|
|
return {
|
|
ok: false,
|
|
summary: `E2B sandbox probe failed for template ${config.template}.`,
|
|
metadata: {
|
|
provider: "e2b",
|
|
template: config.template,
|
|
timeoutMs: config.timeoutMs,
|
|
reuseLease: config.reuseLease,
|
|
error: message,
|
|
},
|
|
};
|
|
}
|
|
},
|
|
|
|
async onEnvironmentAcquireLease(
|
|
params: PluginEnvironmentAcquireLeaseParams,
|
|
): Promise<PluginEnvironmentLease> {
|
|
const config = parseDriverConfig(params.config);
|
|
const sandbox = await createSandbox(config);
|
|
try {
|
|
await sandbox.setTimeout(config.timeoutMs);
|
|
const remoteCwd = await resolveSandboxWorkingDirectory(sandbox);
|
|
|
|
return {
|
|
providerLeaseId: sandbox.sandboxId,
|
|
metadata: leaseMetadata({ config, sandbox, remoteCwd, resumedLease: false }),
|
|
};
|
|
} catch (error) {
|
|
await sandbox.kill().catch(() => undefined);
|
|
throw error;
|
|
}
|
|
},
|
|
|
|
async onEnvironmentResumeLease(
|
|
params: PluginEnvironmentResumeLeaseParams,
|
|
): Promise<PluginEnvironmentLease> {
|
|
const config = parseDriverConfig(params.config);
|
|
try {
|
|
const sandbox = await connectSandbox(config, params.providerLeaseId);
|
|
try {
|
|
await sandbox.setTimeout(config.timeoutMs);
|
|
const remoteCwd = await resolveSandboxWorkingDirectory(sandbox);
|
|
|
|
return {
|
|
providerLeaseId: sandbox.sandboxId,
|
|
metadata: leaseMetadata({ config, sandbox, remoteCwd, resumedLease: true }),
|
|
};
|
|
} catch (error) {
|
|
await sandbox.kill().catch(() => undefined);
|
|
throw error;
|
|
}
|
|
} catch (error) {
|
|
if (error instanceof SandboxNotFoundError) {
|
|
return { providerLeaseId: null, metadata: { expired: true } };
|
|
}
|
|
throw error;
|
|
}
|
|
},
|
|
|
|
async onEnvironmentReleaseLease(
|
|
params: PluginEnvironmentReleaseLeaseParams,
|
|
): Promise<void> {
|
|
if (!params.providerLeaseId) return;
|
|
const config = parseDriverConfig(params.config);
|
|
const sandbox = await connectForCleanup(config, params.providerLeaseId);
|
|
if (!sandbox) return;
|
|
|
|
await releaseSandboxBestEffort(sandbox, config.reuseLease);
|
|
},
|
|
|
|
async onEnvironmentDestroyLease(
|
|
params: PluginEnvironmentDestroyLeaseParams,
|
|
): Promise<void> {
|
|
if (!params.providerLeaseId) return;
|
|
const config = parseDriverConfig(params.config);
|
|
const sandbox = await connectForCleanup(config, params.providerLeaseId);
|
|
if (!sandbox) return;
|
|
await killSandboxBestEffort(sandbox, "lease destroy");
|
|
},
|
|
|
|
async onEnvironmentRealizeWorkspace(
|
|
params: PluginEnvironmentRealizeWorkspaceParams,
|
|
): Promise<PluginEnvironmentRealizeWorkspaceResult> {
|
|
const config = parseDriverConfig(params.config);
|
|
const remoteCwd =
|
|
typeof params.lease.metadata?.remoteCwd === "string" &&
|
|
params.lease.metadata.remoteCwd.trim().length > 0
|
|
? params.lease.metadata.remoteCwd.trim()
|
|
: params.workspace.remotePath ?? params.workspace.localPath ?? "/paperclip-workspace";
|
|
|
|
if (params.lease.providerLeaseId) {
|
|
const sandbox = await connectSandbox(config, params.lease.providerLeaseId);
|
|
await ensureSandboxWorkspace(sandbox, remoteCwd);
|
|
}
|
|
|
|
return {
|
|
cwd: remoteCwd,
|
|
metadata: {
|
|
provider: "e2b",
|
|
remoteCwd,
|
|
},
|
|
};
|
|
},
|
|
|
|
async onEnvironmentExecute(
|
|
params: PluginEnvironmentExecuteParams,
|
|
): Promise<PluginEnvironmentExecuteResult> {
|
|
if (!params.lease.providerLeaseId) {
|
|
return {
|
|
exitCode: 1,
|
|
timedOut: false,
|
|
stdout: "",
|
|
stderr: "No provider lease ID available for execution.",
|
|
};
|
|
}
|
|
|
|
const config = parseDriverConfig(params.config);
|
|
const sandbox = await connectSandbox(config, params.lease.providerLeaseId);
|
|
const baseCommand = buildLoginShellScript({
|
|
command: params.command,
|
|
args: params.args ?? [],
|
|
env: params.env,
|
|
});
|
|
const timeoutMs = params.timeoutMs ?? config.timeoutMs;
|
|
|
|
// For commands with stdin, stage the payload to a temp file inside the
|
|
// sandbox and shell-redirect it. Streaming stdin via `sendStdin` raced
|
|
// with fast-failing commands (the process exits before the RPC lands),
|
|
// and the previous code awaited a foreground `run` before sending stdin
|
|
// at all, so the data was never delivered. The staged-file approach
|
|
// keeps execution synchronous, avoids the race, and is unaffected by
|
|
// whether the command exits in microseconds or minutes.
|
|
let stagedStdinPath: string | null = null;
|
|
if (params.stdin != null) {
|
|
stagedStdinPath = `/tmp/paperclip-stdin-${randomUUID()}`;
|
|
try {
|
|
await sandbox.files.write(stagedStdinPath, params.stdin);
|
|
} catch (error) {
|
|
// Best-effort cleanup in case the write partially succeeded; ignore
|
|
// remove failures so the original error is what propagates.
|
|
await sandbox.files.remove(stagedStdinPath).catch(() => undefined);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
const command = stagedStdinPath
|
|
? `${baseCommand} < ${shellQuote(stagedStdinPath)}`
|
|
: baseCommand;
|
|
|
|
try {
|
|
// Env is interpolated into the script via `exec env KEY=val …` after
|
|
// profile sourcing so user-configured env wins over anything profiles
|
|
// export. No need to pass `envs:` separately.
|
|
const result = await sandbox.commands.run(command, {
|
|
cwd: params.cwd,
|
|
timeoutMs,
|
|
}) as Awaited<ReturnType<Sandbox["commands"]["run"]>> & {
|
|
exitCode: number;
|
|
stdout: string;
|
|
stderr: string;
|
|
};
|
|
return {
|
|
exitCode: result.exitCode,
|
|
timedOut: false,
|
|
stdout: result.stdout,
|
|
stderr: result.stderr,
|
|
};
|
|
} catch (error) {
|
|
if (error instanceof CommandExitError) {
|
|
return {
|
|
exitCode: error.exitCode,
|
|
timedOut: false,
|
|
stdout: error.stdout,
|
|
stderr: error.stderr,
|
|
};
|
|
}
|
|
if (error instanceof TimeoutError) {
|
|
return buildTimeoutExecuteResult(error);
|
|
}
|
|
throw error;
|
|
} finally {
|
|
if (stagedStdinPath) {
|
|
await sandbox.files.remove(stagedStdinPath).catch(() => undefined);
|
|
}
|
|
}
|
|
},
|
|
});
|
|
|
|
export default plugin;
|