Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): isolate workspace agent memory (#2963)

Andrew Barbad594b94ea8ee
diff --git a/.changeset/separate-workspace-agent-memory.md b/.changeset/separate-workspace-agent-memory.md
new file mode 100644
index 000000000..e0f091a8c
--- /dev/null
+++ b/.changeset/separate-workspace-agent-memory.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Separate default memory namespaces for agents mounted under different route prefixes in the same Vercel project.
diff --git a/docs/memory/overview.mdx b/docs/memory/overview.mdx
index 209f3fb31..a8a1e81c4 100644
--- a/docs/memory/overview.mdx
+++ b/docs/memory/overview.mdx
@@ -211,7 +211,7 @@ The namespace separates an application's memory domains before scope is
applied. Omit it to use `defaultNamespace`, which combines the slot name, the
graph node, and a deployment-aware identity:
-- Production and other Vercel environments use the project and environment.
+- Production and other Vercel environments use the project and environment. Members of a top-level `agents/` workspace use separate namespaces.
- Preview also uses the branch or deployment identity.
- Local development uses a digest of the application root, never the raw path.
diff --git a/packages/eve/src/cli/commands/build.ts b/packages/eve/src/cli/commands/build.ts
index a590d9cd1..5038039d6 100644
--- a/packages/eve/src/cli/commands/build.ts
+++ b/packages/eve/src/cli/commands/build.ts
@@ -4,6 +4,7 @@ import type { Command } from "#compiled/commander/index.js";
import type { CliApplicationContext } from "#cli/application-command.js";
import { resolveInternalVercelServiceOutput } from "#cli/vercel-service-output.js";
import { createCliTheme, renderCliTaggedLine } from "#cli/ui/output.js";
+import { EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV } from "#internal/application/build-output-environment.js";
import type { ApplicationBuildOptions } from "#internal/nitro/host/types.js";
import { resolveEveProjectContext } from "#internal/project-context.js";
import {
@@ -78,10 +79,14 @@ export function registerBuildCommand(input: {
readonly publicRoutePrefix: ApplicationBuildOptions["publicRoutePrefix"];
readonly skipVercelSandboxPrewarm: boolean;
readonly vercelServiceOutput: ApplicationBuildOptions["vercelServiceOutput"];
+ readonly workspaceMember: boolean;
} = {
publicRoutePrefix: normalizePublicRoutePrefix(process.env[EVE_PUBLIC_ROUTE_PREFIX_ENV]),
skipVercelSandboxPrewarm: options.skipSandboxPrewarm === true,
vercelServiceOutput: resolveInternalVercelServiceOutput(input.applicationContext.root),
+ workspaceMember:
+ projectContext.kind === "workspace-member" ||
+ process.env[EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV] === "1",
};
if (profileOutputPath !== undefined) {
buildOptions.profileOutputPath = profileOutputPath;
diff --git a/packages/eve/src/cli/run.test.ts b/packages/eve/src/cli/run.test.ts
index 4615da813..9a1a7cf78 100644
--- a/packages/eve/src/cli/run.test.ts
+++ b/packages/eve/src/cli/run.test.ts
@@ -1004,6 +1004,7 @@ describe("eve build output ownership", () => {
profileOutputPath: resolve(process.cwd(), profilePath),
skipVercelSandboxPrewarm: false,
vercelServiceOutput: undefined,
+ workspaceMember: false,
});
});
@@ -1026,6 +1027,7 @@ describe("eve build output ownership", () => {
hostOutputDirectory: resolve(process.cwd(), configuredHostDirectory),
serviceOutputDirectory: resolve(process.cwd(), configuredDirectory),
},
+ workspaceMember: false,
});
});
diff --git a/packages/eve/src/internal/application/build-output-environment.ts b/packages/eve/src/internal/application/build-output-environment.ts
index 23b20f12d..4ffc25ed7 100644
--- a/packages/eve/src/internal/application/build-output-environment.ts
+++ b/packages/eve/src/internal/application/build-output-environment.ts
@@ -1,3 +1,4 @@
+export const EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV = "EVE_INTERNAL_AGENT_WORKSPACE_MEMBER";
export const EVE_INTERNAL_BUILD_OUTPUT_DIRECTORY_ENV = "EVE_INTERNAL_BUILD_OUTPUT_DIRECTORY";
export const EVE_INTERNAL_HOST_BUILD_OUTPUT_DIRECTORY_ENV =
"EVE_INTERNAL_HOST_BUILD_OUTPUT_DIRECTORY";
diff --git a/packages/eve/src/internal/nitro/host/build-application.ts b/packages/eve/src/internal/nitro/host/build-application.ts
index afdeca0cd..6c79e32e1 100644
--- a/packages/eve/src/internal/nitro/host/build-application.ts
+++ b/packages/eve/src/internal/nitro/host/build-application.ts
@@ -309,6 +309,7 @@ async function buildApplicationInWorkspace(
buildDir: workspace.nitro.buildDir,
outputDir: workspace.publication.output.stagedDir,
publicRoutePrefix,
+ workspaceMember: options.workspaceMember,
}),
);
diff --git a/packages/eve/src/internal/nitro/host/create-application-nitro.ts b/packages/eve/src/internal/nitro/host/create-application-nitro.ts
index c076a7d22..97cb1cca2 100644
--- a/packages/eve/src/internal/nitro/host/create-application-nitro.ts
+++ b/packages/eve/src/internal/nitro/host/create-application-nitro.ts
@@ -802,6 +802,7 @@ interface ProductionApplicationNitroOptions {
* function's environment for callback-URL minting behind a per-agent mount.
*/
readonly publicRoutePrefix?: string;
+ readonly workspaceMember?: boolean;
}
/**
@@ -845,6 +846,7 @@ export async function createProductionApplicationNitro(
agentName: preparedHost.compileResult.manifest.config.name,
enabled: preset === "vercel",
publicRoutePrefix: options.publicRoutePrefix,
+ workspaceMember: options.workspaceMember,
}),
});
await writeEveVersionedCacheMetadata(options.buildDir);
diff --git a/packages/eve/src/internal/nitro/host/types.ts b/packages/eve/src/internal/nitro/host/types.ts
index 2370844be..9290eeb3c 100644
--- a/packages/eve/src/internal/nitro/host/types.ts
+++ b/packages/eve/src/internal/nitro/host/types.ts
@@ -21,6 +21,8 @@ export interface ApplicationBuildOptions {
*/
readonly publicRoutePrefix?: string;
readonly skipVercelSandboxPrewarm: boolean;
+ /** Whether this build is for a member of a top-level `agents/` workspace. */
+ readonly workspaceMember?: boolean;
readonly vercelServiceOutput?: {
readonly hostOutputDirectory: string;
readonly serviceOutputDirectory: string;
diff --git a/packages/eve/src/internal/nitro/host/vercel-build-output-config.test.ts b/packages/eve/src/internal/nitro/host/vercel-build-output-config.test.ts
index 68a4ad2a2..67add0ac1 100644
--- a/packages/eve/src/internal/nitro/host/vercel-build-output-config.test.ts
+++ b/packages/eve/src/internal/nitro/host/vercel-build-output-config.test.ts
@@ -70,4 +70,25 @@ describe("createEveVercelOptions", () => {
EVE_PUBLIC_ROUTE_PREFIX: "/eve/agents/support",
});
});
+
+ it("marks workspace-member flow functions without marking standalone agents", () => {
+ const standalone = createEveVercelOptions({
+ agentName: "test-agent",
+ enabled: true,
+ publicRoutePrefix: "/support",
+ });
+ const workspaceMember = createEveVercelOptions({
+ agentName: "test-agent",
+ enabled: true,
+ publicRoutePrefix: "/support",
+ workspaceMember: true,
+ });
+
+ expect(standalone?.functionRules[EVE_WORKFLOW_FLOW_ROUTE_PATH].environment).not.toHaveProperty(
+ "EVE_INTERNAL_AGENT_WORKSPACE_MEMBER",
+ );
+ expect(workspaceMember?.functionRules[EVE_WORKFLOW_FLOW_ROUTE_PATH].environment).toMatchObject({
+ EVE_INTERNAL_AGENT_WORKSPACE_MEMBER: "1",
+ });
+ });
});
diff --git a/packages/eve/src/internal/nitro/host/vercel-build-output-config.ts b/packages/eve/src/internal/nitro/host/vercel-build-output-config.ts
index 637ca3af8..9879c7072 100644
--- a/packages/eve/src/internal/nitro/host/vercel-build-output-config.ts
+++ b/packages/eve/src/internal/nitro/host/vercel-build-output-config.ts
@@ -1,3 +1,4 @@
+import { EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV } from "#internal/application/build-output-environment.js";
import { resolveInstalledPackageInfo } from "#internal/application/package.js";
import { EVE_PACKAGE_NAME } from "#internal/package-name.js";
import { createEveWorkflowQueueTrigger } from "#internal/workflow/queue-namespace.js";
@@ -22,6 +23,7 @@ export function createEveVercelOptions(input: {
agentName: string;
enabled: boolean;
publicRoutePrefix?: string;
+ workspaceMember?: boolean;
}) {
if (!input.enabled) {
return undefined;
@@ -40,6 +42,9 @@ export function createEveVercelOptions(input: {
if (publicRoutePrefix !== undefined) {
environment[EVE_PUBLIC_ROUTE_PREFIX_ENV] = publicRoutePrefix;
}
+ if (input.workspaceMember === true) {
+ environment[EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV] = "1";
+ }
return {
config: {
diff --git a/packages/eve/src/internal/vercel/build-agent-workspace.integration.test.ts b/packages/eve/src/internal/vercel/build-agent-workspace.integration.test.ts
index 4bb1c56fb..96188805b 100644
--- a/packages/eve/src/internal/vercel/build-agent-workspace.integration.test.ts
+++ b/packages/eve/src/internal/vercel/build-agent-workspace.integration.test.ts
@@ -49,7 +49,7 @@ describe("buildAgentWorkspace", () => {
expect(config.services["eve-support"]).toEqual({
buildCommand:
- "cd '../../../agents/support' && export EVE_INTERNAL_BUILD_OUTPUT_DIRECTORY='../../.eve/vercel-services/eve-support/.vercel/output' && export EVE_INTERNAL_HOST_BUILD_OUTPUT_DIRECTORY='../../.vercel/output' && export EVE_PUBLIC_ROUTE_PREFIX='/support' && node 'node_modules/eve/bin/eve.js' build",
+ "cd '../../../agents/support' && export EVE_INTERNAL_BUILD_OUTPUT_DIRECTORY='../../.eve/vercel-services/eve-support/.vercel/output' && export EVE_INTERNAL_HOST_BUILD_OUTPUT_DIRECTORY='../../.vercel/output' && export EVE_PUBLIC_ROUTE_PREFIX='/support' && export EVE_INTERNAL_AGENT_WORKSPACE_MEMBER=1 && node 'node_modules/eve/bin/eve.js' build",
framework: "eve",
root: ".eve/vercel-services/eve-support",
routePrefix: "/support",
diff --git a/packages/eve/src/internal/vercel/build-agent-workspace.ts b/packages/eve/src/internal/vercel/build-agent-workspace.ts
index df8208d60..597aa41b9 100644
--- a/packages/eve/src/internal/vercel/build-agent-workspace.ts
+++ b/packages/eve/src/internal/vercel/build-agent-workspace.ts
@@ -30,6 +30,7 @@ export async function buildAgentWorkspace(workspace: AgentWorkspace): Promise<st
)} build`,
name: member.name,
publicRoutePrefix: `/${member.name}`,
+ workspaceMember: true,
},
target: {
hostOutputDirectory: join(workspace.root, ".vercel", "output"),
diff --git a/packages/eve/src/internal/vercel/eve-service-contribution.ts b/packages/eve/src/internal/vercel/eve-service-contribution.ts
index 1f38fbfa6..42bf44b96 100644
--- a/packages/eve/src/internal/vercel/eve-service-contribution.ts
+++ b/packages/eve/src/internal/vercel/eve-service-contribution.ts
@@ -2,6 +2,7 @@ import { createHash } from "node:crypto";
import { join } from "node:path";
import {
+ EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV,
EVE_INTERNAL_BUILD_OUTPUT_DIRECTORY_ENV,
EVE_INTERNAL_HOST_BUILD_OUTPUT_DIRECTORY_ENV,
} from "#internal/application/build-output-environment.js";
@@ -28,6 +29,7 @@ export interface EveVercelAgentTarget {
readonly buildCommand: string;
readonly name?: string;
readonly publicRoutePrefix: string;
+ readonly workspaceMember?: boolean;
}
export interface EveVercelBuildTarget {
@@ -93,9 +95,13 @@ function createIsolatedBuild(input: {
prefix === undefined
? ""
: ` && export ${EVE_PUBLIC_ROUTE_PREFIX_ENV}=${quoteVercelShellArgument(prefix)}`;
+ const workspaceMemberExport =
+ input.agent.workspaceMember === true
+ ? ` && export ${EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV}=1`
+ : "";
return {
- buildCommand: `cd ${quoteVercelShellArgument(toVercelRelativePath(rootDirectory, input.agent.appRoot))} && export ${EVE_INTERNAL_BUILD_OUTPUT_DIRECTORY_ENV}=${quoteVercelShellArgument(toVercelRelativePath(input.agent.appRoot, outputDirectory))} && export ${EVE_INTERNAL_HOST_BUILD_OUTPUT_DIRECTORY_ENV}=${quoteVercelShellArgument(toVercelRelativePath(input.agent.appRoot, input.hostOutputDirectory))}${prefixExport} && ${input.agent.buildCommand}`,
+ buildCommand: `cd ${quoteVercelShellArgument(toVercelRelativePath(rootDirectory, input.agent.appRoot))} && export ${EVE_INTERNAL_BUILD_OUTPUT_DIRECTORY_ENV}=${quoteVercelShellArgument(toVercelRelativePath(input.agent.appRoot, outputDirectory))} && export ${EVE_INTERNAL_HOST_BUILD_OUTPUT_DIRECTORY_ENV}=${quoteVercelShellArgument(toVercelRelativePath(input.agent.appRoot, input.hostOutputDirectory))}${prefixExport}${workspaceMemberExport} && ${input.agent.buildCommand}`,
root: toVercelRelativePath(input.projectRoot, rootDirectory),
rootDirectory,
};
diff --git a/packages/eve/src/public/memory/index.test.ts b/packages/eve/src/public/memory/index.test.ts
index 6ddeaae14..6350139ea 100644
--- a/packages/eve/src/public/memory/index.test.ts
+++ b/packages/eve/src/public/memory/index.test.ts
@@ -58,6 +58,40 @@ describe("memory namespaces and scopes", () => {
expect(preview).not.toBe(production);
});
+ it("separates workspace agents mounted within the same Vercel project", () => {
+ vi.stubEnv("VERCEL_PROJECT_ID", "prj_123");
+ vi.stubEnv("VERCEL_ENV", "production");
+ vi.stubEnv("EVE_INTERNAL_AGENT_WORKSPACE_MEMBER", "1");
+ vi.stubEnv("EVE_PUBLIC_ROUTE_PREFIX", "/support/");
+ const support = defaultNamespace({ appRoot: "/app", node: "__root__", slot: "profile" });
+
+ vi.stubEnv("EVE_PUBLIC_ROUTE_PREFIX", "/research");
+ const research = defaultNamespace({ appRoot: "/app", node: "__root__", slot: "profile" });
+
+ expect(JSON.parse(support)).toEqual([
+ "eve-memory-default-namespace-v1",
+ "vercel",
+ "prj_123",
+ "production",
+ null,
+ "/support",
+ "__root__",
+ "profile",
+ ]);
+ expect(support).not.toBe(research);
+ });
+
+ it("preserves standalone Vercel namespaces when a public route prefix is configured", () => {
+ vi.stubEnv("VERCEL_PROJECT_ID", "prj_123");
+ vi.stubEnv("VERCEL_ENV", "production");
+ const input = { appRoot: "/app", node: "__root__", slot: "profile" };
+ const unprefixed = defaultNamespace(input);
+
+ vi.stubEnv("EVE_PUBLIC_ROUTE_PREFIX", "/support");
+
+ expect(defaultNamespace(input)).toBe(unprefixed);
+ });
+
it("disables anonymous and runtime principals and normalizes local development", () => {
const context = (principalType: string, principalId = "principal") => ({
...baseContext,
diff --git a/packages/eve/src/public/memory/index.ts b/packages/eve/src/public/memory/index.ts
index 8088affd2..c07acc622 100644
--- a/packages/eve/src/public/memory/index.ts
+++ b/packages/eve/src/public/memory/index.ts
@@ -7,7 +7,12 @@ import type { Approval } from "#public/definitions/approval.js";
import type { SessionContext } from "#public/definitions/callback-context.js";
import type { ExactDefinition } from "#public/definitions/exact.js";
import type { DynamicResolveContext } from "#dynamic/definition.js";
+import { EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV } from "#internal/application/build-output-environment.js";
import { MEMORY_DEFINITION_BRAND } from "#shared/memory-definition.js";
+import {
+ EVE_PUBLIC_ROUTE_PREFIX_ENV,
+ normalizePublicRoutePrefix,
+} from "#shared/public-route-prefix.js";
import { resolveVercelProjectIdFromEnvironment } from "#shared/vercel-project.js";
import type { ToolContext, ToolModelOutput } from "#tools/definition.js";
@@ -186,12 +191,17 @@ export function defaultNamespace(context: MemoryNamespaceContext): string {
process.env.VERCEL_URL?.trim() ||
"unknown-preview"
: null;
+ const publicRoutePrefix =
+ process.env[EVE_INTERNAL_AGENT_WORKSPACE_MEMBER_ENV] === "1"
+ ? normalizePublicRoutePrefix(process.env[EVE_PUBLIC_ROUTE_PREFIX_ENV])
+ : undefined;
return JSON.stringify([
"eve-memory-default-namespace-v1",
"vercel",
projectId,
environment,
previewIdentity,
+ ...(publicRoutePrefix === undefined ? [] : [publicRoutePrefix]),
context.node,
context.slot,
]);
diff --git a/packages/eve/test/scenarios/cli.scenario.test.ts b/packages/eve/test/scenarios/cli.scenario.test.ts
index 755b6a970..bd31c8fbe 100644
--- a/packages/eve/test/scenarios/cli.scenario.test.ts
+++ b/packages/eve/test/scenarios/cli.scenario.test.ts
@@ -529,7 +529,10 @@ describe("runCli", () => {
}
expect(buildHost).toHaveBeenCalledWith(resolvedWorkspaceRoot, {
+ publicRoutePrefix: undefined,
skipVercelSandboxPrewarm: false,
+ vercelServiceOutput: undefined,
+ workspaceMember: false,
});
expect(observedEnvironment).toEqual({
EVE_BUILD_DEFAULT_ONLY: "from-env",
@@ -562,7 +565,10 @@ describe("runCli", () => {
}
expect(buildHost).toHaveBeenCalledWith(resolvedWorkspaceRoot, {
+ publicRoutePrefix: undefined,
skipVercelSandboxPrewarm: true,
+ vercelServiceOutput: undefined,
+ workspaceMember: false,
});
});
});