Fix import

Co-authored-by: Claude <noreply@anthropic.com>

.claude/rules.md

@@ -0,0 +1,22 @@
+# 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

.claude/skills/release-notes/SKILL.md

@@ -0,0 +1,50 @@
+---
+name: Yaak:generate-release-notes
+description: Generate formatted release notes for Yaak releases by analyzing git history and pull request descriptions
+---
+
+# Release Notes Generator
+
+Generate formatted release notes for Yaak releases by analyzing git history and pull request descriptions.
+
+## Usage
+
+You can invoke this skill by:
+1. Providing a version number: "Generate release notes for 2025.10.0-beta.6"
+2. Using "latest" to generate notes for the most recent tag
+
+## What this skill does
+
+1. Identifies the version tag and previous version
+2. Retrieves all commits between versions
+3. Fetches PR descriptions for linked issues to find:
+   - Feedback URLs (feedback.yaak.app)
+   - Additional context and descriptions
+   - Installation links for plugins
+4. Formats the release notes using the standard Yaak format:
+   - Changelog badge at the top
+   - Bulleted list of changes with PR links
+   - Feedback links where available
+   - Full changelog comparison link at the bottom
+
+## Output Format
+
+The skill generates markdown-formatted release notes following this structure:
+
+```markdown
+[![Changelog](https://img.shields.io/badge/Changelog-VERSION-blue)](https://yaak.app/changelog/VERSION)
+
+- Feature/fix description in [#123](https://github.com/mountain-loop/yaak/pull/123)
+  - Additional context if needed
+- [Linked feedback item](https://feedback.yaak.app/p/item) in [#456](https://github.com/mountain-loop/yaak/pull/456)
+
+**Full Changelog**: https://github.com/mountain-loop/yaak/compare/vPREV...vCURRENT
+```
+
+**IMPORTANT**: Always add a blank line after the closing ``` markdown fence before any explanatory text.
+
+## Requirements
+
+- Git repository must be available
+- GitHub CLI (`gh`) must be installed and authenticated
+- Version tags should follow the format: `v2025.10.0-beta.X`

.gitattributes

@@ -1,2 +1,7 @@
 src-tauri/vendored/**/* linguist-generated=true
 src-tauri/gen/schemas/**/* linguist-generated=true
+**/bindings/* linguist-generated=true
+src-tauri/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

.github/workflows/claude.yml

@@ -0,0 +1,50 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+      actions: read # Required for Claude to read CI results on PRs
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
+
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
+
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://code.claude.com/docs/en/cli-reference for available options
+          # claude_args: '--allowed-tools Bash(gh pr:*)'
+

.gitignore

@@ -25,6 +25,7 @@ dist-ssr
 *.sln
 *.sw?
 .eslintcache
+out
 
 *.sqlite
 *.sqlite-*
@@ -33,3 +34,5 @@ dist-ssr
 
 .tmp
 tmp
+.zed
+codebook.toml

README.md

@@ -19,7 +19,7 @@
 
 
 <p align="center">
-  <!-- sponsors-premium --><a href="https://github.com/MVST-Solutions"><img src="https:&#x2F;&#x2F;github.com&#x2F;MVST-Solutions.png" width="80px" alt="User avatar: MVST-Solutions" /></a>&nbsp;&nbsp;<a href="https://github.com/dharsanb"><img src="https:&#x2F;&#x2F;github.com&#x2F;dharsanb.png" width="80px" alt="User avatar: dharsanb" /></a>&nbsp;&nbsp;<a href="https://github.com/railwayapp"><img src="https:&#x2F;&#x2F;github.com&#x2F;railwayapp.png" width="80px" alt="User avatar: railwayapp" /></a>&nbsp;&nbsp;<a href="https://github.com/caseyamcl"><img src="https:&#x2F;&#x2F;github.com&#x2F;caseyamcl.png" width="80px" alt="User avatar: caseyamcl" /></a>&nbsp;&nbsp;<a href="https://github.com/"><img src="https:&#x2F;&#x2F;raw.githubusercontent.com&#x2F;JamesIves&#x2F;github-sponsors-readme-action&#x2F;dev&#x2F;.github&#x2F;assets&#x2F;placeholder.png" width="80px" alt="User avatar: " /></a>&nbsp;&nbsp;<!-- sponsors-premium -->
+  <!-- sponsors-premium --><a href="https://github.com/MVST-Solutions"><img src="https:&#x2F;&#x2F;github.com&#x2F;MVST-Solutions.png" width="80px" alt="User avatar: MVST-Solutions" /></a>&nbsp;&nbsp;<a href="https://github.com/dharsanb"><img src="https:&#x2F;&#x2F;github.com&#x2F;dharsanb.png" width="80px" alt="User avatar: dharsanb" /></a>&nbsp;&nbsp;<a href="https://github.com/railwayapp"><img src="https:&#x2F;&#x2F;github.com&#x2F;railwayapp.png" width="80px" alt="User avatar: railwayapp" /></a>&nbsp;&nbsp;<a href="https://github.com/caseyamcl"><img src="https:&#x2F;&#x2F;github.com&#x2F;caseyamcl.png" width="80px" alt="User avatar: caseyamcl" /></a>&nbsp;&nbsp;<a href="https://github.com/bytebase"><img src="https:&#x2F;&#x2F;github.com&#x2F;bytebase.png" width="80px" alt="User avatar: bytebase" /></a>&nbsp;&nbsp;<a href="https://github.com/"><img src="https:&#x2F;&#x2F;raw.githubusercontent.com&#x2F;JamesIves&#x2F;github-sponsors-readme-action&#x2F;dev&#x2F;.github&#x2F;assets&#x2F;placeholder.png" width="80px" alt="User avatar: " /></a>&nbsp;&nbsp;<!-- sponsors-premium -->
 </p>
 <p align="center">
   <!-- sponsors-base --><a href="https://github.com/seanwash"><img src="https:&#x2F;&#x2F;github.com&#x2F;seanwash.png" width="50px" alt="User avatar: seanwash" /></a>&nbsp;&nbsp;<a href="https://github.com/jerath"><img src="https:&#x2F;&#x2F;github.com&#x2F;jerath.png" width="50px" alt="User avatar: jerath" /></a>&nbsp;&nbsp;<a href="https://github.com/itsa-sh"><img src="https:&#x2F;&#x2F;github.com&#x2F;itsa-sh.png" width="50px" alt="User avatar: itsa-sh" /></a>&nbsp;&nbsp;<a href="https://github.com/dmmulroy"><img src="https:&#x2F;&#x2F;github.com&#x2F;dmmulroy.png" width="50px" alt="User avatar: dmmulroy" /></a>&nbsp;&nbsp;<a href="https://github.com/timcole"><img src="https:&#x2F;&#x2F;github.com&#x2F;timcole.png" width="50px" alt="User avatar: timcole" /></a>&nbsp;&nbsp;<a href="https://github.com/VLZH"><img src="https:&#x2F;&#x2F;github.com&#x2F;VLZH.png" width="50px" alt="User avatar: VLZH" /></a>&nbsp;&nbsp;<a href="https://github.com/terasaka2k"><img src="https:&#x2F;&#x2F;github.com&#x2F;terasaka2k.png" width="50px" alt="User avatar: terasaka2k" /></a>&nbsp;&nbsp;<a href="https://github.com/andriyor"><img src="https:&#x2F;&#x2F;github.com&#x2F;andriyor.png" width="50px" alt="User avatar: andriyor" /></a>&nbsp;&nbsp;<a href="https://github.com/majudhu"><img src="https:&#x2F;&#x2F;github.com&#x2F;majudhu.png" width="50px" alt="User avatar: majudhu" /></a>&nbsp;&nbsp;<a href="https://github.com/axelrindle"><img src="https:&#x2F;&#x2F;github.com&#x2F;axelrindle.png" width="50px" alt="User avatar: axelrindle" /></a>&nbsp;&nbsp;<a href="https://github.com/jirizverina"><img src="https:&#x2F;&#x2F;github.com&#x2F;jirizverina.png" width="50px" alt="User avatar: jirizverina" /></a>&nbsp;&nbsp;<a href="https://github.com/chip-well"><img src="https:&#x2F;&#x2F;github.com&#x2F;chip-well.png" width="50px" alt="User avatar: chip-well" /></a>&nbsp;&nbsp;<a href="https://github.com/GRAYAH"><img src="https:&#x2F;&#x2F;github.com&#x2F;GRAYAH.png" width="50px" alt="User avatar: GRAYAH" /></a>&nbsp;&nbsp;<!-- sponsors-base -->

package.json

@@ -10,6 +10,8 @@
     "packages/common-lib",
     "packages/plugin-runtime",
     "packages/plugin-runtime-types",
+    "plugins-external/mcp-server",
+    "plugins-external/template-function-faker",
     "plugins/action-copy-curl",
     "plugins/action-copy-grpcurl",
     "plugins/auth-apikey",
@@ -88,7 +90,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.7",
-    "@tauri-apps/cli": "^2.9.1",
+    "@tauri-apps/cli": "^2.9.6",
     "@yaakapp/cli": "^0.3.4",
     "nodejs-file-downloader": "^4.13.0",
     "npm-run-all": "^4.1.5",

packages/plugin-runtime-types/package-lock.json

@@ -1,47 +0,0 @@
-{
-  "name": "@yaakapp/api",
-  "version": "0.1.17",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@yaakapp/api",
-      "version": "0.1.17",
-      "dependencies": {
-        "@types/node": "^22.5.4"
-      },
-      "devDependencies": {
-        "typescript": "^5.6.2"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
-      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.19.2"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "license": "MIT"
-    }
-  }
-}

packages/plugin-runtime-types/src/bindings/gen_models.ts

@@ -1,18 +1,53 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
+export type AnyModel = CookieJar | Environment | Folder | GraphQlIntrospection | GrpcConnection | GrpcEvent | GrpcRequest | HttpRequest | HttpResponse | HttpResponseEvent | KeyValue | Plugin | Settings | SyncState | WebsocketConnection | WebsocketEvent | WebsocketRequest | Workspace | WorkspaceMeta;
+
+export type ClientCertificate = { host: string, port: number | null, crtFile: string | null, keyFile: string | null, pfxFile: string | null, passphrase: string | null, enabled?: boolean, };
+
+export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], };
+
+export type CookieDomain = { "HostOnly": string } | { "Suffix": string } | "NotPresent" | "Empty";
+
+export type CookieExpires = { "AtUtc": string } | "SessionEnd";
+
+export type CookieJar = { model: "cookie_jar", id: string, createdAt: string, updatedAt: string, workspaceId: string, cookies: Array<Cookie>, name: string, };
+
+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: Array<EnvironmentVariable>, color: string | null, sortPriority: number, };
 
 export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };
 
 export type Folder = { model: "folder", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, sortPriority: number, };
 
+export type GraphQlIntrospection = { model: "graphql_introspection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, content: string | null, };
+
+export type GrpcConnection = { model: "grpc_connection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, elapsed: number, error: string | null, method: string, service: string, status: number, state: GrpcConnectionState, trailers: { [key in string]?: string }, url: string, };
+
+export type GrpcConnectionState = "initialized" | "connected" | "closed";
+
+export type GrpcEvent = { model: "grpc_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, connectionId: string, content: string, error: string | null, eventType: GrpcEventType, metadata: { [key in string]?: string }, status: number | null, };
+
+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, 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, urlParameters: Array<HttpUrlParameter>, };
 
 export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, };
 
-export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, };
+export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, contentLengthCompressed: number | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, requestContentLength: number | null, requestHeaders: Array<HttpResponseHeader>, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, };
+
+export type HttpResponseEvent = { model: "http_response_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, responseId: string, event: HttpResponseEventData, };
+
+/**
+ * Serializable representation of HTTP response events for DB storage.
+ * 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, } | { "type": "send_url", method: string, path: 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, };
 
 export type HttpResponseHeader = { name: string, value: string, };
 
@@ -20,6 +55,28 @@ export type HttpResponseState = "initialized" | "connected" | "closed";
 
 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, };
+
+export type ProxySetting = { "type": "enabled", http: string, https: string, auth: ProxySettingAuth | null, bypass: string, disabled: boolean, } | { "type": "disabled" };
+
+export type ProxySettingAuth = { user: string, password: string, };
+
+export type Settings = { model: "settings", id: string, createdAt: string, updatedAt: string, appearance: string, clientCertificates: Array<ClientCertificate>, coloredMethods: boolean, editorFont: string | null, editorFontSize: number, editorKeymap: EditorKeymap, editorSoftWrap: boolean, hideWindowControls: boolean, useNativeTitlebar: boolean, interfaceFont: string | null, interfaceFontSize: number, interfaceScale: number, openWorkspaceNewWindow: boolean | null, proxy: ProxySetting | null, themeDark: string, themeLight: string, updateChannel: string, hideLicenseBadge: boolean, autoupdate: boolean, autoDownloadUpdates: boolean, checkNotifications: boolean, };
+
+export type SyncState = { model: "sync_state", id: string, workspaceId: string, createdAt: string, updatedAt: string, flushedAt: string, modelId: string, checksum: string, relPath: string, syncDir: string, };
+
+export type WebsocketConnection = { model: "websocket_connection", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, elapsed: number, error: string | null, headers: Array<HttpResponseHeader>, state: WebsocketConnectionState, status: number, url: string, };
+
+export type WebsocketConnectionState = "initialized" | "connected" | "closing" | "closed";
+
+export type WebsocketEvent = { model: "websocket_event", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, connectionId: string, isServer: boolean, message: Array<number>, messageType: WebsocketEventType, };
+
+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, 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, };
+
+export type WorkspaceMeta = { model: "workspace_meta", id: string, workspaceId: string, createdAt: string, updatedAt: string, encryptionKey: EncryptedKey | null, settingSyncDir: string | null, };

packages/plugin-runtime-types/src/plugins/Context.ts

@@ -1,25 +1,33 @@
 import type {
-  FindHttpResponsesRequest,
-  FindHttpResponsesResponse,
-  GetCookieValueRequest,
-  GetCookieValueResponse,
-  GetHttpRequestByIdRequest,
-  GetHttpRequestByIdResponse,
-  ListCookieNamesResponse,
-  OpenWindowRequest,
-  PromptTextRequest,
-  PromptTextResponse,
-  RenderGrpcRequestRequest,
-  RenderGrpcRequestResponse,
-  RenderHttpRequestRequest,
-  RenderHttpRequestResponse,
-  SendHttpRequestRequest,
-  SendHttpRequestResponse,
-  ShowToastRequest,
-  TemplateRenderRequest,
+    FindHttpResponsesRequest,
+    FindHttpResponsesResponse,
+    GetCookieValueRequest,
+    GetCookieValueResponse,
+    GetHttpRequestByIdRequest,
+    GetHttpRequestByIdResponse,
+    ListCookieNamesResponse,
+    ListFoldersRequest,
+    ListFoldersResponse,
+    ListHttpRequestsRequest,
+    ListHttpRequestsResponse,
+    OpenWindowRequest,
+    PromptTextRequest,
+    PromptTextResponse,
+    RenderGrpcRequestRequest,
+    RenderGrpcRequestResponse,
+    RenderHttpRequestRequest,
+    RenderHttpRequestResponse,
+    SendHttpRequestRequest,
+    SendHttpRequestResponse,
+    ShowToastRequest,
+    TemplateRenderRequest,
+    WorkspaceInfo,
 } from '../bindings/gen_events.ts';
+import type { HttpRequest } from '../bindings/gen_models.ts';
 import type { JsonValue } from '../bindings/serde_json/JsonValue';
 
+export type WorkspaceHandle = Pick<WorkspaceInfo, 'id' | 'name'>;
+
 export interface Context {
   clipboard: {
     copyText(text: string): Promise<void>;
@@ -57,6 +65,19 @@ export interface Context {
     send(args: SendHttpRequestRequest): Promise<SendHttpRequestResponse['httpResponse']>;
     getById(args: GetHttpRequestByIdRequest): Promise<GetHttpRequestByIdResponse['httpRequest']>;
     render(args: RenderHttpRequestRequest): Promise<RenderHttpRequestResponse['httpRequest']>;
+    list(args?: ListHttpRequestsRequest): Promise<ListHttpRequestsResponse['httpRequests']>;
+    create(
+      args: Omit<Partial<HttpRequest>, 'id' | 'model' | 'createdAt' | 'updatedAt'> &
+        Pick<HttpRequest, 'workspaceId' | 'url'>,
+    ): Promise<HttpRequest>;
+    update(
+      args: Omit<Partial<HttpRequest>, 'model' | 'createdAt' | 'updatedAt'> &
+        Pick<HttpRequest, 'id'>,
+    ): Promise<HttpRequest>;
+    delete(args: { id: string }): Promise<HttpRequest>;
+  };
+  folder: {
+    list(args?: ListFoldersRequest): Promise<ListFoldersResponse['folders']>;
   };
   httpResponse: {
     find(args: FindHttpResponsesRequest): Promise<FindHttpResponsesResponse['httpResponses']>;
@@ -67,4 +88,8 @@ export interface Context {
   plugin: {
     reload(): void;
   };
+  workspace: {
+    list(): Promise<WorkspaceHandle[]>;
+    withContext(handle: WorkspaceHandle): Context;
+  };
 }

packages/plugin-runtime-types/src/plugins/FolderActionPlugin.ts

@@ -0,0 +1,6 @@
+import type { CallFolderActionArgs, FolderAction } from '../bindings/gen_events';
+import type { Context } from './Context';
+
+export type FolderActionPlugin = FolderAction & {
+  onSelect(ctx: Context, args: CallFolderActionArgs): Promise<void> | void;
+};

packages/plugin-runtime-types/src/plugins/WebsocketRequestActionPlugin.ts

@@ -0,0 +1,6 @@
+import type { CallWebsocketRequestActionArgs, WebsocketRequestAction } from '../bindings/gen_events';
+import type { Context } from './Context';
+
+export type WebsocketRequestActionPlugin = WebsocketRequestAction & {
+  onSelect(ctx: Context, args: CallWebsocketRequestActionArgs): Promise<void> | void;
+};

packages/plugin-runtime-types/src/plugins/WorkspaceActionPlugin.ts

@@ -0,0 +1,6 @@
+import type { CallWorkspaceActionArgs, WorkspaceAction } from '../bindings/gen_events';
+import type { Context } from './Context';
+
+export type WorkspaceActionPlugin = WorkspaceAction & {
+  onSelect(ctx: Context, args: CallWorkspaceActionArgs): Promise<void> | void;
+};

packages/plugin-runtime-types/src/plugins/index.ts

@@ -4,6 +4,9 @@ import type { Context } from './Context';
 import type { FilterPlugin } from './FilterPlugin';
 import { GrpcRequestActionPlugin } from './GrpcRequestActionPlugin';
 import type { HttpRequestActionPlugin } from './HttpRequestActionPlugin';
+import type { WebsocketRequestActionPlugin } from './WebsocketRequestActionPlugin';
+import type { WorkspaceActionPlugin } from './WorkspaceActionPlugin';
+import type { FolderActionPlugin } from './FolderActionPlugin';
 import type { ImporterPlugin } from './ImporterPlugin';
 import type { TemplateFunctionPlugin } from './TemplateFunctionPlugin';
 import type { ThemePlugin } from './ThemePlugin';
@@ -12,6 +15,8 @@ export type { Context };
 export type { DynamicTemplateFunctionArg } from './TemplateFunctionPlugin';
 export type { DynamicAuthenticationArg } from './AuthenticationPlugin';
 export type { TemplateFunctionPlugin };
+export type { WorkspaceActionPlugin } from './WorkspaceActionPlugin';
+export type { FolderActionPlugin } from './FolderActionPlugin';
 
 /**
  * The global structure of a Yaak plugin
@@ -24,6 +29,9 @@ export type PluginDefinition = {
   filter?: FilterPlugin;
   authentication?: AuthenticationPlugin;
   httpRequestActions?: HttpRequestActionPlugin[];
+  websocketRequestActions?: WebsocketRequestActionPlugin[];
+  workspaceActions?: WorkspaceActionPlugin[];
+  folderActions?: FolderActionPlugin[];
   grpcRequestActions?: GrpcRequestActionPlugin[];
   templateFunctions?: TemplateFunctionPlugin[];
 };

packages/plugin-runtime/package-lock.json

@@ -1,10 +0,0 @@
-{
-  "name": "@yaakapp-internal/plugin-runtime",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@yaakapp-internal/plugin-runtime"
-    }
-  }
-}

packages/plugin-runtime/src/PluginInstance.ts

@@ -2,6 +2,7 @@ import { applyFormInputDefaults, validateTemplateFunctionArgs } from '@yaakapp-i
 import {
   BootRequest,
   DeleteKeyValueResponse,
+  DeleteModelResponse,
   FindHttpResponsesResponse,
   GetCookieValueRequest,
   GetCookieValueResponse,
@@ -9,10 +10,12 @@ import {
   GetKeyValueResponse,
   GrpcRequestAction,
   HttpAuthenticationAction,
+  HttpRequest,
   HttpRequestAction,
   InternalEvent,
   InternalEventPayload,
   ListCookieNamesResponse,
+  ListWorkspacesResponse,
   PluginContext,
   PromptTextResponse,
   RenderGrpcRequestResponse,
@@ -20,6 +23,7 @@ import {
   SendHttpRequestResponse,
   TemplateFunction,
   TemplateRenderResponse,
+  UpsertModelResponse,
   WindowInfoResponse,
 } from '@yaakapp-internal/plugins';
 import { Context, PluginDefinition } from '@yaakapp/api';
@@ -172,6 +176,57 @@ export class PluginInstance {
         return;
       }
 
+      if (
+        payload.type === 'get_websocket_request_actions_request' &&
+        Array.isArray(this.#mod?.websocketRequestActions)
+      ) {
+        const reply = this.#mod.websocketRequestActions.map((a) => ({
+          ...a,
+          onSelect: undefined,
+        }));
+        const replyPayload: InternalEventPayload = {
+          type: 'get_websocket_request_actions_response',
+          pluginRefId: this.#workerData.pluginRefId,
+          actions: reply,
+        };
+        this.#sendPayload(context, replyPayload, replyId);
+        return;
+      }
+
+      if (
+        payload.type === 'get_workspace_actions_request' &&
+        Array.isArray(this.#mod?.workspaceActions)
+      ) {
+        const reply = this.#mod.workspaceActions.map((a) => ({
+          ...a,
+          onSelect: undefined,
+        }));
+        const replyPayload: InternalEventPayload = {
+          type: 'get_workspace_actions_response',
+          pluginRefId: this.#workerData.pluginRefId,
+          actions: reply,
+        };
+        this.#sendPayload(context, replyPayload, replyId);
+        return;
+      }
+
+      if (
+        payload.type === 'get_folder_actions_request' &&
+        Array.isArray(this.#mod?.folderActions)
+      ) {
+        const reply = this.#mod.folderActions.map((a) => ({
+          ...a,
+          onSelect: undefined,
+        }));
+        const replyPayload: InternalEventPayload = {
+          type: 'get_folder_actions_response',
+          pluginRefId: this.#workerData.pluginRefId,
+          actions: reply,
+        };
+        this.#sendPayload(context, replyPayload, replyId);
+        return;
+      }
+
       if (payload.type === 'get_themes_request' && Array.isArray(this.#mod?.themes)) {
         const replyPayload: InternalEventPayload = {
           type: 'get_themes_response',
@@ -302,6 +357,42 @@ export class PluginInstance {
         }
       }
 
+      if (
+        payload.type === 'call_websocket_request_action_request' &&
+        Array.isArray(this.#mod.websocketRequestActions)
+      ) {
+        const action = this.#mod.websocketRequestActions[payload.index];
+        if (typeof action?.onSelect === 'function') {
+          await action.onSelect(ctx, payload.args);
+          this.#sendEmpty(context, replyId);
+          return;
+        }
+      }
+
+      if (
+        payload.type === 'call_workspace_action_request' &&
+        Array.isArray(this.#mod.workspaceActions)
+      ) {
+        const action = this.#mod.workspaceActions[payload.index];
+        if (typeof action?.onSelect === 'function') {
+          await action.onSelect(ctx, payload.args);
+          this.#sendEmpty(context, replyId);
+          return;
+        }
+      }
+
+      if (
+        payload.type === 'call_folder_action_request' &&
+        Array.isArray(this.#mod.folderActions)
+      ) {
+        const action = this.#mod.folderActions[payload.index];
+        if (typeof action?.onSelect === 'function') {
+          await action.onSelect(ctx, payload.args);
+          this.#sendEmpty(context, replyId);
+          return;
+        }
+      }
+
       if (
         payload.type === 'call_grpc_request_action_request' &&
         Array.isArray(this.#mod.grpcRequestActions)
@@ -611,6 +702,57 @@ export class PluginInstance {
           );
           return httpRequest;
         },
+        list: async (args?: { folderId?: string }) => {
+          const payload = {
+            type: 'list_http_requests_request',
+            folderId: args?.folderId,
+          } as any;
+          const { httpRequests } = await this.#sendForReply<any>(context, payload);
+          return httpRequests as any[];
+        },
+        create: async (args) => {
+          const payload = {
+            type: 'upsert_model_request',
+            model: {
+              name: '',
+              method: 'GET',
+              ...args,
+              id: '',
+              model: 'http_request',
+            },
+          } as InternalEventPayload;
+          const response = await this.#sendForReply<UpsertModelResponse>(context, payload);
+          return response.model as HttpRequest;
+        },
+        update: async (args) => {
+          const payload = {
+            type: 'upsert_model_request',
+            model: {
+              model: 'http_request',
+              ...args,
+            },
+          } as InternalEventPayload;
+          const response = await this.#sendForReply<UpsertModelResponse>(context, payload);
+          return response.model as HttpRequest;
+        },
+        delete: async (args) => {
+          const payload = {
+            type: 'delete_model_request',
+            model: 'http_request',
+            id: args.id,
+          } as InternalEventPayload;
+          const response = await this.#sendForReply<DeleteModelResponse>(context, payload);
+          return response.model as HttpRequest;
+        },
+      },
+      folder: {
+        list: async () => {
+          const payload = {
+            type: 'list_folders_request',
+          } as any;
+          const { folders } = await this.#sendForReply<any>(context, payload);
+          return folders as any[];
+        },
       },
       cookies: {
         getValue: async (args: GetCookieValueRequest) => {
@@ -664,6 +806,29 @@ export class PluginInstance {
           this.#sendPayload(context, { type: 'reload_response', silent: true }, null);
         },
       },
+      workspace: {
+        list: async () => {
+          const payload = {
+            type: 'list_workspaces_request'
+          } as InternalEventPayload;
+          const response = await this.#sendForReply<ListWorkspacesResponse>(context, payload);
+          return response.workspaces.map((w) => ({
+            id: w.id,
+            name: w.name,
+            // Hide label from plugin authors, but keep it for internal routing
+            _label: (w as any).label as string,
+          }));
+        },
+        withContext: (workspaceHandle: { id: string; name: string; _label?: string }) => {
+          // Create a new context with the workspace's window label
+          const newContext: PluginContext = {
+            ...context,
+            label: workspaceHandle._label || null,
+            workspaceId: workspaceHandle.id,
+          };
+          return this.#newCtx(newContext);
+        },
+      },
     };
   }
 }

packages/plugin-runtime/tests/common.test.ts

@@ -1,7 +1,8 @@
+import { applyFormInputDefaults } from '@yaakapp-internal/lib/templateFunction';
 import { CallTemplateFunctionArgs } from '@yaakapp-internal/plugins';
 import { Context, DynamicTemplateFunctionArg } from '@yaakapp/api';
 import { describe, expect, test } from 'vitest';
-import { applyDynamicFormInput, applyFormInputDefaults } from '../src/common';
+import { applyDynamicFormInput } from '../src/common';
 
 describe('applyFormInputDefaults', () => {
   test('Works with top-level select', () => {

plugins-external/.gitignore

@@ -0,0 +1 @@
+*/build

plugins-external/faker/README.md

@@ -0,0 +1,76 @@
+# Yaak Faker Plugin
+
+This is a template function that generates realistic fake data
+for testing and development using [FakerJS](https://fakerjs.dev).
+
+![CleanShot 2024-09-19 at 13 56 33@2x](https://github.com/user-attachments/assets/2f935110-4af2-4236-a50d-18db5454176d)
+
+## Example JSON Body
+
+Here's an example JSON body that uses fake data:
+
+```json
+{
+  "id": "${[ faker.string.uuid() ]}",
+  "name": "${[ faker.person.fullName() ]}",
+  "email": "${[ faker.internet.email() ]}",
+  "phone": "${[ faker.phone.number() ]}",
+  "address": {
+    "street": "${[ faker.location.streetAddress() ]}",
+    "city": "${[ faker.location.city() ]}",
+    "country": "${[ faker.location.country() ]}",
+    "zipCode": "${[ faker.location.zipCode() ]}"
+  },
+  "company": "${[ faker.company.name() ]}",
+  "website": "${[ faker.internet.url() ]}"
+}
+```
+
+This will generate a random JSON body on every request:
+
+```json
+{
+  "id": "589f0aec-7310-4bf2-81c4-0b1bb7f1c3c1",
+  "name": "Lucy Gottlieb-Weissnat",
+  "email": "Destiny_Herzog@gmail.com",
+  "phone": "411.805.2871 x699",
+  "address": {
+    "street": "846 Christ Mills",
+    "city": "Spencerfurt",
+    "country": "United Kingdom",
+    "zipCode": "20354"
+  },
+  "company": "Emard, Kohler and Rutherford",
+  "website": "https://watery-detective.org"
+}
+```
+
+## Available Categories
+
+The plugin provides access to all FakerJS modules and their methods:
+
+| Category   | Description               | Example Methods                            |
+|------------|---------------------------|--------------------------------------------|
+| `airline`  | Airline-related data      | `aircraftType`, `airline`, `airplane`      |
+| `animal`   | Animal names and types    | `bear`, `bird`, `cat`, `dog`, `fish`       |
+| `color`    | Colors in various formats | `human`, `rgb`, `hex`, `hsl`               |
+| `commerce` | E-commerce data           | `department`, `product`, `price`           |
+| `company`  | Company information       | `name`, `catchPhrase`, `bs`                |
+| `database` | Database-related data     | `column`, `type`, `collation`              |
+| `date`     | Date and time values      | `recent`, `future`, `past`, `between`      |
+| `finance`  | Financial data            | `account`, `amount`, `currency`            |
+| `git`      | Git-related data          | `branch`, `commitEntry`, `commitSha`       |
+| `hacker`   | Tech/hacker terminology   | `abbreviation`, `noun`, `phrase`           |
+| `image`    | Image URLs and data       | `avatar`, `url`, `dataUri`                 |
+| `internet` | Internet-related data     | `email`, `url`, `ip`, `userAgent`          |
+| `location` | Geographic data           | `city`, `country`, `latitude`, `longitude` |
+| `lorem`    | Lorem ipsum text          | `word`, `sentence`, `paragraph`            |
+| `person`   | Personal information      | `firstName`, `lastName`, `fullName`        |
+| `music`    | Music-related data        | `genre`, `songName`, `artist`              |
+| `number`   | Numeric data              | `int`, `float`, `binary`, `hex`            |
+| `phone`    | Phone numbers             | `number`, `imei`                           |
+| `science`  | Scientific data           | `chemicalElement`, `unit`                  |
+| `string`   | String utilities          | `uuid`, `alpha`, `alphanumeric`            |
+| `system`   | System-related data       | `fileName`, `mimeType`, `fileExt`          |
+| `vehicle`  | Vehicle information       | `vehicle`, `manufacturer`, `model`         |
+| `word`     | Word generation           | `adjective`, `adverb`, `conjunction`       |

plugins-external/faker/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "@yaak/faker",
+  "private": true,
+  "version": "0.1.0",
+  "displayName": "Faker",
+  "description": "Template functions for generating fake data using FakerJS",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mountain-loop/yaak.git",
+    "directory": "plugins-external/faker"
+  },
+  "scripts": {
+    "build": "yaakcli build",
+    "dev": "yaakcli dev"
+  },
+  "dependencies": {
+    "@faker-js/faker": "^10.1.0"
+  },
+  "devDependencies": {
+    "@types/node": "^25.0.3",
+    "typescript": "^5.9.3"
+  }
+}

plugins-external/faker/src/index.ts

@@ -0,0 +1,106 @@
+import { faker } from '@faker-js/faker';
+import type { PluginDefinition, TemplateFunctionArg } from '@yaakapp/api';
+
+const modules = [
+  'airline',
+  'animal',
+  'color',
+  'commerce',
+  'company',
+  'database',
+  'date',
+  'finance',
+  'git',
+  'hacker',
+  'image',
+  'internet',
+  'location',
+  'lorem',
+  'person',
+  'music',
+  'number',
+  'phone',
+  'science',
+  'string',
+  'system',
+  'vehicle',
+  'word',
+];
+
+function normalizeResult(result: unknown): string {
+  if (typeof result === 'string') return result;
+  return JSON.stringify(result);
+}
+
+// Whatever Yaak’s arg type shape is – rough example
+function args(modName: string, fnName: string): TemplateFunctionArg[] {
+  return [
+    {
+      type: 'banner',
+      color: 'info',
+      inputs: [
+        {
+          type: 'markdown',
+          content: `Need help? View documentation for [\`${modName}.${fnName}(…)\`](https://fakerjs.dev/api/${encodeURIComponent(modName)}.html#${encodeURIComponent(fnName)})`,
+        },
+      ],
+    },
+    {
+      name: 'options',
+      label: 'Arguments',
+      type: 'editor',
+      language: 'json',
+      optional: true,
+      placeholder: 'e.g. { "min": 1, "max": 10 } or 10 or ["en","US"]',
+    },
+  ];
+}
+
+export const plugin: PluginDefinition = {
+  templateFunctions: modules.flatMap((modName) => {
+    // @ts-expect-error - Dynamic access to faker modules
+    const mod = faker[modName];
+    return Object.keys(mod)
+      .filter((n) => n !== 'faker')
+      .map((fnName) => ({
+        name: ['faker', modName, fnName].join('.'),
+        args: args(modName, fnName),
+        async onRender(_ctx, args) {
+          const fn = mod[fnName] as (...a: unknown[]) => unknown;
+          const options = args.values.options;
+
+          // No options supplied
+          if (options == null || options === '') {
+            return normalizeResult(fn());
+          }
+
+          // Try JSON first
+          let parsed: unknown = options;
+          if (typeof options === 'string') {
+            try {
+              parsed = JSON.parse(options);
+            } catch {
+              // Not valid JSON – maybe just a scalar
+              const n = Number(options);
+              if (!Number.isNaN(n)) {
+                parsed = n;
+              } else {
+                parsed = options;
+              }
+            }
+          }
+
+          let result: unknown;
+          if (Array.isArray(parsed)) {
+            // Treat as positional arguments
+            result = fn(...parsed);
+          } else {
+            // Treat as a single argument (option object or scalar)
+            result = fn(parsed);
+          }
+
+          return normalizeResult(result);
+        },
+      }));
+  }),
+};

