Better trial activation flows

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/release.yml

@@ -119,11 +119,7 @@ jobs:
         with:
           tagName: 'v__VERSION__'
           releaseName: 'Release __VERSION__'
-          releaseBody: |
-            > [!IMPORTANT]
-            > The Yaak project is open source. However, to fund development, these pre-built binaries require a license for commercial use. Please see the [Pricing Page](https://yaak.app/pricing) for more details.
-            
-            You can view the full release notes here → https://yaak.app/blog/2024.13.0
+          releaseBody: '[Changelog __VERSION__](https://yaak.app/blog/__VERSION__)'
           releaseDraft: true
           prerelease: false
           args: ${{ matrix.args }}

.prettierrc.cjs

@@ -1,8 +0,0 @@
-module.exports = {
-    "trailingComma": "all",
-    "tabWidth": 2,
-    "semi": true,
-    "singleQuote": true,
-    "printWidth": 100,
-    "bracketSpacing": true
-}

.prettierrc.js

@@ -0,0 +1,8 @@
+export default {
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "printWidth": 100,
+  "bracketSpacing": true
+}

README.md

@@ -1,15 +1,30 @@
 # Yaak API Client
 
-Yaak is a desktop API client for organizing and executing REST, GraphQL, and gRPC
-requests. It's built using [Tauri](https://tauri.app), Rust, and ReactJS.
+Yaak is a desktop API client for interacting with REST, GraphQL, Server Sent Events (SSE), WebSocket, and gRPC
+APIs. It's built using [Tauri](https://tauri.app), Rust, and ReactJS.
 
 ![screenshot](https://github.com/user-attachments/assets/f18e963f-0b68-4ecb-b8b8-cb71aa9aec02)
 
+## Feature Overview
+
+- 🪂 Import data from Postman, Insomnia, OpenAPI, Swagger, or Curl.<br/>
+- 📤 Send requests via REST, GraphQL, Server Sent Events (SSE), WebSockets, or gRPC.<br/>
+- 🔐 Automatically authorize requests with OAuth 2.0, JWT tokens, Basic Auth, and more.<br/>
+- 🔎 Filter response bodies using JSONPath or XPath queries.<br/>
+- ⛓️ Chain together multiple requests to dynamically reference values.<br/>
+- 📂 Organize requests into workspaces and nested folders.<br/>
+- 🧮 Use environment variables to easily switch between Prod and Dev.<br/>
+- 🏷️ Send dynamic values like UUIDs or timestamps using template tags.<br/>
+- 🎨 Choose from many of the included themes, or make your own.<br/>
+- 💽 Mirror workspace data to a directory for integration with Git or Dropbox.<br/>
+- 📜 View response history for each request.<br/>
+- 🔌 Create your own plugins for authentication, template tags, and more!<br/>
+- 🛜 Configure a proxy to access firewall-blocked APIs
+
 ## Feedback and Bug Reports
 
 All feedback, bug reports, questions, and feature requests should be reported to
-[feedback.yaak.app](https://feedback.yaak.app). Issues will be duplicated
-in this repository if applicable.
+[feedback.yaak.app](https://feedback.yaak.app).
 
 ## Community Projects
 
@@ -18,9 +33,5 @@ in this repository if applicable.
 
 ## Contribution Policy
 
-Yaak is open source, but only accepting contributions for bug fixes. See the
-[`good first issue`](https://github.com/yaakapp/app/labels/good%20first%20issue) label for
-issues that are more approachable for contribution.
-
-To get started, visit [`DEVELOPMENT.md`](DEVELOPMENT.md) for tips on setting up your
-environment.
+Yaak is open source, but only accepting contributions for bug fixes. To get started, 
+visit [`DEVELOPMENT.md`](DEVELOPMENT.md) for tips on setting up your environment.

package.json

@@ -11,11 +11,13 @@
     "packages/plugin-runtime-types",
     "packages/common-lib",
     "src-tauri/yaak-license",
+    "src-tauri/yaak-git",
     "src-tauri/yaak-models",
     "src-tauri/yaak-plugins",
     "src-tauri/yaak-sse",
     "src-tauri/yaak-sync",
     "src-tauri/yaak-templates",
+    "src-tauri/yaak-ws",
     "src-web"
   ],
   "scripts": {
@@ -34,7 +36,7 @@
     "tauri-before-dev": "npm run --workspaces --if-present dev"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^2.2.4",
+    "@tauri-apps/cli": "^2.2.7",
     "@typescript-eslint/eslint-plugin": "^8.18.1",
     "@typescript-eslint/parser": "^8.18.1",
     "eslint": "^8",

packages/common-lib/formatSize.ts

@@ -0,0 +1,20 @@
+export function formatSize(bytes: number): string {
+    let num;
+    let unit;
+
+    if (bytes > 1000 * 1000 * 1000) {
+        num = bytes / 1000 / 1000 / 1000;
+        unit = 'GB';
+    } else if (bytes > 1000 * 1000) {
+        num = bytes / 1000 / 1000;
+        unit = 'MB';
+    } else if (bytes > 1000) {
+        num = bytes / 1000;
+        unit = 'KB';
+    } else {
+        num = bytes;
+        unit = 'B';
+    }
+
+    return `${Math.round(num * 10) / 10} ${unit}`;
+}

packages/plugin-runtime-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaakapp/api",
-  "version": "0.3.2",
+  "version": "0.5.0",
   "main": "lib/index.js",
   "typings": "./lib/index.d.ts",
   "files": [

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

@@ -1,288 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Environment } from "./models";
-import type { Folder } from "./models";
-import type { GrpcRequest } from "./models";
-import type { HttpRequest } from "./models";
-import type { HttpResponse } from "./models";
-import type { JsonValue } from "./serde_json/JsonValue";
-import type { Workspace } from "./models";
-
-export type BootRequest = { dir: string, watch: boolean, };
-
-export type BootResponse = { name: string, version: string, capabilities: Array<string>, };
-
-export type CallHttpAuthenticationRequest = { config: { [key in string]?: JsonValue }, method: string, url: string, headers: Array<HttpHeader>, };
-
-export type CallHttpAuthenticationResponse = { 
-/**
- * HTTP headers to add to the request. Existing headers will be replaced, while
- * new headers will be added.
- */
-setHeaders: Array<HttpHeader>, };
-
-export type CallHttpRequestActionArgs = { httpRequest: HttpRequest, };
-
-export type CallHttpRequestActionRequest = { key: string, pluginRefId: string, args: CallHttpRequestActionArgs, };
-
-export type CallTemplateFunctionArgs = { purpose: RenderPurpose, values: { [key in string]?: string }, };
-
-export type CallTemplateFunctionRequest = { name: string, args: CallTemplateFunctionArgs, };
-
-export type CallTemplateFunctionResponse = { value: string | null, };
-
-export type Color = "custom" | "default" | "primary" | "secondary" | "info" | "success" | "notice" | "warning" | "danger";
-
-export type CopyTextRequest = { text: string, };
-
-export type EditorLanguage = "text" | "javascript" | "json" | "html" | "xml" | "graphql" | "markdown";
-
-export type EmptyPayload = {};
-
-export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };
-
-export type ExportHttpRequestResponse = { content: string, };
-
-export type FileFilter = { name: string, 
-/**
- * File extensions to require
- */
-extensions: Array<string>, };
-
-export type FilterRequest = { content: string, filter: string, };
-
-export type FilterResponse = { content: string, };
-
-export type FindHttpResponsesRequest = { requestId: string, limit?: number, };
-
-export type FindHttpResponsesResponse = { httpResponses: Array<HttpResponse>, };
-
-export type FormInput = { "type": "text" } & FormInputText | { "type": "editor" } & FormInputEditor | { "type": "select" } & FormInputSelect | { "type": "checkbox" } & FormInputCheckbox | { "type": "file" } & FormInputFile | { "type": "http_request" } & FormInputHttpRequest;
-
-export type FormInputBase = { name: string, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, };
-
-export type FormInputCheckbox = { name: string, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, };
-
-export type FormInputEditor = { 
-/**
- * Placeholder for the text input
- */
-placeholder?: string | null, 
-/**
- * Don't show the editor gutter (line numbers, folds, etc.)
- */
-hideGutter?: boolean, 
-/**
- * Language for syntax highlighting
- */
-language?: EditorLanguage, name: string, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, };
-
-export type FormInputFile = { 
-/**
- * The title of the file selection window
- */
-title: string, 
-/**
- * Allow selecting multiple files
- */
-multiple?: boolean, directory?: boolean, defaultPath?: string, filters?: Array<FileFilter>, name: string, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, };
-
-export type FormInputHttpRequest = { name: string, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, };
-
-export type FormInputSelect = { 
-/**
- * The options that will be available in the select input
- */
-options: Array<FormInputSelectOption>, name: string, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, };
-
-export type FormInputSelectOption = { name: string, value: string, };
-
-export type FormInputText = { 
-/**
- * Placeholder for the text input
- */
-placeholder?: string | null, 
-/**
- * Placeholder for the text input
- */
-password?: boolean, name: string, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, };
-
-export type GetHttpAuthenticationResponse = { name: string, label: string, shortLabel: string, config: Array<FormInput>, };
-
-export type GetHttpRequestActionsRequest = Record<string, never>;
-
-export type GetHttpRequestActionsResponse = { actions: Array<HttpRequestAction>, pluginRefId: string, };
-
-export type GetHttpRequestByIdRequest = { id: string, };
-
-export type GetHttpRequestByIdResponse = { httpRequest: HttpRequest | null, };
-
-export type GetTemplateFunctionsResponse = { functions: Array<TemplateFunction>, pluginRefId: string, };
-
-export type HttpHeader = { name: string, value: string, };
-
-export type HttpRequestAction = { key: string, label: string, icon?: Icon, };
-
-export type Icon = "copy" | "info" | "check_circle" | "alert_triangle" | "_unknown";
-
-export type ImportRequest = { content: string, };
-
-export type ImportResources = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, };
-
-export type ImportResponse = { resources: ImportResources, };
-
-export type InternalEvent = { id: string, pluginRefId: string, replyId: string | null, payload: InternalEventPayload, windowContext: WindowContext, };
-
-export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } & BootResponse | { "type": "reload_request" } & EmptyPayload | { "type": "reload_response" } & EmptyPayload | { "type": "terminate_request" } | { "type": "terminate_response" } | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "get_http_request_actions_request" } & EmptyPayload | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "get_http_authentication_request" } & EmptyPayload | { "type": "get_http_authentication_response" } & GetHttpAuthenticationResponse | { "type": "call_http_authentication_request" } & CallHttpAuthenticationRequest | { "type": "call_http_authentication_response" } & CallHttpAuthenticationResponse | { "type": "copy_text_request" } & CopyTextRequest | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "template_render_request" } & TemplateRenderRequest | { "type": "template_render_response" } & TemplateRenderResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "prompt_text_request" } & PromptTextRequest | { "type": "prompt_text_response" } & PromptTextResponse | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "empty_response" } & EmptyPayload;
-
-export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string, 
-/**
- * Text to add to the confirmation button
- */
-confirmText?: string, 
-/**
- * Text to add to the cancel button
- */
-cancelText?: string, 
-/**
- * Require the user to enter a non-empty value
- */
-required?: boolean, };
-
-export type PromptTextResponse = { value: string | null, };
-
-export type RenderHttpRequestRequest = { httpRequest: HttpRequest, purpose: RenderPurpose, };
-
-export type RenderHttpRequestResponse = { httpRequest: HttpRequest, };
-
-export type RenderPurpose = "send" | "preview";
-
-export type SendHttpRequestRequest = { httpRequest: HttpRequest, };
-
-export type SendHttpRequestResponse = { httpResponse: HttpResponse, };
-
-export type ShowToastRequest = { message: string, color?: Color, icon?: Icon, };
-
-export type TemplateFunction = { name: string, description?: string, 
-/**
- * Also support alternative names. This is useful for not breaking existing
- * tags when changing the `name` property
- */
-aliases?: Array<string>, args: Array<FormInput>, };
-
-export type TemplateRenderRequest = { data: JsonValue, purpose: RenderPurpose, };
-
-export type TemplateRenderResponse = { data: JsonValue, };
-
-export type WindowContext = { "type": "none" } | { "type": "label", label: string, };

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

@@ -0,0 +1,406 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Environment } from "./gen_models.js";
+import type { Folder } from "./gen_models.js";
+import type { GrpcRequest } from "./gen_models.js";
+import type { HttpRequest } from "./gen_models.js";
+import type { HttpResponse } from "./gen_models.js";
+import type { JsonValue } from "./serde_json/JsonValue.js";
+import type { WebsocketRequest } from "./gen_models.js";
+import type { Workspace } from "./gen_models.js";
+
+export type BootRequest = { dir: string, watch: boolean, };
+
+export type BootResponse = { name: string, version: string, };
+
+export type CallHttpAuthenticationActionArgs = { contextId: string, values: { [key in string]?: JsonPrimitive }, };
+
+export type CallHttpAuthenticationActionRequest = { index: number, pluginRefId: string, args: CallHttpAuthenticationActionArgs, };
+
+export type CallHttpAuthenticationRequest = { contextId: string, values: { [key in string]?: JsonPrimitive }, method: string, url: string, headers: Array<HttpHeader>, };
+
+export type CallHttpAuthenticationResponse = { 
+/**
+ * HTTP headers to add to the request. Existing headers will be replaced, while
+ * new headers will be added.
+ */
+setHeaders: Array<HttpHeader>, };
+
+export type CallHttpRequestActionArgs = { httpRequest: HttpRequest, };
+
+export type CallHttpRequestActionRequest = { index: number, pluginRefId: string, args: CallHttpRequestActionArgs, };
+
+export type CallTemplateFunctionArgs = { purpose: RenderPurpose, values: { [key in string]?: string }, };
+
+export type CallTemplateFunctionRequest = { name: string, args: CallTemplateFunctionArgs, };
+
+export type CallTemplateFunctionResponse = { value: string | null, };
+
+export type CloseWindowRequest = { label: string, };
+
+export type Color = "primary" | "secondary" | "info" | "success" | "notice" | "warning" | "danger";
+
+export type CompletionOptionType = "constant" | "variable";
+
+export type Content = { "type": "text", content: string, } | { "type": "markdown", content: string, };
+
+export type CopyTextRequest = { text: string, };
+
+export type DeleteKeyValueRequest = { key: string, };
+
+export type DeleteKeyValueResponse = { deleted: boolean, };
+
+export type EditorLanguage = "text" | "javascript" | "json" | "html" | "xml" | "graphql" | "markdown";
+
+export type EmptyPayload = {};
+
+export type ErrorResponse = { error: string, };
+
+export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };
+
+export type ExportHttpRequestResponse = { content: string, };
+
+export type FileFilter = { name: string, 
+/**
+ * File extensions to require
+ */
+extensions: Array<string>, };
+
+export type FilterRequest = { content: string, filter: string, };
+
+export type FilterResponse = { content: string, };
+
+export type FindHttpResponsesRequest = { requestId: string, limit?: number, };
+
+export type FindHttpResponsesResponse = { httpResponses: Array<HttpResponse>, };
+
+export type FormInput = { "type": "text" } & FormInputText | { "type": "editor" } & FormInputEditor | { "type": "select" } & FormInputSelect | { "type": "checkbox" } & FormInputCheckbox | { "type": "file" } & FormInputFile | { "type": "http_request" } & FormInputHttpRequest | { "type": "accordion" } & FormInputAccordion | { "type": "banner" } & FormInputBanner | { "type": "markdown" } & FormInputMarkdown;
+
+export type FormInputAccordion = { label: string, inputs?: Array<FormInput>, hidden?: boolean, };
+
+export type FormInputBanner = { inputs?: Array<FormInput>, hidden?: boolean, color?: Color, };
+
+export type FormInputBase = { 
+/**
+ * The name of the input. The value will be stored at this object attribute in the resulting data
+ */
+name: string, 
+/**
+ * Whether this input is visible for the given configuration. Use this to
+ * make branching forms.
+ */
+hidden?: boolean, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input
+ */
+label?: string, 
+/**
+ * Visually hide the label of the input
+ */
+hideLabel?: boolean, 
+/**
+ * The default value
+ */
+defaultValue?: string, disabled?: boolean, };
+
+export type FormInputCheckbox = { 
+/**
+ * The name of the input. The value will be stored at this object attribute in the resulting data
+ */
+name: string, 
+/**
+ * Whether this input is visible for the given configuration. Use this to
+ * make branching forms.
+ */
+hidden?: boolean, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input
+ */
+label?: string, 
+/**
+ * Visually hide the label of the input
+ */
+hideLabel?: boolean, 
+/**
+ * The default value
+ */
+defaultValue?: string, disabled?: boolean, };
+
+export type FormInputEditor = { 
+/**
+ * Placeholder for the text input
+ */
+placeholder?: string | null, 
+/**
+ * Don't show the editor gutter (line numbers, folds, etc.)
+ */
+hideGutter?: boolean, 
+/**
+ * Language for syntax highlighting
+ */
+language?: EditorLanguage, readOnly?: boolean, completionOptions?: Array<GenericCompletionOption>, 
+/**
+ * The name of the input. The value will be stored at this object attribute in the resulting data
+ */
+name: string, 
+/**
+ * Whether this input is visible for the given configuration. Use this to
+ * make branching forms.
+ */
+hidden?: boolean, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input
+ */
+label?: string, 
+/**
+ * Visually hide the label of the input
+ */
+hideLabel?: boolean, 
+/**
+ * The default value
+ */
+defaultValue?: string, disabled?: boolean, };
+
+export type FormInputFile = { 
+/**
+ * The title of the file selection window
+ */
+title: string, 
+/**
+ * Allow selecting multiple files
+ */
+multiple?: boolean, directory?: boolean, defaultPath?: string, filters?: Array<FileFilter>, 
+/**
+ * The name of the input. The value will be stored at this object attribute in the resulting data
+ */
+name: string, 
+/**
+ * Whether this input is visible for the given configuration. Use this to
+ * make branching forms.
+ */
+hidden?: boolean, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input
+ */
+label?: string, 
+/**
+ * Visually hide the label of the input
+ */
+hideLabel?: boolean, 
+/**
+ * The default value
+ */
+defaultValue?: string, disabled?: boolean, };
+
+export type FormInputHttpRequest = { 
+/**
+ * The name of the input. The value will be stored at this object attribute in the resulting data
+ */
+name: string, 
+/**
+ * Whether this input is visible for the given configuration. Use this to
+ * make branching forms.
+ */
+hidden?: boolean, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input
+ */
+label?: string, 
+/**
+ * Visually hide the label of the input
+ */
+hideLabel?: boolean, 
+/**
+ * The default value
+ */
+defaultValue?: string, disabled?: boolean, };
+
+export type FormInputMarkdown = { content: string, hidden?: boolean, };
+
+export type FormInputSelect = { 
+/**
+ * The options that will be available in the select input
+ */
+options: Array<FormInputSelectOption>, 
+/**
+ * The name of the input. The value will be stored at this object attribute in the resulting data
+ */
+name: string, 
+/**
+ * Whether this input is visible for the given configuration. Use this to
+ * make branching forms.
+ */
+hidden?: boolean, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input
+ */
+label?: string, 
+/**
+ * Visually hide the label of the input
+ */
+hideLabel?: boolean, 
+/**
+ * The default value
+ */
+defaultValue?: string, disabled?: boolean, };
+
+export type FormInputSelectOption = { label: string, value: string, };
+
+export type FormInputText = { 
+/**
+ * Placeholder for the text input
+ */
+placeholder?: string | null, 
+/**
+ * Placeholder for the text input
+ */
+password?: boolean, 
+/**
+ * Whether to allow newlines in the input, like a <textarea/>
+ */
+multiLine?: boolean, completionOptions?: Array<GenericCompletionOption>, 
+/**
+ * The name of the input. The value will be stored at this object attribute in the resulting data
+ */
+name: string, 
+/**
+ * Whether this input is visible for the given configuration. Use this to
+ * make branching forms.
+ */
+hidden?: boolean, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input
+ */
+label?: string, 
+/**
+ * Visually hide the label of the input
+ */
+hideLabel?: boolean, 
+/**
+ * The default value
+ */
+defaultValue?: string, disabled?: boolean, };
+
+export type GenericCompletionOption = { label: string, detail?: string, info?: string, type?: CompletionOptionType, boost?: number, };
+
+export type GetHttpAuthenticationConfigRequest = { contextId: string, values: { [key in string]?: JsonPrimitive }, };
+
+export type GetHttpAuthenticationConfigResponse = { args: Array<FormInput>, pluginRefId: string, actions?: Array<HttpAuthenticationAction>, };
+
+export type GetHttpAuthenticationSummaryResponse = { name: string, label: string, shortLabel: string, };
+
+export type GetHttpRequestActionsRequest = Record<string, never>;
+
+export type GetHttpRequestActionsResponse = { actions: Array<HttpRequestAction>, pluginRefId: string, };
+
+export type GetHttpRequestByIdRequest = { id: string, };
+
+export type GetHttpRequestByIdResponse = { httpRequest: HttpRequest | null, };
+
+export type GetKeyValueRequest = { key: string, };
+
+export type GetKeyValueResponse = { value?: string, };
+
+export type GetTemplateFunctionsResponse = { functions: Array<TemplateFunction>, pluginRefId: string, };
+
+export type HttpAuthenticationAction = { label: string, icon?: Icon, };
+
+export type HttpHeader = { name: string, value: string, };
+
+export type HttpRequestAction = { label: string, icon?: Icon, };
+
+export type Icon = "alert_triangle" | "check" | "check_circle" | "chevron_down" | "copy" | "info" | "pin" | "search" | "trash" | "_unknown";
+
+export type ImportRequest = { content: string, };
+
+export type ImportResources = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, websocketRequests: Array<WebsocketRequest>, };
+
+export type ImportResponse = { resources: ImportResources, };
+
+export type InternalEvent = { id: string, pluginRefId: string, pluginName: string, replyId: string | null, windowContext: WindowContext, payload: InternalEventPayload, };
+
+export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } & BootResponse | { "type": "reload_request" } & EmptyPayload | { "type": "reload_response" } & EmptyPayload | { "type": "terminate_request" } | { "type": "terminate_response" } | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "get_http_request_actions_request" } & EmptyPayload | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "get_http_authentication_summary_request" } & EmptyPayload | { "type": "get_http_authentication_summary_response" } & GetHttpAuthenticationSummaryResponse | { "type": "get_http_authentication_config_request" } & GetHttpAuthenticationConfigRequest | { "type": "get_http_authentication_config_response" } & GetHttpAuthenticationConfigResponse | { "type": "call_http_authentication_request" } & CallHttpAuthenticationRequest | { "type": "call_http_authentication_response" } & CallHttpAuthenticationResponse | { "type": "call_http_authentication_action_request" } & CallHttpAuthenticationActionRequest | { "type": "call_http_authentication_action_response" } & EmptyPayload | { "type": "copy_text_request" } & CopyTextRequest | { "type": "copy_text_response" } & EmptyPayload | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "get_key_value_request" } & GetKeyValueRequest | { "type": "get_key_value_response" } & GetKeyValueResponse | { "type": "set_key_value_request" } & SetKeyValueRequest | { "type": "set_key_value_response" } & SetKeyValueResponse | { "type": "delete_key_value_request" } & DeleteKeyValueRequest | { "type": "delete_key_value_response" } & DeleteKeyValueResponse | { "type": "open_window_request" } & OpenWindowRequest | { "type": "window_navigate_event" } & WindowNavigateEvent | { "type": "window_close_event" } | { "type": "close_window_request" } & CloseWindowRequest | { "type": "template_render_request" } & TemplateRenderRequest | { "type": "template_render_response" } & TemplateRenderResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "show_toast_response" } & EmptyPayload | { "type": "prompt_text_request" } & PromptTextRequest | { "type": "prompt_text_response" } & PromptTextResponse | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "empty_response" } & EmptyPayload | { "type": "error_response" } & ErrorResponse;
+
+export type JsonPrimitive = string | number | boolean | null;
+
+export type OpenWindowRequest = { url: string, 
+/**
+ * Label for the window. If not provided, a random one will be generated.
+ */
+label: string, title?: string, size?: WindowSize, dataDirKey?: string, };
+
+export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string, 
+/**
+ * Text to add to the confirmation button
+ */
+confirmText?: string, 
+/**
+ * Text to add to the cancel button
+ */
+cancelText?: string, 
+/**
+ * Require the user to enter a non-empty value
+ */
+required?: boolean, };
+
+export type PromptTextResponse = { value: string | null, };
+
+export type RenderHttpRequestRequest = { httpRequest: HttpRequest, purpose: RenderPurpose, };
+
+export type RenderHttpRequestResponse = { httpRequest: HttpRequest, };
+
+export type RenderPurpose = "send" | "preview";
+
+export type SendHttpRequestRequest = { httpRequest: Partial<HttpRequest>, };
+
+export type SendHttpRequestResponse = { httpResponse: HttpResponse, };
+
+export type SetKeyValueRequest = { key: string, value: string, };
+
+export type SetKeyValueResponse = {};
+
+export type ShowToastRequest = { message: string, color?: Color, icon?: Icon, };
+
+export type TemplateFunction = { name: string, description?: string, 
+/**
+ * Also support alternative names. This is useful for not breaking existing
+ * tags when changing the `name` property
+ */
+aliases?: Array<string>, args: Array<FormInput>, };
+
+export type TemplateRenderRequest = { data: JsonValue, purpose: RenderPurpose, };
+
+export type TemplateRenderResponse = { data: JsonValue, };
+
+export type WindowContext = { "type": "none" } | { "type": "label", label: string, };
+
+export type WindowNavigateEvent = { url: string, };
+
+export type WindowSize = { width: number, height: number, };

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

@@ -22,4 +22,6 @@ export type HttpResponseState = "initialized" | "connected" | "closed";
 
 export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, id?: string, };
 
+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, name: string, description: string, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };

packages/plugin-runtime-types/src/helpers.ts

@@ -1 +1,2 @@
 export type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
+export type MaybePromise<T> = Promise<T> | T;

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

@@ -1,5 +1,5 @@
 export type * from './plugins';
 export type * from './themes';
 
-export * from './bindings/models';
-export * from './bindings/events';
+export * from './bindings/gen_models';
+export * from './bindings/gen_events';

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

@@ -1,13 +1,29 @@
 import {
+  CallHttpAuthenticationActionArgs,
   CallHttpAuthenticationRequest,
   CallHttpAuthenticationResponse,
-  GetHttpAuthenticationResponse,
-} from '..';
-import type { Context } from './Context';
+  FormInput,
+  GetHttpAuthenticationConfigRequest,
+  GetHttpAuthenticationSummaryResponse,
+  HttpAuthenticationAction,
+} from '../bindings/gen_events';
+import { MaybePromise } from '../helpers';
+import { Context } from './Context';
 
-export type AuthenticationPlugin = Omit<GetHttpAuthenticationResponse, 'pluginName'> & {
+type DynamicFormInput = FormInput & {
+  dynamic(
+    ctx: Context,
+    args: GetHttpAuthenticationConfigRequest,
+  ): MaybePromise<Partial<FormInput> | undefined | null>;
+};
+
+export type AuthenticationPlugin = GetHttpAuthenticationSummaryResponse & {
+  args: (FormInput | DynamicFormInput)[];
   onApply(
     ctx: Context,
     args: CallHttpAuthenticationRequest,
-  ): Promise<CallHttpAuthenticationResponse> | CallHttpAuthenticationResponse;
+  ): MaybePromise<CallHttpAuthenticationResponse>;
+  actions?: (HttpAuthenticationAction & {
+    onSelect(ctx: Context, args: CallHttpAuthenticationActionArgs): Promise<void> | void;
+  })[];
 };

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

@@ -3,6 +3,7 @@ import type {
   FindHttpResponsesResponse,
   GetHttpRequestByIdRequest,
   GetHttpRequestByIdResponse,
+  OpenWindowRequest,
   PromptTextRequest,
   PromptTextResponse,
   RenderHttpRequestRequest,
@@ -12,18 +13,31 @@ import type {
   ShowToastRequest,
   TemplateRenderRequest,
   TemplateRenderResponse,
-} from '..';
+} from '../bindings/gen_events.ts';
 
