Fix biome lint: update schema to 2.3.13, exclude npm dir, fix lint errors

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Update release skills for CLI
2026-03-09 23:00:06 +01:00 · 2026-03-05 16:19:05 -08:00 · 2026-03-05 16:06:40 -08:00 · 2026-03-05 15:59:10 -08:00 · 2026-03-05 15:53:13 -08:00 · 2026-03-05 15:36:09 -08:00
732 changed files with 3608 additions and 6713 deletions
--- a/.claude-context.md
+++ b/.claude-context.md
@@ -6,14 +6,14 @@ Make Yaak runnable as a standalone CLI without Tauri as a dependency. The core R
 ## Project Structure
 ```
 crates/           # Core crates - should NOT depend on Tauri
-crates-tauri/     # Tauri-specific crates (yaak-app-client, yaak-tauri-utils, etc.)
+crates-tauri/     # Tauri-specific crates (yaak-app, yaak-tauri-utils, etc.)
 crates-cli/       # CLI crate (yaak-cli)
 ```

 ## Completed Work

 ### 1. Folder Restructure
- Moved Tauri-dependent app code to `crates-tauri/yaak-app-client/`
+- Moved Tauri-dependent app code to `crates-tauri/yaak-app/`
 - Created `crates-tauri/yaak-tauri-utils/` for shared Tauri utilities (window traits, api_client, error handling)
 - Created `crates-cli/yaak-cli/` for the standalone CLI

@@ -43,13 +43,13 @@ crates-cli/       # CLI crate (yaak-cli)
 3. Move extension traits (e.g., `SomethingManagerExt`) to yaak-app or yaak-tauri-utils
 4. Initialize managers in yaak-app's `.setup()` block
 5. Remove `tauri` from Cargo.toml dependencies
-6. Update `crates-tauri/yaak-app-client/capabilities/default.json` to remove the plugin permission
+6. Update `crates-tauri/yaak-app/capabilities/default.json` to remove the plugin permission
 7. Replace `tauri::async_runtime::block_on` with `tokio::runtime::Handle::current().block_on()`

 ## Key Files
- `crates-tauri/yaak-app-client/src/lib.rs` - Main Tauri app, setup block initializes managers
- `crates-tauri/yaak-app-client/src/commands.rs` - Migrated Tauri commands
- `crates-tauri/yaak-app-client/src/models_ext.rs` - Database plugin and extension traits
+- `crates-tauri/yaak-app/src/lib.rs` - Main Tauri app, setup block initializes managers
+- `crates-tauri/yaak-app/src/commands.rs` - Migrated Tauri commands
+- `crates-tauri/yaak-app/src/models_ext.rs` - Database plugin and extension traits
 - `crates-tauri/yaak-tauri-utils/src/window.rs` - WorkspaceWindowTrait for window state
 - `crates/yaak-models/src/lib.rs` - Contains `init_standalone()` for CLI usage

@@ -68,5 +68,5 @@ e718a5f1 Refactor models_ext to use init_standalone from yaak-models

 ## Testing
 - Run `cargo check -p <crate>` to verify a crate builds without Tauri
- Run `npm run client:dev` to test the Tauri app still works
+- Run `npm run app-dev` to test the Tauri app still works
 - Run `cargo run -p yaak-cli -- --help` to test the CLI
--- a/.claude/commands/release/generate-release-notes.md
+++ b/.claude/commands/release/generate-release-notes.md
@@ -37,6 +37,7 @@ The skill generates markdown-formatted release notes following this structure:

 **IMPORTANT**: Always add a blank lines around the markdown code fence and output the markdown code block last
 **IMPORTANT**: PRs by `@gschier` should not mention the @username
+**IMPORTANT**: These are app release notes. Exclude CLI-only changes (commits prefixed with `cli:` or only touching `crates-cli/`) since the CLI has its own release process.

 ## After Generating Release Notes

--- a/.codex/skills/release-generate-release-notes/SKILL.md
+++ b/.codex/skills/release-generate-release-notes/SKILL.md
@@ -32,6 +32,7 @@ Generate formatted markdown release notes for a Yaak tag.
 - Keep a blank line before and after the code fence.
 - Output the markdown code block last.
 - Do not append `by @gschier` for PRs authored by `@gschier`.
+- These are app release notes. Exclude CLI-only changes (commits prefixed with `cli:` or only touching `crates-cli/`) since the CLI has its own release process.

 ## Release Creation Prompt

--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
-crates-tauri/yaak-app-client/vendored/**/* linguist-generated=true
-crates-tauri/yaak-app-client/gen/schemas/**/* linguist-generated=true
+crates-tauri/yaak-app/vendored/**/* linguist-generated=true
+crates-tauri/yaak-app/gen/schemas/**/* linguist-generated=true
 **/bindings/* linguist-generated=true
 crates/yaak-templates/pkg/* linguist-generated=true

--- a/.github/workflows/release-app.yml
+++ b/.github/workflows/release-app.yml
@@ -95,7 +95,7 @@ jobs:
      - name: Run JS Tests
        run: npm test
      - name: Run Rust Tests
-        run: cargo test --all
+        run: cargo test --all --exclude yaak-cli

      - name: Set version
        run: npm run replace-version
@@ -122,8 +122,8 @@ jobs:
          security list-keychain -d user -s $KEYCHAIN_PATH

          # Sign vendored binaries with hardened runtime and their specific entitlements
-          codesign --force --options runtime --entitlements crates-tauri/yaak-app-client/macos/entitlements.yaakprotoc.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app-client/vendored/protoc/yaakprotoc || true
-          codesign --force --options runtime --entitlements crates-tauri/yaak-app-client/macos/entitlements.yaaknode.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app-client/vendored/node/yaaknode || true
+          codesign --force --options runtime --entitlements crates-tauri/yaak-app/macos/entitlements.yaakprotoc.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app/vendored/protoc/yaakprotoc || true
+          codesign --force --options runtime --entitlements crates-tauri/yaak-app/macos/entitlements.yaaknode.plist --sign "$APPLE_SIGNING_IDENTITY" crates-tauri/yaak-app/vendored/node/yaaknode || true

      - uses: tauri-apps/tauri-action@v0
        env:
@@ -152,7 +152,7 @@ jobs:
          releaseBody: "[Changelog __VERSION__](https://yaak.app/blog/__VERSION__)"
          releaseDraft: true
          prerelease: true
-          args: "${{ matrix.args }} --config ./crates-tauri/yaak-app-client/tauri.release.conf.json"
+          args: "${{ matrix.args }} --config ./crates-tauri/yaak-app/tauri.release.conf.json"

      # Build a per-machine NSIS installer for enterprise deployment (PDQ, SCCM, Intune)
      - name: Build and upload machine-wide installer (Windows only)
@@ -168,7 +168,7 @@ jobs:
          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
        run: |
          Get-ChildItem -Recurse -Path target -File -Filter "*.exe.sig" | Remove-Item -Force
-          npx tauri bundle ${{ matrix.args }} --bundles nsis --config ./crates-tauri/yaak-app-client/tauri.release.conf.json --config '{"bundle":{"createUpdaterArtifacts":true,"windows":{"nsis":{"installMode":"perMachine"}}}}'
+          npx tauri bundle ${{ matrix.args }} --bundles nsis --config ./crates-tauri/yaak-app/tauri.release.conf.json --config '{"bundle":{"createUpdaterArtifacts":true,"windows":{"nsis":{"installMode":"perMachine"}}}}'
          $setup = Get-ChildItem -Recurse -Path target -Filter "*setup*.exe" | Select-Object -First 1
          $setupSig = "$($setup.FullName).sig"
          $dest = $setup.FullName -replace '-setup\.exe$', '-setup-machine.exe'
--- a/.github/workflows/release-cli-npm.yml
+++ b/.github/workflows/release-cli-npm.yml
@@ -45,8 +45,8 @@ jobs:
        with:
          name: vendored-assets
          path: |
-            crates-tauri/yaak-app-client/vendored/plugin-runtime/index.cjs
-            crates-tauri/yaak-app-client/vendored/plugins
+            crates-tauri/yaak-app/vendored/plugin-runtime/index.cjs
+            crates-tauri/yaak-app/vendored/plugins
          if-no-files-found: error

  build-binaries:
@@ -107,7 +107,7 @@ jobs:
        uses: actions/download-artifact@v4
        with:
          name: vendored-assets
-          path: crates-tauri/yaak-app-client/vendored
+          path: crates-tauri/yaak-app/vendored

      - name: Set CLI build version
        shell: bash
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,7 @@ codebook.toml
 target

 # Per-worktree Tauri config (generated by post-checkout hook)
-crates-tauri/yaak-app-client/tauri.worktree.conf.json
-crates-tauri/yaak-app-proxy/tauri.worktree.conf.json
+crates-tauri/yaak-app/tauri.worktree.conf.json

 # Tauri auto-generated permission files
 **/permissions/autogenerated
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -173,6 +173,17 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"

+[[package]]
+name = "apollo-parser"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "947e21ff51879f8a40d7519dfe619268de2afba4042a8a43878276de3cb910f0"
+dependencies = [
+ "memchr",
+ "rowan",
+ "thiserror 2.0.17",
+]
+
 [[package]]
 name = "append-only-vec"
 version = "0.1.8"
@@ -477,28 +488,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

-[[package]]
-name = "aws-lc-rs"
-version = "1.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf"
-dependencies = [
- "aws-lc-sys",
- "zeroize",
-]
-
-[[package]]
-name = "aws-lc-sys"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e"
-dependencies = [
- "cc",
- "cmake",
- "dunce",
- "fs_extra",
-]
-
 [[package]]
 name = "axum"
 version = "0.7.9"
@@ -1369,6 +1358,12 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "countme"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
+
 [[package]]
 name = "cow-utils"
 version = "0.1.3"
@@ -2214,12 +2209,6 @@ dependencies = [
 "pkg-config",
 ]

