The Open Framework for Building Agents
fix(eve): connections - use local callback URL (#328)
Andrew Barbab04975641ef8
diff --git a/.changeset/calm-callback-ports.md b/.changeset/calm-callback-ports.mdnew file mode 100644index 000000000..9d98e9bef--- /dev/null+++ b/.changeset/calm-callback-ports.md@@ -0,0 +1,5 @@+---+"eve": patch+---++Use the active eve development server URL for connection authorization callbacks. Local Vercel Connect flows now return to eve's actual port instead of Workflow's port 3000 fallback.diff --git a/packages/eve/src/execution/workflow-callback-url.test.ts b/packages/eve/src/execution/workflow-callback-url.test.tsindex 457acc032..2f91a2c3d 100644--- a/packages/eve/src/execution/workflow-callback-url.test.ts+++ b/packages/eve/src/execution/workflow-callback-url.test.ts@@ -3,6 +3,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";import {createWorkflowCallbackUrl,resolveVercelProductionCallbackBaseUrl,+ resolveWorkflowCallbackBaseUrl,} from "#execution/workflow-callback-url.js";describe("resolveVercelProductionCallbackBaseUrl", () => {@@ -47,3 +48,33 @@ describe("resolveVercelProductionCallbackBaseUrl", () => {);});});++describe("resolveWorkflowCallbackBaseUrl", () => {+ afterEach(() => {+ vi.unstubAllEnvs();+ });++ it("uses workflow metadata when no callback override is configured", () => {+ vi.stubEnv("VERCEL_ENV", "");+ vi.stubEnv("WORKFLOW_LOCAL_BASE_URL", "");++ expect(resolveWorkflowCallbackBaseUrl("http://localhost:3000/")).toBe("http://localhost:3000");+ });++ it("prefers the active local world base URL and removes its trailing slash", () => {+ vi.stubEnv("VERCEL_ENV", "");+ vi.stubEnv("WORKFLOW_LOCAL_BASE_URL", "http://127.0.0.1:2000/");++ expect(resolveWorkflowCallbackBaseUrl("http://localhost:3000")).toBe("http://127.0.0.1:2000");+ });++ it("prefers the stable Vercel production URL over a local world override", () => {+ vi.stubEnv("VERCEL_ENV", "production");+ vi.stubEnv("VERCEL_PROJECT_PRODUCTION_URL", "agent.example.com");+ vi.stubEnv("WORKFLOW_LOCAL_BASE_URL", "http://127.0.0.1:2000");++ expect(resolveWorkflowCallbackBaseUrl("https://deployment.example.com")).toBe(+ "https://agent.example.com",+ );+ });+});diff --git a/packages/eve/src/execution/workflow-callback-url.ts b/packages/eve/src/execution/workflow-callback-url.tsindex 7e32f5000..c0d4f417f 100644--- a/packages/eve/src/execution/workflow-callback-url.ts+++ b/packages/eve/src/execution/workflow-callback-url.ts@@ -1,5 +1,6 @@const PRODUCTION_ENVIRONMENT = "production";const VERCEL_PROTECTION_BYPASS_QUERY = "x-vercel-protection-bypass";+const WORKFLOW_LOCAL_BASE_URL_ENV = "WORKFLOW_LOCAL_BASE_URL";/*** Workflow metadata is deployment-specific, so on Vercel it can point at@@ -20,6 +21,20 @@ export function resolveVercelProductionCallbackBaseUrl(): string | null {return null;}+/**+ * Resolves the origin used for framework-owned workflow callbacks.+ *+ * Workflow metadata falls back to port 3000 when its optional local port+ * discovery is unavailable. eve already configures the local world with the+ * active dev-server origin, so prefer that value before the metadata fallback.+ */+export function resolveWorkflowCallbackBaseUrl(metadataUrl: string): string {+ const configuredLocalBaseUrl = process.env[WORKFLOW_LOCAL_BASE_URL_ENV]?.trim();+ const localBaseUrl = configuredLocalBaseUrl ? configuredLocalBaseUrl : undefined;+ const resolved = resolveVercelProductionCallbackBaseUrl() ?? localBaseUrl ?? metadataUrl;+ return resolved.replace(/\/$/, "");+}+/*** Builds a framework-owned callback URL from a resolved callback origin.*/diff --git a/packages/eve/src/execution/workflow-entry.ts b/packages/eve/src/execution/workflow-entry.tsindex be15e0fbc..2f4cdf3e8 100644--- a/packages/eve/src/execution/workflow-entry.ts+++ b/packages/eve/src/execution/workflow-entry.ts@@ -31,7 +31,7 @@ import {normalizeSerializableError,rebuildSerializableError,} from "#execution/workflow-errors.js";-import { resolveVercelProductionCallbackBaseUrl } from "#execution/workflow-callback-url.js";+import { resolveWorkflowCallbackBaseUrl } from "#execution/workflow-callback-url.js";import { createSessionStep } from "#execution/create-session-step.js";import { dispatchWorkflowRuntimeActionsStep } from "#execution/dispatch-workflow-runtime-actions-step.js";import { dispatchRuntimeActionsStep } from "#execution/dispatch-runtime-actions-step.js";@@ -297,7 +297,7 @@ async function runDriverLoop(input: {: dispatchRuntimeActionsStep;const dispatchResult = await dispatchStep({- callbackBaseUrl: resolveVercelProductionCallbackBaseUrl() ?? getWorkflowMetadata().url,+ callbackBaseUrl: resolveWorkflowCallbackBaseUrl(getWorkflowMetadata().url),parentWritable: input.driverWritable,serializedContext: action.serializedContext,sessionState: action.sessionState,diff --git a/packages/eve/src/execution/workflow-steps.ts b/packages/eve/src/execution/workflow-steps.tsindex 55d45687f..9c69514e5 100644--- a/packages/eve/src/execution/workflow-steps.ts+++ b/packages/eve/src/execution/workflow-steps.ts@@ -43,6 +43,7 @@ import {PendingAuthorizationResultKey,type AuthorizationResult,} from "#harness/authorization.js";+import { resolveWorkflowCallbackBaseUrl } from "#execution/workflow-callback-url.js";import type { ConnectionAuthorizationChallenge } from "#public/connections/errors.js";import type { AuthorizationCallback } from "#runtime/connections/types.js";import {@@ -111,13 +112,13 @@ export async function turnStep(rawInput: TurnStepInput): Promise<DurableStepResuconst adapter = ctx.require(ChannelKey);const bundle = ctx.require(BundleKey);- // Populate the callback base URL so getHookUrl() works during- // tool execution. Reads from workflow metadata (available in steps).+ // Populate the callback base URL so getHookUrl() works during tool+ // execution, preferring eve's active local origin over metadata fallback.try {const { getWorkflowMetadata } = await import("#compiled/@workflow/core/index.js");const metadata = getWorkflowMetadata();if (typeof metadata.url === "string") {- ctx.set(CallbackBaseUrlKey, metadata.url.replace(/\/$/, ""));+ ctx.set(CallbackBaseUrlKey, resolveWorkflowCallbackBaseUrl(metadata.url));}} catch {// Outside a workflow context (e.g. tests) — getHookUrl will return undefined.