The Open Framework for Building Agents
fix(eve): honor overwrite in integration setup (#2892)
OwenKephart6a5fd362843d
diff --git a/.changeset/fix-registry-setup-overwrite.md b/.changeset/fix-registry-setup-overwrite.mdnew file mode 100644index 000000000..0b571c139--- /dev/null+++ b/.changeset/fix-registry-setup-overwrite.md@@ -0,0 +1,5 @@+---+"eve": patch+---++Make `eve add --overwrite` also replace files generated by eve-owned integration setup flows, including Photon channels.diff --git a/packages/eve/src/cli/commands/integration-setup.test.ts b/packages/eve/src/cli/commands/integration-setup.test.tsindex 9113b9672..bb9b98274 100644--- a/packages/eve/src/cli/commands/integration-setup.test.ts+++ b/packages/eve/src/cli/commands/integration-setup.test.ts@@ -78,6 +78,21 @@ describe("runIntegrationSetupCommand", () => {expect(output.errors).toEqual([]);});+ it("passes force to the integration runner", async () => {+ vi.mocked(runIntegrationSetup).mockResolvedValue({+ kind: "done",+ completion: { facts: [] },+ });++ await runIntegrationSetupCommand(logger(), "/project", "photon", { force: true });++ expect(runIntegrationSetup).toHaveBeenCalledWith(+ "photon",+ expect.objectContaining({ force: true }),+ undefined,+ );+ });+it("assumes recommended setup answers with --yes in interactive mode", async () => {vi.mocked(runIntegrationSetup).mockImplementation(async (_kind, options) => {await expect(diff --git a/packages/eve/src/cli/commands/integration-setup.ts b/packages/eve/src/cli/commands/integration-setup.tsindex fbb7300e2..dd78dcd80 100644--- a/packages/eve/src/cli/commands/integration-setup.ts+++ b/packages/eve/src/cli/commands/integration-setup.ts@@ -22,6 +22,7 @@ import { serializeHeadlessSetupEvent } from "./setup-headless.js";export interface IntegrationSetupOptions {yes?: boolean;+ force?: boolean;nonInteractive?: boolean;answers?: Record<string, unknown>;signal?: AbortSignal;@@ -62,6 +63,7 @@ export async function runIntegrationSetupCommand(appRoot,prompter,asker,+ force: options.force,resolveVercelProject: nonInteractive? undefined: () =>diff --git a/packages/eve/src/cli/commands/register-integration-commands.ts b/packages/eve/src/cli/commands/register-integration-commands.tsindex 9fc9cea48..534abb118 100644--- a/packages/eve/src/cli/commands/register-integration-commands.ts+++ b/packages/eve/src/cli/commands/register-integration-commands.ts@@ -26,6 +26,7 @@ export function registerIntegrationCommands(input: {applicationCommand(integration.command("setup <kind>"), applicationContext).option("-y, --yes")+ .option("--force", "Overwrite files created by setup.").option("--non-interactive","Run without interactive prompts, instead emit structured NDJSON when further input is required",@@ -41,6 +42,7 @@ export function registerIntegrationCommands(input: {kind: string,options: {yes?: boolean;+ force?: boolean;nonInteractive?: boolean;answer?: Record<string, unknown>;},@@ -48,6 +50,7 @@ export function registerIntegrationCommands(input: {const { runIntegrationSetupCommand } = await import("./integration-setup.js");await runIntegrationSetupCommand(logger, applicationContext.root, kind, {yes: options.yes,+ force: options.force,nonInteractive: options.nonInteractive,answers: options.answer,});diff --git a/packages/eve/src/cli/commands/registry-declared-setups.ts b/packages/eve/src/cli/commands/registry-declared-setups.tsindex f317cacfa..c9781f0ec 100644--- a/packages/eve/src/cli/commands/registry-declared-setups.ts+++ b/packages/eve/src/cli/commands/registry-declared-setups.ts@@ -9,6 +9,7 @@ import { headlessSetupContinuation, serializeHeadlessSetupEvent } from "./setup-export interface DeclaredSetupOptions {yes?: boolean;+ force?: boolean;nonInteractive?: boolean;answers?: Record<string, unknown>;silent?: boolean;@@ -42,6 +43,13 @@ export async function runDeclaredSetups(input: {args: [...setup.args,...(input.options.yes ? ["--yes"] : []),+ ...(input.options.force &&+ setup.package === "eve" &&+ setup.bin === "eve" &&+ setup.args[0] === "integration" &&+ setup.args[1] === "setup"+ ? ["--force"]+ : []),...(input.options.nonInteractive ? ["--non-interactive"] : []),...Object.entries(input.options.answers ?? {}).flatMap(([key, value]) => ["--answer",diff --git a/packages/eve/src/cli/commands/registry.test.ts b/packages/eve/src/cli/commands/registry.test.tsindex b02ce2c70..470af6991 100644--- a/packages/eve/src/cli/commands/registry.test.ts+++ b/packages/eve/src/cli/commands/registry.test.ts@@ -325,7 +325,7 @@ describe("registry commands", () => {expect(process.exitCode).toBe(1);});- it.each(["web", "slack"] as const)(+ it.each(["web", "slack", "photon"] as const)("installs the official %s item before running its declared setup",async (kind) => {const logger = createLogger();@@ -369,7 +369,7 @@ describe("registry commands", () => {{package: "eve",bin: "eve",- args: ["integration", "setup", kind, "--yes"],+ args: ["integration", "setup", kind, "--yes", "--force"],},`channel/${kind}`,expect.objectContaining({ prompter: expect.any(Object) }),diff --git a/packages/eve/src/cli/commands/registry.ts b/packages/eve/src/cli/commands/registry.tsindex a2138bec8..09fbc383b 100644--- a/packages/eve/src/cli/commands/registry.ts+++ b/packages/eve/src/cli/commands/registry.ts@@ -512,6 +512,7 @@ export async function runAddCommand(setups,options: {yes: options.yes,+ force: options.overwrite,nonInteractive: options.nonInteractive,answers: options.answers,prompter,@@ -630,7 +631,7 @@ export async function runAddCommand(appRoot,item,setups: eveMetadata.setup,- options,+ options: { ...options, force: options.overwrite },dependencies,cancelledReminder: setupReminder(item, "cancelled"),resumeCommand: setupResumeCommand(item),