Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): resolve Vercel credentials when creating sandboxes (#4788)

Ben Pankowf2e0f67ec9f0
diff --git a/.changeset/sandbox-create-env-credentials.md b/.changeset/sandbox-create-env-credentials.md
new file mode 100644
index 000000000..2f7c6f390
--- /dev/null
+++ b/.changeset/sandbox-create-env-credentials.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Vercel sandbox creation now reads `VERCEL_TOKEN`, `VERCEL_TEAM_ID`/`VERCEL_ORG_ID`, and `VERCEL_PROJECT_ID` from the environment, like sandbox lookup and deletion already do. A CI runner without a linked project can now create sandboxes.
diff --git a/packages/eve/src/execution/sandbox/bindings/vercel-create-sdk.ts b/packages/eve/src/execution/sandbox/bindings/vercel-create-sdk.ts
index 33d1ea3a5..4a30fe866 100644
--- a/packages/eve/src/execution/sandbox/bindings/vercel-create-sdk.ts
+++ b/packages/eve/src/execution/sandbox/bindings/vercel-create-sdk.ts
@@ -1,4 +1,7 @@
-import { getVercelSandboxFetch } from "#execution/sandbox/bindings/vercel-credentials.js";
+import {
+ getVercelSandboxFetch,
+ resolveVercelSandboxCredentials,
+} from "#execution/sandbox/bindings/vercel-credentials.js";
import { VERCEL_EVE_SANDBOX_IMAGE } from "#execution/sandbox/bindings/eve-image.js";
import type {
VercelCreateOptions,
@@ -27,23 +30,22 @@ export async function createVercelEveImageSandbox(input: {
readonly sandboxModule: VercelModule;
}): Promise<VercelSandbox> {
const { image, runtime: _runtime, source, ...createOptions } = input.createOptions;
- const fetch = getVercelSandboxFetch(input.createOptions);
+ const options = {
+ ...createOptions,
+ ...(await resolveVercelSandboxCredentials(input.createOptions)),
+ fetch: getVercelSandboxFetch(input.createOptions),
+ };
/*
* `runtime`, `image`, and a snapshot source are mutually exclusive in the
* SDK.
*/
if (source?.type === "snapshot") {
- return await input.sandboxModule.Sandbox.create({
- ...createOptions,
- source,
- fetch,
- });
+ return await input.sandboxModule.Sandbox.create({ ...options, source });
}
return await input.sandboxModule.Sandbox.create({
- ...createOptions,
+ ...options,
source,
image: image ?? VERCEL_EVE_SANDBOX_IMAGE,
- fetch,
});
}
diff --git a/packages/eve/src/execution/sandbox/bindings/vercel-credentials.ts b/packages/eve/src/execution/sandbox/bindings/vercel-credentials.ts
index 176128f52..3c68cb272 100644
--- a/packages/eve/src/execution/sandbox/bindings/vercel-credentials.ts
+++ b/packages/eve/src/execution/sandbox/bindings/vercel-credentials.ts
@@ -34,6 +34,17 @@ export async function getVercelSandboxCredentials(
return getVercelSandboxCredentialsFromOidcToken(oidcToken);
}
+/** Credentials when eve can resolve them; otherwise `{}` so the SDK falls back to its own resolution. */
+export async function resolveVercelSandboxCredentials(
+ createOptions: VercelCreateOptions,
+): Promise<VercelSandboxCredentials | Record<string, never>> {
+ try {
+ return await getVercelSandboxCredentials(createOptions);
+ } catch {
+ return {};
+ }
+}
+
function readNonEmptyString(object: object, key: string): string | undefined {
const value = Reflect.get(object, key);
return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
diff --git a/packages/eve/src/execution/sandbox/bindings/vercel-lifecycle.ts b/packages/eve/src/execution/sandbox/bindings/vercel-lifecycle.ts
index 6cbb4de14..34d72077e 100644
--- a/packages/eve/src/execution/sandbox/bindings/vercel-lifecycle.ts
+++ b/packages/eve/src/execution/sandbox/bindings/vercel-lifecycle.ts
@@ -1,7 +1,6 @@
import {
- getVercelSandboxCredentials,
getVercelSandboxFetch,
- type VercelSandboxCredentials,
+ resolveVercelSandboxCredentials,
} from "#execution/sandbox/bindings/vercel-credentials.js";
import type {
VercelCreateOptions,
@@ -54,13 +53,3 @@ export async function stopVercelSandbox(sandbox: VercelSandbox): Promise<void> {
}
await sandbox.stop();
}
-
-async function resolveVercelSandboxCredentials(
- createOptions: VercelCreateOptions,
-): Promise<VercelSandboxCredentials | Record<string, never>> {
- try {
- return await getVercelSandboxCredentials(createOptions);
- } catch {
- return {};
- }
-}
diff --git a/packages/eve/src/execution/sandbox/bindings/vercel-lookup.ts b/packages/eve/src/execution/sandbox/bindings/vercel-lookup.ts
index 893ee7e91..906be19e6 100644
--- a/packages/eve/src/execution/sandbox/bindings/vercel-lookup.ts
+++ b/packages/eve/src/execution/sandbox/bindings/vercel-lookup.ts
@@ -1,6 +1,6 @@
import {
- getVercelSandboxCredentials,
getVercelSandboxFetch,
+ resolveVercelSandboxCredentials,
} from "#execution/sandbox/bindings/vercel-credentials.js";
import { isVercelSandboxMissingError } from "#execution/sandbox/bindings/vercel-errors.js";
import { errorMessage } from "#execution/sandbox/bindings/vercel-options.js";
@@ -36,20 +36,11 @@ async function getVercelSandboxGetOptions(input: {
readonly createOptions: VercelCreateOptions;
readonly sandboxName: string;
}): Promise<VercelGetOptions> {
- const baseOptions = {
+ return {
+ ...(await resolveVercelSandboxCredentials(input.createOptions)),
fetch: getVercelSandboxFetch(input.createOptions),
name: input.sandboxName,
resume: false,
+ signal: input.createOptions.signal,
};
-
- try {
- const credentials = await getVercelSandboxCredentials(input.createOptions);
- return {
- ...baseOptions,
- ...credentials,
- signal: input.createOptions.signal,
- };
- } catch {
- return baseOptions;
- }
}
diff --git a/packages/eve/src/execution/sandbox/bindings/vercel.test.ts b/packages/eve/src/execution/sandbox/bindings/vercel.test.ts
index 9d7705f05..ac2497f4a 100644
--- a/packages/eve/src/execution/sandbox/bindings/vercel.test.ts
+++ b/packages/eve/src/execution/sandbox/bindings/vercel.test.ts
@@ -187,6 +187,40 @@ describe("createVercelSandbox", () => {
);
});
+ it("creates sandboxes with Vercel API credentials from the environment", async () => {
+ vi.stubEnv("VERCEL_TEAM_ID", "team_env");
+ vi.stubEnv("VERCEL_PROJECT_ID", "prj_env");
+ vi.stubEnv("VERCEL_TOKEN", "token_env");
+ const sandboxModule = {
+ Sandbox: {
+ create: vi
+ .fn()
+ .mockResolvedValueOnce(createMockSandbox({ name: "template" }))
+ .mockResolvedValueOnce(createMockSandbox({ name: "session" })),
+ get: vi.fn().mockResolvedValue(null),
+ },
+ };
+ const provider = createVercelSandbox({
+ loadSandboxModule: async () => sandboxModule as never,
+ });
+
+ await provider.prepare({ appRoot: "/tmp/test-app-root", seedFiles: [] });
+ await provider.openSession({
+ appRoot: "/tmp/test-app-root",
+ prepared: { snapshotId: "prepared-snapshot" },
+ sandboxName: "session-key",
+ });
+
+ const credentials = { projectId: "prj_env", teamId: "team_env", token: "token_env" };
+ expect(sandboxModule.Sandbox.create.mock.calls.map(([options]) => options)).toEqual([
+ expect.objectContaining({ ...credentials, image: VERCEL_EVE_SANDBOX_IMAGE }),
+ expect.objectContaining({
+ ...credentials,
+ source: expect.objectContaining({ type: "snapshot" }),
+ }),
+ ]);
+ });
+
it("reuses template identity until authored source or resources change", async () => {
async function prepareName(input: {
createOptions?: NonNullable<