diff --git a/.gitignore b/.gitignore
index 3750d9b8..3ab3cf96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,4 +60,6 @@ conf.yaml
 # Agents
 .cursor
 .cursorrules
-.claude
\ No newline at end of file
+.claude
+
+test_app
\ No newline at end of file
diff --git a/INSPECTOR_INTEGRATION.md b/INSPECTOR_INTEGRATION.md
index 4038f635..f1a7c336 100644
--- a/INSPECTOR_INTEGRATION.md
+++ b/INSPECTOR_INTEGRATION.md
@@ -33,7 +33,7 @@ The MCP Inspector is now automatically mounted at `/inspector` for all MCP serve
 When developers create a new MCP server:
 
 ```typescript
-import { createMCPServer } from 'mcp-use'
+import { createMCPServer } from 'mcp-use/server'
 
 const server = createMCPServer('my-server', {
   version: '1.0.0',
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 3c5bfda4..f56f4444 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @mcp-use/cli
 
+## 2.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @mcp-use/inspector@0.3.7
+  - mcp-use@1.0.3
+
 ## 2.1.6
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 440ba8e1..57ee2a5e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mcp-use/cli",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Build tool for MCP UI widgets - bundles React components into standalone HTML pages for Model Context Protocol servers",
   "author": "mcp-use, Inc.",
   "license": "MIT",
diff --git a/packages/create-mcp-use-app/CHANGELOG.md b/packages/create-mcp-use-app/CHANGELOG.md
index 649f6c12..e1cd6b71 100644
--- a/packages/create-mcp-use-app/CHANGELOG.md
+++ b/packages/create-mcp-use-app/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-mcp-use-app
 
+## 0.3.3
+
+### Patch Changes
+
+- fix: export server from mcp-use/server due to edge runtime
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/packages/create-mcp-use-app/package.json b/packages/create-mcp-use-app/package.json
index 9876718c..f7828082 100644
--- a/packages/create-mcp-use-app/package.json
+++ b/packages/create-mcp-use-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-mcp-use-app",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "type": "module",
   "description": "Create MCP-Use apps with one command",
   "author": "mcp-use, Inc.",
diff --git a/packages/create-mcp-use-app/src/templates/ui/src/server.ts b/packages/create-mcp-use-app/src/templates/ui/src/server.ts
index 8a150b09..e33eb641 100644
--- a/packages/create-mcp-use-app/src/templates/ui/src/server.ts
+++ b/packages/create-mcp-use-app/src/templates/ui/src/server.ts
@@ -1,4 +1,4 @@
-import { createMCPServer } from 'mcp-use'
+import { createMCPServer } from 'mcp-use/server'
 import { createUIResource } from '@mcp-ui/server';
 
 // Create an MCP server (which is also an Express app)
diff --git a/packages/create-mcp-use-app/src/templates/ui/tsconfig.json b/packages/create-mcp-use-app/src/templates/ui/tsconfig.json
index 5a2c6947..cafb2cf5 100644
--- a/packages/create-mcp-use-app/src/templates/ui/tsconfig.json
+++ b/packages/create-mcp-use-app/src/templates/ui/tsconfig.json
@@ -3,7 +3,7 @@
     "target": "ES2022",
     "jsx": "react-jsx",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "allowJs": true,
     "strict": true,
     "declaration": true,
diff --git a/packages/inspector/CHANGELOG.md b/packages/inspector/CHANGELOG.md
index 0e7493af..c93d6a57 100644
--- a/packages/inspector/CHANGELOG.md
+++ b/packages/inspector/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @mcp-use/inspector
 
+## 0.3.7
+
+### Patch Changes
+
+- fix: export server from mcp-use/server due to edge runtime
+- Updated dependencies
+  - mcp-use@1.0.3
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/packages/inspector/package.json b/packages/inspector/package.json
index bb37bbb9..c2c25957 100644
--- a/packages/inspector/package.json
+++ b/packages/inspector/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mcp-use/inspector",
   "type": "module",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "MCP Inspector - A tool for inspecting and debugging MCP servers",
   "author": "",
   "license": "MIT",
diff --git a/packages/inspector/src/server/middleware.ts b/packages/inspector/src/server/middleware.ts
index 1f5cb86b..2fbe428d 100644
--- a/packages/inspector/src/server/middleware.ts
+++ b/packages/inspector/src/server/middleware.ts
@@ -13,7 +13,7 @@ import { checkClientFiles, getClientDistPath, getContentType, handleChatRequest
  *
  * @example
  * ```typescript
- * import { createMCPServer } from 'mcp-use'
+ * import { createMCPServer } from 'mcp-use/server'
  * import { mountInspector } from '@mcp-use/inspector'
  *
  * const server = createMCPServer('my-server')
diff --git a/packages/mcp-use/CHANGELOG.md b/packages/mcp-use/CHANGELOG.md
index 4014344e..99d6075c 100644
--- a/packages/mcp-use/CHANGELOG.md
+++ b/packages/mcp-use/CHANGELOG.md
@@ -1,5 +1,13 @@
 # mcp-use
 
