The Open Framework for Building Agents
fix(eve): discover self-reference / default export extension mounts (#4165)
prhaf9d20719be10
diff --git a/.changeset/default-export-discovery.md b/.changeset/default-export-discovery.mdnew file mode 100644index 000000000..1a3bc0988--- /dev/null+++ b/.changeset/default-export-discovery.md@@ -0,0 +1,5 @@+---+"eve": patch+---++Fix discovery of packaged extension mounts whose default exports are rewritten during compilation, and of built-in extensions mounted from inside the eve package itself.diff --git a/packages/eve/src/discover/discover-agent.ts b/packages/eve/src/discover/discover-agent.tsindex d07c813ce..b3572c89b 100644--- a/packages/eve/src/discover/discover-agent.ts+++ b/packages/eve/src/discover/discover-agent.ts@@ -44,6 +44,7 @@ import {createDiskProjectSource,type ProjectSource,type ProjectSourceEntry,+ readPackageJsonName,} from "#discover/project-source.js";import { discoverSandboxSource } from "#discover/sandbox.js";import { discoverScheduleSources } from "#discover/schedules.js";@@ -553,19 +554,6 @@ async function tryReadPackageJsonName(source: ProjectSource,appRoot: string,): Promise<string | undefined> {- try {- const packageJsonPath = join(appRoot, "package.json");- const content = JSON.parse(await source.readTextFile(packageJsonPath)) as {- name?: unknown;- };- const name = content.name;-- if (typeof name !== "string" || name.length === 0) {- return undefined;- }-- return stripNpmPackageScope(name);- } catch {- return undefined;- }+ const name = await readPackageJsonName(source, appRoot);+ return name === undefined ? undefined : stripNpmPackageScope(name);}diff --git a/packages/eve/src/discover/extension-specifier.test.ts b/packages/eve/src/discover/extension-specifier.test.tsindex 685cbf6be..b6430c979 100644--- a/packages/eve/src/discover/extension-specifier.test.ts+++ b/packages/eve/src/discover/extension-specifier.test.ts@@ -44,6 +44,23 @@ describe("parseExtensionMountSpecifier", () => {);});+ it.each(["const", "let", "var"])("reads a %s mount with an emitted default export", (kind) => {+ const source = `import{config}from"./config.js";import code from"eve/extensions/code";${kind} code_default=code({github:config()});export{code_default as default};`;+ expect(parseExtensionMountSpecifier(source)).toBe("eve/extensions/code");+ });++ it("resolves an emitted factory's aliased named import", () => {+ const source =+ 'import{crm as mount}from"@acme/crm";const crm_default=mount({});export{crm_default as default};';+ expect(parseExtensionMountSpecifier(source)).toBe("@acme/crm");+ });++ it("does not use an unrelated factory for an emitted default export", () => {+ const source =+ 'import crm from"@acme/crm";const other=crm({});const exported={};export{exported as default};';+ expect(parseExtensionMountSpecifier(source)).toBeNull();+ });+it("returns null when no mount shape is present", () => {expect(parseExtensionMountSpecifier("export const value = 1;")).toBeNull();});diff --git a/packages/eve/src/discover/extension-specifier.ts b/packages/eve/src/discover/extension-specifier.tsindex e183dc5e5..e1283b1c7 100644--- a/packages/eve/src/discover/extension-specifier.ts+++ b/packages/eve/src/discover/extension-specifier.ts@@ -12,6 +12,7 @@ function escapeRegExp(value: string): string {* - `export { default } from "@acme/crm";`* - `import { crm } from "@acme/crm"; export default crm({ ... });`* - `import crm from "@acme/crm"; export default crm();`+ * - `import crm from "@acme/crm"; const mount = crm(); export { mount as default };`** Returns the specifier string, or `null` when the file does not match a* recognized mount shape.@@ -23,7 +24,7 @@ export function parseExtensionMountSpecifier(source: string): string | null {}const factory = source.match(/export\s+default\s+([A-Za-z_$][\w$]*)\s*[(;\n]/);- const boundName = factory?.[1];+ const boundName = factory?.[1] ?? emittedMountFactory(source);if (boundName === undefined) {return null;}@@ -51,3 +52,20 @@ export function parseExtensionMountSpecifier(source: string): string | null {return null;}++function emittedMountFactory(source: string): string | undefined {+ const exports = /export\s*\{([^}]*)\}\s*(?:;|$)/g;+ for (const match of source.matchAll(exports)) {+ for (const entry of (match[1] ?? "").split(",")) {+ const alias = entry.trim().match(/^([A-Za-z_$][\w$]*)\s+as\s+default$/);+ if (alias === null) continue;+ const declaration = source.match(+ new RegExp(+ `\\b(?:const|let|var)\\s+${escapeRegExp(alias[1]!)}\\s*=\\s*([A-Za-z_$][\\w$]*)\\s*\\(`,+ ),+ );+ return declaration?.[1];+ }+ }+ return undefined;+}diff --git a/packages/eve/src/discover/extensions.test.ts b/packages/eve/src/discover/extensions.test.tsindex 1422dfb69..654044111 100644--- a/packages/eve/src/discover/extensions.test.ts+++ b/packages/eve/src/discover/extensions.test.ts@@ -52,6 +52,39 @@ describe("locateExtensionMountPackage", () => {});});+ it("resolves a built-in extension mounted from inside the eve package by self-reference", async () => {+ const packageRoot = "/repo/packages/eve";+ const agentRoot = `${packageRoot}/src/example/extension`;+ const source = createMemoryProjectSource({+ files: {+ [`${agentRoot}/subagents/coder/extensions/code.ts`]:+ 'import code from "eve/extensions/code";\nexport default code({});\n',+ [`${packageRoot}/package.json`]: JSON.stringify({+ name: "eve",+ eve: {+ builtInExtensions: {+ "./extensions/code": { dist: "dist/src/extensions/code/extension" },+ },+ },+ }),+ },+ });++ const result = await locateExtensionMount({+ source,+ agentRoot: `${agentRoot}/subagents/coder`,+ appRoot: packageRoot,+ mount: createModuleSourceRef({ logicalPath: "extensions/code.ts" }),+ namespace: "code",+ });++ expect(result.diagnostics).toEqual([]);+ expect(result.location).toMatchObject({+ packageRoot,+ sourceRoot: `${packageRoot}/dist/src/extensions/code/extension`,+ });+ });+it("resolves source and dist roots before the distribution exists", async () => {const appRoot = "/repo/apps/agent";const agentRoot = `${appRoot}/agent`;diff --git a/packages/eve/src/discover/extensions.ts b/packages/eve/src/discover/extensions.tsindex 318d17ff5..8965a8ad1 100644--- a/packages/eve/src/discover/extensions.ts+++ b/packages/eve/src/discover/extensions.ts@@ -9,7 +9,7 @@ import { createDiscoverErrorDiagnostic, type DiscoverDiagnostic } from "#discoveimport { parseExtensionMountSpecifier } from "#discover/extension-specifier.js";import { SUPPORTED_AUTHORED_MODULE_FILE_EXTENSIONS } from "#discover/filesystem.js";import type { ExtensionSourceRef } from "#discover/manifest.js";-import type { ProjectSource } from "#discover/project-source.js";+import { type ProjectSource, readPackageJsonName } from "#discover/project-source.js";import {parseBuiltInExtensionPackageRoots,parseExtensionPackageRoots,@@ -367,6 +367,11 @@ async function resolvePackageRoot(input: {}const packageSubpath = bareSpecifierPackagePath(input.specifier);+ // Node resolves a package's own name through self-reference; bundled extensions+ // discovered from inside eve use it to mount other built-in extensions.+ if ((await readPackageJsonName(input.source, input.appRoot)) === packageSubpath) {+ return resolve(input.appRoot);+ }let current = resolve(input.appRoot);while (true) {const candidate = join(current, "node_modules", packageSubpath);diff --git a/packages/eve/src/discover/project-source.ts b/packages/eve/src/discover/project-source.tsindex e964c430b..54b71fd98 100644--- a/packages/eve/src/discover/project-source.ts+++ b/packages/eve/src/discover/project-source.ts@@ -1,5 +1,5 @@import { readdir, readFile, stat } from "node:fs/promises";-import { posix, sep } from "node:path";+import { join, posix, sep } from "node:path";/*** Minimum directory-entry shape returned by a {@link ProjectSource}.@@ -280,6 +280,24 @@ function createMemoryEntry(name: string, kind: "file" | "directory"): ProjectSou};}+/**+ * Reads the non-empty string `name` field from `root/package.json`, or+ * `undefined` when the file is missing, unparseable, or has no usable name.+ */+export async function readPackageJsonName(+ source: ProjectSource,+ root: string,+): Promise<string | undefined> {+ try {+ const { name } = JSON.parse(await source.readTextFile(join(root, "package.json"))) as {+ name?: unknown;+ };+ return typeof name === "string" && name.length > 0 ? name : undefined;+ } catch {+ return undefined;+ }+}+function normalizeToPosix(path: string): string {const withPosixSeparators = sep === "/" ? path : path.replaceAll(sep, "/");