-export type Context = {
+export interface Context {
   clipboard: {
-    copyText(text: string): void;
+    copyText(text: string): Promise<void>;
   };
   toast: {
-    show(args: ShowToastRequest): void;
+    show(args: ShowToastRequest): Promise<void>;
   };
   prompt: {
     text(args: PromptTextRequest): Promise<PromptTextResponse['value']>;
   };
+  store: {
+    set<T>(key: string, value: T): Promise<void>;
+    get<T>(key: string): Promise<T | undefined>;
+    delete(key: string): Promise<boolean>;
+  };
+  window: {
+    openUrl(
+      args: OpenWindowRequest & {
+        onNavigate?: (args: { url: string }) => void;
+        onClose: () => void;
+      },
+    ): Promise<{ close: () => void }>;
+  };
   httpRequest: {
     send(args: SendHttpRequestRequest): Promise<SendHttpRequestResponse['httpResponse']>;
     getById(args: GetHttpRequestByIdRequest): Promise<GetHttpRequestByIdResponse['httpRequest']>;
@@ -35,4 +49,4 @@ export type Context = {
   templates: {
     render(args: TemplateRenderRequest): Promise<TemplateRenderResponse['data']>;
   };
-};
+}

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

@@ -1,13 +1,12 @@
 import type { Context } from './Context';
 
-export type FilterPluginResponse = string[];
+export type FilterPluginResponse = { filtered: string };
 
 export type FilterPlugin = {
   name: string;
   description?: string;
-  canFilter(ctx: Context, args: { mimeType: string }): Promise<boolean>;
   onFilter(
     ctx: Context,
-    args: { payload: string; mimeType: string },
-  ): Promise<FilterPluginResponse>;
+    args: { payload: string; filter: string; mimeType: string },
+  ): Promise<FilterPluginResponse> | FilterPluginResponse;
 };

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

@@ -1,4 +1,4 @@
-import type { CallHttpRequestActionArgs, HttpRequestAction } from '..';
+import type { CallHttpRequestActionArgs, HttpRequestAction } from '../bindings/gen_events';
 import type { Context } from './Context';
 
 export type HttpRequestActionPlugin = HttpRequestAction & {

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

@@ -1,13 +1,15 @@
-import type { Environment, Folder, GrpcRequest, HttpRequest, Workspace } from '..';
+import { Environment, Folder, GrpcRequest, HttpRequest, Workspace } from '../bindings/gen_models';
 import type { AtLeast } from '../helpers';
 import type { Context } from './Context';
 
-export type ImportPluginResponse = null | {
-  workspaces: AtLeast<Workspace, 'name' | 'id' | 'model'>[];
-  environments: AtLeast<Environment, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  httpRequests: AtLeast<HttpRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  grpcRequests: AtLeast<GrpcRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
+type ImportPluginResponse = null | {
+  resources: {
+    workspaces: AtLeast<Workspace, 'name' | 'id' | 'model'>[];
+    environments: AtLeast<Environment, 'name' | 'id' | 'model' | 'workspaceId'>[];
+    folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
+    httpRequests: AtLeast<HttpRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
+    grpcRequests: AtLeast<GrpcRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
+  };
 };
 
 export type ImporterPlugin = {

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

@@ -1,6 +1,12 @@
-import type { CallTemplateFunctionArgs, TemplateFunction } from '..';
-import type { Context } from './Context';
+import {
+  CallTemplateFunctionArgs,
+  TemplateFunction,
+} from "../bindings/gen_events";
+import { Context } from "./Context";
 
 export type TemplateFunctionPlugin = TemplateFunction & {
-  onRender(ctx: Context, args: CallTemplateFunctionArgs): Promise<string | null>;
+  onRender(
+    ctx: Context,
+    args: CallTemplateFunctionArgs,
+  ): Promise<string | null>;
 };

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

@@ -1,8 +1,8 @@
-import type { Theme } from '../themes';
-import type { Context } from './Context';
+import { Index } from "../themes";
+import { Context } from "./Context";
 
 export type ThemePlugin = {
   name: string;
   description?: string;
-  getTheme(ctx: Context, fileContents: string): Promise<Theme>;
+  getTheme(ctx: Context, fileContents: string): Promise<Index>;
 };

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

@@ -24,7 +24,7 @@ export type Colors = {
   danger?: string;
 };
 
-export type Theme = Colors & {
+export type Index = Colors & {
   id: string;
   name: string;
   components?: Partial<{

packages/plugin-runtime/.gitignore

@@ -1,3 +0,0 @@
-build
-node_modules
-*.blob

packages/plugin-runtime/package-lock.json

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

packages/plugin-runtime/package.json

@@ -3,19 +3,12 @@
   "scripts": {
     "bootstrap": "npm run build",
     "build": "run-p build:*",
-    "build:main": "esbuild src/index.ts --bundle --platform=node --outfile=../../src-tauri/vendored/plugin-runtime/index.cjs",
-    "build:worker": "esbuild src/index.worker.ts --bundle --platform=node --outfile=../../src-tauri/vendored/plugin-runtime/index.worker.cjs",
-    "build:proto": "grpc_tools_node_protoc --ts_proto_out=src/gen --ts_proto_opt=outputServices=nice-grpc,outputServices=generic-definitions,useExactTypes=false --proto_path=../../proto ../../proto/plugins/*.proto"
+    "build:main": "esbuild src/index.ts --bundle --platform=node --outfile=../../src-tauri/vendored/plugin-runtime/index.cjs"
   },
   "dependencies": {
-    "intercept-stdout": "^0.1.2",
-    "long": "^5.2.3",
-    "nice-grpc": "^2.1.9",
-    "protobufjs": "^7.4.0"
+    "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@types/intercept-stdout": "^0.1.3",
-    "grpc-tools": "^1.12.4",
-    "ts-proto": "^2.2.0"
+    "@types/ws": "^8.5.13"
   }
 }

packages/plugin-runtime/src/EventChannel.ts

@@ -1,21 +1,19 @@
 import type { InternalEvent } from '@yaakapp/api';
-import EventEmitter from 'node:events';
-import type { EventStreamEvent } from './gen/plugins/runtime';
 
 export class EventChannel {
-  emitter: EventEmitter = new EventEmitter();
+  #listeners = new Set<(event: InternalEvent) => void>();
 
   emit(e: InternalEvent) {
-    this.emitter.emit('__plugin_event__', { event: JSON.stringify(e) });
-  }
-
-  async *listen(): AsyncGenerator<EventStreamEvent> {
-    while (true) {
-      yield new Promise<EventStreamEvent>((resolve) => {
-        this.emitter.once('__plugin_event__', (event: EventStreamEvent) => {
-          resolve(event);
-        });
-      });
+    for (const l of this.#listeners) {
+      l(e);
     }
   }
+
+  listen(cb: (e: InternalEvent) => void) {
+    this.#listeners.add(cb);
+  }
+
+  unlisten(cb: (e: InternalEvent) => void) {
+    this.#listeners.delete(cb);
+  }
 }

packages/plugin-runtime/src/PluginHandle.ts

@@ -1,56 +1,28 @@
-import type { BootRequest, InternalEvent } from '@yaakapp-internal/plugins';
-import path from 'node:path';
-import { Worker } from 'node:worker_threads';
+import type { BootRequest, InternalEvent } from '@yaakapp/api';
 import type { EventChannel } from './EventChannel';
-import type { PluginWorkerData } from './index.worker';
+import { PluginInstance, PluginWorkerData } from './PluginInstance';
 
 export class PluginHandle {
-  #worker: Worker;
+  #instance: PluginInstance;
 
   constructor(
     readonly pluginRefId: string,
     readonly bootRequest: BootRequest,
-    readonly events: EventChannel,
+    readonly pluginToAppEvents: EventChannel,
   ) {
-    this.#worker = this.#createWorker();
-  }
-
-  sendToWorker(event: InternalEvent) {
-    this.#worker.postMessage(event);
-  }
-
-  async terminate() {
-    await this.#worker.terminate();
-  }
-
-  #createWorker(): Worker {
-    const workerPath = process.env.YAAK_WORKER_PATH ?? path.join(__dirname, 'index.worker.cjs');
     const workerData: PluginWorkerData = {
       pluginRefId: this.pluginRefId,
       bootRequest: this.bootRequest,
     };
-    const worker = new Worker(workerPath, {
-      workerData,
-    });
-
-    worker.on('message', (e) => this.events.emit(e));
-    worker.on('error', this.#handleError.bind(this));
-    worker.on('exit', this.#handleExit.bind(this));
-
+    this.#instance = new PluginInstance(workerData, pluginToAppEvents);
     console.log('Created plugin worker for ', this.bootRequest.dir);
-
-    return worker;
   }
 
-  async #handleError(err: Error) {
-    console.error('Plugin errored', this.bootRequest.dir, err);
+  sendToWorker(event: InternalEvent) {
+    this.#instance.postMessage(event);
   }
 
-  async #handleExit(code: number) {
-    if (code === 0) {
-      console.log('Plugin exited successfully', this.bootRequest.dir);
-    } else {
-      console.log('Plugin exited with status', code, this.bootRequest.dir);
-    }
+  terminate() {
+    this.#instance.terminate();
   }
 }

packages/plugin-runtime/src/PluginInstance.ts

@@ -0,0 +1,597 @@
+import type {
+  BootRequest,
+  Context,
+  DeleteKeyValueResponse,
+  FindHttpResponsesResponse,
+  FormInput,
+  GetHttpRequestByIdResponse,
+  GetKeyValueResponse,
+  HttpAuthenticationAction,
+  HttpRequestAction,
+  InternalEvent,
+  InternalEventPayload,
+  JsonPrimitive,
+  PluginDefinition,
+  PromptTextResponse,
+  RenderHttpRequestResponse,
+  SendHttpRequestResponse,
+  TemplateFunction,
+  TemplateRenderResponse,
+  WindowContext,
+} from '@yaakapp/api';
+import console from 'node:console';
+import { readFileSync, type Stats, statSync, watch } from 'node:fs';
+import path from 'node:path';
+// import util from 'node:util';
+import { EventChannel } from './EventChannel';
+// import { interceptStdout } from './interceptStdout';
+import { migrateTemplateFunctionSelectOptions } from './migrations';
+
+export interface PluginWorkerData {
+  bootRequest: BootRequest;
+  pluginRefId: string;
+}
+
+export class PluginInstance {
+  #workerData: PluginWorkerData;
+  #mod: PluginDefinition;
+  #pkg: { name?: string; version?: string };
+  #pluginToAppEvents: EventChannel;
+  #appToPluginEvents: EventChannel;
+
+  constructor(workerData: PluginWorkerData, pluginEvents: EventChannel) {
+    this.#workerData = workerData;
+    this.#pluginToAppEvents = pluginEvents;
+    this.#appToPluginEvents = new EventChannel();
+
+    // Forward incoming events to onMessage()
+    this.#appToPluginEvents.listen(async event => {
+      await this.#onMessage(event);
+    })
+
+    // Reload plugin if the JS or package.json changes
+    const windowContextNone: WindowContext = { type: 'none' };
+    const fileChangeCallback = async () => {
+      this.#importModule();
+      return this.#sendPayload(windowContextNone, { type: 'reload_response' }, null);
+    };
+
+    if (this.#workerData.bootRequest.watch) {
+      watchFile(this.#pathMod(), fileChangeCallback);
+      watchFile(this.#pathPkg(), fileChangeCallback);
+    }
+
+    this.#mod = {};
+    this.#pkg = JSON.parse(readFileSync(this.#pathPkg(), 'utf8'));
+
+    // TODO: Re-implement this now that we're not using workers
+    // prefixStdout(`[plugin][${this.#pkg.name}] %s`);
+
+    this.#importModule();
+  }
+
+  postMessage(event: InternalEvent) {
+    this.#appToPluginEvents.emit(event);
+  }
+
+  terminate() {
+    this.#unimportModule();
+  }
+
+  async #onMessage(event: InternalEvent) {
+    const ctx = this.#newCtx(event);
+
+    const { windowContext, payload, id: replyId } = event;
+    try {
+      if (payload.type === 'boot_request') {
+        // console.log('Plugin initialized', pkg.name, { capabilities, enableWatch });
+        const payload: InternalEventPayload = {
+          type: 'boot_response',
+          name: this.#pkg.name ?? 'unknown',
+          version: this.#pkg.version ?? '0.0.1',
+        };
+        this.#sendPayload(windowContext, payload, replyId);
+        return;
+      }
+
+      if (payload.type === 'terminate_request') {
+        const payload: InternalEventPayload = {
+          type: 'terminate_response',
+        };
+        this.#sendPayload(windowContext, payload, replyId);
+        return;
+      }
+
+      if (
+        payload.type === 'import_request' &&
+        typeof this.#mod?.importer?.onImport === 'function'
+      ) {
+        const reply = await this.#mod.importer.onImport(ctx, {
+          text: payload.content,
+        });
+        if (reply != null) {
+          const replyPayload: InternalEventPayload = {
+            type: 'import_response',
+            // deno-lint-ignore no-explicit-any
+            resources: reply.resources as any,
+          };
+          this.#sendPayload(windowContext, replyPayload, replyId);
+          return;
+        } else {
+          // Continue, to send back an empty reply
+        }
+      }
+
+      if (payload.type === 'filter_request' && typeof this.#mod?.filter?.onFilter === 'function') {
+        const reply = await this.#mod.filter.onFilter(ctx, {
+          filter: payload.filter,
+          payload: payload.content,
+          mimeType: payload.type,
+        });
+        const replyPayload: InternalEventPayload = {
+          type: 'filter_response',
+          content: reply.filtered,
+        };
+        this.#sendPayload(windowContext, replyPayload, replyId);
+        return;
+      }
+
+      if (
+        payload.type === 'get_http_request_actions_request' &&
+        Array.isArray(this.#mod?.httpRequestActions)
+      ) {
+        const reply: HttpRequestAction[] = this.#mod.httpRequestActions.map((a) => ({
+          ...a,
+          // Add everything except onSelect
+          onSelect: undefined,
+        }));
+        const replyPayload: InternalEventPayload = {
+          type: 'get_http_request_actions_response',
+          pluginRefId: this.#workerData.pluginRefId,
+          actions: reply,
+        };
+        this.#sendPayload(windowContext, replyPayload, replyId);
+        return;
+      }
+
+      if (
+        payload.type === 'get_template_functions_request' &&
+        Array.isArray(this.#mod?.templateFunctions)
+      ) {
+        const reply: TemplateFunction[] = this.#mod.templateFunctions.map((templateFunction) => {
+          return {
+            ...migrateTemplateFunctionSelectOptions(templateFunction),
+            // Add everything except render
+            onRender: undefined,
+          };
+        });
+        const replyPayload: InternalEventPayload = {
+          type: 'get_template_functions_response',
+          pluginRefId: this.#workerData.pluginRefId,
+          functions: reply,
+        };
+        this.#sendPayload(windowContext, replyPayload, replyId);
+        return;
+      }
+
+      if (payload.type === 'get_http_authentication_summary_request' && this.#mod?.authentication) {
+        const { name, shortLabel, label } = this.#mod.authentication;
+        const replyPayload: InternalEventPayload = {
+          type: 'get_http_authentication_summary_response',
+          name,
+          label,
+          shortLabel,
+        };
+
+        this.#sendPayload(windowContext, replyPayload, replyId);
+        return;
+      }
+
+      if (payload.type === 'get_http_authentication_config_request' && this.#mod?.authentication) {
+        const { args, actions } = this.#mod.authentication;
+        const resolvedArgs: FormInput[] = [];
+        for (let i = 0; i < args.length; i++) {
+          let v = args[i];
+          if ('dynamic' in v) {
+            const dynamicAttrs = await v.dynamic(ctx, payload);
+            const { dynamic, ...other } = v;
+            resolvedArgs.push({ ...other, ...dynamicAttrs } as FormInput);
+          } else {
+            resolvedArgs.push(v);
+          }
+        }
+        const resolvedActions: HttpAuthenticationAction[] = [];
+        for (const { onSelect, ...action } of actions ?? []) {
+          resolvedActions.push(action);
+        }
+
+        const replyPayload: InternalEventPayload = {
+          type: 'get_http_authentication_config_response',
+          args: resolvedArgs,
+          actions: resolvedActions,
+          pluginRefId: this.#workerData.pluginRefId,
+        };
+
+        this.#sendPayload(windowContext, replyPayload, replyId);
+        return;
+      }
+
+      if (payload.type === 'call_http_authentication_request' && this.#mod?.authentication) {
+        const auth = this.#mod.authentication;
+        if (typeof auth?.onApply === 'function') {
+          applyFormInputDefaults(auth.args, payload.values);
+          const result = await auth.onApply(ctx, payload);
+          this.#sendPayload(
+            windowContext,
+            {
+              type: 'call_http_authentication_response',
+              setHeaders: result.setHeaders,
+            },
+            replyId,
+          );
+          return;
+        }
+      }
+
+      if (
+        payload.type === 'call_http_authentication_action_request' &&
+        this.#mod.authentication != null
+      ) {
+        const action = this.#mod.authentication.actions?.[payload.index];
+        if (typeof action?.onSelect === 'function') {
+          await action.onSelect(ctx, payload.args);
+          this.#sendEmpty(windowContext, replyId);
+          return;
+        }
+      }
+
+      if (
+        payload.type === 'call_http_request_action_request' &&
+        Array.isArray(this.#mod.httpRequestActions)
+      ) {
+        const action = this.#mod.httpRequestActions[payload.index];
+        if (typeof action?.onSelect === 'function') {
+          await action.onSelect(ctx, payload.args);
+          this.#sendEmpty(windowContext, replyId);
+          return;
+        }
+      }
+
+      if (
+        payload.type === 'call_template_function_request' &&
+        Array.isArray(this.#mod?.templateFunctions)
+      ) {
+        const action = this.#mod.templateFunctions.find((a) => a.name === payload.name);
+        if (typeof action?.onRender === 'function') {
+          applyFormInputDefaults(action.args, payload.args.values);
+          const result = await action.onRender(ctx, payload.args);
+          this.#sendPayload(
+            windowContext,
+            {
+              type: 'call_template_function_response',
+              value: result ?? null,
+            },
+            replyId,
+          );
+          return;
+        }
+      }
+
+      if (payload.type === 'reload_request') {
+        this.#importModule();
+      }
+    } catch (err) {
+      console.log('Plugin call threw exception', payload.type, err);
+      this.#sendPayload(
+        windowContext,
+        {
+          type: 'error_response',
+          error: `${err}`,
+        },
+        replyId,
+      );
+      return;
+    }
+
+    // No matches, so send back an empty response so the caller doesn't block forever
+    this.#sendEmpty(windowContext, replyId);
+  }
+
+  #pathMod() {
+    return path.posix.join(this.#workerData.bootRequest.dir, 'build', 'index.js');
+  }
+
+  #pathPkg() {
+    return path.join(this.#workerData.bootRequest.dir, 'package.json');
+  }
+
+  #unimportModule() {
+    const id = require.resolve(this.#pathMod());
+    delete require.cache[id];
+  }
+
+  #importModule() {
+    const id = require.resolve(this.#pathMod());
+    delete require.cache[id];
+    this.#mod = require(id).plugin;
+  }
+
+  #buildEventToSend(
+    windowContext: WindowContext,
+    payload: InternalEventPayload,
+    replyId: string | null = null,
+  ): InternalEvent {
+    return {
+      pluginRefId: this.#workerData.pluginRefId,
+      pluginName: path.basename(this.#workerData.bootRequest.dir),
+      id: genId(),
+      replyId,
+      payload,
+      windowContext,
+    };
+  }
+
+  #sendPayload(
+    windowContext: WindowContext,
+    payload: InternalEventPayload,
+    replyId: string | null,
+  ): string {
+    const event = this.#buildEventToSend(windowContext, payload, replyId);
+    this.#sendEvent(event);
+    return event.id;
+  }
+
+  #sendEvent(event: InternalEvent) {
+    // if (event.payload.type !== 'empty_response') {
+    //   console.log('Sending event to app', this.#pkg.name, event.id, event.payload.type);
+    // }
+    this.#pluginToAppEvents.emit(event);
+  }
+
+  #sendEmpty(windowContext: WindowContext, replyId: string | null = null): string {
+    return this.#sendPayload(windowContext, { type: 'empty_response' }, replyId);
+  }
+
+  #sendAndWaitForReply<T extends Omit<InternalEventPayload, 'type'>>(
+    windowContext: WindowContext,
+    payload: InternalEventPayload,
+  ): Promise<T> {
+    // 1. Build event to send
+    const eventToSend = this.#buildEventToSend(windowContext, payload, null);
+
+    // 2. Spawn listener in background
+    const promise = new Promise<T>((resolve) => {
+      const cb = (event: InternalEvent) => {
+        if (event.replyId === eventToSend.id) {
+          this.#appToPluginEvents.unlisten(cb); // Unlisten, now that we're done
+          const { type: _, ...payload } = event.payload;
+          resolve(payload as T);
+        }
+      };
+      this.#appToPluginEvents.listen(cb);
+    });
+
+    // 3. Send the event after we start listening (to prevent race)
+    this.#sendEvent(eventToSend);
+
+    // 4. Return the listener promise
+    return promise as unknown as Promise<T>;
+  }
+
+  #sendAndListenForEvents(
+    windowContext: WindowContext,
+    payload: InternalEventPayload,
+    onEvent: (event: InternalEventPayload) => void,
+  ): void {
+    // 1. Build event to send
+    const eventToSend = this.#buildEventToSend(windowContext, payload, null);
+
+    // 2. Listen for replies in the background
+    this.#appToPluginEvents.listen((event: InternalEvent) => {
+      if (event.replyId === eventToSend.id) {
+        onEvent(event.payload);
+      }
+    });
+
+    // 3. Send the event after we start listening (to prevent race)
+    this.#sendEvent(eventToSend);
+  }
+
+  #newCtx(event: InternalEvent): Context {
+    return {
+      clipboard: {
+        copyText: async (text) => {
+          await this.#sendAndWaitForReply(event.windowContext, {
+            type: 'copy_text_request',
+            text,
+          });
+        },
+      },
+      toast: {
+        show: async (args) => {
+          await this.#sendAndWaitForReply(event.windowContext, {
+            type: 'show_toast_request',
+            ...args,
+          });
+        },
+      },
+      window: {
+        openUrl: async ({ onNavigate, onClose, ...args }) => {
+          args.label = args.label || `${Math.random()}`;
+          const payload: InternalEventPayload = { type: 'open_window_request', ...args };
+          const onEvent = (event: InternalEventPayload) => {
+            if (event.type === 'window_navigate_event') {
+              onNavigate?.(event);
+            } else if (event.type === 'window_close_event') {
+              onClose?.();
+            }
+          };
+          this.#sendAndListenForEvents(event.windowContext, payload, onEvent);
+          return {
+            close: () => {
+              const closePayload: InternalEventPayload = {
+                type: 'close_window_request',
+                label: args.label,
+              };
+              this.#sendPayload(event.windowContext, closePayload, null);
+            },
+          };
+        },
+      },
+      prompt: {
+        text: async (args) => {
+          const reply: PromptTextResponse = await this.#sendAndWaitForReply(event.windowContext, {
+            type: 'prompt_text_request',
+            ...args,
+          });
+          return reply.value;
+        },
+      },
+      httpResponse: {
+        find: async (args) => {
+          const payload = {
+            type: 'find_http_responses_request',
+            ...args,
+          } as const;
+          const { httpResponses } = await this.#sendAndWaitForReply<FindHttpResponsesResponse>(
+            event.windowContext,
+            payload,
+          );
+          return httpResponses;
+        },
+      },
+      httpRequest: {
+        getById: async (args) => {
+          const payload = {
+            type: 'get_http_request_by_id_request',
+            ...args,
+          } as const;
+          const { httpRequest } = await this.#sendAndWaitForReply<GetHttpRequestByIdResponse>(
+            event.windowContext,
+            payload,
+          );
+          return httpRequest;
+        },
+        send: async (args) => {
+          const payload = {
+            type: 'send_http_request_request',
+            ...args,
+          } as const;
+          const { httpResponse } = await this.#sendAndWaitForReply<SendHttpRequestResponse>(
+            event.windowContext,
+            payload,
+          );
+          return httpResponse;
+        },
+        render: async (args) => {
+          const payload = {
+            type: 'render_http_request_request',
+            ...args,
+          } as const;
+          const { httpRequest } = await this.#sendAndWaitForReply<RenderHttpRequestResponse>(
+            event.windowContext,
+            payload,
+          );
+          return httpRequest;
+        },
+      },
+      templates: {
+        /**
+         * Invoke Yaak's template engine to render a value. If the value is a nested type
+         * (eg. object), it will be recursively rendered.
+         */
+        render: async (args) => {
+          const payload = { type: 'template_render_request', ...args } as const;
+          const result = await this.#sendAndWaitForReply<TemplateRenderResponse>(
+            event.windowContext,
+            payload,
+          );
+          return result.data;
+        },
+      },
+      store: {
+        get: async <T>(key: string) => {
+          const payload = { type: 'get_key_value_request', key } as const;
+          const result = await this.#sendAndWaitForReply<GetKeyValueResponse>(
+            event.windowContext,
+            payload,
+          );
+          return result.value ? (JSON.parse(result.value) as T) : undefined;
+        },
+        set: async <T>(key: string, value: T) => {
+          const valueStr = JSON.stringify(value);
+          const payload: InternalEventPayload = {
+            type: 'set_key_value_request',
+            key,
+            value: valueStr,
+          };
+          await this.#sendAndWaitForReply<GetKeyValueResponse>(event.windowContext, payload);
+        },
+        delete: async (key: string) => {
+          const payload = { type: 'delete_key_value_request', key } as const;
+          const result = await this.#sendAndWaitForReply<DeleteKeyValueResponse>(
+            event.windowContext,
+            payload,
+          );
+          return result.deleted;
+        },
+      },
+    };
+  }
+}
+
+function genId(len = 5): string {
+  const alphabet = '01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  let id = '';
+  for (let i = 0; i < len; i++) {
+    id += alphabet[Math.floor(Math.random() * alphabet.length)];
+  }
+  return id;
+}
+
+/** Recursively apply form input defaults to a set of values */
+function applyFormInputDefaults(
+  inputs: FormInput[],
+  values: { [p: string]: JsonPrimitive | undefined },
+) {
+  for (const input of inputs) {
+    if ('inputs' in input) {
+      applyFormInputDefaults(input.inputs ?? [], values);
+    } else if ('defaultValue' in input && values[input.name] === undefined) {
+      values[input.name] = input.defaultValue;
+    }
+  }
+}
+
+const watchedFiles: Record<string, Stats> = {};
+
+/**
+ * Watch a file and trigger callback on change.
+ *
+ * We also track the stat for each file because fs.watch() will
+ * trigger a "change" event when the access date changes
+ */
+function watchFile(filepath: string, cb: (filepath: string) => void) {
+  watch(filepath, () => {
+    const stat = statSync(filepath);
+    if (stat.mtimeMs !== watchedFiles[filepath]?.mtimeMs) {
+      cb(filepath);
+    }
+    watchedFiles[filepath] = stat;
+  });
+}
+
+// function prefixStdout(s: string) {
+//   if (!s.includes('%s')) {
+//     throw new Error('Console prefix must contain a "%s" replacer');
+//   }
+//   interceptStdout((text: string) => {
+//     const lines = text.split(/\n/);
+//     let newText = '';
+//     for (let i = 0; i < lines.length; i++) {
+//       if (lines[i] == '') continue;
+//       newText += util.format(s, lines[i]) + '\n';
+//     }
+//     return newText.trimEnd();
+//   });
+// }

packages/plugin-runtime/src/gen/plugins/runtime.ts

@@ -1,126 +0,0 @@
-// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
-// versions:
-//   protoc-gen-ts_proto  v2.2.3
-//   protoc               v3.19.1
-// source: plugins/runtime.proto
-
-/* eslint-disable */
-import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
-import { type CallContext, type CallOptions } from "nice-grpc-common";
-
-export const protobufPackage = "yaak.plugins.runtime";
-
-export interface EventStreamEvent {
-  event: string;
-}
-
-function createBaseEventStreamEvent(): EventStreamEvent {
-  return { event: "" };
-}
-
-export const EventStreamEvent: MessageFns<EventStreamEvent> = {
-  encode(message: EventStreamEvent, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.event !== "") {
-      writer.uint32(10).string(message.event);
-    }
-    return writer;
-  },
-
-  decode(input: BinaryReader | Uint8Array, length?: number): EventStreamEvent {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseEventStreamEvent();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-
-          message.event = reader.string();
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): EventStreamEvent {
-    return { event: isSet(object.event) ? globalThis.String(object.event) : "" };
-  },
-
-  toJSON(message: EventStreamEvent): unknown {
-    const obj: any = {};
-    if (message.event !== "") {
-      obj.event = message.event;
-    }
-    return obj;
-  },
-
-  create(base?: DeepPartial<EventStreamEvent>): EventStreamEvent {
-    return EventStreamEvent.fromPartial(base ?? {});
-  },
-  fromPartial(object: DeepPartial<EventStreamEvent>): EventStreamEvent {
-    const message = createBaseEventStreamEvent();
-    message.event = object.event ?? "";
-    return message;
-  },
-};
-
-export type PluginRuntimeDefinition = typeof PluginRuntimeDefinition;
-export const PluginRuntimeDefinition = {
-  name: "PluginRuntime",
-  fullName: "yaak.plugins.runtime.PluginRuntime",
-  methods: {
-    eventStream: {
-      name: "EventStream",
-      requestType: EventStreamEvent,
-      requestStream: true,
-      responseType: EventStreamEvent,
-      responseStream: true,
-      options: {},
-    },
-  },
-} as const;
-
-export interface PluginRuntimeServiceImplementation<CallContextExt = {}> {
-  eventStream(
-    request: AsyncIterable<EventStreamEvent>,
-    context: CallContext & CallContextExt,
-  ): ServerStreamingMethodResult<DeepPartial<EventStreamEvent>>;
-}
-
-export interface PluginRuntimeClient<CallOptionsExt = {}> {
-  eventStream(
-    request: AsyncIterable<DeepPartial<EventStreamEvent>>,
-    options?: CallOptions & CallOptionsExt,
-  ): AsyncIterable<EventStreamEvent>;
-}
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}
-
-export type ServerStreamingMethodResult<Response> = { [Symbol.asyncIterator](): AsyncIterator<Response, void> };
-
-export interface MessageFns<T> {
-  encode(message: T, writer?: BinaryWriter): BinaryWriter;
-  decode(input: BinaryReader | Uint8Array, length?: number): T;
-  fromJSON(object: any): T;
-  toJSON(message: T): unknown;
-  create(base?: DeepPartial<T>): T;
-  fromPartial(object: DeepPartial<T>): T;
-}

packages/plugin-runtime/src/index.ts

@@ -1,52 +1,55 @@
 import type { InternalEvent } from '@yaakapp/api';
-import { createChannel, createClient, Status } from 'nice-grpc';
 import { EventChannel } from './EventChannel';
-import type { PluginRuntimeClient} from './gen/plugins/runtime';
-import { PluginRuntimeDefinition } from './gen/plugins/runtime';
 import { PluginHandle } from './PluginHandle';
+import WebSocket from 'ws';
 
-const port = process.env.PORT || '50051';
+const port = process.env.PORT;
+if (!port) {
+  throw new Error('Plugin runtime missing PORT')
+}
 
-const channel = createChannel(`localhost:${port}`, undefined, {
-  'grpc.max_receive_message_length': Number.MAX_SAFE_INTEGER,
-  'grpc.max_send_message_length': Number.MAX_SAFE_INTEGER,
-});
-const client: PluginRuntimeClient = createClient(PluginRuntimeDefinition, channel);
-
-const events = new EventChannel();
+const pluginToAppEvents = new EventChannel();
 const plugins: Record<string, PluginHandle> = {};
 
-(async () => {
+const ws = new WebSocket(`ws://localhost:${port}`);
+
+ws.on('message', async (e: Buffer) => {
   try {
-    for await (const e of client.eventStream(events.listen())) {
-      const pluginEvent: InternalEvent = JSON.parse(e.event);
-      // Handle special event to bootstrap plugin
-      if (pluginEvent.payload.type === 'boot_request') {
-        const plugin = new PluginHandle(pluginEvent.pluginRefId, pluginEvent.payload, events);
-        plugins[pluginEvent.pluginRefId] = plugin;
-      }
-
-      // Once booted, forward all events to the plugin worker
-      const plugin = plugins[pluginEvent.pluginRefId];
-      if (!plugin) {
-        console.warn('Failed to get plugin for event by', pluginEvent.pluginRefId);
-        continue;
-      }
-
-      if (pluginEvent.payload.type === 'terminate_request') {
-        await plugin.terminate();
-        console.log('Terminated plugin worker', pluginEvent.pluginRefId);
-        delete plugins[pluginEvent.pluginRefId];
-      }
-
-      plugin.sendToWorker(pluginEvent);
-    }
-    console.log('Stream ended');
-  } catch (err: any) {
-    if (err.code === Status.CANCELLED) {
-      console.log('Stream was cancelled by server');
-    } else {
-      console.log('Client stream errored', err);
-    }
+    await handleIncoming(e.toString());
+  } catch (err) {
+    console.log('Failed to handle incoming plugin event', err);
   }
-})();
+});
+ws.on('open', () => console.log('Plugin runtime connected to websocket'));
+ws.on('error', (err: any) => console.error('Plugin runtime websocket error', err));
+ws.on('close', (code: number) => console.log('Plugin runtime websocket closed', code));
+
+// Listen for incoming events from plugins
+pluginToAppEvents.listen((e) => {
+  const eventStr = JSON.stringify(e);
+  ws.send(eventStr);
+});
+
+async function handleIncoming(msg: string) {
+  const pluginEvent: InternalEvent = JSON.parse(msg);
+  // Handle special event to bootstrap plugin
+  if (pluginEvent.payload.type === 'boot_request') {
+    const plugin = new PluginHandle(pluginEvent.pluginRefId, pluginEvent.payload, pluginToAppEvents);
+    plugins[pluginEvent.pluginRefId] = plugin;
+  }
+
+  // Once booted, forward all events to the plugin worker
+  const plugin = plugins[pluginEvent.pluginRefId];
+  if (!plugin) {
+    console.warn('Failed to get plugin for event by', pluginEvent.pluginRefId);
+    return;
+  }
+
+  if (pluginEvent.payload.type === 'terminate_request') {
+    plugin.terminate();
+    console.log('Terminated plugin worker', pluginEvent.pluginRefId);
+    delete plugins[pluginEvent.pluginRefId];
+  }
+
+  plugin.sendToWorker(pluginEvent);
+}

packages/plugin-runtime/src/index.worker.ts

