Revert "plugin-events: move model/find handlers to shared path"

This reverts commit 072b486857.
plugins: keep dev workspace plugins in watch mode
2026-03-07 05:40:04 +01:00 · 2026-02-26 10:13:36 -08:00 · 2026-02-26 09:53:58 -08:00 · 2026-02-26 09:51:17 -08:00 · 2026-02-26 09:22:54 -08:00 · 2026-02-26 09:19:59 -08:00
119 changed files with 1685 additions and 4605 deletions
--- a/.claude/commands/release/check-out-pr.md
+++ b/.claude/commands/release/check-out-pr.md
@@ -0,0 +1,62 @@
+---
+description: Review a PR in a new worktree
+allowed-tools: Bash(git worktree:*), Bash(gh pr:*), Bash(git branch:*)
+---
+
+Check out a GitHub pull request for review.
+
+## Usage
+
+```
+/check-out-pr <PR_NUMBER>
+```
+
+## What to do
+
+1. If no PR number is provided, list all open pull requests and ask the user to select one
+2. Get PR information using `gh pr view <PR_NUMBER> --json number,headRefName`
+3. **Ask the user** whether they want to:
+   - **A) Check out in current directory** — simple `gh pr checkout <PR_NUMBER>`
+   - **B) Create a new worktree** — isolated copy at `../yaak-worktrees/pr-<PR_NUMBER>`
+4. Follow the appropriate path below
+
+## Option A: Check out in current directory
+
+1. Run `gh pr checkout <PR_NUMBER>`
+2. Inform the user which branch they're now on
+
+## Option B: Create a new worktree
+
+1. Create a new worktree at `../yaak-worktrees/pr-<PR_NUMBER>` using `git worktree add` with a timeout of at least 300000ms (5 minutes) since the post-checkout hook runs a bootstrap script
+2. Checkout the PR branch in the new worktree using `gh pr checkout <PR_NUMBER>`
+3. The post-checkout hook will automatically:
+   - Create `.env.local` with unique ports
+   - Copy editor config folders
+   - Run `npm install && npm run bootstrap`
+4. Inform the user:
+   - Where the worktree was created
+   - What ports were assigned
+   - How to access it (cd command)
+   - How to run the dev server
+   - How to remove the worktree when done
+
+### Example worktree output
+
+```
+Created worktree for PR #123 at ../yaak-worktrees/pr-123
+Branch: feature-auth
+Ports: Vite (1421), MCP (64344)
+
+To start working:
+  cd ../yaak-worktrees/pr-123
+  npm run app-dev
+
+To remove when done:
+  git worktree remove ../yaak-worktrees/pr-123
+```
+
+## Error Handling
+
+- If the PR doesn't exist, show a helpful error
+- If the worktree already exists, inform the user and ask if they want to remove and recreate it
+- If `gh` CLI is not available, inform the user to install it
--- a/.claude/commands/release/generate-release-notes.md
+++ b/.claude/commands/release/generate-release-notes.md
@@ -37,7 +37,6 @@ 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/.claude/skills/worktree.md
+++ b/.claude/skills/worktree.md
@@ -0,0 +1,35 @@
+# Worktree Management Skill
+
+## Creating Worktrees
+
+When creating git worktrees for this project, ALWAYS use the path format:
+```
+../yaak-worktrees/<NAME>
+```
+
+For example:
+- `git worktree add ../yaak-worktrees/feature-auth`
+- `git worktree add ../yaak-worktrees/bugfix-login`
+- `git worktree add ../yaak-worktrees/refactor-api`
+
+## What Happens Automatically
+
+The post-checkout hook will automatically:
+1. Create `.env.local` with unique ports (YAAK_DEV_PORT and YAAK_PLUGIN_MCP_SERVER_PORT)
+2. Copy gitignored editor config folders (.zed, .idea, etc.)
+3. Run `npm install && npm run bootstrap`
+
+## Deleting Worktrees
+
+```bash
+git worktree remove ../yaak-worktrees/<NAME>
+```
+
+## Port Assignments
+
+- Main worktree: 1420 (Vite), 64343 (MCP)
+- First worktree: 1421, 64344
+- Second worktree: 1422, 64345
+- etc.
+
+Each worktree can run `npm run app-dev` simultaneously without conflicts.
--- a/.codex/skills/release-check-out-pr/SKILL.md
+++ b/.codex/skills/release-check-out-pr/SKILL.md
@@ -0,0 +1,46 @@
+---
+name: release-check-out-pr
+description: Check out a GitHub pull request for review in this repo, either in the current directory or in a new isolated worktree at ../yaak-worktrees/pr-<PR_NUMBER>. Use when asked to run or replace the old Claude check-out-pr command.
+---
+
+# Check Out PR
+
+Check out a PR by number and let the user choose between current-directory checkout and isolated worktree checkout.
+
+## Workflow
+
+1. Confirm `gh` CLI is available.
+2. If no PR number is provided, list open PRs (`gh pr list`) and ask the user to choose one.
+3. Read PR metadata:
+   - `gh pr view <PR_NUMBER> --json number,headRefName`
+4. Ask the user to choose:
+   - Option A: check out in the current directory
+   - Option B: create a new worktree at `../yaak-worktrees/pr-<PR_NUMBER>`
+
+## Option A: Current Directory
+
+1. Run:
+   - `gh pr checkout <PR_NUMBER>`
+2. Report the checked-out branch.
+
+## Option B: New Worktree
+
+1. Use path:
+   - `../yaak-worktrees/pr-<PR_NUMBER>`
+2. Create the worktree with a timeout of at least 5 minutes because checkout hooks run bootstrap.
+3. In the new worktree, run:
+   - `gh pr checkout <PR_NUMBER>`
+4. Report:
+   - Worktree path
+   - Assigned ports from `.env.local` if present
+   - How to start work:
+     - `cd ../yaak-worktrees/pr-<PR_NUMBER>`
+     - `npm run app-dev`
+   - How to remove when done:
+     - `git worktree remove ../yaak-worktrees/pr-<PR_NUMBER>`
+
+## Error Handling
+
+- If PR does not exist, show a clear error.
+- If worktree already exists, ask whether to reuse it or remove/recreate it.
+- If `gh` is missing, instruct the user to install/authenticate it.
--- a/.codex/skills/release-generate-release-notes/SKILL.md
+++ b/.codex/skills/release-generate-release-notes/SKILL.md
@@ -32,7 +32,6 @@ 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/.codex/skills/worktree-management/SKILL.md
+++ b/.codex/skills/worktree-management/SKILL.md
@@ -0,0 +1,37 @@
+---
+name: worktree-management
+description: Manage Yaak git worktrees using the standard ../yaak-worktrees/<NAME> layout, including creation, removal, and expected automatic setup behavior and port assignments.
+---
+
+# Worktree Management
+
+Use the Yaak-standard worktree path layout and lifecycle commands.
+
+## Path Convention
+
+Always create worktrees under:
+
+`../yaak-worktrees/<NAME>`
+
+Examples:
+- `git worktree add ../yaak-worktrees/feature-auth`
+- `git worktree add ../yaak-worktrees/bugfix-login`
+- `git worktree add ../yaak-worktrees/refactor-api`
+
+## Automatic Setup After Checkout
+
+Project git hooks automatically:
+1. Create `.env.local` with unique `YAAK_DEV_PORT` and `YAAK_PLUGIN_MCP_SERVER_PORT`
+2. Copy gitignored editor config folders
+3. Run `npm install && npm run bootstrap`
+
+## Remove Worktree
+
+`git worktree remove ../yaak-worktrees/<NAME>`
+
+## Port Pattern
+
+- Main worktree: Vite `1420`, MCP `64343`
+- First extra worktree: `1421`, `64344`
+- Second extra worktree: `1422`, `64345`
+- Continue incrementally for additional worktrees
--- 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 --exclude yaak-cli
+        run: cargo test --all

      - name: Set version
        run: npm run replace-version
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,3 @@ flatpak/node-sources.json

 # Local Codex desktop env state
 .codex/environments/environment.toml
-
-# Claude Code local settings
-.claude/settings.local.json
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,2 +0,0 @@
- Tag safety: app releases use `v*` tags and CLI releases use `yaak-cli-*` tags; always confirm which one is requested before retagging.
- Do not commit, push, or tag without explicit approval
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -173,17 +173,6 @@ 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"
@@ -1211,7 +1200,7 @@ dependencies = [
 "encode_unicode",
 "libc",
 "once_cell",
- "unicode-width 0.2.2",
+ "unicode-width",
 "windows-sys 0.59.0",
 ]

@@ -1358,12 +1347,6 @@ 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"
@@ -1422,31 +1405,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"

