Merge branch 'main' into omnara/premium-deviator

Add support for settings overrides at folder and HTTP request levels. Introduces nullable settings columns to database tables and implements resolution logic to merge workspace, folder, and request-level settings with proper precedence.

.claude-context.md

@@ -0,0 +1,72 @@
+# Claude Context: Detaching Tauri from Yaak
+
+## Goal
+Make Yaak runnable as a standalone CLI without Tauri as a dependency. The core Rust crates in `crates/` should be usable independently, while Tauri-specific code lives in `crates-tauri/`.
+
+## Project Structure
+```
+crates/           # Core crates - should NOT depend on Tauri
+crates-tauri/     # Tauri-specific crates (yaak-app, yaak-tauri-utils, etc.)
+crates-cli/       # CLI crate (yaak-cli)
+```
+
+## Completed Work
+
+### 1. Folder Restructure
+- Moved Tauri-dependent app code to `crates-tauri/yaak-app/`
+- Created `crates-tauri/yaak-tauri-utils/` for shared Tauri utilities (window traits, api_client, error handling)
+- Created `crates-cli/yaak-cli/` for the standalone CLI
+
+### 2. Decoupled Crates (no longer depend on Tauri)
+- **yaak-models**: Uses `init_standalone()` pattern for CLI database access
+- **yaak-http**: Removed Tauri plugin, HttpConnectionManager initialized in yaak-app setup
+- **yaak-common**: Only contains Tauri-free utilities (serde, platform)
+- **yaak-crypto**: Removed Tauri plugin, EncryptionManager initialized in yaak-app setup, commands moved to yaak-app
+- **yaak-grpc**: Replaced AppHandle with GrpcConfig struct, uses tokio::process::Command instead of Tauri sidecar
+
+### 3. CLI Implementation
+- Basic CLI at `crates-cli/yaak-cli/src/main.rs`
+- Commands: workspaces, requests, send (by ID), get (ad-hoc URL), create
+- Uses same database as Tauri app via `yaak_models::init_standalone()`
+
+## Remaining Work
+
+### Crates Still Depending on Tauri (in `crates/`)
+1. **yaak-git** (3 files) - Moderate complexity
+2. **yaak-plugins** (13 files) - **Hardest** - deeply integrated with Tauri for plugin-to-window communication
+3. **yaak-sync** (4 files) - Moderate complexity
+4. **yaak-ws** (5 files) - Moderate complexity
+
+### Pattern for Decoupling
+1. Remove Tauri plugin `init()` function from the crate
+2. Move commands to `yaak-app/src/commands.rs` or keep inline in `lib.rs`
+3. Move extension traits (e.g., `SomethingManagerExt`) to yaak-app or yaak-tauri-utils
+4. Initialize managers in yaak-app's `.setup()` block
+5. Remove `tauri` from Cargo.toml dependencies
+6. Update `crates-tauri/yaak-app/capabilities/default.json` to remove the plugin permission
+7. Replace `tauri::async_runtime::block_on` with `tokio::runtime::Handle::current().block_on()`
+
+## Key Files
+- `crates-tauri/yaak-app/src/lib.rs` - Main Tauri app, setup block initializes managers
+- `crates-tauri/yaak-app/src/commands.rs` - Migrated Tauri commands
+- `crates-tauri/yaak-app/src/models_ext.rs` - Database plugin and extension traits
+- `crates-tauri/yaak-tauri-utils/src/window.rs` - WorkspaceWindowTrait for window state
+- `crates/yaak-models/src/lib.rs` - Contains `init_standalone()` for CLI usage
+
+## Git Branch
+Working on `detach-tauri` branch.
+
+## Recent Commits
+```
+c40cff40 Remove Tauri dependencies from yaak-crypto and yaak-grpc
+df495f1d Move Tauri utilities from yaak-common to yaak-tauri-utils
+481e0273 Remove Tauri dependencies from yaak-http and yaak-common
+10568ac3 Add HTTP request sending to yaak-cli
+bcb7d600 Add yaak-cli stub with basic database access
+e718a5f1 Refactor models_ext to use init_standalone from yaak-models
+```
+
+## Testing
+- Run `cargo check -p <crate>` to verify a crate builds without Tauri
+- Run `npm run app-dev` to test the Tauri app still works
+- Run `cargo run -p yaak-cli -- --help` to test the CLI