@@ -1,427 +0,0 @@
-import type {
-  BootRequest,
-  FindHttpResponsesResponse,
-  GetHttpRequestByIdResponse,
-  HttpRequestAction,
-  ImportResponse,
-  InternalEvent,
-  InternalEventPayload,
-  PromptTextResponse,
-  RenderHttpRequestResponse,
-  SendHttpRequestResponse,
-  TemplateFunction,
-  TemplateRenderResponse,
-  WindowContext,
-} from '@yaakapp-internal/plugins';
-import type { Context } from '@yaakapp/api';
-import type { HttpRequestActionPlugin } from '@yaakapp/api/lib/plugins/HttpRequestActionPlugin';
-import type { TemplateFunctionPlugin } from '@yaakapp/api/lib/plugins/TemplateFunctionPlugin';
-import interceptStdout from 'intercept-stdout';
-import * as console from 'node:console';
-import type { Stats } from 'node:fs';
-import { readFileSync, statSync, watch } from 'node:fs';
-import path from 'node:path';
-import * as util from 'node:util';
-import { parentPort, workerData } from 'node:worker_threads';
-
-export interface PluginWorkerData {
-  bootRequest: BootRequest;
-  pluginRefId: string;
-}
-
-async function initialize() {
-  const {
-    bootRequest: { dir: pluginDir, watch: enableWatch },
-    pluginRefId,
-  }: PluginWorkerData = workerData;
-  const pathPkg = path.join(pluginDir, 'package.json');
-
-  const pathMod = path.posix.join(pluginDir, 'build', 'index.js');
-
-  async function importModule() {
-    const id = require.resolve(pathMod);
-    delete require.cache[id];
-    return require(id);
-  }
-
-  const pkg = JSON.parse(readFileSync(pathPkg, 'utf8'));
-
-  prefixStdout(`[plugin][${pkg.name}] %s`);
-
-  let mod = await importModule();
-
-  const capabilities: string[] = [];
-  if (typeof mod.pluginHookExport === 'function') capabilities.push('export');
-  if (typeof mod.pluginHookImport === 'function') capabilities.push('import');
-  if (typeof mod.pluginHookResponseFilter === 'function') capabilities.push('filter');
-
-  console.log('Plugin initialized', pkg.name, { capabilities, enableWatch });
-
-  function buildEventToSend(
-    windowContext: WindowContext,
-    payload: InternalEventPayload,
-    replyId: string | null = null,
-  ): InternalEvent {
-    return { pluginRefId, id: genId(), replyId, payload, windowContext };
-  }
-
-  function sendEmpty(windowContext: WindowContext, replyId: string | null = null): string {
-    return sendPayload(windowContext, { type: 'empty_response' }, replyId);
-  }
-
-  function sendPayload(
-    windowContext: WindowContext,
-    payload: InternalEventPayload,
-    replyId: string | null,
-  ): string {
-    const event = buildEventToSend(windowContext, payload, replyId);
-    sendEvent(event);
-    return event.id;
-  }
-
-  function sendEvent(event: InternalEvent) {
-    if (event.payload.type !== 'empty_response') {
-      console.log('Sending event to app', event.id, event.payload.type);
-    }
-    parentPort!.postMessage(event);
-  }
-
-  async function sendAndWaitForReply<T extends Omit<InternalEventPayload, 'type'>>(
-    windowContext: WindowContext,
-    payload: InternalEventPayload,
-  ): Promise<T> {
-    // 1. Build event to send
-    const eventToSend = buildEventToSend(windowContext, payload, null);
-
-    // 2. Spawn listener in background
-    const promise = new Promise<InternalEventPayload>(async (resolve) => {
-      const cb = (event: InternalEvent) => {
-        if (event.replyId === eventToSend.id) {
-          parentPort!.off('message', cb); // Unlisten, now that we're done
-          resolve(event.payload); // Not type-safe but oh well
-        }
-      };
-      parentPort!.on('message', cb);
-    });
-
-    // 3. Send the event after we start listening (to prevent race)
-    sendEvent(eventToSend);
-
-    // 4. Return the listener promise
-    return promise as unknown as Promise<T>;
-  }
-
-  async function reloadModule() {
-    mod = await importModule();
-  }
-
-  // Reload plugin if JS or package.json changes
-  const windowContextNone: WindowContext = { type: 'none' };
-  const cb = async () => {
-    await reloadModule();
-    return sendPayload(windowContextNone, { type: 'reload_response' }, null);
-  };
-
-  if (enableWatch) {
-    watchFile(pathMod, cb);
-    watchFile(pathPkg, cb);
-  }
-
-  const newCtx = (event: InternalEvent): Context => ({
-    clipboard: {
-      async copyText(text) {
-        await sendAndWaitForReply(event.windowContext, { type: 'copy_text_request', text });
-      },
-    },
-    toast: {
-      async show(args) {
-        await sendAndWaitForReply(event.windowContext, { type: 'show_toast_request', ...args });
-      },
-    },
-    prompt: {
-      async text(args) {
-        const reply: PromptTextResponse = await sendAndWaitForReply(event.windowContext, {
-          type: 'prompt_text_request',
-          ...args,
-        });
-        return reply.value;
-      },
-    },
-    httpResponse: {
-      async find(args) {
-        const payload = { type: 'find_http_responses_request', ...args } as const;
-        const { httpResponses } = await sendAndWaitForReply<FindHttpResponsesResponse>(
-          event.windowContext,
-          payload,
-        );
-        return httpResponses;
-      },
-    },
-    httpRequest: {
-      async getById(args) {
-        const payload = { type: 'get_http_request_by_id_request', ...args } as const;
-        const { httpRequest } = await sendAndWaitForReply<GetHttpRequestByIdResponse>(
-          event.windowContext,
-          payload,
-        );
-        return httpRequest;
-      },
-      async send(args) {
-        const payload = { type: 'send_http_request_request', ...args } as const;
-        const { httpResponse } = await sendAndWaitForReply<SendHttpRequestResponse>(
-          event.windowContext,
-          payload,
-        );
-        return httpResponse;
-      },
-      async render(args) {
-        const payload = { type: 'render_http_request_request', ...args } as const;
-        const { httpRequest } = await sendAndWaitForReply<RenderHttpRequestResponse>(
-          event.windowContext,
-          payload,
-        );
-        return httpRequest;
-      },
-    },
-    templates: {
-      /**
-       * Invoke Yaak's template engine to render a value. If the value is a nested type
-       * (eg. object), it will be recursively rendered.
-       * */
-      async render(args) {
-        const payload = { type: 'template_render_request', ...args } as const;
-        const result = await sendAndWaitForReply<TemplateRenderResponse>(
-          event.windowContext,
-          payload,
-        );
-        return result.data;
-      },
-    },
-  });
-
-  // Message comes into the plugin to be processed
-  parentPort!.on('message', async (event: InternalEvent) => {
-    const { windowContext, payload, id: replyId } = event;
-    const ctx = newCtx(event);
-    try {
-      if (payload.type === 'boot_request') {
-        const payload: InternalEventPayload = {
-          type: 'boot_response',
-          name: pkg.name,
-          version: pkg.version,
-          capabilities,
-        };
-        sendPayload(windowContext, payload, replyId);
-        return;
-      }
-
-      if (payload.type === 'terminate_request') {
-        const payload: InternalEventPayload = {
-          type: 'terminate_response',
-        };
-        sendPayload(windowContext, payload, replyId);
-        return;
-      }
-
-      if (payload.type === 'import_request' && typeof mod.pluginHookImport === 'function') {
-        const reply: ImportResponse | null = await mod.pluginHookImport(ctx, payload.content);
-        if (reply != null) {
-          const replyPayload: InternalEventPayload = {
-            type: 'import_response',
-            resources: reply?.resources,
-          };
-          sendPayload(windowContext, replyPayload, replyId);
-          return;
-        } else {
-          // Continue, to send back an empty reply
-        }
-      }
-
-      if (
-        payload.type === 'export_http_request_request' &&
-        typeof mod.pluginHookExport === 'function'
-      ) {
-        const reply: string = await mod.pluginHookExport(ctx, payload.httpRequest);
-        const replyPayload: InternalEventPayload = {
-          type: 'export_http_request_response',
-          content: reply,
-        };
-        sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (payload.type === 'filter_request' && typeof mod.pluginHookResponseFilter === 'function') {
-        const reply: string = await mod.pluginHookResponseFilter(ctx, {
-          filter: payload.filter,
-          body: payload.content,
-        });
-        const replyPayload: InternalEventPayload = {
-          type: 'filter_response',
-          content: reply,
-        };
-        sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (
-        payload.type === 'get_http_request_actions_request' &&
-        Array.isArray(mod.plugin?.httpRequestActions)
-      ) {
-        const reply: HttpRequestAction[] = mod.plugin.httpRequestActions.map(
-          (a: HttpRequestActionPlugin) => ({
-            ...a,
-            // Add everything except onSelect
-            onSelect: undefined,
-          }),
-        );
-        const replyPayload: InternalEventPayload = {
-          type: 'get_http_request_actions_response',
-          pluginRefId,
-          actions: reply,
-        };
-        sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (
-        payload.type === 'get_template_functions_request' &&
-        Array.isArray(mod.plugin?.templateFunctions)
-      ) {
-        const reply: TemplateFunction[] = mod.plugin.templateFunctions.map(
-          (a: TemplateFunctionPlugin) => ({
-            ...a,
-            // Add everything except render
-            onRender: undefined,
-          }),
-        );
-        const replyPayload: InternalEventPayload = {
-          type: 'get_template_functions_response',
-          pluginRefId,
-          functions: reply,
-        };
-        sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (payload.type === 'get_http_authentication_request' && mod.plugin?.authentication) {
-        const auth = mod.plugin.authentication;
-        const replyPayload: InternalEventPayload = {
-          ...auth,
-          type: 'get_http_authentication_response',
-
-          // Remove unneeded attrs
-          onApply: undefined,
-        };
-        sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (payload.type === 'call_http_authentication_request' && mod.plugin?.authentication) {
-        const auth = mod.plugin.authentication;
-        if (typeof auth?.onApply === 'function') {
-          const result = await auth.onApply(ctx, payload);
-          sendPayload(
-            windowContext,
-            {
-              ...result,
-              type: 'call_http_authentication_response',
-            },
-            replyId,
-          );
-          return;
-        }
-      }
-
-      if (
-        payload.type === 'call_http_request_action_request' &&
-        Array.isArray(mod.plugin?.httpRequestActions)
-      ) {
-        const action = mod.plugin.httpRequestActions.find(
-          (a: HttpRequestActionPlugin) => a.key === payload.key,
-        );
-        if (typeof action?.onSelect === 'function') {
-          await action.onSelect(ctx, payload.args);
-          sendEmpty(windowContext, replyId);
-          return;
-        }
-      }
-
-      if (
-        payload.type === 'call_template_function_request' &&
-        Array.isArray(mod.plugin?.templateFunctions)
-      ) {
-        const action = mod.plugin.templateFunctions.find(
-          (a: TemplateFunctionPlugin) => a.name === payload.name,
-        );
-        if (typeof action?.onRender === 'function') {
-          const result = await action.onRender(ctx, payload.args);
-          sendPayload(
-            windowContext,
-            {
-              type: 'call_template_function_response',
-              value: result ?? null,
-            },
-            replyId,
-          );
-          return;
-        }
-      }
-
-      if (payload.type === 'reload_request') {
-        await reloadModule();
-      }
-    } catch (err) {
-      console.log('Plugin call threw exception', payload.type, err);
-      // TODO: Return errors to server
-    }
-
-    // No matches, so send back an empty response so the caller doesn't block forever
-    sendEmpty(windowContext, replyId);
-  });
-}
-
-initialize().catch((err) => {
-  console.log('failed to boot plugin', err);
-});
-
-function genId(len = 5): string {
-  const alphabet = '01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-  let id = '';
-  for (let i = 0; i < len; i++) {
-    id += alphabet[Math.floor(Math.random() * alphabet.length)];
-  }
-  return id;
-}
-
-function prefixStdout(s: string) {
-  if (!s.includes('%s')) {
-    throw new Error('Console prefix must contain a "%s" replacer');
-  }
-  interceptStdout((text) => {
-    const lines = text.split(/\n/);
-    let newText = '';
-    for (let i = 0; i < lines.length; i++) {
-      if (lines[i] == '') continue;
-      newText += util.format(s, lines[i]) + '\n';
-    }
-    return newText.trimEnd();
-  });
-}
-
-const watchedFiles: Record<string, Stats> = {};
-
-/**
- * Watch a file and trigger callback on change.
- *
- * We also track the stat for each file because fs.watch will
- * trigger a "change" event when the access date changes
- */
-function watchFile(filepath: string, cb: (filepath: string) => void) {
-  watch(filepath, (_event, _name) => {
-    const stat = statSync(filepath);
-    if (stat.mtimeMs !== watchedFiles[filepath]?.mtimeMs) {
-      cb(filepath);
-    }
-    watchedFiles[filepath] = stat;
-  });
-}

packages/plugin-runtime/src/interceptStdout.ts

@@ -0,0 +1,37 @@
+import process from "node:process";
+
+export function interceptStdout(
+  intercept: (text: string) => string,
+) {
+  const old_stdout_write = process.stdout.write;
+  const old_stderr_write = process.stderr.write;
+
+  process.stdout.write = (function (write) {
+    return function (text: string) {
+      arguments[0] = interceptor(text, intercept);
+      // deno-lint-ignore no-explicit-any
+      write.apply(process.stdout, arguments as any);
+      return true;
+    };
+  })(process.stdout.write);
+
+  process.stderr.write = (function (write) {
+    return function (text: string) {
+      arguments[0] = interceptor(text, intercept);
+      // deno-lint-ignore no-explicit-any
+      write.apply(process.stderr, arguments as any);
+      return true;
+    };
+  })(process.stderr.write);
+
+  // puts back to original
+  return function unhook() {
+    process.stdout.write = old_stdout_write;
+    process.stderr.write = old_stderr_write;
+  };
+}
+
+function interceptor(text: string, fn: (text: string) => string) {
+  return fn(text).replace(/\n$/, "") +
+    (fn(text) && /\n$/.test(text) ? "\n" : "");
+}

packages/plugin-runtime/src/migrations.ts

@@ -0,0 +1,18 @@
+import { TemplateFunction } from '@yaakapp/api';
+
+export function migrateTemplateFunctionSelectOptions(f: TemplateFunction): TemplateFunction {
+  const migratedArgs = f.args.map((a) => {
+    if (a.type === 'select') {
+      a.options = a.options.map((o) => ({
+        ...o,
+        label: o.label || (o as any).name,
+      }));
+    }
+    return a;
+  });
+
+  return {
+    ...f,
+    args: migratedArgs,
+  };
+}

packages/plugin-runtime/tsconfig.json

@@ -8,6 +8,7 @@
     "lib": ["es2021"],
     "noImplicitAny": false,
     "moduleResolution": "node16",
+    "resolveJsonModule": true,
     "sourceMap": true,
     "outDir": "build",
     "baseUrl": ".",

src-tauri/Cargo.toml

@@ -1,12 +1,15 @@
 [workspace]
 members = [
+    "yaak-git",
     "yaak-grpc",
+    "yaak-http",
     "yaak-license",
     "yaak-models",
     "yaak-plugins",
     "yaak-sse",
     "yaak-sync",
     "yaak-templates",
+    "yaak-ws",
 ]
 
 [package]
@@ -35,56 +38,64 @@ objc = "0.2.7"
 cocoa = "0.26.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work
+openssl-sys = { version = "0.9.105", features = ["vendored"] } # For Ubuntu installation to work
 
 [dependencies]
 chrono = { version = "0.4.31", features = ["serde"] }
 datetime = "0.5.2"
+encoding_rs = "0.8.35"
 eventsource-client = { git = "https://github.com/yaakapp/rust-eventsource-client", version = "0.14.0" }
 hex_color = "3.0.0"
 http = { version = "1.2.0", default-features = false }
 log = "0.4.21"
-rand = "0.8.5"
+md5 = "0.7.0"
+mime_guess = "2.0.5"
+rand = "0.9.0"
 regex = "1.10.2"
 reqwest = { workspace = true, features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "rustls-tls-manual-roots-no-provider"] }
 reqwest_cookie_store = "0.8.0"
-rustls = { version = "0.23.21", default-features = false }
+rustls = { version = "0.23.22", default-features = false, features = ["custom-provider", "ring"] }
 rustls-platform-verifier = "0.5.0"
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["raw_value"] }
 tauri = { workspace = true, features = ["devtools", "protocol-asset"] }
-tauri-plugin-clipboard-manager = "2.2.0"
+tauri-plugin-clipboard-manager = "2.2.1"
 tauri-plugin-dialog = "2.2.0"
 tauri-plugin-fs = "2.2.0"
-tauri-plugin-log = { version = "2.2.0", features = ["colored"] }
-tauri-plugin-opener = "2.2.4"
+tauri-plugin-log = { version = "2.2.1", features = ["colored"] }
+tauri-plugin-opener = "2.2.5"
 tauri-plugin-os = "2.2.0"
 tauri-plugin-shell = { workspace = true }
 tauri-plugin-single-instance = "2.2.1"
-tauri-plugin-updater = "2.3.1"
-tauri-plugin-window-state = "2.2.0"
-tokio = { version = "1.36.0", features = ["sync"] }
-tokio-stream = "0.1.15"
+tauri-plugin-updater = "2.5.0"
+tauri-plugin-window-state = "2.2.1"
+tokio = { version = "1.43.0", features = ["sync"] }
+tokio-stream = "0.1.17"
 ts-rs = { workspace = true }
-mime_guess = "2.0.5"
-urlencoding = "2.1.3"
-uuid = "1.7.0"
+uuid = "1.12.1"
+yaak-git = { path = "yaak-git" }
 yaak-grpc = { path = "yaak-grpc" }
+yaak-http = { workspace = true }
 yaak-license = { path = "yaak-license" }
 yaak-models = { workspace = true }
 yaak-plugins = { workspace = true }
 yaak-sse = { workspace = true }
-yaak-sync = { path = "yaak-sync" }
-yaak-templates = { path = "yaak-templates" }
+yaak-sync = { workspace = true }
+yaak-templates = { workspace = true }
+yaak-ws = { path = "yaak-ws" }
 
 [workspace.dependencies]
-yaak-models = { path = "yaak-models" }
-yaak-sse = { path = "yaak-sse" }
-yaak-plugins = { path = "yaak-plugins" }
+reqwest = "0.12.12"
 serde = "1.0.215"
 serde_json = "1.0.132"
+tauri = "2.2.5"
+tauri-plugin = "2.0.4"
 tauri-plugin-shell = "2.2.0"
-tauri = "2.2.0"
 thiserror = "2.0.3"
 ts-rs = "10.0.0"
-reqwest = "0.12.12"
+yaak-http = { path = "yaak-http" }
+yaak-models = { path = "yaak-models" }
+yaak-plugins = { path = "yaak-plugins" }
+yaak-sync = { path = "yaak-sync" }
+yaak-sse = { path = "yaak-sse" }
+yaak-templates = { path = "yaak-templates" }

src-tauri/bindings/analytics.ts

@@ -1,5 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type AnalyticsAction = "cancel" | "click" | "commit" | "create" | "delete" | "delete_many" | "duplicate" | "error" | "export" | "hide" | "import" | "launch" | "launch_first" | "launch_update" | "send" | "show" | "toggle" | "update" | "upsert";
-
-export type AnalyticsResource = "app" | "appearance" | "button" | "checkbox" | "cookie_jar" | "dialog" | "environment" | "folder" | "grpc_connection" | "grpc_event" | "grpc_request" | "http_request" | "http_response" | "key_value" | "link" | "mutation" | "plugin" | "select" | "setting" | "sidebar" | "tab" | "theme" | "workspace";

src-tauri/capabilities/capabilities.json

@@ -30,10 +30,8 @@
         }
       ]
     },
-    "opener:allow-open-url",
-    "opener:allow-open-path",
-    "opener:allow-default-urls",
-    "opener:allow-reveal-item-in-dir",
+    "clipboard-manager:allow-read-text",
+    "clipboard-manager:allow-write-text",
     "core:webview:allow-set-webview-zoom",
     "core:window:allow-close",
     "core:window:allow-internal-toggle-maximize",
@@ -47,9 +45,14 @@
     "core:window:allow-start-dragging",
     "core:window:allow-theme",
     "core:window:allow-unmaximize",
-    "clipboard-manager:allow-read-text",
-    "clipboard-manager:allow-write-text",
+    "opener:allow-default-urls",
+    "opener:allow-open-path",
+    "opener:allow-open-url",
+    "opener:allow-reveal-item-in-dir",
+    "shell:allow-open",
     "yaak-license:default",
-    "yaak-sync:default"
+    "yaak-git:default",
+    "yaak-sync:default",
+    "yaak-ws:default"
   ]
 }

src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["core:event:allow-emit","core:event:allow-listen","core:event:allow-unlisten","os:allow-os-type","clipboard-manager:allow-clear","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","fs:allow-read-dir","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"opener:allow-open-url","opener:allow-open-path","opener:allow-default-urls","opener:allow-reveal-item-in-dir","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-internal-toggle-maximize","core:window:allow-is-fullscreen","core:window:allow-is-maximized","core:window:allow-maximize","core:window:allow-minimize","core:window:allow-set-decorations","core:window:allow-set-title","core:window:allow-show","core:window:allow-start-dragging","core:window:allow-theme","core:window:allow-unmaximize","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text","yaak-license:default","yaak-sync:default"]}}
+{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["core:event:allow-emit","core:event:allow-listen","core:event:allow-unlisten","os:allow-os-type","clipboard-manager:allow-clear","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","fs:allow-read-dir","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"clipboard-manager:allow-read-text","clipboard-manager:allow-write-text","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-internal-toggle-maximize","core:window:allow-is-fullscreen","core:window:allow-is-maximized","core:window:allow-maximize","core:window:allow-minimize","core:window:allow-set-decorations","core:window:allow-set-title","core:window:allow-show","core:window:allow-start-dragging","core:window:allow-theme","core:window:allow-unmaximize","opener:allow-default-urls","opener:allow-open-path","opener:allow-open-url","opener:allow-reveal-item-in-dir","shell:allow-open","yaak-license:default","yaak-git:default","yaak-sync:default","yaak-ws:default"]}}

src-tauri/gen/schemas/desktop-schema.json

@@ -5412,6 +5412,151 @@
           "type": "string",
           "const": "window-state:deny-save-window-state"
         },
+        {
+          "description": "Default permissions for the plugin",
+          "type": "string",
+          "const": "yaak-git:default"
+        },
+        {
+          "description": "Enables the add command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-add"
+        },
+        {
+          "description": "Enables the branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-branch"
+        },
+        {
+          "description": "Enables the checkout command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-checkout"
+        },
+        {
+          "description": "Enables the checkout_remote command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-checkout-remote"
+        },
+        {
+          "description": "Enables the commit command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-commit"
+        },
+        {
+          "description": "Enables the delete_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-delete-branch"
+        },
+        {
+          "description": "Enables the fetch_all command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-fetch-all"
+        },
+        {
+          "description": "Enables the initialize command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-initialize"
+        },
+        {
+          "description": "Enables the log command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-log"
+        },
+        {
+          "description": "Enables the merge_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-merge-branch"
+        },
+        {
+          "description": "Enables the pull command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-pull"
+        },
+        {
+          "description": "Enables the push command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-push"
+        },
+        {
+          "description": "Enables the status command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-status"
+        },
+        {
+          "description": "Enables the unstage command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-unstage"
+        },
+        {
+          "description": "Denies the add command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-add"
+        },
+        {
+          "description": "Denies the branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-branch"
+        },
+        {
+          "description": "Denies the checkout command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-checkout"
+        },
+        {
+          "description": "Denies the checkout_remote command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-checkout-remote"
+        },
+        {
+          "description": "Denies the commit command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-commit"
+        },
+        {
+          "description": "Denies the delete_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-delete-branch"
+        },
+        {
+          "description": "Denies the fetch_all command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-fetch-all"
+        },
+        {
+          "description": "Denies the initialize command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-initialize"
+        },
+        {
+          "description": "Denies the log command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-log"
+        },
+        {
+          "description": "Denies the merge_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-merge-branch"
+        },
+        {
+          "description": "Denies the pull command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-pull"
+        },
+        {
+          "description": "Denies the push command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-push"
+        },
+        {
+          "description": "Denies the status command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-status"
+        },
+        {
+          "description": "Denies the unstage command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-unstage"
+        },
         {
           "description": "Default permissions for the plugin",
           "type": "string",
@@ -5481,6 +5626,161 @@
           "description": "Denies the watch command without any pre-configured scope.",
           "type": "string",
           "const": "yaak-sync:deny-watch"
+        },
+        {
+          "description": "Default permissions for the plugin",
+          "type": "string",
+          "const": "yaak-ws:default"
+        },
+        {
+          "description": "Enables the cancel command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-cancel"
+        },
+        {
+          "description": "Enables the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-close"
+        },
+        {
+          "description": "Enables the connect command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-connect"
+        },
+        {
+          "description": "Enables the delete_connection command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-delete-connection"
+        },
+        {
+          "description": "Enables the delete_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-delete-connections"
+        },
+        {
+          "description": "Enables the delete_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-delete-request"
+        },
+        {
+          "description": "Enables the duplicate_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-duplicate-request"
+        },
+        {
+          "description": "Enables the list_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-connections"
+        },
+        {
+          "description": "Enables the list_events command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-events"
+        },
+        {
+          "description": "Enables the list_requests command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-requests"
+        },
+        {
+          "description": "Enables the list_websocket_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-websocket-connections"
+        },
+        {
+          "description": "Enables the list_websocket_requests command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-websocket-requests"
+        },
+        {
+          "description": "Enables the send command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-send"
+        },
+        {
+          "description": "Enables the upsert_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-upsert-request"
+        },
+        {
+          "description": "Enables the upsert_websocket_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-upsert-websocket-request"
+        },
+        {
+          "description": "Denies the cancel command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-cancel"
+        },
+        {
+          "description": "Denies the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-close"
+        },
+        {
+          "description": "Denies the connect command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-connect"
+        },
+        {
+          "description": "Denies the delete_connection command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-delete-connection"
+        },
+        {
+          "description": "Denies the delete_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-delete-connections"
+        },
+        {
+          "description": "Denies the delete_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-delete-request"
+        },
+        {
+          "description": "Denies the duplicate_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-duplicate-request"
+        },
+        {
+          "description": "Denies the list_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-connections"
+        },
+        {
+          "description": "Denies the list_events command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-events"
+        },
+        {
+          "description": "Denies the list_requests command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-requests"
+        },
+        {
+          "description": "Denies the list_websocket_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-websocket-connections"
+        },
+        {
+          "description": "Denies the list_websocket_requests command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-websocket-requests"
+        },
+        {
+          "description": "Denies the send command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-send"
+        },
+        {
+          "description": "Denies the upsert_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-upsert-request"
+        },
+        {
+          "description": "Denies the upsert_websocket_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-upsert-websocket-request"
         }
       ]
     },

src-tauri/gen/schemas/macOS-schema.json

@@ -5412,6 +5412,151 @@
           "type": "string",
           "const": "window-state:deny-save-window-state"
         },
+        {
+          "description": "Default permissions for the plugin",
+          "type": "string",
+          "const": "yaak-git:default"
+        },
+        {
+          "description": "Enables the add command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-add"
+        },
+        {
+          "description": "Enables the branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-branch"
+        },
+        {
+          "description": "Enables the checkout command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-checkout"
+        },
+        {
+          "description": "Enables the checkout_remote command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-checkout-remote"
+        },
+        {
+          "description": "Enables the commit command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-commit"
+        },
+        {
+          "description": "Enables the delete_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-delete-branch"
+        },
+        {
+          "description": "Enables the fetch_all command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-fetch-all"
+        },
+        {
+          "description": "Enables the initialize command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-initialize"
+        },
+        {
+          "description": "Enables the log command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-log"
+        },
+        {
+          "description": "Enables the merge_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-merge-branch"
+        },
+        {
+          "description": "Enables the pull command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-pull"
+        },
+        {
+          "description": "Enables the push command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-push"
+        },
+        {
+          "description": "Enables the status command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-status"
+        },
+        {
+          "description": "Enables the unstage command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:allow-unstage"
+        },
+        {
+          "description": "Denies the add command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-add"
+        },
+        {
+          "description": "Denies the branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-branch"
+        },
+        {
+          "description": "Denies the checkout command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-checkout"
+        },
+        {
+          "description": "Denies the checkout_remote command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-checkout-remote"
+        },
+        {
+          "description": "Denies the commit command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-commit"
+        },
+        {
+          "description": "Denies the delete_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-delete-branch"
+        },
+        {
+          "description": "Denies the fetch_all command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-fetch-all"
+        },
+        {
+          "description": "Denies the initialize command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-initialize"
+        },
+        {
+          "description": "Denies the log command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-log"
+        },
+        {
+          "description": "Denies the merge_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-merge-branch"
+        },
+        {
+          "description": "Denies the pull command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-pull"
+        },
+        {
+          "description": "Denies the push command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-push"
+        },
+        {
+          "description": "Denies the status command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-status"
+        },
+        {
+          "description": "Denies the unstage command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-git:deny-unstage"
+        },
         {
           "description": "Default permissions for the plugin",
           "type": "string",
@@ -5481,6 +5626,161 @@
           "description": "Denies the watch command without any pre-configured scope.",
           "type": "string",
           "const": "yaak-sync:deny-watch"
+        },
+        {
+          "description": "Default permissions for the plugin",
+          "type": "string",
+          "const": "yaak-ws:default"
+        },
+        {
+          "description": "Enables the cancel command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-cancel"
+        },
+        {
+          "description": "Enables the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-close"
+        },
+        {
+          "description": "Enables the connect command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-connect"
+        },
+        {
+          "description": "Enables the delete_connection command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-delete-connection"
+        },
+        {
+          "description": "Enables the delete_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-delete-connections"
+        },
+        {
+          "description": "Enables the delete_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-delete-request"
+        },
+        {
+          "description": "Enables the duplicate_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-duplicate-request"
+        },
+        {
+          "description": "Enables the list_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-connections"
+        },
+        {
+          "description": "Enables the list_events command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-events"
+        },
+        {
+          "description": "Enables the list_requests command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-requests"
+        },
+        {
+          "description": "Enables the list_websocket_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-websocket-connections"
+        },
+        {
+          "description": "Enables the list_websocket_requests command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-list-websocket-requests"
+        },
+        {
+          "description": "Enables the send command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-send"
+        },
+        {
+          "description": "Enables the upsert_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-upsert-request"
+        },
+        {
+          "description": "Enables the upsert_websocket_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:allow-upsert-websocket-request"
+        },
+        {
+          "description": "Denies the cancel command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-cancel"
+        },
+        {
+          "description": "Denies the close command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-close"
+        },
+        {
+          "description": "Denies the connect command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-connect"
+        },
+        {
+          "description": "Denies the delete_connection command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-delete-connection"
+        },
+        {
+          "description": "Denies the delete_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-delete-connections"
+        },
+        {
+          "description": "Denies the delete_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-delete-request"
+        },
+        {
+          "description": "Denies the duplicate_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-duplicate-request"
+        },
+        {
+          "description": "Denies the list_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-connections"
+        },
+        {
+          "description": "Denies the list_events command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-events"
+        },
+        {
+          "description": "Denies the list_requests command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-requests"
+        },
+        {
+          "description": "Denies the list_websocket_connections command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-websocket-connections"
+        },
+        {
+          "description": "Denies the list_websocket_requests command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-list-websocket-requests"
+        },
+        {
+          "description": "Denies the send command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-send"
+        },
+        {
+          "description": "Denies the upsert_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-upsert-request"
+        },
+        {
+          "description": "Denies the upsert_websocket_request command without any pre-configured scope.",
+          "type": "string",
+          "const": "yaak-ws:deny-upsert-websocket-request"
         }
       ]
     },

src-tauri/migrations/20250114160022_remove-workspace-sync-setting.sql

@@ -0,0 +1,2 @@
+-- This setting was moved to the new workspace_metas table
+ALTER TABLE workspaces DROP COLUMN setting_sync_dir;

src-tauri/migrations/20250123192023_plugin-kv.sql

@@ -0,0 +1,11 @@
+CREATE TABLE plugin_key_values
+(
+    model       TEXT     DEFAULT 'plugin_key_value' NOT NULL,
+    created_at  DATETIME DEFAULT CURRENT_TIMESTAMP  NOT NULL,
+    updated_at  DATETIME DEFAULT CURRENT_TIMESTAMP  NOT NULL,
+    deleted_at  DATETIME,
+    plugin_name TEXT                                NOT NULL,
+    key         TEXT                                NOT NULL,
+    value       TEXT                                NOT NULL,
+    PRIMARY KEY (plugin_name, key)
+);

src-tauri/migrations/20250128155623_websockets.sql

@@ -0,0 +1,66 @@
+CREATE TABLE websocket_requests
+(
+    id                  TEXT                                 NOT NULL
+        PRIMARY KEY,
+    model               TEXT     DEFAULT 'websocket_request' NOT NULL,
+    workspace_id        TEXT                                 NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    folder_id           TEXT
+        REFERENCES folders
+            ON DELETE CASCADE,
+    created_at          DATETIME DEFAULT CURRENT_TIMESTAMP   NOT NULL,
+    updated_at          DATETIME DEFAULT CURRENT_TIMESTAMP   NOT NULL,
+    deleted_at          DATETIME,
+    authentication      TEXT     DEFAULT '{}'                NOT NULL,
+    authentication_type TEXT,
+    description         TEXT                                 NOT NULL,
+    name                TEXT                                 NOT NULL,
+    url                 TEXT                                 NOT NULL,
+    headers             TEXT                                 NOT NULL,
+    message             TEXT                                 NOT NULL,
+    sort_priority       REAL                                 NOT NULL,
+    url_parameters      TEXT     DEFAULT '[]'                NOT NULL
+);
+
+CREATE TABLE websocket_connections
+(
+    id           TEXT                                    NOT NULL
+        PRIMARY KEY,
+    model        TEXT     DEFAULT 'websocket_connection' NOT NULL,
+    workspace_id TEXT                                    NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    request_id   TEXT                                    NOT NULL
+        REFERENCES websocket_requests
+            ON DELETE CASCADE,
+    created_at   DATETIME DEFAULT CURRENT_TIMESTAMP      NOT NULL,
+    updated_at   DATETIME DEFAULT CURRENT_TIMESTAMP      NOT NULL,
+    url          TEXT                                    NOT NULL,
+    state        TEXT                                    NOT NULL,
+    status       INTEGER  DEFAULT -1                     NOT NULL,
+    error        TEXT                                    NULL,
+    elapsed      INTEGER  DEFAULT 0                      NOT NULL,
+    headers      TEXT     DEFAULT '{}'                   NOT NULL
+);
+
+CREATE TABLE websocket_events
+(
+    id            TEXT                                                    NOT NULL
+        PRIMARY KEY,
+    model         TEXT     DEFAULT 'websocket_event'                      NOT NULL,
+    workspace_id  TEXT                                                    NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    request_id    TEXT                                                    NOT NULL
+        REFERENCES websocket_requests
+            ON DELETE CASCADE,
+    connection_id TEXT                                                    NOT NULL
+        REFERENCES websocket_connections
+            ON DELETE CASCADE,
+    created_at    DATETIME DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')) NOT NULL,
+    updated_at    DATETIME DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')) NOT NULL,
+    is_server     BOOLEAN                                                 NOT NULL,
+    message_type  TEXT                                                    NOT NULL,
+    message       BLOB                                                    NOT NULL
+);

src-tauri/src/analytics.rs

@@ -1,243 +0,0 @@
-use std::fmt::Display;
-
-use log::{debug, info};
-use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
-use tauri::{Manager, Runtime, WebviewWindow};
-use ts_rs::TS;
-use yaak_models::queries::{
-    generate_id, get_key_value_int, get_key_value_string, get_or_create_settings,
-    set_key_value_int, set_key_value_string, UpdateSource,
-};
-
-use crate::is_dev;
-
-const NAMESPACE: &str = "analytics";
-const NUM_LAUNCHES_KEY: &str = "num_launches";
-
-// serializable
-#[derive(Serialize, Deserialize, Debug, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "analytics.ts")]
-pub enum AnalyticsResource {
-    App,
-    Appearance,
-    Button,
-    Checkbox,
-    CookieJar,
-    Dialog,
-    Environment,
-    Folder,
-    GrpcConnection,
-    GrpcEvent,
-    GrpcRequest,
-    HttpRequest,
-    HttpResponse,
-    KeyValue,
-    Link,
-    Mutation,
-    Plugin,
-    Select,
-    Setting,
-    Sidebar,
-    Tab,
-    Theme,
-    Workspace,
-}
-
-impl AnalyticsResource {
-    pub fn from_str(s: &str) -> serde_json::Result<AnalyticsResource> {
-        serde_json::from_str(format!("\"{s}\"").as_str())
-    }
-}
-
-impl Display for AnalyticsResource {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", serde_json::to_string(self).unwrap().replace("\"", ""))
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, TS)]
-#[serde(rename_all = "snake_case")]
-#[ts(export, export_to = "analytics.ts")]
-pub enum AnalyticsAction {
-    Cancel,
-    Click,
-    Commit,
-    Create,
-    Delete,
-    DeleteMany,
-    Duplicate,
-    Error,
-    Export,
-    Hide,
-    Import,
-    Launch,
-    LaunchFirst,
-    LaunchUpdate,
-    Send,
-    Show,
-    Toggle,
-    Update,
-    Upsert,
-}
-
-impl AnalyticsAction {
-    pub fn from_str(s: &str) -> serde_json::Result<AnalyticsAction> {
-        serde_json::from_str(format!("\"{s}\"").as_str())
-    }
-}
-
-impl Display for AnalyticsAction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", serde_json::to_string(self).unwrap().replace("\"", ""))
-    }
-}
-
-#[derive(Default, Debug)]
-pub struct LaunchEventInfo {
-    pub current_version: String,
-    pub previous_version: String,
-    pub launched_after_update: bool,
-    pub num_launches: i32,
-}
-
-pub async fn track_launch_event<R: Runtime>(w: &WebviewWindow<R>) -> LaunchEventInfo {
-    let last_tracked_version_key = "last_tracked_version";
-
-    let mut info = LaunchEventInfo::default();
-
-    info.num_launches = get_num_launches(w).await + 1;
-    info.previous_version = get_key_value_string(w, NAMESPACE, last_tracked_version_key, "").await;
-    info.current_version = w.package_info().version.to_string();
-
-    if info.previous_version.is_empty() {
-        track_event(w, AnalyticsResource::App, AnalyticsAction::LaunchFirst, None).await;
-    } else {
-        info.launched_after_update = info.current_version != info.previous_version;
-        if info.launched_after_update {
-            track_event(
-                w,
-                AnalyticsResource::App,
-                AnalyticsAction::LaunchUpdate,
-                Some(json!({ NUM_LAUNCHES_KEY: info.num_launches })),
-            )
-            .await;
-        }
-    };
-
-    // Track a launch event in all cases
-    track_event(
-        w,
-        AnalyticsResource::App,
-        AnalyticsAction::Launch,
-        Some(json!({ NUM_LAUNCHES_KEY: info.num_launches })),
-    )
-    .await;
-
-    // Update key values
-
-    set_key_value_string(
-        w,
-        NAMESPACE,
-        last_tracked_version_key,
-        info.current_version.as_str(),
-        &UpdateSource::Background,
-    )
-    .await;
-    set_key_value_int(w, NAMESPACE, NUM_LAUNCHES_KEY, info.num_launches, &UpdateSource::Background)
-        .await;
-
-    info
-}
-
-pub async fn track_event<R: Runtime>(
-    w: &WebviewWindow<R>,
-    resource: AnalyticsResource,
-    action: AnalyticsAction,
-    attributes: Option<Value>,
-) {
-    let id = get_id(w).await;
-    let event = format!("{}.{}", resource, action);
-    let attributes_json = attributes.unwrap_or("{}".to_string().into()).to_string();
-    let info = w.app_handle().package_info();
-    let tz = datetime::sys_timezone().unwrap_or("unknown".to_string());
-    let site = match is_dev() {
-        true => "site_TkHWjoXwZPq3HfhERb",
-        false => "site_zOK0d7jeBy2TLxFCnZ",
-    };
-    let base_url = match is_dev() {
-        true => "http://localhost:7194",
-        false => "https://t.yaak.app",
-    };
-    let params = vec![
-        ("u", id),
-        ("e", event.clone()),
-        ("a", attributes_json.clone()),
-        ("id", site.to_string()),
-        ("v", info.version.clone().to_string()),
-        ("os", get_os().to_string()),
-        ("tz", tz),
-        ("xy", get_window_size(w)),
-    ];
-    let req =
-        reqwest::Client::builder().build().unwrap().get(format!("{base_url}/t/e")).query(&params);
-
-    let settings = get_or_create_settings(w).await;
-    if !settings.telemetry {
-        info!("Track event (disabled): {}", event);
-        return;
-    }
-
-    // Disable analytics actual sending in dev
-    if is_dev() {
-        debug!("Track event: {} {}", event, attributes_json);
-        return;
-    }
-
-    if let Err(e) = req.send().await {
-        info!("Error sending analytics event: {}", e);
-    }
-}
-
-fn get_os() -> &'static str {
-    if cfg!(target_os = "windows") {
-        "windows"
-    } else if cfg!(target_os = "macos") {
-        "macos"
-    } else if cfg!(target_os = "linux") {
-        "linux"
-    } else {
-        "unknown"
-    }
-}
-
-fn get_window_size<R: Runtime>(w: &WebviewWindow<R>) -> String {
-    let current_monitor = match w.current_monitor() {
-        Ok(Some(m)) => m,
-        _ => return "unknown".to_string(),
-    };
-
-    let scale_factor = current_monitor.scale_factor();
-    let size = current_monitor.size();
-    let width: f64 = size.width as f64 / scale_factor;
-    let height: f64 = size.height as f64 / scale_factor;
-
-    format!("{}x{}", (width / 100.0).round() * 100.0, (height / 100.0).round() * 100.0)
-}
-
-async fn get_id<R: Runtime>(w: &WebviewWindow<R>) -> String {
-    let id = get_key_value_string(w, "analytics", "id", "").await;
-    if id.is_empty() {
-        let new_id = generate_id();
-        set_key_value_string(w, "analytics", "id", new_id.as_str(), &UpdateSource::Background)
-            .await;
-        new_id
-    } else {
-        id
-    }
-}
-
-pub async fn get_num_launches<R: Runtime>(w: &WebviewWindow<R>) -> i32 {
-    get_key_value_int(w, NAMESPACE, NUM_LAUNCHES_KEY, 0).await
-}

