diff --git a/README.md b/README.md
index bda54586..5790f542 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ Detector Adapters:
 | Python | ✅ |
 | Ruby | ✅ |
 | Swift | ✅ |
+| Bun | ✅ |
 
 `✅  - supported, 🛠  - work in progress`
 
diff --git a/src/Detector/Adapter/Bun.php b/src/Detector/Adapter/Bun.php
new file mode 100644
index 00000000..6e9adcbd
--- /dev/null
+++ b/src/Detector/Adapter/Bun.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Utopia\Detector\Adapter;
+
+use Utopia\Detector\Adapter;
+
+class Bun extends Adapter
+{
+    /**
+     * @return string[]
+     */
+    public function getLanguages(): array
+    {
+        return ['JavaScript', 'TypeScript'];
+    }
+
+    public function getRuntime(): string
+    {
+        return 'bun';
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getFileExtensions(): array
+    {
+        return ['ts', 'tsx', 'js', 'jsx'];
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getFiles(): array
+    {
+        return ['bun.lockb'];
+    }
+
+    public function getInstallCommand(): string
+    {
+        return 'bun install';
+    }
+
+    public function getBuildCommand(): string
+    {
+        return '';
+    }
+
+    public function getEntryPoint(): string
+    {
+        return 'main.ts';
+    }
+}
diff --git a/tests/Detector/DetectorTest.php b/tests/Detector/DetectorTest.php
index fd229bcd..a0085c6b 100644
--- a/tests/Detector/DetectorTest.php
+++ b/tests/Detector/DetectorTest.php
@@ -6,6 +6,7 @@
 use Utopia\App;
 use Utopia\Cache\Adapter\None;
 use Utopia\Cache\Cache;
+use Utopia\Detector\Adapter\Bun;
 use Utopia\Detector\Adapter\CPP;
 use Utopia\Detector\Adapter\Dart;
 use Utopia\Detector\Adapter\Deno;
@@ -40,6 +41,7 @@ public function detect($files, $languages): ?string
             ->addDetector(new Ruby())
             ->addDetector(new Java())
             ->addDetector(new CPP())
+            ->addDetector(new Bun())
             ->addDetector(new Deno())
             ->addDetector(new Dotnet());
 
@@ -70,6 +72,7 @@ public function testLanguageDetection(): void
             ['Dobiasd', 'FunctionalPlus', 'cpp'],
             ['anthonychu', 'azure-functions-deno-worker', 'deno'],
             ['mono', 'mono-basic', 'dotnet'],
+            ['X', 'X', 'bun'],
         ];
 
         foreach ($languageMap as [$owner, $repositoryName, $expectedRuntime]) {