.claude/rules.md

@@ -1,22 +1,27 @@
 # Project Rules
 
 ## General Development
+
 - **NEVER** commit or push without explicit confirmation
 
 ## Build and Lint
+
 - **ALWAYS** run `npm run lint` after modifying TypeScript or JavaScript files
 - Run `npm run bootstrap` after changing plugin runtime or MCP server code
 
 ## Plugin System
 
 ### Backend Constraints
+
 - Always use `UpdateSource::Plugin` when calling database methods from plugin events
 - Never send timestamps (`createdAt`, `updatedAt`) from TypeScript - Rust backend controls these
 - Backend uses `NaiveDateTime` (no timezone) so avoid sending ISO timestamp strings
 
 ### MCP Server
+
 - MCP server has **no active window context** - cannot call `window.workspaceId()`
 - Get workspace ID from `workspaceCtx.yaak.workspace.list()` instead
 
 ## Rust Type Generation
-- Run `cd src-tauri && cargo test --package yaak-plugins` to regenerate TypeScript bindings after modifying Rust event types
+
+- Run `cargo test --package yaak-plugins` (and for other crates) to regenerate TypeScript bindings after modifying Rust event types

.gitattributes

@@ -1,7 +1,7 @@
-src-tauri/vendored/**/* linguist-generated=true
-src-tauri/gen/schemas/**/* linguist-generated=true
+crates-tauri/yaak-app/vendored/**/* linguist-generated=true
+crates-tauri/yaak-app/gen/schemas/**/* linguist-generated=true
 **/bindings/* linguist-generated=true
-src-tauri/yaak-templates/pkg/* linguist-generated=true
+crates/yaak-templates/pkg/* linguist-generated=true
 
 # Ensure consistent line endings for test files that check exact content
-src-tauri/yaak-http/tests/test.txt text eol=lf
+crates/yaak-http/tests/test.txt text eol=lf

.github/workflows/ci.yml

@@ -18,14 +18,13 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: 'src-tauri'
           shared-key: ci
           cache-on-failure: true
 
       - run: npm ci
+      - run: npm run bootstrap
       - run: npm run lint
       - name: Run JS Tests
         run: npm test
       - name: Run Rust Tests
         run: cargo test --all
-        working-directory: src-tauri

.github/workflows/release.yml

@@ -60,7 +60,6 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: 'src-tauri'
           shared-key: ci
           cache-on-failure: true
 
@@ -94,7 +93,6 @@ jobs:
         run: npm test
       - name: Run Rust Tests
         run: cargo test --all
-        working-directory: src-tauri
 
       - name: Set version
         run: npm run replace-version
@@ -128,4 +126,4 @@ jobs:
           releaseBody: '[Changelog __VERSION__](https://yaak.app/blog/__VERSION__)'
           releaseDraft: true
           prerelease: true
-          args: '${{ matrix.args }} --config ./src-tauri/tauri.release.conf.json'
+          args: '${{ matrix.args }} --config ./crates-tauri/yaak-app/tauri.release.conf.json'

.gitignore

@@ -37,3 +37,10 @@ tmp
 .zed
 codebook.toml
 target
+
+# Per-worktree Tauri config (generated by post-checkout hook)
+crates-tauri/yaak-app/tauri.worktree.conf.json
+
+# Tauri auto-generated permission files
+**/permissions/autogenerated
+**/permissions/schemas

Cargo.lock

@@ -102,6 +102,56 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.98"
@@ -850,6 +900,46 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "clap"
+version = "4.5.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+
 [[package]]
 name = "clipboard-win"
 version = "5.4.0"
@@ -897,6 +987,12 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
 [[package]]
 name = "colored"
 version = "2.2.0"
@@ -1478,6 +1574,19 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -2684,6 +2793,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -2722,6 +2837,30 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "jiff"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67e8da4c49d6d9909fe03361f9b620f58898859f5c7aded68351e85e71ecf50"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0c84ee7f197eca9a86c6fd6cb771e55eb991632f15f2bc3ca6ec838929e6e78"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "jni"
 version = "0.21.1"
@@ -3614,6 +3753,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
 [[package]]
 name = "opaque-debug"
 version = "0.3.1"
