Fix window path issue

Remove unused import from window.rs
Try fix oauth window creation
2026-01-19 18:17:58 +01:00 · 2025-10-02 08:25:00 -07:00 · 2025-10-02 08:05:07 -07:00 · 2025-10-02 07:45:50 -07:00 · 2025-10-02 06:04:27 -07:00 · 2025-10-01 21:14:26 -07:00
209 changed files with 3811 additions and 1657 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:

      - name: install dependencies (windows only)
        if: matrix.platform == 'windows-latest'
-        run: cargo install --force trusted-signing-cli --version 0.5.0
+        run: cargo install --force trusted-signing-cli

      - name: Install NPM Dependencies
        run: npm ci
@@ -72,9 +72,16 @@ jobs:
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}

+      # Some things (eg. WASM package) requires building before lint will work
+      - name: Run bootstrap
+        run: npm run bootstrap
+
      - name: Run lint
        run: npm run lint

+      - name: Run tests
+        run: npm test
+
      - name: Set version
        run: npm run replace-version
        env:
@@ -106,5 +113,5 @@ jobs:
          releaseName: 'Release __VERSION__'
          releaseBody: '[Changelog __VERSION__](https://yaak.app/blog/__VERSION__)'
          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}
+          prerelease: true
+          args: '${{ matrix.args }} --config ./src-tauri/tauri.commercial.conf.json'
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Yaak is a desktop API client for interacting with REST, GraphQL, Server Sent Events (SSE), WebSocket, and gRPC
 APIs. It's built using [Tauri](https://tauri.app), Rust, and ReactJS.

-![366149288-f18e963f-0b68-4ecb-b8b8-cb71aa9aec02](https://github.com/user-attachments/assets/ca83b7ad-5708-411b-8faf-e36b365841a4)
+![Yaak API Client](https://yaak.app/static/screenshot.png)

 ## Contribution Policy

@@ -31,4 +31,7 @@ visit [`DEVELOPMENT.md`](DEVELOPMENT.md) for tips on setting up your environment

 - [Feedback and Bug Reports](https://feedback.yaak.app)
 - [Documentation](https://feedback.yaak.app/help)
- [Yaak vs Postman](https://yaak.app/blog/postman-alternative)
+- [Yaak vs Postman](https://yaak.app/alternatives/postman)
+- [Yaak vs Bruno](https://yaak.app/alternatives/bruno)
+- [Yaak vs Insomnia](https://yaak.app/alternatives/insomnia)
+
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
        "plugins/template-function-uuid",
        "plugins/template-function-xml",
        "plugins/themes-yaak",
+        "src-tauri",
        "src-tauri/yaak-crypto",
        "src-tauri/yaak-git",
        "src-tauri/yaak-fonts",
@@ -58,7 +59,7 @@
        "@eslint/compat": "^1.3.0",
        "@eslint/eslintrc": "^3.3.1",
        "@eslint/js": "^9.29.0",
-        "@tauri-apps/cli": "2.4.1",
+        "@tauri-apps/cli": "^2.8.4",
        "@typescript-eslint/eslint-plugin": "^8.27.0",
        "@typescript-eslint/parser": "^8.27.0",
        "@yaakapp/cli": "^0.2.7",
@@ -812,6 +813,12 @@
        "w3c-keyname": "^2.2.4"
      }
    },
+    "node_modules/@date-fns/tz": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.4.1.tgz",
+      "integrity": "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==",
+      "license": "MIT"
+    },
    "node_modules/@esbuild/aix-ppc64": {
      "version": "0.25.6",
      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz",
@@ -3081,9 +3088,9 @@
      }
    },
    "node_modules/@tauri-apps/api": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.6.0.tgz",
-      "integrity": "sha512-hRNcdercfgpzgFrMXWwNDBN0B7vNzOzRepy6ZAmhxi5mDLVPNrTpo9MGg2tN/F7JRugj4d2aF7E1rtPXAHaetg==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
+      "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw==",
      "license": "Apache-2.0 OR MIT",
      "funding": {
        "type": "opencollective",
@@ -3091,9 +3098,9 @@
      }
    },
    "node_modules/@tauri-apps/cli": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.4.1.tgz",
-      "integrity": "sha512-9Ta81jx9+57FhtU/mPIckDcOBtPTUdKM75t4+aA0X84b8Sclb0jy1xA8NplmcRzp2fsfIHNngU2NiRxsW5+yOQ==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.8.4.tgz",
+      "integrity": "sha512-ejUZBzuQRcjFV+v/gdj/DcbyX/6T4unZQjMSBZwLzP/CymEjKcc2+Fc8xTORThebHDUvqoXMdsCZt8r+hyN15g==",
      "dev": true,
      "license": "Apache-2.0 OR MIT",
      "bin": {
@@ -3107,23 +3114,23 @@
        "url": "https://opencollective.com/tauri"
      },
      "optionalDependencies": {
-        "@tauri-apps/cli-darwin-arm64": "2.4.1",
-        "@tauri-apps/cli-darwin-x64": "2.4.1",
-        "@tauri-apps/cli-linux-arm-gnueabihf": "2.4.1",
-        "@tauri-apps/cli-linux-arm64-gnu": "2.4.1",
-        "@tauri-apps/cli-linux-arm64-musl": "2.4.1",
-        "@tauri-apps/cli-linux-riscv64-gnu": "2.4.1",
-        "@tauri-apps/cli-linux-x64-gnu": "2.4.1",
-        "@tauri-apps/cli-linux-x64-musl": "2.4.1",
-        "@tauri-apps/cli-win32-arm64-msvc": "2.4.1",
-        "@tauri-apps/cli-win32-ia32-msvc": "2.4.1",
-        "@tauri-apps/cli-win32-x64-msvc": "2.4.1"
+        "@tauri-apps/cli-darwin-arm64": "2.8.4",
+        "@tauri-apps/cli-darwin-x64": "2.8.4",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "2.8.4",
+        "@tauri-apps/cli-linux-arm64-gnu": "2.8.4",
+        "@tauri-apps/cli-linux-arm64-musl": "2.8.4",
+        "@tauri-apps/cli-linux-riscv64-gnu": "2.8.4",
+        "@tauri-apps/cli-linux-x64-gnu": "2.8.4",
+        "@tauri-apps/cli-linux-x64-musl": "2.8.4",
+        "@tauri-apps/cli-win32-arm64-msvc": "2.8.4",
+        "@tauri-apps/cli-win32-ia32-msvc": "2.8.4",
+        "@tauri-apps/cli-win32-x64-msvc": "2.8.4"
      }
    },
    "node_modules/@tauri-apps/cli-darwin-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.4.1.tgz",
-      "integrity": "sha512-QME7s8XQwy3LWClTVlIlwXVSLKkeJ/z88pr917Mtn9spYOjnBfsgHAgGdmpWD3NfJxjg7CtLbhH49DxoFL+hLg==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.8.4.tgz",
+      "integrity": "sha512-BKu8HRkYV01SMTa7r4fLx+wjgtRK8Vep7lmBdHDioP6b8XH3q2KgsAyPWfEZaZIkZ2LY4SqqGARaE9oilNe0oA==",
      "cpu": [
        "arm64"
      ],
@@ -3138,9 +3145,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-darwin-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.4.1.tgz",
-      "integrity": "sha512-/r89IcW6Ya1sEsFUEH7wLNruDTj7WmDWKGpPy7gATFtQr5JEY4heernqE82isjTUimnHZD8SCr0jA3NceI4ybw==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.8.4.tgz",
+      "integrity": "sha512-imb9PfSd/7G6VAO7v1bQ2A3ZH4NOCbhGJFLchxzepGcXf9NKkfun157JH9mko29K6sqAwuJ88qtzbKCbWJTH9g==",
      "cpu": [
        "x64"
      ],
@@ -3155,9 +3162,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.4.1.tgz",
-      "integrity": "sha512-9tDijkRB+CchAGjXxYdY9l/XzFpLp1yihUtGXJz9eh+3qIoRI043n3e+6xmU8ZURr7XPnu+R4sCmXs6HD+NCEQ==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.8.4.tgz",
+      "integrity": "sha512-Ml215UnDdl7/fpOrF1CNovym/KjtUbCuPgrcZ4IhqUCnhZdXuphud/JT3E8X97Y03TZ40Sjz8raXYI2ET0exzw==",
      "cpu": [
        "arm"
      ],
@@ -3172,9 +3179,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-linux-arm64-gnu": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.4.1.tgz",
-      "integrity": "sha512-pnFGDEXBAzS4iDYAVxTRhAzNu3K2XPGflYyBc0czfHDBXopqRgMyj5Q9Wj7HAwv6cM8BqzXINxnb2ZJFGmbSgA==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.8.4.tgz",
+      "integrity": "sha512-pbcgBpMyI90C83CxE5REZ9ODyIlmmAPkkJXtV398X3SgZEIYy5TACYqlyyv2z5yKgD8F8WH4/2fek7+jH+ZXAw==",
      "cpu": [
        "arm64"
      ],
@@ -3189,9 +3196,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-linux-arm64-musl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.4.1.tgz",
-      "integrity": "sha512-Hp0zXgeZNKmT+eoJSCxSBUm2QndNuRxR55tmIeNm3vbyUMJN/49uW7nurZ5fBPsacN4Pzwlx1dIMK+Gnr9A69w==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.8.4.tgz",
+      "integrity": "sha512-zumFeaU1Ws5Ay872FTyIm7z8kfzEHu8NcIn8M6TxbJs0a7GRV21KBdpW1zNj2qy7HynnpQCqjAYXTUUmm9JAOw==",
      "cpu": [
        "arm64"
      ],
@@ -3206,9 +3213,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-linux-riscv64-gnu": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.4.1.tgz",
-      "integrity": "sha512-3T3bo2E4fdYRvzcXheWUeQOVB+LunEEi92iPRgOyuSVexVE4cmHYl+MPJF+EUV28Et0hIVTsHibmDO0/04lAFg==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.8.4.tgz",
+      "integrity": "sha512-qiqbB3Zz6IyO201f+1ojxLj65WYj8mixL5cOMo63nlg8CIzsP23cPYUrx1YaDPsCLszKZo7tVs14pc7BWf+/aQ==",
      "cpu": [
        "riscv64"
      ],
@@ -3223,9 +3230,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-linux-x64-gnu": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.4.1.tgz",
-      "integrity": "sha512-kLN0FdNONO+2i+OpU9+mm6oTGufRC00e197TtwjpC0N6K2K8130w7Q3FeODIM2CMyg0ov3tH+QWqKW7GNhHFzg==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.8.4.tgz",
+      "integrity": "sha512-TaqaDd9Oy6k45Hotx3pOf+pkbsxLaApv4rGd9mLuRM1k6YS/aw81YrsMryYPThrxrScEIUcmNIHaHsLiU4GMkw==",
      "cpu": [
        "x64"
      ],
@@ -3240,9 +3247,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-linux-x64-musl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.4.1.tgz",
-      "integrity": "sha512-a8exvA5Ub9eg66a6hsMQKJIkf63QAf9OdiuFKOsEnKZkNN2x0NLgfvEcqdw88VY0UMs9dBoZ1AGbWMeYnLrLwQ==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.8.4.tgz",
+      "integrity": "sha512-ot9STAwyezN8w+bBHZ+bqSQIJ0qPZFlz/AyscpGqB/JnJQVDFQcRDmUPFEaAtt2UUHSWzN3GoTJ5ypqLBp2WQA==",
      "cpu": [
        "x64"
      ],
@@ -3257,9 +3264,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-win32-arm64-msvc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.4.1.tgz",
-      "integrity": "sha512-4JFrslsMCJQG1c573T9uqQSAbF3j/tMKkMWzsIssv8jvPiP++OG61A2/F+y9te9/Q/O95cKhDK63kaiO5xQaeg==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.8.4.tgz",
+      "integrity": "sha512-+2aJ/g90dhLiOLFSD1PbElXX3SoMdpO7HFPAZB+xot3CWlAZD1tReUFy7xe0L5GAR16ZmrxpIDM9v9gn5xRy/w==",
      "cpu": [
        "arm64"
      ],
@@ -3274,9 +3281,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-win32-ia32-msvc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.4.1.tgz",
-      "integrity": "sha512-9eXfFORehYSCRwxg2KodfmX/mhr50CI7wyBYGbPLePCjr5z0jK/9IyW6r0tC+ZVjwpX48dkk7hKiUgI25jHjzA==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.8.4.tgz",
+      "integrity": "sha512-yj7WDxkL1t9Uzr2gufQ1Hl7hrHuFKTNEOyascbc109EoiAqCp0tgZ2IykQqOZmZOHU884UAWI1pVMqBhS/BfhA==",
      "cpu": [
        "ia32"
      ],
@@ -3291,9 +3298,9 @@
      }
    },
    "node_modules/@tauri-apps/cli-win32-x64-msvc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.4.1.tgz",
-      "integrity": "sha512-60a4Ov7Jrwqz2hzDltlS7301dhSAmM9dxo+IRBD3xz7yobKrgaHXYpWvnRomYItHcDd51VaKc9292H8/eE/gsw==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.8.4.tgz",
+      "integrity": "sha512-XuvGB4ehBdd7QhMZ9qbj/8icGEatDuBNxyYHbLKsTYh90ggUlPa/AtaqcC1Fo69lGkTmq9BOKrs1aWSi7xDonA==",
      "cpu": [
        "x64"
      ],
@@ -3317,57 +3324,57 @@
      }
    },
    "node_modules/@tauri-apps/plugin-dialog": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.3.0.tgz",
-      "integrity": "sha512-ylSBvYYShpGlKKh732ZuaHyJ5Ie1JR71QCXewCtsRLqGdc8Is4xWdz6t43rzXyvkItM9syNPMvFVcvjgEy+/GA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
+      "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
      "license": "MIT OR Apache-2.0",
      "dependencies": {
-        "@tauri-apps/api": "^2.6.0"
+        "@tauri-apps/api": "^2.8.0"
      }
    },
    "node_modules/@tauri-apps/plugin-fs": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-fs/-/plugin-fs-2.4.0.tgz",
-      "integrity": "sha512-Sp8AdDcbyXyk6LD6Pmdx44SH3LPeNAvxR2TFfq/8CwqzfO1yOyV+RzT8fov0NNN7d9nvW7O7MtMAptJ42YXA5g==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-fs/-/plugin-fs-2.4.2.tgz",
+      "integrity": "sha512-YGhmYuTgXGsi6AjoV+5mh2NvicgWBfVJHHheuck6oHD+HC9bVWPaHvCP0/Aw4pHDejwrvT8hE3+zZAaWf+hrig==",
      "license": "MIT OR Apache-2.0",
      "dependencies": {
-        "@tauri-apps/api": "^2.6.0"
+        "@tauri-apps/api": "^2.8.0"
      }
    },
    "node_modules/@tauri-apps/plugin-log": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-log/-/plugin-log-2.6.0.tgz",
-      "integrity": "sha512-gVp3l31akA1Jk2bZsTA0hMFD5/gLe49Nw1btu5lViau0QqgC2XyT79LSwvy7a44ewtQbSexchqIg7oTJKMIbXQ==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-log/-/plugin-log-2.7.0.tgz",
+      "integrity": "sha512-81XQ2f93x4vmIB5OY0XlYAxy60cHdYLs0Ki8Qp38tNATRiuBit+Orh3frpY3qfYQnqEvYVyRub7YRJWlmW2RRA==",
      "license": "MIT OR Apache-2.0",
      "dependencies": {
-        "@tauri-apps/api": "^2.6.0"
+        "@tauri-apps/api": "^2.8.0"
      }
    },
    "node_modules/@tauri-apps/plugin-opener": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-opener/-/plugin-opener-2.4.0.tgz",
-      "integrity": "sha512-43VyN8JJtvKWJY72WI/KNZszTpDpzHULFxQs0CJBIYUdCRowQ6Q1feWTDb979N7nldqSuDOaBupZ6wz2nvuWwQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-opener/-/plugin-opener-2.5.0.tgz",
+      "integrity": "sha512-B0LShOYae4CZjN8leiNDbnfjSrTwoZakqKaWpfoH6nXiJwt6Rgj6RnVIffG3DoJiKsffRhMkjmBV9VeilSb4TA==",
      "license": "MIT OR Apache-2.0",
      "dependencies": {
-        "@tauri-apps/api": "^2.6.0"
+        "@tauri-apps/api": "^2.8.0"
      }
    },
    "node_modules/@tauri-apps/plugin-os": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.0.tgz",
-      "integrity": "sha512-dm3bDsMuUngpIQdJ1jaMkMfyQpHyDcaTIKTFaAMHoKeUd+Is3UHO2uzhElr6ZZkfytIIyQtSVnCWdW2Kc58f3g==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.1.tgz",
+      "integrity": "sha512-ty5V8XDUIFbSnrk3zsFoP3kzN+vAufYzalJSlmrVhQTImIZa1aL1a03bOaP2vuBvfR+WDRC6NgV2xBl8G07d+w==",
      "license": "MIT OR Apache-2.0",
      "dependencies": {
-        "@tauri-apps/api": "^2.6.0"
+        "@tauri-apps/api": "^2.8.0"
      }
    },
    "node_modules/@tauri-apps/plugin-shell": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.0.tgz",
-      "integrity": "sha512-6GIRxO2z64uxPX4CCTuhQzefvCC0ew7HjdBhMALiGw74vFBDY95VWueAHOHgNOMV4UOUAFupyidN9YulTe5xlA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.1.tgz",
+      "integrity": "sha512-jjs2WGDO/9z2pjNlydY/F5yYhNsscv99K5lCmU5uKjsVvQ3dRlDhhtVYoa4OLDmktLtQvgvbQjCFibMl6tgGfw==",
      "license": "MIT OR Apache-2.0",
      "dependencies": {
-        "@tauri-apps/api": "^2.6.0"
+        "@tauri-apps/api": "^2.8.0"
      }
    },
    "node_modules/@types/babel__core": {
@@ -3619,6 +3626,16 @@
        "@types/react": "^19.0.0"
      }
    },
+    "node_modules/@types/react-syntax-highlighter": {
+      "version": "15.5.13",
+      "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.13.tgz",
+      "integrity": "sha512-uLGJ87j6Sz8UaBAooU0T6lWJ0dBmjZgN1PZTrj05TNql2/XpC6+4HhMT5syIdFUUt+FASfCeLLv4kBygNU+8qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
    "node_modules/@types/shell-quote": {
      "version": "1.7.5",
      "resolved": "https://registry.npmjs.org/@types/shell-quote/-/shell-quote-1.7.5.tgz",
@@ -4235,6 +4252,10 @@
      "resolved": "src-tauri/yaak-sync",
      "link": true
    },
+    "node_modules/@yaakapp-internal/tauri": {
+      "resolved": "src-tauri",
+      "link": true
+    },
    "node_modules/@yaakapp-internal/templates": {
      "resolved": "src-tauri/yaak-templates",
      "link": true
@@ -9018,6 +9039,16 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/hast-util-parse-selector": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz",
+      "integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
    "node_modules/hast-util-to-html": {
      "version": "9.0.5",
      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
@@ -9081,6 +9112,71 @@
        "url": "https://opencollective.com/unified"
      }
    },
+    "node_modules/hastscript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz",
+      "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^2.0.0",
+        "comma-separated-tokens": "^1.0.0",
+        "hast-util-parse-selector": "^2.0.0",
+        "property-information": "^5.0.0",
+        "space-separated-tokens": "^1.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hastscript/node_modules/@types/hast": {
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.10.tgz",
+      "integrity": "sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^2"
+      }
+    },
+    "node_modules/hastscript/node_modules/@types/unist": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz",
+      "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
+      "license": "MIT"
+    },
+    "node_modules/hastscript/node_modules/comma-separated-tokens": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
+      "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/hastscript/node_modules/property-information": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
+      "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
+      "license": "MIT",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/hastscript/node_modules/space-separated-tokens": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
+      "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
    "node_modules/hexy": {
      "version": "0.3.5",
      "resolved": "https://registry.npmjs.org/hexy/-/hexy-0.3.5.tgz",
@@ -9093,6 +9189,21 @@
        "node": ">=10.4"
      }
    },
+    "node_modules/highlight.js": {
+      "version": "10.7.3",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
+      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/highlightjs-vue": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/highlightjs-vue/-/highlightjs-vue-1.0.0.tgz",
+      "integrity": "sha512-PDEfEF102G23vHmPhLyPboFCD+BkMGu+GuJe2d9/eH4FsCwvgBpnc9n0pGE+ffKdph38s6foEZiEjdgHdzp+IA==",
+      "license": "CC0-1.0"
+    },
    "node_modules/history": {
      "version": "5.3.0",
      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
@@ -10782,6 +10893,33 @@
        "tslib": "^2.0.3"
      }
    },
+    "node_modules/lowlight": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
+      "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
+      "license": "MIT",
+      "dependencies": {
+        "fault": "^1.0.0",
+        "highlight.js": "~10.7.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/lowlight/node_modules/fault": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
+      "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
+      "license": "MIT",
+      "dependencies": {
+        "format": "^0.2.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
    "node_modules/lru-cache": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -14103,6 +14241,15 @@
        "url": "https://github.com/prettier/prettier?sponsor=1"
      }
    },
+    "node_modules/prismjs": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
+      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/process-nextick-args": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -14339,6 +14486,23 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/react-syntax-highlighter": {
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.6.1.tgz",
+      "integrity": "sha512-OqJ2/vL7lEeV5zTJyG7kmARppUjiB9h9udl4qHQjjgEos66z00Ia0OckwYfRxCSFrW8RJIBnsBwQsHZbVPspqg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.3.1",
+        "highlight.js": "^10.4.1",
+        "highlightjs-vue": "^1.0.0",
+        "lowlight": "^1.17.0",
+        "prismjs": "^1.27.0",
+        "refractor": "^3.6.0"
+      },
+      "peerDependencies": {
+        "react": ">= 0.14.0"
+      }
+    },
    "node_modules/react-universal-interface": {
      "version": "0.6.2",
      "resolved": "https://registry.npmjs.org/react-universal-interface/-/react-universal-interface-0.6.2.tgz",
@@ -14654,6 +14818,122 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/refractor": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz",
+      "integrity": "sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==",
+      "license": "MIT",
+      "dependencies": {
+        "hastscript": "^6.0.0",
+        "parse-entities": "^2.0.0",
+        "prismjs": "~1.27.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/character-entities": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
+      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/character-entities-legacy": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
+      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/character-reference-invalid": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
+      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/is-alphabetical": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
+      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/is-alphanumerical": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
+      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
+      "license": "MIT",
+      "dependencies": {
+        "is-alphabetical": "^1.0.0",
+        "is-decimal": "^1.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/is-decimal": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
+      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/is-hexadecimal": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
+      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/parse-entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
+      "license": "MIT",
+      "dependencies": {
+        "character-entities": "^1.0.0",
+        "character-entities-legacy": "^1.0.0",
+        "character-reference-invalid": "^1.0.0",
+        "is-alphanumerical": "^1.0.0",
+        "is-decimal": "^1.0.0",
+        "is-hexadecimal": "^1.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/refractor/node_modules/prismjs": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz",
+      "integrity": "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/reftools": {
      "version": "1.1.9",
      "resolved": "https://registry.npmjs.org/reftools/-/reftools-1.1.9.tgz",
@@ -17595,21 +17875,24 @@
      }
    },
    "node_modules/vite": {
-      "version": "6.2.7",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.7.tgz",
-      "integrity": "sha512-qg3LkeuinTrZoJHHF94coSaTfIPyBYoywp+ys4qu20oSJFbKMYoIJo0FWJT9q6Vp49l6z9IsJRbHdcGtiKbGoQ==",
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.7.tgz",
+      "integrity": "sha512-hc6LujN/EkJHmxeiDJMs0qBontZ1cdBvvoCbWhVjzUFTU329VRyOC46gHNSA8NcOC5yzCeXpwI40tieI3DEZqg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "esbuild": "^0.25.0",
-        "postcss": "^8.5.3",
-        "rollup": "^4.30.1"
+        "fdir": "^6.4.6",
+        "picomatch": "^4.0.3",
+        "postcss": "^8.5.6",
+        "rollup": "^4.40.0",
+        "tinyglobby": "^0.2.14"
      },
      "bin": {
        "vite": "bin/vite.js"
      },
      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+        "node": "^20.19.0 || >=22.12.0"
      },
      "funding": {
        "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -17618,14 +17901,14 @@
        "fsevents": "~2.3.3"
      },
      "peerDependencies": {
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@types/node": "^20.19.0 || >=22.12.0",
        "jiti": ">=1.21.0",
-        "less": "*",
+        "less": "^4.0.0",
        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
+        "sass": "^1.70.0",
+        "sass-embedded": "^1.70.0",
+        "stylus": ">=0.54.8",
+        "sugarss": "^5.0.0",
        "terser": "^5.16.0",
        "tsx": "^4.8.1",
        "yaml": "^2.4.2"
@@ -17690,9 +17973,9 @@
      }
    },
    "node_modules/vite-plugin-static-copy": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-3.1.1.tgz",
-      "integrity": "sha512-oR53SkL5cX4KT1t18E/xU50vJDo0N8oaHza4EMk0Fm+2/u6nQivxavOfrDk3udWj+dizRizB/QnBvJOOQrTTAQ==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-3.1.2.tgz",
+      "integrity": "sha512-aVmYOzptLVOI2b1jL+cmkF7O6uhRv1u5fvOkQgbohWZp2CbR22kn9ZqkCUIt9umKF7UhdbsEpshn1rf4720QFg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -17749,6 +18032,37 @@
        "vite": "^2 || ^3 || ^4 || ^5 || ^6 || ^7"
      }
    },
