The Open Framework for Building Agents
fix(eve): handle optional pnpm build scripts in registry installs (#2852)
prhafbc89e58fa5d
diff --git a/.changeset/calm-ravens-add.md b/.changeset/calm-ravens-add.mdnew file mode 100644index 000000000..3938feba3--- /dev/null+++ b/.changeset/calm-ravens-add.md@@ -0,0 +1,5 @@+---+"eve": patch+---++Registry items can now declare optional pnpm packages with build scripts. Before installation, eve asks whether to skip those packages, allow their scripts, or abort, and records the choice in the owning workspace policy.diff --git a/apps/docs/registry.json b/apps/docs/registry.jsonindex abb19dc08..a7dd2c5dd 100644--- a/apps/docs/registry.json+++ b/apps/docs/registry.json@@ -33,9 +33,23 @@"type": "registry:item","title": "Self-modification (Experimental)","description": "Add an experimental, development-only source editing subagent to an eve project.",- "dependencies": [- "@eve/self-modification"- ],+ "dependencies": ["@eve/self-modification"],+ "meta": {+ "eve": {+ "install": {+ "pnpm": {+ "buildScripts": [+ {+ "packages": ["node-liblzma", "@mongodb-js/zstd"],+ "optional": true,+ "recommendedAction": "ignore-optional",+ "reason": "These optional just-bash compression accelerators are not required by the self-modification agent."+ }+ ]+ }+ }+ }+ },"files": [{"path": "registry/experimental/self-modification/agent.ts",diff --git a/docs/install-integrations.mdx b/docs/install-integrations.mdxindex e97a951bb..969f4a899 100644--- a/docs/install-integrations.mdx+++ b/docs/install-integrations.mdx@@ -26,6 +26,8 @@ Some integrations package several independently installable components. For examWhen an official item declares an interactive setup flow or flows, eve asks whether to run them after installation and runs multiple flows in declaration order. Run the printed `eve add <item> --skip-install` command to resume a skipped or cancelled setup later; it reruns the selected components' declared flows from the beginning.+An official item may identify optional pnpm dependencies that have build scripts. Before installation, eve asks whether to skip those optional packages, allow their build scripts, or abort. Your choice updates `ignoredOptionalDependencies` or `allowBuilds` in the pnpm workspace that owns the project. Allow build scripts only when you trust the packages named in the prompt.+## Automate setupUse `eve add <item> --non-interactive` when a script or coding agent cannot answer terminal prompts. It prints NDJSON events and exits with a status you can branch on:diff --git a/packages/eve/src/cli/commands/registry-metadata.ts b/packages/eve/src/cli/commands/registry-metadata.tsindex 6a8fdb33d..279e033a3 100644--- a/packages/eve/src/cli/commands/registry-metadata.ts+++ b/packages/eve/src/cli/commands/registry-metadata.ts@@ -8,10 +8,26 @@ const RegistrySetupSchema = z.object({args: z.array(z.string()).default([]),});+const ExactPackageNameSchema = z+ .string()+ .regex(/^(?:@[a-z0-9][a-z0-9._~-]*\/)?[a-z0-9][a-z0-9._~-]*$/u);++const PnpmBuildScriptPolicySchema = z.object({+ packages: z.array(ExactPackageNameSchema).min(1),+ optional: z.literal(true),+ recommendedAction: z.literal("ignore-optional"),+ reason: z.string().min(1),+});+const EveRegistryMetadataSchema = z.object({requires: z.string().optional(),docs: z.string().min(1).optional(),implementation: z.enum(["native", "chat-sdk"]).optional(),+ install: z+ .object({+ pnpm: z.object({ buildScripts: z.array(PnpmBuildScriptPolicySchema).min(1) }).optional(),+ })+ .optional(),setup: z.union([RegistrySetupSchema, z.array(RegistrySetupSchema).min(1)]).transform((setup) => (Array.isArray(setup) ? setup : [setup]))diff --git a/packages/eve/src/cli/commands/registry-package.ts b/packages/eve/src/cli/commands/registry-package.tsindex dac49c302..ffa0e70d2 100644--- a/packages/eve/src/cli/commands/registry-package.ts+++ b/packages/eve/src/cli/commands/registry-package.ts@@ -11,6 +11,10 @@ import type { RegistrySetupCompletion } from "#setup/registry-setup-protocol.js"import { hasInteractiveTerminal } from "./preconditions.js";import type { AddCommandOptions, RegistryCommandLogger } from "./registry.js";+import {+ prepareDeclaredPnpmBuildPolicy,+ type DeclaredPnpmBuildPolicy,+} from "./registry-pnpm-build-policy-flow.js";import type { RegistrySetupCommand } from "./registry-setup-command.js";import { headlessSetupContinuation, serializeHeadlessSetupEvent } from "./setup-headless.js";@@ -23,6 +27,7 @@ export const RegistryPackageComponentSchema = z.object({export type RegistryPackageComponent = z.infer<typeof RegistryPackageComponentSchema>;interface PackageMetadata {requires?: string;+ install?: { pnpm?: { buildScripts: readonly DeclaredPnpmBuildPolicy[] } };setup?: RegistrySetupCommand[];}export interface RegistryPackageDependencies {@@ -140,6 +145,17 @@ export async function runRegistryPackage(input: {operations.assertCompatibleVersion(metadata?.requires);return metadata;});+ if (+ options.skipInstall !== true &&+ !(await prepareDeclaredPnpmBuildPolicy({+ logger,+ appRoot,+ item,+ policies: entries.flatMap((entry) => entry?.install?.pnpm?.buildScripts ?? []),+ options,+ }))+ )+ return false;if (options.skipInstall !== true)await addRegistryItems(addresses, {config,diff --git a/packages/eve/src/cli/commands/registry-pnpm-build-policy-flow.test.ts b/packages/eve/src/cli/commands/registry-pnpm-build-policy-flow.test.tsnew file mode 100644index 000000000..09410c8da--- /dev/null+++ b/packages/eve/src/cli/commands/registry-pnpm-build-policy-flow.test.ts@@ -0,0 +1,139 @@+import { describe, expect, it, vi } from "vitest";++import { createFakePrompter } from "#internal/testing/fake-prompter.js";+import { prepareDeclaredPnpmBuildPolicy } from "./registry-pnpm-build-policy-flow.js";++function createLogger() {+ const errors: string[] = [];+ const logs: string[] = [];+ return {+ errors,+ logs,+ error: (message: string) => errors.push(message),+ log: (message: string) => logs.push(message),+ };+}++const policy = {+ packages: ["node-liblzma", "@mongodb-js/zstd"],+ optional: true as const,+ recommendedAction: "ignore-optional" as const,+ reason: "Optional accelerators are not required.",+};++const pnpm = vi.fn(async () => ({ kind: "pnpm" as const, source: "lockfile" as const }));++describe("registry pnpm build policy flow", () => {+ it("applies the interactive policy selection", async () => {+ const logger = createLogger();+ const select = vi.fn(() => "ignore-optional");+ const { prompter } = createFakePrompter({ single: select });+ const context = {+ filePath: "/project/pnpm-workspace.yaml",+ packages: policy.packages,+ satisfied: false,+ };+ const applyPnpmBuildPolicy = vi.fn(async () => {});++ await expect(+ prepareDeclaredPnpmBuildPolicy(+ {+ logger,+ appRoot: "/project",+ item: "experimental/tool",+ policies: [policy],+ options: { prompter },+ },+ {+ detectPackageManager: pnpm,+ inspectPnpmBuildPolicy: vi.fn(async () => context),+ applyPnpmBuildPolicy,+ },+ ),+ ).resolves.toBe(true);+ expect(applyPnpmBuildPolicy).toHaveBeenCalledWith(context, "ignore-optional");+ expect(select).toHaveBeenCalledWith(+ expect.objectContaining({+ hintLayout: "inline",+ options: expect.arrayContaining([+ expect.objectContaining({ value: "ignore-optional", hint: expect.any(String) }),+ expect.objectContaining({ value: "allow-builds", hint: expect.any(String) }),+ expect.objectContaining({ value: "abort", hint: "Do not add this registry item." }),+ ]),+ }),+ );+ });++ it("cancels before changing policy when abort is selected", async () => {+ const logger = createLogger();+ const { prompter } = createFakePrompter({ single: () => "abort" });+ const applyPnpmBuildPolicy = vi.fn(async () => {});++ await expect(+ prepareDeclaredPnpmBuildPolicy(+ {+ logger,+ appRoot: "/project",+ item: "experimental/tool",+ policies: [policy],+ options: { prompter },+ },+ {+ detectPackageManager: pnpm,+ inspectPnpmBuildPolicy: vi.fn(async () => ({+ filePath: "/project/pnpm-workspace.yaml",+ packages: policy.packages,+ satisfied: false,+ })),+ applyPnpmBuildPolicy,+ },+ ),+ ).resolves.toBe(false);+ expect(applyPnpmBuildPolicy).not.toHaveBeenCalled();+ });++ it("blocks a headless install until a policy is selected", async () => {+ const logger = createLogger();++ await expect(+ prepareDeclaredPnpmBuildPolicy(+ {+ logger,+ appRoot: "/project",+ item: "experimental/tool",+ policies: [policy],+ options: { nonInteractive: true },+ },+ {+ detectPackageManager: pnpm,+ inspectPnpmBuildPolicy: vi.fn(async () => ({+ filePath: "/project/pnpm-workspace.yaml",+ packages: policy.packages,+ satisfied: false,+ })),+ },+ ),+ ).resolves.toBe(false);++ expect(JSON.parse(logger.errors[0]!)).toMatchObject({+ type: "blocked",+ item: "experimental/tool",+ installed: false,+ status: "input_required",+ question: {+ key: "install.pnpm.buildScripts",+ recommended: "ignore-optional",+ },+ next: {+ command: "eve",+ args: [+ "add",+ "experimental/tool",+ "--non-interactive",+ "--answer",+ "install.pnpm.buildScripts=<JSON value>",+ ],+ },+ });+ });+});diff --git a/packages/eve/src/cli/commands/registry-pnpm-build-policy-flow.ts b/packages/eve/src/cli/commands/registry-pnpm-build-policy-flow.tsnew file mode 100644index 000000000..0b373244f--- /dev/null+++ b/packages/eve/src/cli/commands/registry-pnpm-build-policy-flow.ts@@ -0,0 +1,157 @@+import { detectPackageManager } from "#setup/package-manager.js";+import { createPrompter, type Prompter } from "#setup/prompter.js";+import { WizardCancelledError } from "#setup/step.js";++import type { RegistryCommandLogger } from "./registry-recovery.js";+import {+ applyPnpmBuildPolicy,+ inspectPnpmBuildPolicy,+ type PnpmBuildPolicyAction,+ type PnpmBuildPolicyContext,+} from "./registry-pnpm-build-policy.js";+import { headlessSetupContinuation, serializeHeadlessSetupEvent } from "./setup-headless.js";++const PNPM_BUILD_POLICY_ANSWER_KEY = "install.pnpm.buildScripts";+type PnpmBuildPolicyChoice = PnpmBuildPolicyAction | "abort";++export interface DeclaredPnpmBuildPolicy {+ readonly packages: readonly string[];+ readonly optional: true;+ readonly recommendedAction: "ignore-optional";+ readonly reason: string;+}++interface PnpmBuildPolicyFlowDependencies {+ readonly detectPackageManager: typeof detectPackageManager;+ readonly inspectPnpmBuildPolicy: typeof inspectPnpmBuildPolicy;+ readonly applyPnpmBuildPolicy: typeof applyPnpmBuildPolicy;+ readonly createPrompter: () => Prompter;+}++function pnpmBuildPolicyChoice(value: unknown): PnpmBuildPolicyChoice | undefined {+ return value === "ignore-optional" || value === "allow-builds" || value === "abort"+ ? value+ : undefined;+}++/** Resolves declared pnpm build-script decisions before registry installation begins. */+export async function prepareDeclaredPnpmBuildPolicy(+ input: {+ readonly logger: RegistryCommandLogger;+ readonly appRoot: string;+ readonly item: string;+ readonly policies: readonly DeclaredPnpmBuildPolicy[] | undefined;+ readonly options: {+ readonly yes?: boolean;+ readonly nonInteractive?: boolean;+ readonly answers?: Readonly<Record<string, unknown>>;+ readonly prompter?: Prompter;+ };+ },+ dependencyOverrides: Partial<PnpmBuildPolicyFlowDependencies> = {},+): Promise<boolean> {+ if (input.policies === undefined || input.policies.length === 0) return true;+ const dependencies: PnpmBuildPolicyFlowDependencies = {+ detectPackageManager: dependencyOverrides.detectPackageManager ?? detectPackageManager,+ inspectPnpmBuildPolicy: dependencyOverrides.inspectPnpmBuildPolicy ?? inspectPnpmBuildPolicy,+ applyPnpmBuildPolicy: dependencyOverrides.applyPnpmBuildPolicy ?? applyPnpmBuildPolicy,+ createPrompter: dependencyOverrides.createPrompter ?? createPrompter,+ };+ if ((await dependencies.detectPackageManager(input.appRoot)).kind !== "pnpm") return true;++ for (const policy of input.policies) {+ const context: PnpmBuildPolicyContext = await dependencies.inspectPnpmBuildPolicy(+ input.appRoot,+ policy.packages,+ );+ if (context.satisfied) continue;++ const suppliedAnswer = input.options.answers?.[PNPM_BUILD_POLICY_ANSWER_KEY];+ let choice = pnpmBuildPolicyChoice(suppliedAnswer);+ if (suppliedAnswer !== undefined && choice === undefined) {+ throw new Error(+ `${PNPM_BUILD_POLICY_ANSWER_KEY} must be "ignore-optional", "allow-builds", or "abort".`,+ );+ }+ if (input.options.nonInteractive && choice === undefined && input.options.yes !== true) {+ const question = {+ key: PNPM_BUILD_POLICY_ANSWER_KEY,+ kind: "select" as const,+ message: "How should pnpm handle these optional packages?",+ required: true,+ recommended: policy.recommendedAction,+ options: [+ { id: "ignore-optional", label: "Ignore optional packages" },+ { id: "allow-builds", label: "Allow build scripts" },+ { id: "abort", label: "Abort add" },+ ],+ };+ input.logger.error(+ serializeHeadlessSetupEvent({+ version: 1,+ type: "blocked",+ item: input.item,+ installed: false,+ completedItems: [],+ status: "input_required",+ question,+ next: headlessSetupContinuation({ item: input.item, installed: false, question }),+ }),+ );+ process.exitCode = 2;+ return false;+ }+ if (choice === undefined && input.options.yes === true) choice = policy.recommendedAction;+ if (choice === undefined) {+ const prompter = input.options.prompter ?? dependencies.createPrompter();+ try {+ choice = await prompter.select<PnpmBuildPolicyChoice>({+ message: "How should pnpm handle these optional packages?",+ description: policy.reason,+ metadata: [+ { label: "Packages", value: policy.packages.join(", ") },+ { label: "Policy file", value: context.filePath },+ ],+ hintLayout: "inline",+ initialValue: policy.recommendedAction,+ options: [+ {+ value: "ignore-optional",+ label: "Ignore optional packages (recommended)",+ hint: "Add the item without installing these packages or running their build scripts.",+ },+ {+ value: "allow-builds",+ label: "Allow build scripts",+ hint: "Install these packages and allow their third-party build scripts to run.",+ },+ {+ value: "abort",+ label: "Abort add",+ hint: "Do not add this registry item.",+ },+ ],+ });+ } catch (error) {+ if (!(error instanceof WizardCancelledError)) throw error;+ return false;+ }+ }+ if (choice === "abort") {+ if (input.options.nonInteractive) {+ input.logger.log(+ serializeHeadlessSetupEvent({+ version: 1,+ type: "cancelled",+ item: input.item,+ completedItems: [],+ }),+ );+ }+ return false;+ }+ if (choice === undefined) throw new Error("pnpm build policy selection is required.");+ await dependencies.applyPnpmBuildPolicy(context, choice);+ }+ return true;+}diff --git a/packages/eve/src/cli/commands/registry-pnpm-build-policy.test.ts b/packages/eve/src/cli/commands/registry-pnpm-build-policy.test.tsnew file mode 100644index 000000000..ea18eb8a1--- /dev/null+++ b/packages/eve/src/cli/commands/registry-pnpm-build-policy.test.ts@@ -0,0 +1,47 @@+import { describe, expect, it } from "vitest";++import { withPnpmBuildPolicy } from "./registry-pnpm-build-policy.js";++describe("pnpm registry build policy", () => {+ it("adds exact optional dependencies to the ignored list", () => {+ expect(+ withPnpmBuildPolicy(+ "packages:\n - apps/*\n\nallowBuilds:\n sharp: false\n",+ ["node-liblzma", "@mongodb-js/zstd"],+ "ignore-optional",+ ),+ ).toBe(+ 'packages:\n - apps/*\n\nallowBuilds:\n sharp: false\n\nignoredOptionalDependencies:\n - "@mongodb-js/zstd"\n - "node-liblzma"\n',+ );+ });++ it("replaces an ignored decision when build scripts are allowed", () => {+ expect(+ withPnpmBuildPolicy(+ 'ignoredOptionalDependencies:\n - "@mongodb-js/zstd"\n - cbor-extract\n - node-liblzma\n',+ ["node-liblzma", "@mongodb-js/zstd"],+ "allow-builds",+ ),+ ).toBe(+ 'ignoredOptionalDependencies:\n - cbor-extract\n\nallowBuilds:\n "@mongodb-js/zstd": true\n "node-liblzma": true\n',+ );+ });++ it("replaces an allowed decision when optional packages are ignored", () => {+ expect(+ withPnpmBuildPolicy(+ 'allowBuilds:\n "@mongodb-js/zstd": true\n esbuild: true\n node-liblzma: false\n',+ ["node-liblzma", "@mongodb-js/zstd"],+ "ignore-optional",+ ),+ ).toBe(+ 'allowBuilds:\n esbuild: true\n\nignoredOptionalDependencies:\n - "@mongodb-js/zstd"\n - "node-liblzma"\n',+ );+ });++ it("refuses inline policy structures instead of corrupting them", () => {+ expect(() =>+ withPnpmBuildPolicy("allowBuilds: { esbuild: true }\n", ["node-liblzma"], "ignore-optional"),+ ).toThrow("does not use block-style YAML");+ });+});diff --git a/packages/eve/src/cli/commands/registry-pnpm-build-policy.ts b/packages/eve/src/cli/commands/registry-pnpm-build-policy.tsnew file mode 100644index 000000000..cbcf97555--- /dev/null+++ b/packages/eve/src/cli/commands/registry-pnpm-build-policy.ts@@ -0,0 +1,201 @@+import { access, readFile, writeFile } from "node:fs/promises";+import { join } from "node:path";++import {+ findClaimingAncestorPnpmWorkspaceRoot,+ PNPM_WORKSPACE_PATH,+} from "#setup/primitives/pm/pnpm.js";++export type PnpmBuildPolicyAction = "ignore-optional" | "allow-builds";++export interface PnpmBuildPolicyContext {+ readonly filePath: string;+ readonly packages: readonly string[];+ readonly satisfied: boolean;+}++type PolicyBlockKind = "mapping" | "sequence";++function blockRange(+ lines: readonly string[],+ key: string,+): { start: number; end: number } | undefined {+ const start = lines.findIndex((line) => new RegExp(`^${key}:`).test(line));+ if (start < 0) return undefined;+ if (!new RegExp(`^${key}:\\s*(?:#.*)?$`).test(lines[start] ?? "")) {+ throw new Error(+ `Cannot safely update ${key} because it does not use block-style YAML in ${PNPM_WORKSPACE_PATH}.`,+ );+ }+ let end = start + 1;+ while (end < lines.length && !/^\S/u.test(lines[end] ?? "")) end += 1;+ return { start, end };+}++function unquoteYamlScalar(value: string): string {+ const trimmed = value.trim();+ if (trimmed.startsWith('"') && trimmed.endsWith('"')) {+ try {+ const parsed = JSON.parse(trimmed);+ if (typeof parsed === "string") return parsed;+ } catch {+ return trimmed;+ }+ }+ if (trimmed.startsWith("'") && trimmed.endsWith("'")) {+ return trimmed.slice(1, -1).replaceAll("''", "'");+ }+ return trimmed;+}++function mappingEntry(line: string): { key: string; value: boolean } | undefined {+ const match =+ /^\s+("(?:[^"\\]|\\.)*"|'(?:[^']|'')*'|[^:#][^:]*?):\s*(true|false)\s*(?:#.*)?$/u.exec(line);+ if (match === null) return undefined;+ return { key: unquoteYamlScalar(match[1]!), value: match[2] === "true" };+}++function sequenceEntry(line: string): string | undefined {+ const match = /^\s+-\s+(.*?)(?:\s+#.*)?$/u.exec(line);+ return match === null ? undefined : unquoteYamlScalar(match[1]!);+}++function policyEntries(+ lines: readonly string[],+ key: string,+ kind: PolicyBlockKind,+): ReadonlyMap<string, boolean> {+ const range = blockRange(lines, key);+ const entries = new Map<string, boolean>();+ if (range === undefined) return entries;+ for (const line of lines.slice(range.start + 1, range.end)) {+ if (kind === "mapping") {+ const entry = mappingEntry(line);+ if (entry !== undefined) entries.set(entry.key, entry.value);+ } else {+ const entry = sequenceEntry(line);+ if (entry !== undefined) entries.set(entry, true);+ }+ }+ return entries;+}++function removePolicyEntries(+ lines: string[],+ key: string,+ kind: PolicyBlockKind,+ packages: ReadonlySet<string>,+): void {+ const range = blockRange(lines, key);+ if (range === undefined) return;+ for (let index = range.end - 1; index > range.start; index -= 1) {+ const packageName =+ kind === "mapping"+ ? mappingEntry(lines[index] ?? "")?.key+ : sequenceEntry(lines[index] ?? "");+ if (packageName !== undefined && packages.has(packageName)) lines.splice(index, 1);+ }+ const updated = blockRange(lines, key);+ if (updated === undefined) return;+ const hasEntry = lines+ .slice(updated.start + 1, updated.end)+ .some((line) => (kind === "mapping" ? mappingEntry(line) : sequenceEntry(line)) !== undefined);+ if (!hasEntry) {+ const comments = lines+ .slice(updated.start + 1, updated.end)+ .filter((line) => line.trimStart().startsWith("#"));+ lines.splice(updated.start, updated.end - updated.start, ...comments);+ }+}++function appendPolicyEntries(+ lines: string[],+ key: string,+ kind: PolicyBlockKind,+ packages: readonly string[],+): void {+ let range = blockRange(lines, key);+ if (range === undefined) {+ while (lines.at(-1) === "") lines.pop();+ if (lines.length > 0) lines.push("");+ lines.push(`${key}:`);+ range = { start: lines.length - 1, end: lines.length };+ }+ const existing = policyEntries(lines, key, kind);+ const missing = packages.filter((packageName) => !existing.has(packageName));+ if (missing.length === 0) return;+ const insertion = missing.map((packageName) =>+ kind === "mapping"+ ? ` ${JSON.stringify(packageName)}: true`+ : ` - ${JSON.stringify(packageName)}`,+ );+ lines.splice(range.end, 0, ...insertion);+}++/** Applies one explicit pnpm build policy while preserving unrelated workspace settings. */+export function withPnpmBuildPolicy(+ source: string,+ packages: readonly string[],+ action: PnpmBuildPolicyAction,+): string {+ const normalizedPackages = [...new Set(packages)].sort();+ const packageSet = new Set(normalizedPackages);+ const lines = source.replace(/\r\n/gu, "\n").split("\n");+ removePolicyEntries(lines, "allowBuilds", "mapping", packageSet);+ removePolicyEntries(lines, "ignoredOptionalDependencies", "sequence", packageSet);+ if (action === "allow-builds") {+ appendPolicyEntries(lines, "allowBuilds", "mapping", normalizedPackages);+ } else {+ appendPolicyEntries(lines, "ignoredOptionalDependencies", "sequence", normalizedPackages);+ }+ while (lines.at(-1) === "") lines.pop();+ return `${lines.join("\n")}\n`;+}++async function readWorkspacePolicy(filePath: string): Promise<string> {+ try {+ return await readFile(filePath, "utf8");+ } catch (error) {+ if ((error as NodeJS.ErrnoException).code === "ENOENT") return "";+ throw error;+ }+}++async function owningPnpmWorkspaceRoot(appRoot: string): Promise<string> {+ try {+ await access(join(appRoot, PNPM_WORKSPACE_PATH));+ return appRoot;+ } catch (error) {+ if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;+ }+ return findClaimingAncestorPnpmWorkspaceRoot(appRoot) ?? appRoot;+}++/** Resolves whether every package already has an explicit non-blocking pnpm policy. */+export async function inspectPnpmBuildPolicy(+ appRoot: string,+ packages: readonly string[],+): Promise<PnpmBuildPolicyContext> {+ const workspaceRoot = await owningPnpmWorkspaceRoot(appRoot);+ const filePath = join(workspaceRoot, PNPM_WORKSPACE_PATH);+ const source = await readWorkspacePolicy(filePath);+ const lines = source.replace(/\r\n/gu, "\n").split("\n");+ const allowed = policyEntries(lines, "allowBuilds", "mapping");+ const ignored = policyEntries(lines, "ignoredOptionalDependencies", "sequence");+ return {+ filePath,+ packages,+ satisfied: packages.every(+ (packageName) => allowed.get(packageName) === true || ignored.has(packageName),+ ),+ };+}++/** Persists the policy selected before the registry installation transaction begins. */+export async function applyPnpmBuildPolicy(+ context: PnpmBuildPolicyContext,+ action: PnpmBuildPolicyAction,+): Promise<void> {+ const source = await readWorkspacePolicy(context.filePath);+ await writeFile(context.filePath, withPnpmBuildPolicy(source, context.packages, action), "utf8");+}diff --git a/packages/eve/src/cli/commands/registry-recovery.ts b/packages/eve/src/cli/commands/registry-recovery.tsindex d6a0f5dce..6e3647c22 100644--- a/packages/eve/src/cli/commands/registry-recovery.ts+++ b/packages/eve/src/cli/commands/registry-recovery.ts@@ -1,10 +1,27 @@+import type { RegistrySetupCompletion } from "#setup/registry-setup-protocol.js";import { WizardCancelledError } from "#setup/step.js";+import { reportHeadlessSetupCompletion } from "./setup-headless.js";+export interface RegistryCommandLogger {error(message: string): void;log(message: string): void;}+export function reportRegistryCompletion(+ logger: RegistryCommandLogger,+ item: string,+ completion: RegistrySetupCompletion | false,+ options: { nonInteractive?: boolean },+): RegistrySetupCompletion | undefined {+ return reportHeadlessSetupCompletion({+ logger,+ item,+ completion,+ nonInteractive: options.nonInteractive,+ });+}+export function errorMessage(error: unknown): string {return error instanceof Error ? error.message : String(error);}diff --git a/packages/eve/src/cli/commands/registry.test.ts b/packages/eve/src/cli/commands/registry.test.tsindex df049bcbe..b02ce2c70 100644--- a/packages/eve/src/cli/commands/registry.test.ts+++ b/packages/eve/src/cli/commands/registry.test.ts@@ -23,6 +23,7 @@ const {applyPackageManagerWorkspaceConfiguration,getRegistryItems,isEveProject,+ prepareDeclaredPnpmBuildPolicy,readFile,resolveInstalledPackageInfo,unlink,@@ -33,6 +34,7 @@ const {applyPackageManagerWorkspaceConfiguration: vi.fn(),getRegistryItems: vi.fn(),isEveProject: vi.fn(),+ prepareDeclaredPnpmBuildPolicy: vi.fn(async () => true),readFile: vi.fn(),resolveInstalledPackageInfo: vi.fn(() => ({ name: "eve", version: "0.27.8" })),unlink: vi.fn(),@@ -47,6 +49,7 @@ vi.mock("#compiled/shadcn-registry/index.js", () => ({}));vi.mock("#setup/scaffold/index.js", () => ({ isEveProject }));+vi.mock("./registry-pnpm-build-policy-flow.js", () => ({ prepareDeclaredPnpmBuildPolicy }));vi.mock("#setup/scaffold/workspace-root.js", () => ({ applyPackageManagerWorkspaceConfiguration }));vi.mock("#internal/application/package.js", () => ({ resolveInstalledPackageInfo }));vi.mock("node:fs/promises", () => ({ readFile, unlink, writeFile }));@@ -130,6 +133,70 @@ describe("registry commands", () => {expect(logger.errors).toEqual([]);});+ it("prepares declared pnpm build policy before installing", async () => {+ const logger = createLogger();+ const buildScripts = [+ {+ packages: ["node-liblzma", "@mongodb-js/zstd"],+ optional: true,+ recommendedAction: "ignore-optional",+ reason: "Optional accelerators are not required.",+ },+ ];+ getRegistryItems.mockResolvedValue([+ {+ name: "experimental/tool",+ type: "registry:item",+ meta: { eve: { install: { pnpm: { buildScripts } } } },+ },+ ]);++ await runAddCommand(logger, "/project", "experimental/tool", {});++ expect(prepareDeclaredPnpmBuildPolicy).toHaveBeenCalledWith({+ logger,+ appRoot: "/project",+ item: "experimental/tool",+ policies: buildScripts,+ options: {},+ });+ expect(prepareDeclaredPnpmBuildPolicy.mock.invocationCallOrder[0]).toBeLessThan(+ addRegistryItems.mock.invocationCallOrder[0]!,+ );+ });++ it("propagates an interactive build-policy abort without reporting an install", async () => {+ const { prompter } = createFakePrompter();+ getRegistryItems.mockResolvedValue([+ {+ name: "experimental/tool",+ type: "registry:item",+ meta: {+ eve: {+ install: {+ pnpm: {+ buildScripts: [+ {+ packages: ["optional-package"],+ optional: true,+ recommendedAction: "ignore-optional",+ reason: "Optional package is not required.",+ },+ ],+ },+ },+ },+ },+ },+ ]);+ prepareDeclaredPnpmBuildPolicy.mockResolvedValueOnce(false);++ await expect(+ installRegistryItem("/project", "experimental/tool", { prompter }),+ ).rejects.toBeInstanceOf(WizardCancelledError);+ expect(addRegistryItems).not.toHaveBeenCalled();+ });+it("reports completion after installing an item without setup headlessly", async () => {const logger = createLogger();getRegistryItems.mockResolvedValue([{ name: "extension/browser", type: "registry:item" }]);diff --git a/packages/eve/src/cli/commands/registry.ts b/packages/eve/src/cli/commands/registry.tsindex f7510ae24..a2138bec8 100644--- a/packages/eve/src/cli/commands/registry.ts+++ b/packages/eve/src/cli/commands/registry.ts@@ -16,6 +16,7 @@ import { installRegistryItemTransaction } from "./registry-install-transaction.jimport { runDeclaredSetups } from "./registry-declared-setups.js";import {errorMessage,+ reportRegistryCompletion as reportCompletion,resolveRegistryItemForAdd,runRegistryAction,setupReminder,@@ -28,6 +29,7 @@ import {type RegistrySearchMetadata,} from "./registry-metadata.js";import { runRegistryPackage } from "./registry-package.js";+import { prepareDeclaredPnpmBuildPolicy } from "./registry-pnpm-build-policy-flow.js";import {printRegistrySearchResults,registryViewText,@@ -35,7 +37,7 @@ import {type RegistrySearchPresentationSection,} from "./registry-presentation.js";import type { runRegistrySetupCommand } from "./registry-setup-command.js";-import { reportHeadlessSetupCompletion, serializeHeadlessSetupEvent } from "./setup-headless.js";+import { serializeHeadlessSetupEvent } from "./setup-headless.js";import {addRegistryMappings,prepareWebRegistryProject,@@ -445,6 +447,7 @@ export async function installRegistryItem();process.exitCode = previousExitCode;if (failure !== undefined) throw new Error(failure);+ if (setup === false) throw new WizardCancelledError();const result: { output: readonly string[]; setup?: RegistrySetupCompletion } = { output };if (setup !== undefined) result.setup = setup;return result;@@ -457,7 +460,7 @@ export async function runAddCommand(item: string,options: RunAddCommandOptions,dependencies: AddCommandDependencies = defaultAddCommandDependencies,-): Promise<RegistrySetupCompletion | undefined> {+): Promise<RegistrySetupCompletion | false | undefined> {return runRegistryAction(logger, appRoot, async () => {const config = await readEveRegistryConfig(appRoot);const address = itemAddress(item);@@ -541,6 +544,15 @@ export async function runAddCommand(return reportCompletion(logger, item, completion, options);}+ const installReady = await prepareDeclaredPnpmBuildPolicy({+ logger,+ appRoot,+ item,+ policies: eveMetadata?.install?.pnpm?.buildScripts,+ options,+ });+ if (!installReady) return false;+if (address === itemAddress("channel/web")) {await (dependencies.prepareWebRegistryProject ?? prepareWebRegistryProject)(appRoot);}@@ -626,19 +638,6 @@ export async function runAddCommand(return reportCompletion(logger, item, completion, options);});}-function reportCompletion(- logger: RegistryCommandLogger,- item: string,- completion: RegistrySetupCompletion | false,- options: AddCommandOptions,-): RegistrySetupCompletion | undefined {- return reportHeadlessSetupCompletion({- logger,- item,- completion,- nonInteractive: options.nonInteractive,- });-}/** Adds registry namespace mappings to the project's package.json. */export async function runRegistryAddCommand(logger: RegistryCommandLogger,diff --git a/packages/eve/src/setup/flows/registry.ts b/packages/eve/src/setup/flows/registry.tsindex 3741efad5..00b9e62bb 100644--- a/packages/eve/src/setup/flows/registry.ts+++ b/packages/eve/src/setup/flows/registry.ts@@ -67,9 +67,9 @@ const SECTIONS = {"connection/notion","connection/vercel","extension/agent-browser",+ "experimental/self-modification",],- includes: (item: Item) =>- !item.name.startsWith("channel/") && !item.name.startsWith("experimental/"),+ includes: (item: Item) => !item.name.startsWith("channel/"),},} as const;