Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/scoped-eval-target.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"eve": patch
---

Make `eve eval` match scoped package targets against the same unscoped agent id used at runtime.
17 changes: 11 additions & 6 deletions packages/eve/src/evals/cli/eval.ts
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,15 @@ async function readExpectedAgentName(appRoot: string): Promise<string> {
const packageJson = JSON.parse(await readFile(join(appRoot, "package.json"), "utf8")) as {
readonly name?: unknown;
};
return typeof packageJson.name === "string" && packageJson.name.length > 0
? packageJson.name
: basename(appRoot);
} catch {
return basename(appRoot);
}
if (typeof packageJson.name === "string" && packageJson.name.length > 0) {
return unscopedPackageName(packageJson.name);
}
} catch {}

return basename(appRoot);
}

function unscopedPackageName(packageName: string): string {
const slashIndex = packageName.lastIndexOf("/");
return slashIndex === -1 ? packageName : packageName.slice(slashIndex + 1);
}
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,44 @@ const TEST_CONFIG = {
};

describe("eve eval environment loading", () => {
it("matches scoped package names against the runtime agent id", async () => {
const fixtureRoot = await createEnvironmentFixture();
const previousCwd = process.cwd();
const logger = {
error: vi.fn(),
log: vi.fn(),
};
const exit = vi.spyOn(process, "exit").mockImplementation(() => undefined as never);
const evaluation = makeEvaluation("demo-eval");

await writeFile(join(fixtureRoot, "package.json"), '{ "name": "@acme/agent" }\n');
process.chdir(fixtureRoot);
mockedEvalDependencies.discoverAndImportEvals.mockResolvedValue([evaluation]);
mockedEvalDependencies.discoverEvalConfig.mockResolvedValue(TEST_CONFIG);
mockedEvalDependencies.resolveEvalTargetHandle.mockResolvedValue({
attachSession: vi.fn(),
capabilities: { devRoutes: false },
dispatchSchedule: vi.fn(),
fetch: vi.fn(),
kind: "remote",
url: "https://example.com",
});
mockedEvalDependencies.executeEval.mockResolvedValue(makeEvalResult(evaluation.id));

try {
await runCli(["eval", "--url", "https://example.com"], logger);
} finally {
process.chdir(previousCwd);
}

expect(mockedEvalDependencies.resolveEvalTargetHandle).toHaveBeenCalledWith(
expect.objectContaining({
expectedAgentName: "agent",
}),
);
expect(exit).toHaveBeenCalledWith(0);
});

it("loads local env files before resolving a remote target", async () => {
const fixtureRoot = await createEnvironmentFixture();
const resolvedFixtureRoot = await realpath(fixtureRoot);
Expand Down