-[[package]]
-name = "crossterm"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
-dependencies = [
- "bitflags 1.3.2",
- "crossterm_winapi",
- "libc",
- "mio 0.8.11",
- "parking_lot",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "crunchy"
 version = "0.2.3"
@@ -2336,15 +2294,6 @@ dependencies = [
 "slab",
 ]

-[[package]]
-name = "fuzzy-matcher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
-dependencies = [
- "thread_local 1.1.9",
-]
-
 [[package]]
 name = "fxhash"
 version = "0.2.1"
@@ -3215,24 +3164,6 @@ dependencies = [
 "generic-array",
 ]

-[[package]]
-name = "inquire"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a"
-dependencies = [
- "bitflags 2.11.0",
- "crossterm",
- "dyn-clone",
- "fuzzy-matcher",
- "fxhash",
- "newline-converter",
- "once_cell",
- "tempfile",
- "unicode-segmentation",
- "unicode-width 0.1.14",
-]
-
 [[package]]
 name = "interfaces"
 version = "0.0.8"
@@ -3825,18 +3756,6 @@ dependencies = [
 "simd-adler32",
 ]

-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log 0.4.29",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "mio"
 version = "1.0.4"
@@ -3932,15 +3851,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"

-[[package]]
-name = "newline-converter"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "nibble_vec"
 version = "0.1.0"
@@ -4032,7 +3942,7 @@ dependencies = [
 "kqueue",
 "libc",
 "log 0.4.29",
- "mio 1.0.4",
+ "mio",
 "notify-types",
 "walkdir",
 "windows-sys 0.59.0",
@@ -4573,7 +4483,7 @@ checksum = "75b1853bc34cadaa90aa09f95713d8b77ec0c0d3e2d90ccf7a74216f40d20850"
 dependencies = [
 "flate2",
 "postcard",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde",
 "serde_json",
 "thiserror 2.0.17",
@@ -4591,7 +4501,7 @@ dependencies = [
 "textwrap",
 "thiserror 2.0.17",
 "unicode-segmentation",
- "unicode-width 0.2.2",
+ "unicode-width",
 ]

 [[package]]
@@ -4616,7 +4526,7 @@ dependencies = [
 "hashbrown 0.16.1",
 "oxc_data_structures",
 "oxc_estree",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde",
 ]

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

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

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

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

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

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

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

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

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

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

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

 [[package]]
@@ -5431,7 +5341,7 @@ dependencies = [
 "nodejs-built-in-modules",
 "pathdiff",
 "radix_trie",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde",
 "serde_json",
 "thiserror 2.0.17",
@@ -5550,18 +5460,6 @@ 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"
@@ -5742,7 +5640,7 @@ dependencies = [
 "pin-project-lite",
 "quinn-proto",
 "quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "rustls",
 "socket2 0.5.10",
 "thiserror 2.0.17",
@@ -5762,7 +5660,7 @@ dependencies = [
 "lru-slab",
 "rand 0.9.1",
 "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "rustls",
 "rustls-pki-types",
 "slab",
@@ -6256,7 +6154,7 @@ dependencies = [
 "rolldown_tracing",
 "rolldown_utils",
 "rolldown_watcher",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde",
 "serde_json",
 "string_wizard",
@@ -6273,7 +6171,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77dff57c9de498bb1eb5b1ce682c2e3a0ae956b266fa0933c3e151b87b078967"
 dependencies = [
- "unicode-width 0.2.2",
+ "unicode-width",
 "yansi",
 ]

@@ -6298,7 +6196,7 @@ dependencies = [
 "kqueue",
 "libc",
 "log 0.4.29",
- "mio 1.0.4",
+ "mio",
 "rolldown-notify-types",
 "walkdir",
 "windows-sys 0.61.2",
@@ -6346,7 +6244,7 @@ dependencies = [
 "rolldown_sourcemap",
 "rolldown_std_utils",
 "rolldown_utils",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde",
 "serde_json",
 "simdutf8",
@@ -6364,7 +6262,7 @@ dependencies = [
 "blake3",
 "dashmap",
 "rolldown_debug_action",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde",
 "serde_json",
 "tracing",
@@ -6421,7 +6319,7 @@ dependencies = [
 "rolldown-ariadne",
 "rolldown_utils",
 "ropey",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "sugar_path",
 ]

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

 [[package]]
@@ -6598,7 +6496,7 @@ dependencies = [
 "regex 1.11.1",
 "regress",
 "rolldown_std_utils",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde_json",
 "simdutf8",
 "sugar_path",
@@ -6628,18 +6526,6 @@ 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"
@@ -6682,12 +6568,6 @@ 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"
@@ -7293,27 +7173,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

-[[package]]
-name = "signal-hook"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
-dependencies = [
- "libc",
- "mio 0.8.11",
- "signal-hook",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.5"
@@ -7500,7 +7359,7 @@ dependencies = [
 "memchr",
 "oxc_index",
 "oxc_sourcemap",
- "rustc-hash 2.1.1",
+ "rustc-hash",
 "serde",
 ]

@@ -8201,12 +8060,6 @@ 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"
@@ -8215,7 +8068,7 @@ checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
 dependencies = [
 "smawk",
 "unicode-linebreak",
- "unicode-width 0.2.2",
+ "unicode-width",
 ]

 [[package]]
@@ -8329,12 +8182,6 @@ 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"
@@ -8368,7 +8215,7 @@ checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
 "bytes",
 "libc",
- "mio 1.0.4",
+ "mio",
 "pin-project-lite",
 "signal-hook-registry",
 "socket2 0.6.1",
@@ -8938,12 +8785,6 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"

-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
 [[package]]
 name = "unicode-width"
 version = "0.2.2"
@@ -9721,15 +9562,6 @@ dependencies = [
 "windows-targets 0.42.2",
 ]

-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -10257,7 +10089,6 @@ dependencies = [
 "md5 0.8.0",
 "mime_guess",
 "openssl-sys",
- "pretty_graphql",
 "r2d2",
 "r2d2_sqlite",
 "rand 0.9.1",
@@ -10310,7 +10141,6 @@ dependencies = [
 name = "yaak-cli"
 version = "0.1.0"
 dependencies = [
- "arboard",
 "assert_cmd",
 "base64 0.22.1",
 "clap",
@@ -10320,7 +10150,6 @@ dependencies = [
 "futures",
 "hex",
 "include_dir",
- "inquire",
 "keyring",
 "log 0.4.29",
 "oxc_resolver",
@@ -10337,7 +10166,6 @@ dependencies = [
 "walkdir",
 "webbrowser",
 "yaak",
- "yaak-api",
 "yaak-crypto",
 "yaak-http",
 "yaak-models",
@@ -10459,7 +10287,6 @@ dependencies = [
 "urlencoding",
 "yaak-common",
 "yaak-models",
- "yaak-templates",
 "yaak-tls",
 "zstd",
 ]
@@ -10532,6 +10359,7 @@ dependencies = [
 "md5 0.7.0",
 "path-slash",
 "rand 0.9.1",
+ "regex 1.11.1",
 "reqwest",
 "serde",
 "serde_json",
--- a/biome.json
+++ b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.3.13/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json",
  "linter": {
    "enabled": true,
    "rules": {
@@ -48,8 +48,7 @@
      "!src-web/routeTree.gen.ts",
      "!packages/plugin-runtime-types/lib",
      "!**/bindings",
-      "!flatpak",
-      "!npm"
+      "!flatpak"
    ]
  }
 }
--- a/crates-cli/yaak-cli/Cargo.toml
+++ b/crates-cli/yaak-cli/Cargo.toml
@@ -9,14 +9,12 @@ name = "yaak"
 path = "src/main.rs"

 [dependencies]
-arboard = "3"
 base64 = "0.22"
 clap = { version = "4", features = ["derive"] }
 console = "0.15"
 dirs = "6"
 env_logger = "0.11"
 futures = "0.3"
-inquire = { version = "0.7", features = ["editor"] }
 hex = { workspace = true }
 include_dir = "0.7"
 keyring = { workspace = true, features = ["apple-native", "windows-native", "sync-secret-service"] }
@@ -34,7 +32,6 @@ walkdir = "2"
 webbrowser = "1"
 zip = "4"
 yaak = { workspace = true }
-yaak-api = { workspace = true }
 yaak-crypto = { workspace = true }
 yaak-http = { workspace = true }
 yaak-models = { workspace = true }
--- a/crates-cli/yaak-cli/src/cli.rs
+++ b/crates-cli/yaak-cli/src/cli.rs
@@ -21,10 +21,6 @@ pub struct Cli {
    #[arg(long, short, global = true)]
    pub environment: Option<String>,

-    /// Cookie jar ID to use when sending requests
-    #[arg(long = "cookie-jar", global = true, value_name = "COOKIE_JAR_ID")]
-    pub cookie_jar: Option<String>,
-
    /// Enable verbose send output (events and streamed response body)
    #[arg(long, short, global = true)]
    pub verbose: bool,
@@ -51,20 +47,9 @@ pub enum Commands {
    #[command(hide = true)]
    Dev(PluginPathArg),

-    /// Backward-compatible alias for `plugin generate`
-    #[command(hide = true)]
-    Generate(GenerateArgs),
-
-    /// Backward-compatible alias for `plugin publish`
-    #[command(hide = true)]
-    Publish(PluginPathArg),
-
    /// Send a request, folder, or workspace by ID
    Send(SendArgs),

-    /// Cookie jar commands
-    CookieJar(CookieJarArgs),
-
    /// Workspace commands
    Workspace(WorkspaceArgs),

@@ -92,22 +77,6 @@ pub struct SendArgs {
    pub fail_fast: bool,
 }

-#[derive(Args)]
-#[command(disable_help_subcommand = true)]
-pub struct CookieJarArgs {
-    #[command(subcommand)]
-    pub command: CookieJarCommands,
-}
-
-#[derive(Subcommand)]
-pub enum CookieJarCommands {
-    /// List cookie jars in a workspace
-    List {
-        /// Workspace ID (optional when exactly one workspace exists)
-        workspace_id: Option<String>,
-    },
-}
-
 #[derive(Args)]
 #[command(disable_help_subcommand = true)]
 pub struct WorkspaceArgs {
@@ -181,8 +150,8 @@ pub struct RequestArgs {
 pub enum RequestCommands {
    /// List requests in a workspace
    List {
-        /// Workspace ID (optional when exactly one workspace exists)
-        workspace_id: Option<String>,
+        /// Workspace ID
+        workspace_id: String,
    },

    /// Show a request as JSON
@@ -290,8 +259,8 @@ pub struct FolderArgs {
 pub enum FolderCommands {
    /// List folders in a workspace
    List {
-        /// Workspace ID (optional when exactly one workspace exists)
-        workspace_id: Option<String>,
+        /// Workspace ID
+        workspace_id: String,
    },

    /// Show a folder as JSON
@@ -347,8 +316,8 @@ pub struct EnvironmentArgs {
 pub enum EnvironmentCommands {
    /// List environments in a workspace
    List {
-        /// Workspace ID (optional when exactly one workspace exists)
-        workspace_id: Option<String>,
+        /// Workspace ID
+        workspace_id: String,
    },

    /// Output JSON schema for environment create/update payloads
@@ -444,9 +413,6 @@ pub enum PluginCommands {
    /// Generate a "Hello World" Yaak plugin
    Generate(GenerateArgs),

-    /// Install a plugin from a local directory or from the registry
-    Install(InstallPluginArgs),
-
    /// Publish a Yaak plugin version to the plugin registry
    Publish(PluginPathArg),
 }
@@ -467,9 +433,3 @@ pub struct GenerateArgs {
    #[arg(long)]
    pub dir: Option<PathBuf>,
 }
-
-#[derive(Args, Clone)]
-pub struct InstallPluginArgs {
-    /// Local plugin directory path, or registry plugin spec (@org/plugin[@version])
-    pub source: String,
-}
--- a/crates-cli/yaak-cli/src/commands/cookie_jar.rs
+++ b/crates-cli/yaak-cli/src/commands/cookie_jar.rs
@@ -1,42 +0,0 @@
-use crate::cli::{CookieJarArgs, CookieJarCommands};
-use crate::context::CliContext;
-use crate::utils::workspace::resolve_workspace_id;
-
-type CommandResult<T = ()> = std::result::Result<T, String>;
-
-pub fn run(ctx: &CliContext, args: CookieJarArgs) -> i32 {
-    let result = match args.command {
-        CookieJarCommands::List { workspace_id } => list(ctx, workspace_id.as_deref()),
-    };
-
-    match result {
-        Ok(()) => 0,
-        Err(error) => {
-            eprintln!("Error: {error}");
-            1
-        }
-    }
-}
-
-fn list(ctx: &CliContext, workspace_id: Option<&str>) -> CommandResult {
-    let workspace_id = resolve_workspace_id(ctx, workspace_id, "cookie-jar list")?;
-    let cookie_jars = ctx
-        .db()
-        .list_cookie_jars(&workspace_id)
-        .map_err(|e| format!("Failed to list cookie jars: {e}"))?;
-
-    if cookie_jars.is_empty() {
-        println!("No cookie jars found in workspace {}", workspace_id);
-    } else {
-        for cookie_jar in cookie_jars {
-            println!(
-                "{} - {} ({} cookies)",
-                cookie_jar.id,
-                cookie_jar.name,
-                cookie_jar.cookies.len()
-            );
-        }
-    }
-
-    Ok(())
-}
--- a/crates-cli/yaak-cli/src/commands/environment.rs
+++ b/crates-cli/yaak-cli/src/commands/environment.rs
@@ -6,7 +6,6 @@ use crate::utils::json::{
    parse_required_json, require_id, validate_create_id,
 };
 use crate::utils::schema::append_agent_hints;
-use crate::utils::workspace::resolve_workspace_id;
 use schemars::schema_for;
 use yaak_models::models::Environment;
 use yaak_models::util::UpdateSource;
@@ -15,7 +14,7 @@ type CommandResult<T = ()> = std::result::Result<T, String>;

 pub fn run(ctx: &CliContext, args: EnvironmentArgs) -> i32 {
    let result = match args.command {
-        EnvironmentCommands::List { workspace_id } => list(ctx, workspace_id.as_deref()),
+        EnvironmentCommands::List { workspace_id } => list(ctx, &workspace_id),
        EnvironmentCommands::Schema { pretty } => schema(pretty),
        EnvironmentCommands::Show { environment_id } => show(ctx, &environment_id),
        EnvironmentCommands::Create { workspace_id, name, json } => {
@@ -46,11 +45,10 @@ fn schema(pretty: bool) -> CommandResult {
    Ok(())
 }

-fn list(ctx: &CliContext, workspace_id: Option<&str>) -> CommandResult {
-    let workspace_id = resolve_workspace_id(ctx, workspace_id, "environment list")?;
+fn list(ctx: &CliContext, workspace_id: &str) -> CommandResult {
    let environments = ctx
        .db()
-        .list_environments_ensure_base(&workspace_id)
+        .list_environments_ensure_base(workspace_id)
        .map_err(|e| format!("Failed to list environments: {e}"))?;

    if environments.is_empty() {
@@ -94,14 +92,8 @@ fn create(
        validate_create_id(&payload, "environment")?;
        let mut environment: Environment = serde_json::from_value(payload)
            .map_err(|e| format!("Failed to parse environment create JSON: {e}"))?;
-        let fallback_workspace_id =
-            if workspace_id_arg.is_none() && environment.workspace_id.is_empty() {
-                Some(resolve_workspace_id(ctx, None, "environment create")?)
-            } else {
-                None
-            };
        merge_workspace_id_arg(
-            workspace_id_arg.as_deref().or(fallback_workspace_id.as_deref()),
+            workspace_id_arg.as_deref(),
            &mut environment.workspace_id,
            "environment create",
        )?;
@@ -119,8 +111,9 @@ fn create(
        return Ok(());
    }

-    let workspace_id =
-        resolve_workspace_id(ctx, workspace_id_arg.as_deref(), "environment create")?;
+    let workspace_id = workspace_id_arg.ok_or_else(|| {
+        "environment create requires workspace_id unless JSON payload is provided".to_string()
+    })?;
    let name = name.ok_or_else(|| {
        "environment create requires --name unless JSON payload is provided".to_string()
    })?;
--- a/crates-cli/yaak-cli/src/commands/folder.rs
+++ b/crates-cli/yaak-cli/src/commands/folder.rs
@@ -5,7 +5,6 @@ use crate::utils::json::{
    apply_merge_patch, is_json_shorthand, merge_workspace_id_arg, parse_optional_json,
    parse_required_json, require_id, validate_create_id,
 };
-use crate::utils::workspace::resolve_workspace_id;
 use yaak_models::models::Folder;
 use yaak_models::util::UpdateSource;

@@ -13,7 +12,7 @@ type CommandResult<T = ()> = std::result::Result<T, String>;

 pub fn run(ctx: &CliContext, args: FolderArgs) -> i32 {
    let result = match args.command {
-        FolderCommands::List { workspace_id } => list(ctx, workspace_id.as_deref()),
+        FolderCommands::List { workspace_id } => list(ctx, &workspace_id),
        FolderCommands::Show { folder_id } => show(ctx, &folder_id),
        FolderCommands::Create { workspace_id, name, json } => {
            create(ctx, workspace_id, name, json)
@@ -31,10 +30,9 @@ pub fn run(ctx: &CliContext, args: FolderArgs) -> i32 {
    }
 }

-fn list(ctx: &CliContext, workspace_id: Option<&str>) -> CommandResult {
-    let workspace_id = resolve_workspace_id(ctx, workspace_id, "folder list")?;
+fn list(ctx: &CliContext, workspace_id: &str) -> CommandResult {
    let folders =
-        ctx.db().list_folders(&workspace_id).map_err(|e| format!("Failed to list folders: {e}"))?;
+        ctx.db().list_folders(workspace_id).map_err(|e| format!("Failed to list folders: {e}"))?;
    if folders.is_empty() {
        println!("No folders found in workspace {}", workspace_id);
    } else {
@@ -74,14 +72,8 @@ fn create(
        validate_create_id(&payload, "folder")?;
        let mut folder: Folder = serde_json::from_value(payload)
            .map_err(|e| format!("Failed to parse folder create JSON: {e}"))?;
-        let fallback_workspace_id = if workspace_id_arg.is_none() && folder.workspace_id.is_empty()
-        {
-            Some(resolve_workspace_id(ctx, None, "folder create")?)
-        } else {
-            None
-        };
        merge_workspace_id_arg(
-            workspace_id_arg.as_deref().or(fallback_workspace_id.as_deref()),
+            workspace_id_arg.as_deref(),
            &mut folder.workspace_id,
            "folder create",
        )?;
@@ -95,7 +87,9 @@ fn create(
        return Ok(());
    }

-    let workspace_id = resolve_workspace_id(ctx, workspace_id_arg.as_deref(), "folder create")?;
+    let workspace_id = workspace_id_arg.ok_or_else(|| {
+        "folder create requires workspace_id unless JSON payload is provided".to_string()
+    })?;
    let name = name.ok_or_else(|| {
        "folder create requires --name unless JSON payload is provided".to_string()
    })?;
--- a/crates-cli/yaak-cli/src/commands/mod.rs
+++ b/crates-cli/yaak-cli/src/commands/mod.rs
@@ -1,5 +1,4 @@
 pub mod auth;
-pub mod cookie_jar;
 pub mod environment;
 pub mod folder;
 pub mod plugin;
--- a/crates-cli/yaak-cli/src/commands/plugin.rs
+++ b/crates-cli/yaak-cli/src/commands/plugin.rs
@@ -1,12 +1,11 @@
-use crate::cli::{GenerateArgs, InstallPluginArgs, PluginPathArg};
-use crate::context::CliContext;
+use crate::cli::{GenerateArgs, PluginArgs, PluginCommands, PluginPathArg};
 use crate::ui;
 use crate::utils::http;
 use keyring::Entry;
 use rand::Rng;
 use rolldown::{
-    BundleEvent, Bundler, BundlerOptions, ExperimentalOptions, InputItem, LogLevel, OutputFormat,
-    Platform, WatchOption, Watcher, WatcherEvent,
+    Bundler, BundlerOptions, ExperimentalOptions, InputItem, LogLevel, OutputFormat, Platform,
+    WatchOption, Watcher,
 };
 use serde::Deserialize;
 use std::collections::HashSet;
@@ -16,11 +15,6 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use tokio::sync::Mutex;
 use walkdir::WalkDir;
-use yaak_api::{ApiClientKind, yaak_api_client};
-use yaak_models::models::{Plugin, PluginSource};
-use yaak_models::util::UpdateSource;
-use yaak_plugins::events::PluginContext;
-use yaak_plugins::install::download_and_install;
 use zip::CompressionMethod;
 use zip::write::SimpleFileOptions;

@@ -63,13 +57,12 @@ pub async fn run_build(args: PluginPathArg) -> i32 {
    }
 }

-pub async fn run_install(context: &CliContext, args: InstallPluginArgs) -> i32 {
-    match install(context, args).await {
-        Ok(()) => 0,
-        Err(error) => {
-            ui::error(&error);
-            1
-        }
+pub async fn run(args: PluginArgs) -> i32 {
+    match args.command {
+        PluginCommands::Build(args) => run_build(args).await,
+        PluginCommands::Dev(args) => run_dev(args).await,
+        PluginCommands::Generate(args) => run_generate(args).await,
+        PluginCommands::Publish(args) => run_publish(args).await,
    }
 }

@@ -121,53 +114,12 @@ async fn dev(args: PluginPathArg) -> CommandResult {
    ensure_plugin_build_inputs(&plugin_dir)?;

    ui::info(&format!("Watching plugin {}...", plugin_dir.display()));
+    ui::info("Press Ctrl-C to stop");

    let bundler = Bundler::new(bundler_options(&plugin_dir, true))
        .map_err(|err| format!("Failed to initialize Rolldown watcher: {err}"))?;
    let watcher = Watcher::new(vec![Arc::new(Mutex::new(bundler))], None)
        .map_err(|err| format!("Failed to start Rolldown watcher: {err}"))?;
-    let emitter = watcher.emitter();
-    let watch_root = plugin_dir.clone();
-    let _event_logger = tokio::spawn(async move {
-        loop {
-            let event = {
-                let rx = emitter.rx.lock().await;
-                rx.recv()
-            };
-
-            let Ok(event) = event else {
-                break;
-            };
-
-            match event {
-                WatcherEvent::Change(change) => {
-                    let changed_path = Path::new(change.path.as_str());
-                    let display_path = changed_path
-                        .strip_prefix(&watch_root)
-                        .map(|p| p.display().to_string())
-                        .unwrap_or_else(|_| {
-                            changed_path
-                                .file_name()
-                                .map(|name| name.to_string_lossy().into_owned())
-                                .unwrap_or_else(|| "unknown".to_string())
-                        });
-                    ui::info(&format!("Rebuilding plugin {display_path}"));
-                }
-                WatcherEvent::Event(BundleEvent::BundleEnd(_)) => {}
-                WatcherEvent::Event(BundleEvent::Error(event)) => {
-                    if event.error.diagnostics.is_empty() {
-                        ui::error("Plugin build failed");
-                    } else {
-                        for diagnostic in event.error.diagnostics {
-                            ui::error(&diagnostic.to_string());
-                        }
-                    }
-                }
-                WatcherEvent::Close => break,
-                _ => {}
-            }
-        }
-    });

    watcher.start().await;
    Ok(())
@@ -257,113 +209,6 @@ async fn publish(args: PluginPathArg) -> CommandResult {
    Ok(())
 }

-async fn install(context: &CliContext, args: InstallPluginArgs) -> CommandResult {
-    if args.source.starts_with('@') {
-        let (name, version) =
-            parse_registry_install_spec(args.source.as_str()).ok_or_else(|| {
-                "Invalid registry plugin spec. Expected format: @org/plugin or @org/plugin@version"
-                    .to_string()
-            })?;
-        return install_from_registry(context, name, version).await;
-    }
-
-    install_from_directory(context, args.source.as_str()).await
-}
-
-async fn install_from_registry(
-    context: &CliContext,
-    name: String,
-    version: Option<String>,
-) -> CommandResult {
-    let current_version = crate::version::cli_version();
-    let http_client = yaak_api_client(ApiClientKind::Cli, current_version)
-        .map_err(|err| format!("Failed to initialize API client: {err}"))?;
-    let installing_version = version.clone().unwrap_or_else(|| "latest".to_string());
-    ui::info(&format!("Installing registry plugin {name}@{installing_version}"));
-
-    let plugin_context = PluginContext::new(Some("cli".to_string()), None);
-    let installed = download_and_install(
-        context.plugin_manager(),
-        context.query_manager(),
-        &http_client,
-        &plugin_context,
-        name.as_str(),
-        version,
-    )
-    .await
-    .map_err(|err| format!("Failed to install plugin: {err}"))?;
-
-    ui::success(&format!("Installed plugin {}@{}", installed.name, installed.version));
-    Ok(())
-}
-
-async fn install_from_directory(context: &CliContext, source: &str) -> CommandResult {
-    let plugin_dir = resolve_plugin_dir(Some(PathBuf::from(source)))?;
-    let plugin_dir_str = plugin_dir
-        .to_str()
-        .ok_or_else(|| {
-            format!("Plugin directory path is not valid UTF-8: {}", plugin_dir.display())
-        })?
-        .to_string();
-    ui::info(&format!("Installing plugin from directory {}", plugin_dir.display()));
-
-    let plugin = context
-        .db()
-        .upsert_plugin(
-            &Plugin {
-                directory: plugin_dir_str,
-                url: None,
-                enabled: true,
-                source: PluginSource::Filesystem,
-                ..Default::default()
-            },
-            &UpdateSource::Background,
-        )
-        .map_err(|err| format!("Failed to save plugin in database: {err}"))?;
-
-    let plugin_context = PluginContext::new(Some("cli".to_string()), None);
-    context
-        .plugin_manager()
-        .add_plugin(&plugin_context, &plugin)
-        .await
-        .map_err(|err| format!("Failed to load plugin runtime: {err}"))?;
-
-    ui::success(&format!("Installed plugin from {}", plugin.directory));
-    Ok(())
-}
-
-fn parse_registry_install_spec(source: &str) -> Option<(String, Option<String>)> {
-    if !source.starts_with('@') || !source.contains('/') {
-        return None;
-    }
-
-    let rest = source.get(1..)?;
-    let version_split = rest.rfind('@').map(|idx| idx + 1);
-    let (name, version) = match version_split {
-        Some(at_idx) => {
-            let (name, version) = source.split_at(at_idx);
-            let version = version.strip_prefix('@').unwrap_or_default();
-            if version.is_empty() {
-                return None;
-            }
-            (name.to_string(), Some(version.to_string()))
-        }
-        None => (source.to_string(), None),
-    };
-
-    if !name.starts_with('@') {
-        return None;
-    }
-
-    let without_scope = name.get(1..)?;
-    let (scope, plugin_name) = without_scope.split_once('/')?;
-    if scope.is_empty() || plugin_name.is_empty() {
-        return None;
-    }
-
-    Some((name, version))
-}
-
 #[derive(Deserialize)]
 struct PublishResponse {
    version: String,
--- a/crates-cli/yaak-cli/src/commands/request.rs
+++ b/crates-cli/yaak-cli/src/commands/request.rs
@@ -6,7 +6,6 @@ use crate::utils::json::{
    parse_required_json, require_id, validate_create_id,
 };
 use crate::utils::schema::append_agent_hints;
-use crate::utils::workspace::resolve_workspace_id;
 use schemars::schema_for;
 use serde_json::{Map, Value, json};
 use std::collections::HashMap;
@@ -25,16 +24,13 @@ pub async fn run(
    ctx: &CliContext,
    args: RequestArgs,
    environment: Option<&str>,
-    cookie_jar_id: Option<&str>,
    verbose: bool,
 ) -> i32 {
    let result = match args.command {
-        RequestCommands::List { workspace_id } => list(ctx, workspace_id.as_deref()),
+        RequestCommands::List { workspace_id } => list(ctx, &workspace_id),
        RequestCommands::Show { request_id } => show(ctx, &request_id),
        RequestCommands::Send { request_id } => {
-            return match send_request_by_id(ctx, &request_id, environment, cookie_jar_id, verbose)
-                .await
-            {
+            return match send_request_by_id(ctx, &request_id, environment, verbose).await {
                Ok(()) => 0,
                Err(error) => {
                    eprintln!("Error: {error}");
@@ -67,11 +63,10 @@ pub async fn run(
    }
 }

-fn list(ctx: &CliContext, workspace_id: Option<&str>) -> CommandResult {
-    let workspace_id = resolve_workspace_id(ctx, workspace_id, "request list")?;
+fn list(ctx: &CliContext, workspace_id: &str) -> CommandResult {
    let requests = ctx
        .db()
-        .list_http_requests(&workspace_id)
+        .list_http_requests(workspace_id)
        .map_err(|e| format!("Failed to list requests: {e}"))?;
    if requests.is_empty() {
        println!("No requests found in workspace {}", workspace_id);
@@ -355,14 +350,8 @@ fn create(
        validate_create_id(&payload, "request")?;
        let mut request: HttpRequest = serde_json::from_value(payload)
            .map_err(|e| format!("Failed to parse request create JSON: {e}"))?;
-        let fallback_workspace_id = if workspace_id_arg.is_none() && request.workspace_id.is_empty()
-        {
-            Some(resolve_workspace_id(ctx, None, "request create")?)
-        } else {
-            None
-        };
        merge_workspace_id_arg(
-            workspace_id_arg.as_deref().or(fallback_workspace_id.as_deref()),
+            workspace_id_arg.as_deref(),
            &mut request.workspace_id,
            "request create",
        )?;
@@ -376,7 +365,9 @@ fn create(
        return Ok(());
    }

-    let workspace_id = resolve_workspace_id(ctx, workspace_id_arg.as_deref(), "request create")?;
+    let workspace_id = workspace_id_arg.ok_or_else(|| {
+        "request create requires workspace_id unless JSON payload is provided".to_string()
+    })?;
    let name = name.unwrap_or_default();
    let url = url.unwrap_or_default();
    let method = method.unwrap_or_else(|| "GET".to_string());
@@ -445,7 +436,6 @@ pub async fn send_request_by_id(
    ctx: &CliContext,
    request_id: &str,
    environment: Option<&str>,
-    cookie_jar_id: Option<&str>,
    verbose: bool,
 ) -> Result<(), String> {
    let request =
@@ -457,7 +447,6 @@ pub async fn send_request_by_id(
                &http_request.id,
                &http_request.workspace_id,
                environment,
-                cookie_jar_id,
                verbose,
            )
            .await
@@ -476,13 +465,9 @@ async fn send_http_request_by_id(
    request_id: &str,
    workspace_id: &str,
    environment: Option<&str>,
-    cookie_jar_id: Option<&str>,
    verbose: bool,
 ) -> Result<(), String> {
-    let cookie_jar_id = resolve_cookie_jar_id(ctx, workspace_id, cookie_jar_id)?;
-
-    let plugin_context =
-        PluginContext::new(Some("cli".to_string()), Some(workspace_id.to_string()));
+    let plugin_context = PluginContext::new(None, Some(workspace_id.to_string()));

    let (event_tx, mut event_rx) = mpsc::channel::<SenderHttpResponseEvent>(100);
    let (body_chunk_tx, mut body_chunk_rx) = mpsc::unbounded_channel::<Vec<u8>>();
@@ -510,7 +495,7 @@ async fn send_http_request_by_id(
        request_id,
        environment_id: environment,
        update_source: UpdateSource::Sync,
-        cookie_jar_id,
+        cookie_jar_id: None,
        response_dir: &response_dir,
        emit_events_to: Some(event_tx),
        emit_response_body_chunks_to: Some(body_chunk_tx),
@@ -527,22 +512,3 @@ async fn send_http_request_by_id(
    result.map_err(|e| e.to_string())?;
    Ok(())
 }
-
-pub(crate) fn resolve_cookie_jar_id(
-    ctx: &CliContext,
-    workspace_id: &str,
-    explicit_cookie_jar_id: Option<&str>,
-) -> Result<Option<String>, String> {
-    if let Some(cookie_jar_id) = explicit_cookie_jar_id {
-        return Ok(Some(cookie_jar_id.to_string()));
-    }
-
-    let default_cookie_jar = ctx
-        .db()
-        .list_cookie_jars(workspace_id)
-        .map_err(|e| format!("Failed to list cookie jars: {e}"))?
-        .into_iter()
-        .min_by_key(|jar| jar.created_at)
-        .map(|jar| jar.id);
-    Ok(default_cookie_jar)
-}
--- a/crates-cli/yaak-cli/src/commands/send.rs
+++ b/crates-cli/yaak-cli/src/commands/send.rs
@@ -2,7 +2,6 @@ use crate::cli::SendArgs;
 use crate::commands::request;
 use crate::context::CliContext;
 use futures::future::join_all;
-use yaak_models::queries::any_request::AnyRequest;

 enum ExecutionMode {
    Sequential,
@@ -13,10 +12,9 @@ pub async fn run(
    ctx: &CliContext,
    args: SendArgs,
    environment: Option<&str>,
-    cookie_jar_id: Option<&str>,
    verbose: bool,
 ) -> i32 {
-    match send_target(ctx, args, environment, cookie_jar_id, verbose).await {
+    match send_target(ctx, args, environment, verbose).await {
        Ok(()) => 0,
        Err(error) => {
            eprintln!("Error: {error}");
@@ -29,70 +27,30 @@ async fn send_target(
    ctx: &CliContext,
    args: SendArgs,
    environment: Option<&str>,
-    cookie_jar_id: Option<&str>,
    verbose: bool,
 ) -> Result<(), String> {
    let mode = if args.parallel { ExecutionMode::Parallel } else { ExecutionMode::Sequential };

-    if let Ok(request) = ctx.db().get_any_request(&args.id) {
-        let workspace_id = match &request {
-            AnyRequest::HttpRequest(r) => r.workspace_id.clone(),
-            AnyRequest::GrpcRequest(r) => r.workspace_id.clone(),
-            AnyRequest::WebsocketRequest(r) => r.workspace_id.clone(),
-        };
-        let resolved_cookie_jar_id =
-            request::resolve_cookie_jar_id(ctx, &workspace_id, cookie_jar_id)?;
-
-        return request::send_request_by_id(
-            ctx,
-            &args.id,
-            environment,
-            resolved_cookie_jar_id.as_deref(),
-            verbose,
-        )
-        .await;
+    if ctx.db().get_any_request(&args.id).is_ok() {
+        return request::send_request_by_id(ctx, &args.id, environment, verbose).await;
    }

-    if let Ok(folder) = ctx.db().get_folder(&args.id) {
-        let resolved_cookie_jar_id =
-            request::resolve_cookie_jar_id(ctx, &folder.workspace_id, cookie_jar_id)?;
-
+    if ctx.db().get_folder(&args.id).is_ok() {
        let request_ids = collect_folder_request_ids(ctx, &args.id)?;
        if request_ids.is_empty() {
            println!("No requests found in folder {}", args.id);
            return Ok(());
        }
-        return send_many(
-            ctx,
-            request_ids,
-            mode,
-            args.fail_fast,
-            environment,
-            resolved_cookie_jar_id.as_deref(),
-            verbose,
-        )
-        .await;
+        return send_many(ctx, request_ids, mode, args.fail_fast, environment, verbose).await;
    }

-    if let Ok(workspace) = ctx.db().get_workspace(&args.id) {
-        let resolved_cookie_jar_id =
-            request::resolve_cookie_jar_id(ctx, &workspace.id, cookie_jar_id)?;
-
+    if ctx.db().get_workspace(&args.id).is_ok() {
        let request_ids = collect_workspace_request_ids(ctx, &args.id)?;
        if request_ids.is_empty() {
            println!("No requests found in workspace {}", args.id);
            return Ok(());
        }
-        return send_many(
-            ctx,
-            request_ids,
-            mode,
-            args.fail_fast,
-            environment,
-            resolved_cookie_jar_id.as_deref(),
-            verbose,
-        )
-        .await;
+        return send_many(ctx, request_ids, mode, args.fail_fast, environment, verbose).await;
    }

    Err(format!("Could not resolve ID '{}' as request, folder, or workspace", args.id))
@@ -173,7 +131,6 @@ async fn send_many(
    mode: ExecutionMode,
    fail_fast: bool,
    environment: Option<&str>,
-    cookie_jar_id: Option<&str>,
    verbose: bool,
 ) -> Result<(), String> {
    let mut success_count = 0usize;
@@ -182,15 +139,7 @@ async fn send_many(
    match mode {
        ExecutionMode::Sequential => {
            for request_id in request_ids {
-                match request::send_request_by_id(
-                    ctx,
-                    &request_id,
-                    environment,
-                    cookie_jar_id,
-                    verbose,
-                )
-                .await
-                {
+                match request::send_request_by_id(ctx, &request_id, environment, verbose).await {
                    Ok(()) => success_count += 1,
                    Err(error) => {
                        failures.push((request_id, error));
@@ -207,14 +156,7 @@ async fn send_many(
                .map(|request_id| async move {
                    (
                        request_id.clone(),
-                        request::send_request_by_id(
-                            ctx,
-                            request_id,
-                            environment,
-                            cookie_jar_id,
-                            verbose,
-                        )
-                        .await,
+                        request::send_request_by_id(ctx, request_id, environment, verbose).await,
                    )
                })
                .collect::<Vec<_>>();
--- a/crates-cli/yaak-cli/src/commands/workspace.rs
+++ b/crates-cli/yaak-cli/src/commands/workspace.rs
@@ -31,13 +31,18 @@ pub fn run(ctx: &CliContext, args: WorkspaceArgs) -> i32 {
 }

 fn schema(pretty: bool) -> CommandResult {
-    let mut schema = serde_json::to_value(schema_for!(Workspace))
-        .map_err(|e| format!("Failed to serialize workspace schema: {e}"))?;
+    let mut schema =
+        serde_json::to_value(schema_for!(Workspace)).map_err(|e| format!(
+            "Failed to serialize workspace schema: {e}"
+        ))?;
    append_agent_hints(&mut schema);

-    let output =
-        if pretty { serde_json::to_string_pretty(&schema) } else { serde_json::to_string(&schema) }
-            .map_err(|e| format!("Failed to format workspace schema JSON: {e}"))?;
+    let output = if pretty {
+        serde_json::to_string_pretty(&schema)
+    } else {
+        serde_json::to_string(&schema)
+    }
+    .map_err(|e| format!("Failed to format workspace schema JSON: {e}"))?;
    println!("{output}");
    Ok(())
 }
--- a/crates-cli/yaak-cli/src/context.rs
+++ b/crates-cli/yaak-cli/src/context.rs
@@ -18,14 +18,6 @@ const EMBEDDED_PLUGIN_RUNTIME: &str = include_str!(concat!(
 static EMBEDDED_VENDORED_PLUGINS: Dir<'_> =
    include_dir!("$CARGO_MANIFEST_DIR/../../crates-tauri/yaak-app/vendored/plugins");

-#[derive(Clone, Debug, Default)]
-pub struct CliExecutionContext {
-    pub request_id: Option<String>,
-    pub workspace_id: Option<String>,
-    pub environment_id: Option<String>,
-    pub cookie_jar_id: Option<String>,
-}
-
 pub struct CliContext {
    data_dir: PathBuf,
    query_manager: QueryManager,
@@ -36,71 +28,67 @@ pub struct CliContext {
 }

 impl CliContext {
-    pub fn new(data_dir: PathBuf, app_id: &str) -> Self {
+    pub async fn initialize(data_dir: PathBuf, app_id: &str, with_plugins: bool) -> Self {
        let db_path = data_dir.join("db.sqlite");
        let blob_path = data_dir.join("blobs.sqlite");
-        let (query_manager, blob_manager, _rx) =
-            match yaak_models::init_standalone(&db_path, &blob_path) {
-                Ok(v) => v,
-                Err(err) => {
-                    eprintln!("Error: Failed to initialize database: {err}");
-                    std::process::exit(1);
-                }
-            };
+
+        let (query_manager, blob_manager, _rx) = yaak_models::init_standalone(&db_path, &blob_path)
+            .expect("Failed to initialize database");
+
        let encryption_manager = Arc::new(EncryptionManager::new(query_manager.clone(), app_id));

+        let plugin_manager = if with_plugins {
+            let embedded_vendored_plugin_dir = data_dir.join("vendored-plugins");
+            let bundled_plugin_dir =
+                resolve_bundled_plugin_dir_for_cli(&embedded_vendored_plugin_dir);
+            let installed_plugin_dir = data_dir.join("installed-plugins");
+            let node_bin_path = PathBuf::from("node");
+
+            if bundled_plugin_dir == embedded_vendored_plugin_dir {
+                prepare_embedded_vendored_plugins(&embedded_vendored_plugin_dir)
+                    .expect("Failed to prepare bundled plugins");
+            }
+
+            let plugin_runtime_main =
+                std::env::var("YAAK_PLUGIN_RUNTIME").map(PathBuf::from).unwrap_or_else(|_| {
+                    prepare_embedded_plugin_runtime(&data_dir)
+                        .expect("Failed to prepare embedded plugin runtime")
+                });
+
+            match PluginManager::new(
+                bundled_plugin_dir,
+                embedded_vendored_plugin_dir,
+                installed_plugin_dir,
+                node_bin_path,
+                plugin_runtime_main,
+                &query_manager,
+                &PluginContext::new_empty(),
+            )
+            .await
+            {
+                Ok(plugin_manager) => Some(Arc::new(plugin_manager)),
+                Err(err) => {
+                    eprintln!("Warning: Failed to initialize plugins: {err}");
+                    None
+                }
+            }
+        } else {
+            None
+        };
+
+        let plugin_event_bridge = if let Some(plugin_manager) = &plugin_manager {
+            Some(CliPluginEventBridge::start(plugin_manager.clone(), query_manager.clone()).await)
+        } else {
+            None
+        };
+
        Self {
            data_dir,
            query_manager,
            blob_manager,
            encryption_manager,
-            plugin_manager: None,
-            plugin_event_bridge: Mutex::new(None),
-        }
-    }
-
-    pub async fn init_plugins(&mut self, execution_context: CliExecutionContext) {
-        let vendored_plugin_dir = self.data_dir.join("vendored-plugins");
-        let installed_plugin_dir = self.data_dir.join("installed-plugins");
-        let node_bin_path = PathBuf::from("node");
-
-        prepare_embedded_vendored_plugins(&vendored_plugin_dir)
-            .expect("Failed to prepare bundled plugins");
-
-        let plugin_runtime_main =
-            std::env::var("YAAK_PLUGIN_RUNTIME").map(PathBuf::from).unwrap_or_else(|_| {
-                prepare_embedded_plugin_runtime(&self.data_dir)
-                    .expect("Failed to prepare embedded plugin runtime")
-            });
-
-        match PluginManager::new(
-            vendored_plugin_dir,
-            installed_plugin_dir,
-            node_bin_path,
-            plugin_runtime_main,
-            &self.query_manager,
-            &PluginContext::new_empty(),
-            false,
-        )
-        .await
-        {
-            Ok(plugin_manager) => {
-                let plugin_manager = Arc::new(plugin_manager);
-                let plugin_event_bridge = CliPluginEventBridge::start(
-                    plugin_manager.clone(),
-                    self.query_manager.clone(),
-                    self.blob_manager.clone(),
-                    self.encryption_manager.clone(),
-                    self.data_dir.clone(),
-                    execution_context,
-                )
-                .await;
-                self.plugin_manager = Some(plugin_manager);
-                *self.plugin_event_bridge.lock().await = Some(plugin_event_bridge);
-            }
-            Err(err) => {
-                eprintln!("Warning: Failed to initialize plugins: {err}");
-            }
+            plugin_manager,
+            plugin_event_bridge: Mutex::new(plugin_event_bridge),
        }
    }

@@ -147,3 +135,20 @@ fn prepare_embedded_vendored_plugins(vendored_plugin_dir: &Path) -> std::io::Res
    EMBEDDED_VENDORED_PLUGINS.extract(vendored_plugin_dir)?;
    Ok(())
 }
+
+fn resolve_bundled_plugin_dir_for_cli(embedded_vendored_plugin_dir: &Path) -> PathBuf {
+    if !cfg!(debug_assertions) {
+        return embedded_vendored_plugin_dir.to_path_buf();
+    }
+
+    let plugins_dir = match std::env::current_dir() {
+        Ok(cwd) => cwd.join("plugins"),
+        Err(_) => return embedded_vendored_plugin_dir.to_path_buf(),
+    };
+
+    if !plugins_dir.is_dir() {
+        return embedded_vendored_plugin_dir.to_path_buf();
+    }
+
+    plugins_dir.canonicalize().unwrap_or(plugins_dir)
+}
--- a/crates-cli/yaak-cli/src/main.rs
+++ b/crates-cli/yaak-cli/src/main.rs
@@ -5,16 +5,14 @@ mod plugin_events;
 mod ui;
 mod utils;
 mod version;
-mod version_check;

 use clap::Parser;
-use cli::{Cli, Commands, PluginCommands, RequestCommands};
-use context::{CliContext, CliExecutionContext};
-use yaak_models::queries::any_request::AnyRequest;
+use cli::{Cli, Commands, RequestCommands};
+use context::CliContext;

 #[tokio::main]
 async fn main() {
-    let Cli { data_dir, environment, cookie_jar, verbose, log, command } = Cli::parse();
+    let Cli { data_dir, environment, verbose, log, command } = Cli::parse();

    if let Some(log_level) = log {
        match log_level {
@@ -34,208 +32,70 @@ async fn main() {
        dirs::data_dir().expect("Could not determine data directory").join(app_id)
    });

-    version_check::maybe_check_for_updates().await;
+    let needs_context = matches!(
+        &command,
+        Commands::Send(_)
+            | Commands::Workspace(_)
+            | Commands::Request(_)
+            | Commands::Folder(_)
+            | Commands::Environment(_)
+    );
+
+    let needs_plugins = matches!(
+        &command,
+        Commands::Send(_)
+            | Commands::Request(cli::RequestArgs {
+                command: RequestCommands::Send { .. } | RequestCommands::Schema { .. },
+            })
+    );
+
+    let context = if needs_context {
+        Some(CliContext::initialize(data_dir, app_id, needs_plugins).await)
+    } else {
+        None
+    };

    let exit_code = match command {
        Commands::Auth(args) => commands::auth::run(args).await,
-        Commands::Plugin(args) => match args.command {
-            PluginCommands::Build(args) => commands::plugin::run_build(args).await,
-            PluginCommands::Dev(args) => commands::plugin::run_dev(args).await,
-            PluginCommands::Generate(args) => commands::plugin::run_generate(args).await,
-            PluginCommands::Publish(args) => commands::plugin::run_publish(args).await,
-            PluginCommands::Install(install_args) => {
-                let mut context = CliContext::new(data_dir.clone(), app_id);
-                context.init_plugins(CliExecutionContext::default()).await;
-                let exit_code = commands::plugin::run_install(&context, install_args).await;
-                context.shutdown().await;
-                exit_code
-            }
-        },
+        Commands::Plugin(args) => commands::plugin::run(args).await,
        Commands::Build(args) => commands::plugin::run_build(args).await,
        Commands::Dev(args) => commands::plugin::run_dev(args).await,
-        Commands::Generate(args) => commands::plugin::run_generate(args).await,
-        Commands::Publish(args) => commands::plugin::run_publish(args).await,
        Commands::Send(args) => {
-            let mut context = CliContext::new(data_dir.clone(), app_id);
-            match resolve_send_execution_context(
-                &context,
-                &args.id,
+            commands::send::run(
+                context.as_ref().expect("context initialized for send"),
+                args,
                environment.as_deref(),
-                cookie_jar.as_deref(),
-            ) {
-                Ok(execution_context) => {
-                    context.init_plugins(execution_context).await;
-                    let exit_code = commands::send::run(
-                        &context,
-                        args,
-                        environment.as_deref(),
-                        cookie_jar.as_deref(),
-                        verbose,
-                    )
-                    .await;
-                    context.shutdown().await;
-                    exit_code
-                }
-                Err(error) => {
-                    eprintln!("Error: {error}");
-                    1
-                }
-            }
-        }
-        Commands::CookieJar(args) => {
-            let context = CliContext::new(data_dir.clone(), app_id);
-            let exit_code = commands::cookie_jar::run(&context, args);
-            context.shutdown().await;
-            exit_code
-        }
-        Commands::Workspace(args) => {
-            let context = CliContext::new(data_dir.clone(), app_id);
-            let exit_code = commands::workspace::run(&context, args);
-            context.shutdown().await;
-            exit_code
+                verbose,
+            )
+            .await
        }
+        Commands::Workspace(args) => commands::workspace::run(
+            context.as_ref().expect("context initialized for workspace"),
+            args,
+        ),
        Commands::Request(args) => {
-            let mut context = CliContext::new(data_dir.clone(), app_id);
-            let execution_context_result = match &args.command {
-                RequestCommands::Send { request_id } => resolve_request_execution_context(
-                    &context,
-                    request_id,
-                    environment.as_deref(),
-                    cookie_jar.as_deref(),
-                ),
-                _ => Ok(CliExecutionContext::default()),
-            };
-            match execution_context_result {
-                Ok(execution_context) => {
-                    let with_plugins = matches!(
-                        &args.command,
-                        RequestCommands::Send { .. } | RequestCommands::Schema { .. }
-                    );
-                    if with_plugins {
-                        context.init_plugins(execution_context).await;
-                    }
-                    let exit_code = commands::request::run(
-                        &context,
-                        args,
-                        environment.as_deref(),
-                        cookie_jar.as_deref(),
-                        verbose,
-                    )
-                    .await;
-                    context.shutdown().await;
-                    exit_code
-                }
-                Err(error) => {
-                    eprintln!("Error: {error}");
-                    1
-                }
-            }
+            commands::request::run(
+                context.as_ref().expect("context initialized for request"),
+                args,
+                environment.as_deref(),
+                verbose,
+            )
+            .await
        }
        Commands::Folder(args) => {
-            let context = CliContext::new(data_dir.clone(), app_id);
-            let exit_code = commands::folder::run(&context, args);
-            context.shutdown().await;
-            exit_code
-        }
-        Commands::Environment(args) => {
-            let context = CliContext::new(data_dir.clone(), app_id);
-            let exit_code = commands::environment::run(&context, args);
-            context.shutdown().await;
-            exit_code
+            commands::folder::run(context.as_ref().expect("context initialized for folder"), args)
        }
+        Commands::Environment(args) => commands::environment::run(
+            context.as_ref().expect("context initialized for environment"),
+            args,
+        ),
    };

+    if let Some(context) = &context {
+        context.shutdown().await;
+    }
+
    if exit_code != 0 {
        std::process::exit(exit_code);
    }
 }
-
-fn resolve_send_execution_context(
-    context: &CliContext,
-    id: &str,
-    environment: Option<&str>,
-    explicit_cookie_jar_id: Option<&str>,
-) -> Result<CliExecutionContext, String> {
-    if let Ok(request) = context.db().get_any_request(id) {
-        let (request_id, workspace_id) = match request {
-            AnyRequest::HttpRequest(r) => (Some(r.id), r.workspace_id),
-            AnyRequest::GrpcRequest(r) => (Some(r.id), r.workspace_id),
-            AnyRequest::WebsocketRequest(r) => (Some(r.id), r.workspace_id),
-        };
-        let cookie_jar_id = resolve_cookie_jar_id(context, &workspace_id, explicit_cookie_jar_id)?;
-        return Ok(CliExecutionContext {
-            request_id,
-            workspace_id: Some(workspace_id),
-            environment_id: environment.map(str::to_string),
-            cookie_jar_id,
-        });
-    }
-
-    if let Ok(folder) = context.db().get_folder(id) {
-        let cookie_jar_id =
-            resolve_cookie_jar_id(context, &folder.workspace_id, explicit_cookie_jar_id)?;
-        return Ok(CliExecutionContext {
-            request_id: None,
-            workspace_id: Some(folder.workspace_id),
-            environment_id: environment.map(str::to_string),
-            cookie_jar_id,
-        });
-    }
-
-    if let Ok(workspace) = context.db().get_workspace(id) {
-        let cookie_jar_id = resolve_cookie_jar_id(context, &workspace.id, explicit_cookie_jar_id)?;
-        return Ok(CliExecutionContext {
-            request_id: None,
-            workspace_id: Some(workspace.id),
-            environment_id: environment.map(str::to_string),
-            cookie_jar_id,
-        });
-    }
-
-    Err(format!("Could not resolve ID '{}' as request, folder, or workspace", id))
-}
-
-fn resolve_request_execution_context(
-    context: &CliContext,
-    request_id: &str,
-    environment: Option<&str>,
-    explicit_cookie_jar_id: Option<&str>,
-) -> Result<CliExecutionContext, String> {
-    let request = context
-        .db()
-        .get_any_request(request_id)
-        .map_err(|e| format!("Failed to get request: {e}"))?;
-
-    let workspace_id = match request {
-        AnyRequest::HttpRequest(r) => r.workspace_id,
-        AnyRequest::GrpcRequest(r) => r.workspace_id,
-        AnyRequest::WebsocketRequest(r) => r.workspace_id,
-    };
-    let cookie_jar_id = resolve_cookie_jar_id(context, &workspace_id, explicit_cookie_jar_id)?;
-
-    Ok(CliExecutionContext {
-        request_id: Some(request_id.to_string()),
-        workspace_id: Some(workspace_id),
-        environment_id: environment.map(str::to_string),
-        cookie_jar_id,
-    })
-}
-
-fn resolve_cookie_jar_id(
-    context: &CliContext,
-    workspace_id: &str,
-    explicit_cookie_jar_id: Option<&str>,
-) -> Result<Option<String>, String> {
-    if let Some(cookie_jar_id) = explicit_cookie_jar_id {
-        return Ok(Some(cookie_jar_id.to_string()));
-    }
-
-    let default_cookie_jar = context
-        .db()
-        .list_cookie_jars(workspace_id)
-        .map_err(|e| format!("Failed to list cookie jars: {e}"))?
-        .into_iter()
-        .min_by_key(|jar| jar.created_at)
-        .map(|jar| jar.id);
-    Ok(default_cookie_jar)
-}
--- a/crates-cli/yaak-cli/src/plugin_events.rs
+++ b/crates-cli/yaak-cli/src/plugin_events.rs
--- a/crates-cli/yaak-cli/src/ui.rs
+++ b/crates-cli/yaak-cli/src/ui.rs
@@ -17,14 +17,6 @@ pub fn warning(message: &str) {
    }
 }

-pub fn warning_stderr(message: &str) {
-    if io::stderr().is_terminal() {
-        eprintln!("{:<8} {}", style("WARNING").yellow().bold(), style(message).yellow());
-    } else {
-        eprintln!("WARNING  {message}");
-    }
-}
-
 pub fn success(message: &str) {
    if io::stdout().is_terminal() {
        println!("{:<8} {}", style("SUCCESS").green().bold(), style(message).green());
--- a/crates-cli/yaak-cli/src/utils/mod.rs
+++ b/crates-cli/yaak-cli/src/utils/mod.rs
@@ -2,4 +2,3 @@ pub mod confirm;
 pub mod http;
 pub mod json;
 pub mod schema;
-pub mod workspace;
--- a/crates-cli/yaak-cli/src/utils/workspace.rs
+++ b/crates-cli/yaak-cli/src/utils/workspace.rs
@@ -1,19 +0,0 @@
-use crate::context::CliContext;
-
-pub fn resolve_workspace_id(
-    ctx: &CliContext,
-    workspace_id: Option<&str>,
-    command_name: &str,
-) -> Result<String, String> {
-    if let Some(workspace_id) = workspace_id {
-        return Ok(workspace_id.to_string());
-    }
-
-    let workspaces =
-        ctx.db().list_workspaces().map_err(|e| format!("Failed to list workspaces: {e}"))?;
-    match workspaces.as_slice() {
-        [] => Err(format!("No workspaces found. {command_name} requires a workspace ID.")),
-        [workspace] => Ok(workspace.id.clone()),
-        _ => Err(format!("Multiple workspaces found. {command_name} requires a workspace ID.")),
-    }
-}
--- a/crates-cli/yaak-cli/src/version_check.rs
+++ b/crates-cli/yaak-cli/src/version_check.rs
@@ -1,226 +0,0 @@
-use crate::ui;
-use crate::version;
-use serde::{Deserialize, Serialize};
-use std::fs;
-use std::io::IsTerminal;
-use std::path::{Path, PathBuf};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-use yaak_api::{ApiClientKind, yaak_api_client};
-
-const CACHE_FILE_NAME: &str = "cli-version-check.json";
-const CHECK_INTERVAL_SECS: u64 = 24 * 60 * 60;
-const REQUEST_TIMEOUT: Duration = Duration::from_millis(800);
-
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-#[serde(default)]
-struct VersionCheckResponse {
-    outdated: bool,
-    latest_version: Option<String>,
-    upgrade_hint: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-struct CacheRecord {
-    checked_at_epoch_secs: u64,
-    response: VersionCheckResponse,
-    last_warned_at_epoch_secs: Option<u64>,
-    last_warned_version: Option<String>,
-}
-
-impl Default for CacheRecord {
-    fn default() -> Self {
-        Self {
-            checked_at_epoch_secs: 0,
-            response: VersionCheckResponse::default(),
-            last_warned_at_epoch_secs: None,
-            last_warned_version: None,
-        }
-    }
-}
-
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct VersionCheckRequest<'a> {
-    current_version: &'a str,
-    channel: String,
-    install_source: String,
-    platform: &'a str,
-    arch: &'a str,
-}
-
-pub async fn maybe_check_for_updates() {
-    if should_skip_check() {
-        return;
-    }
-
-    let now = unix_epoch_secs();
-    let cache_path = cache_path();
-    let cached = read_cache(&cache_path);
-
-    if let Some(cache) = cached.as_ref().filter(|c| !is_expired(c.checked_at_epoch_secs, now)) {
-        let mut record = cache.clone();
-        maybe_warn_outdated(&mut record, now);
-        write_cache(&cache_path, &record);
-        return;
-    }
-
-    let fresh = fetch_version_check().await;
-    match fresh {
-        Some(response) => {
-            let mut record = CacheRecord {
-                checked_at_epoch_secs: now,
-                response: response.clone(),
-                last_warned_at_epoch_secs: cached
-                    .as_ref()
-                    .and_then(|c| c.last_warned_at_epoch_secs),
-                last_warned_version: cached.as_ref().and_then(|c| c.last_warned_version.clone()),
-            };
-            maybe_warn_outdated(&mut record, now);
-            write_cache(&cache_path, &record);
-        }
-        None => {
-            let fallback = cached.as_ref().map(|cache| cache.response.clone()).unwrap_or_default();
-            let mut record = CacheRecord {
-                checked_at_epoch_secs: now,
-                response: fallback,
-                last_warned_at_epoch_secs: cached
-                    .as_ref()
-                    .and_then(|c| c.last_warned_at_epoch_secs),
-                last_warned_version: cached.as_ref().and_then(|c| c.last_warned_version.clone()),
-            };
-            maybe_warn_outdated(&mut record, now);
-            write_cache(&cache_path, &record);
-        }
-    }
-}
-
-fn should_skip_check() -> bool {
-    if std::env::var("YAAK_CLI_NO_UPDATE_CHECK")
-        .is_ok_and(|v| v == "1" || v.eq_ignore_ascii_case("true"))
-    {
-        return true;
-    }
-
-    if std::env::var("CI").is_ok() {
-        return true;
-    }
-
-    !std::io::stdout().is_terminal()
-}
-
-async fn fetch_version_check() -> Option<VersionCheckResponse> {
-    let api_url = format!("{}/cli/check", update_base_url());
-    let current_version = version::cli_version();
-    let payload = VersionCheckRequest {
-        current_version,
-        channel: release_channel(current_version),
-        install_source: install_source(),
-        platform: std::env::consts::OS,
-        arch: std::env::consts::ARCH,
-    };
-
-    let client = yaak_api_client(ApiClientKind::Cli, current_version).ok()?;
-    let request = client.post(api_url).json(&payload);
-
-    let response = tokio::time::timeout(REQUEST_TIMEOUT, request.send()).await.ok()?.ok()?;
-    if !response.status().is_success() {
-        return None;
-    }
-
-    tokio::time::timeout(REQUEST_TIMEOUT, response.json::<VersionCheckResponse>()).await.ok()?.ok()
-}
-
-fn release_channel(version: &str) -> String {
-    version
-        .split_once('-')
-        .and_then(|(_, suffix)| suffix.split('.').next())
-        .unwrap_or("stable")
-        .to_string()
-}
-
-fn install_source() -> String {
-    std::env::var("YAAK_CLI_INSTALL_SOURCE")
-        .ok()
-        .filter(|s| !s.trim().is_empty())
-        .unwrap_or_else(|| "source".to_string())
-}
-
-fn update_base_url() -> &'static str {
-    match std::env::var("ENVIRONMENT").ok().as_deref() {
-        Some("development") => "http://localhost:9444",
-        _ => "https://update.yaak.app",
-    }
-}
-
-fn maybe_warn_outdated(record: &mut CacheRecord, now: u64) {
-    if !record.response.outdated {
-        return;
-    }
-
-    let latest =
-        record.response.latest_version.clone().unwrap_or_else(|| "a newer release".to_string());
-    let warn_suppressed = record.last_warned_version.as_deref() == Some(latest.as_str())
-        && record.last_warned_at_epoch_secs.is_some_and(|t| !is_expired(t, now));
-    if warn_suppressed {
-        return;
-    }
-
-    let hint = record.response.upgrade_hint.clone().unwrap_or_else(default_upgrade_hint);
-    ui::warning_stderr(&format!("A newer Yaak CLI version is available ({latest}). {hint}"));
-    record.last_warned_version = Some(latest);
-    record.last_warned_at_epoch_secs = Some(now);
-}
-
-fn default_upgrade_hint() -> String {
-    if install_source() == "npm" {
-        let channel = release_channel(version::cli_version());
-        if channel == "stable" {
-            return "Run `npm install -g @yaakapp/cli@latest` to update.".to_string();
-        }
-        return format!("Run `npm install -g @yaakapp/cli@{channel}` to update.");
-    }
-
-    "Update your Yaak CLI installation to the latest release.".to_string()
-}
-
-fn cache_path() -> PathBuf {
-    std::env::temp_dir().join("yaak-cli").join(format!("{}-{CACHE_FILE_NAME}", environment_name()))
-}
-
-fn environment_name() -> &'static str {
-    match std::env::var("ENVIRONMENT").ok().as_deref() {
-        Some("staging") => "staging",
-        Some("development") => "development",
-        _ => "production",
-    }
-}
-
-fn read_cache(path: &Path) -> Option<CacheRecord> {
-    let contents = fs::read_to_string(path).ok()?;
-    serde_json::from_str::<CacheRecord>(&contents).ok()
-}
-
-fn write_cache(path: &Path, record: &CacheRecord) {
-    let Some(parent) = path.parent() else {
-        return;
-    };
-    if fs::create_dir_all(parent).is_err() {
-        return;
-    }
-    let Ok(json) = serde_json::to_string(record) else {
-        return;
-    };
-    let _ = fs::write(path, json);
-}
-
-fn is_expired(checked_at_epoch_secs: u64, now: u64) -> bool {
-    now.saturating_sub(checked_at_epoch_secs) >= CHECK_INTERVAL_SECS
-}
-
-fn unix_epoch_secs() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .unwrap_or_else(|_| Duration::from_secs(0))
-        .as_secs()
-}
--- a/crates-cli/yaak-cli/tests/common/http_server.rs
+++ b/crates-cli/yaak-cli/tests/common/http_server.rs
@@ -1,14 +1,9 @@
 use std::io::{Read, Write};
-use std::net::{SocketAddr, TcpListener, TcpStream};
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::net::TcpListener;
 use std::thread;
-use std::time::Duration;

 pub struct TestHttpServer {
    pub url: String,
-    addr: SocketAddr,
-    shutdown: Arc<AtomicBool>,
    handle: Option<thread::JoinHandle<()>>,
 }

@@ -17,46 +12,29 @@ impl TestHttpServer {
        let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind test HTTP server");
        let addr = listener.local_addr().expect("Failed to get local addr");
        let url = format!("http://{addr}/test");
-        listener.set_nonblocking(true).expect("Failed to set test server listener nonblocking");
-
-        let shutdown = Arc::new(AtomicBool::new(false));
-        let shutdown_signal = Arc::clone(&shutdown);
        let body_bytes = body.as_bytes().to_vec();

        let handle = thread::spawn(move || {
-            while !shutdown_signal.load(Ordering::Relaxed) {
-                match listener.accept() {
-                    Ok((mut stream, _)) => {
-                        let _ = stream.set_read_timeout(Some(Duration::from_secs(1)));
-                        let mut request_buf = [0u8; 4096];
-                        let _ = stream.read(&mut request_buf);
+            if let Ok((mut stream, _)) = listener.accept() {
+                let mut request_buf = [0u8; 4096];
+                let _ = stream.read(&mut request_buf);

-                        let response = format!(
-                            "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
-                            body_bytes.len()
-                        );
-                        let _ = stream.write_all(response.as_bytes());
-                        let _ = stream.write_all(&body_bytes);
-                        let _ = stream.flush();
-                        break;
-                    }
-                    Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => {
-                        thread::sleep(Duration::from_millis(10));
-                    }
-                    Err(_) => break,
-                }
+                let response = format!(
+                    "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
+                    body_bytes.len()
+                );
+                let _ = stream.write_all(response.as_bytes());
+                let _ = stream.write_all(&body_bytes);
+                let _ = stream.flush();
            }
        });

-        Self { url, addr, shutdown, handle: Some(handle) }
+        Self { url, handle: Some(handle) }
    }
 }

 impl Drop for TestHttpServer {
    fn drop(&mut self) {
-        self.shutdown.store(true, Ordering::Relaxed);
-        let _ = TcpStream::connect(self.addr);
-
        if let Some(handle) = self.handle.take() {
            let _ = handle.join();
        }
--- a/crates-cli/yaak-cli/tests/workspace_commands.rs
+++ b/crates-cli/yaak-cli/tests/workspace_commands.rs
@@ -70,8 +70,6 @@ fn workspace_schema_outputs_json_schema() {
        .stdout(contains("\"type\":\"object\""))
        .stdout(contains("\"x-yaak-agent-hints\""))
        .stdout(contains("\"templateVariableSyntax\":\"${[ my_var ]}\""))
-        .stdout(contains(
-            "\"templateFunctionSyntax\":\"${[ namespace.my_func(a='aaa',b='bbb') ]}\"",
-        ))
+        .stdout(contains("\"templateFunctionSyntax\":\"${[ namespace.my_func(a='aaa',b='bbb') ]}\""))
        .stdout(contains("\"name\""));
 }
--- a/crates-tauri/yaak-app/Cargo.toml
+++ b/crates-tauri/yaak-app/Cargo.toml
@@ -30,7 +30,6 @@ 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"
--- a/crates-tauri/yaak-app/src/lib.rs
+++ b/crates-tauri/yaak-app/src/lib.rs
@@ -31,16 +31,14 @@ use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 use tokio::sync::Mutex;
 use tokio::task::block_in_place;
 use tokio::time;
-use yaak_common::command::new_checked_command;
 use yaak_crypto::manager::EncryptionManager;
 use yaak_grpc::manager::{GrpcConfig, GrpcHandle};
-use yaak_templates::strip_json_comments::strip_json_comments;
 use yaak_grpc::{Code, ServiceDefinition, serialize_message};
 use yaak_mac_window::AppHandleMacWindowExt;
 use yaak_models::models::{
    AnyModel, CookieJar, Environment, GrpcConnection, GrpcConnectionState, GrpcEvent,
-    GrpcEventType, HttpRequest, HttpResponse, HttpResponseEvent, HttpResponseState, Workspace,
-    WorkspaceMeta,
+    GrpcEventType, HttpRequest, HttpResponse, HttpResponseEvent, HttpResponseState, Plugin,
+    Workspace, WorkspaceMeta,
 };
 use yaak_models::util::{BatchUpsertResult, UpdateSource, get_workspace_export_resources};
 use yaak_plugins::events::{
@@ -99,7 +97,6 @@ impl<R: Runtime> PluginContextExt<R> for WebviewWindow<R> {
 struct AppMetaData {
    is_dev: bool,
    version: String,
-    cli_version: Option<String>,
    name: String,
    app_data_dir: String,
    app_log_dir: String,
@@ -116,11 +113,9 @@ async fn cmd_metadata(app_handle: AppHandle) -> YaakResult<AppMetaData> {
    let vendored_plugin_dir =
        app_handle.path().resolve("vendored/plugins", BaseDirectory::Resource)?;
    let default_project_dir = app_handle.path().home_dir()?.join("YaakProjects");
-    let cli_version = detect_cli_version().await;
    Ok(AppMetaData {
        is_dev: is_dev(),
        version: app_handle.package_info().version.to_string(),
-        cli_version,
        name: app_handle.package_info().name.to_string(),
        app_data_dir: app_data_dir.to_string_lossy().to_string(),
        app_log_dir: app_log_dir.to_string_lossy().to_string(),
@@ -131,24 +126,6 @@ async fn cmd_metadata(app_handle: AppHandle) -> YaakResult<AppMetaData> {
    })
 }

-async fn detect_cli_version() -> Option<String> {
-    detect_cli_version_for_binary("yaak").await
-}
-
-async fn detect_cli_version_for_binary(program: &str) -> Option<String> {
-    let mut cmd = new_checked_command(program, "--version").await.ok()?;
-    let out = cmd.arg("--version").output().await.ok()?;
-    if !out.status.success() {
-        return None;
-    }
-
-    let line = String::from_utf8(out.stdout).ok()?;
-    let line = line.lines().find(|l| !l.trim().is_empty())?.trim();
-    let mut parts = line.split_whitespace();
-    let _name = parts.next();
-    Some(parts.next().unwrap_or(line).to_string())
-}
-
 #[tauri::command]
 async fn cmd_template_tokens_to_string<R: Runtime>(
    window: WebviewWindow<R>,
@@ -434,7 +411,6 @@ async fn cmd_grpc_go<R: Runtime>(
                            result.expect("Failed to render template")
                        })
                    });
-                    let msg = strip_json_comments(&msg);
                    in_msg_tx.try_send(msg.clone()).unwrap();
                }
                Ok(IncomingMsg::Commit) => {
@@ -470,7 +446,6 @@ async fn cmd_grpc_go<R: Runtime>(
            &RenderOptions { error_behavior: RenderErrorBehavior::Throw },
        )
        .await?;
-        let msg = strip_json_comments(&msg);

        app_handle.db().upsert_grpc_event(
            &GrpcEvent {
@@ -872,14 +847,6 @@ async fn cmd_format_json(text: &str) -> YaakResult<String> {
    Ok(format_json(text, "  "))
 }

-#[tauri::command]
-async fn cmd_format_graphql(text: &str) -> YaakResult<String> {
-    match pretty_graphql::format_text(text, &Default::default()) {
-        Ok(formatted) => Ok(formatted),
-        Err(_) => Ok(text.to_string()),
-    }
-}
-
 #[tauri::command]
 async fn cmd_http_response_body<R: Runtime>(
    window: WebviewWindow<R>,
@@ -1378,6 +1345,29 @@ async fn cmd_send_http_request<R: Runtime>(
    Ok(r)
 }

+#[tauri::command]
+async fn cmd_install_plugin<R: Runtime>(
+    directory: &str,
+    url: Option<String>,
+    plugin_manager: State<'_, PluginManager>,
+    app_handle: AppHandle<R>,
+    window: WebviewWindow<R>,
+) -> YaakResult<Plugin> {
+    let plugin = app_handle.db().upsert_plugin(
+        &Plugin { directory: directory.into(), url, enabled: true, ..Default::default() },
+        &UpdateSource::from_window_label(window.label()),
+    )?;
+
+    plugin_manager
+        .add_plugin(
+            &PluginContext::new(Some(window.label().to_string()), window.workspace_id()),
+            &plugin,
+        )
+        .await?;
+
+    Ok(plugin)
+}
+
 #[tauri::command]
 async fn cmd_reload_plugins<R: Runtime>(
    app_handle: AppHandle<R>,
@@ -1649,7 +1639,6 @@ pub fn run() {
            cmd_http_request_body,
            cmd_http_response_body,
            cmd_format_json,
-            cmd_format_graphql,
            cmd_get_http_authentication_summaries,
            cmd_get_http_authentication_config,
            cmd_get_sse_events,
@@ -1663,6 +1652,7 @@ pub fn run() {
            cmd_workspace_actions,
            cmd_folder_actions,
            cmd_import_data,
+            cmd_install_plugin,
            cmd_metadata,
            cmd_new_child_window,
            cmd_new_main_window,
@@ -1731,7 +1721,6 @@ pub fn run() {
            git_ext::cmd_git_rm_remote,
            //
            // Plugin commands
-            plugins_ext::cmd_plugins_install_from_directory,
            plugins_ext::cmd_plugins_search,
            plugins_ext::cmd_plugins_install,
            plugins_ext::cmd_plugins_uninstall,
--- a/crates-tauri/yaak-app/src/models_ext.rs
+++ b/crates-tauri/yaak-app/src/models_ext.rs
@@ -15,7 +15,6 @@ use yaak_models::error::Result;
 use yaak_models::models::{AnyModel, GraphQlIntrospection, GrpcEvent, Settings, WebsocketEvent};
 use yaak_models::query_manager::QueryManager;
 use yaak_models::util::UpdateSource;
-use yaak_plugins::manager::PluginManager;

 const MODEL_CHANGES_RETENTION_HOURS: i64 = 1;
 const MODEL_CHANGES_POLL_INTERVAL_MS: u64 = 1000;
@@ -256,32 +255,23 @@ pub(crate) fn models_upsert_graphql_introspection<R: Runtime>(
 }

 #[tauri::command]
-pub(crate) async fn models_workspace_models<R: Runtime>(
+pub(crate) fn models_workspace_models<R: Runtime>(
    window: WebviewWindow<R>,
    workspace_id: Option<&str>,
-    plugin_manager: State<'_, PluginManager>,
 ) -> Result<String> {
+    let db = window.db();
    let mut l: Vec<AnyModel> = Vec::new();

-    // Add the global models
-    {
-        let db = window.db();
-        l.push(db.get_settings().into());
-        l.append(&mut db.list_workspaces()?.into_iter().map(Into::into).collect());
-        l.append(&mut db.list_key_values()?.into_iter().map(Into::into).collect());
-    }
+    // Add the settings
+    l.push(db.get_settings().into());

-    let plugins = {
-        let db = window.db();
-        db.list_plugins()?
-    };
-
-    let plugins = plugin_manager.resolve_plugins_for_runtime_from_db(plugins).await;
-    l.append(&mut plugins.into_iter().map(Into::into).collect());
+    // Add global models
+    l.append(&mut db.list_workspaces()?.into_iter().map(Into::into).collect());
+    l.append(&mut db.list_key_values()?.into_iter().map(Into::into).collect());
+    l.append(&mut db.list_plugins()?.into_iter().map(Into::into).collect());

    // Add the workspace children
    if let Some(wid) = workspace_id {
-        let db = window.db();
        l.append(&mut db.list_cookie_jars(wid)?.into_iter().map(Into::into).collect());
        l.append(&mut db.list_environments_ensure_base(wid)?.into_iter().map(Into::into).collect());
        l.append(&mut db.list_folders(wid)?.into_iter().map(Into::into).collect());
--- a/crates-tauri/yaak-app/src/notifications.rs
+++ b/crates-tauri/yaak-app/src/notifications.rs
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use std::time::Instant;
 use tauri::{AppHandle, Emitter, Manager, Runtime, WebviewWindow};
 use ts_rs::TS;
-use yaak_api::{ApiClientKind, yaak_api_client};
+use yaak_api::yaak_api_client;
 use yaak_common::platform::get_os_str;
 use yaak_models::util::UpdateSource;

@@ -102,7 +102,7 @@ impl YaakNotifier {

        let launch_info = get_or_upsert_launch_info(app_handle);
        let app_version = app_handle.package_info().version.to_string();
-        let req = yaak_api_client(ApiClientKind::App, &app_version)?
+        let req = yaak_api_client(&app_version)?
            .request(Method::GET, "https://notify.yaak.app/notifications")
            .query(&[
                ("version", &launch_info.current_version),
--- a/crates-tauri/yaak-app/src/plugin_events.rs
+++ b/crates-tauri/yaak-app/src/plugin_events.rs
@@ -19,13 +19,13 @@ use yaak::plugin_events::{
    GroupedPluginEvent, HostRequest, SharedPluginEventContext, handle_shared_plugin_event,
 };
 use yaak_crypto::manager::EncryptionManager;
-use yaak_models::models::{HttpResponse, Plugin};
+use yaak_models::models::{AnyModel, HttpResponse, Plugin};
 use yaak_models::queries::any_request::AnyRequest;
 use yaak_models::util::UpdateSource;
 use yaak_plugins::error::Error::PluginErr;
 use yaak_plugins::events::{
-    Color, EmptyPayload, ErrorResponse, GetCookieValueResponse, Icon, InternalEvent,
-    InternalEventPayload, ListCookieNamesResponse, ListOpenWorkspacesResponse,
+    Color, EmptyPayload, ErrorResponse, FindHttpResponsesResponse, GetCookieValueResponse, Icon,
+    InternalEvent, InternalEventPayload, ListCookieNamesResponse, ListOpenWorkspacesResponse,
    RenderGrpcRequestResponse, RenderHttpRequestResponse, SendHttpRequestResponse,
    ShowToastRequest, TemplateRenderResponse, WindowInfoResponse, WindowNavigateEvent,
    WorkspaceInfo,
@@ -118,7 +118,7 @@ async fn handle_host_plugin_request<R: Runtime>(
                    &InternalEventPayload::ShowToastRequest(ShowToastRequest {
                        message: format!("Reloaded plugin {}@{}", info.name, info.version),
                        icon: Some(Icon::Info),
-                        timeout: Some(5000),
+                        timeout: Some(3000),
                        ..Default::default()
                    }),
                    None,
@@ -190,6 +190,71 @@ async fn handle_host_plugin_request<R: Runtime>(
                Ok(None)
            }
        }
+        HostRequest::FindHttpResponses(req) => {
+            let http_responses = app_handle
+                .db()
+                .list_http_responses_for_request(&req.request_id, req.limit.map(|l| l as u64))
+                .unwrap_or_default();
+            Ok(Some(InternalEventPayload::FindHttpResponsesResponse(FindHttpResponsesResponse {
+                http_responses,
+            })))
+        }
+        HostRequest::UpsertModel(req) => {
+            use AnyModel::*;
+            let model = match &req.model {
+                HttpRequest(m) => {
+                    HttpRequest(app_handle.db().upsert_http_request(m, &UpdateSource::Plugin)?)
+                }
+                GrpcRequest(m) => {
+                    GrpcRequest(app_handle.db().upsert_grpc_request(m, &UpdateSource::Plugin)?)
+                }
+                WebsocketRequest(m) => WebsocketRequest(
+                    app_handle.db().upsert_websocket_request(m, &UpdateSource::Plugin)?,
+                ),
+                Folder(m) => Folder(app_handle.db().upsert_folder(m, &UpdateSource::Plugin)?),
+                Environment(m) => {
+                    Environment(app_handle.db().upsert_environment(m, &UpdateSource::Plugin)?)
+                }
+                Workspace(m) => {
+                    Workspace(app_handle.db().upsert_workspace(m, &UpdateSource::Plugin)?)
+                }
+                _ => {
+                    return Err(PluginErr("Upsert not supported for this model type".into()).into());
+                }
+            };
+
+            Ok(Some(InternalEventPayload::UpsertModelResponse(
+                yaak_plugins::events::UpsertModelResponse { model },
+            )))
+        }
+        HostRequest::DeleteModel(req) => {
+            let model = match req.model.as_str() {
+                "http_request" => AnyModel::HttpRequest(
+                    app_handle.db().delete_http_request_by_id(&req.id, &UpdateSource::Plugin)?,
+                ),
+                "grpc_request" => AnyModel::GrpcRequest(
+                    app_handle.db().delete_grpc_request_by_id(&req.id, &UpdateSource::Plugin)?,
+                ),
+                "websocket_request" => AnyModel::WebsocketRequest(
+                    app_handle
+                        .db()
+                        .delete_websocket_request_by_id(&req.id, &UpdateSource::Plugin)?,
+                ),
+                "folder" => AnyModel::Folder(
+                    app_handle.db().delete_folder_by_id(&req.id, &UpdateSource::Plugin)?,
+                ),
+                "environment" => AnyModel::Environment(
+                    app_handle.db().delete_environment_by_id(&req.id, &UpdateSource::Plugin)?,
+                ),
+                _ => {
+                    return Err(PluginErr("Delete not supported for this model type".into()).into());
+                }
+            };
+
+            Ok(Some(InternalEventPayload::DeleteModelResponse(
+                yaak_plugins::events::DeleteModelResponse { model },
+            )))
+        }
        HostRequest::RenderGrpcRequest(req) => {
            let window = get_window_from_plugin_context(app_handle, plugin_context)?;

--- a/crates-tauri/yaak-app/src/plugins_ext.rs
+++ b/crates-tauri/yaak-app/src/plugins_ext.rs
@@ -10,6 +10,7 @@ use crate::error::Result;
 use crate::models_ext::QueryManagerExt;
 use log::{error, info, warn};
 use serde::Serialize;
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::{Duration, Instant};
@@ -21,9 +22,8 @@ use tauri::{
 };
 use tokio::sync::Mutex;
 use ts_rs::TS;
-use yaak_api::{ApiClientKind, yaak_api_client};
-use yaak_models::models::{Plugin, PluginSource};
-use yaak_models::util::UpdateSource;
+use yaak_api::yaak_api_client;
+use yaak_models::models::Plugin;
 use yaak_plugins::api::{
    PluginNameVersion, PluginSearchResponse, PluginUpdatesResponse, check_plugin_updates,
    search_plugins,
@@ -73,7 +73,7 @@ impl PluginUpdater {
        info!("Checking for plugin updates");

        let app_version = window.app_handle().package_info().version.to_string();
-        let http_client = yaak_api_client(ApiClientKind::App, &app_version)?;
+        let http_client = yaak_api_client(&app_version)?;
        let plugins = window.app_handle().db().list_plugins()?;
        let updates = check_plugin_updates(&http_client, plugins.clone()).await?;

@@ -138,7 +138,7 @@ pub async fn cmd_plugins_search<R: Runtime>(
    query: &str,
 ) -> Result<PluginSearchResponse> {
    let app_version = app_handle.package_info().version.to_string();
-    let http_client = yaak_api_client(ApiClientKind::App, &app_version)?;
+    let http_client = yaak_api_client(&app_version)?;
    Ok(search_plugins(&http_client, query).await?)
 }

@@ -150,7 +150,7 @@ pub async fn cmd_plugins_install<R: Runtime>(
 ) -> Result<()> {
    let plugin_manager = Arc::new((*window.state::<PluginManager>()).clone());
    let app_version = window.app_handle().package_info().version.to_string();
-    let http_client = yaak_api_client(ApiClientKind::App, &app_version)?;
+    let http_client = yaak_api_client(&app_version)?;
    let query_manager = window.state::<yaak_models::query_manager::QueryManager>();
    let plugin_context = window.plugin_context();
    download_and_install(
@@ -165,28 +165,6 @@ pub async fn cmd_plugins_install<R: Runtime>(
    Ok(())
 }

-#[command]
-pub async fn cmd_plugins_install_from_directory<R: Runtime>(
-    window: WebviewWindow<R>,
-    directory: &str,
-) -> Result<Plugin> {
-    let plugin = window.db().upsert_plugin(
-        &Plugin {
-            directory: directory.into(),
-            url: None,
-            enabled: true,
-            source: PluginSource::Filesystem,
-            ..Default::default()
-        },
-        &UpdateSource::from_window_label(window.label()),
-    )?;
-
-    let plugin_manager = Arc::new((*window.state::<PluginManager>()).clone());
-    plugin_manager.add_plugin(&window.plugin_context(), &plugin).await?;
-
-    Ok(plugin)
-}
-
 #[command]
 pub async fn cmd_plugins_uninstall<R: Runtime>(
    plugin_id: &str,
@@ -203,7 +181,7 @@ pub async fn cmd_plugins_updates<R: Runtime>(
    app_handle: AppHandle<R>,
 ) -> Result<PluginUpdatesResponse> {
    let app_version = app_handle.package_info().version.to_string();
-    let http_client = yaak_api_client(ApiClientKind::App, &app_version)?;
+    let http_client = yaak_api_client(&app_version)?;
    let plugins = app_handle.db().list_plugins()?;
    Ok(check_plugin_updates(&http_client, plugins).await?)
 }
@@ -213,7 +191,7 @@ pub async fn cmd_plugins_update_all<R: Runtime>(
    window: WebviewWindow<R>,
 ) -> Result<Vec<PluginNameVersion>> {
    let app_version = window.app_handle().package_info().version.to_string();
-    let http_client = yaak_api_client(ApiClientKind::App, &app_version)?;
+    let http_client = yaak_api_client(&app_version)?;
    let plugins = window.db().list_plugins()?;

    // Get list of available updates (already filtered to only registry plugins)
@@ -266,6 +244,11 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
                .path()
                .resolve("vendored/plugins", BaseDirectory::Resource)
                .expect("failed to resolve plugin directory resource");
+            let bundled_plugin_dir = if is_dev() {
+                resolve_workspace_plugins_dir().unwrap_or_else(|| vendored_plugin_dir.clone())
+            } else {
+                vendored_plugin_dir.clone()
+            };

            let installed_plugin_dir = app_handle
                .path()
@@ -289,7 +272,6 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
                .expect("failed to resolve plugin runtime")
                .join("index.cjs");

-            let dev_mode = is_dev();
            let query_manager =
                app_handle.state::<yaak_models::query_manager::QueryManager>().inner().clone();

@@ -297,13 +279,13 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
            let app_handle_clone = app_handle.clone();
            tauri::async_runtime::block_on(async move {
                let manager = PluginManager::new(
+                    bundled_plugin_dir,
                    vendored_plugin_dir,
                    installed_plugin_dir,
                    node_bin_path,
                    plugin_runtime_main,
                    &query_manager,
                    &PluginContext::new_empty(),
-                    dev_mode,
                )
                .await
                .expect("Failed to initialize plugins");
@@ -345,3 +327,11 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
        })
        .build()
 }
+
+fn resolve_workspace_plugins_dir() -> Option<PathBuf> {
+    PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("../..")
+        .join("plugins")
+        .canonicalize()
+        .ok()
+}
--- a/crates-tauri/yaak-app/src/render.rs
+++ b/crates-tauri/yaak-app/src/render.rs
@@ -1,6 +1,8 @@
+use log::info;
 use serde_json::Value;
-pub use yaak::render::{render_grpc_request, render_http_request};
-use yaak_models::models::Environment;
+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};

@@ -23,3 +25,61 @@ pub async fn render_json_value<T: TemplateCallback>(
    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/src/uri_scheme.rs
+++ b/crates-tauri/yaak-app/src/uri_scheme.rs
@@ -8,7 +8,7 @@ use std::fs;
 use std::sync::Arc;
 use tauri::{AppHandle, Emitter, Manager, Runtime, Url};
 use tauri_plugin_dialog::{DialogExt, MessageDialogButtons, MessageDialogKind};
-use yaak_api::{ApiClientKind, yaak_api_client};
+use yaak_api::yaak_api_client;
 use yaak_models::util::generate_id;
 use yaak_plugins::events::{Color, ShowToastRequest};
 use yaak_plugins::install::download_and_install;
@@ -47,7 +47,7 @@ pub(crate) async fn handle_deep_link<R: Runtime>(
            let plugin_manager = Arc::new((*window.state::<PluginManager>()).clone());
            let query_manager = app_handle.db_manager();
            let app_version = app_handle.package_info().version.to_string();
-            let http_client = yaak_api_client(ApiClientKind::App, &app_version)?;
+            let http_client = yaak_api_client(&app_version)?;
            let plugin_context = window.plugin_context();
            let pv = download_and_install(
                plugin_manager,
@@ -88,8 +88,7 @@ pub(crate) async fn handle_deep_link<R: Runtime>(
                }

                let app_version = app_handle.package_info().version.to_string();
-                let resp =
-                    yaak_api_client(ApiClientKind::App, &app_version)?.get(file_url).send().await?;
+                let resp = yaak_api_client(&app_version)?.get(file_url).send().await?;
                let json = resp.bytes().await?;
                let p = app_handle
                    .path()
--- a/crates-tauri/yaak-app/src/ws_ext.rs
+++ b/crates-tauri/yaak-app/src/ws_ext.rs
@@ -24,7 +24,6 @@ use yaak_models::util::UpdateSource;
 use yaak_plugins::events::{CallHttpAuthenticationRequest, HttpHeader, RenderPurpose};
 use yaak_plugins::manager::PluginManager;
 use yaak_plugins::template_callback::PluginTemplateCallback;
-use yaak_templates::strip_json_comments::maybe_strip_json_comments;
 use yaak_templates::{RenderErrorBehavior, RenderOptions};
 use yaak_tls::find_client_certificate;
 use yaak_ws::{WebsocketManager, render_websocket_request};
@@ -73,10 +72,8 @@ pub async fn cmd_ws_send<R: Runtime>(
    )
    .await?;

-    let message = maybe_strip_json_comments(&request.message);
-
    let mut ws_manager = ws_manager.lock().await;
-    ws_manager.send(&connection.id, Message::Text(message.clone().into())).await?;
+    ws_manager.send(&connection.id, Message::Text(request.message.clone().into())).await?;

    app_handle.db().upsert_websocket_event(
        &WebsocketEvent {
@@ -85,7 +82,7 @@ pub async fn cmd_ws_send<R: Runtime>(
            workspace_id: connection.workspace_id.clone(),
            is_server: false,
            message_type: WebsocketEventType::Text,
-            message: message.into(),
+            message: request.message.into(),
            ..Default::default()
        },
        &UpdateSource::from_window_label(window.label()),
--- a/crates-tauri/yaak-license/src/license.rs
+++ b/crates-tauri/yaak-license/src/license.rs
@@ -7,7 +7,7 @@ use std::ops::Add;
 use std::time::Duration;
 use tauri::{AppHandle, Emitter, Manager, Runtime, WebviewWindow, is_dev};
 use ts_rs::TS;
-use yaak_api::{ApiClientKind, yaak_api_client};
+use yaak_api::yaak_api_client;
 use yaak_common::platform::get_os_str;
 use yaak_models::db_context::DbContext;
 use yaak_models::query_manager::QueryManager;
@@ -119,7 +119,7 @@ pub async fn activate_license<R: Runtime>(
 ) -> Result<()> {
    info!("Activating license {}", license_key);
    let app_version = window.app_handle().package_info().version.to_string();
-    let client = yaak_api_client(ApiClientKind::App, &app_version)?;
+    let client = yaak_api_client(&app_version)?;
    let payload = ActivateLicenseRequestPayload {
        license_key: license_key.to_string(),
        app_platform: get_os_str().to_string(),
@@ -157,7 +157,7 @@ pub async fn deactivate_license<R: Runtime>(window: &WebviewWindow<R>) -> Result
    let activation_id = get_activation_id(app_handle).await;

    let app_version = window.app_handle().package_info().version.to_string();
-    let client = yaak_api_client(ApiClientKind::App, &app_version)?;
+    let client = yaak_api_client(&app_version)?;
    let path = format!("/licenses/activations/{}/deactivate", activation_id);
    let payload =
        DeactivateLicenseRequestPayload { app_platform: get_os_str().to_string(), app_version };
@@ -203,7 +203,7 @@ pub async fn check_license<R: Runtime>(window: &WebviewWindow<R>) -> Result<Lice
        (true, _) => {
            info!("Checking license activation");
            // A license has been activated, so let's check the license server
-            let client = yaak_api_client(ApiClientKind::App, &payload.app_version)?;
+            let client = yaak_api_client(&payload.app_version)?;
            let path = format!("/licenses/activations/{activation_id}/check-v2");
            let response = client.post(build_url(&path)).json(&payload).send().await?;

--- a/crates-tauri/yaak-mac-window/src/mac.rs
+++ b/crates-tauri/yaak-mac-window/src/mac.rs
@@ -12,11 +12,6 @@ unsafe impl Sync for UnsafeWindowHandle {}

 const WINDOW_CONTROL_PAD_X: f64 = 13.0;
 const WINDOW_CONTROL_PAD_Y: f64 = 18.0;
-/// Extra pixels to add to the title bar height when the default title bar is
-/// already as tall as button_height + PAD_Y (i.e. macOS Tahoe 26+, where the
-/// default is 32px and 14 + 18 = 32). On pre-Tahoe this is unused because the
-/// default title bar is shorter than button_height + PAD_Y.
-const TITLEBAR_EXTRA_HEIGHT: f64 = 4.0;
 const MAIN_WINDOW_PREFIX: &str = "main_";

 pub(crate) fn update_window_title<R: Runtime>(window: Window<R>, title: String) {
@@ -100,29 +95,12 @@ fn position_traffic_lights(ns_window_handle: UnsafeWindowHandle, x: f64, y: f64,
            ns_window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
        let zoom = ns_window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);

+        let title_bar_container_view = close.superview().superview();
+
        let close_rect: NSRect = msg_send![close, frame];
        let button_height = close_rect.size.height;

-        let title_bar_container_view = close.superview().superview();
-
-        // Capture the OS default title bar height on the first call, before
-        // we've modified it. This avoids the height growing on repeated calls.
-        use std::sync::OnceLock;
-        static DEFAULT_TITLEBAR_HEIGHT: OnceLock<f64> = OnceLock::new();
-        let default_height =
-            *DEFAULT_TITLEBAR_HEIGHT.get_or_init(|| NSView::frame(title_bar_container_view).size.height);
-
-        // On pre-Tahoe, button_height + y is larger than the default title bar
-        // height, so the resize works as before. On Tahoe (26+), the default is
-        // already 32px and button_height + y = 32, so nothing changes. In that
-        // case, add TITLEBAR_EXTRA_HEIGHT extra pixels to push the buttons down.
-        let desired = button_height + y;
-        let title_bar_frame_height = if desired > default_height {
-            desired
-        } else {
-            default_height + TITLEBAR_EXTRA_HEIGHT
-        };
-
+        let title_bar_frame_height = button_height + y;
        let mut title_bar_rect = NSView::frame(title_bar_container_view);
        title_bar_rect.size.height = title_bar_frame_height;
        title_bar_rect.origin.y = NSView::frame(ns_window).size.height - title_bar_frame_height;
--- a/crates/yaak-api/src/lib.rs
+++ b/crates/yaak-api/src/lib.rs
@@ -8,24 +8,14 @@ use reqwest::header::{HeaderMap, HeaderValue};
 use std::time::Duration;
 use yaak_common::platform::{get_ua_arch, get_ua_platform};

-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
-pub enum ApiClientKind {
-    App,
-    Cli,
-}
-
 /// Build a reqwest Client configured for Yaak's own API calls.
 ///
 /// Includes a custom User-Agent, JSON accept header, 20s timeout, gzip,
 /// and automatic OS-level proxy detection via sysproxy.
-pub fn yaak_api_client(kind: ApiClientKind, version: &str) -> Result<Client> {
+pub fn yaak_api_client(version: &str) -> Result<Client> {
    let platform = get_ua_platform();
    let arch = get_ua_arch();
-    let product = match kind {
-        ApiClientKind::App => "Yaak",
-        ApiClientKind::Cli => "YaakCli",
-    };
-    let ua = format!("{product}/{version} ({platform}; {arch})");
+    let ua = format!("Yaak/{version} ({platform}; {arch})");

    let mut default_headers = HeaderMap::new();
    default_headers.insert("Accept", HeaderValue::from_str("application/json").unwrap());
--- a/crates/yaak-common/src/command.rs
+++ b/crates/yaak-common/src/command.rs
@@ -1,6 +1,4 @@
-use std::ffi::{OsStr, OsString};
-use std::io::{self, ErrorKind};
-use std::process::Stdio;
+use std::ffi::OsStr;

 #[cfg(target_os = "windows")]
 const CREATE_NO_WINDOW: u32 = 0x0800_0000;
@@ -16,27 +14,3 @@ pub fn new_xplatform_command<S: AsRef<OsStr>>(program: S) -> tokio::process::Com
    }
    cmd
 }
-
-/// Creates a command only if the binary exists and can be invoked with the given probe argument.
-pub async fn new_checked_command<S: AsRef<OsStr>>(
-    program: S,
-    probe_arg: &str,
-) -> io::Result<tokio::process::Command> {
-    let program: OsString = program.as_ref().to_os_string();
-
-    let mut probe = new_xplatform_command(&program);
-    probe.arg(probe_arg).stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null());
-
-    let status = probe.status().await?;
-    if !status.success() {
-        return Err(io::Error::new(
-            ErrorKind::NotFound,
-            format!(
-                "'{}' is not available on PATH or failed to execute",
-                program.to_string_lossy()
-            ),
-        ));
-    }
-
-    Ok(new_xplatform_command(&program))
-}
--- a/crates/yaak-common/src/serde.rs
+++ b/crates/yaak-common/src/serde.rs
@@ -21,10 +21,3 @@ pub fn get_str_map<'a>(v: &'a BTreeMap<String, Value>, key: &str) -> &'a str {
        Some(v) => v.as_str().unwrap_or_default(),
    }
 }
-
-pub fn get_bool_map(v: &BTreeMap<String, Value>, key: &str, fallback: bool) -> bool {
-    match v.get(key) {
-        None => fallback,
-        Some(v) => v.as_bool().unwrap_or(fallback),
-    }
-}
--- a/crates/yaak-git/src/binary.rs
+++ b/crates/yaak-git/src/binary.rs
@@ -1,8 +1,9 @@
 use crate::error::Error::GitNotFound;
 use crate::error::Result;
 use std::path::Path;
+use std::process::Stdio;
 use tokio::process::Command;
-use yaak_common::command::new_checked_command;
+use yaak_common::command::new_xplatform_command;

 /// Create a git command that runs in the specified directory
 pub(crate) async fn new_binary_command(dir: &Path) -> Result<Command> {
@@ -13,5 +14,17 @@ pub(crate) async fn new_binary_command(dir: &Path) -> Result<Command> {

 /// Create a git command without a specific directory (for global operations)
 pub(crate) async fn new_binary_command_global() -> Result<Command> {
-    new_checked_command("git", "--version").await.map_err(|_| GitNotFound)
+    // 1. Probe that `git` exists and is runnable
+    let mut probe = new_xplatform_command("git");
+    probe.arg("--version").stdin(Stdio::null()).stdout(Stdio::null()).stderr(Stdio::null());
+
+    let status = probe.status().await.map_err(|_| GitNotFound)?;
+
+    if !status.success() {
+        return Err(GitNotFound);
+    }
+
+    // 2. Build the reusable git command
+    let cmd = new_xplatform_command("git");
+    Ok(cmd)
 }
--- a/crates/yaak-http/Cargo.toml
+++ b/crates/yaak-http/Cargo.toml
@@ -29,5 +29,4 @@ tower-service = "0.3.3"
 urlencoding = "2.1.3"
 yaak-common = { workspace = true }
 yaak-models = { workspace = true }
-yaak-templates = { workspace = true }
 yaak-tls = { workspace = true }
--- a/crates/yaak-http/src/manager.rs
+++ b/crates/yaak-http/src/manager.rs
@@ -1,6 +1,7 @@
 use crate::client::HttpConnectionOptions;
 use crate::dns::LocalhostResolver;
 use crate::error::Result;
+use log::info;
 use reqwest::Client;
 use std::collections::BTreeMap;
 use std::sync::Arc;
--- a/crates/yaak-http/src/sender.rs
+++ b/crates/yaak-http/src/sender.rs
@@ -30,8 +30,6 @@ pub enum HttpResponseEvent {
        url: String,
        status: u16,
        behavior: RedirectBehavior,
-        dropped_body: bool,
-        dropped_headers: Vec<String>,
    },
    SendUrl {
        method: String,
@@ -69,28 +67,12 @@ impl Display for HttpResponseEvent {
        match self {
            HttpResponseEvent::Setting(name, value) => write!(f, "* Setting {}={}", name, value),
            HttpResponseEvent::Info(s) => write!(f, "* {}", s),
-            HttpResponseEvent::Redirect {
-                url,
-                status,
-                behavior,
-                dropped_body,
-                dropped_headers,
-            } => {
+            HttpResponseEvent::Redirect { url, status, behavior } => {
                let behavior_str = match behavior {
                    RedirectBehavior::Preserve => "preserve",
                    RedirectBehavior::DropBody => "drop body",
                };
-                let body_str = if *dropped_body { ", body dropped" } else { "" };
-                let headers_str = if dropped_headers.is_empty() {
-                    String::new()
-                } else {
-                    format!(", headers dropped: {}", dropped_headers.join(", "))
-                };
-                write!(
-                    f,
-                    "* Redirect {} -> {} ({}{}{})",
-                    status, url, behavior_str, body_str, headers_str
-                )
+                write!(f, "* Redirect {} -> {} ({})", status, url, behavior_str)
            }
            HttpResponseEvent::SendUrl {
                method,
@@ -148,21 +130,13 @@ impl From<HttpResponseEvent> for yaak_models::models::HttpResponseEventData {
        match event {
            HttpResponseEvent::Setting(name, value) => D::Setting { name, value },
            HttpResponseEvent::Info(message) => D::Info { message },
-            HttpResponseEvent::Redirect {
-                url,
-                status,
-                behavior,
-                dropped_body,
-                dropped_headers,
-            } => D::Redirect {
+            HttpResponseEvent::Redirect { url, status, behavior } => D::Redirect {
                url,
                status,
                behavior: match behavior {
                    RedirectBehavior::Preserve => "preserve".to_string(),
                    RedirectBehavior::DropBody => "drop_body".to_string(),
                },
-                dropped_body,
-                dropped_headers,
            },
            HttpResponseEvent::SendUrl {
                method,
--- a/crates/yaak-http/src/transaction.rs
+++ b/crates/yaak-http/src/transaction.rs
@@ -1,7 +1,7 @@
 use crate::cookies::CookieStore;
 use crate::error::Result;
 use crate::sender::{HttpResponse, HttpResponseEvent, HttpSender, RedirectBehavior};
-use crate::types::{SendableBody, SendableHttpRequest};
+use crate::types::SendableHttpRequest;
 use log::debug;
 use tokio::sync::mpsc;
 use tokio::sync::watch::Receiver;
@@ -87,11 +87,6 @@ impl<S: HttpSender> HttpTransaction<S> {
            };

            // Build request for this iteration
-            let preserved_body = match &current_body {
-                Some(SendableBody::Bytes(b)) => Some(SendableBody::Bytes(b.clone())),
-                _ => None,
-            };
-            let request_had_body = current_body.is_some();
            let req = SendableHttpRequest {
                url: current_url.clone(),
                method: current_method.clone(),
@@ -187,6 +182,8 @@ impl<S: HttpSender> HttpTransaction<S> {
                format!("{}/{}", base_path, location)
            };

+            Self::remove_sensitive_headers(&mut current_headers, &previous_url, &current_url);
+
            // Determine redirect behavior based on status code and method
            let behavior = if status == 303 {
                // 303 See Other always changes to GET
@@ -200,8 +197,11 @@ impl<S: HttpSender> HttpTransaction<S> {
                RedirectBehavior::Preserve
            };

-            let mut dropped_headers =
-                Self::remove_sensitive_headers(&mut current_headers, &previous_url, &current_url);
+            send_event(HttpResponseEvent::Redirect {
+                url: current_url.clone(),
+                status,
+                behavior: behavior.clone(),
+            });

            // Handle method changes for certain redirect codes
            if matches!(behavior, RedirectBehavior::DropBody) {
@@ -211,40 +211,13 @@ impl<S: HttpSender> HttpTransaction<S> {
                // Remove content-related headers
                current_headers.retain(|h| {
                    let name_lower = h.0.to_lowercase();
-                    let should_drop =
-                        name_lower.starts_with("content-") || name_lower == "transfer-encoding";
-                    if should_drop {
-                        Self::push_header_if_missing(&mut dropped_headers, &h.0);
-                    }
-                    !should_drop
+                    !name_lower.starts_with("content-") && name_lower != "transfer-encoding"
                });
            }

-            // Restore body for Preserve redirects (307/308), drop for others.
-            // Stream bodies can't be replayed (same limitation as reqwest).
-            current_body = if matches!(behavior, RedirectBehavior::Preserve) {
-                if request_had_body && preserved_body.is_none() {
-                    // Stream body was consumed and can't be replayed (same as reqwest)
-                    return Err(crate::error::Error::RequestError(
-                        "Cannot follow redirect: request body was a stream and cannot be resent"
-                            .to_string(),
-                    ));
-                }
-                preserved_body
-            } else {
-                None
-            };
-
-            // Body was dropped if the request had one but we can't resend it
-            let dropped_body = request_had_body && current_body.is_none();
-
-            send_event(HttpResponseEvent::Redirect {
-                url: current_url.clone(),
-                status,
-                behavior: behavior.clone(),
-                dropped_body,
-                dropped_headers,
-            });
+            // Reset body for next iteration (since it was moved in the send call)
+            // For redirects that change method to GET or for all redirects since body was consumed
+            current_body = None;

            redirect_count += 1;
        }
@@ -258,8 +231,7 @@ impl<S: HttpSender> HttpTransaction<S> {
        headers: &mut Vec<(String, String)>,
        previous_url: &str,
        next_url: &str,
-    ) -> Vec<String> {
-        let mut dropped_headers = Vec::new();
+    ) {
        let previous_host = Url::parse(previous_url).ok().and_then(|u| {
            u.host_str().map(|h| format!("{}:{}", h, u.port_or_known_default().unwrap_or(0)))
        });
@@ -269,24 +241,13 @@ impl<S: HttpSender> HttpTransaction<S> {
        if previous_host != next_host {
            headers.retain(|h| {
                let name_lower = h.0.to_lowercase();
-                let should_drop = name_lower == "authorization"
-                    || name_lower == "cookie"
-                    || name_lower == "cookie2"
-                    || name_lower == "proxy-authorization"
-                    || name_lower == "www-authenticate";
-                if should_drop {
-                    Self::push_header_if_missing(&mut dropped_headers, &h.0);
-                }
-                !should_drop
+                name_lower != "authorization"
+                    && name_lower != "cookie"
+                    && name_lower != "cookie2"
+                    && name_lower != "proxy-authorization"
+                    && name_lower != "www-authenticate"
            });
        }
-        dropped_headers
-    }
-
-    fn push_header_if_missing(headers: &mut Vec<String>, name: &str) {
-        if !headers.iter().any(|h| h.eq_ignore_ascii_case(name)) {
-            headers.push(name.to_string());
-        }
    }

    /// Check if a status code indicates a redirect
--- a/crates/yaak-http/src/types.rs
+++ b/crates/yaak-http/src/types.rs
@@ -9,9 +9,8 @@ use std::collections::BTreeMap;
 use std::pin::Pin;
 use std::time::Duration;
 use tokio::io::AsyncRead;
-use yaak_common::serde::{get_bool, get_bool_map, get_str, get_str_map};
+use yaak_common::serde::{get_bool, get_str, get_str_map};
 use yaak_models::models::HttpRequest;
-use yaak_templates::strip_json_comments::{maybe_strip_json_comments, strip_json_comments};

 pub(crate) const MULTIPART_BOUNDARY: &str = "------YaakFormBoundary";

@@ -135,69 +134,16 @@ pub fn append_query_params(url: &str, params: Vec<(String, String)>) -> String {
    result
 }

-fn strip_query_params(url: &str, names: &[&str]) -> String {
-    // Split off fragment
-    let (base_and_query, fragment) = if let Some(hash_pos) = url.find('#') {
-        (&url[..hash_pos], Some(&url[hash_pos..]))
-    } else {
-        (url, None)
-    };
-
-    let result = if let Some(q_pos) = base_and_query.find('?') {
-        let base = &base_and_query[..q_pos];
-        let query = &base_and_query[q_pos + 1..];
-        let filtered: Vec<&str> = query
-            .split('&')
-            .filter(|pair| {
-                let key = pair.split('=').next().unwrap_or("");
-                let decoded = urlencoding::decode(key).unwrap_or_default();
-                !names.contains(&decoded.as_ref())
-            })
-            .collect();
-        if filtered.is_empty() {
-            base.to_string()
-        } else {
-            format!("{}?{}", base, filtered.join("&"))
-        }
-    } else {
-        base_and_query.to_string()
-    };
-
-    match fragment {
-        Some(f) => format!("{}{}", result, f),
-        None => result,
-    }
-}
-
 fn build_url(r: &HttpRequest) -> String {
    let (url_string, params) = apply_path_placeholders(&ensure_proto(&r.url), &r.url_parameters);
-    let mut url = append_query_params(
+    append_query_params(
        &url_string,
        params
            .iter()
            .filter(|p| p.enabled && !p.name.is_empty())
            .map(|p| (p.name.clone(), p.value.clone()))
            .collect(),
-    );
-
-    // GraphQL GET requests encode query/variables as URL query parameters
-    if r.method.to_lowercase() == "get" && r.body_type.as_deref() == Some("graphql") {
-        url = append_graphql_query_params(&url, &r.body);
-    }
-
-    url
-}
-
-fn append_graphql_query_params(url: &str, body: &BTreeMap<String, serde_json::Value>) -> String {
-    let query = get_str_map(body, "query").to_string();
-    let variables = strip_json_comments(&get_str_map(body, "variables"));
-    let mut params = vec![("query".to_string(), query)];
-    if !variables.trim().is_empty() {
-        params.push(("variables".to_string(), variables));
-    }
-    // Strip existing query/variables params to avoid duplicates
-    let url = strip_query_params(url, &["query", "variables"]);
-    append_query_params(&url, params)
+    )
 }

 fn build_headers(r: &HttpRequest) -> Vec<(String, String)> {
@@ -231,7 +177,7 @@ async fn build_body(
            (build_form_body(&body), Some("application/x-www-form-urlencoded".to_string()))
        }
        "multipart/form-data" => build_multipart_body(&body, &headers).await?,
-        _ if body.contains_key("text") => (build_text_body(&body, body_type), None),
+        _ if body.contains_key("text") => (build_text_body(&body), None),
        t => {
            warn!("Unsupported body type: {}", t);
            (None, None)
@@ -306,20 +252,13 @@ async fn build_binary_body(
    }))
 }

-fn build_text_body(body: &BTreeMap<String, serde_json::Value>, body_type: &str) -> Option<SendableBodyWithMeta> {
+fn build_text_body(body: &BTreeMap<String, serde_json::Value>) -> Option<SendableBodyWithMeta> {
    let text = get_str_map(body, "text");
    if text.is_empty() {
-        return None;
-    }
-
-    let send_comments = get_bool_map(body, "sendJsonComments", false);
-    let text = if !send_comments && body_type == "application/json" {
-        maybe_strip_json_comments(text)
+        None
    } else {
-        text.to_string()
-    };
-
-    Some(SendableBodyWithMeta::Bytes(Bytes::from(text)))
+        Some(SendableBodyWithMeta::Bytes(Bytes::from(text.to_string())))
+    }
 }

 fn build_graphql_body(
@@ -327,7 +266,7 @@ fn build_graphql_body(
    body: &BTreeMap<String, serde_json::Value>,
 ) -> Option<SendableBodyWithMeta> {
    let query = get_str_map(body, "query");
-    let variables = strip_json_comments(&get_str_map(body, "variables"));
+    let variables = get_str_map(body, "variables");

    if method.to_lowercase() == "get" {
        // GraphQL GET requests use query parameters, not a body
@@ -745,7 +684,7 @@ mod tests {
        let mut body = BTreeMap::new();
        body.insert("text".to_string(), json!("Hello, World!"));

-        let result = build_text_body(&body, "application/json");
+        let result = build_text_body(&body);
        match result {
            Some(SendableBodyWithMeta::Bytes(bytes)) => {
                assert_eq!(bytes, Bytes::from("Hello, World!"))
@@ -759,7 +698,7 @@ mod tests {
        let mut body = BTreeMap::new();
        body.insert("text".to_string(), json!(""));

-        let result = build_text_body(&body, "application/json");
+        let result = build_text_body(&body);
        assert!(result.is_none());
    }

@@ -767,57 +706,10 @@ mod tests {
    async fn test_text_body_missing() {
        let body = BTreeMap::new();

-        let result = build_text_body(&body, "application/json");
+        let result = build_text_body(&body);
        assert!(result.is_none());
    }

-    #[tokio::test]
-    async fn test_text_body_strips_json_comments_by_default() {
-        let mut body = BTreeMap::new();
-        body.insert("text".to_string(), json!("{\n  // comment\n  \"foo\": \"bar\"\n}"));
-
-        let result = build_text_body(&body, "application/json");
-        match result {
-            Some(SendableBodyWithMeta::Bytes(bytes)) => {
-                let text = String::from_utf8_lossy(&bytes);
-                assert!(!text.contains("// comment"));
-                assert!(text.contains("\"foo\": \"bar\""));
-            }
-            _ => panic!("Expected Some(SendableBody::Bytes)"),
-        }
-    }
-
-    #[tokio::test]
-    async fn test_text_body_send_json_comments_when_opted_in() {
-        let mut body = BTreeMap::new();
-        body.insert("text".to_string(), json!("{\n  // comment\n  \"foo\": \"bar\"\n}"));
-        body.insert("sendJsonComments".to_string(), json!(true));
-
-        let result = build_text_body(&body, "application/json");
-        match result {
-            Some(SendableBodyWithMeta::Bytes(bytes)) => {
-                let text = String::from_utf8_lossy(&bytes);
-                assert!(text.contains("// comment"));
-            }
-            _ => panic!("Expected Some(SendableBody::Bytes)"),
-        }
-    }
-
-    #[tokio::test]
-    async fn test_text_body_no_strip_for_non_json() {
-        let mut body = BTreeMap::new();
-        body.insert("text".to_string(), json!("// not json\nsome text"));
-
-        let result = build_text_body(&body, "text/plain");
-        match result {
-            Some(SendableBodyWithMeta::Bytes(bytes)) => {
-                let text = String::from_utf8_lossy(&bytes);
-                assert!(text.contains("// not json"));
-            }
-            _ => panic!("Expected Some(SendableBody::Bytes)"),
-        }
-    }
-
    #[tokio::test]
    async fn test_form_urlencoded_body() -> Result<()> {
        let mut body = BTreeMap::new();
--- a/crates/yaak-models/bindings/gen_models.ts
+++ b/crates/yaak-models/bindings/gen_models.ts
@@ -49,7 +49,7 @@ export type HttpResponseEvent = { model: "http_response_event", id: string, crea
 * This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
 * The `From` impl is in yaak-http to avoid circular dependencies.
 */
-export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, dropped_body: boolean, dropped_headers: Array<string>, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
+export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };

 export type HttpResponseHeader = { name: string, value: string, };

@@ -67,9 +67,7 @@ export type ParentAuthentication = { authentication: Record<string, any>, authen

 export type ParentHeaders = { headers: Array<HttpRequestHeader>, };

-export type Plugin = { model: "plugin", id: string, createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, enabled: boolean, url: string | null, source: PluginSource, };
-
-export type PluginSource = "bundled" | "filesystem" | "registry";
+export type Plugin = { model: "plugin", id: string, createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, enabled: boolean, url: string | null, };

 export type PluginKeyValue = { model: "plugin_key_value", createdAt: string, updatedAt: string, pluginName: string, key: string, value: string, };

--- a/crates/yaak-models/migrations/20260301000000_plugin-source-and-unique-directory.sql
+++ b/crates/yaak-models/migrations/20260301000000_plugin-source-and-unique-directory.sql
@@ -1,33 +0,0 @@
-ALTER TABLE plugins
-    ADD COLUMN source TEXT DEFAULT 'filesystem' NOT NULL;
-
-- Existing registry installs have a URL; classify them first.
-UPDATE plugins
-SET source = 'registry'
-WHERE url IS NOT NULL;
-
-- Best-effort bundled backfill for legacy rows.
-UPDATE plugins
-SET source = 'bundled'
-WHERE source = 'filesystem'
-  AND (
-    -- Normalize separators so this also works for Windows paths.
-    replace(directory, '\', '/') LIKE '%/vendored/plugins/%'
-        OR replace(directory, '\', '/') LIKE '%/vendored-plugins/%'
-    );
-
-- Keep one row per exact directory before adding uniqueness.
-- Tie-break by recency.
-WITH ranked AS (SELECT id,
-                       ROW_NUMBER() OVER (
-                           PARTITION BY directory
-                           ORDER BY updated_at DESC,
-                               created_at DESC
-                           ) AS row_num
-                FROM plugins)
-DELETE
-FROM plugins
-WHERE id IN (SELECT id FROM ranked WHERE row_num > 1);
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_plugins_directory_unique
-    ON plugins (directory);
--- a/crates/yaak-models/src/models.rs
+++ b/crates/yaak-models/src/models.rs
@@ -1499,10 +1499,6 @@ pub enum HttpResponseEventData {
        url: String,
        status: u16,
        behavior: String,
-        #[serde(default)]
-        dropped_body: bool,
-        #[serde(default)]
-        dropped_headers: Vec<String>,
    },
    SendUrl {
        method: String,
@@ -2078,46 +2074,6 @@ pub struct Plugin {
    pub directory: String,
    pub enabled: bool,
    pub url: Option<String>,
-    pub source: PluginSource,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "gen_models.ts")]
-pub enum PluginSource {
-    Bundled,
-    Filesystem,
-    Registry,
-}
-
-impl FromStr for PluginSource {
-    type Err = crate::error::Error;
-
-    fn from_str(s: &str) -> Result<Self> {
-        match s {
-            "bundled" => Ok(Self::Bundled),
-            "filesystem" => Ok(Self::Filesystem),
-            "registry" => Ok(Self::Registry),
-            _ => Ok(Self::default()),
-        }
-    }
-}
-
-impl Display for PluginSource {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let str = match self {
-            PluginSource::Bundled => "bundled".to_string(),
-            PluginSource::Filesystem => "filesystem".to_string(),
-            PluginSource::Registry => "registry".to_string(),
-        };
-        write!(f, "{}", str)
-    }
-}
-
-impl Default for PluginSource {
-    fn default() -> Self {
-        Self::Filesystem
-    }
 }

 impl UpsertModelInfo for Plugin {
@@ -2153,7 +2109,6 @@ impl UpsertModelInfo for Plugin {
            (Directory, self.directory.into()),
            (Url, self.url.into()),
            (Enabled, self.enabled.into()),
-            (Source, self.source.to_string().into()),
        ])
    }

@@ -2164,7 +2119,6 @@ impl UpsertModelInfo for Plugin {
            PluginIden::Directory,
            PluginIden::Url,
            PluginIden::Enabled,
-            PluginIden::Source,
        ]
    }

@@ -2181,7 +2135,6 @@ impl UpsertModelInfo for Plugin {
            url: row.get("url")?,
            directory: row.get("directory")?,
            enabled: row.get("enabled")?,
-            source: PluginSource::from_str(row.get::<_, String>("source")?.as_str()).unwrap(),
        })
    }
 }
--- a/crates/yaak-models/src/queries/plugins.rs
+++ b/crates/yaak-models/src/queries/plugins.rs
@@ -26,10 +26,6 @@ impl<'a> DbContext<'a> {
    }

    pub fn upsert_plugin(&self, plugin: &Plugin, source: &UpdateSource) -> Result<Plugin> {
-        let mut plugin_to_upsert = plugin.clone();
-        if let Some(existing) = self.get_plugin_by_directory(&plugin.directory) {
-            plugin_to_upsert.id = existing.id;
-        }
-        self.upsert(&plugin_to_upsert, source)
+        self.upsert(plugin, source)
    }
 }
--- a/crates/yaak-plugins/Cargo.toml
+++ b/crates/yaak-plugins/Cargo.toml
@@ -15,6 +15,7 @@ log = { workspace = true }
 md5 = "0.7.0"
 path-slash = "0.2.1"
 rand = "0.9.0"
+regex = "1.10.6"
 reqwest = { workspace = true, features = ["json"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
--- a/crates/yaak-plugins/bindings/gen_events.ts
+++ b/crates/yaak-plugins/bindings/gen_events.ts
@@ -18,12 +18,12 @@ export type CallHttpAuthenticationActionRequest = { index: number, pluginRefId:

 export type CallHttpAuthenticationRequest = { contextId: string, values: { [key in string]?: JsonPrimitive }, method: string, url: string, headers: Array<HttpHeader>, };

-export type CallHttpAuthenticationResponse = {
+export type CallHttpAuthenticationResponse = { 
 /**
 * HTTP headers to add to the request. Existing headers will be replaced, while
 * new headers will be added.
 */
-setHeaders?: Array<HttpHeader>,
+setHeaders?: Array<HttpHeader>, 
 /**
 * Query parameters to add to the request. Existing params will be replaced, while
 * new params will be added.
@@ -78,7 +78,7 @@ export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };

 export type ExportHttpRequestResponse = { content: string, };

-export type FileFilter = { name: string,
+export type FileFilter = { name: string, 
 /**
 * File extensions to require
 */
@@ -100,149 +100,149 @@ export type FormInputAccordion = { label: string, inputs?: Array<FormInput>, hid

 export type FormInputBanner = { inputs?: Array<FormInput>, hidden?: boolean, color?: Color, };

-export type FormInputBase = {
+export type FormInputBase = { 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
 description?: string, };

-export type FormInputCheckbox = {
+export type FormInputCheckbox = { 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
 description?: string, };

-export type FormInputEditor = {
+export type FormInputEditor = { 
 /**
 * Placeholder for the text input
 */
-placeholder?: string | null,
+placeholder?: string | null, 
 /**
 * Don't show the editor gutter (line numbers, folds, etc.)
 */
-hideGutter?: boolean,
+hideGutter?: boolean, 
 /**
 * Language for syntax highlighting
 */
-language?: EditorLanguage, readOnly?: boolean,
+language?: EditorLanguage, readOnly?: boolean, 
 /**
 * Fixed number of visible rows
 */
-rows?: number, completionOptions?: Array<GenericCompletionOption>,
+rows?: number, completionOptions?: Array<GenericCompletionOption>, 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
 description?: string, };

-export type FormInputFile = {
+export type FormInputFile = { 
 /**
 * The title of the file selection window
 */
-title: string,
+title: string, 
 /**
 * Allow selecting multiple files
 */
-multiple?: boolean, directory?: boolean, defaultPath?: string, filters?: Array<FileFilter>,
+multiple?: boolean, directory?: boolean, defaultPath?: string, filters?: Array<FileFilter>, 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
@@ -250,63 +250,63 @@ description?: string, };

 export type FormInputHStack = { inputs?: Array<FormInput>, hidden?: boolean, };

-export type FormInputHttpRequest = {
+export type FormInputHttpRequest = { 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
 description?: string, };

-export type FormInputKeyValue = {
+export type FormInputKeyValue = { 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
@@ -314,36 +314,36 @@ description?: string, };

 export type FormInputMarkdown = { content: string, hidden?: boolean, };

-export type FormInputSelect = {
+export type FormInputSelect = { 
 /**
 * The options that will be available in the select input
 */
-options: Array<FormInputSelectOption>,
+options: Array<FormInputSelectOption>, 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
@@ -351,44 +351,44 @@ description?: string, };

 export type FormInputSelectOption = { label: string, value: string, };

-export type FormInputText = {
+export type FormInputText = { 
 /**
 * Placeholder for the text input
 */
-placeholder?: string | null,
+placeholder?: string | null, 
 /**
 * Placeholder for the text input
 */
-password?: boolean,
+password?: boolean, 
 /**
 * Whether to allow newlines in the input, like a <textarea/>
 */
-multiLine?: boolean, completionOptions?: Array<GenericCompletionOption>,
+multiLine?: boolean, completionOptions?: Array<GenericCompletionOption>, 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
@@ -474,7 +474,7 @@ export type ListOpenWorkspacesResponse = { workspaces: Array<WorkspaceInfo>, };

 export type OpenExternalUrlRequest = { url: string, };

-export type OpenWindowRequest = { url: string,
+export type OpenWindowRequest = { url: string, 
 /**
 * Label for the window. If not provided, a random one will be generated.
 */
@@ -486,15 +486,15 @@ export type PromptFormRequest = { id: string, title: string, description?: strin

 export type PromptFormResponse = { values: { [key in string]?: JsonPrimitive } | null, done?: boolean, };

-export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string,
+export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string, 
 /**
 * Text to add to the confirmation button
 */
-confirmText?: string, password?: boolean,
+confirmText?: string, password?: boolean, 
 /**
 * Text to add to the cancel button
 */
-cancelText?: string,
+cancelText?: string, 
 /**
 * Require the user to enter a non-empty value
 */
@@ -524,12 +524,12 @@ export type SetKeyValueResponse = {};

 export type ShowToastRequest = { message: string, color?: Color, icon?: Icon, timeout?: number, };

-export type TemplateFunction = { name: string, previewType?: TemplateFunctionPreviewType, description?: string,
+export type TemplateFunction = { name: string, previewType?: TemplateFunctionPreviewType, description?: string, 
 /**
 * Also support alternative names. This is useful for not breaking existing
 * tags when changing the `name` property
 */
-aliases?: Array<string>, args: Array<TemplateFunctionArg>,
+aliases?: Array<string>, args: Array<TemplateFunctionArg>, 
 /**
 * A list of arg names to show in the inline preview. If not provided, none will be shown (for privacy reasons).
 */
@@ -546,23 +546,23 @@ export type TemplateRenderRequest = { data: JsonValue, purpose: RenderPurpose, }

 export type TemplateRenderResponse = { data: JsonValue, };

-export type Theme = {
+export type Theme = { 
 /**
 * How the theme is identified. This should never be changed
 */
-id: string,
+id: string, 
 /**
 * The friendly name of the theme to be displayed to the user
 */
-label: string,
+label: string, 
 /**
 * Whether the theme will be used for dark or light appearance
 */
-dark: boolean,
+dark: boolean, 
 /**
 * The default top-level colors for the theme
 */
-base: ThemeComponentColors,
+base: ThemeComponentColors, 
 /**
 * Optionally override theme for individual UI components for more control
 */
--- a/crates/yaak-plugins/bindings/gen_models.ts
+++ b/crates/yaak-plugins/bindings/gen_models.ts
@@ -18,12 +18,7 @@ export type EditorKeymap = "default" | "vim" | "vscode" | "emacs";

 export type EncryptedKey = { encryptedKey: string, };

-export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, 
-/**
- * Variables defined in this environment scope.
- * Child environments override parent variables by name.
- */
-variables: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, variables: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };

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

@@ -39,17 +34,9 @@ export type GrpcEvent = { model: "grpc_event", id: string, createdAt: string, up

 export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end";

-export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, 
-/**
- * Server URL (http for plaintext or https for secure)
- */
-url: string, };
+export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, url: string, };

-export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, 
-/**
- * URL parameters used for both path placeholders (`:id`) and query string entries.
- */
-urlParameters: Array<HttpUrlParameter>, };
+export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };

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

@@ -62,24 +49,17 @@ export type HttpResponseEvent = { model: "http_response_event", id: string, crea
 * This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
 * The `From` impl is in yaak-http to avoid circular dependencies.
 */
-export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, dropped_body: boolean, dropped_headers: Array<string>, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
+export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };

 export type HttpResponseHeader = { name: string, value: string, };

 export type HttpResponseState = "initialized" | "connected" | "closed";

-export type HttpUrlParameter = { enabled?: boolean, 
-/**
- * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
- * Other entries are appended as query parameters
- */
-name: string, value: string, id?: string, };
+export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, id?: string, };

 export type KeyValue = { model: "key_value", id: string, createdAt: string, updatedAt: string, key: string, namespace: string, value: string, };

-export type Plugin = { model: "plugin", id: string, createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, enabled: boolean, url: string | null, source: PluginSource, };
-
-export type PluginSource = "bundled" | "filesystem" | "registry";
+export type Plugin = { model: "plugin", id: string, createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, enabled: boolean, url: string | null, };

 export type ProxySetting = { "type": "enabled", http: string, https: string, auth: ProxySettingAuth | null, bypass: string, disabled: boolean, } | { "type": "disabled" };

@@ -97,11 +77,7 @@ export type WebsocketEvent = { model: "websocket_event", id: string, createdAt:

 export type WebsocketEventType = "binary" | "close" | "frame" | "open" | "ping" | "pong" | "text";

-export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, 
-/**
- * URL parameters used for both path placeholders (`:id`) and query string entries.
- */
-urlParameters: Array<HttpUrlParameter>, };
+export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };

 export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, settingDnsOverrides: Array<DnsOverride>, };

--- a/crates/yaak-plugins/index.ts
+++ b/crates/yaak-plugins/index.ts
@@ -24,7 +24,3 @@ export async function checkPluginUpdates() {
 export async function updateAllPlugins() {
  return invoke<PluginNameVersion[]>('cmd_plugins_update_all', {});
 }
-
-export async function installPluginFromDirectory(directory: string) {
-  return invoke<void>('cmd_plugins_install_from_directory', { directory });
-}
--- a/crates/yaak-plugins/src/api.rs
+++ b/crates/yaak-plugins/src/api.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::str::FromStr;
 use ts_rs::TS;
-use yaak_models::models::{Plugin, PluginSource};
+use yaak_models::models::Plugin;

 /// Get plugin info from the registry.
 pub async fn get_plugin(
@@ -58,7 +58,7 @@ pub async fn check_plugin_updates(
 ) -> Result<PluginUpdatesResponse> {
    let name_versions: Vec<PluginNameVersion> = plugins
        .into_iter()
-        .filter(|p| matches!(p.source, PluginSource::Registry)) // Only check registry-installed plugins
+        .filter(|p| p.url.is_some()) // Only check plugins with URLs (from registry)
        .filter_map(|p| match get_plugin_meta(&Path::new(&p.directory)) {
            Ok(m) => Some(PluginNameVersion { name: m.name, version: m.version }),
            Err(e) => {
--- a/crates/yaak-plugins/src/install.rs
+++ b/crates/yaak-plugins/src/install.rs
@@ -9,7 +9,7 @@ use log::info;
 use std::fs::{create_dir_all, remove_dir_all};
 use std::io::Cursor;
 use std::sync::Arc;
-use yaak_models::models::{Plugin, PluginSource};
+use yaak_models::models::Plugin;
 use yaak_models::query_manager::QueryManager;
 use yaak_models::util::UpdateSource;

@@ -78,7 +78,6 @@ pub async fn download_and_install(
                directory: plugin_dir_str.clone(),
                enabled: true,
                url: Some(plugin_version.url.clone()),
-                source: PluginSource::Registry,
                ..Default::default()
            },
            &UpdateSource::Background,
--- a/crates/yaak-plugins/src/manager.rs
+++ b/crates/yaak-plugins/src/manager.rs
@@ -21,11 +21,9 @@ use crate::events::{
 use crate::native_template_functions::{template_function_keyring, template_function_secure};
 use crate::nodejs::start_nodejs_plugin_runtime;
 use crate::plugin_handle::PluginHandle;
-use crate::plugin_meta::get_plugin_meta;
 use crate::server_ws::PluginRuntimeServerWebsocket;
 use log::{error, info, warn};
-use std::collections::{HashMap, HashSet};
-use std::env;
+use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::Duration;
@@ -34,7 +32,7 @@ use tokio::net::TcpListener;
 use tokio::sync::mpsc::error::TrySendError;
 use tokio::sync::{Mutex, mpsc, oneshot};
 use tokio::time::{Instant, timeout};
-use yaak_models::models::{Plugin, PluginSource};
+use yaak_models::models::Plugin;
 use yaak_models::query_manager::QueryManager;
 use yaak_models::util::{UpdateSource, generate_id};
 use yaak_templates::error::Error::RenderError;
@@ -47,9 +45,9 @@ pub struct PluginManager {
    kill_tx: tokio::sync::watch::Sender<bool>,
    killed_rx: Arc<Mutex<Option<oneshot::Receiver<()>>>>,
    ws_service: Arc<PluginRuntimeServerWebsocket>,
+    bundled_plugin_dir: PathBuf,
    vendored_plugin_dir: PathBuf,
    pub(crate) installed_plugin_dir: PathBuf,
-    dev_mode: bool,
 }

 /// Callback for plugin initialization events (e.g., toast notifications)
@@ -59,21 +57,21 @@ impl PluginManager {
    /// Create a new PluginManager with the given paths.
    ///
    /// # Arguments
+    /// * `bundled_plugin_dir` - Directory to scan for bundled plugins
    /// * `vendored_plugin_dir` - Path to vendored plugins directory
    /// * `installed_plugin_dir` - Path to installed plugins directory
    /// * `node_bin_path` - Path to the yaaknode binary
    /// * `plugin_runtime_main` - Path to the plugin runtime index.cjs
    /// * `query_manager` - Query manager for bundled plugin registration and loading
    /// * `plugin_context` - Context to use while initializing plugins
-    /// * `dev_mode` - Whether the app is in dev mode (affects plugin loading)
    pub async fn new(
+        bundled_plugin_dir: PathBuf,
        vendored_plugin_dir: PathBuf,
        installed_plugin_dir: PathBuf,
        node_bin_path: PathBuf,
        plugin_runtime_main: PathBuf,
        query_manager: &QueryManager,
        plugin_context: &PluginContext,
-        dev_mode: bool,
    ) -> Result<PluginManager> {
        let (events_tx, mut events_rx) = mpsc::channel(2048);
        let (kill_server_tx, kill_server_rx) = tokio::sync::watch::channel(false);
@@ -90,9 +88,9 @@ impl PluginManager {
            ws_service: Arc::new(ws_service.clone()),
            kill_tx: kill_server_tx,
            killed_rx: Arc::new(Mutex::new(Some(killed_rx))),
+            bundled_plugin_dir,
            vendored_plugin_dir,
            installed_plugin_dir,
-            dev_mode,
        };

        // Forward events to subscribers
@@ -163,14 +161,13 @@ impl PluginManager {

        let bundled_dirs = plugin_manager.list_bundled_plugin_dirs().await?;
        let db = query_manager.connect();
-        for dir in &bundled_dirs {
-            if db.get_plugin_by_directory(dir).is_none() {
+        for dir in bundled_dirs {
+            if db.get_plugin_by_directory(&dir).is_none() {
                db.upsert_plugin(
                    &Plugin {
-                        directory: dir.clone(),
+                        directory: dir,
                        enabled: true,
                        url: None,
-                        source: PluginSource::Bundled,
                        ..Default::default()
                    },
                    &UpdateSource::Background,
@@ -194,76 +191,11 @@ impl PluginManager {
        Ok(plugin_manager)
    }

-    /// Get the vendored plugin directory path (resolves dev mode path if applicable)
-    pub fn get_plugins_dir(&self) -> PathBuf {
-        if self.dev_mode {
-            // Use plugins directly for easy development
-            // Tauri runs from crates-tauri/yaak-app/, so go up two levels to reach project root
-            env::current_dir()
-                .map(|cwd| cwd.join("../../plugins").canonicalize().unwrap())
-                .unwrap_or_else(|_| self.vendored_plugin_dir.clone())
-        } else {
-            self.vendored_plugin_dir.clone()
-        }
-    }
-
    /// Read plugin directories from disk and return their paths.
    /// This is useful for discovering bundled plugins.
    pub async fn list_bundled_plugin_dirs(&self) -> Result<Vec<String>> {
-        let plugins_dir = self.get_plugins_dir();
-        info!("Loading bundled plugins from {plugins_dir:?}");
-        read_plugins_dir(&plugins_dir).await
-    }
-
-    pub async fn resolve_plugins_for_runtime_from_db(&self, plugins: Vec<Plugin>) -> Vec<Plugin> {
-        let bundled_dirs = match self.list_bundled_plugin_dirs().await {
-            Ok(dirs) => dirs,
-            Err(err) => {
-                warn!("Failed to read bundled plugin dirs for resolution: {err:?}");
-                Vec::new()
-            }
-        };
-        self.resolve_plugins_for_runtime(plugins, bundled_dirs)
-    }
-
-    /// Resolve the plugin set for the current runtime instance.
-    ///
-    /// Rules:
-    /// - Drop bundled rows that are not present in this instance's bundled directory list.
-    /// - Deduplicate by plugin metadata name (fallback to directory key when metadata is unreadable).
-    /// - Prefer sources in this order: filesystem > registry > bundled.
-    /// - For same-source conflicts, prefer the most recently installed row (`created_at`).
-    fn resolve_plugins_for_runtime(
-        &self,
-        plugins: Vec<Plugin>,
-        bundled_dirs: Vec<String>,
-    ) -> Vec<Plugin> {
-        let bundled_dir_set: HashSet<String> = bundled_dirs.into_iter().collect();
-        let mut selected: HashMap<String, Plugin> = HashMap::new();
-
-        for plugin in plugins {
-            if matches!(plugin.source, PluginSource::Bundled)
-                && !bundled_dir_set.contains(&plugin.directory)
-            {
-                continue;
-            }
-
-            let key = match get_plugin_meta(Path::new(&plugin.directory)) {
-                Ok(meta) => meta.name,
-                Err(_) => format!("__dir__{}", plugin.directory),
-            };
-
-            match selected.get(&key) {
-                Some(existing) if !prefer_plugin(&plugin, existing) => {}
-                _ => {
-                    selected.insert(key, plugin);
-                }
-            }
-        }
-
-        let mut resolved = selected.into_values().collect::<Vec<_>>();
-        resolved.sort_by(|a, b| b.created_at.cmp(&a.created_at));
-        resolved
+        info!("Loading bundled plugins from {:?}", self.bundled_plugin_dir);
+        read_plugins_dir(&self.bundled_plugin_dir).await
    }

    pub async fn uninstall(&self, plugin_context: &PluginContext, dir: &str) -> Result<()> {
@@ -340,8 +272,7 @@ impl PluginManager {
        Ok(())
    }

-    /// Initialize all plugins from the provided DB list.
-    /// Plugin candidates are resolved for this runtime instance before initialization.
+    /// Initialize all plugins from the provided list.
    /// Returns a list of (plugin_directory, error_message) for any plugins that failed to initialize.
    pub async fn initialize_all_plugins(
        &self,
@@ -351,18 +282,15 @@ impl PluginManager {
        info!("Initializing all plugins");
        let start = Instant::now();
        let mut errors = Vec::new();
-        let plugins = self.resolve_plugins_for_runtime_from_db(plugins).await;
-
-        // Rebuild runtime handles from scratch to avoid stale/duplicate handles.
-        let existing_handles = { self.plugin_handles.lock().await.clone() };
-        for plugin_handle in existing_handles {
-            if let Err(e) = self.remove_plugin(plugin_context, &plugin_handle).await {
-                error!("Failed to remove plugin {} {e:?}", plugin_handle.dir);
-                errors.push((plugin_handle.dir.clone(), e.to_string()));
-            }
-        }

        for plugin in plugins {
+            // First remove the plugin if it exists and is enabled
+            if let Some(plugin_handle) = self.get_plugin_by_dir(&plugin.directory).await {
+                if let Err(e) = self.remove_plugin(plugin_context, &plugin_handle).await {
+                    error!("Failed to remove plugin {} {e:?}", plugin.directory);
+                    continue;
+                }
+            }
            if let Err(e) = self.add_plugin(plugin_context, &plugin).await {
                warn!("Failed to add plugin {} {e:?}", plugin.directory);
                errors.push((plugin.directory.clone(), e.to_string()));
@@ -1120,24 +1048,6 @@ impl PluginManager {
    }
 }

-fn source_priority(source: &PluginSource) -> i32 {
-    match source {
-        PluginSource::Filesystem => 3,
-        PluginSource::Registry => 2,
-        PluginSource::Bundled => 1,
-    }
-}
-
-fn prefer_plugin(candidate: &Plugin, existing: &Plugin) -> bool {
-    let candidate_priority = source_priority(&candidate.source);
-    let existing_priority = source_priority(&existing.source);
-    if candidate_priority != existing_priority {
-        return candidate_priority > existing_priority;
-    }
-
-    candidate.created_at > existing.created_at
-}
-
 async fn read_plugins_dir(dir: &PathBuf) -> Result<Vec<String>> {
    let mut result = read_dir(dir).await?;
    let mut dirs: Vec<String> = vec![];
@@ -1156,10 +1066,16 @@ async fn read_plugins_dir(dir: &PathBuf) -> Result<Vec<String>> {
 fn fix_windows_paths(p: &PathBuf) -> String {
    use dunce;
    use path_slash::PathBufExt;
+    use regex::Regex;

-    // 1. Remove UNC prefix for Windows paths
-    let safe_path = dunce::simplified(p.as_path());
+    // 1. Remove UNC prefix for Windows paths to pass to sidecar
+    let safe_path = dunce::simplified(p.as_path()).to_string_lossy().to_string();

-    // 2. Convert backslashes to forward slashes for Node.js compatibility
-    PathBuf::from(safe_path).to_slash_lossy().to_string()
+    // 2. Remove the drive letter
+    let safe_path = Regex::new("^[a-zA-Z]:").unwrap().replace(safe_path.as_str(), "");
+
+    // 3. Convert backslashes to forward
+    let safe_path = PathBuf::from(safe_path.to_string()).to_slash_lossy().to_string();
+
+    safe_path
 }
--- a/crates/yaak-templates/pkg/yaak_templates.d.ts
+++ b/crates/yaak-templates/pkg/yaak_templates.d.ts
@@ -1,5 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-export function escape_template(template: string): any;
-export function parse_template(template: string): any;
 export function unescape_template(template: string): any;
+export function parse_template(template: string): any;
+export function escape_template(template: string): any;
--- a/crates/yaak-templates/pkg/yaak_templates_bg.js
+++ b/crates/yaak-templates/pkg/yaak_templates_bg.js
@@ -165,10 +165,10 @@ function takeFromExternrefTable0(idx) {
 * @param {string} template
 * @returns {any}
 */
-export function escape_template(template) {
+export function unescape_template(template) {
    const ptr0 = passStringToWasm0(template, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.escape_template(ptr0, len0);
+    const ret = wasm.unescape_template(ptr0, len0);
    if (ret[2]) {
        throw takeFromExternrefTable0(ret[1]);
    }
@@ -193,10 +193,10 @@ export function parse_template(template) {
 * @param {string} template
 * @returns {any}
 */
-export function unescape_template(template) {
+export function escape_template(template) {
    const ptr0 = passStringToWasm0(template, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.unescape_template(ptr0, len0);
+    const ret = wasm.escape_template(ptr0, len0);
    if (ret[2]) {
        throw takeFromExternrefTable0(ret[1]);
    }
--- a/crates/yaak-templates/pkg/yaak_templates_bg.wasm
+++ b/crates/yaak-templates/pkg/yaak_templates_bg.wasm
--- a/crates/yaak-templates/src/format_json.rs
+++ b/crates/yaak-templates/src/format_json.rs
@@ -11,7 +11,6 @@ pub fn format_json(text: &str, tab: &str) -> String {
    let mut new_json = "".to_string();
    let mut depth = 0;
    let mut state = FormatState::None;
-    let mut saw_newline_in_whitespace = false;

    loop {
        let rest_of_chars = chars.clone();
@@ -62,62 +61,6 @@ pub fn format_json(text: &str, tab: &str) -> String {
            continue;
        }

-        // Handle line comments (//)
-        if current_char == '/' && chars.peek() == Some(&'/') {
-            chars.next(); // Skip second /
-            // Collect the rest of the comment until newline
-            let mut comment = String::from("//");
-            loop {
-                match chars.peek() {
-                    Some(&'\n') | None => break,
-                    Some(_) => comment.push(chars.next().unwrap()),
-                }
-            }
-            // Check if the comma handler already added \n + indent
-            let trimmed = new_json.trim_end_matches(|c: char| c == ' ' || c == '\t');
-            if trimmed.ends_with(",\n") && !saw_newline_in_whitespace {
-                // Trailing comment on the same line as comma (e.g. "foo",// comment)
-                new_json.truncate(trimmed.len() - 1);
-                new_json.push(' ');
-            } else if !trimmed.ends_with('\n') && !new_json.is_empty() {
-                // Trailing comment after a value (no newline before us)
-                new_json.push(' ');
-            }
-            new_json.push_str(&comment);
-            new_json.push('\n');
-            new_json.push_str(tab.to_string().repeat(depth).as_str());
-            saw_newline_in_whitespace = false;
-            continue;
-        }
-
-        // Handle block comments (/* ... */)
-        if current_char == '/' && chars.peek() == Some(&'*') {
-            chars.next(); // Skip *
-            let mut comment = String::from("/*");
-            loop {
-                match chars.next() {
-                    None => break,
-                    Some('*') if chars.peek() == Some(&'/') => {
-                        chars.next(); // Skip /
-                        comment.push_str("*/");
-                        break;
-                    }
-                    Some(c) => comment.push(c),
-                }
-            }
-            // If we're not already on a fresh line, add newline + indent before comment
-            let trimmed = new_json.trim_end_matches(|c: char| c == ' ' || c == '\t');
-            if !trimmed.is_empty() && !trimmed.ends_with('\n') {
-                new_json.push('\n');
-                new_json.push_str(tab.to_string().repeat(depth).as_str());
-            }
-            new_json.push_str(&comment);
-            // After block comment, add newline + indent for the next content
-            new_json.push('\n');
-            new_json.push_str(tab.to_string().repeat(depth).as_str());
-            continue;
-        }
-
        match current_char {
            ',' => {
                new_json.push(current_char);
@@ -182,37 +125,20 @@ pub fn format_json(text: &str, tab: &str) -> String {
                    || current_char == '\t'
                    || current_char == '\r'
                {
-                    if current_char == '\n' {
-                        saw_newline_in_whitespace = true;
-                    }
                    // Don't add these
                } else {
-                    saw_newline_in_whitespace = false;
                    new_json.push(current_char);
                }
            }
        }
    }

-    // Filter out whitespace-only lines, but preserve empty lines inside block comments
-    let mut result_lines: Vec<&str> = Vec::new();
-    let mut in_block_comment = false;
-    for line in new_json.lines() {
-        if in_block_comment {
-            result_lines.push(line);
-            if line.contains("*/") {
-                in_block_comment = false;
-            }
-        } else {
-            if line.contains("/*") && !line.contains("*/") {
-                in_block_comment = true;
-            }
-            if !line.trim().is_empty() {
-                result_lines.push(line);
-            }
-        }
-    }
-    result_lines.iter().map(|line| line.trim_end()).collect::<Vec<&str>>().join("\n")
+    // Replace only lines containing whitespace with nothing
+    new_json
+        .lines()
+        .filter(|line| !line.trim().is_empty()) // Filter out whitespace-only lines
+        .collect::<Vec<&str>>() // Collect the non-empty lines into a vector
+        .join("\n") // Join the lines back into a single string
 }

 #[cfg(test)]
@@ -371,161 +297,6 @@ mod tests {
            r#"
 {}
 }
-"#
-            .trim()
-        );
-    }
-
-    #[test]
-    fn test_line_comment_between_keys() {
-        assert_eq!(
-            format_json(
-                r#"{"foo":"bar",// a comment
-"baz":"qux"}"#,
-                "  "
-            ),
-            r#"
-{
-  "foo": "bar", // a comment
-  "baz": "qux"
-}
-"#
-            .trim()
-        );
-    }
-
-    #[test]
-    fn test_line_comment_at_end() {
-        assert_eq!(
-            format_json(
-                r#"{"foo":"bar" // trailing
-}"#,
-                "  "
-            ),
-            r#"
-{
-  "foo": "bar" // trailing
-}
-"#
-            .trim()
-        );
-    }
-
-    #[test]
-    fn test_block_comment() {
-        assert_eq!(
-            format_json(r#"{"foo":"bar",/* comment */"baz":"qux"}"#, "  "),
-            r#"
-{
-  "foo": "bar",
-  /* comment */
-  "baz": "qux"
-}
-"#
-            .trim()
-        );
-    }
-
-    #[test]
-    fn test_comment_in_array() {
-        assert_eq!(
-            format_json(
-                r#"[1,// item comment
-2,3]"#,
-                "  "
-            ),
-            r#"
-[
-  1, // item comment
-  2,
-  3
-]
-"#
-            .trim()
-        );
-    }
-
-    #[test]
-    fn test_comment_only_line() {
-        assert_eq!(
-            format_json(
-                r#"{
-  // this is a standalone comment
-  "foo": "bar"
-}"#,
-                "  "
-            ),
-            r#"
-{
-  // this is a standalone comment
-  "foo": "bar"
-}
-"#
-            .trim()
-        );
-    }
-
-    #[test]
-    fn test_multiline_block_comment() {
-        assert_eq!(
-            format_json(
-                r#"{
-  "foo": "bar"
-  /**
-   Hello World!
-
-   Hi there
-   */
-}"#,
-                "  "
-            ),
-            r#"
-{
-  "foo": "bar"
-  /**
-   Hello World!
-
-   Hi there
-   */
-}
-"#
-            .trim()
-        );
-    }
-
-    // NOTE: trailing whitespace on output lines is trimmed by the formatter.
-    // We can't easily add a test for this because raw string literals get
-    // trailing whitespace stripped by the editor/linter.
-
-    #[test]
-    fn test_comment_inside_string_ignored() {
-        assert_eq!(
-            format_json(r#"{"foo":"// not a comment","bar":"/* also not */"}"#, "  "),
-            r#"
-{
-  "foo": "// not a comment",
-  "bar": "/* also not */"
-}
-"#
-            .trim()
-        );
-    }
-
-    #[test]
-    fn test_comment_on_line_after_comma() {
-        assert_eq!(
-            format_json(
-                r#"{
-  "a": "aaa",
-  // "b": "bbb"
-}"#,
-                "  "
-            ),
-            r#"
-{
-  "a": "aaa",
-  // "b": "bbb"
-}
 "#
            .trim()
        );
--- a/crates/yaak-templates/src/lib.rs
+++ b/crates/yaak-templates/src/lib.rs
@@ -1,7 +1,6 @@
 pub mod error;
 pub mod escape;
 pub mod format_json;
-pub mod strip_json_comments;
 pub mod parser;
 pub mod renderer;
 pub mod wasm;
--- a/crates/yaak-templates/src/strip_json_comments.rs
+++ b/crates/yaak-templates/src/strip_json_comments.rs
@@ -1,318 +0,0 @@
-/// Strips JSON comments only if the result is valid JSON. If stripping comments
-/// produces invalid JSON, the original text is returned unchanged.
-pub fn maybe_strip_json_comments(text: &str) -> String {
-    let stripped = strip_json_comments(text);
-    if serde_json::from_str::<serde_json::Value>(&stripped).is_ok() {
-        stripped
-    } else {
-        text.to_string()
-    }
-}
-
-/// Strips comments from JSONC, preserving the original formatting as much as possible.
-///
-/// - Trailing comments on a line are removed (along with preceding whitespace)
-/// - Whole-line comments are removed, including the line itself
-/// - Block comments are removed, including any lines that become empty
-/// - Comments inside strings and template tags are left alone
-pub fn strip_json_comments(text: &str) -> String {
-    let mut chars = text.chars().peekable();
-    let mut result = String::with_capacity(text.len());
-    let mut in_string = false;
-    let mut in_template_tag = false;
-
-    loop {
-        let current_char = match chars.next() {
-            None => break,
-            Some(c) => c,
-        };
-
-        // Handle JSON strings
-        if in_string {
-            result.push(current_char);
-            match current_char {
-                '"' => in_string = false,
-                '\\' => {
-                    if let Some(c) = chars.next() {
-                        result.push(c);
-                    }
-                }
-                _ => {}
-            }
-            continue;
-        }
-
-        // Handle template tags
-        if in_template_tag {
-            result.push(current_char);
-            if current_char == ']' && chars.peek() == Some(&'}') {
-                result.push(chars.next().unwrap());
-                in_template_tag = false;
-            }
-            continue;
-        }
-
-        // Check for template tag start
-        if current_char == '$' && chars.peek() == Some(&'{') {
-            let mut lookahead = chars.clone();
-            lookahead.next(); // skip {
-            if lookahead.peek() == Some(&'[') {
-                in_template_tag = true;
-                result.push(current_char);
-                result.push(chars.next().unwrap()); // {
-                result.push(chars.next().unwrap()); // [
-                continue;
-            }
-        }
-
-        // Check for line comment
-        if current_char == '/' && chars.peek() == Some(&'/') {
-            chars.next(); // skip second /
-            // Consume until newline
-            loop {
-                match chars.peek() {
-                    Some(&'\n') | None => break,
-                    Some(_) => {
-                        chars.next();
-                    }
-                }
-            }
-            // Trim trailing whitespace that preceded the comment
-            let trimmed_len = result.trim_end_matches(|c: char| c == ' ' || c == '\t').len();
-            result.truncate(trimmed_len);
-            continue;
-        }
-
-        // Check for block comment
-        if current_char == '/' && chars.peek() == Some(&'*') {
-            chars.next(); // skip *
-            // Consume until */
-            loop {
-                match chars.next() {
-                    None => break,
-                    Some('*') if chars.peek() == Some(&'/') => {
-                        chars.next(); // skip /
-                        break;
-                    }
-                    Some(_) => {}
-                }
-            }
-            // Trim trailing whitespace that preceded the comment
-            let trimmed_len = result.trim_end_matches(|c: char| c == ' ' || c == '\t').len();
-            result.truncate(trimmed_len);
-            // Skip whitespace/newline after the block comment if the next line is content
-            // (this handles the case where the block comment is on its own line)
-            continue;
-        }
-
-        if current_char == '"' {
-            in_string = true;
-        }
-
-        result.push(current_char);
-    }
-
-    // Remove lines that are now empty (were comment-only lines)
-    let result = result
-        .lines()
-        .filter(|line| !line.trim().is_empty())
-        .collect::<Vec<&str>>()
-        .join("\n");
-
-    // Remove trailing commas before } or ]
-    strip_trailing_commas(&result)
-}
-
-/// Removes trailing commas before closing braces/brackets, respecting strings.
-fn strip_trailing_commas(text: &str) -> String {
-    let mut result = String::with_capacity(text.len());
-    let chars: Vec<char> = text.chars().collect();
-    let mut i = 0;
-    let mut in_string = false;
-
-    while i < chars.len() {
-        let ch = chars[i];
-
-        if in_string {
-            result.push(ch);
-            match ch {
-                '"' => in_string = false,
-                '\\' => {
-                    i += 1;
-                    if i < chars.len() {
-                        result.push(chars[i]);
-                    }
-                }
-                _ => {}
-            }
-            i += 1;
-            continue;
-        }
-
-        if ch == '"' {
-            in_string = true;
-            result.push(ch);
-            i += 1;
-            continue;
-        }
-
-        if ch == ',' {
-            // Look ahead past whitespace/newlines for } or ]
-            let mut j = i + 1;
-            while j < chars.len() && chars[j].is_whitespace() {
-                j += 1;
-            }
-            if j < chars.len() && (chars[j] == '}' || chars[j] == ']') {
-                // Skip the comma
-                i += 1;
-                continue;
-            }
-        }
-
-        result.push(ch);
-        i += 1;
-    }
-
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::strip_json_comments::strip_json_comments;
-
-    #[test]
-    fn test_no_comments() {
-        let input = r#"{
-  "foo": "bar",
-  "baz": 123
-}"#;
-        assert_eq!(strip_json_comments(input), input);
-    }
-
-    #[test]
-    fn test_trailing_line_comment() {
-        assert_eq!(
-            strip_json_comments(r#"{
-  "foo": "bar", // this is a comment
-  "baz": 123
-}"#),
-            r#"{
-  "foo": "bar",
-  "baz": 123
-}"#
-        );
-    }
-
-    #[test]
-    fn test_whole_line_comment() {
-        assert_eq!(
-            strip_json_comments(r#"{
-  // this is a comment
-  "foo": "bar"
-}"#),
-            r#"{
-  "foo": "bar"
-}"#
-        );
-    }
-
-    #[test]
-    fn test_inline_block_comment() {
-        assert_eq!(
-            strip_json_comments(r#"{
-  "foo": /* a comment */ "bar"
-}"#),
-            r#"{
-  "foo": "bar"
-}"#
-        );
-    }
-
-    #[test]
-    fn test_whole_line_block_comment() {
-        assert_eq!(
-            strip_json_comments(r#"{
-  /* a comment */
-  "foo": "bar"
-}"#),
-            r#"{
-  "foo": "bar"
-}"#
-        );
-    }
-
-    #[test]
-    fn test_multiline_block_comment() {
-        assert_eq!(
-            strip_json_comments(r#"{
-  /**
-   * Hello World!
-   */
-  "foo": "bar"
-}"#),
-            r#"{
-  "foo": "bar"
-}"#
-        );
-    }
-
-    #[test]
-    fn test_comment_inside_string_preserved() {
-        let input = r#"{
-  "foo": "// not a comment",
-  "bar": "/* also not */"
-}"#;
-        assert_eq!(strip_json_comments(input), input);
-    }
-
-    #[test]
-    fn test_comment_inside_template_tag_preserved() {
-        let input = r#"{
-  "foo": ${[ fn("// hi", "/* hey */") ]}
-}"#;
-        assert_eq!(strip_json_comments(input), input);
-    }
-
-    #[test]
-    fn test_multiple_comments() {
-        assert_eq!(
-            strip_json_comments(r#"{
-  // first comment
-  "foo": "bar", // trailing
-  /* block */
-  "baz": 123
-}"#),
-            r#"{
-  "foo": "bar",
-  "baz": 123
-}"#
-        );
-    }
-
-    #[test]
-    fn test_trailing_comma_after_comment_removed() {
-        assert_eq!(
-            strip_json_comments(r#"{
-  "a": "aaa",
-  // "b": "bbb"
-}"#),
-            r#"{
-  "a": "aaa"
-}"#
-        );
-    }
-
-    #[test]
-    fn test_trailing_comma_in_array() {
-        assert_eq!(
-            strip_json_comments(r#"[1, 2, /* 3 */]"#),
-            r#"[1, 2]"#
-        );
-    }
-
-    #[test]
-    fn test_comma_inside_string_preserved() {
-        let input = r#"{"a": "hello,}"#;
-        assert_eq!(strip_json_comments(input), input);
-    }
-}
--- a/crates/yaak/src/plugin_events.rs
+++ b/crates/yaak/src/plugin_events.rs
@@ -1,16 +1,14 @@
-use yaak_models::models::AnyModel;
 use yaak_models::query_manager::QueryManager;
-use yaak_models::util::UpdateSource;
 use yaak_plugins::events::{
    CloseWindowRequest, CopyTextRequest, DeleteKeyValueRequest, DeleteKeyValueResponse,
-    DeleteModelRequest, DeleteModelResponse, ErrorResponse, FindHttpResponsesRequest,
-    FindHttpResponsesResponse, GetCookieValueRequest, GetHttpRequestByIdRequest,
-    GetHttpRequestByIdResponse, GetKeyValueRequest, GetKeyValueResponse, InternalEventPayload,
-    ListCookieNamesRequest, ListFoldersRequest, ListFoldersResponse, ListHttpRequestsRequest,
-    ListHttpRequestsResponse, ListOpenWorkspacesRequest, OpenExternalUrlRequest, OpenWindowRequest,
-    PromptFormRequest, PromptTextRequest, ReloadResponse, RenderGrpcRequestRequest,
-    RenderHttpRequestRequest, SendHttpRequestRequest, SetKeyValueRequest, ShowToastRequest,
-    TemplateRenderRequest, UpsertModelRequest, UpsertModelResponse, WindowInfoRequest,
+    DeleteModelRequest, ErrorResponse, FindHttpResponsesRequest, GetCookieValueRequest,
+    GetHttpRequestByIdRequest, GetHttpRequestByIdResponse, GetKeyValueRequest, GetKeyValueResponse,
+    InternalEventPayload, ListCookieNamesRequest, ListFoldersRequest, ListFoldersResponse,
+    ListHttpRequestsRequest, ListHttpRequestsResponse, ListOpenWorkspacesRequest,
+    OpenExternalUrlRequest, OpenWindowRequest, PromptFormRequest, PromptTextRequest,
+    ReloadResponse, RenderGrpcRequestRequest, RenderHttpRequestRequest, SendHttpRequestRequest,
+    SetKeyValueRequest, ShowToastRequest, TemplateRenderRequest, UpsertModelRequest,
+    WindowInfoRequest,
 };

 pub struct SharedPluginEventContext<'a> {
@@ -39,9 +37,6 @@ pub enum SharedRequest<'a> {
    GetHttpRequestById(&'a GetHttpRequestByIdRequest),
    ListFolders(&'a ListFoldersRequest),
    ListHttpRequests(&'a ListHttpRequestsRequest),
-    FindHttpResponses(&'a FindHttpResponsesRequest),
-    UpsertModel(&'a UpsertModelRequest),
-    DeleteModel(&'a DeleteModelRequest),
 }

 #[derive(Debug)]
@@ -50,6 +45,9 @@ pub enum HostRequest<'a> {
    CopyText(&'a CopyTextRequest),
    PromptText(&'a PromptTextRequest),
    PromptForm(&'a PromptFormRequest),
+    FindHttpResponses(&'a FindHttpResponsesRequest),
+    UpsertModel(&'a UpsertModelRequest),
+    DeleteModel(&'a DeleteModelRequest),
    RenderGrpcRequest(&'a RenderGrpcRequestRequest),
    RenderHttpRequest(&'a RenderHttpRequestRequest),
    TemplateRender(&'a TemplateRenderRequest),
@@ -73,6 +71,9 @@ impl HostRequest<'_> {
            HostRequest::CopyText(_) => "copy_text_request".to_string(),
            HostRequest::PromptText(_) => "prompt_text_request".to_string(),
            HostRequest::PromptForm(_) => "prompt_form_request".to_string(),
+            HostRequest::FindHttpResponses(_) => "find_http_responses_request".to_string(),
+            HostRequest::UpsertModel(_) => "upsert_model_request".to_string(),
+            HostRequest::DeleteModel(_) => "delete_model_request".to_string(),
            HostRequest::RenderGrpcRequest(_) => "render_grpc_request_request".to_string(),
            HostRequest::RenderHttpRequest(_) => "render_http_request_request".to_string(),
            HostRequest::TemplateRender(_) => "template_render_request".to_string(),
@@ -134,13 +135,13 @@ impl<'a> From<&'a InternalEventPayload> for GroupedPluginRequest<'a> {
                GroupedPluginRequest::Host(HostRequest::PromptForm(req))
            }
            InternalEventPayload::FindHttpResponsesRequest(req) => {
-                GroupedPluginRequest::Shared(SharedRequest::FindHttpResponses(req))
+                GroupedPluginRequest::Host(HostRequest::FindHttpResponses(req))
            }
            InternalEventPayload::UpsertModelRequest(req) => {
-                GroupedPluginRequest::Shared(SharedRequest::UpsertModel(req))
+                GroupedPluginRequest::Host(HostRequest::UpsertModel(req))
            }
            InternalEventPayload::DeleteModelRequest(req) => {
-                GroupedPluginRequest::Shared(SharedRequest::DeleteModel(req))
+                GroupedPluginRequest::Host(HostRequest::DeleteModel(req))
            }
            InternalEventPayload::RenderGrpcRequestRequest(req) => {
                GroupedPluginRequest::Host(HostRequest::RenderGrpcRequest(req))
@@ -274,175 +275,17 @@ fn build_shared_reply(
                http_requests,
            })
        }
-        SharedRequest::FindHttpResponses(req) => {
-            let http_responses = query_manager
-                .connect()
-                .list_http_responses_for_request(&req.request_id, req.limit.map(|l| l as u64))
-                .unwrap_or_default();
-            InternalEventPayload::FindHttpResponsesResponse(FindHttpResponsesResponse {
-                http_responses,
-            })
-        }
-        SharedRequest::UpsertModel(req) => {
-            use AnyModel::*;
-
-            let model = match &req.model {
-                HttpRequest(m) => {
-                    match query_manager.connect().upsert_http_request(m, &UpdateSource::Plugin) {
-                        Ok(model) => HttpRequest(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to upsert HTTP request: {err}"),
-                            });
-                        }
-                    }
-                }
-                GrpcRequest(m) => {
-                    match query_manager.connect().upsert_grpc_request(m, &UpdateSource::Plugin) {
-                        Ok(model) => GrpcRequest(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to upsert gRPC request: {err}"),
-                            });
-                        }
-                    }
-                }
-                WebsocketRequest(m) => {
-                    match query_manager.connect().upsert_websocket_request(m, &UpdateSource::Plugin)
-                    {
-                        Ok(model) => WebsocketRequest(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to upsert WebSocket request: {err}"),
-                            });
-                        }
-                    }
-                }
-                Folder(m) => {
-                    match query_manager.connect().upsert_folder(m, &UpdateSource::Plugin) {
-                        Ok(model) => Folder(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to upsert folder: {err}"),
-                            });
-                        }
-                    }
-                }
-                Environment(m) => {
-                    match query_manager.connect().upsert_environment(m, &UpdateSource::Plugin) {
-                        Ok(model) => Environment(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to upsert environment: {err}"),
-                            });
-                        }
-                    }
-                }
-                Workspace(m) => {
-                    match query_manager.connect().upsert_workspace(m, &UpdateSource::Plugin) {
-                        Ok(model) => Workspace(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to upsert workspace: {err}"),
-                            });
-                        }
-                    }
-                }
-                _ => {
-                    return InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: "Upsert not supported for this model type".to_string(),
-                    });
-                }
-            };
-
-            InternalEventPayload::UpsertModelResponse(UpsertModelResponse { model })
-        }
-        SharedRequest::DeleteModel(req) => {
-            let model = match req.model.as_str() {
-                "http_request" => {
-                    match query_manager
-                        .connect()
-                        .delete_http_request_by_id(&req.id, &UpdateSource::Plugin)
-                    {
-                        Ok(model) => AnyModel::HttpRequest(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to delete HTTP request: {err}"),
-                            });
-                        }
-                    }
-                }
-                "grpc_request" => {
-                    match query_manager
-                        .connect()
-                        .delete_grpc_request_by_id(&req.id, &UpdateSource::Plugin)
-                    {
-                        Ok(model) => AnyModel::GrpcRequest(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to delete gRPC request: {err}"),
-                            });
-                        }
-                    }
-                }
-                "websocket_request" => {
-                    match query_manager
-                        .connect()
-                        .delete_websocket_request_by_id(&req.id, &UpdateSource::Plugin)
-                    {
-                        Ok(model) => AnyModel::WebsocketRequest(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to delete WebSocket request: {err}"),
-                            });
-                        }
-                    }
-                }
-                "folder" => match query_manager
-                    .connect()
-                    .delete_folder_by_id(&req.id, &UpdateSource::Plugin)
-                {
-                    Ok(model) => AnyModel::Folder(model),
-                    Err(err) => {
-                        return InternalEventPayload::ErrorResponse(ErrorResponse {
-                            error: format!("Failed to delete folder: {err}"),
-                        });
-                    }
-                },
-                "environment" => {
-                    match query_manager
-                        .connect()
-                        .delete_environment_by_id(&req.id, &UpdateSource::Plugin)
-                    {
-                        Ok(model) => AnyModel::Environment(model),
-                        Err(err) => {
-                            return InternalEventPayload::ErrorResponse(ErrorResponse {
-                                error: format!("Failed to delete environment: {err}"),
-                            });
-                        }
-                    }
-                }
-                _ => {
-                    return InternalEventPayload::ErrorResponse(ErrorResponse {
-                        error: "Delete not supported for this model type".to_string(),
-                    });
-                }
-            };
-
-            InternalEventPayload::DeleteModelResponse(DeleteModelResponse { model })
-        }
    }
 }

 #[cfg(test)]
 mod tests {
    use super::*;
-    use tempfile::TempDir;
-    use yaak_models::models::{AnyModel, Folder, HttpRequest, Workspace};
+    use yaak_models::models::{Folder, HttpRequest, Workspace};
    use yaak_models::util::UpdateSource;

-    fn seed_query_manager() -> (QueryManager, TempDir) {
-        let temp_dir = TempDir::new().expect("Failed to create temp dir");
+    fn seed_query_manager() -> QueryManager {
+        let temp_dir = tempfile::TempDir::new().expect("Failed to create temp dir");
        let db_path = temp_dir.path().join("db.sqlite");
        let blob_path = temp_dir.path().join("blobs.sqlite");
        let (query_manager, _blob_manager, _rx) =
@@ -489,12 +332,12 @@ mod tests {
            )
            .expect("Failed to seed request");

-        (query_manager, temp_dir)
+        query_manager
    }

    #[test]
    fn list_requests_requires_workspace_when_folder_missing() {
-        let (query_manager, _temp_dir) = seed_query_manager();
+        let query_manager = seed_query_manager();
        let payload = InternalEventPayload::ListHttpRequestsRequest(
            yaak_plugins::events::ListHttpRequestsRequest { folder_id: None },
        );
@@ -512,7 +355,7 @@ mod tests {

    #[test]
    fn list_requests_by_workspace_and_folder() {
-        let (query_manager, _temp_dir) = seed_query_manager();
+        let query_manager = seed_query_manager();

        let by_workspace_payload = InternalEventPayload::ListHttpRequestsRequest(
            yaak_plugins::events::ListHttpRequestsRequest { folder_id: None },
@@ -551,83 +394,9 @@ mod tests {
        }
    }

-    #[test]
-    fn find_http_responses_is_shared_handled() {
-        let (query_manager, _temp_dir) = seed_query_manager();
-        let payload = InternalEventPayload::FindHttpResponsesRequest(FindHttpResponsesRequest {
-            request_id: "rq_test".to_string(),
-            limit: Some(1),
-        });
-
-        let result = handle_shared_plugin_event(
-            &query_manager,
-            &payload,
-            SharedPluginEventContext { plugin_name: "@yaak/test", workspace_id: Some("wk_test") },
-        );
-
-        match result {
-            GroupedPluginEvent::Handled(Some(InternalEventPayload::FindHttpResponsesResponse(
-                resp,
-            ))) => {
-                assert!(resp.http_responses.is_empty());
-            }
-            other => panic!("unexpected find responses result: {other:?}"),
-        }
-    }
-
-    #[test]
-    fn upsert_and_delete_model_are_shared_handled() {
-        let (query_manager, _temp_dir) = seed_query_manager();
-
-        let existing = query_manager
-            .connect()
-            .get_http_request("rq_test")
-            .expect("Failed to load seeded request");
-        let upsert_payload = InternalEventPayload::UpsertModelRequest(UpsertModelRequest {
-            model: AnyModel::HttpRequest(HttpRequest {
-                name: "Request Updated".to_string(),
-                ..existing
-            }),
-        });
-
-        let upsert_result = handle_shared_plugin_event(
-            &query_manager,
-            &upsert_payload,
-            SharedPluginEventContext { plugin_name: "@yaak/test", workspace_id: Some("wk_test") },
-        );
-        match upsert_result {
-            GroupedPluginEvent::Handled(Some(InternalEventPayload::UpsertModelResponse(resp))) => {
-                match resp.model {
-                    AnyModel::HttpRequest(r) => assert_eq!(r.name, "Request Updated"),
-                    other => panic!("unexpected upsert model type: {other:?}"),
-                }
-            }
-            other => panic!("unexpected upsert result: {other:?}"),
-        }
-
-        let delete_payload = InternalEventPayload::DeleteModelRequest(DeleteModelRequest {
-            model: "http_request".to_string(),
-            id: "rq_test".to_string(),
-        });
-        let delete_result = handle_shared_plugin_event(
-            &query_manager,
-            &delete_payload,
-            SharedPluginEventContext { plugin_name: "@yaak/test", workspace_id: Some("wk_test") },
-        );
-        match delete_result {
-            GroupedPluginEvent::Handled(Some(InternalEventPayload::DeleteModelResponse(resp))) => {
-                match resp.model {
-                    AnyModel::HttpRequest(r) => assert_eq!(r.id, "rq_test"),
-                    other => panic!("unexpected delete model type: {other:?}"),
-                }
-            }
-            other => panic!("unexpected delete result: {other:?}"),
-        }
-    }
-
    #[test]
    fn host_request_classification_works() {
-        let (query_manager, _temp_dir) = seed_query_manager();
+        let query_manager = seed_query_manager();
        let payload = InternalEventPayload::WindowInfoRequest(WindowInfoRequest {
            label: "main".to_string(),
        });
--- a/crates/yaak/src/render.rs
+++ b/crates/yaak/src/render.rs
@@ -2,7 +2,7 @@ use log::info;
 use serde_json::Value;
 use std::collections::BTreeMap;
 use yaak_http::path_placeholders::apply_path_placeholders;
-use yaak_models::models::{Environment, GrpcRequest, HttpRequest, HttpRequestHeader, HttpUrlParameter};
+use yaak_models::models::{Environment, HttpRequest, HttpRequestHeader, HttpUrlParameter};
 use yaak_models::render::make_vars_hashmap;
 use yaak_templates::{RenderOptions, TemplateCallback, parse_and_render, render_json_value_raw};

@@ -89,64 +89,6 @@ pub async fn render_http_request<T: TemplateCallback>(
    Ok(HttpRequest { url, url_parameters, headers, body, authentication, ..request.to_owned() })
 }

-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() })
-}
-
 fn strip_disabled_form_entries(v: Value) -> Value {
    match v {
        Value::Array(items) => Value::Array(
--- a/npm/cli/bin/cli.js
+++ b/npm/cli/bin/cli.js
@@ -16,8 +16,7 @@ function getBinaryPath() {
 }

 const result = childProcess.spawnSync(getBinaryPath(), process.argv.slice(2), {
-  stdio: "inherit",
-  env: { ...process.env, YAAK_CLI_INSTALL_SOURCE: process.env.YAAK_CLI_INSTALL_SOURCE ?? "npm" },
+  stdio: "inherit"
 });

 if (result.error) {
--- a/npm/cli/index.js
+++ b/npm/cli/index.js
@@ -15,7 +15,6 @@ function getBinaryPath() {

 module.exports.runBinary = function runBinary(...args) {
  childProcess.execFileSync(getBinaryPath(), args, {
-    stdio: "inherit",
-    env: { ...process.env, YAAK_CLI_INSTALL_SOURCE: process.env.YAAK_CLI_INSTALL_SOURCE ?? "npm" },
+    stdio: "inherit"
  });
 };
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
  "devDependencies": {
    "@biomejs/biome": "^2.3.13",
    "@tauri-apps/cli": "^2.9.6",
-    "@yaakapp/cli": "^0.5.1",
+    "@yaakapp/cli": "^0.4.0",
    "dotenv-cli": "^11.0.0",
    "husky": "^9.1.7",
    "nodejs-file-downloader": "^4.13.0",
--- a/packages/plugin-runtime-types/src/bindings/gen_events.ts
+++ b/packages/plugin-runtime-types/src/bindings/gen_events.ts
@@ -18,12 +18,12 @@ export type CallHttpAuthenticationActionRequest = { index: number, pluginRefId:

 export type CallHttpAuthenticationRequest = { contextId: string, values: { [key in string]?: JsonPrimitive }, method: string, url: string, headers: Array<HttpHeader>, };

-export type CallHttpAuthenticationResponse = {
+export type CallHttpAuthenticationResponse = { 
 /**
 * HTTP headers to add to the request. Existing headers will be replaced, while
 * new headers will be added.
 */
-setHeaders?: Array<HttpHeader>,
+setHeaders?: Array<HttpHeader>, 
 /**
 * Query parameters to add to the request. Existing params will be replaced, while
 * new params will be added.
@@ -78,7 +78,7 @@ export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };

 export type ExportHttpRequestResponse = { content: string, };

-export type FileFilter = { name: string,
+export type FileFilter = { name: string, 
 /**
 * File extensions to require
 */
@@ -100,149 +100,149 @@ export type FormInputAccordion = { label: string, inputs?: Array<FormInput>, hid

 export type FormInputBanner = { inputs?: Array<FormInput>, hidden?: boolean, color?: Color, };

-export type FormInputBase = {
+export type FormInputBase = { 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
 description?: string, };

-export type FormInputCheckbox = {
+export type FormInputCheckbox = { 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
 description?: string, };

-export type FormInputEditor = {
+export type FormInputEditor = { 
 /**
 * Placeholder for the text input
 */
-placeholder?: string | null,
+placeholder?: string | null, 
 /**
 * Don't show the editor gutter (line numbers, folds, etc.)
 */
-hideGutter?: boolean,
+hideGutter?: boolean, 
 /**
 * Language for syntax highlighting
 */
-language?: EditorLanguage, readOnly?: boolean,
+language?: EditorLanguage, readOnly?: boolean, 
 /**
 * Fixed number of visible rows
 */
-rows?: number, completionOptions?: Array<GenericCompletionOption>,
+rows?: number, completionOptions?: Array<GenericCompletionOption>, 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
 description?: string, };

-export type FormInputFile = {
+export type FormInputFile = { 
 /**
 * The title of the file selection window
 */
-title: string,
+title: string, 
 /**
 * Allow selecting multiple files
 */
-multiple?: boolean, directory?: boolean, defaultPath?: string, filters?: Array<FileFilter>,
+multiple?: boolean, directory?: boolean, defaultPath?: string, filters?: Array<FileFilter>, 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
@@ -250,63 +250,63 @@ description?: string, };

 export type FormInputHStack = { inputs?: Array<FormInput>, hidden?: boolean, };

-export type FormInputHttpRequest = {
+export type FormInputHttpRequest = { 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
 description?: string, };

-export type FormInputKeyValue = {
+export type FormInputKeyValue = { 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
@@ -314,36 +314,36 @@ description?: string, };

 export type FormInputMarkdown = { content: string, hidden?: boolean, };

-export type FormInputSelect = {
+export type FormInputSelect = { 
 /**
 * The options that will be available in the select input
 */
-options: Array<FormInputSelectOption>,
+options: Array<FormInputSelectOption>, 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
@@ -351,44 +351,44 @@ description?: string, };

 export type FormInputSelectOption = { label: string, value: string, };

-export type FormInputText = {
+export type FormInputText = { 
 /**
 * Placeholder for the text input
 */
-placeholder?: string | null,
+placeholder?: string | null, 
 /**
 * Placeholder for the text input
 */
-password?: boolean,
+password?: boolean, 
 /**
 * Whether to allow newlines in the input, like a <textarea/>
 */
-multiLine?: boolean, completionOptions?: Array<GenericCompletionOption>,
+multiLine?: boolean, completionOptions?: Array<GenericCompletionOption>, 
 /**
 * The name of the input. The value will be stored at this object attribute in the resulting data
 */
-name: string,
+name: string, 
 /**
 * Whether this input is visible for the given configuration. Use this to
 * make branching forms.
 */
-hidden?: boolean,
+hidden?: boolean, 
 /**
 * Whether the user must fill in the argument
 */
-optional?: boolean,
+optional?: boolean, 
 /**
 * The label of the input
 */
-label?: string,
+label?: string, 
 /**
 * Visually hide the label of the input
 */
-hideLabel?: boolean,
+hideLabel?: boolean, 
 /**
 * The default value
 */
-defaultValue?: string, disabled?: boolean,
+defaultValue?: string, disabled?: boolean, 
 /**
 * Longer description of the input, likely shown in a tooltip
 */
@@ -474,7 +474,7 @@ export type ListOpenWorkspacesResponse = { workspaces: Array<WorkspaceInfo>, };

 export type OpenExternalUrlRequest = { url: string, };

-export type OpenWindowRequest = { url: string,
+export type OpenWindowRequest = { url: string, 
 /**
 * Label for the window. If not provided, a random one will be generated.
 */
@@ -486,15 +486,15 @@ export type PromptFormRequest = { id: string, title: string, description?: strin

 export type PromptFormResponse = { values: { [key in string]?: JsonPrimitive } | null, done?: boolean, };

-export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string,
+export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string, 
 /**
 * Text to add to the confirmation button
 */
-confirmText?: string, password?: boolean,
+confirmText?: string, password?: boolean, 
 /**
 * Text to add to the cancel button
 */
-cancelText?: string,
+cancelText?: string, 
 /**
 * Require the user to enter a non-empty value
 */
@@ -524,12 +524,12 @@ export type SetKeyValueResponse = {};

 export type ShowToastRequest = { message: string, color?: Color, icon?: Icon, timeout?: number, };

-export type TemplateFunction = { name: string, previewType?: TemplateFunctionPreviewType, description?: string,
+export type TemplateFunction = { name: string, previewType?: TemplateFunctionPreviewType, description?: string, 
 /**
 * Also support alternative names. This is useful for not breaking existing
 * tags when changing the `name` property
 */
-aliases?: Array<string>, args: Array<TemplateFunctionArg>,
+aliases?: Array<string>, args: Array<TemplateFunctionArg>, 
 /**
 * A list of arg names to show in the inline preview. If not provided, none will be shown (for privacy reasons).
 */
@@ -546,23 +546,23 @@ export type TemplateRenderRequest = { data: JsonValue, purpose: RenderPurpose, }

 export type TemplateRenderResponse = { data: JsonValue, };

-export type Theme = {
+export type Theme = { 
 /**
 * How the theme is identified. This should never be changed
 */
-id: string,
+id: string, 
 /**
 * The friendly name of the theme to be displayed to the user
 */
-label: string,
+label: string, 
 /**
 * Whether the theme will be used for dark or light appearance
 */
-dark: boolean,
+dark: boolean, 
 /**
 * The default top-level colors for the theme
 */
-base: ThemeComponentColors,
+base: ThemeComponentColors, 
 /**
 * Optionally override theme for individual UI components for more control
 */
--- a/packages/plugin-runtime-types/src/bindings/gen_models.ts
+++ b/packages/plugin-runtime-types/src/bindings/gen_models.ts
@@ -18,12 +18,7 @@ export type EditorKeymap = "default" | "vim" | "vscode" | "emacs";

 export type EncryptedKey = { encryptedKey: string, };

-export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, 
-/**
- * Variables defined in this environment scope.
- * Child environments override parent variables by name.
- */
-variables: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };
+export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, parentModel: string, parentId: string | null, variables: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };

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

@@ -39,17 +34,9 @@ export type GrpcEvent = { model: "grpc_event", id: string, createdAt: string, up

 export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end";

-export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, 
-/**
- * Server URL (http for plaintext or https for secure)
- */
-url: string, };
+export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, url: string, };

-export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, 
-/**
- * URL parameters used for both path placeholders (`:id`) and query string entries.
- */
-urlParameters: Array<HttpUrlParameter>, };
+export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };

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

@@ -62,24 +49,17 @@ export type HttpResponseEvent = { model: "http_response_event", id: string, crea
 * This mirrors `yaak_http::sender::HttpResponseEvent` but with serde support.
 * The `From` impl is in yaak-http to avoid circular dependencies.
 */
-export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, dropped_body: boolean, dropped_headers: Array<string>, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };
+export type HttpResponseEventData = { "type": "setting", name: string, value: string, } | { "type": "info", message: string, } | { "type": "redirect", url: string, status: number, behavior: string, } | { "type": "send_url", method: string, scheme: string, username: string, password: string, host: string, port: number, path: string, query: string, fragment: string, } | { "type": "receive_url", version: string, status: string, } | { "type": "header_up", name: string, value: string, } | { "type": "header_down", name: string, value: string, } | { "type": "chunk_sent", bytes: number, } | { "type": "chunk_received", bytes: number, } | { "type": "dns_resolved", hostname: string, addresses: Array<string>, duration: bigint, overridden: boolean, };

 export type HttpResponseHeader = { name: string, value: string, };

 export type HttpResponseState = "initialized" | "connected" | "closed";

-export type HttpUrlParameter = { enabled?: boolean, 
-/**
- * Colon-prefixed parameters are treated as path parameters if they match, like `/users/:id`
- * Other entries are appended as query parameters
- */
-name: string, value: string, id?: string, };
+export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, id?: string, };

 export type KeyValue = { model: "key_value", id: string, createdAt: string, updatedAt: string, key: string, namespace: string, value: string, };

-export type Plugin = { model: "plugin", id: string, createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, enabled: boolean, url: string | null, source: PluginSource, };
-
-export type PluginSource = "bundled" | "filesystem" | "registry";
+export type Plugin = { model: "plugin", id: string, createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, enabled: boolean, url: string | null, };

 export type ProxySetting = { "type": "enabled", http: string, https: string, auth: ProxySettingAuth | null, bypass: string, disabled: boolean, } | { "type": "disabled" };

@@ -97,11 +77,7 @@ export type WebsocketEvent = { model: "websocket_event", id: string, createdAt:

 export type WebsocketEventType = "binary" | "close" | "frame" | "open" | "ping" | "pong" | "text";

-export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, 
-/**
- * URL parameters used for both path placeholders (`:id`) and query string entries.
- */
-urlParameters: Array<HttpUrlParameter>, };
+export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };

 export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, settingDnsOverrides: Array<DnsOverride>, };

--- a/packages/plugin-runtime/src/PluginInstance.ts
+++ b/packages/plugin-runtime/src/PluginInstance.ts
@@ -76,10 +76,10 @@ export class PluginInstance {
    this.#mod = {};

    const fileChangeCallback = async () => {
+      await this.#mod?.dispose?.();
+      this.#importModule();
      const ctx = this.#newCtx(workerData.context);
      try {
-        await this.#mod?.dispose?.();
-        this.#importModule();
        await this.#mod?.init?.(ctx);
        this.#sendPayload(
          workerData.context,
@@ -90,7 +90,7 @@ export class PluginInstance {
          null,
        );
      } catch (err: unknown) {
-        await ctx.toast.show({
+        ctx.toast.show({
          message: `Failed to initialize plugin ${this.#workerData.bootRequest.dir.split('/').pop()}: ${err}`,
          color: 'notice',
          icon: 'alert_triangle',
@@ -1003,7 +1003,6 @@ function watchFile(filepath: string, cb: () => void) {
    const stat = statSync(filepath, { throwIfNoEntry: false });
    if (stat == null || stat.mtimeMs !== watchedFiles[filepath]?.mtimeMs) {
      watchedFiles[filepath] = stat ?? null;
-      console.log('[plugin-runtime] watchFile triggered', filepath);
      cb();
    }
  });
--- a/plugins-external/faker/tests/init.test.ts
+++ b/plugins-external/faker/tests/init.test.ts
@@ -13,16 +13,12 @@ describe('template-function-faker', () => {
  it('renders date results as unquoted ISO strings', async () => {
    const { plugin } = await import('../src/index');
    const fn = plugin.templateFunctions?.find((fn) => fn.name === 'faker.date.future');
-    const onRender = fn?.onRender;

-    expect(onRender).toBeTypeOf('function');
-    if (onRender == null) {
-      throw new Error("Expected template function 'faker.date.future' to define onRender");
-    }
+    expect(fn?.onRender).toBeTypeOf('function');

-    const result = await onRender(
-      {} as Parameters<typeof onRender>[0],
-      { values: {} } as Parameters<typeof onRender>[1],
+    const result = await fn!.onRender!(
+      {} as Parameters<NonNullable<typeof fn.onRender>>[0],
+      { values: {} } as Parameters<NonNullable<typeof fn.onRender>>[1],
    );

    expect(result).toMatch(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/);
--- a/plugins-external/httpsnippet/src/index.ts
+++ b/plugins-external/httpsnippet/src/index.ts
@@ -206,10 +206,7 @@ export const plugin: PluginDefinition = {
        // Create snippet generator
        const snippet = new HTTPSnippet(harRequest);
        const generateSnippet = (target: string, client: string): string => {
-          const result = snippet.convert(
-            target as Parameters<typeof snippet.convert>[0],
-            client as Parameters<typeof snippet.convert>[1],
-          );
+          const result = snippet.convert(target as any, client);
          return (Array.isArray(result) ? result.join('\n') : result || '').replace(/\r\n/g, '\n');
        };

--- a/plugins-external/mcp-server/package.json
+++ b/plugins-external/mcp-server/package.json
@@ -16,9 +16,9 @@
  },
  "dependencies": {
    "@hono/mcp": "^0.2.3",
-    "@hono/node-server": "^1.19.10",
+    "@hono/node-server": "^1.19.7",
    "@modelcontextprotocol/sdk": "^1.26.0",
-    "hono": "^4.12.4",
+    "hono": "^4.11.10",
    "zod": "^3.25.76"
  },
  "devDependencies": {
--- a/plugins/action-copy-grpcurl/src/index.ts
+++ b/plugins/action-copy-grpcurl/src/index.ts
@@ -11,7 +11,7 @@ export const plugin: PluginDefinition = {
      async onSelect(ctx, args) {
        const rendered_request = await ctx.grpcRequest.render({
          grpcRequest: args.grpcRequest,
-          purpose: 'send',
+          purpose: 'preview',
        });
        const data = await convert(rendered_request, args.protoFiles);
        await ctx.clipboard.copyText(data);
@@ -103,7 +103,7 @@ export async function convert(request: Partial<GrpcRequest>, allProtoFiles: stri

  // Add form params
  if (request.message) {
-    xs.push('-d', quote(request.message));
+    xs.push('-d', `${quote(JSON.stringify(JSON.parse(request.message)))}`);
    xs.push(NEWLINE);
  }

--- a/plugins/action-copy-grpcurl/tests/index.test.ts
+++ b/plugins/action-copy-grpcurl/tests/index.test.ts
@@ -151,26 +151,7 @@ describe('exporter-curl', () => {
      [
        `grpcurl -import-path '/'`,
        `-proto '/foo.proto'`,
-        `-d '{\n  "foo": "bar",\n  "baz": 1\n}'`,
-        'yaak.app',
-      ].join(' \\\n  '),
-    );
-  });
-
-  test('Sends data with unresolved template tags', async () => {
-    expect(
-      await convert(
-        {
-          url: 'https://yaak.app',
-          message: '{"timestamp": ${[ faker "timestamp" ]}, "foo": "bar"}',
-        },
-        ['/foo.proto'],
-      ),
-    ).toEqual(
-      [
-        `grpcurl -import-path '/'`,
-        `-proto '/foo.proto'`,
-        `-d '{"timestamp": \${[ faker "timestamp" ]}, "foo": "bar"}'`,
+        `-d '{"foo":"bar","baz":1}'`,
        'yaak.app',
      ].join(' \\\n  '),
    );
--- a/plugins/auth-oauth2/src/callbackServer.ts
+++ b/plugins/auth-oauth2/src/callbackServer.ts
@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from 'node:http';
 import http from 'node:http';
 import type { Context } from '@yaakapp/api';

-export const HOSTED_CALLBACK_URL_BASE = 'https://oauth.yaak.app/redirect';
+export const HOSTED_CALLBACK_URL = 'https://oauth.yaak.app/redirect';
 export const DEFAULT_LOCALHOST_PORT = 8765;
 const CALLBACK_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes

@@ -176,15 +176,12 @@ export function startCallbackServer(options: {

 /**
 * Build the redirect URI for the hosted callback page.
- * The port is encoded in the URL path so the hosted page can redirect
- * to the local server without relying on query params (which some OAuth
- * providers strip). The default port is omitted for a cleaner URL.
+ * The hosted page will redirect to the local server with the OAuth response.
 */
-export function buildHostedCallbackRedirectUri(localPort: number): string {
-  if (localPort === DEFAULT_LOCALHOST_PORT) {
-    return HOSTED_CALLBACK_URL_BASE;
-  }
-  return `${HOSTED_CALLBACK_URL_BASE}/${localPort}`;
+export function buildHostedCallbackRedirectUri(localPort: number, localPath: string): string {
+  const localRedirectUri = `http://127.0.0.1:${localPort}${localPath}`;
+  // The hosted callback page will read params and redirect to the local server
+  return `${HOSTED_CALLBACK_URL}?redirect_to=${encodeURIComponent(localRedirectUri)}`;
 }

 /**
@@ -216,9 +213,14 @@ export async function getRedirectUrlViaExternalBrowser(
 ): Promise<{ callbackUrl: string; redirectUri: string }> {
  const { callbackType, callbackPort } = options;

-  const port = callbackPort ?? DEFAULT_LOCALHOST_PORT;
+  // Determine port based on callback type:
+  // - localhost: use specified port or default stable port
+  // - hosted: use random port (0) since hosted page redirects to local
+  const port = callbackType === 'localhost' ? (callbackPort ?? DEFAULT_LOCALHOST_PORT) : 0;

-  console.log(`[oauth2] Starting callback server (type: ${callbackType}, port: ${port})`);
+  console.log(
+    `[oauth2] Starting callback server (type: ${callbackType}, port: ${port || 'random'})`,
+  );

  const server = await startCallbackServer({
    port,
@@ -230,7 +232,7 @@ export async function getRedirectUrlViaExternalBrowser(
    let oauthRedirectUri: string;

    if (callbackType === 'hosted') {
-      oauthRedirectUri = buildHostedCallbackRedirectUri(server.port);
+      oauthRedirectUri = buildHostedCallbackRedirectUri(server.port, '/callback');
      console.log('[oauth2] Using hosted callback redirect:', oauthRedirectUri);
    } else {
      oauthRedirectUri = server.redirectUri;
--- a/plugins/auth-oauth2/src/index.ts
+++ b/plugins/auth-oauth2/src/index.ts
@@ -6,11 +6,7 @@ import type {
  PluginDefinition,
 } from '@yaakapp/api';
 import type { Algorithm } from 'jsonwebtoken';
-import {
-  buildHostedCallbackRedirectUri,
-  DEFAULT_LOCALHOST_PORT,
-  stopActiveServer,
-} from './callbackServer';
+import { DEFAULT_LOCALHOST_PORT, HOSTED_CALLBACK_URL, stopActiveServer } from './callbackServer';
 import {
  type CallbackType,
  DEFAULT_PKCE_METHOD,
@@ -304,7 +300,8 @@ export const plugin: PluginDefinition = {
                optional: true,
                dynamic: hiddenIfNot(
                  ['authorization_code', 'implicit'],
-                  ({ useExternalBrowser }) => !!useExternalBrowser,
+                  ({ useExternalBrowser, callbackType }) =>
+                    !!useExternalBrowser && callbackType === 'localhost',
                ),
              },
            ],
@@ -331,11 +328,11 @@ export const plugin: PluginDefinition = {
                  }

                  // Compute the redirect URI based on callback type
-                  const port = intArg(values, 'callbackPort') || DEFAULT_LOCALHOST_PORT;
                  let redirectUri: string;
                  if (callbackType === 'hosted') {
-                    redirectUri = buildHostedCallbackRedirectUri(port);
+                    redirectUri = HOSTED_CALLBACK_URL;
                  } else {
+                    const port = intArg(values, 'callbackPort') || DEFAULT_LOCALHOST_PORT;
                    redirectUri = `http://127.0.0.1:${port}/callback`;
                  }

--- a/plugins/importer-curl/src/index.ts
+++ b/plugins/importer-curl/src/index.ts
@@ -82,9 +82,7 @@ function splitCommands(rawData: string): string[] {
  let inDollarQuote = false;

  for (let i = 0; i < joined.length; i++) {
-    if (joined[i] === undefined) break; // Make TS happy
-
-    const ch = joined[i];
+    const ch = joined[i]!;
    const next = joined[i + 1];

    // Track quoting state to avoid splitting inside quoted strings
@@ -123,11 +121,7 @@ function splitCommands(rawData: string): string[] {
    const inQuote = inSingleQuote || inDoubleQuote || inDollarQuote;

    // Split on ;, newline, or CRLF when not inside quotes and not escaped
-    if (
-      !inQuote &&
-      !isEscaped(i) &&
-      (ch === ';' || ch === '\n' || (ch === '\r' && next === '\n'))
-    ) {
+    if (!inQuote && !isEscaped(i) && (ch === ';' || ch === '\n' || (ch === '\r' && next === '\n'))) {
      if (ch === '\r') i++; // Skip the \n in \r\n
      if (current.trim()) {
        commands.push(current.trim());
--- a/plugins/importer-openapi/tests/index.test.ts
+++ b/plugins/importer-openapi/tests/index.test.ts
@@ -7,29 +7,6 @@ describe('importer-openapi', () => {
  const p = path.join(__dirname, 'fixtures');
  const fixtures = fs.readdirSync(p);

-  test('Maps operation description to request description', async () => {
-    const imported = await convertOpenApi(
-      JSON.stringify({
-        openapi: '3.0.0',
-        info: { title: 'Description Test', version: '1.0.0' },
-        paths: {
-          '/klanten': {
-            get: {
-              description: 'Lijst van klanten',
-              responses: { '200': { description: 'ok' } },
-            },
-          },
-        },
-      }),
-    );
-
-    expect(imported?.resources.httpRequests).toEqual([
-      expect.objectContaining({
-        description: 'Lijst van klanten',
-      }),
-    ]);
-  });
-
  test('Skips invalid file', async () => {
    const imported = await convertOpenApi('{}');
    expect(imported).toBeUndefined();
--- a/plugins/importer-postman/src/index.ts
+++ b/plugins/importer-postman/src/index.ts
@@ -55,11 +55,19 @@ export function convertPostman(contents: string): ImportPluginResponse | undefin
    folders: [],
  };

+  const rawDescription = info.description;
+  const description =
+    typeof rawDescription === 'object' && rawDescription != null && 'content' in rawDescription
+      ? String(rawDescription.content)
+      : rawDescription == null
+        ? undefined
+        : String(rawDescription);
+
  const workspace: ExportResources['workspaces'][0] = {
    model: 'workspace',
    id: generateId('workspace'),
    name: info.name ? String(info.name) : 'Postman Import',
-    description: importDescription(info.description),
+    description,
    ...globalAuth,
  };
  exportResources.workspaces.push(workspace);
@@ -131,7 +139,7 @@ export function convertPostman(contents: string): ImportPluginResponse | undefin
        workspaceId: workspace.id,
        folderId,
        name: v.name,
-        description: importDescription(r.description),
+        description: r.description ? String(r.description) : undefined,
        method: typeof r.method === 'string' ? r.method : 'GET',
        url,
        urlParameters,
@@ -501,26 +509,6 @@ function toArray<T>(value: unknown): T[] {
  return [];
 }

-function importDescription(rawDescription: unknown): string | undefined {
-  if (rawDescription == null) {
-    return undefined;
-  }
-
-  if (typeof rawDescription === 'string') {
-    return rawDescription;
-  }
-
-  if (typeof rawDescription === 'object' && !Array.isArray(rawDescription)) {
-    const description = toRecord(rawDescription);
-    if ('content' in description && description.content != null) {
-      return String(description.content);
-    }
-    return undefined;
-  }
-
-  return String(rawDescription);
-}
-
 /** Recursively render all nested object properties */
 function convertTemplateSyntax<T>(obj: T): T {
  if (typeof obj === 'string') {
--- a/plugins/importer-postman/tests/index.test.ts
+++ b/plugins/importer-postman/tests/index.test.ts
@@ -22,39 +22,4 @@ describe('importer-postman', () => {
      );
    });
  }
-
-  test('Imports object descriptions without [object Object]', () => {
-    const result = convertPostman(
-      JSON.stringify({
-        info: {
-          name: 'Description Test',
-          schema: 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json',
-        },
-        item: [
-          {
-            name: 'Request 1',
-            request: {
-              method: 'GET',
-              description: {
-                content: 'Lijst van klanten',
-                type: 'text/plain',
-              },
-            },
-          },
-        ],
-      }),
-    );
-
-    expect(result?.resources.workspaces).toEqual([
-      expect.objectContaining({
-        name: 'Description Test',
-      }),
-    ]);
-    expect(result?.resources.httpRequests).toEqual([
-      expect.objectContaining({
-        name: 'Request 1',
-        description: 'Lijst van klanten',
-      }),
-    ]);
-  });
 });
--- a/plugins/template-function-response/src/index.ts
+++ b/plugins/template-function-response/src/index.ts
@@ -317,8 +317,7 @@ async function getResponse(
    finalBehavior === 'always' ||
    (finalBehavior === BEHAVIOR_TTL && shouldSendExpired(response, ttl))
  ) {
-    // Explicitly render the request before send (instead of relying on send() to render) so that we can
-    // preserve the render purpose.
+    // NOTE: Render inside this conditional, or we'll get infinite recursion (render->render->...)
    const renderedHttpRequest = await ctx.httpRequest.render({ httpRequest, purpose });
    response = await ctx.httpRequest.send({ httpRequest: renderedHttpRequest });
  }
--- a/plugins/template-function-timestamp/package.json
+++ b/plugins/template-function-timestamp/package.json
@@ -1,7 +1,5 @@
 {
  "name": "@yaak/template-function-timestamp",
-  "displayName": "Timestamp Template Functions",
-  "description": "Template functions for dealing with timestamps",
  "private": true,
  "version": "0.1.0",
  "scripts": {
--- a/scripts/run-dev.mjs
+++ b/scripts/run-dev.mjs
@@ -45,9 +45,6 @@ const args = [
  ...additionalArgs
 ];

-// Invoke the tauri CLI JS entry point directly via node to avoid shell escaping issues on Windows
-const tauriJs = path.join(rootDir, 'node_modules', '@tauri-apps', 'cli', 'tauri.js');
-
-const result = spawnSync(process.execPath, [tauriJs, ...args], { stdio: 'inherit', env: process.env });
+const result = spawnSync('tauri', args, { stdio: 'inherit', shell: false, env: process.env });

 process.exit(result.status || 0);
--- a/src-web/components/CommandPaletteDialog.tsx
+++ b/src-web/components/CommandPaletteDialog.tsx
@@ -32,8 +32,6 @@ import { useRecentWorkspaces } from '../hooks/useRecentWorkspaces';
 import { useScrollIntoView } from '../hooks/useScrollIntoView';
 import { useSendAnyHttpRequest } from '../hooks/useSendAnyHttpRequest';
 import { useSidebarHidden } from '../hooks/useSidebarHidden';
-import { appInfo } from '../lib/appInfo';
-import { copyToClipboard } from '../lib/copy';
 import { createRequestAndNavigate } from '../lib/createRequestAndNavigate';
 import { deleteModelWithConfirm } from '../lib/deleteModelWithConfirm';
 import { showDialog } from '../lib/dialog';
@@ -164,14 +162,6 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
        label: 'Send Request',
        onSelect: () => sendRequest(activeRequest.id),
      });
-      if (appInfo.cliVersion != null) {
-        commands.push({
-          key: 'request.copy_cli_send',
-          searchText: `copy cli send yaak request send ${activeRequest.id}`,
-          label: 'Copy CLI Send Command',
-          onSelect: () => copyToClipboard(`yaak request send ${activeRequest.id}`),
-        });
-      }
      httpRequestActions.forEach((a, i) => {
        commands.push({
          key: `http_request_action.${i}`,
--- a/src-web/components/GrpcEditor.tsx
+++ b/src-web/components/GrpcEditor.tsx
@@ -1,4 +1,4 @@
-import { jsoncLanguage } from '@shopify/lang-jsonc';
+import { jsonLanguage } from '@codemirror/lang-json';
 import { linter } from '@codemirror/lint';
 import type { EditorView } from '@codemirror/view';
 import type { GrpcRequest } from '@yaakapp-internal/models';
@@ -115,7 +115,7 @@ export function GrpcEditor({
        delay: 200,
        needsRefresh: handleRefresh,
      }),
-      jsoncLanguage.data.of({
+      jsonLanguage.data.of({
        autocomplete: jsonCompletion(),
      }),
      stateExtensions({}),
--- a/src-web/components/HeaderSize.tsx
+++ b/src-web/components/HeaderSize.tsx
@@ -40,7 +40,7 @@ export function HeaderSize({
    } else if (type() === 'macos') {
      if (!isFullscreen) {
        // Add large padding for window controls
-        s.paddingLeft = 76 / settings.interfaceScale;
+        s.paddingLeft = 72 / settings.interfaceScale;
      }
    } else if (!ignoreControlsSpacing && !settings.hideWindowControls) {
      s.paddingRight = WINDOW_CONTROLS_WIDTH;
--- a/src-web/components/HttpRequestPane.tsx
+++ b/src-web/components/HttpRequestPane.tsx
@@ -48,7 +48,6 @@ import { FormMultipartEditor } from './FormMultipartEditor';
 import { FormUrlencodedEditor } from './FormUrlencodedEditor';
 import { HeadersEditor } from './HeadersEditor';
 import { HttpAuthenticationEditor } from './HttpAuthenticationEditor';
-import { JsonBodyEditor } from './JsonBodyEditor';
 import { MarkdownEditor } from './MarkdownEditor';
 import { RequestMethodDropdown } from './RequestMethodDropdown';
 import { UrlBar } from './UrlBar';
@@ -258,7 +257,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
  );

  const handleBodyTextChange = useCallback(
-    (text: string) => patchModel(activeRequest, { body: { ...activeRequest.body, text } }),
+    (text: string) => patchModel(activeRequest, { body: { text } }),
    [activeRequest],
  );

@@ -371,10 +370,16 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
            <TabContent value={TAB_BODY}>
              <ConfirmLargeRequestBody request={activeRequest}>
                {activeRequest.bodyType === BODY_TYPE_JSON ? (
-                  <JsonBodyEditor
+                  <Editor
                    forceUpdateKey={forceUpdateKey}
+                    autocompleteFunctions
+                    autocompleteVariables
+                    placeholder="..."
                    heightMode={fullHeight ? 'full' : 'auto'}
-                    request={activeRequest}
+                    defaultValue={`${activeRequest.body?.text ?? ''}`}
+                    language="json"
+                    onChange={handleBodyTextChange}
+                    stateKey={`json.${activeRequest.id}`}
                  />
                ) : activeRequest.bodyType === BODY_TYPE_XML ? (
                  <Editor
--- a/src-web/components/HttpResponsePane.tsx
+++ b/src-web/components/HttpResponsePane.tsx
@@ -1,4 +1,4 @@
-import type { HttpResponse, HttpResponseEvent } from '@yaakapp-internal/models';
+import type { HttpResponse } from '@yaakapp-internal/models';
 import classNames from 'classnames';
 import type { ComponentType, CSSProperties } from 'react';
 import { lazy, Suspense, useMemo } from 'react';
@@ -18,14 +18,11 @@ import { CountBadge } from './core/CountBadge';
 import { HotkeyList } from './core/HotkeyList';
 import { HttpResponseDurationTag } from './core/HttpResponseDurationTag';
 import { HttpStatusTag } from './core/HttpStatusTag';
-import { Icon } from './core/Icon';
 import { LoadingIcon } from './core/LoadingIcon';
-import { PillButton } from './core/PillButton';
 import { SizeTag } from './core/SizeTag';
 import { HStack, VStack } from './core/Stacks';
 import type { TabItem } from './core/Tabs/Tabs';
 import { TabContent, Tabs } from './core/Tabs/Tabs';
-import { Tooltip } from './core/Tooltip';
 import { EmptyStateText } from './EmptyStateText';
 import { ErrorBoundary } from './ErrorBoundary';
 import { HttpResponseTimeline } from './HttpResponseTimeline';
@@ -60,11 +57,6 @@ const TAB_TIMELINE = 'timeline';

 export type TimelineViewMode = 'timeline' | 'text';

-interface RedirectDropWarning {
-  droppedBodyCount: number;
-  droppedHeaders: string[];
-}
-
 export function HttpResponsePane({ style, className, activeRequestId }: Props) {
  const { activeResponse, setPinnedResponseId, responses } = usePinnedHttpResponse(activeRequestId);
  const [viewMode, setViewMode] = useResponseViewMode(activeResponse?.requestId);
@@ -73,12 +65,6 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
  const mimeType = contentType == null ? null : getMimeTypeFromContentType(contentType).essence;

  const responseEvents = useHttpResponseEvents(activeResponse);
-  const redirectDropWarning = useMemo(
-    () => getRedirectDropWarning(responseEvents.data),
-    [responseEvents.data],
-  );
-  const shouldShowRedirectDropWarning =
-    activeResponse?.state === 'closed' && redirectDropWarning != null;

  const cookieCounts = useMemo(() => getCookieCounts(responseEvents.data), [responseEvents.data]);

@@ -176,77 +162,32 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
            )}
          >
            {activeResponse && (
-              <div
+              <HStack
+                space={2}
+                alignItems="center"
                className={classNames(
-                  'grid grid-cols-[auto_minmax(4rem,1fr)_auto]',
                  'cursor-default select-none',
                  'whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm hide-scrollbars',
                )}
              >
-                <HStack space={2} className="w-full flex-shrink-0">
-                  {activeResponse.state !== 'closed' && <LoadingIcon size="sm" />}
-                  <HttpStatusTag showReason response={activeResponse} />
-                  <span>&bull;</span>
-                  <HttpResponseDurationTag response={activeResponse} />
-                  <span>&bull;</span>
-                  <SizeTag
-                    contentLength={activeResponse.contentLength ?? 0}
-                    contentLengthCompressed={activeResponse.contentLengthCompressed}
-                  />
-                </HStack>
-                {shouldShowRedirectDropWarning ? (
-                  <Tooltip
-                    tabIndex={0}
-                    className="my-auto pl-3 flex-shrink-0 max-w-full justify-self-end overflow-hidden"
-                    content={
-                      <VStack alignItems="start" space={1} className="text-xs">
-                        <span className="font-medium text-warning">
-                          Redirect changed this request
-                        </span>
-                        {redirectDropWarning.droppedBodyCount > 0 && (
-                          <span>
-                            Body dropped on {redirectDropWarning.droppedBodyCount}{' '}
-                            {redirectDropWarning.droppedBodyCount === 1
-                              ? 'redirect hop'
-                              : 'redirect hops'}
-                          </span>
-                        )}
-                        {redirectDropWarning.droppedHeaders.length > 0 && (
-                          <span>
-                            Headers dropped:{' '}
-                            <span className="font-mono">
-                              {redirectDropWarning.droppedHeaders.join(', ')}
-                            </span>
-                          </span>
-                        )}
-                        <span className="text-text-subtle">See Timeline for details.</span>
-                      </VStack>
-                    }
-                  >
-                    <span className="inline-flex min-w-0">
-                      <PillButton
-                        color="warning"
-                        className="font-sans text-sm !flex-shrink max-w-full"
-                        innerClassName="flex items-center"
-                        leftSlot={<Icon icon="alert_triangle" size="xs" color="warning" />}
-                      >
-                        <span className="truncate">
-                          {getRedirectWarningLabel(redirectDropWarning)}
-                        </span>
-                      </PillButton>
-                    </span>
-                  </Tooltip>
-                ) : (
-                  <span />
-                )}
-                <div className="justify-self-end flex-shrink-0">
+                {activeResponse.state !== 'closed' && <LoadingIcon size="sm" />}
+                <HttpStatusTag showReason response={activeResponse} />
+                <span>&bull;</span>
+                <HttpResponseDurationTag response={activeResponse} />
+                <span>&bull;</span>
+                <SizeTag
+                  contentLength={activeResponse.contentLength ?? 0}
+                  contentLengthCompressed={activeResponse.contentLengthCompressed}
+                />
+
+                <div className="ml-auto">
                  <RecentHttpResponsesDropdown
                    responses={responses}
                    activeResponse={activeResponse}
                    onPinnedResponseId={setPinnedResponseId}
                  />
                </div>
-              </div>
+              </HStack>
            )}
          </HStack>

@@ -333,54 +274,6 @@ export function HttpResponsePane({ style, className, activeRequestId }: Props) {
  );
 }

-function getRedirectDropWarning(
-  events: HttpResponseEvent[] | undefined,
-): RedirectDropWarning | null {
-  if (events == null || events.length === 0) return null;
-
-  let droppedBodyCount = 0;
-  const droppedHeaders = new Set<string>();
-  for (const e of events) {
-    const event = e.event;
-    if (event.type !== 'redirect') {
-      continue;
-    }
-
-    if (event.dropped_body) {
-      droppedBodyCount += 1;
-    }
-    for (const headerName of event.dropped_headers ?? []) {
-      pushHeaderName(droppedHeaders, headerName);
-    }
-  }
-
-  if (droppedBodyCount === 0 && droppedHeaders.size === 0) {
-    return null;
-  }
-
-  return {
-    droppedBodyCount,
-    droppedHeaders: Array.from(droppedHeaders).sort(),
-  };
-}
-
-function pushHeaderName(headers: Set<string>, headerName: string): void {
-  const existing = Array.from(headers).find((h) => h.toLowerCase() === headerName.toLowerCase());
-  if (existing == null) {
-    headers.add(headerName);
-  }
-}
-
-function getRedirectWarningLabel(warning: RedirectDropWarning): string {
-  if (warning.droppedBodyCount > 0 && warning.droppedHeaders.length > 0) {
-    return 'Dropped body and headers';
-  }
-  if (warning.droppedBodyCount > 0) {
-    return 'Dropped body';
-  }
-  return 'Dropped headers';
-}
-
 function EnsureCompleteResponse({
  response,
  Component,
--- a/src-web/components/HttpResponseTimeline.tsx
+++ b/src-web/components/HttpResponseTimeline.tsx
@@ -8,6 +8,7 @@ import { useHttpResponseEvents } from '../hooks/useHttpResponseEvents';
 import { Editor } from './core/Editor/LazyEditor';
 import { type EventDetailAction, EventDetailHeader, EventViewer } from './core/EventViewer';
 import { EventViewerRow } from './core/EventViewerRow';
+import { HttpMethodTagRaw } from './core/HttpMethodTag';
 import { HttpStatusTagRaw } from './core/HttpStatusTag';
 import { Icon, type IconProps } from './core/Icon';
 import { KeyValueRow, KeyValueRows } from './core/KeyValueRow';
@@ -187,7 +188,6 @@ function EventDetails({

    // Redirect - show status, URL, and behavior
    if (e.type === 'redirect') {
-      const droppedHeaders = e.dropped_headers ?? [];
      return (
        <KeyValueRows>
          <KeyValueRow label="Status">
@@ -197,10 +197,6 @@ function EventDetails({
          <KeyValueRow label="Behavior">
            {e.behavior === 'drop_body' ? 'Drop body, change to GET' : 'Preserve method and body'}
          </KeyValueRow>
-          <KeyValueRow label="Body Dropped">{e.dropped_body ? 'Yes' : 'No'}</KeyValueRow>
-          <KeyValueRow label="Headers Dropped">
-            {droppedHeaders.length > 0 ? droppedHeaders.join(', ') : '--'}
-          </KeyValueRow>
        </KeyValueRows>
      );
    }
@@ -273,17 +269,7 @@ function getEventTextParts(event: HttpResponseEventData): EventTextParts {
      return { prefix: '<', text: `${event.name}: ${event.value}` };
    case 'redirect': {
      const behavior = event.behavior === 'drop_body' ? 'drop body' : 'preserve';
-      const droppedHeaders = event.dropped_headers ?? [];
-      const dropped = [
-        event.dropped_body ? 'body dropped' : null,
-        droppedHeaders.length > 0 ? `headers dropped: ${droppedHeaders.join(', ')}` : null,
-      ]
-        .filter(Boolean)
-        .join(', ');
-      return {
-        prefix: '*',
-        text: `Redirect ${event.status} -> ${event.url} (${behavior}${dropped ? `, ${dropped}` : ''})`,
-      };
+      return { prefix: '*', text: `Redirect ${event.status} -> ${event.url} (${behavior})` };
    }
    case 'setting':
      return { prefix: '*', text: `Setting ${event.name}=${event.value}` };
@@ -338,23 +324,13 @@ function getEventDisplay(event: HttpResponseEventData): EventDisplay {
        label: 'Info',
        summary: event.message,
      };
-    case 'redirect': {
-      const droppedHeaders = event.dropped_headers ?? [];
-      const dropped = [
-        event.dropped_body ? 'drop body' : null,
-        droppedHeaders.length > 0
-          ? `drop ${droppedHeaders.length} ${droppedHeaders.length === 1 ? 'header' : 'headers'}`
-          : null,
-      ]
-        .filter(Boolean)
-        .join(', ');
+    case 'redirect':
      return {
        icon: 'arrow_big_right_dash',
        color: 'success',
        label: 'Redirect',
-        summary: `Redirecting ${event.status} ${event.url}${dropped ? ` (${dropped})` : ''}`,
+        summary: `Redirecting ${event.status} ${event.url}${event.behavior === 'drop_body' ? ' (drop body)' : ''}`,
      };
-    }
    case 'send_url':
      return {
        icon: 'arrow_big_up_dash',
--- a/src-web/components/JsonBodyEditor.tsx
+++ b/src-web/components/JsonBodyEditor.tsx
@@ -1,122 +0,0 @@
-import { linter } from '@codemirror/lint';
-import type { HttpRequest } from '@yaakapp-internal/models';
-import { patchModel } from '@yaakapp-internal/models';
-import { useCallback, useMemo } from 'react';
-import { useKeyValue } from '../hooks/useKeyValue';
-import { textLikelyContainsJsonComments } from '../lib/jsonComments';
-import { Banner } from './core/Banner';
-import type { DropdownItem } from './core/Dropdown';
-import { Dropdown } from './core/Dropdown';
-import type { EditorProps } from './core/Editor/Editor';
-import { jsonParseLinter } from './core/Editor/json-lint';
-import { Editor } from './core/Editor/LazyEditor';
-import { Icon } from './core/Icon';
-import { IconButton } from './core/IconButton';
-import { IconTooltip } from './core/IconTooltip';
-
-interface Props {
-  forceUpdateKey: string;
-  heightMode: EditorProps['heightMode'];
-  request: HttpRequest;
-}
-
-export function JsonBodyEditor({ forceUpdateKey, heightMode, request }: Props) {
-  const handleChange = useCallback(
-    (text: string) => patchModel(request, { body: { ...request.body, text } }),
-    [request],
-  );
-
-  const autoFix = request.body?.sendJsonComments !== true;
-
-  const lintExtension = useMemo(
-    () =>
-      linter(
-        jsonParseLinter(
-          autoFix
-            ? { allowComments: true, allowTrailingCommas: true }
-            : { allowComments: false, allowTrailingCommas: false },
-        ),
-      ),
-    [autoFix],
-  );
-
-  const hasComments = useMemo(
-    () => textLikelyContainsJsonComments(request.body?.text ?? ''),
-    [request.body?.text],
-  );
-
-  const { value: bannerDismissed, set: setBannerDismissed } = useKeyValue<boolean>({
-    namespace: 'no_sync',
-    key: ['json-fix-3', request.workspaceId],
-    fallback: false,
-  });
-
-  const handleToggleAutoFix = useCallback(() => {
-    const newBody = { ...request.body };
-    if (autoFix) {
-      newBody.sendJsonComments = true;
-    } else {
-      delete newBody.sendJsonComments;
-    }
-    patchModel(request, { body: newBody });
-  }, [request, autoFix]);
-
-  const handleDropdownOpen = useCallback(() => {
-    if (!bannerDismissed) {
-      setBannerDismissed(true);
-    }
-  }, [bannerDismissed, setBannerDismissed]);
-
-  const showBanner = hasComments && autoFix && !bannerDismissed;
-
-  const stripMessage = 'Automatically strip comments and trailing commas before sending';
-  const actions = useMemo<EditorProps['actions']>(
-    () => [
-      showBanner && (
-        <Banner color="notice" className="!opacity-100 h-sm !py-0 !px-2 flex items-center text-xs">
-          <p className="inline-flex items-center gap-1 min-w-0">
-            <span className="truncate">Auto-fix enabled</span>
-            <Icon icon="arrow_right" size="sm" className="opacity-disabled" />
-          </p>
-        </Banner>
-      ),
-      <div key="settings" className="!opacity-100 !shadow">
-        <Dropdown
-          onOpen={handleDropdownOpen}
-          items={
-            [
-              {
-                label: 'Automatically Fix JSON',
-                keepOpenOnSelect: true,
-                onSelect: handleToggleAutoFix,
-                rightSlot: <IconTooltip content={stripMessage} />,
-                leftSlot: (
-                  <Icon icon={autoFix ? 'check_square_checked' : 'check_square_unchecked'} />
-                ),
-              },
-            ] satisfies DropdownItem[]
-          }
-        >
-          <IconButton size="sm" variant="border" icon="settings" title="JSON Settings" />
-        </Dropdown>
-      </div>,
-    ],
-    [handleDropdownOpen, handleToggleAutoFix, autoFix, showBanner],
-  );
-
-  return (
-    <Editor
-      forceUpdateKey={forceUpdateKey}
-      autocompleteFunctions
-      autocompleteVariables
-      placeholder="..."
-      heightMode={heightMode}
-      defaultValue={`${request.body?.text ?? ''}`}
-      language="json"
-      onChange={handleChange}
-      stateKey={`json.${request.id}`}
-      actions={actions}
-      lintExtension={lintExtension}
-    />
-  );
-}
--- a/src-web/components/Settings/Settings.tsx
+++ b/src-web/components/Settings/Settings.tsx
@@ -39,9 +39,9 @@ const tabs = [
  TAB_THEME,
  TAB_INTERFACE,
  TAB_SHORTCUTS,
-  TAB_PLUGINS,
  TAB_CERTIFICATES,
  TAB_PROXY,
+  TAB_PLUGINS,
  TAB_LICENSE,
 ] as const;
 export type SettingsTab = (typeof tabs)[number];
@@ -120,7 +120,7 @@ export default function Settings({ hide }: Props) {
              value === TAB_CERTIFICATES ? (
                <CountBadge count={settings.clientCertificates.length} />
              ) : value === TAB_PLUGINS ? (
-                <CountBadge count={plugins.filter((p) => p.source !== 'bundled').length} />
+                <CountBadge count={plugins.length} />
              ) : value === TAB_PROXY && settings.proxy?.type === 'enabled' ? (
                <CountBadge count />
              ) : value === TAB_LICENSE && licenseCheck.check.data?.status === 'personal_use' ? (
@@ -141,7 +141,7 @@ export default function Settings({ hide }: Props) {
        <TabContent value={TAB_SHORTCUTS} className="overflow-y-auto h-full px-6 !py-4">
          <SettingsHotkeys />
        </TabContent>
-        <TabContent value={TAB_PLUGINS} className="h-full grid grid-rows-1">
+        <TabContent value={TAB_PLUGINS} className="h-full grid grid-rows-1 px-6 !py-4">
          <SettingsPlugins defaultSubtab={mainTab === TAB_PLUGINS ? subtab : undefined} />
        </TabContent>
        <TabContent value={TAB_PROXY} className="overflow-y-auto h-full px-6 !py-4">
--- a/src-web/components/Settings/SettingsLicense.tsx
+++ b/src-web/components/Settings/SettingsLicense.tsx
@@ -13,6 +13,7 @@ import { Link } from '../core/Link';
 import { PlainInput } from '../core/PlainInput';
 import { Separator } from '../core/Separator';
 import { HStack, VStack } from '../core/Stacks';
+import { LocalImage } from '../LocalImage';

 export function SettingsLicense() {
  return (
@@ -40,7 +41,11 @@ function SettingsLicenseCmp() {

      case 'trialing':
        return (
-          <Banner color="info" className="max-w-lg">
+          <Banner color="info" className="@container flex items-center gap-x-5 max-w-xl">
+            <LocalImage
+              src="static/greg.jpeg"
+              className="hidden @sm:block rounded-full h-14 w-14"
+            />
            <p className="w-full">
              <strong>
                {pluralizeCount('day', differenceInDays(check.data.data.end, new Date()))}
@@ -50,6 +55,10 @@ function SettingsLicenseCmp() {
              <span className="opacity-50">Personal use is always free, forever.</span>
              <Separator className="my-2" />
              <div className="flex flex-wrap items-center gap-x-2 text-sm text-notice">
+                <Link noUnderline href="mailto:support@yaak.app">
+                  Contact Support
+                </Link>
+                <Icon icon="dot" size="sm" color="secondary" />
                <Link noUnderline href={`https://yaak.app/pricing?s=learn&t=${check.data.status}`}>
                  Learn More
                </Link>
@@ -60,16 +69,24 @@ function SettingsLicenseCmp() {

      case 'personal_use':
        return (
-          <Banner color="notice" className="max-w-lg">
+          <Banner color="notice" className="@container flex items-center gap-x-5 max-w-xl">
+            <LocalImage
+              src="static/greg.jpeg"
+              className="hidden @sm:block rounded-full h-14 w-14"
+            />
            <p className="w-full">
              Your commercial-use trial has ended.
              <br />
              <span className="opacity-50">
-                You may continue using Yaak for personal use only.
+                You may continue using Yaak for personal use free, forever.
                <br />A license is required for commercial use.
              </span>
              <Separator className="my-2" />
              <div className="flex flex-wrap items-center gap-x-2 text-sm text-notice">
+                <Link noUnderline href="mailto:support@yaak.app">
+                  Contact Support
+                </Link>
+                <Icon icon="dot" size="sm" color="secondary" />
                <Link noUnderline href={`https://yaak.app/pricing?s=learn&t=${check.data.status}`}>
                  Learn More
                </Link>
--- a/src-web/components/Settings/SettingsPlugins.tsx
+++ b/src-web/components/Settings/SettingsPlugins.tsx
@@ -9,13 +9,13 @@ import {
  searchPlugins,
  uninstallPlugin,
 } from '@yaakapp-internal/plugins';
-import classNames from 'classnames';
 import { useAtomValue } from 'jotai';
 import { useState } from 'react';
 import { useDebouncedValue } from '../../hooks/useDebouncedValue';
 import { useInstallPlugin } from '../../hooks/useInstallPlugin';
 import { usePluginInfo } from '../../hooks/usePluginInfo';
 import { usePluginsKey, useRefreshPlugins } from '../../hooks/usePlugins';
+import { appInfo } from '../../lib/appInfo';
 import { showConfirmDelete } from '../../lib/confirm';
 import { minPromiseMillis } from '../../lib/minPromiseMillis';
 import { Button } from '../core/Button';
@@ -33,6 +33,16 @@ import { TabContent, Tabs } from '../core/Tabs/Tabs';
 import { EmptyStateText } from '../EmptyStateText';
 import { SelectFile } from '../SelectFile';

+function isPluginBundled(plugin: Plugin, vendoredPluginDir: string): boolean {
+  const normalizedDir = plugin.directory.replace(/\\/g, '/');
+  const normalizedVendoredDir = vendoredPluginDir.replace(/\\/g, '/');
+  return (
+    normalizedDir.includes(normalizedVendoredDir) ||
+    normalizedDir.includes('vendored/plugins') ||
+    normalizedDir.includes('/plugins/')
+  );
+}
+
 interface SettingsPluginsProps {
  defaultSubtab?: string;
 }
@@ -40,8 +50,8 @@ interface SettingsPluginsProps {
 export function SettingsPlugins({ defaultSubtab }: SettingsPluginsProps) {
  const [directory, setDirectory] = useState<string | null>(null);
  const plugins = useAtomValue(pluginsAtom);
-  const bundledPlugins = plugins.filter((p) => p.source === 'bundled');
-  const installedPlugins = plugins.filter((p) => p.source !== 'bundled');
+  const bundledPlugins = plugins.filter((p) => isPluginBundled(p, appInfo.vendoredPluginDir));
+  const installedPlugins = plugins.filter((p) => !isPluginBundled(p, appInfo.vendoredPluginDir));
  const createPlugin = useInstallPlugin();
  const refreshPlugins = useRefreshPlugins();
  return (
@@ -50,7 +60,6 @@ export function SettingsPlugins({ defaultSubtab }: SettingsPluginsProps) {
        defaultValue={defaultSubtab}
        label="Plugins"
        addBorders
-        tabListClassName="px-6 pt-2"
        tabs={[
          { label: 'Discover', value: 'search' },
          {
@@ -65,13 +74,13 @@ export function SettingsPlugins({ defaultSubtab }: SettingsPluginsProps) {
          },
        ]}
      >
-        <TabContent value="search" className="px-6">
+        <TabContent value="search">
          <PluginSearch />
        </TabContent>
        <TabContent value="installed" className="pb-0">
          <div className="h-full grid grid-rows-[minmax(0,1fr)_auto]">
-            <InstalledPlugins plugins={installedPlugins} className="px-6" />
-            <footer className="grid grid-cols-[minmax(0,1fr)_auto] py-2 px-4 border-t bg-surface-highlight border-border-subtle min-w-0">
+            <InstalledPlugins plugins={installedPlugins} />
+            <footer className="grid grid-cols-[minmax(0,1fr)_auto] -mx-4 py-2 px-4 border-t bg-surface-highlight border-border-subtle min-w-0">
              <SelectFile
                size="xs"
                noun="Plugin"
@@ -113,7 +122,7 @@ export function SettingsPlugins({ defaultSubtab }: SettingsPluginsProps) {
            </footer>
          </div>
        </TabContent>
-        <TabContent value="bundled" className="pb-0 px-6">
+        <TabContent value="bundled" className="pb-0">
          <BundledPlugins plugins={bundledPlugins} />
        </TabContent>
      </Tabs>
@@ -332,9 +341,9 @@ function PluginSearch() {
  );
 }

-function InstalledPlugins({ plugins, className }: { plugins: Plugin[]; className?: string }) {
+function InstalledPlugins({ plugins }: { plugins: Plugin[] }) {
  return plugins.length === 0 ? (
-    <div className={classNames(className, 'pb-4')}>
+    <div className="pb-4">
      <EmptyStateText className="text-center">
        Plugins extend the functionality of Yaak.
        <br />
@@ -342,7 +351,7 @@ function InstalledPlugins({ plugins, className }: { plugins: Plugin[]; className
      </EmptyStateText>
    </div>
  ) : (
-    <Table scrollable className={className}>
+    <Table scrollable>
      <TableHead>
        <TableRow>
          <TableHeaderCell className="w-0" />
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gregory Schier	b9b90188a0	Revert "plugin-events: move model/find handlers to shared path" This reverts commit `072b486857`.	2026-02-26 10:13:36 -08:00
Gregory Schier	e64404d7a5	plugins: keep dev workspace plugins in watch mode	2026-02-26 09:53:58 -08:00
Gregory Schier	072b486857	plugin-events: move model/find handlers to shared path	2026-02-26 09:51:17 -08:00
Gregory Schier	23e9cbb376	cli: inline cwd plugins resolver	2026-02-26 09:22:54 -08:00
Gregory Schier	9c09e32a56	cli: only use cwd plugins in debug builds	2026-02-26 09:19:59 -08:00
Gregory Schier	be26cc4db4	cli: prefer cwd plugins dir when present	2026-02-26 09:19:18 -08:00
Gregory Schier	a2f12aef35	cli: use explicit flag for workspace plugin dir	2026-02-26 09:17:11 -08:00
Gregory Schier	e34301ccab	plugins: have callers provide bundled plugin dir	2026-02-26 08:36:42 -08:00
Gregory Schier	8f0062f917	cli: avoid tauri dev path logic in plugin manager	2026-02-26 08:30:35 -08:00
Gregory Schier	68d68035a1	cli: use workspace plugins dir in dev mode	2026-02-26 08:22:44 -08:00