From ca47a2dbc80f7eba4348606bb5dedacf8f4379b5 Mon Sep 17 00:00:00 2001
From: johnyeo <johnyeocx@gmail.com>
Date: Wed, 3 Jun 2026 14:54:10 +0100
Subject: [PATCH] fix: leaf

---
 apps/leaf/src/agent/mcp.ts | 2 +-
 apps/leaf/src/lib/env.ts   | 4 +++-
 scripts/dev.ts             | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/leaf/src/agent/mcp.ts b/apps/leaf/src/agent/mcp.ts
index f8e4fd214..44b2dc2ec 100644
--- a/apps/leaf/src/agent/mcp.ts
+++ b/apps/leaf/src/agent/mcp.ts
@@ -39,7 +39,7 @@ export const createAutumnMcpClient = (
 		id: `autumn-${apiKey.slice(0, 14)}`,
 		servers: {
 			autumn: {
-				url: new URL(env.AUTUMN_MCP_URL),
+				url: new URL("/mcp", env.MCP_SERVER_URL),
 				requestInit: {
 					headers: {
 						Authorization: `Bearer ${apiKey}`,
diff --git a/apps/leaf/src/lib/env.ts b/apps/leaf/src/lib/env.ts
index 361d453fe..6db1e9696 100644
--- a/apps/leaf/src/lib/env.ts
+++ b/apps/leaf/src/lib/env.ts
@@ -7,7 +7,7 @@ const optionalString = z.preprocess(
 
 const envSchema = z
 	.object({
-		AUTUMN_MCP_URL: z.string().min(1).default("http://localhost:3099/mcp"),
+		MCP_SERVER_URL: optionalString,
 		BETTER_AUTH_SECRET: optionalString,
 		BETTER_AUTH_URL: optionalString,
 		CHAT_MODEL: z.string().min(1).default("anthropic/claude-sonnet-4-6"),
@@ -32,6 +32,8 @@ const envSchema = z
 
 		return {
 			...values,
+			MCP_SERVER_URL:
+				values.MCP_SERVER_URL ?? `http://localhost:${values.PORT}`,
 			BETTER_AUTH_URL:
 				values.BETTER_AUTH_URL ??
 				(process.env.NODE_ENV === "production"
diff --git a/scripts/dev.ts b/scripts/dev.ts
index c42b966cb..a4dc9d6b3 100644
--- a/scripts/dev.ts
+++ b/scripts/dev.ts
@@ -294,8 +294,6 @@ async function startDev() {
 					process.env.CHAT_SERVER_URL ?? `http://localhost:${CHAT_PORT}`,
 				MCP_RESOURCE_URLS:
 					process.env.MCP_RESOURCE_URLS ?? `http://localhost:${CHAT_PORT}/mcp`,
-				AUTUMN_MCP_URL:
-					process.env.AUTUMN_MCP_URL ?? `http://localhost:${CHAT_PORT}/mcp`,
 				AUTUMN_API_URL: process.env.AUTUMN_API_URL ?? LOCAL_SERVER_URL,
 				CHAT_URL: process.env.CHAT_URL ?? LOCAL_CHAT_URL,
 				CHAT_INTERNAL_URL: process.env.CHAT_INTERNAL_URL ?? LOCAL_CHAT_URL,