plugins-external/faker/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}

plugins-external/mcp-server/README.md

@@ -0,0 +1,54 @@
+# Yaak MCP Server Plugin
+
+A Yaak plugin that exposes Yaak's functionality via the [Model Context Protocol (MCP)](https://modelcontextprotocol.io/), allowing AI assistants and other tools to interact with Yaak programmatically.
+
+## Features
+
+This plugin starts an MCP server on `http://127.0.0.1:64343/mcp` that provides tools for:
+
+### HTTP Requests
+- `list_http_requests` - List all HTTP requests in a workspace
+- `get_http_request` - Get details of a specific HTTP request
+- `send_http_request` - Send an HTTP request and get the response
+- `create_http_request` - Create a new HTTP request
+- `update_http_request` - Update an existing HTTP request
+- `delete_http_request` - Delete an HTTP request
+
+### Folders
+- `list_folders` - List all folders in a workspace
+
+### Workspaces
+- `list_workspaces` - List all open workspaces in Yaak
+
+### Clipboard
+- `copy_to_clipboard` - Copy text to the system clipboard
+
+### Window
+- `get_workspace_id` - Get the current workspace ID
+- `get_environment_id` - Get the current environment ID
+
+### Toast Notifications
+- `show_toast` - Show a toast notification in Yaak
+
+## Usage
+
+Once the plugin is installed and Yaak is running, the MCP server will be available at:
+
+```
+http://127.0.0.1:64343/mcp
+```
+
+Configure your MCP client to connect to this endpoint to start interacting with Yaak.
+
+## Development
+
+```bash
+# Install dependencies
+npm install
+
+# Build the plugin
+npm run build
+
+# Development mode with auto-rebuild
+npm run dev
+```

plugins-external/mcp-server/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@yaak/mcp-server",
+  "private": true,
+  "version": "0.1.0",
+  "displayName": "MCP Server",
+  "description": "Expose Yaak functionality via Model Context Protocol",
+  "minYaakVersion": "2025.10.0-beta.6",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mountain-loop/yaak.git",
+    "directory": "plugins-external/mcp-server"
+  },
+  "scripts": {
+    "build": "yaakcli build",
+    "dev": "yaakcli dev"
+  },
+  "dependencies": {
+    "@hono/mcp": "^0.2.3",
+    "@hono/node-server": "^1.19.7",
+    "@modelcontextprotocol/sdk": "^1.25.1",
+    "hono": "^4.11.3",
+    "zod": "^3.25.76"
+  },
+  "devDependencies": {
+    "@types/node": "^25.0.3",
+    "typescript": "^5.9.3"
+  }
+}

plugins-external/mcp-server/src/index.ts

@@ -0,0 +1,25 @@
+import type { Context, PluginDefinition } from '@yaakapp/api';
+import { createMcpServer } from './server.js';
+
+const serverPort = 64343;
+
+let mcpServer: Awaited<ReturnType<typeof createMcpServer>> | null = null;
+
+export const plugin: PluginDefinition = {
+  async init(ctx: Context) {
+    // Start the server after waiting, so there's an active window open to do things
+    // like show the startup toast.
+    setTimeout(() => {
+      mcpServer = createMcpServer({ yaak: ctx }, serverPort);
+    }, 5000);
+  },
+
+  async dispose() {
+    console.log('Disposing MCP Server plugin');
+
+    if (mcpServer) {
+      await mcpServer.close();
+      mcpServer = null;
+    }
+  },
+};

plugins-external/mcp-server/src/server.ts

@@ -0,0 +1,58 @@
+import { serve } from '@hono/node-server';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js';
+import { Hono } from 'hono';
+import { registerFolderTools } from './tools/folder.js';
+import { registerHttpRequestTools } from './tools/httpRequest.js';
+import { registerToastTools } from './tools/toast.js';
+import { registerWindowTools } from './tools/window.js';
+import { registerWorkspaceTools } from './tools/workspace.js';
+import type { McpServerContext } from './types.js';
+
+export function createMcpServer(ctx: McpServerContext, port: number) {
+  const server = new McpServer({
+    name: 'yaak-mcp-server',
+    version: '0.1.0',
+  });
+
+  // Register all tools
+  registerToastTools(server, ctx);
+  registerHttpRequestTools(server, ctx);
+  registerFolderTools(server, ctx);
+  registerWindowTools(server, ctx);
+  registerWorkspaceTools(server, ctx);
+
+  // Create a stateless transport
+  const transport = new WebStandardStreamableHTTPServerTransport();
+
+  // Create Hono app
+  const app = new Hono();
+
+  // MCP endpoint - reuse the same transport for all requests
+  app.all('/mcp', (c) => transport.handleRequest(c.req.raw));
+
+  // Connect server to transport
+  server.connect(transport).then(() => {
+    console.log(`MCP Server running at http://127.0.0.1:${port}/mcp`);
+    ctx.yaak.toast.show({
+      message: `MCP Server running on port ${port}`,
+      icon: 'check_circle',
+      color: 'success',
+    });
+  });
+
+  // Start the HTTP server
+  const honoServer = serve({
+    fetch: app.fetch,
+    port,
+    hostname: '127.0.0.1',
+  });
+
+  return {
+    server,
+    close: async () => {
+      honoServer.close();
+      await server.close();
+    },
+  };
+}

plugins-external/mcp-server/src/tools/folder.ts

@@ -0,0 +1,33 @@
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import * as z from 'zod/v4';
+import type { McpServerContext } from '../types.js';
+import { getWorkspaceContext } from './helpers.js';
+
+export function registerFolderTools(server: McpServer, ctx: McpServerContext) {
+  server.registerTool(
+    'list_folders',
+    {
+      title: 'List Folders',
+      description: 'List all folders in a workspace',
+      inputSchema: z.object({
+        workspaceId: z
+          .string()
+          .optional()
+          .describe('Workspace ID (required if multiple workspaces are open)'),
+      }),
+    },
+    async ({ workspaceId }) => {
+      const workspaceCtx = await getWorkspaceContext(ctx, workspaceId);
+      const folders = await workspaceCtx.yaak.folder.list();
+
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: JSON.stringify(folders, null, 2),
+          },
+        ],
+      };
+    },
+  );
+}

plugins-external/mcp-server/src/tools/helpers.ts

@@ -0,0 +1,32 @@
+import type { McpServerContext } from '../types.js';
+
+export async function getWorkspaceContext(
+  ctx: McpServerContext,
+  workspaceId?: string,
+): Promise<McpServerContext> {
+  const workspaces = await ctx.yaak.workspace.list();
+
+  if (!workspaceId && workspaces.length > 1) {
+    const workspaceList = workspaces.map((w, i) => `${i + 1}. ${w.name} (ID: ${w.id})`).join('\n');
+    throw new Error(
+      `Multiple workspaces are open. Please specify which workspace to use.\n\n` +
+        `Currently open workspaces:\n${workspaceList}\n\n` +
+        `You can use the list_workspaces tool to get workspace IDs, then use other tools ` +
+        `with the workspace context. For example, ask the user which workspace they want ` +
+        `to work with by presenting them with the numbered list above.`,
+    );
+  }
+
+  const workspace = workspaceId ? workspaces.find((w) => w.id === workspaceId) : workspaces[0];
+  if (!workspace) {
+    const workspaceList = workspaces.map((w) => `- ${w.name} (ID: ${w.id})`).join('\n');
+    throw new Error(
+      `Workspace with ID "${workspaceId}" not found.\n\n` +
+        `Available workspaces:\n${workspaceList}`,
+    );
+  }
+
+  return {
+    yaak: ctx.yaak.workspace.withContext(workspace),
+  };
+}

plugins-external/mcp-server/src/tools/httpRequest.ts

@@ -0,0 +1,219 @@
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import * as z from 'zod/v4';
+import type { McpServerContext } from '../types.js';
+import { getWorkspaceContext } from './helpers.js';
+
+export function registerHttpRequestTools(server: McpServer, ctx: McpServerContext) {
+  server.registerTool(
+    'list_http_requests',
+    {
+      title: 'List HTTP Requests',
+      description: 'List all HTTP requests in a workspace',
+      inputSchema: z.object({
+        workspaceId: z
+          .string()
+          .optional()
+          .describe('Workspace ID (required if multiple workspaces are open)'),
+      }),
+    },
+    async ({ workspaceId }) => {
+      const workspaceCtx = await getWorkspaceContext(ctx, workspaceId);
+      const requests = await workspaceCtx.yaak.httpRequest.list();
+
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: JSON.stringify(requests, null, 2),
+          },
+        ],
+      };
+    },
+  );
+
+  server.registerTool(
+    'get_http_request',
+    {
+      title: 'Get HTTP Request',
+      description: 'Get details of a specific HTTP request by ID',
+      inputSchema: z.object({
+        id: z.string().describe('The HTTP request ID'),
+        workspaceId: z
+          .string()
+          .optional()
+          .describe('Workspace ID (required if multiple workspaces are open)'),
+      }),
+    },
+    async ({ id, workspaceId }) => {
+      const workspaceCtx = await getWorkspaceContext(ctx, workspaceId);
+      const request = await workspaceCtx.yaak.httpRequest.getById({ id });
+
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: JSON.stringify(request, null, 2),
+          },
+        ],
+      };
+    },
+  );
+
+  server.registerTool(
+    'send_http_request',
+    {
+      title: 'Send HTTP Request',
+      description: 'Send an HTTP request and get the response',
+      inputSchema: z.object({
+        id: z.string().describe('The HTTP request ID to send'),
+        environmentId: z.string().optional().describe('Optional environment ID to use'),
+        workspaceId: z
+          .string()
+          .optional()
+          .describe('Workspace ID (required if multiple workspaces are open)'),
+      }),
+    },
+    async ({ id, workspaceId }) => {
+      const workspaceCtx = await getWorkspaceContext(ctx, workspaceId);
+      const httpRequest = await workspaceCtx.yaak.httpRequest.getById({ id });
+      if (httpRequest == null) {
+        throw new Error(`HTTP request with ID ${id} not found`);
+      }
+
+      const response = await workspaceCtx.yaak.httpRequest.send({ httpRequest });
+
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: JSON.stringify(response, null, 2),
+          },
+        ],
+      };
+    },
+  );
+
+  server.registerTool(
+    'create_http_request',
+    {
+      title: 'Create HTTP Request',
+      description: 'Create a new HTTP request',
+      inputSchema: z.object({
+        workspaceId: z
+          .string()
+          .optional()
+          .describe('Workspace ID (required if multiple workspaces are open)'),
+        name: z
+          .string()
+          .optional()
+          .describe('Request name (empty string to auto-generate from URL)'),
+        url: z.string().describe('Request URL'),
+        method: z.string().optional().describe('HTTP method (defaults to GET)'),
+        folderId: z.string().optional().describe('Parent folder ID'),
+        description: z.string().optional().describe('Request description'),
+        headers: z
+          .array(
+            z.object({
+              name: z.string(),
+              value: z.string(),
+              enabled: z.boolean().default(true),
+            }),
+          )
+          .optional()
+          .describe('Request headers'),
+        urlParameters: z
+          .array(
+            z.object({
+              name: z.string(),
+              value: z.string(),
+              enabled: z.boolean().default(true),
+            }),
+          )
+          .optional()
+          .describe('URL query parameters'),
+      }),
+    },
+    async ({ workspaceId: ogWorkspaceId, ...args }) => {
+      const workspaceCtx = await getWorkspaceContext(ctx, ogWorkspaceId);
+      const workspaceId = await workspaceCtx.yaak.window.workspaceId();
+      if (!workspaceId) {
+        throw new Error('No workspace is open');
+      }
+
+      const httpRequest = await workspaceCtx.yaak.httpRequest.create({
+        workspaceId: workspaceId,
+        ...args,
+      });
+
+      return {
+        content: [{ type: 'text' as const, text: JSON.stringify(httpRequest, null, 2) }],
+      };
+    },
+  );
+
+  server.registerTool(
+    'update_http_request',
+    {
+      title: 'Update HTTP Request',
+      description: 'Update an existing HTTP request',
+      inputSchema: z.object({
+        id: z.string().describe('HTTP request ID to update'),
+        workspaceId: z
+          .string()
+          .optional()
+          .describe('Workspace ID (required if multiple workspaces are open)'),
+        name: z.string().optional().describe('Request name'),
+        url: z.string().optional().describe('Request URL'),
+        method: z.string().optional().describe('HTTP method'),
+        folderId: z.string().optional().describe('Parent folder ID'),
+        description: z.string().optional().describe('Request description'),
+        headers: z
+          .array(
+            z.object({
+              name: z.string(),
+              value: z.string(),
+              enabled: z.boolean().default(true),
+            }),
+          )
+          .optional()
+          .describe('Request headers'),
+        urlParameters: z
+          .array(
+            z.object({
+              name: z.string(),
+              value: z.string(),
+              enabled: z.boolean().default(true),
+            }),
+          )
+          .optional()
+          .describe('URL query parameters'),
+      }),
+    },
+    async ({ id, workspaceId, ...updates }) => {
+      const workspaceCtx = await getWorkspaceContext(ctx, workspaceId);
+      const httpRequest = await workspaceCtx.yaak.httpRequest.update({ id, ...updates });
+      return {
+        content: [{ type: 'text' as const, text: JSON.stringify(httpRequest, null, 2) }],
+      };
+    },
+  );
+
+  server.registerTool(
+    'delete_http_request',
+    {
+      title: 'Delete HTTP Request',
+      description: 'Delete an HTTP request by ID',
+      inputSchema: z.object({
+        id: z.string().describe('HTTP request ID to delete'),
+      }),
+    },
+    async ({ id }) => {
+      const httpRequest = await ctx.yaak.httpRequest.delete({ id });
+      return {
+        content: [
+          { type: 'text' as const, text: `Deleted: ${httpRequest.name} (${httpRequest.id})` },
+        ],
+      };
+    },
+  );
+}

plugins-external/mcp-server/src/tools/toast.ts

@@ -0,0 +1,59 @@
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { Color, Icon } from '@yaakapp/api';
+import * as z from 'zod/v4';
+import type { McpServerContext } from '../types.js';
+
+const ICON_VALUES = [
+  'alert_triangle',
+  'check',
+  'check_circle',
+  'chevron_down',
+  'copy',
+  'info',
+  'pin',
+  'search',
+  'trash',
+] as const satisfies readonly Icon[];
+
+const COLOR_VALUES = [
+  'primary',
+  'secondary',
+  'info',
+  'success',
+  'notice',
+  'warning',
+  'danger',
+] as const satisfies readonly Color[];
+
+export function registerToastTools(server: McpServer, ctx: McpServerContext) {
+  server.registerTool(
+    'show_toast',
+    {
+      title: 'Show Toast',
+      description: 'Show a toast notification in Yaak',
+      inputSchema: z.object({
+        message: z.string().describe('The message to display'),
+        icon: z.enum(ICON_VALUES).optional().describe('Icon name'),
+        color: z.enum(COLOR_VALUES).optional().describe('Toast color'),
+        timeout: z.number().optional().describe('Timeout in milliseconds'),
+      }),
+    },
+    async ({ message, icon, color, timeout }) => {
+      await ctx.yaak.toast.show({
+        message,
+        icon,
+        color,
+        timeout,
+      });
+
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: `✓ Toast shown: "${message}"`,
+          },
+        ],
+      };
+    },
+  );
+}

plugins-external/mcp-server/src/tools/window.ts

@@ -0,0 +1,50 @@
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import * as z from 'zod/v4';
+import type { McpServerContext } from '../types.js';
+import { getWorkspaceContext } from './helpers.js';
+
+export function registerWindowTools(server: McpServer, ctx: McpServerContext) {
+  server.registerTool(
+    'get_workspace_id',
+    {
+      title: 'Get Workspace ID',
+      description: 'Get the current workspace ID',
+      inputSchema: z.object({}),
+    },
+    async () => {
+      const workspaceCtx = await getWorkspaceContext(ctx);
+      const workspaceId = await workspaceCtx.yaak.window.workspaceId();
+
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: workspaceId || 'No workspace open',
+          },
+        ],
+      };
+    },
+  );
+
+  server.registerTool(
+    'get_environment_id',
+    {
+      title: 'Get Environment ID',
+      description: 'Get the current environment ID',
+      inputSchema: z.object({}),
+    },
+    async () => {
+      const workspaceCtx = await getWorkspaceContext(ctx);
+      const environmentId = await workspaceCtx.yaak.window.environmentId();
+
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: environmentId || 'No environment selected',
+          },
+        ],
+      };
+    },
+  );
+}

plugins-external/mcp-server/src/tools/workspace.ts

@@ -0,0 +1,26 @@
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import * as z from 'zod/v4';
+import type { McpServerContext } from '../types.js';
+
+export function registerWorkspaceTools(server: McpServer, ctx: McpServerContext) {
+  server.registerTool(
+    'list_workspaces',
+    {
+      title: 'List Workspaces',
+      description: 'List all open workspaces in Yaak',
+      inputSchema: z.object({}),
+    },
+    async () => {
+      const workspaces = await ctx.yaak.workspace.list();
+
+      return {
+        content: [
+          {
+            type: 'text' as const,
+            text: JSON.stringify(workspaces, null, 2),
+          },
+        ],
+      };
+    },
+  );
+}

plugins-external/mcp-server/src/types.ts

@@ -0,0 +1,5 @@
+import type { Context } from '@yaakapp/api';
+
+export interface McpServerContext {
+  yaak: Context;
+}

plugins-external/mcp-server/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}

plugins/importer-curl/src/index.ts

@@ -194,11 +194,18 @@ function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
       let value: string | boolean;
       const nextEntry = parseEntries[i + 1];
       const hasValue = !BOOLEAN_FLAGS.includes(name);
+      // Check if nextEntry looks like a flag:
+      // - Single dash followed by a letter: -X, -H, -d
+      // - Double dash followed by a letter: --data-raw, --header
+      // This prevents mistaking data that starts with dashes (like multipart boundaries ------) as flags
+      const nextEntryIsFlag =
+        typeof nextEntry === 'string' &&
+        (nextEntry.match(/^-[a-zA-Z]/) || nextEntry.match(/^--[a-zA-Z]/));
       if (isSingleDash && name.length > 1) {
         // Handle squished arguments like -XPOST
         value = name.slice(1);
         name = name.slice(0, 1);
-      } else if (typeof nextEntry === 'string' && hasValue && !nextEntry.startsWith('-')) {
+      } else if (typeof nextEntry === 'string' && hasValue && !nextEntryIsFlag) {
         // Next arg is not a flag, so assign it as the value
         value = nextEntry;
         i++; // Skip next one
@@ -305,11 +312,34 @@ function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
   }
 
   // Body (Text or Blob)
-  const dataParameters = pairsToDataParameters(flagsByName);
   const contentTypeHeader = headers.find((header) => header.name.toLowerCase() === 'content-type');
-  const mimeType = contentTypeHeader ? contentTypeHeader.value.split(';')[0] : null;
+  const mimeType = contentTypeHeader ? contentTypeHeader.value.split(';')[0]?.trim() : null;
 
-  // Body (Multipart Form Data)
+  // Extract boundary from Content-Type header for multipart parsing
+  const boundaryMatch = contentTypeHeader?.value.match(/boundary=([^\s;]+)/i);
+  const boundary = boundaryMatch?.[1];
+
+  // Get raw data from --data-raw flags (before splitting by &)
+  const rawDataValues = [
+    ...((flagsByName['data-raw'] as string[] | undefined) || []),
+    ...((flagsByName.d as string[] | undefined) || []),
+    ...((flagsByName.data as string[] | undefined) || []),
+    ...((flagsByName['data-binary'] as string[] | undefined) || []),
+    ...((flagsByName['data-ascii'] as string[] | undefined) || []),
+  ];
+
+  // Check if this is multipart form data in --data-raw (Chrome DevTools format)
+  let multipartFormDataFromRaw:
+    | { name: string; value?: string; file?: string; enabled: boolean }[]
+    | null = null;
+  if (mimeType === 'multipart/form-data' && boundary && rawDataValues.length > 0) {
+    const rawBody = rawDataValues.join('');
+    multipartFormDataFromRaw = parseMultipartFormData(rawBody, boundary);
+  }
+
+  const dataParameters = pairsToDataParameters(flagsByName);
+
+  // Body (Multipart Form Data from -F flags)
   const formDataParams = [
     ...((flagsByName.form as string[] | undefined) || []),
     ...((flagsByName.F as string[] | undefined) || []),
@@ -336,7 +366,13 @@ function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
   let bodyType: string | null = null;
   const bodyAsGET = getPairValue(flagsByName, false, ['G', 'get']);
 
-  if (dataParameters.length > 0 && bodyAsGET) {
+  if (multipartFormDataFromRaw) {
+    // Handle multipart form data parsed from --data-raw (Chrome DevTools format)
+    bodyType = 'multipart/form-data';
+    body = {
+      form: multipartFormDataFromRaw,
+    };
+  } else if (dataParameters.length > 0 && bodyAsGET) {
     urlParameters.push(...dataParameters);
   } else if (
     dataParameters.length > 0 &&
@@ -473,6 +509,71 @@ function splitOnce(str: string, sep: string): string[] {
   return [str];
 }
 
+/**
+ * Parses multipart form data from a raw body string
+ * Used when Chrome DevTools exports a cURL with --data-raw containing multipart data
+ */
+function parseMultipartFormData(
+  rawBody: string,
+  boundary: string,
+): { name: string; value?: string; file?: string; enabled: boolean }[] | null {
+  const results: { name: string; value?: string; file?: string; enabled: boolean }[] = [];
+
+  // The boundary in the body typically has -- prefix
+  const boundaryMarker = `--${boundary}`;
+  const parts = rawBody.split(boundaryMarker);
+
+  for (const part of parts) {
+    // Skip empty parts and the closing boundary marker
+    if (!part || part.trim() === '--' || part.trim() === '--\r\n') {
+      continue;
+    }
+
+    // Each part has headers and content separated by \r\n\r\n
+    const headerContentSplit = part.indexOf('\r\n\r\n');
+    if (headerContentSplit === -1) {
+      continue;
+    }
+
+    const headerSection = part.slice(0, headerContentSplit);
+    let content = part.slice(headerContentSplit + 4); // Skip \r\n\r\n
+
+    // Remove trailing \r\n from content
+    if (content.endsWith('\r\n')) {
+      content = content.slice(0, -2);
+    }
+
+    // Parse Content-Disposition header to get name and filename
+    const contentDispositionMatch = headerSection.match(
+      /Content-Disposition:\s*form-data;\s*name="([^"]+)"(?:;\s*filename="([^"]+)")?/i,
+    );
+
+    if (!contentDispositionMatch) {
+      continue;
+    }
+
+    const name = contentDispositionMatch[1] ?? '';
+    const filename = contentDispositionMatch[2];
+
+    const item: { name: string; value?: string; file?: string; enabled: boolean } = {
+      name,
+      enabled: true,
+    };
+
+    if (filename) {
+      // This is a file upload field
+      item.file = filename;
+    } else {
+      // This is a regular text field
+      item.value = content;
+    }
+
+    results.push(item);
+  }
+
+  return results.length > 0 ? results : null;
+}
+
 const idCount: Partial<Record<string, number>> = {};
 
 function generateId(model: string): string {

plugins/importer-curl/tests/index.test.ts

@@ -441,6 +441,72 @@ describe('importer-curl', () => {
       },
     });
   });