@@ -4100,6 +4245,21 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
 [[package]]
 name = "potential_utf"
 version = "0.1.2"
@@ -6817,6 +6977,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "uuid"
 version = "1.17.0"
@@ -7841,6 +8007,8 @@ dependencies = [
  "md5 0.8.0",
  "mime_guess",
  "openssl-sys",
+ "r2d2",
+ "r2d2_sqlite",
  "rand 0.9.1",
  "reqwest",
  "serde",
@@ -7861,10 +8029,13 @@ dependencies = [
  "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
+ "tokio-tungstenite",
  "tokio-util",
  "ts-rs",
+ "url",
  "uuid",
  "yaak-common",
+ "yaak-core",
  "yaak-crypto",
  "yaak-fonts",
  "yaak-git",
@@ -7876,20 +8047,40 @@ dependencies = [
  "yaak-plugins",
  "yaak-sse",
  "yaak-sync",
+ "yaak-tauri-utils",
  "yaak-templates",
  "yaak-tls",
  "yaak-ws",
 ]
 
+[[package]]
+name = "yaak-cli"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "dirs",
+ "env_logger",
+ "log",
+ "serde_json",
+ "tokio",
+ "yaak-crypto",
+ "yaak-http",
+ "yaak-models",
+ "yaak-plugins",
+ "yaak-templates",
+]
+
 [[package]]
 name = "yaak-common"
 version = "0.1.0"
 dependencies = [
- "regex",
- "reqwest",
- "serde",
  "serde_json",
- "tauri",
+]
+
+[[package]]
+name = "yaak-core"
+version = "0.0.0"
+dependencies = [
  "thiserror 2.0.17",
 ]
 
@@ -7903,8 +8094,6 @@ dependencies = [
  "keyring",
  "log",
  "serde",
- "tauri",
- "tauri-plugin",
  "thiserror 2.0.17",
  "yaak-models",
 ]
@@ -7931,10 +8120,9 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "tauri",
- "tauri-plugin",
  "thiserror 2.0.17",
  "ts-rs",
+ "url",
  "yaak-models",
  "yaak-sync",
 ]
@@ -7955,8 +8143,6 @@ dependencies = [
  "prost-types",
  "serde",
  "serde_json",
- "tauri",
- "tauri-plugin-shell",
  "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
@@ -7984,7 +8170,6 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "tauri",
  "thiserror 2.0.17",
  "tokio",
  "tokio-util",
@@ -8012,6 +8197,7 @@ dependencies = [
  "ts-rs",
  "yaak-common",
  "yaak-models",
+ "yaak-tauri-utils",
 ]
 
 [[package]]
@@ -8044,12 +8230,9 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "tauri",
- "tauri-plugin",
- "tauri-plugin-dialog",
  "thiserror 2.0.17",
  "ts-rs",
- "yaak-common",
+ "yaak-core",
 ]
 
 [[package]]
@@ -8071,9 +8254,6 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "tauri",
- "tauri-plugin",
- "tauri-plugin-shell",
  "thiserror 2.0.17",
  "tokio",
  "tokio-tungstenite",
@@ -8106,14 +8286,24 @@ dependencies = [
  "serde_path_to_error",
  "serde_yaml",
  "sha1",
- "tauri",
- "tauri-plugin",
  "thiserror 2.0.17",
  "tokio",
  "ts-rs",
  "yaak-models",
 ]
 
+[[package]]
+name = "yaak-tauri-utils"
+version = "0.1.0"
+dependencies = [
+ "regex",
+ "reqwest",
+ "serde",
+ "tauri",
+ "thiserror 2.0.17",
+ "yaak-common",
+]
+
 [[package]]
 name = "yaak-templates"
 version = "0.1.0"
@@ -8149,19 +8339,17 @@ name = "yaak-ws"
 version = "0.1.0"
 dependencies = [
  "futures-util",
+ "http",
  "log",
  "md5 0.8.0",
  "serde",
  "serde_json",
- "tauri",
- "tauri-plugin",
  "thiserror 2.0.17",
  "tokio",
  "tokio-tungstenite",
  "url",
  "yaak-http",
  "yaak-models",
- "yaak-plugins",
  "yaak-templates",
  "yaak-tls",
 ]

Cargo.toml