src-tauri/src/encoding.rs

@@ -0,0 +1,16 @@
+use encoding_rs::SHIFT_JIS;
+use tokio::fs;
+use yaak_models::models::HttpResponse;
+
+pub async fn read_response_body<'a>(
+    response: HttpResponse,
+) -> Option<String> {
+    let body_path = match response.body_path {
+        None => return None,
+        Some(p) => p,
+    };
+
+    let body = fs::read(body_path).await.unwrap();
+    let (s, _, _) = SHIFT_JIS.decode(body.as_slice());
+    Some(s.to_string())
+}

src-tauri/src/history.rs

@@ -0,0 +1,64 @@
+use tauri::{Manager, Runtime, WebviewWindow};
+
+use yaak_models::queries::{
+    get_key_value_int, get_key_value_string,
+    set_key_value_int, set_key_value_string, UpdateSource,
+};
+
+const NAMESPACE: &str = "analytics";
+const NUM_LAUNCHES_KEY: &str = "num_launches";
+
+#[derive(Default, Debug)]
+pub struct LaunchEventInfo {
+    pub current_version: String,
+    pub previous_version: String,
+    pub launched_after_update: bool,
+    pub num_launches: i32,
+}
+
+pub async fn store_launch_history<R: Runtime>(w: &WebviewWindow<R>) -> LaunchEventInfo {
+    let last_tracked_version_key = "last_tracked_version";
+
+    let mut info = LaunchEventInfo::default();
+
+    info.num_launches = get_num_launches(w).await + 1;
+    info.previous_version = get_key_value_string(w, NAMESPACE, last_tracked_version_key, "").await;
+    info.current_version = w.package_info().version.to_string();
+
+    if info.previous_version.is_empty() {
+    } else {
+        info.launched_after_update = info.current_version != info.previous_version;
+    };
+
+    // Update key values
+
+    set_key_value_string(
+        w,
+        NAMESPACE,
+        last_tracked_version_key,
+        info.current_version.as_str(),
+        &UpdateSource::Background,
+    )
+    .await;
+    
+    set_key_value_int(w, NAMESPACE, NUM_LAUNCHES_KEY, info.num_launches, &UpdateSource::Background)
+        .await;
+
+    info
+}
+
+pub fn get_os() -> &'static str {
+    if cfg!(target_os = "windows") {
+        "windows"
+    } else if cfg!(target_os = "macos") {
+        "macos"
+    } else if cfg!(target_os = "linux") {
+        "linux"
+    } else {
+        "unknown"
+    }
+}
+
+pub async fn get_num_launches<R: Runtime>(w: &WebviewWindow<R>) -> i32 {
+    get_key_value_int(w, NAMESPACE, NUM_LAUNCHES_KEY, 0).await
+}

src-tauri/src/http_request.rs

@@ -1,6 +1,5 @@
 use crate::render::render_http_request;
 use crate::response_err;
-use crate::template_callback::PluginTemplateCallback;
 use http::header::{ACCEPT, USER_AGENT};
 use http::{HeaderMap, HeaderName, HeaderValue, Uri};
 use log::{debug, error, warn};
@@ -8,8 +7,9 @@ use mime_guess::Mime;
 use reqwest::redirect::Policy;
 use reqwest::{multipart, Proxy, Url};
 use reqwest::{Method, Response};
+use rustls::crypto::ring;
 use rustls::ClientConfig;
-use rustls_platform_verifier::ConfigVerifierExt;
+use rustls_platform_verifier::BuilderVerifierExt;
 use serde_json::Value;
 use std::collections::BTreeMap;
 use std::path::PathBuf;
@@ -34,6 +34,7 @@ use yaak_plugins::events::{
     CallHttpAuthenticationRequest, HttpHeader, RenderPurpose, WindowContext,
 };
 use yaak_plugins::manager::PluginManager;
