forked from farhoodlabs/paperclip
c0ce35d1fb
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - E2B is a sandbox provider plugin that runs agent code in isolated cloud environments > - Operators configure E2B through the plugin settings page > - But the E2B API key configuration was unclear — the settings field description didn't explain that pasted keys are auto-saved as company secrets, and the fallback to the host `E2B_API_KEY` variable wasn't documented > - Additionally, long-running E2B sandbox commands were timing out because the plugin environment RPC driver used a fixed timeout, and environment commands competed for the single foreground command slot > - This PR clarifies the E2B configuration UX, fixes RPC timeouts for plugin environment execution, and runs E2B environment commands in background mode to avoid blocking the foreground slot > - The benefit is clearer E2B setup for operators and more reliable sandbox command execution ## What Changed - Updated E2B plugin manifest and settings UI to clarify API key configuration — field description now explains that pasted keys are saved as company secrets and documents the `E2B_API_KEY` host fallback - Added test coverage for the plugin settings page rendering - Fixed `plugin-environment-driver.ts` to pass the configured timeout through to RPC calls instead of using a hardcoded default - Updated `environment-runtime.ts` to propagate timeout from the environment lease to the plugin driver - Changed E2B sandbox command execution to use background handles so long-running agent commands don't block the foreground slot needed by the callback bridge ## Verification - `pnpm test` — all existing and new tests pass - `pnpm typecheck` — clean - Manual: navigate to plugin settings, verify E2B API key field shows the updated description text - Manual: run an E2B-backed agent task with a long-running command, verify it completes without RPC timeout ## Risks - Low risk. Configuration UX change is cosmetic. The timeout fix passes an existing value through instead of dropping it. Background command execution is a behavioral change but only affects E2B sandbox commands — the foreground slot is still available for bridge health checks. ## Model Used Codex GPT 5.4 high via Paperclip. ## 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 - [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
344 lines
11 KiB
TypeScript
344 lines
11 KiB
TypeScript
import type { Db } from "@paperclipai/db";
|
|
import type {
|
|
EnvironmentProbeResult,
|
|
PluginEnvironmentConfig,
|
|
PluginEnvironmentDriverDeclaration,
|
|
} from "@paperclipai/shared";
|
|
import type {
|
|
PluginEnvironmentExecuteParams,
|
|
PluginEnvironmentExecuteResult,
|
|
PluginEnvironmentLease,
|
|
PluginEnvironmentRealizeWorkspaceParams,
|
|
PluginEnvironmentRealizeWorkspaceResult,
|
|
} from "@paperclipai/plugin-sdk";
|
|
import { unprocessable } from "../errors.js";
|
|
import { pluginRegistryService } from "./plugin-registry.js";
|
|
import type { PluginWorkerManager } from "./plugin-worker-manager.js";
|
|
|
|
export function pluginDriverProviderKey(config: Pick<PluginEnvironmentConfig, "pluginKey" | "driverKey">): string {
|
|
return `${config.pluginKey}:${config.driverKey}`;
|
|
}
|
|
|
|
export async function resolvePluginEnvironmentDriver(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
config: PluginEnvironmentConfig;
|
|
}) {
|
|
const pluginRegistry = pluginRegistryService(input.db);
|
|
const plugin = await pluginRegistry.getByKey(input.config.pluginKey);
|
|
if (!plugin || plugin.status !== "ready") {
|
|
throw new Error(`Plugin environment driver "${pluginDriverProviderKey(input.config)}" is not ready.`);
|
|
}
|
|
const driver = plugin.manifestJson.environmentDrivers?.find(
|
|
(candidate) => candidate.driverKey === input.config.driverKey,
|
|
);
|
|
if (!driver) {
|
|
throw new Error(`Plugin "${input.config.pluginKey}" does not declare environment driver "${input.config.driverKey}".`);
|
|
}
|
|
if (!input.workerManager.isRunning(plugin.id)) {
|
|
throw new Error(`Plugin environment driver "${pluginDriverProviderKey(input.config)}" has no running worker.`);
|
|
}
|
|
return { plugin, driver };
|
|
}
|
|
|
|
export async function resolvePluginEnvironmentDriverByKey(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
driverKey: string;
|
|
}) {
|
|
return await resolvePluginSandboxProviderDriverByKey({
|
|
db: input.db,
|
|
driverKey: input.driverKey,
|
|
workerManager: input.workerManager,
|
|
requireRunning: true,
|
|
});
|
|
}
|
|
|
|
export async function resolvePluginSandboxProviderDriverByKey(input: {
|
|
db: Db;
|
|
driverKey: string;
|
|
workerManager?: PluginWorkerManager;
|
|
requireRunning?: boolean;
|
|
}): Promise<{ plugin: Awaited<ReturnType<ReturnType<typeof pluginRegistryService>["list"]>>[number]; driver: PluginEnvironmentDriverDeclaration } | null> {
|
|
const pluginRegistry = pluginRegistryService(input.db);
|
|
const plugins = await pluginRegistry.list();
|
|
for (const plugin of plugins) {
|
|
const driver = plugin.manifestJson.environmentDrivers?.find(
|
|
(candidate) => candidate.driverKey === input.driverKey && candidate.kind === "sandbox_provider",
|
|
) as PluginEnvironmentDriverDeclaration | undefined;
|
|
if (!driver) continue;
|
|
if (input.requireRunning) {
|
|
if (plugin.status !== "ready") continue;
|
|
if (!input.workerManager?.isRunning(plugin.id)) continue;
|
|
}
|
|
return { plugin, driver };
|
|
}
|
|
return null;
|
|
}
|
|
|
|
export async function listReadyPluginEnvironmentDrivers(input: {
|
|
db: Db;
|
|
workerManager?: PluginWorkerManager;
|
|
}) {
|
|
if (!input.workerManager) return [];
|
|
const pluginRegistry = pluginRegistryService(input.db);
|
|
const plugins = await pluginRegistry.list();
|
|
return plugins.flatMap((plugin) => {
|
|
if (plugin.status !== "ready" || !input.workerManager?.isRunning(plugin.id)) return [];
|
|
return (plugin.manifestJson.environmentDrivers ?? [])
|
|
.filter((driver) => driver.kind === "sandbox_provider")
|
|
.map((driver) => ({
|
|
pluginId: plugin.id,
|
|
pluginKey: plugin.pluginKey,
|
|
driverKey: driver.driverKey,
|
|
displayName: driver.displayName,
|
|
description: driver.description,
|
|
configSchema: driver.configSchema,
|
|
}));
|
|
});
|
|
}
|
|
|
|
export async function validatePluginSandboxProviderConfig(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
provider: string;
|
|
config: Record<string, unknown>;
|
|
}): Promise<{
|
|
normalizedConfig: Record<string, unknown>;
|
|
pluginId: string;
|
|
pluginKey: string;
|
|
driver: PluginEnvironmentDriverDeclaration;
|
|
}> {
|
|
const resolved = await resolvePluginSandboxProviderDriverByKey({
|
|
db: input.db,
|
|
driverKey: input.provider,
|
|
workerManager: input.workerManager,
|
|
requireRunning: true,
|
|
});
|
|
if (!resolved) {
|
|
throw unprocessable(`Sandbox provider "${input.provider}" is not installed or its plugin worker is not running.`);
|
|
}
|
|
|
|
const result = await input.workerManager.call(resolved.plugin.id, "environmentValidateConfig", {
|
|
driverKey: input.provider,
|
|
config: input.config,
|
|
});
|
|
|
|
if (!result.ok) {
|
|
throw unprocessable(
|
|
result.errors?.[0] ?? `Sandbox provider "${input.provider}" rejected its config.`,
|
|
{
|
|
errors: result.errors ?? [],
|
|
warnings: result.warnings ?? [],
|
|
},
|
|
);
|
|
}
|
|
|
|
return {
|
|
normalizedConfig: result.normalizedConfig ?? input.config,
|
|
pluginId: resolved.plugin.id,
|
|
pluginKey: resolved.plugin.pluginKey,
|
|
driver: resolved.driver,
|
|
};
|
|
}
|
|
|
|
export async function validatePluginEnvironmentDriverConfig(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
config: PluginEnvironmentConfig;
|
|
}): Promise<PluginEnvironmentConfig> {
|
|
const { plugin } = await resolvePluginEnvironmentDriver(input);
|
|
const result = await input.workerManager.call(plugin.id, "environmentValidateConfig", {
|
|
driverKey: input.config.driverKey,
|
|
config: input.config.driverConfig,
|
|
});
|
|
|
|
if (!result.ok) {
|
|
throw unprocessable(
|
|
result.errors?.[0] ?? `Plugin environment driver "${pluginDriverProviderKey(input.config)}" rejected its config.`,
|
|
{
|
|
errors: result.errors ?? [],
|
|
warnings: result.warnings ?? [],
|
|
},
|
|
);
|
|
}
|
|
|
|
return {
|
|
...input.config,
|
|
driverConfig: result.normalizedConfig ?? input.config.driverConfig,
|
|
};
|
|
}
|
|
|
|
export async function probePluginEnvironmentDriver(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
companyId: string;
|
|
environmentId: string;
|
|
config: PluginEnvironmentConfig;
|
|
}): Promise<EnvironmentProbeResult> {
|
|
const { plugin } = await resolvePluginEnvironmentDriver(input);
|
|
const result = await input.workerManager.call(plugin.id, "environmentProbe", {
|
|
driverKey: input.config.driverKey,
|
|
companyId: input.companyId,
|
|
environmentId: input.environmentId,
|
|
config: input.config.driverConfig,
|
|
});
|
|
|
|
return {
|
|
ok: result.ok,
|
|
driver: "plugin",
|
|
summary: result.summary ?? `Plugin environment driver "${pluginDriverProviderKey(input.config)}" probe ${result.ok ? "passed" : "failed"}.`,
|
|
details: {
|
|
pluginKey: input.config.pluginKey,
|
|
driverKey: input.config.driverKey,
|
|
diagnostics: result.diagnostics ?? [],
|
|
metadata: result.metadata ?? {},
|
|
},
|
|
};
|
|
}
|
|
|
|
export async function probePluginSandboxProviderDriver(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
companyId: string;
|
|
environmentId: string;
|
|
provider: string;
|
|
config: Record<string, unknown>;
|
|
}): Promise<EnvironmentProbeResult> {
|
|
const resolved = await resolvePluginEnvironmentDriverByKey({
|
|
db: input.db,
|
|
workerManager: input.workerManager,
|
|
driverKey: input.provider,
|
|
});
|
|
if (!resolved) {
|
|
return {
|
|
ok: false,
|
|
driver: "sandbox",
|
|
summary: `Sandbox provider "${input.provider}" is not installed or its plugin worker is not running.`,
|
|
details: {
|
|
provider: input.provider,
|
|
},
|
|
};
|
|
}
|
|
|
|
const { provider: _provider, ...driverConfig } = input.config;
|
|
const result = await input.workerManager.call(resolved.plugin.id, "environmentProbe", {
|
|
driverKey: input.provider,
|
|
companyId: input.companyId,
|
|
environmentId: input.environmentId,
|
|
config: driverConfig,
|
|
});
|
|
|
|
return {
|
|
ok: result.ok,
|
|
driver: "sandbox",
|
|
summary: result.summary ?? `Sandbox provider "${input.provider}" probe ${result.ok ? "passed" : "failed"}.`,
|
|
details: {
|
|
provider: input.provider,
|
|
pluginKey: resolved.plugin.pluginKey,
|
|
diagnostics: result.diagnostics ?? [],
|
|
metadata: result.metadata ?? {},
|
|
},
|
|
};
|
|
}
|
|
|
|
export async function resumePluginEnvironmentLease(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
companyId: string;
|
|
environmentId: string;
|
|
config: PluginEnvironmentConfig;
|
|
providerLeaseId: string;
|
|
leaseMetadata?: Record<string, unknown>;
|
|
}): Promise<PluginEnvironmentLease> {
|
|
const { plugin } = await resolvePluginEnvironmentDriver(input);
|
|
return await input.workerManager.call(plugin.id, "environmentResumeLease", {
|
|
driverKey: input.config.driverKey,
|
|
companyId: input.companyId,
|
|
environmentId: input.environmentId,
|
|
config: input.config.driverConfig,
|
|
providerLeaseId: input.providerLeaseId,
|
|
leaseMetadata: input.leaseMetadata,
|
|
});
|
|
}
|
|
|
|
export async function destroyPluginEnvironmentLease(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
companyId: string;
|
|
environmentId: string;
|
|
config: PluginEnvironmentConfig;
|
|
providerLeaseId: string | null;
|
|
leaseMetadata?: Record<string, unknown>;
|
|
}): Promise<void> {
|
|
const { plugin } = await resolvePluginEnvironmentDriver(input);
|
|
await input.workerManager.call(plugin.id, "environmentDestroyLease", {
|
|
driverKey: input.config.driverKey,
|
|
companyId: input.companyId,
|
|
environmentId: input.environmentId,
|
|
config: input.config.driverConfig,
|
|
providerLeaseId: input.providerLeaseId,
|
|
leaseMetadata: input.leaseMetadata,
|
|
});
|
|
}
|
|
|
|
export async function realizePluginEnvironmentWorkspace(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
pluginId?: string | null;
|
|
params: PluginEnvironmentRealizeWorkspaceParams;
|
|
config: PluginEnvironmentConfig;
|
|
}): Promise<PluginEnvironmentRealizeWorkspaceResult> {
|
|
const { plugin } = input.pluginId
|
|
? { plugin: { id: input.pluginId } }
|
|
: await resolvePluginEnvironmentDriver({
|
|
db: input.db,
|
|
workerManager: input.workerManager,
|
|
config: input.config,
|
|
});
|
|
return await input.workerManager.call(plugin.id, "environmentRealizeWorkspace", input.params);
|
|
}
|
|
|
|
export async function executePluginEnvironmentCommand(input: {
|
|
db: Db;
|
|
workerManager: PluginWorkerManager;
|
|
pluginId?: string | null;
|
|
params: PluginEnvironmentExecuteParams;
|
|
config: PluginEnvironmentConfig;
|
|
}): Promise<PluginEnvironmentExecuteResult> {
|
|
const { plugin } = input.pluginId
|
|
? { plugin: { id: input.pluginId } }
|
|
: await resolvePluginEnvironmentDriver({
|
|
db: input.db,
|
|
workerManager: input.workerManager,
|
|
config: input.config,
|
|
});
|
|
return await input.workerManager.call(
|
|
plugin.id,
|
|
"environmentExecute",
|
|
input.params,
|
|
resolvePluginExecuteRpcTimeoutMs({
|
|
requestedTimeoutMs: input.params.timeoutMs,
|
|
config: input.config.driverConfig,
|
|
}),
|
|
);
|
|
}
|
|
|
|
const RPC_OVERHEAD_BUFFER_MS = 30_000;
|
|
|
|
export function resolvePluginExecuteRpcTimeoutMs(input: {
|
|
requestedTimeoutMs?: number;
|
|
config: Record<string, unknown>;
|
|
}): number | undefined {
|
|
let baseMs: number | undefined;
|
|
if (Number.isFinite(input.requestedTimeoutMs) && (input.requestedTimeoutMs ?? 0) > 0) {
|
|
baseMs = Math.trunc(input.requestedTimeoutMs!);
|
|
} else {
|
|
const configTimeoutMs = typeof input.config.timeoutMs === "number" ? input.config.timeoutMs : null;
|
|
if (configTimeoutMs && Number.isFinite(configTimeoutMs) && configTimeoutMs > 0) {
|
|
baseMs = Math.trunc(configTimeoutMs);
|
|
}
|
|
}
|
|
return baseMs != null ? baseMs + RPC_OVERHEAD_BUFFER_MS : undefined;
|
|
}
|