@@ -0,0 +1,69 @@
+[workspace]
+resolver = "2"
+members = [
+    # Shared crates (no Tauri dependency)
+    "crates/yaak-core",
+    "crates/yaak-common",
+    "crates/yaak-crypto",
+    "crates/yaak-git",
+    "crates/yaak-grpc",
+    "crates/yaak-http",
+    "crates/yaak-models",
+    "crates/yaak-plugins",
+    "crates/yaak-sse",
+    "crates/yaak-sync",
+    "crates/yaak-templates",
+    "crates/yaak-tls",
+    "crates/yaak-ws",
+    # CLI crates
+    "crates-cli/yaak-cli",
+    # Tauri-specific crates
+    "crates-tauri/yaak-app",
+    "crates-tauri/yaak-fonts",
+    "crates-tauri/yaak-license",
+    "crates-tauri/yaak-mac-window",
+    "crates-tauri/yaak-tauri-utils",
+]
+
+[workspace.dependencies]
+chrono = "0.4.42"
+hex = "0.4.3"
+keyring = "3.6.3"
+log = "0.4.29"
+reqwest = "0.12.20"
+rustls = { version = "0.23.34", default-features = false }
+rustls-platform-verifier = "0.6.2"
+serde = "1.0.228"
+serde_json = "1.0.145"
+sha2 = "0.10.9"
+tauri = "2.9.5"
+tauri-plugin = "2.5.2"
+tauri-plugin-dialog = "2.4.2"
+tauri-plugin-shell = "2.3.3"
+thiserror = "2.0.17"
+tokio = "1.48.0"
+ts-rs = "11.1.0"
+
+# Internal crates - shared
+yaak-core = { path = "crates/yaak-core" }
+yaak-common = { path = "crates/yaak-common" }
+yaak-crypto = { path = "crates/yaak-crypto" }
+yaak-git = { path = "crates/yaak-git" }
+yaak-grpc = { path = "crates/yaak-grpc" }
+yaak-http = { path = "crates/yaak-http" }
+yaak-models = { path = "crates/yaak-models" }
+yaak-plugins = { path = "crates/yaak-plugins" }
+yaak-sse = { path = "crates/yaak-sse" }
+yaak-sync = { path = "crates/yaak-sync" }
+yaak-templates = { path = "crates/yaak-templates" }
+yaak-tls = { path = "crates/yaak-tls" }
+yaak-ws = { path = "crates/yaak-ws" }
+
+# Internal crates - Tauri-specific
+yaak-fonts = { path = "crates-tauri/yaak-fonts" }
+yaak-license = { path = "crates-tauri/yaak-license" }
+yaak-mac-window = { path = "crates-tauri/yaak-mac-window" }
+yaak-tauri-utils = { path = "crates-tauri/yaak-tauri-utils" }
+
+[profile.release]
+strip = false

biome.json

@@ -38,8 +38,10 @@
       "!**/node_modules",
       "!**/dist",
       "!**/build",
+      "!target",
       "!scripts",
-      "!src-tauri",
+      "!crates",
+      "!crates-tauri",
       "!src-web/tailwind.config.cjs",
       "!src-web/postcss.config.cjs",
       "!src-web/vite.config.ts",

crates-cli/yaak-cli/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "yaak-cli"
+version = "0.1.0"
+edition = "2024"
+publish = false
+
+[[bin]]
+name = "yaakcli"
+path = "src/main.rs"
+
+[dependencies]
+clap = { version = "4", features = ["derive"] }
+dirs = "6"
+env_logger = "0.11"
+log = { workspace = true }
+serde_json = { workspace = true }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+yaak-crypto = { workspace = true }
+yaak-http = { workspace = true }
+yaak-models = { workspace = true }
+yaak-plugins = { workspace = true }
+yaak-templates = { workspace = true }

crates-cli/yaak-cli/src/main.rs

