diff --git a/libs/adapters/tsconfig.lib.json b/libs/adapters/tsconfig.lib.json
index 566be4d8..e995023b 100644
--- a/libs/adapters/tsconfig.lib.json
+++ b/libs/adapters/tsconfig.lib.json
@@ -3,7 +3,13 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "declaration": true,
-    "types": ["node"]
+    "types": ["node"],
+    "paths": {
+      "@frontmcp/ui": ["libs/ui/dist/index.d.ts"],
+      "@frontmcp/ui/*": ["libs/ui/dist/*/index.d.ts"],
+      "@frontmcp/sdk": ["libs/sdk/dist/index.d.ts"],
+      "@frontmcp/sdk/*": ["libs/sdk/dist/*/index.d.ts"]
+    }
   },
   "include": ["src/**/*.ts"],
   "exclude": [
diff --git a/libs/sdk/tsconfig.lib.json b/libs/sdk/tsconfig.lib.json
index 713d08aa..b0bdf66a 100644
--- a/libs/sdk/tsconfig.lib.json
+++ b/libs/sdk/tsconfig.lib.json
@@ -5,7 +5,11 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "types": ["node"]
+    "types": ["node"],
+    "paths": {
+      "@frontmcp/ui": ["libs/ui/dist/index.d.ts"],
+      "@frontmcp/ui/*": ["libs/ui/dist/*/index.d.ts"]
+    }
   },
   "include": ["src/**/*.ts"],
   "exclude": [
diff --git a/libs/ui/package.json b/libs/ui/package.json
index 5f3c2a57..b149b194 100644
--- a/libs/ui/package.json
+++ b/libs/ui/package.json
@@ -30,106 +30,35 @@
   "bugs": {
     "url": "https://github.com/agentfront/frontmcp/issues"
   },
-  "main": "./dist/src/index.js",
-  "types": "./dist/src/index.d.ts",
+  "type": "commonjs",
+  "main": "./dist/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "development": "./src/index.ts",
-      "types": "./dist/src/index.d.ts",
-      "import": "./dist/src/index.js",
-      "default": "./dist/src/index.js"
-    },
-    "./types": {
-      "development": "./src/types/index.ts",
-      "types": "./dist/src/types/index.d.ts",
-      "import": "./dist/src/types/index.js",
-      "default": "./dist/src/types/index.js"
-    },
-    "./adapters": {
-      "development": "./src/adapters/index.ts",
-      "types": "./dist/src/adapters/index.d.ts",
-      "import": "./dist/src/adapters/index.js",
-      "default": "./dist/src/adapters/index.js"
-    },
-    "./build": {
-      "development": "./src/build/index.ts",
-      "types": "./dist/src/build/index.d.ts",
-      "import": "./dist/src/build/index.js",
-      "default": "./dist/src/build/index.js"
-    },
-    "./renderers": {
-      "development": "./src/renderers/index.ts",
-      "types": "./dist/src/renderers/index.d.ts",
-      "import": "./dist/src/renderers/index.js",
-      "default": "./dist/src/renderers/index.js"
-    },
-    "./components": {
-      "development": "./src/components/index.ts",
-      "types": "./dist/src/components/index.d.ts",
-      "import": "./dist/src/components/index.js",
-      "default": "./dist/src/components/index.js"
-    },
-    "./runtime": {
-      "development": "./src/runtime/index.ts",
-      "types": "./dist/src/runtime/index.d.ts",
-      "import": "./dist/src/runtime/index.js",
-      "default": "./dist/src/runtime/index.js"
-    },
-    "./theme": {
-      "development": "./src/theme/index.ts",
-      "types": "./dist/src/theme/index.d.ts",
-      "import": "./dist/src/theme/index.js",
-      "default": "./dist/src/theme/index.js"
-    },
-    "./bridge": {
-      "development": "./src/bridge/index.ts",
-      "types": "./dist/src/bridge/index.d.ts",
-      "import": "./dist/src/bridge/index.js",
-      "default": "./dist/src/bridge/index.js"
-    },
-    "./web-components": {
-      "development": "./src/web-components/index.ts",
-      "types": "./dist/src/web-components/index.d.ts",
-      "import": "./dist/src/web-components/index.js",
-      "default": "./dist/src/web-components/index.js"
-    },
-    "./react": {
-      "development": "./src/react/index.ts",
-      "types": "./dist/src/react/index.d.ts",
-      "import": "./dist/src/react/index.js",
-      "default": "./dist/src/react/index.js"
-    },
-    "./render": {
-      "development": "./src/render/index.ts",
-      "types": "./dist/src/render/index.d.ts",
-      "import": "./dist/src/render/index.js",
-      "default": "./dist/src/render/index.js"
-    },
-    "./styles": {
-      "development": "./src/styles/index.ts",
-      "types": "./dist/src/styles/index.d.ts",
-      "import": "./dist/src/styles/index.js",
-      "default": "./dist/src/styles/index.js"
-    },
-    "./bundler": {
-      "development": "./src/bundler/index.ts",
-      "types": "./dist/src/bundler/index.d.ts",
-      "import": "./dist/src/bundler/index.js",
-      "default": "./dist/src/bundler/index.js"
-    },
-    "./handlebars": {
-      "development": "./src/handlebars/index.ts",
-      "types": "./dist/src/handlebars/index.d.ts",
-      "import": "./dist/src/handlebars/index.js",
-      "default": "./dist/src/handlebars/index.js"
-    },
-    "./registry": {
-      "development": "./src/registry/index.ts",
-      "types": "./dist/src/registry/index.d.ts",
-      "import": "./dist/src/registry/index.js",
-      "default": "./dist/src/registry/index.js"
-    }
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      }
+    },
+    "./*": {
+      "development": "./src/*/index.ts",
+      "require": {
+        "types": "./dist/*/index.d.ts",
+        "default": "./dist/*/index.js"
+      },
+      "import": {
+        "types": "./dist/esm/*/index.d.ts",
+        "default": "./dist/esm/*/index.js"
+      }
+    },
+    "./esm": null
   },
   "dependencies": {
     "@swc/core": "^1.5.0",
diff --git a/libs/ui/project.json b/libs/ui/project.json
index 329363f1..26ea07aa 100644
--- a/libs/ui/project.json
+++ b/libs/ui/project.json
@@ -5,19 +5,92 @@
   "projectType": "library",
   "tags": ["scope:libs", "scope:publishable", "versioning:synchronized"],
   "targets": {
-    "build-tsc": {
-      "executor": "@nx/js:tsc",
+    "build-cjs": {
+      "executor": "@nx/esbuild:esbuild",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "libs/ui/dist",
         "main": "libs/ui/src/index.ts",
         "tsConfig": "libs/ui/tsconfig.lib.json",
-        "assets": ["libs/ui/README.md", "LICENSE"]
+        "format": ["cjs"],
+        "declaration": true,
+        "declarationRootDir": "libs/ui/src",
+        "bundle": true,
+        "thirdParty": false,
+        "platform": "node",
+        "assets": ["libs/ui/README.md", "LICENSE", "libs/ui/package.json"],
+        "additionalEntryPoints": [
+          "libs/ui/src/adapters/index.ts",
+          "libs/ui/src/base-template/index.ts",
+          "libs/ui/src/bridge/index.ts",
+          "libs/ui/src/build/index.ts",
+          "libs/ui/src/bundler/index.ts",
+          "libs/ui/src/components/index.ts",
+          "libs/ui/src/handlebars/index.ts",
+          "libs/ui/src/layouts/index.ts",
+          "libs/ui/src/pages/index.ts",
+          "libs/ui/src/react/index.ts",
+          "libs/ui/src/registry/index.ts",
+          "libs/ui/src/render/index.ts",
+          "libs/ui/src/renderers/index.ts",
+          "libs/ui/src/runtime/index.ts",
+          "libs/ui/src/styles/index.ts",
+          "libs/ui/src/theme/index.ts",
+          "libs/ui/src/tool-template/index.ts",
+          "libs/ui/src/types/index.ts",
+          "libs/ui/src/validation/index.ts",
+          "libs/ui/src/web-components/index.ts",
+          "libs/ui/src/widgets/index.ts"
+        ],
+        "esbuildOptions": {
+          "outExtension": { ".js": ".js" }
+        }
+      }
+    },
+    "build-esm": {
+      "executor": "@nx/esbuild:esbuild",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "libs/ui/dist/esm",
+        "main": "libs/ui/src/index.ts",
+        "tsConfig": "libs/ui/tsconfig.lib.json",
+        "format": ["esm"],
+        "declaration": true,
+        "declarationRootDir": "libs/ui/src",
+        "bundle": true,
+        "thirdParty": false,
+        "platform": "node",
+        "additionalEntryPoints": [
+          "libs/ui/src/adapters/index.ts",
+          "libs/ui/src/base-template/index.ts",
+          "libs/ui/src/bridge/index.ts",
+          "libs/ui/src/build/index.ts",
+          "libs/ui/src/bundler/index.ts",
+          "libs/ui/src/components/index.ts",
+          "libs/ui/src/handlebars/index.ts",
+          "libs/ui/src/layouts/index.ts",
+          "libs/ui/src/pages/index.ts",
+          "libs/ui/src/react/index.ts",
+          "libs/ui/src/registry/index.ts",
+          "libs/ui/src/render/index.ts",
+          "libs/ui/src/renderers/index.ts",
+          "libs/ui/src/runtime/index.ts",
+          "libs/ui/src/styles/index.ts",
+          "libs/ui/src/theme/index.ts",
+          "libs/ui/src/tool-template/index.ts",
+          "libs/ui/src/types/index.ts",
+          "libs/ui/src/validation/index.ts",
+          "libs/ui/src/web-components/index.ts",
+          "libs/ui/src/widgets/index.ts"
+        ],
+        "esbuildOptions": {
+          "outExtension": { ".js": ".js" }
+        }
       }
     },
     "build": {
       "executor": "nx:run-commands",
-      "dependsOn": ["build-tsc"],
+      "dependsOn": ["build-cjs", "build-esm"],
       "options": {
         "command": "node scripts/strip-dist-from-pkg.js libs/ui/dist/package.json"
       }
diff --git a/libs/ui/tsconfig.lib.json b/libs/ui/tsconfig.lib.json
index 5231e2ac..6324ec71 100644
--- a/libs/ui/tsconfig.lib.json
+++ b/libs/ui/tsconfig.lib.json
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "declaration": true,
+    "declarationMap": true,
     "types": ["node"]
   },
   "include": ["src/**/*.ts", "src/**/*.tsx"],