+## 1.0.3
+
+### Patch Changes
+
+- fix: export server from mcp-use/server due to edge runtime
+- Updated dependencies
+  - @mcp-use/inspector@0.3.7
+
 ## 1.0.2
 
 ### Patch Changes
diff --git a/packages/mcp-use/examples/server/simple/src/server.ts b/packages/mcp-use/examples/server/simple/src/server.ts
index 50c4bb67..10cc2be2 100644
--- a/packages/mcp-use/examples/server/simple/src/server.ts
+++ b/packages/mcp-use/examples/server/simple/src/server.ts
@@ -1,4 +1,4 @@
-import { createMCPServer } from 'mcp-use'
+import { createMCPServer } from 'mcp-use/server'
 
 // Create an MCP server (which is also an Express app)
 // The MCP Inspector is automatically mounted at /inspector
diff --git a/packages/mcp-use/index.ts b/packages/mcp-use/index.ts
index 3ec34719..b447e02d 100644
--- a/packages/mcp-use/index.ts
+++ b/packages/mcp-use/index.ts
@@ -20,19 +20,6 @@ export * from './src/managers/tools/index.js'
 // Export observability utilities
 export { type ObservabilityConfig, ObservabilityManager } from './src/observability/index.js'
 
-// Export server utilities
-export { createMCPServer } from './src/server/index.js'
-
-export type {
-  InputDefinition,
-  PromptDefinition,
-  PromptHandler,
-  ResourceDefinition,
-  ResourceHandler,
-  ServerConfig,
-  ToolDefinition,
-  ToolHandler,
-} from './src/server/types.js'
 // Export telemetry utilities
 export { setTelemetrySource, Telemetry } from './src/telemetry/index.js'
 
diff --git a/packages/mcp-use/package.json b/packages/mcp-use/package.json
index a22b418b..36fb768c 100644
--- a/packages/mcp-use/package.json
+++ b/packages/mcp-use/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mcp-use",
   "type": "module",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "packageManager": "pnpm@10.6.1",
   "description": "Opinionated MCP Framework for TypeScript (@modelcontextprotocol/sdk compatible) - Build MCP Agents and Clients + MCP Servers with support for MCP-UI.",
   "author": "mcp-use, Inc.",
@@ -88,7 +88,7 @@
     "example:observability": "tsx examples/client/observability.ts"
   },
   "peerDependencies": {
-    "@mcp-use/inspector": "^0.3.6",
+    "@mcp-use/inspector": "^0.3.7",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "langfuse": "^3.32.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 71b5735e..10c81d68 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -516,6 +516,64 @@ importers:
         specifier: ^5.0.0
         version: 5.9.3
 
+  test_app:
+    dependencies:
+      '@mcp-ui/server':
+        specifier: ^5.11.0
+        version: 5.11.0(patch_hash=5d24b4104a7d6d537b7de1dc183b27e42d9c1b3fde96a28dbeb722713ba85f11)
+      cors:
+        specifier: ^2.8.5
+        version: 2.8.5
+      express:
+        specifier: ^4.18.0
+        version: 4.21.2
+      mcp-use:
+        specifier: workspace:*
+        version: link:../packages/mcp-use
+    devDependencies:
+      '@mcp-use/cli':
+        specifier: workspace:*
+        version: link:../packages/cli
+      '@mcp-use/inspector':
+        specifier: workspace:*
+        version: link:../packages/inspector
+      '@types/cors':
+        specifier: ^2.8.0
+        version: 2.8.19
+      '@types/express':
+        specifier: ^4.17.0
+        version: 4.17.23
+      '@types/node':
+        specifier: ^20.0.0
+        version: 20.19.19
+      '@types/react':
+        specifier: ^18.0.0
+        version: 18.3.26
+      '@types/react-dom':
+        specifier: ^18.0.0
+        version: 18.3.7(@types/react@18.3.26)
+      concurrently:
+        specifier: ^8.0.0
+        version: 8.2.2
+      esbuild:
+        specifier: ^0.23.0
+        version: 0.23.1
+      globby:
+        specifier: ^14.0.2
+        version: 14.1.0
+      react:
+        specifier: ^19.2.0
+        version: 19.2.0
+      react-dom:
+        specifier: ^19.2.0
+        version: 19.2.0(react@19.2.0)
+      tsx:
+        specifier: ^4.0.0
+        version: 4.20.6
+      typescript:
+        specifier: ^5.0.0
+        version: 5.9.3
+
 packages:
 
   '@ai-sdk/provider-utils@2.2.8':
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 28363ba3..cd64b37d 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -3,3 +3,4 @@ packages:
   - 'packages/mcp-use/examples/client/react'
   - 'packages/mcp-use/examples/server/simple'
   - 'packages/create-mcp-use-app/src/templates/ui'
+  - 'test_app'