+
+  test('Imports multipart form data from --data-raw (Chrome DevTools format)', () => {
+    // This is the format Chrome DevTools uses when copying a multipart form submission as cURL
+    const curlCommand = `curl 'http://localhost:8080/system' \
+  -H 'Content-Type: multipart/form-data; boundary=----WebKitFormBoundaryHwsXKi4rKA6P5VBd' \
+  --data-raw $'------WebKitFormBoundaryHwsXKi4rKA6P5VBd\r\nContent-Disposition: form-data; name="username"\r\n\r\njsgj\r\n------WebKitFormBoundaryHwsXKi4rKA6P5VBd\r\nContent-Disposition: form-data; name="password"\r\n\r\n654321\r\n------WebKitFormBoundaryHwsXKi4rKA6P5VBd\r\nContent-Disposition: form-data; name="captcha"; filename="test.xlsx"\r\nContent-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\r\n\r\n\r\n------WebKitFormBoundaryHwsXKi4rKA6P5VBd--\r\n'`;
+
+    expect(convertCurl(curlCommand)).toEqual({
+      resources: {
+        workspaces: [baseWorkspace()],
+        httpRequests: [
+          baseRequest({
+            url: 'http://localhost:8080/system',
+            method: 'POST',
+            headers: [
+              {
+                name: 'Content-Type',
+                value: 'multipart/form-data; boundary=----WebKitFormBoundaryHwsXKi4rKA6P5VBd',
+                enabled: true,
+              },
+            ],
+            bodyType: 'multipart/form-data',
+            body: {
+              form: [
+                { name: 'username', value: 'jsgj', enabled: true },
+                { name: 'password', value: '654321', enabled: true },
+                { name: 'captcha', file: 'test.xlsx', enabled: true },
+              ],
+            },
+          }),
+        ],
+      },
+    });
+  });
+
+  test('Imports multipart form data with text-only fields from --data-raw', () => {
+    const curlCommand = `curl 'http://example.com/api' \
+  -H 'Content-Type: multipart/form-data; boundary=----FormBoundary123' \
+  --data-raw $'------FormBoundary123\r\nContent-Disposition: form-data; name="field1"\r\n\r\nvalue1\r\n------FormBoundary123\r\nContent-Disposition: form-data; name="field2"\r\n\r\nvalue2\r\n------FormBoundary123--\r\n'`;
+
+    expect(convertCurl(curlCommand)).toEqual({
+      resources: {
+        workspaces: [baseWorkspace()],
+        httpRequests: [
+          baseRequest({
+            url: 'http://example.com/api',
+            method: 'POST',
+            headers: [
+              {
+                name: 'Content-Type',
+                value: 'multipart/form-data; boundary=----FormBoundary123',
+                enabled: true,
+              },
+            ],
+            bodyType: 'multipart/form-data',
+            body: {
+              form: [
+                { name: 'field1', value: 'value1', enabled: true },
+                { name: 'field2', value: 'value2', enabled: true },
+              ],
+            },
+          }),
+        ],
+      },
+    });
+  });
 });
 
 const idCount: Partial<Record<string, number>> = {};

plugins/template-function-1password/src/index.ts

