Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

fix(eve): workspace discovery - ignore unrelated ancestor agents directories (#2943)

Andrew Barbaf9b760a593d6
diff --git a/.changeset/fix-unrelated-agents-workspace-detection.md b/.changeset/fix-unrelated-agents-workspace-detection.md
new file mode 100644
index 000000000..41f603c9b
--- /dev/null
+++ b/.changeset/fix-unrelated-agents-workspace-detection.md
@@ -0,0 +1,5 @@
+---
+"eve": patch
+---
+
+Ignore unrelated ancestor `agents/` directories when resolving standalone projects so local CLI commands do not misclassify neighboring repositories as agent workspaces.
diff --git a/packages/eve/src/internal/agent-workspace.integration.test.ts b/packages/eve/src/internal/agent-workspace.integration.test.ts
index bc15d818f..e0bc685bc 100644
--- a/packages/eve/src/internal/agent-workspace.integration.test.ts
+++ b/packages/eve/src/internal/agent-workspace.integration.test.ts
@@ -103,4 +103,34 @@ describe("resolveAgentWorkspace", () => {
member: { appRoot: supportRoot, name: "support" },
});
});
+
+ it("ignores unrelated agents directories above a standalone project", async () => {
+ const root = await mkdtemp(join(tmpdir(), "eve-standalone-unrelated-agents-"));
+ const appRoot = join(root, "eve", "apps", "fixtures", "weather-agent");
+ await Promise.all([
+ mkdir(join(appRoot, "agent"), { recursive: true }),
+ mkdir(join(root, "agents", "apps"), { recursive: true }),
+ ]);
+
+ await expect(resolveEveProjectContext(appRoot)).resolves.toEqual({
+ appRoot,
+ environmentRoot: appRoot,
+ kind: "standalone",
+ });
+ });
+
+ it("preserves a standalone project boundary above an agents directory", async () => {
+ const root = await mkdtemp(join(tmpdir(), "eve-standalone-boundary-"));
+ const appRoot = join(root, "agents", "support");
+ await Promise.all([
+ mkdir(join(root, "agent"), { recursive: true }),
+ mkdir(join(appRoot, "agent"), { recursive: true }),
+ ]);
+
+ await expect(resolveEveProjectContext(appRoot)).resolves.toEqual({
+ appRoot,
+ environmentRoot: appRoot,
+ kind: "standalone",
+ });
+ });
});
diff --git a/packages/eve/src/internal/project-context.ts b/packages/eve/src/internal/project-context.ts
index ce8dba3db..8c5459d6b 100644
--- a/packages/eve/src/internal/project-context.ts
+++ b/packages/eve/src/internal/project-context.ts
@@ -1,4 +1,4 @@
-import { join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
import { createDiskProjectSource, type ProjectSource } from "#discover/project-source.js";
import {
@@ -36,30 +36,22 @@ export async function resolveNamedAgentProjectContext(
): Promise<Extract<EveProjectContext, { kind: "workspace-member" | "standalone" }> | undefined> {
const resolvedAppRoot = resolve(appRoot);
const source = options.source ?? createDiskProjectSource();
- let workspaceRoot = resolvedAppRoot;
+ const agentsRoot = dirname(resolvedAppRoot);
+ if (basename(agentsRoot) !== "agents") return undefined;
- while (true) {
- if (
- workspaceRoot !== resolvedAppRoot &&
- (await source.stat(join(workspaceRoot, "agent"))) === "directory"
- ) {
- return undefined;
- }
- const workspace = await resolveAgentWorkspace(workspaceRoot, { source });
- const member = workspace?.members.find((candidate) => candidate.appRoot === resolvedAppRoot);
- if (workspace !== undefined && member !== undefined) {
- return {
- workspace,
- environmentRoot: workspace.root,
- kind: "workspace-member",
- member,
- };
- }
+ const workspaceRoot = dirname(agentsRoot);
+ if ((await source.stat(join(workspaceRoot, "agent"))) === "directory") return undefined;
+
+ const workspace = await resolveAgentWorkspace(workspaceRoot, { source });
+ const member = workspace?.members.find((candidate) => candidate.appRoot === resolvedAppRoot);
+ if (workspace === undefined || member === undefined) return undefined;
- const parent = resolve(workspaceRoot, "..");
- if (parent === workspaceRoot) return undefined;
- workspaceRoot = parent;
- }
+ return {
+ workspace,
+ environmentRoot: workspace.root,
+ kind: "workspace-member",
+ member,
+ };
}
/** Classify the current filesystem scope before command-specific policy runs. */