+    "node_modules/vite/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
    "node_modules/vitest": {
      "version": "3.2.4",
      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
@@ -18263,7 +18577,6 @@
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=0.4"
@@ -18647,6 +18960,7 @@
      "name": "@yaak/template-function-timestamp",
      "version": "0.1.0",
      "dependencies": {
+        "@date-fns/tz": "^1.4.1",
        "date-fns": "^4.1.0"
      }
    },
@@ -18682,6 +18996,10 @@
      "name": "@yaak/themes-yaak",
      "version": "0.1.0"
    },
+    "src-tauri": {
+      "name": "@yaakapp-internal/tauri",
+      "version": "1.0.0"
+    },
    "src-tauri/yaak-crypto": {
      "name": "@yaakapp-internal/crypto",
      "version": "1.0.0"
@@ -18750,14 +19068,14 @@
        "@tanstack/react-query": "^5.76.1",
        "@tanstack/react-router": "^1.120.3",
        "@tanstack/react-virtual": "^3.13.8",
-        "@tauri-apps/api": "^2.5.0",
-        "@tauri-apps/plugin-clipboard-manager": "^2.2.2",
-        "@tauri-apps/plugin-dialog": "^2.2.2",
-        "@tauri-apps/plugin-fs": "^2.3.0",
-        "@tauri-apps/plugin-log": "^2.4.0",
-        "@tauri-apps/plugin-opener": "^2.2.7",
-        "@tauri-apps/plugin-os": "^2.2.1",
-        "@tauri-apps/plugin-shell": "^2.2.1",
+        "@tauri-apps/api": "^2.8.0",
+        "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
+        "@tauri-apps/plugin-dialog": "^2.4.0",
+        "@tauri-apps/plugin-fs": "^2.4.2",
+        "@tauri-apps/plugin-log": "^2.7.0",
+        "@tauri-apps/plugin-opener": "^2.5.0",
+        "@tauri-apps/plugin-os": "^2.3.1",
+        "@tauri-apps/plugin-shell": "^2.3.1",
        "buffer": "^6.0.3",
        "classnames": "^2.5.1",
        "cm6-graphql": "^0.2.1",
@@ -18784,6 +19102,7 @@
        "react-dom": "^19.1.0",
        "react-markdown": "^10.1.0",
        "react-pdf": "^10.0.1",
+        "react-syntax-highlighter": "^15.6.1",
        "react-use": "^17.6.0",
        "rehype-stringify": "^10.0.1",
        "remark-frontmatter": "^5.0.0",
@@ -18803,6 +19122,7 @@
        "@types/parse-color": "^1.0.3",
        "@types/react": "^19.1.8",
        "@types/react-dom": "^19.1.6",
+        "@types/react-syntax-highlighter": "^15.5.13",
        "@types/uuid": "^10.0.0",
        "@types/whatwg-mimetype": "^3.0.2",
        "@vitejs/plugin-react": "^4.6.0",
@@ -18813,28 +19133,13 @@
        "postcss": "^8.5.6",
        "postcss-nesting": "^13.0.2",
        "tailwindcss": "^3.4.17",
-        "vite": "^7.0.4",
-        "vite-plugin-static-copy": "^3.1.1",
+        "vite": "^7.0.7",
+        "vite-plugin-static-copy": "^3.1.2",
        "vite-plugin-svgr": "^4.3.0",
        "vite-plugin-top-level-await": "^1.5.0",
        "vite-plugin-wasm": "^3.5.0"
      }
    },
-    "src-web/node_modules/fdir": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
-      },
-      "peerDependenciesMeta": {
-        "picomatch": {
-          "optional": true
-        }
-      }
-    },
    "src-web/node_modules/jiti": {
      "version": "1.21.7",
      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
@@ -18845,19 +19150,6 @@
        "jiti": "bin/jiti.js"
      }
    },
-    "src-web/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
    "src-web/node_modules/postcss-nested": {
      "version": "6.2.0",
      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
@@ -18961,81 +19253,6 @@
      "bin": {
        "uuid": "dist/esm/bin/uuid"
      }
-    },
-    "src-web/node_modules/vite": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.4.tgz",
-      "integrity": "sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "^0.25.0",
-        "fdir": "^6.4.6",
-        "picomatch": "^4.0.2",
-        "postcss": "^8.5.6",
-        "rollup": "^4.40.0",
-        "tinyglobby": "^0.2.14"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^20.19.0 || >=22.12.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^20.19.0 || >=22.12.0",
-        "jiti": ">=1.21.0",
-        "less": "^4.0.0",
-        "lightningcss": "^1.21.0",
-        "sass": "^1.70.0",
-        "sass-embedded": "^1.70.0",
-        "stylus": ">=0.54.8",
-        "sugarss": "^5.0.0",
-        "terser": "^5.16.0",
-        "tsx": "^4.8.1",
-        "yaml": "^2.4.2"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "jiti": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        },
-        "tsx": {
-          "optional": true
-        },
-        "yaml": {
-          "optional": true
-        }
-      }
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
    "plugins/template-function-uuid",
    "plugins/template-function-xml",
    "plugins/themes-yaak",
+    "src-tauri",
    "src-tauri/yaak-crypto",
    "src-tauri/yaak-git",
    "src-tauri/yaak-fonts",
@@ -53,10 +54,14 @@
  "scripts": {
    "start": "npm run app-dev",
    "app-build": "tauri build",
-    "app-dev": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
+    "app-dev": "tauri dev --no-watch --config ./src-tauri/tauri.development.conf.json",
    "migration": "node scripts/create-migration.cjs",
    "build": "npm run --workspaces --if-present build",
    "build-plugins": "npm run --workspaces --if-present build",
+    "test": "npm run --workspaces --if-present test",
+    "icons": "run-p icons:*",
+    "icons:dev": "tauri icon src-tauri/icons/icon.png --output src-tauri/icons/release",
+    "icons:release": "tauri icon src-tauri/icons/icon-dev.png --output src-tauri/icons/dev",
    "bootstrap": "run-p bootstrap:* && npm run --workspaces --if-present bootstrap",
    "bootstrap:vendor-node": "node scripts/vendor-node.cjs",
    "bootstrap:vendor-plugins": "node scripts/vendor-plugins.cjs",
@@ -74,7 +79,7 @@
    "@eslint/compat": "^1.3.0",
    "@eslint/eslintrc": "^3.3.1",
    "@eslint/js": "^9.29.0",
-    "@tauri-apps/cli": "2.4.1",
+    "@tauri-apps/cli": "^2.8.4",
    "@typescript-eslint/eslint-plugin": "^8.27.0",
    "@typescript-eslint/parser": "^8.27.0",
    "@yaakapp/cli": "^0.2.7",
--- a/packages/plugin-runtime-types/src/bindings/gen_events.ts
+++ b/packages/plugin-runtime-types/src/bindings/gen_events.ts
@@ -4,8 +4,6 @@ import type { JsonValue } from "./serde_json/JsonValue.js";

 export type BootRequest = { dir: string, watch: boolean, };

-export type BootResponse = { name: string, version: string, };
-
 export type CallGrpcRequestActionArgs = { grpcRequest: GrpcRequest, protoFiles: Array<string>, };

 export type CallGrpcRequestActionRequest = { index: number, pluginRefId: string, args: CallGrpcRequestActionArgs, };
@@ -387,7 +385,7 @@ export type ImportResponse = { resources: ImportResources, };

 export type InternalEvent = { id: string, pluginRefId: string, pluginName: string, replyId: string | null, windowContext: PluginWindowContext, payload: InternalEventPayload, };

-export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } & BootResponse | { "type": "reload_request" } & EmptyPayload | { "type": "reload_response" } & BootResponse | { "type": "terminate_request" } | { "type": "terminate_response" } | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "list_cookie_names_request" } & ListCookieNamesRequest | { "type": "list_cookie_names_response" } & ListCookieNamesResponse | { "type": "get_cookie_value_request" } & GetCookieValueRequest | { "type": "get_cookie_value_response" } & GetCookieValueResponse | { "type": "get_http_request_actions_request" } & EmptyPayload | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_grpc_request_actions_request" } & EmptyPayload | { "type": "get_grpc_request_actions_response" } & GetGrpcRequestActionsResponse | { "type": "call_grpc_request_action_request" } & CallGrpcRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "get_http_authentication_summary_request" } & EmptyPayload | { "type": "get_http_authentication_summary_response" } & GetHttpAuthenticationSummaryResponse | { "type": "get_http_authentication_config_request" } & GetHttpAuthenticationConfigRequest | { "type": "get_http_authentication_config_response" } & GetHttpAuthenticationConfigResponse | { "type": "call_http_authentication_request" } & CallHttpAuthenticationRequest | { "type": "call_http_authentication_response" } & CallHttpAuthenticationResponse | { "type": "call_http_authentication_action_request" } & CallHttpAuthenticationActionRequest | { "type": "call_http_authentication_action_response" } & EmptyPayload | { "type": "copy_text_request" } & CopyTextRequest | { "type": "copy_text_response" } & EmptyPayload | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "render_grpc_request_request" } & RenderGrpcRequestRequest | { "type": "render_grpc_request_response" } & RenderGrpcRequestResponse | { "type": "get_key_value_request" } & GetKeyValueRequest | { "type": "get_key_value_response" } & GetKeyValueResponse | { "type": "set_key_value_request" } & SetKeyValueRequest | { "type": "set_key_value_response" } & SetKeyValueResponse | { "type": "delete_key_value_request" } & DeleteKeyValueRequest | { "type": "delete_key_value_response" } & DeleteKeyValueResponse | { "type": "open_window_request" } & OpenWindowRequest | { "type": "window_navigate_event" } & WindowNavigateEvent | { "type": "window_close_event" } | { "type": "close_window_request" } & CloseWindowRequest | { "type": "template_render_request" } & TemplateRenderRequest | { "type": "template_render_response" } & TemplateRenderResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "show_toast_response" } & EmptyPayload | { "type": "prompt_text_request" } & PromptTextRequest | { "type": "prompt_text_response" } & PromptTextResponse | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "get_themes_request" } & GetThemesRequest | { "type": "get_themes_response" } & GetThemesResponse | { "type": "empty_response" } & EmptyPayload | { "type": "error_response" } & ErrorResponse;
+export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } | { "type": "reload_response" } & ReloadResponse | { "type": "terminate_request" } | { "type": "terminate_response" } | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "list_cookie_names_request" } & ListCookieNamesRequest | { "type": "list_cookie_names_response" } & ListCookieNamesResponse | { "type": "get_cookie_value_request" } & GetCookieValueRequest | { "type": "get_cookie_value_response" } & GetCookieValueResponse | { "type": "get_http_request_actions_request" } & EmptyPayload | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_grpc_request_actions_request" } & EmptyPayload | { "type": "get_grpc_request_actions_response" } & GetGrpcRequestActionsResponse | { "type": "call_grpc_request_action_request" } & CallGrpcRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "get_http_authentication_summary_request" } & EmptyPayload | { "type": "get_http_authentication_summary_response" } & GetHttpAuthenticationSummaryResponse | { "type": "get_http_authentication_config_request" } & GetHttpAuthenticationConfigRequest | { "type": "get_http_authentication_config_response" } & GetHttpAuthenticationConfigResponse | { "type": "call_http_authentication_request" } & CallHttpAuthenticationRequest | { "type": "call_http_authentication_response" } & CallHttpAuthenticationResponse | { "type": "call_http_authentication_action_request" } & CallHttpAuthenticationActionRequest | { "type": "call_http_authentication_action_response" } & EmptyPayload | { "type": "copy_text_request" } & CopyTextRequest | { "type": "copy_text_response" } & EmptyPayload | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "render_grpc_request_request" } & RenderGrpcRequestRequest | { "type": "render_grpc_request_response" } & RenderGrpcRequestResponse | { "type": "get_key_value_request" } & GetKeyValueRequest | { "type": "get_key_value_response" } & GetKeyValueResponse | { "type": "set_key_value_request" } & SetKeyValueRequest | { "type": "set_key_value_response" } & SetKeyValueResponse | { "type": "delete_key_value_request" } & DeleteKeyValueRequest | { "type": "delete_key_value_response" } & DeleteKeyValueResponse | { "type": "open_window_request" } & OpenWindowRequest | { "type": "window_navigate_event" } & WindowNavigateEvent | { "type": "window_close_event" } | { "type": "close_window_request" } & CloseWindowRequest | { "type": "template_render_request" } & TemplateRenderRequest | { "type": "template_render_response" } & TemplateRenderResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "show_toast_response" } & EmptyPayload | { "type": "prompt_text_request" } & PromptTextRequest | { "type": "prompt_text_response" } & PromptTextResponse | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "get_themes_request" } & GetThemesRequest | { "type": "get_themes_response" } & GetThemesResponse | { "type": "empty_response" } & EmptyPayload | { "type": "error_response" } & ErrorResponse;

 export type JsonPrimitive = string | number | boolean | null;

@@ -419,6 +417,8 @@ required?: boolean, };

 export type PromptTextResponse = { value: string | null, };

+export type ReloadResponse = { silent: boolean, };
+
 export type RenderGrpcRequestRequest = { grpcRequest: GrpcRequest, purpose: RenderPurpose, };

 export type RenderGrpcRequestResponse = { grpcRequest: GrpcRequest, };
--- a/packages/plugin-runtime-types/src/bindings/gen_models.ts
+++ b/packages/plugin-runtime-types/src/bindings/gen_models.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.

-export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, base: boolean, variables: Array<EnvironmentVariable>, color: string | null, };
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, variables: Array<EnvironmentVariable>, color: string | null, parentModel: string, parentId: string | null, };

 export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };

--- a/packages/plugin-runtime-types/src/plugins/Context.ts
+++ b/packages/plugin-runtime-types/src/plugins/Context.ts
@@ -61,4 +61,7 @@ export interface Context {
  templates: {
    render<T extends JsonValue>(args: TemplateRenderRequest & { data: T }): Promise<T>;
  };
+  plugin: {
+    reload(): void;
+  };
 }
--- a/packages/plugin-runtime-types/src/plugins/index.ts
+++ b/packages/plugin-runtime-types/src/plugins/index.ts
@@ -6,12 +6,16 @@ import type { ImporterPlugin } from './ImporterPlugin';
 import type { TemplateFunctionPlugin } from './TemplateFunctionPlugin';
 import type { ThemePlugin } from './ThemePlugin';

-export type { Context } from './Context';
+import type { Context } from './Context';
+
+export type { Context };

 /**
 * The global structure of a Yaak plugin
 */
 export type PluginDefinition = {
+  init?: (ctx: Context) => void | Promise<void>;
+  dispose?: () => void | Promise<void>;
  importer?: ImporterPlugin;
  themes?: ThemePlugin[];
  filter?: FilterPlugin;
--- a/packages/plugin-runtime/src/PluginHandle.ts
+++ b/packages/plugin-runtime/src/PluginHandle.ts
@@ -21,7 +21,7 @@ export class PluginHandle {
    this.#instance.postMessage(event);
  }

-  terminate() {
-    this.#instance.terminate();
+  async terminate() {
+    await this.#instance.terminate();
  }
 }
--- a/packages/plugin-runtime/src/PluginInstance.ts
+++ b/packages/plugin-runtime/src/PluginInstance.ts
@@ -1,6 +1,5 @@
 import {
  BootRequest,
-  BootResponse,
  DeleteKeyValueResponse,
  FindHttpResponsesResponse,
  FormInput,
@@ -56,19 +55,19 @@ export class PluginInstance {
    // Reload plugin if the JS or package.json changes
    const windowContextNone: PluginWindowContext = { type: 'none' };

-    this.#mod = {};
+    this.#mod = {} as any;
    this.#pkg = JSON.parse(readFileSync(this.#pathPkg(), 'utf8'));

-    const bootResponse: BootResponse = {
-      name: this.#pkg.name ?? 'unknown',
-      version: this.#pkg.version ?? '0.0.1',
-    };
-
    const fileChangeCallback = async () => {
+      await this.#mod?.dispose?.();
      this.#importModule();
+      await this.#mod?.init?.(this.#newCtx({ type: 'none' }));
      return this.#sendPayload(
        windowContextNone,
-        { type: 'reload_response', ...bootResponse },
+        {
+          type: 'reload_response',
+          silent: false,
+        },
        null,
      );
    };
@@ -85,23 +84,20 @@ export class PluginInstance {
    this.#appToPluginEvents.emit(event);
  }

-  terminate() {
+  async terminate() {
+    await this.#mod?.dispose?.();
    this.#unimportModule();
  }

  async #onMessage(event: InternalEvent) {
-    const ctx = this.#newCtx(event);
+    const ctx = this.#newCtx(event.windowContext);

    const { windowContext, payload, id: replyId } = event;
+
    try {
      if (payload.type === 'boot_request') {
-        // console.log('Plugin initialized', pkg.name, { capabilities, enableWatch });
-        const payload: InternalEventPayload = {
-          type: 'boot_response',
-          name: this.#pkg.name ?? 'unknown',
-          version: this.#pkg.version ?? '0.0.1',
-        };
-        this.#sendPayload(windowContext, payload, replyId);
+        await this.#mod?.init?.(ctx);
+        this.#sendPayload(windowContext, { type: 'boot_response' }, replyId);
        return;
      }

@@ -109,6 +105,7 @@ export class PluginInstance {
        const payload: InternalEventPayload = {
          type: 'terminate_response',
        };
+        await this.terminate();
        this.#sendPayload(windowContext, payload, replyId);
        return;
      }
@@ -332,10 +329,6 @@ export class PluginInstance {
          return;
        }
      }
-
-      if (payload.type === 'reload_request') {
-        this.#importModule();
-      }
    } catch (err) {
      const error = `${err}`.replace(/^Error:\s*/g, '');
      console.log('Plugin call threw exception', payload.type, '→', error);
@@ -447,11 +440,11 @@ export class PluginInstance {
    this.#sendEvent(eventToSend);
  }

-  #newCtx(event: InternalEvent): Context {
+  #newCtx(windowContext: PluginWindowContext): Context {
    return {
      clipboard: {
        copyText: async (text) => {
-          await this.#sendAndWaitForReply(event.windowContext, {
+          await this.#sendAndWaitForReply(windowContext, {
            type: 'copy_text_request',
            text,
          });
@@ -459,7 +452,7 @@ export class PluginInstance {
      },
      toast: {
        show: async (args) => {
-          await this.#sendAndWaitForReply(event.windowContext, {
+          await this.#sendAndWaitForReply(windowContext, {
            type: 'show_toast_request',
            ...args,
          });
@@ -476,21 +469,21 @@ export class PluginInstance {
              onClose?.();
            }
          };
-          this.#sendAndListenForEvents(event.windowContext, payload, onEvent);
+          this.#sendAndListenForEvents(windowContext, payload, onEvent);
          return {
            close: () => {
              const closePayload: InternalEventPayload = {
                type: 'close_window_request',
                label: args.label,
              };
-              this.#sendPayload(event.windowContext, closePayload, null);
+              this.#sendPayload(windowContext, closePayload, null);
            },
          };
        },
      },
      prompt: {
        text: async (args) => {
-          const reply: PromptTextResponse = await this.#sendAndWaitForReply(event.windowContext, {
+          const reply: PromptTextResponse = await this.#sendAndWaitForReply(windowContext, {
            type: 'prompt_text_request',
            ...args,
          });
@@ -504,7 +497,7 @@ export class PluginInstance {
            ...args,
          } as const;
          const { httpResponses } = await this.#sendAndWaitForReply<FindHttpResponsesResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return httpResponses;
@@ -517,7 +510,7 @@ export class PluginInstance {
            ...args,
          } as const;
          const { grpcRequest } = await this.#sendAndWaitForReply<RenderGrpcRequestResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return grpcRequest;
@@ -530,7 +523,7 @@ export class PluginInstance {
            ...args,
          } as const;
          const { httpRequest } = await this.#sendAndWaitForReply<GetHttpRequestByIdResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return httpRequest;
@@ -541,7 +534,7 @@ export class PluginInstance {
            ...args,
          } as const;
          const { httpResponse } = await this.#sendAndWaitForReply<SendHttpRequestResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return httpResponse;
@@ -552,7 +545,7 @@ export class PluginInstance {
            ...args,
          } as const;
          const { httpRequest } = await this.#sendAndWaitForReply<RenderHttpRequestResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return httpRequest;
@@ -565,7 +558,7 @@ export class PluginInstance {
            ...args,
          } as const;
          const { value } = await this.#sendAndWaitForReply<GetCookieValueResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return value;
@@ -573,7 +566,7 @@ export class PluginInstance {
        listNames: async () => {
          const payload = { type: 'list_cookie_names_request' } as const;
          const { names } = await this.#sendAndWaitForReply<ListCookieNamesResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return names;
@@ -587,7 +580,7 @@ export class PluginInstance {
        render: async (args) => {
          const payload = { type: 'template_render_request', ...args } as const;
          const result = await this.#sendAndWaitForReply<TemplateRenderResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return result.data as any;
@@ -597,7 +590,7 @@ export class PluginInstance {
        get: async <T>(key: string) => {
          const payload = { type: 'get_key_value_request', key } as const;
          const result = await this.#sendAndWaitForReply<GetKeyValueResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return result.value ? (JSON.parse(result.value) as T) : undefined;
@@ -609,17 +602,22 @@ export class PluginInstance {
            key,
            value: valueStr,
          };
-          await this.#sendAndWaitForReply<GetKeyValueResponse>(event.windowContext, payload);
+          await this.#sendAndWaitForReply<GetKeyValueResponse>(windowContext, payload);
        },
        delete: async (key: string) => {
          const payload = { type: 'delete_key_value_request', key } as const;
          const result = await this.#sendAndWaitForReply<DeleteKeyValueResponse>(
-            event.windowContext,
+            windowContext,
            payload,
          );
          return result.deleted;
        },
      },
+      plugin: {
+        reload: () => {
+          this.#sendPayload({ type: 'none' }, { type: 'reload_response', silent: true }, null);
+        },
+      },
    };
  }
 }
--- a/packages/plugin-runtime/src/index.ts
+++ b/packages/plugin-runtime/src/index.ts
@@ -46,7 +46,7 @@ async function handleIncoming(msg: string) {
  }

  if (pluginEvent.payload.type === 'terminate_request') {
-    plugin.terminate();
+    await plugin.terminate();
    console.log('Terminated plugin worker', pluginEvent.pluginRefId);
    delete plugins[pluginEvent.pluginRefId];
  }
--- a/plugins/action-copy-curl/package.json
+++ b/plugins/action-copy-curl/package.json
@@ -12,6 +12,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint": "tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  }
 }