@@ -0,0 +1,448 @@
+use clap::{Parser, Subcommand};
+use log::info;
+use serde_json::Value;
+use std::collections::BTreeMap;
+use std::path::PathBuf;
+use std::sync::Arc;
+use tokio::sync::mpsc;
+use yaak_crypto::manager::EncryptionManager;
+use yaak_http::path_placeholders::apply_path_placeholders;
+use yaak_http::sender::{HttpSender, ReqwestSender};
+use yaak_http::types::{SendableHttpRequest, SendableHttpRequestOptions};
+use yaak_models::models::{HttpRequest, HttpRequestHeader, HttpUrlParameter};
+use yaak_models::render::make_vars_hashmap;
+use yaak_models::util::UpdateSource;
+use yaak_plugins::events::{PluginContext, RenderPurpose};
+use yaak_plugins::manager::PluginManager;
+use yaak_plugins::template_callback::PluginTemplateCallback;
+use yaak_templates::{parse_and_render, render_json_value_raw, RenderOptions};
+
+#[derive(Parser)]
+#[command(name = "yaakcli")]
+#[command(about = "Yaak CLI - API client from the command line")]
+struct Cli {
+    /// Use a custom data directory
+    #[arg(long, global = true)]
+    data_dir: Option<PathBuf>,
+
+    /// Environment ID to use for variable substitution
+    #[arg(long, short, global = true)]
+    environment: Option<String>,
+
+    /// Enable verbose logging
+    #[arg(long, short, global = true)]
+    verbose: bool,
+
+    #[command(subcommand)]
+    command: Commands,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+    /// List all workspaces
+    Workspaces,
+    /// List requests in a workspace
+    Requests {
+        /// Workspace ID
+        workspace_id: String,
+    },
+    /// Send an HTTP request by ID
+    Send {
+        /// Request ID
+        request_id: String,
+    },
+    /// Send a GET request to a URL
+    Get {
+        /// URL to request
+        url: String,
+    },
+    /// Create a new HTTP request
+    Create {
+        /// Workspace ID
+        workspace_id: String,
+        /// Request name
+        #[arg(short, long)]
+        name: String,
+        /// HTTP method
+        #[arg(short, long, default_value = "GET")]
+        method: String,
+        /// URL
+        #[arg(short, long)]
+        url: String,
+    },
+}
+
+/// Render an HTTP request with template variables and plugin functions
+async fn render_http_request(
+    r: &HttpRequest,
+    environment_chain: Vec<yaak_models::models::Environment>,
+    cb: &PluginTemplateCallback,
+    opt: &RenderOptions,
+) -> yaak_templates::error::Result<HttpRequest> {
+    let vars = &make_vars_hashmap(environment_chain);
+
+    let mut url_parameters = Vec::new();
+    for p in r.url_parameters.clone() {
+        if !p.enabled {
+            continue;
+        }
+        url_parameters.push(HttpUrlParameter {
+            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 mut headers = Vec::new();
+    for p in r.headers.clone() {
+        if !p.enabled {
+            continue;
+        }
+        headers.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 mut body = BTreeMap::new();
+    for (k, v) in r.body.clone() {
+        body.insert(k, render_json_value_raw(v, vars, cb, opt).await?);
+    }
+
+    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.clone().as_str(), vars, cb, opt).await?;
+
+    // Apply path placeholders (e.g., /users/:id -> /users/123)
+    let (url, url_parameters) = apply_path_placeholders(&url, &url_parameters);
+
+    Ok(HttpRequest {
+        url,
+        url_parameters,
+        headers,
+        body,
+        authentication,
+        ..r.to_owned()
+    })
+}
+
+#[tokio::main]
+async fn main() {
+    let cli = Cli::parse();
+
+    // Initialize logging
+    if cli.verbose {
+        env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+    }
+
+    // Use the same app_id for both data directory and keyring
+    let app_id = if cfg!(debug_assertions) {
+        "app.yaak.desktop.dev"
+    } else {
+        "app.yaak.desktop"
+    };
+
+    let data_dir = cli.data_dir.unwrap_or_else(|| {
+        dirs::data_dir()
+            .expect("Could not determine data directory")
+            .join(app_id)
+    });
+
+    let db_path = data_dir.join("db.sqlite");
+    let blob_path = data_dir.join("blobs.sqlite");
+
+    let (query_manager, _blob_manager, _rx) =
+        yaak_models::init_standalone(&db_path, &blob_path).expect("Failed to initialize database");
+
+    let db = query_manager.connect();
+
+    // Initialize encryption manager for secure() template function
+    // Use the same app_id as the Tauri app for keyring access
+    let encryption_manager = Arc::new(
+        EncryptionManager::new(query_manager.clone(), app_id),
+    );
+
+    // Initialize plugin manager for template functions
+    let vendored_plugin_dir = data_dir.join("vendored-plugins");
+    let installed_plugin_dir = data_dir.join("installed-plugins");
+
+    // Use system node for CLI (must be in PATH)
+    let node_bin_path = PathBuf::from("node");
+
+    // Find the plugin runtime - check YAAK_PLUGIN_RUNTIME env var, then fallback to development path
+    let plugin_runtime_main = std::env::var("YAAK_PLUGIN_RUNTIME")
+        .map(PathBuf::from)
+        .unwrap_or_else(|_| {
+            // Development fallback: look relative to crate root
+            PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+                .join("../../crates-tauri/yaak-app/vendored/plugin-runtime/index.cjs")
+        });
+
+    // Create plugin manager (plugins may not be available in CLI context)
+    let plugin_manager = Arc::new(
+        PluginManager::new(
+            vendored_plugin_dir,
+            installed_plugin_dir,
+            node_bin_path,
+            plugin_runtime_main,
+            false,
+        )
+        .await,
+    );
+
+    // Initialize plugins from database
+    let plugins = db.list_plugins().unwrap_or_default();
+    if !plugins.is_empty() {
+        let errors = plugin_manager
+            .initialize_all_plugins(plugins, &PluginContext::new_empty())
+            .await;
+        for (plugin_dir, error_msg) in errors {
+            eprintln!(
+                "Warning: Failed to initialize plugin '{}': {}",
+                plugin_dir, error_msg
+            );
+        }
+    }
+
+    match cli.command {
+        Commands::Workspaces => {
+            let workspaces = db.list_workspaces().expect("Failed to list workspaces");
+            if workspaces.is_empty() {
+                println!("No workspaces found");
+            } else {
+                for ws in workspaces {
+                    println!("{} - {}", ws.id, ws.name);
+                }
+            }
+        }
+        Commands::Requests { workspace_id } => {
+            let requests = db
+                .list_http_requests(&workspace_id)
+                .expect("Failed to list requests");
+            if requests.is_empty() {
+                println!("No requests found in workspace {}", workspace_id);
+            } else {
+                for req in requests {
+                    println!("{} - {} {}", req.id, req.method, req.name);
+                }
+            }
+        }
+        Commands::Send { request_id } => {
+            let request = db
+                .get_http_request(&request_id)
+                .expect("Failed to get request");
+
+            // Resolve environment chain for variable substitution
+            let environment_chain = db
+                .resolve_environments(
+                    &request.workspace_id,
+                    request.folder_id.as_deref(),
+                    cli.environment.as_deref(),
+                )
+                .unwrap_or_default();
+
+            // Create template callback with plugin support
+            let plugin_context = PluginContext::new(None, Some(request.workspace_id.clone()));
+            let template_callback = PluginTemplateCallback::new(
+                plugin_manager.clone(),
+                encryption_manager.clone(),
+                &plugin_context,
+                RenderPurpose::Send,
+            );
+
+            // Render templates in the request
+            let rendered_request = render_http_request(
+                &request,
+                environment_chain,
+                &template_callback,
+                &RenderOptions::throw(),
+            )
+            .await
+            .expect("Failed to render request templates");
+
+            if cli.verbose {
+                println!("> {} {}", rendered_request.method, rendered_request.url);
+            }
+
+            // Convert to sendable request
+            let sendable = SendableHttpRequest::from_http_request(
+                &rendered_request,
+                SendableHttpRequestOptions::default(),
+            )
+            .await
+            .expect("Failed to build request");
+
+            // Create event channel for progress
+            let (event_tx, mut event_rx) = mpsc::channel(100);
+
+            // Spawn task to print events if verbose
+            let verbose = cli.verbose;
+            let verbose_handle = if verbose {
+                Some(tokio::spawn(async move {
+                    while let Some(event) = event_rx.recv().await {
+                        println!("{}", event);
+                    }
+                }))
+            } else {
+                // Drain events silently
+                tokio::spawn(async move {
+                    while event_rx.recv().await.is_some() {}
+                });
+                None
+            };
+
+            // Send the request
+            let sender = ReqwestSender::new().expect("Failed to create HTTP client");
+            let response = sender
+                .send(sendable, event_tx)
+                .await
+                .expect("Failed to send request");
+
+            // Wait for event handler to finish
+            if let Some(handle) = verbose_handle {
+                let _ = handle.await;
+            }
+
+            // Print response
+            if verbose {
+                println!();
+            }
+            println!(
+                "HTTP {} {}",
+                response.status,
+                response.status_reason.as_deref().unwrap_or("")
+            );
+
+            if verbose {
+                for (name, value) in &response.headers {
+                    println!("{}: {}", name, value);
+                }
+                println!();
+            }
+
+            // Print body
+            let (body, _stats) = response.text().await.expect("Failed to read response body");
+            println!("{}", body);
+        }
+        Commands::Get { url } => {
+            if cli.verbose {
+                println!("> GET {}", url);
+            }
+
+            // Build a simple GET request
+            let sendable = SendableHttpRequest {
+                url: url.clone(),
+                method: "GET".to_string(),
+                headers: vec![],
+                body: None,
+                options: SendableHttpRequestOptions::default(),
+            };
+
+            // Create event channel for progress
+            let (event_tx, mut event_rx) = mpsc::channel(100);
+
+            // Spawn task to print events if verbose
+            let verbose = cli.verbose;
+            let verbose_handle = if verbose {
+                Some(tokio::spawn(async move {
+                    while let Some(event) = event_rx.recv().await {
+                        println!("{}", event);
+                    }
+                }))
+            } else {
+                tokio::spawn(async move {
+                    while event_rx.recv().await.is_some() {}
+                });
+                None
+            };
+
+            // Send the request
+            let sender = ReqwestSender::new().expect("Failed to create HTTP client");
+            let response = sender
+                .send(sendable, event_tx)
+                .await
+                .expect("Failed to send request");
+
+            if let Some(handle) = verbose_handle {
+                let _ = handle.await;
+            }
+
+            // Print response
+            if verbose {
+                println!();
+            }
+            println!(
+                "HTTP {} {}",
+                response.status,
+                response.status_reason.as_deref().unwrap_or("")
+            );
+
+            if verbose {
+                for (name, value) in &response.headers {
+                    println!("{}: {}", name, value);
+                }
+                println!();
+            }
+
+            // Print body
+            let (body, _stats) = response.text().await.expect("Failed to read response body");
+            println!("{}", body);
+        }
+        Commands::Create {
+            workspace_id,
+            name,
+            method,
+            url,
+        } => {
+            let request = HttpRequest {
+                workspace_id,
+                name,
+                method: method.to_uppercase(),
+                url,
+                ..Default::default()
+            };
+
+            let created = db
+                .upsert_http_request(&request, &UpdateSource::Sync)
+                .expect("Failed to create request");
+
+            println!("Created request: {}", created.id);
+        }
+    }
+
+    // Terminate plugin manager gracefully
+    plugin_manager.terminate().await;
+}

crates-tauri/yaak-app/Cargo.toml

@@ -1,21 +1,3 @@
-[workspace]
-members = [
-    "yaak-crypto",
-    "yaak-fonts",
-    "yaak-git",
-    "yaak-grpc",
-    "yaak-http",
-    "yaak-license",
-    "yaak-mac-window",
-    "yaak-models",
-    "yaak-plugins",
-    "yaak-sse",
-    "yaak-sync",
-    "yaak-templates",
-    "yaak-tls",
-    "yaak-ws",
-]
-
 [package]
 name = "yaak-app"
 version = "0.0.0"
@@ -28,11 +10,6 @@ publish = false
 name = "tauri_app_lib"
 crate-type = ["staticlib", "cdylib", "lib"]
 
-[profile.release]
-# Currently disabled due to:
-#   Warn Failed to add bundler type to the binary: __TAURI_BUNDLE_TYPE variable not found in binary. Make sure tauri crate and tauri-cli are up to date and that symbol stripping is disabled (https://doc.rust-lang.org/cargo/reference/profiles.html#strip). Updater plugin may not be able to update this package. This shouldn't normally happen, please report it to https://github.com/tauri-apps/tauri/issues
-strip = false
-
 [features]
 cargo-clippy = []
 default = []
@@ -53,6 +30,8 @@ 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"
+r2d2 = "0.8.10"
+r2d2_sqlite = "0.25.0"
 mime_guess = "2.0.5"
 rand = "0.9.0"
 reqwest = { workspace = true, features = ["multipart", "gzip", "brotli", "deflate", "json", "rustls-tls-manual-roots-no-provider", "socks", "http2"] }
@@ -73,50 +52,25 @@ tauri-plugin-window-state = "2.4.1"
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
 tokio-stream = "0.1.17"
+tokio-tungstenite = { version = "0.26.2", default-features = false }
+url = "2"
 tokio-util = { version = "0.7", features = ["codec"] }
 ts-rs = { workspace = true }
 uuid = "1.12.1"
 yaak-common = { workspace = true }
+yaak-tauri-utils = { workspace = true }
+yaak-core = { workspace = true }
 yaak-crypto = { workspace = true }
 yaak-fonts = { workspace = true }
-yaak-git = { path = "yaak-git" }
-yaak-grpc = { path = "yaak-grpc" }
+yaak-git = { workspace = true }
+yaak-grpc = { workspace = true }
 yaak-http = { workspace = true }
-yaak-license = { path = "yaak-license", optional = true }
-yaak-mac-window = { path = "yaak-mac-window" }
+yaak-license = { workspace = true, optional = true }
+yaak-mac-window = { workspace = true }
 yaak-models = { workspace = true }
 yaak-plugins = { workspace = true }
 yaak-sse = { workspace = true }
 yaak-sync = { workspace = true }
 yaak-templates = { workspace = true }
 yaak-tls = { workspace = true }
-yaak-ws = { path = "yaak-ws" }
-
-[workspace.dependencies]
-chrono = "0.4.42"
-hex = "0.4.3"
-keyring = "3.6.3"
-reqwest = "0.12.20"
-rustls = { version = "0.23.34", default-features = false }
-rustls-platform-verifier = "0.6.2"
-serde = "1.0.228"
-serde_json = "1.0.145"
-sha2 = "0.10.9"
-log = "0.4.29"
-tauri = "2.9.5"
-tauri-plugin = "2.5.2"
-tauri-plugin-dialog = "2.4.2"
-tauri-plugin-shell = "2.3.3"
-thiserror = "2.0.17"
-tokio = "1.48.0"
-ts-rs = "11.1.0"
-yaak-common = { path = "yaak-common" }
-yaak-crypto = { path = "yaak-crypto" }
-yaak-fonts = { path = "yaak-fonts" }
-yaak-http = { path = "yaak-http" }
-yaak-models = { path = "yaak-models" }
-yaak-plugins = { path = "yaak-plugins" }
-yaak-sse = { path = "yaak-sse" }
-yaak-sync = { path = "yaak-sync" }
-yaak-templates = { path = "yaak-templates" }
-yaak-tls = { path = "yaak-tls" }
+yaak-ws = { workspace = true }

crates-tauri/yaak-app/bindings/gen_watch.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type WatchResult = { unlistenEvent: string, };

crates-tauri/yaak-app/bindings/index.ts

@@ -10,6 +10,8 @@ export type UpdateResponse = { "type": "ack" } | { "type": "action", action: Upd
 
 export type UpdateResponseAction = "install" | "skip";
 
+export type WatchResult = { unlistenEvent: string, };
+
 export type YaakNotification = { timestamp: string, timeout: number | null, id: string, title: string | null, message: string, color: string | null, action: YaakNotificationAction | null, };
 
 export type YaakNotificationAction = { label: string, url: string, };

crates-tauri/yaak-app/bindings/plugins_ext.ts

@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type PluginUpdateInfo = { name: string, currentVersion: string, latestVersion: string, };
+
+export type PluginUpdateNotification = { updateCount: number, plugins: Array<PluginUpdateInfo>, };

crates-tauri/yaak-app/capabilities/default.json

@@ -51,13 +51,7 @@
     "opener:allow-open-url",
     "opener:allow-reveal-item-in-dir",
     "shell:allow-open",
-    "yaak-crypto:default",
     "yaak-fonts:default",
-    "yaak-git:default",
-    "yaak-mac-window:default",
-    "yaak-models:default",
-    "yaak-plugins:default",
-    "yaak-sync:default",
-    "yaak-ws:default"
+    "yaak-mac-window:default"
   ]
 }