-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -4584,7 +4573,7 @@ checksum = "75b1853bc34cadaa90aa09f95713d8b77ec0c0d3e2d90ccf7a74216f40d20850"
 dependencies = [
 "flate2",
 "postcard",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 "serde_json",
 "thiserror 2.0.17",
@@ -4627,7 +4616,7 @@ dependencies = [
 "hashbrown 0.16.1",
 "oxc_data_structures",
 "oxc_estree",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 ]

@@ -4683,7 +4672,7 @@ dependencies = [
 "oxc_index",
 "oxc_syntax",
 "petgraph 0.8.3",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 ]

 [[package]]
@@ -4704,7 +4693,7 @@ dependencies = [
 "oxc_sourcemap",
 "oxc_span",
 "oxc_syntax",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 ]

 [[package]]
@@ -4716,7 +4705,7 @@ dependencies = [
 "cow-utils",
 "oxc-browserslist",
 "oxc_syntax",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 ]

@@ -4791,7 +4780,7 @@ dependencies = [
 "oxc_ecmascript",
 "oxc_span",
 "oxc_syntax",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 ]

 [[package]]
@@ -4808,7 +4797,7 @@ dependencies = [
 "oxc_semantic",
 "oxc_span",
 "oxc_syntax",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 ]

 [[package]]
@@ -4833,7 +4822,7 @@ dependencies = [
 "oxc_span",
 "oxc_syntax",
 "oxc_traverse",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 ]

 [[package]]
@@ -4855,7 +4844,7 @@ dependencies = [
 "oxc_regular_expression",
 "oxc_span",
 "oxc_syntax",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "seq-macro",
 ]

@@ -4871,7 +4860,7 @@ dependencies = [
 "oxc_diagnostics",
 "oxc_span",
 "phf 0.13.1",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "unicode-id-start",
 ]

@@ -4888,7 +4877,7 @@ dependencies = [
 "once_cell",
 "papaya",
 "pnp",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "self_cell",
 "serde",
 "serde_json",
@@ -4918,7 +4907,7 @@ dependencies = [
 "oxc_span",
 "oxc_syntax",
 "phf 0.13.1",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "self_cell",
 ]

@@ -4930,7 +4919,7 @@ checksum = "c7f89482522f3cd820817d48ee4ade5b10822060d6e5e4d419f05f6d8bd29d70"
 dependencies = [
 "base64-simd",
 "json-escape-simd",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 "serde_json",
 ]
@@ -4994,7 +4983,7 @@ dependencies = [
 "oxc_span",
 "oxc_syntax",
 "oxc_traverse",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 "serde_json",
 "sha1",
@@ -5019,7 +5008,7 @@ dependencies = [
 "oxc_syntax",
 "oxc_transformer",
 "oxc_traverse",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 ]

 [[package]]
@@ -5037,7 +5026,7 @@ dependencies = [
 "oxc_semantic",
 "oxc_span",
 "oxc_syntax",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 ]

 [[package]]
@@ -5143,16 +5132,6 @@ dependencies = [
 "hmac",
 ]

-[[package]]
-name = "pem"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
-dependencies = [
- "base64 0.22.1",
- "serde_core",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -5452,7 +5431,7 @@ dependencies = [
 "nodejs-built-in-modules",
 "pathdiff",
 "radix_trie",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 "serde_json",
 "thiserror 2.0.17",
@@ -5571,6 +5550,18 @@ dependencies = [
 "termtree",
 ]

+[[package]]
+name = "pretty_graphql"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea8c38ecedb3d28a998ea783469a78587f5f984d61226cf071f6979861e9e6a9"
+dependencies = [
+ "apollo-parser",
+ "memchr",
+ "rowan",
+ "tiny_pretty",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -5751,7 +5742,7 @@ dependencies = [
 "pin-project-lite",
 "quinn-proto",
 "quinn-udp",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "rustls",
 "socket2 0.5.10",
 "thiserror 2.0.17",
@@ -5771,7 +5762,7 @@ dependencies = [
 "lru-slab",
 "rand 0.9.1",
 "ring",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "rustls",
 "rustls-pki-types",
 "slab",
@@ -5993,19 +5984,6 @@ dependencies = [
 "cipher",
 ]

-[[package]]
-name = "rcgen"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
-dependencies = [
- "pem",
- "ring",
- "rustls-pki-types",
- "time",
- "yasna",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.12"
@@ -6278,7 +6256,7 @@ dependencies = [
 "rolldown_tracing",
 "rolldown_utils",
 "rolldown_watcher",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 "serde_json",
 "string_wizard",
@@ -6368,7 +6346,7 @@ dependencies = [
 "rolldown_sourcemap",
 "rolldown_std_utils",
 "rolldown_utils",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 "serde_json",
 "simdutf8",
@@ -6386,7 +6364,7 @@ dependencies = [
 "blake3",
 "dashmap",
 "rolldown_debug_action",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 "serde_json",
 "tracing",
@@ -6443,7 +6421,7 @@ dependencies = [
 "rolldown-ariadne",
 "rolldown_utils",
 "ropey",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "sugar_path",
 ]

@@ -6477,7 +6455,7 @@ dependencies = [
 "rolldown_resolver",
 "rolldown_sourcemap",
 "rolldown_utils",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 "serde_json",
 "string_wizard",
@@ -6497,7 +6475,7 @@ dependencies = [
 "rolldown_common",
 "rolldown_plugin",
 "rolldown_utils",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde_json",
 "xxhash-rust",
 ]
@@ -6568,7 +6546,7 @@ dependencies = [
 "oxc",
 "oxc_sourcemap",
 "rolldown_utils",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 ]

 [[package]]
@@ -6620,7 +6598,7 @@ dependencies = [
 "regex 1.11.1",
 "regress",
 "rolldown_std_utils",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde_json",
 "simdutf8",
 "sugar_path",
@@ -6650,6 +6628,18 @@ dependencies = [
 "str_indices",
 ]

+[[package]]
+name = "rowan"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "417a3a9f582e349834051b8a10c8d71ca88da4211e4093528e36b9845f6b5f21"
+dependencies = [
+ "countme",
+ "hashbrown 0.14.5",
+ "rustc-hash 1.1.0",
+ "text-size",
+]
+
 [[package]]
 name = "rusqlite"
 version = "0.32.1"
@@ -6692,6 +6682,12 @@ dependencies = [
 "serde_json",
 ]

+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -6739,8 +6735,6 @@ version = "0.23.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
 dependencies = [
- "aws-lc-rs",
- "log 0.4.29",
 "once_cell",
 "ring",
 "rustls-pki-types",
@@ -6813,7 +6807,6 @@ version = "0.103.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
 dependencies = [
- "aws-lc-rs",
 "ring",
 "rustls-pki-types",
 "untrusted",
@@ -7507,7 +7500,7 @@ dependencies = [
 "memchr",
 "oxc_index",
 "oxc_sourcemap",
- "rustc-hash",
+ "rustc-hash 2.1.1",
 "serde",
 ]

@@ -8208,6 +8201,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"

+[[package]]
+name = "text-size"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
+
 [[package]]
 name = "textwrap"
 version = "0.16.2"
@@ -8330,6 +8329,12 @@ dependencies = [
 "crunchy",
 ]

+[[package]]
+name = "tiny_pretty"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650d82e943da333637be9f1567d33d605e76810a26464edfd7ae74f7ef181e95"
+
 [[package]]
 name = "tinystr"
 version = "0.8.1"
@@ -10240,7 +10245,7 @@ dependencies = [
 ]

 [[package]]
-name = "yaak-app-client"
+name = "yaak-app"
 version = "0.0.0"
 dependencies = [
 "charset",
@@ -10252,6 +10257,7 @@ dependencies = [
 "md5 0.8.0",
 "mime_guess",
 "openssl-sys",
+ "pretty_graphql",
 "r2d2",
 "r2d2_sqlite",
 "rand 0.9.1",
@@ -10297,24 +10303,9 @@ dependencies = [
 "yaak-tauri-utils",
 "yaak-templates",
 "yaak-tls",
- "yaak-window",
 "yaak-ws",
 ]

-[[package]]
-name = "yaak-app-proxy"
-version = "0.0.0"
-dependencies = [
- "log 0.4.29",
- "serde_json",
- "tauri",
- "tauri-build",
- "tauri-plugin-os",
- "yaak-proxy-lib",
- "yaak-rpc",
- "yaak-window",
-]
-
 [[package]]
 name = "yaak-cli"
 version = "0.1.0"
@@ -10384,25 +10375,6 @@ dependencies = [
 "yaak-models",
 ]

-[[package]]
-name = "yaak-database"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "include_dir",
- "log 0.4.29",
- "nanoid",
- "r2d2",
- "r2d2_sqlite",
- "rusqlite",
- "sea-query",
- "sea-query-rusqlite",
- "serde",
- "serde_json",
- "thiserror 2.0.17",
- "ts-rs",
-]
-
 [[package]]
 name = "yaak-fonts"
 version = "0.1.0"
@@ -10487,6 +10459,7 @@ dependencies = [
 "urlencoding",
 "yaak-common",
 "yaak-models",
+ "yaak-templates",
 "yaak-tls",
 "zstd",
 ]
@@ -10543,7 +10516,6 @@ dependencies = [
 "thiserror 2.0.17",
 "ts-rs",
 "yaak-core",
- "yaak-database",
 ]

 [[package]]
@@ -10575,52 +10547,6 @@ dependencies = [
 "zip-extract",
 ]

-[[package]]
-name = "yaak-proxy"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "http",
- "http-body-util",
- "hyper",
- "hyper-util",
- "pem",
- "rcgen",
- "rustls",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls",
-]
-
-[[package]]
-name = "yaak-proxy-lib"
-version = "0.0.0"
-dependencies = [
- "chrono",
- "include_dir",
- "log 0.4.29",
- "r2d2",
- "r2d2_sqlite",
- "rusqlite",
- "sea-query",
- "serde",
- "serde_json",
- "ts-rs",
- "yaak-database",
- "yaak-proxy",
- "yaak-rpc",
-]
-
-[[package]]
-name = "yaak-rpc"
-version = "0.0.0"
-dependencies = [
- "log 0.4.29",
- "serde",
- "serde_json",
- "ts-rs",
-]
-
 [[package]]
 name = "yaak-sse"
 version = "0.1.0"
@@ -10686,17 +10612,6 @@ dependencies = [
 "yaak-models",
 ]

-[[package]]
-name = "yaak-window"
-version = "0.1.0"
-dependencies = [
- "log 0.4.29",
- "md5 0.8.0",
- "rand 0.9.1",
- "tauri",
- "tokio",
-]
-
 [[package]]
 name = "yaak-ws"
 version = "0.1.0"
@@ -10728,9 +10643,6 @@ name = "yasna"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
-dependencies = [
- "time",
-]

 [[package]]
 name = "yoke"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,9 +2,6 @@
 resolver = "2"
 members = [
    "crates/yaak",
-    # Common/foundation crates
-    "crates/common/yaak-database",
-    "crates/common/yaak-rpc",
    # Shared crates (no Tauri dependency)
    "crates/yaak-core",
    "crates/yaak-common",
@@ -20,19 +17,14 @@ members = [
    "crates/yaak-tls",
    "crates/yaak-ws",
    "crates/yaak-api",
-    "crates/yaak-proxy",
-    # Proxy-specific crates
-    "crates-proxy/yaak-proxy-lib",
    # CLI crates
    "crates-cli/yaak-cli",
    # Tauri-specific crates
-    "crates-tauri/yaak-app-client",
-    "crates-tauri/yaak-app-proxy",
+    "crates-tauri/yaak-app",
    "crates-tauri/yaak-fonts",
    "crates-tauri/yaak-license",
    "crates-tauri/yaak-mac-window",
    "crates-tauri/yaak-tauri-utils",
-    "crates-tauri/yaak-window",
 ]

 [workspace.dependencies]
@@ -55,10 +47,6 @@ thiserror = "2.0.17"
 tokio = "1.48.0"
 ts-rs = "11.1.0"

-# Internal crates - common/foundation
-yaak-database = { path = "crates/common/yaak-database" }
-yaak-rpc = { path = "crates/common/yaak-rpc" }
-
 # Internal crates - shared
 yaak-core = { path = "crates/yaak-core" }
 yaak = { path = "crates/yaak" }
@@ -75,17 +63,12 @@ yaak-templates = { path = "crates/yaak-templates" }
 yaak-tls = { path = "crates/yaak-tls" }
 yaak-ws = { path = "crates/yaak-ws" }
 yaak-api = { path = "crates/yaak-api" }
-yaak-proxy = { path = "crates/yaak-proxy" }
-
-# Internal crates - proxy
-yaak-proxy-lib = { path = "crates-proxy/yaak-proxy-lib" }

 # Internal crates - Tauri-specific
 yaak-fonts = { path = "crates-tauri/yaak-fonts" }
 yaak-license = { path = "crates-tauri/yaak-license" }
 yaak-mac-window = { path = "crates-tauri/yaak-mac-window" }
 yaak-tauri-utils = { path = "crates-tauri/yaak-tauri-utils" }
-yaak-window = { path = "crates-tauri/yaak-window" }

 [profile.release]
 strip = false
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <p align="center">
  <a href="https://github.com/JamesIves/github-sponsors-readme-action">
-    <img width="200px" src="https://github.com/mountain-loop/yaak/raw/main/crates-tauri/yaak-app-client/icons/icon.png">
+    <img width="200px" src="https://github.com/mountain-loop/yaak/raw/main/crates-tauri/yaak-app/icons/icon.png">
  </a>
 </p>

--- a/apps/yaak-client/lib/atoms.ts
+++ b/apps/yaak-client/lib/atoms.ts
@@ -1,25 +0,0 @@
-import deepEqual from "@gilbarbara/deep-equal";
-import type { UpdateInfo } from "@yaakapp-internal/tauri-client";
-import type { Atom } from "jotai";
-import { atom } from "jotai";
-import { selectAtom } from "jotai/utils";
-import type { SplitLayoutLayout } from "../components/core/SplitLayout";
-import { atomWithKVStorage } from "./atoms/atomWithKVStorage";
-
-export function deepEqualAtom<T>(a: Atom<T>) {
-  return selectAtom(
-    a,
-    (v) => v,
-    (a, b) => deepEqual(a, b),
-  );
-}
-
-export const workspaceLayoutAtom = atomWithKVStorage<SplitLayoutLayout>(
-  "workspace_layout",
-  "horizontal",
-);
-
-export const updateAvailableAtom = atom<Omit<
-  UpdateInfo,
-  "replyEventId"
-> | null>(null);
--- a/apps/yaak-client/lib/initGlobalListeners.tsx
+++ b/apps/yaak-client/lib/initGlobalListeners.tsx
@@ -1,322 +0,0 @@
-import { emit } from "@tauri-apps/api/event";
-import { openUrl } from "@tauri-apps/plugin-opener";
-import { debounce } from "@yaakapp-internal/lib";
-import type {
-  FormInput,
-  InternalEvent,
-  JsonPrimitive,
-  ShowToastRequest,
-} from "@yaakapp-internal/plugins";
-import { updateAllPlugins } from "@yaakapp-internal/plugins";
-import type {
-  PluginUpdateNotification,
-  UpdateInfo,
-  UpdateResponse,
-  YaakNotification,
-} from "@yaakapp-internal/tauri-client";
-import { openSettings } from "../commands/openSettings";
-import { Button } from "../components/core/Button";
-import { ButtonInfiniteLoading } from "../components/core/ButtonInfiniteLoading";
-import { Icon } from "@yaakapp-internal/ui";
-import { HStack, VStack } from "../components/core/Stacks";
-
-// Listen for toasts
-import { listenToTauriEvent } from "../hooks/useListenToTauriEvent";
-import { updateAvailableAtom } from "./atoms";
-import { stringToColor } from "./color";
-import { generateId } from "./generateId";
-import { jotaiStore } from "./jotai";
-import { showPrompt } from "./prompt";
-import { showPromptForm } from "./prompt-form";
-import { invokeCmd } from "./tauri";
-import { showToast } from "./toast";
-
-export function initGlobalListeners() {
-  listenToTauriEvent<ShowToastRequest>("show_toast", (event) => {
-    showToast({ ...event.payload });
-  });
-
-  listenToTauriEvent("settings", () => openSettings.mutate(null));
-
-  // Track active dynamic form dialogs so follow-up input updates can reach them
-  const activeForms = new Map<string, (inputs: FormInput[]) => void>();
-
-  // Listen for plugin events
-  listenToTauriEvent<InternalEvent>(
-    "plugin_event",
-    async ({ payload: event }) => {
-      if (event.payload.type === "prompt_text_request") {
-        const value = await showPrompt(event.payload);
-        const result: InternalEvent = {
-          id: generateId(),
-          replyId: event.id,
-          pluginName: event.pluginName,
-          pluginRefId: event.pluginRefId,
-          context: event.context,
-          payload: {
-            type: "prompt_text_response",
-            value,
-          },
-        };
-        await emit(event.id, result);
-      } else if (event.payload.type === "prompt_form_request") {
-        if (event.replyId != null) {
-          // Follow-up update from plugin runtime — update the active dialog's inputs
-          const updateInputs = activeForms.get(event.replyId);
-          if (updateInputs) {
-            updateInputs(event.payload.inputs);
-          }
-          return;
-        }
-
-        // Initial request — show the dialog with bidirectional support
-        const emitFormResponse = (
-          values: Record<string, JsonPrimitive> | null,
-          done: boolean,
-        ) => {
-          const result: InternalEvent = {
-            id: generateId(),
-            replyId: event.id,
-            pluginName: event.pluginName,
-            pluginRefId: event.pluginRefId,
-            context: event.context,
-            payload: {
-              type: "prompt_form_response",
-              values,
-              done,
-            },
-          };
-          emit(event.id, result);
-        };
-
-        const values = await showPromptForm({
-          id: event.payload.id,
-          title: event.payload.title,
-          description: event.payload.description,
-          size: event.payload.size,
-          inputs: event.payload.inputs,
-          confirmText: event.payload.confirmText,
-          cancelText: event.payload.cancelText,
-          onValuesChange: debounce(
-            (values) => emitFormResponse(values, false),
-            150,
-          ),
-          onInputsUpdated: (cb) => activeForms.set(event.id, cb),
-        });
-
-        // Clean up and send final response
-        activeForms.delete(event.id);
-        emitFormResponse(values, true);
-      }
-    },
-  );
-
-  listenToTauriEvent<string>(
-    "update_installed",
-    async ({ payload: version }) => {
-      console.log("Got update installed event", version);
-      showUpdateInstalledToast(version);
-    },
-  );
-
-  // Listen for update events
-  listenToTauriEvent<UpdateInfo>("update_available", async ({ payload }) => {
-    console.log("Got update available", payload);
-    showUpdateAvailableToast(payload);
-  });
-
-  listenToTauriEvent<YaakNotification>("notification", ({ payload }) => {
-    console.log("Got notification event", payload);
-    showNotificationToast(payload);
-  });
-
-  // Listen for plugin update events
-  listenToTauriEvent<PluginUpdateNotification>(
-    "plugin_updates_available",
-    ({ payload }) => {
-      console.log("Got plugin updates event", payload);
-      showPluginUpdatesToast(payload);
-    },
-  );
-}
-
-function showUpdateInstalledToast(version: string) {
-  const UPDATE_TOAST_ID = "update-info";
-
-  showToast({
-    id: UPDATE_TOAST_ID,
-    color: "primary",
-    timeout: null,
-    message: (
-      <VStack>
-        <h2 className="font-semibold">Yaak {version} was installed</h2>
-        <p className="text-text-subtle text-sm">
-          Start using the new version now?
-        </p>
-      </VStack>
-    ),
-    action: ({ hide }) => (
-      <ButtonInfiniteLoading
-        size="xs"
-        className="mr-auto min-w-[5rem]"
-        color="primary"
-        loadingChildren="Restarting..."
-        onClick={() => {
-          hide();
-          setTimeout(() => invokeCmd("cmd_restart", {}), 200);
-        }}
-      >
-        Relaunch Yaak
-      </ButtonInfiniteLoading>
-    ),
-  });
-}
-
-async function showUpdateAvailableToast(updateInfo: UpdateInfo) {
-  const UPDATE_TOAST_ID = "update-info";
-  const { version, replyEventId, downloaded } = updateInfo;
-
-  jotaiStore.set(updateAvailableAtom, { version, downloaded });
-
-  // Acknowledge the event, so we don't time out and try the fallback update logic
-  await emit<UpdateResponse>(replyEventId, { type: "ack" });
-
-  showToast({
-    id: UPDATE_TOAST_ID,
-    color: "info",
-    timeout: null,
-    message: (
-      <VStack>
-        <h2 className="font-semibold">Yaak {version} is available</h2>
-        <p className="text-text-subtle text-sm">
-          {downloaded ? "Do you want to install" : "Download and install"} the
-          update?
-        </p>
-      </VStack>
-    ),
-    action: () => (
-      <HStack space={1.5}>
-        <ButtonInfiniteLoading
-          size="xs"
-          color="info"
-          className="min-w-[10rem]"
-          loadingChildren={downloaded ? "Installing..." : "Downloading..."}
-          onClick={async () => {
-            await emit<UpdateResponse>(replyEventId, {
-              type: "action",
-              action: "install",
-            });
-          }}
-        >
-          {downloaded ? "Install Now" : "Download and Install"}
-        </ButtonInfiniteLoading>
-        <Button
-          size="xs"
-          color="info"
-          variant="border"
-          rightSlot={<Icon icon="external_link" />}
-          onClick={async () => {
-            await openUrl(`https://yaak.app/changelog/${version}`);
-          }}
-        >
-          What&apos;s New
-        </Button>
-      </HStack>
-    ),
-  });
-}
-
-function showPluginUpdatesToast(updateInfo: PluginUpdateNotification) {
-  const PLUGIN_UPDATE_TOAST_ID = "plugin-updates";
-  const count = updateInfo.updateCount;
-  const pluginNames = updateInfo.plugins.map((p: { name: string }) => p.name);
-
-  showToast({
-    id: PLUGIN_UPDATE_TOAST_ID,
-    color: "info",
-    timeout: null,
-    message: (
-      <VStack>
-        <h2 className="font-semibold">
-          {count === 1 ? "1 plugin update" : `${count} plugin updates`}{" "}
-          available
-        </h2>
-        <p className="text-text-subtle text-sm">
-          {count === 1
-            ? pluginNames[0]
-            : `${pluginNames.slice(0, 2).join(", ")}${count > 2 ? `, and ${count - 2} more` : ""}`}
-        </p>
-      </VStack>
-    ),
-    action: ({ hide }) => (
-      <HStack space={1.5}>
-        <ButtonInfiniteLoading
-          size="xs"
-          color="info"
-          className="min-w-[5rem]"
-          loadingChildren="Updating..."
-          onClick={async () => {
-            const updated = await updateAllPlugins();
-            hide();
-            if (updated.length > 0) {
-              showToast({
-                color: "success",
-                message: `Successfully updated ${updated.length} plugin${updated.length === 1 ? "" : "s"}`,
-              });
-            }
-          }}
-        >
-          Update All
-        </ButtonInfiniteLoading>
-        <Button
-          size="xs"
-          color="info"
-          variant="border"
-          onClick={() => {
-            hide();
-            openSettings.mutate("plugins:installed");
-          }}
-        >
-          View Updates
-        </Button>
-      </HStack>
-    ),
-  });
-}
-
-function showNotificationToast(n: YaakNotification) {
-  const actionUrl = n.action?.url;
-  const actionLabel = n.action?.label;
-  showToast({
-    id: n.id,
-    timeout: n.timeout ?? null,
-    color: stringToColor(n.color) ?? undefined,
-    message: (
-      <VStack>
-        {n.title && <h2 className="font-semibold">{n.title}</h2>}
-        <p className="text-text-subtle text-sm">{n.message}</p>
-      </VStack>
-    ),
-    onClose: () => {
-      invokeCmd("cmd_dismiss_notification", { notificationId: n.id }).catch(
-        console.error,
-      );
-    },
-    action: ({ hide }) => {
-      return actionLabel && actionUrl ? (
-        <Button
-          size="xs"
-          color={stringToColor(n.color) ?? undefined}
-          className="mr-auto min-w-[5rem]"
-          rightSlot={<Icon icon="external_link" />}
-          onClick={() => {
-            hide();
-            return openUrl(actionUrl);
-          }}
-        >
-          {actionLabel}
-        </Button>
-      ) : null;
-    },
-  });
-}
--- a/apps/yaak-client/lib/theme/appearance.ts
+++ b/apps/yaak-client/lib/theme/appearance.ts
@@ -1,8 +0,0 @@
-export type { Appearance } from "@yaakapp-internal/theme";
-export {
-  getCSSAppearance,
-  getWindowAppearance,
-  resolveAppearance,
-  subscribeToPreferredAppearance,
-  subscribeToWindowAppearanceChange,
-} from "@yaakapp-internal/theme";
--- a/apps/yaak-client/lib/theme/themes.ts
+++ b/apps/yaak-client/lib/theme/themes.ts
@@ -1,45 +0,0 @@
-import type { GetThemesResponse } from "@yaakapp-internal/plugins";
-import { defaultDarkTheme, defaultLightTheme } from "@yaakapp-internal/theme";
-import { invokeCmd } from "../tauri";
-import type { Appearance } from "./appearance";
-import { resolveAppearance } from "./appearance";
-
-export { defaultDarkTheme, defaultLightTheme } from "@yaakapp-internal/theme";
-
-export async function getThemes() {
-  const themes = (
-    await invokeCmd<GetThemesResponse[]>("cmd_get_themes")
-  ).flatMap((t) => t.themes);
-  themes.sort((a, b) => a.label.localeCompare(b.label));
-  // Remove duplicates, in case multiple plugins provide the same theme
-  const uniqueThemes = Array.from(
-    new Map(themes.map((t) => [t.id, t])).values(),
-  );
-  return { themes: [defaultDarkTheme, defaultLightTheme, ...uniqueThemes] };
-}
-
-export async function getResolvedTheme(
-  preferredAppearance: Appearance,
-  appearanceSetting: string,
-  themeLight: string,
-  themeDark: string,
-) {
-  const appearance = resolveAppearance(preferredAppearance, appearanceSetting);
-  const { themes } = await getThemes();
-
-  const darkThemes = themes.filter((t) => t.dark);
-  const lightThemes = themes.filter((t) => !t.dark);
-
-  const dark =
-    darkThemes.find((t) => t.id === themeDark) ??
-    darkThemes[0] ??
-    defaultDarkTheme;
-  const light =
-    lightThemes.find((t) => t.id === themeLight) ??
-    lightThemes[0] ??
-    defaultLightTheme;
-
-  const active = appearance === "dark" ? dark : light;
-
-  return { dark, light, active };
-}
--- a/apps/yaak-client/lib/theme/window.ts
+++ b/apps/yaak-client/lib/theme/window.ts
@@ -1,13 +0,0 @@
-export type {
-  YaakColorKey,
-  YaakColors,
-  YaakTheme,
-} from "@yaakapp-internal/theme";
-export {
-  addThemeStylesToDocument,
-  applyThemeToDocument,
-  completeTheme,
-  getThemeCSS,
-  indent,
-  setThemeOnDocument,
-} from "@yaakapp-internal/theme";
--- a/apps/yaak-client/lib/theme/yaakColor.ts
+++ b/apps/yaak-client/lib/theme/yaakColor.ts
@@ -1 +0,0 @@
-export { YaakColor } from "@yaakapp-internal/theme";
--- a/apps/yaak-client/main.tsx
+++ b/apps/yaak-client/main.tsx
@@ -1,47 +0,0 @@
-import "./main.css";
-import { RouterProvider } from "@tanstack/react-router";
-import { type } from "@tauri-apps/plugin-os";
-import {
-  changeModelStoreWorkspace,
-  initModelStore,
-} from "@yaakapp-internal/models";
-import { setPlatformOnDocument } from "@yaakapp-internal/theme";
-import { StrictMode } from "react";
-import { createRoot } from "react-dom/client";
-import { initSync } from "./init/sync";
-import { initGlobalListeners } from "./lib/initGlobalListeners";
-import { jotaiStore } from "./lib/jotai";
-import { router } from "./lib/router";
-
-const osType = type();
-setPlatformOnDocument(osType);
-
-window.addEventListener("keydown", (e) => {
-  const rx = /input|select|textarea/i;
-
-  const target = e.target;
-  if (e.key !== "Backspace") return;
-  if (!(target instanceof Element)) return;
-  if (target.getAttribute("contenteditable") !== null) return;
-
-  if (
-    !rx.test(target.tagName) ||
-    ("disabled" in target && target.disabled) ||
-    ("readOnly" in target && target.readOnly)
-  ) {
-    e.preventDefault();
-  }
-});
-
-// Initialize a bunch of watchers
-initSync();
-initModelStore(jotaiStore);
-initGlobalListeners();
-await changeModelStoreWorkspace(null); // Load global models
-
-console.log("Creating React root");
-createRoot(document.getElementById("root") as HTMLElement).render(
-  <StrictMode>
-    <RouterProvider router={router} />
-  </StrictMode>,
-);
--- a/apps/yaak-client/modules.d.ts
+++ b/apps/yaak-client/modules.d.ts
@@ -1,2 +0,0 @@
-declare module 'format-graphql';
-declare module 'vkbeautify';
--- a/apps/yaak-client/tailwind.config.cjs
+++ b/apps/yaak-client/tailwind.config.cjs
@@ -1,16 +0,0 @@
-const sharedConfig = require("@yaakapp-internal/tailwind-config");
-
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  ...sharedConfig,
-  content: [
-    "./*.{html,ts,tsx}",
-    "./commands/**/*.{ts,tsx}",
-    "./components/**/*.{ts,tsx}",
-    "./hooks/**/*.{ts,tsx}",
-    "./init/**/*.{ts,tsx}",
-    "./lib/**/*.{ts,tsx}",
-    "./routes/**/*.{ts,tsx}",
-    "../../packages/ui/src/**/*.{ts,tsx}",
-  ],
-};
--- a/apps/yaak-client/tsconfig.json
+++ b/apps/yaak-client/tsconfig.json
@@ -1,27 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2021",
-    "lib": ["DOM", "DOM.Iterable", "ESNext"],
-    "useDefineForClassFields": true,
-    "allowJs": false,
-    "skipLibCheck": true,
-    "strict": true,
-    "noUncheckedIndexedAccess": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-    "paths": {
-      "@yaakapp-internal/theme": ["../../packages/theme/src/index.ts"],
-      "@yaakapp-internal/theme/*": ["../../packages/theme/src/*"],
-      "@yaakapp-internal/ui": ["../../packages/ui/src/index.ts"],
-      "@yaakapp-internal/ui/*": ["../../packages/ui/src/*"],
-    },
-  },
-  "include": ["."],
-  "exclude": ["vite.config.ts"],
-  "references": [{ "path": "./tsconfig.node.json" }],
-}
--- a/apps/yaak-client/vite.config.ts
+++ b/apps/yaak-client/vite.config.ts
@@ -1,67 +0,0 @@
-// @ts-ignore
-import { tanstackRouter } from "@tanstack/router-plugin/vite";
-import react from "@vitejs/plugin-react";
-import { createRequire } from "node:module";
-import path from "node:path";
-import { defineConfig, normalizePath } from "vite";
-import { viteStaticCopy } from "vite-plugin-static-copy";
-import svgr from "vite-plugin-svgr";
-import topLevelAwait from "vite-plugin-top-level-await";
-import wasm from "vite-plugin-wasm";
-
-const require = createRequire(import.meta.url);
-const cMapsDir = normalizePath(
-  path.join(path.dirname(require.resolve("pdfjs-dist/package.json")), "cmaps"),
-);
-const standardFontsDir = normalizePath(
-  path.join(
-    path.dirname(require.resolve("pdfjs-dist/package.json")),
-    "standard_fonts",
-  ),
-);
-
-// https://vitejs.dev/config/
-export default defineConfig(async () => {
-  return {
-    plugins: [
-      wasm(),
-      tanstackRouter({
-        target: "react",
-        routesDirectory: "./routes",
-        generatedRouteTree: "./routeTree.gen.ts",
-        autoCodeSplitting: true,
-      }),
-      svgr(),
-      react(),
-      topLevelAwait(),
-      viteStaticCopy({
-        targets: [
-          { src: cMapsDir, dest: "" },
-          { src: standardFontsDir, dest: "" },
-        ],
-      }),
-    ],
-    build: {
-      sourcemap: true,
-      outDir: "../../dist/apps/yaak-client",
-      emptyOutDir: true,
-      rollupOptions: {
-        output: {
-          // Make chunk names readable
-          chunkFileNames: "assets/chunk-[name]-[hash].js",
-          entryFileNames: "assets/entry-[name]-[hash].js",
-          assetFileNames: "assets/asset-[name]-[hash][extname]",
-        },
-      },
-    },
-    clearScreen: false,
-    server: {
-      port: parseInt(
-        process.env.YAAK_CLIENT_DEV_PORT ?? process.env.YAAK_DEV_PORT ?? "1420",
-        10,
-      ),
-      strictPort: true,
-    },
-    envPrefix: ["VITE_", "TAURI_"],
-  };
-});
--- a/apps/yaak-proxy/ActionButton.tsx
+++ b/apps/yaak-proxy/ActionButton.tsx
@@ -1,31 +0,0 @@
-import { Button, type ButtonProps } from "@yaakapp-internal/ui";
-import { useCallback, useState } from "react";
-import type { ActionInvocation } from "@yaakapp-internal/proxy-lib";
-import { useActionMetadata } from "./hooks";
-import { rpc } from "./rpc";
-
-type ActionButtonProps = Omit<ButtonProps, "onClick" | "children"> & {
-  action: ActionInvocation;
-  /** Override the label from metadata */
-  children?: React.ReactNode;
-};
-
-export function ActionButton({ action, children, ...props }: ActionButtonProps) {
-  const meta = useActionMetadata(action);
-  const [busy, setBusy] = useState(false);
-
-  const onClick = useCallback(async () => {
-    setBusy(true);
-    try {
-      await rpc("execute_action", action);
-    } finally {
-      setBusy(false);
-    }
-  }, [action]);
-
-  return (
-    <Button {...props} disabled={props.disabled || busy} isLoading={busy} onClick={onClick}>
-      {children ?? meta?.label ?? "…"}
-    </Button>
-  );
-}
--- a/apps/yaak-proxy/Sidebar.tsx
+++ b/apps/yaak-proxy/Sidebar.tsx
@@ -1,169 +0,0 @@
-import type { HttpExchange } from "@yaakapp-internal/proxy-lib";
-import { Tree } from "@yaakapp-internal/ui";
-import type { TreeNode } from "@yaakapp-internal/ui";
-import { atom, useAtomValue } from "jotai";
-import { atomFamily } from "jotai/utils";
-import { useCallback, useMemo } from "react";
-import { httpExchangesAtom } from "./store";
-
-/** A node in the sidebar tree — either a domain or a path segment. */
-export type SidebarItem = {
-  id: string;
-  label: string;
-  exchangeIds: string[];
-};
-
-const collapsedAtom = atomFamily((treeId: string) =>
-  atom<Record<string, boolean>>({}),
-);
-
-const sidebarTreeAtom = atom<TreeNode<SidebarItem>>((get) => {
-  const exchanges = get(httpExchangesAtom);
-  return buildTree(exchanges);
-});
-
-/**
- * Build a domain → path-segment trie from a flat list of exchanges.
- *
- * Example: Given URLs
- *   GET https://api.example.com/v1/users
- *   GET https://api.example.com/v1/users/123
- *   POST https://api.example.com/v1/orders
- *
- * Produces:
- *   api.example.com
- *     /v1
- *       /users
- *         /123
- *       /orders
- */
-function buildTree(exchanges: HttpExchange[]): TreeNode<SidebarItem> {
-  const root: SidebarItem = { id: "root", label: "All Traffic", exchangeIds: [] };
-  const rootNode: TreeNode<SidebarItem> = {
-    item: root,
-    parent: null,
-    depth: 0,
-    children: [],
-  };
-
-  // Intermediate trie structure for building
-  type TrieNode = {
-    id: string;
-    label: string;
-    exchangeIds: string[];
-    children: Map<string, TrieNode>;
-  };
-
-  const domainMap = new Map<string, TrieNode>();
-
-  for (const ex of exchanges) {
-    let hostname: string;
-    let segments: string[];
-    try {
-      const url = new URL(ex.url);
-      hostname = url.host;
-      segments = url.pathname.split("/").filter(Boolean);
-    } catch {
-      hostname = ex.url;
-      segments = [];
-    }
-
-    // Get or create domain node
-    let domainNode = domainMap.get(hostname);
-    if (!domainNode) {
-      domainNode = {
-        id: `domain:${hostname}`,
-        label: hostname,
-        exchangeIds: [],
-        children: new Map(),
-      };
-      domainMap.set(hostname, domainNode);
-    }
-    domainNode.exchangeIds.push(ex.id);
-
-    // Walk path segments
-    let current = domainNode;
-    const pathSoFar: string[] = [];
-    for (const seg of segments) {
-      pathSoFar.push(seg);
-      let child = current.children.get(seg);
-      if (!child) {
-        child = {
-          id: `path:${hostname}/${pathSoFar.join("/")}`,
-          label: `/${seg}`,
-          exchangeIds: [],
-          children: new Map(),
-        };
-        current.children.set(seg, child);
-      }
-      child.exchangeIds.push(ex.id);
-      current = child;
-    }
-  }
-
-  // Convert trie to TreeNode structure
-  function toTreeNode(
-    trie: TrieNode,
-    parent: TreeNode<SidebarItem>,
-    depth: number,
-  ): TreeNode<SidebarItem> {
-    const node: TreeNode<SidebarItem> = {
-      item: {
-        id: trie.id,
-        label: trie.label,
-        exchangeIds: trie.exchangeIds,
-      },
-      parent,
-      depth,
-      children: [],
-    };
-    for (const child of trie.children.values()) {
-      node.children!.push(toTreeNode(child, node, depth + 1));
-    }
-    return node;
-  }
-
-  // Sort domains alphabetically, add to root
-  const sortedDomains = [...domainMap.values()].sort((a, b) =>
-    a.label.localeCompare(b.label),
-  );
-  for (const domain of sortedDomains) {
-    rootNode.children!.push(toTreeNode(domain, rootNode, 1));
-  }
-
-  return rootNode;
-}
-
-function ItemInner({ item }: { item: SidebarItem }) {
-  const count = item.exchangeIds.length;
-  return (
-    <div className="flex items-center gap-2 w-full min-w-0">
-      <span className="truncate">{item.label}</span>
-      {count > 0 && (
-        <span className="text-text-subtlest text-2xs shrink-0">{count}</span>
-      )}
-    </div>
-  );
-}
-
-export function Sidebar() {
-  const tree = useAtomValue(sidebarTreeAtom);
-  const treeId = "proxy-sidebar";
-
-  const getItemKey = useCallback((item: SidebarItem) => item.id, []);
-
-  return (
-    <aside className="x-theme-sidebar h-full w-[250px] min-w-0 overflow-y-auto border-r border-border-subtle">
-      <div className="pt-2 text-xs">
-        <Tree
-          treeId={treeId}
-          collapsedAtom={collapsedAtom(treeId)}
-          className="px-2 pb-10"
-          root={tree}
-          getItemKey={getItemKey}
-          ItemInner={ItemInner}
-        />
-      </div>
-    </aside>
-  );
-}
--- a/apps/yaak-proxy/hooks.ts
+++ b/apps/yaak-proxy/hooks.ts
@@ -1,35 +0,0 @@
-import { useEffect, useState } from "react";
-import type {
-  ActionInvocation,
-  ActionMetadata,
-} from "@yaakapp-internal/proxy-lib";
-import { rpc } from "./rpc";
-
-let cachedActions: [ActionInvocation, ActionMetadata][] | null = null;
-
-/** Fetch and cache all action metadata. */
-async function getActions(): Promise<[ActionInvocation, ActionMetadata][]> {
-  if (!cachedActions) {
-    const { actions } = await rpc("list_actions", {});
-    cachedActions = actions;
-  }
-  return cachedActions;
-}
-
-/** Look up metadata for a specific action invocation. */
-export function useActionMetadata(
-  action: ActionInvocation,
-): ActionMetadata | null {
-  const [meta, setMeta] = useState<ActionMetadata | null>(null);
-
-  useEffect(() => {
-    getActions().then((actions) => {
-      const match = actions.find(
-        ([inv]) => inv.scope === action.scope && inv.action === action.action,
-      );
-      setMeta(match?.[1] ?? null);
-    });
-  }, [action]);
-
-  return meta;
-}
--- a/apps/yaak-proxy/hotkeys.ts
+++ b/apps/yaak-proxy/hotkeys.ts
@@ -1,64 +0,0 @@
-import type {
-  ActionInvocation,
-  ActionMetadata,
-} from "@yaakapp-internal/proxy-lib";
-import { rpc } from "./rpc";
-
-type ActionBinding = {
-  invocation: ActionInvocation;
-  meta: ActionMetadata;
-  keys: { key: string; ctrl: boolean; shift: boolean; alt: boolean; meta: boolean };
-};
-
-/** Parse a hotkey string like "Ctrl+Shift+P" into its parts. */
-function parseHotkey(hotkey: string): ActionBinding["keys"] {
-  const parts = hotkey.split("+").map((p) => p.trim().toLowerCase());
-  return {
-    ctrl: parts.includes("ctrl") || parts.includes("control"),
-    shift: parts.includes("shift"),
-    alt: parts.includes("alt"),
-    meta: parts.includes("meta") || parts.includes("cmd") || parts.includes("command"),
-    key: parts.filter(
-      (p) => !["ctrl", "control", "shift", "alt", "meta", "cmd", "command"].includes(p),
-    )[0] ?? "",
-  };
-}
-
-function matchesEvent(binding: ActionBinding["keys"], e: KeyboardEvent): boolean {
-  return (
-    e.ctrlKey === binding.ctrl &&
-    e.shiftKey === binding.shift &&
-    e.altKey === binding.alt &&
-    e.metaKey === binding.meta &&
-    e.key.toLowerCase() === binding.key
-  );
-}
-
-/** Fetch all actions from Rust and register a global keydown listener. */
-export async function initHotkeys(): Promise<() => void> {
-  const { actions } = await rpc("list_actions", {});
-
-  const bindings: ActionBinding[] = actions
-    .filter(
-      (entry): entry is [ActionInvocation, ActionMetadata & { defaultHotkey: string }] =>
-        entry[1].defaultHotkey != null,
-    )
-    .map(([invocation, meta]) => ({
-      invocation,
-      meta,
-      keys: parseHotkey(meta.defaultHotkey),
-    }));
-
-  function onKeyDown(e: KeyboardEvent) {
-    for (const binding of bindings) {
-      if (matchesEvent(binding.keys, e)) {
-        e.preventDefault();
-        rpc("execute_action", binding.invocation);
-        return;
-      }
-    }
-  }
-
-  window.addEventListener("keydown", onKeyDown);
-  return () => window.removeEventListener("keydown", onKeyDown);
-}
--- a/apps/yaak-proxy/index.html
+++ b/apps/yaak-proxy/index.html
@@ -1,27 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Yaak Proxy</title>
-
-    <style>
-      html,
-      body {
-        background-color: white;
-      }
-
-      @media (prefers-color-scheme: dark) {
-        html,
-        body {
-          background-color: #1b1a29;
-        }
-      }
-    </style>
-  </head>
-  <body class="text-base">
-    <div id="root"></div>
-    <script type="module" src="/theme.ts"></script>
-    <script type="module" src="/main.tsx"></script>
-  </body>
-</html>
--- a/apps/yaak-proxy/main.css
+++ b/apps/yaak-proxy/main.css
@@ -1,92 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
-  html,
-  body,
-  #root {
-    @apply w-full h-full overflow-hidden text-text bg-surface;
-  }
-
-  :root {
-    --font-family-interface: "";
-    --font-family-editor: "";
-  }
-
-  :root {
-    font-variant-ligatures: none;
-  }
-
-  html[data-platform="linux"] {
-    font-synthesis: none;
-    text-rendering: optimizeLegibility;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-text-size-adjust: 100%;
-  }
-
-  ::selection {
-    @apply bg-selection;
-  }
-
-  :not(a),
-  :not(input):not(textarea),
-  :not(input):not(textarea)::after,
-  :not(input):not(textarea)::before {
-    @apply select-none cursor-default;
-  }
-
-  input,
-  textarea {
-    &::placeholder {
-      @apply text-placeholder;
-    }
-  }
-
-  a,
-  a[href] * {
-    @apply cursor-pointer !important;
-  }
-
-  table th {
-    @apply text-left;
-  }
-
-  :not(iframe) {
-    &::-webkit-scrollbar,
-    &::-webkit-scrollbar-corner {
-      @apply w-[8px] h-[8px] bg-transparent;
-    }
-
-    &::-webkit-scrollbar-track {
-      @apply bg-transparent;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      @apply bg-text-subtlest rounded-[4px] opacity-20;
-    }
-
-    &::-webkit-scrollbar-thumb:hover {
-      @apply opacity-40 !important;
-    }
-  }
-
-  .hide-scrollbars {
-    &::-webkit-scrollbar-corner,
-    &::-webkit-scrollbar {
-      @apply hidden !important;
-    }
-  }
-
-  .rtl {
-    direction: rtl;
-  }
-
-  :root {
-    color-scheme: light dark;
-    --transition-duration: 100ms ease-in-out;
-    --color-white: 255 100% 100%;
-    --color-black: 255 0% 0%;
-  }
-}
--- a/apps/yaak-proxy/main.tsx
+++ b/apps/yaak-proxy/main.tsx
@@ -1,115 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { type } from "@tauri-apps/plugin-os";
-import { HeaderSize } from "@yaakapp-internal/ui";
-import { ActionButton } from "./ActionButton";
-import { Sidebar } from "./Sidebar";
-import classNames from "classnames";
-import { createStore, Provider, useAtomValue } from "jotai";
-import { StrictMode } from "react";
-import { createRoot } from "react-dom/client";
-import "./main.css";
-import { initHotkeys } from "./hotkeys";
-import { listen, rpc } from "./rpc";
-import { applyChange, dataAtom, httpExchangesAtom, replaceAll } from "./store";
-
-const queryClient = new QueryClient();
-const jotaiStore = createStore();
-
-// Load initial models from the database
-rpc("list_models", {}).then((res) => {
-  jotaiStore.set(dataAtom, (prev) =>
-    replaceAll(prev, "http_exchange", res.httpExchanges),
-  );
-});
-
-// Register hotkeys from action metadata
-initHotkeys();
-
-// Subscribe to model change events from the backend
-listen("model_write", (payload) => {
-  jotaiStore.set(dataAtom, (prev) =>
-    applyChange(prev, "http_exchange", payload.model, payload.change),
-  );
-});
-
-function App() {
-  const osType = type();
-  const exchanges = useAtomValue(httpExchangesAtom);
-
-  return (
-    <div
-      className={classNames(
-        "h-full w-full grid grid-rows-[auto_1fr]",
-        osType === "linux" && "border border-border-subtle",
-      )}
-    >
-      <HeaderSize
-        size="lg"
-        osType={osType}
-        hideWindowControls={false}
-        useNativeTitlebar={false}
-        interfaceScale={1}
-        className="x-theme-appHeader bg-surface"
-      >
-        <div
-          data-tauri-drag-region
-          className="flex items-center px-2 text-sm font-semibold text-text-subtle"
-        >
-          Yaak Proxy
-        </div>
-      </HeaderSize>
-      <div className="grid grid-cols-[auto_1fr] min-h-0">
-        <Sidebar />
-        <main className="overflow-auto p-4">
-          <div className="flex items-center gap-3 mb-4">
-            <ActionButton
-              action={{ scope: "global", action: "proxy_start" }}
-              size="sm"
-              tone="primary"
-            />
-            <ActionButton
-              action={{ scope: "global", action: "proxy_stop" }}
-              size="sm"
-              variant="border"
-            />
-          </div>
-
-          <div className="text-xs font-mono">
-            {exchanges.length === 0 ? (
-              <p className="text-text-subtlest">No traffic yet</p>
-            ) : (
-              <table className="w-full text-left">
-                <thead>
-                  <tr className="text-text-subtlest border-b border-border-subtle">
-                    <th className="py-1 pr-3 font-medium">Method</th>
-                    <th className="py-1 pr-3 font-medium">URL</th>
-                    <th className="py-1 pr-3 font-medium">Status</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {exchanges.map((ex) => (
-                    <tr key={ex.id} className="border-b border-border-subtle">
-                      <td className="py-1 pr-3">{ex.method}</td>
-                      <td className="py-1 pr-3 truncate max-w-md">{ex.url}</td>
-                      <td className="py-1 pr-3">{ex.resStatus ?? "—"}</td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            )}
-          </div>
-        </main>
-      </div>
-    </div>
-  );
-}
-
-createRoot(document.getElementById("root") as HTMLElement).render(
-  <StrictMode>
-    <QueryClientProvider client={queryClient}>
-      <Provider store={jotaiStore}>
-        <App />
-      </Provider>
-    </QueryClientProvider>
-  </StrictMode>,
-);
--- a/apps/yaak-proxy/package.json
+++ b/apps/yaak-proxy/package.json
@@ -1,31 +0,0 @@
-{
-  "name": "@yaakapp/yaak-proxy",
-  "private": true,
-  "version": "1.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite dev --force",
-    "build": "vite build",
-    "lint": "tsc --noEmit"
-  },
-  "dependencies": {
-    "@tanstack/react-query": "^5.90.5",
-    "@tauri-apps/api": "^2.9.1",
-    "@tauri-apps/plugin-os": "^2.3.2",
-    "@yaakapp-internal/theme": "^1.0.0",
-    "@yaakapp-internal/model-store": "^1.0.0",
-    "@yaakapp-internal/proxy-lib": "^1.0.0",
-    "@yaakapp-internal/ui": "^1.0.0",
-    "classnames": "^2.5.1",
-    "jotai": "^2.18.0",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0"
-  },
-  "devDependencies": {
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6",
-    "@vitejs/plugin-react": "^4.6.0",
-    "typescript": "^5.8.3",
-    "vite": "^7.0.8"
-  }
-}
--- a/apps/yaak-proxy/postcss.config.cjs
+++ b/apps/yaak-proxy/postcss.config.cjs
@@ -1,7 +0,0 @@
-module.exports = {
-  plugins: [
-    require("@tailwindcss/nesting")(require("postcss-nesting")),
-    require("tailwindcss"),
-    require("autoprefixer"),
-  ],
-};
--- a/apps/yaak-proxy/rpc.ts
+++ b/apps/yaak-proxy/rpc.ts
@@ -1,30 +0,0 @@
-import { invoke } from "@tauri-apps/api/core";
-import { listen as tauriListen } from "@tauri-apps/api/event";
-import type {
-  RpcEventSchema,
-  RpcSchema,
-} from "@yaakapp-internal/proxy-lib";
-
-type Req<K extends keyof RpcSchema> = RpcSchema[K][0];
-type Res<K extends keyof RpcSchema> = RpcSchema[K][1];
-
-export async function rpc<K extends keyof RpcSchema>(
-  cmd: K,
-  payload: Req<K>,
-): Promise<Res<K>> {
-  return invoke("rpc", { cmd, payload }) as Promise<Res<K>>;
-}
-
-/** Subscribe to a backend event. Returns an unsubscribe function. */
-export function listen<K extends keyof RpcEventSchema>(
-  event: K & string,
-  callback: (payload: RpcEventSchema[K]) => void,
-): () => void {
-  let unsub: (() => void) | null = null;
-  tauriListen<RpcEventSchema[K]>(event, (e) => callback(e.payload))
-    .then((fn) => {
-      unsub = fn;
-    })
-    .catch(console.error);
-  return () => unsub?.();
-}
--- a/apps/yaak-proxy/store.ts
+++ b/apps/yaak-proxy/store.ts
@@ -1,15 +0,0 @@
-import { createModelStore } from "@yaakapp-internal/model-store";
-import type { HttpExchange } from "@yaakapp-internal/proxy-lib";
-
-type ProxyModels = {
-  http_exchange: HttpExchange;
-};
-
-export const { dataAtom, applyChange, replaceAll, listAtom, orderedListAtom } =
-  createModelStore<ProxyModels>(["http_exchange"]);
-
-export const httpExchangesAtom = orderedListAtom(
-  "http_exchange",
-  "createdAt",
-  "desc",
-);
--- a/apps/yaak-proxy/tailwind.config.cjs
+++ b/apps/yaak-proxy/tailwind.config.cjs
@@ -1,7 +0,0 @@
-const sharedConfig = require("@yaakapp-internal/tailwind-config");
-
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  ...sharedConfig,
-  content: ["./*.{html,ts,tsx}", "../../packages/ui/src/**/*.{ts,tsx}"],
-};
--- a/apps/yaak-proxy/theme.ts
+++ b/apps/yaak-proxy/theme.ts
@@ -1,9 +0,0 @@
-import {
-  applyThemeToDocument,
-  defaultDarkTheme,
-  platformFromUserAgent,
-  setPlatformOnDocument,
-} from "@yaakapp-internal/theme";
-
-setPlatformOnDocument(platformFromUserAgent(navigator.userAgent));
-applyThemeToDocument(defaultDarkTheme);
--- a/apps/yaak-proxy/tsconfig.node.json
+++ b/apps/yaak-proxy/tsconfig.node.json
@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "allowSyntheticDefaultImports": true,
-    "noUncheckedIndexedAccess": true
-  },
-  "include": ["vite.config.ts"]
-}
--- a/apps/yaak-proxy/vite-env.d.ts
+++ b/apps/yaak-proxy/vite-env.d.ts
@@ -1 +0,0 @@
-/// <reference types="vite/client" />
--- a/apps/yaak-proxy/vite.config.ts
+++ b/apps/yaak-proxy/vite.config.ts
@@ -1,16 +0,0 @@
-import react from "@vitejs/plugin-react";
-import { defineConfig } from "vite";
-
-export default defineConfig({
-  plugins: [react()],
-  build: {
-    outDir: "../../dist/apps/yaak-proxy",
-    emptyOutDir: true,
-  },
-  clearScreen: false,
-  server: {
-    port: parseInt(process.env.YAAK_PROXY_DEV_PORT ?? "2420", 10),
-    strictPort: true,
-  },
-  envPrefix: ["VITE_", "TAURI_"],
-});
--- a/biome.json
+++ b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.13/schema.json",
  "linter": {
    "enabled": true,
    "rules": {
@@ -42,13 +42,14 @@
      "!scripts",
      "!crates",
      "!crates-tauri",
-      "!apps/yaak-client/tailwind.config.cjs",
-      "!apps/yaak-client/postcss.config.cjs",
-      "!apps/yaak-client/vite.config.ts",
-      "!apps/yaak-client/routeTree.gen.ts",
+      "!src-web/tailwind.config.cjs",
+      "!src-web/postcss.config.cjs",
+      "!src-web/vite.config.ts",
+      "!src-web/routeTree.gen.ts",
      "!packages/plugin-runtime-types/lib",
      "!**/bindings",
-      "!flatpak"
+      "!flatpak",
+      "!npm"
    ]
  }
 }
--- a/crates-cli/yaak-cli/src/context.rs
+++ b/crates-cli/yaak-cli/src/context.rs
@@ -6,17 +6,17 @@ use std::sync::Arc;
 use tokio::sync::Mutex;
 use yaak_crypto::manager::EncryptionManager;
 use yaak_models::blob_manager::BlobManager;
-use yaak_models::client_db::ClientDb;
+use yaak_models::db_context::DbContext;
 use yaak_models::query_manager::QueryManager;
 use yaak_plugins::events::PluginContext;
 use yaak_plugins::manager::PluginManager;

 const EMBEDDED_PLUGIN_RUNTIME: &str = include_str!(concat!(
    env!("CARGO_MANIFEST_DIR"),
-    "/../../crates-tauri/yaak-app-client/vendored/plugin-runtime/index.cjs"
+    "/../../crates-tauri/yaak-app/vendored/plugin-runtime/index.cjs"
 ));
 static EMBEDDED_VENDORED_PLUGINS: Dir<'_> =
-    include_dir!("$CARGO_MANIFEST_DIR/../../crates-tauri/yaak-app-client/vendored/plugins");
+    include_dir!("$CARGO_MANIFEST_DIR/../../crates-tauri/yaak-app/vendored/plugins");

 #[derive(Clone, Debug, Default)]
 pub struct CliExecutionContext {
@@ -108,7 +108,7 @@ impl CliContext {
        &self.data_dir
    }

-    pub fn db(&self) -> ClientDb<'_> {
+    pub fn db(&self) -> DbContext<'_> {
        self.query_manager.connect()
    }

--- a/crates-cli/yaak-cli/src/plugin_events.rs
+++ b/crates-cli/yaak-cli/src/plugin_events.rs
@@ -3,7 +3,7 @@ use arboard::Clipboard;
 use console::Term;
 use inquire::{Confirm, Editor, Password, PasswordDisplayMode, Select, Text};
 use serde_json::Value;
-use std::collections::{BTreeMap, HashMap};
+use std::collections::HashMap;
 use std::io::IsTerminal;
 use std::path::PathBuf;
 use std::sync::Arc;
@@ -11,11 +11,11 @@ use tokio::task::JoinHandle;
 use yaak::plugin_events::{
    GroupedPluginEvent, HostRequest, SharedPluginEventContext, handle_shared_plugin_event,
 };
-use yaak::render::render_http_request;
+use yaak::render::{render_grpc_request, render_http_request};
 use yaak::send::{SendHttpRequestWithPluginsParams, send_http_request_with_plugins};
 use yaak_crypto::manager::EncryptionManager;
 use yaak_models::blob_manager::BlobManager;
-use yaak_models::models::{Environment, GrpcRequest, HttpRequestHeader};
+use yaak_models::models::Environment;
 use yaak_models::queries::any_request::AnyRequest;
 use yaak_models::query_manager::QueryManager;
 use yaak_models::render::make_vars_hashmap;
@@ -29,7 +29,7 @@ use yaak_plugins::events::{
 };
 use yaak_plugins::manager::PluginManager;
 use yaak_plugins::template_callback::PluginTemplateCallback;
-use yaak_templates::{RenderOptions, TemplateCallback, parse_and_render, render_json_value_raw};
+use yaak_templates::{RenderOptions, TemplateCallback, render_json_value_raw};

 pub struct CliPluginEventBridge {
    rx_id: String,
@@ -269,7 +269,7 @@ async fn build_plugin_reply(
                );
                let render_options = RenderOptions::throw();

-                match render_grpc_request_for_cli(
+                match render_grpc_request(
                    &grpc_request,
                    environment_chain,
                    &template_callback,
@@ -532,60 +532,6 @@ async fn render_json_value_for_cli<T: TemplateCallback>(
    render_json_value_raw(value, vars, cb, opt).await
 }

-async fn render_grpc_request_for_cli<T: TemplateCallback>(
-    grpc_request: &GrpcRequest,
-    environment_chain: Vec<Environment>,
-    cb: &T,
-    opt: &RenderOptions,
-) -> yaak_templates::error::Result<GrpcRequest> {
-    let vars = &make_vars_hashmap(environment_chain);
-
-    let mut metadata = Vec::new();
-    for p in grpc_request.metadata.clone() {
-        if !p.enabled {
-            continue;
-        }
-        metadata.push(HttpRequestHeader {
-            enabled: p.enabled,
-            name: parse_and_render(p.name.as_str(), vars, cb, opt).await?,
-            value: parse_and_render(p.value.as_str(), vars, cb, opt).await?,
-            id: p.id,
-        })
-    }
-
-    let authentication = {
-        let mut disabled = false;
-        let mut auth = BTreeMap::new();
-        match grpc_request.authentication.get("disabled") {
-            Some(Value::Bool(true)) => {
-                disabled = true;
-            }
-            Some(Value::String(tmpl)) => {
-                disabled = parse_and_render(tmpl.as_str(), vars, cb, opt)
-                    .await
-                    .unwrap_or_default()
-                    .is_empty();
-            }
-            _ => {}
-        }
-        if disabled {
-            auth.insert("disabled".to_string(), Value::Bool(true));
-        } else {
-            for (k, v) in grpc_request.authentication.clone() {
-                if k == "disabled" {
-                    auth.insert(k, Value::Bool(false));
-                } else {
-                    auth.insert(k, render_json_value_raw(v, vars, cb, opt).await?);
-                }
-            }
-        }
-        auth
-    };
-
-    let url = parse_and_render(grpc_request.url.as_str(), vars, cb, opt).await?;
-
-    Ok(GrpcRequest { url, metadata, authentication, ..grpc_request.to_owned() })
-}

 fn parse_cookie_name_value(raw_cookie: &str) -> Option<(String, String)> {
    let first_part = raw_cookie.split(';').next()?.trim();
--- a/crates-proxy/yaak-proxy-lib/Cargo.toml
+++ b/crates-proxy/yaak-proxy-lib/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-name = "yaak-proxy-lib"
-version = "0.0.0"
-edition = "2024"
-authors = ["Gregory Schier"]
-publish = false
-
-[dependencies]
-chrono = { workspace = true, features = ["serde"] }
-log = { workspace = true }
-include_dir = "0.7"
-r2d2 = "0.8.10"
-r2d2_sqlite = "0.25.0"
-rusqlite = { version = "0.32.1", features = ["bundled", "chrono"] }
-sea-query = { version = "0.32.1", features = ["with-chrono", "attr"] }
-serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
-ts-rs = { workspace = true, features = ["chrono-impl"] }
-yaak-database = { workspace = true }
-yaak-proxy = { workspace = true }
-yaak-rpc = { workspace = true }
--- a/crates-proxy/yaak-proxy-lib/bindings/ModelChangeEvent.ts
+++ b/crates-proxy/yaak-proxy-lib/bindings/ModelChangeEvent.ts
@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ModelChangeEvent = { "type": "upsert", created: boolean, } | { "type": "delete" };
--- a/crates-proxy/yaak-proxy-lib/bindings/gen_models.ts
+++ b/crates-proxy/yaak-proxy-lib/bindings/gen_models.ts
@@ -1,8 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ModelChangeEvent } from "./ModelChangeEvent";
-
-export type HttpExchange = { id: string, createdAt: string, updatedAt: string, url: string, method: string, reqHeaders: Array<ProxyHeader>, reqBody: Array<number> | null, resStatus: number | null, resHeaders: Array<ProxyHeader>, resBody: Array<number> | null, error: string | null, };
-
-export type ModelPayload = { model: HttpExchange, change: ModelChangeEvent, };
-
-export type ProxyHeader = { name: string, value: string, };
--- a/crates-proxy/yaak-proxy-lib/bindings/gen_rpc.ts
+++ b/crates-proxy/yaak-proxy-lib/bindings/gen_rpc.ts
@@ -1,20 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpExchange, ModelPayload } from "./gen_models";
-
-export type ActionInvocation = { "scope": "global", action: GlobalAction, };
-
-export type ActionMetadata = { label: string, defaultHotkey: string | null, };
-
-export type GlobalAction = "proxy_start" | "proxy_stop";
-
-export type ListActionsRequest = Record<string, never>;
-
-export type ListActionsResponse = { actions: Array<[ActionInvocation, ActionMetadata]>, };
-
-export type ListModelsRequest = Record<string, never>;
-
-export type ListModelsResponse = { httpExchanges: Array<HttpExchange>, };
-
-export type RpcEventSchema = { model_write: ModelPayload, };
-
-export type RpcSchema = { execute_action: [ActionInvocation, boolean], list_actions: [ListActionsRequest, ListActionsResponse], list_models: [ListModelsRequest, ListModelsResponse], };
--- a/crates-proxy/yaak-proxy-lib/bindings/index.ts
+++ b/crates-proxy/yaak-proxy-lib/bindings/index.ts
@@ -1,2 +0,0 @@
-export * from "./gen_rpc";
-export * from "./gen_models";
--- a/crates-proxy/yaak-proxy-lib/migrations/00000001_init.sql
+++ b/crates-proxy/yaak-proxy-lib/migrations/00000001_init.sql
@@ -1,14 +0,0 @@
-CREATE TABLE http_exchanges
-(
-    id          TEXT    NOT NULL PRIMARY KEY,
-    created_at  DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
-    updated_at  DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
-    url         TEXT    NOT NULL DEFAULT '',
-    method      TEXT    NOT NULL DEFAULT '',
-    req_headers TEXT    NOT NULL DEFAULT '[]',
-    req_body    BLOB,
-    res_status  INTEGER,
-    res_headers TEXT    NOT NULL DEFAULT '[]',
-    res_body    BLOB,
-    error       TEXT
-);
--- a/crates-proxy/yaak-proxy-lib/src/actions.rs
+++ b/crates-proxy/yaak-proxy-lib/src/actions.rs
@@ -1,53 +0,0 @@
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-
-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "gen_rpc.ts")]
-pub enum GlobalAction {
-    ProxyStart,
-    ProxyStop,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(tag = "scope", rename_all = "snake_case")]
-#[ts(export, export_to = "gen_rpc.ts")]
-pub enum ActionInvocation {
-    Global { action: GlobalAction },
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export, export_to = "gen_rpc.ts")]
-pub struct ActionMetadata {
-    pub label: String,
-    pub default_hotkey: Option<String>,
-}
-
-fn default_hotkey(mac: &str, other: &str) -> Option<String> {
-    if cfg!(target_os = "macos") {
-        Some(mac.into())
-    } else {
-        Some(other.into())
-    }
-}
-
-/// All global actions with their metadata, used by `list_actions` RPC.
-pub fn all_global_actions() -> Vec<(ActionInvocation, ActionMetadata)> {
-    vec![
-        (
-            ActionInvocation::Global { action: GlobalAction::ProxyStart },
-            ActionMetadata {
-                label: "Start Proxy".into(),
-                default_hotkey: default_hotkey("Meta+Shift+P", "Ctrl+Shift+P"),
-            },
-        ),
-        (
-            ActionInvocation::Global { action: GlobalAction::ProxyStop },
-            ActionMetadata {
-                label: "Stop Proxy".into(),
-                default_hotkey: default_hotkey("Meta+Shift+S", "Ctrl+Shift+S"),
-            },
-        ),
-    ]
-}
--- a/crates-proxy/yaak-proxy-lib/src/db.rs
+++ b/crates-proxy/yaak-proxy-lib/src/db.rs
@@ -1,33 +0,0 @@
-use include_dir::{Dir, include_dir};
-use r2d2::Pool;
-use r2d2_sqlite::SqliteConnectionManager;
-use std::path::Path;
-use yaak_database::{ConnectionOrTx, DbContext, run_migrations};
-
-static MIGRATIONS: Dir<'static> = include_dir!("$CARGO_MANIFEST_DIR/migrations");
-
-#[derive(Clone)]
-pub struct ProxyQueryManager {
-    pool: Pool<SqliteConnectionManager>,
-}
-
-impl ProxyQueryManager {
-    pub fn new(db_path: &Path) -> Self {
-        let manager = SqliteConnectionManager::file(db_path);
-        let pool = Pool::builder()
-            .max_size(5)
-            .build(manager)
-            .expect("Failed to create proxy DB pool");
-        run_migrations(&pool, &MIGRATIONS).expect("Failed to run proxy DB migrations");
-        Self { pool }
-    }
-
-    pub fn with_conn<F, T>(&self, func: F) -> T
-    where
-        F: FnOnce(&DbContext) -> T,
-    {
-        let conn = self.pool.get().expect("Failed to get proxy DB connection");
-        let ctx = DbContext::new(ConnectionOrTx::Connection(conn));
-        func(&ctx)
-    }
-}
--- a/crates-proxy/yaak-proxy-lib/src/lib.rs
+++ b/crates-proxy/yaak-proxy-lib/src/lib.rs
@@ -1,225 +0,0 @@
-pub mod actions;
-pub mod db;
-pub mod models;
-
-use std::collections::HashMap;
-use std::path::Path;
-use std::sync::Mutex;
-use log::warn;
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-use yaak_database::{ModelChangeEvent, UpdateSource};
-use yaak_proxy::{CapturedRequest, ProxyEvent, ProxyHandle, RequestState};
-use yaak_rpc::{RpcError, RpcEventEmitter, define_rpc};
-use crate::actions::{ActionInvocation, ActionMetadata, GlobalAction};
-use crate::db::ProxyQueryManager;
-use crate::models::{HttpExchange, ModelPayload, ProxyHeader};
-
-// -- Context --
-
-pub struct ProxyCtx {
-    handle: Mutex<Option<ProxyHandle>>,
-    pub db: ProxyQueryManager,
-    pub events: RpcEventEmitter,
-}
-
-impl ProxyCtx {
-    pub fn new(db_path: &Path, events: RpcEventEmitter) -> Self {
-        Self {
-            handle: Mutex::new(None),
-            db: ProxyQueryManager::new(db_path),
-            events,
-        }
-    }
-}
-
-// -- Request/response types --
-
-#[derive(Deserialize, TS)]
-#[ts(export, export_to = "gen_rpc.ts")]
-pub struct ListActionsRequest {}
-
-#[derive(Serialize, TS)]
-#[ts(export, export_to = "gen_rpc.ts")]
-pub struct ListActionsResponse {
-    pub actions: Vec<(ActionInvocation, ActionMetadata)>,
-}
-
-#[derive(Deserialize, TS)]
-#[ts(export, export_to = "gen_rpc.ts")]
-pub struct ListModelsRequest {}
-
-#[derive(Serialize, TS)]
-#[ts(export, export_to = "gen_rpc.ts")]
-#[serde(rename_all = "camelCase")]
-pub struct ListModelsResponse {
-    pub http_exchanges: Vec<HttpExchange>,
-}
-
-// -- Handlers --
-
-fn execute_action(ctx: &ProxyCtx, invocation: ActionInvocation) -> Result<bool, RpcError> {
-    match invocation {
-        ActionInvocation::Global { action } => match action {
-            GlobalAction::ProxyStart => {
-                let mut handle = ctx
-                    .handle
-                    .lock()
-                    .map_err(|_| RpcError { message: "lock poisoned".into() })?;
-
-                if handle.is_some() {
-                    return Ok(true); // already running
-                }
-
-                let mut proxy_handle = yaak_proxy::start_proxy(9090)
-                    .map_err(|e| RpcError { message: e })?;
-
-                if let Some(event_rx) = proxy_handle.take_event_rx() {
-                    let db = ctx.db.clone();
-                    let events = ctx.events.clone();
-                    std::thread::spawn(move || run_event_loop(event_rx, db, events));
-                }
-
-                *handle = Some(proxy_handle);
-                Ok(true)
-            }
-            GlobalAction::ProxyStop => {
-                let mut handle = ctx
-                    .handle
-                    .lock()
-                    .map_err(|_| RpcError { message: "lock poisoned".into() })?;
-                handle.take();
-                Ok(true)
-            }
-        },
-    }
-}
-
-fn list_actions(_ctx: &ProxyCtx, _req: ListActionsRequest) -> Result<ListActionsResponse, RpcError> {
-    Ok(ListActionsResponse {
-        actions: crate::actions::all_global_actions(),
-    })
-}
-
-fn list_models(ctx: &ProxyCtx, _req: ListModelsRequest) -> Result<ListModelsResponse, RpcError> {
-    ctx.db.with_conn(|db| {
-        Ok(ListModelsResponse {
-            http_exchanges: db.find_all::<HttpExchange>()
-                .map_err(|e| RpcError { message: e.to_string() })?,
-        })
-    })
-}
-
-// -- Event loop --
-
-fn run_event_loop(rx: std::sync::mpsc::Receiver<ProxyEvent>, db: ProxyQueryManager, events: RpcEventEmitter) {
-    let mut in_flight: HashMap<u64, CapturedRequest> = HashMap::new();
-
-    while let Ok(event) = rx.recv() {
-        match event {
-            ProxyEvent::RequestStart { id, method, url, http_version } => {
-                in_flight.insert(id, CapturedRequest {
-                    id,
-                    method,
-                    url,
-                    http_version,
-                    status: None,
-                    elapsed_ms: None,
-                    remote_http_version: None,
-                    request_headers: vec![],
-                    request_body: None,
-                    response_headers: vec![],
-                    response_body: None,
-                    response_body_size: 0,
-                    state: RequestState::Sending,
-                    error: None,
-                });
-            }
-            ProxyEvent::RequestHeader { id, name, value } => {
-                if let Some(r) = in_flight.get_mut(&id) {
-                    r.request_headers.push((name, value));
-                }
-            }
-            ProxyEvent::RequestBody { id, body } => {
-                if let Some(r) = in_flight.get_mut(&id) {
-                    r.request_body = Some(body);
-                }
-            }
-            ProxyEvent::ResponseStart { id, status, http_version, elapsed_ms } => {
-                if let Some(r) = in_flight.get_mut(&id) {
-                    r.status = Some(status);
-                    r.remote_http_version = Some(http_version);
-                    r.elapsed_ms = Some(elapsed_ms);
-                    r.state = RequestState::Receiving;
-                }
-            }
-            ProxyEvent::ResponseHeader { id, name, value } => {
-                if let Some(r) = in_flight.get_mut(&id) {
-                    r.response_headers.push((name, value));
-                }
-            }
-            ProxyEvent::ResponseBodyChunk { .. } => {
-                // Progress only — no action needed
-            }
-            ProxyEvent::ResponseBodyComplete { id, body, size, elapsed_ms } => {
-                if let Some(mut r) = in_flight.remove(&id) {
-                    r.response_body = body;
-                    r.response_body_size = size;
-                    r.elapsed_ms = r.elapsed_ms.or(Some(elapsed_ms));
-                    r.state = RequestState::Complete;
-                    write_entry(&db, &events, &r);
-                }
-            }
-            ProxyEvent::Error { id, error } => {
-                if let Some(mut r) = in_flight.remove(&id) {
-                    r.error = Some(error);
-                    r.state = RequestState::Error;
-                    write_entry(&db, &events, &r);
-                }
-            }
-        }
-    }
-}
-
-fn write_entry(db: &ProxyQueryManager, events: &RpcEventEmitter, r: &CapturedRequest) {
-    let entry = HttpExchange {
-        url: r.url.clone(),
-        method: r.method.clone(),
-        req_headers: r.request_headers.iter()
-            .map(|(n, v)| ProxyHeader { name: n.clone(), value: v.clone() })
-            .collect(),
-        req_body: r.request_body.clone(),
-        res_status: r.status.map(|s| s as i32),
-        res_headers: r.response_headers.iter()
-            .map(|(n, v)| ProxyHeader { name: n.clone(), value: v.clone() })
-            .collect(),
-        res_body: r.response_body.clone(),
-        error: r.error.clone(),
-        ..Default::default()
-    };
-    db.with_conn(|ctx| {
-        match ctx.upsert(&entry, &UpdateSource::Background) {
-            Ok((saved, created)) => {
-                events.emit("model_write", &ModelPayload {
-                    model: saved,
-                    change: ModelChangeEvent::Upsert { created },
-                });
-            }
-            Err(e) => warn!("Failed to write proxy entry: {e}"),
-        }
-    });
-}
-
-// -- Router + Schema --
-
-define_rpc! {
-    ProxyCtx;
-    commands {
-        execute_action(ActionInvocation) -> bool,
-        list_actions(ListActionsRequest) -> ListActionsResponse,
-        list_models(ListModelsRequest) -> ListModelsResponse,
-    }
-    events {
-        model_write(ModelPayload),
-    }
-}
--- a/crates-proxy/yaak-proxy-lib/src/models.rs
+++ b/crates-proxy/yaak-proxy-lib/src/models.rs
@@ -1,116 +0,0 @@
-use chrono::NaiveDateTime;
-use rusqlite::Row;
-use sea_query::{IntoColumnRef, IntoIden, IntoTableRef, Order, SimpleExpr, enum_def};
-use serde::{Deserialize, Serialize};
-use ts_rs::TS;
-use yaak_database::{ModelChangeEvent, Result as DbResult, UpdateSource, UpsertModelInfo, generate_prefixed_id, upsert_date};
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export, export_to = "gen_models.ts")]
-pub struct ProxyHeader {
-    pub name: String,
-    pub value: String,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize, TS)]
-#[serde(default, rename_all = "camelCase")]
-#[ts(export, export_to = "gen_models.ts")]
-#[enum_def(table_name = "http_exchanges")]
-pub struct HttpExchange {
-    pub id: String,
-    pub created_at: NaiveDateTime,
-    pub updated_at: NaiveDateTime,
-    pub url: String,
-    pub method: String,
-    pub req_headers: Vec<ProxyHeader>,
-    pub req_body: Option<Vec<u8>>,
-    pub res_status: Option<i32>,
-    pub res_headers: Vec<ProxyHeader>,
-    pub res_body: Option<Vec<u8>>,
-    pub error: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(rename_all = "camelCase")]
-#[ts(export, export_to = "gen_models.ts")]
-pub struct ModelPayload {
-    pub model: HttpExchange,
-    pub change: ModelChangeEvent,
-}
-
-impl UpsertModelInfo for HttpExchange {
-    fn table_name() -> impl IntoTableRef + IntoIden {
-        HttpExchangeIden::Table
-    }
-
-    fn id_column() -> impl IntoIden + Eq + Clone {
-        HttpExchangeIden::Id
-    }
-
-    fn generate_id() -> String {
-        generate_prefixed_id("he")
-    }
-
-    fn order_by() -> (impl IntoColumnRef, Order) {
-        (HttpExchangeIden::CreatedAt, Order::Desc)
-    }
-
-    fn get_id(&self) -> String {
-        self.id.clone()
-    }
-
-    fn insert_values(
-        self,
-        source: &UpdateSource,
-    ) -> DbResult<Vec<(impl IntoIden + Eq, impl Into<SimpleExpr>)>> {
-        use HttpExchangeIden::*;
-        Ok(vec![
-            (CreatedAt, upsert_date(source, self.created_at)),
-            (UpdatedAt, upsert_date(source, self.updated_at)),
-            (Url, self.url.into()),
-            (Method, self.method.into()),
-            (ReqHeaders, serde_json::to_string(&self.req_headers)?.into()),
-            (ReqBody, self.req_body.into()),
-            (ResStatus, self.res_status.into()),
-            (ResHeaders, serde_json::to_string(&self.res_headers)?.into()),
-            (ResBody, self.res_body.into()),
-            (Error, self.error.into()),
-        ])
-    }
-
-    fn update_columns() -> Vec<impl IntoIden> {
-        vec![
-            HttpExchangeIden::UpdatedAt,
-            HttpExchangeIden::Url,
-            HttpExchangeIden::Method,
-            HttpExchangeIden::ReqHeaders,
-            HttpExchangeIden::ReqBody,
-            HttpExchangeIden::ResStatus,
-            HttpExchangeIden::ResHeaders,
-            HttpExchangeIden::ResBody,
-            HttpExchangeIden::Error,
-        ]
-    }
-
-    fn from_row(r: &Row) -> rusqlite::Result<Self>
-    where
-        Self: Sized,
-    {
-        let req_headers: String = r.get("req_headers")?;
-        let res_headers: String = r.get("res_headers")?;
-        Ok(Self {
-            id: r.get("id")?,
-            created_at: r.get("created_at")?,
-            updated_at: r.get("updated_at")?,
-            url: r.get("url")?,
-            method: r.get("method")?,
-            req_headers: serde_json::from_str(&req_headers).unwrap_or_default(),
-            req_body: r.get("req_body")?,
-            res_status: r.get("res_status")?,
-            res_headers: serde_json::from_str(&res_headers).unwrap_or_default(),
-            res_body: r.get("res_body")?,
-            error: r.get("error")?,
-        })
-    }
-}
--- a/crates-tauri/yaak-app-client/package.json
+++ b/crates-tauri/yaak-app-client/package.json
@@ -1,6 +0,0 @@
-{
-  "name": "@yaakapp-internal/tauri-client",
-  "private": true,
-  "version": "1.0.0",
-  "main": "bindings/index.ts"
-}
--- a/crates-tauri/yaak-app-client/src/main.rs
+++ b/crates-tauri/yaak-app-client/src/main.rs
@@ -1,5 +0,0 @@
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-fn main() {
-    tauri_app_client_lib::run();
-}
--- a/crates-tauri/yaak-app-client/src/render.rs
+++ b/crates-tauri/yaak-app-client/src/render.rs
@@ -1,85 +0,0 @@
-use log::info;
-use serde_json::Value;
-use std::collections::BTreeMap;
-pub use yaak::render::render_http_request;
-use yaak_models::models::{Environment, GrpcRequest, HttpRequestHeader};
-use yaak_models::render::make_vars_hashmap;
-use yaak_templates::{RenderOptions, TemplateCallback, parse_and_render, render_json_value_raw};
-
-pub async fn render_template<T: TemplateCallback>(
-    template: &str,
-    environment_chain: Vec<Environment>,
-    cb: &T,
-    opt: &RenderOptions,
-) -> yaak_templates::error::Result<String> {
-    let vars = &make_vars_hashmap(environment_chain);
-    parse_and_render(template, vars, cb, &opt).await
-}
-
-pub async fn render_json_value<T: TemplateCallback>(
-    value: Value,
-    environment_chain: Vec<Environment>,
-    cb: &T,
-    opt: &RenderOptions,
-) -> yaak_templates::error::Result<Value> {
-    let vars = &make_vars_hashmap(environment_chain);
-    render_json_value_raw(value, vars, cb, opt).await
-}
-
-pub async fn render_grpc_request<T: TemplateCallback>(
-    r: &GrpcRequest,
-    environment_chain: Vec<Environment>,
-    cb: &T,
-    opt: &RenderOptions,
-) -> yaak_templates::error::Result<GrpcRequest> {
-    let vars = &make_vars_hashmap(environment_chain);
-
-    let mut metadata = Vec::new();
-    for p in r.metadata.clone() {
-        if !p.enabled {
-            continue;
-        }
-        metadata.push(HttpRequestHeader {
-            enabled: p.enabled,
-            name: parse_and_render(p.name.as_str(), vars, cb, &opt).await?,
-            value: parse_and_render(p.value.as_str(), vars, cb, &opt).await?,
-            id: p.id,
-        })
-    }
-
-    let authentication = {
-        let mut disabled = false;
-        let mut auth = BTreeMap::new();
-        match r.authentication.get("disabled") {
-            Some(Value::Bool(true)) => {
-                disabled = true;
-            }
-            Some(Value::String(tmpl)) => {
-                disabled = parse_and_render(tmpl.as_str(), vars, cb, &opt)
-                    .await
-                    .unwrap_or_default()
-                    .is_empty();
-                info!(
-                    "Rendering authentication.disabled as a template: {disabled} from \"{tmpl}\""
-                );
-            }
-            _ => {}
-        }
-        if disabled {
-            auth.insert("disabled".to_string(), Value::Bool(true));
-        } else {
-            for (k, v) in r.authentication.clone() {
-                if k == "disabled" {
-                    auth.insert(k, Value::Bool(false));
-                } else {
-                    auth.insert(k, render_json_value_raw(v, vars, cb, &opt).await?);
-                }
-            }
-        }
-        auth
-    };
-
-    let url = parse_and_render(r.url.as_str(), vars, cb, &opt).await?;
-
-    Ok(GrpcRequest { url, metadata, authentication, ..r.to_owned() })
-}
--- a/crates-tauri/yaak-app-proxy/.gitignore
+++ b/crates-tauri/yaak-app-proxy/.gitignore
@@ -1,8 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-target/
-
-gen/*
-
-**/permissions/autogenerated
-**/permissions/schemas
--- a/crates-tauri/yaak-app-proxy/Cargo.toml
+++ b/crates-tauri/yaak-app-proxy/Cargo.toml
@@ -1,22 +0,0 @@
-[package]
-name = "yaak-app-proxy"
-version = "0.0.0"
-edition = "2024"
-authors = ["Gregory Schier"]
-publish = false
-
-[lib]
-name = "tauri_app_proxy_lib"
-crate-type = ["staticlib", "cdylib", "lib"]
-
-[build-dependencies]
-tauri-build = { version = "2.5.3", features = [] }
-
-[dependencies]
-log = { workspace = true }
-serde_json = { workspace = true }
-tauri = { workspace = true }
-tauri-plugin-os = "2.3.2"
-yaak-proxy-lib = { workspace = true }
-yaak-rpc = { workspace = true }
-yaak-window = { workspace = true }
--- a/crates-tauri/yaak-app-proxy/bindings/index.ts
+++ b/crates-tauri/yaak-app-proxy/bindings/index.ts
@@ -1 +0,0 @@
-export {};
--- a/crates-tauri/yaak-app-proxy/build.rs
+++ b/crates-tauri/yaak-app-proxy/build.rs
@@ -1,3 +0,0 @@
-fn main() {
-    tauri_build::build()
-}
--- a/crates-tauri/yaak-app-proxy/capabilities/default.json
+++ b/crates-tauri/yaak-app-proxy/capabilities/default.json
@@ -1,18 +0,0 @@
-{
-  "identifier": "default",
-  "description": "Default capabilities for the Yaak Proxy app",
-  "windows": [
-    "*"
-  ],
-  "permissions": [
-    "core:default",
-    "os:allow-os-type",
-    "core:window:allow-close",
-    "core:window:allow-is-fullscreen",
-    "core:window:allow-is-maximized",
-    "core:window:allow-maximize",
-    "core:window:allow-minimize",
-    "core:window:allow-start-dragging",
-    "core:window:allow-unmaximize"
-  ]
-}
--- a/crates-tauri/yaak-app-proxy/package.json
+++ b/crates-tauri/yaak-app-proxy/package.json
@@ -1,6 +0,0 @@
-{
-  "name": "@yaakapp-internal/tauri-proxy",
-  "private": true,
-  "version": "1.0.0",
-  "main": "bindings/index.ts"
-}
--- a/crates-tauri/yaak-app-proxy/src/lib.rs
+++ b/crates-tauri/yaak-app-proxy/src/lib.rs
@@ -1,59 +0,0 @@
-use log::error;
-use tauri::{Emitter, Manager, RunEvent, State};
-use yaak_proxy_lib::ProxyCtx;
-use yaak_rpc::{RpcEventEmitter, RpcRouter};
-use yaak_window::window::CreateWindowConfig;
-
-#[tauri::command]
-fn rpc(
-    router: State<'_, RpcRouter<ProxyCtx>>,
-    ctx: State<'_, ProxyCtx>,
-    cmd: String,
-    payload: serde_json::Value,
-) -> Result<serde_json::Value, String> {
-    router.dispatch(&cmd, payload, &ctx).map_err(|e| e.message)
-}
-
-pub fn run() {
-    tauri::Builder::default()
-        .plugin(tauri_plugin_os::init())
-        .setup(|app| {
-            let data_dir = app.path().app_data_dir().expect("no app data dir");
-            std::fs::create_dir_all(&data_dir).expect("failed to create app data dir");
-
-            let (emitter, event_rx) = RpcEventEmitter::new();
-            app.manage(ProxyCtx::new(&data_dir.join("proxy.db"), emitter));
-            app.manage(yaak_proxy_lib::build_router());
-
-            // Drain RPC events and forward as Tauri events
-            let app_handle = app.handle().clone();
-            std::thread::spawn(move || {
-                for event in event_rx {
-                    if let Err(e) = app_handle.emit(event.event, event.payload) {
-                        error!("Failed to emit RPC event: {e}");
-                    }
-                }
-            });
-
-            Ok(())
-        })
-        .invoke_handler(tauri::generate_handler![rpc])
-        .build(tauri::generate_context!())
-        .expect("error while building yaak proxy tauri application")
-        .run(|app_handle, event| {
-            if let RunEvent::Ready = event {
-                let config = CreateWindowConfig {
-                    url: "/",
-                    label: "main",
-                    title: "Yaak Proxy",
-                    inner_size: Some((1000.0, 700.0)),
-                    visible: true,
-                    hide_titlebar: true,
-                    ..Default::default()
-                };
-                if let Err(e) = yaak_window::window::create_window(app_handle, config) {
-                    error!("Failed to create proxy window: {e:?}");
-                }
-            }
-        });
-}
--- a/crates-tauri/yaak-app-proxy/tauri.conf.json
+++ b/crates-tauri/yaak-app-proxy/tauri.conf.json
@@ -1,24 +0,0 @@
-{
-  "productName": "Yaak Proxy",
-  "version": "0.0.0",
-  "identifier": "app.yaak.proxy",
-  "build": {
-    "beforeBuildCommand": "npm --prefix ../.. run proxy:tauri-before-build",
-    "beforeDevCommand": "npm --prefix ../.. run proxy:tauri-before-dev",
-    "devUrl": "http://localhost:2420",
-    "frontendDist": "../../dist/apps/yaak-proxy"
-  },
-  "app": {
-    "withGlobalTauri": false,
-    "windows": []
-  },
-  "bundle": {
-    "icon": [
-      "../yaak-app-client/icons/release/32x32.png",
-      "../yaak-app-client/icons/release/128x128.png",
-      "../yaak-app-client/icons/release/128x128@2x.png",
-      "../yaak-app-client/icons/release/icon.icns",
-      "../yaak-app-client/icons/release/icon.ico"
-    ]
-  }
-}
--- a/crates-tauri/yaak-app-proxy/tauri.development.conf.json
+++ b/crates-tauri/yaak-app-proxy/tauri.development.conf.json
@@ -1,13 +0,0 @@
-{
-  "productName": "Yaak Proxy Dev",
-  "identifier": "app.yaak.proxy.dev",
-  "bundle": {
-    "icon": [
-      "../yaak-app-client/icons/dev/32x32.png",
-      "../yaak-app-client/icons/dev/128x128.png",
-      "../yaak-app-client/icons/dev/128x128@2x.png",
-      "../yaak-app-client/icons/dev/icon.icns",
-      "../yaak-app-client/icons/dev/icon.ico"
-    ]
-  }
-}
--- a/crates-tauri/yaak-app-proxy/tauri.release.conf.json
+++ b/crates-tauri/yaak-app-proxy/tauri.release.conf.json
@@ -1,5 +0,0 @@
-{
-  "build": {
-    "features": []
-  }
-}
--- a/crates-tauri/yaak-app-proxy/template.desktop
+++ b/crates-tauri/yaak-app-proxy/template.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Categories={{categories}}
-Comment={{comment}}
-Exec={{exec}}
-Icon={{icon}}
-Name={{name}}
-StartupWMClass={{exec}}
-Terminal=false
-Type=Application
--- a/crates-tauri/yaak-app-client/.gitignore
+++ b/crates-tauri/yaak-app-client/.gitignore
--- a/crates-tauri/yaak-app-client/Cargo.toml
+++ b/crates-tauri/yaak-app-client/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "yaak-app-client"
+name = "yaak-app"
 version = "0.0.0"
 edition = "2024"
 authors = ["Gregory Schier"]
@@ -7,7 +7,7 @@ publish = false

 # Produce a library for mobile support
 [lib]
-name = "tauri_app_client_lib"
+name = "tauri_app_lib"
 crate-type = ["staticlib", "cdylib", "lib"]

 [features]
@@ -30,6 +30,7 @@ eventsource-client = { git = "https://github.com/yaakapp/rust-eventsource-client
 http = { version = "1.2.0", default-features = false }
 log = { workspace = true }
 md5 = "0.8.0"
+pretty_graphql = "0.2"
 r2d2 = "0.8.10"
 r2d2_sqlite = "0.25.0"
 mime_guess = "2.0.5"
@@ -75,5 +76,4 @@ yaak-sse = { workspace = true }
 yaak-sync = { workspace = true }
 yaak-templates = { workspace = true }
 yaak-tls = { workspace = true }
-yaak-window = { workspace = true }
 yaak-ws = { workspace = true }
--- a/crates-tauri/yaak-app-client/bindings/gen_watch.ts
+++ b/crates-tauri/yaak-app-client/bindings/gen_watch.ts
--- a/crates-tauri/yaak-app-client/bindings/index.ts
+++ b/crates-tauri/yaak-app-client/bindings/index.ts
--- a/crates-tauri/yaak-app-client/bindings/plugins_ext.ts
+++ b/crates-tauri/yaak-app-client/bindings/plugins_ext.ts
--- a/crates-tauri/yaak-app-client/build.rs
+++ b/crates-tauri/yaak-app-client/build.rs
--- a/crates-tauri/yaak-app-client/capabilities/default.json
+++ b/crates-tauri/yaak-app-client/capabilities/default.json
--- a/crates-tauri/yaak-app-client/icons/dev/128x128.png
+++ b/crates-tauri/yaak-app-client/icons/dev/128x128.png
--- a/crates-tauri/yaak-app-client/icons/dev/128x128@2x.png
+++ b/crates-tauri/yaak-app-client/icons/dev/128x128@2x.png
--- a/crates-tauri/yaak-app-client/icons/dev/32x32.png
+++ b/crates-tauri/yaak-app-client/icons/dev/32x32.png
--- a/crates-tauri/yaak-app-client/icons/dev/64x64.png
+++ b/crates-tauri/yaak-app-client/icons/dev/64x64.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square107x107Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square107x107Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square142x142Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square142x142Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square150x150Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square150x150Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square284x284Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square284x284Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square30x30Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square30x30Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square310x310Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square310x310Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square44x44Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square44x44Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square71x71Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square71x71Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/Square89x89Logo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/Square89x89Logo.png
--- a/crates-tauri/yaak-app-client/icons/dev/StoreLogo.png
+++ b/crates-tauri/yaak-app-client/icons/dev/StoreLogo.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-hdpi/ic_launcher.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-hdpi/ic_launcher.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-hdpi/ic_launcher_foreground.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-hdpi/ic_launcher_foreground.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-hdpi/ic_launcher_round.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-hdpi/ic_launcher_round.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-mdpi/ic_launcher.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-mdpi/ic_launcher.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-mdpi/ic_launcher_foreground.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-mdpi/ic_launcher_foreground.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-mdpi/ic_launcher_round.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-mdpi/ic_launcher_round.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xhdpi/ic_launcher.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xhdpi/ic_launcher.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xhdpi/ic_launcher_foreground.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xhdpi/ic_launcher_round.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xhdpi/ic_launcher_round.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxhdpi/ic_launcher.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxhdpi/ic_launcher.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxhdpi/ic_launcher_round.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxhdpi/ic_launcher_round.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxxhdpi/ic_launcher.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxxhdpi/ic_launcher.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/crates-tauri/yaak-app-client/icons/dev/android/mipmap-xxxhdpi/ic_launcher_round.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gregory Schier	b563319bed	Fix biome lint: update schema to 2.3.13, exclude npm dir, fix lint errors Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-05 16:19:05 -08:00
Gregory Schier	3d577dd7d9	Update release skills for CLI	2026-03-05 16:06:40 -08:00
Gregory Schier	591c68c59c	Revert macOS CI runners back to macos-latest Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-05 15:59:10 -08:00
Gregory Schier	a0cb7f813f	Replace format-graphql with pretty_graphql for comment-preserving GraphQL formatting Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-05 15:53:13 -08:00
Gregory Schier	cfab62707e	Exclude yaak-cli from app release tests and remove stale lint comments Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-05 15:36:09 -08:00
Gregory Schier	267508e533	Support comments in JSON body (#419 ) Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-05 15:05:09 -08:00
Gregory Schier	242f55b609	Fix macOS Tahoe stoplight positioning and build on macOS 26 On macOS Tahoe (26+), the default title bar is 32px with 14px buttons, so the old formula (button_height + PAD_Y = 14 + 18 = 32) produced no change. Add TITLEBAR_EXTRA_HEIGHT to push the title bar taller than the Tahoe default. Use OnceLock to capture the original default height so repeated calls don't accumulate extra pixels. Also update CI runners to macos-26 for Tahoe SDK builds and adjust frontend padding for larger stoplights. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-05 14:56:19 -08:00
dependabot[bot]	67a3dd15ac	Bump @hono/node-server from 1.19.9 to 1.19.10 (#417 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-05 13:24:21 -08:00
dependabot[bot]	543325613b	Bump hono from 4.11.10 to 4.12.4 (#416 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-05 13:24:04 -08:00
				`@@ -1 +0,0 @@`
				`export { YaakColor } from "@yaakapp-internal/theme";`