@@ -11,7 +11,7 @@ async function op(args: CallTemplateFunctionArgs): Promise<{ client?: Client; er
   let hash: string | null = null;
   switch (args.values.authMethod) {
     case 'desktop': {
-      const account = args.values.account;
+      const account = args.values.token;
       if (typeof account !== 'string' || !account) return { error: 'Missing account name' };
 
       hash = crypto.createHash('sha256').update(`desktop:${account}`).digest('hex');
@@ -97,7 +97,7 @@ export const plugin: PluginDefinition = {
               name: 'authMethod',
               type: 'select',
               label: 'Authentication Method',
-              description: '',
+              defaultValue: 'token',
               options: [
                 {
                   label: 'Service Account',
@@ -108,29 +108,25 @@ export const plugin: PluginDefinition = {
                   value: 'desktop',
                 },
               ],
-              defaultValue: 'token',
             },
             {
-              name: 'account',
+              name: 'token',
               type: 'text',
-              description: '',
+              // biome-ignore lint/suspicious/noTemplateCurlyInString: Yaak template syntax
+              defaultValue: '${[1PASSWORD_TOKEN]}',
               dynamic(_ctx, args) {
                 switch (args.values.authMethod) {
                   case 'desktop':
                     return {
-                      name: 'account',
                       label: 'Account Name',
                       description:
                         'Account name can be taken from the sidebar of the 1Password App. Make sure you\'re on the BETA version of the 1Password app and have "Integrate with other apps" enabled in Settings > Developer.',
                     };
                   case 'token':
                     return {
-                      name: 'token',
                       label: 'Token',
                       description:
                         'Token can be generated from the 1Password website by visiting Developer > Service Accounts',
-                      // biome-ignore lint/suspicious/noTemplateCurlyInString: Yaak template syntax
-                      defaultValue: '${[1PASSWORD_TOKEN]}',
                       password: true,
                     };
                 }

plugins/themes-yaak/src/index.ts

@@ -1,791 +1,116 @@
 import type { PluginDefinition } from '@yaakapp/api';
 
+// Yaak themes
+import { highContrast, highContrastDark } from './themes/high-contrast';
+import {
+  catppuccinFrappe,
+  catppuccinMacchiato,
+  catppuccinMocha,
+  catppuccinLatte,
+} from './themes/catppuccin';
+import { dracula } from './themes/dracula';
+import { githubDark, githubLight } from './themes/github';
+import { gruvbox } from './themes/gruvbox';
+import { hotdogStand } from './themes/hotdog-stand';
+import {
+  monokaiPro,
+  monokaiProClassic,
+  monokaiProMachine,
+  monokaiProOctagon,
+  monokaiProRistretto,
+  monokaiProSpectrum,
+} from './themes/monokai-pro';
+import { moonlight } from './themes/moonlight';
+import { nord } from './themes/nord';
+import { relaxing } from './themes/relaxing';
+import { rosePine, rosePineMoon, rosePineDawn } from './themes/rose-pine';
+import { triangle } from './themes/triangle';
+
+// VSCode themes
+import { oneDarkPro } from './themes/one-dark-pro';
+import { materialPalenight } from './themes/material-palenight';
+import { materialOcean } from './themes/material-ocean';
+import { materialDarker } from './themes/material-darker';
+import { nightOwl, lightOwl } from './themes/night-owl';
+import { tokyoNight, tokyoNightStorm, tokyoNightDay } from './themes/tokyo-night';
+import { solarizedDark, solarizedLight } from './themes/solarized';
+import { ayuDark, ayuMirage, ayuLight } from './themes/ayu';
+import { synthwave84 } from './themes/synthwave-84';
+import { shadesOfPurple, shadesOfPurpleSuperDark } from './themes/shades-of-purple';
+import { cobalt2 } from './themes/cobalt2';
+import { horizon } from './themes/horizon';
+import { pandaSyntax } from './themes/panda';
+import { andromeda } from './themes/andromeda';
+import { winterIsComing } from './themes/winter-is-coming';
+import { atomOneDark } from './themes/atom-one-dark';
+import { vitesseDark, vitesseLight } from './themes/vitesse';
+import { everforestDark, everforestLight } from './themes/everforest';
+import { githubDarkDimmed } from './themes/github-dimmed';
+import { slackAubergine } from './themes/slack';
+import { noctisAzureus } from './themes/noctis';
+import { blulocoDark, blulocoLight } from './themes/bluloco';
+import { fleetLight, fleetDarkPurple, fleetDark } from './themes/fleet';
+
 export const plugin: PluginDefinition = {
   themes: [
-    {
-      id: 'high-contrast',
-      label: 'High Contrast Light',
-      dark: false,
-      base: {
-        surface: 'white',
-        surfaceHighlight: 'hsl(218,24%,93%)',
-        text: 'black',
-        textSubtle: 'hsl(217,24%,40%)',
-        textSubtlest: 'hsl(217,24%,40%)',
-        border: 'hsl(217,22%,50%)',
-        borderSubtle: 'hsl(217,22%,60%)',
-        primary: 'hsl(267,67%,47%)',
-        secondary: 'hsl(218,18%,53%)',
-        info: 'hsl(206,100%,36%)',
-        success: 'hsl(155,100%,26%)',
-        notice: 'hsl(45,100%,31%)',
-        warning: 'hsl(30,99%,34%)',
-        danger: 'hsl(334,100%,35%)',
-      },
-    },
-    {
-      id: 'high-contrast-dark',
-      label: 'High Contrast Dark',
-      dark: true,
-      base: {
-        surface: 'hsl(0,0%,0%)',
-        surfaceHighlight: 'hsl(0,0%,20%)',
-        text: 'hsl(0,0%,100%)',
-        textSubtle: 'hsl(0,0%,90%)',
-        textSubtlest: 'hsl(0,0%,80%)',
-        selection: 'hsl(276,100%,30%)',
-        surfaceActive: 'hsl(276,100%,30%)',
-        border: 'hsl(0,0%,60%)',
-        primary: 'hsl(266,100%,85%)',
-        secondary: 'hsl(242,20%,72%)',
-        info: 'hsl(208,100%,83%)',
-        success: 'hsl(150,100%,63%)',
-        notice: 'hsl(49,100%,77%)',
-        warning: 'hsl(28,100%,73%)',
-        danger: 'hsl(343,100%,79%)',
-      },
-    },
-    {
-      id: 'catppuccin-frappe',
-      label: 'Catppuccin Frappé',
-      dark: true,
-      base: {
-        surface: 'hsl(231,19%,20%)',
-        text: 'hsl(227,70%,87%)',
-        textSubtle: 'hsl(228,29%,73%)',
-        textSubtlest: 'hsl(227,17%,58%)',
-        primary: 'hsl(277,59%,76%)',
-        secondary: 'hsl(228,39%,80%)',
-        info: 'hsl(222,74%,74%)',
-        success: 'hsl(96,44%,68%)',
-        notice: 'hsl(40,62%,73%)',
-        warning: 'hsl(20,79%,70%)',
-        danger: 'hsl(359,68%,71%)',
-      },
-      components: {
-        dialog: {
-          surface: 'hsl(240,21%,12%)',
-        },
-        sidebar: {
-          surface: 'hsl(229,19%,23%)',
-          border: 'hsl(229,19%,27%)',
-        },
-        appHeader: {
-          surface: 'hsl(229,20%,17%)',
-          border: 'hsl(229,20%,25%)',
-        },
-        responsePane: {
-          surface: 'hsl(229,19%,23%)',
-          border: 'hsl(229,19%,27%)',
-        },
-        button: {
-          primary: 'hsl(277,59%,68%)',
-          secondary: 'hsl(228,39%,72%)',
-          info: 'hsl(222,74%,67%)',
-          success: 'hsl(96,44%,61%)',
-          notice: 'hsl(40,62%,66%)',
-          warning: 'hsl(20,79%,63%)',
-          danger: 'hsl(359,68%,64%)',
-        },
-      },
-    },
-    {
-      id: 'catppuccin-macchiato',
-      label: 'Catppuccin Macchiato',
-      dark: true,
-      base: {
-        surface: 'hsl(233,23%,15%)',
-        text: 'hsl(227,68%,88%)',
-        textSubtle: 'hsl(227,27%,72%)',
-        textSubtlest: 'hsl(228,15%,57%)',
-        primary: 'hsl(267,83%,80%)',
-        secondary: 'hsl(228,39%,80%)',
-        info: 'hsl(220,83%,75%)',
-        success: 'hsl(105,48%,72%)',
-        notice: 'hsl(40,70%,78%)',
-        warning: 'hsl(21,86%,73%)',
-        danger: 'hsl(351,74%,73%)',
-      },
-      components: {
-        dialog: {
-          surface: 'hsl(240,21%,12%)',
-        },
-        sidebar: {
-          surface: 'hsl(232,23%,18%)',
-          border: 'hsl(231,23%,22%)',
-        },
-        appHeader: {
-          surface: 'hsl(236,23%,12%)',
-          border: 'hsl(236,23%,21%)',
-        },
-        responsePane: {
-          surface: 'hsl(232,23%,18%)',
-          border: 'hsl(231,23%,22%)',
-        },
-        button: {
-          primary: 'hsl(267,82%,72%)',
-          secondary: 'hsl(228,39%,72%)',
-          info: 'hsl(220,83%,68%)',
-          success: 'hsl(105,48%,65%)',
-          notice: 'hsl(40,70%,70%)',
-          warning: 'hsl(21,86%,66%)',
-          danger: 'hsl(351,74%,66%)',
-        },
-      },
-    },
-    {
-      id: 'catppuccin-mocha',
-      label: 'Catppuccin Mocha',
-      dark: true,
-      base: {
-        surface: 'hsl(240,21%,12%)',
-        text: 'hsl(226,64%,88%)',
-        textSubtle: 'hsl(228,24%,72%)',
-        textSubtlest: 'hsl(230,13%,55%)',
-        primary: 'hsl(267,83%,80%)',
-        secondary: 'hsl(227,35%,80%)',
-        info: 'hsl(217,92%,76%)',
-        success: 'hsl(115,54%,76%)',
-        notice: 'hsl(41,86%,83%)',
-        warning: 'hsl(23,92%,75%)',
-        danger: 'hsl(343,81%,75%)',
-      },
-      components: {
-        dialog: {
-          surface: 'hsl(240,21%,12%)',
-        },
-        sidebar: {
-          surface: 'hsl(240,21%,15%)',
-          border: 'hsl(240,21%,19%)',
-        },
-        appHeader: {
-          surface: 'hsl(240,23%,9%)',
-          border: 'hsl(240,22%,18%)',
-        },
-        responsePane: {
-          surface: 'hsl(240,21%,15%)',
-          border: 'hsl(240,21%,19%)',
-        },
-        button: {
-          primary: 'hsl(267,67%,65%)',
-          secondary: 'hsl(227,28%,64%)',
-          info: 'hsl(217,74%,61%)',
-          success: 'hsl(115,43%,61%)',
-          notice: 'hsl(41,69%,66%)',
-          warning: 'hsl(23,74%,60%)',
-          danger: 'hsl(343,65%,60%)',
-        },
-      },
-    },
-    {
-      id: 'catppuccin-latte',
-      label: 'Catppuccin Latte',
-      dark: false,
-      base: {
-        surface: 'hsl(220,23%,95%)',
-        text: 'hsl(234,16%,35%)',
-        textSubtle: 'hsl(233,10%,47%)',
-        textSubtlest: 'hsl(231,10%,59%)',
-        primary: 'hsl(266,85%,58%)',
-        secondary: 'hsl(233,10%,47%)',
-        info: 'hsl(231,97%,72%)',
-        success: 'hsl(183,74%,35%)',
-        notice: 'hsl(35,77%,49%)',
-        warning: 'hsl(22,99%,52%)',
-        danger: 'hsl(355,76%,59%)',
-      },
-      components: {
-        sidebar: {
-          surface: 'hsl(220,22%,92%)',
-          border: 'hsl(220,22%,87%)',
-        },
-        appHeader: {
-          surface: 'hsl(220,21%,89%)',
-          border: 'hsl(220,22%,87%)',
-        },
-      },
-    },
-    {
-      id: 'dracula',
-      label: 'Dracula',
-      dark: true,
-      base: {
-        surface: 'hsl(231,15%,18%)',
-        surfaceHighlight: 'hsl(230,15%,24%)',
-        text: 'hsl(60,30%,96%)',
-        textSubtle: 'hsl(232,14%,65%)',
-        textSubtlest: 'hsl(232,14%,50%)',
-        primary: 'hsl(265,89%,78%)',
-        secondary: 'hsl(225,27%,51%)',
-        info: 'hsl(191,97%,77%)',
-        success: 'hsl(135,94%,65%)',
-        notice: 'hsl(65,92%,76%)',
-        warning: 'hsl(31,100%,71%)',
-        danger: 'hsl(0,100%,67%)',
-      },
-      components: {
-        sidebar: {
-          backdrop: 'hsl(230,15%,24%)',
-        },
-        appHeader: {
-          backdrop: 'hsl(235,14%,15%)',
-        },
-      },
-    },
-    {
-      id: 'github-dark',
-      label: 'GitHub',
-      dark: true,
-      base: {
-        surface: 'hsl(213,30%,7%)',
-        surfaceHighlight: 'hsl(213,16%,13%)',
-        text: 'hsl(212,27%,89%)',
-        textSubtle: 'hsl(212,9%,57%)',
-        textSubtlest: 'hsl(217,8%,45%)',
-        border: 'hsl(215,21%,11%)',
-        primary: 'hsl(262,78%,74%)',
-        secondary: 'hsl(217,8%,50%)',
-        info: 'hsl(215,84%,64%)',
-        success: 'hsl(129,48%,52%)',
-        notice: 'hsl(39,71%,58%)',
-        warning: 'hsl(22,83%,60%)',
-        danger: 'hsl(3,83%,65%)',
-      },
-      components: {
-        button: {
-          primary: 'hsl(262,79%,71%)',
-          secondary: 'hsl(217,8%,45%)',
-          info: 'hsl(215,84%,60%)',
-          success: 'hsl(129,48%,47%)',
-          notice: 'hsl(39,71%,53%)',
-          warning: 'hsl(22,83%,56%)',
-          danger: 'hsl(3,83%,61%)',
-        },
-      },
-    },
-    {
-      id: 'github-light',
-      label: 'GitHub',
-      dark: false,
-      base: {
-        surface: 'hsl(0,0%,100%)',
-        surfaceHighlight: 'hsl(210,29%,94%)',
-        text: 'hsl(213,13%,14%)',
-        textSubtle: 'hsl(212,9%,43%)',
-        textSubtlest: 'hsl(203,8%,55%)',
-        border: 'hsl(210,15%,92%)',
-        borderSubtle: 'hsl(210,15%,92%)',
-        primary: 'hsl(261,69%,59%)',
-        secondary: 'hsl(212,8%,47%)',
-        info: 'hsl(212,92%,48%)',
-        success: 'hsl(137,66%,32%)',
-        notice: 'hsl(40,100%,40%)',
-        warning: 'hsl(24,100%,44%)',
-        danger: 'hsl(356,71%,48%)',
-      },
-    },
-    {
-      id: 'gruvbox',
-      label: 'Gruvbox',
-      dark: true,
-      base: {
-        surface: 'hsl(0,0%,16%)',
-        surfaceHighlight: 'hsl(20,3%,19%)',
-        text: 'hsl(53,74%,91%)',
-        textSubtle: 'hsl(39,24%,66%)',
-        textSubtlest: 'hsl(30,12%,51%)',
-        primary: 'hsl(344,47%,68%)',
-        secondary: 'hsl(157,16%,58%)',
-        info: 'hsl(104,35%,62%)',
-        success: 'hsl(61,66%,44%)',
-        notice: 'hsl(42,95%,58%)',
-        warning: 'hsl(27,99%,55%)',
-        danger: 'hsl(6,96%,59%)',
-      },
-    },
-    {
-      id: 'hotdog-stand',
-      label: 'Hotdog Stand',
-      dark: true,
-      base: {
-        surface: 'hsl(0,100%,50%)',
-        surfaceHighlight: 'hsl(0,0%,0%)',
-        text: 'hsl(0,0%,100%)',
-        textSubtle: 'hsl(0,0%,100%)',
-        textSubtlest: 'hsl(60,100%,50%)',
-        border: 'hsl(0,0%,0%)',
-        primary: 'hsl(60,100%,50%)',
-        secondary: 'hsl(60,100%,50%)',
-        info: 'hsl(60,100%,50%)',
-        success: 'hsl(60,100%,50%)',
-        notice: 'hsl(60,100%,50%)',
-        warning: 'hsl(60,100%,50%)',
-        danger: 'hsl(60,100%,50%)',
-      },
-      components: {
-        appHeader: {
-          surface: 'hsl(0,0%,0%)',
-          text: 'hsl(0,0%,100%)',
-          textSubtle: 'hsl(60,100%,50%)',
-          textSubtlest: 'hsl(0,100%,50%)',
-        },
-        menu: {
-          surface: 'hsl(0,0%,0%)',
-          border: 'hsl(0,100%,50%)',
-          surfaceHighlight: 'hsl(0,100%,50%)',
-          text: 'hsl(0,0%,100%)',
-          textSubtle: 'hsl(60,100%,50%)',
-          textSubtlest: 'hsl(60,100%,50%)',
-        },
-        button: {
-          surface: 'hsl(0,0%,0%)',
-          text: 'hsl(0,0%,100%)',
-          primary: 'hsl(0,0%,0%)',
-          secondary: 'hsl(0,0%,100%)',
-          info: 'hsl(0,0%,0%)',
-          success: 'hsl(60,100%,50%)',
-          notice: 'hsl(60,100%,50%)',
-          warning: 'hsl(0,0%,0%)',
-          danger: 'hsl(0,100%,50%)',
-        },
-        editor: {
-          primary: 'hsl(0,0%,100%)',
-          secondary: 'hsl(0,0%,100%)',
-          info: 'hsl(0,0%,100%)',
-          success: 'hsl(0,0%,100%)',
-          notice: 'hsl(60,100%,50%)',
-          warning: 'hsl(0,0%,100%)',
-          danger: 'hsl(0,0%,100%)',
-        },
-      },
-    },
-    {
-      id: 'monokai-pro',
-      label: 'Monokai Pro',
-      dark: true,
-      base: {
-        surface: 'hsl(285,5%,17%)',
-        text: 'hsl(60,25%,98%)',
-        textSubtle: 'hsl(0,1%,75%)',
-        textSubtlest: 'hsl(300,0%,57%)',
-        primary: 'hsl(250,77%,78%)',
-        secondary: 'hsl(0,1%,75%)',
-        info: 'hsl(186,71%,69%)',
-        success: 'hsl(90,59%,66%)',
-        notice: 'hsl(45,100%,70%)',
-        warning: 'hsl(20,96%,70%)',
-        danger: 'hsl(345,100%,69%)',
-      },
-      components: {
-        appHeader: {
-          surface: 'hsl(300,5%,13%)',
-          text: 'hsl(0,1%,75%)',
-          textSubtle: 'hsl(300,0%,57%)',
-          textSubtlest: 'hsl(300,1%,44%)',
-        },
-        button: {
-          primary: 'hsl(250,77%,70%)',
-          secondary: 'hsl(0,1%,68%)',
-          info: 'hsl(186,71%,62%)',
-          success: 'hsl(90,59%,59%)',
-          notice: 'hsl(45,100%,63%)',
-          warning: 'hsl(20,96%,63%)',
-          danger: 'hsl(345,100%,62%)',
-        },
-      },
-    },
-    {
-      id: 'monokai-pro-classic',
-      label: 'Monokai Pro Classic',
-      dark: true,
-      base: {
-        surface: 'hsl(70,8%,15%)',
-        text: 'hsl(69,100%,97%)',
-        textSubtle: 'hsl(65,9%,73%)',
-        textSubtlest: 'hsl(66,4%,55%)',
-        primary: 'hsl(261,100%,75%)',
-        secondary: 'hsl(202,8%,72%)',
-        info: 'hsl(190,81%,67%)',
-        success: 'hsl(80,76%,53%)',
-        notice: 'hsl(54,70%,68%)',
-        warning: 'hsl(32,98%,56%)',
-        danger: 'hsl(338,95%,56%)',
-      },
-      components: {
-        appHeader: {
-          surface: 'hsl(72,9%,11%)',
-          text: 'hsl(202,8%,72%)',
-          textSubtle: 'hsl(213,4%,48%)',
-          textSubtlest: 'hsl(223,6%,44%)',
-        },
-        button: {
-          primary: 'hsl(261,100%,68%)',
-          secondary: 'hsl(202,8%,65%)',
-          info: 'hsl(190,81%,60%)',
-          success: 'hsl(80,76%,48%)',
-          notice: 'hsl(54,71%,61%)',
-          warning: 'hsl(32,98%,50%)',
-          danger: 'hsl(338,95%,50%)',
-        },
-      },
-    },
-    {
-      id: 'monokai-pro-machine',
-      label: 'Monokai Pro Machine',
-      dark: true,
-      base: {
-        surface: 'hsl(200,16%,18%)',
-        text: 'hsl(173,24%,93%)',
-        textSubtle: 'hsl(185,6%,57%)',
-        textSubtlest: 'hsl(189,6%,45%)',
-        primary: 'hsl(258,86%,80%)',
-        secondary: 'hsl(175,9%,75%)',
-        info: 'hsl(194,81%,72%)',
-        success: 'hsl(98,67%,69%)',
-        notice: 'hsl(52,100%,72%)',
-        warning: 'hsl(28,100%,72%)',
-        danger: 'hsl(353,100%,71%)',
-      },
-      components: {
-        appHeader: {
-          surface: 'hsl(196,16%,14%)',
-          text: 'hsl(202,8%,72%)',
-          textSubtle: 'hsl(213,4%,48%)',
-          textSubtlest: 'hsl(223,6%,44%)',
-        },
-        button: {
-          primary: 'hsl(258,86%,72%)',
-          secondary: 'hsl(175,9%,68%)',
-          info: 'hsl(194,80%,65%)',
-          success: 'hsl(98,67%,62%)',
-          notice: 'hsl(52,100%,65%)',
-          warning: 'hsl(28,100%,65%)',
-          danger: 'hsl(353,100%,64%)',
-        },
-      },
-    },
-    {
-      id: 'monokai-pro-octagon',
-      label: 'Monokai Pro Octagon',
-      dark: true,
-      base: {
-        surface: 'hsl(233,18%,19%)',
-        text: 'hsl(173,24%,93%)',
-        textSubtle: 'hsl(202,8%,72%)',
-        textSubtlest: 'hsl(213,4%,48%)',
-        primary: 'hsl(292,30%,70%)',
-        secondary: 'hsl(202,8%,72%)',
-        info: 'hsl(155,37%,72%)',
-        success: 'hsl(75,60%,61%)',
-        notice: 'hsl(44,100%,71%)',
-        warning: 'hsl(23,100%,68%)',
-        danger: 'hsl(352,100%,70%)',
-      },
-      components: {
-        appHeader: {
-          surface: 'hsl(235,18%,14%)',
-          text: 'hsl(202,8%,72%)',
-          textSubtle: 'hsl(213,4%,48%)',
-          textSubtlest: 'hsl(223,6%,44%)',
-        },
-        button: {
-          primary: 'hsl(292,26%,63%)',
-          secondary: 'hsl(201,7%,65%)',
-          info: 'hsl(155,33%,65%)',
-          success: 'hsl(75,54%,55%)',
-          notice: 'hsl(44,90%,64%)',
-          warning: 'hsl(23,90%,61%)',
-          danger: 'hsl(352,90%,63%)',
-        },
-      },
-    },
-    {
-      id: 'monokai-pro-ristretto',
-      label: 'Monokai Pro Ristretto',
-      dark: true,
-      base: {
-        surface: 'hsl(0,9%,16%)',
-        text: 'hsl(351,100%,97%)',
-        textSubtle: 'hsl(355,9%,74%)',
-        textSubtlest: 'hsl(354,4%,56%)',
-        primary: 'hsl(239,63%,79%)',
-        secondary: 'hsl(355,9%,74%)',
-        info: 'hsl(170,53%,69%)',
-        success: 'hsl(88,57%,66%)',
-        notice: 'hsl(41,92%,70%)',
-        warning: 'hsl(13,85%,70%)',
-        danger: 'hsl(349,97%,70%)',
-      },
-      components: {
-        appHeader: {
-          surface: 'hsl(0,8%,12%)',
-          text: 'hsl(355,9%,74%)',
-          textSubtle: 'hsl(354,4%,56%)',
-          textSubtlest: 'hsl(353,4%,43%)',
-        },
-        button: {
-          primary: 'hsl(239,63%,71%)',
-          secondary: 'hsl(355,9%,67%)',
-          info: 'hsl(170,53%,62%)',
-          success: 'hsl(88,57%,59%)',
-          notice: 'hsl(41,92%,63%)',
-          warning: 'hsl(13,86%,63%)',
-          danger: 'hsl(349,97%,63%)',
-        },
-      },
-    },
-    {
-      id: 'monokai-pro-spectrum',
-      label: 'Monokai Pro Spectrum',
-      dark: true,
-      base: {
-        surface: 'hsl(0,0%,13%)',
-        text: 'hsl(266,100%,97%)',
-        textSubtle: 'hsl(264,7%,73%)',
-        textSubtlest: 'hsl(266,3%,55%)',
-        primary: 'hsl(247,61%,72%)',
-        secondary: 'hsl(264,7%,73%)',
-        info: 'hsl(188,74%,63%)',
-        success: 'hsl(133,54%,66%)',
-        notice: 'hsl(51,96%,69%)',
-        warning: 'hsl(23,98%,66%)',
-        danger: 'hsl(343,96%,68%)',
-      },
-      components: {
-        appHeader: {
-          surface: 'hsl(0,0%,10%)',
-          text: 'hsl(264,7%,73%)',
-          textSubtle: 'hsl(266,3%,55%)',
-          textSubtlest: 'hsl(264,2%,41%)',
-        },
-        button: {
-          primary: 'hsl(247,61%,65%)',
-          secondary: 'hsl(264,7%,66%)',
-          info: 'hsl(188,74%,57%)',
-          success: 'hsl(133,54%,59%)',
-          notice: 'hsl(51,96%,62%)',
-          warning: 'hsl(23,98%,59%)',
-          danger: 'hsl(343,96%,61%)',
-        },
-      },
-    },
-    {
-      id: 'moonlight',
-      label: 'Moonlight',
-      dark: true,
-      base: {
-        surface: 'hsl(234,23%,17%)',
-        text: 'hsl(225,71%,90%)',
-        textSubtle: 'hsl(230,28%,62%)',
-        textSubtlest: 'hsl(232,26%,43%)',
-        primary: 'hsl(262,100%,82%)',
-        secondary: 'hsl(232,18%,65%)',
-        info: 'hsl(217,100%,74%)',
-        success: 'hsl(174,66%,54%)',
-        notice: 'hsl(35,100%,73%)',
-        warning: 'hsl(17,100%,71%)',
-        danger: 'hsl(356,100%,73%)',
-      },
-      components: {
-        appHeader: {
-          surface: 'hsl(233,23%,15%)',
-        },
-        sidebar: {
-          surface: 'hsl(233,23%,15%)',
-        },
-      },
-    },
-    {
-      id: 'nord',
-      label: 'Nord',
-      dark: true,
-      base: {
-        surface: 'hsl(220,16%,22%)',
-        surfaceHighlight: 'hsl(220,14%,28%)',
-        text: 'hsl(220,28%,93%)',
-        textSubtle: 'hsl(220,26%,90%)',
-        textSubtlest: 'hsl(220,24%,86%)',
-        primary: 'hsl(193,38%,68%)',
-        secondary: 'hsl(210,34%,63%)',
-        info: 'hsl(174,25%,69%)',
-        success: 'hsl(89,26%,66%)',
-        notice: 'hsl(40,66%,73%)',
-        warning: 'hsl(17,48%,64%)',
-        danger: 'hsl(353,43%,56%)',
-      },
-      components: {
-        sidebar: {
-          backdrop: 'hsl(220,16%,22%)',
-        },
-        appHeader: {
-          backdrop: 'hsl(220,14%,28%)',
-        },
-      },
-    },
-    {
-      id: 'relaxing',
-      label: 'Relaxing',
-      dark: true,
-      base: {
-        surface: 'hsl(267,33%,17%)',
-        text: 'hsl(275,49%,92%)',
-        primary: 'hsl(267,84%,81%)',
-        secondary: 'hsl(227,35%,80%)',
-        info: 'hsl(217,92%,76%)',
-        success: 'hsl(115,54%,76%)',
-        notice: 'hsl(41,86%,83%)',
-        warning: 'hsl(23,92%,75%)',
-        danger: 'hsl(343,81%,75%)',
-      },
-    },
-    {
-      id: 'rose-pine',
-      label: 'Rosé Pine',
-      dark: true,
-      base: {
-        surface: 'hsl(249,22%,12%)',
-        text: 'hsl(245,50%,91%)',
-        textSubtle: 'hsl(248,15%,61%)',
-        textSubtlest: 'hsl(249,12%,47%)',
-        primary: 'hsl(267,57%,78%)',
-        secondary: 'hsl(249,12%,47%)',
-        info: 'hsl(199,49%,60%)',
-        success: 'hsl(180,43%,73%)',
-        notice: 'hsl(35,88%,72%)',
-        warning: 'hsl(1,74%,79%)',
-        danger: 'hsl(343,76%,68%)',
-      },
-      components: {
-        responsePane: {
-          surface: 'hsl(247,23%,15%)',
-        },
-        sidebar: {
-          surface: 'hsl(247,23%,15%)',
-        },
-        menu: {
-          surface: 'hsl(248,21%,26%)',
-          textSubtle: 'hsl(248,15%,66%)',
-          textSubtlest: 'hsl(249,12%,52%)',
-          border: 'hsl(248,21%,35%)',
-          borderSubtle: 'hsl(248,21%,33%)',
-        },
-      },
-    },
-    {
-      id: 'rose-pine-moon',
-      label: 'Rosé Pine Moon',
-      dark: true,
-      base: {
-        surface: 'hsl(246,24%,17%)',
-        text: 'hsl(245,50%,91%)',
-        textSubtle: 'hsl(248,15%,61%)',
-        textSubtlest: 'hsl(249,12%,47%)',
-        primary: 'hsl(267,57%,78%)',
-        secondary: 'hsl(248,15%,61%)',
-        info: 'hsl(197,48%,60%)',
-        success: 'hsl(197,48%,60%)',
-        notice: 'hsl(35,88%,72%)',
-        warning: 'hsl(2,66%,75%)',
-        danger: 'hsl(343,76%,68%)',
-      },
-      components: {
-        responsePane: {
-          surface: 'hsl(247,24%,20%)',
-        },
-        sidebar: {
-          surface: 'hsl(247,24%,20%)',
-        },
-        menu: {
-          surface: 'hsl(248,21%,26%)',
-          textSubtle: 'hsl(248,15%,61%)',
-          textSubtlest: 'hsl(249,12%,55%)',
-          border: 'hsl(248,21%,35%)',
-          borderSubtle: 'hsl(248,21%,31%)',
-        },
-      },
-    },
-    {
-      id: 'rose-pine-dawn',
-      label: 'Rosé Pine Dawn',
-      dark: false,
-      base: {
-        surface: 'hsl(32,57%,95%)',
-        border: 'hsl(10,9%,86%)',
-        surfaceHighlight: 'hsl(25,35%,93%)',
-        text: 'hsl(248,19%,40%)',
-        textSubtle: 'hsl(248,12%,52%)',
-        textSubtlest: 'hsl(257,9%,61%)',
-        primary: 'hsl(271,27%,56%)',
-        secondary: 'hsl(249,12%,47%)',
-        info: 'hsl(197,52%,36%)',
-        success: 'hsl(188,31%,45%)',
-        notice: 'hsl(34,64%,49%)',
-        warning: 'hsl(2,47%,64%)',
-        danger: 'hsl(343,35%,55%)',
-      },
-      components: {
-        responsePane: {
-          border: 'hsl(20,12%,90%)',
-        },
-        sidebar: {
-          border: 'hsl(20,12%,90%)',
-        },
-        appHeader: {
-          border: 'hsl(20,12%,90%)',
-        },
-        input: {
-          border: 'hsl(10,9%,86%)',
-        },
-        dialog: {
-          border: 'hsl(20,12%,90%)',
-        },
-        menu: {
-          surface: 'hsl(28,40%,92%)',
-          border: 'hsl(10,9%,86%)',
-        },
-      },
-    },
-    {
-      id: 'triangle',
-      dark: true,
-      label: 'Triangle',
-      base: {
-        surface: 'rgb(0,0,0)',
-        surfaceHighlight: 'rgb(21,21,21)',
-        surfaceActive: 'rgb(31,31,31)',
-        text: 'rgb(237,237,237)',
-        textSubtle: 'rgb(161,161,161)',
-        textSubtlest: 'rgb(115,115,115)',
-        border: 'rgb(31,31,31)',
-        primary: 'rgb(196,114,251)',
-        secondary: 'rgb(161,161,161)',
-        info: 'rgb(71,168,255)',
-        success: 'rgb(0,202,81)',
-        notice: 'rgb(255,175,0)',
-        warning: '#FF4C8D',
-        danger: '#fd495a',
-      },
-      components: {
-        editor: {
-          danger: '#FF4C8D',
-          warning: '#fd495a',
-        },
-        dialog: {
-          surface: 'rgb(10,10,10)',
-          border: 'rgb(31,31,31)',
-        },
-        sidebar: {
-          border: 'rgb(31,31,31)',
-        },
-        responsePane: {
-          surface: 'rgb(10,10,10)',
-          border: 'rgb(31,31,31)',
-        },
-        appHeader: {
-          surface: 'rgb(10,10,10)',
-          border: 'rgb(31,31,31)',
-        },
-      },
-    },
+    andromeda,
+    atomOneDark,
+    ayuDark,
+    ayuLight,
+    ayuMirage,
+    blulocoDark,
+    blulocoLight,
+    catppuccinFrappe,
+    catppuccinLatte,
+    catppuccinMacchiato,
+    catppuccinMocha,
+    cobalt2,
+    dracula,
+    everforestDark,
+    everforestLight,
+    fleetDark,
+    fleetDarkPurple,
+    fleetLight,
+    githubDark,
+    githubDarkDimmed,
+    githubLight,
+    gruvbox,
+    highContrast,
+    highContrastDark,
+    horizon,
+    hotdogStand,
+    lightOwl,
+    materialDarker,
+    materialOcean,
+    materialPalenight,
+    monokaiPro,
+    monokaiProClassic,
+    monokaiProMachine,
+    monokaiProOctagon,
+    monokaiProRistretto,
+    monokaiProSpectrum,
+    moonlight,
+    nightOwl,
+    noctisAzureus,
+    nord,
+    oneDarkPro,
+    pandaSyntax,
+    relaxing,
+    rosePine,
+    rosePineDawn,
+    rosePineMoon,
+    shadesOfPurple,
+    shadesOfPurpleSuperDark,
+    slackAubergine,
+    solarizedDark,
+    solarizedLight,
+    synthwave84,
+    tokyoNight,
+    tokyoNightDay,
+    tokyoNightStorm,
+    triangle,
+    vitesseDark,
+    vitesseLight,
+    winterIsComing,
   ],
 };

plugins/themes-yaak/src/themes/andromeda.ts

@@ -0,0 +1,47 @@
+import type { Theme } from '@yaakapp/api';
+
+export const andromeda: Theme = {
+  id: 'andromeda',
+  label: 'Andromeda',
+  dark: true,
+  base: {
+    surface: 'hsl(251, 25%, 15%)',
+    surfaceHighlight: 'hsl(251, 22%, 20%)',
+    text: 'hsl(220, 10%, 85%)',
+    textSubtle: 'hsl(220, 8%, 60%)',
+    textSubtlest: 'hsl(220, 6%, 45%)',
+    primary: 'hsl(293, 75%, 68%)',
+    secondary: 'hsl(220, 8%, 60%)',
+    info: 'hsl(180, 60%, 60%)',
+    success: 'hsl(85, 60%, 55%)',
+    notice: 'hsl(38, 100%, 65%)',
+    warning: 'hsl(25, 95%, 60%)',
+    danger: 'hsl(358, 80%, 60%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(251, 25%, 12%)',
+    },
+    sidebar: {
+      surface: 'hsl(251, 23%, 13%)',
+      border: 'hsl(251, 20%, 18%)',
+    },
+    appHeader: {
+      surface: 'hsl(251, 25%, 11%)',
+      border: 'hsl(251, 20%, 16%)',
+    },
+    responsePane: {
+      surface: 'hsl(251, 23%, 13%)',
+      border: 'hsl(251, 20%, 18%)',
+    },
+    button: {
+      primary: 'hsl(293, 75%, 61%)',
+      secondary: 'hsl(220, 8%, 53%)',
+      info: 'hsl(180, 60%, 53%)',
+      success: 'hsl(85, 60%, 48%)',
+      notice: 'hsl(38, 100%, 58%)',
+      warning: 'hsl(25, 95%, 53%)',
+      danger: 'hsl(358, 80%, 53%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/atom-one-dark.ts

@@ -0,0 +1,47 @@
+import type { Theme } from '@yaakapp/api';
+
+export const atomOneDark: Theme = {
+  id: 'atom-one-dark',
+  label: 'Atom One Dark',
+  dark: true,
+  base: {
+    surface: 'hsl(220, 13%, 18%)',
+    surfaceHighlight: 'hsl(219, 13%, 22%)',
+    text: 'hsl(219, 14%, 71%)',
+    textSubtle: 'hsl(220, 9%, 55%)',
+    textSubtlest: 'hsl(220, 8%, 45%)',
+    primary: 'hsl(286, 60%, 67%)',
+    secondary: 'hsl(220, 9%, 55%)',
+    info: 'hsl(207, 82%, 66%)',
+    success: 'hsl(95, 38%, 62%)',
+    notice: 'hsl(39, 67%, 69%)',
+    warning: 'hsl(29, 54%, 61%)',
+    danger: 'hsl(355, 65%, 65%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(220, 13%, 14%)',
+    },
+    sidebar: {
+      surface: 'hsl(220, 13%, 16%)',
+      border: 'hsl(220, 13%, 20%)',
+    },
+    appHeader: {
+      surface: 'hsl(220, 13%, 12%)',
+      border: 'hsl(220, 13%, 18%)',
+    },
+    responsePane: {
+      surface: 'hsl(220, 13%, 16%)',
+      border: 'hsl(220, 13%, 20%)',
+    },
+    button: {
+      primary: 'hsl(286, 60%, 60%)',
+      secondary: 'hsl(220, 9%, 48%)',
+      info: 'hsl(207, 82%, 59%)',
+      success: 'hsl(95, 38%, 55%)',
+      notice: 'hsl(39, 67%, 62%)',
+      warning: 'hsl(29, 54%, 54%)',
+      danger: 'hsl(355, 65%, 58%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/ayu.ts

@@ -0,0 +1,122 @@
+import type { Theme } from '@yaakapp/api';
+
+export const ayuDark: Theme = {
+  id: 'ayu-dark',
+  label: 'Ayu Dark',
+  dark: true,
+  base: {
+    surface: 'hsl(220, 25%, 10%)',
+    surfaceHighlight: 'hsl(220, 20%, 15%)',
+    text: 'hsl(210, 22%, 78%)',
+    textSubtle: 'hsl(40, 13%, 50%)',
+    textSubtlest: 'hsl(220, 10%, 40%)',
+    primary: 'hsl(38, 100%, 56%)',
+    secondary: 'hsl(210, 15%, 55%)',
+    info: 'hsl(200, 80%, 60%)',
+    success: 'hsl(100, 75%, 60%)',
+    notice: 'hsl(38, 100%, 56%)',
+    warning: 'hsl(25, 100%, 60%)',
+    danger: 'hsl(345, 80%, 60%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(220, 25%, 8%)',
+    },
+    sidebar: {
+      surface: 'hsl(220, 22%, 12%)',
+      border: 'hsl(220, 20%, 16%)',
+    },
+    appHeader: {
+      surface: 'hsl(220, 25%, 7%)',
+      border: 'hsl(220, 20%, 13%)',
+    },
+    responsePane: {
+      surface: 'hsl(220, 22%, 12%)',
+      border: 'hsl(220, 20%, 16%)',
+    },
+    button: {
+      primary: 'hsl(38, 100%, 50%)',
+      secondary: 'hsl(210, 15%, 48%)',
+      info: 'hsl(200, 80%, 53%)',
+      success: 'hsl(100, 75%, 53%)',
+      notice: 'hsl(38, 100%, 50%)',
+      warning: 'hsl(25, 100%, 53%)',
+      danger: 'hsl(345, 80%, 53%)',
+    },
+  },
+};
+
+export const ayuMirage: Theme = {
+  id: 'ayu-mirage',
+  label: 'Ayu Mirage',
+  dark: true,
+  base: {
+    surface: 'hsl(226, 23%, 17%)',
+    surfaceHighlight: 'hsl(226, 20%, 22%)',
+    text: 'hsl(212, 15%, 81%)',
+    textSubtle: 'hsl(212, 12%, 55%)',
+    textSubtlest: 'hsl(212, 10%, 45%)',
+    primary: 'hsl(38, 100%, 67%)',
+    secondary: 'hsl(212, 12%, 55%)',
+    info: 'hsl(200, 80%, 70%)',
+    success: 'hsl(100, 50%, 68%)',
+    notice: 'hsl(38, 100%, 67%)',
+    warning: 'hsl(25, 100%, 70%)',
+    danger: 'hsl(345, 80%, 70%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(226, 23%, 14%)',
+    },
+    sidebar: {
+      surface: 'hsl(226, 22%, 15%)',
+      border: 'hsl(226, 20%, 20%)',
+    },
+    appHeader: {
+      surface: 'hsl(226, 23%, 12%)',
+      border: 'hsl(226, 20%, 17%)',
+    },
+    responsePane: {
+      surface: 'hsl(226, 22%, 15%)',
+      border: 'hsl(226, 20%, 20%)',
+    },
+    button: {
+      primary: 'hsl(38, 100%, 60%)',
+      info: 'hsl(200, 80%, 63%)',
+      success: 'hsl(100, 50%, 61%)',
+      notice: 'hsl(38, 100%, 60%)',
+      warning: 'hsl(25, 100%, 63%)',
+      danger: 'hsl(345, 80%, 63%)',
+    },
+  },
+};
+
+export const ayuLight: Theme = {
+  id: 'ayu-light',
+  label: 'Ayu Light',
+  dark: false,
+  base: {
+    surface: 'hsl(40, 22%, 97%)',
+    surfaceHighlight: 'hsl(40, 20%, 93%)',
+    text: 'hsl(214, 10%, 35%)',
+    textSubtle: 'hsl(214, 8%, 50%)',
+    textSubtlest: 'hsl(214, 6%, 60%)',
+    primary: 'hsl(35, 100%, 45%)',
+    secondary: 'hsl(214, 8%, 50%)',
+    info: 'hsl(200, 75%, 45%)',
+    success: 'hsl(100, 60%, 40%)',
+    notice: 'hsl(35, 100%, 45%)',
+    warning: 'hsl(22, 100%, 50%)',
+    danger: 'hsl(345, 70%, 55%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(40, 20%, 95%)',
+      border: 'hsl(40, 15%, 90%)',
+    },
+    appHeader: {
+      surface: 'hsl(40, 20%, 93%)',
+      border: 'hsl(40, 15%, 88%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/bluloco.ts

@@ -0,0 +1,77 @@
+import type { Theme } from '@yaakapp/api';
+
+export const blulocoDark: Theme = {
+  id: 'bluloco-dark',
+  label: 'Bluloco Dark',
+  dark: true,
+  base: {
+    surface: 'hsl(230, 20%, 14%)',
+    surfaceHighlight: 'hsl(230, 17%, 19%)',
+    text: 'hsl(220, 15%, 80%)',
+    textSubtle: 'hsl(220, 10%, 55%)',
+    textSubtlest: 'hsl(220, 8%, 42%)',
+    primary: 'hsl(218, 85%, 65%)',
+    secondary: 'hsl(220, 10%, 55%)',
+    info: 'hsl(218, 85%, 65%)',
+    success: 'hsl(95, 55%, 55%)',
+    notice: 'hsl(37, 90%, 60%)',
+    warning: 'hsl(22, 85%, 55%)',
+    danger: 'hsl(355, 75%, 60%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(230, 20%, 11%)',
+    },
+    sidebar: {
+      surface: 'hsl(230, 18%, 12%)',
+      border: 'hsl(230, 16%, 17%)',
+    },
+    appHeader: {
+      surface: 'hsl(230, 20%, 10%)',
+      border: 'hsl(230, 16%, 15%)',
+    },
+    responsePane: {
+      surface: 'hsl(230, 18%, 12%)',
+      border: 'hsl(230, 16%, 17%)',
+    },
+    button: {
+      primary: 'hsl(218, 85%, 58%)',
+      secondary: 'hsl(220, 10%, 48%)',
+      info: 'hsl(218, 85%, 58%)',
+      success: 'hsl(95, 55%, 48%)',
+      notice: 'hsl(37, 90%, 53%)',
+      warning: 'hsl(22, 85%, 48%)',
+      danger: 'hsl(355, 75%, 53%)',
+    },
+  },
+};
+
+export const blulocoLight: Theme = {
+  id: 'bluloco-light',
+  label: 'Bluloco Light',
+  dark: false,
+  base: {
+    surface: 'hsl(0, 0%, 98%)',
+    surfaceHighlight: 'hsl(220, 15%, 94%)',
+    text: 'hsl(228, 18%, 30%)',
+    textSubtle: 'hsl(228, 10%, 48%)',
+    textSubtlest: 'hsl(228, 8%, 58%)',
+    primary: 'hsl(218, 80%, 48%)',
+    secondary: 'hsl(228, 10%, 48%)',
+    info: 'hsl(218, 80%, 48%)',
+    success: 'hsl(138, 55%, 40%)',
+    notice: 'hsl(35, 85%, 45%)',
+    warning: 'hsl(22, 80%, 48%)',
+    danger: 'hsl(355, 70%, 48%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(220, 15%, 96%)',
+      border: 'hsl(220, 12%, 90%)',
+    },
+    appHeader: {
+      surface: 'hsl(220, 15%, 94%)',
+      border: 'hsl(220, 12%, 88%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/catppuccin.ts

@@ -0,0 +1,165 @@
+import type { Theme } from '@yaakapp/api';
+
+export const catppuccinFrappe: Theme = {
+  id: 'catppuccin-frappe',
+  label: 'Catppuccin Frappé',
+  dark: true,
+  base: {
+    surface: 'hsl(231,19%,20%)',
+    text: 'hsl(227,70%,87%)',
+    textSubtle: 'hsl(228,29%,73%)',
+    textSubtlest: 'hsl(227,17%,58%)',
+    primary: 'hsl(277,59%,76%)',
+    secondary: 'hsl(228,39%,80%)',
+    info: 'hsl(222,74%,74%)',
+    success: 'hsl(96,44%,68%)',
+    notice: 'hsl(40,62%,73%)',
+    warning: 'hsl(20,79%,70%)',
+    danger: 'hsl(359,68%,71%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(240,21%,12%)',
+    },
+    sidebar: {
+      surface: 'hsl(229,19%,23%)',
+      border: 'hsl(229,19%,27%)',
+    },
+    appHeader: {
+      surface: 'hsl(229,20%,17%)',
+      border: 'hsl(229,20%,25%)',
+    },
+    responsePane: {
+      surface: 'hsl(229,19%,23%)',
+      border: 'hsl(229,19%,27%)',
+    },
+    button: {
+      primary: 'hsl(277,59%,68%)',
+      secondary: 'hsl(228,39%,72%)',
+      info: 'hsl(222,74%,67%)',
+      success: 'hsl(96,44%,61%)',
+      notice: 'hsl(40,62%,66%)',
+      warning: 'hsl(20,79%,63%)',
+      danger: 'hsl(359,68%,64%)',
+    },
+  },
+};
+
+export const catppuccinMacchiato: Theme = {
+  id: 'catppuccin-macchiato',
+  label: 'Catppuccin Macchiato',
+  dark: true,
+  base: {
+    surface: 'hsl(233,23%,15%)',
+    text: 'hsl(227,68%,88%)',
+    textSubtle: 'hsl(227,27%,72%)',
+    textSubtlest: 'hsl(228,15%,57%)',
+    primary: 'hsl(267,83%,80%)',
+    secondary: 'hsl(228,39%,80%)',
+    info: 'hsl(220,83%,75%)',
+    success: 'hsl(105,48%,72%)',
+    notice: 'hsl(40,70%,78%)',
+    warning: 'hsl(21,86%,73%)',
+    danger: 'hsl(351,74%,73%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(240,21%,12%)',
+    },
+    sidebar: {
+      surface: 'hsl(232,23%,18%)',
+      border: 'hsl(231,23%,22%)',
+    },
+    appHeader: {
+      surface: 'hsl(236,23%,12%)',
+      border: 'hsl(236,23%,21%)',
+    },
+    responsePane: {
+      surface: 'hsl(232,23%,18%)',
+      border: 'hsl(231,23%,22%)',
+    },
+    button: {
+      primary: 'hsl(267,82%,72%)',
+      secondary: 'hsl(228,39%,72%)',
+      info: 'hsl(220,83%,68%)',
+      success: 'hsl(105,48%,65%)',
+      notice: 'hsl(40,70%,70%)',
+      warning: 'hsl(21,86%,66%)',
+      danger: 'hsl(351,74%,66%)',
+    },
+  },
+};
+
+export const catppuccinMocha: Theme = {
+  id: 'catppuccin-mocha',
+  label: 'Catppuccin Mocha',
+  dark: true,
+  base: {
+    surface: 'hsl(240,21%,12%)',
+    text: 'hsl(226,64%,88%)',
+    textSubtle: 'hsl(228,24%,72%)',
+    textSubtlest: 'hsl(230,13%,55%)',
+    primary: 'hsl(267,83%,80%)',
+    secondary: 'hsl(227,35%,80%)',
+    info: 'hsl(217,92%,76%)',
+    success: 'hsl(115,54%,76%)',
+    notice: 'hsl(41,86%,83%)',
+    warning: 'hsl(23,92%,75%)',
+    danger: 'hsl(343,81%,75%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(240,21%,12%)',
+    },
+    sidebar: {
+      surface: 'hsl(240,21%,15%)',
+      border: 'hsl(240,21%,19%)',
+    },
+    appHeader: {
+      surface: 'hsl(240,23%,9%)',
+      border: 'hsl(240,22%,18%)',
+    },
+    responsePane: {
+      surface: 'hsl(240,21%,15%)',
+      border: 'hsl(240,21%,19%)',
+    },
+    button: {
+      primary: 'hsl(267,67%,65%)',
+      secondary: 'hsl(227,28%,64%)',
+      info: 'hsl(217,74%,61%)',
+      success: 'hsl(115,43%,61%)',
+      notice: 'hsl(41,69%,66%)',
+      warning: 'hsl(23,74%,60%)',
+      danger: 'hsl(343,65%,60%)',
+    },
+  },
+};
+
+export const catppuccinLatte: Theme = {
+  id: 'catppuccin-latte',
+  label: 'Catppuccin Latte',
+  dark: false,
+  base: {
+    surface: 'hsl(220,23%,95%)',
+    text: 'hsl(234,16%,35%)',
+    textSubtle: 'hsl(233,10%,47%)',
+    textSubtlest: 'hsl(231,10%,59%)',
+    primary: 'hsl(266,85%,58%)',
+    secondary: 'hsl(233,10%,47%)',
+    info: 'hsl(231,97%,72%)',
+    success: 'hsl(183,74%,35%)',
+    notice: 'hsl(35,77%,49%)',
+    warning: 'hsl(22,99%,52%)',
+    danger: 'hsl(355,76%,59%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(220,22%,92%)',
+      border: 'hsl(220,22%,87%)',
+    },
+    appHeader: {
+      surface: 'hsl(220,21%,89%)',
+      border: 'hsl(220,22%,87%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/cobalt2.ts

@@ -0,0 +1,47 @@
+import type { Theme } from '@yaakapp/api';
+
+export const cobalt2: Theme = {
+  id: 'cobalt2',
+  label: 'Cobalt2',
+  dark: true,
+  base: {
+    surface: '#193549',
+    surfaceHighlight: '#1f4662',
+    text: '#d2e1f1',
+    textSubtle: '#709ac8',
+    textSubtlest: '#55749e',
+    primary: '#ffc600',
+    secondary: '#819fc3',
+    info: '#0088FF',
+    success: '#3AD900',
+    notice: '#FFEE80',
+    warning: '#FF9D00',
+    danger: '#FF628C',
+  },
+  components: {
+    sidebar: {
+      surface: '#13283a',
+      border: '#102332',
+    },
+    input: {
+      border: '#1f4561',
+    },
+    appHeader: {
+      surface: '#13283a',
+      border: '#112636',
+    },
+    responsePane: {
+      surface: '#13283a',
+      border: '#112636',
+    },
+    button: {
+      primary: '#ffc600',
+      secondary: '#709ac8',
+      info: '#0088FF',
+      success: '#3AD900',
+      notice: '#ecdc6a',
+      warning: '#FF9D00',
+      danger: '#FF628C',
+    },
+  },
+};

plugins/themes-yaak/src/themes/dracula.ts

@@ -0,0 +1,29 @@
+import type { Theme } from '@yaakapp/api';
+
+export const dracula: Theme = {
+  id: 'dracula',
+  label: 'Dracula',
+  dark: true,
+  base: {
+    surface: 'hsl(231,15%,18%)',
+    surfaceHighlight: 'hsl(230,15%,24%)',
+    text: 'hsl(60,30%,96%)',
+    textSubtle: 'hsl(232,14%,65%)',
+    textSubtlest: 'hsl(232,14%,50%)',
+    primary: 'hsl(265,89%,78%)',
+    secondary: 'hsl(225,27%,51%)',
+    info: 'hsl(191,97%,77%)',
+    success: 'hsl(135,94%,65%)',
+    notice: 'hsl(65,92%,76%)',
+    warning: 'hsl(31,100%,71%)',
+    danger: 'hsl(0,100%,67%)',
+  },
+  components: {
+    sidebar: {
+      backdrop: 'hsl(230,15%,24%)',
+    },
+    appHeader: {
+      backdrop: 'hsl(235,14%,15%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/everforest.ts

@@ -0,0 +1,77 @@
+import type { Theme } from '@yaakapp/api';
+
+export const everforestDark: Theme = {
+  id: 'everforest-dark',
+  label: 'Everforest Dark',
+  dark: true,
+  base: {
+    surface: 'hsl(150, 8%, 18%)',
+    surfaceHighlight: 'hsl(150, 7%, 22%)',
+    text: 'hsl(45, 30%, 78%)',
+    textSubtle: 'hsl(145, 8%, 55%)',
+    textSubtlest: 'hsl(145, 6%, 42%)',
+    primary: 'hsl(142, 35%, 60%)',
+    secondary: 'hsl(145, 8%, 55%)',
+    info: 'hsl(200, 35%, 65%)',
+    success: 'hsl(142, 35%, 60%)',
+    notice: 'hsl(46, 55%, 68%)',
+    warning: 'hsl(24, 55%, 65%)',
+    danger: 'hsl(358, 50%, 68%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(150, 8%, 15%)',
+    },
+    sidebar: {
+      surface: 'hsl(150, 7%, 16%)',
+      border: 'hsl(150, 6%, 20%)',
+    },
+    appHeader: {
+      surface: 'hsl(150, 8%, 14%)',
+      border: 'hsl(150, 6%, 18%)',
+    },
+    responsePane: {
+      surface: 'hsl(150, 7%, 16%)',
+      border: 'hsl(150, 6%, 20%)',
+    },
+    button: {
+      primary: 'hsl(142, 35%, 53%)',
+      secondary: 'hsl(145, 8%, 48%)',
+      info: 'hsl(200, 35%, 58%)',
+      success: 'hsl(142, 35%, 53%)',
+      notice: 'hsl(46, 55%, 61%)',
+      warning: 'hsl(24, 55%, 58%)',
+      danger: 'hsl(358, 50%, 61%)',
+    },
+  },
+};
+
+export const everforestLight: Theme = {
+  id: 'everforest-light',
+  label: 'Everforest Light',
+  dark: false,
+  base: {
+    surface: 'hsl(40, 32%, 93%)',
+    surfaceHighlight: 'hsl(40, 28%, 89%)',
+    text: 'hsl(135, 8%, 35%)',
+    textSubtle: 'hsl(135, 6%, 45%)',
+    textSubtlest: 'hsl(135, 4%, 55%)',
+    primary: 'hsl(128, 30%, 45%)',
+    secondary: 'hsl(135, 6%, 45%)',
+    info: 'hsl(200, 35%, 45%)',
+    success: 'hsl(128, 30%, 45%)',
+    notice: 'hsl(45, 70%, 40%)',
+    warning: 'hsl(22, 60%, 48%)',
+    danger: 'hsl(355, 55%, 50%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(40, 30%, 91%)',
+      border: 'hsl(40, 25%, 86%)',
+    },
+    appHeader: {
+      surface: 'hsl(40, 30%, 89%)',
+      border: 'hsl(40, 25%, 84%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/fleet.ts

@@ -0,0 +1,173 @@
+import type { Theme } from '@yaakapp/api';
+
+export const fleetLight: Theme = {
+  id: 'fleet-light',
+  label: 'Fleet Light',
+  dark: false,
+  base: {
+    surface: '#FFFFFF',
+    surfaceHighlight: '#F8F8F9',
+    surfaceActive: '#EEEFF0',
+    border: '#18191B33',
+    text: '#090909',
+    textSubtle: '#6E747B',
+    textSubtlest: '#898E94',
+    primary: '#1D61BA',
+    secondary: '#6E747B',
+    info: '#4B8DEC',
+    success: '#169068',
+    notice: '#B07203',
+    warning: '#B07203',
+    danger: '#E1465E',
+  },
+  components: {
+    sidebar: {
+      surface: '#EEEFF0',
+      border: '#18191B33',
+    },
+    appHeader: {
+      surface: '#EEEFF0',
+      border: '#18191B33',
+    },
+    responsePane: {
+      surface: '#FFFFFF',
+      border: '#18191B33',
+    },
+    dialog: {
+      surface: '#FFFFFF',
+      border: '#18191B33',
+    },
+    button: {
+      surface: '#F8F8F9',
+      text: '#090909',
+      primary: '#2A7DEB',
+      secondary: '#6E747B',
+      info: '#4B8DEC',
+      success: '#169068',
+      notice: '#B07203',
+      warning: '#B07203',
+      danger: '#E1465E',
+    },
+    editor: {
+      primary: '#5511BF',
+      secondary: '#A31D8D',
+      info: '#14646E',
+      success: '#086E14',
+      notice: '#616605',
+      warning: '#747576',
+      danger: '#1749BD',
+    },
+  },
+};
+
+export const fleetDarkPurple: Theme = {
+  id: 'fleet-dark-purple',
+  label: 'Fleet Dark Purple',
+  dark: true,
+  base: {
+    surface: '#1C1827',
+    surfaceHighlight: '#262136',
+    surfaceActive: '#3E3852',
+    border: '#3E3852',
+    text: '#E0E1E4',
+    textSubtle: '#E0E1E480',
+    textSubtlest: '#E0E1E44D',
+    primary: '#B174D9',
+    secondary: '#E0E1E480',
+    info: '#4B8DEC',
+    success: '#169068',
+    notice: '#B07203',
+    warning: '#B07203',
+    danger: '#E1465E',
+  },
+  components: {
+    appHeader: {
+      surface: '#13101B',
+      border: '#3E3852',
+    },
+    responsePane: {
+      surface: '#1C1827',
+      border: '#3E3852',
+    },
+    dialog: {
+      surface: '#262136',
+      border: '#3E3852',
+    },
+    button: {
+      surface: '#262136',
+      text: '#E0E1E4',
+      primary: '#A660D4',
+      secondary: '#E0E1E480',
+      info: '#4B8DEC',
+      success: '#169068',
+      notice: '#B07203',
+      warning: '#B07203',
+      danger: '#E1465E',
+    },
+    editor: {
+      primary: '#C7A65D',
+      secondary: '#93A6F5',
+      info: '#E09B70',
+      success: '#62A362',
+      notice: '#85A658',
+      warning: '#7e7d86',
+      danger: '#4DACF0',
+    },
+  },
+};
+
+export const fleetDark: Theme = {
+  id: 'fleet-dark',
+  label: 'Fleet Dark',
+  dark: true,
+  base: {
+    surface: '#18191B',
+    surfaceHighlight: '#252629',
+    surfaceActive: '#3E4147',
+    border: '#3E4147',
+    text: '#E0E1E4',
+    textSubtle: '#898E94',
+    textSubtlest: '#646B71',
+    primary: '#4B8DEC',
+    secondary: '#898E94',
+    info: '#4B8DEC',
+    success: '#169068',
+    notice: '#B07203',
+    warning: '#B07203',
+    danger: '#E1465E',
+  },
+  components: {
+    appHeader: {
+      surface: '#090909',
+      border: '#3E4147',
+    },
+    responsePane: {
+      surface: '#18191B',
+      border: '#3E4147',
+    },
+    dialog: {
+      surface: '#252629',
+      border: '#3E4147',
+    },
+    button: {
+      surface: '#252629',
+      text: '#E0E1E4',
+      primary: '#2A7DEB',
+      secondary: '#898E94',
+      info: '#4B8DEC',
+      success: '#169068',
+      notice: '#B07203',
+      warning: '#B07203',
+      danger: '#E1465E',
+    },
+    editor: {
+      primary: '#EBC88D',
+      secondary: '#AF9CFF',
+      info: '#82D2CE',
+      success: '#A8C5A0',
+      notice: '#C7A65D',
+      warning: '#909194',
+      danger: '#87C3FF',
+    },
+  },
+};

plugins/themes-yaak/src/themes/github-dimmed.ts

@@ -0,0 +1,46 @@
+import type { Theme } from '@yaakapp/api';
+
+export const githubDarkDimmed: Theme = {
+  id: 'github-dark-dimmed',
+  label: 'GitHub Dark Dimmed',
+  dark: true,
+  base: {
+    surface: 'hsl(215, 15%, 16%)',
+    surfaceHighlight: 'hsl(215, 13%, 20%)',
+    text: 'hsl(212, 15%, 78%)',
+    textSubtle: 'hsl(212, 10%, 55%)',
+    textSubtlest: 'hsl(212, 8%, 42%)',
+    primary: 'hsl(212, 80%, 65%)',
+    secondary: 'hsl(212, 10%, 55%)',
+    info: 'hsl(212, 80%, 65%)',
+    success: 'hsl(140, 50%, 50%)',
+    notice: 'hsl(42, 75%, 55%)',
+    warning: 'hsl(27, 80%, 55%)',
+    danger: 'hsl(355, 70%, 55%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(215, 15%, 13%)',
+    },
+    sidebar: {
+      surface: 'hsl(215, 14%, 14%)',
+      border: 'hsl(215, 12%, 19%)',
+    },
+    appHeader: {
+      surface: 'hsl(215, 15%, 12%)',
+      border: 'hsl(215, 12%, 17%)',
+    },
+    responsePane: {
+      surface: 'hsl(215, 14%, 14%)',
+      border: 'hsl(215, 12%, 19%)',
+    },
+    button: {
+      primary: 'hsl(212, 80%, 58%)',
+      info: 'hsl(212, 80%, 58%)',
+      success: 'hsl(140, 50%, 45%)',
+      notice: 'hsl(42, 75%, 48%)',
+      warning: 'hsl(27, 80%, 48%)',
+      danger: 'hsl(355, 70%, 48%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/github.ts

@@ -0,0 +1,55 @@
+import type { Theme } from '@yaakapp/api';
+
+export const githubDark: Theme = {
+  id: 'github-dark',
+  label: 'GitHub',
+  dark: true,
+  base: {
+    surface: 'hsl(213,30%,7%)',
+    surfaceHighlight: 'hsl(213,16%,13%)',
+    text: 'hsl(212,27%,89%)',
+    textSubtle: 'hsl(212,9%,57%)',
+    textSubtlest: 'hsl(217,8%,45%)',
+    border: 'hsl(215,21%,11%)',
+    primary: 'hsl(262,78%,74%)',
+    secondary: 'hsl(217,8%,50%)',
+    info: 'hsl(215,84%,64%)',
+    success: 'hsl(129,48%,52%)',
+    notice: 'hsl(39,71%,58%)',
+    warning: 'hsl(22,83%,60%)',
+    danger: 'hsl(3,83%,65%)',
+  },
+  components: {
+    button: {
+      primary: 'hsl(262,79%,71%)',
+      secondary: 'hsl(217,8%,45%)',
+      info: 'hsl(215,84%,60%)',
+      success: 'hsl(129,48%,47%)',
+      notice: 'hsl(39,71%,53%)',
+      warning: 'hsl(22,83%,56%)',
+      danger: 'hsl(3,83%,61%)',
+    },
+  },
+};
+
+export const githubLight: Theme = {
+  id: 'github-light',
+  label: 'GitHub',
+  dark: false,
+  base: {
+    surface: 'hsl(0,0%,100%)',
+    surfaceHighlight: 'hsl(210,29%,94%)',
+    text: 'hsl(213,13%,14%)',
+    textSubtle: 'hsl(212,9%,43%)',
+    textSubtlest: 'hsl(203,8%,55%)',
+    border: 'hsl(210,15%,92%)',
+    borderSubtle: 'hsl(210,15%,92%)',
+    primary: 'hsl(261,69%,59%)',
+    secondary: 'hsl(212,8%,47%)',
+    info: 'hsl(212,92%,48%)',
+    success: 'hsl(137,66%,32%)',
+    notice: 'hsl(40,100%,40%)',
+    warning: 'hsl(24,100%,44%)',
+    danger: 'hsl(356,71%,48%)',
+  },
+};

plugins/themes-yaak/src/themes/gruvbox.ts

@@ -0,0 +1,21 @@
+import type { Theme } from '@yaakapp/api';
+
+export const gruvbox: Theme = {
+  id: 'gruvbox',
+  label: 'Gruvbox',
+  dark: true,
+  base: {
+    surface: 'hsl(0,0%,16%)',
+    surfaceHighlight: 'hsl(20,3%,19%)',
+    text: 'hsl(53,74%,91%)',
+    textSubtle: 'hsl(39,24%,66%)',
+    textSubtlest: 'hsl(30,12%,51%)',
+    primary: 'hsl(344,47%,68%)',
+    secondary: 'hsl(157,16%,58%)',
+    info: 'hsl(104,35%,62%)',
+    success: 'hsl(61,66%,44%)',
+    notice: 'hsl(42,95%,58%)',
+    warning: 'hsl(27,99%,55%)',
+    danger: 'hsl(6,96%,59%)',
+  },
+};

plugins/themes-yaak/src/themes/high-contrast.ts

@@ -0,0 +1,46 @@
+import type { Theme } from '@yaakapp/api';
+
+export const highContrast: Theme = {
+  id: 'high-contrast',
+  label: 'High Contrast Light',
+  dark: false,
+  base: {
+    surface: 'white',
+    surfaceHighlight: 'hsl(218,24%,93%)',
+    text: 'black',
+    textSubtle: 'hsl(217,24%,40%)',
+    textSubtlest: 'hsl(217,24%,40%)',
+    border: 'hsl(217,22%,50%)',
+    borderSubtle: 'hsl(217,22%,60%)',
+    primary: 'hsl(267,67%,47%)',
+    secondary: 'hsl(218,18%,53%)',
+    info: 'hsl(206,100%,36%)',
+    success: 'hsl(155,100%,26%)',
+    notice: 'hsl(45,100%,31%)',
+    warning: 'hsl(30,99%,34%)',
+    danger: 'hsl(334,100%,35%)',
+  },
+};
+
+export const highContrastDark: Theme = {
+  id: 'high-contrast-dark',
+  label: 'High Contrast Dark',
+  dark: true,
+  base: {
+    surface: 'hsl(0,0%,0%)',
+    surfaceHighlight: 'hsl(0,0%,20%)',
+    text: 'hsl(0,0%,100%)',
+    textSubtle: 'hsl(0,0%,90%)',
+    textSubtlest: 'hsl(0,0%,80%)',
+    selection: 'hsl(276,100%,30%)',
+    surfaceActive: 'hsl(276,100%,30%)',
+    border: 'hsl(0,0%,60%)',
+    primary: 'hsl(266,100%,85%)',
+    secondary: 'hsl(242,20%,72%)',
+    info: 'hsl(208,100%,83%)',
+    success: 'hsl(150,100%,63%)',
+    notice: 'hsl(49,100%,77%)',
+    warning: 'hsl(28,100%,73%)',
+    danger: 'hsl(343,100%,79%)',
+  },
+};

plugins/themes-yaak/src/themes/horizon.ts

@@ -0,0 +1,47 @@
+import type { Theme } from '@yaakapp/api';
+
+export const horizon: Theme = {
+  id: 'horizon',
+  label: 'Horizon',
+  dark: true,
+  base: {
+    surface: 'hsl(220, 16%, 13%)',
+    surfaceHighlight: 'hsl(220, 14%, 18%)',
+    text: 'hsl(220, 15%, 85%)',
+    textSubtle: 'hsl(220, 10%, 55%)',
+    textSubtlest: 'hsl(220, 8%, 45%)',
+    primary: 'hsl(5, 85%, 68%)',
+    secondary: 'hsl(220, 10%, 55%)',
+    info: 'hsl(217, 70%, 68%)',
+    success: 'hsl(92, 50%, 60%)',
+    notice: 'hsl(34, 92%, 70%)',
+    warning: 'hsl(20, 90%, 65%)',
+    danger: 'hsl(355, 80%, 65%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(220, 16%, 10%)',
+    },
+    sidebar: {
+      surface: 'hsl(220, 14%, 15%)',
+      border: 'hsl(220, 14%, 19%)',
+    },
+    appHeader: {
+      surface: 'hsl(220, 16%, 11%)',
+      border: 'hsl(220, 14%, 17%)',
+    },
+    responsePane: {
+      surface: 'hsl(220, 14%, 15%)',
+      border: 'hsl(220, 14%, 19%)',
+    },
+    button: {
+      primary: 'hsl(5, 85%, 61%)',
+      secondary: 'hsl(224,8%,53%)',
+      info: 'hsl(217, 70%, 61%)',
+      success: 'hsl(92, 50%, 53%)',
+      notice: 'hsl(34, 92%, 63%)',
+      warning: 'hsl(20, 90%, 58%)',
+      danger: 'hsl(355, 80%, 58%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/hotdog-stand.ts

@@ -0,0 +1,58 @@
+import type { Theme } from '@yaakapp/api';
+
+export const hotdogStand: Theme = {
+  id: 'hotdog-stand',
+  label: 'Hotdog Stand',
+  dark: true,
+  base: {
+    surface: 'hsl(0,100%,50%)',
+    surfaceHighlight: 'hsl(0,0%,0%)',
+    text: 'hsl(0,0%,100%)',
+    textSubtle: 'hsl(0,0%,100%)',
+    textSubtlest: 'hsl(60,100%,50%)',
+    border: 'hsl(0,0%,0%)',
+    primary: 'hsl(60,100%,50%)',
+    secondary: 'hsl(60,100%,50%)',
+    info: 'hsl(60,100%,50%)',
+    success: 'hsl(60,100%,50%)',
+    notice: 'hsl(60,100%,50%)',
+    warning: 'hsl(60,100%,50%)',
+    danger: 'hsl(60,100%,50%)',
+  },
+  components: {
+    appHeader: {
+      surface: 'hsl(0,0%,0%)',
+      text: 'hsl(0,0%,100%)',
+      textSubtle: 'hsl(60,100%,50%)',
+      textSubtlest: 'hsl(0,100%,50%)',
+    },
+    menu: {
+      surface: 'hsl(0,0%,0%)',
+      border: 'hsl(0,100%,50%)',
+      surfaceHighlight: 'hsl(0,100%,50%)',
+      text: 'hsl(0,0%,100%)',
+      textSubtle: 'hsl(60,100%,50%)',
+      textSubtlest: 'hsl(60,100%,50%)',
+    },
+    button: {
+      surface: 'hsl(0,0%,0%)',
+      text: 'hsl(0,0%,100%)',
+      primary: 'hsl(0,0%,0%)',
+      secondary: 'hsl(0,0%,100%)',
+      info: 'hsl(0,0%,0%)',
+      success: 'hsl(60,100%,50%)',
+      notice: 'hsl(60,100%,50%)',
+      warning: 'hsl(0,0%,0%)',
+      danger: 'hsl(0,100%,50%)',
+    },
+    editor: {
+      primary: 'hsl(0,0%,100%)',
+      secondary: 'hsl(0,0%,100%)',
+      info: 'hsl(0,0%,100%)',
+      success: 'hsl(0,0%,100%)',
+      notice: 'hsl(60,100%,50%)',
+      warning: 'hsl(0,0%,100%)',
+      danger: 'hsl(0,0%,100%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/material-darker.ts

@@ -0,0 +1,39 @@
+import type { Theme } from '@yaakapp/api';
+
+export const materialDarker: Theme = {
+  id: 'material-darker',
+  label: 'Material Darker',
+  dark: true,
+  base: {
+    surface: 'hsl(0, 0%, 13%)',
+    surfaceHighlight: 'hsl(0, 0%, 18%)',
+    text: 'hsl(0, 0%, 93%)',
+    textSubtle: 'hsl(0, 0%, 65%)',
+    textSubtlest: 'hsl(0, 0%, 50%)',
+    primary: 'hsl(262, 100%, 75%)',
+    secondary: 'hsl(0, 0%, 60%)',
+    info: 'hsl(224, 100%, 75%)',
+    success: 'hsl(84, 60%, 73%)',
+    notice: 'hsl(43, 100%, 70%)',
+    warning: 'hsl(14, 85%, 70%)',
+    danger: 'hsl(1, 77%, 59%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(0, 0%, 11%)',
+      border: 'hsl(0, 0%, 16%)',
+    },
+    appHeader: {
+      surface: 'hsl(0, 0%, 9%)',
+      border: 'hsl(0, 0%, 14%)',
+    },
+    button: {
+      primary: 'hsl(262, 100%, 68%)',
+      info: 'hsl(224, 100%, 68%)',
+      success: 'hsl(84, 60%, 66%)',
+      notice: 'hsl(43, 100%, 63%)',
+      warning: 'hsl(14, 85%, 63%)',
+      danger: 'hsl(1, 77%, 52%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/material-ocean.ts

@@ -0,0 +1,43 @@
+import type { Theme } from '@yaakapp/api';
+
+export const materialOcean: Theme = {
+  id: 'material-ocean',
+  label: 'Material Ocean',
+  dark: true,
+  base: {
+    surface: 'hsl(230, 25%, 14%)',
+    surfaceHighlight: 'hsl(230, 20%, 18%)',
+    text: 'hsl(220, 53%, 85%)',
+    textSubtle: 'hsl(228, 12%, 54%)',
+    textSubtlest: 'hsl(228, 12%, 42%)',
+    primary: 'hsl(262, 100%, 75%)',
+    secondary: 'hsl(228, 12%, 60%)',
+    info: 'hsl(224, 100%, 75%)',
+    success: 'hsl(84, 60%, 73%)',
+    notice: 'hsl(43, 100%, 70%)',
+    warning: 'hsl(14, 85%, 70%)',
+    danger: 'hsl(1, 77%, 59%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(230, 25%, 12%)',
+      border: 'hsl(230, 20%, 18%)',
+    },
+    appHeader: {
+      surface: 'hsl(230, 25%, 10%)',
+      border: 'hsl(230, 20%, 16%)',
+    },
+    responsePane: {
+      surface: 'hsl(230, 25%, 12%)',
+      border: 'hsl(230, 20%, 18%)',
+    },
+    button: {
+      primary: 'hsl(262, 100%, 68%)',
+      info: 'hsl(224, 100%, 68%)',
+      success: 'hsl(84, 60%, 66%)',
+      notice: 'hsl(43, 100%, 63%)',
+      warning: 'hsl(14, 85%, 63%)',
+      danger: 'hsl(1, 77%, 52%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/material-palenight.ts

@@ -0,0 +1,45 @@
+import type { Theme } from '@yaakapp/api';
+
+export const materialPalenight: Theme = {
+  id: 'material-palenight',
+  label: 'Material Palenight',
+  dark: true,
+  base: {
+    surface: '#292D3E',
+    surfaceHighlight: '#313850',
+    text: '#BFC7D5',
+    textSubtle: '#697098',
+    textSubtlest: '#4E5579',
+    primary: '#c792ea',
+    secondary: '#697098',
+    info: '#82AAFF',
+    success: '#C3E88D',
+    notice: '#FFCB6B',
+    warning: '#F78C6C',
+    danger: '#ff5572',
+  },
+  components: {
+    dialog: {
+      surface: '#232635',
+    },
+    sidebar: {
+      surface: '#292D3E',
+    },
+    appHeader: {
+      surface: '#282C3D',
+    },
+    responsePane: {
+      surface: '#313850',
+      border: '#3a3f58',
+    },
+    button: {
+      primary: '#c792ea',
+      secondary: '#697098',
+      info: '#82AAFF',
+      success: '#C3E88D',
+      notice: '#FFCB6B',
+      warning: '#F78C6C',
+      danger: '#ff5572',
+    },
+  },
+};

plugins/themes-yaak/src/themes/monokai-pro.ts

@@ -0,0 +1,217 @@
+import type { Theme } from '@yaakapp/api';
+
+export const monokaiPro: Theme = {
+  id: 'monokai-pro',
+  label: 'Monokai Pro',
+  dark: true,
+  base: {
+    surface: 'hsl(285,5%,17%)',
+    text: 'hsl(60,25%,98%)',
+    textSubtle: 'hsl(0,1%,75%)',
+    textSubtlest: 'hsl(300,0%,57%)',
+    primary: 'hsl(250,77%,78%)',
+    secondary: 'hsl(0,1%,75%)',
+    info: 'hsl(186,71%,69%)',
+    success: 'hsl(90,59%,66%)',
+    notice: 'hsl(45,100%,70%)',
+    warning: 'hsl(20,96%,70%)',
+    danger: 'hsl(345,100%,69%)',
+  },
+  components: {
+    appHeader: {
+      surface: 'hsl(300,5%,13%)',
+      text: 'hsl(0,1%,75%)',
+      textSubtle: 'hsl(300,0%,57%)',
+      textSubtlest: 'hsl(300,1%,44%)',
+    },
+    button: {
+      primary: 'hsl(250,77%,70%)',
+      secondary: 'hsl(0,1%,68%)',
+      info: 'hsl(186,71%,62%)',
+      success: 'hsl(90,59%,59%)',
+      notice: 'hsl(45,100%,63%)',
+      warning: 'hsl(20,96%,63%)',
+      danger: 'hsl(345,100%,62%)',
+    },
+  },
+};
+
+export const monokaiProClassic: Theme = {
+  id: 'monokai-pro-classic',
+  label: 'Monokai Pro Classic',
+  dark: true,
+  base: {
+    surface: 'hsl(70,8%,15%)',
+    text: 'hsl(69,100%,97%)',
+    textSubtle: 'hsl(65,9%,73%)',
+    textSubtlest: 'hsl(66,4%,55%)',
+    primary: 'hsl(261,100%,75%)',
+    secondary: 'hsl(202,8%,72%)',
+    info: 'hsl(190,81%,67%)',
+    success: 'hsl(80,76%,53%)',
+    notice: 'hsl(54,70%,68%)',
+    warning: 'hsl(32,98%,56%)',
+    danger: 'hsl(338,95%,56%)',
+  },
+  components: {
+    appHeader: {
+      surface: 'hsl(72,9%,11%)',
+      text: 'hsl(202,8%,72%)',
+      textSubtle: 'hsl(213,4%,48%)',
+      textSubtlest: 'hsl(223,6%,44%)',
+    },
+    button: {
+      primary: 'hsl(261,100%,68%)',
+      secondary: 'hsl(202,8%,65%)',
+      info: 'hsl(190,81%,60%)',
+      success: 'hsl(80,76%,48%)',
+      notice: 'hsl(54,71%,61%)',
+      warning: 'hsl(32,98%,50%)',
+      danger: 'hsl(338,95%,50%)',
+    },
+  },
+};
+
+export const monokaiProMachine: Theme = {
+  id: 'monokai-pro-machine',
+  label: 'Monokai Pro Machine',
+  dark: true,
+  base: {
+    surface: 'hsl(200,16%,18%)',
+    text: 'hsl(173,24%,93%)',
+    textSubtle: 'hsl(185,6%,57%)',
+    textSubtlest: 'hsl(189,6%,45%)',
+    primary: 'hsl(258,86%,80%)',
+    secondary: 'hsl(175,9%,75%)',
+    info: 'hsl(194,81%,72%)',
+    success: 'hsl(98,67%,69%)',
+    notice: 'hsl(52,100%,72%)',
+    warning: 'hsl(28,100%,72%)',
+    danger: 'hsl(353,100%,71%)',
+  },
+  components: {
+    appHeader: {
+      surface: 'hsl(196,16%,14%)',
+      text: 'hsl(202,8%,72%)',
+      textSubtle: 'hsl(213,4%,48%)',
+      textSubtlest: 'hsl(223,6%,44%)',
+    },
+    button: {
+      primary: 'hsl(258,86%,72%)',
+      secondary: 'hsl(175,9%,68%)',
+      info: 'hsl(194,80%,65%)',
+      success: 'hsl(98,67%,62%)',
+      notice: 'hsl(52,100%,65%)',
+      warning: 'hsl(28,100%,65%)',
+      danger: 'hsl(353,100%,64%)',
+    },
+  },
+};
+
+export const monokaiProOctagon: Theme = {
+  id: 'monokai-pro-octagon',
+  label: 'Monokai Pro Octagon',
+  dark: true,
+  base: {
+    surface: 'hsl(233,18%,19%)',
+    text: 'hsl(173,24%,93%)',
+    textSubtle: 'hsl(202,8%,72%)',
+    textSubtlest: 'hsl(213,4%,48%)',
+    primary: 'hsl(292,30%,70%)',
+    secondary: 'hsl(202,8%,72%)',
+    info: 'hsl(155,37%,72%)',
+    success: 'hsl(75,60%,61%)',
+    notice: 'hsl(44,100%,71%)',
+    warning: 'hsl(23,100%,68%)',
+    danger: 'hsl(352,100%,70%)',
+  },
+  components: {
+    appHeader: {
+      surface: 'hsl(235,18%,14%)',
+      text: 'hsl(202,8%,72%)',
+      textSubtle: 'hsl(213,4%,48%)',
+      textSubtlest: 'hsl(223,6%,44%)',
+    },
+    button: {
+      primary: 'hsl(292,26%,63%)',
+      secondary: 'hsl(201,7%,65%)',
+      info: 'hsl(155,33%,65%)',
+      success: 'hsl(75,54%,55%)',
+      notice: 'hsl(44,90%,64%)',
+      warning: 'hsl(23,90%,61%)',
+      danger: 'hsl(352,90%,63%)',
+    },
+  },
+};
+
+export const monokaiProRistretto: Theme = {
+  id: 'monokai-pro-ristretto',
+  label: 'Monokai Pro Ristretto',
+  dark: true,
+  base: {
+    surface: 'hsl(0,9%,16%)',
+    text: 'hsl(351,100%,97%)',
+    textSubtle: 'hsl(355,9%,74%)',
+    textSubtlest: 'hsl(354,4%,56%)',
+    primary: 'hsl(239,63%,79%)',
+    secondary: 'hsl(355,9%,74%)',
+    info: 'hsl(170,53%,69%)',
+    success: 'hsl(88,57%,66%)',
+    notice: 'hsl(41,92%,70%)',
+    warning: 'hsl(13,85%,70%)',
+    danger: 'hsl(349,97%,70%)',
+  },
+  components: {
+    appHeader: {
+      surface: 'hsl(0,8%,12%)',
+      text: 'hsl(355,9%,74%)',
+      textSubtle: 'hsl(354,4%,56%)',
+      textSubtlest: 'hsl(353,4%,43%)',
+    },
+    button: {
+      primary: 'hsl(239,63%,71%)',
+      secondary: 'hsl(355,9%,67%)',
+      info: 'hsl(170,53%,62%)',
+      success: 'hsl(88,57%,59%)',
+      notice: 'hsl(41,92%,63%)',
+      warning: 'hsl(13,86%,63%)',
+      danger: 'hsl(349,97%,63%)',
+    },
+  },
+};
+
+export const monokaiProSpectrum: Theme = {
+  id: 'monokai-pro-spectrum',
+  label: 'Monokai Pro Spectrum',
+  dark: true,
+  base: {
+    surface: 'hsl(0,0%,13%)',
+    text: 'hsl(266,100%,97%)',
+    textSubtle: 'hsl(264,7%,73%)',
+    textSubtlest: 'hsl(266,3%,55%)',
+    primary: 'hsl(247,61%,72%)',
+    secondary: 'hsl(264,7%,73%)',
+    info: 'hsl(188,74%,63%)',
+    success: 'hsl(133,54%,66%)',
+    notice: 'hsl(51,96%,69%)',
+    warning: 'hsl(23,98%,66%)',
+    danger: 'hsl(343,96%,68%)',
+  },
+  components: {
+    appHeader: {
+      surface: 'hsl(0,0%,10%)',
+      text: 'hsl(264,7%,73%)',
+      textSubtle: 'hsl(266,3%,55%)',
+      textSubtlest: 'hsl(264,2%,41%)',
+    },
+    button: {
+      primary: 'hsl(247,61%,65%)',
+      secondary: 'hsl(264,7%,66%)',
+      info: 'hsl(188,74%,57%)',
+      success: 'hsl(133,54%,59%)',
+      notice: 'hsl(51,96%,62%)',
+      warning: 'hsl(23,98%,59%)',
+      danger: 'hsl(343,96%,61%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/moonlight.ts

@@ -0,0 +1,28 @@
+import type { Theme } from '@yaakapp/api';
+
+export const moonlight: Theme = {
+  id: 'moonlight',
+  label: 'Moonlight',
+  dark: true,
+  base: {
+    surface: 'hsl(234,23%,17%)',
+    text: 'hsl(225,71%,90%)',
+    textSubtle: 'hsl(230,28%,62%)',
+    textSubtlest: 'hsl(232,26%,43%)',
+    primary: 'hsl(262,100%,82%)',
+    secondary: 'hsl(232,18%,65%)',
+    info: 'hsl(217,100%,74%)',
+    success: 'hsl(174,66%,54%)',
+    notice: 'hsl(35,100%,73%)',
+    warning: 'hsl(17,100%,71%)',
+    danger: 'hsl(356,100%,73%)',
+  },
+  components: {
+    appHeader: {
+      surface: 'hsl(233,23%,15%)',
+    },
+    sidebar: {
+      surface: 'hsl(233,23%,15%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/night-owl.ts

@@ -0,0 +1,78 @@
+import type { Theme } from '@yaakapp/api';
+
+export const nightOwl: Theme = {
+  id: 'night-owl',
+  label: 'Night Owl',
+  dark: true,
+  base: {
+    surface: 'hsl(207, 95%, 8%)',
+    surfaceHighlight: 'hsl(207, 50%, 14%)',
+    text: 'hsl(213, 50%, 90%)',
+    textSubtle: 'hsl(213, 30%, 70%)',
+    textSubtlest: 'hsl(213, 20%, 50%)',
+    border: 'hsl(207, 50%, 14%)',
+    primary: 'hsl(261, 51%, 51%)',
+    secondary: 'hsl(213, 30%, 60%)',
+    info: 'hsl(220, 100%, 75%)',
+    success: 'hsl(145, 100%, 43%)',
+    notice: 'hsl(62, 61%, 71%)',
+    warning: 'hsl(4, 90%, 58%)',
+    danger: 'hsl(4, 90%, 58%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(207, 95%, 6%)',
+    },
+    sidebar: {
+      surface: 'hsl(207, 95%, 8%)',
+      border: 'hsl(207, 50%, 14%)',
+    },
+    appHeader: {
+      surface: 'hsl(207, 95%, 5%)',
+      border: 'hsl(207, 50%, 12%)',
+    },
+    responsePane: {
+      surface: 'hsl(207, 70%, 10%)',
+      border: 'hsl(207, 50%, 14%)',
+    },
+    button: {
+      primary: 'hsl(261, 51%, 45%)',
+      secondary: 'hsl(213, 30%, 60%)',
+      info: 'hsl(220, 100%, 68%)',
+      success: 'hsl(145, 100%, 38%)',
+      notice: 'hsl(62, 61%, 64%)',
+      warning: 'hsl(4, 90%, 52%)',
+      danger: 'hsl(4, 90%, 52%)',
+    },
+  },
+};
+
+export const lightOwl: Theme = {
+  id: 'light-owl',
+  label: 'Light Owl',
+  dark: false,
+  base: {
+    surface: 'hsl(0, 0%, 98%)',
+    surfaceHighlight: 'hsl(210, 18%, 94%)',
+    text: 'hsl(224, 26%, 27%)',
+    textSubtle: 'hsl(224, 15%, 45%)',
+    textSubtlest: 'hsl(224, 10%, 55%)',
+    primary: 'hsl(283, 100%, 41%)',
+    secondary: 'hsl(224, 15%, 50%)',
+    info: 'hsl(219, 75%, 40%)',
+    success: 'hsl(145, 70%, 35%)',
+    notice: 'hsl(36, 95%, 40%)',
+    warning: 'hsl(0, 55%, 55%)',
+    danger: 'hsl(0, 55%, 50%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(210, 20%, 96%)',
+      border: 'hsl(210, 15%, 90%)',
+    },
+    appHeader: {
+      surface: 'hsl(210, 20%, 94%)',
+      border: 'hsl(210, 15%, 88%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/noctis.ts

@@ -0,0 +1,47 @@
+import type { Theme } from '@yaakapp/api';
+
+export const noctisAzureus: Theme = {
+  id: 'noctis-azureus',
+  label: 'Noctis Azureus',
+  dark: true,
+  base: {
+    surface: 'hsl(210, 35%, 14%)',
+    surfaceHighlight: 'hsl(210, 30%, 19%)',
+    text: 'hsl(180, 45%, 85%)',
+    textSubtle: 'hsl(180, 25%, 60%)',
+    textSubtlest: 'hsl(180, 18%, 45%)',
+    primary: 'hsl(175, 60%, 55%)',
+    secondary: 'hsl(200, 70%, 65%)',
+    info: 'hsl(200, 70%, 65%)',
+    success: 'hsl(85, 55%, 60%)',
+    notice: 'hsl(45, 90%, 60%)',
+    warning: 'hsl(25, 85%, 58%)',
+    danger: 'hsl(355, 75%, 62%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(210, 35%, 11%)',
+    },
+    sidebar: {
+      surface: 'hsl(210, 33%, 12%)',
+      border: 'hsl(210, 30%, 17%)',
+    },
+    appHeader: {
+      surface: 'hsl(210, 35%, 10%)',
+      border: 'hsl(210, 30%, 15%)',
+    },
+    responsePane: {
+      surface: 'hsl(210, 33%, 12%)',
+      border: 'hsl(210, 30%, 17%)',
+    },
+    button: {
+      primary: 'hsl(175, 60%, 48%)',
+      secondary: 'hsl(200, 70%, 58%)',
+      info: 'hsl(200, 70%, 58%)',
+      success: 'hsl(85, 55%, 53%)',
+      notice: 'hsl(45, 90%, 53%)',
+      warning: 'hsl(25, 85%, 51%)',
+      danger: 'hsl(355, 75%, 55%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/nord.ts

@@ -0,0 +1,29 @@
+import type { Theme } from '@yaakapp/api';
+
+export const nord: Theme = {
+  id: 'nord',
+  label: 'Nord',
+  dark: true,
+  base: {
+    surface: 'hsl(220,16%,22%)',
+    surfaceHighlight: 'hsl(220,14%,28%)',
+    text: 'hsl(220,28%,93%)',
+    textSubtle: 'hsl(220,26%,90%)',
+    textSubtlest: 'hsl(220,24%,86%)',
+    primary: 'hsl(193,38%,68%)',
+    secondary: 'hsl(210,34%,63%)',
+    info: 'hsl(174,25%,69%)',
+    success: 'hsl(89,26%,66%)',
+    notice: 'hsl(40,66%,73%)',
+    warning: 'hsl(17,48%,64%)',
+    danger: 'hsl(353,43%,56%)',
+  },
+  components: {
+    sidebar: {
+      backdrop: 'hsl(220,16%,22%)',
+    },
+    appHeader: {
+      backdrop: 'hsl(220,14%,28%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/one-dark-pro.ts

@@ -0,0 +1,44 @@
+import type { Theme } from '@yaakapp/api';
+
+export const oneDarkPro: Theme = {
+  id: 'one-dark-pro',
+  label: 'One Dark Pro',
+  dark: true,
+  base: {
+    surface: 'hsl(220, 13%, 18%)',
+    surfaceHighlight: 'hsl(220, 13%, 22%)',
+    text: 'hsl(219, 14%, 71%)',
+    textSubtle: 'hsl(219, 10%, 53%)',
+    textSubtlest: 'hsl(220, 9%, 45%)',
+    primary: 'hsl(286, 60%, 67%)',
+    secondary: 'hsl(219, 14%, 60%)',
+    info: 'hsl(207, 82%, 66%)',
+    success: 'hsl(95, 38%, 62%)',
+    notice: 'hsl(39, 67%, 69%)',
+    warning: 'hsl(29, 54%, 61%)',
+    danger: 'hsl(355, 65%, 65%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(220, 13%, 16%)',
+      border: 'hsl(220, 13%, 20%)',
+    },
+    appHeader: {
+      surface: 'hsl(220, 13%, 14%)',
+      border: 'hsl(220, 13%, 20%)',
+    },
+    responsePane: {
+      surface: 'hsl(220, 13%, 16%)',
+      border: 'hsl(220, 13%, 20%)',
+    },
+    button: {
+      primary: 'hsl(286, 60%, 60%)',
+      secondary: 'hsl(219, 14%, 53%)',
+      info: 'hsl(207, 82%, 59%)',
+      success: 'hsl(95, 38%, 55%)',
+      notice: 'hsl(39, 67%, 62%)',
+      warning: 'hsl(29, 54%, 54%)',
+      danger: 'hsl(355, 65%, 58%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/panda.ts

@@ -0,0 +1,47 @@
+import type { Theme } from '@yaakapp/api';
+
+export const pandaSyntax: Theme = {
+  id: 'panda',
+  label: 'Panda Syntax',
+  dark: true,
+  base: {
+    surface: 'hsl(225, 15%, 15%)',
+    surfaceHighlight: 'hsl(225, 12%, 20%)',
+    text: 'hsl(0, 0%, 90%)',
+    textSubtle: 'hsl(0, 0%, 65%)',
+    textSubtlest: 'hsl(0, 0%, 50%)',
+    primary: 'hsl(353, 95%, 70%)',
+    secondary: 'hsl(0, 0%, 65%)',
+    info: 'hsl(200, 85%, 65%)',
+    success: 'hsl(175, 90%, 65%)',
+    notice: 'hsl(40, 100%, 65%)',
+    warning: 'hsl(40, 100%, 65%)',
+    danger: 'hsl(0, 90%, 65%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(225, 15%, 12%)',
+    },
+    sidebar: {
+      surface: 'hsl(225, 14%, 13%)',
+      border: 'hsl(225, 12%, 18%)',
+    },
+    appHeader: {
+      surface: 'hsl(225, 15%, 11%)',
+      border: 'hsl(225, 12%, 16%)',
+    },
+    responsePane: {
+      surface: 'hsl(225, 14%, 13%)',
+      border: 'hsl(225, 12%, 18%)',
+    },
+    button: {
+      primary: 'hsl(353, 95%, 63%)',
+      secondary: 'hsl(0, 0%, 58%)',
+      info: 'hsl(200, 85%, 58%)',
+      success: 'hsl(175, 90%, 58%)',
+      notice: 'hsl(40, 100%, 58%)',
+      warning: 'hsl(40, 100%, 58%)',
+      danger: 'hsl(0, 90%, 58%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/relaxing.ts

@@ -0,0 +1,18 @@
+import type { Theme } from '@yaakapp/api';
+
+export const relaxing: Theme = {
+  id: 'relaxing',
+  label: 'Relaxing',
+  dark: true,
+  base: {
+    surface: 'hsl(267,33%,17%)',
+    text: 'hsl(275,49%,92%)',
+    primary: 'hsl(267,84%,81%)',
+    secondary: 'hsl(227,35%,80%)',
+    info: 'hsl(217,92%,76%)',
+    success: 'hsl(115,54%,76%)',
+    notice: 'hsl(41,86%,83%)',
+    warning: 'hsl(23,92%,75%)',
+    danger: 'hsl(343,81%,75%)',
+  },
+};

plugins/themes-yaak/src/themes/rose-pine.ts

@@ -0,0 +1,111 @@
+import type { Theme } from '@yaakapp/api';
+
+export const rosePine: Theme = {
+  id: 'rose-pine',
+  label: 'Rosé Pine',
+  dark: true,
+  base: {
+    surface: 'hsl(249,22%,12%)',
+    text: 'hsl(245,50%,91%)',
+    textSubtle: 'hsl(248,15%,61%)',
+    textSubtlest: 'hsl(249,12%,47%)',
+    primary: 'hsl(267,57%,78%)',
+    secondary: 'hsl(249,12%,47%)',
+    info: 'hsl(199,49%,60%)',
+    success: 'hsl(180,43%,73%)',
+    notice: 'hsl(35,88%,72%)',
+    warning: 'hsl(1,74%,79%)',
+    danger: 'hsl(343,76%,68%)',
+  },
+  components: {
+    responsePane: {
+      surface: 'hsl(247,23%,15%)',
+    },
+    sidebar: {
+      surface: 'hsl(247,23%,15%)',
+    },
+    menu: {
+      surface: 'hsl(248,21%,26%)',
+      textSubtle: 'hsl(248,15%,66%)',
+      textSubtlest: 'hsl(249,12%,52%)',
+      border: 'hsl(248,21%,35%)',
+      borderSubtle: 'hsl(248,21%,33%)',
+    },
+  },
+};
+
+export const rosePineMoon: Theme = {
+  id: 'rose-pine-moon',
+  label: 'Rosé Pine Moon',
+  dark: true,
+  base: {
+    surface: 'hsl(246,24%,17%)',
+    text: 'hsl(245,50%,91%)',
+    textSubtle: 'hsl(248,15%,61%)',
+    textSubtlest: 'hsl(249,12%,47%)',
+    primary: 'hsl(267,57%,78%)',
+    secondary: 'hsl(248,15%,61%)',
+    info: 'hsl(197,48%,60%)',
+    success: 'hsl(197,48%,60%)',
+    notice: 'hsl(35,88%,72%)',
+    warning: 'hsl(2,66%,75%)',
+    danger: 'hsl(343,76%,68%)',
+  },
+  components: {
+    responsePane: {
+      surface: 'hsl(247,24%,20%)',
+    },
+    sidebar: {
+      surface: 'hsl(247,24%,20%)',
+    },
+    menu: {
+      surface: 'hsl(248,21%,26%)',
+      textSubtle: 'hsl(248,15%,61%)',
+      textSubtlest: 'hsl(249,12%,55%)',
+      border: 'hsl(248,21%,35%)',
+      borderSubtle: 'hsl(248,21%,31%)',
+    },
+  },
+};
+
+export const rosePineDawn: Theme = {
+  id: 'rose-pine-dawn',
+  label: 'Rosé Pine Dawn',
+  dark: false,
+  base: {
+    surface: 'hsl(32,57%,95%)',
+    border: 'hsl(10,9%,86%)',
+    surfaceHighlight: 'hsl(25,35%,93%)',
+    text: 'hsl(248,19%,40%)',
+    textSubtle: 'hsl(248,12%,52%)',
+    textSubtlest: 'hsl(257,9%,61%)',
+    primary: 'hsl(271,27%,56%)',
+    secondary: 'hsl(249,12%,47%)',
+    info: 'hsl(197,52%,36%)',
+    success: 'hsl(188,31%,45%)',
+    notice: 'hsl(34,64%,49%)',
+    warning: 'hsl(2,47%,64%)',
+    danger: 'hsl(343,35%,55%)',
+  },
+  components: {
+    responsePane: {
+      border: 'hsl(20,12%,90%)',
+    },
+    sidebar: {
+      border: 'hsl(20,12%,90%)',
+    },
+    appHeader: {
+      border: 'hsl(20,12%,90%)',
+    },
+    input: {
+      border: 'hsl(10,9%,86%)',
+    },
+    dialog: {
+      border: 'hsl(20,12%,90%)',
+    },
+    menu: {
+      surface: 'hsl(28,40%,92%)',
+      border: 'hsl(10,9%,86%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/shades-of-purple.ts

@@ -0,0 +1,99 @@
+import type { Theme } from '@yaakapp/api';
+
+export const shadesOfPurple: Theme = {
+  id: 'shades-of-purple',
+  label: 'Shades of Purple',
+  dark: true,
+  base: {
+    surface: '#2D2B55',
+    surfaceHighlight: '#1F1F41',
+    text: '#FFFFFF',
+    textSubtle: '#A599E9',
+    textSubtlest: '#7E72C4',
+    primary: '#FAD000',
+    secondary: '#A599E9',
+    info: '#80FFBB',
+    success: '#3AD900',
+    notice: '#FAD000',
+    warning: '#FF9D00',
+    danger: '#EC3A37F5',
+  },
+  components: {
+    dialog: {
+      surface: '#1E1E3F',
+    },
+    sidebar: {
+      surface: '#222244',
+      border: '#1E1E3F',
+    },
+    input: {
+      border: '#7E72C4',
+    },
+    appHeader: {
+      surface: '#1E1E3F',
+      border: '#1E1E3F',
+    },
+    responsePane: {
+      surface: 'hsl(240,33%,20%)',
+      border: 'hsl(240,33%,20%)',
+    },
+    button: {
+      primary: '#FAD000',
+      secondary: '#A599E9',
+      info: '#80FFBB',
+      success: '#3AD900',
+      notice: '#FAD000',
+      warning: '#FF9D00',
+      danger: '#EC3A37F5',
+    },
+  },
+};
+
+export const shadesOfPurpleSuperDark: Theme = {
+  id: 'shades-of-purple-super-dark',
+  label: 'Shades of Purple (Super Dark)',
+  dark: true,
+  base: {
+    surface: '#191830',
+    surfaceHighlight: '#1F1E3A',
+    text: '#FFFFFF',
+    textSubtle: '#A599E9',
+    textSubtlest: '#7E72C4',
+    primary: '#FAD000',
+    secondary: '#A599E9',
+    info: '#80FFBB',
+    success: '#3AD900',
+    notice: '#FAD000',
+    warning: '#FF9D00',
+    danger: '#EC3A37F5',
+  },
+  components: {
+    dialog: {
+      surface: '#15152b',
+    },
+    input: {
+      border: '#2D2B55',
+    },
+    sidebar: {
+      surface: '#131327',
+      border: '#131327',
+    },
+    appHeader: {
+      surface: '#15152a',
+      border: '#15152a',
+    },
+    responsePane: {
+      surface: '#131327',
+      border: '#131327',
+    },
+    button: {
+      primary: '#FAD000',
+      secondary: '#A599E9',
+      info: '#80FFBB',
+      success: '#3AD900',
+      notice: '#FAD000',
+      warning: '#FF9D00',
+      danger: '#EC3A37F5',
+    },
+  },
+};

plugins/themes-yaak/src/themes/slack.ts

@@ -0,0 +1,47 @@
+import type { Theme } from '@yaakapp/api';
+
+export const slackAubergine: Theme = {
+  id: 'slack-aubergine',
+  label: 'Slack Aubergine',
+  dark: true,
+  base: {
+    surface: 'hsl(270, 25%, 18%)',
+    surfaceHighlight: 'hsl(270, 22%, 24%)',
+    text: 'hsl(0, 0%, 100%)',
+    textSubtle: 'hsl(270, 15%, 75%)',
+    textSubtlest: 'hsl(270, 12%, 58%)',
+    primary: 'hsl(165, 100%, 40%)',
+    secondary: 'hsl(270, 12%, 65%)',
+    info: 'hsl(195, 95%, 55%)',
+    success: 'hsl(145, 80%, 50%)',
+    notice: 'hsl(43, 100%, 55%)',
+    warning: 'hsl(43, 100%, 50%)',
+    danger: 'hsl(0, 80%, 55%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(270, 25%, 14%)',
+    },
+    sidebar: {
+      surface: 'hsl(270, 23%, 15%)',
+      border: 'hsl(270, 22%, 22%)',
+    },
+    appHeader: {
+      surface: 'hsl(270, 25%, 13%)',
+      border: 'hsl(270, 22%, 20%)',
+    },
+    responsePane: {
+      surface: 'hsl(270, 23%, 15%)',
+      border: 'hsl(270, 22%, 22%)',
+    },
+    button: {
+      primary: 'hsl(165, 100%, 35%)',
+      secondary: 'hsl(270, 12%, 58%)',
+      info: 'hsl(195, 95%, 48%)',
+      success: 'hsl(145, 80%, 45%)',
+      notice: 'hsl(43, 100%, 48%)',
+      warning: 'hsl(43, 100%, 45%)',
+      danger: 'hsl(0, 80%, 48%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/solarized.ts

@@ -0,0 +1,77 @@
+import type { Theme } from '@yaakapp/api';
+
+export const solarizedDark: Theme = {
+  id: 'solarized-dark',
+  label: 'Solarized Dark',
+  dark: true,
+  base: {
+    surface: '#002b36',
+    surfaceHighlight: '#073642',
+    text: '#839496',
+    textSubtle: '#657b83',
+    textSubtlest: '#586e75',
+    primary: '#268bd2',
+    secondary: '#657b83',
+    info: '#268bd2',
+    success: '#859900',
+    notice: '#b58900',
+    warning: '#cb4b16',
+    danger: '#dc322f',
+  },
+  components: {
+    dialog: {
+      surface: '#002b36',
+    },
+    sidebar: {
+      surface: '#073642',
+      border: 'hsl(192,81%,17%)',
+    },
+    appHeader: {
+      surface: '#002b36',
+      border: 'hsl(192,81%,16%)',
+    },
+    responsePane: {
+      surface: '#073642',
+      border: 'hsl(192,81%,17%)',
+    },
+    button: {
+      primary: '#268bd2',
+      secondary: '#657b83',
+      info: '#268bd2',
+      success: '#859900',
+      notice: '#b58900',
+      warning: '#cb4b16',
+      danger: '#dc322f',
+    },
+  },
+};
+
+export const solarizedLight: Theme = {
+  id: 'solarized-light',
+  label: 'Solarized Light',
+  dark: false,
+  base: {
+    surface: '#fdf6e3',
+    surfaceHighlight: '#eee8d5',
+    text: '#657b83',
+    textSubtle: '#839496',
+    textSubtlest: '#93a1a1',
+    primary: '#268bd2',
+    secondary: '#839496',
+    info: '#268bd2',
+    success: '#859900',
+    notice: '#b58900',
+    warning: '#cb4b16',
+    danger: '#dc322f',
+  },
+  components: {
+    sidebar: {
+      surface: '#eee8d5',
+      border: '#d3cbb7',
+    },
+    appHeader: {
+      surface: '#eee8d5',
+      border: '#d3cbb7',
+    },
+  },
+};

plugins/themes-yaak/src/themes/synthwave-84.ts

@@ -0,0 +1,56 @@
+import type { Theme } from '@yaakapp/api';
+
+export const synthwave84: Theme = {
+  id: 'synthwave-84',
+  label: "SynthWave '84",
+  dark: true,
+  base: {
+    surface: 'hsl(253, 45%, 15%)',
+    surfaceHighlight: 'hsl(253, 40%, 20%)',
+    text: 'hsl(300, 50%, 90%)',
+    textSubtle: 'hsl(280, 25%, 65%)',
+    textSubtlest: 'hsl(280, 20%, 50%)',
+    primary: 'hsl(177, 100%, 55%)',
+    secondary: 'hsl(280, 20%, 60%)',
+    info: 'hsl(320, 100%, 75%)',
+    success: 'hsl(83, 100%, 60%)',
+    notice: 'hsl(57, 100%, 60%)',
+    warning: 'hsl(30, 100%, 60%)',
+    danger: 'hsl(340, 100%, 65%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(253, 45%, 12%)',
+    },
+    sidebar: {
+      surface: 'hsl(253, 42%, 18%)',
+      border: 'hsl(253, 40%, 22%)',
+    },
+    appHeader: {
+      surface: 'hsl(253, 45%, 11%)',
+      border: 'hsl(253, 40%, 18%)',
+    },
+    responsePane: {
+      surface: 'hsl(253, 42%, 18%)',
+      border: 'hsl(253, 40%, 22%)',
+    },
+    button: {
+      primary: 'hsl(177, 100%, 48%)',
+      secondary: 'hsl(280, 20%, 53%)',
+      info: 'hsl(320, 100%, 68%)',
+      success: 'hsl(83, 100%, 53%)',
+      notice: 'hsl(57, 100%, 53%)',
+      warning: 'hsl(30, 100%, 53%)',
+      danger: 'hsl(340, 100%, 58%)',
+    },
+    editor: {
+      primary: 'hsl(177, 100%, 55%)',
+      secondary: 'hsl(280, 20%, 60%)',
+      info: 'hsl(320, 100%, 75%)',
+      success: 'hsl(83, 100%, 60%)',
+      notice: 'hsl(57, 100%, 60%)',
+      warning: 'hsl(30, 100%, 60%)',
+      danger: 'hsl(340, 100%, 65%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/tokyo-night.ts

@@ -0,0 +1,121 @@
+import type { Theme } from '@yaakapp/api';
+
+export const tokyoNight: Theme = {
+  id: 'tokyo-night',
+  label: 'Tokyo Night',
+  dark: true,
+  base: {
+    surface: 'hsl(235, 21%, 13%)',
+    surfaceHighlight: 'hsl(235, 18%, 18%)',
+    text: 'hsl(229, 28%, 76%)',
+    textSubtle: 'hsl(232, 18%, 52%)',
+    textSubtlest: 'hsl(234, 16%, 40%)',
+    primary: 'hsl(266, 100%, 78%)',
+    secondary: 'hsl(232, 18%, 52%)',
+    info: 'hsl(217, 100%, 73%)',
+    success: 'hsl(158, 57%, 63%)',
+    notice: 'hsl(40, 67%, 65%)',
+    warning: 'hsl(25, 75%, 58%)',
+    danger: 'hsl(358, 100%, 70%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(235, 21%, 11%)',
+    },
+    sidebar: {
+      surface: 'hsl(235, 21%, 11%)',
+      border: 'hsl(235, 18%, 16%)',
+    },
+    appHeader: {
+      surface: 'hsl(235, 21%, 9%)',
+      border: 'hsl(235, 18%, 14%)',
+    },
+    responsePane: {
+      surface: 'hsl(235, 21%, 11%)',
+      border: 'hsl(235, 18%, 16%)',
+    },
+    button: {
+      primary: 'hsl(266, 100%, 71%)',
+      info: 'hsl(217, 100%, 66%)',
+      success: 'hsl(158, 57%, 56%)',
+      notice: 'hsl(40, 67%, 58%)',
+      warning: 'hsl(25, 75%, 52%)',
+      danger: 'hsl(358, 100%, 63%)',
+    },
+  },
+};
+
+export const tokyoNightStorm: Theme = {
+  id: 'tokyo-night-storm',
+  label: 'Tokyo Night Storm',
+  dark: true,
+  base: {
+    surface: 'hsl(232, 25%, 17%)',
+    surfaceHighlight: 'hsl(232, 22%, 22%)',
+    text: 'hsl(229, 28%, 76%)',
+    textSubtle: 'hsl(232, 18%, 52%)',
+    textSubtlest: 'hsl(234, 16%, 40%)',
+    primary: 'hsl(266, 100%, 78%)',
+    secondary: 'hsl(232, 18%, 52%)',
+    info: 'hsl(217, 100%, 73%)',
+    success: 'hsl(158, 57%, 63%)',
+    notice: 'hsl(40, 67%, 65%)',
+    warning: 'hsl(25, 75%, 58%)',
+    danger: 'hsl(358, 100%, 70%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(232, 25%, 14%)',
+    },
+    sidebar: {
+      surface: 'hsl(232, 25%, 14%)',
+      border: 'hsl(232, 22%, 20%)',
+    },
+    appHeader: {
+      surface: 'hsl(232, 25%, 12%)',
+      border: 'hsl(232, 22%, 18%)',
+    },
+    responsePane: {
+      surface: 'hsl(232, 25%, 14%)',
+      border: 'hsl(232, 22%, 20%)',
+    },
+    button: {
+      primary: 'hsl(266, 100%, 71%)',
+      info: 'hsl(217, 100%, 66%)',
+      success: 'hsl(158, 57%, 56%)',
+      notice: 'hsl(40, 67%, 58%)',
+      warning: 'hsl(25, 75%, 52%)',
+      danger: 'hsl(358, 100%, 63%)',
+    },
+  },
+};
+
+export const tokyoNightDay: Theme = {
+  id: 'tokyo-night-day',
+  label: 'Tokyo Night Day',
+  dark: false,
+  base: {
+    surface: 'hsl(212, 100%, 98%)',
+    surfaceHighlight: 'hsl(212, 60%, 93%)',
+    text: 'hsl(233, 26%, 27%)',
+    textSubtle: 'hsl(232, 18%, 45%)',
+    textSubtlest: 'hsl(232, 12%, 55%)',
+    primary: 'hsl(290, 80%, 45%)',
+    secondary: 'hsl(232, 18%, 50%)',
+    info: 'hsl(217, 88%, 52%)',
+    success: 'hsl(160, 75%, 35%)',
+    notice: 'hsl(41, 80%, 40%)',
+    warning: 'hsl(20, 80%, 48%)',
+    danger: 'hsl(359, 65%, 48%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(212, 60%, 95%)',
+      border: 'hsl(212, 40%, 88%)',
+    },
+    appHeader: {
+      surface: 'hsl(212, 60%, 93%)',
+      border: 'hsl(212, 40%, 86%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/triangle.ts

@@ -0,0 +1,44 @@
+import type { Theme } from '@yaakapp/api';
+
+export const triangle: Theme = {
+  id: 'triangle',
+  dark: true,
+  label: 'Triangle',
+  base: {
+    surface: 'rgb(0,0,0)',
+    surfaceHighlight: 'rgb(21,21,21)',
+    surfaceActive: 'rgb(31,31,31)',
+    text: 'rgb(237,237,237)',
+    textSubtle: 'rgb(161,161,161)',
+    textSubtlest: 'rgb(115,115,115)',
+    border: 'rgb(31,31,31)',
+    primary: 'rgb(196,114,251)',
+    secondary: 'rgb(161,161,161)',
+    info: 'rgb(71,168,255)',
+    success: 'rgb(0,202,81)',
+    notice: 'rgb(255,175,0)',
+    warning: '#FF4C8D',
+    danger: '#fd495a',
+  },
+  components: {
+    editor: {
+      danger: '#FF4C8D',
+      warning: '#fd495a',
+    },
+    dialog: {
+      surface: 'rgb(10,10,10)',
+      border: 'rgb(31,31,31)',
+    },
+    sidebar: {
+      border: 'rgb(31,31,31)',
+    },
+    responsePane: {
+      surface: 'rgb(10,10,10)',
+      border: 'rgb(31,31,31)',
+    },
+    appHeader: {
+      surface: 'rgb(10,10,10)',
+      border: 'rgb(31,31,31)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/vitesse.ts

@@ -0,0 +1,77 @@
+import type { Theme } from '@yaakapp/api';
+
+export const vitesseDark: Theme = {
+  id: 'vitesse-dark',
+  label: 'Vitesse Dark',
+  dark: true,
+  base: {
+    surface: 'hsl(220, 13%, 10%)',
+    surfaceHighlight: 'hsl(220, 12%, 15%)',
+    text: 'hsl(220, 10%, 80%)',
+    textSubtle: 'hsl(220, 8%, 55%)',
+    textSubtlest: 'hsl(220, 6%, 42%)',
+    primary: 'hsl(143, 50%, 55%)',
+    secondary: 'hsl(220, 8%, 55%)',
+    info: 'hsl(214, 60%, 65%)',
+    success: 'hsl(143, 50%, 55%)',
+    notice: 'hsl(45, 65%, 65%)',
+    warning: 'hsl(30, 60%, 60%)',
+    danger: 'hsl(355, 60%, 60%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(220, 13%, 7%)',
+    },
+    sidebar: {
+      surface: 'hsl(220, 12%, 8%)',
+      border: 'hsl(220, 10%, 14%)',
+    },
+    appHeader: {
+      surface: 'hsl(220, 13%, 6%)',
+      border: 'hsl(220, 10%, 12%)',
+    },
+    responsePane: {
+      surface: 'hsl(220, 12%, 8%)',
+      border: 'hsl(220, 10%, 14%)',
+    },
+    button: {
+      primary: 'hsl(143, 50%, 48%)',
+      secondary: 'hsl(220, 8%, 48%)',
+      info: 'hsl(214, 60%, 58%)',
+      success: 'hsl(143, 50%, 48%)',
+      notice: 'hsl(45, 65%, 58%)',
+      warning: 'hsl(30, 60%, 53%)',
+      danger: 'hsl(355, 60%, 53%)',
+    },
+  },
+};
+
+export const vitesseLight: Theme = {
+  id: 'vitesse-light',
+  label: 'Vitesse Light',
+  dark: false,
+  base: {
+    surface: 'hsl(0, 0%, 100%)',
+    surfaceHighlight: 'hsl(40, 20%, 96%)',
+    text: 'hsl(0, 0%, 24%)',
+    textSubtle: 'hsl(0, 0%, 45%)',
+    textSubtlest: 'hsl(0, 0%, 55%)',
+    primary: 'hsl(143, 40%, 40%)',
+    secondary: 'hsl(0, 0%, 45%)',
+    info: 'hsl(214, 50%, 48%)',
+    success: 'hsl(143, 40%, 40%)',
+    notice: 'hsl(40, 60%, 42%)',
+    warning: 'hsl(25, 60%, 48%)',
+    danger: 'hsl(345, 50%, 48%)',
+  },
+  components: {
+    sidebar: {
+      surface: 'hsl(40, 20%, 97%)',
+      border: 'hsl(40, 15%, 92%)',
+    },
+    appHeader: {
+      surface: 'hsl(40, 20%, 95%)',
+      border: 'hsl(40, 15%, 90%)',
+    },
+  },
+};

plugins/themes-yaak/src/themes/winter-is-coming.ts

@@ -0,0 +1,47 @@
+import type { Theme } from '@yaakapp/api';
+
+export const winterIsComing: Theme = {
+  id: 'winter-is-coming',
+  label: 'Winter is Coming',
+  dark: true,
+  base: {
+    surface: 'hsl(216, 50%, 10%)',
+    surfaceHighlight: 'hsl(216, 40%, 15%)',
+    text: 'hsl(210, 20%, 88%)',
+    textSubtle: 'hsl(210, 15%, 60%)',
+    textSubtlest: 'hsl(210, 10%, 45%)',
+    primary: 'hsl(176, 85%, 60%)',
+    secondary: 'hsl(210, 15%, 60%)',
+    info: 'hsl(210, 65%, 65%)',
+    success: 'hsl(100, 65%, 55%)',
+    notice: 'hsl(45, 100%, 65%)',
+    warning: 'hsl(30, 90%, 55%)',
+    danger: 'hsl(350, 100%, 65%)',
+  },
+  components: {
+    dialog: {
+      surface: 'hsl(216, 50%, 7%)',
+    },
+    sidebar: {
+      surface: 'hsl(216, 45%, 12%)',
+      border: 'hsl(216, 40%, 17%)',
+    },
+    appHeader: {
+      surface: 'hsl(216, 50%, 8%)',
+      border: 'hsl(216, 40%, 14%)',
+    },
+    responsePane: {
+      surface: 'hsl(216, 45%, 12%)',
+      border: 'hsl(216, 40%, 17%)',
+    },
+    button: {
+      primary: 'hsl(176, 85%, 53%)',
+      secondary: 'hsl(210, 15%, 53%)',
+      info: 'hsl(210, 65%, 58%)',
+      success: 'hsl(100, 65%, 48%)',
+      notice: 'hsl(45, 100%, 58%)',
+      warning: 'hsl(30, 90%, 48%)',
+      danger: 'hsl(350, 100%, 58%)',
+    },
+  },
+};

rustfmt.toml

@@ -5,3 +5,4 @@ chain_width = 100
 max_width = 100
 single_line_if_else_max_width = 100
 fn_call_width = 100
+struct_lit_width = 100

scripts/vendor-plugins.cjs

@@ -1,13 +1,28 @@
-const { readdirSync, cpSync } = require('node:fs');
+const { readdirSync, cpSync, existsSync } = require('node:fs');
 const path = require('node:path');
 
 const pluginsDir = path.join(__dirname, '..', 'plugins');
+const externalPluginsDir = path.join(__dirname, '..', 'plugins-external');
+
+// Get list of external (non-bundled) plugins
+const externalPlugins = new Set();
+if (existsSync(externalPluginsDir)) {
+  for (const name of readdirSync(externalPluginsDir)) {
+    if (!name.startsWith('.')) {
+      externalPlugins.add(name);
+    }
+  }
+}
 
 console.log('Copying Yaak plugins to', pluginsDir);
 
 for (const name of readdirSync(pluginsDir)) {
   const dir = path.join(pluginsDir, name);
   if (name.startsWith('.')) continue;
+  if (externalPlugins.has(name)) {
+    console.log(`Skipping ${name} (external plugin)`);
+    continue;
+  }
   const destDir = path.join(__dirname, '../src-tauri/vendored/plugins/', name);
   console.log(`Copying ${name} to ${destDir}`);
   cpSync(path.join(dir, 'package.json'), path.join(destDir, 'package.json'));

src-tauri/Cargo.lock

@@ -192,12 +192,14 @@ version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b37fc50485c4f3f736a4fb14199f6d5f5ba008d7f28fe710306c92780f004c07"
 dependencies = [
- "brotli",
+ "brotli 8.0.1",
  "flate2",
  "futures-core",
  "memchr",
  "pin-project-lite",
  "tokio",
+ "zstd",
+ "zstd-safe",
 ]
 
 [[package]]
@@ -473,6 +475,15 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "block2"
 version = "0.5.1"
@@ -527,6 +538,17 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "brotli"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor 4.0.3",
+]
+
 [[package]]
 name = "brotli"
 version = "8.0.1"
@@ -535,7 +557,17 @@ checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
- "brotli-decompressor",
+ "brotli-decompressor 5.0.0",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a334ef7c9e23abf0ce748e8cd309037da93e606ad52eb372e4ce327a0dcfbdfd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
 ]
 
 [[package]]
@@ -700,6 +732,15 @@ dependencies = [
  "toml 0.8.23",
 ]
 
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "cc"
 version = "1.2.26"
@@ -923,29 +964,10 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
 dependencies = [
- "percent-encoding",
  "time",
  "version_check",
 ]
 
-[[package]]
-name = "cookie_store"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9"
-dependencies = [
- "cookie",
- "document-features",
- "idna",
- "log",
- "publicsuffix",
- "serde",
- "serde_derive",
- "serde_json",
- "time",
- "url",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1230,6 +1252,15 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "des"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1333,15 +1364,6 @@ dependencies = [
  "const-random",
 ]
 
-[[package]]
-name = "document-features"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
-dependencies = [
- "litrs",
-]
-
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
@@ -2623,6 +2645,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
+ "block-padding",
  "generic-array",
 ]
 
@@ -2991,12 +3014,6 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
-[[package]]
-name = "litrs"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
-
 [[package]]
 name = "lock_api"
 version = "0.4.13"
@@ -3009,9 +3026,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 dependencies = [
  "value-bag",
 ]
@@ -3739,6 +3756,23 @@ dependencies = [
  "thiserror 2.0.17",
 ]
 
+[[package]]
+name = "p12"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4873306de53fe82e7e484df31e1e947d61514b6ea2ed6cd7b45d63006fd9224"
+dependencies = [
+ "cbc",
+ "cipher",
+ "des",
+ "getrandom 0.2.16",
+ "hmac",
+ "lazy_static",
+ "rc2",
+ "sha1",
+ "yasna",
+]
+
 [[package]]
 name = "pango"
 version = "0.18.3"
@@ -4221,12 +4255,6 @@ dependencies = [
  "prost",
 ]
 
-[[package]]
-name = "psl-types"
-version = "2.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
-
 [[package]]
 name = "ptr_meta"
 version = "0.1.4"
@@ -4247,16 +4275,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "publicsuffix"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf"
-dependencies = [
- "idna",
- "psl-types",
-]
-
 [[package]]
 name = "quick-xml"
 version = "0.32.0"
@@ -4489,6 +4507,15 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
+[[package]]
+name = "rc2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.12"
@@ -4556,8 +4583,6 @@ dependencies = [
  "async-compression",
  "base64 0.22.1",
  "bytes",
- "cookie",
- "cookie_store",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -4598,18 +4623,6 @@ dependencies = [
  "webpki-roots",
 ]
 
-[[package]]
-name = "reqwest_cookie_store"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0b36498c7452f11b1833900f31fbb01fc46be20992a50269c88cf59d79f54e9"
-dependencies = [
- "bytes",
- "cookie_store",
- "reqwest",
- "url",
-]
-
 [[package]]
 name = "rfd"
 version = "0.15.3"
@@ -4787,6 +4800,15 @@ dependencies = [
  "security-framework 3.5.1",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "rustls-pki-types"
 version = "1.12.0"
@@ -5620,9 +5642,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.9.2"
+version = "2.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bceb52453e507c505b330afe3398510e87f428ea42b6e76ecb6bd63b15965b5"
+checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5672,9 +5694,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.5.1"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a924b6c50fe83193f0f8b14072afa7c25b7a72752a2a73d9549b463f5fe91a38"
+checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -5694,12 +5716,12 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c1fe64c74cc40f90848281a90058a6db931eb400b60205840e09801ee30f190"
+checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf"
 dependencies = [
  "base64 0.22.1",
- "brotli",
+ "brotli 8.0.1",
  "ico",
  "json-patch",
  "plist",
@@ -5721,9 +5743,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260c5d2eb036b76206b9fca20b7be3614cfd21046c5396f7959e0e64a4b07f2f"
+checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -5735,9 +5757,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076c78a474a7247c90cad0b6e87e593c4c620ed4efdb79cbe0214f0021f6c39d"
+checksum = "0e1d0a4860b7ff570c891e1d2a586bf1ede205ff858fbc305e0b5ae5d14c1377"
 dependencies = [
  "anyhow",
  "glob",
@@ -5752,9 +5774,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-clipboard-manager"
-version = "2.3.0"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adddd9e9275b20e77af3061d100a25a884cced3c4c9ef680bd94dd0f7e26c1ca"
+checksum = "206dc20af4ed210748ba945c2774e60fd0acd52b9a73a028402caf809e9b6ecf"
 dependencies = [
  "arboard",
  "log",
@@ -5767,9 +5789,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-deep-link"
-version = "2.4.3"
+version = "2.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd67112fb1131834c2a7398ffcba520dbbf62c17de3b10329acd1a3554b1a9bb"
+checksum = "6e82759f7c7d51de3cbde51c04b3f2332de52436ed84541182cd8944b04e9e73"
 dependencies = [
  "dunce",
  "plist",
@@ -5828,9 +5850,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-log"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c1438bc7662acd16d508c919b3c087efd63669a4c75625dff829b1c75975ec"
+checksum = "d5709c792b8630290b5d9811a1f8fe983dd925fc87c7fc7f4923616458cd00b6"
 dependencies = [
  "android_logger",
  "byte-unit",
@@ -5850,9 +5872,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-opener"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "786156aa8e89e03d271fbd3fe642207da8e65f3c961baa9e2930f332bf80a1f5"
+checksum = "c26b72571d25dee25667940027114e60f569fc3974f8cefbe50c2cbc5fd65e3b"
 dependencies = [
  "dunce",
  "glob",
@@ -5872,9 +5894,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-os"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a1c77ebf6f20417ab2a74e8c310820ba52151406d0c80fbcea7df232e3f6ba"
+checksum = "d8f08346c8deb39e96f86973da0e2d76cbb933d7ac9b750f6dc4daf955a6f997"
 dependencies = [
  "gethostname 1.0.2",
  "log",
@@ -5911,9 +5933,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-single-instance"
-version = "2.3.4"
+version = "2.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb9cac815bf11c4a80fb498666bcdad66d65b89e3ae24669e47806febb76389c"
+checksum = "dd707f8c86b4e3004e2c141fa24351f1909ba40ce1b8437e30d5ed5277dd3710"
 dependencies = [
  "serde",
  "serde_json",
@@ -5959,9 +5981,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-window-state"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5f6fe3291bfa609c7e0b0ee3bedac294d94c7018934086ce782c1d0f2a468e"
+checksum = "73736611e14142408d15353e21e3cca2f12a3cfb523ad0ce85999b6d2ef1a704"
 dependencies = [
  "bitflags 2.9.1",
  "log",
@@ -5974,9 +5996,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.9.1"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9368f09358496f2229313fccb37682ad116b7f46fa76981efe116994a0628926"
+checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892"
 dependencies = [
  "cookie",
  "dpi",
@@ -5999,9 +6021,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.9.1"
+version = "2.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929f5df216f5c02a9e894554401bcdab6eec3e39ec6a4a7731c7067fc8688a93"
+checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065"
 dependencies = [
  "gtk",
  "http",
@@ -6026,12 +6048,12 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b8bbe426abdbf52d050e52ed693130dbd68375b9ad82a3fb17efb4c8d85673"
+checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490"
 dependencies = [
  "anyhow",
- "brotli",
+ "brotli 8.0.1",
  "cargo_metadata",
  "ctor",
  "dunce",
@@ -6810,9 +6832,9 @@ dependencies = [
 
 [[package]]
 name = "value-bag"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0"
 
 [[package]]
 name = "vcpkg"
@@ -7114,9 +7136,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a83f7e1a9f8712695c03eabe9ed3fbca0feff0152f33f12593e5a6303cb1a4"
+checksum = "ee3e3b5f5e80bc89f30ce8d0343bf4e5f12341c51f3e26cbeecbc7c85443e85b"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -7821,7 +7843,6 @@ dependencies = [
  "openssl-sys",
  "rand 0.9.1",
  "reqwest",
- "reqwest_cookie_store",
  "serde",
  "serde_json",
  "tauri",
@@ -7840,6 +7861,7 @@ dependencies = [
  "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
+ "tokio-util",
  "ts-rs",
  "uuid",
  "yaak-common",
@@ -7855,6 +7877,7 @@ dependencies = [
  "yaak-sse",
  "yaak-sync",
  "yaak-templates",
+ "yaak-tls",
  "yaak-ws",
 ]
 
@@ -7865,6 +7888,7 @@ dependencies = [
  "regex",
  "reqwest",
  "serde",
+ "serde_json",
  "tauri",
  "thiserror 2.0.17",
 ]
@@ -7933,32 +7957,44 @@ dependencies = [
  "serde_json",
  "tauri",
  "tauri-plugin-shell",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-stream",
  "tonic",
  "tonic-reflection",
  "uuid",
- "yaak-http",
+ "yaak-tls",
 ]
 
 [[package]]
 name = "yaak-http"
 version = "0.1.0"
 dependencies = [
+ "async-compression",
+ "async-trait",
+ "brotli 7.0.0",
+ "bytes",
+ "cookie",
+ "flate2",
+ "futures-util",
  "hyper-util",
  "log",
+ "mime_guess",
  "regex",
  "reqwest",
- "reqwest_cookie_store",
- "rustls",
- "rustls-platform-verifier",
  "serde",
+ "serde_json",
  "tauri",
  "thiserror 2.0.17",
  "tokio",
+ "tokio-util",
  "tower-service",
+ "url",
  "urlencoding",
+ "yaak-common",
  "yaak-models",
+ "yaak-tls",
+ "zstd",
 ]
 
 [[package]]
@@ -8093,14 +8129,28 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "yaak-tls"
+version = "0.1.0"
+dependencies = [
+ "log",
+ "p12",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-platform-verifier",
+ "serde",
+ "thiserror 2.0.17",
+ "url",
+ "yaak-models",
+]
+
 [[package]]
 name = "yaak-ws"
 version = "0.1.0"
 dependencies = [
  "futures-util",
  "log",
- "md5 0.7.0",
- "reqwest_cookie_store",
+ "md5 0.8.0",
  "serde",
  "serde_json",
  "tauri",
@@ -8108,12 +8158,20 @@ dependencies = [
  "thiserror 2.0.17",
  "tokio",
  "tokio-tungstenite",
+ "url",
  "yaak-http",
  "yaak-models",
  "yaak-plugins",
  "yaak-templates",
+ "yaak-tls",
 ]
 
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+
 [[package]]
 name = "yoke"
 version = "0.8.0"

src-tauri/Cargo.toml

@@ -12,6 +12,7 @@ members = [
     "yaak-sse",
     "yaak-sync",
     "yaak-templates",
+    "yaak-tls",
     "yaak-ws",
 ]
 
@@ -28,7 +29,9 @@ name = "tauri_app_lib"
 crate-type = ["staticlib", "cdylib", "lib"]
 
 [profile.release]
-strip = true  # Automatically strip symbols from the binary.
+# 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 = []
@@ -37,7 +40,7 @@ updater = []
 license = ["yaak-license"]
 
 [build-dependencies]
-tauri-build = { version = "2.5.0", features = [] }
+tauri-build = { version = "2.5.3", features = [] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 openssl-sys = { version = "0.9.105", features = ["vendored"] } # For Ubuntu installation to work
@@ -52,25 +55,25 @@ log = { workspace = true }
 md5 = "0.8.0"
 mime_guess = "2.0.5"
 rand = "0.9.0"
-reqwest = { workspace = true, features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "rustls-tls-manual-roots-no-provider", "socks", "http2"] }
-reqwest_cookie_store = { workspace = true }
+reqwest = { workspace = true, features = ["multipart", "gzip", "brotli", "deflate", "json", "rustls-tls-manual-roots-no-provider", "socks", "http2"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["raw_value"] }
 tauri = { workspace = true, features = ["devtools", "protocol-asset"] }
-tauri-plugin-clipboard-manager = "2.3.0"
-tauri-plugin-deep-link = "2.4.3"
+tauri-plugin-clipboard-manager = "2.3.2"
+tauri-plugin-deep-link = "2.4.5"
 tauri-plugin-dialog = { workspace = true }
-tauri-plugin-fs = "2.4.2"
-tauri-plugin-log = { version = "2.7.0", features = ["colored"] }
-tauri-plugin-opener = "2.5.0"
-tauri-plugin-os = "2.3.1"
+tauri-plugin-fs = "2.4.4"
+tauri-plugin-log = { version = "2.7.1", features = ["colored"] }
+tauri-plugin-opener = "2.5.2"
+tauri-plugin-os = "2.3.2"
 tauri-plugin-shell = { workspace = true }
-tauri-plugin-single-instance = { version = "2.3.4", features = ["deep-link"] }
+tauri-plugin-single-instance = { version = "2.3.6", features = ["deep-link"] }
 tauri-plugin-updater = "2.9.0"
-tauri-plugin-window-state = "2.4.0"
+tauri-plugin-window-state = "2.4.1"
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
 tokio-stream = "0.1.17"
+tokio-util = { version = "0.7", features = ["codec"] }
 ts-rs = { workspace = true }
 uuid = "1.12.1"
 yaak-common = { workspace = true }
@@ -86,6 +89,7 @@ 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]
@@ -93,15 +97,14 @@ chrono = "0.4.42"
 hex = "0.4.3"
 keyring = "3.6.3"
 reqwest = "0.12.20"
-reqwest_cookie_store = "0.8.0"
 rustls = { version = "0.23.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.28"
-tauri = "2.9.2"
-tauri-plugin = "2.5.1"
+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"
@@ -116,3 +119,4 @@ 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" }

src-tauri/macos/entitlements.plist

@@ -6,6 +6,10 @@
         <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
         <true/>
 
+        <!-- Allow loading 1Password's dylib (signed with different Team ID) -->
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <true/>
+
         <!--    Re-enable for sandboxing. Currently disabled because auto-updater doesn't work with sandboxing.-->
         <!--    <key>com.apple.security.app-sandbox</key> <true/>-->
         <!--    <key>com.apple.security.files.user-selected.read-write</key> <true/>-->

src-tauri/src/commands.rs

@@ -1,5 +1,5 @@
 use crate::error::Result;
-use tauri::{command, AppHandle, Manager, Runtime, State, WebviewWindow};
+use tauri::{AppHandle, Manager, Runtime, State, WebviewWindow, command};
 use tauri_plugin_dialog::{DialogExt, MessageDialogKind};
 use yaak_crypto::manager::EncryptionManagerExt;
 use yaak_plugins::events::{GetThemesResponse, PluginContext};

src-tauri/src/encoding.rs

@@ -1,4 +1,4 @@
-use mime_guess::{mime, Mime};
+use mime_guess::{Mime, mime};
 use std::path::Path;
 use std::str::FromStr;
 use tokio::fs;

src-tauri/src/error.rs

@@ -1,5 +1,5 @@
-use std::io;
 use serde::{Serialize, Serializer};
+use std::io;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -59,7 +59,7 @@ pub enum Error {
     #[error("Request error: {0}")]
     RequestError(#[from] reqwest::Error),
 
-    #[error("Generic error: {0}")]
+    #[error("{0}")]
     GenericError(String),
 }
 

src-tauri/src/lib.rs

@@ -32,20 +32,24 @@ use yaak_common::window::WorkspaceWindowTrait;
 use yaak_grpc::manager::GrpcHandle;
 use yaak_grpc::{Code, ServiceDefinition, serialize_message};
 use yaak_mac_window::AppHandleMacWindowExt;
+use yaak_models::blob_manager::BlobManagerExt;
 use yaak_models::models::{
     AnyModel, CookieJar, Environment, GrpcConnection, GrpcConnectionState, GrpcEvent,
-    GrpcEventType, GrpcRequest, HttpRequest, HttpResponse, HttpResponseState, Plugin, Workspace,
-    WorkspaceMeta,
+    GrpcEventType, GrpcRequest, HttpRequest, HttpResponse, HttpResponseEvent, HttpResponseState,
+    Plugin, Workspace, WorkspaceMeta,
 };
 use yaak_models::query_manager::QueryManagerExt;
 use yaak_models::util::{BatchUpsertResult, UpdateSource, get_workspace_export_resources};
 use yaak_plugins::events::{
-    CallGrpcRequestActionArgs, CallGrpcRequestActionRequest, CallHttpRequestActionArgs,
-    CallHttpRequestActionRequest, Color, FilterResponse, GetGrpcRequestActionsResponse,
-    GetHttpAuthenticationConfigResponse, GetHttpAuthenticationSummaryResponse,
-    GetHttpRequestActionsResponse, GetTemplateFunctionConfigResponse,
-    GetTemplateFunctionSummaryResponse, InternalEvent, InternalEventPayload, JsonPrimitive,
-    PluginContext, RenderPurpose, ShowToastRequest,
+    CallFolderActionArgs, CallFolderActionRequest, CallGrpcRequestActionArgs,
+    CallGrpcRequestActionRequest, CallHttpRequestActionArgs, CallHttpRequestActionRequest,
+    CallWebsocketRequestActionArgs, CallWebsocketRequestActionRequest, CallWorkspaceActionArgs,
+    CallWorkspaceActionRequest, Color, FilterResponse, GetFolderActionsResponse,
+    GetGrpcRequestActionsResponse, GetHttpAuthenticationConfigResponse,
+    GetHttpAuthenticationSummaryResponse, GetHttpRequestActionsResponse,
+    GetTemplateFunctionConfigResponse, GetTemplateFunctionSummaryResponse,
+    GetWebsocketRequestActionsResponse, GetWorkspaceActionsResponse, InternalEvent,
+    InternalEventPayload, JsonPrimitive, PluginContext, RenderPurpose, ShowToastRequest,
 };
 use yaak_plugins::manager::PluginManager;
 use yaak_plugins::plugin_meta::PluginMetadata;
@@ -53,6 +57,7 @@ use yaak_plugins::template_callback::PluginTemplateCallback;
 use yaak_sse::sse::ServerSentEvent;
 use yaak_templates::format_json::format_json;
 use yaak_templates::{RenderErrorBehavior, RenderOptions, Tokens, transform_args};
+use yaak_tls::find_client_certificate;
 
 mod commands;
 mod encoding;
@@ -179,14 +184,15 @@ async fn cmd_grpc_reflect<R: Runtime>(
             &PluginContext::new(&window),
             RenderPurpose::Send,
         ),
-        &RenderOptions {
-            error_behavior: RenderErrorBehavior::Throw,
-        },
+        &RenderOptions { error_behavior: RenderErrorBehavior::Throw },
     )
     .await?;
 
     let uri = safe_uri(&req.url);
     let metadata = build_metadata(&window, &req, &auth_context_id).await?;
+    let settings = window.db().get_settings();
+    let client_certificate =
+        find_client_certificate(req.url.as_str(), &settings.client_certificates);
 
     Ok(grpc_handle
         .lock()
@@ -197,6 +203,7 @@ async fn cmd_grpc_reflect<R: Runtime>(
             &proto_files.iter().map(|p| PathBuf::from_str(p).unwrap()).collect(),
             &metadata,
             workspace.setting_validate_certificates,
+            client_certificate,
             skip_cache.unwrap_or(false),
         )
         .await
@@ -229,14 +236,16 @@ async fn cmd_grpc_go<R: Runtime>(
             &PluginContext::new(&window),
             RenderPurpose::Send,
         ),
-        &RenderOptions {
-            error_behavior: RenderErrorBehavior::Throw,
-        },
+        &RenderOptions { error_behavior: RenderErrorBehavior::Throw },
     )
     .await?;
 
     let metadata = build_metadata(&window, &request, &auth_context_id).await?;
 
+    // Find matching client certificate for this URL
+    let settings = app_handle.db().get_settings();
+    let client_cert = find_client_certificate(&request.url, &settings.client_certificates);
+
     let conn = app_handle.db().upsert_grpc_connection(
         &GrpcConnection {
             workspace_id: request.workspace_id.clone(),
@@ -285,6 +294,7 @@ async fn cmd_grpc_go<R: Runtime>(
             &proto_files.iter().map(|p| PathBuf::from_str(p).unwrap()).collect(),
             &metadata,
             workspace.setting_validate_certificates,
+            client_cert.clone(),
         )
         .await;
 
@@ -294,7 +304,7 @@ async fn cmd_grpc_go<R: Runtime>(
             app_handle.db().upsert_grpc_connection(
                 &GrpcConnection {
                     elapsed: start.elapsed().as_millis() as i32,
-                    error: Some(err.clone()),
+                    error: Some(err.to_string()),
                     state: GrpcConnectionState::Closed,
                     ..conn.clone()
                 },
@@ -352,9 +362,7 @@ async fn cmd_grpc_go<R: Runtime>(
                                     &PluginContext::new(&window),
                                     RenderPurpose::Send,
                                 ),
-                                &RenderOptions {
-                                    error_behavior: RenderErrorBehavior::Throw,
-                                },
+                                &RenderOptions { error_behavior: RenderErrorBehavior::Throw },
                             )
                             .await
                             .expect("Failed to render template")
@@ -404,9 +412,7 @@ async fn cmd_grpc_go<R: Runtime>(
                 &PluginContext::new(&window),
                 RenderPurpose::Send,
             ),
-            &RenderOptions {
-                error_behavior: RenderErrorBehavior::Throw,
-            },
+            &RenderOptions { error_behavior: RenderErrorBehavior::Throw },
         )
         .await?;
 
@@ -425,7 +431,9 @@ async fn cmd_grpc_go<R: Runtime>(
                 match (method_desc.is_client_streaming(), method_desc.is_server_streaming()) {
                     (true, true) => (
                         Some(
-                            connection.streaming(&service, &method, in_msg_stream, &metadata).await,
+                            connection
+                                .streaming(&service, &method, in_msg_stream, &metadata, client_cert)
+                                .await,
                         ),
                         None,
                     ),
@@ -433,7 +441,13 @@ async fn cmd_grpc_go<R: Runtime>(
                         None,
                         Some(
                             connection
-                                .client_streaming(&service, &method, in_msg_stream, &metadata)
+                                .client_streaming(
+                                    &service,
+                                    &method,
+                                    in_msg_stream,
+                                    &metadata,
+                                    client_cert,
+                                )
                                 .await,
                         ),
                     ),
@@ -441,9 +455,12 @@ async fn cmd_grpc_go<R: Runtime>(
                         Some(connection.server_streaming(&service, &method, &msg, &metadata).await),
                         None,
                     ),
-                    (false, false) => {
-                        (None, Some(connection.unary(&service, &method, &msg, &metadata).await))
-                    }
+                    (false, false) => (
+                        None,
+                        Some(
+                            connection.unary(&service, &method, &msg, &metadata, client_cert).await,
+                        ),
+                    ),
                 };
 
             if !method_desc.is_client_streaming() {
@@ -503,7 +520,7 @@ async fn cmd_grpc_go<R: Runtime>(
                         )
                         .unwrap();
                 }
-                Some(Err(e)) => {
+                Some(Err(yaak_grpc::error::Error::GrpcStreamError(e))) => {
                     app_handle
                         .db()
                         .upsert_grpc_event(
@@ -528,6 +545,21 @@ async fn cmd_grpc_go<R: Runtime>(
                         )
                         .unwrap();
                 }
+                Some(Err(e)) => {
+                    app_handle
+                        .db()
+                        .upsert_grpc_event(
+                            &GrpcEvent {
+                                error: Some(e.to_string()),
+                                status: Some(Code::Unknown as i32),
+                                content: "Failed to connect".to_string(),
+                                event_type: GrpcEventType::ConnectionEnd,
+                                ..base_event.clone()
+                            },
+                            &UpdateSource::from_window(&window),
+                        )
+                        .unwrap();
+                }
                 None => {
                     // Server streaming doesn't return the initial message
                 }
@@ -554,7 +586,7 @@ async fn cmd_grpc_go<R: Runtime>(
                         .unwrap();
                     stream.into_inner()
                 }
-                Some(Err(e)) => {
+                Some(Err(yaak_grpc::error::Error::GrpcStreamError(e))) => {
                     warn!("GRPC stream error {e:?}");
                     app_handle
                         .db()
@@ -581,6 +613,22 @@ async fn cmd_grpc_go<R: Runtime>(
                         .unwrap();
                     return;
                 }
+                Some(Err(e)) => {
+                    app_handle
+                        .db()
+                        .upsert_grpc_event(
+                            &GrpcEvent {
+                                error: Some(e.to_string()),
+                                status: Some(Code::Unknown as i32),
+                                content: "Failed to connect".to_string(),
+                                event_type: GrpcEventType::ConnectionEnd,
+                                ..base_event.clone()
+                            },
+                            &UpdateSource::from_window(&window),
+                        )
+                        .unwrap();
+                    return;
+                }
                 None => return,
             };
 
@@ -740,7 +788,7 @@ async fn cmd_http_response_body<R: Runtime>(
 ) -> YaakResult<FilterResponse> {
     let body_path = match response.body_path {
         None => {
-            return Err(GenericError("Response body path not set".to_string()));
+            return Ok(FilterResponse { content: String::new(), error: None });
         }
         Some(p) => p,
     };
@@ -761,13 +809,27 @@ async fn cmd_http_response_body<R: Runtime>(
         Some(filter) if !filter.is_empty() => {
             Ok(plugin_manager.filter_data(&window, filter, &body, content_type).await?)
         }
-        _ => Ok(FilterResponse {
-            content: body,
-            error: None,
-        }),
+        _ => Ok(FilterResponse { content: body, error: None }),
     }
 }
 
+#[tauri::command]
+async fn cmd_http_request_body<R: Runtime>(
+    app_handle: AppHandle<R>,
+    response_id: &str,
+) -> YaakResult<Option<Vec<u8>>> {
+    let body_id = format!("{}.request", response_id);
+    let chunks = app_handle.blobs().get_chunks(&body_id)?;
+
+    if chunks.is_empty() {
+        return Ok(None);
+    }
+
+    // Concatenate all chunks
+    let body: Vec<u8> = chunks.into_iter().flat_map(|c| c.data).collect();
+    Ok(Some(body))
+}
+
 #[tauri::command]
 async fn cmd_get_sse_events(file_path: &str) -> YaakResult<Vec<ServerSentEvent>> {
     let body = fs::read(file_path)?;
@@ -789,6 +851,15 @@ async fn cmd_get_sse_events(file_path: &str) -> YaakResult<Vec<ServerSentEvent>>
     Ok(events)
 }
 
+#[tauri::command]
+async fn cmd_get_http_response_events<R: Runtime>(
+    app_handle: AppHandle<R>,
+    response_id: &str,
+) -> YaakResult<Vec<HttpResponseEvent>> {
+    let events: Vec<HttpResponseEvent> = app_handle.db().list_http_response_events(response_id)?;
+    Ok(events)
+}
+
 #[tauri::command]
 async fn cmd_import_data<R: Runtime>(
     window: WebviewWindow<R>,
@@ -805,6 +876,78 @@ async fn cmd_http_request_actions<R: Runtime>(
     Ok(plugin_manager.get_http_request_actions(&window).await?)
 }
 
+#[tauri::command]
+async fn cmd_websocket_request_actions<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetWebsocketRequestActionsResponse>> {
+    Ok(plugin_manager.get_websocket_request_actions(&window).await?)
+}
+
+#[tauri::command]
+async fn cmd_call_websocket_request_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    req: CallWebsocketRequestActionRequest,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<()> {
+    let websocket_request = window.db().get_websocket_request(&req.args.websocket_request.id)?;
+    Ok(plugin_manager
+        .call_websocket_request_action(
+            &window,
+            CallWebsocketRequestActionRequest {
+                args: CallWebsocketRequestActionArgs { websocket_request },
+                ..req
+            },
+        )
+        .await?)
+}
+
+#[tauri::command]
+async fn cmd_workspace_actions<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetWorkspaceActionsResponse>> {
+    Ok(plugin_manager.get_workspace_actions(&window).await?)
+}
+
+#[tauri::command]
+async fn cmd_call_workspace_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    req: CallWorkspaceActionRequest,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<()> {
+    let workspace = window.db().get_workspace(&req.args.workspace.id)?;
+    Ok(plugin_manager
+        .call_workspace_action(
+            &window,
+            CallWorkspaceActionRequest { args: CallWorkspaceActionArgs { workspace }, ..req },
+        )
+        .await?)
+}
+
+#[tauri::command]
+async fn cmd_folder_actions<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<Vec<GetFolderActionsResponse>> {
+    Ok(plugin_manager.get_folder_actions(&window).await?)
+}
+
+#[tauri::command]
+async fn cmd_call_folder_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    req: CallFolderActionRequest,
+    plugin_manager: State<'_, PluginManager>,
+) -> YaakResult<()> {
+    let folder = window.db().get_folder(&req.args.folder.id)?;
+    Ok(plugin_manager
+        .call_folder_action(
+            &window,
+            CallFolderActionRequest { args: CallFolderActionArgs { folder }, ..req },
+        )
+        .await?)
+}
+
 #[tauri::command]
 async fn cmd_grpc_request_actions<R: Runtime>(
     window: WebviewWindow<R>,
@@ -1063,6 +1206,7 @@ async fn cmd_send_http_request<R: Runtime>(
     //   that has not yet been saved in the DB.
     request: HttpRequest,
 ) -> YaakResult<HttpResponse> {
+    let blobs = app_handle.blob_manager();
     let response = app_handle.db().upsert_http_response(
         &HttpResponse {
             request_id: request.id.clone(),
@@ -1070,6 +1214,7 @@ async fn cmd_send_http_request<R: Runtime>(
             ..Default::default()
         },
         &UpdateSource::from_window(&window),
+        &blobs,
     )?;
 
     let (cancel_tx, mut cancel_rx) = tokio::sync::watch::channel(false);
@@ -1115,6 +1260,7 @@ async fn cmd_send_http_request<R: Runtime>(
                     ..resp
                 },
                 &UpdateSource::from_window(&window),
+                &blobs,
             )?
         }
     };
@@ -1122,23 +1268,6 @@ async fn cmd_send_http_request<R: Runtime>(
     Ok(r)
 }
 
-fn response_err<R: Runtime>(
-    app_handle: &AppHandle<R>,
-    response: &HttpResponse,
-    error: String,
-    update_source: &UpdateSource,
-) -> HttpResponse {
-    warn!("Failed to send request: {error:?}");
-    let mut response = response.clone();
-    response.state = HttpResponseState::Closed;
-    response.error = Some(error.clone());
-    response = app_handle
-        .db()
-        .update_http_response_if_id(&response, update_source)
-        .expect("Failed to update response");
-    response
-}
-
 #[tauri::command]
 async fn cmd_install_plugin<R: Runtime>(
     directory: &str,
@@ -1150,11 +1279,7 @@ async fn cmd_install_plugin<R: Runtime>(
     plugin_manager.add_plugin_by_dir(&PluginContext::new(&window), &directory).await?;
 
     Ok(app_handle.db().upsert_plugin(
-        &Plugin {
-            directory: directory.into(),
-            url,
-            ..Default::default()
-        },
+        &Plugin { directory: directory.into(), url, ..Default::default() },
         &UpdateSource::from_window(&window),
     )?)
 }
@@ -1411,6 +1536,9 @@ pub fn run() {
         .invoke_handler(tauri::generate_handler![
             cmd_call_http_authentication_action,
             cmd_call_http_request_action,
+            cmd_call_websocket_request_action,
+            cmd_call_workspace_action,
+            cmd_call_folder_action,
             cmd_call_grpc_request_action,
             cmd_check_for_updates,
             cmd_create_grpc_request,
@@ -1420,16 +1548,21 @@ pub fn run() {
             cmd_delete_send_history,
             cmd_dismiss_notification,
             cmd_export_data,
+            cmd_http_request_body,
             cmd_http_response_body,
             cmd_format_json,
             cmd_get_http_authentication_summaries,
             cmd_get_http_authentication_config,
             cmd_get_sse_events,
+            cmd_get_http_response_events,
             cmd_get_workspace_meta,
             cmd_grpc_go,
             cmd_grpc_reflect,
             cmd_grpc_request_actions,
             cmd_http_request_actions,
+            cmd_websocket_request_actions,
+            cmd_workspace_actions,
+            cmd_folder_actions,
             cmd_import_data,
             cmd_install_plugin,
             cmd_metadata,
@@ -1475,11 +1608,7 @@ pub fn run() {
                         let _ = db.cancel_pending_websocket_connections();
                     });
                 }
-                RunEvent::WindowEvent {
-                    event: WindowEvent::Focused(true),
-                    label,
-                    ..
-                } => {
+                RunEvent::WindowEvent { event: WindowEvent::Focused(true), label, .. } => {
                     if cfg!(feature = "updater") {
                         // Run update check whenever the window is focused
                         let w = app_handle.get_webview_window(&label).unwrap();
@@ -1514,10 +1643,7 @@ pub fn run() {
                         }
                     });
                 }
-                RunEvent::WindowEvent {
-                    event: WindowEvent::CloseRequested { .. },
-                    ..
-                } => {
+                RunEvent::WindowEvent { event: WindowEvent::CloseRequested { .. }, .. } => {
                     if let Err(e) = app_handle.save_window_state(StateFlags::all()) {
                         warn!("Failed to save window state {e:?}");
                     } else {

src-tauri/src/plugin_events.rs

@@ -12,7 +12,8 @@ use log::error;
 use tauri::{AppHandle, Emitter, Manager, Runtime};
 use tauri_plugin_clipboard_manager::ClipboardExt;
 use yaak_common::window::WorkspaceWindowTrait;
-use yaak_models::models::{HttpResponse, Plugin};
+use yaak_models::blob_manager::BlobManagerExt;
+use yaak_models::models::{AnyModel, HttpResponse, Plugin};
 use yaak_models::queries::any_request::AnyRequest;
 use yaak_models::query_manager::QueryManagerExt;
 use yaak_models::util::UpdateSource;
@@ -20,9 +21,10 @@ use yaak_plugins::error::Error::PluginErr;
 use yaak_plugins::events::{
     Color, DeleteKeyValueResponse, EmptyPayload, ErrorResponse, FindHttpResponsesResponse,
     GetCookieValueResponse, GetHttpRequestByIdResponse, GetKeyValueResponse, Icon, InternalEvent,
-    InternalEventPayload, ListCookieNamesResponse, RenderGrpcRequestResponse,
-    RenderHttpRequestResponse, SendHttpRequestResponse, SetKeyValueResponse, ShowToastRequest,
-    TemplateRenderResponse, WindowInfoResponse, WindowNavigateEvent,
+    InternalEventPayload, ListCookieNamesResponse, ListHttpRequestsResponse, ListWorkspacesResponse,
+    RenderGrpcRequestResponse, RenderHttpRequestResponse, SendHttpRequestResponse,
+    SetKeyValueResponse, ShowToastRequest, TemplateRenderResponse, WindowInfoResponse,
+    WindowNavigateEvent, WorkspaceInfo,
 };
 use yaak_plugins::plugin_handle::PluginHandle;
 use yaak_plugins::template_callback::PluginTemplateCallback;
@@ -60,6 +62,95 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                 http_responses,
             })))
         }
+        InternalEventPayload::ListHttpRequestsRequest(req) => {
+            let w = get_window_from_plugin_context(app_handle, &plugin_context)?;
+            let workspace = workspace_from_window(&w)
+                .ok_or(PluginErr("Failed to get workspace from window".into()))?;
+
+            let http_requests = if let Some(folder_id) = req.folder_id {
+                app_handle.db().list_http_requests_for_folder_recursive(&folder_id)?
+            } else {
+                app_handle.db().list_http_requests(&workspace.id)?
+            };
+
+            Ok(Some(InternalEventPayload::ListHttpRequestsResponse(ListHttpRequestsResponse {
+                http_requests,
+            })))
+        }
+        InternalEventPayload::ListFoldersRequest(_req) => {
+            let w = get_window_from_plugin_context(app_handle, &plugin_context)?;
+            let workspace = workspace_from_window(&w)
+                .ok_or(PluginErr("Failed to get workspace from window".into()))?;
+            let folders = app_handle.db().list_folders(&workspace.id)?;
+
+            Ok(Some(InternalEventPayload::ListFoldersResponse(
+                yaak_plugins::events::ListFoldersResponse { folders },
+            )))
+        }
+        InternalEventPayload::UpsertModelRequest(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 },
+            )))
+        }
+        InternalEventPayload::DeleteModelRequest(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 },
+            )))
+        }
         InternalEventPayload::GetHttpRequestByIdRequest(req) => {
             let http_request = app_handle.db().get_http_request(&req.id).ok();
             Ok(Some(InternalEventPayload::GetHttpRequestByIdResponse(GetHttpRequestByIdResponse {
@@ -78,9 +169,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                 environment_id.as_deref(),
             )?;
             let cb = PluginTemplateCallback::new(app_handle, &plugin_context, req.purpose);
-            let opt = RenderOptions {
-                error_behavior: RenderErrorBehavior::Throw,
-            };
+            let opt = RenderOptions { error_behavior: RenderErrorBehavior::Throw };
             let grpc_request =
                 render_grpc_request(&req.grpc_request, environment_chain, &cb, &opt).await?;
             Ok(Some(InternalEventPayload::RenderGrpcRequestResponse(RenderGrpcRequestResponse {
@@ -99,9 +188,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                 environment_id.as_deref(),
             )?;
             let cb = PluginTemplateCallback::new(app_handle, &plugin_context, req.purpose);
-            let opt = &RenderOptions {
-                error_behavior: RenderErrorBehavior::Throw,
-            };
+            let opt = &RenderOptions { error_behavior: RenderErrorBehavior::Throw };
             let http_request =
                 render_http_request(&req.http_request, environment_chain, &cb, &opt).await?;
             Ok(Some(InternalEventPayload::RenderHttpRequestResponse(RenderHttpRequestResponse {
@@ -130,9 +217,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                 environment_id.as_deref(),
             )?;
             let cb = PluginTemplateCallback::new(app_handle, &plugin_context, req.purpose);
-            let opt = RenderOptions {
-                error_behavior: RenderErrorBehavior::Throw,
-            };
+            let opt = RenderOptions { error_behavior: RenderErrorBehavior::Throw };
             let data = render_json_value(req.data, environment_chain, &cb, &opt).await?;
             Ok(Some(InternalEventPayload::TemplateRenderResponse(TemplateRenderResponse { data })))
         }
@@ -200,6 +285,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
             let http_response = if http_request.id.is_empty() {
                 HttpResponse::default()
             } else {
+                let blobs = window.blob_manager();
                 window.db().upsert_http_response(
                     &HttpResponse {
                         request_id: http_request.id.clone(),
@@ -207,6 +293,7 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                         ..Default::default()
                     },
                     &UpdateSource::Plugin,
+                    &blobs,
                 )?
             };
 
@@ -358,6 +445,25 @@ pub(crate) async fn handle_plugin_event<R: Runtime>(
                 environment_id,
             })))
         }
+
+        InternalEventPayload::ListWorkspacesRequest(_) => {
+            let mut workspaces = Vec::new();
+
+            for (_, window) in app_handle.webview_windows() {
+                if let Some(workspace) = workspace_from_window(&window) {
+                    workspaces.push(WorkspaceInfo {
+                        id: workspace.id.clone(),
+                        name: workspace.name.clone(),
+                        label: window.label().to_string(),
+                    });
+                }
+            }
+
+            Ok(Some(InternalEventPayload::ListWorkspacesResponse(ListWorkspacesResponse {
+                workspaces,
+            })))
+        }
+
         _ => Ok(None),
     }
 }

src-tauri/src/render.rs

@@ -80,12 +80,7 @@ pub async fn render_grpc_request<T: TemplateCallback>(
 
     let url = parse_and_render(r.url.as_str(), vars, cb, &opt).await?;
 
-    Ok(GrpcRequest {
-        url,
-        metadata,
-        authentication,
-        ..r.to_owned()
-    })
+    Ok(GrpcRequest { url, metadata, authentication, ..r.to_owned() })
 }
 
 pub async fn render_http_request<T: TemplateCallback>(
@@ -162,14 +157,7 @@ pub async fn render_http_request<T: TemplateCallback>(
     let url = parse_and_render(r.url.clone().as_str(), vars, cb, &opt).await?;
 
     // This doesn't fit perfectly with the concept of "rendering" but it kind of does
-    let (url, url_parameters) = apply_path_placeholders(&url, url_parameters);
+    let (url, url_parameters) = apply_path_placeholders(&url, &url_parameters);
 
-    Ok(HttpRequest {
-        url,
-        url_parameters,
-        headers,
-        body,
-        authentication,
-        ..r.to_owned()
-    })
+    Ok(HttpRequest { url, url_parameters, headers, body, authentication, ..r.to_owned() })
 }

src-tauri/src/updates.rs

@@ -259,17 +259,11 @@ async fn start_integrated_update<R: Runtime>(
             self.win.unlisten(self.id);
         }
     }
-    let _guard = Unlisten {
-        win: window,
-        id: event_id,
-    };
+    let _guard = Unlisten { win: window, id: event_id };
 
     // 2) Emit the event now that listener is in place
-    let info = UpdateInfo {
-        version: update.version.to_string(),
-        downloaded,
-        reply_event_id: reply_id,
-    };
+    let info =
+        UpdateInfo { version: update.version.to_string(), downloaded, reply_event_id: reply_id };
     window
         .emit_to(window.label(), "update_available", &info)
         .map_err(|e| GenericError(format!("Failed to emit update_available: {e}")))?;

src-tauri/src/window.rs

@@ -3,7 +3,8 @@ use crate::window_menu::app_menu;
 use log::{info, warn};
 use rand::random;
 use tauri::{
-    AppHandle, Emitter, LogicalSize, Manager, PhysicalSize, Runtime, WebviewUrl, WebviewWindow, WindowEvent
+    AppHandle, Emitter, LogicalSize, Manager, PhysicalSize, Runtime, WebviewUrl, WebviewWindow,
+    WindowEvent,
 };
 use tauri_plugin_opener::OpenerExt;
 use tokio::sync::mpsc;

src-tauri/src/window_menu.rs

@@ -30,7 +30,8 @@ pub fn app_menu<R: Runtime>(app_handle: &AppHandle<R>) -> tauri::Result<Menu<R>>
         ],
     )?;
 
-    #[cfg(target_os = "macos")] {
+    #[cfg(target_os = "macos")]
+    {
         window_menu.set_as_windows_menu_for_nsapp()?;
     }
 
@@ -48,7 +49,8 @@ pub fn app_menu<R: Runtime>(app_handle: &AppHandle<R>) -> tauri::Result<Menu<R>>
         ],
     )?;
 
-    #[cfg(target_os = "macos")] {
+    #[cfg(target_os = "macos")]
+    {
         help_menu.set_as_windows_menu_for_nsapp()?;
     }
 
@@ -151,8 +153,11 @@ pub fn app_menu<R: Runtime>(app_handle: &AppHandle<R>) -> tauri::Result<Menu<R>>
                         .build(app_handle)?,
                     &MenuItemBuilder::with_id("dev.reset_size".to_string(), "Reset Size")
                         .build(app_handle)?,
-                    &MenuItemBuilder::with_id("dev.reset_size_record".to_string(), "Reset Size 16x9")
-                        .build(app_handle)?,
+                    &MenuItemBuilder::with_id(
+                        "dev.reset_size_record".to_string(),
+                        "Reset Size 16x9",
+                    )
+                    .build(app_handle)?,
                     &MenuItemBuilder::with_id(
                         "dev.generate_theme_css".to_string(),
                         "Generate Theme CSS",

src-tauri/yaak-common/Cargo.toml

@@ -10,3 +10,4 @@ reqwest = { workspace = true, features = ["system-proxy", "gzip"] }
 thiserror = { workspace = true }
 regex = "1.11.0"
 serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }

src-tauri/yaak-common/src/lib.rs

@@ -1,4 +1,5 @@
-pub mod window;
-pub mod platform;
 pub mod api_client;
 pub mod error;
+pub mod platform;
+pub mod serde;
+pub mod window;

src-tauri/yaak-common/src/serde.rs

@@ -0,0 +1,23 @@
+use serde_json::Value;
+use std::collections::BTreeMap;
+
+pub fn get_bool(v: &Value, key: &str, fallback: bool) -> bool {
+    match v.get(key) {
+        None => fallback,
+        Some(v) => v.as_bool().unwrap_or(fallback),
+    }
+}
+
+pub fn get_str<'a>(v: &'a Value, key: &str) -> &'a str {
+    match v.get(key) {
+        None => "",
+        Some(v) => v.as_str().unwrap_or_default(),
+    }
+}
+
+pub fn get_str_map<'a>(v: &'a BTreeMap<String, Value>, key: &str) -> &'a str {
+    match v.get(key) {
+        None => "",
+        Some(v) => v.as_str().unwrap_or_default(),
+    }
+}

src-tauri/yaak-crypto/src/manager.rs

@@ -96,18 +96,12 @@ impl EncryptionManager {
             let workspace = tx.get_workspace(workspace_id)?;
             let workspace_meta = tx.get_or_create_workspace_meta(workspace_id)?;
             tx.upsert_workspace(
-                &Workspace {
-                    encryption_key_challenge,
-                    ..workspace
-                },
+                &Workspace { encryption_key_challenge, ..workspace },
                 &UpdateSource::Background,
             )?;
 
             Ok(tx.upsert_workspace_meta(
-                &WorkspaceMeta {
-                    encryption_key: Some(encrypted_key.clone()),
-                    ..workspace_meta
-                },
+                &WorkspaceMeta { encryption_key: Some(encrypted_key.clone()), ..workspace_meta },
                 &UpdateSource::Background,
             )?)
         })?;

src-tauri/yaak-crypto/src/workspace_key.rs

@@ -39,9 +39,7 @@ impl WorkspaceKey {
     }
 
     pub(crate) fn from_raw_key(key: &[u8]) -> Self {
-        Self {
-            key: Key::<XChaCha20Poly1305>::clone_from_slice(key),
-        }
+        Self { key: Key::<XChaCha20Poly1305>::clone_from_slice(key) }
     }
 
     pub(crate) fn raw_key(&self) -> &[u8] {

src-tauri/yaak-fonts/src/commands.rs

@@ -34,8 +34,5 @@ pub(crate) async fn list() -> Result<Fonts> {
     ui_fonts.sort();
     editor_fonts.sort();
 
-    Ok(Fonts {
-        ui_fonts,
-        editor_fonts,
-    })
+    Ok(Fonts { ui_fonts, editor_fonts })
 }

src-tauri/yaak-git/src/binary.rs

@@ -1,10 +1,10 @@
+use crate::error::Result;
 use std::path::Path;
 use std::process::{Command, Stdio};
-use crate::error::Result;
 
+use crate::error::Error::GitNotFound;
 #[cfg(target_os = "windows")]
 use std::os::windows::process::CommandExt;
-use crate::error::Error::GitNotFound;
 
 #[cfg(target_os = "windows")]
 const CREATE_NO_WINDOW: u32 = 0x0800_0000;

src-tauri/yaak-git/src/lib.rs

@@ -1,4 +1,7 @@
-use crate::commands::{add, add_credential, add_remote, branch, checkout, commit, delete_branch, fetch_all, initialize, log, merge_branch, pull, push, remotes, rm_remote, status, unstage};
+use crate::commands::{
+    add, add_credential, add_remote, branch, checkout, commit, delete_branch, fetch_all,
+    initialize, log, merge_branch, pull, push, remotes, rm_remote, status, unstage,
+};
 use tauri::{
     Runtime, generate_handler,
     plugin::{Builder, TauriPlugin},
@@ -10,6 +13,7 @@ mod branch;
 mod commands;
 mod commit;
 mod credential;
+pub mod error;
 mod fetch;
 mod init;
 mod log;
@@ -21,7 +25,6 @@ mod repository;
 mod status;
 mod unstage;
 mod util;
-pub mod error;
 
 pub fn init<R: Runtime>() -> TauriPlugin<R> {
     Builder::new("yaak-git")

src-tauri/yaak-git/src/pull.rs

@@ -37,10 +37,7 @@ pub(crate) fn git_pull(dir: &Path) -> Result<PullResult> {
     info!("Pulled status={} {combined}", out.status);
 
     if combined.to_lowercase().contains("could not read") {
-        return Ok(PullResult::NeedsCredentials {
-            url: remote_url.to_string(),
-            error: None,
-        });
+        return Ok(PullResult::NeedsCredentials { url: remote_url.to_string(), error: None });
     }
 
     if combined.to_lowercase().contains("unable to access") {
@@ -58,9 +55,7 @@ pub(crate) fn git_pull(dir: &Path) -> Result<PullResult> {
         return Ok(PullResult::UpToDate);
     }
 
-    Ok(PullResult::Success {
-        message: format!("Pulled from {}/{}", remote_name, branch_name),
-    })
+    Ok(PullResult::Success { message: format!("Pulled from {}/{}", remote_name, branch_name) })
 }
 
 // pub(crate) fn git_pull_old(dir: &Path) -> Result<PullResult> {

src-tauri/yaak-git/src/push.rs

@@ -37,10 +37,7 @@ pub(crate) fn git_push(dir: &Path) -> Result<PushResult> {
     info!("Pushed to repo status={} {combined}", out.status);
 
     if combined.to_lowercase().contains("could not read") {
-        return Ok(PushResult::NeedsCredentials {
-            url: remote_url.to_string(),
-            error: None,
-        });
+        return Ok(PushResult::NeedsCredentials { url: remote_url.to_string(), error: None });
     }
 
     if combined.to_lowercase().contains("unable to access") {
@@ -58,7 +55,5 @@ pub(crate) fn git_push(dir: &Path) -> Result<PushResult> {
         return Err(GenericError(format!("Failed to push {combined}")));
     }
 
-    Ok(PushResult::Success {
-        message: format!("Pushed to {}/{}", remote_name, branch_name),
-    })
+    Ok(PushResult::Success { message: format!("Pushed to {}/{}", remote_name, branch_name) })
 }