+use yaak_plugins::template_callback::PluginTemplateCallback;
 
 pub async fn send_http_request<R: Runtime>(
     window: &WebviewWindow<R>,
@@ -70,7 +71,7 @@ pub async fn send_http_request<R: Runtime>(
     if !url_string.starts_with("http://") && !url_string.starts_with("https://") {
         url_string = format!("http://{}", url_string);
     }
-    debug!("Sending request to {url_string}");
+    debug!("Sending request to {} {url_string}", request.method);
 
     let mut client_builder = reqwest::Client::builder()
         .redirect(match workspace.setting_follow_redirects {
@@ -86,11 +87,15 @@ pub async fn send_http_request<R: Runtime>(
 
     if workspace.setting_validate_certificates {
         // Use platform-native verifier to validate certificates
-        client_builder =
-            client_builder.use_preconfigured_tls(ClientConfig::with_platform_verifier())
+        let arc_crypto_provider = Arc::new(ring::default_provider());
+        let config = ClientConfig::builder_with_provider(arc_crypto_provider)
+            .with_safe_default_protocol_versions()
+            .unwrap()
+            .with_platform_verifier()
+            .with_no_client_auth();
+        client_builder = client_builder.use_preconfigured_tls(config)
     } else {
-        // Use rustls to skip validation because rustls_platform_verifier does not have this
-        // ability
+        // Use rustls to skip validation because rustls_platform_verifier does not have this ability
         client_builder = client_builder
             .use_rustls_tls()
             .danger_accept_invalid_hostnames(true)
@@ -220,14 +225,14 @@ pub async fn send_http_request<R: Runtime>(
             continue;
         }
 
-        let header_name = match HeaderName::from_bytes(h.name.as_bytes()) {
+        let header_name = match HeaderName::from_str(&h.name) {
             Ok(n) => n,
             Err(e) => {
                 error!("Failed to create header name: {}", e);
                 continue;
             }
         };
-        let header_value = match HeaderValue::from_str(h.value.as_str()) {
+        let header_value = match HeaderValue::from_str(&h.value) {
             Ok(n) => n,
             Err(e) => {
                 error!("Failed to create header value: {}", e);
@@ -262,7 +267,7 @@ pub async fn send_http_request<R: Runtime>(
                     None => {}
                     Some(a) => {
                         for p in a {
-                            let enabled = get_bool(p, "enabled");
+                            let enabled = get_bool(p, "enabled", true);
                             let name = get_str(p, "name");
                             if !enabled || name.is_empty() {
                                 continue;
@@ -296,7 +301,7 @@ pub async fn send_http_request<R: Runtime>(
                     None => {}
                     Some(fd) => {
                         for p in fd {
-                            let enabled = get_bool(p, "enabled");
+                            let enabled = get_bool(p, "enabled", true);
                             let name = get_str(p, "name").to_string();
 
                             if !enabled || name.is_empty() {
@@ -326,14 +331,33 @@ pub async fn send_http_request<R: Runtime>(
 
                             // Set or guess mimetype
                             if !content_type.is_empty() {
-                                part = part.mime_str(content_type).map_err(|e| e.to_string())?;
+                                part = match part.mime_str(content_type) {
+                                    Ok(p) => p,
+                                    Err(e) => {
+                                        return Ok(response_err(
+                                            &*response.lock().await,
+                                            format!("Invalid mime for multi-part entry {e:?}"),
+                                            window,
+                                        )
+                                        .await);
+                                    }
+                                };
                             } else if !file_path.is_empty() {
                                 let default_mime =
                                     Mime::from_str("application/octet-stream").unwrap();
                                 let mime =
                                     mime_guess::from_path(file_path.clone()).first_or(default_mime);
-                                part =
-                                    part.mime_str(mime.essence_str()).map_err(|e| e.to_string())?;
+                                part = match part.mime_str(mime.essence_str()) {
+                                    Ok(p) => p,
+                                    Err(e) => {
+                                        return Ok(response_err(
+                                            &*response.lock().await,
+                                            format!("Invalid mime for multi-part entry {e:?}"),
+                                            window,
+                                        )
+                                        .await);
+                                    }
+                                };
                             }
 
                             // Set file path if not empty
@@ -376,13 +400,11 @@ pub async fn send_http_request<R: Runtime>(
 
     if let Some(auth_name) = request.authentication_type.to_owned() {
         let req = CallHttpAuthenticationRequest {
-            config: serde_json::to_value(&request.authentication)
-                .unwrap()
-                .as_object()
-                .unwrap()
-                .to_owned(),
-            method: sendable_req.method().to_string(),
+            context_id: format!("{:x}", md5::compute(request.id)),
+            values: serde_json::from_value(serde_json::to_value(&request.authentication).unwrap())
+                .unwrap(),
             url: sendable_req.url().to_string(),
+            method: sendable_req.method().to_string(),
             headers: sendable_req
                 .headers()
                 .iter()
@@ -604,10 +626,10 @@ fn ensure_proto(url_str: &str) -> String {
     format!("http://{url_str}")
 }
 
-fn get_bool(v: &Value, key: &str) -> bool {
+fn get_bool(v: &Value, key: &str, fallback: bool) -> bool {
     match v.get(key) {
-        None => false,
-        Some(v) => v.as_bool().unwrap_or_default(),
+        None => fallback,
+        Some(v) => v.as_bool().unwrap_or(fallback),
     }
 }
 

src-tauri/src/lib.rs

@@ -1,38 +1,28 @@
 extern crate core;
 #[cfg(target_os = "macos")]
 extern crate objc;
-use crate::analytics::{AnalyticsAction, AnalyticsResource};
+use crate::encoding::read_response_body;
 use crate::grpc::metadata_to_map;
 use crate::http_request::send_http_request;
 use crate::notifications::YaakNotifier;
-use crate::render::{render_grpc_request, render_http_request, render_json_value, render_template};
-use crate::template_callback::PluginTemplateCallback;
-use crate::updates::{UpdateMode, YaakUpdater};
-use crate::window_menu::app_menu;
-use chrono::Utc;
+use crate::render::{render_grpc_request, render_template};
+use crate::updates::{UpdateMode, UpdateTrigger, YaakUpdater};
 use eventsource_client::{EventParser, SSE};
-use log::{debug, error, info, warn};
+use log::{debug, error, warn};
 use rand::random;
 use regex::Regex;
-use serde::Serialize;
-use serde_json::{json, Value};
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use std::fs::{create_dir_all, File};
 use std::path::PathBuf;
-use std::process::exit;
 use std::str::FromStr;
 use std::time::Duration;
 use std::{fs, panic};
-#[cfg(target_os = "macos")]
-use tauri::TitleBarStyle;
-use tauri::{AppHandle, Emitter, LogicalSize, RunEvent, State, WebviewUrl, WebviewWindow};
+use tauri::{AppHandle, Emitter, RunEvent, State, WebviewWindow};
 use tauri::{Listener, Runtime};
 use tauri::{Manager, WindowEvent};
-use tauri_plugin_clipboard_manager::ClipboardExt;
 use tauri_plugin_log::fern::colors::ColoredLevelConfig;
 use tauri_plugin_log::{Builder, Target, TargetKind};
-use tauri_plugin_opener::OpenerExt;
-use tauri_plugin_window_state::{AppHandleExt, StateFlags, WindowExt};
+use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 use tokio::fs::read_to_string;
 use tokio::sync::Mutex;
 use tokio::task::block_in_place;
@@ -41,49 +31,50 @@ use yaak_grpc::{deserialize_message, serialize_message, Code, ServiceDefinition}
 use yaak_models::models::{
     CookieJar, Environment, EnvironmentVariable, Folder, GrpcConnection, GrpcConnectionState,
     GrpcEvent, GrpcEventType, GrpcRequest, HttpRequest, HttpResponse, HttpResponseState, KeyValue,
-    ModelType, Plugin, Settings, Workspace, WorkspaceMeta,
+    ModelType, Plugin, Settings, WebsocketRequest, Workspace, WorkspaceMeta,
 };
 use yaak_models::queries::{
     batch_upsert, cancel_pending_grpc_connections, cancel_pending_responses,
     create_default_http_response, delete_all_grpc_connections,
     delete_all_grpc_connections_for_workspace, delete_all_http_responses_for_request,
-    delete_all_http_responses_for_workspace, delete_cookie_jar, delete_environment, delete_folder,
-    delete_grpc_connection, delete_grpc_request, delete_http_request, delete_http_response,
-    delete_plugin, delete_workspace, duplicate_folder, duplicate_grpc_request,
-    duplicate_http_request, ensure_base_environment, generate_id, generate_model_id,
-    get_base_environment, get_cookie_jar, get_environment, get_folder, get_grpc_connection,
-    get_grpc_request, get_http_request, get_http_response, get_key_value_raw,
-    get_or_create_settings, get_or_create_workspace_meta, get_plugin, get_workspace,
-    get_workspace_export_resources, list_cookie_jars, list_environments, list_folders,
-    list_grpc_connections_for_workspace, list_grpc_events, list_grpc_requests, list_http_requests,
-    list_http_responses_for_request, list_http_responses_for_workspace, list_key_values_raw,
-    list_plugins, list_workspaces, set_key_value_raw, update_response_if_id, update_settings,
-    upsert_cookie_jar, upsert_environment, upsert_folder, upsert_grpc_connection,
-    upsert_grpc_event, upsert_grpc_request, upsert_http_request, upsert_plugin, upsert_workspace,
+    delete_all_http_responses_for_workspace, delete_all_websocket_connections_for_workspace,
+    delete_cookie_jar, delete_environment, delete_folder, delete_grpc_connection,
+    delete_grpc_request, delete_http_request, delete_http_response, delete_plugin,
+    delete_workspace, duplicate_folder, duplicate_grpc_request, duplicate_http_request,
+    ensure_base_environment, generate_model_id, get_base_environment, get_cookie_jar,
+    get_environment, get_folder, get_grpc_connection, get_grpc_request, get_http_request,
+    get_http_response, get_key_value_raw, get_or_create_settings, get_or_create_workspace_meta,
+    get_plugin, get_workspace, get_workspace_export_resources, list_cookie_jars, list_environments,
+    list_folders, list_grpc_connections_for_workspace, list_grpc_events, list_grpc_requests,
+    list_http_requests, list_http_responses_for_workspace, list_key_values_raw, list_plugins,
+    list_workspaces, set_key_value_raw, update_response_if_id, update_settings, upsert_cookie_jar,
+    upsert_environment, upsert_folder, upsert_grpc_connection, upsert_grpc_event,
+    upsert_grpc_request, upsert_http_request, upsert_plugin, upsert_workspace,
     upsert_workspace_meta, BatchUpsertResult, UpdateSource,
 };
 use yaak_plugins::events::{
     BootResponse, CallHttpAuthenticationRequest, CallHttpRequestActionRequest, FilterResponse,
-    FindHttpResponsesResponse, GetHttpAuthenticationResponse, GetHttpRequestActionsResponse,
-    GetHttpRequestByIdResponse, GetTemplateFunctionsResponse, HttpHeader, Icon, InternalEvent,
-    InternalEventPayload, PromptTextResponse, RenderHttpRequestResponse, RenderPurpose,
-    SendHttpRequestResponse, ShowToastRequest, TemplateRenderResponse, WindowContext,
+    GetHttpAuthenticationConfigResponse, GetHttpAuthenticationSummaryResponse,
+    GetHttpRequestActionsResponse, GetTemplateFunctionsResponse, HttpHeader, InternalEvent,
+    InternalEventPayload, JsonPrimitive, RenderPurpose, WindowContext,
 };
 use yaak_plugins::manager::PluginManager;
-use yaak_plugins::plugin_handle::PluginHandle;
+use yaak_plugins::template_callback::PluginTemplateCallback;
 use yaak_sse::sse::ServerSentEvent;
 use yaak_templates::format::format_json;
 use yaak_templates::{Parser, Tokens};
 
-mod analytics;
+mod encoding;
 mod grpc;
+mod history;
 mod http_request;
 mod notifications;
+mod plugin_events;
 mod render;
 #[cfg(target_os = "macos")]
 mod tauri_plugin_mac_window;
-mod template_callback;
 mod updates;
+mod window;
 mod window_menu;
 
 const DEFAULT_WINDOW_WIDTH: f64 = 1100.0;
@@ -239,7 +230,8 @@ async fn cmd_grpc_go<R: Runtime>(
     if let Some(auth_name) = request.authentication_type.clone() {
         let auth = request.authentication.clone();
         let plugin_req = CallHttpAuthenticationRequest {
-            config: serde_json::to_value(&auth).unwrap().as_object().unwrap().to_owned(),
+            context_id: format!("{:x}", md5::compute(request_id.to_string())),
+            values: serde_json::from_value(serde_json::to_value(&auth).unwrap()).unwrap(),
             method: "POST".to_string(),
             url: request.url.clone(),
             headers: metadata
@@ -795,7 +787,7 @@ async fn cmd_filter_response<R: Runtime>(
         }
     }
 
-    let body = read_to_string(response.body_path.unwrap()).await.unwrap();
+    let body = read_response_body(response).await.unwrap();
 
     // TODO: Have plugins register their own content type (regex?)
     plugin_manager
@@ -807,11 +799,11 @@ async fn cmd_filter_response<R: Runtime>(
 #[tauri::command]
 async fn cmd_get_sse_events(file_path: &str) -> Result<Vec<ServerSentEvent>, String> {
     let body = fs::read(file_path).map_err(|e| e.to_string())?;
-    let mut p = EventParser::new();
-    p.process_bytes(body.into()).map_err(|e| e.to_string())?;
+    let mut event_parser = EventParser::new();
+    event_parser.process_bytes(body.into()).map_err(|e| e.to_string())?;
 
     let mut events = Vec::new();
-    while let Some(e) = p.get_event() {
+    while let Some(e) = event_parser.get_event() {
         if let SSE::Event(e) = e {
             events.push(ServerSentEvent {
                 event_type: e.event_type,
@@ -835,7 +827,7 @@ async fn cmd_import_data<R: Runtime>(
         .await
         .unwrap_or_else(|_| panic!("Unable to read file {}", file_path));
     let file_contents = file.as_str();
-    let (import_result, plugin_name) =
+    let import_result =
         plugin_manager.import_data(&window, file_contents).await.map_err(|e| e.to_string())?;
 
     let mut id_map: BTreeMap<String, String> = BTreeMap::new();
@@ -926,6 +918,18 @@ async fn cmd_import_data<R: Runtime>(
         })
         .collect();
 
+    let websocket_requests: Vec<WebsocketRequest> = resources
+        .websocket_requests
+        .into_iter()
+        .map(|mut v| {
+            v.id = maybe_gen_id(v.id.as_str(), ModelType::TypeWebsocketRequest, &mut id_map);
+            v.workspace_id =
+                maybe_gen_id(v.workspace_id.as_str(), ModelType::TypeWorkspace, &mut id_map);
+            v.folder_id = maybe_gen_id_opt(v.folder_id, ModelType::TypeFolder, &mut id_map);
+            v
+        })
+        .collect();
+
     let upserted = batch_upsert(
         &window,
         workspaces,
@@ -933,19 +937,12 @@ async fn cmd_import_data<R: Runtime>(
         folders,
         http_requests,
         grpc_requests,
+        websocket_requests,
         &UpdateSource::Import,
     )
     .await
     .map_err(|e| e.to_string())?;
 
-    analytics::track_event(
-        &window,
-        AnalyticsResource::App,
-        AnalyticsAction::Import,
-        Some(json!({ "plugin": plugin_name })),
-    )
-    .await;
-
     Ok(upserted)
 }
 
@@ -966,15 +963,31 @@ async fn cmd_template_functions<R: Runtime>(
 }
 
 #[tauri::command]
-async fn cmd_get_http_authentication<R: Runtime>(
+async fn cmd_get_http_authentication_summaries<R: Runtime>(
     window: WebviewWindow<R>,
     plugin_manager: State<'_, PluginManager>,
-) -> Result<Vec<GetHttpAuthenticationResponse>, String> {
-    let results =
-        plugin_manager.get_http_authentication(&window).await.map_err(|e| e.to_string())?;
+) -> Result<Vec<GetHttpAuthenticationSummaryResponse>, String> {
+    let results = plugin_manager
+        .get_http_authentication_summaries(&window)
+        .await
+        .map_err(|e| e.to_string())?;
     Ok(results.into_iter().map(|(_, a)| a).collect())
 }
 
+#[tauri::command]
+async fn cmd_get_http_authentication_config<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+    auth_name: &str,
+    values: HashMap<String, JsonPrimitive>,
+    request_id: &str,
+) -> Result<GetHttpAuthenticationConfigResponse, String> {
+    plugin_manager
+        .get_http_authentication_config(&window, auth_name, values, request_id)
+        .await
+        .map_err(|e| e.to_string())
+}
+
 #[tauri::command]
 async fn cmd_call_http_request_action<R: Runtime>(
     window: WebviewWindow<R>,
@@ -984,6 +997,21 @@ async fn cmd_call_http_request_action<R: Runtime>(
     plugin_manager.call_http_request_action(&window, req).await.map_err(|e| e.to_string())
 }
 
+#[tauri::command]
+async fn cmd_call_http_authentication_action<R: Runtime>(
+    window: WebviewWindow<R>,
+    plugin_manager: State<'_, PluginManager>,
+    auth_name: &str,
+    action_index: i32,
+    values: HashMap<String, JsonPrimitive>,
+    request_id: &str,
+) -> Result<(), String> {
+    plugin_manager
+        .call_http_authentication_action(&window, auth_name, action_index, values, request_id)
+        .await
+        .map_err(|e| e.to_string())
+}
+
 #[tauri::command]
 async fn cmd_curl_to_request<R: Runtime>(
     window: WebviewWindow<R>,
@@ -991,17 +1019,9 @@ async fn cmd_curl_to_request<R: Runtime>(
     plugin_manager: State<'_, PluginManager>,
     workspace_id: &str,
 ) -> Result<HttpRequest, String> {
-    let (import_result, plugin_name) =
+    let import_result =
         { plugin_manager.import_data(&window, command).await.map_err(|e| e.to_string())? };
 
-    analytics::track_event(
-        &window,
-        AnalyticsResource::App,
-        AnalyticsAction::Import,
-        Some(json!({ "plugin": plugin_name })),
-    )
-    .await;
-
     import_result.resources.http_requests.get(0).ok_or("No curl command found".to_string()).map(
         |r| {
             let mut request = r.clone();
@@ -1035,8 +1055,6 @@ async fn cmd_export_data(
 
     f.sync_all().expect("Failed to sync");
 
-    analytics::track_event(&window, AnalyticsResource::App, AnalyticsAction::Export, None).await;
-
     Ok(())
 }
 
@@ -1115,28 +1133,6 @@ async fn response_err<R: Runtime>(
     response
 }
 
-#[tauri::command]
-async fn cmd_track_event(
-    window: WebviewWindow,
-    resource: &str,
-    action: &str,
-    attributes: Option<Value>,
-) -> Result<(), String> {
-    match (AnalyticsResource::from_str(resource), AnalyticsAction::from_str(action)) {
-        (Ok(resource), Ok(action)) => {
-            analytics::track_event(&window, resource, action, attributes).await;
-        }
-        (r, a) => {
-            error!(
-                "Invalid action/resource for track_event: {resource}.{action} = {:?}.{:?}",
-                r, a
-            );
-            return Err("Invalid analytics event".to_string());
-        }
-    };
-    Ok(())
-}
-
 #[tauri::command]
 async fn cmd_set_update_mode(update_mode: &str, w: WebviewWindow) -> Result<KeyValue, String> {
     cmd_set_key_value("app", "update_mode", update_mode, w).await.map_err(|e| e.to_string())
@@ -1172,7 +1168,7 @@ async fn cmd_install_plugin<R: Runtime>(
     window: WebviewWindow<R>,
 ) -> Result<Plugin, String> {
     plugin_manager
-        .add_plugin_by_dir(WindowContext::from_window(&window), &directory, true)
+        .add_plugin_by_dir(&WindowContext::from_window(&window), &directory, true)
         .await
         .map_err(|e| e.to_string())?;
 
@@ -1202,7 +1198,7 @@ async fn cmd_uninstall_plugin<R: Runtime>(
         .map_err(|e| e.to_string())?;
 
     plugin_manager
-        .uninstall(WindowContext::from_window(&window), plugin.directory.as_str())
+        .uninstall(&WindowContext::from_window(&window), plugin.directory.as_str())
         .await
         .map_err(|e| e.to_string())?;
 
@@ -1455,7 +1451,7 @@ async fn cmd_reload_plugins<R: Runtime>(
     plugin_manager: State<'_, PluginManager>,
 ) -> Result<(), String> {
     plugin_manager
-        .initialize_all_plugins(window.app_handle(), WindowContext::from_window(&window))
+        .initialize_all_plugins(window.app_handle(), &WindowContext::from_window(&window))
         .await
         .map_err(|e| e.to_string())?;
     Ok(())
@@ -1586,6 +1582,9 @@ async fn cmd_delete_send_history(workspace_id: &str, window: WebviewWindow) -> R
     delete_all_grpc_connections_for_workspace(&window, workspace_id, &UpdateSource::Window)
         .await
         .map_err(|e| e.to_string())?;
+    delete_all_websocket_connections_for_workspace(&window, workspace_id, &UpdateSource::Window)
+        .await
+        .map_err(|e| e.to_string())?;
     Ok(())
 }
 
@@ -1653,15 +1652,17 @@ async fn cmd_new_child_window(
         current_pos.y + current_size.height / 2.0 - inner_size.1 / 2.0,
     );
 
-    let config = CreateWindowConfig {
+    let config = window::CreateWindowConfig {
         label: label.as_str(),
         title,
         url,
-        inner_size,
-        position,
+        inner_size: Some(inner_size),
+        position: Some(position),
+        hide_titlebar: true,
+        ..Default::default()
     };
 
-    let child_window = create_window(&app_handle, config);
+    let child_window = window::create_window(&app_handle, config);
 
     // NOTE: These listeners will remain active even when the windows close. Unfortunately,
     //   there's no way to unlisten to events for now, so we just have to be defensive.
@@ -1718,99 +1719,94 @@ async fn cmd_check_for_updates(
     yaak_updater: State<'_, Mutex<YaakUpdater>>,
 ) -> Result<bool, String> {
     let update_mode = get_update_mode(&app_handle).await;
-    yaak_updater.lock().await.force_check(&app_handle, update_mode).await.map_err(|e| e.to_string())
+    yaak_updater
+        .lock()
+        .await
+        .check_now(&app_handle, update_mode, UpdateTrigger::User)
+        .await
+        .map_err(|e| e.to_string())
 }
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     #[allow(unused_mut)]
-    let mut builder =
-        tauri::Builder::default()
-            .plugin(
-                Builder::default()
-                    .targets([
-                        Target::new(TargetKind::Stdout),
-                        Target::new(TargetKind::LogDir { file_name: None }),
-                        Target::new(TargetKind::Webview),
-                    ])
-                    .level_for("plugin_runtime", log::LevelFilter::Info)
-                    .level_for("cookie_store", log::LevelFilter::Info)
-                    .level_for("eventsource_client::event_parser", log::LevelFilter::Info)
-                    .level_for("h2", log::LevelFilter::Info)
-                    .level_for("hyper", log::LevelFilter::Info)
-                    .level_for("hyper_util", log::LevelFilter::Info)
-                    .level_for("hyper_rustls", log::LevelFilter::Info)
-                    .level_for("reqwest", log::LevelFilter::Info)
-                    .level_for("sqlx", log::LevelFilter::Warn)
-                    .level_for("tao", log::LevelFilter::Info)
-                    .level_for("tokio_util", log::LevelFilter::Info)
-                    .level_for("tonic", log::LevelFilter::Info)
-                    .level_for("tower", log::LevelFilter::Info)
-                    .level_for("tracing", log::LevelFilter::Warn)
-                    .level_for("swc_ecma_codegen", log::LevelFilter::Off)
-                    .level_for("swc_ecma_transforms_base", log::LevelFilter::Off)
-                    .with_colors(ColoredLevelConfig::default())
-                    .level(if is_dev() { log::LevelFilter::Debug } else { log::LevelFilter::Info })
-                    .build(),
-            )
-            .plugin(
-                Builder::default()
-                    .targets([
-                        Target::new(TargetKind::Stdout),
-                        Target::new(TargetKind::LogDir { file_name: None }),
-                        Target::new(TargetKind::Webview),
-                    ])
-                    .level_for("plugin_runtime", log::LevelFilter::Info)
-                    .level_for("cookie_store", log::LevelFilter::Info)
-                    .level_for("eventsource_client::event_parser", log::LevelFilter::Info)
-                    .level_for("h2", log::LevelFilter::Info)
-                    .level_for("hyper", log::LevelFilter::Info)
-                    .level_for("hyper_util", log::LevelFilter::Info)
-                    .level_for("hyper_rustls", log::LevelFilter::Info)
-                    .level_for("reqwest", log::LevelFilter::Info)
-                    .level_for("sqlx", log::LevelFilter::Warn)
-                    .level_for("tao", log::LevelFilter::Info)
-                    .level_for("tokio_util", log::LevelFilter::Info)
-                    .level_for("tonic", log::LevelFilter::Info)
-                    .level_for("tower", log::LevelFilter::Info)
-                    .level_for("tracing", log::LevelFilter::Warn)
-                    .level_for("swc_ecma_codegen", log::LevelFilter::Off)
-                    .level_for("swc_ecma_transforms_base", log::LevelFilter::Off)
-                    .with_colors(ColoredLevelConfig::default())
-                    .level(if is_dev() { log::LevelFilter::Debug } else { log::LevelFilter::Info })
-                    .build(),
-            )
-            .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
-                // When trying to open a new app instance (common operation on Linux),
-                // focus the first existing window we find instead of opening a new one
-                // TODO: Keep track of the last focused window and always focus that one
-                if let Some(window) = app.webview_windows().values().next() {
-                    let _ = window.set_focus();
-                }
-            }))
-            .plugin(tauri_plugin_clipboard_manager::init())
-            .plugin(tauri_plugin_opener::init())
-            .plugin(
-                tauri_plugin_window_state::Builder::default()
-                    .with_denylist(&["ignored"])
-                    .map_label(|label| {
-                        if label.starts_with(OTHER_WINDOW_PREFIX) {
-                            "ignored"
-                        } else {
-                            label
-                        }
-                    })
-                    .build(),
-            )
-            .plugin(tauri_plugin_shell::init())
-            .plugin(tauri_plugin_updater::Builder::default().build())
-            .plugin(tauri_plugin_dialog::init())
-            .plugin(tauri_plugin_os::init())
-            .plugin(tauri_plugin_fs::init())
-            .plugin(yaak_license::init())
-            .plugin(yaak_models::plugin::Builder::default().build())
-            .plugin(yaak_plugins::init())
-            .plugin(yaak_sync::init());
+    let mut builder = tauri::Builder::default()
+        .plugin(
+            Builder::default()
+                .targets([
+                    Target::new(TargetKind::Stdout),
+                    Target::new(TargetKind::LogDir { file_name: None }),
+                    Target::new(TargetKind::Webview),
+                ])
+                .level_for("plugin_runtime", log::LevelFilter::Info)
+                .level_for("cookie_store", log::LevelFilter::Info)
+                .level_for("eventsource_client::event_parser", log::LevelFilter::Info)
+                .level_for("h2", log::LevelFilter::Info)
+                .level_for("hyper", log::LevelFilter::Info)
+                .level_for("hyper_util", log::LevelFilter::Info)
+                .level_for("hyper_rustls", log::LevelFilter::Info)
+                .level_for("reqwest", log::LevelFilter::Info)
+                .level_for("sqlx", log::LevelFilter::Warn)
+                .level_for("tao", log::LevelFilter::Info)
+                .level_for("tokio_util", log::LevelFilter::Info)
+                .level_for("tonic", log::LevelFilter::Info)
+                .level_for("tower", log::LevelFilter::Info)
+                .level_for("tracing", log::LevelFilter::Warn)
+                .level_for("swc_ecma_codegen", log::LevelFilter::Off)
+                .level_for("swc_ecma_transforms_base", log::LevelFilter::Off)
+                .with_colors(ColoredLevelConfig::default())
+                .level(if is_dev() { log::LevelFilter::Debug } else { log::LevelFilter::Info })
+                .build(),
+        )
+        .plugin(
+            Builder::default()
+                .targets([
+                    Target::new(TargetKind::Stdout),
+                    Target::new(TargetKind::LogDir { file_name: None }),
+                    Target::new(TargetKind::Webview),
+                ])
+                .level_for("plugin_runtime", log::LevelFilter::Info)
+                .level_for("cookie_store", log::LevelFilter::Info)
+                .level_for("eventsource_client::event_parser", log::LevelFilter::Info)
+                .level_for("h2", log::LevelFilter::Info)
+                .level_for("hyper", log::LevelFilter::Info)
+                .level_for("hyper_util", log::LevelFilter::Info)
+                .level_for("hyper_rustls", log::LevelFilter::Info)
+                .level_for("reqwest", log::LevelFilter::Info)
+                .level_for("sqlx", log::LevelFilter::Warn)
+                .level_for("tao", log::LevelFilter::Info)
+                .level_for("tokio_util", log::LevelFilter::Info)
+                .level_for("tonic", log::LevelFilter::Info)
+                .level_for("tower", log::LevelFilter::Info)
+                .level_for("tracing", log::LevelFilter::Warn)
+                .level_for("swc_ecma_codegen", log::LevelFilter::Off)
+                .level_for("swc_ecma_transforms_base", log::LevelFilter::Off)
+                .with_colors(ColoredLevelConfig::default())
+                .level(if is_dev() { log::LevelFilter::Debug } else { log::LevelFilter::Info })
+                .build(),
+        )
+        .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
+            // When trying to open a new app instance (common operation on Linux),
+            // focus the first existing window we find instead of opening a new one
+            // TODO: Keep track of the last focused window and always focus that one
+            if let Some(window) = app.webview_windows().values().next() {
+                let _ = window.set_focus();
+            }
+        }))
+        .plugin(tauri_plugin_clipboard_manager::init())
+        .plugin(tauri_plugin_opener::init())
+        .plugin(tauri_plugin_window_state::Builder::default().build())
+        .plugin(tauri_plugin_shell::init())
+        .plugin(tauri_plugin_updater::Builder::default().build())
+        .plugin(tauri_plugin_dialog::init())
+        .plugin(tauri_plugin_os::init())
+        .plugin(tauri_plugin_fs::init())
+        .plugin(yaak_license::init())
+        .plugin(yaak_models::plugin::Builder::default().build())
+        .plugin(yaak_plugins::init())
+        .plugin(yaak_git::init())
+        .plugin(yaak_ws::init())
+        .plugin(yaak_sync::init());
 
     #[cfg(target_os = "macos")]
     {
@@ -1839,6 +1835,7 @@ pub fn run() {
             Ok(())
         })
         .invoke_handler(tauri::generate_handler![
+            cmd_call_http_authentication_action,
             cmd_call_http_request_action,
             cmd_check_for_updates,
             cmd_create_cookie_jar,
@@ -1868,7 +1865,8 @@ pub fn run() {
             cmd_get_environment,
             cmd_get_folder,
             cmd_get_grpc_request,
-            cmd_get_http_authentication,
+            cmd_get_http_authentication_summaries,
+            cmd_get_http_authentication_config,
             cmd_get_http_request,
             cmd_get_key_value,
             cmd_get_settings,
@@ -1905,7 +1903,6 @@ pub fn run() {
             cmd_set_update_mode,
             cmd_template_functions,
             cmd_template_tokens_to_string,
-            cmd_track_event,
             cmd_uninstall_plugin,
             cmd_update_cookie_jar,
             cmd_update_environment,
@@ -1928,7 +1925,7 @@ pub fn run() {
                 RunEvent::Ready => {
                     let w = create_main_window(app_handle, "/");
                     tauri::async_runtime::spawn(async move {
-                        let info = analytics::track_launch_event(&w).await;
+                        let info = history::store_launch_history(&w).await;
                         debug!("Launched Yaak {:?}", info);
                     });
 
@@ -1948,7 +1945,7 @@ pub fn run() {
                     tauri::async_runtime::spawn(async move {
                         let val: State<'_, Mutex<YaakUpdater>> = h.state();
                         let update_mode = get_update_mode(&h).await;
-                        if let Err(e) = val.lock().await.check(&h, update_mode).await {
+                        if let Err(e) = val.lock().await.maybe_check(&h, update_mode).await {
                             warn!("Failed to check for updates {e:?}");
                         };
                     });
@@ -2007,124 +2004,21 @@ fn create_main_window(handle: &AppHandle, url: &str) -> WebviewWindow {
     }
     .expect("Failed to generate label for new window");
 
-    let config = CreateWindowConfig {
+    let config = window::CreateWindowConfig {
         url,
         label: label.as_str(),
         title: "Yaak",
-        inner_size: (DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT),
-        position: (
+        inner_size: Some((DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT)),
+        position: Some((
             // Offset by random amount so it's easier to differentiate
             100.0 + random::<f64>() * 20.0,
             100.0 + random::<f64>() * 20.0,
-        ),
+        )),
+        hide_titlebar: true,
+        ..Default::default()
     };
 
-    let window = create_window(handle, config);
-
-    // Restore window state if it's a main window
-    if !label.starts_with(OTHER_WINDOW_PREFIX) {
-        if let Err(e) = window.restore_state(StateFlags::all()) {
-            warn!("Failed to restore window state {e:?}");
-        } else {
-            debug!("Restored window state");
-        }
-    }
-
-    window
-}
-
-struct CreateWindowConfig<'s> {
-    url: &'s str,
-    label: &'s str,
-    title: &'s str,
-    inner_size: (f64, f64),
-    position: (f64, f64),
-}
-
-fn create_window(handle: &AppHandle, config: CreateWindowConfig) -> WebviewWindow {
-    #[allow(unused_variables)]
-    let menu = app_menu(handle).unwrap();
-
-    // This causes the window to not be clickable (in AppImage), so disable on Linux
-    #[cfg(not(target_os = "linux"))]
-    handle.set_menu(menu).expect("Failed to set app menu");
-
-    info!("Create new window label={}", config.label);
-
-    let mut win_builder =
-        tauri::WebviewWindowBuilder::new(handle, config.label, WebviewUrl::App(config.url.into()))
-            .title(config.title)
-            .resizable(true)
-            .visible(false) // To prevent theme flashing, the frontend code calls show() immediately after configuring the theme
-            .fullscreen(false)
-            .disable_drag_drop_handler() // Required for frontend Dnd on windows
-            .inner_size(config.inner_size.0, config.inner_size.1)
-            .position(config.position.0, config.position.1)
-            .min_inner_size(MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT);
-
-    // Add macOS-only things
-    #[cfg(target_os = "macos")]
-    {
-        win_builder = win_builder.hidden_title(true).title_bar_style(TitleBarStyle::Overlay);
-    }
-
-    // Add non-MacOS things
-    #[cfg(not(target_os = "macos"))]
-    {
-        // Doesn't seem to work from Rust, here, so we do it in main.tsx
-        win_builder = win_builder.decorations(false);
-    }
-
-    if let Some(w) = handle.webview_windows().get(config.label) {
-        info!("Webview with label {} already exists. Focusing existing", config.label);
-        w.set_focus().unwrap();
-        return w.to_owned();
-    }
-
-    let win = win_builder.build().unwrap();
-
-    let webview_window = win.clone();
-    win.on_menu_event(move |w, event| {
-        if !w.is_focused().unwrap() {
-            return;
-        }
-
-        let event_id = event.id().0.as_str();
-        match event_id {
-            "quit" => exit(0),
-            "close" => w.close().unwrap(),
-            "zoom_reset" => w.emit("zoom_reset", true).unwrap(),
-            "zoom_in" => w.emit("zoom_in", true).unwrap(),
-            "zoom_out" => w.emit("zoom_out", true).unwrap(),
-            "settings" => w.emit("settings", true).unwrap(),
-            "open_feedback" => {
-                if let Err(e) =
-                    w.app_handle().opener().open_url("https://yaak.app/feedback", None::<&str>)
-                {
-                    warn!("Failed to open feedback {e:?}")
-                }
-            }
-
-            // Commands for development
-            "dev.reset_size" => webview_window
-                .set_size(LogicalSize::new(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT))
-                .unwrap(),
-            "dev.refresh" => webview_window.eval("location.reload()").unwrap(),
-            "dev.generate_theme_css" => {
-                w.emit("generate_theme_css", true).unwrap();
-            }
-            "dev.toggle_devtools" => {
-                if webview_window.is_devtools_open() {
-                    webview_window.close_devtools();
-                } else {
-                    webview_window.open_devtools();
-                }
-            }
-            _ => {}
-        }
-    });
-
-    win
+    window::create_window(handle, config)
 }
 
 async fn get_update_mode(h: &AppHandle) -> UpdateMode {
@@ -2160,36 +2054,24 @@ fn monitor_plugin_events<R: Runtime>(app_handle: &AppHandle<R>) {
             // We might have recursive back-and-forth calls between app and plugin, so we don't
             // want to block here
             tauri::async_runtime::spawn(async move {
-                handle_plugin_event(&app_handle, &event, &plugin).await;
+                plugin_events::handle_plugin_event(&app_handle, &event, &plugin).await;
             });
         }
         plugin_manager.unsubscribe(rx_id.as_str()).await;
     });
 }
 
-#[derive(Debug, Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct FrontendCall<T: Serialize + Clone> {
-    args: T,
-    reply_id: String,
-}
-
-async fn call_frontend<T: Serialize + Clone, R: Runtime>(
+async fn call_frontend<R: Runtime>(
     window: WebviewWindow<R>,
-    event_name: &str,
-    args: T,
-) -> PromptTextResponse {
-    let reply_id = format!("{event_name}_reply_{}", generate_id());
-    let payload = FrontendCall {
-        args,
-        reply_id: reply_id.clone(),
-    };
-    window.emit_to(window.label(), event_name, payload).unwrap();
-    let (tx, mut rx) = tokio::sync::watch::channel(PromptTextResponse::default());
+    event: &InternalEvent,
+) -> Option<InternalEventPayload> {
+    window.emit_to(window.label(), "plugin_event", event.clone()).unwrap();
+    let (tx, mut rx) = tokio::sync::watch::channel(None);
 
+    let reply_id = event.id.clone();
     let event_id = window.clone().listen(reply_id, move |ev| {
-        let resp: PromptTextResponse = serde_json::from_str(ev.payload()).unwrap();
-        if let Err(e) = tx.send(resp) {
+        let resp: InternalEvent = serde_json::from_str(ev.payload()).unwrap();
+        if let Err(e) = tx.send(Some(resp.payload)) {
             warn!("Failed to prompt for text {e:?}");
         }
     });
@@ -2200,166 +2082,8 @@ async fn call_frontend<T: Serialize + Clone, R: Runtime>(
     }
     window.unlisten(event_id);
 
-    let foo = rx.borrow();
-    foo.clone()
-}
-
-async fn handle_plugin_event<R: Runtime>(
-    app_handle: &AppHandle<R>,
-    event: &InternalEvent,
-    plugin_handle: &PluginHandle,
-) {
-    // info!("Got event to app {}", event.id);
-    let window_context = event.window_context.to_owned();
-    let response_event: Option<InternalEventPayload> = match event.clone().payload {
-        InternalEventPayload::CopyTextRequest(req) => {
-            app_handle
-                .clipboard()
-                .write_text(req.text.as_str())
-                .expect("Failed to write text to clipboard");
-            None
-        }
-        InternalEventPayload::ShowToastRequest(req) => {
-            match window_context {
-                WindowContext::Label { label } => app_handle
-                    .emit_to(label, "show_toast", req)
-                    .expect("Failed to emit show_toast to window"),
-                _ => app_handle.emit("show_toast", req).expect("Failed to emit show_toast"),
-            };
-            None
-        }
-        InternalEventPayload::PromptTextRequest(req) => {
-            let window = get_window_from_window_context(app_handle, &window_context)
-                .expect("Failed to find window for render");
-            let resp = call_frontend(window, "show_prompt", req).await;
-            Some(InternalEventPayload::PromptTextResponse(resp))
-        }
-        InternalEventPayload::FindHttpResponsesRequest(req) => {
-            let http_responses = list_http_responses_for_request(
-                app_handle,
-                req.request_id.as_str(),
-                req.limit.map(|l| l as i64),
-            )
-            .await
-            .unwrap_or_default();
-            Some(InternalEventPayload::FindHttpResponsesResponse(FindHttpResponsesResponse {
-                http_responses,
-            }))
-        }
-        InternalEventPayload::GetHttpRequestByIdRequest(req) => {
-            let http_request = get_http_request(app_handle, req.id.as_str()).await.unwrap();
-            Some(InternalEventPayload::GetHttpRequestByIdResponse(GetHttpRequestByIdResponse {
-                http_request,
-            }))
-        }
-        InternalEventPayload::RenderHttpRequestRequest(req) => {
-            let window = get_window_from_window_context(app_handle, &window_context)
-                .expect("Failed to find window for render http request");
-
-            let workspace = workspace_from_window(&window)
-                .await
-                .expect("Failed to get workspace_id from window URL");
-            let environment = environment_from_window(&window).await;
-            let base_environment = get_base_environment(&window, workspace.id.as_str())
-                .await
-                .expect("Failed to get base environment");
-            let cb = PluginTemplateCallback::new(app_handle, &window_context, req.purpose);
-            let http_request = render_http_request(
-                &req.http_request,
-                &base_environment,
-                environment.as_ref(),
-                &cb,
-            )
-            .await;
-            Some(InternalEventPayload::RenderHttpRequestResponse(RenderHttpRequestResponse {
-                http_request,
-            }))
-        }
-        InternalEventPayload::TemplateRenderRequest(req) => {
-            let window = get_window_from_window_context(app_handle, &window_context)
-                .expect("Failed to find window for render");
-
-            let workspace = workspace_from_window(&window)
-                .await
-                .expect("Failed to get workspace_id from window URL");
-            let environment = environment_from_window(&window).await;
-            let base_environment = get_base_environment(&window, workspace.id.as_str())
-                .await
-                .expect("Failed to get base environment");
-            let cb = PluginTemplateCallback::new(app_handle, &window_context, req.purpose);
-            let data =
-                render_json_value(req.data, &base_environment, environment.as_ref(), &cb).await;
-            Some(InternalEventPayload::TemplateRenderResponse(TemplateRenderResponse { data }))
-        }
-        InternalEventPayload::ReloadResponse(_) => {
-            let window = get_window_from_window_context(app_handle, &window_context)
-                .expect("Failed to find window for plugin reload");
-            let plugins = list_plugins(app_handle).await.unwrap();
-            for plugin in plugins {
-                if plugin.directory != plugin_handle.dir {
-                    continue;
-                }
-
-                let new_plugin = Plugin {
-                    updated_at: Utc::now().naive_utc(), // TODO: Add reloaded_at field to use instead
-                    ..plugin
-                };
-                upsert_plugin(&window, new_plugin, &UpdateSource::Plugin).await.unwrap();
-            }
-            let toast_event = plugin_handle.build_event_to_send(
-                WindowContext::from_window(&window),
-                &InternalEventPayload::ShowToastRequest(ShowToastRequest {
-                    message: format!("Reloaded plugin {}", plugin_handle.dir),
-                    icon: Some(Icon::Info),
-                    ..Default::default()
-                }),
-                None,
-            );
-            Box::pin(handle_plugin_event(app_handle, &toast_event, plugin_handle)).await;
-            None
-        }
-        InternalEventPayload::SendHttpRequestRequest(req) => {
-            let window = get_window_from_window_context(app_handle, &window_context)
-                .expect("Failed to find window for sending HTTP request");
-            let cookie_jar = cookie_jar_from_window(&window).await;
-            let environment = environment_from_window(&window).await;
-
-            let resp = create_default_http_response(
-                &window,
-                req.http_request.id.as_str(),
-                &UpdateSource::Plugin,
-            )
-            .await
-            .unwrap();
-
-            let result = send_http_request(
-                &window,
-                &req.http_request,
-                &resp,
-                environment,
-                cookie_jar,
-                &mut tokio::sync::watch::channel(false).1, // No-op cancel channel
-            )
-            .await;
-
-            let http_response = match result {
-                Ok(r) => r,
-                Err(_e) => return,
-            };
-
-            Some(InternalEventPayload::SendHttpRequestResponse(SendHttpRequestResponse {
-                http_response,
-            }))
-        }
-        _ => None,
-    };
-
-    if let Some(e) = response_event {
-        let plugin_manager: State<'_, PluginManager> = app_handle.state();
-        if let Err(e) = plugin_manager.reply(&event, &e).await {
-            warn!("Failed to reply to plugin manager: {:?}", e)
-        }
-    }
+    let v = rx.borrow();
+    v.to_owned()
 }
 
 fn get_window_from_window_context<R: Runtime>(

src-tauri/src/notifications.rs

@@ -1,10 +1,11 @@
 use std::time::SystemTime;
 
-use crate::analytics::get_num_launches;
+use crate::history::{get_num_launches, get_os};
 use chrono::{DateTime, Duration, Utc};
 use log::debug;
 use reqwest::Method;
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 use tauri::{Emitter, Manager, Runtime, WebviewWindow};
 use yaak_models::queries::{get_key_value_raw, set_key_value_raw, UpdateSource};
 
@@ -65,8 +66,9 @@ impl YaakNotifier {
         let req = reqwest::Client::default()
             .request(Method::GET, "https://notify.yaak.app/notifications")
             .query(&[
-                ("version", info.version.to_string()),
-                ("launches", num_launches.to_string()),
+                ("version", info.version.to_string().as_str()),
+                ("launches", num_launches.to_string().as_str()),
+                ("platform", get_os())
             ]);
         let resp = req.send().await.map_err(|e| e.to_string())?;
         if resp.status() != 200 {
@@ -74,17 +76,29 @@ impl YaakNotifier {
             return Ok(());
         }
 
-        let notification = resp.json::<YaakNotification>().await.map_err(|e| e.to_string())?;
+        let result = resp.json::<Value>().await.map_err(|e| e.to_string())?;
 
-        let age = notification.timestamp.signed_duration_since(Utc::now());
-        let seen = get_kv(window).await?;
-        if seen.contains(&notification.id) || (age > Duration::days(2)) {
-            debug!("Already seen notification {}", notification.id);
-            return Ok(());
+        // Support both single and multiple notifications.
+        // TODO: Remove support for single after April 2025
+        let notifications = match result {
+            Value::Array(a) => a
+                .into_iter()
+                .map(|a| serde_json::from_value(a).unwrap())
+                .collect::<Vec<YaakNotification>>(),
+            a @ _ => vec![serde_json::from_value(a).unwrap()],
+        };
+
+        for notification in notifications {
+            let age = notification.timestamp.signed_duration_since(Utc::now());
+            let seen = get_kv(window).await?;
+            if seen.contains(&notification.id) || (age > Duration::days(2)) {
+                debug!("Already seen notification {}", notification.id);
+                return Ok(());
+            }
+            debug!("Got notification {:?}", notification);
+
+            let _ = window.emit_to(window.label(), "notification", notification.clone());
         }
-        debug!("Got notification {:?}", notification);
-
-        let _ = window.emit_to(window.label(), "notification", notification.clone());
 
         Ok(())
     }

src-tauri/src/plugin_events.rs

@@ -0,0 +1,288 @@
+use crate::http_request::send_http_request;
+use crate::render::{render_http_request, render_json_value};
+use crate::window::{create_window, CreateWindowConfig};
+use crate::{
+    call_frontend, cookie_jar_from_window, environment_from_window, get_window_from_window_context,
+    workspace_from_window,
+};
+use chrono::Utc;
+use log::warn;
+use tauri::{AppHandle, Emitter, Manager, Runtime, State};
+use tauri_plugin_clipboard_manager::ClipboardExt;
+use yaak_models::models::{HttpResponse, Plugin};
+use yaak_models::queries::{
+    create_default_http_response, delete_plugin_key_value, get_base_environment, get_http_request,
+    get_plugin_key_value, list_http_responses_for_request, list_plugins, set_plugin_key_value,
+    upsert_plugin, UpdateSource,
+};
+use yaak_plugins::events::{
+    Color, DeleteKeyValueResponse, EmptyPayload, FindHttpResponsesResponse,
+    GetHttpRequestByIdResponse, GetKeyValueResponse, Icon, InternalEvent, InternalEventPayload,
+    RenderHttpRequestResponse, SendHttpRequestResponse, SetKeyValueResponse, ShowToastRequest,
+    TemplateRenderResponse, WindowContext, WindowNavigateEvent,
+};
+use yaak_plugins::manager::PluginManager;
+use yaak_plugins::plugin_handle::PluginHandle;
+use yaak_plugins::template_callback::PluginTemplateCallback;
+
+pub(crate) async fn handle_plugin_event<R: Runtime>(
+    app_handle: &AppHandle<R>,
+    event: &InternalEvent,
+    plugin_handle: &PluginHandle,
+) {
+    // debug!("Got event to app {event:?}");
+    let window_context = event.window_context.to_owned();
+    let response_event: Option<InternalEventPayload> = match event.clone().payload {
+        InternalEventPayload::CopyTextRequest(req) => {
+            app_handle
+                .clipboard()
+                .write_text(req.text.as_str())
+                .expect("Failed to write text to clipboard");
+            Some(InternalEventPayload::CopyTextResponse(EmptyPayload {}))
+        }
+        InternalEventPayload::ShowToastRequest(req) => {
+            match window_context {
+                WindowContext::Label { label } => app_handle
+                    .emit_to(label, "show_toast", req)
+                    .expect("Failed to emit show_toast to window"),
+                _ => app_handle.emit("show_toast", req).expect("Failed to emit show_toast"),
+            };
+            Some(InternalEventPayload::ShowToastResponse(EmptyPayload {}))
+        }
+        InternalEventPayload::PromptTextRequest(_) => {
+            let window = get_window_from_window_context(app_handle, &window_context)
+                .expect("Failed to find window for render");
+            call_frontend(window, event).await
+        }
+        InternalEventPayload::FindHttpResponsesRequest(req) => {
+            let http_responses = list_http_responses_for_request(
+                app_handle,
+                req.request_id.as_str(),
+                req.limit.map(|l| l as i64),
+            )
+            .await
+            .unwrap_or_default();
+            Some(InternalEventPayload::FindHttpResponsesResponse(FindHttpResponsesResponse {
+                http_responses,
+            }))
+        }
+        InternalEventPayload::GetHttpRequestByIdRequest(req) => {
+            let http_request = get_http_request(app_handle, req.id.as_str()).await.unwrap();
+            Some(InternalEventPayload::GetHttpRequestByIdResponse(GetHttpRequestByIdResponse {
+                http_request,
+            }))
+        }
+        InternalEventPayload::RenderHttpRequestRequest(req) => {
+            let window = get_window_from_window_context(app_handle, &window_context)
+                .expect("Failed to find window for render http request");
+
+            let workspace = workspace_from_window(&window)
+                .await
+                .expect("Failed to get workspace_id from window URL");
+            let environment = environment_from_window(&window).await;
+            let base_environment = get_base_environment(&window, workspace.id.as_str())
+                .await
+                .expect("Failed to get base environment");
+            let cb = PluginTemplateCallback::new(app_handle, &window_context, req.purpose);
+            let http_request = render_http_request(
+                &req.http_request,
+                &base_environment,
+                environment.as_ref(),
+                &cb,
+            )
+            .await;
+            Some(InternalEventPayload::RenderHttpRequestResponse(RenderHttpRequestResponse {
+                http_request,
+            }))
+        }
+        InternalEventPayload::TemplateRenderRequest(req) => {
+            let window = get_window_from_window_context(app_handle, &window_context)
+                .expect("Failed to find window for render");
+
+            let workspace = workspace_from_window(&window)
+                .await
+                .expect("Failed to get workspace_id from window URL");
+            let environment = environment_from_window(&window).await;
+            let base_environment = get_base_environment(&window, workspace.id.as_str())
+                .await
+                .expect("Failed to get base environment");
+            let cb = PluginTemplateCallback::new(app_handle, &window_context, req.purpose);
+            let data =
+                render_json_value(req.data, &base_environment, environment.as_ref(), &cb).await;
+            Some(InternalEventPayload::TemplateRenderResponse(TemplateRenderResponse { data }))
+        }
+        InternalEventPayload::ErrorResponse(resp) => {
+            let window = get_window_from_window_context(app_handle, &window_context)
+                .expect("Failed to find window for plugin reload");
+            let toast_event = plugin_handle.build_event_to_send(
+                &WindowContext::from_window(&window),
+                &InternalEventPayload::ShowToastRequest(ShowToastRequest {
+                    message: format!(
+                        "Plugin error from {}: {}",
+                        plugin_handle.name().await,
+                        resp.error
+                    ),
+                    color: Some(Color::Danger),
+                    ..Default::default()
+                }),
+                None,
+            );
+            Box::pin(handle_plugin_event(app_handle, &toast_event, plugin_handle)).await;
+            None
+        }
+        InternalEventPayload::ReloadResponse(_) => {
+            let window = get_window_from_window_context(app_handle, &window_context)
+                .expect("Failed to find window for plugin reload");
+            let plugins = list_plugins(app_handle).await.unwrap();
+            for plugin in plugins {
+                if plugin.directory != plugin_handle.dir {
+                    continue;
+                }
+
+                let new_plugin = Plugin {
+                    updated_at: Utc::now().naive_utc(), // TODO: Add reloaded_at field to use instead
+                    ..plugin
+                };
+                upsert_plugin(&window, new_plugin, &UpdateSource::Plugin).await.unwrap();
+            }
+            let toast_event = plugin_handle.build_event_to_send(
+                &WindowContext::from_window(&window),
+                &InternalEventPayload::ShowToastRequest(ShowToastRequest {
+                    message: format!("Reloaded plugin {}", plugin_handle.dir),
+                    icon: Some(Icon::Info),
+                    ..Default::default()
+                }),
+                None,
+            );
+            Box::pin(handle_plugin_event(app_handle, &toast_event, plugin_handle)).await;
+            None
+        }
+        InternalEventPayload::SendHttpRequestRequest(req) => {
+            let window = get_window_from_window_context(app_handle, &window_context)
+                .expect("Failed to find window for sending HTTP request");
+            let mut http_request = req.http_request;
+            let workspace = workspace_from_window(&window)
+                .await
+                .expect("Failed to get workspace_id from window URL");
+            let cookie_jar = cookie_jar_from_window(&window).await;
+            let environment = environment_from_window(&window).await;
+
+            if http_request.workspace_id.is_empty() {
+                http_request.workspace_id = workspace.id;
+            }
+
+            let resp = if http_request.id.is_empty() {
+                HttpResponse::new()
+            } else {
+                create_default_http_response(
+                    &window,
+                    http_request.id.as_str(),
+                    &UpdateSource::Plugin,
+                )
+                .await
+                .unwrap()
+            };
+
+            let result = send_http_request(
+                &window,
+                &http_request,
+                &resp,
+                environment,
+                cookie_jar,
+                &mut tokio::sync::watch::channel(false).1, // No-op cancel channel
+            )
+            .await;
+
+            let http_response = match result {
+                Ok(r) => r,
+                Err(_e) => return,
+            };
+
+            Some(InternalEventPayload::SendHttpRequestResponse(SendHttpRequestResponse {
+                http_response,
+            }))
+        }
+        InternalEventPayload::OpenWindowRequest(req) => {
+            let label = req.label;
+            let (navigation_tx, mut navigation_rx) = tokio::sync::mpsc::channel(128);
+            let (close_tx, mut close_rx) = tokio::sync::mpsc::channel(128);
+            let win_config = CreateWindowConfig {
+                url: &req.url,
+                label: &label.clone(),
+                title: &req.title.unwrap_or_default(),
+                navigation_tx: Some(navigation_tx),
+                close_tx: Some(close_tx),
+                inner_size: req.size.map(|s| (s.width, s.height)),
+                data_dir_key: req.data_dir_key,
+                ..Default::default()
+            };
+            create_window(app_handle, win_config);
+
+            {
+                let event_id = event.id.clone();
+                let plugin_handle = plugin_handle.clone();
+                let label = label.clone();
+                tauri::async_runtime::spawn(async move {
+                    while let Some(url) = navigation_rx.recv().await {
+                        let url = url.to_string();
+                        let label = label.clone();
+                        let event_to_send = plugin_handle.build_event_to_send(
+                            &WindowContext::Label { label },
+                            &InternalEventPayload::WindowNavigateEvent(WindowNavigateEvent { url }),
+                            Some(event_id.clone()),
+                        );
+                        plugin_handle.send(&event_to_send).await.unwrap();
+                    }
+                });
+            }
+
+            {
+                let event_id = event.id.clone();
+                let plugin_handle = plugin_handle.clone();
+                let label = label.clone();
+                tauri::async_runtime::spawn(async move {
+                    while let Some(_) = close_rx.recv().await {
+                        let label = label.clone();
+                        let event_to_send = plugin_handle.build_event_to_send(
+                            &WindowContext::Label { label },
+                            &InternalEventPayload::WindowCloseEvent,
+                            Some(event_id.clone()),
+                        );
+                        plugin_handle.send(&event_to_send).await.unwrap();
+                    }
+                });
+            }
+
+            None
+        }
+        InternalEventPayload::CloseWindowRequest(req) => {
+            if let Some(window) = app_handle.webview_windows().get(&req.label) {
+                window.close().expect("Failed to close window");
+            }
+            None
+        }
+        InternalEventPayload::SetKeyValueRequest(req) => {
+            let name = plugin_handle.name().await;
+            set_plugin_key_value(app_handle, &name, &req.key, &req.value).await;
+            Some(InternalEventPayload::SetKeyValueResponse(SetKeyValueResponse {}))
+        }
+        InternalEventPayload::GetKeyValueRequest(req) => {
+            let name = plugin_handle.name().await;
+            let value = get_plugin_key_value(app_handle, &name, &req.key).await.map(|v| v.value);
+            Some(InternalEventPayload::GetKeyValueResponse(GetKeyValueResponse { value }))
+        }
+        InternalEventPayload::DeleteKeyValueRequest(req) => {
+            let name = plugin_handle.name().await;
+            let deleted = delete_plugin_key_value(app_handle, &name, &req.key).await;
+            Some(InternalEventPayload::DeleteKeyValueResponse(DeleteKeyValueResponse { deleted }))
+        }
+        _ => None,
+    };
+
+    if let Some(e) = response_event {
+        let plugin_manager: State<'_, PluginManager> = app_handle.state();
+        if let Err(e) = plugin_manager.reply(&event, &e).await {
+            warn!("Failed to reply to plugin manager: {:?}", e)
+        }
+    }
+}

src-tauri/src/render.rs

@@ -1,11 +1,11 @@
-use crate::template_callback::PluginTemplateCallback;
-use serde_json::{json, Map, Value};
+use serde_json::Value;
 use std::collections::{BTreeMap, HashMap};
+use yaak_http::apply_path_placeholders;
 use yaak_models::models::{
-    Environment, EnvironmentVariable, GrpcMetadataEntry, GrpcRequest, HttpRequest,
-    HttpRequestHeader, HttpUrlParameter,
+    Environment, GrpcMetadataEntry, GrpcRequest, HttpRequest, HttpRequestHeader, HttpUrlParameter,
 };
-use yaak_templates::{parse_and_render, TemplateCallback};
+use yaak_models::render::make_vars_hashmap;
+use yaak_templates::{parse_and_render, render_json_value_raw, TemplateCallback};
 
 pub async fn render_template<T: TemplateCallback>(
     template: &str,
@@ -60,11 +60,11 @@ pub async fn render_grpc_request<T: TemplateCallback>(
     }
 }
 
-pub async fn render_http_request(
+pub async fn render_http_request<T: TemplateCallback>(
     r: &HttpRequest,
     base_environment: &Environment,
     environment: Option<&Environment>,
-    cb: &PluginTemplateCallback,
+    cb: &T,
 ) -> HttpRequest {
     let vars = &make_vars_hashmap(base_environment, environment);
 
@@ -99,31 +99,18 @@ pub async fn render_http_request(
     }
 
     let url = render(r.url.clone().as_str(), vars, cb).await;
-    let req = HttpRequest {
+
+    // 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);
+
+    HttpRequest {
         url,
         url_parameters,
         headers,
         body,
         authentication,
         ..r.to_owned()
-    };
-
-    // This doesn't fit perfectly with the concept of "rendering" but it kind of does
-    apply_path_placeholders(req)
-}
-
-pub fn make_vars_hashmap(
-    base_environment: &Environment,
-    environment: Option<&Environment>,
-) -> HashMap<String, String> {
-    let mut variables = HashMap::new();
-    variables = add_variable_to_map(variables, &base_environment.variables);
-
-    if let Some(e) = environment {
-        variables = add_variable_to_map(variables, &e.variables);
     }
-
-    variables
 }
 
 pub async fn render<T: TemplateCallback>(
@@ -133,300 +120,3 @@ pub async fn render<T: TemplateCallback>(
 ) -> String {
     parse_and_render(template, vars, cb).await
 }
-
-fn add_variable_to_map(
-    m: HashMap<String, String>,
-    variables: &Vec<EnvironmentVariable>,
-) -> HashMap<String, String> {
-    let mut map = m.clone();
-    for variable in variables {
-        if !variable.enabled || variable.value.is_empty() {
-            continue;
-        }
-        let name = variable.name.as_str();
-        let value = variable.value.as_str();
-        map.insert(name.into(), value.into());
-    }
-
-    map
-}
-
-async fn render_json_value_raw<T: TemplateCallback>(
-    v: Value,
-    vars: &HashMap<String, String>,
-    cb: &T,
-) -> Value {
-    match v {
-        Value::String(s) => json!(render(s.as_str(), vars, cb).await),
-        Value::Array(a) => {
-            let mut new_a = Vec::new();
-            for v in a {
-                new_a.push(Box::pin(render_json_value_raw(v, vars, cb)).await)
-            }
-            json!(new_a)
-        }
-        Value::Object(o) => {
-            let mut new_o = Map::new();
-            for (k, v) in o {
-                let key = Box::pin(render(k.as_str(), vars, cb)).await;
-                let value = Box::pin(render_json_value_raw(v, vars, cb)).await;
-                new_o.insert(key, value);
-            }
-            json!(new_o)
-        }
-        v => v,
-    }
-}
-
-#[cfg(test)]
-mod render_tests {
-    use serde_json::json;
-    use std::collections::HashMap;
-    use yaak_templates::TemplateCallback;
-
-    struct EmptyCB {}
-
-    impl TemplateCallback for EmptyCB {
-        async fn run(
-            &self,
-            _fn_name: &str,
-            _args: HashMap<String, String>,
-        ) -> Result<String, String> {
-            todo!()
-        }
-    }
-
-    #[tokio::test]
-    async fn render_json_value_string() {
-        let v = json!("${[a]}");
-        let mut vars = HashMap::new();
-        vars.insert("a".to_string(), "aaa".to_string());
-
-        let result = super::render_json_value_raw(v, &vars, &EmptyCB {}).await;
-        assert_eq!(result, json!("aaa"))
-    }
-
-    #[tokio::test]
-    async fn render_json_value_array() {
-        let v = json!(["${[a]}", "${[a]}"]);
-        let mut vars = HashMap::new();
-        vars.insert("a".to_string(), "aaa".to_string());
-
-        let result = super::render_json_value_raw(v, &vars, &EmptyCB {}).await;
-        assert_eq!(result, json!(["aaa", "aaa"]))
-    }
-
-    #[tokio::test]
-    async fn render_json_value_object() {
-        let v = json!({"${[a]}": "${[a]}"});
-        let mut vars = HashMap::new();
-        vars.insert("a".to_string(), "aaa".to_string());
-
-        let result = super::render_json_value_raw(v, &vars, &EmptyCB {}).await;
-        assert_eq!(result, json!({"aaa": "aaa"}))
-    }
-
-    #[tokio::test]
-    async fn render_json_value_nested() {
-        let v = json!([
-            123,
-            {"${[a]}": "${[a]}"},
-            null,
-            "${[a]}",
-            false,
-            {"x": ["${[a]}"]}
-        ]);
-        let mut vars = HashMap::new();
-        vars.insert("a".to_string(), "aaa".to_string());
-
-        let result = super::render_json_value_raw(v, &vars, &EmptyCB {}).await;
-        assert_eq!(
-            result,
-            json!([
-                123,
-                {"aaa": "aaa"},
-                null,
-                "aaa",
-                false,
-                {"x": ["aaa"]}
-            ])
-        )
-    }
-}
-
-fn replace_path_placeholder(p: &HttpUrlParameter, url: &str) -> String {
-    if !p.enabled {
-        return url.to_string();
-    }
-
-    if !p.name.starts_with(":") {
-        return url.to_string();
-    }
-
-    let re = regex::Regex::new(format!("(/){}([/?#]|$)", p.name).as_str()).unwrap();
-    let result = re
-        .replace_all(url, |cap: &regex::Captures| {
-            format!(
-                "{}{}{}",
-                cap[1].to_string(),
-                urlencoding::encode(p.value.as_str()),
-                cap[2].to_string()
-            )
-        })
-        .into_owned();
-    result
-}
-
-fn apply_path_placeholders(rendered_request: HttpRequest) -> HttpRequest {
-    let mut url = rendered_request.url.to_owned();
-    let mut url_parameters = Vec::new();
-    for p in rendered_request.url_parameters.clone() {
-        if !p.enabled || p.name.is_empty() {
-            continue;
-        }
-
-        // Replace path parameters with values from URL parameters
-        let old_url_string = url.clone();
-        url = replace_path_placeholder(&p, url.as_str());
-
-        // Remove as param if it modified the URL
-        if old_url_string == url {
-            url_parameters.push(p);
-        }
-    }
-
-    let mut request = rendered_request.clone();
-    request.url_parameters = url_parameters;
-    request.url = url;
-    request
-}
-
-#[cfg(test)]
-mod placeholder_tests {
-    use crate::render::{apply_path_placeholders, replace_path_placeholder};
-    use yaak_models::models::{HttpRequest, HttpUrlParameter};
-
-    #[test]
-    fn placeholder_middle() {
-        let p = HttpUrlParameter {
-            name: ":foo".into(),
-            value: "xxx".into(),
-            enabled: true,
-            id: None,
-        };
-        assert_eq!(
-            replace_path_placeholder(&p, "https://example.com/:foo/bar"),
-            "https://example.com/xxx/bar",
-        );
-    }
-
-    #[test]
-    fn placeholder_end() {
-        let p = HttpUrlParameter {
-            name: ":foo".into(),
-            value: "xxx".into(),
-            enabled: true,
-            id: None,
-        };
-        assert_eq!(
-            replace_path_placeholder(&p, "https://example.com/:foo"),
-            "https://example.com/xxx",
-        );
-    }
-
-    #[test]
-    fn placeholder_query() {
-        let p = HttpUrlParameter {
-            name: ":foo".into(),
-            value: "xxx".into(),
-            enabled: true,
-            id: None,
-        };
-        assert_eq!(
-            replace_path_placeholder(&p, "https://example.com/:foo?:foo"),
-            "https://example.com/xxx?:foo",
-        );
-    }
-
-    #[test]
-    fn placeholder_missing() {
-        let p = HttpUrlParameter {
-            enabled: true,
-            name: "".to_string(),
-            value: "".to_string(),
-            id: None,
-        };
-        assert_eq!(
-            replace_path_placeholder(&p, "https://example.com/:missing"),
-            "https://example.com/:missing",
-        );
-    }
-
-    #[test]
-    fn placeholder_disabled() {
-        let p = HttpUrlParameter {
-            enabled: false,
-            name: ":foo".to_string(),
-            value: "xxx".to_string(),
-            id: None,
-        };
-        assert_eq!(
-            replace_path_placeholder(&p, "https://example.com/:foo"),
-            "https://example.com/:foo",
-        );
-    }
-
-    #[test]
-    fn placeholder_prefix() {
-        let p = HttpUrlParameter {
-            name: ":foo".into(),
-            value: "xxx".into(),
-            enabled: true,
-            id: None,
-        };
-        assert_eq!(
-            replace_path_placeholder(&p, "https://example.com/:foooo"),
-            "https://example.com/:foooo",
-        );
-    }
-
-    #[test]
-    fn placeholder_encode() {
-        let p = HttpUrlParameter {
-            name: ":foo".into(),
-            value: "Hello World".into(),
-            enabled: true,
-            id: None,
-        };
-        assert_eq!(
-            replace_path_placeholder(&p, "https://example.com/:foo"),
-            "https://example.com/Hello%20World",
-        );
-    }
-
-    #[test]
-    fn apply_placeholder() {
-        let result = apply_path_placeholders(HttpRequest {
-            url: "example.com/:a/bar".to_string(),
-            url_parameters: vec![
-                HttpUrlParameter {
-                    name: "b".to_string(),
-                    value: "bbb".to_string(),
-                    enabled: true,
-                    id: None,
-                },
-                HttpUrlParameter {
-                    name: ":a".to_string(),
-                    value: "aaa".to_string(),
-                    enabled: true,
-                    id: None,
-                },
-            ],
-            ..Default::default()
-        });
-        assert_eq!(result.url, "example.com/aaa/bar");
-        assert_eq!(result.url_parameters.len(), 1);
-        assert_eq!(result.url_parameters[0].name, "b");
-        assert_eq!(result.url_parameters[0].value, "bbb");
-    }
-}

src-tauri/src/tauri_plugin_mac_window.rs

@@ -2,7 +2,8 @@ use crate::MAIN_WINDOW_PREFIX;
 use hex_color::HexColor;
 use log::warn;
 use objc::{msg_send, sel, sel_impl};
-use rand::{distributions::Alphanumeric, Rng};
+use rand::distr::Alphanumeric;
+use rand::Rng;
 use tauri::{
     plugin::{Builder, TauriPlugin},
     Emitter, Listener, Manager, Runtime, Window, WindowEvent,
@@ -420,7 +421,7 @@ pub fn setup_traffic_light_positioner<R: Runtime>(window: &Window<R>) {
         };
         let app_box = Box::into_raw(Box::new(app_state)) as *mut c_void;
         let random_str: String =
-            rand::thread_rng().sample_iter(&Alphanumeric).take(20).map(char::from).collect();
+            rand::rng().sample_iter(&Alphanumeric).take(20).map(char::from).collect();
 
         // We need to ensure we have a unique delegate name, otherwise we will panic while trying to create a duplicate
         // delegate with the same name.

src-tauri/src/updates.rs

@@ -6,6 +6,7 @@ use tauri::{AppHandle, Manager};
 use tauri_plugin_dialog::{DialogExt, MessageDialogButtons};
 use tauri_plugin_updater::UpdaterExt;
 use tokio::task::block_in_place;
+use yaak_models::queries::get_or_create_settings;
 use yaak_plugins::manager::PluginManager;
 
 use crate::is_dev;
@@ -46,6 +47,11 @@ impl UpdateMode {
     }
 }
 
+pub enum UpdateTrigger {
+    Background,
+    User,
+}
+
 impl YaakUpdater {
     pub fn new() -> Self {
         Self {
@@ -53,11 +59,14 @@ impl YaakUpdater {
         }
     }
 
-    pub async fn force_check(
+    pub async fn check_now(
         &mut self,
         app_handle: &AppHandle,
         mode: UpdateMode,
+        update_trigger: UpdateTrigger,
     ) -> Result<bool, tauri_plugin_updater::Error> {
+        let settings = get_or_create_settings(app_handle).await;
+        let update_key = format!("{:x}", md5::compute(settings.id));
         self.last_update_check = SystemTime::now();
 
         info!("Checking for updates mode={}", mode);
@@ -79,6 +88,14 @@ impl YaakUpdater {
                 });
             })
             .header("X-Update-Mode", mode.to_string())?
+            .header("X-Update-Key", update_key)?
+            .header(
+                "X-Update-Trigger",
+                match update_trigger {
+                    UpdateTrigger::Background => "background",
+                    UpdateTrigger::User => "user",
+                },
+            )?
             .build()?
             .check()
             .await;
@@ -129,7 +146,7 @@ impl YaakUpdater {
             Err(e) => Err(e),
         }
     }
-    pub async fn check(
+    pub async fn maybe_check(
         &mut self,
         app_handle: &AppHandle,
         mode: UpdateMode,
@@ -150,6 +167,6 @@ impl YaakUpdater {
             return Ok(false);
         }
 
-        self.force_check(app_handle, mode).await
+        self.check_now(app_handle, mode, UpdateTrigger::Background).await
     }
 }

src-tauri/src/window.rs

@@ -0,0 +1,167 @@
+use crate::window_menu::app_menu;
+use crate::{DEFAULT_WINDOW_HEIGHT, DEFAULT_WINDOW_WIDTH, MIN_WINDOW_HEIGHT, MIN_WINDOW_WIDTH};
+use log::{info, warn};
+use std::process::exit;
+use tauri::{
+    AppHandle, Emitter, LogicalSize, Manager, Runtime, WebviewUrl, WebviewWindow, WindowEvent,
+};
+use tauri_plugin_opener::OpenerExt;
+use tokio::sync::mpsc;
+
+#[derive(Default, Debug)]
+pub(crate) struct CreateWindowConfig<'s> {
+    pub url: &'s str,
+    pub label: &'s str,
+    pub title: &'s str,
+    pub inner_size: Option<(f64, f64)>,
+    pub position: Option<(f64, f64)>,
+    pub navigation_tx: Option<mpsc::Sender<String>>,
+    pub close_tx: Option<mpsc::Sender<()>>,
+    pub data_dir_key: Option<String>,
+    pub hide_titlebar: bool,
+}
+
+pub(crate) fn create_window<R: Runtime>(
+    handle: &AppHandle<R>,
+    config: CreateWindowConfig,
+) -> WebviewWindow<R> {
+    #[allow(unused_variables)]
+    let menu = app_menu(handle).unwrap();
+
+    // This causes the window to not be clickable (in AppImage), so disable on Linux
+    #[cfg(not(target_os = "linux"))]
+    handle.set_menu(menu).expect("Failed to set app menu");
+
+    info!("Create new window label={}", config.label);
+
+    let mut win_builder =
+        tauri::WebviewWindowBuilder::new(handle, config.label, WebviewUrl::App(config.url.into()))
+            .title(config.title)
+            .resizable(true)
+            .visible(false) // To prevent theme flashing, the frontend code calls show() immediately after configuring the theme
+            .fullscreen(false)
+            .disable_drag_drop_handler() // Required for frontend Dnd on windows
+            .min_inner_size(MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT);
+
+    if let Some(key) = config.data_dir_key {
+        #[cfg(not(target_os = "macos"))]
+        {
+            use std::fs;
+            let dir = handle.path().temp_dir().unwrap().join("yaak_sessions").join(key);
+            fs::create_dir_all(dir.clone()).unwrap();
+            win_builder = win_builder.data_directory(dir);
+        }
+
+        // macOS doesn't support data dir so must use this fn instead
+        #[cfg(target_os = "macos")]
+        {
+            win_builder = win_builder.data_store_identifier(to_fixed_hash(&key));
+        }
+    }
+
+    if let Some((w, h)) = config.inner_size {
+        win_builder = win_builder.inner_size(w, h);
+    } else {
+        win_builder = win_builder.inner_size(600.0, 600.0);
+    }
+
+    if let Some((x, y)) = config.position {
+        win_builder = win_builder.position(x, y);
+    } else {
+        win_builder = win_builder.center();
+    }
+
+    if let Some(tx) = config.navigation_tx {
+        win_builder = win_builder.on_navigation(move |url| {
+            let url = url.to_string();
+            let tx = tx.clone();
+            tauri::async_runtime::block_on(async move {
+                tx.send(url).await.unwrap();
+            });
+            true
+        });
+    }
+
+    if config.hide_titlebar {
+        #[cfg(target_os = "macos")]
+        {
+            use tauri::TitleBarStyle;
+            win_builder = win_builder.hidden_title(true).title_bar_style(TitleBarStyle::Overlay);
+        }
+        #[cfg(not(target_os = "macos"))]
+        {
+            // Doesn't seem to work from Rust, here, so we do it in main.tsx
+            win_builder = win_builder.decorations(false);
+        }
+    }
+
+    if let Some(w) = handle.webview_windows().get(config.label) {
+        info!("Webview with label {} already exists. Focusing existing", config.label);
+        w.set_focus().unwrap();
+        return w.to_owned();
+    }
+
+    let win = win_builder.build().unwrap();
+
+    if let Some(tx) = config.close_tx {
+        win.on_window_event(move |event| match event {
+            WindowEvent::CloseRequested { .. } => {
+                let tx = tx.clone();
+                tauri::async_runtime::block_on(async move {
+                    tx.send(()).await.unwrap();
+                });
+            }
+            _ => {}
+        });
+    }
+
+    let webview_window = win.clone();
+    win.on_menu_event(move |w, event| {
+        if !w.is_focused().unwrap() {
+            return;
+        }
+
+        let event_id = event.id().0.as_str();
+        match event_id {
+            "quit" => exit(0),
+            "close" => w.close().unwrap(),
+            "zoom_reset" => w.emit("zoom_reset", true).unwrap(),
+            "zoom_in" => w.emit("zoom_in", true).unwrap(),
+            "zoom_out" => w.emit("zoom_out", true).unwrap(),
+            "settings" => w.emit("settings", true).unwrap(),
+            "open_feedback" => {
+                if let Err(e) =
+                    w.app_handle().opener().open_url("https://yaak.app/feedback", None::<&str>)
+                {
+                    warn!("Failed to open feedback {e:?}")
+                }
+            }
+
+            // Commands for development
+            "dev.reset_size" => webview_window
+                .set_size(LogicalSize::new(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT))
+                .unwrap(),
+            "dev.refresh" => webview_window.eval("location.reload()").unwrap(),
+            "dev.generate_theme_css" => {
+                w.emit("generate_theme_css", true).unwrap();
+            }
+            "dev.toggle_devtools" => {
+                if webview_window.is_devtools_open() {
+                    webview_window.close_devtools();
+                } else {
+                    webview_window.open_devtools();
+                }
+            }
+            _ => {}
+        }
+    });
+
+    win
+}
+
+fn to_fixed_hash(s: &str) -> [u8; 16] {
+    let hash = md5::compute(s.as_bytes());
+    let mut fixed = [0u8; 16];
+    fixed.copy_from_slice(&hash[..16]); // Take the first 16 bytes of the hash
+    fixed
+}

src-tauri/src/window_menu.rs

@@ -3,9 +3,9 @@ use tauri::menu::{
     WINDOW_SUBMENU_ID,
 };
 pub use tauri::AppHandle;
-use tauri::Wry;
+use tauri::Runtime;
 
-pub fn app_menu(app_handle: &AppHandle) -> tauri::Result<Menu<Wry>> {
+pub fn app_menu<R: Runtime>(app_handle: &AppHandle<R>) -> tauri::Result<Menu<R>> {
     let pkg_info = app_handle.package_info();
     let config = app_handle.config();
     let about_metadata = AboutMetadata {
@@ -37,7 +37,7 @@ pub fn app_menu(app_handle: &AppHandle) -> tauri::Result<Menu<Wry>> {
         true,
         &[
             #[cfg(not(target_os = "macos"))]
-            &PredefinedMenuItem::about(app_handle, None, Some(about_metadata))?,
+            &PredefinedMenuItem::about(app_handle, None, Some(about_metadata.clone()))?,
             #[cfg(target_os = "macos")]
             &MenuItemBuilder::with_id("open_feedback".to_string(), "Give Feedback")
                 .build(app_handle)?,

src-tauri/vendored/plugins/auth-basic/build/index.js

@@ -28,7 +28,7 @@ var plugin = {
     name: "basic",
     label: "Basic Auth",
     shortLabel: "Basic",
-    config: [{
+    args: [{
       type: "text",
       name: "username",
       label: "Username",
@@ -40,8 +40,8 @@ var plugin = {
       optional: true,
       password: true
     }],
-    async onApply(_ctx, args) {
-      const { username, password } = args.config;
+    async onApply(_ctx, { values }) {
+      const { username, password } = values;
       const value = "Basic " + Buffer.from(`${username}:${password}`).toString("base64");
       return { setHeaders: [{ name: "Authorization", value }] };
     }

src-tauri/vendored/plugins/auth-bearer/build/index.js

@@ -28,15 +28,15 @@ var plugin = {
     name: "bearer",
     label: "Bearer Token",
     shortLabel: "Bearer",
-    config: [{
+    args: [{
       type: "text",
       name: "token",
       label: "Token",
       optional: true,
       password: true
     }],
-    async onApply(_ctx, args) {
-      const { token } = args.config;
+    async onApply(_ctx, { values }) {
+      const { token } = values;
       const value = `Bearer ${token}`.trim();
       return { setHeaders: [{ name: "Authorization", value }] };
     }

src-tauri/vendored/plugins/auth-jwt/build/index.js

@@ -3805,7 +3805,8 @@ var algorithms = [
   "PS512",
   "ES256",
   "ES384",
-  "ES512"
+  "ES512",
+  "none"
 ];
 var defaultAlgorithm = algorithms[0];
 var plugin = {
@@ -3813,35 +3814,39 @@ var plugin = {
     name: "jwt",
     label: "JWT Bearer",
     shortLabel: "JWT",
-    config: [
+    args: [
       {
         type: "select",
         name: "algorithm",
         label: "Algorithm",
+        hideLabel: true,
         defaultValue: defaultAlgorithm,
-        options: algorithms.map((value) => ({ name: value, value }))
+        options: algorithms.map((value) => ({ label: value === "none" ? "None" : value, value }))
       },
       {
         type: "text",
         name: "secret",
-        label: "Secret",
-        optional: true
+        label: "Secret or Private Key",
+        password: true,
+        optional: true,
+        multiLine: true
       },
       {
         type: "checkbox",
         name: "secretBase64",
-        label: "Secret Base64 Encoded"
+        label: "Secret is base64 encoded"
       },
       {
         type: "editor",
         name: "payload",
         label: "Payload",
         language: "json",
-        optional: true
+        defaultValue: '{\n  "foo": "bar"\n}',
+        placeholder: "{ }"
       }
     ],
-    async onApply(_ctx, args) {
-      const { algorithm, secret: _secret, secretBase64, payload } = args.config;
+    async onApply(_ctx, { values }) {
+      const { algorithm, secret: _secret, secretBase64, payload } = values;
       const secret = secretBase64 ? Buffer.from(`${_secret}`, "base64") : `${_secret}`;
       const token = import_jsonwebtoken.default.sign(`${payload}`, secret, { algorithm });
       const value = `Bearer ${token}`;

src-tauri/vendored/plugins/auth-oauth2/build/index.js

@@ -0,0 +1,701 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  plugin: () => plugin
+});
+module.exports = __toCommonJS(src_exports);
+
+// src/grants/authorizationCode.ts
+var import_node_crypto = require("node:crypto");
+
+// src/getAccessToken.ts
+var import_node_fs = require("node:fs");
+async function getAccessToken(ctx, {
+  accessTokenUrl,
+  scope,
+  params,
+  grantType,
+  credentialsInBody,
+  clientId,
+  clientSecret
+}) {
+  console.log("Getting access token", accessTokenUrl);
+  const httpRequest = {
+    method: "POST",
+    url: accessTokenUrl,
+    bodyType: "application/x-www-form-urlencoded",
+    body: {
+      form: [
+        { name: "grant_type", value: grantType },
+        ...params
+      ]
+    },
+    headers: [
+      { name: "User-Agent", value: "yaak" },
+      { name: "Accept", value: "application/x-www-form-urlencoded, application/json" },
+      { name: "Content-Type", value: "application/x-www-form-urlencoded" }
+    ]
+  };
+  if (scope) httpRequest.body.form.push({ name: "scope", value: scope });
+  if (credentialsInBody) {
+    httpRequest.body.form.push({ name: "client_id", value: clientId });
+    httpRequest.body.form.push({ name: "client_secret", value: clientSecret });
+  } else {
+    const value = "Basic " + Buffer.from(`${clientId}:${clientSecret}`).toString("base64");
+    httpRequest.headers.push({ name: "Authorization", value });
+  }
+  const resp = await ctx.httpRequest.send({ httpRequest });
+  if (resp.status < 200 || resp.status >= 300) {
+    throw new Error("Failed to fetch access token with status=" + resp.status);
+  }
+  const body = (0, import_node_fs.readFileSync)(resp.bodyPath ?? "", "utf8");
+  let response;
+  try {
+    response = JSON.parse(body);
+  } catch {
+    response = Object.fromEntries(new URLSearchParams(body));
+  }
+  if (response.error) {
+    throw new Error("Failed to fetch access token with " + response.error);
+  }
+  return response;
+}
+
+// src/getOrRefreshAccessToken.ts
+var import_node_fs2 = require("node:fs");
+
+// src/store.ts
+async function storeToken(ctx, contextId, response) {
+  if (!response.access_token) {
+    throw new Error(`Token not found in response`);
+  }
+  const expiresAt = response.expires_in ? Date.now() + response.expires_in * 1e3 : null;
+  const token = {
+    response,
+    expiresAt
+  };
+  await ctx.store.set(tokenStoreKey(contextId), token);
+  return token;
+}
+async function getToken(ctx, contextId) {
+  return ctx.store.get(tokenStoreKey(contextId));
+}
+async function deleteToken(ctx, contextId) {
+  return ctx.store.delete(tokenStoreKey(contextId));
+}
+async function resetDataDirKey(ctx, contextId) {
+  const key = (/* @__PURE__ */ new Date()).toISOString();
+  return ctx.store.set(dataDirStoreKey(contextId), key);
+}
+async function getDataDirKey(ctx, contextId) {
+  const key = await ctx.store.get(dataDirStoreKey(contextId)) ?? "default";
+  return `${contextId}::${key}`;
+}
+function tokenStoreKey(context_id) {
+  return ["token", context_id].join("::");
+}
+function dataDirStoreKey(context_id) {
+  return ["data_dir", context_id].join("::");
+}
+
+// src/getOrRefreshAccessToken.ts
+async function getOrRefreshAccessToken(ctx, contextId, {
+  scope,
+  accessTokenUrl,
+  credentialsInBody,
+  clientId,
+  clientSecret,
+  forceRefresh
+}) {
+  const token = await getToken(ctx, contextId);
+  if (token == null) {
+    return null;
+  }
+  const now = Date.now() / 1e3;
+  const isExpired = token.expiresAt && now > token.expiresAt;
+  if (!isExpired && !forceRefresh) {
+    return token;
+  }
+  if (!token.response.refresh_token) {
+    return null;
+  }
+  const httpRequest = {
+    method: "POST",
+    url: accessTokenUrl,
+    bodyType: "application/x-www-form-urlencoded",
+    body: {
+      form: [
+        { name: "grant_type", value: "refresh_token" },
+        { name: "refresh_token", value: token.response.refresh_token }
+      ]
+    },
+    headers: [
+      { name: "User-Agent", value: "yaak" },
+      { name: "Accept", value: "application/x-www-form-urlencoded, application/json" },
+      { name: "Content-Type", value: "application/x-www-form-urlencoded" }
+    ]
+  };
+  if (scope) httpRequest.body.form.push({ name: "scope", value: scope });
+  if (credentialsInBody) {
+    httpRequest.body.form.push({ name: "client_id", value: clientId });
+    httpRequest.body.form.push({ name: "client_secret", value: clientSecret });
+  } else {
+    const value = "Basic " + Buffer.from(`${clientId}:${clientSecret}`).toString("base64");
+    httpRequest.headers.push({ name: "Authorization", value });
+  }
+  const resp = await ctx.httpRequest.send({ httpRequest });
+  if (resp.status === 401) {
+    console.log("Unauthorized refresh_token request");
+    await deleteToken(ctx, contextId);
+    return null;
+  }
+  if (resp.status < 200 || resp.status >= 300) {
+    throw new Error("Failed to fetch access token with status=" + resp.status);
+  }
+  const body = (0, import_node_fs2.readFileSync)(resp.bodyPath ?? "", "utf8");
+  let response;
+  try {
+    response = JSON.parse(body);
+  } catch {
+    response = Object.fromEntries(new URLSearchParams(body));
+  }
+  if (response.error) {
+    throw new Error(`Failed to fetch access token with ${response.error} -> ${response.error_description}`);
+  }
+  const newResponse = {
+    ...response,
+    // Assign a new one or keep the old one,
+    refresh_token: response.refresh_token ?? token.response.refresh_token
+  };
+  return storeToken(ctx, contextId, newResponse);
+}
+
+// src/grants/authorizationCode.ts
+var PKCE_SHA256 = "S256";
+var PKCE_PLAIN = "plain";
+var DEFAULT_PKCE_METHOD = PKCE_SHA256;
+async function getAuthorizationCode(ctx, contextId, {
+  authorizationUrl: authorizationUrlRaw,
+  accessTokenUrl,
+  clientId,
+  clientSecret,
+  redirectUri,
+  scope,
+  state,
+  credentialsInBody,
+  pkce
+}) {
+  const token = await getOrRefreshAccessToken(ctx, contextId, {
+    accessTokenUrl,
+    scope,
+    clientId,
+    clientSecret,
+    credentialsInBody
+  });
+  if (token != null) {
+    return token;
+  }
+  const authorizationUrl = new URL(`${authorizationUrlRaw ?? ""}`);
+  authorizationUrl.searchParams.set("response_type", "code");
+  authorizationUrl.searchParams.set("client_id", clientId);
+  if (redirectUri) authorizationUrl.searchParams.set("redirect_uri", redirectUri);
+  if (scope) authorizationUrl.searchParams.set("scope", scope);
+  if (state) authorizationUrl.searchParams.set("state", state);
+  if (pkce) {
+    const verifier = pkce.codeVerifier || createPkceCodeVerifier();
+    const challengeMethod = pkce.challengeMethod || DEFAULT_PKCE_METHOD;
+    authorizationUrl.searchParams.set("code_challenge", createPkceCodeChallenge(verifier, challengeMethod));
+    authorizationUrl.searchParams.set("code_challenge_method", challengeMethod);
+  }
+  return new Promise(async (resolve, reject) => {
+    const authorizationUrlStr = authorizationUrl.toString();
+    console.log("Authorizing", authorizationUrlStr);
+    let foundCode = false;
+    let { close } = await ctx.window.openUrl({
+      url: authorizationUrlStr,
+      label: "oauth-authorization-url",
+      dataDirKey: await getDataDirKey(ctx, contextId),
+      async onClose() {
+        if (!foundCode) {
+          reject(new Error("Authorization window closed"));
+        }
+      },
+      async onNavigate({ url: urlStr }) {
+        const url = new URL(urlStr);
+        if (url.searchParams.has("error")) {
+          return reject(new Error(`Failed to authorize: ${url.searchParams.get("error")}`));
+        }
+        const code = url.searchParams.get("code");
+        if (!code) {
+          return;
+        }
+        foundCode = true;
+        close();
+        const response = await getAccessToken(ctx, {
+          grantType: "authorization_code",
+          accessTokenUrl,
+          clientId,
+          clientSecret,
+          scope,
+          credentialsInBody,
+          params: [
+            { name: "code", value: code },
+            ...redirectUri ? [{ name: "redirect_uri", value: redirectUri }] : []
+          ]
+        });
+        try {
+          resolve(await storeToken(ctx, contextId, response));
+        } catch (err) {
+          reject(err);
+        }
+      }
+    });
+  });
+}
+function createPkceCodeVerifier() {
+  return encodeForPkce((0, import_node_crypto.randomBytes)(32));
+}
+function createPkceCodeChallenge(verifier, method) {
+  if (method === "plain") {
+    return verifier;
+  }
+  const hash = encodeForPkce((0, import_node_crypto.createHash)("sha256").update(verifier).digest());
+  return hash.replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+function encodeForPkce(bytes) {
+  return bytes.toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+}
+
+// src/grants/clientCredentials.ts
+async function getClientCredentials(ctx, contextId, {
+  accessTokenUrl,
+  clientId,
+  clientSecret,
+  scope,
+  credentialsInBody
+}) {
+  const token = await getToken(ctx, contextId);
+  if (token) {
+  }
+  const response = await getAccessToken(ctx, {
+    grantType: "client_credentials",
+    accessTokenUrl,
+    clientId,
+    clientSecret,
+    scope,
+    credentialsInBody,
+    params: []
+  });
+  return storeToken(ctx, contextId, response);
+}
+
+// src/grants/implicit.ts
+function getImplicit(ctx, contextId, {
+  authorizationUrl: authorizationUrlRaw,
+  responseType,
+  clientId,
+  redirectUri,
+  scope,
+  state
+}) {
+  return new Promise(async (resolve, reject) => {
+    const token = await getToken(ctx, contextId);
+    if (token) {
+    }
+    const authorizationUrl = new URL(`${authorizationUrlRaw ?? ""}`);
+    authorizationUrl.searchParams.set("response_type", "code");
+    authorizationUrl.searchParams.set("client_id", clientId);
+    if (redirectUri) authorizationUrl.searchParams.set("redirect_uri", redirectUri);
+    if (scope) authorizationUrl.searchParams.set("scope", scope);
+    if (state) authorizationUrl.searchParams.set("state", state);
+    if (responseType.includes("id_token")) {
+      authorizationUrl.searchParams.set("nonce", String(Math.floor(Math.random() * 9999999999999) + 1));
+    }
+    const authorizationUrlStr = authorizationUrl.toString();
+    let { close } = await ctx.window.openUrl({
+      url: authorizationUrlStr,
+      label: "oauth-authorization-url",
+      async onNavigate({ url: urlStr }) {
+        const url = new URL(urlStr);
+        if (url.searchParams.has("error")) {
+          return reject(Error(`Failed to authorize: ${url.searchParams.get("error")}`));
+        }
+        close();
+        const hash = url.hash.slice(1);
+        const params = new URLSearchParams(hash);
+        const idToken = params.get("id_token");
+        if (idToken) {
+          params.set("access_token", idToken);
+          params.delete("id_token");
+        }
+        const response = Object.fromEntries(params);
+        try {
+          resolve(await storeToken(ctx, contextId, response));
+        } catch (err) {
+          reject(err);
+        }
+      }
+    });
+  });
+}
+
+// src/grants/password.ts
+async function getPassword(ctx, contextId, {
+  accessTokenUrl,
+  clientId,
+  clientSecret,
+  username,
+  password,
+  credentialsInBody,
+  scope
+}) {
+  const token = await getOrRefreshAccessToken(ctx, contextId, {
+    accessTokenUrl,
+    scope,
+    clientId,
+    clientSecret,
+    credentialsInBody
+  });
+  if (token != null) {
+    return token;
+  }
+  const response = await getAccessToken(ctx, {
+    accessTokenUrl,
+    clientId,
+    clientSecret,
+    scope,
+    grantType: "password",
+    credentialsInBody,
+    params: [
+      { name: "username", value: username },
+      { name: "password", value: password }
+    ]
+  });
+  return storeToken(ctx, contextId, response);
+}
+
+// src/index.ts
+var grantTypes = [
+  { label: "Authorization Code", value: "authorization_code" },
+  { label: "Implicit", value: "implicit" },
+  { label: "Resource Owner Password Credential", value: "password" },
+  { label: "Client Credentials", value: "client_credentials" }
+];
+var defaultGrantType = grantTypes[0].value;
+function hiddenIfNot(grantTypes2, ...other) {
+  return (_ctx, { values }) => {
+    const hasGrantType = grantTypes2.find((t) => t === String(values.grantType ?? defaultGrantType));
+    const hasOtherBools = other.every((t) => t(values));
+    const show = hasGrantType && hasOtherBools;
+    return { hidden: !show };
+  };
+}
+var authorizationUrls = [
+  "https://github.com/login/oauth/authorize",
+  "https://account.box.com/api/oauth2/authorize",
+  "https://accounts.google.com/o/oauth2/v2/auth",
+  "https://api.imgur.com/oauth2/authorize",
+  "https://bitly.com/oauth/authorize",
+  "https://gitlab.example.com/oauth/authorize",
+  "https://medium.com/m/oauth/authorize",
+  "https://public-api.wordpress.com/oauth2/authorize",
+  "https://slack.com/oauth/authorize",
+  "https://todoist.com/oauth/authorize",
+  "https://www.dropbox.com/oauth2/authorize",
+  "https://www.linkedin.com/oauth/v2/authorization",
+  "https://MY_SHOP.myshopify.com/admin/oauth/access_token"
+];
+var accessTokenUrls = [
+  "https://github.com/login/oauth/access_token",
+  "https://api-ssl.bitly.com/oauth/access_token",
+  "https://api.box.com/oauth2/token",
+  "https://api.dropboxapi.com/oauth2/token",
+  "https://api.imgur.com/oauth2/token",
+  "https://api.medium.com/v1/tokens",
+  "https://gitlab.example.com/oauth/token",
+  "https://public-api.wordpress.com/oauth2/token",
+  "https://slack.com/api/oauth.access",
+  "https://todoist.com/oauth/access_token",
+  "https://www.googleapis.com/oauth2/v4/token",
+  "https://www.linkedin.com/oauth/v2/accessToken",
+  "https://MY_SHOP.myshopify.com/admin/oauth/authorize"
+];
+var plugin = {
+  authentication: {
+    name: "oauth2",
+    label: "OAuth 2.0",
+    shortLabel: "OAuth 2",
+    actions: [
+      {
+        label: "Copy Current Token",
+        async onSelect(ctx, { contextId }) {
+          const token = await getToken(ctx, contextId);
+          if (token == null) {
+            await ctx.toast.show({ message: "No token to copy", color: "warning" });
+          } else {
+            await ctx.clipboard.copyText(token.response.access_token);
+            await ctx.toast.show({ message: "Token copied to clipboard", icon: "copy", color: "success" });
+          }
+        }
+      },
+      {
+        label: "Delete Token",
+        async onSelect(ctx, { contextId }) {
+          if (await deleteToken(ctx, contextId)) {
+            await ctx.toast.show({ message: "Token deleted", color: "success" });
+          } else {
+            await ctx.toast.show({ message: "No token to delete", color: "warning" });
+          }
+        }
+      },
+      {
+        label: "Clear Window Session",
+        async onSelect(ctx, { contextId }) {
+          await resetDataDirKey(ctx, contextId);
+        }
+      }
+    ],
+    args: [
+      {
+        type: "select",
+        name: "grantType",
+        label: "Grant Type",
+        hideLabel: true,
+        defaultValue: defaultGrantType,
+        options: grantTypes
+      },
+      // Always-present fields
+      {
+        type: "text",
+        name: "clientId",
+        label: "Client ID",
+        optional: true
+      },
+      {
+        type: "text",
+        name: "clientSecret",
+        label: "Client Secret",
+        optional: true,
+        password: true,
+        dynamic: hiddenIfNot(["authorization_code", "password", "client_credentials"])
+      },
+      {
+        type: "text",
+        name: "authorizationUrl",
+        optional: true,
+        label: "Authorization URL",
+        dynamic: hiddenIfNot(["authorization_code", "implicit"]),
+        placeholder: authorizationUrls[0],
+        completionOptions: authorizationUrls.map((url) => ({ label: url, value: url }))
+      },
+      {
+        type: "text",
+        name: "accessTokenUrl",
+        optional: true,
+        label: "Access Token URL",
+        placeholder: accessTokenUrls[0],
+        dynamic: hiddenIfNot(["authorization_code", "password", "client_credentials"]),
+        completionOptions: accessTokenUrls.map((url) => ({ label: url, value: url }))
+      },
+      {
+        type: "text",
+        name: "redirectUri",
+        label: "Redirect URI",
+        optional: true,
+        dynamic: hiddenIfNot(["authorization_code", "implicit"])
+      },
+      {
+        type: "text",
+        name: "state",
+        label: "State",
+        optional: true,
+        dynamic: hiddenIfNot(["authorization_code", "implicit"])
+      },
+      {
+        type: "checkbox",
+        name: "usePkce",
+        label: "Use PKCE",
+        dynamic: hiddenIfNot(["authorization_code"])
+      },
+      {
+        type: "select",
+        name: "pkceChallengeMethod",
+        label: "Code Challenge Method",
+        options: [{ label: "SHA-256", value: PKCE_SHA256 }, { label: "Plain", value: PKCE_PLAIN }],
+        defaultValue: DEFAULT_PKCE_METHOD,
+        dynamic: hiddenIfNot(["authorization_code"], ({ usePkce }) => !!usePkce)
+      },
+      {
+        type: "text",
+        name: "pkceCodeVerifier",
+        label: "Code Verifier",
+        placeholder: "Automatically generated if not provided",
+        optional: true,
+        dynamic: hiddenIfNot(["authorization_code"], ({ usePkce }) => !!usePkce)
+      },
+      {
+        type: "text",
+        name: "username",
+        label: "Username",
+        optional: true,
+        dynamic: hiddenIfNot(["password"])
+      },
+      {
+        type: "text",
+        name: "password",
+        label: "Password",
+        password: true,
+        optional: true,
+        dynamic: hiddenIfNot(["password"])
+      },
+      {
+        type: "select",
+        name: "responseType",
+        label: "Response Type",
+        defaultValue: "token",
+        options: [
+          { label: "Access Token", value: "token" },
+          { label: "ID Token", value: "id_token" },
+          { label: "ID and Access Token", value: "id_token token" }
+        ],
+        dynamic: hiddenIfNot(["implicit"])
+      },
+      {
+        type: "accordion",
+        label: "Advanced",
+        inputs: [
+          { type: "text", name: "scope", label: "Scope", optional: true },
+          { type: "text", name: "headerPrefix", label: "Header Prefix", optional: true, defaultValue: "Bearer" },
+          {
+            type: "select",
+            name: "credentials",
+            label: "Send Credentials",
+            defaultValue: "body",
+            options: [
+              { label: "In Request Body", value: "body" },
+              { label: "As Basic Authentication", value: "basic" }
+            ]
+          }
+        ]
+      },
+      {
+        type: "accordion",
+        label: "Access Token Response",
+        async dynamic(ctx, { contextId }) {
+          const token = await getToken(ctx, contextId);
+          if (token == null) {
+            return { hidden: true };
+          }
+          return {
+            label: "Access Token Response",
+            inputs: [
+              {
+                type: "editor",
+                defaultValue: JSON.stringify(token.response, null, 2),
+                hideLabel: true,
+                readOnly: true,
+                language: "json"
+              }
+            ]
+          };
+        }
+      }
+    ],
+    async onApply(ctx, { values, contextId }) {
+      const headerPrefix = stringArg(values, "headerPrefix");
+      const grantType = stringArg(values, "grantType");
+      const credentialsInBody = values.credentials === "body";
+      let token;
+      if (grantType === "authorization_code") {
+        const authorizationUrl = stringArg(values, "authorizationUrl");
+        const accessTokenUrl = stringArg(values, "accessTokenUrl");
+        token = await getAuthorizationCode(ctx, contextId, {
+          accessTokenUrl: accessTokenUrl.match(/^https?:\/\//) ? accessTokenUrl : `https://${accessTokenUrl}`,
+          authorizationUrl: authorizationUrl.match(/^https?:\/\//) ? authorizationUrl : `https://${authorizationUrl}`,
+          clientId: stringArg(values, "clientId"),
+          clientSecret: stringArg(values, "clientSecret"),
+          redirectUri: stringArgOrNull(values, "redirectUri"),
+          scope: stringArgOrNull(values, "scope"),
+          state: stringArgOrNull(values, "state"),
+          credentialsInBody,
+          pkce: values.usePkce ? {
+            challengeMethod: stringArg(values, "pkceChallengeMethod"),
+            codeVerifier: stringArgOrNull(values, "pkceCodeVerifier")
+          } : null
+        });
+      } else if (grantType === "implicit") {
+        const authorizationUrl = stringArg(values, "authorizationUrl");
+        token = await getImplicit(ctx, contextId, {
+          authorizationUrl: authorizationUrl.match(/^https?:\/\//) ? authorizationUrl : `https://${authorizationUrl}`,
+          clientId: stringArg(values, "clientId"),
+          redirectUri: stringArgOrNull(values, "redirectUri"),
+          responseType: stringArg(values, "responseType"),
+          scope: stringArgOrNull(values, "scope"),
+          state: stringArgOrNull(values, "state")
+        });
+      } else if (grantType === "client_credentials") {
+        const accessTokenUrl = stringArg(values, "accessTokenUrl");
+        token = await getClientCredentials(ctx, contextId, {
+          accessTokenUrl: accessTokenUrl.match(/^https?:\/\//) ? accessTokenUrl : `https://${accessTokenUrl}`,
+          clientId: stringArg(values, "clientId"),
+          clientSecret: stringArg(values, "clientSecret"),
+          scope: stringArgOrNull(values, "scope"),
+          credentialsInBody
+        });
+      } else if (grantType === "password") {
+        const accessTokenUrl = stringArg(values, "accessTokenUrl");
+        token = await getPassword(ctx, contextId, {
+          accessTokenUrl: accessTokenUrl.match(/^https?:\/\//) ? accessTokenUrl : `https://${accessTokenUrl}`,
+          clientId: stringArg(values, "clientId"),
+          clientSecret: stringArg(values, "clientSecret"),
+          username: stringArg(values, "username"),
+          password: stringArg(values, "password"),
+          scope: stringArgOrNull(values, "scope"),
+          credentialsInBody
+        });
+      } else {
+        throw new Error("Invalid grant type " + grantType);
+      }
+      const headerValue = `${headerPrefix} ${token.response.access_token}`.trim();
+      return {
+        setHeaders: [{
+          name: "Authorization",
+          value: headerValue
+        }]
+      };
+    }
+  }
+};
+function stringArgOrNull(values, name) {
+  const arg = values[name];
+  if (arg == null || arg == "") return null;
+  return `${arg}`;
+}
+function stringArg(values, name) {
+  const arg = stringArgOrNull(values, name);
+  if (!arg) return "";
+  return arg;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  plugin
+});

src-tauri/vendored/plugins/auth-oauth2/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@yaakapp/auth-oauth2",
+  "private": true,
+  "version": "0.0.1",
+  "scripts": {
+    "build": "yaakcli build ./src/index.ts",
+    "dev": "yaakcli dev ./src/index.js"
+  }
+}

src-tauri/vendored/plugins/exporter-curl/build/index.js

@@ -20,25 +20,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  plugin: () => plugin,
-  pluginHookExport: () => pluginHookExport
+  convertToCurl: () => convertToCurl,
+  plugin: () => plugin
 });
 module.exports = __toCommonJS(src_exports);
 var NEWLINE = "\\\n ";
 var plugin = {
   httpRequestActions: [{
-    key: "export-curl",
     label: "Copy as Curl",
     icon: "copy",
     async onSelect(ctx, args) {
       const rendered_request = await ctx.httpRequest.render({ httpRequest: args.httpRequest, purpose: "preview" });
-      const data = await pluginHookExport(ctx, rendered_request);
-      ctx.clipboard.copyText(data);
-      ctx.toast.show({ message: "Curl copied to clipboard", icon: "copy" });
+      const data = await convertToCurl(rendered_request);
+      await ctx.clipboard.copyText(data);
+      await ctx.toast.show({ message: "Curl copied to clipboard", icon: "copy", color: "success" });
     }
   }]
 };
-async function pluginHookExport(_ctx, request) {
+async function convertToCurl(request) {
   const xs = ["curl"];
   if (request.method) xs.push("-X", request.method);
   if (request.url) xs.push(quote(request.url));
@@ -104,6 +103,6 @@ function maybeParseJSON(v, fallback) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  plugin,
-  pluginHookExport
+  convertToCurl,
+  plugin
 });

src-tauri/vendored/plugins/filter-jsonpath/build/index.js

@@ -30,7 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  pluginHookResponseFilter: () => pluginHookResponseFilter
+  plugin: () => plugin
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -499,12 +499,18 @@ JSONPath.prototype.safeVm = import_vm.default;
 var SafeScript = import_vm.default.Script;
 
 // src/index.ts
-function pluginHookResponseFilter(_ctx, args) {
-  const parsed = JSON.parse(args.body);
-  const filtered = JSONPath({ path: args.filter, json: parsed });
-  return JSON.stringify(filtered, null, 2);
-}
+var plugin = {
+  filter: {
+    name: "JSONPath",
+    description: "Filter JSONPath",
+    onFilter(_ctx, args) {
+      const parsed = JSON.parse(args.payload);
+      const filtered = JSONPath({ path: args.filter, json: parsed });
+      return { filtered: JSON.stringify(filtered, null, 2) };
+    }
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginHookResponseFilter
+  plugin
 });

src-tauri/vendored/plugins/filter-xpath/build/index.js

@@ -8346,21 +8346,27 @@ var require_xpath = __commonJS({
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  pluginHookResponseFilter: () => pluginHookResponseFilter
+  plugin: () => plugin
 });
 module.exports = __toCommonJS(src_exports);
 var import_xmldom = __toESM(require_lib());
 var import_xpath = __toESM(require_xpath());
-function pluginHookResponseFilter(_ctx, { filter, body }) {
-  const doc = new import_xmldom.DOMParser().parseFromString(body, "text/xml");
-  const result = import_xpath.default.select(filter, doc, false);
-  if (Array.isArray(result)) {
-    return result.map((r) => String(r)).join("\n");
-  } else {
-    return String(result);
+var plugin = {
+  filter: {
+    name: "XPath",
+    description: "Filter XPath",
+    onFilter(_ctx, args) {
+      const doc = new import_xmldom.DOMParser().parseFromString(args.payload, "text/xml");
+      const result = import_xpath.default.select(args.filter, doc, false);
+      if (Array.isArray(result)) {
+        return { filtered: result.map((r) => String(r)).join("\n") };
+      } else {
+        return { filtered: String(result) };
+      }
+    }
   }
-}
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginHookResponseFilter
+  plugin
 });

src-tauri/vendored/plugins/importer-curl/build/index.js

@@ -260,7 +260,8 @@ var require_shell_quote = __commonJS({
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  pluginHookImport: () => pluginHookImport
+  convertCurl: () => convertCurl,
+  plugin: () => plugin
 });
 module.exports = __toCommonJS(src_exports);
 var import_shell_quote = __toESM(require_shell_quote());
@@ -290,7 +291,16 @@ var SUPPORTED_FLAGS = [
   DATA_FLAGS
 ].flatMap((v) => v);
 var BOOLEAN_FLAGS = ["G", "get", "digest"];
-function pluginHookImport(_ctx, rawData) {
+var plugin = {
+  importer: {
+    name: "cURL",
+    description: "Import cURL commands",
+    onImport(_ctx, args) {
+      return convertCurl(args.text);
+    }
+  }
+};
+function convertCurl(rawData) {
   if (!rawData.match(/^\s*curl /)) {
     return null;
   }
@@ -570,5 +580,6 @@ function generateId(model) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginHookImport
+  convertCurl,
+  plugin
 });

src-tauri/vendored/plugins/importer-insomnia/build/index.js

@@ -7208,11 +7208,21 @@ var require_dist = __commonJS({
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  pluginHookImport: () => pluginHookImport
+  convertInsomnia: () => convertInsomnia,
+  plugin: () => plugin
 });
 module.exports = __toCommonJS(src_exports);
 var import_yaml = __toESM(require_dist());
-function pluginHookImport(ctx, contents) {
+var plugin = {
+  importer: {
+    name: "Insomnia",
+    description: "Import Insomnia workspaces",
+    onImport(_ctx, args) {
+      return convertInsomnia(args.text);
+    }
+  }
+};
+function convertInsomnia(contents) {
   let parsed;
   try {
     parsed = JSON.parse(contents);
@@ -7439,5 +7449,6 @@ function deleteUndefinedAttrs(obj) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginHookImport
+  convertInsomnia,
+  plugin
 });

src-tauri/vendored/plugins/importer-openapi/build/index.js

@@ -113483,30 +113483,30 @@ var require_json_schema_faker = __commonJS({
               });
             };
             exports5.filter = function(plugins, method, file) {
-              return plugins.filter(function(plugin) {
-                return !!getResult(plugin, method, file);
+              return plugins.filter(function(plugin2) {
+                return !!getResult(plugin2, method, file);
               });
             };
             exports5.sort = function(plugins) {
-              plugins.forEach(function(plugin) {
-                plugin.order = plugin.order || Number.MAX_SAFE_INTEGER;
+              plugins.forEach(function(plugin2) {
+                plugin2.order = plugin2.order || Number.MAX_SAFE_INTEGER;
               });
               return plugins.sort(function(a, b) {
                 return a.order - b.order;
               });
             };
             exports5.run = function(plugins, method, file) {
-              var plugin, lastError, index = 0;
+              var plugin2, lastError, index = 0;
               return new Promise(function(resolve2, reject) {
                 runNextPlugin();
                 function runNextPlugin() {
-                  plugin = plugins[index++];
-                  if (!plugin) {
+                  plugin2 = plugins[index++];
+                  if (!plugin2) {
                     return reject(lastError);
                   }
                   try {
-                    debug("  %s", plugin.name);
-                    var result = getResult(plugin, method, file, callback);
+                    debug("  %s", plugin2.name);
+                    var result = getResult(plugin2, method, file, callback);
                     if (result && typeof result.then === "function") {
                       result.then(onSuccess, onError);
                     } else if (result !== void 0) {
@@ -113526,7 +113526,7 @@ var require_json_schema_faker = __commonJS({
                 function onSuccess(result) {
                   debug("    success");
                   resolve2({
-                    plugin,
+                    plugin: plugin2,
                     result
                   });
                 }
@@ -145850,7 +145850,8 @@ var require_openapi_to_postmanv2 = __commonJS({
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  pluginHookImport: () => pluginHookImport2
+  convertOpenApi: () => convertOpenApi,
+  plugin: () => plugin
 });
 module.exports = __toCommonJS(src_exports);
 var import_openapi_to_postmanv2 = __toESM(require_openapi_to_postmanv2());
@@ -145859,7 +145860,7 @@ var import_openapi_to_postmanv2 = __toESM(require_openapi_to_postmanv2());
 var POSTMAN_2_1_0_SCHEMA = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json";
 var POSTMAN_2_0_0_SCHEMA = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json";
 var VALID_SCHEMAS = [POSTMAN_2_0_0_SCHEMA, POSTMAN_2_1_0_SCHEMA];
-function pluginHookImport(_ctx, contents) {
+function convertPostman(contents) {
   const root = parseJSONToRecord(contents);
   if (root == null) return;
   const info = toRecord(root.info);
@@ -146150,7 +146151,16 @@ function generateId(model) {
 }
 
 // src/index.ts
-async function pluginHookImport2(ctx, contents) {
+var plugin = {
+  importer: {
+    name: "OpenAPI",
+    description: "Import OpenAPI collections",
+    onImport(_ctx, args) {
+      return convertOpenApi(args.text);
+    }
+  }
+};
+async function convertOpenApi(contents) {
   let postmanCollection;
   try {
     postmanCollection = await new Promise((resolve, reject) => {
@@ -146164,11 +146174,12 @@ async function pluginHookImport2(ctx, contents) {
   } catch (err) {
     return void 0;
   }
-  return pluginHookImport(ctx, JSON.stringify(postmanCollection));
+  return convertPostman(JSON.stringify(postmanCollection));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginHookImport
+  convertOpenApi,
+  plugin
 });
 /*! Bundled license information:
 

src-tauri/vendored/plugins/importer-postman/build/index.js

@@ -20,13 +20,23 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  pluginHookImport: () => pluginHookImport
+  convertPostman: () => convertPostman,
+  plugin: () => plugin
 });
 module.exports = __toCommonJS(src_exports);
 var POSTMAN_2_1_0_SCHEMA = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json";
 var POSTMAN_2_0_0_SCHEMA = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json";
 var VALID_SCHEMAS = [POSTMAN_2_0_0_SCHEMA, POSTMAN_2_1_0_SCHEMA];
-function pluginHookImport(_ctx, contents) {
+var plugin = {
+  importer: {
+    name: "Postman",
+    description: "Import postman collections",
+    onImport(_ctx, args) {
+      return convertPostman(args.text);
+    }
+  }
+};
+function convertPostman(contents) {
   const root = parseJSONToRecord(contents);
   if (root == null) return;
   const info = toRecord(root.info);
@@ -317,5 +327,6 @@ function generateId(model) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginHookImport
+  convertPostman,
+  plugin
 });

src-tauri/vendored/plugins/importer-yaak/build/index.js

@@ -20,10 +20,20 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  pluginHookImport: () => pluginHookImport
+  migrateImport: () => migrateImport,
+  plugin: () => plugin
 });
 module.exports = __toCommonJS(src_exports);
-function pluginHookImport(_ctx, contents) {
+var plugin = {
+  importer: {
+    name: "Yaak",
+    description: "Yaak official format",
+    onImport(_ctx, args) {
+      return migrateImport(args.text);
+    }
+  }
+};
+function migrateImport(contents) {
   let parsed;
   try {
     parsed = JSON.parse(contents);
@@ -66,5 +76,6 @@ function isJSObject(obj) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginHookImport
+  migrateImport,
+  plugin
 });

src-tauri/vendored/plugins/template-function-response/build/index.js

@@ -8824,8 +8824,8 @@ var behaviorArg = {
   label: "Sending Behavior",
   defaultValue: "smart",
   options: [
-    { name: "When no responses", value: "smart" },
-    { name: "Always", value: "always" }
+    { label: "When no responses", value: "smart" },
+    { label: "Always", value: "always" }
   ]
 };
 var requestArg = {

src-tauri/yaak-git/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "yaak-git"
+links = "yaak-git"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+chrono = { version = "0.4.38", features = ["serde"] }
+git2 = { version = "0.20.0" , features = ["vendored-libgit2", "vendored-openssl"]}
+log = "0.4.22"
+serde = { version = "1.0.215", features = ["derive"] }
+serde_json = "1.0.132"
+serde_yaml = "0.9.34"
+tauri = { workspace = true }
+thiserror = { workspace = true }
+ts-rs = { workspace = true, features = ["chrono-impl", "serde-json-impl"] }
+yaak-models = { workspace = true }
+yaak-sync = { workspace = true }
+
+[build-dependencies]
+tauri-plugin = { version = "2.0.3", features = ["build"] }

src-tauri/yaak-git/bindings/gen_git.ts

@@ -0,0 +1,18 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { SyncModel } from "./gen_models.js";
+
+export type GitAuthor = { name: string | null, email: string | null, };
+
+export type GitCommit = { author: GitAuthor, when: string, message: string | null, };
+
+export type GitStatus = "untracked" | "conflict" | "current" | "modified" | "removed" | "renamed" | "type_change";
+
+export type GitStatusEntry = { relaPath: string, status: GitStatus, staged: boolean, prev: SyncModel | null, next: SyncModel | null, };
+
+export type GitStatusSummary = { path: string, headRef: string | null, headRefShorthand: string | null, entries: Array<GitStatusEntry>, origins: Array<string>, localBranches: Array<string>, remoteBranches: Array<string>, };
+
+export type PullResult = { receivedBytes: number, receivedObjects: number, };
+
+export type PushResult = "success" | "nothing_to_push";
+
+export type PushType = "branch" | "tag";

src-tauri/yaak-git/bindings/gen_models.ts

@@ -0,0 +1,23 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Environment = { model: "environment", id: string, workspaceId: string, environmentId: string | null, createdAt: string, updatedAt: string, name: string, variables: Array<EnvironmentVariable>, };
+
+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, name: string, description: string, sortPriority: number, };
+
+export type GrpcMetadataEntry = { enabled?: boolean, name: string, value: string, id?: string, };
+
+export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<GrpcMetadataEntry>, 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 HttpUrlParameter = { enabled?: boolean, name: string, value: string, id?: string, };
+
+export type SyncModel = { "type": "workspace" } & Workspace | { "type": "environment" } & Environment | { "type": "folder" } & Folder | { "type": "http_request" } & HttpRequest | { "type": "grpc_request" } & GrpcRequest | { "type": "websocket_request" } & WebsocketRequest;
+
+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, name: string, description: string, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };

src-tauri/yaak-git/build.rs

@@ -0,0 +1,19 @@
+const COMMANDS: &[&str] = &[
+    "add",
+    "branch",
+    "checkout",
+    "commit",
+    "delete_branch",
+    "fetch_all",
+    "initialize",
+    "log",
+    "merge_branch",
+    "pull",
+    "push",
+    "status",
+    "unstage",
+];
+
+fn main() {
+    tauri_plugin::Builder::new(COMMANDS).build();
+}

src-tauri/yaak-git/index.ts

@@ -0,0 +1,88 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { invoke } from '@tauri-apps/api/core';
+import { GitCommit, GitStatusSummary, PullResult, PushResult } from './bindings/gen_git';
+
+export * from './bindings/gen_git';
+
+export function useGit(dir: string) {
+  const queryClient = useQueryClient();
+  const onSuccess = () => queryClient.invalidateQueries({ queryKey: ['git'] });
+
+  return [
+    {
+      log: useQuery<void, string, GitCommit[]>({
+        queryKey: ['git', 'log', dir],
+        queryFn: () => invoke('plugin:yaak-git|log', { dir }),
+      }),
+      status: useQuery<void, string, GitStatusSummary>({
+        refetchOnMount: true,
+        queryKey: ['git', 'status', dir],
+        queryFn: () => invoke('plugin:yaak-git|status', { dir }),
+      }),
+    },
+    {
+      add: useMutation<void, string, { relaPaths: string[] }>({
+        mutationKey: ['git', 'add', dir],
+        mutationFn: (args) => invoke('plugin:yaak-git|add', { dir, ...args }),
+        onSuccess,
+      }),
+      branch: useMutation<void, string, { branch: string }>({
+        mutationKey: ['git', 'branch', dir],
+        mutationFn: (args) => invoke('plugin:yaak-git|branch', { dir, ...args }),
+        onSuccess,
+      }),
+      mergeBranch: useMutation<void, string, { branch: string; force: boolean }>({
+        mutationKey: ['git', 'merge', dir],
+        mutationFn: (args) => invoke('plugin:yaak-git|merge_branch', { dir, ...args }),
+        onSuccess,
+      }),
+      deleteBranch: useMutation<void, string, { branch: string }>({
+        mutationKey: ['git', 'delete-branch', dir],
+        mutationFn: (args) => invoke('plugin:yaak-git|delete_branch', { dir, ...args }),
+        onSuccess,
+      }),
+      checkout: useMutation<string, string, { branch: string; force: boolean }>({
+        mutationKey: ['git', 'checkout', dir],
+        mutationFn: (args) => invoke('plugin:yaak-git|checkout', { dir, ...args }),
+        onSuccess,
+      }),
+      commit: useMutation<void, string, { message: string }>({
+        mutationKey: ['git', 'commit', dir],
+        mutationFn: (args) => invoke('plugin:yaak-git|commit', { dir, ...args }),
+        onSuccess,
+      }),
+      commitAndPush: useMutation<PushResult, string, { message: string }>({
+        mutationKey: ['git', 'commitpush', dir],
+        mutationFn: async (args) => {
+          await invoke('plugin:yaak-git|commit', { dir, ...args });
+          return invoke('plugin:yaak-git|push', { dir });
+        },
+        onSuccess,
+      }),
+      fetchAll: useMutation<string, string, void>({
+        mutationKey: ['git', 'checkout', dir],
+        mutationFn: () => invoke('plugin:yaak-git|fetch_all', { dir }),
+        onSuccess,
+      }),
+      push: useMutation<PushResult, string, void>({
+        mutationKey: ['git', 'push', dir],
+        mutationFn: () => invoke('plugin:yaak-git|push', { dir }),
+        onSuccess,
+      }),
+      pull: useMutation<PullResult, string, void>({
+        mutationKey: ['git', 'pull', dir],
+        mutationFn: () => invoke('plugin:yaak-git|pull', { dir }),
+        onSuccess,
+      }),
+      unstage: useMutation<void, string, { relaPaths: string[] }>({
+        mutationKey: ['git', 'unstage', dir],
+        mutationFn: (args) => invoke('plugin:yaak-git|unstage', { dir, ...args }),
+        onSuccess,
+      }),
+    },
+  ] as const;
+}
+
+export async function gitInit(dir: string) {
+  await invoke('plugin:yaak-git|initialize', { dir });
+}

src-tauri/yaak-git/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@yaakapp-internal/git",
+  "private": true,
+  "version": "1.0.0",
+  "main": "index.ts"
+}

src-tauri/yaak-git/permissions/autogenerated/commands/add.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-add"
+description = "Enables the add command without any pre-configured scope."
+commands.allow = ["add"]
+
+[[permission]]
+identifier = "deny-add"
+description = "Denies the add command without any pre-configured scope."
+commands.deny = ["add"]

src-tauri/yaak-git/permissions/autogenerated/commands/branch.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-branch"
+description = "Enables the branch command without any pre-configured scope."
+commands.allow = ["branch"]
+
+[[permission]]
+identifier = "deny-branch"
+description = "Denies the branch command without any pre-configured scope."
+commands.deny = ["branch"]

src-tauri/yaak-git/permissions/autogenerated/commands/checkout.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-checkout"
+description = "Enables the checkout command without any pre-configured scope."
+commands.allow = ["checkout"]
+
+[[permission]]
+identifier = "deny-checkout"
+description = "Denies the checkout command without any pre-configured scope."
+commands.deny = ["checkout"]

src-tauri/yaak-git/permissions/autogenerated/commands/checkout_remote.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-checkout-remote"
+description = "Enables the checkout_remote command without any pre-configured scope."
+commands.allow = ["checkout_remote"]
+
+[[permission]]
+identifier = "deny-checkout-remote"
+description = "Denies the checkout_remote command without any pre-configured scope."
+commands.deny = ["checkout_remote"]

src-tauri/yaak-git/permissions/autogenerated/commands/commit.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-commit"
+description = "Enables the commit command without any pre-configured scope."
+commands.allow = ["commit"]
+
+[[permission]]
+identifier = "deny-commit"
+description = "Denies the commit command without any pre-configured scope."
+commands.deny = ["commit"]

src-tauri/yaak-git/permissions/autogenerated/commands/delete_branch.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-delete-branch"
+description = "Enables the delete_branch command without any pre-configured scope."
+commands.allow = ["delete_branch"]
+
+[[permission]]
+identifier = "deny-delete-branch"
+description = "Denies the delete_branch command without any pre-configured scope."
+commands.deny = ["delete_branch"]

src-tauri/yaak-git/permissions/autogenerated/commands/fetch_all.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-fetch-all"
+description = "Enables the fetch_all command without any pre-configured scope."
+commands.allow = ["fetch_all"]
+
+[[permission]]
+identifier = "deny-fetch-all"
+description = "Denies the fetch_all command without any pre-configured scope."
+commands.deny = ["fetch_all"]

src-tauri/yaak-git/permissions/autogenerated/commands/initialize.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-initialize"
+description = "Enables the initialize command without any pre-configured scope."
+commands.allow = ["initialize"]
+
+[[permission]]
+identifier = "deny-initialize"
+description = "Denies the initialize command without any pre-configured scope."
+commands.deny = ["initialize"]

src-tauri/yaak-git/permissions/autogenerated/commands/log.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-log"
+description = "Enables the log command without any pre-configured scope."
+commands.allow = ["log"]
+
+[[permission]]
+identifier = "deny-log"
+description = "Denies the log command without any pre-configured scope."
+commands.deny = ["log"]

src-tauri/yaak-git/permissions/autogenerated/commands/merge_branch.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-merge-branch"
+description = "Enables the merge_branch command without any pre-configured scope."
+commands.allow = ["merge_branch"]
+
+[[permission]]
+identifier = "deny-merge-branch"
+description = "Denies the merge_branch command without any pre-configured scope."
+commands.deny = ["merge_branch"]

src-tauri/yaak-git/permissions/autogenerated/commands/pull.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-pull"
+description = "Enables the pull command without any pre-configured scope."
+commands.allow = ["pull"]
+
+[[permission]]
+identifier = "deny-pull"
+description = "Denies the pull command without any pre-configured scope."
+commands.deny = ["pull"]

src-tauri/yaak-git/permissions/autogenerated/commands/push.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-push"
+description = "Enables the push command without any pre-configured scope."
+commands.allow = ["push"]
+
+[[permission]]
+identifier = "deny-push"
+description = "Denies the push command without any pre-configured scope."
+commands.deny = ["push"]

src-tauri/yaak-git/permissions/autogenerated/commands/status.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-status"
+description = "Enables the status command without any pre-configured scope."
+commands.allow = ["status"]
+
+[[permission]]
+identifier = "deny-status"
+description = "Denies the status command without any pre-configured scope."
+commands.deny = ["status"]

src-tauri/yaak-git/permissions/autogenerated/commands/unstage.toml

@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-unstage"
+description = "Enables the unstage command without any pre-configured scope."
+commands.allow = ["unstage"]
+
+[[permission]]
+identifier = "deny-unstage"
+description = "Denies the unstage command without any pre-configured scope."
+commands.deny = ["unstage"]

src-tauri/yaak-git/permissions/autogenerated/reference.md

@@ -0,0 +1,391 @@
+## Default Permission
+
+Default permissions for the plugin
+
+- `allow-add`
+- `allow-branch`
+- `allow-checkout`
+- `allow-commit`
+- `allow-delete-branch`
+- `allow-fetch-all`
+- `allow-initialize`
+- `allow-log`
+- `allow-merge-branch`
+- `allow-pull`
+- `allow-push`
+- `allow-status`
+- `allow-unstage`
+
+## Permission Table
+
+<table>
+<tr>
+<th>Identifier</th>
+<th>Description</th>
+</tr>
+
+
+<tr>
+<td>
+
+`yaak-git:allow-add`
+
+</td>
+<td>
+
+Enables the add command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-add`
+
+</td>
+<td>
+
+Denies the add command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-branch`
+
+</td>
+<td>
+
+Enables the branch command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-branch`
+
+</td>
+<td>
+
+Denies the branch command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-checkout`
+
+</td>
+<td>
+
+Enables the checkout command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-checkout`
+
+</td>
+<td>
+
+Denies the checkout command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-checkout-remote`
+
+</td>
+<td>
+
+Enables the checkout_remote command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-checkout-remote`
+
+</td>
+<td>
+
+Denies the checkout_remote command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-commit`
+
+</td>
+<td>
+
+Enables the commit command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-commit`
+
+</td>
+<td>
+
+Denies the commit command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-delete-branch`
+
+</td>
+<td>
+
+Enables the delete_branch command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-delete-branch`
+
+</td>
+<td>
+
+Denies the delete_branch command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-fetch-all`
+
+</td>
+<td>
+
+Enables the fetch_all command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-fetch-all`
+
+</td>
+<td>
+
+Denies the fetch_all command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-initialize`
+
+</td>
+<td>
+
+Enables the initialize command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-initialize`
+
+</td>
+<td>
+
+Denies the initialize command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-log`
+
+</td>
+<td>
+
+Enables the log command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-log`
+
+</td>
+<td>
+
+Denies the log command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-merge-branch`
+
+</td>
+<td>
+
+Enables the merge_branch command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-merge-branch`
+
+</td>
+<td>
+
+Denies the merge_branch command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-pull`
+
+</td>
+<td>
+
+Enables the pull command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-pull`
+
+</td>
+<td>
+
+Denies the pull command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-push`
+
+</td>
+<td>
+
+Enables the push command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-push`
+
+</td>
+<td>
+
+Denies the push command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-status`
+
+</td>
+<td>
+
+Enables the status command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-status`
+
+</td>
+<td>
+
+Denies the status command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:allow-unstage`
+
+</td>
+<td>
+
+Enables the unstage command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`yaak-git:deny-unstage`
+
+</td>
+<td>
+
+Denies the unstage command without any pre-configured scope.
+
+</td>
+</tr>
+</table>

src-tauri/yaak-git/permissions/default.toml

@@ -0,0 +1,17 @@
+[default]
+description = "Default permissions for the plugin"
+permissions = [
+    "allow-add",
+    "allow-branch",
+    "allow-checkout",
+    "allow-commit",
+    "allow-delete-branch",
+    "allow-fetch-all",
+    "allow-initialize",
+    "allow-log",
+    "allow-merge-branch",
+    "allow-pull",
+    "allow-push",
+    "allow-status",
+    "allow-unstage",
+]

src-tauri/yaak-git/permissions/schemas/schema.json

@@ -0,0 +1,445 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "PermissionFile",
+  "description": "Permission file that can define a default permission, a set of permissions or a list of inlined permissions.",
+  "type": "object",
+  "properties": {
+    "default": {
+      "description": "The default permission set for the plugin",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/DefaultPermission"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "set": {
+      "description": "A list of permissions sets defined",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/PermissionSet"
+      }
+    },
+    "permission": {
+      "description": "A list of inlined permissions",
+      "default": [],
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Permission"
+      }
+    }
+  },
+  "definitions": {
+    "DefaultPermission": {
+      "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
+      "type": "object",
+      "required": [
+        "permissions"
+      ],
+      "properties": {
+        "version": {
+          "description": "The version of the permission.",
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 1.0
+        },
+        "description": {
+          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "permissions": {
+          "description": "All permissions this set contains.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "PermissionSet": {
+      "description": "A set of direct permissions grouped together under a new name.",
+      "type": "object",
+      "required": [
+        "description",
+        "identifier",
+        "permissions"
+      ],
+      "properties": {
+        "identifier": {
+          "description": "A unique identifier for the permission.",
+          "type": "string"
+        },
+        "description": {
+          "description": "Human-readable description of what the permission does.",
+          "type": "string"
+        },
+        "permissions": {
+          "description": "All permissions this set contains.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PermissionKind"
+          }
+        }
+      }
+    },
+    "Permission": {
+      "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
+      "type": "object",
+      "required": [
+        "identifier"
+      ],
+      "properties": {
+        "version": {
+          "description": "The version of the permission.",
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 1.0
+        },
+        "identifier": {
+          "description": "A unique identifier for the permission.",
+          "type": "string"
+        },
+        "description": {
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "commands": {
+          "description": "Allowed or denied commands when using this permission.",
+          "default": {
+            "allow": [],
+            "deny": []
+          },
+          "allOf": [
+            {
+              "$ref": "#/definitions/Commands"
+            }
+          ]
+        },
+        "scope": {
+          "description": "Allowed or denied scoped when using this permission.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Scopes"
+            }
+          ]
+        },
+        "platforms": {
+          "description": "Target platforms this permission applies. By default all platforms are affected by this permission.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "$ref": "#/definitions/Target"
+          }
+        }
+      }
+    },
+    "Commands": {
+      "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
+      "type": "object",
+      "properties": {
+        "allow": {
+          "description": "Allowed command.",
+          "default": [],
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "deny": {
+          "description": "Denied command, which takes priority.",
+          "default": [],
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "Scopes": {
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "type": "object",
+      "properties": {
+        "allow": {
+          "description": "Data that defines what is allowed by the scope.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "$ref": "#/definitions/Value"
+          }
+        },
+        "deny": {
+          "description": "Data that defines what is denied by the scope. This should be prioritized by validation logic.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "$ref": "#/definitions/Value"
+          }
+        }
+      }
+    },
+    "Value": {
+      "description": "All supported ACL values.",
+      "anyOf": [
+        {
+          "description": "Represents a null JSON value.",
+          "type": "null"
+        },
+        {
+          "description": "Represents a [`bool`].",
+          "type": "boolean"
+        },
+        {
+          "description": "Represents a valid ACL [`Number`].",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Number"
+            }
+          ]
+        },
+        {
+          "description": "Represents a [`String`].",
+          "type": "string"
+        },
+        {
+          "description": "Represents a list of other [`Value`]s.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Value"
+          }
+        },
+        {
+          "description": "Represents a map of [`String`] keys to [`Value`]s.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/Value"
+          }
+        }
+      ]
+    },
+    "Number": {
+      "description": "A valid ACL number.",
+      "anyOf": [
+        {
+          "description": "Represents an [`i64`].",
+          "type": "integer",
+          "format": "int64"
+        },
+        {
+          "description": "Represents a [`f64`].",
+          "type": "number",
+          "format": "double"
+        }
+      ]
+    },
+    "Target": {
+      "description": "Platform target.",
+      "oneOf": [
+        {
+          "description": "MacOS.",
+          "type": "string",
+          "enum": [
+            "macOS"
+          ]
+        },
+        {
+          "description": "Windows.",
+          "type": "string",
+          "enum": [
+            "windows"
+          ]
+        },
+        {
+          "description": "Linux.",
+          "type": "string",
+          "enum": [
+            "linux"
+          ]
+        },
+        {
+          "description": "Android.",
+          "type": "string",
+          "enum": [
+            "android"
+          ]
+        },
+        {
+          "description": "iOS.",
+          "type": "string",
+          "enum": [
+            "iOS"
+          ]
+        }
+      ]
+    },
+    "PermissionKind": {
+      "type": "string",
+      "oneOf": [
+        {
+          "description": "Enables the add command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-add"
+        },
+        {
+          "description": "Denies the add command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-add"
+        },
+        {
+          "description": "Enables the branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-branch"
+        },
+        {
+          "description": "Denies the branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-branch"
+        },
+        {
+          "description": "Enables the checkout command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-checkout"
+        },
+        {
+          "description": "Denies the checkout command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-checkout"
+        },
+        {
+          "description": "Enables the checkout_remote command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-checkout-remote"
+        },
+        {
+          "description": "Denies the checkout_remote command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-checkout-remote"
+        },
+        {
+          "description": "Enables the commit command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-commit"
+        },
+        {
+          "description": "Denies the commit command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-commit"
+        },
+        {
+          "description": "Enables the delete_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-delete-branch"
+        },
+        {
+          "description": "Denies the delete_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-delete-branch"
+        },
+        {
+          "description": "Enables the fetch_all command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-fetch-all"
+        },
+        {
+          "description": "Denies the fetch_all command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-fetch-all"
+        },
+        {
+          "description": "Enables the initialize command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-initialize"
+        },
+        {
+          "description": "Denies the initialize command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-initialize"
+        },
+        {
+          "description": "Enables the log command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-log"
+        },
+        {
+          "description": "Denies the log command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-log"
+        },
+        {
+          "description": "Enables the merge_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-merge-branch"
+        },
+        {
+          "description": "Denies the merge_branch command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-merge-branch"
+        },
+        {
+          "description": "Enables the pull command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-pull"
+        },
+        {
+          "description": "Denies the pull command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-pull"
+        },
+        {
+          "description": "Enables the push command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-push"
+        },
+        {
+          "description": "Denies the push command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-push"
+        },
+        {
+          "description": "Enables the status command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-status"
+        },
+        {
+          "description": "Denies the status command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-status"
+        },
+        {
+          "description": "Enables the unstage command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-unstage"
+        },
+        {
+          "description": "Denies the unstage command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-unstage"
+        },
+        {
+          "description": "Default permissions for the plugin",
+          "type": "string",
+          "const": "default"
+        }
+      ]
+    }
+  }
+}

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

@@ -0,0 +1,109 @@
+use crate::error::Error::GenericError;
+use crate::error::Result;
+use crate::merge::do_merge;
+use crate::repository::open_repo;
+use crate::util::{
+    bytes_to_string, get_branch_by_name, get_current_branch, get_default_remote_for_push_in_repo,
+};
+use git2::build::CheckoutBuilder;
+use git2::{BranchType, Repository};
+use log::info;
+use std::path::Path;
+
+pub(crate) fn branch_set_upstream_after_push(repo: &Repository, branch_name: &str) -> Result<()> {
+    let mut branch = repo.find_branch(branch_name, BranchType::Local)?;
+
+    if branch.upstream().is_err() {
+        let remote = get_default_remote_for_push_in_repo(repo)?;
+        let upstream_name = format!("{remote}/{branch_name}");
+        branch.set_upstream(Some(upstream_name.as_str()))?;
+    }
+
+    Ok(())
+}
+
+pub(crate) fn git_checkout_branch(dir: &Path, branch_name: &str, force: bool) -> Result<String> {
+    if branch_name.starts_with("origin/") {
+        return git_checkout_remote_branch(dir, branch_name, force);
+    }
+
+    let repo = open_repo(dir)?;
+    let branch = get_branch_by_name(&repo, branch_name)?;
+    let branch_ref = branch.into_reference();
+    let branch_tree = branch_ref.peel_to_tree()?;
+
+    let mut options = CheckoutBuilder::default();
+    if force {
+        options.force();
+    }
+
+    repo.checkout_tree(branch_tree.as_object(), Some(&mut options))?;
+    repo.set_head(branch_ref.name().unwrap())?;
+
+    Ok(branch_name.to_string())
+}
+
+pub(crate) fn git_checkout_remote_branch(dir: &Path, branch_name: &str, force: bool) -> Result<String> {
+    let branch_name = branch_name.trim_start_matches("origin/");
+    let repo = open_repo(dir)?;
+
+    let refname = format!("refs/remotes/origin/{}", branch_name);
+    let remote_ref = repo.find_reference(&refname)?;
+    let commit = remote_ref.peel_to_commit()?;
+
+    let mut new_branch = repo.branch(branch_name, &commit, false)?;
+    let upstream_name = format!("origin/{}", branch_name);
+    new_branch.set_upstream(Some(&upstream_name))?;
+
+    return git_checkout_branch(dir, branch_name, force)
+}
+
+pub(crate) fn git_create_branch(dir: &Path, name: &str) -> Result<()> {
+    let repo = open_repo(dir)?;
+    let head = match repo.head() {
+        Ok(h) => h,
+        Err(e) if e.code() == git2::ErrorCode::UnbornBranch => {
+            let msg = "Cannot create branch when there are no commits";
+            return Err(GenericError(msg.into()));
+        }
+        Err(e) => return Err(e.into()),
+    };
+    let head = head.peel_to_commit()?;
+
+    repo.branch(name, &head, false)?;
+
+    Ok(())
+}
+
+pub(crate) fn git_delete_branch(dir: &Path, name: &str) -> Result<()> {
+    let repo = open_repo(dir)?;
+    let mut branch = get_branch_by_name(&repo, name)?;
+
+    if branch.is_head() {
+        info!("Deleting head branch");
+        let branches = repo.branches(Some(BranchType::Local))?;
+        let other_branch = branches.into_iter().filter_map(|b| b.ok()).find(|b| !b.0.is_head());
+        let other_branch = match other_branch {
+            None => return Err(GenericError("Cannot delete only branch".into())),
+            Some(b) => bytes_to_string(b.0.name_bytes()?)?,
+        };
+
+        git_checkout_branch(dir, &other_branch, true)?;
+    }
+
+    branch.delete()?;
+
+    Ok(())
+}
+
+pub(crate) fn git_merge_branch(dir: &Path, name: &str, _force: bool) -> Result<()> {
+    let repo = open_repo(dir)?;
+    let local_branch = get_current_branch(&repo)?.unwrap();
+
+    let commit_to_merge = get_branch_by_name(&repo, name)?.into_reference();
+    let commit_to_merge = repo.reference_to_annotated_commit(&commit_to_merge)?;
+
+    do_merge(&repo, &local_branch, &commit_to_merge)?;
+
+    Ok(())
+}

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

@@ -0,0 +1,76 @@
+use git2::{Cred, RemoteCallbacks};
+use log::{debug, info};
+use crate::util::find_ssh_key;
+
+pub(crate) fn default_callbacks<'s>() -> RemoteCallbacks<'s> {
+    let mut callbacks = RemoteCallbacks::new();
+
+    let mut fail_next_call = false;
+    let mut tried_agent = false;
+
+    callbacks.credentials(move |url, username_from_url, allowed_types| {
+        if fail_next_call {
+            info!("Failed to get credentials for push");
+            return Err(git2::Error::from_str("Bad credentials."));
+        }
+
+        debug!("getting credentials {url} {username_from_url:?} {allowed_types:?}");
+        match (allowed_types.is_ssh_key(), username_from_url) {
+            (true, Some(username)) => {
+                if !tried_agent {
+                    tried_agent = true;
+                    return Cred::ssh_key_from_agent(username);
+                }
+
+                fail_next_call = true; // This is our last try
+
+                // If the agent failed, try using the default SSH key
+                if let Some(key) = find_ssh_key() {
+                    Cred::ssh_key(username, None, key.as_path(), None)
+                } else {
+                    Err(git2::Error::from_str(
+                        "Bad credentials. Ensure your key was added using ssh-add",
+                    ))
+                }
+            }
+            (true, None) => Err(git2::Error::from_str("Couldn't get username from url")),
+            _ => {
+                return Err(git2::Error::from_str("https remotes are not (yet) supported"));
+            }
+        }
+    });
+
+    callbacks.push_transfer_progress(|current, total, bytes| {
+        debug!("progress: {}/{} ({} B)", current, total, bytes,);
+    });
+
+    callbacks.transfer_progress(|p| {
+        debug!("transfer: {}/{}", p.received_objects(), p.total_objects());
+        true
+    });
+
+    callbacks.pack_progress(|stage, current, total| {
+        debug!("packing: {:?} - {}/{}", stage, current, total);
+    });
+
+    callbacks.push_update_reference(|reference, msg| {
+        debug!("push_update_reference: '{}' {:?}", reference, msg);
+        Ok(())
+    });
+
+    callbacks.update_tips(|name, a, b| {
+        debug!("update tips: '{}' {} -> {}", name, a, b);
+        if a != b {
+            // let mut push_result = push_result.lock().unwrap();
+            // *push_result = PushResult::Success
+        }
+        true
+    });
+
+    callbacks.sideband_progress(|data| {
+        debug!("sideband transfer: '{}'", String::from_utf8_lossy(data).trim());
+        true
+    });
+
+    callbacks
+}

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

@@ -0,0 +1,82 @@
+use crate::branch::{git_checkout_branch, git_create_branch, git_delete_branch, git_merge_branch};
+use crate::error::Result;
+use crate::fetch::git_fetch_all;
+use crate::git::{
+    git_add, git_commit, git_init, git_log, git_status, git_unstage, GitCommit, GitStatusSummary,
+};
+use crate::pull::{git_pull, PullResult};
+use crate::push::{git_push, PushResult};
+use std::path::{Path, PathBuf};
+use tauri::command;
+// NOTE: All of these commands are async to prevent blocking work from locking up the UI
+
+#[command]
+pub async fn checkout(dir: &Path, branch: &str, force: bool) -> Result<String> {
+    git_checkout_branch(dir, branch, force)
+}
+
+#[command]
+pub async fn branch(dir: &Path, branch: &str) -> Result<()> {
+    git_create_branch(dir, branch)
+}
+
+#[command]
+pub async fn delete_branch(dir: &Path, branch: &str) -> Result<()> {
+    git_delete_branch(dir, branch)
+}
+
+#[command]
+pub async fn merge_branch(dir: &Path, branch: &str, force: bool) -> Result<()> {
+    git_merge_branch(dir, branch, force)
+}
+
+#[command]
+pub async fn status(dir: &Path) -> Result<GitStatusSummary> {
+    git_status(dir)
+}
+
+#[command]
+pub async fn log(dir: &Path) -> Result<Vec<GitCommit>> {
+    git_log(dir)
+}
+
+#[command]
+pub async fn initialize(dir: &Path) -> Result<()> {
+    git_init(dir)
+}
+
+#[command]
+pub async fn commit(dir: &Path, message: &str) -> Result<()> {
+    git_commit(dir, message)
+}
+
+#[command]
+pub async fn fetch_all(dir: &Path) -> Result<()> {
+    git_fetch_all(dir)
+}
+
+#[command]
+pub async fn push(dir: &Path) -> Result<PushResult> {
+    git_push(dir)
+}
+
+#[command]
+pub async fn pull(dir: &Path) -> Result<PullResult> {
+    git_pull(dir)
+}
+
+#[command]
+pub async fn add(dir: &Path, rela_paths: Vec<PathBuf>) -> Result<()> {
+    for path in rela_paths {
+        git_add(dir, &path)?;
+    }
+    Ok(())
+}
+
+#[command]
+pub async fn unstage(dir: &Path, rela_paths: Vec<PathBuf>) -> Result<()> {
+    for path in rela_paths {
+        git_unstage(dir, &path)?;
+    }
+    Ok(())
+}

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

@@ -0,0 +1,55 @@
+use serde::{Serialize, Serializer};
+use std::io;
+use std::path::PathBuf;
+use std::string::FromUtf8Error;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum Error {
+    #[error("Git repo not found {0}")]
+    GitRepoNotFound(PathBuf),
+
+    #[error("Git error: {0}")]
+    GitUnknown(#[from] git2::Error),
+
+    #[error("Yaml error: {0}")]
+    YamlParseError(#[from] serde_yaml::Error),
+
+    #[error("Yaml error: {0}")]
+    ModelError(#[from] yaak_models::error::Error),
+
+    #[error("Sync error: {0}")]
+    SyncError(#[from] yaak_sync::error::Error),
+
+    #[error("I/o error: {0}")]
+    IoError(#[from] io::Error),
+
+    #[error("Yaml error: {0}")]
+    JsonParseError(#[from] serde_json::Error),
+
+    #[error("Yaml error: {0}")]
+    Utf8ConversionError(#[from] FromUtf8Error),
+
+    #[error("Git error: {0}")]
+    GenericError(String),
+
+    #[error("No default remote found")]
+    NoDefaultRemoteFound,
+
+    #[error("Merge failed due to conflicts")]
+    MergeConflicts,
+
+    #[error("No active branch")]
+    NoActiveBranch,
+}
+
+impl Serialize for Error {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(self.to_string().as_ref())
+    }
+}
+
+pub type Result<T> = std::result::Result<T, Error>;

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

@@ -0,0 +1,37 @@
+use crate::callbacks::default_callbacks;
+use crate::error::Result;
+use crate::repository::open_repo;
+use git2::{FetchOptions, ProxyOptions, Repository};
+use std::path::Path;
+
+pub(crate) fn git_fetch_all(dir: &Path) -> Result<()> {
+    let repo = open_repo(dir)?;
+    let remotes = repo.remotes()?.iter().flatten().map(String::from).collect::<Vec<_>>();
+
+    for (_idx, remote) in remotes.into_iter().enumerate() {
+        fetch_from_remote(&repo, &remote)?;
+    }
+
+    Ok(())
+}
+
+fn fetch_from_remote(repo: &Repository, remote: &str) -> Result<()> {
+    let mut remote = repo.find_remote(remote)?;
+
+    let mut options = FetchOptions::new();
+    let callbacks = default_callbacks();
+
+    options.prune(git2::FetchPrune::On);
+    let mut proxy = ProxyOptions::new();
+    proxy.auto();
+
+    options.proxy_options(proxy);
+    options.download_tags(git2::AutotagOption::All);
+    options.remote_callbacks(callbacks);
+
+    remote.fetch(&[] as &[&str], Some(&mut options), None)?;
+    // fetch tags (also removing remotely deleted ones)
+    remote.fetch(&["refs/tags/*:refs/tags/*"], Some(&mut options), None)?;
+
+    Ok(())
+}

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

@@ -0,0 +1,673 @@
+use crate::error::Result;
+use crate::repository::open_repo;
+use crate::util::{local_branch_names, remote_branch_names};
+use chrono::{DateTime, Utc};
+use git2::IndexAddOption;
+use log::{info, warn};
+use serde::{Deserialize, Serialize};
+use std::fs;
+use std::path::Path;
+use ts_rs::TS;
+use yaak_sync::models::SyncModel;
+
+#[derive(Debug, Clone, Serialize, Deserialize, TS, PartialEq)]
+#[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "gen_git.ts")]
+pub struct GitStatusSummary {
+    pub path: String,
+    pub head_ref: Option<String>,
+    pub head_ref_shorthand: Option<String>,
+    pub entries: Vec<GitStatusEntry>,
+    pub origins: Vec<String>,
+    pub local_branches: Vec<String>,
+    pub remote_branches: Vec<String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "gen_git.ts")]
+pub struct GitStatusEntry {
+    pub rela_path: String,
+    pub status: GitStatus,
+    pub staged: bool,
+    pub prev: Option<SyncModel>,
+    pub next: Option<SyncModel>,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, TS)]
+#[serde(rename_all = "snake_case")]
+#[ts(export, export_to = "gen_git.ts")]
+pub enum GitStatus {
+    Untracked,
+    Conflict,
+    Current,
+    Modified,
+    Removed,
+    Renamed,
+    TypeChange,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "gen_git.ts")]
+pub struct GitCommit {
+    author: GitAuthor,
+    when: DateTime<Utc>,
+    message: Option<String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, TS)]
+#[serde(rename_all = "camelCase")]
+#[ts(export, export_to = "gen_git.ts")]
+pub struct GitAuthor {
+    name: Option<String>,
+    email: Option<String>,
+}
+
+pub fn git_init(dir: &Path) -> Result<()> {
+    git2::Repository::init(dir)?;
+    let repo = open_repo(dir)?;
+    // Default to main instead of master, to align with
+    // the official Git and GitHub behavior
+    repo.set_head("refs/heads/main")?;
+    info!("Initialized {dir:?}");
+    Ok(())
+}
+
+pub fn git_add(dir: &Path, rela_path: &Path) -> Result<()> {
+    let repo = open_repo(dir)?;
+    let mut index = repo.index()?;
+
+    info!("Staging file {rela_path:?} to {dir:?}");
+    index.add_all(&[rela_path], IndexAddOption::DEFAULT, None)?;
+    index.write()?;
+
+    Ok(())
+}
+
+pub fn git_unstage(dir: &Path, rela_path: &Path) -> Result<()> {
+    let repo = open_repo(dir)?;
+
+    let head = match repo.head() {
+        Ok(h) => h,
+        Err(e) if e.code() == git2::ErrorCode::UnbornBranch => {
+            info!("Unstaging file in empty branch {rela_path:?} to {dir:?}");
+            // Repo has no commits, so "unstage" means remove from index
+            let mut index = repo.index()?;
+            index.remove_path(rela_path)?;
+            index.write()?;
+            return Ok(());
+        }
+        Err(e) => return Err(e.into()),
+    };
+
+    // If repo has commits, update the index entry back to HEAD
+    info!("Unstaging file {rela_path:?} to {dir:?}");
+    let commit = head.peel_to_commit()?;
+    repo.reset_default(Some(commit.as_object()), &[rela_path])?;
+
+    Ok(())
+}
+
+pub fn git_commit(dir: &Path, message: &str) -> Result<()> {
+    let repo = open_repo(dir)?;
+
+    // Clear the in-memory index, add the paths, and write the tree for committing
+    let tree_oid = repo.index()?.write_tree()?;
+    let tree = repo.find_tree(tree_oid)?;
+
+    // Make the signature
+    let config = git2::Config::open_default()?.snapshot()?;
+    let name = config.get_str("user.name").unwrap_or("Change Me");
+    let email = config.get_str("user.email").unwrap_or("change_me@example.com");
+    let sig = git2::Signature::now(name, email)?;
+
+    // Get the current HEAD commit (if it exists)
+    let parent_commit = match repo.head() {
+        Ok(head) => Some(head.peel_to_commit()?),
+        Err(_) => None, // No parent if no HEAD exists (initial commit)
+    };
+
+    let parents = parent_commit.as_ref().map(|p| vec![p]).unwrap_or_default();
+    repo.commit(Some("HEAD"), &sig, &sig, message, &tree, parents.as_slice())?;
+
+    info!("Committed to {dir:?}");
+
+    Ok(())
+}
+
+pub fn git_log(dir: &Path) -> Result<Vec<GitCommit>> {
+    let repo = open_repo(dir)?;
+
+    // Return empty if empty repo or no head (new repo)
+    if repo.is_empty()? || repo.head().is_err() {
+        return Ok(vec![]);
+    }
+
+    let mut revwalk = repo.revwalk()?;
+    revwalk.push_head()?;
+    revwalk.set_sorting(git2::Sort::TIME)?;
+
+    // Run git log
+    macro_rules! filter_try {
+        ($e:expr) => {
+            match $e {
+                Ok(t) => t,
+                Err(_) => return None,
+            }
+        };
+    }
+    let log: Vec<GitCommit> = revwalk
+        .filter_map(|oid| {
+            let oid = filter_try!(oid);
+            let commit = filter_try!(repo.find_commit(oid));
+            let author = commit.author();
+            Some(GitCommit {
+                author: GitAuthor {
+                    name: author.name().map(|s| s.to_string()),
+                    email: author.email().map(|s| s.to_string()),
+                },
+                when: convert_git_time_to_date(author.when()),
+                message: commit.message().map(|m| m.to_string()),
+            })
+        })
+        .collect();
+
+    Ok(log)
+}
+
+pub fn git_status(dir: &Path) -> Result<GitStatusSummary> {
+    let repo = open_repo(dir)?;
+    let (head_tree, head_ref, head_ref_shorthand) = match repo.head() {
+        Ok(head) => {
+            let tree = head.peel_to_tree().ok();
+            let head_ref_shorthand = head.shorthand().map(|s| s.to_string());
+            let head_ref = head.name().map(|s| s.to_string());
+
+            (tree, head_ref, head_ref_shorthand)
+        }
+        Err(_) => {
+            // For "unborn" repos, reading from HEAD is the only way to get the branch name
+            // See https://github.com/starship/starship/pull/1336
+            let head_path = repo.path().join("HEAD");
+            let head_ref = fs::read_to_string(&head_path)
+                .ok()
+                .unwrap_or_default()
+                .lines()
+                .next()
+                .map(|s| s.trim_start_matches("ref:").trim().to_string());
+            let head_ref_shorthand =
+                head_ref.clone().map(|r| r.split('/').last().unwrap_or("unknown").to_string());
+            (None, head_ref, head_ref_shorthand)
+        }
+    };
+
+    let mut opts = git2::StatusOptions::new();
+    opts.include_ignored(false)
+        .include_untracked(true) // Include untracked
+        .recurse_untracked_dirs(true) // Show all untracked
+        .include_unmodified(true); // Include unchanged
+
+    // TODO: Support renames
+
+    let mut entries: Vec<GitStatusEntry> = Vec::new();
+    for entry in repo.statuses(Some(&mut opts))?.into_iter() {
+        let rela_path = entry.path().unwrap().to_string();
+        let status = entry.status();
+        let index_status = match status {
+            // Note: order matters here, since we're checking a bitmap!
+            s if s.contains(git2::Status::CONFLICTED) => GitStatus::Conflict,
+            s if s.contains(git2::Status::INDEX_NEW) => GitStatus::Untracked,
+            s if s.contains(git2::Status::INDEX_MODIFIED) => GitStatus::Modified,
+            s if s.contains(git2::Status::INDEX_DELETED) => GitStatus::Removed,
+            s if s.contains(git2::Status::INDEX_RENAMED) => GitStatus::Renamed,
+            s if s.contains(git2::Status::INDEX_TYPECHANGE) => GitStatus::TypeChange,
+            s if s.contains(git2::Status::CURRENT) => GitStatus::Current,
+            s => {
+                warn!("Unknown index status {s:?}");
+                continue;
+            }
+        };
+
+        let worktree_status = match status {
+            // Note: order matters here, since we're checking a bitmap!
+            s if s.contains(git2::Status::CONFLICTED) => GitStatus::Conflict,
+            s if s.contains(git2::Status::WT_NEW) => GitStatus::Untracked,
+            s if s.contains(git2::Status::WT_MODIFIED) => GitStatus::Modified,
+            s if s.contains(git2::Status::WT_DELETED) => GitStatus::Removed,
+            s if s.contains(git2::Status::WT_RENAMED) => GitStatus::Renamed,
+            s if s.contains(git2::Status::WT_TYPECHANGE) => GitStatus::TypeChange,
+            s if s.contains(git2::Status::CURRENT) => GitStatus::Current,
+            s => {
+                warn!("Unknown worktree status {s:?}");
+                continue;
+            }
+        };
+
+        let status = if index_status == GitStatus::Current {
+            worktree_status.clone()
+        } else {
+            index_status.clone()
+        };
+
+        let staged = if index_status == GitStatus::Current && worktree_status == GitStatus::Current
+        {
+            // No change, so can't be added
+            false
+        } else if index_status != GitStatus::Current {
+            true
+        } else {
+            false
+        };
+
+        // Get previous content from Git, if it's in there
+        let prev = match head_tree.clone() {
+            None => None,
+            Some(t) => match t.get_path(&Path::new(&rela_path)) {
+                Ok(entry) => {
+                    let obj = entry.to_object(&repo).unwrap();
+                    let content = obj.as_blob().unwrap().content();
+                    let name = Path::new(entry.name().unwrap_or_default());
+                    SyncModel::from_bytes(content.into(), name)?.map(|m| m.0)
+                }
+                Err(_) => None,
+            },
+        };
+
+        let next = {
+            let full_path = repo.workdir().unwrap().join(rela_path.clone());
+            SyncModel::from_file(full_path.as_path())?.map(|m| m.0)
+        };
+
+        entries.push(GitStatusEntry {
+            status,
+            staged,
+            rela_path,
+            prev: prev.clone(),
+            next: next.clone(),
+        })
+    }
+
+    let origins = repo.remotes()?.into_iter().filter_map(|o| Some(o?.to_string())).collect();
+    let local_branches = local_branch_names(&repo)?;
+    let remote_branches = remote_branch_names(&repo)?;
+
+    Ok(GitStatusSummary {
+        entries,
+        origins,
+        path: dir.to_string_lossy().to_string(),
+        head_ref,
+        head_ref_shorthand,
+        local_branches,
+        remote_branches,
+    })
+}
+
+#[cfg(test)]
+fn convert_git_time_to_date(_git_time: git2::Time) -> DateTime<Utc> {
+    DateTime::from_timestamp(0, 0).unwrap()
+}
+
+#[cfg(not(test))]
+fn convert_git_time_to_date(git_time: git2::Time) -> DateTime<Utc> {
+    let timestamp = git_time.seconds();
+    DateTime::from_timestamp(timestamp, 0).unwrap()
+}
+
+// // Write a test
+// #[cfg(test)]
+// mod test {
+//     use crate::error::Error::GitRepoNotFound;
+//     use crate::error::Result;
+//     use crate::git::{
+//         git_add, git_commit, git_init, git_log, git_status, git_unstage, open_repo, GitStatus,
+//         GitStatusEntry,
+//     };
+//     use std::fs::{create_dir_all, remove_file, File};
+//     use std::io::Write;
+//     use std::path::{Path, PathBuf};
+//     use tempdir::TempDir;
+//
+//     fn new_dir() -> PathBuf {
+//         let p = TempDir::new("yaak-git").unwrap().into_path();
+//         p
+//     }
+//
+//     fn new_file(path: &Path, content: &str) {
+//         let parent = path.parent().unwrap();
+//         create_dir_all(parent).unwrap();
+//         File::create(path).unwrap().write_all(content.as_bytes()).unwrap();
+//     }
+//
+//     #[tokio::test]
+//     async fn test_status_no_repo() {
+//         let dir = &new_dir();
+//         let result = git_status(dir).await;
+//         assert!(matches!(result, Err(GitRepoNotFound(_))));
+//     }
+//
+//     #[test]
+//     fn test_open_repo() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//         open_repo(dir.as_path())?;
+//         Ok(())
+//     }
+//
+//     #[test]
+//     fn test_open_repo_from_subdir() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//
+//         let sub_dir = dir.join("a").join("b");
+//         create_dir_all(sub_dir.as_path())?; // Create sub dir
+//
+//         open_repo(sub_dir.as_path())?;
+//         Ok(())
+//     }
+//
+//     #[tokio::test]
+//     async fn test_status() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//
+//         assert_eq!(git_status(dir).await?.entries, Vec::new());
+//
+//         new_file(&dir.join("foo.txt"), "foo");
+//         new_file(&dir.join("bar.txt"), "bar");
+//         new_file(&dir.join("dir/baz.txt"), "baz");
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "dir/baz.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("baz".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("foo".to_string()),
+//                 },
+//             ],
+//         );
+//         Ok(())
+//     }
+//
+//     #[tokio::test]
+//     fn test_add() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//
+//         new_file(&dir.join("foo.txt"), "foo");
+//         new_file(&dir.join("bar.txt"), "bar");
+//
+//         git_add(dir, Path::new("foo.txt"))?;
+//
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: true,
+//                     prev: None,
+//                     next: Some("foo".to_string()),
+//                 },
+//             ],
+//         );
+//
+//         new_file(&dir.join("foo.txt"), "foo foo");
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: true,
+//                     prev: None,
+//                     next: Some("foo foo".to_string()),
+//                 },
+//             ],
+//         );
+//         Ok(())
+//     }
+//
+//     #[tokio::test]
+//     fn test_unstage() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//
+//         new_file(&dir.join("foo.txt"), "foo");
+//         new_file(&dir.join("bar.txt"), "bar");
+//
+//         git_add(dir, Path::new("foo.txt"))?;
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: true,
+//                     prev: None,
+//                     next: Some("foo".to_string()),
+//                 },
+//             ]
+//         );
+//
+//         git_unstage(dir, Path::new("foo.txt"))?;
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("foo".to_string()),
+//                 }
+//             ]
+//         );
+//
+//         Ok(())
+//     }
+//
+//     #[tokio::test]
+//     fn test_commit() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//
+//         new_file(&dir.join("foo.txt"), "foo");
+//         new_file(&dir.join("bar.txt"), "bar");
+//
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("foo".to_string()),
+//                 },
+//             ]
+//         );
+//
+//         git_add(dir, Path::new("foo.txt"))?;
+//         git_commit(dir, "This is my message")?;
+//
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Current,
+//                     staged: false,
+//                     prev: Some("foo".to_string()),
+//                     next: Some("foo".to_string()),
+//                 },
+//             ]
+//         );
+//
+//         new_file(&dir.join("foo.txt"), "foo foo");
+//         git_add(dir, Path::new("foo.txt"))?;
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Modified,
+//                     staged: true,
+//                     prev: Some("foo".to_string()),
+//                     next: Some("foo foo".to_string()),
+//                 },
+//             ]
+//         );
+//         Ok(())
+//     }
+//
+//     #[tokio::test]
+//     async fn test_add_removed_file() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//
+//         let foo_path = &dir.join("foo.txt");
+//         let bar_path = &dir.join("bar.txt");
+//
+//         new_file(foo_path, "foo");
+//         new_file(bar_path, "bar");
+//
+//         git_add(dir, Path::new("foo.txt"))?;
+//         git_commit(dir, "Initial commit")?;
+//
+//         remove_file(foo_path)?;
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Removed,
+//                     staged: false,
+//                     prev: Some("foo".to_string()),
+//                     next: None,
+//                 },
+//             ],
+//         );
+//
+//         git_add(dir, Path::new("foo.txt"))?;
+//         assert_eq!(
+//             git_status(dir).await?.entries,
+//             vec![
+//                 GitStatusEntry {
+//                     rela_path: "bar.txt".to_string(),
+//                     status: GitStatus::Added,
+//                     staged: false,
+//                     prev: None,
+//                     next: Some("bar".to_string()),
+//                 },
+//                 GitStatusEntry {
+//                     rela_path: "foo.txt".to_string(),
+//                     status: GitStatus::Removed,
+//                     staged: true,
+//                     prev: Some("foo".to_string()),
+//                     next: None,
+//                 },
+//             ],
+//         );
+//         Ok(())
+//     }
+//
+//     #[tokio::test]
+//     fn test_log_empty() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//
+//         let log = git_log(dir)?;
+//         assert_eq!(log.len(), 0);
+//         Ok(())
+//     }
+//
+//     #[test]
+//     fn test_log() -> Result<()> {
+//         let dir = &new_dir();
+//         git_init(dir)?;
+//
+//         new_file(&dir.join("foo.txt"), "foo");
+//         new_file(&dir.join("bar.txt"), "bar");
+//
+//         git_add(dir, Path::new("foo.txt"))?;
+//         git_commit(dir, "This is my message")?;
+//
+//         let log = git_log(dir)?;
+//         assert_eq!(log.len(), 1);
+//         assert_eq!(log.get(0).unwrap().message, Some("This is my message".to_string()));
+//         Ok(())
+//     }
+// }