diff --git a/packages/agent-sdk/package.json b/packages/agent-sdk/package.json
index 66a5ac9..a449a9f 100644
--- a/packages/agent-sdk/package.json
+++ b/packages/agent-sdk/package.json
@@ -20,15 +20,16 @@
   "publishConfig": {
     "access": "public"
   },
-  "type": "module",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "dist/cjs/index.js",
+  "module": "dist/mjs/index.js",
+  "types": "dist/esm/index.d.ts",
   "files": [
-    "dist"
+    "dist/**/*"
   ],
   "scripts": {
-    "build": "tsc"
+    "build": "rm -fr dist/* && bun build:esm && bun build:cjs",
+    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:cjs": "tsc -p tsconfig.cjs.json"
   },
   "dependencies": {
     "viem": "^2.21.53",
diff --git a/packages/agent-sdk/tsconfig.cjs.json b/packages/agent-sdk/tsconfig.cjs.json
new file mode 100644
index 0000000..1105a76
--- /dev/null
+++ b/packages/agent-sdk/tsconfig.cjs.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist/cjs"
+  }
+}
diff --git a/packages/agent-sdk/tsconfig.esm.json b/packages/agent-sdk/tsconfig.esm.json
new file mode 100644
index 0000000..76c2936
--- /dev/null
+++ b/packages/agent-sdk/tsconfig.esm.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "outDir": "dist/esm"
+  }
+}
diff --git a/packages/agent-sdk/tsconfig.json b/packages/agent-sdk/tsconfig.json
index 6b68593..e57cb20 100644
--- a/packages/agent-sdk/tsconfig.json
+++ b/packages/agent-sdk/tsconfig.json
@@ -1,16 +1,12 @@
 {
   "compilerOptions": {
-    // Enable latest features
-    "lib": ["ESNext", "DOM"],
-    "target": "ESNext",
-    "module": "ESNext",
+    "target": "ES2020",
     "moduleDetection": "force",
 
     // Bundler mode
-    "moduleResolution": "bundler",
+    "moduleResolution": "Node",
     "esModuleInterop": true,
     "resolveJsonModule": true,
-    "verbatimModuleSyntax": true,
     // "allowImportingTsExtensions": true,
     // "noEmit": true,