Fix PDF viewer

Remove duplicate themes in getThemes function
Fix secure() function editing
2026-01-18 09:46:44 +01:00 · 2025-10-22 08:56:36 -07:00 · 2025-10-22 06:56:00 -07:00 · 2025-10-21 20:09:56 -07:00 · 2025-10-21 08:16:33 -07:00 · 2025-10-21 08:08:27 -07:00
79 changed files with 2075 additions and 1344 deletions
--- a/.github/workflows/sponsors.yml
+++ b/.github/workflows/sponsors.yml
@@ -40,4 +40,5 @@ jobs:
        uses: JamesIves/github-pages-deploy-action@v4
        with:
          branch: main
+          force: false
          folder: '.'
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
  <!-- sponsors-premium --><a href="https://github.com/MVST-Solutions"><img src="https:&#x2F;&#x2F;github.com&#x2F;MVST-Solutions.png" width="80px" alt="User avatar: MVST-Solutions" /></a>&nbsp;&nbsp;<a href="https://github.com/dharsanb"><img src="https:&#x2F;&#x2F;github.com&#x2F;dharsanb.png" width="80px" alt="User avatar: dharsanb" /></a>&nbsp;&nbsp;<a href="https://github.com/railwayapp"><img src="https:&#x2F;&#x2F;github.com&#x2F;railwayapp.png" width="80px" alt="User avatar: railwayapp" /></a>&nbsp;&nbsp;<a href="https://github.com/caseyamcl"><img src="https:&#x2F;&#x2F;github.com&#x2F;caseyamcl.png" width="80px" alt="User avatar: caseyamcl" /></a>&nbsp;&nbsp;<a href="https://github.com/andriyor"><img src="https:&#x2F;&#x2F;github.com&#x2F;andriyor.png" width="80px" alt="User avatar: andriyor" /></a>&nbsp;&nbsp;<a href="https://github.com/"><img src="https:&#x2F;&#x2F;raw.githubusercontent.com&#x2F;JamesIves&#x2F;github-sponsors-readme-action&#x2F;dev&#x2F;.github&#x2F;assets&#x2F;placeholder.png" width="80px" alt="User avatar: " /></a>&nbsp;&nbsp;<!-- sponsors-premium -->
 </p>
 <p align="center">
-  <!-- sponsors-base --><a href="https://github.com/seanwash"><img src="https:&#x2F;&#x2F;github.com&#x2F;seanwash.png" width="50px" alt="User avatar: seanwash" /></a>&nbsp;&nbsp;<a href="https://github.com/jerath"><img src="https:&#x2F;&#x2F;github.com&#x2F;jerath.png" width="50px" alt="User avatar: jerath" /></a>&nbsp;&nbsp;<a href="https://github.com/itsa-sh"><img src="https:&#x2F;&#x2F;github.com&#x2F;itsa-sh.png" width="50px" alt="User avatar: itsa-sh" /></a>&nbsp;&nbsp;<a href="https://github.com/dmmulroy"><img src="https:&#x2F;&#x2F;github.com&#x2F;dmmulroy.png" width="50px" alt="User avatar: dmmulroy" /></a>&nbsp;&nbsp;<a href="https://github.com/timcole"><img src="https:&#x2F;&#x2F;github.com&#x2F;timcole.png" width="50px" alt="User avatar: timcole" /></a>&nbsp;&nbsp;<a href="https://github.com/VLZH"><img src="https:&#x2F;&#x2F;github.com&#x2F;VLZH.png" width="50px" alt="User avatar: VLZH" /></a>&nbsp;&nbsp;<a href="https://github.com/terasaka2k"><img src="https:&#x2F;&#x2F;github.com&#x2F;terasaka2k.png" width="50px" alt="User avatar: terasaka2k" /></a>&nbsp;&nbsp;<!-- sponsors-base -->
+  <!-- sponsors-base --><a href="https://github.com/seanwash"><img src="https:&#x2F;&#x2F;github.com&#x2F;seanwash.png" width="50px" alt="User avatar: seanwash" /></a>&nbsp;&nbsp;<a href="https://github.com/jerath"><img src="https:&#x2F;&#x2F;github.com&#x2F;jerath.png" width="50px" alt="User avatar: jerath" /></a>&nbsp;&nbsp;<a href="https://github.com/itsa-sh"><img src="https:&#x2F;&#x2F;github.com&#x2F;itsa-sh.png" width="50px" alt="User avatar: itsa-sh" /></a>&nbsp;&nbsp;<a href="https://github.com/dmmulroy"><img src="https:&#x2F;&#x2F;github.com&#x2F;dmmulroy.png" width="50px" alt="User avatar: dmmulroy" /></a>&nbsp;&nbsp;<a href="https://github.com/timcole"><img src="https:&#x2F;&#x2F;github.com&#x2F;timcole.png" width="50px" alt="User avatar: timcole" /></a>&nbsp;&nbsp;<a href="https://github.com/VLZH"><img src="https:&#x2F;&#x2F;github.com&#x2F;VLZH.png" width="50px" alt="User avatar: VLZH" /></a>&nbsp;&nbsp;<a href="https://github.com/terasaka2k"><img src="https:&#x2F;&#x2F;github.com&#x2F;terasaka2k.png" width="50px" alt="User avatar: terasaka2k" /></a>&nbsp;&nbsp;<a href="https://github.com/majudhu"><img src="https:&#x2F;&#x2F;github.com&#x2F;majudhu.png" width="50px" alt="User avatar: majudhu" /></a>&nbsp;&nbsp;<!-- sponsors-base -->
 </p>

 ![Yaak API Client](https://yaak.app/static/screenshot.png)
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,6 +25,7 @@
        "plugins/importer-insomnia",
        "plugins/importer-openapi",
        "plugins/importer-postman",
+        "plugins/importer-postman-environment",
        "plugins/importer-yaak",
        "plugins/template-function-cookie",
        "plugins/template-function-encode",
@@ -1969,24 +1970,6 @@
        "node": ">=14"
      }
    },
-    "node_modules/@react-dnd/asap": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-5.0.2.tgz",
-      "integrity": "sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A==",
-      "license": "MIT"
-    },
-    "node_modules/@react-dnd/invariant": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-4.0.2.tgz",
-      "integrity": "sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw==",
-      "license": "MIT"
-    },
-    "node_modules/@react-dnd/shallowequal": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz",
-      "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==",
-      "license": "MIT"
-    },
    "node_modules/@replit/codemirror-emacs": {
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/@replit/codemirror-emacs/-/codemirror-emacs-6.1.0.tgz",
@@ -2854,6 +2837,7 @@
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/@tailwindcss/container-queries/-/container-queries-0.1.1.tgz",
      "integrity": "sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==",
+      "dev": true,
      "license": "MIT",
      "peerDependencies": {
        "tailwindcss": ">=3.2.0"
@@ -2873,9 +2857,9 @@
      }
    },
    "node_modules/@tanstack/history": {
-      "version": "1.121.34",
-      "resolved": "https://registry.npmjs.org/@tanstack/history/-/history-1.121.34.tgz",
-      "integrity": "sha512-YL8dGi5ZU+xvtav2boRlw4zrRghkY6hvdcmHhA0RGSJ/CBgzv+cbADW9eYJLx74XMZvIQ1pp6VMbrpXnnM5gHA==",
+      "version": "1.133.3",
+      "resolved": "https://registry.npmjs.org/@tanstack/history/-/history-1.133.3.tgz",
+      "integrity": "sha512-zFQnGdX0S4g5xRuS+95iiEXM+qlGvYG7ksmOKx7LaMv60lDWa0imR8/24WwXXvBWJT1KnwVdZcjvhCwz9IiJCw==",
      "license": "MIT",
      "engines": {
        "node": ">=12"
@@ -2886,9 +2870,9 @@
      }
    },
    "node_modules/@tanstack/query-core": {
-      "version": "5.83.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.83.0.tgz",
-      "integrity": "sha512-0M8dA+amXUkyz5cVUm/B+zSk3xkQAcuXuz5/Q/LveT4ots2rBpPTZOzd7yJa2Utsf8D2Upl5KyjhHRY+9lB/XA==",
+      "version": "5.90.5",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.5.tgz",
+      "integrity": "sha512-wLamYp7FaDq6ZnNehypKI5fNvxHPfTYylE0m/ZpuuzJfJqhR5Pxg9gvGBHZx4n7J+V5Rg5mZxHHTlv25Zt5u+w==",
      "license": "MIT",
      "funding": {
        "type": "github",
@@ -2896,12 +2880,12 @@
      }
    },
    "node_modules/@tanstack/react-query": {
-      "version": "5.83.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.83.0.tgz",
-      "integrity": "sha512-/XGYhZ3foc5H0VM2jLSD/NyBRIOK4q9kfeml4+0x2DlL6xVuAcVEW+hTlTapAmejObg0i3eNqhkr2dT+eciwoQ==",
+      "version": "5.90.5",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.5.tgz",
+      "integrity": "sha512-pN+8UWpxZkEJ/Rnnj2v2Sxpx1WFlaa9L6a4UO89p6tTQbeo+m0MS8oYDjbggrR8QcTyjKoYWKS3xJQGr3ExT8Q==",
      "license": "MIT",
      "dependencies": {
-        "@tanstack/query-core": "5.83.0"
+        "@tanstack/query-core": "5.90.5"
      },
      "funding": {
        "type": "github",
@@ -2912,14 +2896,14 @@
      }
    },
    "node_modules/@tanstack/react-router": {
-      "version": "1.127.3",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-router/-/react-router-1.127.3.tgz",
-      "integrity": "sha512-QprmWHJrGbEKXJiP7WZ+dilTJRc7nMbsFCUnfAUw8PsOYanhgvBkBwAU05YEo8WTIZ9atCc1R90hyzqbiBFkdA==",
+      "version": "1.133.13",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-router/-/react-router-1.133.13.tgz",
+      "integrity": "sha512-mVAj70mPOH/a60Hjlha3gHEWLFuE4kHeKau/AL5Xp6e5GtNk1JTRwN4sJ9QlSyLcClOUUtGfED1FoLj0D2W0Eg==",
      "license": "MIT",
      "dependencies": {
-        "@tanstack/history": "1.121.34",
+        "@tanstack/history": "1.133.3",
        "@tanstack/react-store": "^0.7.0",
-        "@tanstack/router-core": "1.127.3",
+        "@tanstack/router-core": "1.133.13",
        "isbot": "^5.1.22",
        "tiny-invariant": "^1.3.3",
        "tiny-warning": "^1.0.3"
@@ -2972,14 +2956,14 @@
      }
    },
    "node_modules/@tanstack/router-core": {
-      "version": "1.127.3",
-      "resolved": "https://registry.npmjs.org/@tanstack/router-core/-/router-core-1.127.3.tgz",
-      "integrity": "sha512-08JlfwsMIDkMyCQsRviMVBn0cVUzlNzkll4pZgf6QRSO1RASBsci5hMojcsdH0d/yXLH0FBJ6fINbj0ctBm63Q==",
+      "version": "1.133.13",
+      "resolved": "https://registry.npmjs.org/@tanstack/router-core/-/router-core-1.133.13.tgz",
+      "integrity": "sha512-zZptdlS/wSkqozb07Y3zX5gas2OapJdjEG6/Id0e/twNefVdR4EY2TK/mgvyhHtKIpCxIcnZz/3opypgeQi9bg==",
      "license": "MIT",
      "dependencies": {
-        "@tanstack/history": "1.121.34",
+        "@tanstack/history": "1.133.3",
        "@tanstack/store": "^0.7.0",
-        "cookie-es": "^1.2.2",
+        "cookie-es": "^2.0.0",
        "seroval": "^1.3.2",
        "seroval-plugins": "^1.3.2",
        "tiny-invariant": "^1.3.3",
@@ -4206,6 +4190,10 @@
      "resolved": "plugins/importer-postman",
      "link": true
    },
+    "node_modules/@yaak/importer-postman-environment": {
+      "resolved": "plugins/importer-postman-environment",
+      "link": true
+    },
    "node_modules/@yaak/importer-yaak": {
      "resolved": "plugins/importer-yaak",
      "link": true
@@ -5915,9 +5903,9 @@
      "license": "MIT"
    },
    "node_modules/cookie-es": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.2.2.tgz",
-      "integrity": "sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-2.0.0.tgz",
+      "integrity": "sha512-RAj4E421UYRgqokKUmotqAwuplYw15qtdXfY+hGzgCJ/MBjCVZcSoHK/kH9kocfjRjcDME7IiDWR/1WX1TM2Pg==",
      "license": "MIT"
    },
    "node_modules/copy-descriptor": {
@@ -6707,17 +6695,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/dnd-core": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-16.0.1.tgz",
-      "integrity": "sha512-HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==",
-      "license": "MIT",
-      "dependencies": {
-        "@react-dnd/asap": "^5.0.1",
-        "@react-dnd/invariant": "^4.0.1",
-        "redux": "^4.2.0"
-      }
-    },
    "node_modules/doctrine": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
@@ -9273,15 +9250,6 @@
        "@babel/runtime": "^7.7.6"
      }
    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "react-is": "^16.7.0"
-      }
-    },
    "node_modules/hosted-git-info": {
      "version": "2.8.9",
      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -14421,46 +14389,6 @@
        "react-dom": ">=16.8.0"
      }
    },
-    "node_modules/react-dnd": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-16.0.1.tgz",
-      "integrity": "sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@react-dnd/invariant": "^4.0.1",
-        "@react-dnd/shallowequal": "^4.0.1",
-        "dnd-core": "^16.0.1",
-        "fast-deep-equal": "^3.1.3",
-        "hoist-non-react-statics": "^3.3.2"
-      },
-      "peerDependencies": {
-        "@types/hoist-non-react-statics": ">= 3.3.1",
-        "@types/node": ">= 12",
-        "@types/react": ">= 16",
-        "react": ">= 16.14"
-      },
-      "peerDependenciesMeta": {
-        "@types/hoist-non-react-statics": {
-          "optional": true
-        },
-        "@types/node": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-dnd-touch-backend": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-16.0.1.tgz",
-      "integrity": "sha512-NonoCABzzjyWGZuDxSG77dbgMZ2Wad7eQiCd/ECtsR2/NBLTjGksPUx9UPezZ1nQ/L7iD130Tz3RUshL/ClKLA==",
-      "license": "MIT",
-      "dependencies": {
-        "@react-dnd/invariant": "^4.0.1",
-        "dnd-core": "^16.0.1"
-      }
-    },
    "node_modules/react-dom": {
      "version": "18.3.1",
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
@@ -14479,6 +14407,7 @@
      "version": "16.13.1",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true,
      "license": "MIT"
    },
    "node_modules/react-markdown": {
@@ -14847,15 +14776,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
    "node_modules/reflect.getprototypeof": {
      "version": "1.0.10",
      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -16907,6 +16827,7 @@
      "version": "4.1.11",
      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.11.tgz",
      "integrity": "sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==",
+      "dev": true,
      "license": "MIT",
      "peer": true
    },
@@ -17936,9 +17857,9 @@
      }
    },
    "node_modules/vite": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.7.tgz",
-      "integrity": "sha512-hc6LujN/EkJHmxeiDJMs0qBontZ1cdBvvoCbWhVjzUFTU329VRyOC46gHNSA8NcOC5yzCeXpwI40tieI3DEZqg==",
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.8.tgz",
+      "integrity": "sha512-cJBdq0/u+8rgstg9t7UkBilf8ipLmeXJO30NxD5HAHOivnj10ocV8YtR/XBvd2wQpN3TmcaxNKaHX3tN7o5F5A==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -18864,7 +18785,7 @@
    },
    "packages/plugin-runtime-types": {
      "name": "@yaakapp/api",
-      "version": "0.6.6",
+      "version": "0.7.0",
      "dependencies": {
        "@types/node": "^24.0.13"
      },
@@ -18966,6 +18887,10 @@
      "name": "@yaak/importer-postman",
      "version": "0.1.0"
    },
+    "plugins/importer-postman-environment": {
+      "name": "@yaak/importer-postman-environment",
+      "version": "0.1.0"
+    },
    "plugins/importer-yaak": {
      "name": "@yaak/importer-yaak",
      "version": "0.1.0"
@@ -19136,10 +19061,9 @@
        "@replit/codemirror-emacs": "^6.1.0",
        "@replit/codemirror-vim": "^6.3.0",
        "@replit/codemirror-vscode-keymap": "^6.0.2",
-        "@tailwindcss/container-queries": "^0.1.1",
-        "@tanstack/react-query": "^5.76.1",
-        "@tanstack/react-router": "^1.120.3",
-        "@tanstack/react-virtual": "^3.13.8",
+        "@tanstack/react-query": "^5.90.5",
+        "@tanstack/react-router": "^1.133.13",
+        "@tanstack/react-virtual": "^3.13.12",
        "@tauri-apps/api": "^2.8.0",
        "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
        "@tauri-apps/plugin-dialog": "^2.4.0",
@@ -19169,8 +19093,6 @@
        "parse-color": "^1.0.0",
        "react": "^19.1.0",
        "react-colorful": "^5.6.1",
-        "react-dnd": "^16.0.1",
-        "react-dnd-touch-backend": "^16.0.1",
        "react-dom": "^19.1.0",
        "react-markdown": "^10.1.0",
        "react-pdf": "^10.0.1",
@@ -19187,6 +19109,7 @@
      },
      "devDependencies": {
        "@lezer/generator": "^1.8.0",
+        "@tailwindcss/container-queries": "^0.1.1",
        "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
        "@tanstack/router-plugin": "^1.127.5",
        "@types/node": "^24.0.13",
@@ -19205,7 +19128,7 @@
        "postcss": "^8.5.6",
        "postcss-nesting": "^13.0.2",
        "tailwindcss": "^3.4.17",
-        "vite": "^7.0.7",
+        "vite": "^7.0.8",
        "vite-plugin-static-copy": "^3.1.2",
        "vite-plugin-svgr": "^4.3.0",
        "vite-plugin-top-level-await": "^1.5.0",
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
    "plugins/importer-insomnia",
    "plugins/importer-openapi",
    "plugins/importer-postman",
+    "plugins/importer-postman-environment",
    "plugins/importer-yaak",
    "plugins/template-function-cookie",
    "plugins/template-function-encode",
--- a/plugins/auth-oauth2/package.json
+++ b/plugins/auth-oauth2/package.json
@@ -12,6 +12,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  }
 }
--- a/plugins/auth-oauth2/src/grants/authorizationCode.ts
+++ b/plugins/auth-oauth2/src/grants/authorizationCode.ts
@@ -4,6 +4,7 @@ import { fetchAccessToken } from '../fetchAccessToken';
 import { getOrRefreshAccessToken } from '../getOrRefreshAccessToken';
 import type { AccessToken, TokenStoreArgs } from '../store';
 import { getDataDirKey, storeToken } from '../store';
+import { extractCode } from '../util';

 export const PKCE_SHA256 = 'S256';
 export const PKCE_PLAIN = 'plain';
@@ -79,7 +80,6 @@ export async function getAuthorizationCode(
    authorizationUrl.searchParams.set('code_challenge_method', pkce.challengeMethod);
  }

-  const logsEnabled = (await ctx.store.get('enable_logs')) ?? false;
  const dataDirKey = await getDataDirKey(ctx, contextId);
  const authorizationUrlStr = authorizationUrl.toString();
  console.log('[oauth2] Authorizing', authorizationUrlStr);