--- a/plugins/action-copy-curl/src/index.ts
+++ b/plugins/action-copy-curl/src/index.ts
@@ -34,18 +34,18 @@ export async function convertToCurl(request: Partial<HttpRequest>) {
  let finalUrl = request.url || '';
  const urlParams = (request.urlParameters ?? []).filter(onlyEnabled);
  if (urlParams.length > 0) {
-    // Build url 
+    // Build url
    const [base, hash] = finalUrl.split('#');
    const separator = base!.includes('?') ? '&' : '?';
    const queryString = urlParams
-      .map(p => `${encodeURIComponent(p.name)}=${encodeURIComponent(p.value)}`)
+      .map((p) => `${encodeURIComponent(p.name)}=${encodeURIComponent(p.value)}`)
      .join('&');
    finalUrl = base + separator + queryString + (hash ? `#${hash}` : '');
  }
-  
+
  xs.push(quote(finalUrl));
  xs.push(NEWLINE);
-  
+
  // Add headers
  for (const h of (request.headers ?? []).filter(onlyEnabled)) {
    xs.push('--header', quote(`${h.name}: ${h.value}`));
@@ -53,7 +53,11 @@ export async function convertToCurl(request: Partial<HttpRequest>) {
  }

  // Add form params
-  if (Array.isArray(request.body?.form)) {
+  const type = request.bodyType ?? 'none';
+  if (
+    (type === 'multipart/form-data' || type === 'application/x-www-form-urlencoded') &&
+    Array.isArray(request.body?.form)
+  ) {
    const flag = request.bodyType === 'multipart/form-data' ? '--form' : '--data';
    for (const p of (request.body?.form ?? []).filter(onlyEnabled)) {
      if (p.file) {
@@ -65,14 +69,14 @@ export async function convertToCurl(request: Partial<HttpRequest>) {
      }
      xs.push(NEWLINE);
    }
-  } else if (typeof request.body?.query === 'string') {
+  } else if (type === 'graphql' && typeof request.body?.query === 'string') {
    const body = {
      query: request.body.query || '',
      variables: maybeParseJSON(request.body.variables, undefined),
    };
    xs.push('--data', quote(JSON.stringify(body)));
    xs.push(NEWLINE);
-  } else if (typeof request.body?.text === 'string') {
+  } else if (type !== 'none' && typeof request.body?.text === 'string') {
    xs.push('--data', quote(request.body.text));
    xs.push(NEWLINE);
  }
@@ -89,7 +93,9 @@ export async function convertToCurl(request: Partial<HttpRequest>) {

  // Add bearer authentication
  if (request.authenticationType === 'bearer') {
-    xs.push('--header', quote(`Authorization: Bearer ${request.authentication?.token ?? ''}`));
+    const value =
+      `${request.authentication?.prefix ?? 'Bearer'} ${request.authentication?.token ?? ''}`.trim();
+    xs.push('--header', quote(`Authorization: ${value}`));
    xs.push(NEWLINE);
  }

@@ -116,4 +122,4 @@ function maybeParseJSON<T>(v: string, fallback: T) {
  } catch {
    return fallback;
  }
-}
+}
--- a/plugins/action-copy-curl/tests/index.test.ts
+++ b/plugins/action-copy-curl/tests/index.test.ts
@@ -12,9 +12,7 @@ describe('exporter-curl', () => {
          { name: 'c', value: 'ccc', enabled: false },
        ],
      }),
-    ).toEqual(
-      [`curl 'https://yaak.app/?a=aaa&b=bbb'`].join(` \\n  `),
-    );
+    ).toEqual([`curl 'https://yaak.app?a=aaa&b=bbb'`].join(` \\n  `));
  });

  test('Exports GET with params and hash', async () => {
@@ -27,9 +25,7 @@ describe('exporter-curl', () => {
          { name: 'c', value: 'ccc', enabled: false },
        ],
      }),
-    ).toEqual(
-      [`curl 'https://yaak.app/path?a=aaa&b=bbb#section'`].join(` \\n  `),
-    );
+    ).toEqual([`curl 'https://yaak.app/path?a=aaa&b=bbb#section'`].join(` \\n  `));
  });
  test('Exports POST with url form data', async () => {
    expect(
@@ -62,7 +58,10 @@ describe('exporter-curl', () => {
        },
      }),
    ).toEqual(
-      [`curl -X POST 'https://yaak.app'`, `--data '{"query":"{foo,bar}","variables":{"a":"aaa","b":"bbb"}}'`].join(` \\\n  `),
+      [
+        `curl -X POST 'https://yaak.app'`,
+        `--data '{"query":"{foo,bar}","variables":{"a":"aaa","b":"bbb"}}'`,
+      ].join(` \\\n  `),
    );
  });

@@ -206,6 +205,34 @@ describe('exporter-curl', () => {
    ).toEqual([`curl 'https://yaak.app'`, `--header 'Authorization: Bearer tok'`].join(` \\\n  `));
  });