@@ -97,18 +97,17 @@ export async function getAuthorizationCode(
        }
      },
      async onNavigate({ url: urlStr }) {
-        const url = new URL(urlStr);
-        if (logsEnabled) console.log('[oauth2] Navigated to', urlStr);
-
-        if (url.searchParams.has('error')) {
+        let code;
+        try {
+          code = extractCode(urlStr, redirectUri);
+        } catch (err) {
+          reject(err);
          close();
-          return reject(new Error(`Failed to authorize: ${url.searchParams.get('error')}`));
+          return;
        }

-        const code = url.searchParams.get('code');
        if (!code) {
-          console.log('[oauth2] Code not found');
-          return; // Could be one of many redirects in a chain, so skip it
+          return;
        }

        // Close the window here, because we don't need it anymore!
--- a/plugins/auth-oauth2/src/index.ts
+++ b/plugins/auth-oauth2/src/index.ts
@@ -6,8 +6,8 @@ import type {
  PluginDefinition,
 } from '@yaakapp/api';
 import {
-  genPkceCodeVerifier,
  DEFAULT_PKCE_METHOD,
+  genPkceCodeVerifier,
  getAuthorizationCode,
  PKCE_PLAIN,
  PKCE_SHA256,
@@ -125,17 +125,6 @@ export const plugin: PluginDefinition = {
          await resetDataDirKey(ctx, contextId);
        },
      },
-      {
-        label: 'Toggle Debug Logs',
-        async onSelect(ctx) {
-          const enableLogs = !(await ctx.store.get('enable_logs'));
-          await ctx.store.set('enable_logs', enableLogs);
-          await ctx.toast.show({
-            message: `Debug logs ${enableLogs ? 'enabled' : 'disabled'}`,
-            color: 'info',
-          });
-        },
-      },
    ],
    args: [
      {
--- a/plugins/auth-oauth2/src/util.ts
+++ b/plugins/auth-oauth2/src/util.ts
@@ -3,3 +3,83 @@ import type { AccessToken } from './store';
 export function isTokenExpired(token: AccessToken) {
  return token.expiresAt && Date.now() > token.expiresAt;
 }
+
+export function extractCode(urlStr: string, redirectUri: string | null): string | null {
+  const url = new URL(urlStr);
+
+  if (!urlMatchesRedirect(url, redirectUri)) {
+    console.log('[oauth2] URL does not match redirect origin/path; skipping.');
+    return null;
+  }
+
+  // Prefer query param; fall back to fragment if query lacks it
+
+  const query = url.searchParams;
+  const queryError = query.get('error');
+  const queryDesc = query.get('error_description');
+  const queryUri = query.get('error_uri');
+
+  let hashParams: URLSearchParams | null = null;
+  if (url.hash && url.hash.length > 1) {
+    hashParams = new URLSearchParams(url.hash.slice(1));
+  }
+  const hashError = hashParams?.get('error');
+  const hashDesc = hashParams?.get('error_description');
+  const hashUri = hashParams?.get('error_uri');
+
+  const error = queryError || hashError;
+  if (error) {
+    const desc = queryDesc || hashDesc;
+    const uri = queryUri || hashUri;
+    let message = `Failed to authorize: ${error}`;
+    if (desc) message += ` (${desc})`;
+    if (uri) message += ` [${uri}]`;
+    throw new Error(message);
+  }
+
+  const queryCode = query.get('code');
+  if (queryCode) return queryCode;
+
+  const hashCode = hashParams?.get('code');
+  if (hashCode) return hashCode;
+
+  console.log('[oauth2] Code not found');
+  return null;
+}
+
+export function urlMatchesRedirect(url: URL, redirectUrl: string | null): boolean {
+  if (!redirectUrl) return true;
+
+  let redirect;
+  try {
+    redirect = new URL(redirectUrl);
+  } catch {
+    console.log('[oauth2] Invalid redirect URI; skipping.');
+    return false;
+  }
+
+  const sameProtocol = url.protocol === redirect.protocol;
+
+  const sameHost = url.hostname.toLowerCase() === redirect.hostname.toLowerCase();
+
+  const normalizePort = (u: URL) =>
+    (u.protocol === 'https:' && (!u.port || u.port === '443')) ||
+    (u.protocol === 'http:' && (!u.port || u.port === '80'))
+      ? ''
+      : u.port;
+
+  const samePort = normalizePort(url) === normalizePort(redirect);
+
+  const normPath = (p: string) => {
+    const withLeading = p.startsWith('/') ? p : `/${p}`;
+    // strip trailing slashes, keep root as "/"
+    return withLeading.replace(/\/+$/g, '') || '/';
+  };
+
+  // Require redirect path to be a prefix of the navigated URL path
+  const urlPath = normPath(url.pathname);
+  const redirectPath = normPath(redirect.pathname);
+  const pathMatches = urlPath === redirectPath || urlPath.startsWith(`${redirectPath}/`);
+
+  return sameProtocol && sameHost && samePort && pathMatches;
+}
--- a/plugins/auth-oauth2/tests/util.test.ts
+++ b/plugins/auth-oauth2/tests/util.test.ts
@@ -0,0 +1,109 @@
+import { describe, test, expect } from 'vitest';
+import { extractCode } from '../src/util';
+
+describe('extractCode', () => {
+  test('extracts code from query when same origin + path', () => {
+    const url = 'https://app.example.com/cb?code=abc123&state=xyz';
+    const redirect = 'https://app.example.com/cb';
+    expect(extractCode(url, redirect)).toBe('abc123');
+  });
+
+  test('extracts code from query with weird path', () => {
+    const url = 'https://app.example.com/cbwithextra?code=abc123&state=xyz';
+    const redirect = 'https://app.example.com/cb';
+    expect(extractCode(url, redirect)).toBeNull();
+  });
+
+  test('allows trailing slash differences', () => {
+    expect(extractCode('https://app.example.com/cb/?code=abc', 'https://app.example.com/cb')).toBe(
+      'abc',
+    );
+    expect(extractCode('https://app.example.com/cb?code=abc', 'https://app.example.com/cb/')).toBe(
+      'abc',
+    );
+  });
+
+  test('treats default ports as equal (https:443, http:80)', () => {
+    expect(
+      extractCode('https://app.example.com/cb?code=abc', 'https://app.example.com:443/cb'),
+    ).toBe('abc');
+    expect(extractCode('http://app.example.com/cb?code=abc', 'http://app.example.com:80/cb')).toBe(
+      'abc',
+    );
+  });
+
+  test('rejects different port', () => {
+    expect(
+      extractCode('https://app.example.com/cb?code=abc', 'https://app.example.com:8443/cb'),
+    ).toBeNull();
+  });
+
+  test('rejects different hostname (including subdomain changes)', () => {
+    expect(
+      extractCode('https://evil.example.com/cb?code=abc', 'https://app.example.com/cb'),
+    ).toBeNull();
+  });
+
+  test('requires path to start with redirect path (ignoring query/hash)', () => {
+    // same origin but wrong path -> null
+    expect(
+      extractCode('https://app.example.com/other?code=abc', 'https://app.example.com/cb'),
+    ).toBeNull();
+
+    // deeper subpath under the redirect path -> allowed (prefix match)
+    expect(
+      extractCode('https://app.example.com/cb/deep?code=abc', 'https://app.example.com/cb'),
+    ).toBe('abc');
+  });
+
+  test('works with custom schemes', () => {
+    expect(extractCode('myapp://cb?code=abc', 'myapp://cb')).toBe('abc');
+  });
+
+  test('prefers query over fragment when both present', () => {
+    const url = 'https://app.example.com/cb?code=queryCode#code=hashCode';
+    const redirect = 'https://app.example.com/cb';
+    expect(extractCode(url, redirect)).toBe('queryCode');
+  });
+
+  test('extracts code from fragment when query lacks code', () => {
+    const url = 'https://app.example.com/cb#code=fromHash&state=xyz';
+    const redirect = 'https://app.example.com/cb';
+    expect(extractCode(url, redirect)).toBe('fromHash');
+  });
+
+  test('returns null if no code present (query or fragment)', () => {
+    const url = 'https://app.example.com/cb?state=only';
+    const redirect = 'https://app.example.com/cb';
+    expect(extractCode(url, redirect)).toBeNull();
+  });
+
+  test('returns null when provider reports an error', () => {
+    const url = 'https://app.example.com/cb?error=access_denied&error_description=oopsy';
+    const redirect = 'https://app.example.com/cb';
+    expect(() => extractCode(url, redirect)).toThrow('Failed to authorize: access_denied');
+  });
+
+  test('when redirectUri is null, extracts code from any URL', () => {
+    expect(extractCode('https://random.example.com/whatever?code=abc', null)).toBe('abc');
+  });
+
+  test('handles extra params gracefully', () => {
+    const url = 'https://app.example.com/cb?foo=1&bar=2&code=abc&baz=3';
+    const redirect = 'https://app.example.com/cb';
+    expect(extractCode(url, redirect)).toBe('abc');
+  });
+
+  test('ignores fragment noise when code is in query', () => {
+    const url = 'https://app.example.com/cb?code=abc#some=thing';
+    const redirect = 'https://app.example.com/cb';
+    expect(extractCode(url, redirect)).toBe('abc');
+  });
+
+  // If you decide NOT to support fragment-based codes, flip these to expect null or mark as .skip
+  test('supports fragment-only code for response_mode=fragment providers', () => {
+    const url = 'https://app.example.com/cb#state=xyz&code=abc';
+    const redirect = 'https://app.example.com/cb';
+    expect(extractCode(url, redirect)).toBe('abc');
+  });
+});
--- a/plugins/importer-postman-environment/package.json
+++ b/plugins/importer-postman-environment/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "@yaak/importer-postman-environment",
+  "displayName": "Postman Environment Importer",
+  "description": "Import environments from Postman",
+  "private": true,
+  "version": "0.1.0",
+  "main": "./build/index.js",
+  "scripts": {
+    "build": "yaakcli build",
+    "dev": "yaakcli dev",
+    "lint": "tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
+  }
+}
--- a/plugins/importer-postman-environment/src/index.ts
+++ b/plugins/importer-postman-environment/src/index.ts
@@ -0,0 +1,138 @@
+import type {
+  Context,
+  Environment,
+  PartialImportResources,
+  PluginDefinition,
+  Workspace,
+} from '@yaakapp/api';
+import type { ImportPluginResponse } from '@yaakapp/api/lib/plugins/ImporterPlugin';
+
+type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
+
+interface ExportResources {
+  workspaces: AtLeast<Workspace, 'name' | 'id' | 'model'>[];
+  environments: AtLeast<Environment, 'name' | 'id' | 'model' | 'workspaceId'>[];
+}
+
+export const plugin: PluginDefinition = {
+  importer: {
+    name: 'Postman Environment',
+    description: 'Import postman environment exports',
+    onImport(_ctx: Context, args: { text: string }) {
+      return convertPostmanEnvironment(args.text);
+    },
+  },
+};
+
+export function convertPostmanEnvironment(contents: string): ImportPluginResponse | undefined {
+  const root = parseJSONToRecord(contents);
+  if (root == null) return;
+
+  // Validate that it looks like a Postman Environment export
+  const values = toArray<{
+    key?: string;
+    value?: unknown;
+    enabled?: boolean;
+    description?: string;
+    type?: string;
+  }>(root.values);
+  const scope = root._postman_variable_scope;
+  const hasEnvMarkers = typeof scope === 'string';
+
+  if (values.length === 0 || (!hasEnvMarkers && typeof root.name !== 'string')) {
+    // Not a Postman environment file, skip
+    return;
+  }
+
+  const exportResources: ExportResources = {
+    workspaces: [],
+    environments: [],
+  };
+
+  const envVariables = values
+    .map((v) => ({
+      enabled: v.enabled ?? true,
+      name: String(v.key ?? ''),
+      value: String(v.value),
+      description: v.description ? String(v.description) : null,
+    }))
+    .filter((v) => v.name.length > 0);
+
+  const environment: ExportResources['environments'][0] = {
+    model: 'environment',
+    id: generateId('environment'),
+    name: root.name ? String(root.name) : 'Environment',
+    workspaceId: 'CURRENT_WORKSPACE',
+    parentModel: 'environment',
+    parentId: null,
+    variables: envVariables,
+  };
+  exportResources.environments.push(environment);
+
+  const resources = deleteUndefinedAttrs(
+    convertTemplateSyntax(exportResources),
+  ) as PartialImportResources;
+
+  return { resources };
+}
+
+function parseJSONToRecord<T>(jsonStr: string): Record<string, T> | null {
+  try {
+    return toRecord(JSON.parse(jsonStr));
+  } catch {
+    return null;
+  }
+}
+
+function toRecord<T>(value: Record<string, T> | unknown): Record<string, T> {
+  if (value && typeof value === 'object' && !Array.isArray(value)) {
+    return value as Record<string, T>;
+  }
+  return {} as Record<string, T>;
+}
+
+function toArray<T>(value: unknown): T[] {
+  if (Object.prototype.toString.call(value) === '[object Array]') return value as T[];
+  else return [] as T[];
+}
+
+/** Recursively render all nested object properties */
+function convertTemplateSyntax<T>(obj: T): T {
+  if (typeof obj === 'string') {
+    return obj.replace(
+      /{{\s*(_\.)?([^}]*)\s*}}/g,
+      (_m, _dot, expr) => '${[' + expr.trim() + ']}',
+    ) as T;
+  } else if (Array.isArray(obj) && obj != null) {
+    return obj.map(convertTemplateSyntax) as T;
+  } else if (typeof obj === 'object' && obj != null) {
+    return Object.fromEntries(
+      Object.entries(obj as Record<string, unknown>).map(([k, v]) => [k, convertTemplateSyntax(v)]),
+    ) as T;
+  } else {
+    return obj;
+  }
+}
+
+function deleteUndefinedAttrs<T>(obj: T): T {
+  if (Array.isArray(obj) && obj != null) {
+    return obj.map(deleteUndefinedAttrs) as T;
+  } else if (typeof obj === 'object' && obj != null) {
+    return Object.fromEntries(
+      Object.entries(obj as Record<string, unknown>)
+        .filter(([, v]) => v !== undefined)
+        .map(([k, v]) => [k, deleteUndefinedAttrs(v)]),
+    ) as T;
+  } else {
+    return obj;
+  }
+}
+
+const idCount: Partial<Record<string, number>> = {};
+
+function generateId(model: string): string {
+  idCount[model] = (idCount[model] ?? -1) + 1;
+  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;
+}
+
+export default plugin;
--- a/plugins/importer-postman-environment/tests/fixtures/environment.input.json
+++ b/plugins/importer-postman-environment/tests/fixtures/environment.input.json
@@ -0,0 +1,27 @@
+{
+  "id": "123",
+  "name": "My Environment",
+  "values": [
+    {
+      "key": "baseUrl",
+      "value": "https://api.example.com",
+      "type": "default",
+      "enabled": true
+    },
+    {
+      "key": "token",
+      "value": "{{ access_token }}",
+      "type": "default",
+      "description": "Access token for the API.",
+      "enabled": true
+    },
+    {
+      "key": "disabled",
+      "type": "secret",
+      "value": "hello",
+      "enabled": false
+    }
+  ],
+  "_postman_variable_scope": "environment",
+  "_postman_exported_using": "PostmanRuntime/1.0.0"
+}
--- a/plugins/importer-postman-environment/tests/fixtures/environment.output.json
+++ b/plugins/importer-postman-environment/tests/fixtures/environment.output.json
@@ -0,0 +1,35 @@
+{
+  "resources": {
+    "workspaces": [],
+    "environments": [
+      {
+        "id": "GENERATE_ID::ENVIRONMENT_0",
+        "model": "environment",
+        "name": "My Environment",
+        "variables": [
+          {
+            "enabled": true,
+            "description": null,
+            "name": "baseUrl",
+            "value": "https://api.example.com"
+          },
+          {
+            "enabled": true,
+            "description": "Access token for the API.",
+            "name": "token",
+            "value": "${[access_token]}"
+          },
+          {
+            "enabled": false,
+            "description": null,
+            "name": "disabled",
+            "value": "hello"
+          }
+        ],
+        "workspaceId": "CURRENT_WORKSPACE",
+        "parentId": null,
+        "parentModel": "environment"
+      }
+    ]
+  }
+}
--- a/plugins/importer-postman-environment/tests/index.test.ts
+++ b/plugins/importer-postman-environment/tests/index.test.ts
@@ -0,0 +1,22 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { describe, expect, test } from 'vitest';
+import { convertPostmanEnvironment } from '../src';
+
+describe('importer-postman-environment', () => {
+  const p = path.join(__dirname, 'fixtures');
+  const fixtures = fs.readdirSync(p);
+
+  for (const fixture of fixtures) {
+    if (fixture.includes('.output')) {
+      continue;
+    }
+
+    test('Imports ' + fixture, () => {
+      const contents = fs.readFileSync(path.join(p, fixture), 'utf-8');
+      const expected = fs.readFileSync(path.join(p, fixture.replace('.input', '.output')), 'utf-8');
+      const result = convertPostmanEnvironment(contents);
+      expect(result).toEqual(JSON.parse(expected));
+    });
+  }
+});
--- a/plugins/importer-postman-environment/tsconfig.json
+++ b/plugins/importer-postman-environment/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
--- a/plugins/importer-postman/src/index.ts
+++ b/plugins/importer-postman/src/index.ts
@@ -376,7 +376,7 @@ function toArray<T>(value: unknown): T[] {
 /** Recursively render all nested object properties */
 function convertTemplateSyntax<T>(obj: T): T {
  if (typeof obj === 'string') {
-    return obj.replace(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}') as T;
+    return obj.replace(/{{\s*(_\.)?([^}]*)\s*}}/g, (_m, _dot, expr) => '${[' + expr.trim() + ']}') as T;
  } else if (Array.isArray(obj) && obj != null) {
    return obj.map(convertTemplateSyntax) as T;
  } else if (typeof obj === 'object' && obj != null) {
--- a/plugins/template-function-fs/src/index.ts
+++ b/plugins/template-function-fs/src/index.ts
@@ -1,17 +1,39 @@
 import type { CallTemplateFunctionArgs, Context, PluginDefinition } from '@yaakapp/api';
 import fs from 'node:fs';

+const options = [
+  { label: 'ASCII', value: 'ascii' },
+  { label: 'UTF-8', value: 'utf8' },
+  { label: 'UTF-16 LE', value: 'utf16le' },
+  { label: 'Base64', value: 'base64' },
+  { label: 'Base64 URL-safe', value: 'base64url' },
+  { label: 'Latin-1', value: 'latin1' },
+  { label: 'Hexadecimal', value: 'hex' },
+];
 export const plugin: PluginDefinition = {
  templateFunctions: [
    {
      name: 'fs.readFile',
      description: 'Read the contents of a file as utf-8',
-      args: [{ title: 'Select File', type: 'file', name: 'path', label: 'File' }],
+      args: [
+        { title: 'Select File', type: 'file', name: 'path', label: 'File' },
+        {
+          title: 'Select encoding',
+          type: 'select',
+          name: 'encoding',
+          label: 'Encoding',
+          defaultValue: 'utf8',
+          description: 'Specifies how the file’s bytes are decoded into text when read',
+          options,
+        },
+      ],
      async onRender(_ctx: Context, args: CallTemplateFunctionArgs): Promise<string | null> {
-        if (!args.values.path) return null;
+        if (!args.values.path || !args.values.encoding) return null;

        try {
-          return fs.promises.readFile(String(args.values.path ?? ''), 'utf-8');
+          return fs.promises.readFile(String(args.values.path ?? ''), {
+            encoding: String(args.values.encoding ?? 'utf-8') as BufferEncoding,
+          });
        } catch {
          return null;
        }
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 4

-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -85,12 +76,6 @@ dependencies = [
 "alloc-no-stdlib",
 ]

-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_log-sys"
 version = "0.3.2"
@@ -428,21 +413,6 @@ dependencies = [
 "tower-service",
 ]

-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "base32"
 version = "0.5.1"
@@ -717,7 +687,7 @@ dependencies = [
 "semver",
 "serde",
 "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]

 [[package]]
@@ -816,17 +786,16 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "serde",
 "wasm-bindgen",
- "windows-link",
+ "windows-link 0.2.1",
 ]

 [[package]]
@@ -2002,12 +1971,6 @@ dependencies = [
 "wasm-bindgen",
 ]

-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
 [[package]]
 name = "gio"
 version = "0.18.4"
@@ -2405,7 +2368,7 @@ dependencies = [
 "libc",
 "percent-encoding",
 "pin-project-lite",
- "socket2",
+ "socket2 0.5.10",
 "system-configuration",
 "tokio",
 "tower-service",
@@ -3205,7 +3168,7 @@ dependencies = [
 "once_cell",
 "png",
 "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "windows-sys 0.59.0",
 ]

@@ -3628,15 +3591,6 @@ dependencies = [
 "objc2-security",
 ]

-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -3782,7 +3736,7 @@ dependencies = [
 "objc2-osa-kit",
 "serde",
 "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]

 [[package]]
@@ -4334,8 +4288,8 @@ dependencies = [
 "quinn-udp",
 "rustc-hash",
 "rustls",
- "socket2",
- "thiserror 2.0.12",
+ "socket2 0.5.10",
+ "thiserror 2.0.17",
 "tokio",
 "tracing",
 "web-time",
@@ -4356,7 +4310,7 @@ dependencies = [
 "rustls",
 "rustls-pki-types",
 "slab",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tinyvec",
 "tracing",
 "web-time",
@@ -4371,7 +4325,7 @@ dependencies = [
 "cfg_aliases",
 "libc",
 "once_cell",
- "socket2",
+ "socket2 0.5.10",
 "tracing",
 "windows-sys 0.59.0",
 ]
@@ -4552,7 +4506,7 @@ checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
 dependencies = [
 "getrandom 0.2.16",
 "libredox",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]

 [[package]]
@@ -4766,12 +4720,6 @@ dependencies = [
 "serde_json",
 ]

-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -4815,9 +4763,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "751e04a496ca00bb97a5e043158d23d66b5aabf2e1d5aa2a0aaebb1aafe6f82c"
 dependencies = [
 "once_cell",
 "ring",
@@ -4851,9 +4799,9 @@ dependencies = [

 [[package]]
 name = "rustls-platform-verifier"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda84358ed17f1f354cf4b1909ad346e6c7bc2513e8c40eb08e0157aa13a9070"
+checksum = "be59af91596cac372a6942530653ad0c3a246cdd491aaa9dcaee47f88d67d5a0"
 dependencies = [
 "core-foundation 0.10.1",
 "core-foundation-sys",
@@ -4878,9 +4826,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"

 [[package]]
 name = "rustls-webpki"
-version = "0.103.3"
+version = "0.103.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
 dependencies = [
 "ring",
 "rustls-pki-types",
@@ -4981,7 +4929,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.101",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]

 [[package]]
@@ -5065,9 +5013,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
 "serde_core",
 "serde_derive",
@@ -5107,18 +5055,18 @@ dependencies = [

 [[package]]
 name = "serde_core"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5138,14 +5086,15 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
 "itoa",
 "memchr",
 "ryu",
 "serde",
+ "serde_core",
 ]

 [[package]]
@@ -5392,6 +5341,16 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "softbuffer"
 version = "0.4.6"
@@ -5587,9 +5546,9 @@ dependencies = [

 [[package]]
 name = "tao"
-version = "0.34.3"
+version = "0.34.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "959469667dbcea91e5485fc48ba7dd6023face91bb0f1a14681a70f99847c3f7"
+checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7"
 dependencies = [
 "bitflags 2.9.1",
 "block2 0.6.1",
@@ -5661,9 +5620,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"

 [[package]]
 name = "tauri"
-version = "2.8.5"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d1d3b3dc4c101ac989fd7db77e045cc6d91a25349cd410455cb5c57d510c1c"
+checksum = "7f07c6590706b2fc0ab287b041cf5ce9c435b3850bdae5571e19d9d27584e89d"
 dependencies = [
 "anyhow",
 "bytes",
@@ -5701,7 +5660,7 @@ dependencies = [
 "tauri-runtime",
 "tauri-runtime-wry",
 "tauri-utils",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tokio",
 "tray-icon",
 "url",
@@ -5714,9 +5673,9 @@ dependencies = [

 [[package]]
 name = "tauri-build"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c432ccc9ff661803dab74c6cd78de11026a578a9307610bbc39d3c55be7943f"
+checksum = "f71be1f494b683ac439e6d61c16ab5c472c6f9c6ee78995b29556d9067c021a1"
 dependencies = [
 "anyhow",
 "cargo_toml",
@@ -5736,9 +5695,9 @@ dependencies = [

 [[package]]
 name = "tauri-codegen"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab3a62cf2e6253936a8b267c2e95839674e7439f104fa96ad0025e149d54d8a"
+checksum = "6c1fe64c74cc40f90848281a90058a6db931eb400b60205840e09801ee30f190"
 dependencies = [
 "base64 0.22.1",
 "brotli",
@@ -5754,7 +5713,7 @@ dependencies = [
 "sha2",
 "syn 2.0.101",
 "tauri-utils",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "time",
 "url",
 "uuid",
@@ -5763,9 +5722,9 @@ dependencies = [

 [[package]]
 name = "tauri-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4368ea8094e7045217edb690f493b55b30caf9f3e61f79b4c24b6db91f07995e"
+checksum = "260c5d2eb036b76206b9fca20b7be3614cfd21046c5396f7959e0e64a4b07f2f"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
@@ -5777,9 +5736,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9946a3cede302eac0c6eb6c6070ac47b1768e326092d32efbb91f21ed58d978f"
+checksum = "3d7ce9aab979296b2f91e6fbf154207c2e3512b12ddca0b24bfa0e0cde6b2976"
 dependencies = [
 "anyhow",
 "glob",
@@ -5804,7 +5763,7 @@ dependencies = [
 "serde_json",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]

 [[package]]
@@ -5821,7 +5780,7 @@ dependencies = [
 "tauri",
 "tauri-plugin",
 "tauri-utils",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tracing",
 "url",
 "windows-registry",
@@ -5842,7 +5801,7 @@ dependencies = [
 "tauri",
 "tauri-plugin",
 "tauri-plugin-fs",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "url",
 ]

@@ -5863,7 +5822,7 @@ dependencies = [
 "tauri",
 "tauri-plugin",
 "tauri-utils",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "toml 0.9.5",
 "url",
 ]
@@ -5886,7 +5845,7 @@ dependencies = [
 "swift-rs",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "time",
 ]

@@ -5906,7 +5865,7 @@ dependencies = [
 "serde_json",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "url",
 "windows",
 "zbus",
@@ -5927,7 +5886,7 @@ dependencies = [
 "sys-locale",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]

 [[package]]
@@ -5947,7 +5906,7 @@ dependencies = [
 "shared_child",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tokio",
 ]

@@ -5961,7 +5920,7 @@ dependencies = [
 "serde_json",
 "tauri",
 "tauri-plugin-deep-link",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tracing",
 "windows-sys 0.60.2",
 "zbus",
@@ -5991,7 +5950,7 @@ dependencies = [
 "tauri",
 "tauri-plugin",
 "tempfile",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "time",
 "tokio",
 "url",
@@ -6011,14 +5970,14 @@ dependencies = [
 "serde_json",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]

 [[package]]
 name = "tauri-runtime"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4cfc9ad45b487d3fded5a4731a567872a4812e9552e3964161b08edabf93846"
+checksum = "3367f0b47df90e9195cd9f04a56b0055a2cba45aa11923c6c253d748778176fc"
 dependencies = [
 "cookie",
 "dpi",
@@ -6032,7 +5991,7 @@ dependencies = [
 "serde",
 "serde_json",
 "tauri-utils",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "url",
 "webkit2gtk",
 "webview2-com",
@@ -6041,9 +6000,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime-wry"
-version = "2.8.1"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fe9d48bd122ff002064e88cfcd7027090d789c4302714e68fcccba0f4b7807"
+checksum = "80d91d29ca680c545364cf75ba2f2e3c7ea2ab6376bfa3be26b56fa2463a5b5e"
 dependencies = [
 "gtk",
 "http",
@@ -6068,9 +6027,9 @@ dependencies = [

 [[package]]
 name = "tauri-utils"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41a3852fdf9a4f8fbeaa63dc3e9a85284dd6ef7200751f0bd66ceee30c93f212"
+checksum = "f6b8bbe426abdbf52d050e52ed693130dbd68375b9ad82a3fb17efb4c8d85673"
 dependencies = [
 "anyhow",
 "brotli",
@@ -6096,7 +6055,7 @@ dependencies = [
 "serde_json",
 "serde_with",
 "swift-rs",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "toml 0.9.5",
 "url",
 "urlpattern",
@@ -6159,11 +6118,11 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.17",
 ]

 [[package]]
@@ -6179,9 +6138,9 @@ dependencies = [

 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -6268,27 +6227,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
 "bytes",
 "libc",
 "mio",
 "pin-project-lite",
 "signal-hook-registry",
- "socket2",
+ "socket2 0.6.1",
 "tokio-macros",
 "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -6478,7 +6436,7 @@ dependencies = [
 "percent-encoding",
 "pin-project",
 "prost",
- "socket2",
+ "socket2 0.5.10",
 "tokio",
 "tokio-stream",
 "tower 0.4.13",
@@ -6614,7 +6572,7 @@ dependencies = [
 "once_cell",
 "png",
 "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "windows-sys 0.59.0",
 ]

@@ -6645,21 +6603,21 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"

 [[package]]
 name = "ts-rs"
-version = "11.0.1"
+version = "11.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef1b7a6d914a34127ed8e1fa927eb7088903787bcded4fa3eef8f85ee1568be"
+checksum = "4994acea2522cd2b3b85c1d9529a55991e3ad5e25cdcd3de9d505972c4379424"
 dependencies = [
 "chrono",
 "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "ts-rs-macros",
 ]

 [[package]]
 name = "ts-rs-macros"
-version = "11.0.1"
+version = "11.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d4ed7b4c18cc150a6a0a1e9ea1ecfa688791220781af6e119f9599a8502a0a"
+checksum = "ee6ff59666c9cbaec3533964505d39154dc4e0a56151fdea30a09ed0301f62e2"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -6682,7 +6640,7 @@ dependencies = [
 "rustls",
 "rustls-pki-types",
 "sha1",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "utf-8",
 ]

@@ -7204,7 +7162,7 @@ version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c"
 dependencies = [
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "windows",
 "windows-core",
 ]
@@ -7270,7 +7228,7 @@ dependencies = [
 "windows-collections",
 "windows-core",
 "windows-future",
- "windows-link",
+ "windows-link 0.1.1",
 "windows-numerics",
 ]

@@ -7291,7 +7249,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
 "windows-implement",
 "windows-interface",
- "windows-link",
+ "windows-link 0.1.1",
 "windows-result",
 "windows-strings",
 ]
@@ -7303,7 +7261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
 "windows-core",
- "windows-link",
+ "windows-link 0.1.1",
 "windows-threading",
 ]

@@ -7335,6 +7293,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"

+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-numerics"
 version = "0.2.0"
@@ -7342,7 +7306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
 "windows-core",
- "windows-link",
+ "windows-link 0.1.1",
 ]

 [[package]]
@@ -7351,7 +7315,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3bab093bdd303a1240bb99b8aba8ea8a69ee19d34c9e2ef9594e708a4878820"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.1",
 "windows-result",
 "windows-strings",
 ]
@@ -7362,7 +7326,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.1",
 ]

 [[package]]
@@ -7371,7 +7335,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.1",
 ]

 [[package]]
@@ -7410,6 +7374,15 @@ dependencies = [
 "windows-targets 0.53.2",
 ]

+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -7478,7 +7451,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.1",
 ]

 [[package]]
@@ -7487,7 +7460,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e04a5c6627e310a23ad2358483286c7df260c964eb2d003d8efd6d0f4e79265c"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.1",
 ]

 [[package]]
@@ -7718,7 +7691,7 @@ dependencies = [
 "os_pipe",
 "rustix 0.38.44",
 "tempfile",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tree_magic_mini",
 "wayland-backend",
 "wayland-client",
@@ -7734,9 +7707,9 @@ checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"

 [[package]]
 name = "wry"
-version = "0.53.3"
+version = "0.53.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f0e9642a0d061f6236c54ccae64c2722a7879ad4ec7dff59bd376d446d8e90"
+checksum = "6d78ec082b80fa088569a970d043bb3050abaabf4454101d44514ee8d9a8c9f6"
 dependencies = [
 "base64 0.22.1",
 "block2 0.6.1",
@@ -7766,7 +7739,7 @@ dependencies = [
 "sha2",
 "soup3",
 "tao-macros",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "url",
 "webkit2gtk",
 "webkit2gtk-sys",
@@ -7865,7 +7838,7 @@ dependencies = [
 "tauri-plugin-single-instance",
 "tauri-plugin-updater",
 "tauri-plugin-window-state",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tokio",
 "tokio-stream",
 "ts-rs",
@@ -7894,7 +7867,7 @@ dependencies = [
 "reqwest",
 "serde",
 "tauri",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 ]

 [[package]]
@@ -7909,7 +7882,7 @@ dependencies = [
 "serde",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "yaak-models",
 ]

@@ -7921,7 +7894,7 @@ dependencies = [
 "serde",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "ts-rs",
 ]

@@ -7937,7 +7910,7 @@ dependencies = [
 "serde_yaml",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "ts-rs",
 "yaak-models",
 "yaak-sync",
@@ -7991,7 +7964,7 @@ dependencies = [
 "serde_json",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "ts-rs",
 "yaak-common",
 "yaak-models",
@@ -8030,9 +8003,9 @@ dependencies = [
 "tauri",
 "tauri-plugin",
 "tauri-plugin-dialog",
- "thiserror 2.0.12",
- "tokio",
+ "thiserror 2.0.17",
 "ts-rs",
+ "yaak-common",
 ]

 [[package]]
@@ -8057,7 +8030,7 @@ dependencies = [
 "tauri",
 "tauri-plugin",
 "tauri-plugin-shell",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tokio",
 "tokio-tungstenite",
 "ts-rs",
@@ -8091,7 +8064,7 @@ dependencies = [
 "sha1",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tokio",
 "ts-rs",
 "yaak-models",
@@ -8106,7 +8079,7 @@ dependencies = [
 "serde",
 "serde-wasm-bindgen",
 "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tokio",
 "ts-rs",
 "wasm-bindgen",
@@ -8124,7 +8097,7 @@ dependencies = [
 "serde_json",
 "tauri",
 "tauri-plugin",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "tokio",
 "tokio-tungstenite",
 "yaak-http",
@@ -8345,7 +8318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aed5f10c571472911e37d8f7601a8dfba52b4f7f73a344015291b82ab292faf6"
 dependencies = [
 "log",
- "thiserror 2.0.12",
+ "thiserror 2.0.17",
 "zip",
 ]

--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -37,7 +37,7 @@ updater = []
 license = ["yaak-license"]

 [build-dependencies]
-tauri-build = { version = "2.4.1", features = [] }
+tauri-build = { version = "2.5.0", features = [] }

 [target.'cfg(target_os = "linux")'.dependencies]
 openssl-sys = { version = "0.9.105", features = ["vendored"] } # For Ubuntu installation to work
@@ -89,23 +89,23 @@ yaak-templates = { workspace = true }
 yaak-ws = { path = "yaak-ws" }

 [workspace.dependencies]
-chrono = "0.4.41"
+chrono = "0.4.42"
 hex = "0.4.3"
 keyring = "3.6.3"
 reqwest = "0.12.20"
 reqwest_cookie_store = "0.8.0"
-rustls = { version = "0.23.27", default-features = false }
-rustls-platform-verifier = "0.6.0"
-serde = "1.0.219"
-serde_json = "1.0.140"
+rustls = { version = "0.23.33", default-features = false }
+rustls-platform-verifier = "0.6.1"
+serde = "1.0.228"
+serde_json = "1.0.145"
 sha2 = "0.10.9"
-tauri = "2.8.5"
-tauri-plugin = "2.4.0"
+tauri = "2.9.0"
+tauri-plugin = "2.5.0"
 tauri-plugin-dialog = "2.4.0"
 tauri-plugin-shell = "2.3.1"
-thiserror = "2.0.12"
-tokio = "1.45.1"
-ts-rs = "11.0.1"
+thiserror = "2.0.17"
+tokio = "1.48.0"
+ts-rs = "11.1.0"
 yaak-common = { path = "yaak-common" }
 yaak-crypto = { path = "yaak-crypto" }
 yaak-fonts = { path = "yaak-fonts" }
--- a/src-tauri/src/history.rs
+++ b/src-tauri/src/history.rs
@@ -1,48 +1,74 @@
+use chrono::{NaiveDateTime, Utc};
+use log::debug;
+use std::sync::OnceLock;
 use tauri::{AppHandle, Runtime};
 use yaak_models::query_manager::QueryManagerExt;
 use yaak_models::util::UpdateSource;

 const NAMESPACE: &str = "analytics";
 const NUM_LAUNCHES_KEY: &str = "num_launches";
+const LAST_VERSION_KEY: &str = "last_tracked_version";
+const PREV_VERSION_KEY: &str = "last_tracked_version_prev";
+const VERSION_SINCE_KEY: &str = "last_tracked_version_since";

-#[derive(Default, Debug)]
+#[derive(Default, Debug, Clone)]
 pub struct LaunchEventInfo {
    pub current_version: String,
    pub previous_version: String,
    pub launched_after_update: bool,
+    pub version_since: NaiveDateTime,
+    pub user_since: NaiveDateTime,
    pub num_launches: i32,
 }

-pub async fn store_launch_history<R: Runtime>(app_handle: &AppHandle<R>) -> LaunchEventInfo {
-    let last_tracked_version_key = "last_tracked_version";
+static LAUNCH_INFO: OnceLock<LaunchEventInfo> = OnceLock::new();

-    let mut info = LaunchEventInfo::default();
+pub fn get_or_upsert_launch_info<R: Runtime>(app_handle: &AppHandle<R>) -> &LaunchEventInfo {
+    LAUNCH_INFO.get_or_init(|| {
+        let now = Utc::now().naive_utc();
+        let mut info = LaunchEventInfo {
+            version_since: app_handle.db().get_key_value_dte(NAMESPACE, VERSION_SINCE_KEY, now),
+            current_version: app_handle.package_info().version.to_string(),
+            user_since: app_handle.db().get_settings().created_at,
+            num_launches: app_handle.db().get_key_value_int(NAMESPACE, NUM_LAUNCHES_KEY, 0) + 1,

-    info.num_launches = get_num_launches(app_handle).await + 1;
-    info.current_version = app_handle.package_info().version.to_string();
+            // The rest will be set below
+            ..Default::default()
+        };

-    app_handle
-        .with_tx(|tx| {
-            info.previous_version =
-                tx.get_key_value_string(NAMESPACE, last_tracked_version_key, "");
+        app_handle
+            .with_tx(|tx| {
+                // Load the previously tracked version
+                let curr_db = tx.get_key_value_str(NAMESPACE, LAST_VERSION_KEY, "");
+                let prev_db = tx.get_key_value_str(NAMESPACE, PREV_VERSION_KEY, "");

-            if !info.previous_version.is_empty() {
-                info.launched_after_update = info.current_version != info.previous_version;
-            };
+                // We just updated if the app version is different from the last tracked version we stored
+                if !curr_db.is_empty() && info.current_version != curr_db {
+                    info.launched_after_update = true;
+                }

-            // Update key values
+                // If we just updated, track the previous version as the "previous" current version
+                if info.launched_after_update {
+                    info.previous_version = curr_db.clone();
+                    info.version_since = now;
+                } else {
+                    info.previous_version = prev_db.clone();
+                }

-            let source = &UpdateSource::Background;
-            let version = info.current_version.as_str();
-            tx.set_key_value_string(NAMESPACE, last_tracked_version_key, version, source);
-            tx.set_key_value_int(NAMESPACE, NUM_LAUNCHES_KEY, info.num_launches, source);
-            Ok(())
-        })
-        .unwrap();
+                // Rotate stored versions: move previous into the "prev" slot before overwriting
+                let source = &UpdateSource::Background;

-    info
-}
-
-pub async fn get_num_launches<R: Runtime>(app_handle: &AppHandle<R>) -> i32 {
-    app_handle.db().get_key_value_int(NAMESPACE, NUM_LAUNCHES_KEY, 0)
+                tx.set_key_value_str(NAMESPACE, PREV_VERSION_KEY, &info.previous_version, source);
+                tx.set_key_value_str(NAMESPACE, LAST_VERSION_KEY, &info.current_version, source);
+                tx.set_key_value_dte(NAMESPACE, VERSION_SINCE_KEY, info.version_since, source);
+                tx.set_key_value_int(NAMESPACE, NUM_LAUNCHES_KEY, info.num_launches, source);
+
+                Ok(())
+            })
+            .unwrap();
+
+        debug!("Initialized launch info");
+
+        info
+    })
 }
--- a/src-tauri/src/import.rs
+++ b/src-tauri/src/import.rs
@@ -28,7 +28,7 @@ pub(crate) async fn import_data<R: Runtime>(
        .workspaces
        .into_iter()
        .map(|mut v| {
-            v.id = maybe_gen_id::<Workspace>(v.id.as_str(), &mut id_map);
+            v.id = maybe_gen_id::<Workspace, R>(window, v.id.as_str(), &mut id_map);
            v
        })
        .collect();
@@ -37,11 +37,12 @@ pub(crate) async fn import_data<R: Runtime>(
        .environments
        .into_iter()
        .map(|mut v| {
-            v.id = maybe_gen_id::<Environment>(v.id.as_str(), &mut id_map);
-            v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
+            v.id = maybe_gen_id::<Environment, R>(window, v.id.as_str(), &mut id_map);
+            v.workspace_id =
+                maybe_gen_id::<Workspace, R>(window, v.workspace_id.as_str(), &mut id_map);
            match (v.parent_model.as_str(), v.parent_id.clone().as_deref()) {
                ("folder", Some(parent_id)) => {
-                    v.parent_id = Some(maybe_gen_id::<Folder>(&parent_id, &mut id_map));
+                    v.parent_id = Some(maybe_gen_id::<Folder, R>(window, &parent_id, &mut id_map));
                }
                ("", _) => {
                    // Fix any empty ones
@@ -60,9 +61,10 @@ pub(crate) async fn import_data<R: Runtime>(
        .folders
        .into_iter()
        .map(|mut v| {
-            v.id = maybe_gen_id::<Folder>(v.id.as_str(), &mut id_map);
-            v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
-            v.folder_id = maybe_gen_id_opt::<Folder>(v.folder_id, &mut id_map);
+            v.id = maybe_gen_id::<Folder, R>(window, v.id.as_str(), &mut id_map);
+            v.workspace_id =
+                maybe_gen_id::<Workspace, R>(window, v.workspace_id.as_str(), &mut id_map);
+            v.folder_id = maybe_gen_id_opt::<Folder, R>(window, v.folder_id, &mut id_map);
            v
        })
        .collect();
@@ -71,9 +73,10 @@ pub(crate) async fn import_data<R: Runtime>(
        .http_requests
        .into_iter()
        .map(|mut v| {
-            v.id = maybe_gen_id::<HttpRequest>(v.id.as_str(), &mut id_map);
-            v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
-            v.folder_id = maybe_gen_id_opt::<Folder>(v.folder_id, &mut id_map);
+            v.id = maybe_gen_id::<HttpRequest, R>(window, v.id.as_str(), &mut id_map);
+            v.workspace_id =
+                maybe_gen_id::<Workspace, R>(window, v.workspace_id.as_str(), &mut id_map);
+            v.folder_id = maybe_gen_id_opt::<Folder, R>(window, v.folder_id, &mut id_map);
            v
        })
        .collect();
@@ -82,9 +85,10 @@ pub(crate) async fn import_data<R: Runtime>(
        .grpc_requests
        .into_iter()
        .map(|mut v| {
-            v.id = maybe_gen_id::<GrpcRequest>(v.id.as_str(), &mut id_map);
-            v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
-            v.folder_id = maybe_gen_id_opt::<Folder>(v.folder_id, &mut id_map);
+            v.id = maybe_gen_id::<GrpcRequest, R>(window, v.id.as_str(), &mut id_map);
+            v.workspace_id =
+                maybe_gen_id::<Workspace, R>(window, v.workspace_id.as_str(), &mut id_map);
+            v.folder_id = maybe_gen_id_opt::<Folder, R>(window, v.folder_id, &mut id_map);
            v
        })
        .collect();
@@ -93,9 +97,10 @@ pub(crate) async fn import_data<R: Runtime>(
        .websocket_requests
        .into_iter()
        .map(|mut v| {
-            v.id = maybe_gen_id::<WebsocketRequest>(v.id.as_str(), &mut id_map);
-            v.workspace_id = maybe_gen_id::<Workspace>(v.workspace_id.as_str(), &mut id_map);
-            v.folder_id = maybe_gen_id_opt::<Folder>(v.folder_id, &mut id_map);
+            v.id = maybe_gen_id::<WebsocketRequest, R>(window, v.id.as_str(), &mut id_map);
+            v.workspace_id =
+                maybe_gen_id::<Workspace, R>(window, v.workspace_id.as_str(), &mut id_map);
+            v.folder_id = maybe_gen_id_opt::<Folder, R>(window, v.folder_id, &mut id_map);
            v
        })
        .collect();
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1454,7 +1454,7 @@ pub fn run() {
                    let _ = window::create_main_window(app_handle, "/");
                    let h = app_handle.clone();
                    tauri::async_runtime::spawn(async move {
-                        let info = history::store_launch_history(&h).await;
+                        let info = history::get_or_upsert_launch_info(&h);
                        debug!("Launched Yaak {:?}", info);
                    });

--- a/src-tauri/src/notifications.rs
+++ b/src-tauri/src/notifications.rs
@@ -1,7 +1,7 @@
 use std::time::SystemTime;

 use crate::error::Result;
-use crate::history::get_num_launches;
+use crate::history::get_or_upsert_launch_info;
 use chrono::{DateTime, Utc};
 use log::debug;
 use reqwest::Method;
@@ -79,7 +79,7 @@ impl YaakNotifier {

        #[cfg(feature = "license")]
        let license_check = {
-            use yaak_license::{LicenseCheckStatus, check_license};
+            use yaak_license::{check_license, LicenseCheckStatus};
            match check_license(window).await {
                Ok(LicenseCheckStatus::PersonalUse { .. }) => "personal".to_string(),
                Ok(LicenseCheckStatus::CommercialUse) => "commercial".to_string(),
@@ -91,17 +91,17 @@ impl YaakNotifier {
        #[cfg(not(feature = "license"))]
        let license_check = "disabled".to_string();

-        let settings = window.db().get_settings();
-        let num_launches = get_num_launches(app_handle).await;
-        let info = app_handle.package_info().clone();
+        let launch_info = get_or_upsert_launch_info(app_handle);
        let req = yaak_api_client(app_handle)?
            .request(Method::GET, "https://notify.yaak.app/notifications")
            .query(&[
-                ("version", info.version.to_string().as_str()),
-                ("launches", num_launches.to_string().as_str()),
-                ("installed", settings.created_at.format("%Y-%m-%d").to_string().as_str()),
+                ("version", &launch_info.current_version),
+                ("version_prev", &launch_info.previous_version),
+                ("launches", &launch_info.num_launches.to_string()),
+                ("installed", &launch_info.user_since.format("%Y-%m-%d").to_string()),
                ("license", &license_check),
-                ("platform", get_os()),
+                ("updates", &get_updater_status(app_handle).to_string()),
+                ("platform", &get_os().to_string()),
            ]);
        let resp = req.send().await?;
        if resp.status() != 200 {
@@ -131,3 +131,32 @@ async fn get_kv<R: Runtime>(app_handle: &AppHandle<R>) -> Result<Vec<String>> {
        Some(v) => Ok(serde_json::from_str(&v.value)?),
    }
 }
+
+fn get_updater_status<R: Runtime>(app_handle: &AppHandle<R>) -> &'static str {
+    #[cfg(not(feature = "updater"))]
+    {
+        // Updater is not enabled as a Rust feature
+        return "missing";
+    }
+
+    #[cfg(all(feature = "updater", target_os = "linux"))]
+    {
+        let settings = app_handle.db().get_settings();
+        if !settings.autoupdate {
+            // Updates are explicitly disabled
+            "disabled"
+        } else if std::env::var("APPIMAGE").is_err() {
+            // Updates are enabled, but unsupported
+            "unsupported"
+        } else {
+            // Updates are enabled and supported
+            "enabled"
+        }
+    }
+
+    #[cfg(all(feature = "updater", not(target_os = "linux")))]
+    {
+        let settings = app_handle.db().get_settings();
+        if settings.autoupdate { "enabled" } else { "disabled" }
+    }
+}
--- a/src-tauri/tauri.release.conf.json
+++ b/src-tauri/tauri.release.conf.json
@@ -30,7 +30,7 @@
    }
  },
  "bundle": {
-    "createUpdaterArtifacts": "v1Compatible",
+    "createUpdaterArtifacts": true,
    "windows": {
      "signCommand": "trusted-signing-cli -e https://eus.codesigning.azure.net/ -a Yaak -c yaakapp %1"
    }
--- a/src-tauri/yaak-license/src/license.rs
+++ b/src-tauri/yaak-license/src/license.rs
@@ -88,7 +88,7 @@ pub async fn activate_license<R: Runtime>(
    }

    let body: ActivateLicenseResponsePayload = response.json().await?;
-    window.app_handle().db().set_key_value_string(
+    window.app_handle().db().set_key_value_str(
        KV_ACTIVATION_ID_KEY,
        KV_NAMESPACE,
        body.activation_id.as_str(),
@@ -207,5 +207,5 @@ fn build_url(path: &str) -> String {
 }

 pub async fn get_activation_id<R: Runtime>(app_handle: &AppHandle<R>) -> String {
-    app_handle.db().get_key_value_string(KV_ACTIVATION_ID_KEY, KV_NAMESPACE, "")
+    app_handle.db().get_key_value_str(KV_ACTIVATION_ID_KEY, KV_NAMESPACE, "")
 }
--- a/src-tauri/yaak-models/Cargo.toml
+++ b/src-tauri/yaak-models/Cargo.toml
@@ -22,8 +22,8 @@ sha2 = { workspace = true }
 tauri = { workspace = true }
 tauri-plugin-dialog = { workspace = true }
 thiserror = { workspace = true }
-tokio = { workspace = true }
 ts-rs = { workspace = true, features = ["chrono-impl", "serde-json-impl"] }
+yaak-common = { workspace = true }

 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
--- a/src-tauri/yaak-models/src/queries/key_values.rs
+++ b/src-tauri/yaak-models/src/queries/key_values.rs
@@ -1,3 +1,4 @@
+use chrono::NaiveDateTime;
 use crate::db_context::DbContext;
 use crate::error::Result;
 use crate::models::{KeyValue, KeyValueIden, UpsertModelInfo};
@@ -22,7 +23,7 @@ impl<'a> DbContext<'a> {
        Ok(items.map(|v| v.unwrap()).collect())
    }

-    pub fn get_key_value_string(&self, namespace: &str, key: &str, default: &str) -> String {
+    pub fn get_key_value_str(&self, namespace: &str, key: &str, default: &str) -> String {
        match self.get_key_value_raw(namespace, key) {
            None => default.to_string(),
            Some(v) => {
@@ -38,6 +39,22 @@ impl<'a> DbContext<'a> {
        }
    }

+    pub fn get_key_value_dte(&self, namespace: &str, key: &str, default: NaiveDateTime) -> NaiveDateTime {
+        match self.get_key_value_raw(namespace, key) {
+            None => default,
+            Some(v) => {
+                let result = serde_json::from_str(&v.value);
+                match result {
+                    Ok(v) => v,
+                    Err(e) => {
+                        error!("Failed to parse date key value: {}", e);
+                        default
+                    }
+                }
+            }
+        }
+    }
+
    pub fn get_key_value_int(&self, namespace: &str, key: &str, default: i32) -> i32 {
        match self.get_key_value_raw(namespace, key) {
            None => default.clone(),
@@ -67,7 +84,18 @@ impl<'a> DbContext<'a> {
        self.conn.resolve().query_row(sql.as_str(), &*params.as_params(), KeyValue::from_row).ok()
    }

-    pub fn set_key_value_string(
+    pub fn set_key_value_dte(
+        &self,
+        namespace: &str,
+        key: &str,
+        value: NaiveDateTime,
+        source: &UpdateSource,
+    ) -> (KeyValue, bool) {
+        let encoded = serde_json::to_string(&value).unwrap();
+        self.set_key_value_raw(namespace, key, &encoded, source)
+    }
+
+    pub fn set_key_value_str(
        &self,
        namespace: &str,
        key: &str,
--- a/src-tauri/yaak-models/src/util.rs
+++ b/src-tauri/yaak-models/src/util.rs
@@ -3,6 +3,7 @@ use crate::models::{
    AnyModel, Environment, Folder, GrpcRequest, HttpRequest, UpsertModelInfo, WebsocketRequest,
    Workspace, WorkspaceIden,
 };
+use yaak_common::window::WorkspaceWindowTrait;
 use crate::query_manager::QueryManagerExt;
 use chrono::{NaiveDateTime, Utc};
 use log::warn;
@@ -158,7 +159,17 @@ pub fn get_workspace_export_resources<R: Runtime>(
    Ok(data)
 }

-pub fn maybe_gen_id<M: UpsertModelInfo>(id: &str, ids: &mut BTreeMap<String, String>) -> String {
+pub fn maybe_gen_id<M: UpsertModelInfo, R: Runtime>(
+    window: &WebviewWindow<R>,
+    id: &str,
+    ids: &mut BTreeMap<String, String>,
+) -> String {
+    if id == "CURRENT_WORKSPACE" {
+        if let Some(wid) = window.workspace_id() {
+            return wid.to_string();
+        }
+    }
+
    if !id.starts_with("GENERATE_ID::") {
        return id.to_string();
    }
@@ -173,12 +184,13 @@ pub fn maybe_gen_id<M: UpsertModelInfo>(id: &str, ids: &mut BTreeMap<String, Str
    }
 }

-pub fn maybe_gen_id_opt<M: UpsertModelInfo>(
+pub fn maybe_gen_id_opt<M: UpsertModelInfo, R: Runtime>(
+    window: &WebviewWindow<R>,
    id: Option<String>,
    ids: &mut BTreeMap<String, String>,
 ) -> Option<String> {
    match id {
-        Some(id) => Some(maybe_gen_id::<M>(id.as_str(), ids)),
+        Some(id) => Some(maybe_gen_id::<M, R>(window, id.as_str(), ids)),
        None => None,
    }
 }
--- a/src-tauri/yaak-plugins/src/api.rs
+++ b/src-tauri/yaak-plugins/src/api.rs
@@ -6,7 +6,7 @@ use reqwest::{Response, Url};
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::str::FromStr;
-use tauri::{AppHandle, Runtime, is_dev};
+use tauri::{AppHandle, Runtime};
 use ts_rs::TS;
 use yaak_common::api_client::yaak_api_client;
 use yaak_models::query_manager::QueryManagerExt;
@@ -96,11 +96,7 @@ pub async fn search_plugins<R: Runtime>(
 }

 fn build_url(path: &str) -> Url {
-    let base_url = if is_dev() {
-        "http://localhost:9444/api/v1/plugins"
-    } else {
-        "https://api.yaak.app/api/v1/plugins"
-    };
+    let base_url = "https://api.yaak.app/api/v1/plugins";
    Url::from_str(&format!("{base_url}{path}")).unwrap()
 }

--- a/src-tauri/yaak-plugins/src/manager.rs
+++ b/src-tauri/yaak-plugins/src/manager.rs
@@ -503,10 +503,22 @@ impl PluginManager {
            .iter()
            .find(|r| r.functions.iter().any(|f| f.name == fn_name))
            .ok_or_else(|| PluginNotFoundErr(fn_name.into()))?;
-        let plugin = self
-            .get_plugin_by_ref_id(&r.plugin_ref_id)
-            .await
-            .ok_or_else(|| PluginNotFoundErr(r.plugin_ref_id.clone()))?;
+
+        let plugin = match self.get_plugin_by_ref_id(&r.plugin_ref_id).await {
+            None => {
+                // It's probably a native function, so just fallback to the summary
+                let function = r
+                    .functions
+                    .iter()
+                    .find(|f| f.name == fn_name)
+                    .ok_or_else(|| PluginNotFoundErr(fn_name.into()))?;
+                return Ok(GetTemplateFunctionConfigResponse {
+                    function: function.clone(),
+                    plugin_ref_id: r.plugin_ref_id.clone(),
+                });
+            }
+            Some(v) => v,
+        };

        let window_context = &PluginWindowContext::new(&window);
        let vars = &make_vars_hashmap(environment_chain);
--- a/src-tauri/yaak-plugins/src/native_template_functions.rs
+++ b/src-tauri/yaak-plugins/src/native_template_functions.rs
@@ -78,6 +78,10 @@ pub fn template_function_secure_run<R: Runtime>(
                _ => return Ok("".to_string()),
            };

+            if value.is_empty() {
+                return Ok("".to_string());
+            }
+
            let value = match value.strip_prefix("YENC_") {
                None => {
                    return Err(RenderError("Could not decrypt non-encrypted value".to_string()));
--- a/src-web/components/DropMarker.tsx
+++ b/src-web/components/DropMarker.tsx
@@ -1,14 +1,17 @@
 import classNames from 'classnames';
+import type { CSSProperties} from 'react';
 import React, { memo } from 'react';

 interface Props {
  className?: string;
+  style?: CSSProperties;
 }

 export const DropMarker = memo(
-  function DropMarker({ className }: Props) {
+  function DropMarker({ className, style }: Props) {
    return (
      <div
+        style={style}
        className={classNames(
          className,
          'relative w-full h-0 overflow-visible pointer-events-none',
--- a/src-web/components/DynamicForm.tsx
+++ b/src-web/components/DynamicForm.tsx
@@ -21,7 +21,7 @@ import { resolvedModelName } from '../lib/resolvedModelName';
 import { Banner } from './core/Banner';
 import { Checkbox } from './core/Checkbox';
 import { DetailsBanner } from './core/DetailsBanner';
-import { Editor } from './core/Editor/Editor';
+import { Editor } from './core/Editor/LazyEditor';
 import { IconButton } from './core/IconButton';
 import { Input } from './core/Input';
 import { Label } from './core/Label';
--- a/src-web/components/GrpcEditor.tsx
+++ b/src-web/components/GrpcEditor.tsx
@@ -17,7 +17,7 @@ import { showDialog } from '../lib/dialog';
 import { pluralizeCount } from '../lib/pluralize';
 import { Button } from './core/Button';
 import type { EditorProps } from './core/Editor/Editor';
-import { Editor } from './core/Editor/Editor';
+import { Editor } from './core/Editor/LazyEditor';
 import { FormattedError } from './core/FormattedError';
 import { InlineCode } from './core/InlineCode';
 import { VStack } from './core/Stacks';
--- a/src-web/components/GrpcProtoSelectionDialog.tsx
+++ b/src-web/components/GrpcProtoSelectionDialog.tsx
@@ -60,7 +60,7 @@ function GrpcProtoSelectionDialogWithRequest({ request }: Props & { request: Grp
            await grpc.reflect.refetch();
          }}
        >
-          Add Files
+          Add Proto Files
        </Button>
        <Button
          variant="border"
@@ -76,7 +76,7 @@ function GrpcProtoSelectionDialogWithRequest({ request }: Props & { request: Grp
            await grpc.reflect.refetch();
          }}
        >
-          Add Directories
+          Add Import Folders
        </Button>
        <Button
          isLoading={grpc.reflect.isFetching}
--- a/src-web/components/GrpcResponsePane.tsx
+++ b/src-web/components/GrpcResponsePane.tsx
@@ -15,7 +15,7 @@ import { copyToClipboard } from '../lib/copy';
 import { AutoScroller } from './core/AutoScroller';
 import { Banner } from './core/Banner';
 import { Button } from './core/Button';
-import { Editor } from './core/Editor/Editor';
+import { Editor } from './core/Editor/LazyEditor';
 import { HotKeyList } from './core/HotKeyList';
 import { Icon } from './core/Icon';
 import { IconButton } from './core/IconButton';
--- a/src-web/components/HeadersEditor.tsx
+++ b/src-web/components/HeadersEditor.tsx
@@ -53,9 +53,6 @@ export function HeadersEditor({
                disabled
                disableDrag
                className="py-1"
-                onChange={() => {}}
-                onEnd={() => {}}
-                onMove={() => {}}
                pair={ensurePairId(pair)}
                stateKey={null}
                nameAutocompleteFunctions
--- a/src-web/components/HttpRequestPane.tsx
+++ b/src-web/components/HttpRequestPane.tsx
@@ -4,7 +4,7 @@ import type { GenericCompletionOption } from '@yaakapp-internal/plugins';
 import classNames from 'classnames';
 import { atom, useAtomValue } from 'jotai';
 import type { CSSProperties } from 'react';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { lazy, Suspense, useCallback, useMemo, useState } from 'react';
 import { activeRequestIdAtom } from '../hooks/useActiveRequestId';
 import { allRequestsAtom } from '../hooks/useAllRequests';
 import { useAuthTab } from '../hooks/useAuthTab';
@@ -37,7 +37,7 @@ import { showToast } from '../lib/toast';
 import { BinaryFileEditor } from './BinaryFileEditor';
 import { ConfirmLargeRequestBody } from './ConfirmLargeRequestBody';
 import { CountBadge } from './core/CountBadge';
-import { Editor } from './core/Editor/Editor';
+import { Editor } from './core/Editor/LazyEditor';
 import type { GenericCompletionConfig } from './core/Editor/genericCompletion';
 import { InlineCode } from './core/InlineCode';
 import type { Pair } from './core/PairEditor';
@@ -53,7 +53,10 @@ import { MarkdownEditor } from './MarkdownEditor';
 import { RequestMethodDropdown } from './RequestMethodDropdown';
 import { UrlBar } from './UrlBar';
 import { UrlParametersEditor } from './UrlParameterEditor';
-import { GraphQLEditor } from './graphql/GraphQLEditor';
+
+const GraphQLEditor = lazy(() =>
+  import('./graphql/GraphQLEditor').then((m) => ({ default: m.GraphQLEditor })),
+);

 interface Props {
  style: CSSProperties;
@@ -405,12 +408,14 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
                    stateKey={`xml.${activeRequest.id}`}
                  />
                ) : activeRequest.bodyType === BODY_TYPE_GRAPHQL ? (
-                  <GraphQLEditor
-                    forceUpdateKey={forceUpdateKey}
-                    baseRequest={activeRequest}
-                    request={activeRequest}
-                    onChange={handleBodyChange}
-                  />
+                  <Suspense>
+                    <GraphQLEditor
+                      forceUpdateKey={forceUpdateKey}
+                      baseRequest={activeRequest}
+                      request={activeRequest}
+                      onChange={handleBodyChange}
+                    />
+                  </Suspense>
                ) : activeRequest.bodyType === BODY_TYPE_FORM_URLENCODED ? (
                  <FormUrlencodedEditor
                    forceUpdateKey={forceUpdateKey}
--- a/src-web/components/HttpResponsePane.tsx
+++ b/src-web/components/HttpResponsePane.tsx
@@ -1,7 +1,7 @@
 import type { HttpResponse } from '@yaakapp-internal/models';
 import classNames from 'classnames';
-import type { CSSProperties, ReactNode } from 'react';
-import React, { useCallback, useMemo } from 'react';
+import type { ComponentType, CSSProperties } from 'react';
+import React, { lazy, Suspense, useCallback, useMemo } from 'react';
 import { useLocalStorage } from 'react-use';
 import { useCancelHttpResponse } from '../hooks/useCancelHttpResponse';
 import { usePinnedHttpResponse } from '../hooks/usePinnedHttpResponse';
@@ -10,16 +10,18 @@ import { getMimeTypeFromContentType } from '../lib/contentType';
 import { getContentTypeFromHeaders } from '../lib/model_util';
 import { ConfirmLargeResponse } from './ConfirmLargeResponse';
 import { Banner } from './core/Banner';
+import { Button } from './core/Button';
 import { CountBadge } from './core/CountBadge';
-import { HttpResponseDurationTag } from './core/HttpResponseDurationTag';
 import { HotKeyList } from './core/HotKeyList';
+import { HttpResponseDurationTag } from './core/HttpResponseDurationTag';
+import { HttpStatusTag } from './core/HttpStatusTag';
 import { LoadingIcon } from './core/LoadingIcon';
 import { SizeTag } from './core/SizeTag';
 import { HStack, VStack } from './core/Stacks';
-import { HttpStatusTag } from './core/HttpStatusTag';
-import type { TabItem } from './core/Tabs/Tabs';
-import { TabContent, Tabs } from './core/Tabs/Tabs';
+import type { TabItem} from './core/Tabs/Tabs';
+import { Tabs , TabContent} from './core/Tabs/Tabs';
 import { EmptyStateText } from './EmptyStateText';
+import { ErrorBoundary } from './ErrorBoundary';
 import { RecentHttpResponsesDropdown } from './RecentHttpResponsesDropdown';
 import { ResponseHeaders } from './ResponseHeaders';
 import { ResponseInfo } from './ResponseInfo';
@@ -28,11 +30,12 @@ import { CsvViewer } from './responseViewers/CsvViewer';
 import { EventStreamViewer } from './responseViewers/EventStreamViewer';
 import { HTMLOrTextViewer } from './responseViewers/HTMLOrTextViewer';
 import { ImageViewer } from './responseViewers/ImageViewer';
-import { PdfViewer } from './responseViewers/PdfViewer';
 import { SvgViewer } from './responseViewers/SvgViewer';
 import { VideoViewer } from './responseViewers/VideoViewer';
-import { ErrorBoundary } from './ErrorBoundary';
-import { Button } from './core/Button';
+
+const PdfViewer = lazy(() =>
+  import('./responseViewers/PdfViewer').then((m) => ({ default: m.PdfViewer })),
+);

 interface Props {
  style?: CSSProperties;
@@ -106,9 +109,7 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
      )}
    >
      {activeResponse == null ? (
-        <HotKeyList
-          hotkeys={['request.send', 'model.create', 'sidebar.focus', 'url_bar.focus']}
-        />
+        <HotKeyList hotkeys={['request.send', 'model.create', 'sidebar.focus', 'url_bar.focus']} />
      ) : (
        <div className="h-full w-full grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1">
          <HStack
@@ -161,41 +162,46 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
            >
              <TabContent value={TAB_BODY}>
                <ErrorBoundary name="Http Response Viewer">
-                  <ConfirmLargeResponse response={activeResponse}>
-                    {activeResponse.state === 'initialized' ? (
-                      <EmptyStateText>
-                        <VStack space={3}>
-                          <HStack space={3}>
-                            <LoadingIcon className="text-text-subtlest" />
-                            Sending Request
-                          </HStack>
-                          <Button size="sm" variant="border" onClick={() => cancel.mutate()}>Cancel</Button>
-                        </VStack>
-                      </EmptyStateText>
-                    ) : activeResponse.state === 'closed' && activeResponse.contentLength === 0 ? (
-                      <EmptyStateText>Empty </EmptyStateText>
-                    ) : mimeType?.match(/^text\/event-stream/i) && viewMode === 'pretty' ? (
-                      <EventStreamViewer response={activeResponse} />
-                    ) : mimeType?.match(/^image\/svg/) ? (
-                      <SvgViewer response={activeResponse} />
-                    ) : mimeType?.match(/^image/i) ? (
-                      <EnsureCompleteResponse response={activeResponse} render={ImageViewer} />
-                    ) : mimeType?.match(/^audio/i) ? (
-                      <EnsureCompleteResponse response={activeResponse} render={AudioViewer} />
-                    ) : mimeType?.match(/^video/i) ? (
-                      <EnsureCompleteResponse response={activeResponse} render={VideoViewer} />
-                    ) : mimeType?.match(/pdf/i) ? (
-                      <EnsureCompleteResponse response={activeResponse} render={PdfViewer} />
-                    ) : mimeType?.match(/csv|tab-separated/i) ? (
-                      <CsvViewer className="pb-2" response={activeResponse} />
-                    ) : (
-                      <HTMLOrTextViewer
-                        textViewerClassName="-mr-2 bg-surface" // Pull to the right
-                        response={activeResponse}
-                        pretty={viewMode === 'pretty'}
-                      />
-                    )}
-                  </ConfirmLargeResponse>
+                  <Suspense>
+                    <ConfirmLargeResponse response={activeResponse}>
+                      {activeResponse.state === 'initialized' ? (
+                        <EmptyStateText>
+                          <VStack space={3}>
+                            <HStack space={3}>
+                              <LoadingIcon className="text-text-subtlest" />
+                              Sending Request
+                            </HStack>
+                            <Button size="sm" variant="border" onClick={() => cancel.mutate()}>
+                              Cancel
+                            </Button>
+                          </VStack>
+                        </EmptyStateText>
+                      ) : activeResponse.state === 'closed' &&
+                        activeResponse.contentLength === 0 ? (
+                        <EmptyStateText>Empty </EmptyStateText>
+                      ) : mimeType?.match(/^text\/event-stream/i) && viewMode === 'pretty' ? (
+                        <EventStreamViewer response={activeResponse} />
+                      ) : mimeType?.match(/^image\/svg/) ? (
+                        <SvgViewer response={activeResponse} />
+                      ) : mimeType?.match(/^image/i) ? (
+                        <EnsureCompleteResponse response={activeResponse} Component={ImageViewer} />
+                      ) : mimeType?.match(/^audio/i) ? (
+                        <EnsureCompleteResponse response={activeResponse} Component={AudioViewer} />
+                      ) : mimeType?.match(/^video/i) ? (
+                        <EnsureCompleteResponse response={activeResponse} Component={VideoViewer} />
+                      ) : mimeType?.match(/pdf/i) ? (
+                        <EnsureCompleteResponse response={activeResponse} Component={PdfViewer} />
+                      ) : mimeType?.match(/csv|tab-separated/i) ? (
+                        <CsvViewer className="pb-2" response={activeResponse} />
+                      ) : (
+                        <HTMLOrTextViewer
+                          textViewerClassName="-mr-2 bg-surface" // Pull to the right
+                          response={activeResponse}
+                          pretty={viewMode === 'pretty'}
+                        />
+                      )}
+                    </ConfirmLargeResponse>
+                  </Suspense>
                </ErrorBoundary>
              </TabContent>
              <TabContent value={TAB_HEADERS}>
@@ -214,10 +220,10 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {

 function EnsureCompleteResponse({
  response,
-  render,
+  Component,
 }: {
  response: HttpResponse;
-  render: (v: { bodyPath: string }) => ReactNode;
+  Component: ComponentType<{ bodyPath: string }>;
 }) {
  if (response.bodyPath === null) {
    return <div>Empty response body</div>;
@@ -232,5 +238,5 @@ function EnsureCompleteResponse({
    );
  }

-  return render({ bodyPath: response.bodyPath });
+  return <Component bodyPath={response.bodyPath} />;
 }
--- a/src-web/components/MarkdownEditor.tsx
+++ b/src-web/components/MarkdownEditor.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { useRef, useState } from 'react';
 import type { EditorProps } from './core/Editor/Editor';
-import { Editor } from './core/Editor/Editor';
+import { Editor } from './core/Editor/LazyEditor';
 import { SegmentedControl } from './core/SegmentedControl';
 import { Markdown } from './Markdown';

--- a/src-web/components/NewSidebar.tsx
+++ b/src-web/components/NewSidebar.tsx
@@ -18,15 +18,16 @@ import {
 import classNames from 'classnames';
 import { atom, useAtomValue } from 'jotai';
 import { selectAtom } from 'jotai/utils';
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import { moveToWorkspace } from '../commands/moveToWorkspace';
 import { openFolderSettings } from '../commands/openFolderSettings';
 import { activeCookieJarAtom } from '../hooks/useActiveCookieJar';
 import { activeEnvironmentAtom } from '../hooks/useActiveEnvironment';
 import { activeFolderIdAtom } from '../hooks/useActiveFolderId';
 import { activeRequestIdAtom } from '../hooks/useActiveRequestId';
-import { activeWorkspaceAtom } from '../hooks/useActiveWorkspace';
+import { activeWorkspaceAtom, activeWorkspaceIdAtom } from '../hooks/useActiveWorkspace';
 import { allRequestsAtom } from '../hooks/useAllRequests';
+import { getCreateDropdownItems } from '../hooks/useCreateDropdownItems';
 import { getGrpcRequestActions } from '../hooks/useGrpcRequestActions';
 import { useHotKey } from '../hooks/useHotKey';
 import { getHttpRequestActions } from '../hooks/useHttpRequestActions';
@@ -52,74 +53,9 @@ import { Tree } from './core/tree/Tree';
 import type { TreeItemProps } from './core/tree/TreeItem';
 import { GitDropdown } from './GitDropdown';

-type Model = Workspace | Folder | HttpRequest | GrpcRequest | WebsocketRequest;
+type SidebarModel = Workspace | Folder | HttpRequest | GrpcRequest | WebsocketRequest;

-const opacitySubtle = 'opacity-80';
-
-function getItemKey(item: Model) {
-  const responses = jotaiStore.get(httpResponsesAtom);
-  const latestResponse = responses.find((r) => r.requestId === item.id) ?? null;
-  const url = 'url' in item ? item.url : 'n/a';
-  const method = 'method' in item ? item.method : 'n/a';
-  return [
-    item.id,
-    item.name,
-    url,
-    method,
-    latestResponse?.elapsed,
-    latestResponse?.id ?? 'n/a',
-  ].join('::');
-}
-
-function SidebarLeftSlot({ treeId, item }: { treeId: string; item: Model }) {
-  if (item.model === 'folder') {
-    return <Icon icon="folder" />;
-  } else if (item.model === 'workspace') {
-    return null;
-  } else {
-    const isSelected = jotaiStore.get(isSelectedFamily({ treeId, itemId: item.id }));
-    return (
-      <HttpMethodTag
-        short
-        className={classNames('text-xs', !isSelected && opacitySubtle)}
-        request={item}
-      />
-    );
-  }
-}
-
-function SidebarInnerItem({ item }: { treeId: string; item: Model }) {
-  const response = useAtomValue(
-    useMemo(
-      () =>
-        selectAtom(
-          atom((get) => [
-            ...get(grpcConnectionsAtom),
-            ...get(httpResponsesAtom),
-            ...get(websocketConnectionsAtom),
-          ]),
-          (responses) => responses.find((r) => r.requestId === item.id),
-          (a, b) => a?.state === b?.state && a?.id === b?.id, // Only update when the response state changes updated
-        ),
-      [item.id],
-    ),
-  );
-
-  return (
-    <div className="flex items-center gap-2 min-w-0 h-full w-full text-left">
-      <div className="truncate">{resolvedModelName(item)}</div>
-      {response != null && (
-        <div className="ml-auto">
-          {response.state !== 'closed' ? (
-            <LoadingIcon size="sm" className="text-text-subtlest" />
-          ) : response.model === 'http_response' ? (
-            <HttpStatusTag short className="text-xs" response={response} />
-          ) : null}
-        </div>
-      )}
-    </div>
-  );
-}
+const OPACITY_SUBTLE = 'opacity-80';

 function NewSidebar({ className }: { className?: string }) {
  const [hidden, setHidden] = useSidebarHidden();
@@ -155,13 +91,13 @@ function NewSidebar({ className }: { className?: string }) {
    children,
    insertAt,
  }: {
-    items: Model[];
-    parent: Model;
-    children: Model[];
+    items: SidebarModel[];
+    parent: SidebarModel;
+    children: SidebarModel[];
    insertAt: number;
  }) {
-    const prev = children[insertAt - 1] as Exclude<Model, Workspace>;
-    const next = children[insertAt] as Exclude<Model, Workspace>;
+    const prev = children[insertAt - 1] as Exclude<SidebarModel, Workspace>;
+    const next = children[insertAt] as Exclude<SidebarModel, Workspace>;
    const folderId = parent.model === 'folder' ? parent.id : null;

    const beforePriority = prev?.sortPriority ?? 0;
@@ -242,8 +178,8 @@ const activeIdAtom = atom<string | null>((get) => {
 });

 function getEditOptions(
-  item: Model,
-): ReturnType<NonNullable<TreeItemProps<Model>['getEditOptions']>> {
+  item: SidebarModel,
+): ReturnType<NonNullable<TreeItemProps<SidebarModel>['getEditOptions']>> {
  return {
    onChange: handleSubmitEdit,
    defaultValue: resolvedModelName(item),
@@ -251,18 +187,18 @@ function getEditOptions(
  };
 }

-async function handleSubmitEdit(item: Model, text: string) {
+async function handleSubmitEdit(item: SidebarModel, text: string) {
  await patchModel(item, { name: text });
 }

-function handleActivate(item: Model) {
+function handleActivate(item: SidebarModel) {
  // TODO: Add folder layout support
  if (item.model !== 'folder' && item.model !== 'workspace') {
    navigateToRequestOrFolderOrWorkspace(item.id, item.model);
  }
 }

-const allPotentialChildrenAtom = atom<Model[]>((get) => {
+const allPotentialChildrenAtom = atom<SidebarModel[]>((get) => {
  const requests = get(allRequestsAtom);
  const folders = get(foldersAtom);
  return [...requests, ...folders];
@@ -274,7 +210,7 @@ const sidebarTreeAtom = atom((get) => {
  const allModels = get(memoAllPotentialChildrenAtom);
  const activeWorkspace = get(activeWorkspaceAtom);

-  const childrenMap: Record<string, Exclude<Model, Workspace>[]> = {};
+  const childrenMap: Record<string, Exclude<SidebarModel, Workspace>[]> = {};
  for (const item of allModels) {
    if ('folderId' in item && item.folderId == null) {
      childrenMap[item.workspaceId] = childrenMap[item.workspaceId] ?? [];
@@ -285,14 +221,14 @@ const sidebarTreeAtom = atom((get) => {
    }
  }

-  const treeParentMap: Record<string, TreeNode<Model>> = {};
+  const treeParentMap: Record<string, TreeNode<SidebarModel>> = {};

  if (activeWorkspace == null) {
    return null;
  }

  // Put requests and folders into a tree structure
-  const next = (node: TreeNode<Model>): TreeNode<Model> => {
+  const next = (node: TreeNode<SidebarModel>, depth: number): TreeNode<SidebarModel> => {
    const childItems = childrenMap[node.item.id] ?? [];

    // Recurse to children
@@ -301,25 +237,29 @@ const sidebarTreeAtom = atom((get) => {
      node.children = node.children ?? [];
      for (const item of childItems) {
        treeParentMap[item.id] = node;
-        node.children.push(next({ item, parent: node }));
+        node.children.push(next({ item, parent: node, depth }, depth + 1));
      }
    }

    return node;
  };

-  return next({
-    item: activeWorkspace,
-    children: [],
-    parent: null,
-  });
+  return next(
+    {
+      item: activeWorkspace,
+      children: [],
+      parent: null,
+      depth: 0,
+    },
+    1,
+  );
 });

 const actions = {
-  'sidebar.delete_selected_item': async function (items: Model[]) {
+  'sidebar.delete_selected_item': async function (items: SidebarModel[]) {
    await deleteModelWithConfirm(items);
  },
-  'model.duplicate': async function (items: Model[]) {
+  'model.duplicate': async function (items: SidebarModel[]) {
    if (items.length === 1) {
      const item = items[0]!;
      const newId = await duplicateModel(item);
@@ -328,22 +268,29 @@ const actions = {
      await Promise.all(items.map(duplicateModel));
    }
  },
-  'request.send': async function (items: Model[]) {
+  'request.send': async function (items: SidebarModel[]) {
    await Promise.all(
      items.filter((i) => i.model === 'http_request').map((i) => sendAnyHttpRequest.mutate(i.id)),
    );
  },
 } as const;

-const hotkeys: TreeProps<Model>['hotkeys'] = {
+const hotkeys: TreeProps<SidebarModel>['hotkeys'] = {
  priority: 10, // So these ones take precedence over global hotkeys when the sidebar is focused
  actions,
  enable: () => isSidebarFocused(),
 };

-async function getContextMenu(items: Model[]): Promise<DropdownItem[]> {
+async function getContextMenu(items: SidebarModel[]): Promise<DropdownItem[]> {
+  const workspaceId = jotaiStore.get(activeWorkspaceIdAtom);
  const child = items[0];
-  if (child == null) return [];
+
+  // No children means we're in the root
+  if (child == null) {
+    console.log('HELLO', child);
+    return getCreateDropdownItems({ workspaceId, activeRequest: null, folderId: null });
+  }
+
  const workspaces = jotaiStore.get(workspacesAtom);
  const onlyHttpRequests = items.every((i) => i.model === 'http_request');

@@ -401,7 +348,13 @@ async function getContextMenu(items: Model[]): Promise<DropdownItem[]> {
      },
    })),
  ];
-
+  const modelCreationItems: DropdownItem[] =
+    items.length === 1 && child.model === 'folder'
+      ? [
+          { type: 'separator' },
+          ...getCreateDropdownItems({ workspaceId, activeRequest: null, folderId: child.id }),
+        ]
+      : [];
  const menuItems: ContextMenuProps['items'] = [
    ...initialItems,
    { type: 'separator', hidden: initialItems.filter((v) => !v.hidden).length === 0 },
@@ -445,6 +398,83 @@ async function getContextMenu(items: Model[]): Promise<DropdownItem[]> {
      leftSlot: <Icon icon="trash" />,
      onSelect: () => actions['sidebar.delete_selected_item'](items),
    },
+    ...modelCreationItems,
  ];
  return menuItems;
 }
+
+function getItemKey(item: SidebarModel) {
+  const responses = jotaiStore.get(httpResponsesAtom);
+  const latestResponse = responses.find((r) => r.requestId === item.id) ?? null;
+  const url = 'url' in item ? item.url : 'n/a';
+  const method = 'method' in item ? item.method : 'n/a';
+  return [
+    item.id,
+    item.name,
+    url,
+    method,
+    latestResponse?.elapsed,
+    latestResponse?.id ?? 'n/a',
+  ].join('::');
+}
+
+const SidebarLeftSlot = memo(function SidebarLeftSlot({
+  treeId,
+  item,
+}: {
+  treeId: string;
+  item: SidebarModel;
+}) {
+  if (item.model === 'folder') {
+    return <Icon icon="folder" />;
+  } else if (item.model === 'workspace') {
+    return null;
+  } else {
+    const isSelected = jotaiStore.get(isSelectedFamily({ treeId, itemId: item.id }));
+    return (
+      <HttpMethodTag
+        short
+        className={classNames('text-xs', !isSelected && OPACITY_SUBTLE)}
+        request={item}
+      />
+    );
+  }
+});
+
+const SidebarInnerItem = memo(function SidebarInnerItem({
+  item,
+}: {
+  treeId: string;
+  item: SidebarModel;
+}) {
+  const response = useAtomValue(
+    useMemo(
+      () =>
+        selectAtom(
+          atom((get) => [
+            ...get(grpcConnectionsAtom),
+            ...get(httpResponsesAtom),
+            ...get(websocketConnectionsAtom),
+          ]),
+          (responses) => responses.find((r) => r.requestId === item.id),
+          (a, b) => a?.state === b?.state && a?.id === b?.id, // Only update when the response state changes updated
+        ),
+      [item.id],
+    ),
+  );
+
+  return (
+    <div className="flex items-center gap-2 min-w-0 h-full w-full text-left">
+      <div className="truncate">{resolvedModelName(item)}</div>
+      {response != null && (
+        <div className="ml-auto">
+          {response.state !== 'closed' ? (
+            <LoadingIcon size="sm" className="text-text-subtlest" />
+          ) : response.model === 'http_response' ? (
+            <HttpStatusTag short className="text-xs" response={response} />
+          ) : null}
+        </div>
+      )}
+    </div>
+  );
+});
--- a/src-web/components/Settings/SettingsPlugins.tsx
+++ b/src-web/components/Settings/SettingsPlugins.tsx
@@ -44,7 +44,6 @@ export function SettingsPlugins() {
        label="Plugins"
        onChangeValue={setTab}
        addBorders
-        tabListClassName="!-ml-3"
        tabs={[
          { label: 'Discover', value: 'search' },
          {
@@ -243,7 +242,7 @@ function PluginSearch() {
          defaultValue={query}
        />
      </HStack>
-      <div className="w-full h-full">
+      <div className="w-full h-full overflow-y-auto">
        {results.data == null ? (
          <EmptyStateText>
            <LoadingIcon size="xl" className="text-text-subtlest" />
--- a/src-web/components/Settings/SettingsTheme.tsx
+++ b/src-web/components/Settings/SettingsTheme.tsx
@@ -1,11 +1,10 @@
 import { patchModel, settingsAtom } from '@yaakapp-internal/models';
 import { useAtomValue } from 'jotai';
-import React from 'react';
+import React, { lazy, Suspense } from 'react';
 import { activeWorkspaceAtom } from '../../hooks/useActiveWorkspace';
 import { useResolvedAppearance } from '../../hooks/useResolvedAppearance';
 import { useResolvedTheme } from '../../hooks/useResolvedTheme';
 import type { ButtonProps } from '../core/Button';
-import { Editor } from '../core/Editor/Editor';
 import type { IconProps } from '../core/Icon';
 import { Icon } from '../core/Icon';
 import { IconButton } from '../core/IconButton';
@@ -13,6 +12,8 @@ import type { SelectProps } from '../core/Select';
 import { Select } from '../core/Select';
 import { HStack, VStack } from '../core/Stacks';

+const Editor = lazy(() => import('../core/Editor/Editor').then((m) => ({ default: m.Editor })));
+
 const buttonColors: ButtonProps['color'][] = [
  'primary',
  'info',
@@ -144,17 +145,19 @@ export function SettingsTheme() {
            />
          ))}
        </HStack>
-        <Editor
-          defaultValue={[
-            'let foo = { // Demo code editor',
-            '  foo: ("bar" || "baz" ?? \'qux\'),',
-            '  baz: [1, 10.2, null, false, true],',
-            '};',
-          ].join('\n')}
-          heightMode="auto"
-          language="javascript"
-          stateKey={null}
-        />
+        <Suspense>
+          <Editor
+            defaultValue={[
+              'let foo = { // Demo code editor',
+              '  foo: ("bar" || "baz" ?? \'qux\'),',
+              '  baz: [1, 10.2, null, false, true],',
+              '};',
+            ].join('\n')}
+            heightMode="auto"
+            language="javascript"
+            stateKey={null}
+          />
+        </Suspense>
      </VStack>
    </VStack>
  );
--- a/src-web/components/WebsocketRequestPane.tsx
+++ b/src-web/components/WebsocketRequestPane.tsx
@@ -25,7 +25,7 @@ import { generateId } from '../lib/generateId';
 import { prepareImportQuerystring } from '../lib/prepareImportQuerystring';
 import { resolvedModelName } from '../lib/resolvedModelName';
 import { CountBadge } from './core/CountBadge';
-import { Editor } from './core/Editor/Editor';
+import { Editor } from './core/Editor/LazyEditor';
 import type { GenericCompletionConfig } from './core/Editor/genericCompletion';
 import { IconButton } from './core/IconButton';
 import type { Pair } from './core/PairEditor';
--- a/src-web/components/WebsocketResponsePane.tsx
+++ b/src-web/components/WebsocketResponsePane.tsx
@@ -17,7 +17,7 @@ import { copyToClipboard } from '../lib/copy';
 import { AutoScroller } from './core/AutoScroller';
 import { Banner } from './core/Banner';
 import { Button } from './core/Button';
-import { Editor } from './core/Editor/Editor';
+import { Editor } from './core/Editor/LazyEditor';
 import { HotKeyList } from './core/HotKeyList';
 import { Icon } from './core/Icon';
 import { IconButton } from './core/IconButton';
--- a/src-web/components/core/BulkPairEditor.tsx
+++ b/src-web/components/core/BulkPairEditor.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useMemo } from 'react';
 import { generateId } from '../../lib/generateId';
-import { Editor } from './Editor/Editor';
+import { Editor } from './Editor/LazyEditor';
 import type { Pair, PairEditorProps, PairWithId } from './PairEditor';

 type Props = PairEditorProps;
--- a/src-web/components/core/Editor/Editor.css
+++ b/src-web/components/core/Editor/Editor.css
@@ -19,6 +19,11 @@
      @apply text-surface !important;
    }

+    /* Matching bracket */
+    .cm-matchingBracket {
+      @apply bg-transparent border-b border-b-text-subtle;
+    }
+
    &:not(.cm-focused) {
      .cm-cursor, .cm-fat-cursor {
        @apply hidden;
--- a/src-web/components/core/Editor/LazyEditor.tsx
+++ b/src-web/components/core/Editor/LazyEditor.tsx
@@ -0,0 +1,13 @@
+import type { EditorView } from '@codemirror/view';
+import { forwardRef, lazy, Suspense } from 'react';
+import type { EditorProps } from './Editor';
+
+const Editor_ = lazy(() => import('./Editor').then((m) => ({ default: m.Editor })));
+
+export const Editor = forwardRef<EditorView, EditorProps>(function LazyEditor(props, ref) {
+  return (
+    <Suspense>
+      <Editor_ ref={ref} {...props} />
+    </Suspense>
+  );
+});
--- a/src-web/components/core/Editor/extensions.ts
+++ b/src-web/components/core/Editor/extensions.ts
@@ -10,7 +10,7 @@ import { json } from '@codemirror/lang-json';
 import { markdown } from '@codemirror/lang-markdown';
 import { xml } from '@codemirror/lang-xml';
 import type { LanguageSupport } from '@codemirror/language';
-import {
+import  { bracketMatching ,
  codeFolding,
  foldGutter,
  foldKeymap,
@@ -258,6 +258,7 @@ export const multiLineExtensions = ({ hideGutter }: { hideGutter?: boolean }) =>
  indentOnInput(),
  rectangularSelection(),
  crosshairCursor(),
+  bracketMatching(),
  highlightActiveLineGutter(),
  keymap.of([...searchKeymap, ...foldKeymap, ...lintKeymap]),
 ];
--- a/src-web/components/core/HttpMethodTag.tsx
+++ b/src-web/components/core/HttpMethodTag.tsx
@@ -2,6 +2,7 @@ import type { GrpcRequest, HttpRequest, WebsocketRequest } from '@yaakapp-intern
 import { settingsAtom } from '@yaakapp-internal/models';
 import classNames from 'classnames';
 import { useAtomValue } from 'jotai';
+import { memo } from 'react';

 interface Props {
  request: HttpRequest | GrpcRequest | WebsocketRequest;
@@ -23,7 +24,7 @@ const methodNames: Record<string, string> = {
  websocket: 'WS',
 };

-export function HttpMethodTag({ request, className, short }: Props) {
+export const HttpMethodTag = memo(function HttpMethodTag({ request, className, short }: Props) {
  const settings = useAtomValue(settingsAtom);
  const method =
    request.model === 'http_request' && request.bodyType === 'graphql'
@@ -42,9 +43,9 @@ export function HttpMethodTag({ request, className, short }: Props) {
      short={short}
    />
  );
-}
+});

-export function HttpMethodTagRaw({
+function HttpMethodTagRaw({
  className,
  method,
  colored,
--- a/src-web/components/core/Icon.tsx
+++ b/src-web/components/core/Icon.tsx
@@ -1,125 +1,245 @@
 import type { Color } from '@yaakapp-internal/plugins';
 import classNames from 'classnames';
-import * as lucide from 'lucide-react';
-import type { HTMLAttributes } from 'react';
+import {
+  AlertTriangleIcon,
+  ArchiveIcon,
+  ArrowBigDownDashIcon,
+  ArrowBigLeftDashIcon,
+  ArrowBigRightDashIcon,
+  ArrowBigRightIcon,
+  ArrowBigUpDashIcon,
+  ArrowDownIcon,
+  ArrowDownToDotIcon,
+  ArrowDownToLineIcon,
+  ArrowRightCircleIcon,
+  ArrowUpDownIcon,
+  ArrowUpFromDotIcon,
+  ArrowUpFromLineIcon,
+  ArrowUpIcon,
+  BadgeCheckIcon,
+  BookOpenText,
+  BoxIcon,
+  CakeIcon,
+  CheckCircleIcon,
+  CheckIcon,
+  ChevronDownIcon,
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  CircleAlertIcon,
+  CircleDashedIcon,
+  CircleDollarSignIcon,
+  CircleFadingArrowUpIcon,
+  CircleHelpIcon,
+  ClipboardPasteIcon,
+  ClockIcon,
+  CodeIcon,
+  Columns2Icon,
+  CommandIcon,
+  CookieIcon,
+  CopyCheck,
+  CopyIcon,
+  CornerRightUpIcon,
+  CreditCardIcon,
+  DotIcon,
+  DownloadIcon,
+  EllipsisIcon,
+  ExpandIcon,
+  ExternalLinkIcon,
+  EyeIcon,
+  EyeOffIcon,
+  FileCodeIcon,
+  FileTextIcon,
+  FilterIcon,
+  FlameIcon,
+  FlaskConicalIcon,
+  FolderCodeIcon,
+  FolderCogIcon,
+  FolderGitIcon,
+  FolderIcon,
+  FolderInputIcon,
+  FolderOpenIcon,
+  FolderOutputIcon,
+  FolderSymlinkIcon,
+  FolderSyncIcon,
+  FolderUpIcon,
+  GitBranchIcon,
+  GitBranchPlusIcon,
+  GitCommitIcon,
+  GitCommitVerticalIcon,
+  GitForkIcon,
+  GitPullRequestIcon,
+  GripVerticalIcon,
+  HandIcon,
+  HistoryIcon,
+  HomeIcon,
+  ImportIcon,
+  InfoIcon,
+  KeyboardIcon,
+  KeyRoundIcon,
+  LockIcon,
+  LockOpenIcon,
+  MergeIcon,
+  MessageSquare,
+  MinusCircleIcon,
+  MinusIcon,
+  MoonIcon,
+  MoreVerticalIcon,
+  PaletteIcon,
+  PanelLeftCloseIcon,
+  PanelLeftOpenIcon,
+  PencilIcon,
+  PinIcon,
+  PinOffIcon,
+  Plug,
+  PlusCircleIcon,
+  PlusIcon,
+  PuzzleIcon,
+  RefreshCcwIcon,
+  RefreshCwIcon,
+  RocketIcon,
+  Rows2Icon,
+  SaveIcon,
+  SearchIcon,
+  SendHorizonalIcon,
+  SettingsIcon,
+  ShieldAlertIcon,
+  ShieldCheckIcon,
+  ShieldIcon,
+  ShieldOffIcon,
+  SparklesIcon,
+  SquareCheckIcon,
+  SquareIcon,
+  SquareTerminalIcon,
+  SunIcon,
+  TableIcon,
+  Trash2Icon,
+  UploadIcon,
+  VariableIcon,
+  Wand2Icon,
+  WrenchIcon,
+  XIcon,
+} from 'lucide-react';
+import type { CSSProperties, HTMLAttributes } from 'react';
 import { memo } from 'react';

 const icons = {
-  alert_triangle: lucide.AlertTriangleIcon,
-  archive: lucide.ArchiveIcon,
-  arrow_big_down_dash: lucide.ArrowBigDownDashIcon,
-  arrow_big_left_dash: lucide.ArrowBigLeftDashIcon,
-  arrow_big_right: lucide.ArrowBigRightIcon,
-  arrow_big_right_dash: lucide.ArrowBigRightDashIcon,
-  arrow_big_up_dash: lucide.ArrowBigUpDashIcon,
-  arrow_down: lucide.ArrowDownIcon,
-  arrow_down_to_dot: lucide.ArrowDownToDotIcon,
-  arrow_down_to_line: lucide.ArrowDownToLineIcon,
-  arrow_right_circle: lucide.ArrowRightCircleIcon,
-  arrow_up: lucide.ArrowUpIcon,
-  arrow_up_down: lucide.ArrowUpDownIcon,
-  arrow_up_from_dot: lucide.ArrowUpFromDotIcon,
-  arrow_up_from_line: lucide.ArrowUpFromLineIcon,
-  badge_check: lucide.BadgeCheckIcon,
-  book_open_text: lucide.BookOpenText,
-  box: lucide.BoxIcon,
-  cake: lucide.CakeIcon,
-  chat: lucide.MessageSquare,
-  check: lucide.CheckIcon,
-  check_circle: lucide.CheckCircleIcon,
-  check_square_checked: lucide.SquareCheckIcon,
-  check_square_unchecked: lucide.SquareIcon,
-  chevron_down: lucide.ChevronDownIcon,
-  chevron_left: lucide.ChevronLeftIcon,
-  chevron_right: lucide.ChevronRightIcon,
-  circle_alert: lucide.CircleAlertIcon,
-  circle_dollar_sign: lucide.CircleDollarSignIcon,
-  circle_fading_arrow_up: lucide.CircleFadingArrowUpIcon,
-  clock: lucide.ClockIcon,
-  code: lucide.CodeIcon,
-  columns_2: lucide.Columns2Icon,
-  command: lucide.CommandIcon,
-  corner_right_up: lucide.CornerRightUpIcon,
-  credit_card: lucide.CreditCardIcon,
-  cookie: lucide.CookieIcon,
-  copy: lucide.CopyIcon,
-  copy_check: lucide.CopyCheck,
-  download: lucide.DownloadIcon,
-  ellipsis: lucide.EllipsisIcon,
-  expand: lucide.ExpandIcon,
-  external_link: lucide.ExternalLinkIcon,
-  eye: lucide.EyeIcon,
-  eye_closed: lucide.EyeOffIcon,
-  file_code: lucide.FileCodeIcon,
-  filter: lucide.FilterIcon,
-  flame: lucide.FlameIcon,
-  flask: lucide.FlaskConicalIcon,
-  folder: lucide.FolderIcon,
-  folder_cog: lucide.FolderCogIcon,
-  folder_code: lucide.FolderCodeIcon,
-  folder_git: lucide.FolderGitIcon,
-  folder_input: lucide.FolderInputIcon,
-  folder_open: lucide.FolderOpenIcon,
-  folder_output: lucide.FolderOutputIcon,
-  folder_symlink: lucide.FolderSymlinkIcon,
-  folder_sync: lucide.FolderSyncIcon,
-  folder_up: lucide.FolderUpIcon,
-  git_branch: lucide.GitBranchIcon,
-  git_branch_plus: lucide.GitBranchPlusIcon,
-  git_commit: lucide.GitCommitIcon,
-  git_commit_vertical: lucide.GitCommitVerticalIcon,
-  git_fork: lucide.GitForkIcon,
-  git_pull_request: lucide.GitPullRequestIcon,
-  grip_vertical: lucide.GripVerticalIcon,
-  hand: lucide.HandIcon,
-  help: lucide.CircleHelpIcon,
-  history: lucide.HistoryIcon,
-  house: lucide.HomeIcon,
-  import: lucide.ImportIcon,
-  info: lucide.InfoIcon,
-  key_round: lucide.KeyRoundIcon,
-  keyboard: lucide.KeyboardIcon,
-  left_panel_hidden: lucide.PanelLeftOpenIcon,
-  left_panel_visible: lucide.PanelLeftCloseIcon,
-  lock: lucide.LockIcon,
-  lock_open: lucide.LockOpenIcon,
-  magic_wand: lucide.Wand2Icon,
-  merge: lucide.MergeIcon,
-  minus: lucide.MinusIcon,
-  minus_circle: lucide.MinusCircleIcon,
-  moon: lucide.MoonIcon,
-  more_vertical: lucide.MoreVerticalIcon,
-  palette: lucide.PaletteIcon,
-  paste: lucide.ClipboardPasteIcon,
-  pencil: lucide.PencilIcon,
-  pin: lucide.PinIcon,
-  plug: lucide.Plug,
-  plus: lucide.PlusIcon,
-  plus_circle: lucide.PlusCircleIcon,
-  puzzle: lucide.PuzzleIcon,
-  refresh: lucide.RefreshCwIcon,
-  rocket: lucide.RocketIcon,
-  rows_2: lucide.Rows2Icon,
-  save: lucide.SaveIcon,
-  search: lucide.SearchIcon,
-  send_horizontal: lucide.SendHorizonalIcon,
-  settings: lucide.SettingsIcon,
-  shield: lucide.ShieldIcon,
-  shield_check: lucide.ShieldCheckIcon,
-  shield_off: lucide.ShieldOffIcon,
-  sparkles: lucide.SparklesIcon,
-  square_terminal: lucide.SquareTerminalIcon,
-  sun: lucide.SunIcon,
-  table: lucide.TableIcon,
-  text: lucide.FileTextIcon,
-  trash: lucide.Trash2Icon,
-  unpin: lucide.PinOffIcon,
-  update: lucide.RefreshCcwIcon,
-  upload: lucide.UploadIcon,
-  variable: lucide.VariableIcon,
-  wrench: lucide.WrenchIcon,
-  x: lucide.XIcon,
-  _unknown: lucide.ShieldAlertIcon,
+  alert_triangle: AlertTriangleIcon,
+  archive: ArchiveIcon,
+  arrow_big_down_dash: ArrowBigDownDashIcon,
+  arrow_big_left_dash: ArrowBigLeftDashIcon,
+  arrow_big_right: ArrowBigRightIcon,
+  arrow_big_right_dash: ArrowBigRightDashIcon,
+  arrow_big_up_dash: ArrowBigUpDashIcon,
+  arrow_down: ArrowDownIcon,
+  arrow_down_to_dot: ArrowDownToDotIcon,
+  arrow_down_to_line: ArrowDownToLineIcon,
+  arrow_right_circle: ArrowRightCircleIcon,
+  arrow_up: ArrowUpIcon,
+  arrow_up_down: ArrowUpDownIcon,
+  arrow_up_from_dot: ArrowUpFromDotIcon,
+  arrow_up_from_line: ArrowUpFromLineIcon,
+  badge_check: BadgeCheckIcon,
+  book_open_text: BookOpenText,
+  box: BoxIcon,
+  cake: CakeIcon,
+  chat: MessageSquare,
+  check: CheckIcon,
+  check_circle: CheckCircleIcon,
+  check_square_checked: SquareCheckIcon,
+  check_square_unchecked: SquareIcon,
+  chevron_down: ChevronDownIcon,
+  chevron_left: ChevronLeftIcon,
+  chevron_right: ChevronRightIcon,
+  circle_alert: CircleAlertIcon,
+  circle_dashed: CircleDashedIcon,
+  circle_dollar_sign: CircleDollarSignIcon,
+  circle_fading_arrow_up: CircleFadingArrowUpIcon,
+  clock: ClockIcon,
+  code: CodeIcon,
+  columns_2: Columns2Icon,
+  command: CommandIcon,
+  cookie: CookieIcon,
+  copy: CopyIcon,
+  copy_check: CopyCheck,
+  corner_right_up: CornerRightUpIcon,
+  credit_card: CreditCardIcon,
+  dot: DotIcon,
+  download: DownloadIcon,
+  ellipsis: EllipsisIcon,
+  expand: ExpandIcon,
+  external_link: ExternalLinkIcon,
+  eye: EyeIcon,
+  eye_closed: EyeOffIcon,
+  file_code: FileCodeIcon,
+  filter: FilterIcon,
+  flame: FlameIcon,
+  flask: FlaskConicalIcon,
+  folder: FolderIcon,
+  folder_code: FolderCodeIcon,
+  folder_cog: FolderCogIcon,
+  folder_git: FolderGitIcon,
+  folder_input: FolderInputIcon,
+  folder_open: FolderOpenIcon,
+  folder_output: FolderOutputIcon,
+  folder_symlink: FolderSymlinkIcon,
+  folder_sync: FolderSyncIcon,
+  folder_up: FolderUpIcon,
+  git_branch: GitBranchIcon,
+  git_branch_plus: GitBranchPlusIcon,
+  git_commit: GitCommitIcon,
+  git_commit_vertical: GitCommitVerticalIcon,
+  git_fork: GitForkIcon,
+  git_pull_request: GitPullRequestIcon,
+  grip_vertical: GripVerticalIcon,
+  hand: HandIcon,
+  help: CircleHelpIcon,
+  history: HistoryIcon,
+  house: HomeIcon,
+  import: ImportIcon,
+  info: InfoIcon,
+  key_round: KeyRoundIcon,
+  keyboard: KeyboardIcon,
+  left_panel_hidden: PanelLeftOpenIcon,
+  left_panel_visible: PanelLeftCloseIcon,
+  lock: LockIcon,
+  lock_open: LockOpenIcon,
+  magic_wand: Wand2Icon,
+  merge: MergeIcon,
+  minus: MinusIcon,
+  minus_circle: MinusCircleIcon,
+  moon: MoonIcon,
+  more_vertical: MoreVerticalIcon,
+  palette: PaletteIcon,
+  paste: ClipboardPasteIcon,
+  pencil: PencilIcon,
+  pin: PinIcon,
+  plug: Plug,
+  plus: PlusIcon,
+  plus_circle: PlusCircleIcon,
+  puzzle: PuzzleIcon,
+  refresh: RefreshCwIcon,
+  rocket: RocketIcon,
+  rows_2: Rows2Icon,
+  save: SaveIcon,
+  search: SearchIcon,
+  send_horizontal: SendHorizonalIcon,
+  settings: SettingsIcon,
+  shield: ShieldIcon,
+  shield_check: ShieldCheckIcon,
+  shield_off: ShieldOffIcon,
+  sparkles: SparklesIcon,
+  square_terminal: SquareTerminalIcon,
+  sun: SunIcon,
+  table: TableIcon,
+  text: FileTextIcon,
+  trash: Trash2Icon,
+  unpin: PinOffIcon,
+  update: RefreshCcwIcon,
+  upload: UploadIcon,
+  variable: VariableIcon,
+  wrench: WrenchIcon,
+  x: XIcon,
+  _unknown: ShieldAlertIcon,

  empty: (props: HTMLAttributes<HTMLSpanElement>) => <div {...props} />,
 };
@@ -127,6 +247,7 @@ const icons = {
 export interface IconProps {
  icon: keyof typeof icons;
  className?: string;
+  style?: CSSProperties;
  size?: '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl';
  spin?: boolean;
  title?: string;
@@ -138,12 +259,14 @@ export const Icon = memo(function Icon({
  color = 'default',
  spin,
  size = 'md',
+  style,
  className,
  title,
 }: IconProps) {
  const Component = icons[icon] ?? icons._unknown;
  return (
    <Component
+      style={style}
      title={title}
      className={classNames(
        className,
--- a/src-web/components/core/Input.tsx
+++ b/src-web/components/core/Input.tsx
@@ -1,4 +1,3 @@
-import { EditorSelection } from '@codemirror/state';
 import type { EditorView } from '@codemirror/view';
 import type { Color } from '@yaakapp-internal/plugins';
 import classNames from 'classnames';
@@ -30,7 +29,7 @@ import { Button } from './Button';
 import type { DropdownItem } from './Dropdown';
 import { Dropdown } from './Dropdown';
 import type { EditorProps } from './Editor/Editor';
-import { Editor } from './Editor/Editor';
+import { Editor } from './Editor/LazyEditor';
 import type { IconProps } from './Icon';
 import { Icon } from './Icon';
 import { IconButton } from './IconButton';
@@ -161,11 +160,12 @@ const BaseInput = forwardRef<EditorView, InputProps>(function InputBase(
    onFocus?.();
  }, [onFocus, readOnly]);

-  const handleBlur = useCallback(() => {
+  const handleBlur = useCallback(async () => {
    setFocused(false);
    // Move selection to the end on blur
+    const anchor = editorRef.current?.state.doc.length ?? 0;
    editorRef.current?.dispatch({
-      selection: EditorSelection.single(editorRef.current.state.doc.length ),
+      selection: { anchor, head: anchor },
    });
    onBlur?.();
  }, [onBlur]);
--- a/src-web/components/core/PairEditor.tsx
+++ b/src-web/components/core/PairEditor.tsx
@@ -1,4 +1,15 @@
 import type { EditorView } from '@codemirror/view';
+import type { DragEndEvent, DragMoveEvent, DragStartEvent } from '@dnd-kit/core';
+import {
+  DndContext,
+  DragOverlay,
+  PointerSensor,
+  pointerWithin,
+  useDraggable,
+  useDroppable,
+  useSensor,
+  useSensors,
+} from '@dnd-kit/core';
 import classNames from 'classnames';
 import {
  forwardRef,
@@ -10,13 +21,12 @@ import {
  useRef,
  useState,
 } from 'react';
-import type { XYCoord } from 'react-dnd';
-import { useDrag, useDrop } from 'react-dnd';
 import type { WrappedEnvironmentVariable } from '../../hooks/useEnvironmentVariables';
 import { useRandomKey } from '../../hooks/useRandomKey';
 import { useToggle } from '../../hooks/useToggle';
 import { languageFromContentType } from '../../lib/contentType';
 import { showDialog } from '../../lib/dialog';
+import { computeSideForDragMove } from '../../lib/dnd';
 import { showPrompt } from '../../lib/prompt';
 import { DropMarker } from '../DropMarker';
 import { SelectFile } from '../SelectFile';
@@ -25,8 +35,8 @@ import { Checkbox } from './Checkbox';
 import type { DropdownItem } from './Dropdown';
 import { Dropdown } from './Dropdown';
 import type { EditorProps } from './Editor/Editor';
-import { Editor } from './Editor/Editor';
 import type { GenericCompletionConfig } from './Editor/genericCompletion';
+import { Editor } from './Editor/LazyEditor';
 import { Icon } from './Icon';
 import { IconButton } from './IconButton';
 import type { InputProps } from './Input';
@@ -108,6 +118,7 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
  const [forceFocusNamePairId, setForceFocusNamePairId] = useState<string | null>(null);
  const [forceFocusValuePairId, setForceFocusValuePairId] = useState<string | null>(null);
  const [hoveredIndex, setHoveredIndex] = useState<number | null>(null);
+  const [isDragging, setIsDragging] = useState<PairWithId | null>(null);
  const [pairs, setPairs] = useState<PairWithId[]>([]);
  const [showAll, toggleShowAll] = useToggle(false);
  // NOTE: Use local force update key because we trigger an effect on forceUpdateKey change. If
@@ -158,33 +169,6 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
    [onChange],
  );

-  const handleMove = useCallback<PairEditorRowProps['onMove']>(
-    (id, side) => {
-      const dragIndex = pairs.findIndex((r) => r.id === id);
-      setHoveredIndex(side === 'above' ? dragIndex : dragIndex + 1);
-    },
-    [pairs],
-  );
-
-  const handleEnd = useCallback<PairEditorRowProps['onEnd']>(
-    (id: string) => {
-      if (hoveredIndex === null) return;
-      setHoveredIndex(null);
-
-      setPairsAndSave((pairs) => {
-        const index = pairs.findIndex((p) => p.id === id);
-        const pair = pairs[index];
-        if (pair === undefined) return pairs;
-
-        const newPairs = pairs.filter((p) => p.id !== id);
-        if (hoveredIndex > index) newPairs.splice(hoveredIndex - 1, 0, pair);
-        else newPairs.splice(hoveredIndex, 0, pair);
-        return newPairs;
-      });
-    },
-    [hoveredIndex, setPairsAndSave],
-  );
-
  const handleChange = useCallback(
    (pair: PairWithId) =>
      setPairsAndSave((pairs) => pairs.map((p) => (pair.id !== p.id ? p : pair))),
@@ -233,6 +217,61 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
    });
  }, []);

+  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 6 } }));
+
+  // dnd-kit: show the “between rows” marker while hovering
+  const onDragMove = useCallback(
+    (e: DragMoveEvent) => {
+      const overId = e.over?.id as string | undefined;
+      if (!overId) return setHoveredIndex(null);
+
+      const overPair = pairs.find((p) => p.id === overId);
+      if (overPair == null) return setHoveredIndex(null);
+
+      const side = computeSideForDragMove(overPair.id, e);
+      const overIndex = pairs.findIndex((p) => p.id === overId);
+      const hoveredIndex = overIndex + (side === 'above' ? 0 : 1);
+
+      setHoveredIndex(hoveredIndex);
+    },
+    [pairs],
+  );
+
+  const onDragStart = useCallback(
+    (e: DragStartEvent) => {
+      const pair = pairs.find((p) => p.id === e.active.id);
+      setIsDragging(pair ?? null);
+    },
+    [pairs],
+  );
+
+  const onDragCancel = useCallback(() => setIsDragging(null), []);
+
+  const onDragEnd = useCallback(
+    (e: DragEndEvent) => {
+      setIsDragging(null);
+      setHoveredIndex(null);
+      const activeId = e.active.id as string | undefined;
+      const overId = e.over?.id as string | undefined;
+      if (!activeId || !overId) return;
+
+      const from = pairs.findIndex((p) => p.id === activeId);
+      const baseTo = pairs.findIndex((p) => p.id === overId);
+      const to = hoveredIndex ?? (baseTo === -1 ? from : baseTo);
+
+      if (from !== -1 && to !== -1 && from !== to) {
+        setPairsAndSave((ps) => {
+          const next = [...ps];
+          const [moved] = next.splice(from, 1);
+          if (moved === undefined) return ps; // Make TS happy
+          next.splice(to > from ? to - 1 : to, 0, moved);
+          return next;
+        });
+      }
+    },
+    [pairs, hoveredIndex, setPairsAndSave],
+  );
+
  return (
    <div
      className={classNames(
@@ -246,67 +285,82 @@ export const PairEditor = forwardRef<PairEditorRef, PairEditorProps>(function Pa
        'pt-0.5',
      )}
    >
-      {pairs.map((p, i) => {
-        if (!showAll && i > MAX_INITIAL_PAIRS) return null;
+      <DndContext
+        autoScroll
+        sensors={sensors}
+        onDragMove={onDragMove}
+        onDragEnd={onDragEnd}
+        onDragStart={onDragStart}
+        onDragCancel={onDragCancel}
+        collisionDetection={pointerWithin}
+      >
+        {pairs.map((p, i) => {
+          if (!showAll && i > MAX_INITIAL_PAIRS) return null;

-        const isLast = i === pairs.length - 1;
-        return (
-          <Fragment key={p.id}>
-            {hoveredIndex === i && <DropMarker />}
+          const isLast = i === pairs.length - 1;
+          return (
+            <Fragment key={p.id}>
+              {hoveredIndex === i && <DropMarker />}
+              <PairEditorRow
+                allowFileValues={allowFileValues}
+                allowMultilineValues={allowMultilineValues}
+                className="py-1"
+                forcedEnvironmentId={forcedEnvironmentId}
+                forceFocusNamePairId={forceFocusNamePairId}
+                forceFocusValuePairId={forceFocusValuePairId}
+                forceUpdateKey={localForceUpdateKey}
+                index={i}
+                isLast={isLast}
+                isDraggingGlobal={!!isDragging}
+                nameAutocomplete={nameAutocomplete}
+                nameAutocompleteFunctions={nameAutocompleteFunctions}
+                nameAutocompleteVariables={nameAutocompleteVariables}
+                namePlaceholder={namePlaceholder}
+                nameValidate={nameValidate}
+                onChange={handleChange}
+                onDelete={handleDelete}
+                onFocusName={handleFocusName}
+                onFocusValue={handleFocusValue}
+                pair={p}
+                stateKey={stateKey}
+                valueAutocomplete={valueAutocomplete}
+                valueAutocompleteFunctions={valueAutocompleteFunctions}
+                valueAutocompleteVariables={valueAutocompleteVariables}
+                valuePlaceholder={valuePlaceholder}
+                valueType={valueType}
+                valueValidate={valueValidate}
+              />
+            </Fragment>
+          );
+        })}
+        {!showAll && pairs.length > MAX_INITIAL_PAIRS && (
+          <Button onClick={toggleShowAll} variant="border" className="m-2" size="xs">
+            Show {pairs.length - MAX_INITIAL_PAIRS} More
+          </Button>
+        )}
+        <DragOverlay dropAnimation={null}>
+          {isDragging && (
            <PairEditorRow
-              allowFileValues={allowFileValues}
-              allowMultilineValues={allowMultilineValues}
-              className="py-1"
-              forcedEnvironmentId={forcedEnvironmentId}
-              forceFocusNamePairId={forceFocusNamePairId}
-              forceFocusValuePairId={forceFocusValuePairId}
-              forceUpdateKey={localForceUpdateKey}
-              index={i}
-              isLast={isLast}
-              nameAutocomplete={nameAutocomplete}
-              nameAutocompleteFunctions={nameAutocompleteFunctions}
-              nameAutocompleteVariables={nameAutocompleteVariables}
              namePlaceholder={namePlaceholder}
-              nameValidate={nameValidate}
-              onChange={handleChange}
-              onDelete={handleDelete}
-              onEnd={handleEnd}
-              onFocusName={handleFocusName}
-              onFocusValue={handleFocusValue}
-              onMove={handleMove}
-              pair={p}
-              stateKey={stateKey}
-              valueAutocomplete={valueAutocomplete}
-              valueAutocompleteFunctions={valueAutocompleteFunctions}
-              valueAutocompleteVariables={valueAutocompleteVariables}
              valuePlaceholder={valuePlaceholder}
-              valueType={valueType}
-              valueValidate={valueValidate}
+              className="opacity-80"
+              pair={isDragging}
+              index={0}
+              stateKey={null}
            />
-          </Fragment>
-        );
-      })}
-      {!showAll && pairs.length > MAX_INITIAL_PAIRS && (
-        <Button onClick={toggleShowAll} variant="border" className="m-2" size="xs">
-          Show {pairs.length - MAX_INITIAL_PAIRS} More
-        </Button>
-      )}
+          )}
+        </DragOverlay>
+      </DndContext>
    </div>
  );
 });

-enum ItemTypes {
-  ROW = 'pair-row',
-}
-
 type PairEditorRowProps = {
  className?: string;
  pair: PairWithId;
  forceFocusNamePairId?: string | null;
  forceFocusValuePairId?: string | null;
-  onMove: (id: string, side: 'above' | 'below') => void;
-  onEnd: (id: string) => void;
-  onChange: (pair: PairWithId) => void;
+  onChange?: (pair: PairWithId) => void;
  onDelete?: (pair: PairWithId, focusPrevious: boolean) => void;
  onFocusName?: (pair: PairWithId) => void;
  onFocusValue?: (pair: PairWithId) => void;
@@ -315,6 +369,7 @@ type PairEditorRowProps = {
  disabled?: boolean;
  disableDrag?: boolean;
  index: number;
+  isDraggingGlobal?: boolean;
 } & Pick<
  PairEditorProps,
  | 'allowFileValues'
@@ -352,12 +407,11 @@ export function PairEditorRow({
  nameAutocompleteVariables,
  namePlaceholder,
  nameValidate,
+  isDraggingGlobal,
  onChange,
  onDelete,
-  onEnd,
  onFocusName,
  onFocusValue,
-  onMove,
  pair,
  stateKey,
  valueAutocomplete,
@@ -367,7 +421,6 @@ export function PairEditorRow({
  valueType,
  valueValidate,
 }: PairEditorRowProps) {
-  const ref = useRef<HTMLDivElement>(null);
  const nameInputRef = useRef<EditorView>(null);
  const valueInputRef = useRef<EditorView>(null);

@@ -388,29 +441,29 @@ export function PairEditorRow({
  const handleDelete = useCallback(() => onDelete?.(pair, false), [onDelete, pair]);

  const handleChangeEnabled = useMemo(
-    () => (enabled: boolean) => onChange({ ...pair, enabled }),
+    () => (enabled: boolean) => onChange?.({ ...pair, enabled }),
    [onChange, pair],
  );

  const handleChangeName = useMemo(
-    () => (name: string) => onChange({ ...pair, name }),
+    () => (name: string) => onChange?.({ ...pair, name }),
    [onChange, pair],
  );

  const handleChangeValueText = useMemo(
-    () => (value: string) => onChange({ ...pair, value, isFile: false }),
+    () => (value: string) => onChange?.({ ...pair, value, isFile: false }),
    [onChange, pair],
  );

  const handleChangeValueFile = useMemo(
    () =>
      ({ filePath }: { filePath: string | null }) =>
-        onChange({ ...pair, value: filePath ?? '', isFile: true }),
+        onChange?.({ ...pair, value: filePath ?? '', isFile: true }),
    [onChange, pair],
  );

  const handleChangeValueContentType = useMemo(
-    () => (contentType: string) => onChange({ ...pair, contentType }),
+    () => (contentType: string) => onChange?.({ ...pair, contentType }),
    [onChange, pair],
  );

@@ -448,30 +501,8 @@ export function PairEditorRow({
    [allowMultilineValues, handleDelete, handleEditMultiLineValue],
  );

-  const [, connectDrop] = useDrop<Pair>(
-    {
-      accept: ItemTypes.ROW,
-      hover: (_, monitor) => {
-        if (!ref.current) return;
-        const hoverBoundingRect = ref.current?.getBoundingClientRect();
-        const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
-        const clientOffset = monitor.getClientOffset();
-        const hoverClientY = (clientOffset as XYCoord).y - hoverBoundingRect.top;
-        onMove(pair.id, hoverClientY < hoverMiddleY ? 'above' : 'below');
-      },
-    },
-    [onMove],
-  );
-
-  const [, connectDrag] = useDrag(
-    {
-      type: ItemTypes.ROW,
-      item: () => pair,
-      collect: (m) => ({ isDragging: m.isDragging() }),
-      end: () => onEnd(pair.id),
-    },
-    [pair, onEnd],
-  );
+  const { attributes, listeners, setNodeRef: setDraggableRef } = useDraggable({ id: pair.id });
+  const { setNodeRef: setDroppableRef } = useDroppable({ id: pair.id });

  // Filter out the current pair name
  const valueAutocompleteVariablesFiltered = useMemo<EditorProps['autocompleteVariables']>(() => {
@@ -482,12 +513,17 @@ export function PairEditorRow({
    }
  }, [pair.name, valueAutocompleteVariables]);

-  connectDrag(ref);
-  connectDrop(ref);
+  const handleSetRef = useCallback(
+    (n: HTMLDivElement | null) => {
+      setDraggableRef(n);
+      setDroppableRef(n);
+    },
+    [setDraggableRef, setDroppableRef],
+  );

  return (
    <div
-      ref={ref}
+      ref={handleSetRef}
      className={classNames(
        className,
        'group grid grid-cols-[auto_auto_minmax(0,1fr)_auto]',
@@ -505,6 +541,8 @@ export function PairEditorRow({
      />
      {!isLast && !disableDrag ? (
        <div
+          {...attributes}
+          {...listeners}
          className={classNames(
            'py-2 h-7 w-4 flex items-center',
            'justify-center opacity-0 group-hover:opacity-70',
@@ -529,6 +567,7 @@ export function PairEditorRow({
            hideLabel
            size="sm"
            containerClassName={classNames(isLast && 'border-dashed')}
+            className={classNames(isDraggingGlobal && 'pointer-events-none')}
            label="Name"
            name={`name[${index}]`}
            onFocus={handleFocusName}
@@ -541,13 +580,13 @@ export function PairEditorRow({
            stateKey={`name.${pair.id}.${stateKey}`}
            disabled={disabled}
            wrapLines={false}
-            readOnly={pair.readOnlyName}
+            readOnly={pair.readOnlyName || isDraggingGlobal}
            size="sm"
            required={!isLast && !!pair.enabled && !!pair.value}
            validate={nameValidate}
            forcedEnvironmentId={forcedEnvironmentId}
            forceUpdateKey={forceUpdateKey}
-            containerClassName={classNames(isLast && 'border-dashed')}
+            containerClassName={classNames('bg-surface', isLast && 'border-dashed')}
            defaultValue={pair.name}
            label="Name"
            name={`name[${index}]`}
@@ -578,6 +617,7 @@ export function PairEditorRow({
              containerClassName={classNames(isLast && 'border-dashed')}
              label="Value"
              name={`value[${index}]`}
+              className={classNames(isDraggingGlobal && 'pointer-events-none')}
              onFocus={handleFocusValue}
              placeholder={valuePlaceholder ?? 'value'}
            />
@@ -599,7 +639,8 @@ export function PairEditorRow({
              wrapLines={false}
              size="sm"
              disabled={disabled}
-              containerClassName={classNames(isLast && 'border-dashed')}
+              readOnly={isDraggingGlobal}
+              containerClassName={classNames('bg-surface', isLast && 'border-dashed')}
              validate={valueValidate}
              forcedEnvironmentId={forcedEnvironmentId}
              forceUpdateKey={forceUpdateKey}
--- a/src-web/components/core/Tabs/Tabs.tsx
+++ b/src-web/components/core/Tabs/Tabs.tsx
@@ -73,7 +73,6 @@ export function Tabs({
      className={classNames(
        className,
        'tabs-container',
-        'transform-gpu',
        'h-full grid',
        layout === 'horizontal' && 'grid-rows-1 grid-cols-[auto_minmax(0,1fr)]',
        layout === 'vertical' && 'grid-rows-[auto_minmax(0,1fr)] grid-cols-1',
--- a/src-web/components/core/Tooltip.tsx
+++ b/src-web/components/core/Tooltip.tsx
@@ -7,7 +7,7 @@ import { Portal } from '../Portal';
 export interface TooltipProps {
  children: ReactNode;
  content: ReactNode;
-  tabIndex?: number,
+  tabIndex?: number;
  size?: 'md' | 'lg';
 }

--- a/src-web/components/core/tree/AutoScrollWhileDragging.tsx
+++ b/src-web/components/core/tree/AutoScrollWhileDragging.tsx
@@ -1,63 +0,0 @@
-// AutoScrollWhileDragging.tsx
-import { useEffect, useRef } from 'react';
-import { useDragLayer } from 'react-dnd';
-
-type Props = {
-  container: HTMLElement | null | undefined;
-  edgeDistance?: number;
-  maxSpeedPerFrame?: number;
-};
-
-export function AutoScrollWhileDragging({
-  container,
-  edgeDistance = 30,
-  maxSpeedPerFrame = 6,
-}: Props) {
-  const rafId = useRef<number | null>(null);
-
-  const { isDragging, pointer } = useDragLayer((monitor) => ({
-    isDragging: monitor.isDragging(),
-    pointer: monitor.getClientOffset(), // { x, y } | null
-  }));
-
-  useEffect(() => {
-    if (!container || !isDragging) {
-      if (rafId.current != null) cancelAnimationFrame(rafId.current);
-      rafId.current = null;
-      return;
-    }
-
-    const tick = () => {
-      if (!container || !isDragging || !pointer) return;
-
-      const rect = container.getBoundingClientRect();
-      const y = pointer.y;
-
-      // Compute vertical speed based on proximity to edges
-      let dy = 0;
-      if (y < rect.top + edgeDistance) {
-        const t = (rect.top + edgeDistance - y) / edgeDistance; // 0..1
-        dy = -Math.min(maxSpeedPerFrame, Math.ceil(t * maxSpeedPerFrame));
-      } else if (y > rect.bottom - edgeDistance) {
-        const t = (y - (rect.bottom - edgeDistance)) / edgeDistance; // 0..1
-        dy = Math.min(maxSpeedPerFrame, Math.ceil(t * maxSpeedPerFrame));
-      }
-
-      if (dy !== 0) {
-        // Only scroll if there’s more content in that direction
-        const prev = container.scrollTop;
-        container.scrollTop = prev + dy;
-      }
-
-      rafId.current = requestAnimationFrame(tick);
-    };
-
-    rafId.current = requestAnimationFrame(tick);
-    return () => {
-      if (rafId.current != null) cancelAnimationFrame(rafId.current);
-      rafId.current = null;
-    };
-  }, [container, isDragging, pointer, edgeDistance, maxSpeedPerFrame]);
-
-  return null;
-}
--- a/src-web/components/core/tree/Tree.tsx
+++ b/src-web/components/core/tree/Tree.tsx
@@ -9,13 +9,11 @@ import {
 } from '@dnd-kit/core';
 import { type } from '@tauri-apps/plugin-os';
 import classNames from 'classnames';
-import { useAtomValue } from 'jotai';
-import type { ComponentType, ReactElement, Ref, RefAttributes } from 'react';
-import {
+import type { ComponentType, MouseEvent, ReactElement, Ref, RefAttributes } from 'react';
+import React, {
  forwardRef,
  memo,
  useCallback,
-  useEffect,
  useImperativeHandle,
  useMemo,
  useRef,
@@ -24,16 +22,24 @@ import {
 import { useKey, useKeyPressEvent } from 'react-use';
 import type { HotkeyAction, HotKeyOptions } from '../../../hooks/useHotKey';
 import { useHotKey } from '../../../hooks/useHotKey';
-import { sidebarCollapsedAtom } from '../../../hooks/useSidebarItemCollapsed';
+import { computeSideForDragMove } from '../../../lib/dnd';
 import { jotaiStore } from '../../../lib/jotai';
-import type { ContextMenuProps } from '../Dropdown';
-import { draggingIdsFamily, focusIdsFamily, hoveredParentFamily, selectedIdsFamily } from './atoms';
+import type { ContextMenuProps, DropdownItem } from '../Dropdown';
+import { ContextMenu } from '../Dropdown';
+import {
+  collapsedFamily,
+  draggingIdsFamily,
+  focusIdsFamily,
+  hoveredParentFamily,
+  selectedIdsFamily,
+} from './atoms';
 import type { SelectableTreeNode, TreeNode } from './common';
-import { computeSideForDragMove, equalSubtree, getSelectedItems, hasAncestor } from './common';
+import { equalSubtree, getSelectedItems, hasAncestor } from './common';
 import { TreeDragOverlay } from './TreeDragOverlay';
 import type { TreeItemProps } from './TreeItem';
 import type { TreeItemListProps } from './TreeItemList';
 import { TreeItemList } from './TreeItemList';
+import { useSelectableItems } from './useSelectableItems';

 export interface TreeProps<T extends { id: string }> {
  root: TreeNode<T>;
@@ -75,8 +81,16 @@ function TreeInner<T extends { id: string }>(
  ref: Ref<TreeHandle>,
 ) {
  const treeRef = useRef<HTMLDivElement>(null);
-  const { treeParentMap, selectableItems } = useTreeParentMap(root, getItemKey);
-  const [isFocused, setIsFocused] = useState<boolean>(false);
+  const selectableItems = useSelectableItems(root);
+  const [showContextMenu, setShowContextMenu] = useState<{
+    items: DropdownItem[];
+    x: number;
+    y: number;
+  } | null>(null);
+
+  const handleCloseContextMenu = useCallback(() => {
+    setShowContextMenu(null);
+  }, []);

  const tryFocus = useCallback(() => {
    treeRef.current?.querySelector<HTMLButtonElement>('.tree-item button[tabindex="0"]')?.focus();
@@ -228,7 +242,12 @@ function TreeInner<T extends { id: string }>(
      const over = e.over;
      if (!over) {
        // Clear the drop indicator when hovering outside the tree
-        jotaiStore.set(hoveredParentFamily(treeId), { parentId: null, index: null });
+        jotaiStore.set(hoveredParentFamily(treeId), {
+          parentId: null,
+          parentDepth: null,
+          childIndex: null,
+          index: null,
+        });
        return;
      }

@@ -242,39 +261,60 @@ function TreeInner<T extends { id: string }>(
      if (hoveringRoot) {
        jotaiStore.set(hoveredParentFamily(treeId), {
          parentId: root.item.id,
-          index: root.children?.length ?? 0,
+          parentDepth: root.depth,
+          index: selectableItems.length,
+          childIndex: selectableItems.length,
        });
        return;
      }

-      const node = selectableItems.find((i) => i.node.item.id === over.id)?.node ?? null;
-      if (node == null) {
+      const selectableItem = selectableItems.find((i) => i.node.item.id === over.id) ?? null;
+      if (selectableItem == null) {
        return;
      }
+      const node = selectableItem.node;

-      const side = computeSideForDragMove(node, e);
+      const side = computeSideForDragMove(node.item.id, e);

      const item = node.item;
-      let hoveredParent = treeParentMap[item.id] ?? null;
-      const dragIndex = hoveredParent?.children?.findIndex((n) => n.item.id === item.id) ?? -99;
-      const hovered = hoveredParent?.children?.[dragIndex] ?? null;
-      let hoveredIndex = dragIndex + (side === 'above' ? 0 : 1);
+      let hoveredParent = node.parent;
+      const dragIndex = selectableItems.findIndex((n) => n.node.item.id === item.id) ?? -1;
+      const hovered = selectableItems[dragIndex]?.node ?? null;
+      const hoveredIndex = dragIndex + (side === 'above' ? 0 : 1);
+      let hoveredChildIndex = selectableItem.index + (side === 'above' ? 0 : 1);

-      const collapsedMap = jotaiStore.get(jotaiStore.get(sidebarCollapsedAtom));
-      const isHoveredItemCollapsed = hovered != null ? collapsedMap[hovered.item.id] : false;
+      const collapsedMap = jotaiStore.get(collapsedFamily(treeId));
+      const isHoveredItemCollapsed =
+        hovered != null ? hovered.children?.length === 0 || collapsedMap[hovered.item.id] : false;

-      if (hovered?.children != null && side === 'below' && !isHoveredItemCollapsed) {
+      if (hovered?.children != null && side === 'below' && isHoveredItemCollapsed) {
        // Move into the folder if it's open and we're moving below it
-        hoveredParent = hoveredParent?.children?.find((n) => n.item.id === item.id) ?? null;
-        hoveredIndex = 0;
+        hoveredParent = hovered;
+        hoveredChildIndex = 0;
      }

-      jotaiStore.set(hoveredParentFamily(treeId), {
-        parentId: hoveredParent?.item.id ?? null,
-        index: hoveredIndex,
-      });
+      const parentId = hoveredParent?.item.id ?? null;
+      const parentDepth = hoveredParent?.depth ?? null;
+      const index = hoveredIndex;
+      const childIndex = hoveredChildIndex;
+      const existing = jotaiStore.get(hoveredParentFamily(treeId));
+      if (
+        !(
+          parentId === existing.parentId &&
+          parentDepth === existing.parentDepth &&
+          index === existing.index &&
+          childIndex === existing.childIndex
+        )
+      ) {
+        jotaiStore.set(hoveredParentFamily(treeId), {
+          parentId: hoveredParent?.item.id ?? null,
+          parentDepth: hoveredParent?.depth ?? null,
+          index: hoveredIndex,
+          childIndex: hoveredChildIndex,
+        });
+      }
    },
-    [root.children?.length, root.item.id, selectableItems, treeId, treeParentMap],
+    [root.depth, root.item.id, selectableItems, treeId],
  );

  const handleDragStart = useCallback(
@@ -299,46 +339,57 @@ function TreeInner<T extends { id: string }>(
  );

  const clearDragState = useCallback(() => {
-    jotaiStore.set(hoveredParentFamily(treeId), { parentId: null, index: null });
+    jotaiStore.set(hoveredParentFamily(treeId), {
+      parentId: null,
+      parentDepth: null,
+      index: null,
+      childIndex: null,
+    });
    jotaiStore.set(draggingIdsFamily(treeId), []);
  }, [treeId]);

  const handleDragEnd = useCallback(
    function handleDragEnd(e: DragEndEvent) {
      // Get this from the store so our callback doesn't change all the time
-      const hovered = jotaiStore.get(hoveredParentFamily(treeId));
+      const {
+        index: hoveredIndex,
+        parentId: hoveredParentId,
+        childIndex: hoveredChildIndex,
+      } = jotaiStore.get(hoveredParentFamily(treeId));
      const draggingItems = jotaiStore.get(draggingIdsFamily(treeId));
      clearDragState();

      // Dropped outside the tree?
-      if (e.over == null) return;
+      if (e.over == null) {
+        return;
+      }

-      const hoveredParent =
-        hovered.parentId == root.item.id
-          ? root
-          : selectableItems.find((n) => n.node.item.id === hovered.parentId)?.node;
+      const hoveredParentS =
+        hoveredParentId === root.item.id
+          ? { node: root, depth: 0, index: 0 }
+          : (selectableItems.find((i) => i.node.item.id === hoveredParentId) ?? null);
+      const hoveredParent = hoveredParentS?.node ?? null;

-      if (hoveredParent == null || hovered.index == null || !draggingItems?.length) return;
-
-      // Optional tiny guard: don't drop into itself
-      if (draggingItems.some((id) => id === hovered.parentId)) return;
+      if (hoveredParent == null || hoveredIndex == null || !draggingItems?.length) {
+        return;
+      }

      // Resolve the actual tree nodes for each dragged item (keeps order of draggingItems)
      const draggedNodes: TreeNode<T>[] = draggingItems
        .map((id) => {
-          const parent = treeParentMap[id];
-          const idx = parent?.children?.findIndex((n) => n.item.id === id) ?? -1;
-          return idx >= 0 ? parent!.children![idx]! : null;
+          return selectableItems.find((i) => i.node.item.id === id)?.node ?? null;
        })
        .filter((n) => n != null)
        // Filter out invalid drags (dragging into descendant)
-        .filter((n) => !hasAncestor(hoveredParent, n.item.id));
+        .filter(
+          (n) => hoveredParent.item.id !== n.item.id && !hasAncestor(hoveredParent, n.item.id),
+        );

      // Work on a local copy of target children
      const nextChildren = [...(hoveredParent.children ?? [])];

      // Remove any of the dragged nodes already in the target, adjusting hoveredIndex
-      let insertAt = hovered.index;
+      let insertAt = hoveredChildIndex ?? 0;
      for (const node of draggedNodes) {
        const i = nextChildren.findIndex((n) => n.item.id === node.item.id);
        if (i !== -1) {
@@ -355,14 +406,13 @@ function TreeInner<T extends { id: string }>(
        insertAt,
      });
    },
-    [treeId, clearDragState, root, selectableItems, onDragEnd, treeParentMap],
+    [treeId, clearDragState, selectableItems, root, onDragEnd],
  );

  const treeItemListProps: Omit<
    TreeItemListProps<T>,
-    'node' | 'treeId' | 'activeIdAtom' | 'hoveredParent' | 'hoveredIndex'
+    'nodes' | 'treeId' | 'activeIdAtom' | 'hoveredParent' | 'hoveredIndex'
  > = {
-    depth: 0,
    getItemKey,
    getContextMenu: handleGetContextMenu,
    onClick: handleClick,
@@ -371,19 +421,30 @@ function TreeInner<T extends { id: string }>(
    ItemLeftSlot,
  };

-  const handleFocus = useCallback(function handleFocus() {
-    setIsFocused(true);
-  }, []);
+  const handleContextMenu = useCallback(
+    async (e: MouseEvent<HTMLElement>) => {
+      if (getContextMenu == null) return;

-  const handleBlur = useCallback(function handleBlur() {
-    setIsFocused(false);
-  }, []);
+      e.preventDefault();
+      e.stopPropagation();
+      const items = await getContextMenu([]);
+      setShowContextMenu({ items, x: e.clientX, y: e.clientY });
+    },
+    [getContextMenu],
+  );

  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 6 } }));

  return (
    <>
      <TreeHotKeys treeId={treeId} hotkeys={hotkeys} selectableItems={selectableItems} />
+      {showContextMenu && (
+        <ContextMenu
+          items={showContextMenu.items}
+          triggerPosition={showContextMenu}
+          onClose={handleCloseContextMenu}
+        />
+      )}
      <DndContext
        sensors={sensors}
        collisionDetection={pointerWithin}
@@ -396,30 +457,39 @@ function TreeInner<T extends { id: string }>(
      >
        <div
          ref={treeRef}
-          onFocus={handleFocus}
-          onBlur={handleBlur}
          className={classNames(
            className,
            'outline-none h-full',
            'overflow-y-auto overflow-x-hidden',
            'grid grid-rows-[auto_1fr]',
-            ' [&_.tree-item.selected]:text-text',
-            isFocused
-              ? '[&_.tree-item.selected]:bg-surface-active'
-              : '[&_.tree-item.selected]:bg-surface-highlight',
          )}
        >
-          <TreeItemList node={root} treeId={treeId} {...treeItemListProps} />
+          <div
+            className={classNames(
+              '[&_.tree-item.selected_.tree-item-inner]:text-text',
+              '[&:focus-within]:[&_.tree-item.selected]:bg-surface-active',
+              '[&:not(:focus-within)]:[&_.tree-item.selected]:bg-surface-highlight',
+
+              // Round the items, but only if the ends of the selection.
+              // Also account for the drop marker being in between items
+              '[&_.tree-item]:rounded-md',
+              '[&_.tree-item.selected+.tree-item.selected]:rounded-t-none',
+              '[&_.tree-item.selected+.drop-marker+.tree-item.selected]:rounded-t-none',
+              '[&_.tree-item.selected:has(+.tree-item.selected)]:rounded-b-none',
+              '[&_.tree-item.selected:has(+.drop-marker+.tree-item.selected)]:rounded-b-none',
+            )}
+          >
+            <TreeItemList nodes={selectableItems} treeId={treeId} {...treeItemListProps} />
+          </div>
          {/* Assign root ID so we can reuse our same move/end logic */}
-          <DropRegionAfterList id={root.item.id} />
-          <TreeDragOverlay
-            treeId={treeId}
-            root={root}
-            selectableItems={selectableItems}
-            ItemInner={ItemInner}
-            getItemKey={getItemKey}
-          />
+          <DropRegionAfterList id={root.item.id} onContextMenu={handleContextMenu} />
        </div>
+        <TreeDragOverlay
+          treeId={treeId}
+          selectableItems={selectableItems}
+          ItemInner={ItemInner}
+          getItemKey={getItemKey}
+        />
      </DndContext>
    </>
  );
@@ -442,66 +512,15 @@ export const Tree = memo(
  },
 ) as typeof Tree_;

-function DropRegionAfterList({ id }: { id: string }) {
+function DropRegionAfterList({
+  id,
+  onContextMenu,
+}: {
+  id: string;
+  onContextMenu?: (e: MouseEvent<HTMLDivElement>) => void;
+}) {
  const { setNodeRef } = useDroppable({ id });
-  return <div ref={setNodeRef} />;
-}
-
-function useTreeParentMap<T extends { id: string }>(
-  root: TreeNode<T>,
-  getItemKey: (item: T) => string,
-) {
-  const collapsedMap = useAtomValue(useAtomValue(sidebarCollapsedAtom));
-  const [{ treeParentMap, selectableItems }, setData] = useState(() => {
-    return compute(root, collapsedMap);
-  });
-
-  const prevRoot = useRef<TreeNode<T> | null>(null);
-
-  useEffect(() => {
-    const shouldRecompute =
-      root == null || prevRoot.current == null || !equalSubtree(root, prevRoot.current, getItemKey);
-    if (!shouldRecompute) return;
-    setData(compute(root, collapsedMap));
-    prevRoot.current = root;
-  }, [collapsedMap, getItemKey, root]);
-
-  return { treeParentMap, selectableItems };
-}
-
-function compute<T extends { id: string }>(
-  root: TreeNode<T>,
-  collapsedMap: Record<string, boolean>,
-) {
-  const treeParentMap: Record<string, TreeNode<T>> = {};
-  const selectableItems: SelectableTreeNode<T>[] = [];
-
-  // Put requests and folders into a tree structure
-  const next = (node: TreeNode<T>, depth: number = 0) => {
-    const isCollapsed = collapsedMap[node.item.id] === true;
-    // console.log("IS COLLAPSED", node.item.name, isCollapsed);
-    if (node.children == null) {
-      return;
-    }
-
-    // Recurse to children
-    let selectableIndex = 0;
-    for (const child of node.children) {
-      treeParentMap[child.item.id] = node;
-      if (!isCollapsed) {
-        selectableItems.push({
-          node: child,
-          index: selectableIndex++,
-          depth,
-        });
-      }
-
-      next(child, depth + 1);
-    }
-  };
-
-  next(root);
-  return { treeParentMap, selectableItems };
+  return <div ref={setNodeRef} onContextMenu={onContextMenu} />;
 }

 interface TreeHotKeyProps<T extends { id: string }> extends HotKeyOptions {
--- a/src-web/components/core/tree/TreeDragOverlay.tsx
+++ b/src-web/components/core/tree/TreeDragOverlay.tsx
@@ -1,20 +1,18 @@
 import { DragOverlay } from '@dnd-kit/core';
 import { useAtomValue } from 'jotai';
 import { draggingIdsFamily } from './atoms';
-import type { SelectableTreeNode, TreeNode } from './common';
+import type { SelectableTreeNode } from './common';
 import type { TreeProps } from './Tree';
 import { TreeItemList } from './TreeItemList';

 export function TreeDragOverlay<T extends { id: string }>({
  treeId,
-  root,
  selectableItems,
  getItemKey,
  ItemInner,
  ItemLeftSlot,
 }: {
  treeId: string;
-  root: TreeNode<T>;
  selectableItems: SelectableTreeNode<T>[];
 } & Pick<TreeProps<T>, 'getItemKey' | 'ItemInner' | 'ItemLeftSlot'>) {
  const draggingItems = useAtomValue(draggingIdsFamily(treeId));
@@ -22,22 +20,11 @@ export function TreeDragOverlay<T extends { id: string }>({
    <DragOverlay dropAnimation={null}>
      <TreeItemList
        treeId={treeId + '.dragging'}
-        node={{
-          item: { ...root.item, id: `${root.item.id}_dragging` },
-          parent: null,
-          children: draggingItems
-            .map((id) => {
-              const child = selectableItems.find((i2) => {
-                return i2.node.item.id === id;
-              })?.node;
-              return child == null ? null : { ...child, children: undefined };
-            })
-            .filter((c) => c != null),
-        }}
+        nodes={selectableItems.filter((i) => draggingItems.includes(i.node.item.id))}
        getItemKey={getItemKey}
        ItemInner={ItemInner}
        ItemLeftSlot={ItemLeftSlot}
-        depth={0}
+        forceDepth={0}
      />
    </DragOverlay>
  );
--- a/src-web/components/core/tree/TreeDropMarker.tsx
+++ b/src-web/components/core/tree/TreeDropMarker.tsx
@@ -0,0 +1,36 @@
+import classNames from 'classnames';
+import { useAtomValue } from 'jotai';
+import { memo } from 'react';
+import { DropMarker } from '../../DropMarker';
+import { hoveredParentDepthFamily, isCollapsedFamily, isIndexHoveredFamily } from './atoms';
+import type { TreeNode } from './common';
+
+export const TreeDropMarker = memo(function TreeDropMarker<T extends { id: string }>({
+  className,
+  treeId,
+  node,
+  index,
+}: {
+  treeId: string;
+  index: number;
+  node: TreeNode<T> | null;
+  className?: string;
+}) {
+  const itemId = node?.item.id;
+  const isHovered = useAtomValue(isIndexHoveredFamily({ treeId, index }));
+  const parentDepth = useAtomValue(hoveredParentDepthFamily(treeId));
+  const collapsed = useAtomValue(isCollapsedFamily({ treeId, itemId }));
+
+  // Only show if we're hovering over this index
+  if (!isHovered) return null;
+
+  // Don't show if we're right under a collapsed folder, or empty folder. We have a separate
+  // delayed expansion animation for that.
+  if (collapsed || node?.children?.length === 0) return null;
+
+  return (
+    <div className="drop-marker" style={{ paddingLeft: `${parentDepth}rem` }}>
+      <DropMarker className={classNames(className)} />
+    </div>
+  );
+});
--- a/src-web/components/core/tree/TreeIndentGuide.tsx
+++ b/src-web/components/core/tree/TreeIndentGuide.tsx
@@ -0,0 +1,31 @@
+import classNames from 'classnames';
+import { useAtomValue } from 'jotai';
+import { memo } from 'react';
+import { hoveredParentDepthFamily, isParentHoveredFamily } from './atoms';
+
+export const TreeIndentGuide = memo(function TreeIndentGuide({
+  treeId,
+  depth,
+  parentId,
+}: {
+  treeId: string;
+  depth: number;
+  parentId: string | null;
+}) {
+  const parentDepth = useAtomValue(hoveredParentDepthFamily(treeId));
+  const isHovered = useAtomValue(isParentHoveredFamily({ treeId, parentId }));
+
+  return (
+    <div className="flex">
+      {Array.from({ length: depth }).map((_, i) => (
+        <div
+          key={i}
+          className={classNames(
+            'w-[1rem] border-r border-r-text-subtlest',
+            !(parentDepth === i + 1 && isHovered) && 'opacity-30',
+          )}
+        />
+      ))}
+    </div>
+  );
+});
--- a/src-web/components/core/tree/TreeItem.tsx
+++ b/src-web/components/core/tree/TreeItem.tsx
@@ -2,21 +2,18 @@ import type { DragMoveEvent } from '@dnd-kit/core';
 import { useDndMonitor, useDraggable, useDroppable } from '@dnd-kit/core';
 import classNames from 'classnames';
 import { useAtomValue } from 'jotai';
+import { selectAtom } from 'jotai/utils';
 import type { MouseEvent, PointerEvent } from 'react';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { computeSideForDragMove } from '../../../lib/dnd';
 import { jotaiStore } from '../../../lib/jotai';
 import type { ContextMenuProps, DropdownItem } from '../Dropdown';
 import { ContextMenu } from '../Dropdown';
 import { Icon } from '../Icon';
-import {
-  isCollapsedFamily,
-  isLastFocusedFamily,
-  isParentHoveredFamily,
-  isSelectedFamily,
-} from './atoms';
+import { collapsedFamily, isCollapsedFamily, isLastFocusedFamily, isSelectedFamily } from './atoms';
 import type { TreeNode } from './common';
-import { computeSideForDragMove } from './common';
 import type { TreeProps } from './Tree';
+import { TreeIndentGuide } from './TreeIndentGuide';

 interface OnClickEvent {
  shiftKey: boolean;
@@ -26,17 +23,18 @@ interface OnClickEvent {

 export type TreeItemProps<T extends { id: string }> = Pick<
  TreeProps<T>,
-  'ItemInner' | 'ItemLeftSlot' | 'treeId' | 'getEditOptions'
+  'ItemInner' | 'ItemLeftSlot' | 'treeId' | 'getEditOptions' | 'getItemKey'
 > & {
  node: TreeNode<T>;
  className?: string;
  onClick?: (item: T, e: OnClickEvent) => void;
  getContextMenu?: (item: T) => Promise<ContextMenuProps['items']>;
+  depth: number;
 };

 const HOVER_CLOSED_FOLDER_DELAY = 800;

-export function TreeItem<T extends { id: string }>({
+function TreeItem_<T extends { id: string }>({
  treeId,
  node,
  ItemInner,
@@ -45,17 +43,34 @@ export function TreeItem<T extends { id: string }>({
  onClick,
  getEditOptions,
  className,
+  depth,
 }: TreeItemProps<T>) {
-  const ref = useRef<HTMLDivElement>(null);
+  const ref = useRef<HTMLLIElement>(null);
  const draggableRef = useRef<HTMLButtonElement>(null);
  const isSelected = useAtomValue(isSelectedFamily({ treeId, itemId: node.item.id }));
  const isCollapsed = useAtomValue(isCollapsedFamily({ treeId, itemId: node.item.id }));
-  const isHoveredAsParent = useAtomValue(isParentHoveredFamily({ treeId, parentId: node.item.id }));
  const isLastSelected = useAtomValue(isLastFocusedFamily({ treeId, itemId: node.item.id }));
  const [editing, setEditing] = useState<boolean>(false);
-  const [isDropHover, setIsDropHover] = useState<boolean>(false);
+  const [dropHover, setDropHover] = useState<null | 'drop' | 'animate'>(null);
  const startedHoverTimeout = useRef<NodeJS.Timeout>(undefined);

+  const isAncestorCollapsedAtom = useMemo(
+    () =>
+      selectAtom(
+        collapsedFamily(treeId),
+        (collapsed) => {
+          const next = (n: TreeNode<T>) => {
+            if (n.parent == null) return false;
+            if (collapsed[n.parent.item.id]) return true;
+            return next(n.parent);
+          };
+          return next(node);
+        },
+        (a, b) => a === b, // re-render only when boolean flips
+      ),
+    [node, treeId],
+  );
+
  const [showContextMenu, setShowContextMenu] = useState<{
    items: DropdownItem[];
    x: number;
@@ -132,35 +147,41 @@ export function TreeItem<T extends { id: string }>({
    }
  }, [getEditOptions, node.children, toggleCollapsed]);

-  const clearHoverTimer = () => {
+  const clearDropHover = () => {
    if (startedHoverTimeout.current) {
-      setIsDropHover(false); // NEW
-      clearTimeout(startedHoverTimeout.current); // NEW
-      startedHoverTimeout.current = undefined; // NEW
+      clearTimeout(startedHoverTimeout.current);
+      startedHoverTimeout.current = undefined;
    }
+    setDropHover(null);
  };

  // Toggle auto-expand of folders when hovering over them
  useDndMonitor({
+    onDragEnd() {
+      clearDropHover();
+    },
    onDragMove(e: DragMoveEvent) {
-      const side = computeSideForDragMove(node, e);
-      const isFolderWithChildren = (node.children?.length ?? 0) > 0;
+      const side = computeSideForDragMove(node.item.id, e);
+      const isFolder = node.children != null;
+      const hasChildren = (node.children?.length ?? 0) > 0;
      const isCollapsed = jotaiStore.get(isCollapsedFamily({ treeId, itemId: node.item.id }));
-      if (isCollapsed && isFolderWithChildren && side === 'below') {
-        setIsDropHover(true);
+      if (isCollapsed && isFolder && hasChildren && side === 'below') {
+        setDropHover('animate');
        clearTimeout(startedHoverTimeout.current);
        startedHoverTimeout.current = setTimeout(() => {
          jotaiStore.set(isCollapsedFamily({ treeId, itemId: node.item.id }), false);
-          setIsDropHover(false);
+          clearDropHover();
        }, HOVER_CLOSED_FOLDER_DELAY);
+      } else if (isFolder && !hasChildren && side === 'below') {
+        setDropHover('drop');
      } else {
-        clearHoverTimer();
+        clearDropHover();
      }
    },
  });

  const handleContextMenu = useCallback(
-    async (e: MouseEvent<HTMLDivElement>) => {
+    async (e: MouseEvent<HTMLElement>) => {
      if (getContextMenu == null) return;

      e.preventDefault();
@@ -197,77 +218,104 @@ export function TreeItem<T extends { id: string }>({
    [setDraggableRef, setDroppableRef],
  );

+  if (useAtomValue(isAncestorCollapsedAtom)) return null;
+
  return (
-    <div
+    <li
      ref={ref}
+      role="treeitem"
+      aria-level={depth + 1}
+      aria-expanded={node.children == null ? undefined : !isCollapsed}
+      aria-selected={isSelected}
      onContextMenu={handleContextMenu}
      className={classNames(
        className,
        'tree-item',
-        isSelected && 'selected',
-        'text-text-subtle',
-        'h-sm grid grid-cols-[auto_minmax(0,1fr)] items-center rounded-md px-1.5',
+        'h-sm',
+        'grid grid-cols-[auto_minmax(0,1fr)]',
        editing && 'ring-1 focus-within:ring-focus',
-        isDropHover && 'relative z-10 ring-2 ring-primary animate-blinkRing',
+        dropHover != null && 'relative z-10 ring-2 ring-primary',
+        dropHover === 'animate' && 'animate-blinkRing',
+        isSelected && 'selected',
      )}
    >
-      {showContextMenu && (
-        <ContextMenu
-          items={showContextMenu.items}
-          triggerPosition={showContextMenu}
-          onClose={handleCloseContextMenu}
-        />
-      )}
-      {node.children != null ? (
-        <button
-          tabIndex={-1}
-          className="h-full w-[2.8rem] pr-[0.5rem] -ml-[1rem]"
-          onClick={toggleCollapsed}
-        >
-          <Icon
-            icon="chevron_right"
-            className={classNames(
-              'transition-transform text-text-subtlest',
-              'ml-auto !h-[1rem] !w-[1rem]',
-              node.children.length == 0 && 'opacity-0',
-              !isCollapsed && 'rotate-90',
-              isHoveredAsParent && '!text-text',
-            )}
-          />
-        </button>
-      ) : (
-        <span />
-      )}
-      <button
-        ref={handleSetDraggableRef}
-        onPointerDown={handlePointerDown}
-        onClick={handleClick}
-        onDoubleClick={handleDoubleClick}
-        disabled={editing}
-        className="focus:outline-none flex items-center gap-2 h-full whitespace-nowrap"
-        {...attributes}
-        {...listeners}
-        tabIndex={isLastSelected ? 0 : -1}
-      >
-        {ItemLeftSlot != null && <ItemLeftSlot treeId={treeId} item={node.item} />}
-        {getEditOptions != null && editing ? (
-          (() => {
-            const { defaultValue, placeholder } = getEditOptions(node.item);
-            return (
-              <input
-                ref={handleEditFocus}
-                defaultValue={defaultValue}
-                placeholder={placeholder}
-                className="bg-transparent outline-none w-full cursor-text"
-                onBlur={handleEditBlur}
-                onKeyDown={handleEditKeyDown}
-              />
-            );
-          })()
-        ) : (
-          <ItemInner treeId={treeId} item={node.item} />
+      <TreeIndentGuide treeId={treeId} depth={depth} parentId={node.parent?.item.id ?? null} />
+      <div
+        className={classNames(
+          'text-text-subtle',
+          'grid grid-cols-[auto_minmax(0,1fr)] items-center rounded-md',
        )}
-      </button>
-    </div>
+      >
+        {showContextMenu && (
+          <ContextMenu
+            items={showContextMenu.items}
+            triggerPosition={showContextMenu}
+            onClose={handleCloseContextMenu}
+          />
+        )}
+        {node.children != null ? (
+          <button tabIndex={-1} className="h-full pl-[0.5rem]" onClick={toggleCollapsed}>
+            <Icon
+              icon={node.children.length === 0 ? 'dot' : 'chevron_right'}
+              className={classNames(
+                'transition-transform text-text-subtlest',
+                'ml-auto',
+                'w-[1rem] h-[1rem]',
+                !isCollapsed && node.children.length > 0 && 'rotate-90',
+              )}
+            />
+          </button>
+        ) : (
+          <span aria-hidden /> // Make the grid happy
+        )}
+
+        <button
+          ref={handleSetDraggableRef}
+          onPointerDown={handlePointerDown}
+          onClick={handleClick}
+          onDoubleClick={handleDoubleClick}
+          disabled={editing}
+          className="tree-item-inner px-2 focus:outline-none flex items-center gap-2 h-full whitespace-nowrap"
+          {...attributes}
+          {...listeners}
+          tabIndex={isLastSelected ? 0 : -1}
+        >
+          {ItemLeftSlot != null && <ItemLeftSlot treeId={treeId} item={node.item} />}
+          {getEditOptions != null && editing ? (
+            (() => {
+              const { defaultValue, placeholder } = getEditOptions(node.item);
+              return (
+                <input
+                  ref={handleEditFocus}
+                  defaultValue={defaultValue}
+                  placeholder={placeholder}
+                  className="bg-transparent outline-none w-full cursor-text"
+                  onBlur={handleEditBlur}
+                  onKeyDown={handleEditKeyDown}
+                />
+              );
+            })()
+          ) : (
+            <ItemInner treeId={treeId} item={node.item} />
+          )}
+        </button>
+      </div>
+    </li>
  );
 }
+
+export const TreeItem = memo(
+  TreeItem_,
+  ({ node: prevNode, ...prevProps }, { node: nextNode, ...nextProps }) => {
+    const nonEqualKeys = [];
+    for (const key of Object.keys(prevProps)) {
+      if (prevProps[key as keyof typeof prevProps] !== nextProps[key as keyof typeof nextProps]) {
+        nonEqualKeys.push(key);
+      }
+    }
+    if (nonEqualKeys.length > 0) {
+      return false;
+    }
+    return nextProps.getItemKey(prevNode.item) === nextProps.getItemKey(nextNode.item);
+  },
+) as typeof TreeItem_;
--- a/src-web/components/core/tree/TreeItemList.tsx
+++ b/src-web/components/core/tree/TreeItemList.tsx
@@ -1,12 +1,8 @@
-import classNames from 'classnames';
-import { useAtomValue } from 'jotai';
 import type { CSSProperties } from 'react';
 import { Fragment, memo } from 'react';
-import { DropMarker } from '../../DropMarker';
-import { isCollapsedFamily, isItemHoveredFamily, isParentHoveredFamily } from './atoms';
-import type { TreeNode } from './common';
-import { equalSubtree } from './common';
+import type { SelectableTreeNode } from './common';
 import type { TreeProps } from './Tree';
+import { TreeDropMarker } from './TreeDropMarker';
 import type { TreeItemProps } from './TreeItem';
 import { TreeItem } from './TreeItem';

@@ -15,81 +11,54 @@ export type TreeItemListProps<T extends { id: string }> = Pick<
  'ItemInner' | 'ItemLeftSlot' | 'treeId' | 'getItemKey' | 'getEditOptions'
 > &
  Pick<TreeItemProps<T>, 'onClick' | 'getContextMenu'> & {
-    node: TreeNode<T>;
-    depth: number;
+    nodes: SelectableTreeNode<T>[];
    style?: CSSProperties;
    className?: string;
+    forceDepth?: number;
  };

 function TreeItemList_<T extends { id: string }>({
  className,
-  depth,
  getContextMenu,
  getEditOptions,
  getItemKey,
-  node,
+  nodes,
  onClick,
  ItemInner,
  ItemLeftSlot,
  style,
  treeId,
+  forceDepth,
 }: TreeItemListProps<T>) {
-  const isHovered = useAtomValue(isParentHoveredFamily({ treeId, parentId: node.item.id }));
-  const isCollapsed = useAtomValue(isCollapsedFamily({ treeId, itemId: node.item.id }));
-  const childList = !isCollapsed && node.children != null && (
-    <ul
-      style={style}
-      className={classNames(
-        className,
-        depth > 0 && 'ml-[calc(1.2rem+0.5px)] pl-[0.7rem] border-l',
-        isHovered ? 'border-l-text-subtle' : 'border-l-border-subtle',
-      )}
-    >
-      {node.children.map(function mapChild(child, i) {
-        return (
-          <Fragment key={getItemKey(child.item)}>
-            <TreeDropMarker treeId={treeId} parent={node} index={i} />
-            <TreeItemList
-              treeId={treeId}
-              node={child}
-              ItemInner={ItemInner}
-              ItemLeftSlot={ItemLeftSlot}
-              onClick={onClick}
-              getEditOptions={getEditOptions}
-              depth={depth + 1}
-              getItemKey={getItemKey}
-              getContextMenu={getContextMenu}
-            />
-          </Fragment>
-        );
-      })}
-      <TreeDropMarker treeId={treeId} parent={node ?? null} index={node.children?.length ?? 0} />
-    </ul>
-  );
-
-  if (depth === 0) {
-    return childList;
-  }
-
  return (
-    <li>
-      <TreeItem
-        treeId={treeId}
-        node={node}
-        getContextMenu={getContextMenu}
-        ItemInner={ItemInner}
-        ItemLeftSlot={ItemLeftSlot}
-        onClick={onClick}
-        getEditOptions={getEditOptions}
-      />
-      {childList}
-    </li>
+    <ul role="tree" style={style} className={className}>
+      <TreeDropMarker node={null} treeId={treeId} index={0} />
+      {nodes.map((child, i) => (
+        <Fragment key={getItemKey(child.node.item)}>
+          <TreeItem
+            treeId={treeId}
+            node={child.node}
+            ItemInner={ItemInner}
+            ItemLeftSlot={ItemLeftSlot}
+            onClick={onClick}
+            getEditOptions={getEditOptions}
+            getContextMenu={getContextMenu}
+            getItemKey={getItemKey}
+            depth={forceDepth == null ? child.depth : forceDepth}
+          />
+          <TreeDropMarker node={child.node} treeId={treeId} index={i+1} />
+        </Fragment>
+      ))}
+    </ul>
  );
 }

 export const TreeItemList = memo(
  TreeItemList_,
-  ({ node: prevNode, ...prevProps }, { node: nextNode, ...nextProps }) => {
+  (
+    { nodes: prevNodes, getItemKey: prevGetItemKey, ...prevProps },
+    { nodes: nextNodes, getItemKey: nextGetItemKey, ...nextProps },
+  ) => {
    const nonEqualKeys = [];
    for (const key of Object.keys(prevProps)) {
      if (prevProps[key as keyof typeof prevProps] !== nextProps[key as keyof typeof nextProps]) {
@@ -100,32 +69,16 @@ export const TreeItemList = memo(
      // console.log('TreeItemList: ', nonEqualKeys);
      return false;
    }
-    return equalSubtree(prevNode, nextNode, nextProps.getItemKey);
+    if (prevNodes.length !== nextNodes.length) return false;
+
+    for (let i = 0; i < prevNodes.length; i++) {
+      const prev = prevNodes[i]!;
+      const next = nextNodes[i]!;
+      if (prevGetItemKey(prev.node.item) !== nextGetItemKey(next.node.item)) {
+        return false;
+      }
+    }
+
+    return true;
  },
 ) as typeof TreeItemList_;
-
-const TreeDropMarker = memo(function TreeDropMarker<T extends { id: string }>({
-  className,
-  treeId,
-  parent,
-  index,
-}: {
-  treeId: string;
-  parent: TreeNode<T> | null;
-  index: number;
-  className?: string;
-}) {
-  const isHovered = useAtomValue(isItemHoveredFamily({ treeId, parentId: parent?.item.id, index }));
-  const isLastItem = parent?.children?.length === index;
-  const isLastItemHovered = useAtomValue(
-    isItemHoveredFamily({
-      treeId,
-      parentId: parent?.item.id,
-      index: parent?.children?.length ?? 0,
-    }),
-  );
-
-  if (!isHovered && !(isLastItem && isLastItemHovered)) return null;
-
-  return <DropMarker className={classNames(className)} />;
-});
--- a/src-web/components/core/tree/atoms.ts
+++ b/src-web/components/core/tree/atoms.ts
@@ -32,43 +32,46 @@ export const draggingIdsFamily = atomFamily((_treeId: string) => {

 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const hoveredParentFamily = atomFamily((_treeId: string) => {
-  return atom<{ index: number | null; parentId: string | null }>({ index: null, parentId: null });
+  return atom<{
+    index: number | null;
+    childIndex: number | null;
+    parentId: string | null;
+    parentDepth: number | null;
+  }>({
+    index: null,
+    childIndex: null,
+    parentId: null,
+    parentDepth: null,
+  });
 });

 export const isParentHoveredFamily = atomFamily(
-  ({ treeId, parentId }: { treeId: string; parentId: string | null | undefined }) =>
+  ({ treeId, parentId }: { treeId: string; parentId: string | null }) =>
    selectAtom(hoveredParentFamily(treeId), (v) => v.parentId === parentId, Object.is),
  (a, b) => a.treeId === b.treeId && a.parentId === b.parentId,
 );

-export const isItemHoveredFamily = atomFamily(
-  ({
-    treeId,
-    parentId,
-    index,
-  }: {
-    treeId: string;
-    parentId: string | null | undefined;
-    index: number | null;
-  }) =>
-    selectAtom(
-      hoveredParentFamily(treeId),
-      (v) => v.parentId === parentId && v.index === index,
-      Object.is,
-    ),
-  (a, b) => a.treeId === b.treeId && a.parentId === b.parentId && a.index === b.index,
+export const isIndexHoveredFamily = atomFamily(
+  ({ treeId, index }: { treeId: string; index: number }) =>
+    selectAtom(hoveredParentFamily(treeId), (v) => v.index === index, Object.is),
+  (a, b) => a.treeId === b.treeId && a.index === b.index,
 );

-function kvKey(workspaceId: string | null) {
-  return ['sidebar_collapsed', workspaceId ?? 'n/a'];
-}
+export const hoveredParentDepthFamily = atomFamily((treeId: string) =>
+  selectAtom(
+    hoveredParentFamily(treeId),
+    (s) => s.parentDepth,
+    (a, b) => Object.is(a, b), // prevents re-render unless the value changes
+  ),
+);

 export const collapsedFamily = atomFamily((workspaceId: string) => {
-  return atomWithKVStorage<Record<string, boolean>>(kvKey(workspaceId), {});
+  const key = ['sidebar_collapsed', workspaceId ?? 'n/a'];
+  return atomWithKVStorage<Record<string, boolean>>(key, {});
 });

 export const isCollapsedFamily = atomFamily(
-  ({ treeId, itemId }: { treeId: string; itemId: string }) =>
+  ({ treeId, itemId = 'n/a' }: { treeId: string; itemId: string | undefined }) =>
    atom(
      // --- getter ---
      (get) => !!get(collapsedFamily(treeId))[itemId],
--- a/src-web/components/core/tree/common.ts
+++ b/src-web/components/core/tree/common.ts
@@ -1,4 +1,3 @@
-import type { DragMoveEvent } from '@dnd-kit/core';
 import { jotaiStore } from '../../../lib/jotai';
 import { selectedIdsFamily } from './atoms';

@@ -6,6 +5,7 @@ export interface TreeNode<T extends { id: string }> {
  children?: TreeNode<T>[];
  item: T;
  parent: TreeNode<T> | null;
+  depth: number;
 }

 export interface SelectableTreeNode<T extends { id: string }> {
@@ -41,30 +41,9 @@ export function equalSubtree<T extends { id: string }>(
 }

 export function hasAncestor<T extends { id: string }>(node: TreeNode<T>, ancestorId: string) {
-  // Check parents recursively
  if (node.parent == null) return false;
  if (node.parent.item.id === ancestorId) return true;
+
+  // Check parents recursively
  return hasAncestor(node.parent, ancestorId);
 }
-
-export function computeSideForDragMove<T extends { id: string }>(
-  node: TreeNode<T>,
-  e: DragMoveEvent,
-): 'above' | 'below' | null {
-  if (e.over == null || e.over.id !== node.item.id) {
-    return null;
-  }
-  if (e.active.rect.current.initial == null) return null;
-
-  const overRect = e.over.rect;
-  const activeTop =
-    e.active.rect.current.translated?.top ?? e.active.rect.current.initial.top + e.delta.y;
-  const pointerY = activeTop + e.active.rect.current.initial.height / 2;
-
-  const hoverTop = overRect.top;
-  const hoverBottom = overRect.bottom;
-  const hoverMiddleY = (hoverBottom - hoverTop) / 2;
-  const hoverClientY = pointerY - hoverTop;
-
-  return hoverClientY < hoverMiddleY ? 'above' : 'below';
-}
--- a/src-web/components/core/tree/useSelectableItems.ts
+++ b/src-web/components/core/tree/useSelectableItems.ts
@@ -0,0 +1,30 @@
+import { useMemo } from 'react';
+import type { SelectableTreeNode, TreeNode } from './common';
+
+export function useSelectableItems<T extends { id: string }>(root: TreeNode<T>) {
+  return useMemo(() => {
+    const selectableItems: SelectableTreeNode<T>[] = [];
+
+    // Put requests and folders into a tree structure
+    const next = (node: TreeNode<T>, depth: number = 0) => {
+      if (node.children == null) {
+        return;
+      }
+
+      // Recurse to children
+      let selectableIndex = 0;
+      for (const child of node.children) {
+        selectableItems.push({
+          node: child,
+          index: selectableIndex++,
+          depth,
+        });
+
+        next(child, depth + 1);
+      }
+    };
+
+    next(root);
+    return selectableItems;
+  }, [root]);
+}
--- a/src-web/components/graphql/GraphQLDocsExplorer.tsx
+++ b/src-web/components/graphql/GraphQLDocsExplorer.tsx
@@ -177,7 +177,7 @@ function GraphQLExplorerHeader({
  };
  const crumbs = findIt(item);
  return (
-    <nav className="pl-2 pr-1 h-lg grid grid-rows-1 grid-cols-[minmax(0,1fr)_auto] items-center min-w-0 gap-1">
+    <nav className="pl-2 pr-1 h-lg grid grid-rows-1 grid-cols-[minmax(0,1fr)_auto] items-center min-w-0 gap-1 z-10">
      <div className="@container w-full relative pl-2 pr-1 h-lg grid grid-rows-1 grid-cols-[minmax(0,min-content)_auto] items-center gap-1">
        <div className="whitespace-nowrap flex items-center gap-2 text-text-subtle text-sm overflow-x-auto hide-scrollbars">
          <Icon icon="book_open_text" />
--- a/src-web/components/graphql/GraphQLEditor.tsx
+++ b/src-web/components/graphql/GraphQLEditor.tsx
@@ -13,7 +13,7 @@ import { Button } from '../core/Button';
 import type { DropdownItem } from '../core/Dropdown';
 import { Dropdown } from '../core/Dropdown';
 import type { EditorProps } from '../core/Editor/Editor';
-import { Editor } from '../core/Editor/Editor';
+import { Editor } from '../core/Editor/LazyEditor';
 import { FormattedError } from '../core/FormattedError';
 import { Icon } from '../core/Icon';
 import { Separator } from '../core/Separator';
--- a/src-web/components/responseViewers/EventStreamViewer.tsx
+++ b/src-web/components/responseViewers/EventStreamViewer.tsx
@@ -9,7 +9,7 @@ import { AutoScroller } from '../core/AutoScroller';
 import { Banner } from '../core/Banner';
 import { Button } from '../core/Button';
 import type { EditorProps } from '../core/Editor/Editor';
-import { Editor } from '../core/Editor/Editor';
+import { Editor } from '../core/Editor/LazyEditor';
 import { Icon } from '../core/Icon';
 import { InlineCode } from '../core/InlineCode';
 import { Separator } from '../core/Separator';
--- a/src-web/components/responseViewers/PdfViewer.tsx
+++ b/src-web/components/responseViewers/PdfViewer.tsx
@@ -7,6 +7,13 @@ import React, { useRef, useState } from 'react';
 import { Document, Page } from 'react-pdf';
 import { useContainerSize } from '../../hooks/useContainerQuery';

+import('react-pdf').then(({ pdfjs }) => {
+  pdfjs.GlobalWorkerOptions.workerSrc = new URL(
+    'pdfjs-dist/build/pdf.worker.min.mjs',
+    import.meta.url,
+  ).toString();
+});
+
 interface Props {
  bodyPath: string;
 }
--- a/src-web/components/responseViewers/TextViewer.tsx
+++ b/src-web/components/responseViewers/TextViewer.tsx
@@ -7,7 +7,7 @@ import { useDebouncedValue } from '../../hooks/useDebouncedValue';
 import { useFormatText } from '../../hooks/useFormatText';
 import { useResponseBodyText } from '../../hooks/useResponseBodyText';
 import type { EditorProps } from '../core/Editor/Editor';
-import { Editor } from '../core/Editor/Editor';
+import { Editor } from '../core/Editor/LazyEditor';
 import { hyperlink } from '../core/Editor/hyperlink/extension';
 import { IconButton } from '../core/IconButton';
 import { Input } from '../core/Input';
--- a/src-web/hooks/useCreateDropdownItems.tsx
+++ b/src-web/hooks/useCreateDropdownItems.tsx
@@ -1,3 +1,5 @@
+import type { HttpRequest, WebsocketRequest } from '@yaakapp-internal/models';
+import type { GrpcRequest } from '@yaakapp-internal/sync';
 import { useAtomValue } from 'jotai';
 import { useMemo } from 'react';
 import { createFolder } from '../commands/commands';
@@ -5,7 +7,6 @@ import type { DropdownItem } from '../components/core/Dropdown';
 import { Icon } from '../components/core/Icon';
 import { createRequestAndNavigate } from '../lib/createRequestAndNavigate';
 import { generateId } from '../lib/generateId';
-import { jotaiStore } from '../lib/jotai';
 import { BODY_TYPE_GRAPHQL } from '../lib/model_util';
 import { activeRequestAtom } from './useActiveRequest';
 import { activeWorkspaceIdAtom } from './useActiveWorkspace';
@@ -13,62 +14,78 @@ import { activeWorkspaceIdAtom } from './useActiveWorkspace';
 export function useCreateDropdownItems({
  hideFolder,
  hideIcons,
-  folderId: folderIdOption,
+  folderId,
 }: {
  hideFolder?: boolean;
  hideIcons?: boolean;
  folderId?: string | null | 'active-folder';
 } = {}): DropdownItem[] {
  const workspaceId = useAtomValue(activeWorkspaceIdAtom);
+  const activeRequest = useAtomValue(activeRequestAtom);

  const items = useMemo((): DropdownItem[] => {
-    const activeRequest = jotaiStore.get(activeRequestAtom);
-    const folderId =
-      (folderIdOption === 'active-folder' ? activeRequest?.folderId : folderIdOption) ?? null;
-    if (workspaceId == null) return [];
-
-    return [
-      {
-        label: 'HTTP',
-        leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
-        onSelect: () => createRequestAndNavigate({ model: 'http_request', workspaceId, folderId }),
-      },
-      {
-        label: 'GraphQL',
-        leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
-        onSelect: () =>
-          createRequestAndNavigate({
-            model: 'http_request',
-            workspaceId,
-            folderId,
-            bodyType: BODY_TYPE_GRAPHQL,
-            method: 'POST',
-            headers: [{ name: 'Content-Type', value: 'application/json', id: generateId() }],
-          }),
-      },
-      {
-        label: 'gRPC',
-        leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
-        onSelect: () => createRequestAndNavigate({ model: 'grpc_request', workspaceId, folderId }),
-      },
-      {
-        label: 'WebSocket',
-        leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
-        onSelect: () =>
-          createRequestAndNavigate({ model: 'websocket_request', workspaceId, folderId }),
-      },
-      ...((hideFolder
-        ? []
-        : [
-            { type: 'separator' },
-            {
-              label: 'Folder',
-              leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
-              onSelect: () => createFolder.mutate({ folderId }),
-            },
-          ]) as DropdownItem[]),
-    ];
-  }, [folderIdOption, hideFolder, hideIcons, workspaceId]);
+    return getCreateDropdownItems({ hideFolder, hideIcons, folderId, activeRequest, workspaceId });
+  }, [activeRequest, folderId, hideFolder, hideIcons, workspaceId]);

  return items;
 }
+
+export function getCreateDropdownItems({
+  hideFolder,
+  hideIcons,
+  folderId: folderIdOption,
+  workspaceId,
+  activeRequest,
+}: {
+  hideFolder?: boolean;
+  hideIcons?: boolean;
+  folderId?: string | null | 'active-folder';
+  workspaceId: string | null;
+  activeRequest: HttpRequest | GrpcRequest | WebsocketRequest | null;
+}): DropdownItem[] {
+  const folderId =
+    (folderIdOption === 'active-folder' ? activeRequest?.folderId : folderIdOption) ?? null;
+  if (workspaceId == null) return [];
+
+  return [
+    {
+      label: 'HTTP',
+      leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
+      onSelect: () => createRequestAndNavigate({ model: 'http_request', workspaceId, folderId }),
+    },
+    {
+      label: 'GraphQL',
+      leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
+      onSelect: () =>
+        createRequestAndNavigate({
+          model: 'http_request',
+          workspaceId,
+          folderId,
+          bodyType: BODY_TYPE_GRAPHQL,
+          method: 'POST',
+          headers: [{ name: 'Content-Type', value: 'application/json', id: generateId() }],
+        }),
+    },
+    {
+      label: 'gRPC',
+      leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
+      onSelect: () => createRequestAndNavigate({ model: 'grpc_request', workspaceId, folderId }),
+    },
+    {
+      label: 'WebSocket',
+      leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
+      onSelect: () =>
+        createRequestAndNavigate({ model: 'websocket_request', workspaceId, folderId }),
+    },
+    ...((hideFolder
+      ? []
+      : [
+          { type: 'separator' },
+          {
+            label: 'Folder',
+            leftSlot: hideIcons ? undefined : <Icon icon="plus" />,
+            onSelect: () => createFolder.mutate({ folderId }),
+          },
+        ]) as DropdownItem[]),
+  ];
+}
--- a/src-web/hooks/useSidebarItemCollapsed.ts
+++ b/src-web/hooks/useSidebarItemCollapsed.ts
@@ -1,7 +1,5 @@
-import { atom, useAtomValue } from 'jotai';
-import { useCallback } from 'react';
+import { atom } from 'jotai';
 import { atomWithKVStorage } from '../lib/atoms/atomWithKVStorage';
-import { jotaiStore } from '../lib/jotai';
 import { activeWorkspaceIdAtom } from './useActiveWorkspace';

 function kvKey(workspaceId: string | null) {
@@ -12,18 +10,3 @@ export const sidebarCollapsedAtom = atom((get) => {
  const workspaceId = get(activeWorkspaceIdAtom);
  return atomWithKVStorage<Record<string, boolean>>(kvKey(workspaceId), {});
 });
-
-export function useSidebarItemCollapsed(itemId: string) {
-  const map = useAtomValue(useAtomValue(sidebarCollapsedAtom));
-  const isCollapsed = map[itemId] === true;
-
-  const toggle = useCallback(() => toggleSidebarItemCollapsed(itemId), [itemId]);
-
-  return [isCollapsed, toggle] as const;
-}
-
-export function toggleSidebarItemCollapsed(itemId: string) {
-  jotaiStore.set(jotaiStore.get(sidebarCollapsedAtom), (prev) => {
-    return { ...prev, [itemId]: !prev[itemId] };
-  });
-}
--- a/src-web/lib/dnd.ts
+++ b/src-web/lib/dnd.ts
@@ -0,0 +1,23 @@
+import type { DragMoveEvent } from '@dnd-kit/core';
+
+export function computeSideForDragMove(
+  id: string,
+  e: DragMoveEvent,
+): 'above' | 'below' | null {
+  if (e.over == null || e.over.id !== id) {
+    return null;
+  }
+  if (e.active.rect.current.initial == null) return null;
+
+  const overRect = e.over.rect;
+  const activeTop =
+    e.active.rect.current.translated?.top ?? e.active.rect.current.initial.top + e.delta.y;
+  const pointerY = activeTop + e.active.rect.current.initial.height / 2;
+
+  const hoverTop = overRect.top;
+  const hoverBottom = overRect.bottom;
+  const hoverMiddleY = (hoverBottom - hoverTop) / 2;
+  const hoverClientY = pointerY - hoverTop;
+
+  return hoverClientY < hoverMiddleY ? 'above' : 'below';
+}
--- a/src-web/lib/importData.tsx
+++ b/src-web/lib/importData.tsx
@@ -67,7 +67,9 @@ async function performImport(filePath: string): Promise<boolean> {
      return (
        <VStack space={3} className="pb-4">
          <ul className="list-disc pl-6">
-            <li>{pluralizeCount('Workspace', imported.workspaces.length)}</li>
+            {imported.workspaces.length > 0 && (
+              <li>{pluralizeCount('Workspace', imported.workspaces.length)}</li>
+            )}
            {imported.environments.length > 0 && (
              <li>{pluralizeCount('Environment', imported.environments.length)}</li>
            )}
--- a/src-web/lib/theme/themes.ts
+++ b/src-web/lib/theme/themes.ts
@@ -6,7 +6,9 @@ import { resolveAppearance } from './appearance';
 export async function getThemes() {
  const themes = (await invokeCmd<GetThemesResponse[]>('cmd_get_themes')).flatMap((t) => t.themes);
  themes.sort((a, b) => a.label.localeCompare(b.label));
-  return { themes: [yaakDark, yaakLight, ...themes] };
+  // Remove duplicates, in case multiple plugins provide the same theme
+  const uniqueThemes = Array.from(new Map(themes.map((t) => [t.id, t])).values());
+  return { themes: [yaakDark, yaakLight, ...uniqueThemes] };
 }

 export async function getResolvedTheme(
--- a/src-web/main.tsx
+++ b/src-web/main.tsx
@@ -10,13 +10,6 @@ import { initGlobalListeners } from './lib/initGlobalListeners';
 import { jotaiStore } from './lib/jotai';
 import { router } from './lib/router';

-import('react-pdf').then(({ pdfjs }) => {
-  pdfjs.GlobalWorkerOptions.workerSrc = new URL(
-    'pdfjs-dist/build/pdf.worker.min.mjs',
-    import.meta.url,
-  ).toString();
-});
-
 // Hide decorations here because it doesn't work in Rust for some reason (bug?)
 const osType = type();
 if (osType !== 'macos') {
--- a/src-web/package.json
+++ b/src-web/package.json
@@ -23,10 +23,9 @@
    "@replit/codemirror-emacs": "^6.1.0",
    "@replit/codemirror-vim": "^6.3.0",
    "@replit/codemirror-vscode-keymap": "^6.0.2",
-    "@tailwindcss/container-queries": "^0.1.1",
-    "@tanstack/react-query": "^5.76.1",
-    "@tanstack/react-router": "^1.120.3",
-    "@tanstack/react-virtual": "^3.13.8",
+    "@tanstack/react-query": "^5.90.5",
+    "@tanstack/react-router": "^1.133.13",
+    "@tanstack/react-virtual": "^3.13.12",
    "@tauri-apps/api": "^2.8.0",
    "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
    "@tauri-apps/plugin-dialog": "^2.4.0",
@@ -56,8 +55,6 @@
    "parse-color": "^1.0.0",
    "react": "^19.1.0",
    "react-colorful": "^5.6.1",
-    "react-dnd": "^16.0.1",
-    "react-dnd-touch-backend": "^16.0.1",
    "react-dom": "^19.1.0",
    "react-markdown": "^10.1.0",
    "react-pdf": "^10.0.1",
@@ -86,13 +83,14 @@
    "@types/whatwg-mimetype": "^3.0.2",
    "@vitejs/plugin-react": "^4.6.0",
    "autoprefixer": "^10.4.21",
+    "@tailwindcss/container-queries": "^0.1.1",
    "decompress": "^4.2.1",
    "eslint-plugin-react-refresh": "^0.4.20",
    "internal-ip": "^8.0.0",
    "postcss": "^8.5.6",
    "postcss-nesting": "^13.0.2",
    "tailwindcss": "^3.4.17",
-    "vite": "^7.0.7",
+    "vite": "^7.0.8",
    "vite-plugin-static-copy": "^3.1.2",
    "vite-plugin-svgr": "^4.3.0",
    "vite-plugin-top-level-await": "^1.5.0",
--- a/src-web/routes/__root.tsx
+++ b/src-web/routes/__root.tsx
@@ -3,36 +3,35 @@ import { createRootRoute, Outlet } from '@tanstack/react-router';
 import { type } from '@tauri-apps/plugin-os';
 import classNames from 'classnames';
 import { Provider as JotaiProvider } from 'jotai';
-import { domAnimation, LazyMotion, MotionConfig } from 'motion/react';
-import React, { Suspense } from 'react';
-import { DndProvider } from 'react-dnd';
-import { TouchBackend } from 'react-dnd-touch-backend';
-import { Dialogs } from '../components/Dialogs';
+import { LazyMotion, MotionConfig } from 'motion/react';
+import React, { lazy, Suspense } from 'react';
 import { GlobalHooks } from '../components/GlobalHooks';
 import RouteError from '../components/RouteError';
-import { Toasts } from '../components/Toasts';
 import { jotaiStore } from '../lib/jotai';
 import { queryClient } from '../lib/queryClient';

+const Toasts = lazy(() => import('../components/Toasts').then((m) => ({ default: m.Toasts })));
+const Dialogs = lazy(() => import('../components/Dialogs').then((m) => ({ default: m.Dialogs })));
+
 export const Route = createRootRoute({
  component: RouteComponent,
  errorComponent: RouteError,
 });

+const motionFeatures = () => import('framer-motion').then((mod) => mod.domAnimation);
+
 function RouteComponent() {
  return (
    <JotaiProvider store={jotaiStore}>
      <QueryClientProvider client={queryClient}>
-        <LazyMotion features={domAnimation}>
+        <LazyMotion strict features={motionFeatures}>
          <MotionConfig transition={{ duration: 0.1 }}>
-            <DndProvider backend={TouchBackend} options={{ enableMouseEvents: true }}>
-              <Suspense>
-                <GlobalHooks />
-                <Toasts />
-                <Dialogs />
-                <Layout />
-              </Suspense>
-            </DndProvider>
+            <Suspense>
+              <Toasts />
+              <Dialogs />
+            </Suspense>
+            <Layout />
+            <GlobalHooks />
          </MotionConfig>
        </LazyMotion>
      </QueryClientProvider>
--- a/src-web/vite.config.ts
+++ b/src-web/vite.config.ts
@@ -1,5 +1,5 @@
 // @ts-ignore
-import { TanStackRouterVite } from '@tanstack/router-plugin/vite';
+import { tanstackRouter } from '@tanstack/router-plugin/vite';
 import react from '@vitejs/plugin-react';
 import reactRefresh from 'eslint-plugin-react-refresh';
 import { internalIpV4 } from 'internal-ip';
@@ -26,7 +26,8 @@ export default defineConfig(async () => ({
  plugins: [
    wasm(),
    reactRefresh.configs.vite,
-    TanStackRouterVite({
+    tanstackRouter({
+      target: 'react',
      routesDirectory: './routes',
      generatedRouteTree: './routeTree.gen.ts',
      autoCodeSplitting: true,
@@ -44,6 +45,14 @@ export default defineConfig(async () => ({
  build: {
    outDir: '../dist',
    emptyOutDir: true,
+    rollupOptions: {
+      output: {
+        // Make chunk names readable
+        chunkFileNames: 'assets/chunk-[name]-[hash].js',
+        entryFileNames: 'assets/entry-[name]-[hash].js',
+        assetFileNames: 'assets/asset-[name]-[hash][extname]',
+      },
+    },
  },
  clearScreen: false,
  server: {
Author	SHA1	Message	Date
Gregory Schier	451c8b9dde	Fix PDF viewer	2025-10-22 08:56:36 -07:00
Gregory Schier	b7682db9a3	Remove duplicate themes in getThemes function	2025-10-22 06:56:00 -07:00
Gregory Schier	7e2d72c4e3	Fix secure() function editing	2025-10-21 20:09:56 -07:00
Gregory Schier	28bb460409	Add empty workspaces array to environment output fixture	2025-10-21 08:16:33 -07:00
Gregory Schier	56d635166b	Add tsconfig.json for importer-postman-environment plugin	2025-10-21 08:08:27 -07:00
Gregory Schier	f6a7257104	Text color for selected	2025-10-21 07:46:55 -07:00
Gregory Schier	1fce060ef7	Npm i	2025-10-21 07:36:21 -07:00
Gregory Schier	5c966e5a95	Add bracket matching	2025-10-21 07:27:07 -07:00
Gregory Schier	0520ef5d43	Import postman environments https://feedback.yaak.app/p/import-postman-environments	2025-10-21 07:20:37 -07:00
dependabot[bot]	25b110778a	Bump vite from 7.0.7 to 7.0.8 (#269 )	2025-10-20 21:19:55 -07:00
Gregory Schier	327bf84e57	Clarify proto import buttons	2025-10-20 09:23:12 -07:00
Gregory Schier	1c48b309b5	Fix indent guide hovering	2025-10-20 09:13:00 -07:00
Gregory Schier	7c5dec821d	Remove React.lazy on overlay and tooltip	2025-10-19 12:00:30 -07:00
gschier	dcd8f6c08a	Deploying to main from @ mountain-loop/yaak@31f9a63c3b 🚀	2025-10-19 17:19:55 +00:00
Gregory Schier	31f9a63c3b	Don't force push	2025-10-19 10:18:32 -07:00
Gregory Schier	e902b67a63	Replace `arrayMove` with custom implementation in `PairEditor` to remove dependency on `@dnd-kit/sortable`.	2025-10-19 09:40:11 -07:00
Gregory Schier	b11c72fde4	Add back creation items to context menu	2025-10-19 08:52:03 -07:00
Gregory Schier	07b90c6ae3	Make plugins scrollable	2025-10-19 08:21:36 -07:00
Gregory Schier	ba6163b6d8	Better code splitting and removed final instances of react-dnd	2025-10-19 08:16:56 -07:00
Gregory Schier	8055b625d0	Improve handling of drag-and-drop for collapsed and empty folders in tree component	2025-10-18 07:59:14 -07:00
Gregory Schier	3a61ffbbb0	Better drag for empty folders	2025-10-18 07:41:33 -07:00
Gregory Schier	f8478677c5	Pass the previous app version to the notification endpoint so the update notification can display all missed changelogs, not just the latest one.	2025-10-18 07:13:52 -07:00
Gregory Schier	f5094c5a94	Fix drop marker	2025-10-17 16:15:14 -07:00
Étienne Lévesque	8300187566	[Plugins] [Auth] [oauth2] Support identity platforms with underlying IDPs (#261 ) Co-authored-by: Gregory Schier <gschier1990@gmail.com>	2025-10-17 16:07:25 -07:00
Kien Dang	cd8ab3616e	Fix GraphQL doc explorer CountBadge stacking order (#262 )	2025-10-17 15:33:40 -07:00
Maksim Karelov	be0c92b755	Add ability to select `fs.readFile` encoding (#267 )	2025-10-17 15:32:04 -07:00
Gregory Schier	c34ea20406	Flattened the sidebar tree	2025-10-17 15:07:02 -07:00