+  test('Bearer auth with custom prefix', async () => {
+    expect(
+      await convertToCurl({
+        url: 'https://yaak.app',
+        authenticationType: 'bearer',
+        authentication: {
+          token: 'abc123',
+          prefix: 'Token',
+        },
+      }),
+    ).toEqual(
+      [`curl 'https://yaak.app'`, `--header 'Authorization: Token abc123'`].join(` \\\n  `),
+    );
+  });
+
+  test('Bearer auth with empty prefix', async () => {
+    expect(
+      await convertToCurl({
+        url: 'https://yaak.app',
+        authenticationType: 'bearer',
+        authentication: {
+          token: 'xyz789',
+          prefix: '',
+        },
+      }),
+    ).toEqual([`curl 'https://yaak.app'`, `--header 'Authorization: xyz789'`].join(` \\\n  `));
+  });
+
  test('Broken bearer auth', async () => {
    expect(
      await convertToCurl({
@@ -216,6 +243,18 @@ describe('exporter-curl', () => {
          password: 'pass',
        },
      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--header 'Authorization: Bearer '`].join(` \\\n  `));
+    ).toEqual([`curl 'https://yaak.app'`, `--header 'Authorization: Bearer'`].join(` \\\n  `));
  });
-});
+
+  test('Stale body data', async () => {
+    expect(
+      await convertToCurl({
+        url: 'https://yaak.app',
+        bodyType: 'none',
+        body: {
+          text: 'ignore me',
+        },
+      }),
+    ).toEqual([`curl 'https://yaak.app'`].join(` \\\n  `));
+  });
+});
--- a/plugins/action-copy-grpcurl/package.json
+++ b/plugins/action-copy-grpcurl/package.json
@@ -12,6 +12,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  }
 }
--- a/plugins/action-copy-grpcurl/src/index.ts
+++ b/plugins/action-copy-grpcurl/src/index.ts
@@ -41,8 +41,8 @@ export async function convert(request: Partial<GrpcRequest>, allProtoFiles: stri
    if (protoDir) {
      inferredIncludes.add(protoDir);
    } else {
-      inferredIncludes.add(path.join(f, '..'));
-      inferredIncludes.add(path.join(f, '..', '..'));
+      inferredIncludes.add(path.posix.join(f, '..'));
+      inferredIncludes.add(path.posix.join(f, '..', '..'));
    }
  }

--- a/plugins/auth-apikey/package.json
+++ b/plugins/auth-apikey/package.json
@@ -12,6 +12,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/auth-basic/package.json
+++ b/plugins/auth-basic/package.json
@@ -12,6 +12,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/auth-bearer/package.json
+++ b/plugins/auth-bearer/package.json
@@ -12,6 +12,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  }
 }
--- a/plugins/auth-jwt/package.json
+++ b/plugins/auth-jwt/package.json
@@ -12,7 +12,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  },
  "dependencies": {
    "jsonwebtoken": "^9.0.2"
--- a/plugins/auth-oauth2/package.json
+++ b/plugins/auth-oauth2/package.json
@@ -12,6 +12,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/auth-oauth2/src/getAccessTokenIfNotExpired.ts
+++ b/plugins/auth-oauth2/src/getAccessTokenIfNotExpired.ts
@@ -1,19 +0,0 @@
-import type { Context } from '@yaakapp/api';
-import type { AccessToken } from './store';
-import { getToken } from './store';
-
-export async function getAccessTokenIfNotExpired(
-  ctx: Context,
-  contextId: string,
-): Promise<AccessToken | null> {
-  const token = await getToken(ctx, contextId);
-  if (token == null || isTokenExpired(token)) {
-    return null;
-  }
-
-  return token;
-}
-
-export function isTokenExpired(token: AccessToken) {
-  return token.expiresAt && Date.now() > token.expiresAt;
-}
--- a/plugins/auth-oauth2/src/getOrRefreshAccessToken.ts
+++ b/plugins/auth-oauth2/src/getOrRefreshAccessToken.ts
@@ -1,12 +1,12 @@
 import type { Context, HttpRequest } from '@yaakapp/api';
 import { readFileSync } from 'node:fs';
-import { isTokenExpired } from './getAccessTokenIfNotExpired';
-import type { AccessToken, AccessTokenRawResponse } from './store';
+import type { AccessToken, AccessTokenRawResponse, TokenStoreArgs } from './store';
 import { deleteToken, getToken, storeToken } from './store';
+import { isTokenExpired } from './util';

 export async function getOrRefreshAccessToken(
  ctx: Context,
-  contextId: string,
+  tokenArgs: TokenStoreArgs,
  {
    scope,
    accessTokenUrl,
@@ -23,7 +23,7 @@ export async function getOrRefreshAccessToken(
    forceRefresh?: boolean;
  },
 ): Promise<AccessToken | null> {
-  const token = await getToken(ctx, contextId);
+  const token = await getToken(ctx, tokenArgs);
  if (token == null) {
    return null;
  }
@@ -75,7 +75,7 @@ export async function getOrRefreshAccessToken(
    // Bad refresh token, so we'll force it to fetch a fresh access token by deleting
    // and returning null;
    console.log('[oauth2] Unauthorized refresh_token request');
-    await deleteToken(ctx, contextId);
+    await deleteToken(ctx, tokenArgs);
    return null;
  }

@@ -108,5 +108,5 @@ export async function getOrRefreshAccessToken(
    refresh_token: response.refresh_token ?? token.response.refresh_token,
  };

-  return storeToken(ctx, contextId, newResponse);
+  return storeToken(ctx, tokenArgs, newResponse);
 }
--- a/plugins/auth-oauth2/src/grants/authorizationCode.ts
+++ b/plugins/auth-oauth2/src/grants/authorizationCode.ts
@@ -2,7 +2,7 @@ import type { Context } from '@yaakapp/api';
 import { createHash, randomBytes } from 'node:crypto';
 import { fetchAccessToken } from '../fetchAccessToken';
 import { getOrRefreshAccessToken } from '../getOrRefreshAccessToken';
-import type { AccessToken } from '../store';
+import type { AccessToken, TokenStoreArgs } from '../store';
 import { getDataDirKey, storeToken } from '../store';

 export const PKCE_SHA256 = 'S256';
@@ -41,7 +41,14 @@ export async function getAuthorizationCode(
    tokenName: 'access_token' | 'id_token';
  },
 ): Promise<AccessToken> {
-  const token = await getOrRefreshAccessToken(ctx, contextId, {
+  const tokenArgs: TokenStoreArgs = {
+    contextId,
+    clientId,
+    accessTokenUrl,
+    authorizationUrl: authorizationUrlRaw,
+  };
+
+  const token = await getOrRefreshAccessToken(ctx, tokenArgs, {
    accessTokenUrl,
    scope,
    clientId,
@@ -81,9 +88,9 @@ export async function getAuthorizationCode(
  const code = await new Promise<string>(async (resolve, reject) => {
    let foundCode = false;
    const { close } = await ctx.window.openUrl({
+      dataDirKey,
      url: authorizationUrlStr,
      label: 'oauth-authorization-url',
-      dataDirKey,
      async onClose() {
        if (!foundCode) {
          reject(new Error('Authorization window closed'));
@@ -128,7 +135,7 @@ export async function getAuthorizationCode(
    ],
  });

-  return storeToken(ctx, contextId, response, tokenName);
+  return storeToken(ctx, tokenArgs, response, tokenName);
 }

 export function genPkceCodeVerifier() {
--- a/plugins/auth-oauth2/src/grants/clientCredentials.ts
+++ b/plugins/auth-oauth2/src/grants/clientCredentials.ts
@@ -1,7 +1,8 @@
 import type { Context } from '@yaakapp/api';
 import { fetchAccessToken } from '../fetchAccessToken';
-import { isTokenExpired } from '../getAccessTokenIfNotExpired';
+import type { TokenStoreArgs } from '../store';
 import { getToken, storeToken } from '../store';
+import { isTokenExpired } from '../util';

 export async function getClientCredentials(
  ctx: Context,
@@ -22,7 +23,13 @@ export async function getClientCredentials(
    credentialsInBody: boolean;
  },
 ) {
-  const token = await getToken(ctx, contextId);
+  const tokenArgs: TokenStoreArgs = {
+    contextId,
+    clientId,
+    accessTokenUrl,
+    authorizationUrl: null,
+  };
+  const token = await getToken(ctx, tokenArgs);
  if (token && !isTokenExpired(token)) {
    return token;
  }
@@ -38,5 +45,5 @@ export async function getClientCredentials(
    params: [],
  });

-  return storeToken(ctx, contextId, response);
+  return storeToken(ctx, tokenArgs, response);
 }
--- a/plugins/auth-oauth2/src/grants/implicit.ts
+++ b/plugins/auth-oauth2/src/grants/implicit.ts
@@ -1,7 +1,7 @@
 import type { Context } from '@yaakapp/api';
-import { isTokenExpired } from '../getAccessTokenIfNotExpired';
 import type { AccessToken, AccessTokenRawResponse} from '../store';
-import { getToken, storeToken } from '../store';
+import  { getDataDirKey , getToken, storeToken } from '../store';
+import { isTokenExpired } from '../util';

 export async function getImplicit(
  ctx: Context,
@@ -26,7 +26,13 @@ export async function getImplicit(
    tokenName: 'access_token' | 'id_token';
  },
 ): Promise<AccessToken> {
-  const token = await getToken(ctx, contextId);
+  const tokenArgs = {
+    contextId,
+    clientId,
+    accessTokenUrl: null,
+    authorizationUrl: authorizationUrlRaw,
+  };
+  const token = await getToken(ctx, tokenArgs);
  if (token != null && !isTokenExpired(token)) {
    return token;
  }
@@ -54,7 +60,9 @@ export async function getImplicit(
  const newToken = await new Promise<AccessToken>(async (resolve, reject) => {
    let foundAccessToken = false;
    const authorizationUrlStr = authorizationUrl.toString();
+    const dataDirKey = await getDataDirKey(ctx, contextId);
    const { close } = await ctx.window.openUrl({
+      dataDirKey,
      url: authorizationUrlStr,
      label: 'oauth-authorization-url',
      async onClose() {
@@ -82,7 +90,7 @@ export async function getImplicit(

        const response = Object.fromEntries(params) as unknown as AccessTokenRawResponse;
        try {
-          resolve(storeToken(ctx, contextId, response));
+          resolve(storeToken(ctx, tokenArgs, response));
        } catch (err) {
          reject(err);
        }
--- a/plugins/auth-oauth2/src/grants/password.ts
+++ b/plugins/auth-oauth2/src/grants/password.ts
@@ -1,7 +1,7 @@
 import type { Context } from '@yaakapp/api';
 import { fetchAccessToken } from '../fetchAccessToken';
 import { getOrRefreshAccessToken } from '../getOrRefreshAccessToken';
-import type { AccessToken} from '../store';
+import type { AccessToken, TokenStoreArgs } from '../store';
 import { storeToken } from '../store';

 export async function getPassword(
@@ -27,7 +27,13 @@ export async function getPassword(
    credentialsInBody: boolean;
  },
 ): Promise<AccessToken> {
-  const token = await getOrRefreshAccessToken(ctx, contextId, {
+  const tokenArgs: TokenStoreArgs = {
+    contextId,
+    clientId,
+    accessTokenUrl,
+    authorizationUrl: null,
+  };
+  const token = await getOrRefreshAccessToken(ctx, tokenArgs, {
    accessTokenUrl,
    scope,
    clientId,
@@ -52,5 +58,5 @@ export async function getPassword(
    ],
  });

-  return storeToken(ctx, contextId, response);
+  return storeToken(ctx, tokenArgs, response);
 }
--- a/plugins/auth-oauth2/src/index.ts
+++ b/plugins/auth-oauth2/src/index.ts
@@ -15,7 +15,7 @@ import {
 import { getClientCredentials } from './grants/clientCredentials';
 import { getImplicit } from './grants/implicit';
 import { getPassword } from './grants/password';
-import type { AccessToken } from './store';
+import type { AccessToken, TokenStoreArgs } from './store';
 import { deleteToken, getToken, resetDataDirKey } from './store';

 type GrantType = 'authorization_code' | 'implicit' | 'password' | 'client_credentials';
@@ -83,8 +83,14 @@ export const plugin: PluginDefinition = {
    actions: [
      {
        label: 'Copy Current Token',
-        async onSelect(ctx, { contextId }) {
-          const token = await getToken(ctx, contextId);
+        async onSelect(ctx, { contextId, values }) {
+          const tokenArgs: TokenStoreArgs = {
+            contextId,
+            authorizationUrl: stringArg(values, 'authorizationUrl'),
+            accessTokenUrl: stringArg(values, 'accessTokenUrl'),
+            clientId: stringArg(values, 'clientId'),
+          };
+          const token = await getToken(ctx, tokenArgs);
          if (token == null) {
            await ctx.toast.show({ message: 'No token to copy', color: 'warning' });
          } else {
@@ -99,8 +105,14 @@ export const plugin: PluginDefinition = {
      },
      {
        label: 'Delete Token',
-        async onSelect(ctx, { contextId }) {
-          if (await deleteToken(ctx, contextId)) {
+        async onSelect(ctx, { contextId, values }) {
+          const tokenArgs: TokenStoreArgs = {
+            contextId,
+            authorizationUrl: stringArg(values, 'authorizationUrl'),
+            accessTokenUrl: stringArg(values, 'accessTokenUrl'),
+            clientId: stringArg(values, 'clientId'),
+          };
+          if (await deleteToken(ctx, tokenArgs)) {
            await ctx.toast.show({ message: 'Token deleted', color: 'success' });
          } else {
            await ctx.toast.show({ message: 'No token to delete', color: 'warning' });
@@ -281,8 +293,14 @@ export const plugin: PluginDefinition = {
      {
        type: 'accordion',
        label: 'Access Token Response',
-        async dynamic(ctx, { contextId }) {
-          const token = await getToken(ctx, contextId);
+        async dynamic(ctx, { contextId, values }) {
+          const tokenArgs: TokenStoreArgs = {
+            contextId,
+            authorizationUrl: stringArg(values, 'authorizationUrl'),
+            accessTokenUrl: stringArg(values, 'accessTokenUrl'),
+            clientId: stringArg(values, 'clientId'),
+          };
+          const token = await getToken(ctx, tokenArgs);
          if (token == null) {
            return { hidden: true };
          }
@@ -316,9 +334,10 @@ export const plugin: PluginDefinition = {
            accessTokenUrl === '' || accessTokenUrl.match(/^https?:\/\//)
              ? accessTokenUrl
              : `https://${accessTokenUrl}`,
-          authorizationUrl: authorizationUrl === '' || authorizationUrl.match(/^https?:\/\//)
-            ? authorizationUrl
-            : `https://${authorizationUrl}`,
+          authorizationUrl:
+            authorizationUrl === '' || authorizationUrl.match(/^https?:\/\//)
+              ? authorizationUrl
+              : `https://${authorizationUrl}`,
          clientId: stringArg(values, 'clientId'),
          clientSecret: stringArg(values, 'clientSecret'),
          redirectUri: stringArgOrNull(values, 'redirectUri'),
--- a/plugins/auth-oauth2/src/store.ts
+++ b/plugins/auth-oauth2/src/store.ts
@@ -1,8 +1,9 @@
 import type { Context } from '@yaakapp/api';
+import { createHash } from 'node:crypto';

 export async function storeToken(
  ctx: Context,
-  contextId: string,
+  args: TokenStoreArgs,
  response: AccessTokenRawResponse,
  tokenName: 'access_token' | 'id_token' = 'access_token',
 ) {
@@ -15,16 +16,16 @@ export async function storeToken(
    response,
    expiresAt,
  };
-  await ctx.store.set<AccessToken>(tokenStoreKey(contextId), token);
+  await ctx.store.set<AccessToken>(tokenStoreKey(args), token);
  return token;
 }

-export async function getToken(ctx: Context, contextId: string) {
-  return ctx.store.get<AccessToken>(tokenStoreKey(contextId));
+export async function getToken(ctx: Context, args: TokenStoreArgs) {
+  return ctx.store.get<AccessToken>(tokenStoreKey(args));
 }

-export async function deleteToken(ctx: Context, contextId: string) {
-  return ctx.store.delete(tokenStoreKey(contextId));
+export async function deleteToken(ctx: Context, args: TokenStoreArgs) {
+  return ctx.store.delete(tokenStoreKey(args));
 }

 export async function resetDataDirKey(ctx: Context, contextId: string) {
@@ -37,8 +38,25 @@ export async function getDataDirKey(ctx: Context, contextId: string) {
  return `${contextId}::${key}`;
 }

-function tokenStoreKey(contextId: string) {
-  return ['token', contextId].join('::');
+export interface TokenStoreArgs {
+  contextId: string;
+  clientId: string;
+  accessTokenUrl: string | null;
+  authorizationUrl: string | null;
+}
+
+/**
+ * Generate a store key to use based on some arguments. The arguments will be normalized a bit to
+ * account for slight variations (like domains with and without a protocol scheme).
+ */
+function tokenStoreKey(args: TokenStoreArgs) {
+  const hash = createHash('md5');
+  if (args.contextId) hash.update(args.contextId.trim());
+  if (args.clientId) hash.update(args.clientId.trim());
+  if (args.accessTokenUrl) hash.update(args.accessTokenUrl.trim().replace(/^https?:\/\//, ''));
+  if (args.authorizationUrl) hash.update(args.authorizationUrl.trim().replace(/^https?:\/\//, ''));
+  const key = hash.digest('hex');
+  return ['token', key].join('::');
 }

 function dataDirStoreKey(contextId: string) {
--- a/plugins/auth-oauth2/src/util.ts
+++ b/plugins/auth-oauth2/src/util.ts
@@ -0,0 +1,5 @@
+import type { AccessToken } from './store';
+
+export function isTokenExpired(token: AccessToken) {
+  return token.expiresAt && Date.now() > token.expiresAt;
+}
--- a/plugins/filter-jsonpath/package.json
+++ b/plugins/filter-jsonpath/package.json
@@ -12,7 +12,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  },
  "dependencies": {
    "jsonpath-plus": "^10.3.0"
--- a/plugins/filter-xpath/package.json
+++ b/plugins/filter-xpath/package.json
@@ -7,7 +7,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  },
  "dependencies": {
    "@xmldom/xmldom": "^0.9.8",
--- a/plugins/importer-curl/package.json
+++ b/plugins/importer-curl/package.json
@@ -7,7 +7,8 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint": "tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  },
  "dependencies": {
    "shell-quote": "^1.8.1"
--- a/plugins/importer-insomnia/package.json
+++ b/plugins/importer-insomnia/package.json
@@ -7,7 +7,8 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  },
  "dependencies": {
    "yaml": "^2.4.2"
--- a/plugins/importer-insomnia/src/v5.ts
+++ b/plugins/importer-insomnia/src/v5.ts
@@ -30,18 +30,25 @@ export function convertInsomniaV5(parsed: any) {
    model: 'workspace',
    name: parsed.name,
    description: meta.description || undefined,
+    ...importHeaders(parsed),
+    ...importAuthentication(parsed),
  });
+
+  // Import environments
  resources.environments.push(
    importEnvironment(parsed.environments, meta.id, true),
    ...(parsed.environments.subEnvironments ?? []).map((r: any) => importEnvironment(r, meta.id)),
  );

+  // Import folders
  const nextFolder = (children: any[], parentId: string) => {
    for (const child of children ?? []) {
      if (!isJSObject(child)) continue;

      if (Array.isArray(child.children)) {
-        resources.folders.push(importFolder(child, meta.id, parentId));
+        const { folder, environment } = importFolder(child, meta.id, parentId);
+        resources.folders.push(folder);
+        if (environment) resources.environments.push(environment);
        nextFolder(child.children, child.meta.id);
      } else if (child.method) {
        resources.httpRequests.push(importHttpRequest(child, meta.id, parentId));
@@ -191,8 +198,8 @@ function importWebsocketRequest(
  };
 }

-function importHeaders(r: any) {
-  const headers = (r.headers ?? [])
+function importHeaders(obj: any) {
+  const headers = (obj.headers ?? [])
    .map((h: any) => ({
      enabled: !h.disabled,
      name: h.name ?? '',
@@ -202,19 +209,19 @@ function importHeaders(r: any) {
  return { headers } as const;
 }

-function importAuthentication(r: any) {
+function importAuthentication(obj: any) {
  let authenticationType: string | null = null;
  let authentication = {};
-  if (r.authentication?.type === 'bearer') {
+  if (obj.authentication?.type === 'bearer') {
    authenticationType = 'bearer';
    authentication = {
-      token: convertSyntax(r.authentication.token),
+      token: convertSyntax(obj.authentication.token),
    };
-  } else if (r.authentication?.type === 'basic') {
+  } else if (obj.authentication?.type === 'basic') {
    authenticationType = 'basic';
    authentication = {
-      username: convertSyntax(r.authentication.username),
-      password: convertSyntax(r.authentication.password),
+      username: convertSyntax(obj.authentication.username),
+      password: convertSyntax(obj.authentication.password),
    };
  }

@@ -225,22 +232,50 @@ function importFolder(
  f: any,
  workspaceId: string,
  parentId: string,
-): PartialImportResources['folders'][0] {
+): {
+  folder: PartialImportResources['folders'][0];
+  environment: PartialImportResources['environments'][0] | null;
+} {
  const id = f.meta?.id ?? f._id;
  const created = f.meta?.created ?? f.created;
  const updated = f.meta?.modified ?? f.updated;
  const sortKey = f.meta?.sortKey ?? f.sortKey;

+  let environment: PartialImportResources['environments'][0] | null = null;
+  if (Object.keys(f.environment ?? {}).length > 0) {
+    environment = {
+      id: convertId(id + 'folder'),
+      createdAt: created ? new Date(created).toISOString().replace('Z', '') : undefined,
+      updatedAt: updated ? new Date(updated).toISOString().replace('Z', '') : undefined,
+      workspaceId: convertId(workspaceId),
+      public: true,
+      parentModel: 'folder',
+      parentId: convertId(id),
+      model: 'environment',
+      name: 'Folder Environment',
+      variables: Object.entries(f.environment ?? {}).map(([name, value]) => ({
+        enabled: true,
+        name,
+        value: `${value}`,
+      })),
+    };
+  }
+
  return {
-    model: 'folder',
-    id: convertId(id),
-    createdAt: created ? new Date(created).toISOString().replace('Z', '') : undefined,
-    updatedAt: updated ? new Date(updated).toISOString().replace('Z', '') : undefined,
-    folderId: parentId === workspaceId ? null : convertId(parentId),
-    sortPriority: sortKey,
-    workspaceId: convertId(workspaceId),
-    description: f.description || undefined,
-    name: f.name,
+    folder: {
+      model: 'folder',
+      id: convertId(id),
+      createdAt: created ? new Date(created).toISOString().replace('Z', '') : undefined,
+      updatedAt: updated ? new Date(updated).toISOString().replace('Z', '') : undefined,
+      folderId: parentId === workspaceId ? null : convertId(parentId),
+      sortPriority: sortKey,
+      workspaceId: convertId(workspaceId),
+      description: f.description || undefined,
+      name: f.name,
+      ...importAuthentication(f),
+      ...importHeaders(f),
+    },
+    environment,
  };
 }

@@ -263,7 +298,8 @@ function importEnvironment(
    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
    // @ts-expect-error
    sortPriority: sortKey, // Will be added to Yaak later
-    base: isParent ?? e.parentId === workspaceId,
+    parentModel: isParent ? 'workspace' : 'environment',
+    parentId: null,
    model: 'environment',
    name: e.name,
    variables: Object.entries(e.data ?? {}).map(([name, value]) => ({
--- a/plugins/importer-insomnia/tests/fixtures/version-5-minimal.input.yaml
+++ b/plugins/importer-insomnia/tests/fixtures/version-5-minimal.input.yaml
@@ -38,6 +38,8 @@ collection:
        name: foo
        value: bar
        disabled: false
+    environment:
+      folder_env_var: testing
  - name: New Request
    meta:
      id: req_e3f8cdbd58784a539dd4c1e127d73451
--- a/plugins/importer-insomnia/tests/fixtures/version-5-minimal.output.json
+++ b/plugins/importer-insomnia/tests/fixtures/version-5-minimal.output.json
@@ -2,7 +2,6 @@
  "resources": {
    "environments": [
      {
-        "base": true,
        "createdAt": "2025-05-14T04:45:24.903",
        "id": "GENERATE_ID::env_e46dc73e8ccda30ca132153e8f11183bd08119ce",
        "model": "environment",
@@ -10,6 +9,26 @@
        "public": true,
        "updatedAt": "2025-05-14T04:45:24.903",
        "variables": [],
+        "workspaceId": "GENERATE_ID::wrk_9717dd1c9e0c4b2e9ed6d2abcf3bd45c",
+        "parentId": null,
+        "parentModel": "workspace"
+      },
+      {
+        "createdAt": "2025-05-16T16:48:12.298",
+        "id": "GENERATE_ID::fld_296933ea4ea84783a775d199997e9be7folder",
+        "model": "environment",
+        "name": "Folder Environment",
+        "parentId": "GENERATE_ID::fld_296933ea4ea84783a775d199997e9be7",
+        "parentModel": "folder",
+        "public": true,
+        "updatedAt": "2025-05-16T16:49:02.427",
+        "variables": [
+          {
+            "enabled": true,
+            "name": "folder_env_var",
+            "value": "testing"
+          }
+        ],
        "workspaceId": "GENERATE_ID::wrk_9717dd1c9e0c4b2e9ed6d2abcf3bd45c"
      }
    ],
@@ -22,7 +41,16 @@
        "name": "My Folder",
        "sortPriority": -1747414092298,
        "updatedAt": "2025-05-16T16:49:02.427",
-        "workspaceId": "GENERATE_ID::wrk_9717dd1c9e0c4b2e9ed6d2abcf3bd45c"
+        "workspaceId": "GENERATE_ID::wrk_9717dd1c9e0c4b2e9ed6d2abcf3bd45c",
+        "authentication": {},
+        "authenticationType": null,
+        "headers": [
+          {
+            "enabled": true,
+            "name": "foo",
+            "value": "bar"
+          }
+        ]
      }
    ],
    "grpcRequests": [],
@@ -80,7 +108,10 @@
        "id": "GENERATE_ID::wrk_9717dd1c9e0c4b2e9ed6d2abcf3bd45c",
        "model": "workspace",
        "name": "Debugging",
-        "updatedAt": "2025-05-14T04:45:24.902"
+        "updatedAt": "2025-05-14T04:45:24.902",
+        "authentication": {},
+        "authenticationType": null,
+        "headers": []
      }
    ]
  }
--- a/plugins/importer-insomnia/tests/fixtures/version-5.output.json
+++ b/plugins/importer-insomnia/tests/fixtures/version-5.output.json
@@ -4,11 +4,12 @@
      {
        "createdAt": "2025-01-13T15:15:43.767",
        "updatedAt": "2025-01-13T15:15:55.209",
-        "base": true,
        "public": true,
        "id": "GENERATE_ID::env_20945044d3c8497ca8b717bef750987e",
        "model": "environment",
        "name": "Base Environment",
+        "parentId": null,
+        "parentModel": "workspace",
        "variables": [
          {
            "enabled": true,
@@ -21,11 +22,12 @@
      {
        "createdAt": "2025-01-13T15:15:58.515",
        "updatedAt": "2025-01-13T15:16:34.705",
-        "base": false,
        "public": true,
        "id": "GENERATE_ID::env_6f7728bb7fc04d558d668e954d756ea2",
        "model": "environment",
        "name": "Production",
+        "parentId": null,
+        "parentModel": "environment",
        "sortPriority": 1736781358515,
        "variables": [
          {
@@ -39,8 +41,9 @@
      {
        "createdAt": "2025-01-13T15:16:14.707",
        "updatedAt": "2025-01-13T15:16:31.078",
-        "base": false,
        "public": true,
+        "parentId": null,
+        "parentModel": "environment",
        "id": "GENERATE_ID::env_976a8b6eb5d44fb6a20150f65c32d243",
        "model": "environment",
        "name": "Staging",
@@ -64,7 +67,10 @@
        "model": "folder",
        "name": "Top Level",
        "sortPriority": -1736781404718,
-        "workspaceId": "GENERATE_ID::wrk_c1eacfa750a04f3ea9985ef28043fa53"
+        "workspaceId": "GENERATE_ID::wrk_c1eacfa750a04f3ea9985ef28043fa53",
+        "authentication": {},
+        "authenticationType": null,
+        "headers": []
      }
    ],
    "grpcRequests": [
@@ -165,7 +171,10 @@
        "description": "This is the description",
        "id": "GENERATE_ID::wrk_c1eacfa750a04f3ea9985ef28043fa53",
        "model": "workspace",
-        "name": "Dummy"
+        "name": "Dummy",
+        "authentication": {},
+        "authenticationType": null,
+        "headers": []
      }
    ]
  }
--- a/plugins/importer-openapi/package.json
+++ b/plugins/importer-openapi/package.json
@@ -7,7 +7,8 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  },
  "dependencies": {
    "openapi-to-postmanv2": "^5.0.0",
--- a/plugins/importer-postman/package.json
+++ b/plugins/importer-postman/package.json
@@ -8,6 +8,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint": "tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  }
 }
--- a/plugins/importer-postman/src/index.ts
+++ b/plugins/importer-postman/src/index.ts
@@ -57,9 +57,11 @@ export function convertPostman(contents: string): ImportPluginResponse | undefin

  const rawDescription = info.description;
  const description =
-    typeof rawDescription === 'object' && rawDescription !== null && 'content' in rawDescription
+    typeof rawDescription === 'object' && rawDescription != null && 'content' in rawDescription
      ? String(rawDescription.content)
-      : String(rawDescription);
+      : rawDescription == null
+        ? undefined
+        : String(rawDescription);

  const workspace: ExportResources['workspaces'][0] = {
    model: 'workspace',
@@ -75,6 +77,8 @@ export function convertPostman(contents: string): ImportPluginResponse | undefin
    id: generateId('environment'),
    name: 'Global Variables',
    workspaceId: workspace.id,
+    parentModel: 'workspace',
+    parentId: null,
    variables:
      toArray<{ key: string; value: string }>(root.variable).map((v) => ({
        name: v.key,
--- a/plugins/importer-postman/tests/fixtures/nested.output.json
+++ b/plugins/importer-postman/tests/fixtures/nested.output.json
@@ -13,7 +13,9 @@
        "model": "environment",
        "name": "Global Variables",
        "variables": [],
-        "workspaceId": "GENERATE_ID::WORKSPACE_0"
+        "workspaceId": "GENERATE_ID::WORKSPACE_0",
+        "parentId": null,
+        "parentModel": "workspace"
      }
    ],
    "httpRequests": [
@@ -25,6 +27,7 @@
        "name": "Request 1",
        "method": "GET",
        "url": "",
+        "sortPriority": 2,
        "urlParameters": [],
        "body": {},
        "bodyType": null,
@@ -39,6 +42,7 @@
        "folderId": "GENERATE_ID::FOLDER_0",
        "name": "Request 2",
        "method": "GET",
+        "sortPriority": 3,
        "url": "",
        "urlParameters": [],
        "body": {},
@@ -52,6 +56,7 @@
        "id": "GENERATE_ID::HTTP_REQUEST_2",
        "workspaceId": "GENERATE_ID::WORKSPACE_0",
        "folderId": null,
+        "sortPriority": 4,
        "name": "Request 3",
        "method": "GET",
        "url": "",
@@ -69,6 +74,7 @@
        "workspaceId": "GENERATE_ID::WORKSPACE_0",
        "id": "GENERATE_ID::FOLDER_0",
        "name": "Top Folder",
+        "sortPriority": 0,
        "folderId": null
      },
      {
@@ -76,6 +82,7 @@
        "workspaceId": "GENERATE_ID::WORKSPACE_0",
        "id": "GENERATE_ID::FOLDER_1",
        "name": "Nested Folder",
+        "sortPriority": 1,
        "folderId": "GENERATE_ID::FOLDER_0"
      }
    ]
--- a/plugins/importer-postman/tests/fixtures/params.output.json
+++ b/plugins/importer-postman/tests/fixtures/params.output.json
@@ -13,6 +13,8 @@
        "workspaceId": "GENERATE_ID::WORKSPACE_1",
        "model": "environment",
        "name": "Global Variables",
+        "parentId": null,
+        "parentModel": "workspace",
        "variables": [
          {
            "name": "COLLECTION VARIABLE",
@@ -28,6 +30,7 @@
        "workspaceId": "GENERATE_ID::WORKSPACE_1",
        "folderId": null,
        "name": "Form URL",
+        "sortPriority": 0,
        "method": "POST",
        "url": "example.com/:foo/:bar",
        "urlParameters": [
--- a/plugins/importer-yaak/package.json
+++ b/plugins/importer-yaak/package.json
@@ -7,6 +7,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  }
 }
--- a/plugins/importer-yaak/src/index.ts
+++ b/plugins/importer-yaak/src/index.ts
@@ -66,7 +66,20 @@ export function migrateImport(contents: string) {
    }
  }

-  return { resources: parsed.resources }; // Should already be in the correct format
+  // Migrate v4 to v5
+  for (const environment of parsed.resources.environments ?? []) {
+    if ('base' in environment && environment.base) {
+      environment.parentModel = 'workspace';
+      environment.parentId = null;
+      delete environment.base;
+    } else if ('base' in environment && !environment.base) {
+      environment.parentModel = 'environment';
+      environment.parentId = null;
+      delete environment.base;
+    }
+  }
+
+  return { resources: parsed.resources };
 }

 function isJSObject(obj: unknown) {
--- a/plugins/importer-yaak/tests/index.test.ts
+++ b/plugins/importer-yaak/tests/index.test.ts
@@ -31,16 +31,20 @@ describe('importer-yaak', () => {
      JSON.stringify({
        yaakSchema: 2,
        resources: {
-          environments: [{
-            id: 'e_1',
-            workspaceId: 'w_1',
-            name: 'Production',
-            variables: [{ name: 'E1', value: 'E1!' }],
-          }],
-          workspaces: [{
-            id: 'w_1',
-            variables: [{ name: 'W1', value: 'W1!' }],
-          }],
+          environments: [
+            {
+              id: 'e_1',
+              workspaceId: 'w_1',
+              name: 'Production',
+              variables: [{ name: 'E1', value: 'E1!' }],
+            },
+          ],
+          workspaces: [
+            {
+              id: 'w_1',
+              variables: [{ name: 'W1', value: 'W1!' }],
+            },
+          ],
        },
      }),
    );
@@ -48,21 +52,98 @@ describe('importer-yaak', () => {
    expect(imported).toEqual(
      expect.objectContaining({
        resources: {
-          workspaces: [{
-            id: 'w_1',
-          }],
-          environments: [{
-            id: 'e_1',
-            base: false,
-            workspaceId: 'w_1',
-            name: 'Production',
-            variables: [{ name: 'E1', value: 'E1!' }],
-          }, {
-            id: 'GENERATE_ID::base_env_w_1',
-            workspaceId: 'w_1',
-            name: 'Global Variables',
-            variables: [{ name: 'W1', value: 'W1!' }],
-          }],
+          workspaces: [
+            {
+              id: 'w_1',
+            },
+          ],
+          environments: [
+            {
+              id: 'e_1',
+              workspaceId: 'w_1',
+              name: 'Production',
+              variables: [{ name: 'E1', value: 'E1!' }],
+              parentModel: 'environment',
+              parentId: null,
+            },
+            {
+              id: 'GENERATE_ID::base_env_w_1',
+              workspaceId: 'w_1',
+              name: 'Global Variables',
+              variables: [{ name: 'W1', value: 'W1!' }],
+            },
+          ],
+        },
+      }),
+    );
+  });
+
+  test('converts schema 4 to 5', () => {
+    const imported = migrateImport(
+      JSON.stringify({
+        yaakSchema: 2,
+        resources: {
+          environments: [
+            {
+              id: 'e_1',
+              workspaceId: 'w_1',
+              base: false,
+              name: 'Production',
+              variables: [{ name: 'E1', value: 'E1!' }],
+            },
+            {
+              id: 'e_1',
+              workspaceId: 'w_1',
+              base: true,
+              name: 'Global Variables',
+              variables: [{ name: 'G1', value: 'G1!' }],
+            },
+          ],
+          folders: [
+            {
+              id: 'f_1',
+            },
+          ],
+          workspaces: [
+            {
+              id: 'w_1',
+            },
+          ],
+        },
+      }),
+    );
+
+    expect(imported).toEqual(
+      expect.objectContaining({
+        resources: {
+          workspaces: [
+            {
+              id: 'w_1',
+            },
+          ],
+          folders: [
+            {
+              id: 'f_1',
+            },
+          ],
+          environments: [
+            {
+              id: 'e_1',
+              workspaceId: 'w_1',
+              name: 'Production',
+              variables: [{ name: 'E1', value: 'E1!' }],
+              parentModel: 'environment',
+              parentId: null,
+            },
+            {
+              id: 'e_1',
+              workspaceId: 'w_1',
+              name: 'Global Variables',
+              parentModel: 'workspace',
+              parentId: null,
+              variables: [{ name: 'G1', value: 'G1!' }],
+            },
+          ],
        },
      }),
    );
--- a/plugins/template-function-cookie/package.json
+++ b/plugins/template-function-cookie/package.json
@@ -7,6 +7,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/template-function-encode/package.json
+++ b/plugins/template-function-encode/package.json
@@ -7,6 +7,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/template-function-fs/package.json
+++ b/plugins/template-function-fs/package.json
@@ -7,6 +7,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/template-function-hash/package.json
+++ b/plugins/template-function-hash/package.json
@@ -7,6 +7,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/template-function-json/package.json
+++ b/plugins/template-function-json/package.json
@@ -7,7 +7,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  },
  "dependencies": {
    "jsonpath-plus": "^10.3.0"
--- a/plugins/template-function-prompt/package.json
+++ b/plugins/template-function-prompt/package.json
@@ -7,6 +7,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/template-function-regex/package.json
+++ b/plugins/template-function-regex/package.json
@@ -7,6 +7,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  }
 }
--- a/plugins/template-function-request/package.json
+++ b/plugins/template-function-request/package.json
@@ -7,6 +7,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/template-function-response/package.json
+++ b/plugins/template-function-response/package.json
@@ -7,7 +7,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  },
  "dependencies": {
    "jsonpath-plus": "^10.3.0",
--- a/plugins/template-function-timestamp/package.json
+++ b/plugins/template-function-timestamp/package.json
@@ -5,9 +5,11 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint": "tsc --noEmit && eslint . --ext .ts,.tsx",
+    "test": "vitest --run tests"
  },
  "dependencies": {
+    "@date-fns/tz": "^1.4.1",
    "date-fns": "^4.1.0"
  }
 }
--- a/plugins/template-function-timestamp/src/index.ts
+++ b/plugins/template-function-timestamp/src/index.ts
@@ -1,6 +1,7 @@
 import type { TemplateFunctionArg } from '@yaakapp-internal/plugins';
 import type { PluginDefinition } from '@yaakapp/api';

+import type { ContextFn } from 'date-fns';
 import {
  addDays,
  addHours,
@@ -24,7 +25,8 @@ const dateArg: TemplateFunctionArg = {
  name: 'date',
  label: 'Timestamp',
  optional: true,
-  description: 'Can be a timestamp in milliseconds, ISO string, or anything parseable by JS `new Date()`',
+  description:
+    'Can be a timestamp in milliseconds, ISO string, or anything parseable by JS `new Date()`',
  placeholder: new Date().toISOString(),
 };

@@ -148,8 +150,12 @@ export function calculateDatetime(args: { date?: string; expression?: string }):
  return jsDate.toISOString();
 }

-export function formatDatetime(args: { date?: string; format?: string }): string {
+export function formatDatetime(args: {
+  date?: string;
+  format?: string;
+  in?: ContextFn<Date>;
+}): string {
  const { date, format = 'yyyy-MM-dd HH:mm:ss' } = args;
  const d = parseDateString(date ?? '');
-  return formatDate(d, String(format));
+  return formatDate(d, String(format), { in: args.in });
 }
--- a/plugins/template-function-timestamp/tests/formatDatetime.test.ts
+++ b/plugins/template-function-timestamp/tests/formatDatetime.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { calculateDatetime, formatDatetime } from '../src';
+import { tz } from "@date-fns/tz";

 describe('formatDatetime', () => {
  it('returns formatted current date', () => {
@@ -13,12 +14,12 @@ describe('formatDatetime', () => {
  });

  it('returns formatted specific timestamp', () => {
-    const result = formatDatetime({ date: '1752435296000' });
+    const result = formatDatetime({ date: '1752435296000', in: tz('America/Vancouver') });
    expect(result).toBe('2025-07-13 12:34:56');
  });

  it('returns formatted specific timestamp with decimals', () => {
-    const result = formatDatetime({ date: '1752435296000.19' });
+    const result = formatDatetime({ date: '1752435296000.19', in: tz('America/Vancouver') });
    expect(result).toBe('2025-07-13 12:34:56');
  });

--- a/plugins/template-function-uuid/package.json
+++ b/plugins/template-function-uuid/package.json
@@ -7,7 +7,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  },
  "dependencies": {
    "uuid": "^11.1.0"
--- a/plugins/template-function-xml/package.json
+++ b/plugins/template-function-xml/package.json
@@ -7,7 +7,7 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  },
  "dependencies": {
    "@xmldom/xmldom": "^0.9.8",
--- a/plugins/themes-yaak/package.json
+++ b/plugins/themes-yaak/package.json
@@ -7,6 +7,6 @@
  "scripts": {
    "build": "yaakcli build",
    "dev": "yaakcli dev",
-    "lint": "eslint . --ext .ts,.tsx"
+    "lint":"tsc --noEmit && eslint . --ext .ts,.tsx"
  }
 }
--- a/plugins/themes-yaak/src/index.ts
+++ b/plugins/themes-yaak/src/index.ts
@@ -2,6 +2,49 @@ import type { PluginDefinition } from '@yaakapp/api';

 export const plugin: PluginDefinition = {
  themes: [
+    {
+      id: 'high-contrast',
+      label: 'High Contrast Light',
+      dark: false,
+      base: {
+        surface: 'white',
+        surfaceHighlight: 'hsl(218,24%,93%)',
+        text: 'black',
+        textSubtle: 'hsl(217,24%,40%)',
+        textSubtlest: 'hsl(217,24%,40%)',
+        border: 'hsl(217,22%,50%)',
+        borderSubtle: 'hsl(217,22%,60%)',
+        primary: 'hsl(267,67%,47%)',
+        secondary: 'hsl(218,18%,53%)',
+        info: 'hsl(206,100%,36%)',
+        success: 'hsl(155,100%,26%)',
+        notice: 'hsl(45,100%,31%)',
+        warning: 'hsl(30,99%,34%)',
+        danger: 'hsl(334,100%,35%)',
+      },
+    },
+    {
+      id: 'high-contrast-dark',
+      label: 'High Contrast Dark',
+      dark: true,
+      base: {
+        surface: 'hsl(0,0%,0%)',
+        surfaceHighlight: 'hsl(0,0%,20%)',
+        text: 'hsl(0,0%,100%)',
+        textSubtle: 'hsl(0,0%,90%)',
+        textSubtlest: 'hsl(0,0%,80%)',
+        selection: 'hsl(276,100%,30%)',
+        surfaceActive: 'hsl(276,100%,30%)',
+        border: 'hsl(0,0%,60%)',
+        primary: 'hsl(266,100%,85%)',
+        secondary: 'hsl(242,20%,72%)',
+        info: 'hsl(208,100%,83%)',
+        success: 'hsl(150,100%,63%)',
+        notice: 'hsl(49,100%,77%)',
+        warning: 'hsl(28,100%,73%)',
+        danger: 'hsl(343,100%,79%)',
+      },
+    },
    {
      id: 'catppuccin-frappe',
      label: 'Catppuccin Frappé',
@@ -595,5 +638,112 @@ export const plugin: PluginDefinition = {
        danger: 'hsl(343,81%,75%)',
      },
    },
+    {
+      id: 'rose-pine',
+      label: 'Rosé Pine',
+      dark: true,
+      base: {
+        surface: 'hsl(249,22%,12%)',
+        text: 'hsl(245,50%,91%)',
+        textSubtle: 'hsl(248,15%,61%)',
+        textSubtlest: 'hsl(249,12%,47%)',
+        primary: 'hsl(267,57%,78%)',
+        secondary: 'hsl(249,12%,47%)',
+        info: 'hsl(199,49%,60%)',
+        success: 'hsl(180,43%,73%)',
+        notice: 'hsl(35,88%,72%)',
+        warning: 'hsl(1,74%,79%)',
+        danger: 'hsl(343,76%,68%)',
+      },
+      components: {
+        responsePane: {
+          surface: 'hsl(247,23%,15%)',
+        },
+        sidebar: {
+          surface: 'hsl(247,23%,15%)',
+        },
+        menu: {
+          surface: 'hsl(248,21%,26%)',
+          textSubtle: 'hsl(248,15%,66%)',
+          textSubtlest: 'hsl(249,12%,52%)',
+          border: 'hsl(248,21%,35%)',
+          borderSubtle: 'hsl(248,21%,33%)',
+        },
+      },
+    },
+    {
+      id: 'rose-pine-moon',
+      label: 'Rosé Pine Moon',
+      dark: true,
+      base: {
+        surface: 'hsl(246,24%,17%)',
+        text: 'hsl(245,50%,91%)',
+        textSubtle: 'hsl(248,15%,61%)',
+        textSubtlest: 'hsl(249,12%,47%)',
+        primary: 'hsl(267,57%,78%)',
+        secondary: 'hsl(248,15%,61%)',
+        info: 'hsl(197,48%,60%)',
+        success: 'hsl(197,48%,60%)',
+        notice: 'hsl(35,88%,72%)',
+        warning: 'hsl(2,66%,75%)',
+        danger: 'hsl(343,76%,68%)',
+      },
+      components: {
+        responsePane: {
+          surface: 'hsl(247,24%,20%)',
+        },
+        sidebar: {
+          surface: 'hsl(247,24%,20%)',
+        },
+        menu: {
+          surface: 'hsl(248,21%,26%)',
+          textSubtle: 'hsl(248,15%,61%)',
+          textSubtlest: 'hsl(249,12%,55%)',
+          border: 'hsl(248,21%,35%)',
+          borderSubtle: 'hsl(248,21%,31%)',
+        },
+      },
+    },
+    {
+      id: 'rose-pine-dawn',
+      label: 'Rosé Pine Dawn',
+      dark: false,
+      base: {
+        surface: 'hsl(32,57%,95%)',
+        border: 'hsl(10,9%,86%)',
+        surfaceHighlight: 'hsl(25,35%,93%)',
+        text: 'hsl(248,19%,40%)',
+        textSubtle: 'hsl(248,12%,52%)',
+        textSubtlest: 'hsl(257,9%,61%)',
+        primary: 'hsl(271,27%,56%)',
+        secondary: 'hsl(249,12%,47%)',
+        info: 'hsl(197,52%,36%)',
+        success: 'hsl(188,31%,45%)',
+        notice: 'hsl(34,64%,49%)',
+        warning: 'hsl(2,47%,64%)',
+        danger: 'hsl(343,35%,55%)',
+      },
+      components: {
+        responsePane: {
+          border: 'hsl(20,12%,90%)',
+        },
+        sidebar: {
+          border: 'hsl(20,12%,90%)',
+        },
+        appHeader: {
+          border: 'hsl(20,12%,90%)',
+        },
+        input: {
+          border: 'hsl(10,9%,86%)',
+        },
+        dialog: {
+          border: 'hsl(20,12%,90%)',
+        },
+        menu: {
+          surface: 'hsl(28,40%,92%)',
+          border: 'hsl(10,9%,86%)',
+        },
+      },
+    },
  ],
 };
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -503,15 +503,6 @@ dependencies = [
 "generic-array",
 ]

-[[package]]
-name = "block-padding"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "block2"
 version = "0.5.1"
@@ -736,16 +727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257"
 dependencies = [
 "serde",
- "toml",
-]
-
-[[package]]
-name = "cbc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
-dependencies = [
- "cipher",
+ "toml 0.8.23",
 ]

 [[package]]
@@ -822,6 +804,16 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "charset"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e"
+dependencies = [
+ "base64 0.22.1",
+ "encoding_rs",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.41"
@@ -1210,31 +1202,23 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"

 [[package]]
 name = "dbus"
-version = "0.9.7"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
+checksum = "190b6255e8ab55a7b568df5a883e9497edc3e4821c06396612048b430e5ad1e9"
 dependencies = [
 "libc",
 "libdbus-sys",
- "winapi",
+ "windows-sys 0.59.0",
 ]

 [[package]]
 name = "dbus-secret-service"
-version = "4.0.3"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42a16374481d92aed73ae45b1f120207d8e71d24fb89f357fadbd8f946fd84b"
+checksum = "708b509edf7889e53d7efb0ffadd994cc6c2345ccb62f55cfd6b0682165e4fa6"
 dependencies = [
- "aes",
- "block-padding",
- "cbc",
 "dbus",
- "futures-util",
- "hkdf",
- "num",
- "once_cell",
- "rand 0.8.5",
- "sha2",
+ "zeroize",
 ]

 [[package]]
@@ -1350,9 +1334,9 @@ dependencies = [

 [[package]]
 name = "dlopen2"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6"
+checksum = "b54f373ccf864bf587a89e880fb7610f8d73f3045f13580948ccbcaff26febff"
 dependencies = [
 "dlopen2_derive",
 "libc",
@@ -1446,7 +1430,7 @@ dependencies = [
 "cc",
 "memchr",
 "rustc_version",
- "toml",
+ "toml 0.8.23",
 "vswhom",
 "winreg",
 ]
@@ -2263,15 +2247,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

-[[package]]
-name = "hkdf"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
-dependencies = [
- "hmac",
-]
-
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -2685,7 +2660,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
- "block-padding",
 "generic-array",
 ]

@@ -2845,15 +2819,17 @@ dependencies = [

 [[package]]
 name = "keyring"
-version = "4.0.0-rc.1"
+version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb06f73ca0ea1cbd3858e54404585e33dccb860cb4fc8a66ad5e75a5736f3f19"
+checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c"
 dependencies = [
 "byteorder",
 "dbus-secret-service",
 "log",
+ "security-framework 2.11.1",
 "security-framework 3.2.0",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
+ "zeroize",
 ]

 [[package]]
@@ -2926,9 +2902,9 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"

 [[package]]
 name = "libdbus-sys"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
+checksum = "5cbe856efeb50e4681f010e9aaa2bf0a644e10139e54cde10fc83a307c23bd9f"
 dependencies = [
 "pkg-config",
 ]
@@ -3349,76 +3325,12 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"

-[[package]]
-name = "num"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"

-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -3619,6 +3531,16 @@ dependencies = [
 "objc2-core-foundation",
 ]

+[[package]]
+name = "objc2-javascript-core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9052cb1bb50a4c161d934befcf879526fb87ae9a68858f241e693ca46225cf5a"
+dependencies = [
+ "objc2 0.6.1",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "objc2-metal"
 version = "0.2.2"
@@ -3667,6 +3589,17 @@ dependencies = [
 "objc2-foundation 0.3.1",
 ]

+[[package]]
+name = "objc2-security"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1f8e0ef3ab66b08c42644dcb34dba6ec0a574bbd8adbb8bdbdc7a2779731a44"
+dependencies = [
+ "bitflags 2.9.1",
+ "objc2 0.6.1",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "objc2-ui-kit"
 version = "0.3.1"
@@ -3691,6 +3624,8 @@ dependencies = [
 "objc2-app-kit",
 "objc2-core-foundation",
 "objc2-foundation 0.3.1",
+ "objc2-javascript-core",
+ "objc2-security",
 ]

 [[package]]
@@ -5130,10 +5065,11 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
 dependencies = [
+ "serde_core",
 "serde_derive",
 ]

@@ -5170,10 +5106,19 @@ dependencies = [
 ]

 [[package]]
-name = "serde_derive"
-version = "1.0.219"
+name = "serde_core"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.226"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5203,6 +5148,17 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "serde_path_to_error"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+dependencies = [
+ "itoa",
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_repr"
 version = "0.1.20"
@@ -5223,6 +5179,15 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "serde_spanned"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -5280,9 +5245,9 @@ dependencies = [

 [[package]]
 name = "serialize-to-javascript"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
+checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5"
 dependencies = [
 "serde",
 "serde_json",
@@ -5291,13 +5256,13 @@ dependencies = [

 [[package]]
 name = "serialize-to-javascript-impl"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
+checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 1.0.109",
+ "syn 2.0.101",
 ]

 [[package]]
@@ -5616,17 +5581,18 @@ dependencies = [
 "cfg-expr",
 "heck 0.5.0",
 "pkg-config",
- "toml",
+ "toml 0.8.23",
 "version-compare",
 ]

 [[package]]
 name = "tao"
-version = "0.34.0"
+version = "0.34.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a"
+checksum = "959469667dbcea91e5485fc48ba7dd6023face91bb0f1a14681a70f99847c3f7"
 dependencies = [
 "bitflags 2.9.1",
+ "block2 0.6.1",
 "core-foundation 0.10.1",
 "core-graphics 0.24.0",
 "crossbeam-channel",
@@ -5695,12 +5661,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"

 [[package]]
 name = "tauri"
-version = "2.6.2"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "124e129c9c0faa6bec792c5948c89e86c90094133b0b9044df0ce5f0a8efaa0d"
+checksum = "d4d1d3b3dc4c101ac989fd7db77e045cc6d91a25349cd410455cb5c57d510c1c"
 dependencies = [
 "anyhow",
 "bytes",
+ "cookie",
 "dirs",
 "dunce",
 "embed_plist",
@@ -5719,6 +5686,7 @@ dependencies = [
 "objc2-app-kit",
 "objc2-foundation 0.3.1",
 "objc2-ui-kit",
+ "objc2-web-kit",
 "percent-encoding",
 "plist",
 "raw-window-handle",
@@ -5746,9 +5714,9 @@ dependencies = [

 [[package]]
 name = "tauri-build"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f025c389d3adb83114bec704da973142e82fc6ec799c7c750c5e21cefaec83"
+checksum = "9c432ccc9ff661803dab74c6cd78de11026a578a9307610bbc39d3c55be7943f"
 dependencies = [
 "anyhow",
 "cargo_toml",
@@ -5762,15 +5730,15 @@ dependencies = [
 "serde_json",
 "tauri-utils",
 "tauri-winres",
- "toml",
+ "toml 0.9.5",
 "walkdir",
 ]

 [[package]]
 name = "tauri-codegen"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5df493a1075a241065bc865ed5ef8d0fbc1e76c7afdc0bf0eccfaa7d4f0e406"
+checksum = "1ab3a62cf2e6253936a8b267c2e95839674e7439f104fa96ad0025e149d54d8a"
 dependencies = [
 "base64 0.22.1",
 "brotli",
@@ -5795,9 +5763,9 @@ dependencies = [

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

 [[package]]
 name = "tauri-plugin"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9a0bd00bf1930ad1a604d08b0eb6b2a9c1822686d65d7f4731a7723b8901d3"
+checksum = "9946a3cede302eac0c6eb6c6070ac47b1768e326092d32efbb91f21ed58d978f"
 dependencies = [
 "anyhow",
 "glob",
@@ -5820,7 +5788,7 @@ dependencies = [
 "serde",
 "serde_json",
 "tauri-utils",
- "toml",
+ "toml 0.9.5",
 "walkdir",
 ]

@@ -5841,11 +5809,12 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-deep-link"
-version = "2.4.0"
+version = "2.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab261eb006db10ab478e3fbb5a4e2692df3f7eb3e28300ee2b64428979167ed0"
+checksum = "cd67112fb1131834c2a7398ffcba520dbbf62c17de3b10329acd1a3554b1a9bb"
 dependencies = [
 "dunce",
+ "plist",
 "rust-ini",
 "serde",
 "serde_json",
@@ -5861,9 +5830,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aefb14219b492afb30b12647b5b1247cadd2c0603467310c36e0f7ae1698c28"
+checksum = "0beee42a4002bc695550599b011728d9dfabf82f767f134754ed6655e434824e"
 dependencies = [
 "log",
 "raw-window-handle",
@@ -5879,9 +5848,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-fs"
-version = "2.4.0"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c341290d31991dbca38b31d412c73dfbdb070bb11536784f19dd2211d13b778f"
+checksum = "315784ec4be45e90a987687bae7235e6be3d6e9e350d2b75c16b8a4bf22c1db7"
 dependencies = [
 "anyhow",
 "dunce",
@@ -5895,15 +5864,15 @@ dependencies = [
 "tauri-plugin",
 "tauri-utils",
 "thiserror 2.0.12",
- "toml",
+ "toml 0.9.5",
 "url",
 ]

 [[package]]
 name = "tauri-plugin-log"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a59139183e0907cec1499dddee4e085f5a801dc659efa0848ee224f461371426"
+checksum = "61c1438bc7662acd16d508c919b3c087efd63669a4c75625dff829b1c75975ec"
 dependencies = [
 "android_logger",
 "byte-unit",
@@ -5923,9 +5892,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-opener"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecee219f11cdac713ab32959db5d0cceec4810ba4f4458da992292ecf9660321"
+checksum = "786156aa8e89e03d271fbd3fe642207da8e65f3c961baa9e2930f332bf80a1f5"
 dependencies = [
 "dunce",
 "glob",
@@ -5945,9 +5914,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-os"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05bccb4c6de4299beec5a9b070878a01bce9e2c945aa7a75bcea38bcba4c675d"
+checksum = "77a1c77ebf6f20417ab2a74e8c310820ba52151406d0c80fbcea7df232e3f6ba"
 dependencies = [
 "gethostname 1.0.2",
 "log",
@@ -5963,9 +5932,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-shell"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b9ffadec5c3523f11e8273465cacb3d86ea7652a28e6e2a2e9b5c182f791d25"
+checksum = "54777d0c0d8add34eea3ced84378619ef5b97996bd967d3038c668feefd21071"
 dependencies = [
 "encoding_rs",
 "log",
@@ -5984,9 +5953,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-single-instance"
-version = "2.3.0"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b441b6d5d1a194e9fee0b358fe0d602ded845d0f580e1f8c8ef78ebc3c8b225d"
+checksum = "fb9cac815bf11c4a80fb498666bcdad66d65b89e3ae24669e47806febb76389c"
 dependencies = [
 "serde",
 "serde_json",
@@ -6032,9 +6001,9 @@ dependencies = [

 [[package]]
 name = "tauri-plugin-window-state"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3d22b21b9cec73601b512a868f7c74f93c044d44fd6ca1c84e9d6afb6b1559"
+checksum = "2d5f6fe3291bfa609c7e0b0ee3bedac294d94c7018934086ce782c1d0f2a468e"
 dependencies = [
 "bitflags 2.9.1",
 "log",
@@ -6047,9 +6016,9 @@ dependencies = [

 [[package]]
 name = "tauri-runtime"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e7bb73d1bceac06c20b3f755b2c8a2cb13b20b50083084a8cf3700daf397ba4"
+checksum = "d4cfc9ad45b487d3fded5a4731a567872a4812e9552e3964161b08edabf93846"
 dependencies = [
 "cookie",
 "dpi",
@@ -6058,20 +6027,23 @@ dependencies = [
 "jni",
 "objc2 0.6.1",
 "objc2-ui-kit",
+ "objc2-web-kit",
 "raw-window-handle",
 "serde",
 "serde_json",
 "tauri-utils",
 "thiserror 2.0.12",
 "url",
+ "webkit2gtk",
+ "webview2-com",
 "windows",
 ]

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

 [[package]]
 name = "tauri-utils"
-version = "2.5.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41743bbbeb96c3a100d234e5a0b60a46d5aa068f266160862c7afdbf828ca02e"
+checksum = "41a3852fdf9a4f8fbeaa63dc3e9a85284dd6ef7200751f0bd66ceee30c93f212"
 dependencies = [
 "anyhow",
 "brotli",
@@ -6125,7 +6097,7 @@ dependencies = [
 "serde_with",
 "swift-rs",
 "thiserror 2.0.12",
- "toml",
+ "toml 0.9.5",
 "url",
 "urlpattern",
 "uuid",
@@ -6140,7 +6112,7 @@ checksum = "e8d321dbc6f998d825ab3f0d62673e810c861aac2d0de2cc2c395328f1d113b4"
 dependencies = [
 "embed-resource",
 "indexmap 2.9.0",
- "toml",
+ "toml 0.8.23",
 ]

 [[package]]
@@ -6390,11 +6362,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
 "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
 "toml_edit 0.22.27",
 ]

+[[package]]
+name = "toml"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+dependencies = [
+ "indexmap 2.9.0",
+ "serde",
+ "serde_spanned 1.0.0",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 0.7.10",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.11"
@@ -6404,6 +6391,15 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.19.15"
@@ -6411,7 +6407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
 "indexmap 2.9.0",
- "toml_datetime",
+ "toml_datetime 0.6.11",
 "winnow 0.5.40",
 ]

@@ -6422,7 +6418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
 dependencies = [
 "indexmap 2.9.0",
- "toml_datetime",
+ "toml_datetime 0.6.11",
 "winnow 0.5.40",
 ]

@@ -6434,18 +6430,33 @@ checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
 "indexmap 2.9.0",
 "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
 "toml_write",
 "winnow 0.7.10",
 ]

+[[package]]
+name = "toml_parser"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+dependencies = [
+ "winnow 0.7.10",
+]
+
 [[package]]
 name = "toml_write"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"

+[[package]]
+name = "toml_writer"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109"
+
 [[package]]
 name = "tonic"
 version = "0.12.3"
@@ -7723,14 +7734,15 @@ checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"

 [[package]]
 name = "wry"
-version = "0.52.1"
+version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a714d9ba7075aae04a6e50229d6109e3d584774b99a6a8c60de1698ca111b9"
+checksum = "31f0e9642a0d061f6236c54ccae64c2722a7879ad4ec7dff59bd376d446d8e90"
 dependencies = [
 "base64 0.22.1",
 "block2 0.6.1",
 "cookie",
 "crossbeam-channel",
+ "dirs",
 "dpi",
 "dunce",
 "gdkx11",
@@ -7826,9 +7838,9 @@ dependencies = [
 name = "yaak-app"
 version = "0.0.0"
 dependencies = [
+ "charset",
 "chrono",
 "cookie",
- "encoding_rs",
 "eventsource-client",
 "http",
 "log",
@@ -7856,6 +7868,7 @@ dependencies = [
 "thiserror 2.0.12",
 "tokio",
 "tokio-stream",
+ "ts-rs",
 "uuid",
 "yaak-common",
 "yaak-crypto",
@@ -8031,6 +8044,7 @@ dependencies = [
 "dunce",
 "futures-util",
 "hex",
+ "keyring",
 "log",
 "md5 0.7.0",
 "path-slash",
@@ -8072,6 +8086,7 @@ dependencies = [
 "notify",
 "serde",
 "serde_json",
+ "serde_path_to_error",
 "serde_yaml",
 "sha1",
 "tauri",
@@ -8143,9 +8158,9 @@ dependencies = [

 [[package]]
 name = "zbus"
-version = "5.7.1"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a7c7cee313d044fca3f48fa782cb750c79e4ca76ba7bc7718cd4024cdf6f68"
+checksum = "2d07e46d035fb8e375b2ce63ba4e4ff90a7f73cf2ffb0138b29e1158d2eaadf7"
 dependencies = [
 "async-broadcast",
 "async-executor",
@@ -8168,7 +8183,7 @@ dependencies = [
 "tokio",
 "tracing",
 "uds_windows",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 "winnow 0.7.10",
 "zbus_macros",
 "zbus_names",
@@ -8177,9 +8192,9 @@ dependencies = [

 [[package]]
 name = "zbus_macros"
-version = "5.7.1"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17e7e5eec1550f747e71a058df81a9a83813ba0f6a95f39c4e218bdc7ba366a"
+checksum = "57e797a9c847ed3ccc5b6254e8bcce056494b375b511b3d6edcec0aeb4defaca"
 dependencies = [
 "proc-macro-crate 3.3.0",
 "proc-macro2",
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -32,42 +32,46 @@ strip = true  # Automatically strip symbols from the binary.

 [features]
 cargo-clippy = []
+default = []
+updater = []
+license = ["yaak-license"]

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

 [target.'cfg(target_os = "linux")'.dependencies]
 openssl-sys = { version = "0.9.105", features = ["vendored"] } # For Ubuntu installation to work

 [dependencies]
+charset = "0.1.5"
 chrono = { workspace = true, features = ["serde"] }
 cookie = "0.18.1"
-encoding_rs = "0.8.35"
 eventsource-client = { git = "https://github.com/yaakapp/rust-eventsource-client", version = "0.14.0" }
 http = { version = "1.2.0", default-features = false }
 log = "0.4.27"
 md5 = "0.8.0"
 mime_guess = "2.0.5"
 rand = "0.9.0"
-reqwest = { workspace = true, features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "rustls-tls-manual-roots-no-provider", "socks"] }
+reqwest = { workspace = true, features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "rustls-tls-manual-roots-no-provider", "socks", "http2"] }
 reqwest_cookie_store = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["raw_value"] }
 tauri = { workspace = true, features = ["devtools", "protocol-asset"] }
 tauri-plugin-clipboard-manager = "2.3.0"
+tauri-plugin-deep-link = "2.4.3"
 tauri-plugin-dialog = { workspace = true }
-tauri-plugin-fs = "2.4.0"
-tauri-plugin-log = { version = "2.6.0", features = ["colored"] }
-tauri-plugin-opener = "2.4.0"
-tauri-plugin-os = "2.3.0"
+tauri-plugin-fs = "2.4.2"
+tauri-plugin-log = { version = "2.7.0", features = ["colored"] }
+tauri-plugin-opener = "2.5.0"
+tauri-plugin-os = "2.3.1"
 tauri-plugin-shell = { workspace = true }
-tauri-plugin-deep-link = "2.4.0"
-tauri-plugin-single-instance = { version = "2.3.0", features = ["deep-link"] }
+tauri-plugin-single-instance = { version = "2.3.4", features = ["deep-link"] }
 tauri-plugin-updater = "2.9.0"
-tauri-plugin-window-state = "2.3.0"
+tauri-plugin-window-state = "2.4.0"
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
 tokio-stream = "0.1.17"
+ts-rs = { workspace = true }
 uuid = "1.12.1"
 yaak-common = { workspace = true }
 yaak-crypto = { workspace = true }
@@ -75,7 +79,7 @@ yaak-fonts = { workspace = true }
 yaak-git = { path = "yaak-git" }
 yaak-grpc = { path = "yaak-grpc" }
 yaak-http = { workspace = true }
-yaak-license = { path = "yaak-license" }
+yaak-license = { path = "yaak-license", optional = true }
 yaak-mac-window = { path = "yaak-mac-window" }
 yaak-models = { workspace = true }
 yaak-plugins = { workspace = true }
@@ -87,20 +91,21 @@ yaak-ws = { path = "yaak-ws" }
 [workspace.dependencies]
 chrono = "0.4.41"
 hex = "0.4.3"
+keyring = "3.6.3"
 reqwest = "0.12.20"
-serde = "1.0.219"
-serde_json = "1.0.140"
-tauri = "2.6.2"
-tauri-plugin = "2.3.0"
-tauri-plugin-dialog = "2.3.0"
-tauri-plugin-shell = "2.3.0"
-tokio = "1.45.1"
-thiserror = "2.0.12"
-ts-rs = "11.0.1"
 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"
 sha2 = "0.10.9"
+tauri = "2.8.5"
+tauri-plugin = "2.4.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"
 yaak-common = { path = "yaak-common" }
 yaak-crypto = { path = "yaak-crypto" }
 yaak-fonts = { path = "yaak-fonts" }
--- a/src-tauri/bindings/index.ts
+++ b/src-tauri/bindings/index.ts
@@ -0,0 +1,11 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UpdateInfo = { replyEventId: string, version: string, downloaded: boolean, };
+
+export type UpdateResponse = { "type": "ack" } | { "type": "action", action: UpdateResponseAction, };
+
+export type UpdateResponseAction = "install" | "skip";
+
+export type YaakNotification = { timestamp: string, timeout: number | null, id: string, title: string | null, message: string, color: string | null, action: YaakNotificationAction | null, };
+
+export type YaakNotificationAction = { label: string, url: string, };
--- a/src-tauri/capabilities/capabilities.json
+++ b/src-tauri/capabilities/capabilities.json
@@ -1,8 +1,6 @@
 {
-  "$schema": "../gen/schemas/capabilities.json",
-  "identifier": "main",
-  "description": "Main permissions",
-  "local": true,
+  "identifier": "default",
+  "description": "Default capabilities for all build variants",
  "windows": [
    "*"
  ],
@@ -11,6 +9,7 @@
    "core:event:allow-emit",
    "core:event:allow-listen",
    "core:event:allow-unlisten",
+    "core:path:allow-resolve-directory",
    "os:allow-os-type",
    "clipboard-manager:allow-clear",
    "clipboard-manager:allow-write-text",
@@ -54,7 +53,6 @@
    "yaak-crypto:default",
    "yaak-fonts:default",
    "yaak-git:default",
-    "yaak-license:default",
    "yaak-mac-window:default",
    "yaak-models:default",
    "yaak-plugins:default",
--- a/src-tauri/icons/dev/64x64.png
+++ b/src-tauri/icons/dev/64x64.png
--- a/src-tauri/icons/dev/icon.icns
+++ b/src-tauri/icons/dev/icon.icns
--- a/src-tauri/icons/dev/icon.ico
+++ b/src-tauri/icons/dev/icon.ico
--- a/src-tauri/icons/release/64x64.png
+++ b/src-tauri/icons/release/64x64.png
--- a/src-tauri/icons/release/icon.icns
+++ b/src-tauri/icons/release/icon.icns
--- a/src-tauri/icons/release/icon.ico
+++ b/src-tauri/icons/release/icon.ico
--- a/src-tauri/package.json
+++ b/src-tauri/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@yaakapp-internal/tauri",
+  "private": true,
+  "version": "1.0.0",
+  "main": "bindings/index.ts"
+}
--- a/src-tauri/src/encoding.rs
+++ b/src-tauri/src/encoding.rs
@@ -1,16 +1,27 @@
-use encoding_rs::SHIFT_JIS;
+use log::debug;
+use mime_guess::{Mime, mime};
+use std::path::Path;
+use std::str::FromStr;
 use tokio::fs;
-use yaak_models::models::HttpResponse;

-pub async fn read_response_body<'a>(
-    response: HttpResponse,
-) -> Option<String> {
-    let body_path = match response.body_path {
-        None => return None,
-        Some(p) => p,
-    };
+pub async fn read_response_body(body_path: impl AsRef<Path>, content_type: &str) -> Option<String> {
+    let body = fs::read(body_path).await.ok()?;
+    let body_charset = parse_charset(content_type).unwrap_or("utf-8".to_string());
+    debug!("body_charset: {}", body_charset);
+    if let Some(decoder) = charset::Charset::for_label(body_charset.as_bytes()) {
+        debug!("Using decoder for charset: {}", body_charset);
+        let (cow, real_encoding, exist_replace) = decoder.decode(&body);
+        debug!(
+            "Decoded body with charset: {}, real_encoding: {:?}, exist_replace: {}",
+            body_charset, real_encoding, exist_replace
+        );
+        return cow.into_owned().into();
+    }

-    let body = fs::read(body_path).await.unwrap();
-    let (s, _, _) = SHIFT_JIS.decode(body.as_slice());
-    Some(s.to_string())
+    Some(String::from_utf8_lossy(&body).to_string())
+}
+
+fn parse_charset(content_type: &str) -> Option<String> {
+    let mime: Mime = Mime::from_str(content_type).ok()?;
+    mime.get_param(mime::CHARSET).map(|v| v.to_string())
 }
--- a/src-tauri/src/error.rs
+++ b/src-tauri/src/error.rs
@@ -19,9 +19,13 @@ pub enum Error {
    #[error(transparent)]
    GitError(#[from] yaak_git::error::Error),

+    #[error(transparent)]
+    TokioTimeoutElapsed(#[from] tokio::time::error::Elapsed),
+
    #[error(transparent)]
    WebsocketError(#[from] yaak_ws::error::Error),

+    #[cfg(feature = "license")]
    #[error(transparent)]
    LicenseError(#[from] yaak_license::error::Error),

--- a/src-tauri/src/http_request.rs
+++ b/src-tauri/src/http_request.rs
@@ -43,23 +43,18 @@ pub async fn send_http_request<R: Runtime>(
 ) -> Result<HttpResponse> {
    let app_handle = window.app_handle().clone();
    let plugin_manager = app_handle.state::<PluginManager>();
-    let (settings, workspace) = {
-        let db = window.db();
-        let settings = db.get_settings();
-        let workspace = db.get_workspace(&unrendered_request.workspace_id)?;
-        (settings, workspace)
-    };
-    let base_environment =
-        app_handle.db().get_base_environment(&unrendered_request.workspace_id)?;
+    let settings = window.db().get_settings();
+    let workspace = window.db().get_workspace(&unrendered_request.workspace_id)?;
+    let environment_id = environment.map(|e| e.id);
+    let environment_chain = window.db().resolve_environments(
+        &unrendered_request.workspace_id,
+        unrendered_request.folder_id.as_deref(),
+        environment_id.as_deref(),
+    )?;

    let response_id = og_response.id.clone();
    let response = Arc::new(Mutex::new(og_response.clone()));

-    let cb = PluginTemplateCallback::new(
-        window.app_handle(),
-        &PluginWindowContext::new(window),
-        RenderPurpose::Send,
-    );
    let update_source = UpdateSource::from_window(window);

    let (resolved_request, auth_context_id) = match resolve_http_request(window, unrendered_request)
@@ -75,20 +70,23 @@ pub async fn send_http_request<R: Runtime>(
        }
    };

-    let request =
-        match render_http_request(&resolved_request, &base_environment, environment.as_ref(), &cb)
-            .await
-        {
-            Ok(r) => r,
-            Err(e) => {
-                return Ok(response_err(
-                    &app_handle,
-                    &*response.lock().await,
-                    e.to_string(),
-                    &update_source,
-                ));
-            }
-        };
+    let cb = PluginTemplateCallback::new(
+        window.app_handle(),
+        &PluginWindowContext::new(window),
+        RenderPurpose::Send,
+    );
+
+    let request = match render_http_request(&resolved_request, environment_chain, &cb).await {
+        Ok(r) => r,
+        Err(e) => {
+            return Ok(response_err(
+                &app_handle,
+                &*response.lock().await,
+                e.to_string(),
+                &update_source,
+            ));
+        }
+    };

    let mut url_string = request.url.clone();

@@ -110,7 +108,7 @@ pub async fn send_http_request<R: Runtime>(
        .referer(false)
        .tls_info(true);

-    let tls_config = yaak_http::tls::get_config(workspace.setting_validate_certificates);
+    let tls_config = yaak_http::tls::get_config(workspace.setting_validate_certificates, true);
    client_builder = client_builder.use_preconfigured_tls(tls_config);

    match settings.proxy {
@@ -488,10 +486,11 @@ pub async fn send_http_request<R: Runtime>(
                };
            }

-            let mut query_pairs = sendable_req.url_mut().query_pairs_mut();
-            for p in plugin_result.set_query_parameters.unwrap_or_default() {
-                println!("Adding query parameter: {:?}", p);
-                query_pairs.append_pair(&p.name, &p.value);
+            if let Some(params) = plugin_result.set_query_parameters {
+                let mut query_pairs = sendable_req.url_mut().query_pairs_mut();
+                for p in params {
+                    query_pairs.append_pair(&p.name, &p.value);
+                }
            }
        }
    }
--- a/src-tauri/src/import.rs
+++ b/src-tauri/src/import.rs
@@ -39,6 +39,19 @@ pub(crate) async fn import_data<R: Runtime>(
        .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);
+            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));
+                }
+                ("", _) => {
+                    // Fix any empty ones
+                    v.parent_model = "workspace".to_string();
+                }
+                _ => {
+                    // Parent ID only required for the folder case
+                    v.parent_id = None;
+                }
+            };
            v
        })
        .collect();
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -26,16 +26,24 @@ use tauri_plugin_log::{Builder, Target, TargetKind};
 use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 use tokio::sync::Mutex;
 use tokio::task::block_in_place;
+use tokio::time;
 use yaak_common::window::WorkspaceWindowTrait;
 use yaak_grpc::manager::{DynamicMessage, GrpcHandle};
 use yaak_grpc::{Code, ServiceDefinition, deserialize_message, serialize_message};
 use yaak_models::models::{
-    CookieJar, Environment, GrpcConnection, GrpcConnectionState, GrpcEvent, GrpcEventType,
-    GrpcRequest, HttpRequest, HttpResponse, HttpResponseState, Plugin, Workspace, WorkspaceMeta,
+    AnyModel, CookieJar, Environment, GrpcConnection, GrpcConnectionState, GrpcEvent,
+    GrpcEventType, GrpcRequest, HttpRequest, HttpResponse, HttpResponseState, Plugin, Workspace,
+    WorkspaceMeta,
 };
 use yaak_models::query_manager::QueryManagerExt;
 use yaak_models::util::{BatchUpsertResult, UpdateSource, get_workspace_export_resources};
-use yaak_plugins::events::{CallGrpcRequestActionArgs, CallGrpcRequestActionRequest, CallHttpRequestActionArgs, CallHttpRequestActionRequest, Color, FilterResponse, GetGrpcRequestActionsResponse, GetHttpAuthenticationConfigResponse, GetHttpAuthenticationSummaryResponse, GetHttpRequestActionsResponse, GetTemplateFunctionsResponse, InternalEvent, InternalEventPayload, JsonPrimitive, PluginWindowContext, RenderPurpose, ShowToastRequest};
+use yaak_plugins::events::{
+    CallGrpcRequestActionArgs, CallGrpcRequestActionRequest, CallHttpRequestActionArgs,
+    CallHttpRequestActionRequest, Color, FilterResponse, GetGrpcRequestActionsResponse,
+    GetHttpAuthenticationConfigResponse, GetHttpAuthenticationSummaryResponse,
+    GetHttpRequestActionsResponse, GetTemplateFunctionsResponse, InternalEvent,
+    InternalEventPayload, JsonPrimitive, PluginWindowContext, RenderPurpose, ShowToastRequest,
+};
 use yaak_plugins::manager::PluginManager;
 use yaak_plugins::plugin_meta::PluginMetadata;
 use yaak_plugins::template_callback::PluginTemplateCallback;
@@ -66,6 +74,8 @@ struct AppMetaData {
    name: String,
    app_data_dir: String,
    app_log_dir: String,
+    feature_updater: bool,
+    feature_license: bool,
 }

 #[tauri::command]
@@ -78,6 +88,8 @@ async fn cmd_metadata(app_handle: AppHandle) -> YaakResult<AppMetaData> {
        name: app_handle.package_info().name.to_string(),
        app_data_dir: app_data_dir.to_string_lossy().to_string(),
        app_log_dir: app_log_dir.to_string_lossy().to_string(),
+        feature_license: cfg!(feature = "license"),
+        feature_updater: cfg!(feature = "updater"),
    })
 }

@@ -104,15 +116,11 @@ async fn cmd_render_template<R: Runtime>(
    workspace_id: &str,
    environment_id: Option<&str>,
 ) -> YaakResult<String> {
-    let environment = match environment_id {
-        Some(id) => app_handle.db().get_environment(id).ok(),
-        None => None,
-    };
-    let base_environment = app_handle.db().get_base_environment(&workspace_id)?;
+    let environment_chain =
+        app_handle.db().resolve_environments(workspace_id, None, environment_id)?;
    let result = render_template(
        template,
-        &base_environment,
-        environment.as_ref(),
+        environment_chain,
        &PluginTemplateCallback::new(
            &app_handle,
            &PluginWindowContext::new(&window),
@@ -141,21 +149,19 @@ async fn cmd_grpc_reflect<R: Runtime>(
    app_handle: AppHandle<R>,
    grpc_handle: State<'_, Mutex<GrpcHandle>>,
 ) -> YaakResult<Vec<ServiceDefinition>> {
-    let environment = match environment_id {
-        Some(id) => app_handle.db().get_environment(id).ok(),
-        None => None,
-    };
    let unrendered_request = app_handle.db().get_grpc_request(request_id)?;
    let (resolved_request, auth_context_id) = resolve_grpc_request(&window, &unrendered_request)?;

-    let base_environment =
-        app_handle.db().get_base_environment(&unrendered_request.workspace_id)?;
+    let environment_chain = app_handle.db().resolve_environments(
+        &unrendered_request.workspace_id,
+        unrendered_request.folder_id.as_deref(),
+        environment_id,
+    )?;
    let workspace = app_handle.db().get_workspace(&unrendered_request.workspace_id)?;

    let req = render_grpc_request(
        &resolved_request,
-        &base_environment,
-        environment.as_ref(),
+        environment_chain,
        &PluginTemplateCallback::new(
            &app_handle,
            &PluginWindowContext::new(&window),
@@ -190,20 +196,18 @@ async fn cmd_grpc_go<R: Runtime>(
    window: WebviewWindow<R>,
    grpc_handle: State<'_, Mutex<GrpcHandle>>,
 ) -> YaakResult<String> {
-    let environment = match environment_id {
-        Some(id) => app_handle.db().get_environment(id).ok(),
-        None => None,
-    };
    let unrendered_request = app_handle.db().get_grpc_request(request_id)?;
    let (resolved_request, auth_context_id) = resolve_grpc_request(&window, &unrendered_request)?;
-    let base_environment =
-        app_handle.db().get_base_environment(&unrendered_request.workspace_id)?;
+    let environment_chain = app_handle.db().resolve_environments(
+        &unrendered_request.workspace_id,
+        unrendered_request.folder_id.as_deref(),
+        environment_id,
+    )?;
    let workspace = app_handle.db().get_workspace(&unrendered_request.workspace_id)?;

    let request = render_grpc_request(
        &resolved_request,
-        &base_environment,
-        environment.as_ref(),
+        environment_chain.clone(),
        &PluginTemplateCallback::new(
            &app_handle,
            &PluginWindowContext::new(&window),
@@ -294,9 +298,8 @@ async fn cmd_grpc_go<R: Runtime>(
    let cb = {
        let cancelled_rx = cancelled_rx.clone();
        let app_handle = app_handle.clone();
+        let environment_chain = environment_chain.clone();
        let window = window.clone();
-        let base_environment = base_environment.clone();
-        let environment = environment.clone();
        let base_msg = base_msg.clone();
        let method_desc = method_desc.clone();

@@ -321,12 +324,12 @@ async fn cmd_grpc_go<R: Runtime>(
                    let app_handle = app_handle.clone();
                    let base_msg = base_msg.clone();
                    let method_desc = method_desc.clone();
+                    let environment_chain = environment_chain.clone();
                    let msg = block_in_place(|| {
                        tauri::async_runtime::block_on(async {
                            render_template(
                                msg.as_str(),
-                                &base_environment,
-                                environment.as_ref(),
+                                environment_chain,
                                &PluginTemplateCallback::new(
                                    &app_handle,
                                    &PluginWindowContext::new(&window),
@@ -390,12 +393,12 @@ async fn cmd_grpc_go<R: Runtime>(
        let window = window.clone();
        let app_handle = app_handle.clone();
        let base_event = base_msg.clone();
+        let environment_chain = environment_chain.clone();
        let req = request.clone();
        let msg = if req.message.is_empty() { "{}".to_string() } else { req.message };
        let msg = render_template(
            msg.as_str(),
-            &base_environment.clone(),
-            environment.as_ref(),
+            environment_chain,
            &PluginTemplateCallback::new(
                &app_handle,
                &PluginWindowContext::new(&window),
@@ -685,6 +688,12 @@ async fn cmd_grpc_go<R: Runtime>(
    Ok(conn.id)
 }

+#[tauri::command]
+async fn cmd_restart<R: Runtime>(app_handle: AppHandle<R>) -> YaakResult<()> {
+    app_handle.request_restart();
+    Ok(())
+}
+
 #[tauri::command]
 async fn cmd_send_ephemeral_request<R: Runtime>(
    mut request: HttpRequest,
@@ -720,33 +729,40 @@ async fn cmd_format_json(text: &str) -> YaakResult<String> {
 }

 #[tauri::command]
-async fn cmd_filter_response<R: Runtime>(
+async fn cmd_http_response_body<R: Runtime>(
    window: WebviewWindow<R>,
-    app_handle: AppHandle<R>,
-    response_id: &str,
    plugin_manager: State<'_, PluginManager>,
-    filter: &str,
+    response: HttpResponse,
+    filter: Option<&str>,
 ) -> YaakResult<FilterResponse> {
-    let response = app_handle.db().get_http_response(response_id)?;
-
-    if let None = response.body_path {
-        return Err(GenericError("Response body path not set".to_string()));
-    }
-
-    let mut content_type = "".to_string();
-    for header in response.headers.iter() {
-        if header.name.to_lowercase() == "content-type" {
-            content_type = header.value.to_string().to_lowercase();
-            break;
+    let body_path = match response.body_path {
+        None => {
+            return Err(GenericError("Response body path not set".to_string()));
        }
-    }
+        Some(p) => p,
+    };

-    let body = read_response_body(response)
+    let content_type = response
+        .headers
+        .iter()
+        .find_map(|h| {
+            if h.name.eq_ignore_ascii_case("content-type") { Some(h.value.as_str()) } else { None }
+        })
+        .unwrap_or_default();
+
+    let body = read_response_body(&body_path, content_type)
        .await
        .ok_or(GenericError("Failed to find response body".to_string()))?;

-    // TODO: Have plugins register their own content type (regex?)
-    Ok(plugin_manager.filter_data(&window, filter, &body, &content_type).await?)
+    match filter {
+        Some(filter) if !filter.is_empty() => {
+            Ok(plugin_manager.filter_data(&window, filter, &body, content_type).await?)
+        }
+        _ => Ok(FilterResponse {
+            content: body,
+            error: None,
+        }),
+    }
 }

 #[tauri::command]
@@ -817,10 +833,25 @@ async fn cmd_get_http_authentication_config<R: Runtime>(
    plugin_manager: State<'_, PluginManager>,
    auth_name: &str,
    values: HashMap<String, JsonPrimitive>,
-    request_id: &str,
+    request: AnyModel,
+    environment_id: Option<&str>,
 ) -> YaakResult<GetHttpAuthenticationConfigResponse> {
+    let (workspace_id, folder_id) = match request.clone() {
+        AnyModel::HttpRequest(m) => (m.workspace_id, m.folder_id),
+        AnyModel::GrpcRequest(m) => (m.workspace_id, m.folder_id),
+        AnyModel::WebsocketRequest(m) => (m.workspace_id, m.folder_id),
+        AnyModel::Folder(m) => (m.workspace_id, m.folder_id),
+        AnyModel::Workspace(m) => (m.id, None),
+        m => {
+            return Err(GenericError(format!("Unsupported model to call auth config {m:?}")));
+        }
+    };
+
+    let environment_chain =
+        window.db().resolve_environments(&workspace_id, folder_id.as_deref(), environment_id)?;
+
    Ok(plugin_manager
-        .get_http_authentication_config(&window, auth_name, values, request_id)
+        .get_http_authentication_config(&window, environment_chain, auth_name, values, request.id())
        .await?)
 }

@@ -871,10 +902,30 @@ async fn cmd_call_http_authentication_action<R: Runtime>(
    auth_name: &str,
    action_index: i32,
    values: HashMap<String, JsonPrimitive>,
-    model_id: &str,
+    model: AnyModel,
+    environment_id: Option<&str>,
 ) -> YaakResult<()> {
+    let (workspace_id, folder_id) = match model.clone() {
+        AnyModel::HttpRequest(m) => (m.workspace_id, m.folder_id),
+        AnyModel::GrpcRequest(m) => (m.workspace_id, m.folder_id),
+        AnyModel::WebsocketRequest(m) => (m.workspace_id, m.folder_id),
+        AnyModel::Folder(m) => (m.workspace_id, m.folder_id),
+        AnyModel::Workspace(m) => (m.id, None),
+        m => {
+            return Err(GenericError(format!("Unsupported model to call auth {m:?}")));
+        }
+    };
+    let environment_chain =
+        window.db().resolve_environments(&workspace_id, folder_id.as_deref(), environment_id)?;
    Ok(plugin_manager
-        .call_http_authentication_action(&window, auth_name, action_index, values, model_id)
+        .call_http_authentication_action(
+            &window,
+            environment_chain,
+            auth_name,
+            action_index,
+            values,
+            &model.id(),
+        )
        .await?)
 }

@@ -1147,13 +1198,13 @@ async fn cmd_new_child_window(
    title: &str,
    inner_size: (f64, f64),
 ) -> YaakResult<()> {
-    window::create_child_window(&parent_window, url, label, title, inner_size);
+    window::create_child_window(&parent_window, url, label, title, inner_size)?;
    Ok(())
 }

 #[tauri::command]
 async fn cmd_new_main_window(app_handle: AppHandle, url: &str) -> YaakResult<()> {
-    window::create_main_window(&app_handle, url);
+    window::create_main_window(&app_handle, url)?;
    Ok(())
 }

@@ -1163,7 +1214,12 @@ async fn cmd_check_for_updates<R: Runtime>(
    yaak_updater: State<'_, Mutex<YaakUpdater>>,
 ) -> YaakResult<bool> {
    let update_mode = get_update_mode(&window).await?;
-    Ok(yaak_updater.lock().await.check_now(&window, update_mode, UpdateTrigger::User).await?)
+    let settings = window.db().get_settings();
+    Ok(yaak_updater
+        .lock()
+        .await
+        .check_now(&window, update_mode, settings.auto_download_updates, UpdateTrigger::User)
+        .await?)
 }

 #[cfg_attr(mobile, tauri::mobile_entry_point)]
@@ -1214,7 +1270,6 @@ pub fn run() {
        .plugin(tauri_plugin_dialog::init())
        .plugin(tauri_plugin_os::init())
        .plugin(tauri_plugin_fs::init())
-        .plugin(yaak_license::init())
        .plugin(yaak_mac_window::init())
        .plugin(yaak_models::init())
        .plugin(yaak_plugins::init())
@@ -1224,6 +1279,11 @@ pub fn run() {
        .plugin(yaak_ws::init())
        .plugin(yaak_sync::init());

+    #[cfg(feature = "license")]
+    {
+        builder = builder.plugin(yaak_license::init());
+    }
+
    builder
        .setup(|app| {
            {
@@ -1238,9 +1298,13 @@ pub fn run() {
                                let _ = app_handle.emit(
                                    "show_toast",
                                    ShowToastRequest {
-                                        message: format!("Error handling deep link: {}", e.to_string()),
+                                        message: format!(
+                                            "Error handling deep link: {}",
+                                            e.to_string()
+                                        ),
                                        color: Some(Color::Danger),
                                        icon: None,
+                                        timeout: None,
                                    },
                                );
                            };
@@ -1280,7 +1344,7 @@ pub fn run() {
            cmd_delete_send_history,
            cmd_dismiss_notification,
            cmd_export_data,
-            cmd_filter_response,
+            cmd_http_response_body,
            cmd_format_json,
            cmd_get_http_authentication_summaries,
            cmd_get_http_authentication_config,
@@ -1298,6 +1362,7 @@ pub fn run() {
            cmd_plugin_info,
            cmd_reload_plugins,
            cmd_render_template,
+            cmd_restart,
            cmd_save_response,
            cmd_send_ephemeral_request,
            cmd_send_http_request,
@@ -1337,16 +1402,27 @@ pub fn run() {
                    label,
                    ..
                } => {
-                    let w = app_handle.get_webview_window(&label).unwrap();
-                    let h = app_handle.clone();
-                    // Run update check whenever the window is focused
-                    tauri::async_runtime::spawn(async move {
-                        let val: State<'_, Mutex<YaakUpdater>> = h.state();
-                        let update_mode = get_update_mode(&w).await.unwrap();
-                        if let Err(e) = val.lock().await.maybe_check(&w, update_mode).await {
-                            warn!("Failed to check for updates {e:?}");
-                        };
-                    });
+                    if cfg!(feature = "updater") {
+                        // Run update check whenever the window is focused
+                        let w = app_handle.get_webview_window(&label).unwrap();
+                        let h = app_handle.clone();
+                        tauri::async_runtime::spawn(async move {
+                            let settings = w.db().get_settings();
+                            if settings.autoupdate {
+                                time::sleep(Duration::from_secs(3)).await; // Wait a bit so it's not so jarring
+                                let val: State<'_, Mutex<YaakUpdater>> = h.state();
+                                let update_mode = get_update_mode(&w).await.unwrap();
+                                if let Err(e) = val
+                                    .lock()
+                                    .await
+                                    .maybe_check(&w, settings.auto_download_updates, update_mode)
+                                    .await
+                                {
+                                    warn!("Failed to check for updates {e:?}");
+                                }
+                            };
+                        });
+                    }

                    let h = app_handle.clone();
                    tauri::async_runtime::spawn(async move {
@@ -1416,7 +1492,7 @@ fn monitor_plugin_events<R: Runtime>(app_handle: &AppHandle<R>) {
 }

 async fn call_frontend<R: Runtime>(
-    window: WebviewWindow<R>,
+    window: &WebviewWindow<R>,
    event: &InternalEvent,
 ) -> Option<InternalEventPayload> {
    window.emit_to(window.label(), "plugin_event", event.clone()).unwrap();
--- a/src-tauri/src/notifications.rs
+++ b/src-tauri/src/notifications.rs
@@ -7,9 +7,9 @@ use log::debug;
 use reqwest::Method;
 use serde::{Deserialize, Serialize};
 use tauri::{AppHandle, Emitter, Manager, Runtime, WebviewWindow};
+use ts_rs::TS;
 use yaak_common::api_client::yaak_api_client;
 use yaak_common::platform::get_os;
-use yaak_license::{LicenseCheckStatus, check_license};
 use yaak_models::query_manager::QueryManagerExt;
 use yaak_models::util::UpdateSource;

@@ -24,18 +24,22 @@ pub struct YaakNotifier {
    last_check: SystemTime,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
+#[ts(export, export_to = "index.ts")]
 pub struct YaakNotification {
    timestamp: DateTime<Utc>,
    timeout: Option<f64>,
    id: String,
+    title: Option<String>,
    message: String,
+    color: Option<String>,
    action: Option<YaakNotificationAction>,
 }

-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default, TS)]
 #[serde(default, rename_all = "camelCase")]
+#[ts(export, export_to = "index.ts")]
 pub struct YaakNotificationAction {
    label: String,
    url: String,
@@ -73,12 +77,20 @@ impl YaakNotifier {

        self.last_check = SystemTime::now();

-        let license_check = match check_license(window).await? {
-            LicenseCheckStatus::PersonalUse { .. } => "personal".to_string(),
-            LicenseCheckStatus::CommercialUse => "commercial".to_string(),
-            LicenseCheckStatus::InvalidLicense => "invalid_license".to_string(),
-            LicenseCheckStatus::Trialing { .. } => "trialing".to_string(),
+        #[cfg(feature = "license")]
+        let license_check = {
+            use yaak_license::{LicenseCheckStatus, check_license};
+            match check_license(window).await {
+                Ok(LicenseCheckStatus::PersonalUse { .. }) => "personal".to_string(),
+                Ok(LicenseCheckStatus::CommercialUse) => "commercial".to_string(),
+                Ok(LicenseCheckStatus::InvalidLicense) => "invalid_license".to_string(),
+                Ok(LicenseCheckStatus::Trialing { .. }) => "trialing".to_string(),
+                Err(_) => "unknown".to_string(),
+            }
        };
+        #[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();
--- a/src-tauri/src/plugin_events.rs
+++ b/src-tauri/src/plugin_events.rs
@@ -7,16 +7,16 @@ use crate::{
 };
 use chrono::Utc;
 use cookie::Cookie;
-use log::warn;
+use log::{error, warn};
 use tauri::{AppHandle, Emitter, Manager, Runtime, State};
 use tauri_plugin_clipboard_manager::ClipboardExt;
 use yaak_models::models::{HttpResponse, Plugin};
 use yaak_models::query_manager::QueryManagerExt;
 use yaak_models::util::UpdateSource;
 use yaak_plugins::events::{
-    Color, DeleteKeyValueResponse, EmptyPayload, FindHttpResponsesResponse, GetCookieValueResponse,
-    GetHttpRequestByIdResponse, GetKeyValueResponse, Icon, InternalEvent, InternalEventPayload,
-    ListCookieNamesResponse, PluginWindowContext, RenderGrpcRequestResponse,
+    Color, DeleteKeyValueResponse, EmptyPayload, ErrorResponse, FindHttpResponsesResponse,
+    GetCookieValueResponse, GetHttpRequestByIdResponse, GetKeyValueResponse, Icon, InternalEvent,
+    InternalEventPayload, ListCookieNamesResponse, PluginWindowContext, RenderGrpcRequestResponse,
    RenderHttpRequestResponse, SendHttpRequestResponse, SetKeyValueResponse, ShowToastRequest,
    TemplateRenderResponse, WindowNavigateEvent,
 };
@@ -51,7 +51,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
        InternalEventPayload::PromptTextRequest(_) => {
            let window = get_window_from_window_context(app_handle, &window_context)
                .expect("Failed to find window for render");
-            call_frontend(window, event).await
+            call_frontend(&window, event).await
        }
        InternalEventPayload::FindHttpResponsesRequest(req) => {
            let http_responses = app_handle
@@ -74,20 +74,15 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(

            let workspace =
                workspace_from_window(&window).expect("Failed to get workspace_id from window URL");
-            let environment = environment_from_window(&window);
-            let base_environment = app_handle
+            let environment_id = environment_from_window(&window).map(|e| e.id);
+            let environment_chain = window
                .db()
-                .get_base_environment(&workspace.id)
-                .expect("Failed to get base environment");
+                .resolve_environments(&workspace.id, None, environment_id.as_deref())
+                .expect("Failed to resolve environments");
            let cb = PluginTemplateCallback::new(app_handle, &window_context, req.purpose);
-            let grpc_request = render_grpc_request(
-                &req.grpc_request,
-                &base_environment,
-                environment.as_ref(),
-                &cb,
-            )
-            .await
-            .expect("Failed to render grpc request");
+            let grpc_request = render_grpc_request(&req.grpc_request, environment_chain, &cb)
+                .await
+                .expect("Failed to render grpc request");
            Some(InternalEventPayload::RenderGrpcRequestResponse(RenderGrpcRequestResponse {
                grpc_request,
            }))
@@ -98,20 +93,15 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(

            let workspace =
                workspace_from_window(&window).expect("Failed to get workspace_id from window URL");
-            let environment = environment_from_window(&window);
-            let base_environment = app_handle
+            let environment_id = environment_from_window(&window).map(|e| e.id);
+            let environment_chain = window
                .db()
-                .get_base_environment(&workspace.id)
-                .expect("Failed to get base environment");
+                .resolve_environments(&workspace.id, None, environment_id.as_deref())
+                .expect("Failed to resolve environments");
            let cb = PluginTemplateCallback::new(app_handle, &window_context, req.purpose);
-            let http_request = render_http_request(
-                &req.http_request,
-                &base_environment,
-                environment.as_ref(),
-                &cb,
-            )
-            .await
-            .expect("Failed to render http request");
+            let http_request = render_http_request(&req.http_request, environment_chain, &cb)
+                .await
+                .expect("Failed to render http request");
            Some(InternalEventPayload::RenderHttpRequestResponse(RenderHttpRequestResponse {
                http_request,
            }))
@@ -122,18 +112,19 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(

            let workspace =
                workspace_from_window(&window).expect("Failed to get workspace_id from window URL");
-            let environment = environment_from_window(&window);
-            let base_environment = app_handle
+            let environment_id = environment_from_window(&window).map(|e| e.id);
+            let environment_chain = window
                .db()
-                .get_base_environment(&workspace.id)
-                .expect("Failed to get base environment");
+                .resolve_environments(&workspace.id, None, environment_id.as_deref())
+                .expect("Failed to resolve environments");
            let cb = PluginTemplateCallback::new(app_handle, &window_context, req.purpose);
-            let data = render_json_value(req.data, &base_environment, environment.as_ref(), &cb)
+            let data = render_json_value(req.data, environment_chain, &cb)
                .await
                .expect("Failed to render template");
            Some(InternalEventPayload::TemplateRenderResponse(TemplateRenderResponse { data }))
        }
        InternalEventPayload::ErrorResponse(resp) => {
+            error!("Plugin error: {}: {:?}", resp.error, resp);
            let toast_event = plugin_handle.build_event_to_send(
                &window_context,
                &InternalEventPayload::ShowToastRequest(ShowToastRequest {
@@ -143,6 +134,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                        resp.error
                    ),
                    color: Some(Color::Danger),
+                    timeout: None,
                    ..Default::default()
                }),
                None,
@@ -150,7 +142,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
            Box::pin(handle_plugin_event(app_handle, &toast_event, plugin_handle)).await;
            None
        }
-        InternalEventPayload::ReloadResponse(r) => {
+        InternalEventPayload::ReloadResponse(req) => {
            let plugins = app_handle.db().list_plugins().unwrap();
            for plugin in plugins {
                if plugin.directory != plugin_handle.dir {
@@ -163,16 +155,20 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                };
                app_handle.db().upsert_plugin(&new_plugin, &UpdateSource::Plugin).unwrap();
            }
-            let toast_event = plugin_handle.build_event_to_send(
-                &window_context,
-                &InternalEventPayload::ShowToastRequest(ShowToastRequest {
-                    message: format!("Reloaded plugin {}@{}", r.name, r.version),
-                    icon: Some(Icon::Info),
-                    ..Default::default()
-                }),
-                None,
-            );
-            Box::pin(handle_plugin_event(app_handle, &toast_event, plugin_handle)).await;
+
+            if !req.silent {
+                let info = plugin_handle.info();
+                let toast_event = plugin_handle.build_event_to_send(
+                    &window_context,
+                    &InternalEventPayload::ShowToastRequest(ShowToastRequest {
+                        message: format!("Reloaded plugin {}@{}", info.name, info.version),
+                        icon: Some(Icon::Info),
+                        ..Default::default()
+                    }),
+                    None,
+                );
+                Box::pin(handle_plugin_event(app_handle, &toast_event, plugin_handle)).await;
+            }
            None
        }
        InternalEventPayload::SendHttpRequestRequest(req) => {
@@ -224,20 +220,29 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
            }))
        }
        InternalEventPayload::OpenWindowRequest(req) => {
-            let label = req.label;
            let (navigation_tx, mut navigation_rx) = tokio::sync::mpsc::channel(128);
            let (close_tx, mut close_rx) = tokio::sync::mpsc::channel(128);
            let win_config = CreateWindowConfig {
                url: &req.url,
-                label: &label.clone(),
-                title: &req.title.unwrap_or_default(),
+                label: &req.label,
+                title: &req.title.clone().unwrap_or_default(),
                navigation_tx: Some(navigation_tx),
                close_tx: Some(close_tx),
-                inner_size: req.size.map(|s| (s.width, s.height)),
-                data_dir_key: req.data_dir_key,
+                inner_size: req.size.clone().map(|s| (s.width, s.height)),
+                data_dir_key: req.data_dir_key.clone(),
                ..Default::default()
            };
-            create_window(app_handle, win_config);
+            if let Err(e) = create_window(app_handle, win_config) {
+                let error_event = plugin_handle.build_event_to_send(
+                    &window_context,
+                    &InternalEventPayload::ErrorResponse(ErrorResponse {
+                        error: format!("Failed to create window: {:?}", e),
+                    }),
+                    None,
+                );
+                Box::pin(handle_plugin_event(app_handle, &error_event, plugin_handle)).await;
+                return;
+            }

            {
                let event_id = event.id.clone();
--- a/src-tauri/src/render.rs
+++ b/src-tauri/src/render.rs
@@ -5,35 +5,32 @@ use yaak_models::models::{
    Environment, GrpcRequest, HttpRequest, HttpRequestHeader, HttpUrlParameter,
 };
 use yaak_models::render::make_vars_hashmap;
-use yaak_templates::{parse_and_render, render_json_value_raw, TemplateCallback};
+use yaak_templates::{TemplateCallback, parse_and_render, render_json_value_raw};

 pub async fn render_template<T: TemplateCallback>(
    template: &str,
-    base_environment: &Environment,
-    environment: Option<&Environment>,
+    environment_chain: Vec<Environment>,
    cb: &T,
 ) -> yaak_templates::error::Result<String> {
-    let vars = &make_vars_hashmap(base_environment, environment);
+    let vars = &make_vars_hashmap(environment_chain);
    render(template, vars, cb).await
 }

 pub async fn render_json_value<T: TemplateCallback>(
    value: Value,
-    base_environment: &Environment,
-    environment: Option<&Environment>,
+    environment_chain: Vec<Environment>,
    cb: &T,
 ) -> yaak_templates::error::Result<Value> {
-    let vars = &make_vars_hashmap(base_environment, environment);
+    let vars = &make_vars_hashmap(environment_chain);
    render_json_value_raw(value, vars, cb).await
 }

 pub async fn render_grpc_request<T: TemplateCallback>(
    r: &GrpcRequest,
-    base_environment: &Environment,
-    environment: Option<&Environment>,
+    environment_chain: Vec<Environment>,
    cb: &T,
 ) -> yaak_templates::error::Result<GrpcRequest> {
-    let vars = &make_vars_hashmap(base_environment, environment);
+    let vars = &make_vars_hashmap(environment_chain);

    let mut metadata = Vec::new();
    for p in r.metadata.clone() {
@@ -62,11 +59,10 @@ pub async fn render_grpc_request<T: TemplateCallback>(

 pub async fn render_http_request<T: TemplateCallback>(
    r: &HttpRequest,
-    base_environment: &Environment,
-    environment: Option<&Environment>,
+    environment_chain: Vec<Environment>,
    cb: &T,
 ) -> yaak_templates::error::Result<HttpRequest> {
-    let vars = &make_vars_hashmap(base_environment, environment);
+    let vars = &make_vars_hashmap(environment_chain);

    let mut url_parameters = Vec::new();
    for p in r.url_parameters.clone() {
--- a/src-tauri/src/updates.rs
+++ b/src-tauri/src/updates.rs
@@ -1,15 +1,21 @@
 use std::fmt::{Display, Formatter};
-use std::time::SystemTime;
+use std::path::PathBuf;
+use std::time::{Duration, SystemTime};

 use crate::error::Result;
-use log::info;
-use tauri::{Manager, Runtime, WebviewWindow};
+use log::{debug, error, info, warn};
+use serde::{Deserialize, Serialize};
+use tauri::{Emitter, Listener, Manager, Runtime, WebviewWindow};
 use tauri_plugin_dialog::{DialogExt, MessageDialogButtons};
-use tauri_plugin_updater::UpdaterExt;
+use tauri_plugin_updater::{Update, UpdaterExt};
 use tokio::task::block_in_place;
+use tokio::time::sleep;
+use ts_rs::TS;
 use yaak_models::query_manager::QueryManagerExt;
+use yaak_models::util::generate_id;
 use yaak_plugins::manager::PluginManager;

+use crate::error::Error::GenericError;
 use crate::is_dev;

 const MAX_UPDATE_CHECK_HOURS_STABLE: u64 = 12;
@@ -48,6 +54,7 @@ impl UpdateMode {
    }
 }

+#[derive(PartialEq)]
 pub enum UpdateTrigger {
    Background,
    User,
@@ -64,13 +71,22 @@ impl YaakUpdater {
        &mut self,
        window: &WebviewWindow<R>,
        mode: UpdateMode,
+        auto_download: bool,
        update_trigger: UpdateTrigger,
    ) -> Result<bool> {
+        // Only AppImage supports updates on Linux, so skip if it's not
+        #[cfg(target_os = "linux")]
+        {
+            if std::env::var("APPIMAGE").is_err() {
+                return Ok(false);
+            }
+        }
+
        let settings = window.db().get_settings();
        let update_key = format!("{:x}", md5::compute(settings.id));
        self.last_update_check = SystemTime::now();

-        info!("Checking for updates mode={}", mode);
+        info!("Checking for updates mode={} autodl={}", mode, auto_download);

        let w = window.clone();
        let update_check_result = w
@@ -105,42 +121,44 @@ impl YaakUpdater {
            None => false,
            Some(update) => {
                let w = window.clone();
-                w.dialog()
-                    .message(format!(
-                        "{} is available. Would you like to download and install it now?",
-                        update.version
-                    ))
-                    .buttons(MessageDialogButtons::OkCancelCustom(
-                        "Download".to_string(),
-                        "Later".to_string(),
-                    ))
-                    .title("Update Available")
-                    .show(|confirmed| {
-                        if !confirmed {
-                            return;
+                tauri::async_runtime::spawn(async move {
+                    // Force native updater if specified (useful if a release broke the UI)
+                    let native_install_mode =
+                        update.raw_json.get("install_mode").map(|v| v.as_str()).unwrap_or_default()
+                            == Some("native");
+                    if native_install_mode {
+                        start_native_update(&w, &update).await;
+                        return;
+                    }
+
+                    // If it's a background update, try downloading it first
+                    if update_trigger == UpdateTrigger::Background && auto_download {
+                        info!("Downloading update {} in background", update.version);
+                        if let Err(e) = download_update_idempotent(&w, &update).await {
+                            error!("Failed to download {}: {}", update.version, e);
                        }
-                        tauri::async_runtime::spawn(async move {
-                            match update.download_and_install(|_, _| {}, || {}).await {
-                                Ok(_) => {
-                                    if w.dialog()
-                                        .message("Would you like to restart the app?")
-                                        .title("Update Installed")
-                                        .buttons(MessageDialogButtons::OkCancelCustom(
-                                            "Restart".to_string(),
-                                            "Later".to_string(),
-                                        ))
-                                        .blocking_show()
-                                    {
-                                        w.app_handle().restart();
-                                    }
-                                }
-                                Err(e) => {
-                                    w.dialog()
-                                        .message(format!("The update failed to install: {}", e));
-                                }
-                            }
-                        });
-                    });
+                    }
+
+                    match start_integrated_update(&w, &update).await {
+                        Ok(UpdateResponseAction::Skip) => {
+                            info!("Confirmed {}: skipped", update.version);
+                        }
+                        Ok(UpdateResponseAction::Install) => {
+                            info!("Confirmed {}: install", update.version);
+                            if let Err(e) = install_update_maybe_download(&w, &update).await {
+                                error!("Failed to install: {e}");
+                                return;
+                            };
+
+                            info!("Installed {}", update.version);
+                            finish_integrated_update(&w, &update).await;
+                        }
+                        Err(e) => {
+                            warn!("Failed to notify frontend, falling back: {e}",);
+                            start_native_update(&w, &update).await;
+                        }
+                    };
+                });
                true
            }
        };
@@ -150,6 +168,7 @@ impl YaakUpdater {
    pub async fn maybe_check<R: Runtime>(
        &mut self,
        window: &WebviewWindow<R>,
+        auto_download: bool,
        mode: UpdateMode,
    ) -> Result<bool> {
        let update_period_seconds = match mode {
@@ -163,11 +182,206 @@ impl YaakUpdater {
            return Ok(false);
        }

-        // Don't check if dev
+        // Don't check if development (can still with manual user trigger)
        if is_dev() {
            return Ok(false);
        }

-        self.check_now(window, mode, UpdateTrigger::Background).await
+        self.check_now(window, mode, auto_download, UpdateTrigger::Background).await
    }
 }
+
+#[derive(Debug, Clone, PartialEq, Serialize, Default, TS)]
+#[serde(default, rename_all = "camelCase")]
+#[ts(export, export_to = "index.ts")]
+struct UpdateInfo {
+    reply_event_id: String,
+    version: String,
+    downloaded: bool,
+}
+
+#[derive(Debug, Clone, PartialEq, Deserialize, TS)]
+#[serde(rename_all = "camelCase", tag = "type")]
+#[ts(export, export_to = "index.ts")]
+enum UpdateResponse {
+    Ack,
+    Action { action: UpdateResponseAction },
+}
+
+#[derive(Debug, Clone, PartialEq, Deserialize, TS)]
+#[serde(rename_all = "snake_case")]
+#[ts(export, export_to = "index.ts")]
+enum UpdateResponseAction {
+    Install,
+    Skip,
+}
+
+async fn finish_integrated_update<R: Runtime>(window: &WebviewWindow<R>, update: &Update) {
+    if let Err(e) = window.emit_to(window.label(), "update_installed", update.version.to_string()) {
+        warn!("Failed to notify frontend of update install: {}", e);
+    }
+}
+
+async fn start_integrated_update<R: Runtime>(
+    window: &WebviewWindow<R>,
+    update: &Update,
+) -> Result<UpdateResponseAction> {
+    let download_path = ensure_download_path(window, update)?;
+    debug!("Download path: {}", download_path.display());
+    let downloaded = download_path.exists();
+    let ack_wait = Duration::from_secs(3);
+    let reply_id = generate_id();
+
+    // 1) Start listening BEFORE emitting to avoid missing a fast reply
+    let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::<UpdateResponse>();
+    let w_for_listener = window.clone();
+
+    let event_id = w_for_listener.listen(reply_id.clone(), move |ev| {
+        match serde_json::from_str::<UpdateResponse>(ev.payload()) {
+            Ok(UpdateResponse::Ack) => {
+                let _ = tx.send(UpdateResponse::Ack);
+            }
+            Ok(UpdateResponse::Action { action }) => {
+                let _ = tx.send(UpdateResponse::Action { action });
+            }
+            Err(e) => {
+                warn!("Failed to parse update reply from frontend: {e:?}");
+            }
+        }
+    });
+
+    // Make sure we always unlisten
+    struct Unlisten<'a, R: Runtime> {
+        win: &'a WebviewWindow<R>,
+        id: tauri::EventId,
+    }
+    impl<'a, R: Runtime> Drop for Unlisten<'a, R> {
+        fn drop(&mut self) {
+            self.win.unlisten(self.id);
+        }
+    }
+    let _guard = Unlisten {
+        win: window,
+        id: event_id,
+    };
+
+    // 2) Emit the event now that listener is in place
+    let info = UpdateInfo {
+        version: update.version.to_string(),
+        downloaded,
+        reply_event_id: reply_id,
+    };
+    window
+        .emit_to(window.label(), "update_available", &info)
+        .map_err(|e| GenericError(format!("Failed to emit update_available: {e}")))?;
+
+    // 3) Two-stage timeout: first wait for ack, then wait for final action
+    // --- Phase 1: wait for ACK with timeout ---
+    let ack_timer = sleep(ack_wait);
+    tokio::pin!(ack_timer);
+
+    loop {
+        tokio::select! {
+            msg = rx.recv() => match msg {
+                Some(UpdateResponse::Ack) => break, // proceed to Phase 2
+                Some(UpdateResponse::Action{action}) => return Ok(action), // user was fast
+                None => return Err(GenericError("frontend channel closed before ack".into())),
+            },
+            _ = &mut ack_timer => {
+                return Err(GenericError("timed out waiting for frontend ack".into()));
+            }
+        }
+    }
+
+    // --- Phase 2: wait forever for final action ---
+    loop {
+        match rx.recv().await {
+            Some(UpdateResponse::Action { action }) => return Ok(action),
+            Some(UpdateResponse::Ack) => { /* ignore extra acks */ }
+            None => return Err(GenericError("frontend channel closed before action".into())),
+        }
+    }
+}
+
+async fn start_native_update<R: Runtime>(window: &WebviewWindow<R>, update: &Update) {
+    // If the frontend doesn't respond, fallback to native dialogs
+    let confirmed = window
+        .dialog()
+        .message(format!(
+            "{} is available. Would you like to download and install it now?",
+            update.version
+        ))
+        .buttons(MessageDialogButtons::OkCancelCustom("Download".to_string(), "Later".to_string()))
+        .title("Update Available")
+        .blocking_show();
+    if !confirmed {
+        return;
+    }
+
+    match update.download_and_install(|_, _| {}, || {}).await {
+        Ok(()) => {
+            if window
+                .dialog()
+                .message("Would you like to restart the app?")
+                .title("Update Installed")
+                .buttons(MessageDialogButtons::OkCancelCustom(
+                    "Restart".to_string(),
+                    "Later".to_string(),
+                ))
+                .blocking_show()
+            {
+                window.app_handle().request_restart();
+            }
+        }
+        Err(e) => {
+            window.dialog().message(format!("The update failed to install: {}", e));
+        }
+    }
+}
+
+pub async fn download_update_idempotent<R: Runtime>(
+    window: &WebviewWindow<R>,
+    update: &Update,
+) -> Result<PathBuf> {
+    let dl_path = ensure_download_path(window, update)?;
+
+    if dl_path.exists() {
+        info!("{} already downloaded to {}", update.version, dl_path.display());
+        return Ok(dl_path);
+    }
+
+    info!("{} downloading: {}", update.version, dl_path.display());
+    let dl_bytes = update.download(|_, _| {}, || {}).await?;
+    std::fs::write(&dl_path, dl_bytes)
+        .map_err(|e| GenericError(format!("Failed to write update: {e}")))?;
+
+    info!("{} downloaded", update.version);
+
+    Ok(dl_path)
+}
+
+pub async fn install_update_maybe_download<R: Runtime>(
+    window: &WebviewWindow<R>,
+    update: &Update,
+) -> Result<()> {
+    let dl_path = download_update_idempotent(window, update).await?;
+    let update_bytes = std::fs::read(&dl_path)?;
+    update.install(update_bytes.as_slice())?;
+    Ok(())
+}
+
+pub fn ensure_download_path<R: Runtime>(
+    window: &WebviewWindow<R>,
+    update: &Update,
+) -> Result<PathBuf> {
+    // Ensure dir exists
+    let base_dir = window.path().app_cache_dir()?.join("updates");
+    std::fs::create_dir_all(&base_dir)?;
+
+    // Generate name based on signature
+    let sig_digest = md5::compute(&update.signature);
+    let name = format!("yaak-{}-{:x}", update.version, sig_digest);
+    let dl_path = base_dir.join(name);
+
+    Ok(dl_path)
+}
--- a/src-tauri/src/uri_scheme.rs
+++ b/src-tauri/src/uri_scheme.rs
@@ -47,6 +47,7 @@ pub(crate) async fn handle_deep_link<R: Runtime>(
                    message: format!("Installed {name}@{}", pv.version),
                    color: Some(Color::Success),
                    icon: None,
+                    timeout: Some(5000),
                },
            )?;
        }
@@ -90,6 +91,7 @@ pub(crate) async fn handle_deep_link<R: Runtime>(
                            message: "Failed to import data".to_string(),
                            color: Some(Color::Danger),
                            icon: None,
+                            timeout: None,
                        },
                    )?;
                    return Ok(());
@@ -103,6 +105,7 @@ pub(crate) async fn handle_deep_link<R: Runtime>(
                    message: format!("Imported data for {} workspaces", results.workspaces.len()),
                    color: Some(Color::Success),
                    icon: None,
+                    timeout: Some(5000),
                },
            )?;
        }
--- a/src-tauri/src/window.rs
+++ b/src-tauri/src/window.rs
@@ -6,6 +6,7 @@ use tauri::{
 };
 use tauri_plugin_opener::OpenerExt;
 use tokio::sync::mpsc;
+use crate::error::Result;

 const DEFAULT_WINDOW_WIDTH: f64 = 1100.0;
 const DEFAULT_WINDOW_HEIGHT: f64 = 600.0;
@@ -32,9 +33,9 @@ pub(crate) struct CreateWindowConfig<'s> {
 pub(crate) fn create_window<R: Runtime>(
    handle: &AppHandle<R>,
    config: CreateWindowConfig,
-) -> WebviewWindow<R> {
+) -> Result<WebviewWindow<R>> {
    #[allow(unused_variables)]
-    let menu = app_menu(handle).unwrap();
+    let menu = app_menu(handle)?;

    // This causes the window to not be clickable (in AppImage), so disable on Linux
    #[cfg(not(target_os = "linux"))]
@@ -55,12 +56,13 @@ pub(crate) fn create_window<R: Runtime>(
        #[cfg(not(target_os = "macos"))]
        {
            use std::fs;
-            let dir = handle.path().temp_dir().unwrap().join("yaak_sessions").join(key);
-            fs::create_dir_all(dir.clone()).unwrap();
+            let safe_key = format!("{:x}", md5::compute(key.as_bytes()));
+            let dir = handle.path().app_data_dir()?.join("window-sessions").join(safe_key);
+            fs::create_dir_all(&dir)?;
            win_builder = win_builder.data_directory(dir);
        }

-        // macOS doesn't support data dir so must use this fn instead
+        // macOS doesn't support `data_directory()` so must use this fn instead
        #[cfg(target_os = "macos")]
        {
            let hash = md5::compute(key.as_bytes());
@@ -108,11 +110,11 @@ pub(crate) fn create_window<R: Runtime>(

    if let Some(w) = handle.webview_windows().get(config.label) {
        info!("Webview with label {} already exists. Focusing existing", config.label);
-        w.set_focus().unwrap();
-        return w.to_owned();
+        w.set_focus()?;
+        return Ok(w.to_owned());
    }

-    let win = win_builder.build().unwrap();
+    let win = win_builder.build()?;

    if let Some(tx) = config.close_tx {
        win.on_window_event(move |event| match event {
@@ -174,10 +176,10 @@ pub(crate) fn create_window<R: Runtime>(
        }
    });

-    win
+    Ok(win)
 }

-pub(crate) fn create_main_window(handle: &AppHandle, url: &str) -> WebviewWindow {
+pub(crate) fn create_main_window(handle: &AppHandle, url: &str) -> Result<WebviewWindow> {
    let mut counter = 0;
    let label = loop {
        let label = format!("{MAIN_WINDOW_PREFIX}{counter}");
@@ -211,7 +213,7 @@ pub(crate) fn create_child_window(
    label: &str,
    title: &str,
    inner_size: (f64, f64),
-) -> WebviewWindow {
+) -> Result<WebviewWindow> {
    let app_handle = parent_window.app_handle();
    let label = format!("{OTHER_WINDOW_PREFIX}_{label}");
    let scale_factor = parent_window.scale_factor().unwrap();
@@ -235,7 +237,7 @@ pub(crate) fn create_child_window(
        ..Default::default()
    };

-    let child_window = create_window(&app_handle, config);
+    let child_window = create_window(&app_handle, config)?;

    // NOTE: These listeners will remain active even when the windows close. Unfortunately,
    //   there's no way to unlisten to events for now, so we just have to be defensive.
@@ -272,5 +274,5 @@ pub(crate) fn create_child_window(
        });
    }

-    child_window
+    Ok(child_window)
 }
--- a/src-tauri/static/greg.jpeg
+++ b/src-tauri/static/greg.jpeg
--- a/src-tauri/tauri.commercial.conf.json
+++ b/src-tauri/tauri.commercial.conf.json
@@ -0,0 +1,38 @@
+{
+  "build": {
+    "features": [
+      "updater",
+      "license"
+    ]
+  },
+  "app": {
+    "security": {
+      "capabilities": [
+        "default",
+        {
+          "identifier": "release",
+          "windows": [
+            "*"
+          ],
+          "permissions": [
+            "yaak-license:default"
+          ]
+        }
+      ]
+    }
+  },
+  "plugins": {
+    "updater": {
+      "endpoints": [
+        "https://update.yaak.app/check/{{target}}/{{arch}}/{{current_version}}"
+      ],
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEMxRDJFREQ1MjExQjdGN0IKUldSN2Z4c2gxZTNTd1FHNCtmYnFXMHVVQzhuNkJOM1cwOFBodmdLall3ckhKenpKUytHSTR1MlkK"
+    }
+  },
+  "bundle": {
+    "createUpdaterArtifacts": "v1Compatible",
+    "windows": {
+      "signCommand": "trusted-signing-cli -e https://eus.codesigning.azure.net/ -a Yaak -c yaakapp %1"
+    }
+  }
+}
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -15,7 +15,8 @@
        "enable": true,
        "scope": {
          "allow": [
-            "$APPDATA/responses/*"
+            "$APPDATA/responses/*",
+            "$RESOURCE/static/*"
          ]
        }
      }
@@ -28,12 +29,6 @@
          "yaak"
        ]
      }
-    },
-    "updater": {
-      "endpoints": [
-        "https://update.yaak.app/check/{{target}}/{{arch}}/{{current_version}}"
-      ],
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEMxRDJFREQ1MjExQjdGN0IKUldSN2Z4c2gxZTNTd1FHNCtmYnFXMHVVQzhuNkJOM1cwOFBodmdLall3ckhKenpKUytHSTR1MlkK"
    }
  },
  "bundle": {
@@ -56,6 +51,7 @@
    ],
    "longDescription": "A cross-platform desktop app for interacting with REST, GraphQL, and gRPC",
    "resources": [
+      "static",
      "vendored/protoc/include",
      "vendored/plugins",
      "vendored/plugin-runtime"
@@ -69,15 +65,11 @@
      "nsis",
      "rpm"
    ],
-    "createUpdaterArtifacts": "v1Compatible",
    "macOS": {
      "minimumSystemVersion": "13.0",
      "exceptionDomain": "",
      "entitlements": "macos/entitlements.plist",
      "frameworks": []
-    },
-    "windows": {
-      "signCommand": "trusted-signing-cli -e https://eus.codesigning.azure.net/ -a Yaak -c yaakapp %1"
    }
  }
 }
--- a/src-tauri/tauri.development.conf.json
+++ b/src-tauri/tauri.development.conf.json
--- a/src-tauri/tauri.linux.conf.json
+++ b/src-tauri/tauri.linux.conf.json
@@ -1,3 +1,13 @@
 {
-  "productName": "yaak"
+  "productName": "yaak",
+  "bundle": {
+    "linux": {
+      "deb": {
+        "desktopTemplate": "./template.desktop"
+      },
+      "rpm": {
+        "desktopTemplate": "./template.desktop"
+      }
+    }
+  }
 }
--- a/src-tauri/template.desktop
+++ b/src-tauri/template.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Categories={{categories}}
+Comment={{comment}}
+Exec={{exec}}
+Icon={{icon}}
+Name={{name}}
+StartupWMClass={{exec}}
+Terminal=false
+Type=Application
--- a/src-tauri/yaak-crypto/Cargo.toml
+++ b/src-tauri/yaak-crypto/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 base32 = "0.5.1" # For encoding human-readable key
 base64 = "0.22.1" # For encoding in the database
 chacha20poly1305 = "0.10.1"
-keyring = { version = "4.0.0-rc.1" }
+keyring = { workspace = true, features = ["apple-native", "windows-native", "sync-secret-service"] }
 log = "0.4.26"
 serde = { workspace = true, features = ["derive"] }
 tauri = { workspace = true }
--- a/src-tauri/yaak-git/bindings/gen_models.ts
+++ b/src-tauri/yaak-git/bindings/gen_models.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.

-export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, base: boolean, variables: Array<EnvironmentVariable>, color: string | null, };
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, variables: Array<EnvironmentVariable>, color: string | null, };

 export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };

--- a/src-tauri/yaak-git/src/util.rs
+++ b/src-tauri/yaak-git/src/util.rs
@@ -24,7 +24,7 @@ pub(crate) fn find_ssh_key() -> Option<PathBuf> {
    None
 }

-pub(crate) fn get_current_branch(repo: &Repository) -> Result<Option<Branch>> {
+pub(crate) fn get_current_branch(repo: &Repository) -> Result<Option<Branch<'_>>> {
    for b in repo.branches(None)? {
        let branch = b?.0;
        if branch.is_head() {
@@ -101,7 +101,7 @@ pub(crate) fn get_default_remote_in_repo(repo: &Repository) -> Result<String> {
        return Ok(DEFAULT_REMOTE_NAME.into());
    }

-    // if only one remote exists pick that
+    // if only one remote exists, pick that
    if remotes.len() == 1 {
        let first_remote = remotes
            .iter()
--- a/src-tauri/yaak-grpc/src/transport.rs
+++ b/src-tauri/yaak-grpc/src/transport.rs
@@ -4,8 +4,11 @@ use hyper_util::client::legacy::Client;
 use hyper_util::rt::TokioExecutor;
 use tonic::body::BoxBody;

+// I think ALPN breaks this because we're specifying http2_only
+const WITH_ALPN: bool = false;
+
 pub(crate) fn get_transport(validate_certificates: bool) -> Client<HttpsConnector<HttpConnector>, BoxBody> {
-    let tls_config = yaak_http::tls::get_config(validate_certificates);
+    let tls_config = yaak_http::tls::get_config(validate_certificates, WITH_ALPN);

    let mut http = HttpConnector::new();
    http.enforce_http(false);
--- a/src-tauri/yaak-http/src/tls.rs
+++ b/src-tauri/yaak-http/src/tls.rs
@@ -5,12 +5,12 @@ use rustls::{ClientConfig, DigitallySignedStruct, SignatureScheme};
 use rustls_platform_verifier::BuilderVerifierExt;
 use std::sync::Arc;

-pub fn get_config(validate_certificates: bool) -> ClientConfig {
+pub fn get_config(validate_certificates: bool, with_alpn: bool) -> ClientConfig {
    let arc_crypto_provider = Arc::new(ring::default_provider());
    let config_builder = ClientConfig::builder_with_provider(arc_crypto_provider)
        .with_safe_default_protocol_versions()
        .unwrap();
-    if validate_certificates {
+    let mut client = if validate_certificates {
        // Use platform-native verifier to validate certificates
        config_builder.with_platform_verifier().unwrap().with_no_client_auth()
    } else {
@@ -18,7 +18,13 @@ pub fn get_config(validate_certificates: bool) -> ClientConfig {
            .dangerous()
            .with_custom_certificate_verifier(Arc::new(NoVerifier))
            .with_no_client_auth()
+    };
+
+    if with_alpn {
+        client.alpn_protocols = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
    }
+
+    client
 }

 // Copied from reqwest: https://github.com/seanmonstar/reqwest/blob/595c80b1fbcdab73ac2ae93e4edc3406f453df25/src/tls.rs#L608
--- a/src-tauri/yaak-license/index.ts
+++ b/src-tauri/yaak-license/index.ts
@@ -1,11 +1,14 @@
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { invoke } from '@tauri-apps/api/core';
 import { listen } from '@tauri-apps/api/event';
+import { appInfo } from '@yaakapp/app/lib/appInfo';
 import { useEffect } from 'react';
 import { LicenseCheckStatus } from './bindings/license';

 export * from './bindings/license';

+const CHECK_QUERY_KEY = ['license.check'];
+
 export function useLicense() {
  const queryClient = useQueryClient();
  const activate = useMutation<void, string, { licenseKey: string }>({
@@ -30,12 +33,16 @@ export function useLicense() {
    };
  }, []);

-  const CHECK_QUERY_KEY = ['license.check'];
-  const check = useQuery<void, string, LicenseCheckStatus>({
+  const check = useQuery<LicenseCheckStatus | null, string>({
    refetchInterval: 1000 * 60 * 60 * 12, // Refetch every 12 hours
    refetchOnWindowFocus: false,
    queryKey: CHECK_QUERY_KEY,
-    queryFn: () => invoke('plugin:yaak-license|check'),
+    queryFn: async () => {
+      if (!appInfo.featureLicense) {
+        return null;
+      }
+      return invoke<LicenseCheckStatus>('plugin:yaak-license|check');
+    },
  });

  return {
--- a/src-tauri/yaak-license/src/license.rs
+++ b/src-tauri/yaak-license/src/license.rs
@@ -155,6 +155,7 @@ pub async fn check_license<R: Runtime>(window: &WebviewWindow<R>) -> Result<Lice
        app_version: window.package_info().version.to_string(),
    };
    let activation_id = get_activation_id(window.app_handle()).await;
+
    let settings = window.db().get_settings();
    let trial_end = settings.created_at.add(Duration::from_secs(TRIAL_SECONDS));

--- a/src-tauri/yaak-models/bindings/gen_models.ts
+++ b/src-tauri/yaak-models/bindings/gen_models.ts
@@ -14,7 +14,7 @@ export type EditorKeymap = "default" | "vim" | "vscode" | "emacs";

 export type EncryptedKey = { encryptedKey: string, };

-export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, base: boolean, variables: Array<EnvironmentVariable>, color: string | null, };
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, variables: Array<EnvironmentVariable>, color: string | null, };

 export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };

@@ -62,7 +62,7 @@ export type ProxySetting = { "type": "enabled", http: string, https: string, aut

 export type ProxySettingAuth = { user: string, password: string, };

-export type Settings = { model: "settings", id: string, createdAt: string, updatedAt: string, appearance: string, coloredMethods: boolean, editorFont: string | null, editorFontSize: number, editorKeymap: EditorKeymap, editorSoftWrap: boolean, hideWindowControls: boolean, interfaceFont: string | null, interfaceFontSize: number, interfaceScale: number, openWorkspaceNewWindow: boolean | null, proxy: ProxySetting | null, themeDark: string, themeLight: string, updateChannel: string, };
+export type Settings = { model: "settings", id: string, createdAt: string, updatedAt: string, appearance: string, coloredMethods: boolean, editorFont: string | null, editorFontSize: number, editorKeymap: EditorKeymap, editorSoftWrap: boolean, hideWindowControls: boolean, interfaceFont: string | null, interfaceFontSize: number, interfaceScale: number, openWorkspaceNewWindow: boolean | null, proxy: ProxySetting | null, themeDark: string, themeLight: string, updateChannel: string, hideLicenseBadge: boolean, autoupdate: boolean, autoDownloadUpdates: boolean, };

 export type SyncState = { model: "sync_state", id: string, workspaceId: string, createdAt: string, updatedAt: string, flushedAt: string, modelId: string, checksum: string, relPath: string, syncDir: string, };

--- a/src-tauri/yaak-models/migrations/20250727190746_autoupdate_setting.sql
+++ b/src-tauri/yaak-models/migrations/20250727190746_autoupdate_setting.sql
@@ -0,0 +1 @@
+ALTER TABLE settings ADD COLUMN autoupdate BOOLEAN DEFAULT true NOT NULL;
--- a/src-tauri/yaak-models/migrations/20250918141129_request-folder-environments.sql
+++ b/src-tauri/yaak-models/migrations/20250918141129_request-folder-environments.sql
@@ -0,0 +1,62 @@
+-- Create temporary table for migration
+CREATE TABLE environments__new
+(
+    id           TEXT                               NOT NULL PRIMARY KEY,
+    created_at   DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at   DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    deleted_at   DATETIME,
+    workspace_id TEXT                               NOT NULL
+        REFERENCES workspaces ON DELETE CASCADE,
+
+    name         TEXT                               NOT NULL,
+    variables    TEXT     DEFAULT '[]'              NOT NULL,
+    model        TEXT     DEFAULT 'environment',
+    public       BOOLEAN  DEFAULT FALSE,
+    color        TEXT,
+
+    -- NEW
+    parent_model TEXT     DEFAULT 'workspace'       NOT NULL,
+    parent_id    TEXT
+);
+
+-- Backfill the data from the old table
+--    - base=1  -> (workspace, NULL)
+--    - base=0  -> (environment, id_of_workspace_base)  (fallback to workspace,NULL if none)
+INSERT INTO environments__new
+(id, created_at, updated_at, deleted_at, workspace_id, name, variables, model, public, color, parent_model, parent_id)
+SELECT
+    e.id,
+    e.created_at,
+    e.updated_at,
+    e.deleted_at,
+    e.workspace_id,
+    e.name,
+    e.variables,
+    e.model,
+    e.public,
+    e.color,
+    CASE
+        WHEN e.base = 1 THEN 'workspace'
+        WHEN (
+                 SELECT COUNT(1)
+                 FROM environments b
+                 WHERE b.workspace_id = e.workspace_id AND b.base = 1
+             ) > 0 THEN 'environment'
+        ELSE 'workspace'
+        END AS parent_model,
+    CASE
+        WHEN e.base = 1 THEN NULL
+        ELSE (
+            SELECT b.id
+            FROM environments b
+            WHERE b.workspace_id = e.workspace_id AND b.base = 1
+            ORDER BY b.created_at ASC, b.id ASC
+            LIMIT 1
+        )
+        END AS parent_id
+FROM environments e;
+
+-- Move everything to the new table
+DROP TABLE environments;
+ALTER TABLE environments__new
+    RENAME TO environments;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gregory Schier	1a1751c23e	Fix window path issue	2025-10-02 08:25:00 -07:00
Gregory Schier	17de0678b0	Remove unused import from window.rs	2025-10-02 08:05:07 -07:00
Gregory Schier	20bb89de33	Try fix oauth window creation	2025-10-02 07:45:50 -07:00
Gregory Schier	8a634b1056	Add back environment.base (#260 )	2025-10-02 06:04:27 -07:00
Gregory Schier	57f231ca00	Add trial status to links	2025-10-01 21:14:26 -07:00
Gregory Schier	cb1c0e4d8c	Fix ref	2025-10-01 21:07:44 -07:00
Gregory Schier	2152cf87d7	Tweak license badge and fix keyring dep	2025-10-01 21:01:27 -07:00
Gregory Schier	8662b230e7	Oops, actually fix	2025-10-01 16:54:05 -07:00
Gregory Schier	3a8a6484c7	Fix release windows signing	2025-10-01 16:42:38 -07:00
Gregory Schier	f92594a16d	Fix release tauri config	2025-10-01 10:51:26 -07:00
Gregory Schier	7969fcb76c	Alias keyring function	2025-10-01 10:22:06 -07:00
Gregory Schier	eafefb1894	Fix setting	2025-10-01 09:44:18 -07:00
Gregory Schier	9a94a15c82	Integrated update experience (#259 )	2025-10-01 09:36:36 -07:00
Gregory Schier	757d28c235	License and updater Cargo features (#258 )	2025-09-29 22:08:05 -07:00
Gregory Schier	6c79c1ef3f	Rework licensing flows to be more friendly	2025-09-29 15:40:15 -07:00
Gregory Schier	7262eccac5	Fix keyring errors	2025-09-29 10:53:20 -07:00
Gregory Schier	4989a5f759	Add back cmd palette icon	2025-09-29 09:39:15 -07:00
Gregory Schier	0b0b05d29c	Add keyring template function	2025-09-29 08:56:24 -07:00
Gregory Schier	b3d6d87bee	Delete duplicate folder environments on upsert	2025-09-29 07:48:07 -07:00
Gregory Schier	6abbdc8726	Filter out current variable from autocomplete and show sub environment variables in base environment autocomplete	2025-09-29 06:57:04 -07:00
Gregory Schier	b9613591f8	Update resource links in README.md	2025-09-28 15:38:14 -07:00
Gregory Schier	eb555989ac	Force grpcurl to posix paths	2025-09-25 08:40:57 -07:00
Gregory Schier	b77f1375fd	Fix test with timezone	2025-09-25 08:03:07 -07:00
Gregory Schier	3c438b3da7	Add cmdctrl+Backspace for request delete	2025-09-25 07:28:01 -07:00
Gregory Schier	df15543c80	Explicitly set the request layout (#257 )	2025-09-25 07:23:52 -07:00
Gregory Schier	73ad86c6b9	Fix workspace settings scroll with long description	2025-09-25 07:22:42 -07:00
Gregory Schier	615de8b3cc	Update importers for folder environment and fix tests	2025-09-25 07:12:50 -07:00
Gregory Schier	2418bd0672	Update README.md	2025-09-24 11:03:23 -07:00
Gregory Schier	b3414ee60f	Fix ephemeral response body reading	2025-09-22 14:07:25 -07:00
Gregory Schier	8fe50959b9	Add migrate for base environment to sync logic	2025-09-22 11:15:32 -07:00
Gregory Schier	523e7dcf16	Add bootstrap to release script (to fix lint)	2025-09-22 08:57:05 -07:00
Gregory Schier	7951f3a7bd	Tweak light theme, high contrast themes, and fix env null reference	2025-09-22 08:36:40 -07:00
Gregory Schier	c6666b9623	Update tauri and signing deps to try fixing windows signing	2025-09-21 08:40:43 -07:00
Gregory Schier	fa98351e30	Fix lint	2025-09-21 08:04:47 -07:00
Gregory Schier	3c8be3f5b9	Gen models	2025-09-21 08:01:49 -07:00
Gregory Schier	eb3d1c409b	Merge pull request #256 * Update environment model to get ready for request/folder environments * Folder environments in UI * Folder environments working * Tweaks and fixes * Tweak environment encryption UX * Tweak environment encryption UX * Address comments * Update fn name * Add tsc back to lint rules * Update src-web/components/EnvironmentEditor.tsx * Merge remote-tracking branch 'origin/folder-environments' into folder…	2025-09-21 07:54:26 -07:00
Jhonatan Matías	46b049c72b	Fix Typos (#255 )	2025-09-18 10:40:32 -07:00
Hao Xiang	fec64b5c02	fix http response load when filter (#251 )	2025-09-16 13:01:00 -07:00
dependabot[bot]	8c3ed60579	Bump vite-plugin-static-copy from 3.1.1 to 3.1.2 (#252 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-16 11:20:34 -07:00
moshyfawn	907e09a417	[Plugins] [CopyAsCURL] [Auth] [JWT] Include custom bearer prefix to copy CURL (#253 ) Co-authored-by: Gregory Schier <gschier1990@gmail.com>	2025-09-16 11:20:23 -07:00
dependabot[bot]	28c6af8f94	Bump vite from 7.0.4 to 7.0.7 (#254 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-16 10:25:34 -07:00
Gabriel Oliveira	f8b0510d08	feat(settings): add do not check for updates (#246 ) Co-authored-by: Gregory Schier <gschier1990@gmail.com>	2025-08-08 13:25:55 -07:00
Gregory Schier	5f99b7df05	Use logger for plugin logs so they actually show https://feedback.yaak.app/p/log-statements-dont-appear-from-within-plugins	2025-08-08 13:00:38 -07:00
Gregory Schier	158877b355	Fix SVG viewer crashing	2025-08-08 12:59:59 -07:00
Gregory Schier	8b84545b67	Prevent curl copy from using stale body data https://feedback.yaak.app/p/copy-as-curl-includes-wrong-data-property	2025-08-02 10:03:35 -07:00
Gregory Schier	0e28079965	Fix GraphQL introspection breaking app https://feedback.yaak.app/p/workspace-crash-when-graphql-introspection-returns-unexpected-response	2025-08-02 09:58:53 -07:00
Gregory Schier	5d5f9cc943	Better iFrame sandboxing https://feedback.yaak.app/p/completely-white-ui	2025-08-02 09:47:34 -07:00
Gregory Schier	b71bc2cc92	Fix gRPC/WS hang because of ALPN https://feedback.yaak.app/p/grpc-stalls-at-inspecting-schema-no-timeout-no-manual-proto	2025-08-02 09:37:28 -07:00
Gregory Schier	23191dcfc3	Revert change	2025-07-27 08:54:57 -07:00
Gregory Schier	372b15689d	Fix min-size on md code	2025-07-27 08:54:44 -07:00
Gregory Schier	5c6d6fb7e4	Switch to menu right more easily	2025-07-27 08:45:56 -07:00
Gregory Schier	835a2e93e9	Text selection and syntax highlighting to markdown previews https://feedback.yaak.app/p/enable-text-selection-in-the-info-section	2025-07-27 08:33:44 -07:00
Gregory Schier	93c6f6d611	re-enable http/2 support	2025-07-27 07:38:12 -07:00
Gregory Schier	b445261b32	Some tweaks	2025-07-26 15:48:58 -07:00
Gregory Schier	685b59cee9	Fix error	2025-07-26 14:34:40 -07:00
Gregory Schier	38529cc89e	Plugin init/dispose	2025-07-26 14:28:59 -07:00
Gregory Schier	0d98b95b61	Don't prompt for updates on Linux unless APPIMAGE env exists	2025-07-25 15:10:04 -07:00
Gregory Schier	e044dcae3e	Add back Rose Pine themes	2025-07-25 09:39:37 -07:00
Gregory Schier	b5b7b1638d	Use physical key codes for zoom hotkeys	2025-07-24 09:15:57 -07:00
Gregory Schier	9d6ac8a107	Add template.desktop to make icon work until we can upgrade Tauri CLI	2025-07-24 08:44:55 -07:00
Gregory Schier	6440df492e	Generate icons	2025-07-24 08:07:16 -07:00
Gregory Schier	2cdd97cabb	Fix header spacing for window controls https://feedback.yaak.app/p/app-bar-icons-not-aligned-correctly-when-fullscreen	2025-07-24 07:57:38 -07:00
Gregory Schier	20681e5be3	Scoped OAuth 2 tokens	2025-07-23 22:03:03 -07:00
Gregory Schier	a258a80fbd	Prevent auth from adding lone ? to URL https://feedback.yaak.app/p/using-inherited-api-key-causes-a-question-mark-to-be	2025-07-23 17:20:17 -07:00
				`@@ -0,0 +1 @@`
				`ALTER TABLE settings ADD COLUMN autoupdate BOOLEAN DEFAULT true NOT NULL;`